From 2831d79871407ffbc8e19b13bc9830559af7e35c Mon Sep 17 00:00:00 2001
From: Clint Wylie <cwylie@apache.org>
Date: Tue, 26 Nov 2024 22:44:05 -0800
Subject: [PATCH 01/56] update kafka dependency version to 3.9.0 (#17513)

* update kafka dependency version to 3.9.0

* update licenses.yaml
---
 licenses.yaml | 4 ++--
 pom.xml       | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/licenses.yaml b/licenses.yaml
index 32227ce03316..1f05bb5d1d7f 100644
--- a/licenses.yaml
+++ b/licenses.yaml
@@ -3165,7 +3165,7 @@ libraries:
 ---
 
 name: Apache Kafka
-version: 3.6.1
+version: 3.9.0
 license_category: binary
 module: extensions/druid-kafka-indexing-service
 license_name: Apache License version 2.0
@@ -3174,7 +3174,7 @@ libraries:
 notices:
   - kafka-clients: |
       Apache Kafka
-      Copyright 2023 The Apache Software Foundation.
+      Copyright 2024 The Apache Software Foundation.
 
       This product includes software developed at
       The Apache Software Foundation (https://www.apache.org/).
diff --git a/pom.xml b/pom.xml
index e5dbde3ac51e..ac9b91d23d0b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -75,7 +75,7 @@
         <project.build.resourceEncoding>UTF-8</project.build.resourceEncoding>
         <aether.version>0.9.0.M2</aether.version>
         <apache.curator.version>5.5.0</apache.curator.version>
-        <apache.kafka.version>3.6.1</apache.kafka.version>
+        <apache.kafka.version>3.9.0</apache.kafka.version>
         <!-- when updating apache ranger, verify the usage of aws-bundle-sdk vs aws-logs-sdk
         and update as needed in extensions-core/druid-ranger-security/pm.xml  -->
         <apache.ranger.version>2.4.0</apache.ranger.version>

From 5333c53d710f0238b5314b7508d6a7877233a33b Mon Sep 17 00:00:00 2001
From: Vishesh Garg <gargvishesh@gmail.com>
Date: Wed, 27 Nov 2024 13:26:10 +0530
Subject: [PATCH 02/56] Support non time order in MSQ compaction (#17318)

This patch supports sorting segments by non-time columns (added in #16849) to MSQ compaction.
Specifically, if `forceSegmentSortByTime` is set in the data schema, either via the user-supplied
compaction config or in the inferred schema, the following steps are taken:
- Skip adding `__time` explicitly as the first column to the dimension schema since it already comes
as part of the schema
- Ensure column mappings propagate `__time` in the order specified by the schema
- Set `forceSegmentSortByTime` in the MSQ context.
---
 .../msq/indexing/MSQCompactionRunner.java     |  62 ++++--
 .../msq/indexing/MSQCompactionRunnerTest.java | 205 ++++++++++++------
 2 files changed, 176 insertions(+), 91 deletions(-)

diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/MSQCompactionRunner.java b/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/MSQCompactionRunner.java
index d05ab12ea3fe..2d8a510fd98b 100644
--- a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/MSQCompactionRunner.java
+++ b/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/MSQCompactionRunner.java
@@ -348,7 +348,10 @@ private static Integer getRowsPerSegment(CompactionTask compactionTask)
   private static RowSignature getRowSignature(DataSchema dataSchema)
   {
     RowSignature.Builder rowSignatureBuilder = RowSignature.builder();
-    rowSignatureBuilder.add(dataSchema.getTimestampSpec().getTimestampColumn(), ColumnType.LONG);
+    if (dataSchema.getDimensionsSpec().isForceSegmentSortByTime() == true) {
+      // If sort not forced by time, __time appears as part of dimensions in DimensionsSpec
+      rowSignatureBuilder.add(dataSchema.getTimestampSpec().getTimestampColumn(), ColumnType.LONG);
+    }
     if (!isQueryGranularityEmptyOrNone(dataSchema)) {
       // A virtual column for query granularity would have been added. Add corresponding column type.
       rowSignatureBuilder.add(TIME_VIRTUAL_COLUMN, ColumnType.LONG);
@@ -398,25 +401,31 @@ private static List<DimensionSpec> getAggregateDimensions(
 
   private static ColumnMappings getColumnMappings(DataSchema dataSchema)
   {
-    List<ColumnMapping> columnMappings = dataSchema.getDimensionsSpec()
-                                                   .getDimensions()
-                                                   .stream()
-                                                   .map(dim -> new ColumnMapping(
-                                                       dim.getName(), dim.getName()))
-                                                   .collect(Collectors.toList());
+    List<ColumnMapping> columnMappings = new ArrayList<>();
+    // For scan queries, a virtual column is created from __time if a custom query granularity is provided. For
+    // group-by queries, as insert needs __time, it will always be one of the dimensions. Since dimensions in groupby
+    // aren't allowed to have time column as the output name, we map time dimension to TIME_VIRTUAL_COLUMN in
+    // dimensions, and map it back to the time column here.
+    String timeColumn = (isGroupBy(dataSchema) || !isQueryGranularityEmptyOrNone(dataSchema))
+                        ? TIME_VIRTUAL_COLUMN
+                        : ColumnHolder.TIME_COLUMN_NAME;
+    ColumnMapping timeColumnMapping = new ColumnMapping(timeColumn, ColumnHolder.TIME_COLUMN_NAME);
+    if (dataSchema.getDimensionsSpec().isForceSegmentSortByTime()) {
+      // When not sorted by time, the __time column is missing from dimensionsSpec
+      columnMappings.add(timeColumnMapping);
+    }
+    columnMappings.addAll(
+        dataSchema.getDimensionsSpec()
+                  .getDimensions()
+                  .stream()
+                  .map(dim -> dim.getName().equals(ColumnHolder.TIME_COLUMN_NAME)
+                              ? timeColumnMapping
+                              : new ColumnMapping(dim.getName(), dim.getName()))
+                  .collect(Collectors.toList())
+    );
     columnMappings.addAll(Arrays.stream(dataSchema.getAggregators())
                                 .map(agg -> new ColumnMapping(agg.getName(), agg.getName()))
-                                .collect(
-                                    Collectors.toList()));
-    if (isGroupBy(dataSchema) || !isQueryGranularityEmptyOrNone(dataSchema)) {
-      // For scan queries, a virtual column is created from __time if a custom query granularity is provided. For
-      // group-by queries, as insert needs __time, it will always be one of the dimensions. Since dimensions in groupby
-      // aren't allowed to have time column as the output name, we map time dimension to TIME_VIRTUAL_COLUMN in
-      // dimensions, and map it back to the time column here.
-      columnMappings.add(new ColumnMapping(TIME_VIRTUAL_COLUMN, ColumnHolder.TIME_COLUMN_NAME));
-    } else {
-      columnMappings.add(new ColumnMapping(ColumnHolder.TIME_COLUMN_NAME, ColumnHolder.TIME_COLUMN_NAME));
-    }
+                                .collect(Collectors.toList()));
     return new ColumnMappings(columnMappings);
   }
 
@@ -431,6 +440,19 @@ private static List<OrderByColumnSpec> getOrderBySpec(PartitionsSpec partitionSp
     return Collections.emptyList();
   }
 
+  private static Map<String, Object> buildQueryContext(
+      Map<String, Object> taskContext,
+      DataSchema dataSchema
+  )
+  {
+    if (dataSchema.getDimensionsSpec().isForceSegmentSortByTime()) {
+      return taskContext;
+    }
+    Map<String, Object> queryContext = new HashMap<>(taskContext);
+    queryContext.put(MultiStageQueryContext.CTX_FORCE_TIME_SORT, false);
+    return queryContext;
+  }
+
   private static Query<?> buildScanQuery(
       CompactionTask compactionTask,
       Interval interval,
@@ -447,7 +469,7 @@ private static Query<?> buildScanQuery(
         .columnTypes(rowSignature.getColumnTypes())
         .intervals(new MultipleIntervalSegmentSpec(Collections.singletonList(interval)))
         .filters(dataSchema.getTransformSpec().getFilter())
-        .context(compactionTask.getContext());
+        .context(buildQueryContext(compactionTask.getContext(), dataSchema));
 
     if (compactionTask.getTuningConfig() != null && compactionTask.getTuningConfig().getPartitionsSpec() != null) {
       List<OrderByColumnSpec> orderByColumnSpecs = getOrderBySpec(compactionTask.getTuningConfig().getPartitionsSpec());
@@ -599,7 +621,7 @@ private Query<?> buildGroupByQuery(
         .setDimensions(getAggregateDimensions(dataSchema, inputColToVirtualCol))
         .setAggregatorSpecs(Arrays.asList(dataSchema.getAggregators()))
         .setPostAggregatorSpecs(postAggregators)
-        .setContext(compactionTask.getContext())
+        .setContext(buildQueryContext(compactionTask.getContext(), dataSchema))
         .setInterval(interval);
 
     if (compactionTask.getTuningConfig() != null && compactionTask.getTuningConfig().getPartitionsSpec() != null) {
diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/indexing/MSQCompactionRunnerTest.java b/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/indexing/MSQCompactionRunnerTest.java
index 0a54f8550a93..a05ccd499d0c 100644
--- a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/indexing/MSQCompactionRunnerTest.java
+++ b/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/indexing/MSQCompactionRunnerTest.java
@@ -60,7 +60,9 @@
 import org.apache.druid.query.filter.SelectorDimFilter;
 import org.apache.druid.query.groupby.GroupByQuery;
 import org.apache.druid.query.scan.ScanQuery;
+import org.apache.druid.segment.AutoTypeColumnSchema;
 import org.apache.druid.segment.IndexSpec;
+import org.apache.druid.segment.NestedDataColumnSchema;
 import org.apache.druid.segment.column.ColumnHolder;
 import org.apache.druid.segment.column.ColumnType;
 import org.apache.druid.segment.data.CompressionFactory;
@@ -72,14 +74,13 @@
 import org.apache.druid.segment.transform.TransformSpec;
 import org.apache.druid.server.coordinator.CompactionConfigValidationResult;
 import org.apache.druid.sql.calcite.parser.DruidSqlInsert;
-import org.hamcrest.MatcherAssert;
-import org.hamcrest.Matchers;
 import org.joda.time.Interval;
 import org.junit.Assert;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
 import javax.annotation.Nullable;
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -103,10 +104,14 @@ public class MSQCompactionRunnerTest
   private static final StringDimensionSchema STRING_DIMENSION = new StringDimensionSchema("string_dim", null, false);
   private static final StringDimensionSchema MV_STRING_DIMENSION = new StringDimensionSchema("mv_string_dim", null, null);
   private static final LongDimensionSchema LONG_DIMENSION = new LongDimensionSchema("long_dim");
+  private static final NestedDataColumnSchema NESTED_DIMENSION = new NestedDataColumnSchema("nested_dim", 4);
+  private static final AutoTypeColumnSchema AUTO_DIMENSION = new AutoTypeColumnSchema("auto_dim", null);
   private static final List<DimensionSchema> DIMENSIONS = ImmutableList.of(
       STRING_DIMENSION,
       LONG_DIMENSION,
-      MV_STRING_DIMENSION
+      MV_STRING_DIMENSION,
+      NESTED_DIMENSION,
+      AUTO_DIMENSION
   );
   private static final Map<Interval, DataSchema> INTERVAL_DATASCHEMAS = ImmutableMap.of(
       COMPACTION_INTERVAL,
@@ -336,7 +341,7 @@ public void testRunCompactionTasksWithEmptyTaskListFails() throws Exception
   }
 
   @Test
-  public void testMSQControllerTaskSpecWithScanIsValid() throws JsonProcessingException
+  public void testCompactionConfigWithoutMetricsSpecProducesCorrectSpec() throws JsonProcessingException
   {
     DimFilter dimFilter = new SelectorDimFilter("dim1", "foo", null);
 
@@ -357,7 +362,7 @@ public void testMSQControllerTaskSpecWithScanIsValid() throws JsonProcessingExce
                   .withGranularity(
                       new UniformGranularitySpec(
                           SEGMENT_GRANULARITY.getDefaultGranularity(),
-                          null,
+                          QUERY_GRANULARITY.getDefaultGranularity(),
                           false,
                           Collections.singletonList(COMPACTION_INTERVAL)
                       )
@@ -375,37 +380,37 @@ public void testMSQControllerTaskSpecWithScanIsValid() throws JsonProcessingExce
 
     MSQSpec actualMSQSpec = msqControllerTask.getQuerySpec();
 
-    Assert.assertEquals(
-        new MSQTuningConfig(
-            1,
-            MultiStageQueryContext.DEFAULT_ROWS_IN_MEMORY,
-            MAX_ROWS_PER_SEGMENT,
-            null,
-            createIndexSpec()
-        ),
-        actualMSQSpec.getTuningConfig()
-    );
-    Assert.assertEquals(
-        new DataSourceMSQDestination(
-            DATA_SOURCE,
-            SEGMENT_GRANULARITY.getDefaultGranularity(),
-            null,
-            Collections.singletonList(COMPACTION_INTERVAL),
-            DIMENSIONS.stream().collect(Collectors.toMap(DimensionSchema::getName, Function.identity())),
-            null
-        ),
-        actualMSQSpec.getDestination()
-    );
+    Assert.assertEquals(getExpectedTuningConfig(), actualMSQSpec.getTuningConfig());
+    Assert.assertEquals(getExpectedDestination(), actualMSQSpec.getDestination());
 
     Assert.assertTrue(actualMSQSpec.getQuery() instanceof ScanQuery);
     ScanQuery scanQuery = (ScanQuery) actualMSQSpec.getQuery();
 
+    List<String> expectedColumns = new ArrayList<>();
+    List<ColumnType> expectedColumnTypes = new ArrayList<>();
+    // Add __time since this is a time-ordered query which doesn't have __time explicitly defined in dimensionsSpec
+    expectedColumns.add(ColumnHolder.TIME_COLUMN_NAME);
+    expectedColumnTypes.add(ColumnType.LONG);
+
+    // Add TIME_VIRTUAL_COLUMN since a query granularity is specified
+    expectedColumns.add(MSQCompactionRunner.TIME_VIRTUAL_COLUMN);
+    expectedColumnTypes.add(ColumnType.LONG);
+
+    expectedColumns.addAll(DIMENSIONS.stream().map(DimensionSchema::getName).collect(Collectors.toList()));
+    expectedColumnTypes.addAll(DIMENSIONS.stream().map(DimensionSchema::getColumnType).collect(Collectors.toList()));
+
+    Assert.assertEquals(expectedColumns, scanQuery.getColumns());
+    Assert.assertEquals(expectedColumnTypes, scanQuery.getColumnTypes());
+
     Assert.assertEquals(dimFilter, scanQuery.getFilter());
     Assert.assertEquals(
         JSON_MAPPER.writeValueAsString(SEGMENT_GRANULARITY.toString()),
         msqControllerTask.getContext().get(DruidSqlInsert.SQL_INSERT_SEGMENT_GRANULARITY)
     );
-    Assert.assertNull(msqControllerTask.getContext().get(DruidSqlInsert.SQL_INSERT_QUERY_GRANULARITY));
+    Assert.assertEquals(
+        JSON_MAPPER.writeValueAsString(QUERY_GRANULARITY.toString()),
+        msqControllerTask.getContext().get(DruidSqlInsert.SQL_INSERT_QUERY_GRANULARITY)
+    );
     Assert.assertEquals(WorkerAssignmentStrategy.MAX, actualMSQSpec.getAssignmentStrategy());
     Assert.assertEquals(
         PARTITION_DIMENSIONS.stream().map(OrderBy::ascending).collect(Collectors.toList()),
@@ -414,7 +419,60 @@ public void testMSQControllerTaskSpecWithScanIsValid() throws JsonProcessingExce
   }
 
   @Test
-  public void testMSQControllerTaskSpecWithAggregatorsIsValid() throws JsonProcessingException
+  public void testCompactionConfigWithSortOnNonTimeDimensionsProducesCorrectSpec() throws JsonProcessingException
+  {
+    List<DimensionSchema> nonTimeSortedDimensions = ImmutableList.of(
+        STRING_DIMENSION,
+        new LongDimensionSchema(ColumnHolder.TIME_COLUMN_NAME),
+        LONG_DIMENSION
+    );
+    CompactionTask taskCreatedWithTransformSpec = createCompactionTask(
+        new DynamicPartitionsSpec(TARGET_ROWS_PER_SEGMENT, null),
+        null,
+        Collections.emptyMap(),
+        null,
+        null
+    );
+
+    // Set forceSegmentSortByTime=false to enable non-time order
+    DimensionsSpec dimensionsSpec = DimensionsSpec.builder()
+                                                  .setDimensions(nonTimeSortedDimensions)
+                                                  .setForceSegmentSortByTime(false)
+                                                  .build();
+    DataSchema dataSchema =
+        DataSchema.builder()
+                  .withDataSource(DATA_SOURCE)
+                  .withTimestamp(new TimestampSpec(TIMESTAMP_COLUMN, null, null))
+                  .withDimensions(dimensionsSpec)
+                  .withGranularity(
+                      new UniformGranularitySpec(
+                          SEGMENT_GRANULARITY.getDefaultGranularity(),
+                          null,
+                          false,
+                          Collections.singletonList(COMPACTION_INTERVAL)
+                      )
+                  )
+                  .build();
+
+    List<MSQControllerTask> msqControllerTasks = MSQ_COMPACTION_RUNNER.createMsqControllerTasks(
+        taskCreatedWithTransformSpec,
+        Collections.singletonMap(COMPACTION_INTERVAL, dataSchema)
+    );
+
+    MSQSpec actualMSQSpec = Iterables.getOnlyElement(msqControllerTasks).getQuerySpec();
+
+    Assert.assertTrue(actualMSQSpec.getQuery() instanceof ScanQuery);
+    ScanQuery scanQuery = (ScanQuery) actualMSQSpec.getQuery();
+
+    // Dimensions should already list __time and the order should remain intact
+    Assert.assertEquals(
+        nonTimeSortedDimensions.stream().map(DimensionSchema::getName).collect(Collectors.toList()),
+        scanQuery.getColumns()
+    );
+  }
+
+  @Test
+  public void testCompactionConfigWithMetricsSpecProducesCorrectSpec() throws JsonProcessingException
   {
     DimFilter dimFilter = new SelectorDimFilter("dim1", "foo", null);
 
@@ -444,7 +502,6 @@ public void testMSQControllerTaskSpecWithAggregatorsIsValid() throws JsonProcess
         multiValuedDimensions
     );
 
-
     List<MSQControllerTask> msqControllerTasks = MSQ_COMPACTION_RUNNER.createMsqControllerTasks(
         taskCreatedWithTransformSpec,
         Collections.singletonMap(COMPACTION_INTERVAL, dataSchema)
@@ -454,27 +511,8 @@ public void testMSQControllerTaskSpecWithAggregatorsIsValid() throws JsonProcess
 
     MSQSpec actualMSQSpec = msqControllerTask.getQuerySpec();
 
-    Assert.assertEquals(
-        new MSQTuningConfig(
-            1,
-            MultiStageQueryContext.DEFAULT_ROWS_IN_MEMORY,
-            MAX_ROWS_PER_SEGMENT,
-            null,
-            createIndexSpec()
-        ),
-        actualMSQSpec.getTuningConfig()
-    );
-    Assert.assertEquals(
-        new DataSourceMSQDestination(
-            DATA_SOURCE,
-            SEGMENT_GRANULARITY.getDefaultGranularity(),
-            null,
-            Collections.singletonList(COMPACTION_INTERVAL),
-            DIMENSIONS.stream().collect(Collectors.toMap(DimensionSchema::getName, Function.identity())),
-            null
-        ),
-        actualMSQSpec.getDestination()
-    );
+    Assert.assertEquals(getExpectedTuningConfig(), actualMSQSpec.getTuningConfig());
+    Assert.assertEquals(getExpectedDestination(), actualMSQSpec.getDestination());
 
     Assert.assertTrue(actualMSQSpec.getQuery() instanceof GroupByQuery);
     GroupByQuery groupByQuery = (GroupByQuery) actualMSQSpec.getQuery();
@@ -490,30 +528,32 @@ public void testMSQControllerTaskSpecWithAggregatorsIsValid() throws JsonProcess
     );
     Assert.assertEquals(WorkerAssignmentStrategy.MAX, actualMSQSpec.getAssignmentStrategy());
 
-
-    // Since only MV_STRING_DIMENSION is indicated to be MVD by the CombinedSchema, conversion to array should happen
-    // only for that column.
-    List<DimensionSpec> expectedDimensionSpec = DIMENSIONS.stream()
-                                                          .filter(dim -> !MV_STRING_DIMENSION.getName()
-                                                                                            .equals(dim.getName()))
-                                                          .map(dim -> new DefaultDimensionSpec(
-                                                              dim.getName(),
-                                                              dim.getName(),
-                                                              dim.getColumnType()
-                                                          ))
-                                                          .collect(
-                                                              Collectors.toList());
+    List<DimensionSpec> expectedDimensionSpec = new ArrayList<>();
     expectedDimensionSpec.add(
-        new DefaultDimensionSpec(MSQCompactionRunner.TIME_VIRTUAL_COLUMN,
-                                                       MSQCompactionRunner.TIME_VIRTUAL_COLUMN,
-                                                       ColumnType.LONG)
+        new DefaultDimensionSpec(
+            MSQCompactionRunner.TIME_VIRTUAL_COLUMN,
+            MSQCompactionRunner.TIME_VIRTUAL_COLUMN,
+            ColumnType.LONG
+        )
     );
     String mvToArrayStringDim = MSQCompactionRunner.ARRAY_VIRTUAL_COLUMN_PREFIX + MV_STRING_DIMENSION.getName();
-    expectedDimensionSpec.add(new DefaultDimensionSpec(mvToArrayStringDim, mvToArrayStringDim, ColumnType.STRING_ARRAY));
-    MatcherAssert.assertThat(
-        expectedDimensionSpec,
-        Matchers.containsInAnyOrder(groupByQuery.getDimensions().toArray(new DimensionSpec[0]))
-    );
+    // Since only MV_STRING_DIMENSION is indicated to be MVD by the CombinedSchema, conversion to array should happen
+    // only for that column.
+    expectedDimensionSpec.addAll(DIMENSIONS.stream()
+                                           .map(dim ->
+                                                    MV_STRING_DIMENSION.getName().equals(dim.getName())
+                                                    ? new DefaultDimensionSpec(
+                                                        mvToArrayStringDim,
+                                                        mvToArrayStringDim,
+                                                        ColumnType.STRING_ARRAY
+                                                    )
+                                                    : new DefaultDimensionSpec(
+                                                        dim.getName(),
+                                                        dim.getName(),
+                                                        dim.getColumnType()
+                                                    ))
+                                           .collect(Collectors.toList()));
+    Assert.assertEquals(expectedDimensionSpec, groupByQuery.getDimensions());
   }
 
   private CompactionTask createCompactionTask(
@@ -580,4 +620,27 @@ private static IndexSpec createIndexSpec()
                     .withLongEncoding(CompressionFactory.LongEncodingStrategy.LONGS)
                     .build();
   }
+
+  private static DataSourceMSQDestination getExpectedDestination()
+  {
+    return new DataSourceMSQDestination(
+        DATA_SOURCE,
+        SEGMENT_GRANULARITY.getDefaultGranularity(),
+        null,
+        Collections.singletonList(COMPACTION_INTERVAL),
+        DIMENSIONS.stream().collect(Collectors.toMap(DimensionSchema::getName, Function.identity())),
+        null
+    );
+  }
+
+  private static MSQTuningConfig getExpectedTuningConfig()
+  {
+    return new MSQTuningConfig(
+        1,
+        MultiStageQueryContext.DEFAULT_ROWS_IN_MEMORY,
+        MAX_ROWS_PER_SEGMENT,
+        null,
+        createIndexSpec()
+    );
+  }
 }

From 80d6763e390303952db7b4f6a3246d1eccb3e4d5 Mon Sep 17 00:00:00 2001
From: Gian Merlino <gianmerlino@gmail.com>
Date: Wed, 27 Nov 2024 00:01:00 -0800
Subject: [PATCH 03/56] ServerSelector: Synchronize getAllServers(). (#17499)

This method was missing some required synchronization. This patch also
adds GuardedBy annotations to historicalServers and realtimeServers, which
would have caught it.
---
 .../druid/client/selector/ServerSelector.java | 31 +++++++++++--------
 1 file changed, 18 insertions(+), 13 deletions(-)

diff --git a/server/src/main/java/org/apache/druid/client/selector/ServerSelector.java b/server/src/main/java/org/apache/druid/client/selector/ServerSelector.java
index 30b259b66194..99d883c3301a 100644
--- a/server/src/main/java/org/apache/druid/client/selector/ServerSelector.java
+++ b/server/src/main/java/org/apache/druid/client/selector/ServerSelector.java
@@ -19,6 +19,7 @@
 
 package org.apache.druid.client.selector;
 
+import com.google.errorprone.annotations.concurrent.GuardedBy;
 import it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap;
 import org.apache.druid.client.DataSegmentInterner;
 import org.apache.druid.query.Query;
@@ -40,9 +41,10 @@
  */
 public class ServerSelector implements Overshadowable<ServerSelector>
 {
-
+  @GuardedBy("this")
   private final Int2ObjectRBTreeMap<Set<QueryableDruidServer>> historicalServers;
 
+  @GuardedBy("this")
   private final Int2ObjectRBTreeMap<Set<QueryableDruidServer>> realtimeServers;
 
   private final TierSelectorStrategy strategy;
@@ -145,18 +147,21 @@ public List<DruidServerMetadata> getCandidates(final int numCandidates)
 
   public List<DruidServerMetadata> getAllServers()
   {
-    List<DruidServerMetadata> servers = new ArrayList<>();
-    historicalServers.values()
-        .stream()
-        .flatMap(Collection::stream)
-        .map(server -> server.getServer().getMetadata())
-        .forEach(servers::add);
-
-    realtimeServers.values()
-        .stream()
-        .flatMap(Collection::stream)
-        .map(server -> server.getServer().getMetadata())
-        .forEach(servers::add);
+    final List<DruidServerMetadata> servers = new ArrayList<>();
+
+    synchronized (this) {
+      historicalServers.values()
+                       .stream()
+                       .flatMap(Collection::stream)
+                       .map(server -> server.getServer().getMetadata())
+                       .forEach(servers::add);
+
+      realtimeServers.values()
+                     .stream()
+                     .flatMap(Collection::stream)
+                     .map(server -> server.getServer().getMetadata())
+                     .forEach(servers::add);
+    }
 
     return servers;
   }

From 1b9a6dde9f45b77de1cc5a956e1038619a86dcc3 Mon Sep 17 00:00:00 2001
From: Vishesh Garg <gargvishesh@gmail.com>
Date: Wed, 27 Nov 2024 17:16:30 +0530
Subject: [PATCH 04/56] Fix compilation error for MSQCompactionRunnerTest
 (#17516)

---
 .../msq/indexing/MSQCompactionRunnerTest.java  | 18 ++----------------
 1 file changed, 2 insertions(+), 16 deletions(-)

diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/indexing/MSQCompactionRunnerTest.java b/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/indexing/MSQCompactionRunnerTest.java
index a05ccd499d0c..ae59fe1383dc 100644
--- a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/indexing/MSQCompactionRunnerTest.java
+++ b/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/indexing/MSQCompactionRunnerTest.java
@@ -149,7 +149,6 @@ public void testMultipleDisjointCompactionIntervalsAreInvalid()
         null,
         Collections.emptyMap(),
         null,
-        null,
         null
     );
     CompactionConfigValidationResult validationResult = MSQ_COMPACTION_RUNNER.validateCompactionTask(
@@ -171,7 +170,6 @@ public void testHashedPartitionsSpecIsInvalid()
         null,
         Collections.emptyMap(),
         null,
-        null,
         null
     );
     Assert.assertFalse(MSQ_COMPACTION_RUNNER.validateCompactionTask(compactionTask, INTERVAL_DATASCHEMAS).isValid());
@@ -185,7 +183,6 @@ public void testStringDimensionInRangePartitionsSpecIsValid()
         null,
         Collections.emptyMap(),
         null,
-        null,
         null
     );
     Assert.assertTrue(MSQ_COMPACTION_RUNNER.validateCompactionTask(compactionTask, INTERVAL_DATASCHEMAS).isValid());
@@ -200,7 +197,6 @@ public void testLongDimensionInRangePartitionsSpecIsInvalid()
         null,
         Collections.emptyMap(),
         null,
-        null,
         null
     );
 
@@ -223,7 +219,6 @@ public void testMultiValuedDimensionInRangePartitionsSpecIsInvalid()
         null,
         Collections.emptyMap(),
         null,
-        null,
         null
     );
 
@@ -245,7 +240,6 @@ public void testMaxTotalRowsIsInvalid()
         null,
         Collections.emptyMap(),
         null,
-        null,
         null
     );
     Assert.assertFalse(MSQ_COMPACTION_RUNNER.validateCompactionTask(compactionTask, INTERVAL_DATASCHEMAS).isValid());
@@ -259,7 +253,6 @@ public void testDynamicPartitionsSpecIsValid()
         null,
         Collections.emptyMap(),
         null,
-        null,
         null
     );
     Assert.assertTrue(MSQ_COMPACTION_RUNNER.validateCompactionTask(compactionTask, INTERVAL_DATASCHEMAS).isValid());
@@ -273,7 +266,6 @@ public void testQueryGranularityAllIsValid()
         null,
         Collections.emptyMap(),
         new ClientCompactionTaskGranularitySpec(null, Granularities.ALL, null),
-        null,
         null
     );
     Assert.assertTrue(MSQ_COMPACTION_RUNNER.validateCompactionTask(compactionTask, INTERVAL_DATASCHEMAS).isValid());
@@ -287,7 +279,6 @@ public void testRollupFalseWithMetricsSpecIsInValid()
         null,
         Collections.emptyMap(),
         new ClientCompactionTaskGranularitySpec(null, null, false),
-        null,
         AGGREGATORS.toArray(new AggregatorFactory[0])
     );
     Assert.assertFalse(MSQ_COMPACTION_RUNNER.validateCompactionTask(compactionTask, INTERVAL_DATASCHEMAS).isValid());
@@ -301,7 +292,6 @@ public void testRollupTrueWithoutMetricsSpecIsInvalid()
         null,
         Collections.emptyMap(),
         new ClientCompactionTaskGranularitySpec(null, null, true),
-        null,
         null
     );
     Assert.assertFalse(MSQ_COMPACTION_RUNNER.validateCompactionTask(compactionTask, INTERVAL_DATASCHEMAS).isValid());
@@ -318,7 +308,6 @@ public void testMSQEngineWithUnsupportedMetricsSpecIsInvalid()
         null,
         Collections.emptyMap(),
         new ClientCompactionTaskGranularitySpec(null, null, true),
-        null,
         new AggregatorFactory[]{new LongSumAggregatorFactory(outputColName, inputColName)}
     );
     CompactionConfigValidationResult validationResult = MSQ_COMPACTION_RUNNER.validateCompactionTask(
@@ -335,7 +324,7 @@ public void testMSQEngineWithUnsupportedMetricsSpecIsInvalid()
   @Test
   public void testRunCompactionTasksWithEmptyTaskListFails() throws Exception
   {
-    CompactionTask compactionTask = createCompactionTask(null, null, Collections.emptyMap(), null, null, null);
+    CompactionTask compactionTask = createCompactionTask(null, null, Collections.emptyMap(), null, null);
     TaskStatus taskStatus = MSQ_COMPACTION_RUNNER.runCompactionTasks(compactionTask, Collections.emptyMap(), null);
     Assert.assertTrue(taskStatus.isFailure());
   }
@@ -350,7 +339,6 @@ public void testCompactionConfigWithoutMetricsSpecProducesCorrectSpec() throws J
         dimFilter,
         Collections.emptyMap(),
         null,
-        null,
         null
     );
 
@@ -481,7 +469,6 @@ public void testCompactionConfigWithMetricsSpecProducesCorrectSpec() throws Json
         dimFilter,
         Collections.emptyMap(),
         null,
-        null,
         null
     );
 
@@ -561,7 +548,6 @@ private CompactionTask createCompactionTask(
       @Nullable DimFilter dimFilter,
       Map<String, Object> contextParams,
       @Nullable ClientCompactionTaskGranularitySpec granularitySpec,
-      @Nullable List<DimensionSchema> dimensionSchemas,
       @Nullable AggregatorFactory[] metricsSpec
   )
   {
@@ -585,7 +571,7 @@ private CompactionTask createCompactionTask(
         ))
         .transformSpec(transformSpec)
         .granularitySpec(granularitySpec)
-        .dimensionsSpec(new DimensionsSpec(dimensionSchemas))
+        .dimensionsSpec(new DimensionsSpec(null))
         .metricsSpec(metricsSpec)
         .compactionRunner(MSQ_COMPACTION_RUNNER)
         .context(context);

From 09432c099beb38fb0e79a497c589ab83da87ce81 Mon Sep 17 00:00:00 2001
From: Vadim Ogievetsky <vadim@ogievetsky.com>
Date: Wed, 27 Nov 2024 09:37:01 -0800
Subject: [PATCH 05/56] Web console: refactor and improve the segment timeline
 (#17508)

* refactor and improve the segment timeline

* us consistent state

* type cleanup

* add shpitz

* better bubble
---
 licenses.yaml                                 |  94 +-
 web-console/e2e-tests/tutorial-batch.spec.ts  |   2 +-
 web-console/jest.common.config.js             |   2 +
 web-console/lib/keywords.ts                   |   8 +
 web-console/package-lock.json                 | 205 ++--
 web-console/package.json                      |   5 +-
 web-console/script/create-sql-docs.mjs        |   6 +
 web-console/script/licenses                   |   1 +
 web-console/src/bootstrap/json-parser.tsx     |   2 +-
 .../__snapshots__/auto-form.spec.tsx.snap     |   1 -
 .../src/components/auto-form/auto-form.tsx    |   1 -
 .../cell-filter-menu/cell-filter-menu.tsx     |   4 +-
 .../fancy-numeric-input.tsx                   |   2 +-
 web-console/src/components/index.ts           |   1 +
 .../portal-bubble/portal-bubble.scss          |  86 ++
 .../portal-bubble/portal-bubble.tsx           |  93 ++
 .../record-table-pane/record-table-pane.tsx   |   2 +-
 .../__snapshots__/rule-editor.spec.tsx.snap   |  10 +-
 .../components/rule-editor/rule-editor.scss   |   4 +
 .../components/rule-editor/rule-editor.tsx    |   6 +-
 .../__snapshots__/bar-unit.spec.tsx.snap      |  13 -
 .../segment-timeline.spec.tsx.snap            | 422 ++++++---
 .../components/segment-timeline/bar-group.tsx |  75 --
 .../segment-timeline/chart-axis.tsx           |  14 +-
 .../src/components/segment-timeline/common.ts |  87 ++
 .../segment-bar-chart-render.scss             | 169 ++++
 .../segment-bar-chart-render.tsx              | 793 ++++++++++++++++
 ...r-unit.spec.tsx => segment-bar-chart.scss} |  18 +-
 .../segment-timeline/segment-bar-chart.tsx    | 162 ++++
 .../segment-timeline/segment-timeline.scss    |  32 +-
 .../segment-timeline.spec.tsx                 |  52 +-
 .../segment-timeline/segment-timeline.tsx     | 887 ++++++------------
 .../segment-timeline/stacked-bar-chart.tsx    | 174 ----
 .../supervisor-history-panel.tsx              |  13 +-
 .../table-clickable-cell.tsx                  |   5 +-
 .../table-filterable-cell.tsx                 |   2 +-
 web-console/src/console-application.tsx       |  18 +-
 .../compaction-history-dialog.tsx             |   7 +-
 .../coordinator-dynamic-config-dialog.tsx     |   7 +-
 .../datasource-columns-table.tsx              |   2 +-
 .../datasource-preview-pane.tsx               |   4 +-
 .../lookup-values-table.tsx                   |   2 +-
 .../overlord-dynamic-config-dialog.tsx        |   7 +-
 .../retention-dialog.spec.tsx.snap            |   4 +-
 .../retention-dialog/retention-dialog.tsx     |  17 +-
 .../segments-preview-pane.tsx                 |   4 +-
 .../dialogs/status-dialog/status-dialog.tsx   |   3 +-
 .../supervisor-reset-offsets-dialog.tsx       |  11 +-
 .../datasource/datasource.ts}                 |  55 +-
 .../src/druid-models/execution/execution.ts   |   2 +-
 .../external-config/external-config.ts        |   4 +-
 web-console/src/druid-models/index.ts         |   3 +
 .../ingest-query-pattern.spec.ts              |   2 +-
 .../ingest-query-pattern.ts                   |   2 +-
 .../load-rule}/load-rule.ts                   |   3 +-
 .../src/druid-models/segment/segment.ts       |  50 +
 web-console/src/druid-models/task/task.ts     |   2 +-
 .../workbench-query/workbench-query.spec.ts   |   2 +-
 .../workbench-query/workbench-query.ts        |   4 +-
 web-console/src/entry.scss                    |   1 +
 web-console/src/entry.tsx                     |   2 +-
 web-console/src/helpers/capabilities.ts       |   4 +
 web-console/src/helpers/execution/general.ts  |   2 +-
 .../helpers/execution/sql-task-execution.ts   |   2 +-
 web-console/src/helpers/spec-conversion.ts    |   2 +-
 web-console/src/hooks/use-clock.ts            |  18 +-
 .../src/react-table/react-table-utils.spec.ts |   4 +
 .../src/react-table/react-table-utils.ts      |  50 +-
 .../date-floor-shift-ceil-utc.spec.ts         | 169 ++++
 .../date-floor-shift-ceil.spec.ts             | 181 ++++
 .../date-floor-shift-ceil.ts                  | 296 ++++++
 web-console/src/utils/date.spec.ts            |   9 -
 web-console/src/utils/date.ts                 |  11 +-
 web-console/src/utils/download.ts             |   2 +-
 web-console/src/utils/druid-query.spec.ts     |   2 +-
 web-console/src/utils/druid-query.ts          |   8 +-
 .../src/utils/duration/duration.spec.ts       | 505 ++++++++++
 web-console/src/utils/duration/duration.ts    | 388 ++++++++
 web-console/src/utils/general.spec.ts         |  14 +-
 web-console/src/utils/general.tsx             |  28 +-
 web-console/src/utils/index.tsx               |   2 +
 web-console/src/utils/query-action.ts         |   2 +-
 .../src/utils/query-manager/query-manager.ts  |   2 +-
 web-console/src/utils/sampler.ts              |   2 +-
 web-console/src/utils/sql.spec.ts             |   2 +-
 web-console/src/utils/sql.ts                  |   4 +-
 .../explore-view/models => utils}/stage.ts    |  14 +
 web-console/src/utils/table-helpers.ts        |  26 +-
 web-console/src/utils/types.ts                |   2 +-
 web-console/src/utils/values-query.spec.tsx   |   2 +-
 web-console/src/utils/values-query.tsx        |   4 +-
 .../datasources-view.spec.tsx.snap            |   1 +
 .../datasources-view/datasources-view.scss    |   9 +-
 .../datasources-view/datasources-view.tsx     | 145 ++-
 .../column-picker-menu/column-picker-menu.tsx |   2 +-
 .../column-picker/column-picker.tsx           |   2 +-
 .../components/control-pane/control-pane.tsx  |   4 +-
 .../control-pane/expression-menu.tsx          |   4 +-
 .../components/control-pane/measure-menu.tsx  |   4 +-
 .../droppable-container.tsx                   |   2 +-
 .../contains-filter-control.tsx               |   4 +-
 .../filter-pane/filter-menu/filter-menu.tsx   |   4 +-
 .../number-range-filter-control.tsx           |   2 +-
 .../regexp-filter-control.tsx                 |   4 +-
 .../time-interval-filter-control.tsx          |   2 +-
 .../time-relative-filter-control.tsx          |   2 +-
 .../values-filter-control.tsx                 |   4 +-
 .../components/filter-pane/filter-pane.tsx    |   6 +-
 .../generic-output-table.tsx                  |   4 +-
 .../components/module-pane/module-pane.tsx    |   5 +-
 .../components/preview-pane/preview-pane.tsx  |   2 +-
 .../column-dialog/column-dialog.tsx           |   4 +-
 .../measure-dialog/measure-dialog.tsx         |   2 +-
 .../nested-column-dialog.tsx                  |   4 +-
 .../resource-pane/resource-pane.tsx           |   2 +-
 .../components/source-pane/source-pane.tsx    |   6 +-
 .../components/sql-input/sql-input.tsx        |   4 +-
 .../src/views/explore-view/drag-helper.ts     |   2 +-
 .../src/views/explore-view/explore-state.ts   |   4 +-
 .../src/views/explore-view/explore-view.tsx   |   4 +-
 .../explore-view/models/expression-meta.ts    |   4 +-
 .../src/views/explore-view/models/index.ts    |   1 -
 .../explore-view/models/measure-pattern.ts    |   4 +-
 .../src/views/explore-view/models/measure.ts  |   4 +-
 .../views/explore-view/models/query-source.ts |   4 +-
 .../module-repository/module-repository.ts    |   5 +-
 .../explore-view/modules/bar-chart-module.tsx |   2 +-
 .../modules/grouping-table-module.tsx         |   4 +-
 .../modules/multi-axis-chart-module.tsx       |  16 +-
 .../explore-view/modules/pie-chart-module.tsx |   2 +-
 .../modules/record-table-module.tsx           |   2 +-
 .../modules/time-chart-module.tsx             |  19 +-
 .../query-macros/aggregate.spec.ts            |   2 +-
 .../explore-view/query-macros/aggregate.ts    |   2 +-
 .../query-macros/max-data-time.ts             |   4 +-
 .../views/explore-view/utils/duration.spec.ts |  39 -
 .../src/views/explore-view/utils/duration.ts  |  46 -
 .../utils/filter-pattern-helpers.ts           |  10 +-
 .../src/views/explore-view/utils/general.ts   |   4 +-
 .../utils/get-auto-granularity.ts             |  87 +-
 .../src/views/explore-view/utils/index.ts     |   2 -
 .../explore-view/utils/max-time-for-table.ts  |   2 +-
 .../explore-view/utils/snap-to-granularity.ts |  57 --
 .../explore-view/utils/table-query.spec.ts    |   4 +-
 .../views/explore-view/utils/table-query.ts   |  11 +-
 .../utils/time-manipulation.spec.ts           |   2 +-
 .../explore-view/utils/time-manipulation.ts   |   2 +-
 .../datasources-card/datasources-card.tsx     |  10 +-
 .../home-view/segments-card/segments-card.tsx |   7 +-
 .../home-view/services-card/services-card.tsx |  13 +-
 .../supervisors-card/supervisors-card.tsx     |  15 +-
 .../views/home-view/tasks-card/tasks-card.tsx |  17 +-
 .../views/load-data-view/load-data-view.tsx   |   4 +-
 .../src/views/lookups-view/lookups-view.tsx   |  14 +-
 .../__snapshots__/segments-view.spec.tsx.snap |  57 +-
 .../views/segments-view/segments-view.scss    |   2 +-
 .../src/views/segments-view/segments-view.tsx | 521 +++++-----
 .../src/views/services-view/services-view.tsx |  48 +-
 .../column-actions/column-actions.tsx         |   4 +-
 .../column-editor/column-editor.tsx           |   4 +-
 .../expression-editor-dialog.tsx              |   2 +-
 .../ingestion-progress-dialog.tsx             |   2 +-
 .../schema-step/column-list/column-list.tsx   |   2 +-
 .../expression-entry/expression-entry.tsx     |   4 +-
 .../preview-table/preview-table.tsx           |   6 +-
 .../rollup-analysis-pane.tsx                  |   4 +-
 .../schema-step/schema-step.tsx               |   6 +-
 .../sql-data-loader-view.tsx                  |   2 +-
 .../supervisors-view.spec.tsx.snap            |  12 +-
 .../supervisors-view/supervisors-view.tsx     | 119 ++-
 .../src/views/tasks-view/tasks-view.tsx       |  37 +-
 .../complex-menu-items.spec.tsx               |   2 +-
 .../complex-menu-items/complex-menu-items.tsx |   4 +-
 .../number-menu-items.spec.tsx                |   2 +-
 .../number-menu-items/number-menu-items.tsx   |   4 +-
 .../string-menu-items.spec.tsx                |   2 +-
 .../string-menu-items/string-menu-items.tsx   |   4 +-
 .../time-menu-items/time-menu-items.spec.tsx  |   2 +-
 .../time-menu-items/time-menu-items.tsx       |  74 +-
 .../column-tree/column-tree.spec.tsx          |   2 +-
 .../column-tree/column-tree.tsx               |   4 +-
 .../connect-external-data-dialog.tsx          |   2 +-
 .../current-dart-panel/current-dart-panel.tsx |  12 +-
 .../execution-details-pane.tsx                |   2 +-
 .../execution-stages-pane.tsx                 |   2 +-
 .../flexible-query-input.tsx                  |   2 +-
 .../ingest-success-pane.tsx                   |   2 +-
 .../input-format-step/input-format-step.tsx   |   4 +-
 .../input-source-step/input-source-step.tsx   |   2 +-
 .../query-parameters-dialog.tsx               |   4 +-
 .../workbench-view/query-tab/query-tab.tsx    |  15 +-
 .../recent-query-task-panel.tsx               |  20 +-
 .../result-table-pane/result-table-pane.tsx   |   4 +-
 .../workbench-view/run-panel/run-panel.tsx    |  71 +-
 .../time-floor-menu-item.tsx                  |   4 +-
 .../timezone-menu-items.spec.tsx.snap         | 563 +++++++++++
 .../timezone-menu-items.spec.tsx}             |  48 +-
 .../timezone-menu-items.tsx                   | 151 +++
 .../views/workbench-view/work-state-store.ts  |  22 +-
 .../views/workbench-view/workbench-view.tsx   |   4 +-
 200 files changed, 5580 insertions(+), 2379 deletions(-)
 create mode 100644 web-console/src/components/portal-bubble/portal-bubble.scss
 create mode 100644 web-console/src/components/portal-bubble/portal-bubble.tsx
 delete mode 100644 web-console/src/components/segment-timeline/__snapshots__/bar-unit.spec.tsx.snap
 delete mode 100644 web-console/src/components/segment-timeline/bar-group.tsx
 create mode 100644 web-console/src/components/segment-timeline/common.ts
 create mode 100644 web-console/src/components/segment-timeline/segment-bar-chart-render.scss
 create mode 100644 web-console/src/components/segment-timeline/segment-bar-chart-render.tsx
 rename web-console/src/components/segment-timeline/{bar-unit.spec.tsx => segment-bar-chart.scss} (68%)
 create mode 100644 web-console/src/components/segment-timeline/segment-bar-chart.tsx
 delete mode 100644 web-console/src/components/segment-timeline/stacked-bar-chart.tsx
 rename web-console/src/{components/segment-timeline/stacked-bar-chart.scss => druid-models/datasource/datasource.ts} (64%)
 rename web-console/src/{utils => druid-models/load-rule}/load-rule.ts (97%)
 create mode 100644 web-console/src/druid-models/segment/segment.ts
 create mode 100755 web-console/src/utils/date-floor-shift-ceil/date-floor-shift-ceil-utc.spec.ts
 create mode 100755 web-console/src/utils/date-floor-shift-ceil/date-floor-shift-ceil.spec.ts
 create mode 100755 web-console/src/utils/date-floor-shift-ceil/date-floor-shift-ceil.ts
 create mode 100755 web-console/src/utils/duration/duration.spec.ts
 create mode 100755 web-console/src/utils/duration/duration.ts
 rename web-console/src/{views/explore-view/models => utils}/stage.ts (80%)
 delete mode 100644 web-console/src/views/explore-view/utils/duration.spec.ts
 delete mode 100644 web-console/src/views/explore-view/utils/duration.ts
 delete mode 100644 web-console/src/views/explore-view/utils/snap-to-granularity.ts
 create mode 100644 web-console/src/views/workbench-view/timezone-menu-items/__snapshots__/timezone-menu-items.spec.tsx.snap
 rename web-console/src/{components/segment-timeline/bar-unit.tsx => views/workbench-view/timezone-menu-items/timezone-menu-items.spec.tsx} (58%)
 create mode 100644 web-console/src/views/workbench-view/timezone-menu-items/timezone-menu-items.tsx

diff --git a/licenses.yaml b/licenses.yaml
index 1f05bb5d1d7f..8044beb12bab 100644
--- a/licenses.yaml
+++ b/licenses.yaml
@@ -5125,15 +5125,6 @@ version: 5.2.5
 
 ---
 
-name: "@druid-toolkit/query"
-license_category: binary
-module: web-console
-license_name: Apache License version 2.0
-copyright: Imply Data
-version: 0.22.23
-
----
-
 name: "@emotion/cache"
 license_category: binary
 module: web-console
@@ -5224,6 +5215,16 @@ license_file_path: licenses/bin/@emotion-weak-memoize.MIT
 
 ---
 
+name: "@flatten-js/interval-tree"
+license_category: binary
+module: web-console
+license_name: MIT License
+copyright: Alex Bol
+version: 1.1.3
+license_file_path: licenses/bin/@flatten-js-interval-tree.MIT
+
+---
+
 name: "@fontsource/open-sans"
 license_category: binary
 module: web-console
@@ -5234,6 +5235,15 @@ license_file_path: licenses/bin/@fontsource-open-sans.OFL
 
 ---
 
+name: "@internationalized/date"
+license_category: binary
+module: web-console
+license_name: Apache License version 2.0
+copyright: Adobe
+version: 3.5.6
+
+---
+
 name: "@popperjs/core"
 license_category: binary
 module: web-console
@@ -5244,6 +5254,15 @@ license_file_path: licenses/bin/@popperjs-core.MIT
 
 ---
 
+name: "@swc/helpers"
+license_category: binary
+module: web-console
+license_name: Apache License version 2.0
+copyright: 강동윤
+version: 0.5.13
+
+---
+
 name: "@types/parse-json"
 license_category: binary
 module: web-console
@@ -5404,15 +5423,6 @@ license_file_path: licenses/bin/change-case.MIT
 
 ---
 
-name: "chronoshift"
-license_category: binary
-module: web-console
-license_name: Apache License version 2.0
-copyright: Vadim Ogievetsky
-version: 0.10.0
-
----
-
 name: "classnames"
 license_category: binary
 module: web-console
@@ -5702,6 +5712,15 @@ license_file_path: licenses/bin/dot-case.MIT
 
 ---
 
+name: "druid-query-toolkit"
+license_category: binary
+module: web-console
+license_name: Apache License version 2.0
+copyright: Imply Data
+version: 1.0.0
+
+---
+
 name: "echarts"
 license_category: binary
 module: web-console
@@ -5801,16 +5820,6 @@ license_file_path: licenses/bin/has-flag.MIT
 
 ---
 
-name: "has-own-prop"
-license_category: binary
-module: web-console
-license_name: MIT License
-copyright: Sindre Sorhus
-version: 2.0.0
-license_file_path: licenses/bin/has-own-prop.MIT
-
----
-
 name: "hasown"
 license_category: binary
 module: web-console
@@ -5871,15 +5880,6 @@ license_file_path: licenses/bin/iconv-lite.MIT
 
 ---
 
-name: "immutable-class"
-license_category: binary
-module: web-console
-license_name: Apache License version 2.0
-copyright: Vadim Ogievetsky
-version: 0.11.2
-
----
-
 name: "import-fresh"
 license_category: binary
 module: web-console
@@ -6060,26 +6060,6 @@ license_file_path: licenses/bin/mime-types.MIT
 
 ---
 
-name: "moment-timezone"
-license_category: binary
-module: web-console
-license_name: MIT License
-copyright: Tim Wood
-version: 0.5.43
-license_file_path: licenses/bin/moment-timezone.MIT
-
----
-
-name: "moment"
-license_category: binary
-module: web-console
-license_name: MIT License
-copyright: Iskren Ivov Chernev
-version: 2.29.4
-license_file_path: licenses/bin/moment.MIT
-
----
-
 name: "no-case"
 license_category: binary
 module: web-console
diff --git a/web-console/e2e-tests/tutorial-batch.spec.ts b/web-console/e2e-tests/tutorial-batch.spec.ts
index 3fa15af9d2a4..59ac0a407810 100644
--- a/web-console/e2e-tests/tutorial-batch.spec.ts
+++ b/web-console/e2e-tests/tutorial-batch.spec.ts
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-import { T } from '@druid-toolkit/query';
+import { T } from 'druid-query-toolkit';
 import type * as playwright from 'playwright-chromium';
 
 import { DatasourcesOverview } from './component/datasources/overview';
diff --git a/web-console/jest.common.config.js b/web-console/jest.common.config.js
index 89e3dab5852b..1ea8f55ad18b 100644
--- a/web-console/jest.common.config.js
+++ b/web-console/jest.common.config.js
@@ -18,6 +18,8 @@
 
 const { createJsWithTsPreset } = require('ts-jest');
 
+process.env.TZ = 'UTC';
+
 module.exports = {
   testEnvironment: 'jsdom',
   transformIgnorePatterns: ['/node_modules/(?!(d3-.+)/)'],
diff --git a/web-console/lib/keywords.ts b/web-console/lib/keywords.ts
index 06d7ccdcc949..5985ae0a6aa6 100644
--- a/web-console/lib/keywords.ts
+++ b/web-console/lib/keywords.ts
@@ -100,15 +100,23 @@ export const SQL_EXPRESSION_PARTS = [
   'TRAILING',
   'EPOCH',
   'SECOND',
+  'SECONDS',
   'MINUTE',
+  'MINUTES',
   'HOUR',
+  'HOURS',
   'DAY',
+  'DAYS',
   'DOW',
   'DOY',
   'WEEK',
+  'WEEKS',
   'MONTH',
+  'MONTHS',
   'QUARTER',
+  'QUARTERS',
   'YEAR',
+  'YEARS',
   'TIMESTAMP',
   'INTERVAL',
   'CSV',
diff --git a/web-console/package-lock.json b/web-console/package-lock.json
index 95768117648c..27a3d463aad2 100644
--- a/web-console/package-lock.json
+++ b/web-console/package-lock.json
@@ -14,11 +14,11 @@
         "@blueprintjs/datetime2": "^2.3.11",
         "@blueprintjs/icons": "^5.13.0",
         "@blueprintjs/select": "^5.2.5",
-        "@druid-toolkit/query": "^0.22.23",
+        "@flatten-js/interval-tree": "^1.1.3",
         "@fontsource/open-sans": "^5.0.30",
+        "@internationalized/date": "^3.5.6",
         "ace-builds": "~1.5.3",
         "axios": "^1.7.7",
-        "chronoshift": "^0.10.0",
         "classnames": "^2.2.6",
         "copy-to-clipboard": "^3.3.3",
         "d3-array": "^3.2.4",
@@ -28,6 +28,7 @@
         "d3-scale-chromatic": "^3.1.0",
         "d3-selection": "^3.0.0",
         "date-fns": "^2.28.0",
+        "druid-query-toolkit": "^1.0.0",
         "echarts": "^5.5.1",
         "file-saver": "^2.0.5",
         "hjson": "^3.2.2",
@@ -2085,15 +2086,6 @@
         "node": ">=10.0.0"
       }
     },
-    "node_modules/@druid-toolkit/query": {
-      "version": "0.22.23",
-      "resolved": "https://registry.npmjs.org/@druid-toolkit/query/-/query-0.22.23.tgz",
-      "integrity": "sha512-yQOUAQJP63rzsTCdLcqNB8aRtsYPw8rYBfPSXc4zfAA4y/GJc9OJeHcLFRMdUtpwBtm0ueARMUlTSQcTsyV8gQ==",
-      "license": "Apache-2.0",
-      "dependencies": {
-        "tslib": "^2.5.2"
-      }
-    },
     "node_modules/@dual-bundle/import-meta-resolve": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/@dual-bundle/import-meta-resolve/-/import-meta-resolve-4.1.0.tgz",
@@ -2373,9 +2365,9 @@
       }
     },
     "node_modules/@eslint/plugin-kit": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.2.0.tgz",
-      "integrity": "sha512-vH9PiIMMwvhCx31Af3HiGzsVNULDbyVkHXwlemn/B0TFj/00ho3y55efXrUZTfQipxoHC5u4xq6zblww1zm1Ig==",
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.2.3.tgz",
+      "integrity": "sha512-2b/g5hRmpbb1o4GnTZax9N9m0FXzz9OV42ZzI4rDDMDuHUqigAiQCEWChBWCY4ztAGVRjoWT19v0yMmc5/L5kA==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
@@ -2385,6 +2377,12 @@
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       }
     },
+    "node_modules/@flatten-js/interval-tree": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/@flatten-js/interval-tree/-/interval-tree-1.1.3.tgz",
+      "integrity": "sha512-xhFWUBoHJFF77cJO1D6REjdgJEMRf2Y2Z+eKEPav8evGKcLSnj1ud5pLXQSbGuxF3VSvT1rWhMfVpXEKJLTL+A==",
+      "license": "MIT"
+    },
     "node_modules/@fontsource/open-sans": {
       "version": "5.1.0",
       "resolved": "https://registry.npmjs.org/@fontsource/open-sans/-/open-sans-5.1.0.tgz",
@@ -2442,6 +2440,15 @@
         "url": "https://github.com/sponsors/nzakas"
       }
     },
+    "node_modules/@internationalized/date": {
+      "version": "3.5.6",
+      "resolved": "https://registry.npmjs.org/@internationalized/date/-/date-3.5.6.tgz",
+      "integrity": "sha512-jLxQjefH9VI5P9UQuqB6qNKnvFt1Ky1TPIzHGsIlCi7sZZoMR8SdYbBGRvM0y+Jtb+ez4ieBzmiAUcpmPYpyOw==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@swc/helpers": "^0.5.0"
+      }
+    },
     "node_modules/@istanbuljs/load-nyc-config": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz",
@@ -3473,6 +3480,15 @@
         "url": "https://opencollective.com/eslint"
       }
     },
+    "node_modules/@swc/helpers": {
+      "version": "0.5.13",
+      "resolved": "https://registry.npmjs.org/@swc/helpers/-/helpers-0.5.13.tgz",
+      "integrity": "sha512-UoKGxQ3r5kYI9dALKJapMmuK+1zWM/H17Z1+iwnNmzcJRnfFuevZs375TA5rW31pu4BS4NoSy1fRsexDXfWn5w==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "tslib": "^2.4.0"
+      }
+    },
     "node_modules/@testing-library/dom": {
       "version": "10.4.0",
       "resolved": "https://registry.npmjs.org/@testing-library/dom/-/dom-10.4.0.tgz",
@@ -5802,16 +5818,6 @@
         "node": ">=6.0"
       }
     },
-    "node_modules/chronoshift": {
-      "version": "0.10.0",
-      "resolved": "https://registry.npmjs.org/chronoshift/-/chronoshift-0.10.0.tgz",
-      "integrity": "sha512-dNvumPg7R6ACUOKbGo1zH6DtmTo5ut9/LNbzqaKGnpC9VdArIos8+kApHOVIZH4FCpm9M9XYh++jwlRHhc1PyA==",
-      "dependencies": {
-        "immutable-class": "^0.11.0",
-        "moment-timezone": "^0.5.26",
-        "tslib": "^2.3.1"
-      }
-    },
     "node_modules/ci-info": {
       "version": "3.3.0",
       "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.3.0.tgz",
@@ -6205,10 +6211,11 @@
       "dev": true
     },
     "node_modules/cross-spawn": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+      "version": "7.0.6",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
+      "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "path-key": "^3.1.0",
         "shebang-command": "^2.0.0",
@@ -7013,6 +7020,15 @@
         "tslib": "^2.0.3"
       }
     },
+    "node_modules/druid-query-toolkit": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/druid-query-toolkit/-/druid-query-toolkit-1.0.0.tgz",
+      "integrity": "sha512-yBQR4uDcks0lcsRSWoLQy16YQ4dx264m6i7TNQDFrACUKHlMtnw5l+4+UDZKbXbpUFLMLWCr/kLhmXzLJk50+Q==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "tslib": "^2.5.2"
+      }
+    },
     "node_modules/duplexer": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.2.tgz",
@@ -8909,14 +8925,6 @@
         "node": ">=4"
       }
     },
-    "node_modules/has-own-prop": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/has-own-prop/-/has-own-prop-2.0.0.tgz",
-      "integrity": "sha512-Pq0h+hvsVm6dDEa8x82GnLSYHOzNDt7f0ddFa3FqcQlgzEiptPqL+XrOJNavjOzSYiYWIrgeVYYgGlLmnxwilQ==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/has-property-descriptors": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz",
@@ -9213,10 +9221,11 @@
       "dev": true
     },
     "node_modules/http-proxy-middleware": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-2.0.6.tgz",
-      "integrity": "sha512-ya/UeJ6HVBYxrgYotAZo1KvPWlgB48kUJLDePFeneHsVujFaW5WNj2NgWCAE//B1Dl02BIfYlpNgBy8Kf8Rjmw==",
+      "version": "2.0.7",
+      "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-2.0.7.tgz",
+      "integrity": "sha512-fgVY8AV7qU7z/MmXJ/rxwbrtQH4jBQ9m7kp3llF0liB7glmFeVZFBepQb32T3y8n8k2+AEYuMPCpinYW+/CuRA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/http-proxy": "^1.17.8",
         "http-proxy": "^1.18.1",
@@ -9354,15 +9363,6 @@
       "integrity": "sha512-0AOCmOip+xgJwEVTQj1EfiDDOkPmuyllDuTuEX+DDXUgapLAsBIfkg3sxCYyCEA8mQqZrrxPUGjcOQ2JS3WLkg==",
       "dev": true
     },
-    "node_modules/immutable-class": {
-      "version": "0.11.2",
-      "resolved": "https://registry.npmjs.org/immutable-class/-/immutable-class-0.11.2.tgz",
-      "integrity": "sha512-CzkVPkJXzkspt6RX+ipNgtvt16+rzEBUlA3yNPLkK5/S042c9wvuyfE4F5TfMfPJ6XF86Fp+OCwu6eeAnMICuw==",
-      "dependencies": {
-        "has-own-prop": "^2.0.0",
-        "tslib": "^2.3.1"
-      }
-    },
     "node_modules/import-fresh": {
       "version": "3.3.0",
       "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
@@ -12889,25 +12889,6 @@
         "mkdirp": "bin/cmd.js"
       }
     },
-    "node_modules/moment": {
-      "version": "2.29.4",
-      "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.4.tgz",
-      "integrity": "sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w==",
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/moment-timezone": {
-      "version": "0.5.43",
-      "resolved": "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.43.tgz",
-      "integrity": "sha512-72j3aNyuIsDxdF1i7CEgV2FfxM1r6aaqJyLB2vwb33mXYyoyLly+F1zbWqhA3/bVIoJ4szlUoMbUnVdid32NUQ==",
-      "dependencies": {
-        "moment": "^2.29.4"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
     "node_modules/mrmime": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/mrmime/-/mrmime-1.0.1.tgz",
@@ -19560,14 +19541,6 @@
       "integrity": "sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw==",
       "dev": true
     },
-    "@druid-toolkit/query": {
-      "version": "0.22.23",
-      "resolved": "https://registry.npmjs.org/@druid-toolkit/query/-/query-0.22.23.tgz",
-      "integrity": "sha512-yQOUAQJP63rzsTCdLcqNB8aRtsYPw8rYBfPSXc4zfAA4y/GJc9OJeHcLFRMdUtpwBtm0ueARMUlTSQcTsyV8gQ==",
-      "requires": {
-        "tslib": "^2.5.2"
-      }
-    },
     "@dual-bundle/import-meta-resolve": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/@dual-bundle/import-meta-resolve/-/import-meta-resolve-4.1.0.tgz",
@@ -19774,14 +19747,19 @@
       "dev": true
     },
     "@eslint/plugin-kit": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.2.0.tgz",
-      "integrity": "sha512-vH9PiIMMwvhCx31Af3HiGzsVNULDbyVkHXwlemn/B0TFj/00ho3y55efXrUZTfQipxoHC5u4xq6zblww1zm1Ig==",
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.2.3.tgz",
+      "integrity": "sha512-2b/g5hRmpbb1o4GnTZax9N9m0FXzz9OV42ZzI4rDDMDuHUqigAiQCEWChBWCY4ztAGVRjoWT19v0yMmc5/L5kA==",
       "dev": true,
       "requires": {
         "levn": "^0.4.1"
       }
     },
+    "@flatten-js/interval-tree": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/@flatten-js/interval-tree/-/interval-tree-1.1.3.tgz",
+      "integrity": "sha512-xhFWUBoHJFF77cJO1D6REjdgJEMRf2Y2Z+eKEPav8evGKcLSnj1ud5pLXQSbGuxF3VSvT1rWhMfVpXEKJLTL+A=="
+    },
     "@fontsource/open-sans": {
       "version": "5.1.0",
       "resolved": "https://registry.npmjs.org/@fontsource/open-sans/-/open-sans-5.1.0.tgz",
@@ -19815,6 +19793,14 @@
       "integrity": "sha512-JBxkERygn7Bv/GbN5Rv8Ul6LVknS+5Bp6RgDC/O8gEBU/yeH5Ui5C/OlWrTb6qct7LjjfT6Re2NxB0ln0yYybA==",
       "dev": true
     },
+    "@internationalized/date": {
+      "version": "3.5.6",
+      "resolved": "https://registry.npmjs.org/@internationalized/date/-/date-3.5.6.tgz",
+      "integrity": "sha512-jLxQjefH9VI5P9UQuqB6qNKnvFt1Ky1TPIzHGsIlCi7sZZoMR8SdYbBGRvM0y+Jtb+ez4ieBzmiAUcpmPYpyOw==",
+      "requires": {
+        "@swc/helpers": "^0.5.0"
+      }
+    },
     "@istanbuljs/load-nyc-config": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz",
@@ -20614,6 +20600,14 @@
         }
       }
     },
+    "@swc/helpers": {
+      "version": "0.5.13",
+      "resolved": "https://registry.npmjs.org/@swc/helpers/-/helpers-0.5.13.tgz",
+      "integrity": "sha512-UoKGxQ3r5kYI9dALKJapMmuK+1zWM/H17Z1+iwnNmzcJRnfFuevZs375TA5rW31pu4BS4NoSy1fRsexDXfWn5w==",
+      "requires": {
+        "tslib": "^2.4.0"
+      }
+    },
     "@testing-library/dom": {
       "version": "10.4.0",
       "resolved": "https://registry.npmjs.org/@testing-library/dom/-/dom-10.4.0.tgz",
@@ -22411,16 +22405,6 @@
       "integrity": "sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==",
       "dev": true
     },
-    "chronoshift": {
-      "version": "0.10.0",
-      "resolved": "https://registry.npmjs.org/chronoshift/-/chronoshift-0.10.0.tgz",
-      "integrity": "sha512-dNvumPg7R6ACUOKbGo1zH6DtmTo5ut9/LNbzqaKGnpC9VdArIos8+kApHOVIZH4FCpm9M9XYh++jwlRHhc1PyA==",
-      "requires": {
-        "immutable-class": "^0.11.0",
-        "moment-timezone": "^0.5.26",
-        "tslib": "^2.3.1"
-      }
-    },
     "ci-info": {
       "version": "3.3.0",
       "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.3.0.tgz",
@@ -22735,9 +22719,9 @@
       "dev": true
     },
     "cross-spawn": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+      "version": "7.0.6",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
+      "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==",
       "dev": true,
       "requires": {
         "path-key": "^3.1.0",
@@ -23276,6 +23260,14 @@
         "tslib": "^2.0.3"
       }
     },
+    "druid-query-toolkit": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/druid-query-toolkit/-/druid-query-toolkit-1.0.0.tgz",
+      "integrity": "sha512-yBQR4uDcks0lcsRSWoLQy16YQ4dx264m6i7TNQDFrACUKHlMtnw5l+4+UDZKbXbpUFLMLWCr/kLhmXzLJk50+Q==",
+      "requires": {
+        "tslib": "^2.5.2"
+      }
+    },
     "duplexer": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.2.tgz",
@@ -24650,11 +24642,6 @@
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
       "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0="
     },
-    "has-own-prop": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/has-own-prop/-/has-own-prop-2.0.0.tgz",
-      "integrity": "sha512-Pq0h+hvsVm6dDEa8x82GnLSYHOzNDt7f0ddFa3FqcQlgzEiptPqL+XrOJNavjOzSYiYWIrgeVYYgGlLmnxwilQ=="
-    },
     "has-property-descriptors": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz",
@@ -24884,9 +24871,9 @@
       }
     },
     "http-proxy-middleware": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-2.0.6.tgz",
-      "integrity": "sha512-ya/UeJ6HVBYxrgYotAZo1KvPWlgB48kUJLDePFeneHsVujFaW5WNj2NgWCAE//B1Dl02BIfYlpNgBy8Kf8Rjmw==",
+      "version": "2.0.7",
+      "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-2.0.7.tgz",
+      "integrity": "sha512-fgVY8AV7qU7z/MmXJ/rxwbrtQH4jBQ9m7kp3llF0liB7glmFeVZFBepQb32T3y8n8k2+AEYuMPCpinYW+/CuRA==",
       "dev": true,
       "requires": {
         "@types/http-proxy": "^1.17.8",
@@ -24982,15 +24969,6 @@
       "integrity": "sha512-0AOCmOip+xgJwEVTQj1EfiDDOkPmuyllDuTuEX+DDXUgapLAsBIfkg3sxCYyCEA8mQqZrrxPUGjcOQ2JS3WLkg==",
       "dev": true
     },
-    "immutable-class": {
-      "version": "0.11.2",
-      "resolved": "https://registry.npmjs.org/immutable-class/-/immutable-class-0.11.2.tgz",
-      "integrity": "sha512-CzkVPkJXzkspt6RX+ipNgtvt16+rzEBUlA3yNPLkK5/S042c9wvuyfE4F5TfMfPJ6XF86Fp+OCwu6eeAnMICuw==",
-      "requires": {
-        "has-own-prop": "^2.0.0",
-        "tslib": "^2.3.1"
-      }
-    },
     "import-fresh": {
       "version": "3.3.0",
       "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
@@ -27557,19 +27535,6 @@
         "minimist": "^1.2.5"
       }
     },
-    "moment": {
-      "version": "2.29.4",
-      "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.4.tgz",
-      "integrity": "sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w=="
-    },
-    "moment-timezone": {
-      "version": "0.5.43",
-      "resolved": "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.43.tgz",
-      "integrity": "sha512-72j3aNyuIsDxdF1i7CEgV2FfxM1r6aaqJyLB2vwb33mXYyoyLly+F1zbWqhA3/bVIoJ4szlUoMbUnVdid32NUQ==",
-      "requires": {
-        "moment": "^2.29.4"
-      }
-    },
     "mrmime": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/mrmime/-/mrmime-1.0.1.tgz",
diff --git a/web-console/package.json b/web-console/package.json
index 1e76234841ab..39eae99e101b 100644
--- a/web-console/package.json
+++ b/web-console/package.json
@@ -55,11 +55,11 @@
     "@blueprintjs/datetime2": "^2.3.11",
     "@blueprintjs/icons": "^5.13.0",
     "@blueprintjs/select": "^5.2.5",
-    "@druid-toolkit/query": "^0.22.23",
+    "@flatten-js/interval-tree": "^1.1.3",
     "@fontsource/open-sans": "^5.0.30",
+    "@internationalized/date": "^3.5.6",
     "ace-builds": "~1.5.3",
     "axios": "^1.7.7",
-    "chronoshift": "^0.10.0",
     "classnames": "^2.2.6",
     "copy-to-clipboard": "^3.3.3",
     "d3-array": "^3.2.4",
@@ -69,6 +69,7 @@
     "d3-scale-chromatic": "^3.1.0",
     "d3-selection": "^3.0.0",
     "date-fns": "^2.28.0",
+    "druid-query-toolkit": "^1.0.0",
     "echarts": "^5.5.1",
     "file-saver": "^2.0.5",
     "hjson": "^3.2.2",
diff --git a/web-console/script/create-sql-docs.mjs b/web-console/script/create-sql-docs.mjs
index 62e1f44d0177..b14055341a0d 100755
--- a/web-console/script/create-sql-docs.mjs
+++ b/web-console/script/create-sql-docs.mjs
@@ -39,6 +39,12 @@ const initialFunctionDocs = {
       ),
     ],
   ],
+  UNNEST: [
+    [
+      'arrayExpression',
+      convertMarkdownToHtml("Unnests ARRAY typed values. The source for UNNEST can be an array type column, or an input that's been transformed into an array, such as with helper functions like `MV_TO_ARRAY` or `ARRAY`.")
+    ]
+  ]
 };
 
 function hasHtmlTags(str) {
diff --git a/web-console/script/licenses b/web-console/script/licenses
index 90f1420282ae..f4e67862d011 100755
--- a/web-console/script/licenses
+++ b/web-console/script/licenses
@@ -193,6 +193,7 @@ checker.init(
           if (name === 'diff-match-patch') publisher = 'Google';
           if (name === 'esutils') publisher = 'Yusuke Suzuki'; // https://github.com/estools/esutils#license
           if (name === 'echarts') publisher = 'Apache Software Foundation';
+          if (name === '@internationalized/date') publisher = 'Adobe';
         }
 
         if (!publisher) {
diff --git a/web-console/src/bootstrap/json-parser.tsx b/web-console/src/bootstrap/json-parser.tsx
index 7e8fc0994610..d8fd232795e7 100644
--- a/web-console/src/bootstrap/json-parser.tsx
+++ b/web-console/src/bootstrap/json-parser.tsx
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-import { QueryResult } from '@druid-toolkit/query';
+import { QueryResult } from 'druid-query-toolkit';
 import * as JSONBig from 'json-bigint-native';
 
 export function bootstrapJsonParse() {
diff --git a/web-console/src/components/auto-form/__snapshots__/auto-form.spec.tsx.snap b/web-console/src/components/auto-form/__snapshots__/auto-form.spec.tsx.snap
index dc566363abee..0016d1c90323 100644
--- a/web-console/src/components/auto-form/__snapshots__/auto-form.spec.tsx.snap
+++ b/web-console/src/components/auto-form/__snapshots__/auto-form.spec.tsx.snap
@@ -170,7 +170,6 @@ exports[`AutoForm matches snapshot 1`] = `
   </Memo(FormGroupWithInfo)>
   <Blueprint5.FormGroup>
     <Blueprint5.Button
-      fill={true}
       minimal={true}
       onClick={[Function]}
       rightIcon="chevron-down"
diff --git a/web-console/src/components/auto-form/auto-form.tsx b/web-console/src/components/auto-form/auto-form.tsx
index 4c51d2cbf5a9..7026ca5d5dc6 100644
--- a/web-console/src/components/auto-form/auto-form.tsx
+++ b/web-console/src/components/auto-form/auto-form.tsx
@@ -539,7 +539,6 @@ export class AutoForm<T extends Record<string, any>> extends React.PureComponent
           text={showMore ? 'Show less' : 'Show more'}
           rightIcon={showMore ? IconNames.CHEVRON_UP : IconNames.CHEVRON_DOWN}
           minimal
-          fill
           onClick={() => {
             this.setState(({ showMore }) => ({ showMore: !showMore }));
           }}
diff --git a/web-console/src/components/cell-filter-menu/cell-filter-menu.tsx b/web-console/src/components/cell-filter-menu/cell-filter-menu.tsx
index dac3e2fc1979..5d2098c7db4d 100644
--- a/web-console/src/components/cell-filter-menu/cell-filter-menu.tsx
+++ b/web-console/src/components/cell-filter-menu/cell-filter-menu.tsx
@@ -18,8 +18,8 @@
 
 import { Menu, MenuItem } from '@blueprintjs/core';
 import { IconNames } from '@blueprintjs/icons';
-import type { Column, SqlExpression, SqlQuery } from '@druid-toolkit/query';
-import { C, L, SqlComparison, SqlLiteral, SqlRecord, trimString } from '@druid-toolkit/query';
+import type { Column, SqlExpression, SqlQuery } from 'druid-query-toolkit';
+import { C, L, SqlComparison, SqlLiteral, SqlRecord, trimString } from 'druid-query-toolkit';
 
 import type { QueryAction } from '../../utils';
 import { copyAndAlert, prettyPrintSql, stringifyValue } from '../../utils';
diff --git a/web-console/src/components/fancy-numeric-input/fancy-numeric-input.tsx b/web-console/src/components/fancy-numeric-input/fancy-numeric-input.tsx
index cb389ff532dc..dad7c9a0617a 100644
--- a/web-console/src/components/fancy-numeric-input/fancy-numeric-input.tsx
+++ b/web-console/src/components/fancy-numeric-input/fancy-numeric-input.tsx
@@ -19,8 +19,8 @@
 import type { InputGroupProps2, Intent } from '@blueprintjs/core';
 import { Button, ButtonGroup, Classes, ControlGroup, InputGroup, Keys } from '@blueprintjs/core';
 import { IconNames } from '@blueprintjs/icons';
-import { SqlExpression, SqlFunction, SqlLiteral, SqlMulti } from '@druid-toolkit/query';
 import classNames from 'classnames';
+import { SqlExpression, SqlFunction, SqlLiteral, SqlMulti } from 'druid-query-toolkit';
 import React, { useEffect, useState } from 'react';
 
 import { clamp } from '../../utils';
diff --git a/web-console/src/components/index.ts b/web-console/src/components/index.ts
index d885bf07434a..18a4c21e72c2 100644
--- a/web-console/src/components/index.ts
+++ b/web-console/src/components/index.ts
@@ -43,6 +43,7 @@ export * from './menu-checkbox/menu-checkbox';
 export * from './more-button/more-button';
 export * from './plural-pair-if-needed/plural-pair-if-needed';
 export * from './popover-text/popover-text';
+export * from './portal-bubble/portal-bubble';
 export * from './query-error-pane/query-error-pane';
 export * from './record-table-pane/record-table-pane';
 export * from './refresh-button/refresh-button';
diff --git a/web-console/src/components/portal-bubble/portal-bubble.scss b/web-console/src/components/portal-bubble/portal-bubble.scss
new file mode 100644
index 000000000000..f29091150afc
--- /dev/null
+++ b/web-console/src/components/portal-bubble/portal-bubble.scss
@@ -0,0 +1,86 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+@import '../../variables';
+
+$shpitz-size: 9px;
+
+.portal-bubble {
+  position: absolute;
+  @include card-like;
+
+  .#{$bp-ns}-dark & {
+    background: $dark-gray1;
+  }
+
+  &.up {
+    transform: translate(-50%, -100%);
+  }
+
+  &.down {
+    transform: translate(-50%, 0);
+  }
+
+  &.mute {
+    pointer-events: none;
+  }
+
+  & > .shpitz {
+    content: '';
+    position: absolute;
+    transform: translate(-50%, 0);
+    border-right: $shpitz-size solid transparent;
+    border-left: $shpitz-size solid transparent;
+  }
+
+  &.up > .shpitz {
+    bottom: -$shpitz-size;
+    border-top: $shpitz-size solid $dark-gray1;
+  }
+
+  &.down > .shpitz {
+    top: -$shpitz-size;
+    border-bottom: $shpitz-size solid $dark-gray1;
+  }
+
+  & > .bubble-title-bar {
+    position: relative;
+    padding: 5px 5px 0 5px;
+    white-space: nowrap;
+    font-weight: bold;
+
+    &.with-close {
+      padding-right: 26px;
+
+      .close-button {
+        position: absolute;
+        top: 0;
+        right: 0;
+      }
+    }
+  }
+
+  & > .bubble-content {
+    padding: 5px;
+    white-space: nowrap;
+  }
+
+  .bubble-title-bar + .bubble-content {
+    padding-top: 0;
+  }
+}
diff --git a/web-console/src/components/portal-bubble/portal-bubble.tsx b/web-console/src/components/portal-bubble/portal-bubble.tsx
new file mode 100644
index 000000000000..b8831c84bb09
--- /dev/null
+++ b/web-console/src/components/portal-bubble/portal-bubble.tsx
@@ -0,0 +1,93 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { Button } from '@blueprintjs/core';
+import { IconNames } from '@blueprintjs/icons';
+import classNames from 'classnames';
+import type { ReactNode } from 'react';
+import { useState } from 'react';
+import { createPortal } from 'react-dom';
+
+import { clamp } from '../../utils';
+
+import './portal-bubble.scss';
+
+const SHPITZ_SIZE = 10;
+
+export interface PortalBubbleOpenOn {
+  x: number;
+  y: number;
+  title?: string;
+  text: ReactNode;
+}
+
+export interface PortalBubbleProps {
+  className?: string;
+  openOn: PortalBubbleOpenOn | undefined;
+  direction?: 'up' | 'down';
+  onClose?(): void;
+  mute?: boolean;
+  minimal?: boolean;
+}
+
+export const PortalBubble = function PortalBubble(props: PortalBubbleProps) {
+  const { className, openOn, direction = 'up', onClose, mute, minimal } = props;
+  const [myWidth, setMyWidth] = useState(200);
+  if (!openOn) return null;
+
+  const halfMyWidth = myWidth / 2;
+
+  const x = clamp(openOn.x, halfMyWidth, window.innerWidth - halfMyWidth);
+  const offset = clamp(x - openOn.x, -halfMyWidth, halfMyWidth);
+
+  return createPortal(
+    <div
+      className={classNames('portal-bubble', className, direction, {
+        mute: mute && !onClose,
+      })}
+      ref={element => {
+        if (!element) return;
+        setMyWidth(element.offsetWidth);
+      }}
+      style={{
+        left: x,
+        top: openOn.y + (minimal ? 0 : direction === 'up' ? -SHPITZ_SIZE : SHPITZ_SIZE),
+      }}
+    >
+      {(openOn.title || onClose) && (
+        <div className={classNames('bubble-title-bar', { 'with-close': Boolean(onClose) })}>
+          {openOn.title}
+          {onClose && (
+            <Button
+              className="close-button"
+              icon={IconNames.CROSS}
+              small
+              minimal
+              onClick={onClose}
+            />
+          )}
+        </div>
+      )}
+      <div className="bubble-content">{openOn.text}</div>
+      {!minimal && (
+        <div className="shpitz" style={{ left: offset ? `calc(50% - ${offset}px)` : '50%' }} />
+      )}
+    </div>,
+    document.body,
+  );
+};
diff --git a/web-console/src/components/record-table-pane/record-table-pane.tsx b/web-console/src/components/record-table-pane/record-table-pane.tsx
index e44eab355602..803ee783c2cd 100644
--- a/web-console/src/components/record-table-pane/record-table-pane.tsx
+++ b/web-console/src/components/record-table-pane/record-table-pane.tsx
@@ -18,8 +18,8 @@
 
 import { Button, Icon, Popover } from '@blueprintjs/core';
 import { IconNames } from '@blueprintjs/icons';
-import type { Column, QueryResult } from '@druid-toolkit/query';
 import classNames from 'classnames';
+import type { Column, QueryResult } from 'druid-query-toolkit';
 import React, { useEffect, useState } from 'react';
 import type { RowRenderProps } from 'react-table';
 import ReactTable from 'react-table';
diff --git a/web-console/src/components/rule-editor/__snapshots__/rule-editor.spec.tsx.snap b/web-console/src/components/rule-editor/__snapshots__/rule-editor.spec.tsx.snap
index 2769c8af739e..7246fe89490f 100644
--- a/web-console/src/components/rule-editor/__snapshots__/rule-editor.spec.tsx.snap
+++ b/web-console/src/components/rule-editor/__snapshots__/rule-editor.spec.tsx.snap
@@ -70,7 +70,7 @@ exports[`RuleEditor matches snapshot no tier in rule 1`] = `
       style="transform: translateY(0); transition: none;"
     >
       <div
-        class="bp5-card bp5-elevation-2"
+        class="rule-detail bp5-card bp5-elevation-2"
       >
         <div
           class="bp5-form-group"
@@ -451,7 +451,7 @@ exports[`RuleEditor matches snapshot with broadcast rule 1`] = `
       style="transform: translateY(0); transition: none;"
     >
       <div
-        class="bp5-card bp5-elevation-2"
+        class="rule-detail bp5-card bp5-elevation-2"
       >
         <div
           class="bp5-form-group"
@@ -629,7 +629,7 @@ exports[`RuleEditor matches snapshot with existing tier and non existing tier in
       style="transform: translateY(0); transition: none;"
     >
       <div
-        class="bp5-card bp5-elevation-2"
+        class="rule-detail bp5-card bp5-elevation-2"
       >
         <div
           class="bp5-form-group"
@@ -1190,7 +1190,7 @@ exports[`RuleEditor matches snapshot with existing tier in rule 1`] = `
       style="transform: translateY(0); transition: none;"
     >
       <div
-        class="bp5-card bp5-elevation-2"
+        class="rule-detail bp5-card bp5-elevation-2"
       >
         <div
           class="bp5-form-group"
@@ -1581,7 +1581,7 @@ exports[`RuleEditor matches snapshot with non existing tier in rule 1`] = `
       style="transform: translateY(0); transition: none;"
     >
       <div
-        class="bp5-card bp5-elevation-2"
+        class="rule-detail bp5-card bp5-elevation-2"
       >
         <div
           class="bp5-form-group"
diff --git a/web-console/src/components/rule-editor/rule-editor.scss b/web-console/src/components/rule-editor/rule-editor.scss
index e5757bc2999d..cb021e85c01b 100644
--- a/web-console/src/components/rule-editor/rule-editor.scss
+++ b/web-console/src/components/rule-editor/rule-editor.scss
@@ -28,4 +28,8 @@
   .include-future {
     margin-left: 15px;
   }
+
+  .rule-detail {
+    border: 1px solid rgba(255, 255, 255, 0.15);
+  }
 }
diff --git a/web-console/src/components/rule-editor/rule-editor.tsx b/web-console/src/components/rule-editor/rule-editor.tsx
index c5dfb24ddf06..8cea5321cfd7 100644
--- a/web-console/src/components/rule-editor/rule-editor.tsx
+++ b/web-console/src/components/rule-editor/rule-editor.tsx
@@ -30,9 +30,9 @@ import {
 import { IconNames } from '@blueprintjs/icons';
 import React, { useState } from 'react';
 
+import type { Rule } from '../../druid-models';
+import { RuleUtil } from '../../druid-models';
 import { durationSanitizer } from '../../utils';
-import type { Rule } from '../../utils/load-rule';
-import { RuleUtil } from '../../utils/load-rule';
 import { SuggestibleInput } from '../suggestible-input/suggestible-input';
 
 import './rule-editor.scss';
@@ -170,7 +170,7 @@ export const RuleEditor = React.memo(function RuleEditor(props: RuleEditorProps)
       </div>
 
       <Collapse isOpen={isOpen}>
-        <Card elevation={2}>
+        <Card className="rule-detail" elevation={2}>
           <FormGroup>
             <ControlGroup>
               <HTMLSelect
diff --git a/web-console/src/components/segment-timeline/__snapshots__/bar-unit.spec.tsx.snap b/web-console/src/components/segment-timeline/__snapshots__/bar-unit.spec.tsx.snap
deleted file mode 100644
index 7d98145d4b5e..000000000000
--- a/web-console/src/components/segment-timeline/__snapshots__/bar-unit.spec.tsx.snap
+++ /dev/null
@@ -1,13 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`BarUnit matches snapshot 1`] = `
-<svg>
-  <rect
-    class="bar-unit"
-    height="10"
-    width="10"
-    x="10"
-    y="10"
-  />
-</svg>
-`;
diff --git a/web-console/src/components/segment-timeline/__snapshots__/segment-timeline.spec.tsx.snap b/web-console/src/components/segment-timeline/__snapshots__/segment-timeline.spec.tsx.snap
index ae30df246c2b..206c2be703bd 100644
--- a/web-console/src/components/segment-timeline/__snapshots__/segment-timeline.spec.tsx.snap
+++ b/web-console/src/components/segment-timeline/__snapshots__/segment-timeline.spec.tsx.snap
@@ -4,191 +4,309 @@ exports[`SegmentTimeline matches snapshot 1`] = `
 <div
   class="segment-timeline"
 >
-  <div>
-    <div
-      class="loader"
-    >
-      <div
-        class="loader-logo"
-      >
-        <svg
-          viewBox="0 0 100 100"
-        >
-          <path
-            class="one"
-            d="M54.2,69.8h-2.7c-0.7,0-1.3-0.6-1.3-1.3c0-0.7,0.6-1.3,1.3-1.3h2.7c11.5,0,23.8-7.4,23.8-23.7
-          c0-9.1-6.9-15.8-16.4-15.8H38c-0.7,0-1.3-0.6-1.3-1.3s0.6-1.3,1.3-1.3h23.6c5.3,0,10.1,1.9,13.6,5.3c3.5,3.4,5.4,8,5.4,13.1
-          c0,6.6-2.3,13-6.3,17.7C69.5,66.8,62.5,69.8,54.2,69.8z"
-          />
-          <path
-            class="two"
-            d="M55.7,59.5h-26c-0.7,0-1.3-0.6-1.3-1.3c0-0.7,0.6-1.3,1.3-1.3h26c7.5,0,11.5-5.8,11.5-11.5
-            c0-4.2-3.2-7.3-7.7-7.3h-26c-0.7,0-1.3-0.6-1.3-1.3s0.6-1.3,1.3-1.3h26c5.9,0,10.3,4.3,10.3,9.9c0,3.7-1.3,7.2-3.7,9.8
-            C63.5,58,59.9,59.5,55.7,59.5z"
-          />
-          <path
-            class="three"
-            d="M27.2,38h-6.3c-0.7,0-1.3-0.6-1.3-1.3s0.6-1.3,1.3-1.3h6.3c0.7,0,1.3,0.6,1.3,1.3S27.9,38,27.2,38z"
-          />
-          <path
-            class="four"
-            d="M45.1,69.8h-5.8c-0.7,0-1.3-0.6-1.3-1.3c0-0.7,0.6-1.3,1.3-1.3h5.8c0.7,0,1.3,0.6,1.3,1.3
-            C46.4,69.2,45.8,69.8,45.1,69.8z"
-          />
-        </svg>
-      </div>
-    </div>
-  </div>
   <div
-    class="side-control"
+    class="control-bar"
   >
     <div
-      class="bp5-form-group"
+      class="bp5-button-group"
     >
-      <label
-        class="bp5-label"
-      >
-        Show
-         
-        <span
-          class="bp5-text-muted"
-        />
-      </label>
       <div
-        class="bp5-form-content"
+        aria-controls="listbox-0"
+        aria-disabled="false"
+        aria-expanded="false"
+        aria-haspopup="listbox"
+        class="bp5-popover-target"
+        role="combobox"
       >
-        <div
-          class="bp5-segmented-control bp5-fill"
-          role="radiogroup"
+        <button
+          class="bp5-button bp5-small"
+          type="button"
         >
-          <button
-            aria-checked="true"
-            class="bp5-button"
-            role="radio"
-            tabindex="0"
-            type="button"
+          <span
+            class="bp5-button-text"
           >
-            <span
-              class="bp5-button-text"
-            >
-              Total size
-            </span>
-          </button>
-          <button
-            aria-checked="false"
-            class="bp5-button bp5-minimal"
-            role="radio"
-            tabindex="-1"
-            type="button"
+            Datasource: all
+          </span>
+          <span
+            aria-hidden="true"
+            class="bp5-icon bp5-icon-caret-down"
           >
-            <span
-              class="bp5-button-text"
+            <svg
+              data-icon="caret-down"
+              height="16"
+              role="img"
+              viewBox="0 0 16 16"
+              width="16"
             >
-              Segment count
-            </span>
-          </button>
-        </div>
+              <path
+                d="M12 6.5c0-.28-.22-.5-.5-.5h-7a.495.495 0 00-.37.83l3.5 4c.09.1.22.17.37.17s.28-.07.37-.17l3.5-4c.08-.09.13-.2.13-.33z"
+                fill-rule="evenodd"
+              />
+            </svg>
+          </span>
+        </button>
       </div>
     </div>
+    <span
+      class="bp5-popover-target"
+    >
+      <button
+        aria-expanded="false"
+        aria-haspopup="menu"
+        class="bp5-button bp5-small"
+        type="button"
+      >
+        <span
+          class="bp5-button-text"
+        >
+          Show: Size
+        </span>
+        <span
+          aria-hidden="true"
+          class="bp5-icon bp5-icon-caret-down"
+        >
+          <svg
+            data-icon="caret-down"
+            height="16"
+            role="img"
+            viewBox="0 0 16 16"
+            width="16"
+          >
+            <path
+              d="M12 6.5c0-.28-.22-.5-.5-.5h-7a.495.495 0 00-.37.83l3.5 4c.09.1.22.17.37.17s.28-.07.37-.17l3.5-4c.08-.09.13-.2.13-.33z"
+              fill-rule="evenodd"
+            />
+          </svg>
+        </span>
+      </button>
+    </span>
+    <div
+      class="expander"
+    />
     <div
-      class="bp5-form-group"
+      class="bp5-button-group"
     >
-      <label
-        class="bp5-label"
+      <button
+        class="bp5-button bp5-small"
+        data-tooltip="Previous time period
+2024-10-15 → 2024-11-01"
+        type="button"
       >
-        Interval
-         
         <span
-          class="bp5-text-muted"
-        />
-      </label>
-      <div
-        class="bp5-form-content"
+          aria-hidden="true"
+          class="bp5-icon bp5-icon-caret-left"
+        >
+          <svg
+            data-icon="caret-left"
+            height="16"
+            role="img"
+            viewBox="0 0 16 16"
+            width="16"
+          >
+            <path
+              d="M9.5 4c-.13 0-.24.05-.33.13l-4 3.5c-.1.09-.17.22-.17.37s.07.28.17.37l4 3.5a.495.495 0 00.83-.37v-7c0-.28-.22-.5-.5-.5z"
+              fill-rule="evenodd"
+            />
+          </svg>
+        </span>
+      </button>
+      <button
+        class="bp5-button bp5-small"
+        data-tooltip="Zoom out
+2024-10-15 → 2024-11-20"
+        type="button"
       >
-        <div
-          aria-expanded="false"
-          aria-haspopup="menu"
-          class="bp5-control-group bp5-date-range-input bp5-popover-target bp5-fill"
+        <span
+          aria-hidden="true"
+          class="bp5-icon bp5-icon-zoom-out"
         >
-          <div
-            class="bp5-input-group bp5-fill"
+          <svg
+            data-icon="zoom-out"
+            height="16"
+            role="img"
+            viewBox="0 0 16 16"
+            width="16"
           >
-            <input
-              aria-disabled="false"
-              autocomplete="off"
-              class="bp5-input"
-              placeholder="Start date"
-              type="text"
-              value="2021-03-09"
+            <path
+              d="M3.99 5.99c-.55 0-1 .45-1 1s.45 1 1 1h6c.55 0 1-.45 1-1s-.45-1-1-1h-6zm11.56 7.44l-2.67-2.68a6.94 6.94 0 001.11-3.76c0-3.87-3.13-7-7-7s-7 3.13-7 7 3.13 7 7 7c1.39 0 2.68-.42 3.76-1.11l2.68 2.67a1.498 1.498 0 102.12-2.12zm-8.56-1.44c-2.76 0-5-2.24-5-5s2.24-5 5-5 5 2.24 5 5-2.24 5-5 5z"
+              fill-rule="evenodd"
             />
-          </div>
-          <div
-            class="bp5-input-group bp5-fill"
+          </svg>
+        </span>
+      </button>
+      <button
+        class="bp5-button bp5-small"
+        data-tooltip="Next time period
+2024-11-18 → 2024-12-05"
+        type="button"
+      >
+        <span
+          aria-hidden="true"
+          class="bp5-icon bp5-icon-caret-right"
+        >
+          <svg
+            data-icon="caret-right"
+            height="16"
+            role="img"
+            viewBox="0 0 16 16"
+            width="16"
           >
-            <input
-              aria-disabled="false"
-              autocomplete="off"
-              class="bp5-input"
-              placeholder="End date"
-              type="text"
-              value="2021-06-09"
+            <path
+              d="M11 8c0-.15-.07-.28-.17-.37l-4-3.5A.495.495 0 006 4.5v7a.495.495 0 00.83.37l4-3.5c.1-.09.17-.22.17-.37z"
+              fill-rule="evenodd"
             />
-          </div>
-        </div>
-      </div>
+          </svg>
+        </span>
+      </button>
     </div>
     <div
-      class="bp5-form-group"
+      class="bp5-button-group"
     >
-      <label
-        class="bp5-label"
+      <button
+        class="bp5-button bp5-small"
+        data-tooltip="Show last day
+2024-11-19 → 2024-11-20"
+        type="button"
       >
-        Datasource
-         
         <span
-          class="bp5-text-muted"
-        />
-      </label>
-      <div
-        class="bp5-form-content"
+          class="bp5-button-text"
+        >
+          1D
+        </span>
+      </button>
+      <button
+        class="bp5-button bp5-small"
+        data-tooltip="Show last week
+2024-11-13 → 2024-11-20"
+        type="button"
+      >
+        <span
+          class="bp5-button-text"
+        >
+          1W
+        </span>
+      </button>
+      <button
+        class="bp5-button bp5-small"
+        data-tooltip="Show last month
+2024-10-20 → 2024-11-20"
+        type="button"
+      >
+        <span
+          class="bp5-button-text"
+        >
+          1M
+        </span>
+      </button>
+      <button
+        class="bp5-button bp5-small"
+        data-tooltip="Show last 3 months
+2024-08-20 → 2024-11-20"
+        type="button"
+      >
+        <span
+          class="bp5-button-text"
+        >
+          3M
+        </span>
+      </button>
+      <button
+        class="bp5-button bp5-small"
+        data-tooltip="Show last year
+2023-11-20 → 2024-11-20"
+        type="button"
+      >
+        <span
+          class="bp5-button-text"
+        >
+          1Y
+        </span>
+      </button>
+      <button
+        class="bp5-button bp5-small"
+        data-tooltip="Show last 5 years
+2019-11-20 → 2024-11-20"
+        type="button"
+      >
+        <span
+          class="bp5-button-text"
+        >
+          5Y
+        </span>
+      </button>
+      <button
+        class="bp5-button bp5-small"
+        data-tooltip="Show last 10 years
+2014-11-20 → 2024-11-20"
+        type="button"
+      >
+        <span
+          class="bp5-button-text"
+        >
+          10Y
+        </span>
+      </button>
+      <span
+        class="bp5-popover-target"
       >
-        <div
-          aria-controls="listbox-1"
+        <button
           aria-expanded="false"
-          aria-haspopup="listbox"
-          class="bp5-popover-target bp5-fill"
-          role="combobox"
+          aria-haspopup="menu"
+          class="bp5-button bp5-small"
+          data-tooltip="Select a custom date range"
+          type="button"
         >
-          <button
-            class="bp5-button bp5-fill"
-            type="button"
+          <span
+            aria-hidden="true"
+            class="bp5-icon bp5-icon-calendar"
           >
-            <span
-              class="bp5-button-text"
+            <svg
+              data-icon="calendar"
+              height="16"
+              role="img"
+              viewBox="0 0 16 16"
+              width="16"
             >
-              Show all
-            </span>
-            <span
-              aria-hidden="true"
-              class="bp5-icon bp5-icon-caret-down"
-            >
-              <svg
-                data-icon="caret-down"
-                height="16"
-                role="img"
-                viewBox="0 0 16 16"
-                width="16"
-              >
-                <path
-                  d="M12 6.5c0-.28-.22-.5-.5-.5h-7a.495.495 0 00-.37.83l3.5 4c.09.1.22.17.37.17s.28-.07.37-.17l3.5-4c.08-.09.13-.2.13-.33z"
-                  fill-rule="evenodd"
-                />
-              </svg>
-            </span>
-          </button>
-        </div>
-      </div>
+              <path
+                d="M11 3c.6 0 1-.5 1-1V1c0-.6-.4-1-1-1s-1 .4-1 1v1c0 .5.4 1 1 1zm3-2h-1v1c0 1.1-.9 2-2 2s-2-.9-2-2V1H6v1c0 1.1-.9 2-2 2s-2-.9-2-2V1H1c-.6 0-1 .5-1 1v12c0 .6.4 1 1 1h13c.6 0 1-.4 1-1V2c0-.6-.5-1-1-1zM5 13H2v-3h3v3zm0-4H2V6h3v3zm4 4H6v-3h3v3zm0-4H6V6h3v3zm4 4h-3v-3h3v3zm0-4h-3V6h3v3zM4 3c.6 0 1-.5 1-1V1c0-.6-.4-1-1-1S3 .4 3 1v1c0 .5.4 1 1 1z"
+                fill-rule="evenodd"
+              />
+            </svg>
+          </span>
+          <span
+            class="bp5-button-text"
+          >
+            2024-11-01 → 2024-11-18
+          </span>
+        </button>
+      </span>
+      <button
+        class="bp5-button bp5-small"
+        data-tooltip="Auto determine date range to fit datasource"
+        type="button"
+      >
+        <span
+          aria-hidden="true"
+          class="bp5-icon bp5-icon-pin"
+        >
+          <svg
+            data-icon="pin"
+            height="16"
+            role="img"
+            viewBox="0 0 16 16"
+            width="16"
+          >
+            <path
+              d="M9.41.92c-.51.51-.41 1.5.15 2.56L4.34 7.54C2.8 6.48 1.45 6.05.92 6.58l3.54 3.54-3.54 4.95 4.95-3.54 3.54 3.54c.53-.53.1-1.88-.96-3.42l4.06-5.22c1.06.56 2.04.66 2.55.15L9.41.92z"
+              fill-rule="evenodd"
+            />
+          </svg>
+        </span>
+      </button>
     </div>
   </div>
+  <div
+    class="chart-container"
+  />
 </div>
 `;
diff --git a/web-console/src/components/segment-timeline/bar-group.tsx b/web-console/src/components/segment-timeline/bar-group.tsx
deleted file mode 100644
index d0cf867e2b2d..000000000000
--- a/web-console/src/components/segment-timeline/bar-group.tsx
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import type { AxisScale } from 'd3-axis';
-import React from 'react';
-
-import { BarUnit } from './bar-unit';
-import type { BarUnitData, HoveredBarInfo } from './stacked-bar-chart';
-
-interface BarGroupProps {
-  dataToRender: BarUnitData[];
-  changeActiveDatasource: (dataSource: string) => void;
-  formatTick: (e: number) => string;
-  xScale: AxisScale<Date>;
-  yScale: AxisScale<number>;
-  barWidth: number;
-  onHoverBar?: (e: any) => void;
-  offHoverBar?: () => void;
-  hoverOn?: HoveredBarInfo | null;
-}
-
-export class BarGroup extends React.Component<BarGroupProps> {
-  shouldComponentUpdate(nextProps: BarGroupProps): boolean {
-    return nextProps.hoverOn === this.props.hoverOn;
-  }
-
-  render() {
-    const { dataToRender, changeActiveDatasource, xScale, yScale, onHoverBar, barWidth } =
-      this.props;
-    if (dataToRender === undefined) return null;
-
-    return dataToRender.map((entry: BarUnitData, i: number) => {
-      const y0 = yScale(entry.y0 || 0) || 0;
-      const x = xScale(new Date(entry.x + 'T00:00:00Z'));
-      const y = yScale((entry.y0 || 0) + entry.y) || 0;
-      const height = Math.max(y0 - y, 0);
-      const barInfo: HoveredBarInfo = {
-        xCoordinate: x,
-        yCoordinate: y,
-        height,
-        datasource: entry.datasource,
-        xValue: entry.x,
-        yValue: entry.y,
-        dailySize: entry.dailySize,
-      };
-      return (
-        <BarUnit
-          key={i}
-          x={x}
-          y={y}
-          width={barWidth}
-          height={height}
-          style={{ fill: entry.color }}
-          onClick={() => changeActiveDatasource(entry.datasource)}
-          onHover={() => onHoverBar && onHoverBar(barInfo)}
-        />
-      );
-    });
-  }
-}
diff --git a/web-console/src/components/segment-timeline/chart-axis.tsx b/web-console/src/components/segment-timeline/chart-axis.tsx
index bc333d33b773..b8ee4e9cbb11 100644
--- a/web-console/src/components/segment-timeline/chart-axis.tsx
+++ b/web-console/src/components/segment-timeline/chart-axis.tsx
@@ -16,22 +16,22 @@
  * limitations under the License.
  */
 
+import type { Axis } from 'd3-axis';
 import { select } from 'd3-selection';
-import React from 'react';
 
 interface ChartAxisProps {
-  transform?: string;
-  scale: any;
   className?: string;
+  transform?: string;
+  axis: Axis<any>;
 }
 
-export const ChartAxis = React.memo(function ChartAxis(props: ChartAxisProps) {
-  const { transform, scale, className } = props;
+export const ChartAxis = function ChartAxis(props: ChartAxisProps) {
+  const { transform, axis, className } = props;
   return (
     <g
       className={`chart-axis ${className}`}
       transform={transform}
-      ref={node => select(node).call(scale)}
+      ref={node => select(node).call(axis as any)}
     />
   );
-});
+};
diff --git a/web-console/src/components/segment-timeline/common.ts b/web-console/src/components/segment-timeline/common.ts
new file mode 100644
index 000000000000..48aa5ce48d46
--- /dev/null
+++ b/web-console/src/components/segment-timeline/common.ts
@@ -0,0 +1,87 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { sum } from 'd3-array';
+
+import type { Duration } from '../../utils';
+import { formatBytes, formatInteger } from '../../utils';
+
+export type IntervalStat = 'segments' | 'size' | 'rows';
+
+export const INTERVAL_STATS: IntervalStat[] = ['segments', 'size', 'rows'];
+
+export function getIntervalStatTitle(intervalStat: IntervalStat): string {
+  switch (intervalStat) {
+    case 'segments':
+      return 'Num. segments';
+
+    case 'size':
+      return 'Size';
+
+    case 'rows':
+      return 'Rows';
+
+    default:
+      return intervalStat;
+  }
+}
+
+export function aggregateSegmentStats(
+  xs: readonly Record<IntervalStat, number>[],
+): Record<IntervalStat, number> {
+  return {
+    segments: sum(xs, s => s.segments),
+    size: sum(xs, s => s.size),
+    rows: sum(xs, s => s.rows),
+  };
+}
+
+export function formatIntervalStat(stat: IntervalStat, n: number) {
+  switch (stat) {
+    case 'segments':
+    case 'rows':
+      return formatInteger(n);
+
+    case 'size':
+      return formatBytes(n);
+
+    default:
+      return '';
+  }
+}
+
+export interface IntervalRow extends Record<IntervalStat, number> {
+  start: Date;
+  end: Date;
+  datasource: string;
+  realtime: boolean;
+  originalTimeSpan: Duration;
+}
+
+export interface TrimmedIntervalRow extends IntervalRow {
+  shownDays: number;
+  normalized: Record<IntervalStat, number>;
+}
+
+export interface IntervalBar extends TrimmedIntervalRow {
+  offset: Record<IntervalStat, number>;
+}
+
+export function formatIsoDateOnly(date: Date): string {
+  return date.toISOString().slice(0, 10);
+}
diff --git a/web-console/src/components/segment-timeline/segment-bar-chart-render.scss b/web-console/src/components/segment-timeline/segment-bar-chart-render.scss
new file mode 100644
index 000000000000..762772a0f5c5
--- /dev/null
+++ b/web-console/src/components/segment-timeline/segment-bar-chart-render.scss
@@ -0,0 +1,169 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+@import '../../variables';
+
+.segment-bar-chart-render {
+  position: relative;
+  overflow: hidden;
+
+  @keyframes pulseOpacity {
+    0% {
+      opacity: 0.8;
+    }
+    100% {
+      opacity: 0.95;
+    }
+  }
+
+  svg {
+    position: absolute;
+
+    .chart-axis text {
+      user-select: none;
+    }
+
+    .hover-highlight {
+      fill: white;
+      fill-opacity: 0.1;
+    }
+
+    .hovered-bar {
+      fill: none;
+      stroke: #ffffff;
+      stroke-width: 1.5px;
+    }
+
+    .selection {
+      fill: transparent;
+      stroke: #ffffff;
+      stroke-width: 1px;
+      opacity: 0.8;
+
+      &.done {
+        opacity: 1;
+      }
+    }
+
+    .shifter {
+      fill: white;
+      fill-opacity: 0.2;
+      filter: blur(1px);
+    }
+
+    .time-shift-indicator {
+      fill: white;
+      fill-opacity: 0.001;
+      cursor: grab;
+
+      &:hover {
+        fill-opacity: 0.1;
+      }
+
+      &.shifting {
+        fill-opacity: 0.2;
+        cursor: grabbing;
+      }
+    }
+
+    .gridline-x {
+      line {
+        stroke-dasharray: 5, 5;
+        opacity: 0.5;
+      }
+    }
+
+    .now-line {
+      stroke: $orange4;
+      stroke-dasharray: 2, 2;
+      opacity: 0.7;
+    }
+
+    .bar-unit {
+      &.realtime {
+        animation: pulseOpacity 3s alternate infinite;
+      }
+    }
+  }
+
+  .rule-tape {
+    position: absolute;
+    top: 5px;
+    height: 15px;
+    font-size: 10px;
+
+    .rule-error {
+      @include pin-full();
+      background-color: $red3;
+      color: $white;
+    }
+
+    .load-rule {
+      position: absolute;
+      overflow: hidden;
+      padding-left: 2px;
+      border-left: 1px solid $dark-gray2;
+      border-right: 1px solid $dark-gray2;
+      top: 0;
+      height: 100%;
+      text-overflow: ellipsis;
+
+      &.load {
+        background-color: $green1;
+
+        &:nth-child(even) {
+          background-color: $green3;
+        }
+      }
+
+      &.drop {
+        background-color: $dark-gray5;
+
+        &:nth-child(even) {
+          background-color: $gray1;
+        }
+      }
+
+      &.broadcast {
+        background-color: $indigo1;
+
+        &:nth-child(even) {
+          background-color: $indigo3;
+        }
+      }
+    }
+  }
+
+  .empty-placeholder {
+    @include pin-full;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    font-size: 20px;
+    user-select: none;
+    pointer-events: none;
+  }
+}
+
+.segment-bar-chart-bubble {
+  .button-bar {
+    padding-top: 5px;
+    display: flex;
+    gap: 5px;
+  }
+}
diff --git a/web-console/src/components/segment-timeline/segment-bar-chart-render.tsx b/web-console/src/components/segment-timeline/segment-bar-chart-render.tsx
new file mode 100644
index 000000000000..6f2817a202eb
--- /dev/null
+++ b/web-console/src/components/segment-timeline/segment-bar-chart-render.tsx
@@ -0,0 +1,793 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { Button, Intent } from '@blueprintjs/core';
+import type { NonNullDateRange } from '@blueprintjs/datetime';
+import { IconNames } from '@blueprintjs/icons';
+import IntervalTree from '@flatten-js/interval-tree';
+import classNames from 'classnames';
+import { max, sort, sum } from 'd3-array';
+import { axisBottom, axisLeft } from 'd3-axis';
+import { scaleLinear, scaleUtc } from 'd3-scale';
+import type { MouseEvent as ReactMouseEvent, ReactNode } from 'react';
+import { useMemo, useRef, useState } from 'react';
+
+import type { Rule } from '../../druid-models';
+import { getDatasourceColor, RuleUtil } from '../../druid-models';
+import { useClock, useGlobalEventListener } from '../../hooks';
+import {
+  allSameValue,
+  arraysEqualByElement,
+  clamp,
+  day,
+  Duration,
+  formatBytes,
+  formatNumber,
+  groupBy,
+  groupByAsMap,
+  minute,
+  month,
+  pluralIfNeeded,
+  TZ_UTC,
+  uniq,
+} from '../../utils';
+import type { Margin, Stage } from '../../utils/stage';
+import type { PortalBubbleOpenOn } from '../portal-bubble/portal-bubble';
+import { PortalBubble } from '../portal-bubble/portal-bubble';
+
+import { ChartAxis } from './chart-axis';
+import type { IntervalBar, IntervalRow, IntervalStat, TrimmedIntervalRow } from './common';
+import { aggregateSegmentStats, formatIntervalStat, formatIsoDateOnly } from './common';
+
+import './segment-bar-chart-render.scss';
+
+const CHART_MARGIN: Margin = { top: 20, right: 0, bottom: 25, left: 70 };
+const MIN_BAR_WIDTH = 4;
+const POSSIBLE_GRANULARITIES = [
+  new Duration('PT15M'),
+  new Duration('PT1H'),
+  new Duration('PT6H'),
+  new Duration('P1D'),
+  new Duration('P1M'),
+  new Duration('P1Y'),
+];
+
+const EXTEND_X_SCALE_DOMAIN_BY = 1;
+
+function formatStartDuration(start: Date, duration: Duration): string {
+  let sliceLength;
+  const { singleSpan } = duration;
+  switch (singleSpan) {
+    case 'year':
+      sliceLength = 4;
+      break;
+
+    case 'month':
+      sliceLength = 7;
+      break;
+
+    case 'day':
+      sliceLength = 10;
+      break;
+
+    case 'hour':
+      sliceLength = 13;
+      break;
+
+    case 'minute':
+      sliceLength = 16;
+      break;
+
+    default:
+      sliceLength = 19;
+      break;
+  }
+
+  return `${start.toISOString().slice(0, sliceLength)}/${duration}`;
+}
+
+// ---------------------------------------
+// Load rule stuff
+
+function loadRuleToBaseType(loadRule: Rule): string {
+  const m = /^(load|drop|broadcast)/.exec(loadRule.type);
+  return m ? m[1] : 'load';
+}
+
+const NEGATIVE_INFINITY_DATE = new Date(Date.UTC(1000, 0, 1));
+const POSITIVE_INFINITY_DATE = new Date(Date.UTC(3000, 0, 1));
+
+function loadRuleToDateRange(loadRule: Rule): NonNullDateRange {
+  switch (loadRule.type) {
+    case 'loadByInterval':
+    case 'dropByInterval':
+    case 'broadcastByInterval':
+      return String(loadRule.interval)
+        .split('/')
+        .map(d => new Date(d)) as NonNullDateRange;
+
+    case 'loadByPeriod':
+    case 'dropByPeriod':
+    case 'broadcastByPeriod':
+      return [
+        new Duration(loadRule.period || 'P1D').shift(new Date(), TZ_UTC, -1),
+        loadRule.includeFuture ? POSITIVE_INFINITY_DATE : new Date(),
+      ];
+
+    case 'dropBeforeByPeriod':
+      return [
+        NEGATIVE_INFINITY_DATE,
+        new Duration(loadRule.period || 'P1D').shift(new Date(), TZ_UTC, -1),
+      ];
+
+    default:
+      return [NEGATIVE_INFINITY_DATE, POSITIVE_INFINITY_DATE];
+  }
+}
+
+// ---------------------------------------
+
+function offsetDateRange(dateRange: NonNullDateRange, offset: number): NonNullDateRange {
+  return [new Date(dateRange[0].valueOf() + offset), new Date(dateRange[1].valueOf() + offset)];
+}
+
+function stackIntervalRows(trimmedIntervalRows: TrimmedIntervalRow[]): {
+  intervalBars: IntervalBar[];
+  intervalTree: IntervalTree;
+} {
+  // Total size of the datasource will be user as an ordering tiebreaker
+  const datasourceToTotalSize = groupByAsMap(
+    trimmedIntervalRows,
+    intervalRow => intervalRow.datasource,
+    intervalRows => sum(intervalRows, intervalRow => intervalRow.size),
+  );
+
+  const sortedIntervalRows = sort(trimmedIntervalRows, (a, b) => {
+    const shownDaysDiff = b.shownDays - a.shownDays;
+    if (shownDaysDiff) return shownDaysDiff;
+
+    const timeSpanDiff =
+      b.originalTimeSpan.getCanonicalLength() - a.originalTimeSpan.getCanonicalLength();
+    if (timeSpanDiff) return timeSpanDiff;
+
+    const totalSizeDiff = datasourceToTotalSize[b.datasource] - datasourceToTotalSize[a.datasource];
+    if (totalSizeDiff) return totalSizeDiff;
+
+    return Number(a.realtime) - Number(b.realtime);
+  });
+
+  const intervalTree = new IntervalTree();
+  const intervalBars = sortedIntervalRows.map(intervalRow => {
+    const startMs = intervalRow.start.valueOf();
+    const endMs = intervalRow.end.valueOf();
+    const intervalRowsBelow = intervalTree.search([startMs + 1, startMs + 2]) as IntervalBar[];
+    const intervalBar: IntervalBar = {
+      ...intervalRow,
+      offset: aggregateSegmentStats(intervalRowsBelow.map(i => i.normalized)),
+    };
+    intervalTree.insert([startMs, endMs], intervalBar);
+    return intervalBar;
+  });
+
+  return {
+    intervalBars,
+    intervalTree,
+  };
+}
+
+interface BubbleInfo {
+  start: Date;
+  end: Date;
+  timeLabel: string;
+  intervalBars: IntervalBar[];
+}
+
+interface SelectionRange {
+  start: Date;
+  end: Date;
+  done?: boolean;
+}
+
+export interface DatasourceRules {
+  loadRules: Rule[];
+  defaultLoadRules: Rule[];
+}
+
+export interface SegmentBarChartRenderProps {
+  intervalRows: IntervalRow[];
+  datasourceRules: DatasourceRules | undefined;
+  datasourceRulesError: string | undefined;
+
+  stage: Stage;
+  dateRange: NonNullDateRange;
+  changeDateRange(dateRange: NonNullDateRange): void;
+  shownIntervalStat: IntervalStat;
+  shownDatasource: string | undefined;
+  changeShownDatasource(datasource: string | undefined): void;
+  getIntervalActionButton?(
+    start: Date,
+    end: Date,
+    datasource?: string,
+    realtime?: boolean,
+  ): ReactNode;
+}
+
+export const SegmentBarChartRender = function SegmentBarChartRender(
+  props: SegmentBarChartRenderProps,
+) {
+  const {
+    intervalRows,
+    datasourceRules,
+    datasourceRulesError,
+
+    stage,
+    shownIntervalStat,
+    dateRange,
+    changeDateRange,
+    shownDatasource,
+    changeShownDatasource,
+    getIntervalActionButton,
+  } = props;
+  const [mouseDownAt, setMouseDownAt] = useState<
+    { time: Date; action: 'select' | 'shift' } | undefined
+  >();
+  const [selection, setSelection] = useState<SelectionRange | undefined>();
+
+  function setSelectionIfNeeded(newSelection: SelectionRange) {
+    if (
+      selection &&
+      selection.start.valueOf() === newSelection.start.valueOf() &&
+      selection.end.valueOf() === newSelection.end.valueOf() &&
+      selection.done === newSelection.done
+    ) {
+      return;
+    }
+    setSelection(newSelection);
+  }
+
+  const [bubbleInfo, setBubbleInfo] = useState<BubbleInfo | undefined>();
+
+  function setBubbleInfoIfNeeded(newBubbleInfo: BubbleInfo) {
+    if (
+      bubbleInfo &&
+      bubbleInfo.start.valueOf() === newBubbleInfo.start.valueOf() &&
+      bubbleInfo.end.valueOf() === newBubbleInfo.end.valueOf() &&
+      bubbleInfo.timeLabel === newBubbleInfo.timeLabel &&
+      arraysEqualByElement(bubbleInfo.intervalBars, newBubbleInfo.intervalBars)
+    ) {
+      return;
+    }
+    setBubbleInfo(newBubbleInfo);
+  }
+
+  const [shiftOffset, setShiftOffset] = useState<number | undefined>();
+
+  const now = useClock(minute.canonicalLength);
+  const svgRef = useRef<SVGSVGElement | null>(null);
+
+  const trimGranularity = useMemo(() => {
+    return Duration.pickSmallestGranularityThatFits(
+      POSSIBLE_GRANULARITIES,
+      dateRange[1].valueOf() - dateRange[0].valueOf(),
+      Math.floor(stage.width / MIN_BAR_WIDTH),
+    ).toString();
+  }, [dateRange, stage.width]);
+
+  const { intervalBars, intervalTree } = useMemo(() => {
+    const shownIntervalRows = intervalRows.filter(
+      ({ start, end, datasource }) =>
+        start <= dateRange[1] &&
+        dateRange[0] < end &&
+        (!shownDatasource || datasource === shownDatasource),
+    );
+    const averageRowSizeByDatasource = groupByAsMap(
+      shownIntervalRows.filter(intervalRow => intervalRow.size > 0 && intervalRow.rows > 0),
+      intervalRow => intervalRow.datasource,
+      intervalRows => sum(intervalRows, d => d.size) / sum(intervalRows, d => d.rows),
+    );
+
+    const trimDuration = new Duration(trimGranularity);
+    const trimmedIntervalRows = shownIntervalRows.map(intervalRow => {
+      const { start, end, segments, size, rows } = intervalRow;
+      const startTrimmed = trimDuration.floor(start, TZ_UTC);
+      let endTrimmed = trimDuration.ceil(end, TZ_UTC);
+
+      // Special handling to catch WEEK intervals when trimming to month.
+      if (trimGranularity === 'P1M' && intervalRow.originalTimeSpan.toString() === 'P7D') {
+        endTrimmed = trimDuration.shift(startTrimmed, TZ_UTC);
+      }
+
+      const shownDays = (endTrimmed.valueOf() - startTrimmed.valueOf()) / day.canonicalLength;
+      const shownSize =
+        size === 0 ? rows * averageRowSizeByDatasource[intervalRow.datasource] : size;
+      return {
+        ...intervalRow,
+        start: startTrimmed,
+        end: endTrimmed,
+        shownDays,
+        size: shownSize,
+        normalized: {
+          size: shownSize / shownDays,
+          rows: rows / shownDays,
+          segments: segments / shownDays,
+        },
+      };
+    });
+
+    const fullyGroupedSegmentRows = groupBy(
+      trimmedIntervalRows,
+      trimmedIntervalRow =>
+        [
+          trimmedIntervalRow.start.toISOString(),
+          trimmedIntervalRow.end.toISOString(),
+          trimmedIntervalRow.originalTimeSpan,
+          trimmedIntervalRow.datasource,
+          trimmedIntervalRow.realtime,
+        ].join('/'),
+      (trimmedIntervalRows): TrimmedIntervalRow => {
+        const firstIntervalRow = trimmedIntervalRows[0];
+        return {
+          ...firstIntervalRow,
+          ...aggregateSegmentStats(trimmedIntervalRows),
+          normalized: aggregateSegmentStats(trimmedIntervalRows.map(t => t.normalized)),
+        };
+      },
+    );
+
+    return stackIntervalRows(fullyGroupedSegmentRows);
+  }, [intervalRows, trimGranularity, dateRange, shownDatasource]);
+
+  const innerStage = stage.applyMargin(CHART_MARGIN);
+
+  const baseTimeScale = scaleUtc()
+    .domain(dateRange)
+    .range([EXTEND_X_SCALE_DOMAIN_BY, innerStage.width - EXTEND_X_SCALE_DOMAIN_BY]);
+  const timeScale = shiftOffset
+    ? baseTimeScale.copy().domain(offsetDateRange(dateRange, shiftOffset))
+    : baseTimeScale;
+
+  const maxNormalizedStat = max(
+    intervalBars,
+    d => d.normalized[shownIntervalStat] + d.offset[shownIntervalStat],
+  );
+  const statScale = scaleLinear()
+    .rangeRound([innerStage.height, 0])
+    .domain([0, (maxNormalizedStat ?? 1) * 1.05]);
+
+  const formatTickRate = (n: number) => {
+    switch (shownIntervalStat) {
+      case 'segments':
+        return formatNumber(n); // + ' seg/day';
+
+      case 'rows':
+        return formatNumber(n); // + ' row/day';
+
+      case 'size':
+        return formatBytes(n);
+    }
+  };
+
+  function handleMouseDown(e: ReactMouseEvent) {
+    const svg = svgRef.current;
+    if (!svg) return;
+    e.preventDefault();
+
+    if (selection) {
+      setSelection(undefined);
+    } else {
+      const rect = svg.getBoundingClientRect();
+      const x = e.clientX - rect.x - CHART_MARGIN.left;
+      const y = e.clientY - rect.y - CHART_MARGIN.top;
+      const time = baseTimeScale.invert(x);
+      const action = y > innerStage.height || e.shiftKey ? 'shift' : 'select';
+      setBubbleInfo(undefined);
+      setMouseDownAt({
+        time,
+        action,
+      });
+    }
+  }
+
+  useGlobalEventListener('mousemove', (e: MouseEvent) => {
+    const svg = svgRef.current;
+    if (!svg) return;
+    const rect = svg.getBoundingClientRect();
+    const x = e.clientX - rect.x - CHART_MARGIN.left;
+    const y = e.clientY - rect.y - CHART_MARGIN.top;
+
+    if (mouseDownAt) {
+      e.preventDefault();
+
+      const b = baseTimeScale.invert(x);
+      if (mouseDownAt.action === 'shift' || e.shiftKey) {
+        setShiftOffset(mouseDownAt.time.valueOf() - b.valueOf());
+      } else {
+        if (mouseDownAt.time < b) {
+          setSelectionIfNeeded({
+            start: day.floor(mouseDownAt.time, TZ_UTC),
+            end: day.ceil(b, TZ_UTC),
+          });
+        } else {
+          setSelectionIfNeeded({
+            start: day.floor(b, TZ_UTC),
+            end: day.ceil(mouseDownAt.time, TZ_UTC),
+          });
+        }
+      }
+    } else if (!selection) {
+      if (
+        0 <= x &&
+        x <= innerStage.width &&
+        0 <= y &&
+        y <= innerStage.height + CHART_MARGIN.bottom
+      ) {
+        const time = baseTimeScale.invert(x);
+        const shifter =
+          new Duration(trimGranularity).getCanonicalLength() > day.canonicalLength * 25
+            ? month
+            : day;
+        const start = shifter.floor(time, TZ_UTC);
+        const end = shifter.ceil(time, TZ_UTC);
+
+        let intervalBars: IntervalBar[] = [];
+        if (y <= innerStage.height) {
+          const bars = intervalTree.search([
+            time.valueOf() + 1,
+            time.valueOf() + 2,
+          ]) as IntervalBar[];
+
+          if (bars.length) {
+            const stat = statScale.invert(y);
+            const hoverBar = bars.find(
+              bar =>
+                bar.offset[shownIntervalStat] <= stat &&
+                stat < bar.offset[shownIntervalStat] + bar.normalized[shownIntervalStat],
+            );
+            intervalBars = hoverBar ? [hoverBar] : bars;
+          }
+        }
+        setBubbleInfoIfNeeded({
+          start,
+          end,
+          timeLabel: start.toISOString().slice(0, shifter === day ? 10 : 7),
+          intervalBars,
+        });
+      } else {
+        setBubbleInfo(undefined);
+      }
+    }
+  });
+
+  useGlobalEventListener('mouseup', (e: MouseEvent) => {
+    if (!mouseDownAt) return;
+    e.preventDefault();
+    setMouseDownAt(undefined);
+
+    const svg = svgRef.current;
+    if (!svg) return;
+    const rect = svg.getBoundingClientRect();
+    const x = e.clientX - rect.x - CHART_MARGIN.left;
+    const y = e.clientY - rect.y - CHART_MARGIN.top;
+
+    if (shiftOffset || selection) {
+      setShiftOffset(undefined);
+      if (mouseDownAt.action === 'shift' || e.shiftKey) {
+        if (shiftOffset) {
+          changeDateRange(offsetDateRange(dateRange, shiftOffset));
+        }
+      } else {
+        if (selection) {
+          setSelection({ ...selection, done: true });
+        }
+      }
+    } else if (0 <= x && x <= innerStage.width && 0 <= y && y <= innerStage.height) {
+      const time = baseTimeScale.invert(x);
+
+      const bars = intervalTree.search([time.valueOf() + 1, time.valueOf() + 2]) as IntervalBar[];
+
+      if (bars.length) {
+        const stat = statScale.invert(y);
+        const hoverBar = bars.find(
+          bar =>
+            bar.offset[shownIntervalStat] <= stat &&
+            stat < bar.offset[shownIntervalStat] + bar.normalized[shownIntervalStat],
+        );
+        if (hoverBar) {
+          changeShownDatasource(shownDatasource ? undefined : hoverBar.datasource);
+        }
+      }
+    }
+  });
+
+  useGlobalEventListener('keydown', (e: KeyboardEvent) => {
+    if (e.key === 'Escape' && mouseDownAt) {
+      setMouseDownAt(undefined);
+      setSelection(undefined);
+    }
+  });
+
+  function startEndToXWidth({ start, end }: { start: Date; end: Date }) {
+    const xStart = clamp(timeScale(start), 0, innerStage.width);
+    const xEnd = clamp(timeScale(end), 0, innerStage.width);
+
+    return {
+      x: xStart,
+      width: Math.max(xEnd - xStart - 1, 1),
+    };
+  }
+
+  function segmentBarToRect(intervalBar: IntervalBar) {
+    const y0 = statScale(intervalBar.offset[shownIntervalStat]);
+    const y = statScale(
+      intervalBar.normalized[shownIntervalStat] + intervalBar.offset[shownIntervalStat],
+    );
+
+    return {
+      ...startEndToXWidth(intervalBar),
+      y: y,
+      height: y0 - y,
+    };
+  }
+
+  let hoveredOpenOn: PortalBubbleOpenOn | undefined;
+  if (svgRef.current) {
+    const rect = svgRef.current.getBoundingClientRect();
+
+    if (bubbleInfo) {
+      const hoveredIntervalBars = bubbleInfo.intervalBars;
+
+      let title: string | undefined;
+      let text: ReactNode;
+      if (hoveredIntervalBars.length === 0) {
+        title = bubbleInfo.timeLabel;
+        text = '';
+      } else if (hoveredIntervalBars.length === 1) {
+        const hoveredIntervalBar = hoveredIntervalBars[0];
+        title = `${formatStartDuration(
+          hoveredIntervalBar.start,
+          hoveredIntervalBar.originalTimeSpan,
+        )}${hoveredIntervalBar.realtime ? ' (realtime)' : ''}`;
+        text = (
+          <>
+            {!shownDatasource && <div>{`Datasource: ${hoveredIntervalBar.datasource}`}</div>}
+            <div>{`Size: ${
+              hoveredIntervalBar.realtime
+                ? 'estimated for realtime'
+                : formatIntervalStat('size', hoveredIntervalBar.size)
+            }`}</div>
+            <div>{`Rows: ${formatIntervalStat('rows', hoveredIntervalBar.rows)}`}</div>
+            <div>{`Segments: ${formatIntervalStat('segments', hoveredIntervalBar.segments)}`}</div>
+          </>
+        );
+      } else {
+        const datasources = uniq(hoveredIntervalBars.map(b => b.datasource));
+        const agg = aggregateSegmentStats(hoveredIntervalBars);
+        title = bubbleInfo.timeLabel;
+        text = (
+          <>
+            {!shownDatasource && (
+              <div>{`Totals for ${pluralIfNeeded(datasources.length, 'datasource')}`}</div>
+            )}
+            <div>{`Size: ${formatIntervalStat('size', agg.size)}`}</div>
+            <div>{`Rows: ${formatIntervalStat('rows', agg.rows)}`}</div>
+            <div>{`Segments: ${formatIntervalStat('segments', agg.segments)}`}</div>
+          </>
+        );
+      }
+
+      hoveredOpenOn = {
+        x:
+          rect.x +
+          CHART_MARGIN.left +
+          timeScale(new Date((bubbleInfo.start.valueOf() + bubbleInfo.end.valueOf()) / 2)),
+        y: rect.y + CHART_MARGIN.top,
+        title,
+        text,
+      };
+    } else if (selection) {
+      const selectedBars = intervalTree.search([
+        selection.start.valueOf() + 1,
+        selection.end.valueOf() - 1,
+      ]) as IntervalBar[];
+      const datasources = uniq(selectedBars.map(b => b.datasource));
+      const realtime = allSameValue(selectedBars.map(b => b.realtime));
+      const agg = aggregateSegmentStats(selectedBars);
+      hoveredOpenOn = {
+        x:
+          rect.x +
+          CHART_MARGIN.left +
+          timeScale(new Date((selection.start.valueOf() + selection.end.valueOf()) / 2)),
+        y: rect.y + CHART_MARGIN.top,
+        title: `${formatIsoDateOnly(selection.start)} → ${formatIsoDateOnly(selection.end)}`,
+        text: (
+          <>
+            {selectedBars.length ? (
+              <>
+                {!shownDatasource && (
+                  <div>{`Totals for ${pluralIfNeeded(datasources.length, 'datasource')}`}</div>
+                )}
+                <div>{`Size: ${formatIntervalStat('size', agg.size)}`}</div>
+                <div>{`Rows: ${formatIntervalStat('rows', agg.rows)}`}</div>
+                <div>{`Segments: ${formatIntervalStat('segments', agg.segments)}`}</div>
+              </>
+            ) : (
+              <div>No segments in this interval</div>
+            )}
+            {selection.done && (
+              <div className="button-bar">
+                <Button
+                  icon={IconNames.ZOOM_IN}
+                  text="Zoom in"
+                  intent={Intent.PRIMARY}
+                  small
+                  onClick={() => {
+                    if (!selection) return;
+                    setSelection(undefined);
+                    changeDateRange([selection.start, selection.end]);
+                  }}
+                />
+                {getIntervalActionButton?.(
+                  selection.start,
+                  selection.end,
+                  datasources.length === 1 ? datasources[0] : undefined,
+                  realtime,
+                )}
+              </div>
+            )}
+          </>
+        ),
+      };
+    }
+  }
+
+  function renderLoadRule(loadRule: Rule, i: number, isDefault: boolean) {
+    const [start, end] = loadRuleToDateRange(loadRule);
+    const { x, width } = startEndToXWidth({ start, end });
+    const title = RuleUtil.ruleToString(loadRule) + (isDefault ? ' (cluster default)' : '');
+    return (
+      <div
+        key={i}
+        className={classNames('load-rule', loadRuleToBaseType(loadRule))}
+        data-tooltip={title}
+        style={{
+          left: x,
+          width,
+        }}
+      >
+        {title}
+      </div>
+    );
+  }
+
+  const nowX = timeScale(now);
+  return (
+    <div className="segment-bar-chart-render">
+      <svg
+        ref={svgRef}
+        width={stage.width}
+        height={stage.height}
+        viewBox={`0 0 ${stage.width} ${stage.height}`}
+        preserveAspectRatio="xMinYMin meet"
+        onMouseDown={handleMouseDown}
+      >
+        <g transform={`translate(${CHART_MARGIN.left},${CHART_MARGIN.top})`}>
+          <ChartAxis
+            className="gridline-x"
+            transform="translate(0,0)"
+            axis={axisLeft(statScale)
+              .tickValues(statScale.ticks(3).filter(v => v !== 0))
+              .tickSize(-innerStage.width)
+              .tickFormat(() => '')
+              .tickSizeOuter(0)}
+          />
+          <ChartAxis
+            className="axis-x"
+            transform={`translate(0,${innerStage.height})`}
+            axis={axisBottom(timeScale)}
+          />
+          <rect
+            className={classNames('time-shift-indicator', {
+              shifting: typeof shiftOffset === 'number',
+            })}
+            x={0}
+            y={innerStage.height}
+            width={innerStage.width}
+            height={CHART_MARGIN.bottom}
+          />
+          <ChartAxis
+            className="axis-y"
+            axis={axisLeft(statScale)
+              .ticks(3)
+              .tickFormat(e => formatTickRate(e.valueOf()))}
+          />
+          <g className="bar-group">
+            {bubbleInfo && (
+              <rect
+                className="hover-highlight"
+                {...startEndToXWidth(bubbleInfo)}
+                y={0}
+                height={innerStage.height}
+              />
+            )}
+            {0 < nowX && nowX < innerStage.width && (
+              <line className="now-line" x1={nowX} x2={nowX} y1={0} y2={innerStage.height + 8} />
+            )}
+            {intervalBars.map((intervalBar, i) => {
+              return (
+                <rect
+                  key={i}
+                  className={classNames('bar-unit', { realtime: intervalBar.realtime })}
+                  {...segmentBarToRect(intervalBar)}
+                  fill={getDatasourceColor(intervalBar.datasource)}
+                />
+              );
+            })}
+            {bubbleInfo?.intervalBars.length === 1 &&
+              bubbleInfo.intervalBars.map((intervalBar, i) => (
+                <rect key={i} className="hovered-bar" {...segmentBarToRect(intervalBar)} />
+              ))}
+            {selection && (
+              <rect
+                className={classNames('selection', { done: selection.done })}
+                {...startEndToXWidth(selection)}
+                y={0}
+                height={innerStage.height}
+              />
+            )}
+            {!!shiftOffset && (
+              <rect
+                className="shifter"
+                x={shiftOffset > 0 ? timeScale(dateRange[1]) : 0}
+                y={0}
+                height={innerStage.height}
+                width={
+                  shiftOffset > 0
+                    ? innerStage.width - timeScale(dateRange[1])
+                    : timeScale(dateRange[0])
+                }
+              />
+            )}
+          </g>
+        </g>
+      </svg>
+      {(datasourceRules || datasourceRulesError) && (
+        <div className="rule-tape" style={{ left: CHART_MARGIN.left, right: CHART_MARGIN.right }}>
+          {datasourceRules?.defaultLoadRules.map((rule, index) =>
+            renderLoadRule(rule, index, true),
+          )}
+          {datasourceRules?.loadRules.map((rule, index) => renderLoadRule(rule, index, false))}
+          {datasourceRulesError && (
+            <div className="rule-error">Rule loading error: {datasourceRulesError}</div>
+          )}
+        </div>
+      )}
+      {!intervalRows.length && (
+        <div className="empty-placeholder">
+          <div className="no-data-text">There are no segments in the selected range</div>
+        </div>
+      )}
+      <PortalBubble
+        className="segment-bar-chart-bubble"
+        openOn={hoveredOpenOn}
+        onClose={selection?.done ? () => setSelection(undefined) : undefined}
+        mute
+        direction="up"
+      />
+    </div>
+  );
+};
diff --git a/web-console/src/components/segment-timeline/bar-unit.spec.tsx b/web-console/src/components/segment-timeline/segment-bar-chart.scss
similarity index 68%
rename from web-console/src/components/segment-timeline/bar-unit.spec.tsx
rename to web-console/src/components/segment-timeline/segment-bar-chart.scss
index d5926dcf69f0..130997119e3e 100644
--- a/web-console/src/components/segment-timeline/bar-unit.spec.tsx
+++ b/web-console/src/components/segment-timeline/segment-bar-chart.scss
@@ -16,18 +16,6 @@
  * limitations under the License.
  */
 
-import { render } from '@testing-library/react';
-
-import { BarUnit } from './bar-unit';
-
-describe('BarUnit', () => {
-  it('matches snapshot', () => {
-    const barGroup = (
-      <svg>
-        <BarUnit x={10} y={10} width={10} height={10} />
-      </svg>
-    );
-    const { container } = render(barGroup);
-    expect(container.firstChild).toMatchSnapshot();
-  });
-});
+.segment-bar-chart {
+  position: relative;
+}
diff --git a/web-console/src/components/segment-timeline/segment-bar-chart.tsx b/web-console/src/components/segment-timeline/segment-bar-chart.tsx
new file mode 100644
index 000000000000..297ea4afe617
--- /dev/null
+++ b/web-console/src/components/segment-timeline/segment-bar-chart.tsx
@@ -0,0 +1,162 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { C, F, L, N, sql, SqlExpression, SqlQuery } from 'druid-query-toolkit';
+import { useMemo } from 'react';
+
+import { END_OF_TIME_DATE, type Rule, RuleUtil, START_OF_TIME_DATE } from '../../druid-models';
+import type { Capabilities } from '../../helpers';
+import { useQueryManager } from '../../hooks';
+import { Api } from '../../singletons';
+import { Duration, filterMap, getApiArray, queryDruidSql, TZ_UTC } from '../../utils';
+import { Loader } from '../loader/loader';
+
+import type { IntervalRow } from './common';
+import type { SegmentBarChartRenderProps } from './segment-bar-chart-render';
+import { SegmentBarChartRender } from './segment-bar-chart-render';
+
+import './segment-bar-chart.scss';
+
+export interface SegmentBarChartProps
+  extends Omit<
+    SegmentBarChartRenderProps,
+    'intervalRows' | 'datasourceRules' | 'datasourceRulesError'
+  > {
+  capabilities: Capabilities;
+}
+
+export const SegmentBarChart = function SegmentBarChart(props: SegmentBarChartProps) {
+  const { capabilities, dateRange, shownDatasource, ...otherProps } = props;
+
+  const intervalsQuery = useMemo(
+    () => ({ capabilities, dateRange, shownDatasource: shownDatasource }),
+    [capabilities, dateRange, shownDatasource],
+  );
+
+  const [intervalRowsState] = useQueryManager({
+    query: intervalsQuery,
+    processQuery: async ({ capabilities, dateRange, shownDatasource }, cancelToken) => {
+      if (capabilities.hasSql()) {
+        const query = SqlQuery.from(N('sys').table('segments'))
+          .changeWhereExpression(
+            SqlExpression.and(
+              sql`"start" <= '${dateRange[1].toISOString()}' AND '${dateRange[0].toISOString()}' < "end"`,
+              C('start').unequal(START_OF_TIME_DATE),
+              C('end').unequal(END_OF_TIME_DATE),
+              C('is_overshadowed').equal(0),
+              shownDatasource ? C('datasource').equal(L(shownDatasource)) : undefined,
+            ),
+          )
+          .addSelect(C('start'), { addToGroupBy: 'end' })
+          .addSelect(C('end'), { addToGroupBy: 'end' })
+          .addSelect(C('datasource'), { addToGroupBy: 'end' })
+          .addSelect(C('is_realtime').as('realtime'), { addToGroupBy: 'end' })
+          .addSelect(F.count().as('segments'))
+          .addSelect(F.sum(C('size')).as('size'))
+          .addSelect(F.sum(C('num_rows')).as('rows'))
+          .toString();
+
+        return (await queryDruidSql({ query }, cancelToken)).map(sr => {
+          const start = new Date(sr.start);
+          const end = new Date(sr.end);
+
+          return {
+            ...sr,
+            start,
+            end,
+            realtime: Boolean(sr.realtime),
+            originalTimeSpan: Duration.fromRange(start, end, TZ_UTC),
+          } as IntervalRow;
+        });
+      } else {
+        return filterMap(
+          await getApiArray(
+            `/druid/coordinator/v1/metadata/segments?includeOvershadowedStatus&includeRealtimeSegments&${
+              shownDatasource ? `datasources=${Api.encodePath(shownDatasource)}` : ''
+            }`,
+            cancelToken,
+          ),
+          (segment: any) => {
+            if (segment.overshadowed) return; // We have to include overshadowed segments to get the realtime segments in this API
+            const [startStr, endStr] = segment.interval.split('/');
+            if (startStr === START_OF_TIME_DATE && endStr === END_OF_TIME_DATE) return;
+            const start = new Date(startStr);
+            const end = new Date(endStr);
+            if (!(start <= dateRange[1] && dateRange[0] < end)) return;
+
+            return {
+              start,
+              end,
+              datasource: segment.dataSource,
+              realtime: Boolean(segment.realtime),
+              originalTimeSpan: Duration.fromRange(start, end, TZ_UTC),
+              segments: 1,
+              size: segment.size,
+              rows: segment.num_rows || 0, // segment.num_rows is really null on this API :-(
+            } as IntervalRow;
+          },
+        );
+      }
+    },
+  });
+
+  const [allLoadRulesState] = useQueryManager({
+    query: shownDatasource ? '' : undefined,
+    processQuery: async (_, cancelToken) => {
+      return (
+        await Api.instance.get<Record<string, Rule[]>>('/druid/coordinator/v1/rules', {
+          cancelToken,
+        })
+      ).data;
+    },
+  });
+
+  const datasourceRules = useMemo(() => {
+    const allLoadRules = allLoadRulesState.data;
+    if (!allLoadRules || !shownDatasource) return;
+    return {
+      loadRules: (allLoadRules[shownDatasource] || []).toReversed(),
+      defaultLoadRules: (allLoadRules[RuleUtil.DEFAULT_RULES_KEY] || []).toReversed(),
+    };
+  }, [allLoadRulesState.data, shownDatasource]);
+
+  if (intervalRowsState.error) {
+    return (
+      <div className="empty-placeholder">
+        <span className="error-text">{`Error when loading data: ${intervalRowsState.getErrorMessage()}`}</span>
+      </div>
+    );
+  }
+
+  const intervalRows = intervalRowsState.getSomeData();
+  return (
+    <>
+      {intervalRows && (
+        <SegmentBarChartRender
+          intervalRows={intervalRows}
+          datasourceRules={datasourceRules}
+          datasourceRulesError={allLoadRulesState.getErrorMessage()}
+          dateRange={dateRange}
+          shownDatasource={shownDatasource}
+          {...otherProps}
+        />
+      )}
+      {intervalRowsState.loading && <Loader />}
+    </>
+  );
+};
diff --git a/web-console/src/components/segment-timeline/segment-timeline.scss b/web-console/src/components/segment-timeline/segment-timeline.scss
index aa437052d617..4224c1cab89d 100644
--- a/web-console/src/components/segment-timeline/segment-timeline.scss
+++ b/web-console/src/components/segment-timeline/segment-timeline.scss
@@ -16,12 +16,20 @@
  * limitations under the License.
  */
 
+@import '../../variables';
+
 .segment-timeline {
-  display: grid;
-  grid-template-columns: 1fr 220px;
+  .control-bar {
+    @include card-like;
+    height: 34px;
+    display: flex;
+    align-items: start;
+    padding: 5px;
+    gap: 10px;
 
-  .loader {
-    width: 85%;
+    & > .expander {
+      flex: 1;
+    }
   }
 
   .loading-error {
@@ -31,14 +39,16 @@
     transform: translate(-50%, -50%);
   }
 
-  .no-data-text {
+  .chart-container {
     position: absolute;
-    left: 30vw;
-    top: 15vh;
-    font-size: 20px;
-  }
+    top: 34px;
+    width: 100%;
+    bottom: 0;
+    overflow: hidden;
 
-  .side-control {
-    padding-top: 20px;
+    .segment-bar-chart,
+    .segment-bar-chart-render {
+      @include pin-full;
+    }
   }
 }
diff --git a/web-console/src/components/segment-timeline/segment-timeline.spec.tsx b/web-console/src/components/segment-timeline/segment-timeline.spec.tsx
index 4f95842801a4..ebc83ae143c7 100644
--- a/web-console/src/components/segment-timeline/segment-timeline.spec.tsx
+++ b/web-console/src/components/segment-timeline/segment-timeline.spec.tsx
@@ -16,40 +16,42 @@
  * limitations under the License.
  */
 
-import { sane } from '@druid-toolkit/query';
 import { render } from '@testing-library/react';
 
 import { Capabilities } from '../../helpers';
+import { QueryState } from '../../utils';
 
 import { SegmentTimeline } from './segment-timeline';
 
-jest.useFakeTimers('modern').setSystemTime(Date.parse('2021-06-08T12:34:56Z'));
+jest.useFakeTimers('modern').setSystemTime(Date.parse('2024-11-19T12:34:56Z'));
 
-describe('SegmentTimeline', () => {
-  it('.getSqlQuery', () => {
-    expect(
-      SegmentTimeline.getSqlQuery([
-        new Date('2020-01-01T00:00:00Z'),
-        new Date('2021-02-01T00:00:00Z'),
-      ]),
-    ).toEqual(sane`
-      SELECT
-        "start", "end", "datasource",
-        COUNT(*) AS "count",
-        SUM("size") AS "size"
-      FROM sys.segments
-      WHERE
-        '2020-01-01T00:00:00.000Z' <= "start" AND
-        "end" <= '2021-02-01T00:00:00.000Z' AND
-        is_published = 1 AND
-        is_overshadowed = 0
-      GROUP BY 1, 2, 3
-      ORDER BY "start" DESC
-    `);
-  });
+jest.mock('../../hooks', () => {
+  return {
+    useQueryManager: (options: any) => {
+      if (options.initQuery instanceof Capabilities) {
+        // This is a query for data sources
+        return [new QueryState({ data: ['ds1', 'ds2'] })];
+      }
+
+      if (options.query === null) {
+        // This is a query for the data source time range
+        return [
+          new QueryState({
+            data: [new Date('2024-11-01 00:00:00Z'), new Date('2024-11-18 00:00:00Z')],
+          }),
+        ];
+      }
 
+      return new QueryState({ error: new Error('not covered') });
+    },
+  };
+});
+
+describe('SegmentTimeline', () => {
   it('matches snapshot', () => {
-    const segmentTimeline = <SegmentTimeline capabilities={Capabilities.FULL} />;
+    const segmentTimeline = (
+      <SegmentTimeline capabilities={Capabilities.FULL} datasource={undefined} />
+    );
     const { container } = render(segmentTimeline);
     expect(container.firstChild).toMatchSnapshot();
   });
diff --git a/web-console/src/components/segment-timeline/segment-timeline.tsx b/web-console/src/components/segment-timeline/segment-timeline.tsx
index 8aee0c66d477..2774c73276eb 100644
--- a/web-console/src/components/segment-timeline/segment-timeline.tsx
+++ b/web-console/src/components/segment-timeline/segment-timeline.tsx
@@ -16,628 +16,361 @@
  * limitations under the License.
  */
 
-import { Button, FormGroup, MenuItem, ResizeSensor, SegmentedControl } from '@blueprintjs/core';
-import type { DateRange, NonNullDateRange } from '@blueprintjs/datetime';
-import { DateRangeInput3 } from '@blueprintjs/datetime2';
+import {
+  Button,
+  ButtonGroup,
+  Intent,
+  Menu,
+  MenuItem,
+  Popover,
+  Position,
+  ResizeSensor,
+} from '@blueprintjs/core';
+import type { NonNullDateRange } from '@blueprintjs/datetime';
+import { DateRangePicker3 } from '@blueprintjs/datetime2';
 import { IconNames } from '@blueprintjs/icons';
-import type { ItemPredicate, ItemRenderer } from '@blueprintjs/select';
 import { Select } from '@blueprintjs/select';
-import type { AxisScale } from 'd3-axis';
-import { scaleLinear, scaleUtc } from 'd3-scale';
-import enUS from 'date-fns/locale/en-US';
-import React from 'react';
+import { C, L, N, SqlExpression, SqlQuery } from 'druid-query-toolkit';
+import { useEffect, useMemo, useState } from 'react';
 
+import { END_OF_TIME_DATE, START_OF_TIME_DATE } from '../../druid-models';
 import type { Capabilities } from '../../helpers';
-import { Api } from '../../singletons';
+import { useQueryManager } from '../../hooks';
 import {
-  ceilToUtcDay,
-  formatBytes,
-  formatInteger,
+  checkedCircleIcon,
+  day,
+  Duration,
+  getApiArray,
   isNonNullRange,
   localToUtcDateRange,
+  maxDate,
   queryDruidSql,
-  QueryManager,
-  uniq,
+  TZ_UTC,
   utcToLocalDateRange,
 } from '../../utils';
+import { Stage } from '../../utils/stage';
 import { Loader } from '../loader/loader';
 
-import type { BarUnitData } from './stacked-bar-chart';
-import { StackedBarChart } from './stacked-bar-chart';
+import type { IntervalStat } from './common';
+import { formatIsoDateOnly, getIntervalStatTitle, INTERVAL_STATS } from './common';
+import type { SegmentBarChartProps } from './segment-bar-chart';
+import { SegmentBarChart } from './segment-bar-chart';
 
 import './segment-timeline.scss';
 
-interface SegmentTimelineProps {
-  capabilities: Capabilities;
-}
-
-type ActiveDataType = 'sizeData' | 'countData';
-
-interface SegmentTimelineState {
-  chartHeight: number;
-  chartWidth: number;
-  data?: Record<string, any>;
-  datasources: string[];
-  stackedData?: Record<string, BarUnitData[]>;
-  singleDatasourceData?: Record<string, Record<string, BarUnitData[]>>;
-  activeDatasource: string | null;
-  activeDataType: ActiveDataType;
-  dataToRender: BarUnitData[];
-  loading: boolean;
-  error?: Error;
-  xScale: AxisScale<Date> | null;
-  yScale: AxisScale<number> | null;
-  dateRange: NonNullDateRange;
-  selectedDateRange?: DateRange;
+const DEFAULT_SHOWN_DURATION = new Duration('P1Y');
+const SHOWN_DURATION_OPTIONS: Duration[] = [
+  new Duration('P1D'),
+  new Duration('P1W'),
+  new Duration('P1M'),
+  new Duration('P3M'),
+  new Duration('P1Y'),
+  new Duration('P5Y'),
+  new Duration('P10Y'),
+];
+
+function getDateRange(shownDuration: Duration): NonNullDateRange {
+  const end = day.ceil(new Date(), TZ_UTC);
+  return [shownDuration.shift(end, TZ_UTC, -1), end];
 }
 
-interface BarChartScales {
-  xScale: AxisScale<Date>;
-  yScale: AxisScale<number>;
+function formatDateRange(dateRange: NonNullDateRange): string {
+  return `${formatIsoDateOnly(dateRange[0])} → ${formatIsoDateOnly(dateRange[1])}`;
 }
 
-interface IntervalRow {
-  start: string;
-  end: string;
-  datasource: string;
-  count: number;
-  size: number;
+function dateRangesEqual(dr1: NonNullDateRange, dr2: NonNullDateRange): boolean {
+  return dr1[0].valueOf() === dr2[0].valueOf() && dr2[1].valueOf() === dr2[1].valueOf();
 }
 
-const DEFAULT_TIME_SPAN_MONTHS = 3;
-
-function getDefaultDateRange(): NonNullDateRange {
-  const start = ceilToUtcDay(new Date());
-  const end = new Date(start.valueOf());
-  start.setUTCMonth(start.getUTCMonth() - DEFAULT_TIME_SPAN_MONTHS);
-  return [start, end];
+interface SegmentTimelineProps extends Pick<SegmentBarChartProps, 'getIntervalActionButton'> {
+  capabilities: Capabilities;
+  datasource: string | undefined;
 }
 
-export class SegmentTimeline extends React.PureComponent<
-  SegmentTimelineProps,
-  SegmentTimelineState
-> {
-  static COLORS = [
-    '#b33040',
-    '#d25c4d',
-    '#f2b447',
-    '#d9d574',
-    '#4FAA7E',
-    '#57ceff',
-    '#789113',
-    '#098777',
-    '#b33040',
-    '#d2757b',
-    '#f29063',
-    '#d9a241',
-    '#80aa61',
-    '#c4ff9e',
-    '#915412',
-    '#87606c',
-  ];
-
-  static getColor(index: number): string {
-    return SegmentTimeline.COLORS[index % SegmentTimeline.COLORS.length];
-  }
-
-  static getSqlQuery(dateRange: NonNullDateRange): string {
-    return `SELECT
-  "start", "end", "datasource",
-  COUNT(*) AS "count",
-  SUM("size") AS "size"
-FROM sys.segments
-WHERE
-  '${dateRange[0].toISOString()}' <= "start" AND
-  "end" <= '${dateRange[1].toISOString()}' AND
-  is_published = 1 AND
-  is_overshadowed = 0
-GROUP BY 1, 2, 3
-ORDER BY "start" DESC`;
-  }
-
-  static processRawData(data: IntervalRow[]) {
-    if (data === null) return [];
+export const SegmentTimeline = function SegmentTimeline(props: SegmentTimelineProps) {
+  const { capabilities, datasource, ...otherProps } = props;
+  const [stage, setStage] = useState<Stage | undefined>();
+  const [activeSegmentStat, setActiveSegmentStat] = useState<IntervalStat>('size');
+  const [shownDatasource, setShownDatasource] = useState<string | undefined>(datasource);
+  const [dateRange, setDateRange] = useState<NonNullDateRange | undefined>();
+  const [showCustomDatePicker, setShowCustomDatePicker] = useState(false);
+
+  useEffect(() => {
+    setShownDatasource(datasource);
+  }, [datasource]);
+
+  const defaultDateRange = useMemo(() => {
+    return getDateRange(DEFAULT_SHOWN_DURATION);
+  }, []);
+
+  const [datasourcesState] = useQueryManager<Capabilities, string[]>({
+    initQuery: capabilities,
+    processQuery: async (capabilities, cancelToken) => {
+      if (capabilities.hasSql()) {
+        const tables = await queryDruidSql<{ TABLE_NAME: string }>(
+          {
+            query: `SELECT TABLE_NAME FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_TYPE = 'TABLE'`,
+          },
+          cancelToken,
+        );
 
-    const countData: Record<string, any> = {};
-    const sizeData: Record<string, any> = {};
-    data.forEach(entry => {
-      const start = entry.start;
-      const day = start.split('T')[0];
-      const datasource = entry.datasource;
-      const count = entry.count;
-      const segmentSize = entry.size;
-      if (countData[day] === undefined) {
-        countData[day] = {
-          day,
-          [datasource]: count,
-          total: count,
-        };
-        sizeData[day] = {
-          day,
-          [datasource]: segmentSize,
-          total: segmentSize,
-        };
+        return tables.map(d => d.TABLE_NAME);
       } else {
-        const countDataEntry: number | undefined = countData[day][datasource];
-        countData[day][datasource] = count + (countDataEntry === undefined ? 0 : countDataEntry);
-        const sizeDataEntry: number | undefined = sizeData[day][datasource];
-        sizeData[day][datasource] = segmentSize + (sizeDataEntry === undefined ? 0 : sizeDataEntry);
-        countData[day].total += count;
-        sizeData[day].total += segmentSize;
+        return await getApiArray(`/druid/coordinator/v1/datasources`, cancelToken);
       }
-    });
-
-    const countDataArray = Object.keys(countData)
-      .reverse()
-      .map((time: any) => {
-        return countData[time];
-      });
-
-    const sizeDataArray = Object.keys(sizeData)
-      .reverse()
-      .map((time: any) => {
-        return sizeData[time];
-      });
-
-    return { countData: countDataArray, sizeData: sizeDataArray };
-  }
-
-  static calculateStackedData(
-    data: Record<string, any>,
-    datasources: string[],
-  ): Record<string, BarUnitData[]> {
-    const newStackedData: Record<string, BarUnitData[]> = {};
-    Object.keys(data).forEach((type: any) => {
-      const stackedData: any = data[type].map((d: any) => {
-        let y0 = 0;
-        return datasources.map((datasource: string, i) => {
-          const barUnitData = {
-            x: d.day,
-            y: d[datasource] === undefined ? 0 : d[datasource],
-            y0,
-            datasource,
-            color: SegmentTimeline.getColor(i),
-            dailySize: d.total,
-          };
-          y0 += d[datasource] === undefined ? 0 : d[datasource];
-          return barUnitData;
-        });
-      });
-      newStackedData[type] = stackedData.flat();
-    });
+    },
+  });
+
+  const [initDatasourceDateRangeState] = useQueryManager<string | null, NonNullDateRange>({
+    query: dateRange ? undefined : shownDatasource ?? null,
+    processQuery: async (datasource, cancelToken) => {
+      let queriedStart: Date;
+      let queriedEnd: Date;
+      if (capabilities.hasSql()) {
+        const baseQuery = SqlQuery.from(N('sys').table('segments'))
+          .changeWhereExpression(
+            SqlExpression.and(
+              C('start').unequal(START_OF_TIME_DATE),
+              C('end').unequal(END_OF_TIME_DATE),
+              C('is_overshadowed').equal(0),
+              datasource ? C('datasource').equal(L(datasource)) : undefined,
+            ),
+          )
+          .changeLimitValue(1);
 
-    return newStackedData;
-  }
+        const endQuery = baseQuery
+          .addSelect(C('end'), { addToOrderBy: 'end', direction: 'DESC' })
+          .toString();
 
-  static calculateSingleDatasourceData(
-    data: Record<string, any>,
-    datasources: string[],
-  ): Record<string, Record<string, BarUnitData[]>> {
-    const singleDatasourceData: Record<string, Record<string, BarUnitData[]>> = {};
-    Object.keys(data).forEach(dataType => {
-      singleDatasourceData[dataType] = {};
-      datasources.forEach((datasource, i) => {
-        const currentData = data[dataType];
-        if (currentData.length === 0) return;
-        const dataResult = currentData.map((d: any) => {
-          let y = 0;
-          if (d[datasource] !== undefined) {
-            y = d[datasource];
-          }
-          return {
-            x: d.day,
-            y,
-            datasource,
-            color: SegmentTimeline.getColor(i),
-            dailySize: d.total,
-          };
-        });
-        if (!dataResult.every((d: any) => d.y === 0)) {
-          singleDatasourceData[dataType][datasource] = dataResult;
+        const endRes = await queryDruidSql<{ end: string }>({ query: endQuery }, cancelToken).catch(
+          () => [],
+        );
+        if (endRes.length !== 1) {
+          return getDateRange(DEFAULT_SHOWN_DURATION);
         }
-      });
-    });
 
-    return singleDatasourceData;
-  }
-
-  private readonly dataQueryManager: QueryManager<
-    { capabilities: Capabilities; dateRange: NonNullDateRange },
-    any
-  >;
-
-  private readonly chartMargin = { top: 40, right: 15, bottom: 20, left: 60 };
-
-  constructor(props: SegmentTimelineProps) {
-    super(props);
-    const dateRange = getDefaultDateRange();
-
-    this.state = {
-      chartWidth: 1, // Dummy init values to be replaced
-      chartHeight: 1, // after first render
-      data: {},
-      datasources: [],
-      stackedData: {},
-      singleDatasourceData: {},
-      dataToRender: [],
-      activeDatasource: null,
-      activeDataType: 'sizeData',
-      loading: true,
-      xScale: null,
-      yScale: null,
-      dateRange,
-    };
-
-    this.dataQueryManager = new QueryManager({
-      processQuery: async ({ capabilities, dateRange }, cancelToken) => {
-        let intervals: IntervalRow[];
-        let datasources: string[];
-        if (capabilities.hasSql()) {
-          intervals = await queryDruidSql(
-            {
-              query: SegmentTimeline.getSqlQuery(dateRange),
-            },
-            cancelToken,
-          );
-          datasources = uniq(intervals.map(r => r.datasource).sort());
-        } else if (capabilities.hasCoordinatorAccess()) {
-          const startIso = dateRange[0].toISOString();
+        queriedEnd = day.ceil(new Date(endRes[0].end), TZ_UTC);
 
-          datasources = (
-            await Api.instance.get(`/druid/coordinator/v1/datasources`, { cancelToken })
-          ).data;
-          intervals = (
-            await Promise.all(
-              datasources.map(async datasource => {
-                const intervalMap = (
-                  await Api.instance.get(
-                    `/druid/coordinator/v1/datasources/${Api.encodePath(
-                      datasource,
-                    )}/intervals?simple`,
-                    { cancelToken },
-                  )
-                ).data;
+        const startQuery = baseQuery
+          .addSelect(C('start'), { addToOrderBy: 'end', direction: 'ASC' })
+          .toString();
 
-                return Object.keys(intervalMap)
-                  .map(interval => {
-                    const [start, end] = interval.split('/');
-                    const { count, size } = intervalMap[interval];
-                    return {
-                      start,
-                      end,
-                      datasource,
-                      count,
-                      size,
-                    };
-                  })
-                  .filter(a => startIso < a.start);
-              }),
-            )
-          )
-            .flat()
-            .sort((a, b) => b.start.localeCompare(a.start));
-        } else {
-          throw new Error(`must have SQL or coordinator access`);
+        const startRes = await queryDruidSql<{ start: string }>(
+          { query: startQuery },
+          cancelToken,
+        ).catch(() => []);
+        if (startRes.length !== 1) {
+          return [DEFAULT_SHOWN_DURATION.shift(queriedEnd, TZ_UTC, -1), queriedEnd]; // Should not really get here
         }
 
-        const data = SegmentTimeline.processRawData(intervals);
-        const stackedData = SegmentTimeline.calculateStackedData(data, datasources);
-        const singleDatasourceData = SegmentTimeline.calculateSingleDatasourceData(
-          data,
-          datasources,
-        );
-        return { data, datasources, stackedData, singleDatasourceData };
-      },
-      onStateChange: ({ data, loading, error }) => {
-        this.setState({
-          data: data ? data.data : undefined,
-          datasources: data ? data.datasources : [],
-          stackedData: data ? data.stackedData : undefined,
-          singleDatasourceData: data ? data.singleDatasourceData : undefined,
-          loading,
-          error,
-        });
-      },
-    });
-  }
-
-  componentDidMount(): void {
-    const { capabilities } = this.props;
-    const { dateRange } = this.state;
-
-    if (isNonNullRange(dateRange)) {
-      this.dataQueryManager.runQuery({ capabilities, dateRange });
-    }
-  }
-
-  componentWillUnmount(): void {
-    this.dataQueryManager.terminate();
-  }
-
-  componentDidUpdate(_prevProps: SegmentTimelineProps, prevState: SegmentTimelineState): void {
-    const { activeDatasource, activeDataType, singleDatasourceData, stackedData } = this.state;
-    if (
-      prevState.data !== this.state.data ||
-      prevState.activeDataType !== this.state.activeDataType ||
-      prevState.activeDatasource !== this.state.activeDatasource ||
-      prevState.chartWidth !== this.state.chartWidth ||
-      prevState.chartHeight !== this.state.chartHeight
-    ) {
-      const scales: BarChartScales | undefined = this.calculateScales();
-      const dataToRender: BarUnitData[] | undefined = activeDatasource
-        ? singleDatasourceData
-          ? singleDatasourceData[activeDataType][activeDatasource]
-          : undefined
-        : stackedData
-        ? stackedData[activeDataType]
-        : undefined;
-
-      if (scales && dataToRender) {
-        this.setState({
-          dataToRender,
-          xScale: scales.xScale,
-          yScale: scales.yScale,
-        });
+        queriedStart = day.floor(new Date(startRes[0].start), TZ_UTC);
+      } else {
+        // Don't bother querying if there is no SQL
+        return getDateRange(DEFAULT_SHOWN_DURATION);
       }
-    }
-  }
-
-  private calculateScales(): BarChartScales | undefined {
-    const {
-      chartWidth,
-      chartHeight,
-      data,
-      activeDataType,
-      activeDatasource,
-      singleDatasourceData,
-      dateRange,
-    } = this.state;
-    if (!data || !Object.keys(data).length || !isNonNullRange(dateRange)) return;
-    const activeData = data[activeDataType];
 
-    let yDomain: number[] = [
-      0,
-      activeData.length === 0
-        ? 0
-        : activeData.reduce((max: any, d: any) => (max.total > d.total ? max : d)).total,
-    ];
-
-    if (
-      activeDatasource !== null &&
-      singleDatasourceData![activeDataType][activeDatasource] !== undefined
-    ) {
-      yDomain = [
-        0,
-        singleDatasourceData![activeDataType][activeDatasource].reduce((max: any, d: any) =>
-          max.y > d.y ? max : d,
-        ).y,
+      return [
+        maxDate(queriedStart, DEFAULT_SHOWN_DURATION.shift(queriedEnd, TZ_UTC, -1)),
+        queriedEnd,
       ];
-    }
-
-    const xScale: AxisScale<Date> = scaleUtc()
-      .domain(dateRange)
-      .range([0, chartWidth - this.chartMargin.left - this.chartMargin.right]);
-
-    const yScale: AxisScale<number> = scaleLinear()
-      .rangeRound([chartHeight - this.chartMargin.top - this.chartMargin.bottom, 0])
-      .domain(yDomain);
-
-    return {
-      xScale,
-      yScale,
-    };
+    },
+  });
+
+  const effectiveDateRange =
+    dateRange ||
+    initDatasourceDateRangeState.data ||
+    (initDatasourceDateRangeState.isLoading() ? undefined : defaultDateRange);
+
+  let previousDateRange: NonNullDateRange | undefined;
+  let zoomedOutDateRange: NonNullDateRange | undefined;
+  let nextDateRange: NonNullDateRange | undefined;
+  if (effectiveDateRange) {
+    const d = Duration.fromRange(effectiveDateRange[0], effectiveDateRange[1], TZ_UTC);
+    const shiftStartBack = d.shift(effectiveDateRange[0], TZ_UTC, -1);
+    const shiftEndForward = d.shift(effectiveDateRange[1], TZ_UTC);
+    const now = day.ceil(new Date(), TZ_UTC);
+    previousDateRange = [shiftStartBack, effectiveDateRange[0]];
+    zoomedOutDateRange = [shiftStartBack, shiftEndForward < now ? shiftEndForward : now];
+    nextDateRange = [effectiveDateRange[1], shiftEndForward];
   }
 
-  private readonly formatTick = (n: number) => {
-    if (isNaN(n)) return '';
-    const { activeDataType } = this.state;
-    if (activeDataType === 'countData') {
-      return formatInteger(n);
-    } else {
-      return formatBytes(n);
-    }
-  };
-
-  private readonly handleResize = (entries: ResizeObserverEntry[]) => {
-    const chartRect = entries[0].contentRect;
-    this.setState({
-      chartWidth: chartRect.width,
-      chartHeight: chartRect.height,
-    });
-  };
-
-  renderStackedBarChart() {
-    const {
-      chartWidth,
-      chartHeight,
-      loading,
-      dataToRender,
-      activeDataType,
-      error,
-      xScale,
-      yScale,
-      data,
-      activeDatasource,
-      dateRange,
-    } = this.state;
-
-    if (loading) {
-      return (
-        <div>
-          <Loader loading={loading} />
-        </div>
-      );
-    }
-
-    if (error) {
-      return (
-        <div>
-          <span className="no-data-text">Error when loading data: {error.message}</span>
-        </div>
-      );
-    }
-
-    if (xScale === null || yScale === null) {
-      return (
-        <div>
-          <span className="no-data-text">Error when calculating scales</span>
-        </div>
-      );
-    }
-
-    if (data![activeDataType].length === 0) {
-      return (
-        <div>
-          <span className="no-data-text">There are no segments for the selected interval</span>
-        </div>
-      );
-    }
-
-    if (
-      activeDatasource !== null &&
-      data![activeDataType].every((d: any) => d[activeDatasource] === undefined)
-    ) {
-      return (
-        <div>
-          <span className="no-data-text">
-            No data available for <i>{activeDatasource}</i>
-          </span>
-        </div>
-      );
-    }
-
-    const millisecondsPerDay = 24 * 60 * 60 * 1000;
-    const barCounts = (dateRange[1].getTime() - dateRange[0].getTime()) / millisecondsPerDay;
-    const barWidth = Math.max(
-      0,
-      (chartWidth - this.chartMargin.left - this.chartMargin.right) / barCounts,
-    );
-    return (
-      <ResizeSensor onResize={this.handleResize}>
-        <StackedBarChart
-          dataToRender={dataToRender}
-          svgHeight={chartHeight}
-          svgWidth={chartWidth}
-          margin={this.chartMargin}
-          changeActiveDatasource={(datasource: string | null) =>
-            this.setState(prevState => ({
-              activeDatasource: prevState.activeDatasource ? null : datasource,
-            }))
+  return (
+    <div className="segment-timeline">
+      <div className="control-bar">
+        <ButtonGroup>
+          <Select<string>
+            items={datasourcesState.data || []}
+            disabled={datasourcesState.isError()}
+            onItemSelect={setShownDatasource}
+            itemRenderer={(val, { handleClick, handleFocus, modifiers }) => {
+              if (!modifiers.matchesPredicate) return null;
+              return (
+                <MenuItem
+                  key={val}
+                  disabled={modifiers.disabled}
+                  active={modifiers.active}
+                  onClick={handleClick}
+                  onFocus={handleFocus}
+                  roleStructure="listoption"
+                  text={val}
+                />
+              );
+            }}
+            noResults={<MenuItem disabled text="No results" roleStructure="listoption" />}
+            itemPredicate={(query, val, _index, exactMatch) => {
+              const normalizedTitle = val.toLowerCase();
+              const normalizedQuery = query.toLowerCase();
+
+              if (exactMatch) {
+                return normalizedTitle === normalizedQuery;
+              } else {
+                return normalizedTitle.includes(normalizedQuery);
+              }
+            }}
+          >
+            <Button
+              text={`Datasource: ${shownDatasource ?? 'all'}`}
+              small
+              rightIcon={IconNames.CARET_DOWN}
+              intent={datasourcesState.isError() ? Intent.WARNING : undefined}
+              data-tooltip={
+                datasourcesState.isError()
+                  ? `Error: ${datasourcesState.getErrorMessage()}`
+                  : undefined
+              }
+            />
+          </Select>
+          {shownDatasource && (
+            <Button icon={IconNames.CROSS} small onClick={() => setShownDatasource(undefined)} />
+          )}
+        </ButtonGroup>
+        <Popover
+          position={Position.BOTTOM_LEFT}
+          content={
+            <Menu>
+              {INTERVAL_STATS.map(stat => (
+                <MenuItem
+                  key={stat}
+                  icon={checkedCircleIcon(stat === activeSegmentStat)}
+                  text={getIntervalStatTitle(stat)}
+                  onClick={() => setActiveSegmentStat(stat)}
+                />
+              ))}
+            </Menu>
           }
-          activeDataType={activeDataType}
-          formatTick={(n: number) => this.formatTick(n)}
-          xScale={xScale}
-          yScale={yScale}
-          barWidth={barWidth}
-        />
-      </ResizeSensor>
-    );
-  }
-
-  render() {
-    const { capabilities } = this.props;
-    const { datasources, activeDataType, activeDatasource, dateRange, selectedDateRange } =
-      this.state;
-
-    const filterDatasource: ItemPredicate<string> = (query, val, _index, exactMatch) => {
-      const normalizedTitle = val.toLowerCase();
-      const normalizedQuery = query.toLowerCase();
-
-      if (exactMatch) {
-        return normalizedTitle === normalizedQuery;
-      } else {
-        return ` ${normalizedTitle}`.includes(normalizedQuery);
-      }
-    };
-
-    const datasourceRenderer: ItemRenderer<string> = (
-      val,
-      { handleClick, handleFocus, modifiers },
-    ) => {
-      if (!modifiers.matchesPredicate) {
-        return null;
-      }
-      return (
-        <MenuItem
-          key={val}
-          disabled={modifiers.disabled}
-          active={modifiers.active}
-          onClick={handleClick}
-          onFocus={handleFocus}
-          roleStructure="listoption"
-          text={val}
-        />
-      );
-    };
-
-    const DatasourceSelect: React.FC = () => {
-      const showAll = 'Show all';
-      const handleItemSelected = (selectedItem: string) => {
-        this.setState({
-          activeDatasource: selectedItem === showAll ? null : selectedItem,
-        });
-      };
-      const datasourcesWzAll = [showAll].concat(datasources);
-      return (
-        <Select<string>
-          items={datasourcesWzAll}
-          onItemSelect={handleItemSelected}
-          itemRenderer={datasourceRenderer}
-          noResults={<MenuItem disabled text="No results." roleStructure="listoption" />}
-          itemPredicate={filterDatasource}
-          fill
         >
           <Button
-            text={activeDatasource === null ? showAll : activeDatasource}
-            fill
+            text={`Show: ${getIntervalStatTitle(activeSegmentStat)}`}
+            small
             rightIcon={IconNames.CARET_DOWN}
           />
-        </Select>
-      );
-    };
-
-    return (
-      <div className="segment-timeline">
-        {this.renderStackedBarChart()}
-        <div className="side-control">
-          <FormGroup label="Show">
-            <SegmentedControl
-              value={activeDataType}
-              onValueChange={activeDataType =>
-                this.setState({ activeDataType: activeDataType as ActiveDataType })
+        </Popover>
+        <div className="expander" />
+        <ButtonGroup>
+          <Button
+            icon={IconNames.CARET_LEFT}
+            data-tooltip={
+              previousDateRange && `Previous time period\n${formatDateRange(previousDateRange)}`
+            }
+            small
+            disabled={!previousDateRange}
+            onClick={() => setDateRange(previousDateRange)}
+          />
+          <Button
+            icon={IconNames.ZOOM_OUT}
+            data-tooltip={zoomedOutDateRange && `Zoom out\n${formatDateRange(zoomedOutDateRange)}`}
+            small
+            disabled={!zoomedOutDateRange}
+            onClick={() => setDateRange(zoomedOutDateRange)}
+          />
+          <Button
+            icon={IconNames.CARET_RIGHT}
+            data-tooltip={nextDateRange && `Next time period\n${formatDateRange(nextDateRange)}`}
+            small
+            disabled={!nextDateRange}
+            onClick={() => setDateRange(nextDateRange)}
+          />
+        </ButtonGroup>
+        <ButtonGroup>
+          {SHOWN_DURATION_OPTIONS.map((d, i) => {
+            const dr = getDateRange(d);
+            return (
+              <Button
+                key={i}
+                text={d.toString().replace('P', '')}
+                data-tooltip={`Show last ${d.getDescription()}\n${formatDateRange(dr)}`}
+                active={effectiveDateRange && dateRangesEqual(effectiveDateRange, dr)}
+                small
+                onClick={() => setDateRange(dr)}
+              />
+            );
+          })}
+          <Popover
+            isOpen={showCustomDatePicker}
+            onInteraction={setShowCustomDatePicker}
+            content={
+              <DateRangePicker3
+                defaultValue={utcToLocalDateRange(
+                  effectiveDateRange || getDateRange(DEFAULT_SHOWN_DURATION),
+                )}
+                onChange={newDateRange => {
+                  const newUtcDateRange = localToUtcDateRange(newDateRange);
+                  if (!isNonNullRange(newUtcDateRange)) return;
+                  setDateRange(newUtcDateRange);
+                  setShowCustomDatePicker(false);
+                }}
+                contiguousCalendarMonths={false}
+                reverseMonthAndYearMenus
+                timePickerProps={undefined}
+                shortcuts={false}
+              />
+            }
+          >
+            <Button
+              icon={IconNames.CALENDAR}
+              text={
+                effectiveDateRange
+                  ? formatDateRange(effectiveDateRange)
+                  : `Loading datasource date range`
               }
-              options={[
-                {
-                  label: 'Total size',
-                  value: 'sizeData',
-                },
-                {
-                  label: 'Segment count',
-                  value: 'countData',
-                },
-              ]}
-              fill
+              data-tooltip={showCustomDatePicker ? undefined : `Select a custom date range`}
+              small
             />
-          </FormGroup>
-          <FormGroup label="Interval">
-            <DateRangeInput3
-              value={utcToLocalDateRange(selectedDateRange || dateRange)}
-              onChange={newDateRange => {
-                const newUtcDateRange = localToUtcDateRange(newDateRange);
-                if (!isNonNullRange(newUtcDateRange)) return;
-                this.setState({ dateRange: newUtcDateRange, selectedDateRange: undefined }, () => {
-                  this.dataQueryManager.runQuery({ capabilities, dateRange: newUtcDateRange });
-                });
-              }}
-              fill
-              locale={enUS}
+          </Popover>
+          <Button
+            icon={IconNames.PIN}
+            data-tooltip={
+              dateRange ? 'Pin the date range' : 'Auto determine date range to fit datasource'
+            }
+            active={Boolean(dateRange)}
+            disabled={!effectiveDateRange}
+            small
+            onClick={() => setDateRange(dateRange ? undefined : effectiveDateRange)}
+          />
+        </ButtonGroup>
+      </div>
+      <ResizeSensor
+        onResize={(entries: ResizeObserverEntry[]) => {
+          const rect = entries[0].contentRect;
+          setStage(new Stage(rect.width, rect.height));
+        }}
+      >
+        <div className="chart-container">
+          {stage && effectiveDateRange && (
+            <SegmentBarChart
+              capabilities={capabilities}
+              stage={stage}
+              dateRange={effectiveDateRange}
+              changeDateRange={setDateRange}
+              shownIntervalStat={activeSegmentStat}
+              shownDatasource={shownDatasource}
+              changeShownDatasource={setShownDatasource}
+              {...otherProps}
             />
-          </FormGroup>
-          <FormGroup label="Datasource">
-            <DatasourceSelect />
-          </FormGroup>
+          )}
+          {initDatasourceDateRangeState.isLoading() && <Loader />}
         </div>
-      </div>
-    );
-  }
-}
+      </ResizeSensor>
+    </div>
+  );
+};
diff --git a/web-console/src/components/segment-timeline/stacked-bar-chart.tsx b/web-console/src/components/segment-timeline/stacked-bar-chart.tsx
deleted file mode 100644
index 8018aaee5f6f..000000000000
--- a/web-console/src/components/segment-timeline/stacked-bar-chart.tsx
+++ /dev/null
@@ -1,174 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import type { AxisScale } from 'd3-axis';
-import { axisBottom, axisLeft } from 'd3-axis';
-import React, { useState } from 'react';
-
-import { BarGroup } from './bar-group';
-import { ChartAxis } from './chart-axis';
-
-import './stacked-bar-chart.scss';
-
-export interface BarUnitData {
-  x: number;
-  y: number;
-  y0?: number;
-  width: number;
-  datasource: string;
-  color: string;
-  dailySize?: number;
-}
-
-export interface BarChartMargin {
-  top: number;
-  right: number;
-  bottom: number;
-  left: number;
-}
-
-export interface HoveredBarInfo {
-  xCoordinate?: number;
-  yCoordinate?: number;
-  height?: number;
-  width?: number;
-  datasource?: string;
-  xValue?: number;
-  yValue?: number;
-  dailySize?: number;
-}
-
-interface StackedBarChartProps {
-  svgWidth: number;
-  svgHeight: number;
-  margin: BarChartMargin;
-  activeDataType?: string;
-  dataToRender: BarUnitData[];
-  changeActiveDatasource: (e: string | null) => void;
-  formatTick: (e: number) => string;
-  xScale: AxisScale<Date>;
-  yScale: AxisScale<number>;
-  barWidth: number;
-}
-
-export const StackedBarChart = React.forwardRef(function StackedBarChart(
-  props: StackedBarChartProps,
-  ref,
-) {
-  const {
-    activeDataType,
-    svgWidth,
-    svgHeight,
-    margin,
-    formatTick,
-    xScale,
-    yScale,
-    dataToRender,
-    changeActiveDatasource,
-    barWidth,
-  } = props;
-  const [hoverOn, setHoverOn] = useState<HoveredBarInfo>();
-
-  const width = svgWidth - margin.left - margin.right;
-  const height = svgHeight - margin.top - margin.bottom;
-
-  function renderBarChart() {
-    return (
-      <svg
-        width={svgWidth}
-        height={svgHeight}
-        viewBox={`0 0 ${svgWidth} ${svgHeight}`}
-        preserveAspectRatio="xMinYMin meet"
-      >
-        <g
-          transform={`translate(${margin.left}, ${margin.top})`}
-          onMouseLeave={() => setHoverOn(undefined)}
-        >
-          <ChartAxis
-            className="gridline-x"
-            transform="translate(0, 0)"
-            scale={axisLeft(yScale)
-              .ticks(5)
-              .tickSize(-width)
-              .tickFormat(() => '')
-              .tickSizeOuter(0)}
-          />
-          <BarGroup
-            dataToRender={dataToRender}
-            changeActiveDatasource={changeActiveDatasource}
-            formatTick={formatTick}
-            xScale={xScale}
-            yScale={yScale}
-            onHoverBar={(e: HoveredBarInfo) => setHoverOn(e)}
-            hoverOn={hoverOn}
-            barWidth={barWidth}
-          />
-          <ChartAxis
-            className="axis-x"
-            transform={`translate(0, ${height})`}
-            scale={axisBottom(xScale)}
-          />
-          <ChartAxis
-            className="axis-y"
-            scale={axisLeft(yScale)
-              .ticks(5)
-              .tickFormat((e: number) => formatTick(e))}
-          />
-          {hoverOn && (
-            <g
-              className="hovered-bar"
-              onClick={() => {
-                setHoverOn(undefined);
-                changeActiveDatasource(hoverOn.datasource ?? null);
-              }}
-            >
-              <rect
-                x={hoverOn.xCoordinate}
-                y={hoverOn.yCoordinate}
-                width={barWidth}
-                height={hoverOn.height}
-              />
-            </g>
-          )}
-        </g>
-      </svg>
-    );
-  }
-
-  return (
-    <div className="stacked-bar-chart" ref={ref as any}>
-      {hoverOn && (
-        <div className="bar-chart-tooltip">
-          <div>Datasource: {hoverOn.datasource}</div>
-          <div>Time: {hoverOn.xValue}</div>
-          <div>
-            {`${
-              activeDataType === 'countData' ? 'Daily total count:' : 'Daily total size:'
-            } ${formatTick(hoverOn.dailySize!)}`}
-          </div>
-          <div>
-            {`${activeDataType === 'countData' ? 'Count:' : 'Size:'} ${formatTick(
-              hoverOn.yValue!,
-            )}`}
-          </div>
-        </div>
-      )}
-      {renderBarChart()}
-    </div>
-  );
-});
diff --git a/web-console/src/components/supervisor-history-panel/supervisor-history-panel.tsx b/web-console/src/components/supervisor-history-panel/supervisor-history-panel.tsx
index 74cb55682f30..a7fa38fd445c 100644
--- a/web-console/src/components/supervisor-history-panel/supervisor-history-panel.tsx
+++ b/web-console/src/components/supervisor-history-panel/supervisor-history-panel.tsx
@@ -25,7 +25,7 @@ import type { IngestionSpec } from '../../druid-models';
 import { cleanSpec } from '../../druid-models';
 import { useQueryManager } from '../../hooks';
 import { Api } from '../../singletons';
-import { deepSet } from '../../utils';
+import { deepSet, getApiArray } from '../../utils';
 import { Loader } from '../loader/loader';
 import { ShowValue } from '../show-value/show-value';
 
@@ -49,11 +49,12 @@ export const SupervisorHistoryPanel = React.memo(function SupervisorHistoryPanel
   const [historyState] = useQueryManager<string, SupervisorHistoryEntry[]>({
     initQuery: supervisorId,
     processQuery: async (supervisorId, cancelToken) => {
-      const resp = await Api.instance.get(
-        `/druid/indexer/v1/supervisor/${Api.encodePath(supervisorId)}/history`,
-        { cancelToken },
-      );
-      return resp.data.map((vs: SupervisorHistoryEntry) => deepSet(vs, 'spec', cleanSpec(vs.spec)));
+      return (
+        await getApiArray<SupervisorHistoryEntry>(
+          `/druid/indexer/v1/supervisor/${Api.encodePath(supervisorId)}/history`,
+          cancelToken,
+        )
+      ).map(vs => deepSet(vs, 'spec', cleanSpec(vs.spec)));
     },
   });
 
diff --git a/web-console/src/components/table-clickable-cell/table-clickable-cell.tsx b/web-console/src/components/table-clickable-cell/table-clickable-cell.tsx
index aec706a50fc0..38c69e297e0c 100644
--- a/web-console/src/components/table-clickable-cell/table-clickable-cell.tsx
+++ b/web-console/src/components/table-clickable-cell/table-clickable-cell.tsx
@@ -28,7 +28,7 @@ export interface TableClickableCellProps {
   className?: string;
   onClick: MouseEventHandler<any>;
   hoverIcon?: IconName;
-  title?: string;
+  tooltip?: string;
   disabled?: boolean;
   children?: ReactNode;
 }
@@ -36,12 +36,13 @@ export interface TableClickableCellProps {
 export const TableClickableCell = React.memo(function TableClickableCell(
   props: TableClickableCellProps,
 ) {
-  const { className, onClick, hoverIcon, disabled, children, ...rest } = props;
+  const { className, onClick, hoverIcon, disabled, children, tooltip, ...rest } = props;
 
   return (
     <div
       className={classNames('table-clickable-cell', className, { disabled })}
       onClick={disabled ? undefined : onClick}
+      data-tooltip={tooltip}
       {...rest}
     >
       {children}
diff --git a/web-console/src/components/table-filterable-cell/table-filterable-cell.tsx b/web-console/src/components/table-filterable-cell/table-filterable-cell.tsx
index 631fa224aaf4..c03f0038cc7f 100644
--- a/web-console/src/components/table-filterable-cell/table-filterable-cell.tsx
+++ b/web-console/src/components/table-filterable-cell/table-filterable-cell.tsx
@@ -27,7 +27,7 @@ import { Deferred } from '../deferred/deferred';
 
 import './table-filterable-cell.scss';
 
-const FILTER_MODES: FilterMode[] = ['=', '!=', '<=', '>='];
+const FILTER_MODES: FilterMode[] = ['=', '!=', '<', '>='];
 const FILTER_MODES_NO_COMPARISONS: FilterMode[] = ['=', '!='];
 
 export interface TableFilterableCellProps {
diff --git a/web-console/src/console-application.tsx b/web-console/src/console-application.tsx
index 95336713dbb6..5dfbba77101a 100644
--- a/web-console/src/console-application.tsx
+++ b/web-console/src/console-application.tsx
@@ -182,12 +182,24 @@ export class ConsoleApplication extends React.PureComponent<
     changeTabWithFilter('datasources', [{ id: 'datasource', value: `=${datasource}` }]);
   };
 
-  private readonly goToSegments = (datasource: string, onlyUnavailable = false) => {
+  private readonly goToSegments = ({
+    start,
+    end,
+    datasource,
+    realtime,
+  }: {
+    start?: Date;
+    end?: Date;
+    datasource?: string;
+    realtime?: boolean;
+  }) => {
     changeTabWithFilter(
       'segments',
       compact([
-        { id: 'datasource', value: `=${datasource}` },
-        onlyUnavailable ? { id: 'is_available', value: '=false' } : undefined,
+        start && { id: 'start', value: `>=${start.toISOString()}` },
+        end && { id: 'end', value: `<${end.toISOString()}` },
+        datasource && { id: 'datasource', value: `=${datasource}` },
+        typeof realtime === 'boolean' ? { id: 'is_realtime', value: `=${realtime}` } : undefined,
       ]),
     );
   };
diff --git a/web-console/src/dialogs/compaction-history-dialog/compaction-history-dialog.tsx b/web-console/src/dialogs/compaction-history-dialog/compaction-history-dialog.tsx
index 9e19e043c713..8ee0ffdbfbc3 100644
--- a/web-console/src/dialogs/compaction-history-dialog/compaction-history-dialog.tsx
+++ b/web-console/src/dialogs/compaction-history-dialog/compaction-history-dialog.tsx
@@ -24,7 +24,7 @@ import { Loader, ShowValue } from '../../components';
 import type { CompactionConfig } from '../../druid-models';
 import { useQueryManager } from '../../hooks';
 import { Api } from '../../singletons';
-import { formatInteger, formatPercent } from '../../utils';
+import { formatInteger, formatPercent, getApiArray } from '../../utils';
 import { DiffDialog } from '../diff-dialog/diff-dialog';
 
 import './compaction-history-dialog.scss';
@@ -65,11 +65,10 @@ export const CompactionHistoryDialog = React.memo(function CompactionHistoryDial
     initQuery: datasource,
     processQuery: async (datasource, cancelToken) => {
       try {
-        const resp = await Api.instance.get(
+        return await getApiArray<CompactionHistoryEntry>(
           `/druid/coordinator/v1/config/compaction/${Api.encodePath(datasource)}/history?count=20`,
-          { cancelToken },
+          cancelToken,
         );
-        return resp.data;
       } catch (e) {
         if (e.response?.status === 404) return [];
         throw e;
diff --git a/web-console/src/dialogs/coordinator-dynamic-config-dialog/coordinator-dynamic-config-dialog.tsx b/web-console/src/dialogs/coordinator-dynamic-config-dialog/coordinator-dynamic-config-dialog.tsx
index ec964f5507ee..ab4fed8ae1ad 100644
--- a/web-console/src/dialogs/coordinator-dynamic-config-dialog/coordinator-dynamic-config-dialog.tsx
+++ b/web-console/src/dialogs/coordinator-dynamic-config-dialog/coordinator-dynamic-config-dialog.tsx
@@ -27,7 +27,7 @@ import { COORDINATOR_DYNAMIC_CONFIG_FIELDS } from '../../druid-models';
 import { useQueryManager } from '../../hooks';
 import { getLink } from '../../links';
 import { Api, AppToaster } from '../../singletons';
-import { getDruidErrorMessage } from '../../utils';
+import { getApiArray, getDruidErrorMessage } from '../../utils';
 import { SnitchDialog } from '..';
 
 import './coordinator-dynamic-config-dialog.scss';
@@ -47,10 +47,7 @@ export const CoordinatorDynamicConfigDialog = React.memo(function CoordinatorDyn
   const [historyRecordsState] = useQueryManager<null, any[]>({
     initQuery: null,
     processQuery: async (_, cancelToken) => {
-      const historyResp = await Api.instance.get(`/druid/coordinator/v1/config/history?count=100`, {
-        cancelToken,
-      });
-      return historyResp.data;
+      return await getApiArray(`/druid/coordinator/v1/config/history?count=100`, cancelToken);
     },
   });
 
diff --git a/web-console/src/dialogs/datasource-table-action-dialog/datasource-columns-table/datasource-columns-table.tsx b/web-console/src/dialogs/datasource-table-action-dialog/datasource-columns-table/datasource-columns-table.tsx
index 82187c866f44..3dfb2f7879d7 100644
--- a/web-console/src/dialogs/datasource-table-action-dialog/datasource-columns-table/datasource-columns-table.tsx
+++ b/web-console/src/dialogs/datasource-table-action-dialog/datasource-columns-table/datasource-columns-table.tsx
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-import { L } from '@druid-toolkit/query';
+import { L } from 'druid-query-toolkit';
 import React from 'react';
 import ReactTable from 'react-table';
 
diff --git a/web-console/src/dialogs/datasource-table-action-dialog/datasource-preview-pane/datasource-preview-pane.tsx b/web-console/src/dialogs/datasource-table-action-dialog/datasource-preview-pane/datasource-preview-pane.tsx
index 1ca92787c1cb..c48cbfa51989 100644
--- a/web-console/src/dialogs/datasource-table-action-dialog/datasource-preview-pane/datasource-preview-pane.tsx
+++ b/web-console/src/dialogs/datasource-table-action-dialog/datasource-preview-pane/datasource-preview-pane.tsx
@@ -16,8 +16,8 @@
  * limitations under the License.
  */
 
-import type { QueryResult } from '@druid-toolkit/query';
-import { QueryRunner, T } from '@druid-toolkit/query';
+import type { QueryResult } from 'druid-query-toolkit';
+import { QueryRunner, T } from 'druid-query-toolkit';
 import React from 'react';
 
 import { Loader, RecordTablePane } from '../../../components';
diff --git a/web-console/src/dialogs/lookup-table-action-dialog/lookup-values-table/lookup-values-table.tsx b/web-console/src/dialogs/lookup-table-action-dialog/lookup-values-table/lookup-values-table.tsx
index c36445d17731..122cc4566b85 100644
--- a/web-console/src/dialogs/lookup-table-action-dialog/lookup-values-table/lookup-values-table.tsx
+++ b/web-console/src/dialogs/lookup-table-action-dialog/lookup-values-table/lookup-values-table.tsx
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-import { N } from '@druid-toolkit/query';
+import { N } from 'druid-query-toolkit';
 import React from 'react';
 import ReactTable from 'react-table';
 
diff --git a/web-console/src/dialogs/overlord-dynamic-config-dialog/overlord-dynamic-config-dialog.tsx b/web-console/src/dialogs/overlord-dynamic-config-dialog/overlord-dynamic-config-dialog.tsx
index ba30118b0a32..5b1233c6384e 100644
--- a/web-console/src/dialogs/overlord-dynamic-config-dialog/overlord-dynamic-config-dialog.tsx
+++ b/web-console/src/dialogs/overlord-dynamic-config-dialog/overlord-dynamic-config-dialog.tsx
@@ -27,7 +27,7 @@ import { OVERLORD_DYNAMIC_CONFIG_FIELDS } from '../../druid-models';
 import { useQueryManager } from '../../hooks';
 import { getLink } from '../../links';
 import { Api, AppToaster } from '../../singletons';
-import { getDruidErrorMessage } from '../../utils';
+import { getApiArray, getDruidErrorMessage } from '../../utils';
 import { SnitchDialog } from '..';
 
 import './overlord-dynamic-config-dialog.scss';
@@ -47,10 +47,7 @@ export const OverlordDynamicConfigDialog = React.memo(function OverlordDynamicCo
   const [historyRecordsState] = useQueryManager<null, any[]>({
     initQuery: null,
     processQuery: async (_, cancelToken) => {
-      const historyResp = await Api.instance.get(`/druid/indexer/v1/worker/history?count=100`, {
-        cancelToken,
-      });
-      return historyResp.data;
+      return await getApiArray(`/druid/indexer/v1/worker/history?count=100`, cancelToken);
     },
   });
 
diff --git a/web-console/src/dialogs/retention-dialog/__snapshots__/retention-dialog.spec.tsx.snap b/web-console/src/dialogs/retention-dialog/__snapshots__/retention-dialog.spec.tsx.snap
index 19c90c7de335..8bba057fac2d 100644
--- a/web-console/src/dialogs/retention-dialog/__snapshots__/retention-dialog.spec.tsx.snap
+++ b/web-console/src/dialogs/retention-dialog/__snapshots__/retention-dialog.spec.tsx.snap
@@ -188,7 +188,7 @@ exports[`RetentionDialog matches snapshot 1`] = `
                         style="transform: translateY(0); transition: none;"
                       >
                         <div
-                          class="bp5-card bp5-elevation-2"
+                          class="rule-detail bp5-card bp5-elevation-2"
                         >
                           <div
                             class="bp5-form-group"
@@ -653,7 +653,7 @@ exports[`RetentionDialog matches snapshot 1`] = `
                         style="transform: translateY(0); transition: none;"
                       >
                         <div
-                          class="bp5-card bp5-elevation-2"
+                          class="rule-detail bp5-card bp5-elevation-2"
                         >
                           <div
                             class="bp5-form-group"
diff --git a/web-console/src/dialogs/retention-dialog/retention-dialog.tsx b/web-console/src/dialogs/retention-dialog/retention-dialog.tsx
index 9b657622d89c..e656a4cbdff2 100644
--- a/web-console/src/dialogs/retention-dialog/retention-dialog.tsx
+++ b/web-console/src/dialogs/retention-dialog/retention-dialog.tsx
@@ -22,12 +22,12 @@ import React, { useState } from 'react';
 
 import type { FormJsonTabs } from '../../components';
 import { ExternalLink, FormJsonSelector, JsonInput, RuleEditor } from '../../components';
+import type { Rule } from '../../druid-models';
 import type { Capabilities } from '../../helpers';
 import { useQueryManager } from '../../hooks';
 import { getLink } from '../../links';
 import { Api } from '../../singletons';
-import { filterMap, queryDruidSql, swapElements } from '../../utils';
-import type { Rule } from '../../utils/load-rule';
+import { filterMap, getApiArray, queryDruidSql, swapElements } from '../../utils';
 import { SnitchDialog } from '..';
 
 import './retention-dialog.scss';
@@ -67,11 +67,9 @@ ORDER BY 1`,
 
         return sqlResp.map(d => d.tier);
       } else if (capabilities.hasCoordinatorAccess()) {
-        const allServiceResp = await Api.instance.get('/druid/coordinator/v1/servers?simple', {
-          cancelToken,
-        });
-        return filterMap(allServiceResp.data, (s: any) =>
-          s.type === 'historical' ? s.tier : undefined,
+        return filterMap(
+          await getApiArray('/druid/coordinator/v1/servers?simple', cancelToken),
+          (s: any) => (s.type === 'historical' ? s.tier : undefined),
         );
       } else {
         throw new Error(`must have sql or coordinator access`);
@@ -84,11 +82,10 @@ ORDER BY 1`,
   const [historyQueryState] = useQueryManager<string, any[]>({
     initQuery: props.datasource,
     processQuery: async (datasource, cancelToken) => {
-      const historyResp = await Api.instance.get(
+      return await getApiArray(
         `/druid/coordinator/v1/rules/${Api.encodePath(datasource)}/history?count=200`,
-        { cancelToken },
+        cancelToken,
       );
-      return historyResp.data;
     },
   });
 
diff --git a/web-console/src/dialogs/segments-table-action-dialog/segments-preview-pane/segments-preview-pane.tsx b/web-console/src/dialogs/segments-table-action-dialog/segments-preview-pane/segments-preview-pane.tsx
index 4c2487ce0cc6..2925482d9901 100644
--- a/web-console/src/dialogs/segments-table-action-dialog/segments-preview-pane/segments-preview-pane.tsx
+++ b/web-console/src/dialogs/segments-table-action-dialog/segments-preview-pane/segments-preview-pane.tsx
@@ -16,8 +16,8 @@
  * limitations under the License.
  */
 
-import type { QueryResult } from '@druid-toolkit/query';
-import { QueryRunner } from '@druid-toolkit/query';
+import type { QueryResult } from 'druid-query-toolkit';
+import { QueryRunner } from 'druid-query-toolkit';
 import React from 'react';
 
 import { Loader, RecordTablePane } from '../../../components';
diff --git a/web-console/src/dialogs/status-dialog/status-dialog.tsx b/web-console/src/dialogs/status-dialog/status-dialog.tsx
index 311f3e056646..672fc40910f3 100644
--- a/web-console/src/dialogs/status-dialog/status-dialog.tsx
+++ b/web-console/src/dialogs/status-dialog/status-dialog.tsx
@@ -50,8 +50,7 @@ export const StatusDialog = React.memo(function StatusDialog(props: StatusDialog
   const [responseState] = useQueryManager<null, StatusResponse>({
     initQuery: null,
     processQuery: async (_, cancelToken) => {
-      const resp = await Api.instance.get(`/status`, { cancelToken });
-      return resp.data;
+      return (await Api.instance.get(`/status`, { cancelToken })).data;
     },
   });
 
diff --git a/web-console/src/dialogs/supervisor-reset-offsets-dialog/supervisor-reset-offsets-dialog.tsx b/web-console/src/dialogs/supervisor-reset-offsets-dialog/supervisor-reset-offsets-dialog.tsx
index 009d83260604..d10fc00eb5ce 100644
--- a/web-console/src/dialogs/supervisor-reset-offsets-dialog/supervisor-reset-offsets-dialog.tsx
+++ b/web-console/src/dialogs/supervisor-reset-offsets-dialog/supervisor-reset-offsets-dialog.tsx
@@ -106,11 +106,12 @@ export const SupervisorResetOffsetsDialog = React.memo(function SupervisorResetO
   const [statusResp] = useQueryManager<string, SupervisorStatus>({
     initQuery: supervisorId,
     processQuery: async (supervisorId, cancelToken) => {
-      const statusResp = await Api.instance.get(
-        `/druid/indexer/v1/supervisor/${Api.encodePath(supervisorId)}/status`,
-        { cancelToken },
-      );
-      return statusResp.data;
+      return (
+        await Api.instance.get(
+          `/druid/indexer/v1/supervisor/${Api.encodePath(supervisorId)}/status`,
+          { cancelToken },
+        )
+      ).data;
     },
   });
 
diff --git a/web-console/src/components/segment-timeline/stacked-bar-chart.scss b/web-console/src/druid-models/datasource/datasource.ts
similarity index 64%
rename from web-console/src/components/segment-timeline/stacked-bar-chart.scss
rename to web-console/src/druid-models/datasource/datasource.ts
index 26e5f5186b5f..313d711b35c2 100644
--- a/web-console/src/components/segment-timeline/stacked-bar-chart.scss
+++ b/web-console/src/druid-models/datasource/datasource.ts
@@ -16,35 +16,32 @@
  * limitations under the License.
  */
 
-.stacked-bar-chart {
-  position: relative;
-  overflow: hidden;
+import { hashJoaat } from '../../utils';
 
-  .bar-chart-tooltip {
-    position: absolute;
-    left: 100px;
-    right: 0;
+const COLORS = [
+  '#1f77b4',
+  '#aec7e8',
+  '#ff7f0e',
+  '#ffbb78',
+  '#2ca02c',
+  '#98df8a',
+  '#d62728',
+  '#ff9896',
+  '#9467bd',
+  '#c5b0d5',
+  '#8c564b',
+  '#c49c94',
+  '#e377c2',
+  '#f7b6d2',
+  '#7f7f7f',
+  '#c7c7c7',
+  '#bcbd22',
+  '#dbdb8d',
+  '#17becf',
+  '#9edae5',
+];
 
-    div {
-      display: inline-block;
-      width: 230px;
-    }
-  }
-
-  svg {
-    position: absolute;
-
-    .hovered-bar {
-      fill: transparent;
-      stroke: #ffffff;
-      stroke-width: 1.5px;
-    }
-
-    .gridline-x {
-      line {
-        stroke-dasharray: 5, 5;
-        opacity: 0.5;
-      }
-    }
-  }
+export function getDatasourceColor(datasource: string) {
+  const hash = hashJoaat(datasource);
+  return COLORS[hash % COLORS.length];
 }
diff --git a/web-console/src/druid-models/execution/execution.ts b/web-console/src/druid-models/execution/execution.ts
index f4a73eb97207..1237b49e62da 100644
--- a/web-console/src/druid-models/execution/execution.ts
+++ b/web-console/src/druid-models/execution/execution.ts
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-import { Column, QueryResult, SqlExpression, SqlQuery, SqlWithQuery } from '@druid-toolkit/query';
+import { Column, QueryResult, SqlExpression, SqlQuery, SqlWithQuery } from 'druid-query-toolkit';
 
 import { maybeGetClusterCapacity } from '../../helpers';
 import {
diff --git a/web-console/src/druid-models/external-config/external-config.ts b/web-console/src/druid-models/external-config/external-config.ts
index d6541747ce5a..6fa74eb038bd 100644
--- a/web-console/src/druid-models/external-config/external-config.ts
+++ b/web-console/src/druid-models/external-config/external-config.ts
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-import type { SqlQuery } from '@druid-toolkit/query';
+import type { SqlQuery } from 'druid-query-toolkit';
 import {
   C,
   F,
@@ -28,7 +28,7 @@ import {
   SqlLiteral,
   SqlStar,
   SqlType,
-} from '@druid-toolkit/query';
+} from 'druid-query-toolkit';
 import * as JSONBig from 'json-bigint-native';
 
 import { nonEmptyArray } from '../../utils';
diff --git a/web-console/src/druid-models/index.ts b/web-console/src/druid-models/index.ts
index dfeeeeaac837..e31eedeea738 100644
--- a/web-console/src/druid-models/index.ts
+++ b/web-console/src/druid-models/index.ts
@@ -21,6 +21,7 @@ export * from './compaction-config/compaction-config';
 export * from './compaction-status/compaction-status';
 export * from './coordinator-dynamic-config/coordinator-dynamic-config';
 export * from './dart/dart-query-entry';
+export * from './datasource/datasource';
 export * from './dimension-spec/dimension-spec';
 export * from './druid-engine/druid-engine';
 export * from './execution/execution';
@@ -32,10 +33,12 @@ export * from './ingest-query-pattern/ingest-query-pattern';
 export * from './ingestion-spec/ingestion-spec';
 export * from './input-format/input-format';
 export * from './input-source/input-source';
+export * from './load-rule/load-rule';
 export * from './lookup-spec/lookup-spec';
 export * from './metric-spec/metric-spec';
 export * from './overlord-dynamic-config/overlord-dynamic-config';
 export * from './query-context/query-context';
+export * from './segment/segment';
 export * from './stages/stages';
 export * from './supervisor-status/supervisor-status';
 export * from './task/task';
diff --git a/web-console/src/druid-models/ingest-query-pattern/ingest-query-pattern.spec.ts b/web-console/src/druid-models/ingest-query-pattern/ingest-query-pattern.spec.ts
index 996385fc08ff..cf108c2b3890 100644
--- a/web-console/src/druid-models/ingest-query-pattern/ingest-query-pattern.spec.ts
+++ b/web-console/src/druid-models/ingest-query-pattern/ingest-query-pattern.spec.ts
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-import { sane, SqlQuery } from '@druid-toolkit/query';
+import { sane, SqlQuery } from 'druid-query-toolkit';
 
 import { fitIngestQueryPattern, ingestQueryPatternToQuery } from './ingest-query-pattern';
 
diff --git a/web-console/src/druid-models/ingest-query-pattern/ingest-query-pattern.ts b/web-console/src/druid-models/ingest-query-pattern/ingest-query-pattern.ts
index f0ce8a0eb288..d2009ad2e5ee 100644
--- a/web-console/src/druid-models/ingest-query-pattern/ingest-query-pattern.ts
+++ b/web-console/src/druid-models/ingest-query-pattern/ingest-query-pattern.ts
@@ -26,7 +26,7 @@ import {
   SqlTable,
   SqlWithPart,
   T,
-} from '@druid-toolkit/query';
+} from 'druid-query-toolkit';
 
 import { filterMap, oneOf } from '../../utils';
 import type { ExternalConfig } from '../external-config/external-config';
diff --git a/web-console/src/utils/load-rule.ts b/web-console/src/druid-models/load-rule/load-rule.ts
similarity index 97%
rename from web-console/src/utils/load-rule.ts
rename to web-console/src/druid-models/load-rule/load-rule.ts
index a32422bbb6a4..31b4d600585a 100644
--- a/web-console/src/utils/load-rule.ts
+++ b/web-console/src/druid-models/load-rule/load-rule.ts
@@ -18,7 +18,7 @@
 
 import { sum } from 'd3-array';
 
-import { deepMove, deepSet } from './object-change';
+import { deepMove, deepSet } from '../../utils';
 
 export type RuleType =
   | 'loadForever'
@@ -41,6 +41,7 @@ export interface Rule {
 }
 
 export class RuleUtil {
+  static DEFAULT_RULES_KEY = '_default';
   static TYPES: RuleType[] = [
     'loadForever',
     'loadByInterval',
diff --git a/web-console/src/druid-models/segment/segment.ts b/web-console/src/druid-models/segment/segment.ts
new file mode 100644
index 000000000000..1bff0711fcdf
--- /dev/null
+++ b/web-console/src/druid-models/segment/segment.ts
@@ -0,0 +1,50 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { Duration } from '../../utils';
+
+export const START_OF_TIME_DATE = '-146136543-09-08T08:23:32.096Z';
+export const END_OF_TIME_DATE = '146140482-04-24T15:36:27.903Z';
+
+export function computeSegmentTimeSpan(start: string, end: string): string {
+  if (start === START_OF_TIME_DATE && end === END_OF_TIME_DATE) {
+    return 'All';
+  }
+
+  const startDate = new Date(start);
+  if (isNaN(startDate.valueOf())) {
+    return 'Invalid start';
+  }
+
+  const endDate = new Date(end);
+  if (isNaN(endDate.valueOf())) {
+    return 'Invalid end';
+  }
+
+  return Duration.fromRange(startDate, endDate, 'Etc/UTC').getDescription(true);
+}
+
+export interface ShardSpec {
+  type: string;
+  partitionNum?: number;
+  partitions?: number;
+  dimensions?: string[];
+  partitionDimensions?: string[];
+  start?: string[];
+  end?: string[];
+}
diff --git a/web-console/src/druid-models/task/task.ts b/web-console/src/druid-models/task/task.ts
index 3445cc5fb45f..e1743c116897 100644
--- a/web-console/src/druid-models/task/task.ts
+++ b/web-console/src/druid-models/task/task.ts
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-import { C } from '@druid-toolkit/query';
+import { C } from 'druid-query-toolkit';
 
 import type { Counters, StageDefinition } from '../stages/stages';
 
diff --git a/web-console/src/druid-models/workbench-query/workbench-query.spec.ts b/web-console/src/druid-models/workbench-query/workbench-query.spec.ts
index 02bb3e399b02..8456b0d065d5 100644
--- a/web-console/src/druid-models/workbench-query/workbench-query.spec.ts
+++ b/web-console/src/druid-models/workbench-query/workbench-query.spec.ts
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-import { sane } from '@druid-toolkit/query';
+import { sane } from 'druid-query-toolkit';
 
 import { WorkbenchQuery } from './workbench-query';
 
diff --git a/web-console/src/druid-models/workbench-query/workbench-query.ts b/web-console/src/druid-models/workbench-query/workbench-query.ts
index da37127f1d2d..9b1ed42b516b 100644
--- a/web-console/src/druid-models/workbench-query/workbench-query.ts
+++ b/web-console/src/druid-models/workbench-query/workbench-query.ts
@@ -22,7 +22,7 @@ import type {
   SqlClusteredByClause,
   SqlExpression,
   SqlPartitionedByClause,
-} from '@druid-toolkit/query';
+} from 'druid-query-toolkit';
 import {
   C,
   F,
@@ -30,7 +30,7 @@ import {
   SqlOrderByClause,
   SqlOrderByExpression,
   SqlQuery,
-} from '@druid-toolkit/query';
+} from 'druid-query-toolkit';
 import Hjson from 'hjson';
 import * as JSONBig from 'json-bigint-native';
 import { v4 as uuidv4 } from 'uuid';
diff --git a/web-console/src/entry.scss b/web-console/src/entry.scss
index 8d368a4146b7..46ea9d298d0f 100644
--- a/web-console/src/entry.scss
+++ b/web-console/src/entry.scss
@@ -56,6 +56,7 @@ body {
   position: absolute;
   height: 100%;
   width: 100%;
+  z-index: 0;
 
   .console-application {
     position: absolute;
diff --git a/web-console/src/entry.tsx b/web-console/src/entry.tsx
index 42cfe08ad13c..55f7abfc59a2 100644
--- a/web-console/src/entry.tsx
+++ b/web-console/src/entry.tsx
@@ -20,7 +20,7 @@ import 'regenerator-runtime/runtime';
 import './bootstrap/ace';
 
 import { OverlaysProvider } from '@blueprintjs/core';
-import { QueryRunner } from '@druid-toolkit/query';
+import { QueryRunner } from 'druid-query-toolkit';
 import { createRoot } from 'react-dom/client';
 
 import { bootstrapJsonParse } from './bootstrap/json-parser';
diff --git a/web-console/src/helpers/capabilities.ts b/web-console/src/helpers/capabilities.ts
index 013f9368c58c..3255ec93be73 100644
--- a/web-console/src/helpers/capabilities.ts
+++ b/web-console/src/helpers/capabilities.ts
@@ -211,6 +211,10 @@ export class Capabilities {
     };
   }
 
+  public clone(): Capabilities {
+    return new Capabilities(this.valueOf());
+  }
+
   public getMode(): CapabilitiesMode {
     if (!this.hasSql()) return 'no-sql';
     if (!this.hasCoordinatorAccess()) return 'no-proxy';
diff --git a/web-console/src/helpers/execution/general.ts b/web-console/src/helpers/execution/general.ts
index a90c02a63061..0e78834172b1 100644
--- a/web-console/src/helpers/execution/general.ts
+++ b/web-console/src/helpers/execution/general.ts
@@ -16,8 +16,8 @@
  * limitations under the License.
  */
 
-import type { QueryResult } from '@druid-toolkit/query';
 import type { CancelToken } from 'axios';
+import type { QueryResult } from 'druid-query-toolkit';
 
 import type { Execution } from '../../druid-models';
 import { IntermediateQueryState } from '../../utils';
diff --git a/web-console/src/helpers/execution/sql-task-execution.ts b/web-console/src/helpers/execution/sql-task-execution.ts
index f4dd45a2cb91..68cf0763b425 100644
--- a/web-console/src/helpers/execution/sql-task-execution.ts
+++ b/web-console/src/helpers/execution/sql-task-execution.ts
@@ -16,8 +16,8 @@
  * limitations under the License.
  */
 
-import { QueryResult } from '@druid-toolkit/query';
 import type { AxiosResponse, CancelToken } from 'axios';
+import { QueryResult } from 'druid-query-toolkit';
 
 import type { AsyncStatusResponse, MsqTaskPayloadResponse, QueryContext } from '../../druid-models';
 import { Execution } from '../../druid-models';
diff --git a/web-console/src/helpers/spec-conversion.ts b/web-console/src/helpers/spec-conversion.ts
index 00bc3d5f832c..9fc95d3b60f5 100644
--- a/web-console/src/helpers/spec-conversion.ts
+++ b/web-console/src/helpers/spec-conversion.ts
@@ -25,7 +25,7 @@ import {
   SqlExpression,
   SqlType,
   T,
-} from '@druid-toolkit/query';
+} from 'druid-query-toolkit';
 import * as JSONBig from 'json-bigint-native';
 
 import type {
diff --git a/web-console/src/hooks/use-clock.ts b/web-console/src/hooks/use-clock.ts
index 5d1264421957..a909a2c1f740 100644
--- a/web-console/src/hooks/use-clock.ts
+++ b/web-console/src/hooks/use-clock.ts
@@ -16,7 +16,9 @@
  * limitations under the License.
  */
 
-import { useEffect, useState } from 'react';
+import { useState } from 'react';
+
+import { useInterval } from './use-interval';
 
 function getNowToSecond(): Date {
   const now = new Date();
@@ -24,18 +26,12 @@ function getNowToSecond(): Date {
   return now;
 }
 
-export function useClock() {
+export function useClock(updateInterval = 1000) {
   const [now, setNow] = useState<Date>(getNowToSecond);
 
-  useEffect(() => {
-    const checkInterval = setInterval(() => {
-      setNow(getNowToSecond());
-    }, 1000);
-
-    return () => {
-      clearInterval(checkInterval);
-    };
-  }, []);
+  useInterval(() => {
+    setNow(getNowToSecond());
+  }, updateInterval);
 
   return now;
 }
diff --git a/web-console/src/react-table/react-table-utils.spec.ts b/web-console/src/react-table/react-table-utils.spec.ts
index 0a1bbf3f9ad5..1dd245b49f70 100644
--- a/web-console/src/react-table/react-table-utils.spec.ts
+++ b/web-console/src/react-table/react-table-utils.spec.ts
@@ -75,5 +75,9 @@ describe('react-table-utils', () => {
       { id: 'x', value: '~y' },
       { id: 'z', value: '=w&' },
     ]);
+    expect(stringToTableFilters('x<3&y<=3')).toEqual([
+      { id: 'x', value: '<3' },
+      { id: 'y', value: '<=3' },
+    ]);
   });
 });
diff --git a/web-console/src/react-table/react-table-utils.ts b/web-console/src/react-table/react-table-utils.ts
index ce9497a1209a..7732c90b231c 100644
--- a/web-console/src/react-table/react-table-utils.ts
+++ b/web-console/src/react-table/react-table-utils.ts
@@ -18,8 +18,7 @@
 
 import type { IconName } from '@blueprintjs/core';
 import { IconNames } from '@blueprintjs/icons';
-import type { SqlExpression } from '@druid-toolkit/query';
-import { C, F } from '@druid-toolkit/query';
+import { C, F, SqlExpression } from 'druid-query-toolkit';
 import type { Filter } from 'react-table';
 
 import { addOrUpdate, caseInsensitiveContains, filterMap } from '../utils';
@@ -32,9 +31,9 @@ export const STANDARD_TABLE_PAGE_SIZE_OPTIONS = [50, 100, 200];
 export const SMALL_TABLE_PAGE_SIZE = 25;
 export const SMALL_TABLE_PAGE_SIZE_OPTIONS = [25, 50, 100];
 
-export type FilterMode = '~' | '=' | '!=' | '<=' | '>=';
+export type FilterMode = '~' | '=' | '!=' | '<' | '<=' | '>' | '>=';
 
-export const FILTER_MODES: FilterMode[] = ['~', '=', '!=', '<=', '>='];
+export const FILTER_MODES: FilterMode[] = ['~', '=', '!=', '<', '<=', '>', '>='];
 export const FILTER_MODES_NO_COMPARISON: FilterMode[] = ['~', '=', '!='];
 
 export function filterModeToIcon(mode: FilterMode): IconName {
@@ -45,8 +44,12 @@ export function filterModeToIcon(mode: FilterMode): IconName {
       return IconNames.EQUALS;
     case '!=':
       return IconNames.NOT_EQUAL_TO;
+    case '<':
+      return IconNames.LESS_THAN;
     case '<=':
       return IconNames.LESS_THAN_OR_EQUAL_TO;
+    case '>':
+      return IconNames.GREATER_THAN;
     case '>=':
       return IconNames.GREATER_THAN_OR_EQUAL_TO;
     default:
@@ -62,8 +65,12 @@ export function filterModeToTitle(mode: FilterMode): string {
       return 'Equals';
     case '!=':
       return 'Not equals';
+    case '<':
+      return 'Less than';
     case '<=':
       return 'Less than or equal';
+    case '>':
+      return 'Greater than';
     case '>=':
       return 'Greater than or equal';
     default:
@@ -89,7 +96,7 @@ export function parseFilterModeAndNeedle(
   filter: Filter,
   loose = false,
 ): FilterModeAndNeedle | undefined {
-  const m = /^(~|=|!=|<=|>=)?(.*)$/.exec(String(filter.value));
+  const m = /^(~|=|!=|<(?!=)|<=|>(?!=)|>=)?(.*)$/.exec(String(filter.value));
   if (!m) return;
   if (!loose && !m[2]) return;
   const mode = (m[1] as FilterMode) || '~';
@@ -112,21 +119,28 @@ export function booleanCustomTableFilter(filter: Filter, value: unknown): boolea
   const modeAndNeedle = parseFilterModeAndNeedle(filter);
   if (!modeAndNeedle) return true;
   const { mode, needle } = modeAndNeedle;
+  const strValue = String(value);
   switch (mode) {
     case '=':
-      return String(value) === needle;
+      return strValue === needle;
 
     case '!=':
-      return String(value) !== needle;
+      return strValue !== needle;
+
+    case '<':
+      return strValue < needle;
 
     case '<=':
-      return String(value) <= needle;
+      return strValue <= needle;
+
+    case '>':
+      return strValue > needle;
 
     case '>=':
-      return String(value) >= needle;
+      return strValue >= needle;
 
     default:
-      return caseInsensitiveContains(String(value), needle);
+      return caseInsensitiveContains(strValue, needle);
   }
 }
 
@@ -142,9 +156,15 @@ export function sqlQueryCustomTableFilter(filter: Filter): SqlExpression | undef
     case '!=':
       return column.unequal(needle);
 
+    case '<':
+      return column.lessThan(needle);
+
     case '<=':
       return column.lessThanOrEqual(needle);
 
+    case '>':
+      return column.greaterThan(needle);
+
     case '>=':
       return column.greaterThanOrEqual(needle);
 
@@ -153,6 +173,10 @@ export function sqlQueryCustomTableFilter(filter: Filter): SqlExpression | undef
   }
 }
 
+export function sqlQueryCustomTableFilters(filters: Filter[]): SqlExpression {
+  return SqlExpression.and(...filterMap(filters, sqlQueryCustomTableFilter));
+}
+
 export function tableFiltersToString(tableFilters: Filter[]): string {
   return tableFilters
     .map(({ id, value }) => `${id}${value.replace(/[&%]/g, encodeURIComponent)}`)
@@ -161,9 +185,11 @@ export function tableFiltersToString(tableFilters: Filter[]): string {
 
 export function stringToTableFilters(str: string | undefined): Filter[] {
   if (!str) return [];
-  // '~' | '=' | '!=' | '<=' | '>=';
+  // '~' | '=' | '!=' | '<' | '<=' | '>' | '>=';
   return filterMap(str.split('&'), clause => {
-    const m = /^(\w+)((?:~|=|!=|<=|>=).*)$/.exec(clause.replace(/%2[56]/g, decodeURIComponent));
+    const m = /^(\w+)((?:~|=|!=|<(?!=)|<=|>(?!=)|>=).*)$/.exec(
+      clause.replace(/%2[56]/g, decodeURIComponent),
+    );
     if (!m) return;
     return { id: m[1], value: m[2] };
   });
diff --git a/web-console/src/utils/date-floor-shift-ceil/date-floor-shift-ceil-utc.spec.ts b/web-console/src/utils/date-floor-shift-ceil/date-floor-shift-ceil-utc.spec.ts
new file mode 100755
index 000000000000..5ba63b04468f
--- /dev/null
+++ b/web-console/src/utils/date-floor-shift-ceil/date-floor-shift-ceil-utc.spec.ts
@@ -0,0 +1,169 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { shifters } from './date-floor-shift-ceil';
+
+function pairwise<T>(array: T[], callback: (t1: T, t2: T) => void) {
+  for (let i = 0; i < array.length - 1; i++) {
+    callback(array[i], array[i + 1]);
+  }
+}
+
+describe('floor, shift, ceil (UTC)', () => {
+  const tz = 'Etc/UTC';
+
+  it('moves seconds', () => {
+    const dates: Date[] = [
+      new Date('2012-11-04T00:00:00Z'),
+      new Date('2012-11-04T00:00:03Z'),
+      new Date('2012-11-04T00:00:06Z'),
+      new Date('2012-11-04T00:00:09Z'),
+      new Date('2012-11-04T00:00:12Z'),
+    ];
+    pairwise(dates, (d1, d2) => expect(shifters.second.shift(d1, tz, 3)).toEqual(d2));
+  });
+
+  it('rounds minutes', () => {
+    expect(shifters.minute.round(new Date('2012-11-04T00:29:00Z'), 15, tz)).toEqual(
+      new Date('2012-11-04T00:15:00Z'),
+    );
+
+    expect(shifters.minute.round(new Date('2012-11-04T00:29:00Z'), 4, tz)).toEqual(
+      new Date('2012-11-04T00:28:00Z'),
+    );
+  });
+
+  it('moves minutes', () => {
+    const dates: Date[] = [
+      new Date('2012-11-04T00:00:00Z'),
+      new Date('2012-11-04T00:03:00Z'),
+      new Date('2012-11-04T00:06:00Z'),
+      new Date('2012-11-04T00:09:00Z'),
+      new Date('2012-11-04T00:12:00Z'),
+    ];
+    pairwise(dates, (d1, d2) => expect(shifters.minute.shift(d1, tz, 3)).toEqual(d2));
+  });
+
+  it('floors hour correctly', () => {
+    expect(shifters.hour.floor(new Date('2012-11-04T00:30:00Z'), tz)).toEqual(
+      new Date('2012-11-04T00:00:00Z'),
+    );
+
+    expect(shifters.hour.floor(new Date('2012-11-04T01:30:00Z'), tz)).toEqual(
+      new Date('2012-11-04T01:00:00Z'),
+    );
+
+    expect(shifters.hour.floor(new Date('2012-11-04T01:30:00Z'), tz)).toEqual(
+      new Date('2012-11-04T01:00:00Z'),
+    );
+
+    expect(shifters.hour.floor(new Date('2012-11-04T02:30:00Z'), tz)).toEqual(
+      new Date('2012-11-04T02:00:00Z'),
+    );
+
+    expect(shifters.hour.floor(new Date('2012-11-04T03:30:00Z'), tz)).toEqual(
+      new Date('2012-11-04T03:00:00Z'),
+    );
+  });
+
+  it('moves hour', () => {
+    const dates: Date[] = [
+      new Date('2012-11-04T00:00:00Z'),
+      new Date('2012-11-04T01:00:00Z'),
+      new Date('2012-11-04T02:00:00Z'),
+      new Date('2012-11-04T03:00:00Z'),
+    ];
+    pairwise(dates, (d1, d2) => expect(shifters.hour.shift(d1, tz, 1)).toEqual(d2));
+  });
+
+  it('moves day', () => {
+    const dates: Date[] = [
+      new Date('2012-11-03T00:00:00Z'),
+      new Date('2012-11-04T00:00:00Z'),
+      new Date('2012-11-05T00:00:00Z'),
+      new Date('2012-11-06T00:00:00Z'),
+    ];
+    pairwise(dates, (d1, d2) => expect(shifters.day.shift(d1, tz, 1)).toEqual(d2));
+  });
+
+  it('ceils day', () => {
+    let d1 = new Date('2014-12-11T22:11:57.469Z');
+    let d2 = new Date('2014-12-12T00:00:00.000Z');
+    expect(shifters.day.ceil(d1, tz)).toEqual(d2);
+
+    d1 = new Date('2014-12-08T00:00:00.000Z');
+    d2 = new Date('2014-12-08T00:00:00.000Z');
+    expect(shifters.day.ceil(d1, tz)).toEqual(d2);
+  });
+
+  it('moves week', () => {
+    const dates: Date[] = [
+      new Date('2012-10-29T00:00:00Z'),
+      new Date('2012-11-05T00:00:00Z'),
+      new Date('2012-11-12T00:00:00Z'),
+      new Date('2012-11-19T00:00:00Z'),
+    ];
+    pairwise(dates, (d1, d2) => expect(shifters.week.shift(d1, tz, 1)).toEqual(d2));
+  });
+
+  it('floors week correctly', () => {
+    let d1 = new Date('2014-12-11T22:11:57.469Z');
+    let d2 = new Date('2014-12-08T00:00:00.000Z');
+    expect(shifters.week.floor(d1, tz)).toEqual(d2);
+
+    d1 = new Date('2014-12-07T12:11:57.469Z');
+    d2 = new Date('2014-12-01T00:00:00.000Z');
+    expect(shifters.week.floor(d1, tz)).toEqual(d2);
+  });
+
+  it('ceils week correctly', () => {
+    let d1 = new Date('2014-12-11T22:11:57.469Z');
+    let d2 = new Date('2014-12-15T00:00:00.000Z');
+    expect(shifters.week.ceil(d1, tz)).toEqual(d2);
+
+    d1 = new Date('2014-12-07T12:11:57.469Z');
+    d2 = new Date('2014-12-08T00:00:00.000Z');
+    expect(shifters.week.ceil(d1, tz)).toEqual(d2);
+  });
+
+  it('moves month', () => {
+    const dates: Date[] = [
+      new Date('2012-11-01T00:00:00Z'),
+      new Date('2012-12-01T00:00:00Z'),
+      new Date('2013-01-01T00:00:00Z'),
+      new Date('2013-02-01T00:00:00Z'),
+    ];
+    pairwise(dates, (d1, d2) => expect(shifters.month.shift(d1, tz, 1)).toEqual(d2));
+  });
+
+  it('shifts month on the 31st', () => {
+    const d1 = new Date('2016-03-31T00:00:00.000Z');
+    const d2 = new Date('2016-05-01T00:00:00.000Z');
+    expect(shifters.month.shift(d1, tz, 1)).toEqual(d2);
+  });
+
+  it('moves year', () => {
+    const dates: Date[] = [
+      new Date('2010-01-01T00:00:00Z'),
+      new Date('2011-01-01T00:00:00Z'),
+      new Date('2012-01-01T00:00:00Z'),
+      new Date('2013-01-01T00:00:00Z'),
+    ];
+    pairwise(dates, (d1, d2) => expect(shifters.year.shift(d1, tz, 1)).toEqual(d2));
+  });
+});
diff --git a/web-console/src/utils/date-floor-shift-ceil/date-floor-shift-ceil.spec.ts b/web-console/src/utils/date-floor-shift-ceil/date-floor-shift-ceil.spec.ts
new file mode 100755
index 000000000000..1612c9ce5792
--- /dev/null
+++ b/web-console/src/utils/date-floor-shift-ceil/date-floor-shift-ceil.spec.ts
@@ -0,0 +1,181 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { shifters } from './date-floor-shift-ceil';
+
+function pairwise<T>(array: T[], callback: (t1: T, t2: T) => void) {
+  for (let i = 0; i < array.length - 1; i++) {
+    callback(array[i], array[i + 1]);
+  }
+}
+
+describe('floor/shift/ceil', () => {
+  const tz = 'America/Los_Angeles';
+
+  it('shifts seconds', () => {
+    const dates: Date[] = [
+      new Date('2012-11-04T00:00:00-07:00'),
+      new Date('2012-11-04T00:00:03-07:00'),
+      new Date('2012-11-04T00:00:06-07:00'),
+      new Date('2012-11-04T00:00:09-07:00'),
+      new Date('2012-11-04T00:00:12-07:00'),
+    ];
+    pairwise(dates, (d1, d2) => expect(shifters.second.shift(d1, tz, 3)).toEqual(d2));
+  });
+
+  it('shifts minutes', () => {
+    const dates: Date[] = [
+      new Date('2012-11-04T00:00:00-07:00'),
+      new Date('2012-11-04T00:03:00-07:00'),
+      new Date('2012-11-04T00:06:00-07:00'),
+      new Date('2012-11-04T00:09:00-07:00'),
+      new Date('2012-11-04T00:12:00-07:00'),
+    ];
+    pairwise(dates, (d1, d2) => expect(shifters.minute.shift(d1, tz, 3)).toEqual(d2));
+  });
+
+  it('floors hour correctly', () => {
+    expect(shifters.hour.floor(new Date('2012-11-04T00:30:00-07:00'), tz)).toEqual(
+      new Date('2012-11-04T00:00:00-07:00'),
+    );
+
+    expect(shifters.hour.floor(new Date('2012-11-04T01:30:00-07:00'), tz)).toEqual(
+      new Date('2012-11-04T01:00:00-07:00'),
+    );
+
+    expect(shifters.hour.floor(new Date('2012-11-04T01:30:00-08:00'), tz)).toEqual(
+      new Date('2012-11-04T01:00:00-07:00'),
+    );
+
+    expect(shifters.hour.floor(new Date('2012-11-04T02:30:00-08:00'), tz)).toEqual(
+      new Date('2012-11-04T02:00:00-08:00'),
+    );
+
+    expect(shifters.hour.floor(new Date('2012-11-04T03:30:00-08:00'), tz)).toEqual(
+      new Date('2012-11-04T03:00:00-08:00'),
+    );
+  });
+
+  it('shifting 24 hours over DST is not the same as shifting a day', () => {
+    const start = new Date('2012-11-04T07:00:00Z');
+
+    const shift1Day = shifters.day.shift(start, tz, 1);
+    const shift24Hours = shifters.hour.shift(start, tz, 24);
+
+    expect(shift1Day).toEqual(new Date('2012-11-05T08:00:00Z'));
+    expect(shift24Hours).toEqual(new Date('2012-11-05T07:00:00Z'));
+  });
+
+  it('shifts hour over DST 1', () => {
+    const dates: Date[] = [
+      new Date('2012-11-04T00:00:00-07:00'),
+      new Date('2012-11-04T08:00:00Z'),
+      new Date('2012-11-04T09:00:00Z'),
+      new Date('2012-11-04T10:00:00Z'),
+      new Date('2012-11-04T11:00:00Z'),
+    ];
+    pairwise(dates, (d1, d2) => expect(shifters.hour.shift(d1, tz, 1)).toEqual(d2));
+  });
+
+  it('floors hour over DST 1', () => {
+    expect(shifters.hour.floor(new Date('2012-11-04T00:05:00-07:00'), tz)).toEqual(
+      new Date('2012-11-04T00:00:00-07:00'),
+    );
+    expect(shifters.hour.floor(new Date('2012-11-04T01:05:00-07:00'), tz)).toEqual(
+      new Date('2012-11-04T01:00:00-07:00'),
+    );
+    expect(shifters.hour.floor(new Date('2012-11-04T02:05:00-07:00'), tz)).toEqual(
+      new Date('2012-11-04T01:00:00-07:00'),
+    );
+    expect(shifters.hour.floor(new Date('2012-11-04T03:05:00-07:00'), tz)).toEqual(
+      new Date('2012-11-04T03:00:00-07:00'),
+    );
+  });
+
+  it('shifts hour over DST 2', () => {
+    // "2018-03-11T09:00:00Z"
+    const dates: Date[] = [
+      new Date('2018-03-11T01:00:00-07:00'),
+      new Date('2018-03-11T09:00:00Z'),
+      new Date('2018-03-11T10:00:00Z'),
+      new Date('2018-03-11T11:00:00Z'),
+      new Date('2018-03-11T12:00:00Z'),
+    ];
+    pairwise(dates, (d1, d2) => expect(shifters.hour.shift(d1, tz, 1)).toEqual(d2));
+  });
+
+  it('shifts day over DST', () => {
+    const dates: Date[] = [
+      new Date('2012-11-03T00:00:00-07:00'),
+      new Date('2012-11-04T00:00:00-07:00'),
+      new Date('2012-11-05T00:00:00-08:00'),
+      new Date('2012-11-06T00:00:00-08:00'),
+    ];
+    pairwise(dates, (d1, d2) => expect(shifters.day.shift(d1, tz, 1)).toEqual(d2));
+  });
+
+  it('shifts week over DST', () => {
+    const dates: Date[] = [
+      new Date('2012-10-29T00:00:00-07:00'),
+      new Date('2012-11-05T00:00:00-08:00'),
+      new Date('2012-11-12T00:00:00-08:00'),
+      new Date('2012-11-19T00:00:00-08:00'),
+    ];
+    pairwise(dates, (d1, d2) => expect(shifters.week.shift(d1, tz, 1)).toEqual(d2));
+  });
+
+  it('floors week correctly', () => {
+    let d1 = new Date('2014-12-11T22:11:57.469Z');
+    let d2 = new Date('2014-12-08T08:00:00.000Z');
+    expect(shifters.week.floor(d1, tz)).toEqual(d2);
+
+    d1 = new Date('2014-12-07T12:11:57.469Z');
+    d2 = new Date('2014-12-01T08:00:00.000Z');
+    expect(shifters.week.floor(d1, tz)).toEqual(d2);
+  });
+
+  it('ceils week correctly', () => {
+    let d1 = new Date('2014-12-11T22:11:57.469Z');
+    let d2 = new Date('2014-12-15T08:00:00.000Z');
+    expect(shifters.week.ceil(d1, tz)).toEqual(d2);
+
+    d1 = new Date('2014-12-07T12:11:57.469Z');
+    d2 = new Date('2014-12-08T08:00:00.000Z');
+    expect(shifters.week.ceil(d1, tz)).toEqual(d2);
+  });
+
+  it('shifts month over DST', () => {
+    const dates: Date[] = [
+      new Date('2012-11-01T00:00:00-07:00'),
+      new Date('2012-12-01T00:00:00-08:00'),
+      new Date('2013-01-01T00:00:00-08:00'),
+      new Date('2013-02-01T00:00:00-08:00'),
+    ];
+    pairwise(dates, (d1, d2) => expect(shifters.month.shift(d1, tz, 1)).toEqual(d2));
+  });
+
+  it('shifts year', () => {
+    const dates: Date[] = [
+      new Date('2010-01-01T00:00:00-08:00'),
+      new Date('2011-01-01T00:00:00-08:00'),
+      new Date('2012-01-01T00:00:00-08:00'),
+      new Date('2013-01-01T00:00:00-08:00'),
+    ];
+    pairwise(dates, (d1, d2) => expect(shifters.year.shift(d1, tz, 1)).toEqual(d2));
+  });
+});
diff --git a/web-console/src/utils/date-floor-shift-ceil/date-floor-shift-ceil.ts b/web-console/src/utils/date-floor-shift-ceil/date-floor-shift-ceil.ts
new file mode 100755
index 000000000000..3306b05267d9
--- /dev/null
+++ b/web-console/src/utils/date-floor-shift-ceil/date-floor-shift-ceil.ts
@@ -0,0 +1,296 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { fromDate, startOfWeek } from '@internationalized/date';
+
+export type AlignFn = (dt: Date, tz: string) => Date;
+
+export type ShiftFn = (dt: Date, tz: string, step: number) => Date;
+
+export type RoundFn = (dt: Date, roundTo: number, tz: string) => Date;
+
+export interface TimeShifterNoCeil {
+  canonicalLength: number;
+  siblings?: number;
+  floor: AlignFn;
+  round: RoundFn;
+  shift: ShiftFn;
+}
+
+export interface TimeShifter extends TimeShifterNoCeil {
+  ceil: AlignFn;
+}
+
+function isUTC(tz: string): boolean {
+  return tz === 'Etc/UTC';
+}
+
+function adjustDay(day: number): number {
+  return (day + 6) % 7;
+}
+
+function floorTo(n: number, roundTo: number): number {
+  return Math.floor(n / roundTo) * roundTo;
+}
+
+function timeShifterFiller(tm: TimeShifterNoCeil): TimeShifter {
+  const { floor, shift } = tm;
+  return {
+    ...tm,
+    ceil: (dt: Date, tz: string) => {
+      const floored = floor(dt, tz);
+      if (floored.valueOf() === dt.valueOf()) return dt; // Just like ceil(3) is 3 and not 4
+      return shift(floored, tz, 1);
+    },
+  };
+}
+
+export const second = timeShifterFiller({
+  canonicalLength: 1000,
+  siblings: 60,
+  floor: (dt, _tz) => {
+    // Seconds do not actually need a timezone because all timezones align on seconds... for now...
+    dt = new Date(dt.valueOf());
+    dt.setUTCMilliseconds(0);
+    return dt;
+  },
+  round: (dt, roundTo, _tz) => {
+    const cur = dt.getUTCSeconds();
+    const adj = floorTo(cur, roundTo);
+    if (cur !== adj) dt.setUTCSeconds(adj);
+    return dt;
+  },
+  shift: (dt, _tz, step) => {
+    dt = new Date(dt.valueOf());
+    dt.setUTCSeconds(dt.getUTCSeconds() + step);
+    return dt;
+  },
+});
+
+export const minute = timeShifterFiller({
+  canonicalLength: 60000,
+  siblings: 60,
+  floor: (dt, _tz) => {
+    // Minutes do not actually need a timezone because all timezones align on minutes... for now...
+    dt = new Date(dt.valueOf());
+    dt.setUTCSeconds(0, 0);
+    return dt;
+  },
+  round: (dt, roundTo, _tz) => {
+    const cur = dt.getUTCMinutes();
+    const adj = floorTo(cur, roundTo);
+    if (cur !== adj) dt.setUTCMinutes(adj);
+    return dt;
+  },
+  shift: (dt, _tz, step) => {
+    dt = new Date(dt.valueOf());
+    dt.setUTCMinutes(dt.getUTCMinutes() + step);
+    return dt;
+  },
+});
+
+// Movement by hour is tz independent because in every timezone an hour is 60 min
+function hourMove(dt: Date, _tz: string, step: number) {
+  dt = new Date(dt.valueOf());
+  dt.setUTCHours(dt.getUTCHours() + step);
+  return dt;
+}
+
+export const hour = timeShifterFiller({
+  canonicalLength: 3600000,
+  siblings: 24,
+  floor: (dt, tz) => {
+    if (isUTC(tz)) {
+      dt = new Date(dt.valueOf());
+      dt.setUTCMinutes(0, 0, 0);
+      return dt;
+    } else {
+      return fromDate(dt, tz).set({ second: 0, minute: 0, millisecond: 0 }).toDate();
+    }
+  },
+  round: (dt, roundTo, tz) => {
+    if (isUTC(tz)) {
+      const cur = dt.getUTCHours();
+      const adj = floorTo(cur, roundTo);
+      if (cur !== adj) dt.setUTCHours(adj);
+    } else {
+      const cur = fromDate(dt, tz).hour;
+      const adj = floorTo(cur, roundTo);
+      if (cur !== adj) return hourMove(dt, tz, adj - cur);
+    }
+    return dt;
+  },
+  shift: hourMove,
+});
+
+export const day = timeShifterFiller({
+  canonicalLength: 24 * 3600000,
+  floor: (dt, tz) => {
+    if (isUTC(tz)) {
+      dt = new Date(dt.valueOf());
+      dt.setUTCHours(0, 0, 0, 0);
+      return dt;
+    } else {
+      return fromDate(dt, tz).set({ hour: 0, second: 0, minute: 0, millisecond: 0 }).toDate();
+    }
+  },
+  shift: (dt, tz, step) => {
+    if (isUTC(tz)) {
+      dt = new Date(dt.valueOf());
+      dt.setUTCDate(dt.getUTCDate() + step);
+      return dt;
+    } else {
+      return fromDate(dt, tz).add({ days: step }).toDate();
+    }
+  },
+  round: () => {
+    throw new Error('missing day round');
+  },
+});
+
+export const week = timeShifterFiller({
+  canonicalLength: 7 * 24 * 3600000,
+  floor: (dt, tz) => {
+    if (isUTC(tz)) {
+      dt = new Date(dt.valueOf());
+      dt.setUTCHours(0, 0, 0, 0);
+      dt.setUTCDate(dt.getUTCDate() - adjustDay(dt.getUTCDay()));
+    } else {
+      const zd = fromDate(dt, tz);
+      return startOfWeek(
+        zd.set({ hour: 0, second: 0, minute: 0, millisecond: 0 }),
+        'fr-FR', // We want the week to start on Monday
+      ).toDate();
+    }
+    return dt;
+  },
+  shift: (dt, tz, step) => {
+    if (isUTC(tz)) {
+      dt = new Date(dt.valueOf());
+      dt.setUTCDate(dt.getUTCDate() + step * 7);
+      return dt;
+    } else {
+      return fromDate(dt, tz).add({ weeks: step }).toDate();
+    }
+  },
+  round: () => {
+    throw new Error('missing week round');
+  },
+});
+
+function monthShift(dt: Date, tz: string, step: number) {
+  if (isUTC(tz)) {
+    dt = new Date(dt.valueOf());
+    dt.setUTCMonth(dt.getUTCMonth() + step);
+    return dt;
+  } else {
+    return fromDate(dt, tz).add({ months: step }).toDate();
+  }
+}
+
+export const month = timeShifterFiller({
+  canonicalLength: 30 * 24 * 3600000,
+  siblings: 12,
+  floor: (dt, tz) => {
+    if (isUTC(tz)) {
+      dt = new Date(dt.valueOf());
+      dt.setUTCHours(0, 0, 0, 0);
+      dt.setUTCDate(1);
+      return dt;
+    } else {
+      return fromDate(dt, tz)
+        .set({ day: 1, hour: 0, second: 0, minute: 0, millisecond: 0 })
+        .toDate();
+    }
+  },
+  round: (dt, roundTo, tz) => {
+    if (isUTC(tz)) {
+      const cur = dt.getUTCMonth();
+      const adj = floorTo(cur, roundTo);
+      if (cur !== adj) dt.setUTCMonth(adj);
+    } else {
+      const cur = fromDate(dt, tz).month - 1; // Needs to be zero indexed
+      const adj = floorTo(cur, roundTo);
+      if (cur !== adj) return monthShift(dt, tz, adj - cur);
+    }
+    return dt;
+  },
+  shift: monthShift,
+});
+
+function yearShift(dt: Date, tz: string, step: number) {
+  if (isUTC(tz)) {
+    dt = new Date(dt.valueOf());
+    dt.setUTCFullYear(dt.getUTCFullYear() + step);
+    return dt;
+  } else {
+    return fromDate(dt, tz).add({ years: step }).toDate();
+  }
+}
+
+export const year = timeShifterFiller({
+  canonicalLength: 365 * 24 * 3600000,
+  siblings: 1000,
+  floor: (dt, tz) => {
+    if (isUTC(tz)) {
+      dt = new Date(dt.valueOf());
+      dt.setUTCHours(0, 0, 0, 0);
+      dt.setUTCMonth(0, 1);
+      return dt;
+    } else {
+      return fromDate(dt, tz)
+        .set({ month: 1, day: 1, hour: 0, second: 0, minute: 0, millisecond: 0 })
+        .toDate();
+    }
+  },
+  round: (dt, roundTo, tz) => {
+    if (isUTC(tz)) {
+      const cur = dt.getUTCFullYear();
+      const adj = floorTo(cur, roundTo);
+      if (cur !== adj) dt.setUTCFullYear(adj);
+    } else {
+      const cur = fromDate(dt, tz).year;
+      const adj = floorTo(cur, roundTo);
+      if (cur !== adj) return yearShift(dt, tz, adj - cur);
+    }
+    return dt;
+  },
+  shift: yearShift,
+});
+
+export interface Shifters {
+  second: TimeShifter;
+  minute: TimeShifter;
+  hour: TimeShifter;
+  day: TimeShifter;
+  week: TimeShifter;
+  month: TimeShifter;
+  year: TimeShifter;
+
+  [key: string]: TimeShifter;
+}
+
+export const shifters: Shifters = {
+  second,
+  minute,
+  hour,
+  day,
+  week,
+  month,
+  year,
+};
diff --git a/web-console/src/utils/date.spec.ts b/web-console/src/utils/date.spec.ts
index 843c144244ef..b219ee17af06 100644
--- a/web-console/src/utils/date.spec.ts
+++ b/web-console/src/utils/date.spec.ts
@@ -17,7 +17,6 @@
  */
 
 import {
-  ceilToUtcDay,
   dateToIsoDateString,
   intervalToLocalDateRange,
   localDateRangeToInterval,
@@ -60,12 +59,4 @@ describe('date', () => {
       expect(localDateRangeToInterval(intervalToLocalDateRange(interval))).toEqual(interval);
     });
   });
-
-  describe('ceilToUtcDay', () => {
-    it('works', () => {
-      expect(ceilToUtcDay(new Date('2021-02-03T12:03:02.001Z'))).toEqual(
-        new Date('2021-02-04T00:00:00Z'),
-      );
-    });
-  });
 });
diff --git a/web-console/src/utils/date.ts b/web-console/src/utils/date.ts
index 1d5aa4f61e95..08f1d1df43ba 100644
--- a/web-console/src/utils/date.ts
+++ b/web-console/src/utils/date.ts
@@ -99,9 +99,10 @@ export function localDateRangeToInterval(localRange: DateRange): string {
   }`;
 }
 
-export function ceilToUtcDay(date: Date): Date {
-  date = new Date(date.valueOf());
-  date.setUTCHours(0, 0, 0, 0);
-  date.setUTCDate(date.getUTCDate() + 1);
-  return date;
+export function maxDate(a: Date, b: Date): Date {
+  return a > b ? a : b;
+}
+
+export function minDate(a: Date, b: Date): Date {
+  return a < b ? a : b;
 }
diff --git a/web-console/src/utils/download.ts b/web-console/src/utils/download.ts
index 4fb3342e523c..40b0d95e8b91 100644
--- a/web-console/src/utils/download.ts
+++ b/web-console/src/utils/download.ts
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-import type { QueryResult } from '@druid-toolkit/query';
+import type { QueryResult } from 'druid-query-toolkit';
 import FileSaver from 'file-saver';
 import * as JSONBig from 'json-bigint-native';
 
diff --git a/web-console/src/utils/druid-query.spec.ts b/web-console/src/utils/druid-query.spec.ts
index ee867ff47ea5..a940b8ac7bb6 100644
--- a/web-console/src/utils/druid-query.spec.ts
+++ b/web-console/src/utils/druid-query.spec.ts
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-import { sane } from '@druid-toolkit/query';
+import { sane } from 'druid-query-toolkit';
 
 import { DruidError, getDruidErrorMessage } from './druid-query';
 
diff --git a/web-console/src/utils/druid-query.ts b/web-console/src/utils/druid-query.ts
index 8102db89ca3a..ee1ba1ef4a8c 100644
--- a/web-console/src/utils/druid-query.ts
+++ b/web-console/src/utils/druid-query.ts
@@ -16,9 +16,9 @@
  * limitations under the License.
  */
 
-import { C } from '@druid-toolkit/query';
 import type { AxiosResponse, CancelToken } from 'axios';
 import axios from 'axios';
+import { C } from 'druid-query-toolkit';
 
 import { Api } from '../singletons';
 
@@ -358,6 +358,12 @@ export async function queryDruidSqlDart<T = any>(
   return sqlResultResp.data;
 }
 
+export async function getApiArray<T = any>(url: string, cancelToken?: CancelToken): Promise<T[]> {
+  const result = (await Api.instance.get(url, { cancelToken })).data;
+  if (!Array.isArray(result)) throw new Error('unexpected result');
+  return result;
+}
+
 export interface QueryExplanation {
   query: any;
   signature: { name: string; type: string }[];
diff --git a/web-console/src/utils/duration/duration.spec.ts b/web-console/src/utils/duration/duration.spec.ts
new file mode 100755
index 000000000000..8b20ac0a6b2a
--- /dev/null
+++ b/web-console/src/utils/duration/duration.spec.ts
@@ -0,0 +1,505 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { Duration } from './duration';
+
+describe('Duration', () => {
+  const TZ_LA = 'America/Los_Angeles';
+  const TZ_JUNEAU = 'America/Juneau';
+
+  describe('errors', () => {
+    it('throws error if invalid duration', () => {
+      expect(() => new Duration('')).toThrow("Can not parse duration ''");
+
+      expect(() => new Duration('P00')).toThrow("Can not parse duration 'P00'");
+
+      expect(() => new Duration('P')).toThrow('Duration can not be empty');
+
+      expect(() => new Duration('P0YT0H')).toThrow('Duration can not be empty');
+
+      expect(() => new Duration('P0W').shift(new Date(), TZ_LA)).toThrow(
+        'Duration can not have empty weeks',
+      );
+
+      expect(() => new Duration('P0Y0MT0H0M0S').shift(new Date(), TZ_LA)).toThrow(
+        'Duration can not be empty',
+      );
+    });
+
+    it('throws error if fromJS is not given a string', () => {
+      expect(() => new Duration(new Date() as any)).toThrow('Duration can not be empty');
+    });
+  });
+
+  describe('#toString', () => {
+    it('gives back the correct string', () => {
+      let durationStr: string;
+
+      durationStr = 'P3Y';
+      expect(new Duration(durationStr).toString()).toEqual(durationStr);
+
+      durationStr = 'P2W';
+      expect(new Duration(durationStr).toString()).toEqual(durationStr);
+
+      durationStr = 'PT5H';
+      expect(new Duration(durationStr).toString()).toEqual(durationStr);
+
+      durationStr = 'P3DT15H';
+      expect(new Duration(durationStr).toString()).toEqual(durationStr);
+    });
+
+    it('eliminates 0', () => {
+      expect(new Duration('P0DT15H').toString()).toEqual('PT15H');
+    });
+  });
+
+  describe('fromCanonicalLength', () => {
+    it('handles zero', () => {
+      expect(() => {
+        Duration.fromCanonicalLength(0);
+      }).toThrow('length must be positive');
+    });
+
+    it('works 1', () => {
+      expect(Duration.fromCanonicalLength(86400000).toString()).toEqual('P1D');
+    });
+
+    it('works 2', () => {
+      const len =
+        new Date('2018-03-01T00:00:00Z').valueOf() - new Date('2016-02-22T00:00:00Z').valueOf();
+      expect(Duration.fromCanonicalLength(len).toString()).toEqual('P2Y8D');
+    });
+
+    it('works 3', () => {
+      const len =
+        new Date('2018-09-15T00:00:00Z').valueOf() - new Date('2018-09-04T00:00:00Z').valueOf();
+      expect(Duration.fromCanonicalLength(len).toString()).toEqual('P11D');
+    });
+
+    it('works with months', () => {
+      expect(Duration.fromCanonicalLength(2592000000).toString()).toEqual('P1M');
+      expect(Duration.fromCanonicalLength(2678400000).toString()).toEqual('P1M1D');
+    });
+
+    it('works without months', () => {
+      expect(Duration.fromCanonicalLength(2592000000, true).toString()).toEqual('P30D');
+      expect(Duration.fromCanonicalLength(2678400000, true).toString()).toEqual('P31D');
+    });
+  });
+
+  describe('construct from span', () => {
+    it('parses days over DST', () => {
+      expect(
+        Duration.fromRange(
+          new Date('2012-10-29T00:00:00-07:00'),
+          new Date('2012-11-05T00:00:00-08:00'),
+          TZ_LA,
+        ).toString(),
+      ).toEqual('P7D');
+
+      expect(
+        Duration.fromRange(
+          new Date('2012-10-29T00:00:00-07:00'),
+          new Date('2012-11-12T00:00:00-08:00'),
+          TZ_LA,
+        ).toString(),
+      ).toEqual('P14D');
+    });
+
+    it('parses complex case', () => {
+      expect(
+        Duration.fromRange(
+          new Date('2012-10-29T00:00:00-07:00'),
+          new Date(new Date('2012-11-05T00:00:00-08:00').valueOf() - 1000),
+          TZ_LA,
+        ).toString(),
+      ).toEqual('P6DT24H59M59S');
+
+      expect(
+        Duration.fromRange(
+          new Date('2012-01-01T00:00:00-08:00'),
+          new Date('2013-03-04T04:05:06-08:00'),
+          TZ_LA,
+        ).toString(),
+      ).toEqual('P1Y2M3DT4H5M6S');
+    });
+  });
+
+  describe('#isFloorable', () => {
+    const floorable = 'P1Y P5Y P10Y P100Y P1M P2M P3M P4M P1D'.split(' ');
+    for (const v of floorable) {
+      it(`works on floorable ${v}`, () => {
+        expect(new Duration(v).isFloorable()).toEqual(true);
+      });
+    }
+
+    const unfloorable = 'P1Y1M P5M P2D P3D'.split(' ');
+    for (const v of unfloorable) {
+      it(`works on not floorable ${v}`, () => {
+        expect(new Duration(v).isFloorable()).toEqual(false);
+      });
+    }
+  });
+
+  describe('#floor', () => {
+    it('throws error if complex duration', () => {
+      expect(() => new Duration('P1Y2D').floor(new Date(), TZ_LA)).toThrow(
+        'Can not floor on a complex duration',
+      );
+
+      expect(() => new Duration('P3DT15H').floor(new Date(), TZ_LA)).toThrow(
+        'Can not floor on a complex duration',
+      );
+
+      expect(() => new Duration('PT5H').floor(new Date(), TZ_LA)).toThrow(
+        'Can not floor on a hour duration that does not divide into 24',
+      );
+    });
+
+    it('works for year', () => {
+      const p1y = new Duration('P1Y');
+      expect(p1y.floor(new Date('2013-09-29T01:02:03.456-07:00'), TZ_LA)).toEqual(
+        new Date('2013-01-01T00:00:00.000-08:00'),
+      );
+    });
+
+    it('works for PT2M', () => {
+      const pt2h = new Duration('PT2M');
+      expect(pt2h.floor(new Date('2013-09-29T03:03:03.456-07:00'), TZ_LA)).toEqual(
+        new Date('2013-09-29T03:02:00.000-07:00'),
+      );
+    });
+
+    it('works for P2H', () => {
+      const pt2h = new Duration('PT2H');
+      expect(pt2h.floor(new Date('2013-09-29T03:02:03.456-07:00'), TZ_LA)).toEqual(
+        new Date('2013-09-29T02:00:00.000-07:00'),
+      );
+    });
+
+    it('works for PT12H', () => {
+      const pt12h = new Duration('PT12H');
+      expect(pt12h.floor(new Date('2015-09-12T13:05:00-08:00'), TZ_JUNEAU)).toEqual(
+        new Date('2015-09-12T12:00:00-08:00'),
+      );
+    });
+
+    it('works for P1W', () => {
+      const p1w = new Duration('P1W');
+
+      expect(p1w.floor(new Date('2013-09-29T01:02:03.456-07:00'), TZ_LA)).toEqual(
+        new Date('2013-09-23T07:00:00.000Z'),
+      );
+
+      expect(p1w.floor(new Date('2013-10-03T01:02:03.456-07:00'), TZ_LA)).toEqual(
+        new Date('2013-09-30T00:00:00.000-07:00'),
+      );
+    });
+
+    it('works for P3M', () => {
+      const p3m = new Duration('P3M');
+      expect(p3m.floor(new Date('2013-09-29T03:02:03.456-07:00'), TZ_LA)).toEqual(
+        new Date('2013-07-01T00:00:00.000-07:00'),
+      );
+
+      expect(p3m.floor(new Date('2013-02-29T03:02:03.456-07:00'), TZ_LA)).toEqual(
+        new Date('2013-01-01T00:00:00.000-08:00'),
+      );
+    });
+
+    it('works for P4Y', () => {
+      const p4y = new Duration('P4Y');
+      expect(p4y.floor(new Date('2013-09-29T03:02:03.456-07:00'), TZ_LA)).toEqual(
+        new Date('2012-01-01T00:00:00.000-08:00'),
+      );
+    });
+  });
+
+  describe('#shift', () => {
+    it('works for weeks', () => {
+      let p1w = new Duration('P1W');
+      expect(p1w.shift(new Date('2012-10-29T00:00:00-07:00'), TZ_LA)).toEqual(
+        new Date('2012-11-05T00:00:00-08:00'),
+      );
+
+      p1w = new Duration('P1W');
+      expect(p1w.shift(new Date('2012-10-29T00:00:00-07:00'), TZ_LA, 2)).toEqual(
+        new Date('2012-11-12T00:00:00-08:00'),
+      );
+
+      const p2w = new Duration('P2W');
+      expect(p2w.shift(new Date('2012-10-29T05:16:17-07:00'), TZ_LA)).toEqual(
+        new Date('2012-11-12T05:16:17-08:00'),
+      );
+    });
+
+    it('works for general complex case', () => {
+      const pComplex = new Duration('P1Y2M3DT4H5M6S');
+      expect(pComplex.shift(new Date('2012-01-01T00:00:00-08:00'), TZ_LA)).toEqual(
+        new Date('2013-03-04T04:05:06-08:00'),
+      );
+    });
+  });
+
+  describe('#materialize', () => {
+    it('works for weeks', () => {
+      const p1w = new Duration('P1W');
+
+      expect(
+        p1w.materialize(
+          new Date('2012-10-29T00:00:00-07:00'),
+          new Date('2012-12-01T00:00:00-08:00'),
+          TZ_LA,
+        ),
+      ).toEqual([
+        new Date('2012-10-29T07:00:00.000Z'),
+        new Date('2012-11-05T08:00:00.000Z'),
+        new Date('2012-11-12T08:00:00.000Z'),
+        new Date('2012-11-19T08:00:00.000Z'),
+        new Date('2012-11-26T08:00:00.000Z'),
+      ]);
+
+      expect(
+        p1w.materialize(
+          new Date('2012-10-29T00:00:00-07:00'),
+          new Date('2012-12-01T00:00:00-08:00'),
+          TZ_LA,
+          2,
+        ),
+      ).toEqual([
+        new Date('2012-10-29T07:00:00.000Z'),
+        new Date('2012-11-12T08:00:00.000Z'),
+        new Date('2012-11-26T08:00:00.000Z'),
+      ]);
+    });
+  });
+
+  describe('#isAligned', () => {
+    it('works for weeks', () => {
+      const p1w = new Duration('P1W');
+      expect(p1w.isAligned(new Date('2012-10-29T00:00:00-07:00'), TZ_LA)).toEqual(true);
+      expect(p1w.isAligned(new Date('2012-10-29T00:00:00-07:00'), 'Etc/UTC')).toEqual(false);
+    });
+  });
+
+  describe('#dividesBy', () => {
+    const divisible = 'P5Y/P1Y P1D/P1D P1M/P1D P1W/P1D P1D/PT6H PT3H/PT1H'.split(' ');
+    for (const v of divisible) {
+      it(`works for ${v} (true)`, () => {
+        const p = v.split('/');
+        expect(new Duration(p[0]).dividesBy(new Duration(p[1]))).toEqual(true);
+      });
+    }
+
+    const undivisible = 'P1D/P1M PT5H/PT1H'.split(' ');
+    for (const v of undivisible) {
+      it(`works for ${v} (false)`, () => {
+        const p = v.split('/');
+        expect(new Duration(p[0]).dividesBy(new Duration(p[1]))).toEqual(false);
+      });
+    }
+  });
+
+  describe('#getCanonicalLength', () => {
+    it('gives back the correct canonical length', () => {
+      let durationStr: string;
+
+      durationStr = 'P3Y';
+      expect(new Duration(durationStr).getCanonicalLength()).toEqual(94608000000);
+
+      durationStr = 'P2W';
+      expect(new Duration(durationStr).getCanonicalLength()).toEqual(1209600000);
+
+      durationStr = 'PT5H';
+      expect(new Duration(durationStr).getCanonicalLength()).toEqual(18000000);
+
+      durationStr = 'P3DT15H';
+      expect(new Duration(durationStr).getCanonicalLength()).toEqual(313200000);
+    });
+  });
+
+  describe('#add()', () => {
+    it('works with a simple duration', () => {
+      const d1 = new Duration('P1D');
+      const d2 = new Duration('P1D');
+
+      expect(d1.add(d2).toString()).toEqual('P2D');
+    });
+
+    it('works with heterogeneous spans', () => {
+      const d1 = new Duration('P1D');
+      const d2 = new Duration('P1Y');
+
+      expect(d1.add(d2).toString()).toEqual('P1Y1D');
+    });
+
+    it('works with weeks', () => {
+      let d1 = new Duration('P1W');
+      let d2 = new Duration('P2W');
+      expect(d1.add(d2).toString()).toEqual('P3W');
+
+      d1 = new Duration('P6D');
+      d2 = new Duration('P1D');
+      expect(d1.add(d2).toString()).toEqual('P1W');
+    });
+  });
+
+  describe('#subtract()', () => {
+    it('works with a simple duration', () => {
+      const d1 = new Duration('P1DT2H');
+      const d2 = new Duration('PT1H');
+
+      expect(d1.subtract(d2).toString()).toEqual('P1DT1H');
+    });
+
+    it('works with a less simple duration', () => {
+      const d1 = new Duration('P1D');
+      const d2 = new Duration('PT1H');
+
+      expect(d1.subtract(d2).toString()).toEqual('PT23H');
+    });
+
+    it('works with weeks', () => {
+      const d1 = new Duration('P1W');
+      const d2 = new Duration('P1D');
+
+      expect(d1.subtract(d2).toString()).toEqual('P6D');
+    });
+
+    it('throws an error if result is going to be negative', () => {
+      const d1 = new Duration('P1D');
+      const d2 = new Duration('P2D');
+
+      expect(() => d1.subtract(d2)).toThrow();
+    });
+  });
+
+  describe('#multiply()', () => {
+    it('works with a simple duration', () => {
+      const d = new Duration('P1D');
+      expect(d.multiply(5).toString()).toEqual('P5D');
+    });
+
+    it('works with a less simple duration', () => {
+      const d = new Duration('P1DT2H');
+      expect(d.multiply(2).toString()).toEqual('P2DT4H');
+    });
+
+    it('works with weeks', () => {
+      const d = new Duration('P1W');
+      expect(d.multiply(5).toString()).toEqual('P5W');
+    });
+
+    it('throws an error if result is going to be negative', () => {
+      const d = new Duration('P1D');
+      expect(() => d.multiply(-1)).toThrow('Multiplier must be positive non-zero');
+    });
+
+    it('gets description properly', () => {
+      const d = new Duration('P2D');
+      expect(d.multiply(2).getDescription(true)).toEqual('4 Days');
+    });
+  });
+
+  describe('#getDescription()', () => {
+    it('gives back the correct description', () => {
+      let durationStr: string;
+
+      durationStr = 'P1D';
+      expect(new Duration(durationStr).getDescription()).toEqual('day');
+
+      durationStr = 'P1DT2H';
+      expect(new Duration(durationStr).getDescription()).toEqual('1 day, 2 hours');
+
+      durationStr = 'P3Y';
+      expect(new Duration(durationStr).getDescription()).toEqual('3 years');
+
+      durationStr = 'P2W';
+      expect(new Duration(durationStr).getDescription()).toEqual('2 weeks');
+
+      durationStr = 'PT5H';
+      expect(new Duration(durationStr).getDescription()).toEqual('5 hours');
+
+      durationStr = 'P3DT15H';
+      expect(new Duration(durationStr).getDescription()).toEqual('3 days, 15 hours');
+
+      durationStr = 'P3DT15H';
+      expect(new Duration(durationStr).getDescription(true)).toEqual('3 Days, 15 Hours');
+    });
+  });
+
+  describe('#getSingleSpan()', () => {
+    it('gives back the correct span', () => {
+      let durationStr: string;
+
+      durationStr = 'P1D';
+      expect(new Duration(durationStr).getSingleSpan()).toEqual('day');
+
+      durationStr = 'P3Y';
+      expect(new Duration(durationStr).getSingleSpan()).toEqual('year');
+
+      durationStr = 'P2W';
+      expect(new Duration(durationStr).getSingleSpan()).toEqual('week');
+
+      durationStr = 'PT5H';
+      expect(new Duration(durationStr).getSingleSpan()).toEqual('hour');
+
+      durationStr = 'P3DT15H';
+      expect(new Duration(durationStr).getSingleSpan()).toBeUndefined();
+
+      durationStr = 'P3DT15H';
+      expect(new Duration(durationStr).getSingleSpan()).toBeUndefined();
+    });
+  });
+
+  describe('#getSingleSpanValue()', () => {
+    it('gives back the correct span value', () => {
+      let durationStr: string;
+
+      durationStr = 'P1D';
+      expect(new Duration(durationStr).getSingleSpanValue()).toEqual(1);
+
+      durationStr = 'P3Y';
+      expect(new Duration(durationStr).getSingleSpanValue()).toEqual(3);
+
+      durationStr = 'P2W';
+      expect(new Duration(durationStr).getSingleSpanValue()).toEqual(2);
+
+      durationStr = 'PT5H';
+      expect(new Duration(durationStr).getSingleSpanValue()).toEqual(5);
+
+      durationStr = 'P3DT15H';
+      expect(new Duration(durationStr).getSingleSpanValue()).toBeUndefined();
+
+      durationStr = 'P3DT15H';
+      expect(new Duration(durationStr).getSingleSpanValue()).toBeUndefined();
+    });
+  });
+
+  describe('#limitToDays', () => {
+    it('works', () => {
+      expect(new Duration('P6D').limitToDays().toString()).toEqual('P6D');
+
+      expect(new Duration('P1M').limitToDays().toString()).toEqual('P30D');
+
+      expect(new Duration('P1Y').limitToDays().toString()).toEqual('P365D');
+
+      expect(new Duration('P1Y2M').limitToDays().toString()).toEqual('P425D');
+    });
+  });
+});
diff --git a/web-console/src/utils/duration/duration.ts b/web-console/src/utils/duration/duration.ts
new file mode 100755
index 000000000000..bc7236821f12
--- /dev/null
+++ b/web-console/src/utils/duration/duration.ts
@@ -0,0 +1,388 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { second, shifters } from '../date-floor-shift-ceil/date-floor-shift-ceil';
+import { capitalizeFirst, pluralIfNeeded } from '../general';
+
+export const TZ_UTC = 'Etc/UTC';
+
+export type DurationSpan = 'year' | 'month' | 'week' | 'day' | 'hour' | 'minute' | 'second';
+
+const SPANS_WITH_WEEK: DurationSpan[] = [
+  'year',
+  'month',
+  'week',
+  'day',
+  'hour',
+  'minute',
+  'second',
+];
+const SPANS_WITHOUT_WEEK: DurationSpan[] = ['year', 'month', 'day', 'hour', 'minute', 'second'];
+const SPANS_WITHOUT_WEEK_OR_MONTH: DurationSpan[] = ['year', 'day', 'hour', 'minute', 'second'];
+const SPANS_UP_TO_DAY: DurationSpan[] = ['day', 'hour', 'minute', 'second'];
+
+export type DurationValue = Partial<Record<DurationSpan, number>>;
+
+const periodWeekRegExp = /^P(\d+)W$/;
+const periodRegExp = /^P(?:(\d+)Y)?(?:(\d+)M)?(?:(\d+)D)?(?:T(?:(\d+)H)?(?:(\d+)M)?(?:(\d+)S)?)?$/;
+//                     P   (year ) (month   ) (day     )    T(hour    ) (minute  ) (second  )
+
+function getSpansFromString(durationStr: string): DurationValue {
+  const spans: DurationValue = {};
+  let matches: RegExpExecArray | null;
+  if ((matches = periodWeekRegExp.exec(durationStr))) {
+    spans.week = Number(matches[1]);
+    if (!spans.week) throw new Error('Duration can not have empty weeks');
+  } else if ((matches = periodRegExp.exec(durationStr))) {
+    const nums = matches.map(Number);
+    for (let i = 0; i < SPANS_WITHOUT_WEEK.length; i++) {
+      const span = SPANS_WITHOUT_WEEK[i];
+      const value = nums[i + 1];
+      if (value) spans[span] = value;
+    }
+  } else {
+    throw new Error("Can not parse duration '" + durationStr + "'");
+  }
+  return spans;
+}
+
+function getSpansFromStartEnd(start: Date, end: Date, timezone: string): DurationValue {
+  start = second.floor(start, timezone);
+  end = second.floor(end, timezone);
+  if (end <= start) throw new Error('start must come before end');
+
+  const spans: DurationValue = {};
+  let iterator: Date = start;
+  for (let i = 0; i < SPANS_WITHOUT_WEEK.length; i++) {
+    const span = SPANS_WITHOUT_WEEK[i];
+    let spanCount = 0;
+
+    // Shortcut
+    const length = end.valueOf() - iterator.valueOf();
+    const canonicalLength: number = shifters[span].canonicalLength;
+    if (length < canonicalLength / 4) continue;
+    const numberToFit = Math.min(0, Math.floor(length / canonicalLength) - 1);
+    let iteratorMove: Date;
+    if (numberToFit > 0) {
+      // try to skip by numberToFit
+      iteratorMove = shifters[span].shift(iterator, timezone, numberToFit);
+      if (iteratorMove <= end) {
+        spanCount += numberToFit;
+        iterator = iteratorMove;
+      }
+    }
+
+    while (true) {
+      iteratorMove = shifters[span].shift(iterator, timezone, 1);
+      if (iteratorMove <= end) {
+        iterator = iteratorMove;
+        spanCount++;
+      } else {
+        break;
+      }
+    }
+
+    if (spanCount) {
+      spans[span] = spanCount;
+    }
+  }
+  return spans;
+}
+
+function removeZeros(spans: DurationValue): DurationValue {
+  const newSpans: DurationValue = {};
+  for (let i = 0; i < SPANS_WITH_WEEK.length; i++) {
+    const span = SPANS_WITH_WEEK[i];
+    if (Number(spans[span]) > 0) {
+      newSpans[span] = spans[span];
+    }
+  }
+  return newSpans;
+}
+
+function fitIntoSpans(length: number, spansToCheck: DurationSpan[]): DurationValue {
+  const spans: DurationValue = {};
+
+  let lengthLeft = length;
+  for (let i = 0; i < spansToCheck.length; i++) {
+    const span = spansToCheck[i];
+    const spanLength = shifters[span].canonicalLength;
+    const count = Math.floor(lengthLeft / spanLength);
+
+    if (count) {
+      lengthLeft -= spanLength * count;
+      spans[span] = count;
+    }
+  }
+
+  return spans;
+}
+
+/**
+ * Represents an ISO duration like P1DT3H
+ */
+export class Duration {
+  public readonly singleSpan?: DurationSpan;
+  public readonly spans: Readonly<DurationValue>;
+
+  static fromCanonicalLength(length: number, skipMonths = false): Duration {
+    if (length <= 0) throw new Error('length must be positive');
+    let spans = fitIntoSpans(length, skipMonths ? SPANS_WITHOUT_WEEK_OR_MONTH : SPANS_WITHOUT_WEEK);
+
+    if (
+      length % shifters['week'].canonicalLength === 0 && // Weeks fits
+      (Object.keys(spans).length > 1 || // We already have a more complex span
+        spans['day']) // or... we only have days and it might be simpler to express as weeks
+    ) {
+      spans = { week: length / shifters['week'].canonicalLength };
+    }
+
+    return new Duration(spans);
+  }
+
+  static fromCanonicalLengthUpToDays(length: number): Duration {
+    if (length <= 0) throw new Error('length must be positive');
+    return new Duration(fitIntoSpans(length, SPANS_UP_TO_DAY));
+  }
+
+  static fromRange(start: Date, end: Date, timezone: string): Duration {
+    return new Duration(getSpansFromStartEnd(start, end, timezone));
+  }
+
+  static pickSmallestGranularityThatFits(
+    granularities: Duration[],
+    span: number,
+    maxEntities: number,
+  ): Duration {
+    for (const granularity of granularities) {
+      if (span / granularity.getCanonicalLength() < maxEntities) return granularity;
+    }
+    return granularities[granularities.length - 1];
+  }
+
+  constructor(spans: DurationValue | string) {
+    const effectiveSpans: DurationValue =
+      typeof spans === 'string' ? getSpansFromString(spans) : removeZeros(spans);
+
+    const usedSpans = Object.keys(effectiveSpans) as DurationSpan[];
+    if (!usedSpans.length) throw new Error('Duration can not be empty');
+    if (usedSpans.length === 1) {
+      this.singleSpan = usedSpans[0];
+    } else if (effectiveSpans.week) {
+      throw new Error("Can not mix 'week' and other spans");
+    }
+    this.spans = effectiveSpans;
+  }
+
+  public toString() {
+    const strArr: string[] = ['P'];
+    const spans = this.spans;
+    if (spans.week) {
+      strArr.push(String(spans.week), 'W');
+    } else {
+      let addedT = false;
+      for (let i = 0; i < SPANS_WITHOUT_WEEK.length; i++) {
+        const span = SPANS_WITHOUT_WEEK[i];
+        const value = spans[span];
+        if (!value) continue;
+        if (!addedT && i >= 3) {
+          strArr.push('T');
+          addedT = true;
+        }
+        strArr.push(String(value), span[0].toUpperCase());
+      }
+    }
+    return strArr.join('');
+  }
+
+  public add(duration: Duration): Duration {
+    return Duration.fromCanonicalLength(this.getCanonicalLength() + duration.getCanonicalLength());
+  }
+
+  public subtract(duration: Duration): Duration {
+    const newCanonicalDuration = this.getCanonicalLength() - duration.getCanonicalLength();
+    if (newCanonicalDuration < 0) throw new Error('A duration can not be negative.');
+    return Duration.fromCanonicalLength(newCanonicalDuration);
+  }
+
+  public multiply(multiplier: number): Duration {
+    if (multiplier <= 0) throw new Error('Multiplier must be positive non-zero');
+    if (multiplier === 1) return this;
+    const newCanonicalDuration = this.getCanonicalLength() * multiplier;
+    return Duration.fromCanonicalLength(newCanonicalDuration);
+  }
+
+  public valueOf() {
+    return this.spans;
+  }
+
+  public equals(other: Duration | undefined): boolean {
+    return other instanceof Duration && this.toString() === other.toString();
+  }
+
+  public isSimple(): boolean {
+    const { singleSpan } = this;
+    if (!singleSpan) return false;
+    return this.spans[singleSpan] === 1;
+  }
+
+  public isFloorable(): boolean {
+    const { singleSpan } = this;
+    if (!singleSpan) return false;
+    const span = Number(this.spans[singleSpan]);
+    if (span === 1) return true;
+    const { siblings } = shifters[singleSpan];
+    if (!siblings) return false;
+    return siblings % span === 0;
+  }
+
+  /**
+   * Floors the date according to this duration.
+   * @param date The date to floor
+   * @param timezone The timezone within which to floor
+   */
+  public floor(date: Date, timezone: string): Date {
+    const { singleSpan } = this;
+    if (!singleSpan) throw new Error('Can not floor on a complex duration');
+    const span = this.spans[singleSpan]!;
+    const mover = shifters[singleSpan];
+    let dt = mover.floor(date, timezone);
+    if (span !== 1) {
+      if (!mover.siblings) {
+        throw new Error(`Can not floor on a ${singleSpan} duration that is not 1`);
+      }
+      if (mover.siblings % span !== 0) {
+        throw new Error(
+          `Can not floor on a ${singleSpan} duration that does not divide into ${mover.siblings}`,
+        );
+      }
+      dt = mover.round(dt, span, timezone);
+    }
+    return dt;
+  }
+
+  /**
+   * Moves the given date by 'step' times of the duration
+   * Negative step value will move back in time.
+   * @param date The date to move
+   * @param timezone The timezone within which to make the move
+   * @param step The number of times to step by the duration
+   */
+  public shift(date: Date, timezone: string, step = 1): Date {
+    const spans = this.spans;
+    for (const span of SPANS_WITH_WEEK) {
+      const value = spans[span];
+      if (value) date = shifters[span].shift(date, timezone, step * value);
+    }
+    return date;
+  }
+
+  public ceil(date: Date, timezone: string): Date {
+    const floored = this.floor(date, timezone);
+    if (floored.valueOf() === date.valueOf()) return date; // Just like ceil(3) is 3 and not 4
+    return this.shift(floored, timezone, 1);
+  }
+
+  public round(date: Date, timezone: string): Date {
+    const floorDate = this.floor(date, timezone);
+    const ceilDate = this.ceil(date, timezone);
+    const distanceToFloor = Math.abs(date.valueOf() - floorDate.valueOf());
+    const distanceToCeil = Math.abs(date.valueOf() - ceilDate.valueOf());
+    return distanceToFloor < distanceToCeil ? floorDate : ceilDate;
+  }
+
+  /**
+   * Materializes all the values of this duration form start to end
+   * @param start The date to start on
+   * @param end The date to start on
+   * @param timezone The timezone within which to materialize
+   * @param step The number of times to step by the duration
+   */
+  public materialize(start: Date, end: Date, timezone: string, step = 1): Date[] {
+    const values: Date[] = [];
+    let iter = this.floor(start, timezone);
+    while (iter <= end) {
+      values.push(iter);
+      iter = this.shift(iter, timezone, step);
+    }
+    return values;
+  }
+
+  /**
+   * Checks to see if date is aligned to this duration within the timezone (floors to itself)
+   * @param date The date to check
+   * @param timezone The timezone within which to make the check
+   */
+  public isAligned(date: Date, timezone: string): boolean {
+    return this.floor(date, timezone).valueOf() === date.valueOf();
+  }
+
+  /**
+   * Check to see if this duration can be divided by the given duration
+   * @param smaller The smaller duration to divide by
+   */
+  public dividesBy(smaller: Duration): boolean {
+    const myCanonicalLength = this.getCanonicalLength();
+    const smallerCanonicalLength = smaller.getCanonicalLength();
+    return (
+      myCanonicalLength % smallerCanonicalLength === 0 &&
+      this.isFloorable() &&
+      smaller.isFloorable()
+    );
+  }
+
+  public getCanonicalLength(): number {
+    const spans = this.spans;
+    let length = 0;
+    for (const span of SPANS_WITH_WEEK) {
+      const value = spans[span];
+      if (value) length += value * shifters[span].canonicalLength;
+    }
+    return length;
+  }
+
+  public getDescription(capitalize?: boolean): string {
+    const spans = this.spans;
+    const description: string[] = [];
+    for (const span of SPANS_WITH_WEEK) {
+      const value = spans[span];
+      const spanTitle = capitalize ? capitalizeFirst(span) : span;
+      if (value) {
+        if (value === 1 && this.singleSpan) {
+          description.push(spanTitle);
+        } else {
+          description.push(pluralIfNeeded(value, spanTitle));
+        }
+      }
+    }
+    return description.join(', ');
+  }
+
+  public getSingleSpan(): string | undefined {
+    return this.singleSpan;
+  }
+
+  public getSingleSpanValue(): number | undefined {
+    if (!this.singleSpan) return;
+    return this.spans[this.singleSpan];
+  }
+
+  public limitToDays(): Duration {
+    return Duration.fromCanonicalLengthUpToDays(this.getCanonicalLength());
+  }
+}
diff --git a/web-console/src/utils/general.spec.ts b/web-console/src/utils/general.spec.ts
index 4b97cb19acb0..39deab9420aa 100644
--- a/web-console/src/utils/general.spec.ts
+++ b/web-console/src/utils/general.spec.ts
@@ -29,8 +29,8 @@ import {
   hashJoaat,
   moveElement,
   moveToIndex,
-  objectHash,
   offsetToRowColumn,
+  OVERLAY_OPEN_SELECTOR,
   parseCsvLine,
   swapElements,
 } from './general';
@@ -178,12 +178,6 @@ describe('general', () => {
     });
   });
 
-  describe('objectHash', () => {
-    it('works', () => {
-      expect(objectHash({ hello: 'world1' })).toEqual('cc14ad13');
-    });
-  });
-
   describe('offsetToRowColumn', () => {
     it('works', () => {
       const str = 'Hello\nThis is a test\nstring.';
@@ -217,4 +211,10 @@ describe('general', () => {
       expect(caseInsensitiveEquals(undefined, '')).toEqual(false);
     });
   });
+
+  describe('OVERLAY_OPEN_SELECTOR', () => {
+    it('is what it is', () => {
+      expect(OVERLAY_OPEN_SELECTOR).toEqual('.bp5-portal .bp5-overlay-open');
+    });
+  });
 });
diff --git a/web-console/src/utils/general.tsx b/web-console/src/utils/general.tsx
index b742013b2e83..d128d47f3462 100644
--- a/web-console/src/utils/general.tsx
+++ b/web-console/src/utils/general.tsx
@@ -59,6 +59,10 @@ export function isSimpleArray(a: any): a is (string | number | boolean)[] {
   );
 }
 
+export function arraysEqualByElement<T>(xs: T[], ys: T[]): boolean {
+  return xs.length === ys.length && xs.every((x, i) => x === ys[i]);
+}
+
 export function wait(ms: number): Promise<void> {
   return new Promise(resolve => {
     setTimeout(resolve, ms);
@@ -251,6 +255,14 @@ export function uniq(array: readonly string[]): string[] {
   });
 }
 
+export function allSameValue<T>(xs: readonly T[]): T | undefined {
+  const sameValue: T | undefined = xs[0];
+  for (let i = 1; i < xs.length; i++) {
+    if (sameValue !== xs[i]) return;
+  }
+  return sameValue;
+}
+
 // ----------------------------
 
 export function formatEmpty(str: string): string {
@@ -373,6 +385,14 @@ export function formatDurationHybrid(ms: NumberLike): string {
   }
 }
 
+export function timezoneOffsetInMinutesToString(offsetInMinutes: number, padHour: boolean): string {
+  const sign = offsetInMinutes < 0 ? '-' : '+';
+  const absOffset = Math.abs(offsetInMinutes);
+  const h = Math.floor(absOffset / 60);
+  const m = absOffset % 60;
+  return `${sign}${padHour ? pad2(h) : h}:${pad2(m)}`;
+}
+
 function pluralize(word: string): string {
   // Ignoring irregular plurals.
   if (/(s|x|z|ch|sh)$/.test(word)) {
@@ -612,12 +632,10 @@ export function hashJoaat(str: string): number {
   return (hash & 4294967295) >>> 0;
 }
 
-export function objectHash(obj: any): string {
-  return hashJoaat(JSONBig.stringify(obj)).toString(16).padStart(8);
-}
+export const OVERLAY_OPEN_SELECTOR = `.${Classes.PORTAL} .${Classes.OVERLAY_OPEN}`;
 
-export function hasPopoverOpen(): boolean {
-  return Boolean(document.querySelector(`${Classes.PORTAL} ${Classes.OVERLAY} ${Classes.POPOVER}`));
+export function hasOverlayOpen(): boolean {
+  return Boolean(document.querySelector(OVERLAY_OPEN_SELECTOR));
 }
 
 export function checkedCircleIcon(checked: boolean): IconName {
diff --git a/web-console/src/utils/index.tsx b/web-console/src/utils/index.tsx
index edea5ad0a520..096f0dfe0634 100644
--- a/web-console/src/utils/index.tsx
+++ b/web-console/src/utils/index.tsx
@@ -19,10 +19,12 @@
 export * from './base64-url';
 export * from './column-metadata';
 export * from './date';
+export * from './date-floor-shift-ceil/date-floor-shift-ceil';
 export * from './download';
 export * from './download-query-detail-archive';
 export * from './druid-lookup';
 export * from './druid-query';
+export * from './duration/duration';
 export * from './formatter';
 export * from './general';
 export * from './local-storage-backed-visibility';
diff --git a/web-console/src/utils/query-action.ts b/web-console/src/utils/query-action.ts
index 45ade6961388..3f17f22b67d2 100644
--- a/web-console/src/utils/query-action.ts
+++ b/web-console/src/utils/query-action.ts
@@ -16,6 +16,6 @@
  * limitations under the License.
  */
 
-import type { SqlQuery } from '@druid-toolkit/query';
+import type { SqlQuery } from 'druid-query-toolkit';
 
 export type QueryAction = (query: SqlQuery) => SqlQuery;
diff --git a/web-console/src/utils/query-manager/query-manager.ts b/web-console/src/utils/query-manager/query-manager.ts
index 5b141c7c89db..1023b23412ad 100644
--- a/web-console/src/utils/query-manager/query-manager.ts
+++ b/web-console/src/utils/query-manager/query-manager.ts
@@ -288,7 +288,7 @@ export class QueryManager<Q, R, I = never, E extends Error = Error> {
     return this.lastQuery;
   }
 
-  public getLastIntermediateQuery(): any {
+  public getLastIntermediateQuery(): unknown {
     return this.lastIntermediateQuery;
   }
 
diff --git a/web-console/src/utils/sampler.ts b/web-console/src/utils/sampler.ts
index 7fd3d67364cc..5333013c12b4 100644
--- a/web-console/src/utils/sampler.ts
+++ b/web-console/src/utils/sampler.ts
@@ -16,8 +16,8 @@
  * limitations under the License.
  */
 
-import { dedupe, F, SqlExpression, SqlFunction } from '@druid-toolkit/query';
 import type { CancelToken } from 'axios';
+import { dedupe, F, SqlExpression, SqlFunction } from 'druid-query-toolkit';
 import * as JSONBig from 'json-bigint-native';
 
 import type {
diff --git a/web-console/src/utils/sql.spec.ts b/web-console/src/utils/sql.spec.ts
index 9e5533ee4e62..57e7bce95fe8 100644
--- a/web-console/src/utils/sql.spec.ts
+++ b/web-console/src/utils/sql.spec.ts
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-import { sane } from '@druid-toolkit/query';
+import { sane } from 'druid-query-toolkit';
 
 import { findAllSqlQueriesInText, findSqlQueryPrefix } from './sql';
 
diff --git a/web-console/src/utils/sql.ts b/web-console/src/utils/sql.ts
index 1cdf243819d2..6c168002078a 100644
--- a/web-console/src/utils/sql.ts
+++ b/web-console/src/utils/sql.ts
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-import type { SqlBase } from '@druid-toolkit/query';
+import type { SqlBase } from 'druid-query-toolkit';
 import {
   SqlColumn,
   SqlExpression,
@@ -24,7 +24,7 @@ import {
   SqlLiteral,
   SqlQuery,
   SqlStar,
-} from '@druid-toolkit/query';
+} from 'druid-query-toolkit';
 
 import type { RowColumn } from './general';
 import { offsetToRowColumn } from './general';
diff --git a/web-console/src/views/explore-view/models/stage.ts b/web-console/src/utils/stage.ts
similarity index 80%
rename from web-console/src/views/explore-view/models/stage.ts
rename to web-console/src/utils/stage.ts
index a1d01258f0a2..7b65cfebd9cb 100644
--- a/web-console/src/views/explore-view/models/stage.ts
+++ b/web-console/src/utils/stage.ts
@@ -16,6 +16,13 @@
  * limitations under the License.
  */
 
+export interface Margin {
+  top: number;
+  right: number;
+  bottom: number;
+  left: number;
+}
+
 export class Stage {
   public readonly width: number;
   public readonly height: number;
@@ -28,4 +35,11 @@ export class Stage {
   public equals(other: Stage | undefined): boolean {
     return Boolean(other && this.width === other.width && this.height === other.height);
   }
+
+  public applyMargin(margin: Margin): Stage {
+    return new Stage(
+      this.width - margin.left - margin.right,
+      this.height - margin.top - margin.bottom,
+    );
+  }
 }
diff --git a/web-console/src/utils/table-helpers.ts b/web-console/src/utils/table-helpers.ts
index 45e8758bf6f8..a4ba4fce7ddf 100644
--- a/web-console/src/utils/table-helpers.ts
+++ b/web-console/src/utils/table-helpers.ts
@@ -16,9 +16,10 @@
  * limitations under the License.
  */
 
-import type { QueryResult, SqlExpression } from '@druid-toolkit/query';
-import { C } from '@druid-toolkit/query';
-import type { Filter } from 'react-table';
+import { ascending, descending, sort } from 'd3-array';
+import type { QueryResult, SqlExpression } from 'druid-query-toolkit';
+import { C } from 'druid-query-toolkit';
+import type { Filter, SortingRule } from 'react-table';
 
 import { filterMap, formatNumber, isNumberLike, oneOf } from './general';
 import { deepSet } from './object-change';
@@ -67,19 +68,24 @@ export function getNumericColumnBraces(
   return numericColumnBraces;
 }
 
-export interface Sorted {
-  id: string;
-  desc: boolean;
-}
-
 export interface TableState {
   page: number;
   pageSize: number;
   filtered: Filter[];
-  sorted: Sorted[];
+  sorted: SortingRule[];
 }
 
-export function sortedToOrderByClause(sorted: Sorted[]): string | undefined {
+export function sortedToOrderByClause(sorted: SortingRule[]): string | undefined {
   if (!sorted.length) return;
   return 'ORDER BY ' + sorted.map(sort => `${C(sort.id)} ${sort.desc ? 'DESC' : 'ASC'}`).join(', ');
 }
+
+export function applySorting(xs: any[], sorted: SortingRule[]): any[] {
+  const firstSortingRule = sorted[0];
+  if (!firstSortingRule) return xs;
+  const { id, desc } = firstSortingRule;
+  return sort(
+    xs,
+    desc ? (d1, d2) => descending(d1[id], d2[id]) : (d1, d2) => ascending(d1[id], d2[id]),
+  );
+}
diff --git a/web-console/src/utils/types.ts b/web-console/src/utils/types.ts
index 7f48655cb1c4..a3e38a2c8218 100644
--- a/web-console/src/utils/types.ts
+++ b/web-console/src/utils/types.ts
@@ -18,7 +18,7 @@
 
 import type { IconName } from '@blueprintjs/core';
 import { IconNames } from '@blueprintjs/icons';
-import type { Column } from '@druid-toolkit/query';
+import type { Column } from 'druid-query-toolkit';
 
 export function columnToSummary(column: Column): string {
   const lines: string[] = [column.name];
diff --git a/web-console/src/utils/values-query.spec.tsx b/web-console/src/utils/values-query.spec.tsx
index 7bc093bc3e82..89f4a4d2f14f 100644
--- a/web-console/src/utils/values-query.spec.tsx
+++ b/web-console/src/utils/values-query.spec.tsx
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-import { QueryResult, sane } from '@druid-toolkit/query';
+import { QueryResult, sane } from 'druid-query-toolkit';
 
 import { queryResultToValuesQuery } from './values-query';
 
diff --git a/web-console/src/utils/values-query.tsx b/web-console/src/utils/values-query.tsx
index 1b5e62b44c23..69130d380e75 100644
--- a/web-console/src/utils/values-query.tsx
+++ b/web-console/src/utils/values-query.tsx
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-import type { Column, QueryResult, SqlExpression } from '@druid-toolkit/query';
+import type { Column, QueryResult, SqlExpression } from 'druid-query-toolkit';
 import {
   C,
   F,
@@ -28,7 +28,7 @@ import {
   SqlRecord,
   SqlType,
   SqlValues,
-} from '@druid-toolkit/query';
+} from 'druid-query-toolkit';
 import * as JSONBig from 'json-bigint-native';
 
 import { oneOf } from './general';
diff --git a/web-console/src/views/datasources-view/__snapshots__/datasources-view.spec.tsx.snap b/web-console/src/views/datasources-view/__snapshots__/datasources-view.spec.tsx.snap
index 6da41f6eb763..5f471fa1e390 100644
--- a/web-console/src/views/datasources-view/__snapshots__/datasources-view.spec.tsx.snap
+++ b/web-console/src/views/datasources-view/__snapshots__/datasources-view.spec.tsx.snap
@@ -109,6 +109,7 @@ exports[`DatasourcesView matches snapshot 1`] = `
     />
   </Memo(ViewControlBar)>
   <SplitterLayout
+    className="timeline-datasources-splitter"
     percentage={true}
     primaryIndex={1}
     primaryMinSize={20}
diff --git a/web-console/src/views/datasources-view/datasources-view.scss b/web-console/src/views/datasources-view/datasources-view.scss
index b0abe78ec56a..91a95bc32a0f 100644
--- a/web-console/src/views/datasources-view/datasources-view.scss
+++ b/web-console/src/views/datasources-view/datasources-view.scss
@@ -23,7 +23,7 @@
   width: 100%;
   overflow: auto;
 
-  .splitter-layout {
+  .splitter-layout.timeline-datasources-splitter {
     position: absolute;
     top: $view-control-bar-height + $standard-padding;
     bottom: 0;
@@ -45,6 +45,13 @@
   .ReactTable {
     @include pin-full;
 
+    .datasource-color-tab {
+      display: inline-block;
+      width: 10px;
+      height: 20px;
+      border-radius: 3px;
+    }
+
     .clickable-cell {
       cursor: pointer;
     }
diff --git a/web-console/src/views/datasources-view/datasources-view.tsx b/web-console/src/views/datasources-view/datasources-view.tsx
index 3fb6a5be40d8..f4f652befed6 100644
--- a/web-console/src/views/datasources-view/datasources-view.tsx
+++ b/web-console/src/views/datasources-view/datasources-view.tsx
@@ -16,10 +16,10 @@
  * limitations under the License.
  */
 
-import { FormGroup, InputGroup, Intent, MenuItem, Switch, Tag } from '@blueprintjs/core';
+import { Button, FormGroup, InputGroup, Intent, MenuItem, Switch, Tag } from '@blueprintjs/core';
 import { IconNames } from '@blueprintjs/icons';
-import { SqlQuery, T } from '@druid-toolkit/query';
 import { sum } from 'd3-array';
+import { SqlQuery, T } from 'druid-query-toolkit';
 import React from 'react';
 import type { Filter } from 'react-table';
 import ReactTable from 'react-table';
@@ -51,8 +51,16 @@ import type {
   CompactionInfo,
   CompactionStatus,
   QueryWithContext,
+  Rule,
+} from '../../druid-models';
+import {
+  END_OF_TIME_DATE,
+  formatCompactionInfo,
+  getDatasourceColor,
+  RuleUtil,
+  START_OF_TIME_DATE,
+  zeroCompactionStatus,
 } from '../../druid-models';
-import { formatCompactionInfo, zeroCompactionStatus } from '../../druid-models';
 import type { Capabilities, CapabilitiesMode } from '../../helpers';
 import { STANDARD_TABLE_PAGE_SIZE, STANDARD_TABLE_PAGE_SIZE_OPTIONS } from '../../react-table';
 import { Api, AppToaster } from '../../singletons';
@@ -66,9 +74,10 @@ import {
   formatInteger,
   formatMillions,
   formatPercent,
+  getApiArray,
   getDruidErrorMessage,
   groupByAsMap,
-  hasPopoverOpen,
+  hasOverlayOpen,
   isNumberLikeNaN,
   LocalStorageBackedVisibility,
   LocalStorageKeys,
@@ -82,8 +91,6 @@ import {
   twoLines,
 } from '../../utils';
 import type { BasicAction } from '../../utils/basic-action';
-import type { Rule } from '../../utils/load-rule';
-import { RuleUtil } from '../../utils/load-rule';
 
 import './datasources-view.scss';
 
@@ -131,8 +138,6 @@ const TABLE_COLUMNS_BY_MODE: Record<CapabilitiesMode, TableColumnSelectorColumn[
   ],
 };
 
-const DEFAULT_RULES_KEY = '_default';
-
 function formatLoadDrop(segmentsToLoad: NumberLike, segmentsToDrop: NumberLike): string {
   const loadDrop: string[] = [];
   if (segmentsToLoad) {
@@ -240,6 +245,7 @@ interface DatasourcesAndDefaultRules {
 interface RetentionDialogOpenOn {
   readonly datasource: string;
   readonly rules: Rule[];
+  readonly defaultRules: Rule[];
 }
 
 interface CompactionConfigDialogOpenOn {
@@ -299,7 +305,12 @@ export interface DatasourcesViewProps {
   onFiltersChange(filters: Filter[]): void;
   goToQuery(queryWithContext: QueryWithContext): void;
   goToTasks(datasource?: string): void;
-  goToSegments(datasource: string, onlyUnavailable?: boolean): void;
+  goToSegments(options: {
+    start?: Date;
+    end?: Date;
+    datasource?: string;
+    realtime?: boolean;
+  }): void;
   capabilities: Capabilities;
 }
 
@@ -317,7 +328,7 @@ export interface DatasourcesViewState {
   useUnuseInterval: string;
   showForceCompact: boolean;
   visibleColumns: LocalStorageBackedVisibility;
-  showSegmentTimeline: boolean;
+  showSegmentTimeline?: { capabilities: Capabilities; datasource?: string };
 
   datasourceTableActionDialogId?: string;
   actions: BasicAction[];
@@ -362,7 +373,7 @@ export class DatasourcesView extends React.PureComponent<
           `COUNT(*) FILTER (WHERE is_active = 1 AND "start" LIKE '%T00:00:00.000Z' AND "end" LIKE '%T00:00:00.000Z') AS day_aligned_segments`,
           `COUNT(*) FILTER (WHERE is_active = 1 AND "start" LIKE '%-01T00:00:00.000Z' AND "end" LIKE '%-01T00:00:00.000Z') AS month_aligned_segments`,
           `COUNT(*) FILTER (WHERE is_active = 1 AND "start" LIKE '%-01-01T00:00:00.000Z' AND "end" LIKE '%-01-01T00:00:00.000Z') AS year_aligned_segments`,
-          `COUNT(*) FILTER (WHERE is_active = 1 AND "start" = '-146136543-09-08T08:23:32.096Z' AND "end" = '146140482-04-24T15:36:27.903Z') AS all_granularity_segments`,
+          `COUNT(*) FILTER (WHERE is_active = 1 AND "start" = '${START_OF_TIME_DATE}' AND "end" = '${END_OF_TIME_DATE}') AS all_granularity_segments`,
         ],
         visibleColumns.shown('Total rows') &&
           `SUM("num_rows") FILTER (WHERE is_active = 1) AS total_rows`,
@@ -418,7 +429,6 @@ GROUP BY 1, 2`;
         LocalStorageKeys.DATASOURCE_TABLE_COLUMN_SELECTION,
         ['Segment size', 'Segment granularity'],
       ),
-      showSegmentTimeline: false,
 
       actions: [],
     };
@@ -435,15 +445,15 @@ GROUP BY 1, 2`;
           setIntermediateQuery(query);
           datasources = await queryDruidSql({ query }, cancelToken);
         } else if (capabilities.hasCoordinatorAccess()) {
-          const datasourcesResp = await Api.instance.get(
+          const datasourcesResp = await getApiArray(
             '/druid/coordinator/v1/datasources?simple',
-            { cancelToken },
+            cancelToken,
           );
           const loadstatusResp = await Api.instance.get('/druid/coordinator/v1/loadstatus?simple', {
             cancelToken,
           });
           const loadstatus = loadstatusResp.data;
-          datasources = datasourcesResp.data.map((d: any): DatasourceQueryResultRow => {
+          datasources = datasourcesResp.map((d: any): DatasourceQueryResultRow => {
             const totalDataSize = deepGet(d, 'properties.segments.size') || -1;
             const segmentsToLoad = Number(loadstatus[d.name] || 0);
             const availableSegments = Number(deepGet(d, 'properties.segments.count'));
@@ -521,9 +531,10 @@ GROUP BY 1, 2`;
           if (capabilities.hasOverlordAccess()) {
             auxiliaryQueries.push(async (datasourcesAndDefaultRules, cancelToken) => {
               try {
-                const taskList = (
-                  await Api.instance.get(`/druid/indexer/v1/tasks?state=running`, { cancelToken })
-                ).data;
+                const taskList = await getApiArray(
+                  `/druid/indexer/v1/tasks?state=running`,
+                  cancelToken,
+                );
 
                 const runningTasksByDatasource = groupByAsMap(
                   taskList,
@@ -562,10 +573,10 @@ GROUP BY 1, 2`;
           if (showUnused) {
             try {
               unused = (
-                await Api.instance.get<string[]>(
+                await getApiArray<string>(
                   '/druid/coordinator/v1/metadata/datasources?includeUnused',
                 )
-              ).data.filter(d => !seen[d]);
+              ).filter(d => !seen[d]);
             } catch {
               AppToaster.show({
                 icon: IconNames.ERROR,
@@ -578,7 +589,7 @@ GROUP BY 1, 2`;
           // Rules
           auxiliaryQueries.push(async (datasourcesAndDefaultRules, cancelToken) => {
             try {
-              const rules: Record<string, Rule[]> = (
+              const rules = (
                 await Api.instance.get<Record<string, Rule[]>>('/druid/coordinator/v1/rules', {
                   cancelToken,
                 })
@@ -589,7 +600,7 @@ GROUP BY 1, 2`;
                   ...ds,
                   rules: rules[ds.datasource] || [],
                 })),
-                defaultRules: rules[DEFAULT_RULES_KEY],
+                defaultRules: rules[RuleUtil.DEFAULT_RULES_KEY],
               };
             } catch {
               AppToaster.show({
@@ -657,8 +668,19 @@ GROUP BY 1, 2`;
   }
 
   private readonly refresh = (auto: boolean): void => {
-    if (auto && hasPopoverOpen()) return;
+    if (auto && hasOverlayOpen()) return;
     this.datasourceQueryManager.rerunLastQuery(auto);
+
+    const { showSegmentTimeline } = this.state;
+    if (showSegmentTimeline) {
+      // Create a new capabilities object to force the segment timeline to re-render
+      this.setState(({ showSegmentTimeline }) => ({
+        showSegmentTimeline: {
+          ...showSegmentTimeline,
+          capabilities: this.props.capabilities.clone(),
+        },
+      }));
+    }
   };
 
   private fetchDatasourceData() {
@@ -846,9 +868,9 @@ GROUP BY 1, 2`;
           <MenuItem
             icon={IconNames.APPLICATION}
             text="View SQL query for table"
-            disabled={!lastDatasourcesQuery}
+            disabled={typeof lastDatasourcesQuery !== 'string'}
             onClick={() => {
-              if (!lastDatasourcesQuery) return;
+              if (typeof lastDatasourcesQuery !== 'string') return;
               goToQuery({ queryString: lastDatasourcesQuery });
             }}
           />
@@ -921,6 +943,7 @@ GROUP BY 1, 2`;
           retentionDialogOpenOn: {
             datasource: '_default',
             rules: defaultRules,
+            defaultRules,
           },
         };
       });
@@ -1030,10 +1053,13 @@ GROUP BY 1, 2`;
             icon: IconNames.AUTOMATIC_UPDATES,
             title: 'Edit retention rules',
             onAction: () => {
+              const defaultRules = this.state.datasourcesAndDefaultRulesState.data?.defaultRules;
+              if (!defaultRules) return;
               this.setState({
                 retentionDialogOpenOn: {
                   datasource,
                   rules: rules || [],
+                  defaultRules,
                 },
               });
             },
@@ -1097,9 +1123,8 @@ GROUP BY 1, 2`;
 
   private renderRetentionDialog() {
     const { capabilities } = this.props;
-    const { retentionDialogOpenOn, datasourcesAndDefaultRulesState } = this.state;
-    const defaultRules = datasourcesAndDefaultRulesState.data?.defaultRules;
-    if (!retentionDialogOpenOn || !defaultRules) return;
+    const { retentionDialogOpenOn } = this.state;
+    if (!retentionDialogOpenOn) return;
 
     return (
       <RetentionDialog
@@ -1107,7 +1132,7 @@ GROUP BY 1, 2`;
         rules={retentionDialogOpenOn.rules}
         capabilities={capabilities}
         onEditDefaults={this.editDefaultRules}
-        defaultRules={defaultRules}
+        defaultRules={retentionDialogOpenOn.defaultRules}
         onCancel={() => this.setState({ retentionDialogOpenOn: undefined })}
         onSave={this.saveRules}
       />
@@ -1139,8 +1164,9 @@ GROUP BY 1, 2`;
   }
 
   private renderDatasourcesTable() {
-    const { goToSegments, goToTasks, capabilities, filters, onFiltersChange } = this.props;
-    const { datasourcesAndDefaultRulesState, showUnused, visibleColumns } = this.state;
+    const { goToTasks, capabilities, filters, onFiltersChange } = this.props;
+    const { datasourcesAndDefaultRulesState, showUnused, visibleColumns, showSegmentTimeline } =
+      this.state;
 
     let { datasources, defaultRules } = datasourcesAndDefaultRulesState.data || { datasources: [] };
 
@@ -1194,12 +1220,19 @@ GROUP BY 1, 2`;
             show: visibleColumns.shown('Datasource name'),
             accessor: 'datasource',
             width: 150,
-            Cell: row => (
+            Cell: ({ value, original }) => (
               <TableClickableCell
-                onClick={() => this.onDetail(row.original)}
+                onClick={() => this.onDetail(original)}
                 hoverIcon={IconNames.SEARCH_TEMPLATE}
+                tooltip="Show detail"
               >
-                {row.value}
+                {showSegmentTimeline ? (
+                  <>
+                    <span style={{ color: getDatasourceColor(value) }}>&#9632;</span> {value}
+                  </>
+                ) : (
+                  value
+                )}
               </TableClickableCell>
             ),
           },
@@ -1225,7 +1258,12 @@ GROUP BY 1, 2`;
               const hasZeroReplicationRule = RuleUtil.hasZeroReplicaRule(rules, defaultRules);
               const descriptor = hasZeroReplicationRule ? 'pre-cached' : 'available';
               const segmentsEl = (
-                <a onClick={() => goToSegments(datasource)}>
+                <a
+                  onClick={() =>
+                    this.setState({ showSegmentTimeline: { capabilities, datasource } })
+                  }
+                  data-tooltip="Show in segment timeline"
+                >
                   {pluralIfNeeded(num_segments, 'segment')}
                 </a>
               );
@@ -1318,7 +1356,7 @@ GROUP BY 1, 2`;
                 <TableClickableCell
                   onClick={() => goToTasks(original.datasource)}
                   hoverIcon={IconNames.ARROW_TOP_RIGHT}
-                  title="Go to tasks"
+                  tooltip="Go to tasks"
                 >
                   {formatRunningTasks(runningTasks)}
                 </TableClickableCell>
@@ -1498,6 +1536,7 @@ GROUP BY 1, 2`;
               if (!compaction) return;
               return (
                 <TableClickableCell
+                  tooltip="Open compaction configuration"
                   disabled={!compaction}
                   onClick={() => {
                     if (!compaction) return;
@@ -1614,6 +1653,7 @@ GROUP BY 1, 2`;
 
               return (
                 <TableClickableCell
+                  tooltip="Open retention (load rule) configuration"
                   disabled={!defaultRules}
                   onClick={() => {
                     if (!defaultRules) return;
@@ -1621,6 +1661,7 @@ GROUP BY 1, 2`;
                       retentionDialogOpenOn: {
                         datasource,
                         rules,
+                        defaultRules,
                       },
                     });
                   }}
@@ -1668,7 +1709,7 @@ GROUP BY 1, 2`;
   }
 
   render() {
-    const { capabilities } = this.props;
+    const { capabilities, goToSegments } = this.props;
     const {
       showUnused,
       visibleColumns,
@@ -1681,9 +1722,7 @@ GROUP BY 1, 2`;
       <div className="datasources-view app-view">
         <ViewControlBar label="Datasources">
           <RefreshButton
-            onRefresh={auto => {
-              this.refresh(auto);
-            }}
+            onRefresh={this.refresh}
             localStorageKey={LocalStorageKeys.DATASOURCES_REFRESH_RATE}
           />
           {this.renderBulkDatasourceActions()}
@@ -1694,9 +1733,13 @@ GROUP BY 1, 2`;
             disabled={!capabilities.hasCoordinatorAccess()}
           />
           <Switch
-            checked={showSegmentTimeline}
+            checked={Boolean(showSegmentTimeline)}
             label="Show segment timeline"
-            onChange={() => this.setState({ showSegmentTimeline: !showSegmentTimeline })}
+            onChange={() =>
+              this.setState({
+                showSegmentTimeline: showSegmentTimeline ? undefined : { capabilities },
+              })
+            }
             disabled={!capabilities.hasSqlOrCoordinatorAccess()}
           />
           <TableColumnSelector
@@ -1714,6 +1757,7 @@ GROUP BY 1, 2`;
           />
         </ViewControlBar>
         <SplitterLayout
+          className="timeline-datasources-splitter"
           vertical
           percentage
           secondaryInitialSize={35}
@@ -1721,7 +1765,22 @@ GROUP BY 1, 2`;
           primaryMinSize={20}
           secondaryMinSize={10}
         >
-          {showSegmentTimeline && <SegmentTimeline capabilities={capabilities} />}
+          {showSegmentTimeline && (
+            <SegmentTimeline
+              capabilities={showSegmentTimeline.capabilities}
+              datasource={showSegmentTimeline.datasource}
+              getIntervalActionButton={(start, end, datasource, realtime) => {
+                return (
+                  <Button
+                    text="Open in segments view"
+                    small
+                    rightIcon={IconNames.ARROW_TOP_RIGHT}
+                    onClick={() => goToSegments({ start, end, datasource, realtime })}
+                  />
+                );
+              }}
+            />
+          )}
           {this.renderDatasourcesTable()}
         </SplitterLayout>
         {datasourceTableActionDialogId && (
diff --git a/web-console/src/views/explore-view/components/column-picker-menu/column-picker-menu.tsx b/web-console/src/views/explore-view/components/column-picker-menu/column-picker-menu.tsx
index 1d227e864bc8..7634cbae4ccd 100644
--- a/web-console/src/views/explore-view/components/column-picker-menu/column-picker-menu.tsx
+++ b/web-console/src/views/explore-view/components/column-picker-menu/column-picker-menu.tsx
@@ -19,8 +19,8 @@
 import type { IconName } from '@blueprintjs/core';
 import { Icon, InputGroup, Menu, MenuItem } from '@blueprintjs/core';
 import { IconNames } from '@blueprintjs/icons';
-import type { Column } from '@druid-toolkit/query';
 import classNames from 'classnames';
+import type { Column } from 'druid-query-toolkit';
 import { useState } from 'react';
 
 import { caseInsensitiveContains, columnToIcon, filterMap } from '../../../../utils';
diff --git a/web-console/src/views/explore-view/components/column-picker/column-picker.tsx b/web-console/src/views/explore-view/components/column-picker/column-picker.tsx
index 81c88fbf9b78..c61927d5b478 100644
--- a/web-console/src/views/explore-view/components/column-picker/column-picker.tsx
+++ b/web-console/src/views/explore-view/components/column-picker/column-picker.tsx
@@ -18,7 +18,7 @@
 
 import { Button, Menu, MenuItem, Popover, Position } from '@blueprintjs/core';
 import { IconNames } from '@blueprintjs/icons';
-import type { Column } from '@druid-toolkit/query';
+import type { Column } from 'druid-query-toolkit';
 import React, { useState } from 'react';
 
 import { columnToIcon } from '../../../../utils';
diff --git a/web-console/src/views/explore-view/components/control-pane/control-pane.tsx b/web-console/src/views/explore-view/components/control-pane/control-pane.tsx
index 5e7d5c0ec000..d93aefb634ab 100644
--- a/web-console/src/views/explore-view/components/control-pane/control-pane.tsx
+++ b/web-console/src/views/explore-view/components/control-pane/control-pane.tsx
@@ -27,8 +27,8 @@ import {
   Tag,
 } from '@blueprintjs/core';
 import { IconNames } from '@blueprintjs/icons';
-import type { Column, SqlExpression } from '@druid-toolkit/query';
-import { SqlColumn } from '@druid-toolkit/query';
+import type { Column, SqlExpression } from 'druid-query-toolkit';
+import { SqlColumn } from 'druid-query-toolkit';
 import type { JSX } from 'react';
 
 import {
diff --git a/web-console/src/views/explore-view/components/control-pane/expression-menu.tsx b/web-console/src/views/explore-view/components/control-pane/expression-menu.tsx
index 8742cbd46689..5c6639929ca3 100644
--- a/web-console/src/views/explore-view/components/control-pane/expression-menu.tsx
+++ b/web-console/src/views/explore-view/components/control-pane/expression-menu.tsx
@@ -29,8 +29,8 @@ import {
   Position,
 } from '@blueprintjs/core';
 import { IconNames } from '@blueprintjs/icons';
-import type { Column } from '@druid-toolkit/query';
-import { SqlColumn, SqlExpression } from '@druid-toolkit/query';
+import type { Column } from 'druid-query-toolkit';
+import { SqlColumn, SqlExpression } from 'druid-query-toolkit';
 import { useState } from 'react';
 
 import { AppToaster } from '../../../../singletons';
diff --git a/web-console/src/views/explore-view/components/control-pane/measure-menu.tsx b/web-console/src/views/explore-view/components/control-pane/measure-menu.tsx
index 4d841f352f5b..18c8a61e7bb9 100644
--- a/web-console/src/views/explore-view/components/control-pane/measure-menu.tsx
+++ b/web-console/src/views/explore-view/components/control-pane/measure-menu.tsx
@@ -30,8 +30,8 @@ import {
   Position,
 } from '@blueprintjs/core';
 import { IconNames } from '@blueprintjs/icons';
-import type { Column } from '@druid-toolkit/query';
-import { SqlAlias, SqlExpression } from '@druid-toolkit/query';
+import type { Column } from 'druid-query-toolkit';
+import { SqlAlias, SqlExpression } from 'druid-query-toolkit';
 import { useState } from 'react';
 
 import { AppToaster } from '../../../../singletons';
diff --git a/web-console/src/views/explore-view/components/droppable-container/droppable-container.tsx b/web-console/src/views/explore-view/components/droppable-container/droppable-container.tsx
index eceb4e750ddf..36c9ff979efe 100644
--- a/web-console/src/views/explore-view/components/droppable-container/droppable-container.tsx
+++ b/web-console/src/views/explore-view/components/droppable-container/droppable-container.tsx
@@ -16,8 +16,8 @@
  * limitations under the License.
  */
 
-import type { Column } from '@druid-toolkit/query';
 import classNames from 'classnames';
+import type { Column } from 'druid-query-toolkit';
 import type React from 'react';
 import { forwardRef, useState } from 'react';
 
diff --git a/web-console/src/views/explore-view/components/filter-pane/filter-menu/contains-filter-control/contains-filter-control.tsx b/web-console/src/views/explore-view/components/filter-pane/filter-menu/contains-filter-control/contains-filter-control.tsx
index d2a9bcdd93eb..fdf28d34b8d6 100644
--- a/web-console/src/views/explore-view/components/filter-pane/filter-menu/contains-filter-control/contains-filter-control.tsx
+++ b/web-console/src/views/explore-view/components/filter-pane/filter-menu/contains-filter-control/contains-filter-control.tsx
@@ -18,8 +18,8 @@
 
 import { FormGroup, InputGroup, Menu, MenuItem } from '@blueprintjs/core';
 import { IconNames } from '@blueprintjs/icons';
-import type { ContainsFilterPattern, QueryResult, SqlQuery } from '@druid-toolkit/query';
-import { C, F, filterPatternToExpression, SqlExpression } from '@druid-toolkit/query';
+import type { ContainsFilterPattern, QueryResult, SqlQuery } from 'druid-query-toolkit';
+import { C, F, filterPatternToExpression, SqlExpression } from 'druid-query-toolkit';
 import React, { useMemo } from 'react';
 
 import { useQueryManager } from '../../../../../../hooks';
diff --git a/web-console/src/views/explore-view/components/filter-pane/filter-menu/filter-menu.tsx b/web-console/src/views/explore-view/components/filter-pane/filter-menu/filter-menu.tsx
index 8cbca7e8d53e..f0b7f21346f0 100644
--- a/web-console/src/views/explore-view/components/filter-pane/filter-menu/filter-menu.tsx
+++ b/web-console/src/views/explore-view/components/filter-pane/filter-menu/filter-menu.tsx
@@ -35,14 +35,14 @@ import type {
   FilterPatternType,
   QueryResult,
   SqlQuery,
-} from '@druid-toolkit/query';
+} from 'druid-query-toolkit';
 import {
   C,
   changeFilterPatternType,
   filterPatternToExpression,
   fitFilterPattern,
   SqlExpression,
-} from '@druid-toolkit/query';
+} from 'druid-query-toolkit';
 import type { JSX } from 'react';
 import React, { useState } from 'react';
 
diff --git a/web-console/src/views/explore-view/components/filter-pane/filter-menu/number-range-filter-control/number-range-filter-control.tsx b/web-console/src/views/explore-view/components/filter-pane/filter-menu/number-range-filter-control/number-range-filter-control.tsx
index eb5adc9c4a74..d66e1ffcc414 100644
--- a/web-console/src/views/explore-view/components/filter-pane/filter-menu/number-range-filter-control/number-range-filter-control.tsx
+++ b/web-console/src/views/explore-view/components/filter-pane/filter-menu/number-range-filter-control/number-range-filter-control.tsx
@@ -18,7 +18,7 @@
 
 import { Button, ControlGroup, FormGroup, NumericInput } from '@blueprintjs/core';
 import { IconNames } from '@blueprintjs/icons';
-import type { NumberRangeFilterPattern } from '@druid-toolkit/query';
+import type { NumberRangeFilterPattern } from 'druid-query-toolkit';
 import React from 'react';
 
 import type { QuerySource } from '../../../../models';
diff --git a/web-console/src/views/explore-view/components/filter-pane/filter-menu/regexp-filter-control/regexp-filter-control.tsx b/web-console/src/views/explore-view/components/filter-pane/filter-menu/regexp-filter-control/regexp-filter-control.tsx
index 3b86189558ae..b2479bf7022a 100644
--- a/web-console/src/views/explore-view/components/filter-pane/filter-menu/regexp-filter-control/regexp-filter-control.tsx
+++ b/web-console/src/views/explore-view/components/filter-pane/filter-menu/regexp-filter-control/regexp-filter-control.tsx
@@ -18,8 +18,8 @@
 
 import { FormGroup, InputGroup, Menu, MenuItem } from '@blueprintjs/core';
 import { IconNames } from '@blueprintjs/icons';
-import type { QueryResult, RegexpFilterPattern, SqlQuery } from '@druid-toolkit/query';
-import { C, F, filterPatternToExpression, SqlExpression } from '@druid-toolkit/query';
+import type { QueryResult, RegexpFilterPattern, SqlQuery } from 'druid-query-toolkit';
+import { C, F, filterPatternToExpression, SqlExpression } from 'druid-query-toolkit';
 import React, { useMemo } from 'react';
 
 import { useQueryManager } from '../../../../../../hooks';
diff --git a/web-console/src/views/explore-view/components/filter-pane/filter-menu/time-interval-filter-control/time-interval-filter-control.tsx b/web-console/src/views/explore-view/components/filter-pane/filter-menu/time-interval-filter-control/time-interval-filter-control.tsx
index acb21c309d2f..9200ee9e07e1 100644
--- a/web-console/src/views/explore-view/components/filter-pane/filter-menu/time-interval-filter-control/time-interval-filter-control.tsx
+++ b/web-console/src/views/explore-view/components/filter-pane/filter-menu/time-interval-filter-control/time-interval-filter-control.tsx
@@ -17,7 +17,7 @@
  */
 
 import { FormGroup } from '@blueprintjs/core';
-import type { TimeIntervalFilterPattern } from '@druid-toolkit/query';
+import type { TimeIntervalFilterPattern } from 'druid-query-toolkit';
 import React from 'react';
 
 import type { QuerySource } from '../../../../models';
diff --git a/web-console/src/views/explore-view/components/filter-pane/filter-menu/time-relative-filter-control/time-relative-filter-control.tsx b/web-console/src/views/explore-view/components/filter-pane/filter-menu/time-relative-filter-control/time-relative-filter-control.tsx
index 32687c0c1b5d..0854a75cd5ee 100644
--- a/web-console/src/views/explore-view/components/filter-pane/filter-menu/time-relative-filter-control/time-relative-filter-control.tsx
+++ b/web-console/src/views/explore-view/components/filter-pane/filter-menu/time-relative-filter-control/time-relative-filter-control.tsx
@@ -17,7 +17,7 @@
  */
 
 import { Button, ButtonGroup, FormGroup } from '@blueprintjs/core';
-import type { TimeRelativeFilterPattern } from '@druid-toolkit/query';
+import type { TimeRelativeFilterPattern } from 'druid-query-toolkit';
 import React from 'react';
 
 import type { QuerySource } from '../../../../models';
diff --git a/web-console/src/views/explore-view/components/filter-pane/filter-menu/values-filter-control/values-filter-control.tsx b/web-console/src/views/explore-view/components/filter-pane/filter-menu/values-filter-control/values-filter-control.tsx
index 169f95a51433..e19af96c2106 100644
--- a/web-console/src/views/explore-view/components/filter-pane/filter-menu/values-filter-control/values-filter-control.tsx
+++ b/web-console/src/views/explore-view/components/filter-pane/filter-menu/values-filter-control/values-filter-control.tsx
@@ -18,8 +18,8 @@
 
 import { FormGroup, Menu, MenuItem } from '@blueprintjs/core';
 import { IconNames } from '@blueprintjs/icons';
-import type { QueryResult, SqlQuery, ValuesFilterPattern } from '@druid-toolkit/query';
-import { C, F, SqlExpression } from '@druid-toolkit/query';
+import type { QueryResult, SqlQuery, ValuesFilterPattern } from 'druid-query-toolkit';
+import { C, F, SqlExpression } from 'druid-query-toolkit';
 import React, { useMemo, useState } from 'react';
 
 import { ClearableInput } from '../../../../../../components';
diff --git a/web-console/src/views/explore-view/components/filter-pane/filter-pane.tsx b/web-console/src/views/explore-view/components/filter-pane/filter-pane.tsx
index 9cc5ad3e6e79..7314528bb7b2 100644
--- a/web-console/src/views/explore-view/components/filter-pane/filter-pane.tsx
+++ b/web-console/src/views/explore-view/components/filter-pane/filter-pane.tsx
@@ -18,15 +18,15 @@
 
 import { Button, Popover } from '@blueprintjs/core';
 import { IconNames } from '@blueprintjs/icons';
+import classNames from 'classnames';
 import type {
   Column,
   FilterPattern,
   QueryResult,
   SqlExpression,
   SqlQuery,
-} from '@druid-toolkit/query';
-import { filterPatternsToExpression, fitFilterPatterns } from '@druid-toolkit/query';
-import classNames from 'classnames';
+} from 'druid-query-toolkit';
+import { filterPatternsToExpression, fitFilterPatterns } from 'druid-query-toolkit';
 import { forwardRef, useImperativeHandle, useState } from 'react';
 
 import type { QuerySource } from '../../models';
diff --git a/web-console/src/views/explore-view/components/generic-output-table/generic-output-table.tsx b/web-console/src/views/explore-view/components/generic-output-table/generic-output-table.tsx
index b557d99b4fde..a7ea7f1f1c6f 100644
--- a/web-console/src/views/explore-view/components/generic-output-table/generic-output-table.tsx
+++ b/web-console/src/views/explore-view/components/generic-output-table/generic-output-table.tsx
@@ -19,9 +19,9 @@
 import { Button, Icon, Intent, Menu, MenuItem, Popover } from '@blueprintjs/core';
 import type { IconName } from '@blueprintjs/icons';
 import { IconNames } from '@blueprintjs/icons';
-import type { Column, QueryResult } from '@druid-toolkit/query';
-import { SqlColumn, SqlExpression, SqlLiteral, trimString } from '@druid-toolkit/query';
 import classNames from 'classnames';
+import type { Column, QueryResult } from 'druid-query-toolkit';
+import { SqlColumn, SqlExpression, SqlLiteral, trimString } from 'druid-query-toolkit';
 import type { JSX } from 'react';
 import React, { useEffect, useState } from 'react';
 import type { Column as TableColumn } from 'react-table';
diff --git a/web-console/src/views/explore-view/components/module-pane/module-pane.tsx b/web-console/src/views/explore-view/components/module-pane/module-pane.tsx
index b360effc87c1..7155a7eff32a 100644
--- a/web-console/src/views/explore-view/components/module-pane/module-pane.tsx
+++ b/web-console/src/views/explore-view/components/module-pane/module-pane.tsx
@@ -17,11 +17,12 @@
  */
 
 import { ResizeSensor } from '@blueprintjs/core';
-import type { QueryResult, SqlExpression, SqlQuery } from '@druid-toolkit/query';
+import type { QueryResult, SqlExpression, SqlQuery } from 'druid-query-toolkit';
 import React, { useMemo, useState } from 'react';
 
+import { Stage } from '../../../../utils/stage';
 import type { ParameterDefinition, ParameterValues, QuerySource } from '../../models';
-import { effectiveParameterDefault, Stage } from '../../models';
+import { effectiveParameterDefault } from '../../models';
 import { ModuleRepository } from '../../module-repository/module-repository';
 import { Issue } from '../issue/issue';
 
diff --git a/web-console/src/views/explore-view/components/preview-pane/preview-pane.tsx b/web-console/src/views/explore-view/components/preview-pane/preview-pane.tsx
index b0d49128e740..41bfd4bd14ac 100644
--- a/web-console/src/views/explore-view/components/preview-pane/preview-pane.tsx
+++ b/web-console/src/views/explore-view/components/preview-pane/preview-pane.tsx
@@ -17,8 +17,8 @@
  */
 
 import { Callout } from '@blueprintjs/core';
-import type { QueryResult, SqlQuery } from '@druid-toolkit/query';
 import classNames from 'classnames';
+import type { QueryResult, SqlQuery } from 'druid-query-toolkit';
 import React from 'react';
 
 import { useQueryManager } from '../../../../hooks';
diff --git a/web-console/src/views/explore-view/components/resource-pane/column-dialog/column-dialog.tsx b/web-console/src/views/explore-view/components/resource-pane/column-dialog/column-dialog.tsx
index d11210bf2842..d220106ec76b 100644
--- a/web-console/src/views/explore-view/components/resource-pane/column-dialog/column-dialog.tsx
+++ b/web-console/src/views/explore-view/components/resource-pane/column-dialog/column-dialog.tsx
@@ -17,8 +17,8 @@
  */
 
 import { Button, Classes, Dialog, FormGroup, InputGroup, Intent, Tag } from '@blueprintjs/core';
-import type { QueryResult, SqlQuery } from '@druid-toolkit/query';
-import { F, sql, SqlExpression } from '@druid-toolkit/query';
+import type { QueryResult, SqlQuery } from 'druid-query-toolkit';
+import { F, sql, SqlExpression } from 'druid-query-toolkit';
 import React, { useMemo, useState } from 'react';
 
 import { AppToaster } from '../../../../../singletons';
diff --git a/web-console/src/views/explore-view/components/resource-pane/measure-dialog/measure-dialog.tsx b/web-console/src/views/explore-view/components/resource-pane/measure-dialog/measure-dialog.tsx
index 4d56d1b3aab4..308e2563ebf0 100644
--- a/web-console/src/views/explore-view/components/resource-pane/measure-dialog/measure-dialog.tsx
+++ b/web-console/src/views/explore-view/components/resource-pane/measure-dialog/measure-dialog.tsx
@@ -24,7 +24,7 @@ import {
   SqlExpression,
   SqlQuery,
   SqlWithPart,
-} from '@druid-toolkit/query';
+} from 'druid-query-toolkit';
 import React, { useMemo, useState } from 'react';
 
 import { AppToaster } from '../../../../../singletons';
diff --git a/web-console/src/views/explore-view/components/resource-pane/nested-column-dialog/nested-column-dialog.tsx b/web-console/src/views/explore-view/components/resource-pane/nested-column-dialog/nested-column-dialog.tsx
index 5cd057ead2fd..4103dc35bb2a 100644
--- a/web-console/src/views/explore-view/components/resource-pane/nested-column-dialog/nested-column-dialog.tsx
+++ b/web-console/src/views/explore-view/components/resource-pane/nested-column-dialog/nested-column-dialog.tsx
@@ -27,8 +27,8 @@ import {
   Menu,
   Tag,
 } from '@blueprintjs/core';
-import type { QueryResult, SqlExpression, SqlQuery } from '@druid-toolkit/query';
-import { F, sql, SqlFunction } from '@druid-toolkit/query';
+import type { QueryResult, SqlExpression, SqlQuery } from 'druid-query-toolkit';
+import { F, sql, SqlFunction } from 'druid-query-toolkit';
 import React, { useState } from 'react';
 
 import { ClearableInput, Loader, MenuCheckbox } from '../../../../../components';
diff --git a/web-console/src/views/explore-view/components/resource-pane/resource-pane.tsx b/web-console/src/views/explore-view/components/resource-pane/resource-pane.tsx
index 09eaa96fea7d..dda84fdbf05f 100644
--- a/web-console/src/views/explore-view/components/resource-pane/resource-pane.tsx
+++ b/web-console/src/views/explore-view/components/resource-pane/resource-pane.tsx
@@ -28,8 +28,8 @@ import {
   Popover,
 } from '@blueprintjs/core';
 import { IconNames } from '@blueprintjs/icons';
-import type { Column, QueryResult, SqlExpression, SqlQuery } from '@druid-toolkit/query';
 import classNames from 'classnames';
+import type { Column, QueryResult, SqlExpression, SqlQuery } from 'druid-query-toolkit';
 import { useState } from 'react';
 
 import { ClearableInput } from '../../../../components';
diff --git a/web-console/src/views/explore-view/components/source-pane/source-pane.tsx b/web-console/src/views/explore-view/components/source-pane/source-pane.tsx
index c97f736d9bc7..fc0a2688cee4 100644
--- a/web-console/src/views/explore-view/components/source-pane/source-pane.tsx
+++ b/web-console/src/views/explore-view/components/source-pane/source-pane.tsx
@@ -18,7 +18,7 @@
 
 import { Button, Menu, MenuDivider, MenuItem, Popover, Position } from '@blueprintjs/core';
 import { IconNames } from '@blueprintjs/icons';
-import { SqlQuery, SqlTable } from '@druid-toolkit/query';
+import { SqlQuery, SqlTable } from 'druid-query-toolkit';
 import type { JSX } from 'react';
 import React from 'react';
 
@@ -53,8 +53,8 @@ export interface SourcePaneProps {
 export const SourcePane = React.memo(function SourcePane(props: SourcePaneProps) {
   const { selectedSource, onSelectTable, onShowSourceQuery, fill, minimal, disabled } = props;
 
-  const [tables] = useQueryManager<string, string[]>({
-    initQuery: '',
+  const [tables] = useQueryManager<null, string[]>({
+    initQuery: null,
     processQuery: async () => {
       const tables = await queryDruidSql<{ TABLE_NAME: string }>({
         query: `SELECT TABLE_NAME FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_TYPE = 'TABLE'`,
diff --git a/web-console/src/views/explore-view/components/sql-input/sql-input.tsx b/web-console/src/views/explore-view/components/sql-input/sql-input.tsx
index 80534d36d6b3..4347d0962d9d 100644
--- a/web-console/src/views/explore-view/components/sql-input/sql-input.tsx
+++ b/web-console/src/views/explore-view/components/sql-input/sql-input.tsx
@@ -16,10 +16,10 @@
  * limitations under the License.
  */
 
-import type { Column } from '@druid-toolkit/query';
-import { C } from '@druid-toolkit/query';
 import type { Ace } from 'ace-builds';
 import ace from 'ace-builds';
+import type { Column } from 'druid-query-toolkit';
+import { C } from 'druid-query-toolkit';
 import React from 'react';
 import AceEditor from 'react-ace';
 
diff --git a/web-console/src/views/explore-view/drag-helper.ts b/web-console/src/views/explore-view/drag-helper.ts
index a9e1188e9898..82b247e70872 100644
--- a/web-console/src/views/explore-view/drag-helper.ts
+++ b/web-console/src/views/explore-view/drag-helper.ts
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-import type { Column } from '@druid-toolkit/query';
+import type { Column } from 'druid-query-toolkit';
 
 import type { Measure } from './models';
 
diff --git a/web-console/src/views/explore-view/explore-state.ts b/web-console/src/views/explore-view/explore-state.ts
index 07a53d6de702..a5faba0a26f4 100644
--- a/web-console/src/views/explore-view/explore-state.ts
+++ b/web-console/src/views/explore-view/explore-state.ts
@@ -16,13 +16,13 @@
  * limitations under the License.
  */
 
-import type { Column } from '@druid-toolkit/query';
+import type { Column } from 'druid-query-toolkit';
 import {
   filterPatternToExpression,
   SqlExpression,
   SqlLiteral,
   SqlQuery,
-} from '@druid-toolkit/query';
+} from 'druid-query-toolkit';
 
 import { isEmpty } from '../../utils';
 
diff --git a/web-console/src/views/explore-view/explore-view.tsx b/web-console/src/views/explore-view/explore-view.tsx
index 91e7b91306b0..21c98b067fa8 100644
--- a/web-console/src/views/explore-view/explore-view.tsx
+++ b/web-console/src/views/explore-view/explore-view.tsx
@@ -20,11 +20,11 @@ import './modules';
 
 import { Button, Intent, Menu, MenuDivider, MenuItem } from '@blueprintjs/core';
 import { IconNames } from '@blueprintjs/icons';
-import type { Column, QueryResult, SqlExpression } from '@druid-toolkit/query';
-import { QueryRunner, SqlQuery } from '@druid-toolkit/query';
 import type { CancelToken } from 'axios';
 import classNames from 'classnames';
 import copy from 'copy-to-clipboard';
+import type { Column, QueryResult, SqlExpression } from 'druid-query-toolkit';
+import { QueryRunner, SqlQuery } from 'druid-query-toolkit';
 import React, { useEffect, useMemo, useRef, useState } from 'react';
 import { useStore } from 'zustand';
 
diff --git a/web-console/src/views/explore-view/models/expression-meta.ts b/web-console/src/views/explore-view/models/expression-meta.ts
index 7bdb00de6e89..ac8e07aa8a32 100644
--- a/web-console/src/views/explore-view/models/expression-meta.ts
+++ b/web-console/src/views/explore-view/models/expression-meta.ts
@@ -16,8 +16,8 @@
  * limitations under the License.
  */
 
-import type { Column } from '@druid-toolkit/query';
-import { C, filterMap, SqlColumn, SqlExpression } from '@druid-toolkit/query';
+import type { Column } from 'druid-query-toolkit';
+import { C, filterMap, SqlColumn, SqlExpression } from 'druid-query-toolkit';
 
 import { renameColumnsInExpression } from '../utils';
 
diff --git a/web-console/src/views/explore-view/models/index.ts b/web-console/src/views/explore-view/models/index.ts
index 1e3c58ea09fb..8938818acc20 100644
--- a/web-console/src/views/explore-view/models/index.ts
+++ b/web-console/src/views/explore-view/models/index.ts
@@ -22,4 +22,3 @@ export * from './measure';
 export * from './measure-pattern';
 export * from './parameter';
 export * from './query-source';
-export * from './stage';
diff --git a/web-console/src/views/explore-view/models/measure-pattern.ts b/web-console/src/views/explore-view/models/measure-pattern.ts
index fd0d567440cc..cd2998c4d841 100644
--- a/web-console/src/views/explore-view/models/measure-pattern.ts
+++ b/web-console/src/views/explore-view/models/measure-pattern.ts
@@ -16,8 +16,8 @@
  * limitations under the License.
  */
 
-import type { Column, SqlExpression } from '@druid-toolkit/query';
-import { C, F, SqlColumn, SqlFunction, SqlStar } from '@druid-toolkit/query';
+import type { Column, SqlExpression } from 'druid-query-toolkit';
+import { C, F, SqlColumn, SqlFunction, SqlStar } from 'druid-query-toolkit';
 
 import { capitalizeFirst } from '../../../utils';
 
diff --git a/web-console/src/views/explore-view/models/measure.ts b/web-console/src/views/explore-view/models/measure.ts
index 018f11bbcc11..a3aadab89b67 100644
--- a/web-console/src/views/explore-view/models/measure.ts
+++ b/web-console/src/views/explore-view/models/measure.ts
@@ -16,8 +16,8 @@
  * limitations under the License.
  */
 
-import type { Column, SqlBase, SqlQuery } from '@druid-toolkit/query';
-import { C, F, filterMap, L, SqlAlias, SqlExpression, SqlFunction } from '@druid-toolkit/query';
+import type { Column, SqlBase, SqlQuery } from 'druid-query-toolkit';
+import { C, F, filterMap, L, SqlAlias, SqlExpression, SqlFunction } from 'druid-query-toolkit';
 
 import { uniq } from '../../../utils';
 
diff --git a/web-console/src/views/explore-view/models/query-source.ts b/web-console/src/views/explore-view/models/query-source.ts
index 6c6f42c78053..24c4021d94c4 100644
--- a/web-console/src/views/explore-view/models/query-source.ts
+++ b/web-console/src/views/explore-view/models/query-source.ts
@@ -16,8 +16,8 @@
  * limitations under the License.
  */
 
-import type { Column } from '@druid-toolkit/query';
-import { C, F, SqlColumn, SqlExpression, SqlQuery, SqlStar } from '@druid-toolkit/query';
+import type { Column } from 'druid-query-toolkit';
+import { C, F, SqlColumn, SqlExpression, SqlQuery, SqlStar } from 'druid-query-toolkit';
 
 import { filterMap, mapRecordIfChanged } from '../../../utils';
 
diff --git a/web-console/src/views/explore-view/module-repository/module-repository.ts b/web-console/src/views/explore-view/module-repository/module-repository.ts
index d050a2779c51..5f82dbc6dfe1 100644
--- a/web-console/src/views/explore-view/module-repository/module-repository.ts
+++ b/web-console/src/views/explore-view/module-repository/module-repository.ts
@@ -17,10 +17,11 @@
  */
 
 import type { IconName } from '@blueprintjs/icons';
-import type { QueryResult, SqlExpression, SqlQuery } from '@druid-toolkit/query';
 import type { CancelToken } from 'axios';
+import type { QueryResult, SqlExpression, SqlQuery } from 'druid-query-toolkit';
 
-import type { ParameterDefinition, QuerySource, Stage } from '../models';
+import type { Stage } from '../../../utils/stage';
+import type { ParameterDefinition, QuerySource } from '../models';
 
 interface ModuleDefinition<P> {
   id: string;
diff --git a/web-console/src/views/explore-view/modules/bar-chart-module.tsx b/web-console/src/views/explore-view/modules/bar-chart-module.tsx
index 0ff203c70519..34af0404ee6c 100644
--- a/web-console/src/views/explore-view/modules/bar-chart-module.tsx
+++ b/web-console/src/views/explore-view/modules/bar-chart-module.tsx
@@ -17,7 +17,7 @@
  */
 
 import { IconNames } from '@blueprintjs/icons';
-import { L } from '@druid-toolkit/query';
+import { L } from 'druid-query-toolkit';
 import type { ECharts } from 'echarts';
 import * as echarts from 'echarts';
 import { useEffect, useMemo, useRef } from 'react';
diff --git a/web-console/src/views/explore-view/modules/grouping-table-module.tsx b/web-console/src/views/explore-view/modules/grouping-table-module.tsx
index 5cb5650c94e0..81e7d1924799 100644
--- a/web-console/src/views/explore-view/modules/grouping-table-module.tsx
+++ b/web-console/src/views/explore-view/modules/grouping-table-module.tsx
@@ -18,8 +18,8 @@
 
 import { Button } from '@blueprintjs/core';
 import { IconNames } from '@blueprintjs/icons';
-import type { SqlExpression, SqlOrderByDirection, SqlQuery } from '@druid-toolkit/query';
-import { C, F } from '@druid-toolkit/query';
+import type { SqlExpression, SqlOrderByDirection, SqlQuery } from 'druid-query-toolkit';
+import { C, F } from 'druid-query-toolkit';
 import { useMemo } from 'react';
 
 import { Loader } from '../../../components';
diff --git a/web-console/src/views/explore-view/modules/multi-axis-chart-module.tsx b/web-console/src/views/explore-view/modules/multi-axis-chart-module.tsx
index e5f2fb47f9a5..3c3f4c48e646 100644
--- a/web-console/src/views/explore-view/modules/multi-axis-chart-module.tsx
+++ b/web-console/src/views/explore-view/modules/multi-axis-chart-module.tsx
@@ -17,8 +17,8 @@
  */
 
 import { IconNames } from '@blueprintjs/icons';
-import type { SqlQuery } from '@druid-toolkit/query';
-import { C, F, L } from '@druid-toolkit/query';
+import type { SqlQuery } from 'druid-query-toolkit';
+import { C, F, L } from 'druid-query-toolkit';
 import type { ECharts } from 'echarts';
 import * as echarts from 'echarts';
 import { useEffect, useMemo, useRef } from 'react';
@@ -26,6 +26,7 @@ import { useEffect, useMemo, useRef } from 'react';
 import { Loader } from '../../../components';
 import { useQueryManager } from '../../../hooks';
 import {
+  Duration,
   formatInteger,
   formatNumber,
   prettyFormatIsoDateTick,
@@ -35,7 +36,7 @@ import { Issue } from '../components';
 import { highlightStore } from '../highlight-store/highlight-store';
 import type { ExpressionMeta } from '../models';
 import { ModuleRepository } from '../module-repository/module-repository';
-import { DATE_FORMAT, getAutoGranularity, snapToGranularity } from '../utils';
+import { DATE_FORMAT, getAutoGranularity } from '../utils';
 
 import './record-table-module.scss';
 
@@ -223,12 +224,9 @@ ModuleRepository.registerModule<MultiAxisChartParameterValues>({
         // this is only used for the label and the data saved in the highlight
         // the positioning is done with the true coordinates until the user
         // releases the mouse button (in the `brushend` event)
-        const { start, end } = snapToGranularity(
-          params.areas[0].coordRange[0],
-          params.areas[0].coordRange[1],
-          timeGranularity,
-          undefined, // context.timezone,
-        );
+        const duration = new Duration(timeGranularity);
+        const start = duration.round(params.areas[0].coordRange[0], 'Etc/UTC');
+        const end = duration.round(params.areas[0].coordRange[1], 'Etc/UTC');
 
         const x0 = myChart.convertToPixel({ xAxisIndex: 0 }, params.areas[0].coordRange[0]);
         const x1 = myChart.convertToPixel({ xAxisIndex: 0 }, params.areas[0].coordRange[1]);
diff --git a/web-console/src/views/explore-view/modules/pie-chart-module.tsx b/web-console/src/views/explore-view/modules/pie-chart-module.tsx
index 80ff41b0f348..d90dfbeae606 100644
--- a/web-console/src/views/explore-view/modules/pie-chart-module.tsx
+++ b/web-console/src/views/explore-view/modules/pie-chart-module.tsx
@@ -17,7 +17,7 @@
  */
 
 import { IconNames } from '@blueprintjs/icons';
-import { C, L } from '@druid-toolkit/query';
+import { C, L } from 'druid-query-toolkit';
 import type { ECharts } from 'echarts';
 import * as echarts from 'echarts';
 import { useEffect, useMemo, useRef } from 'react';
diff --git a/web-console/src/views/explore-view/modules/record-table-module.tsx b/web-console/src/views/explore-view/modules/record-table-module.tsx
index 37c6483f7841..d7a812e4c167 100644
--- a/web-console/src/views/explore-view/modules/record-table-module.tsx
+++ b/web-console/src/views/explore-view/modules/record-table-module.tsx
@@ -17,7 +17,7 @@
  */
 
 import { IconNames } from '@blueprintjs/icons';
-import { C, SqlQuery } from '@druid-toolkit/query';
+import { C, SqlQuery } from 'druid-query-toolkit';
 import { useMemo } from 'react';
 
 import { Loader } from '../../../components';
diff --git a/web-console/src/views/explore-view/modules/time-chart-module.tsx b/web-console/src/views/explore-view/modules/time-chart-module.tsx
index 1c19963b1ed5..a07455b547a5 100644
--- a/web-console/src/views/explore-view/modules/time-chart-module.tsx
+++ b/web-console/src/views/explore-view/modules/time-chart-module.tsx
@@ -17,7 +17,7 @@
  */
 
 import { IconNames } from '@blueprintjs/icons';
-import { C, F, L, SqlCase } from '@druid-toolkit/query';
+import { C, F, L, SqlCase } from 'druid-query-toolkit';
 import type { ECharts } from 'echarts';
 import * as echarts from 'echarts';
 import { useEffect, useMemo, useRef } from 'react';
@@ -25,6 +25,7 @@ import { useEffect, useMemo, useRef } from 'react';
 import { Loader } from '../../../components';
 import { useQueryManager } from '../../../hooks';
 import {
+  Duration,
   formatInteger,
   formatNumber,
   prettyFormatIsoDateTick,
@@ -34,7 +35,7 @@ import { Issue } from '../components';
 import { highlightStore } from '../highlight-store/highlight-store';
 import type { ExpressionMeta } from '../models';
 import { ModuleRepository } from '../module-repository/module-repository';
-import { DATE_FORMAT, getAutoGranularity, snapToGranularity } from '../utils';
+import { DATE_FORMAT, getAutoGranularity } from '../utils';
 
 import './record-table-module.scss';
 
@@ -295,13 +296,13 @@ ModuleRepository.registerModule<TimeChartParameterValues>({
         // this is only used for the label and the data saved in the highlight
         // the positioning is done with the true coordinates until the user
         // releases the mouse button (in the `brushend` event)
-        const { start, end } = snappyHighlight
-          ? snapToGranularity(
-              params.areas[0].coordRange[0],
-              params.areas[0].coordRange[1],
-              timeGranularity,
-            )
-          : { start: params.areas[0].coordRange[0], end: params.areas[0].coordRange[1] };
+        let start = params.areas[0].coordRange[0];
+        let end = params.areas[0].coordRange[1];
+        if (snappyHighlight) {
+          const duration = new Duration(timeGranularity);
+          start = duration.round(start, 'Etc/UTC');
+          end = duration.round(end, 'Etc/UTC');
+        }
 
         const x0 = myChart.convertToPixel({ xAxisIndex: 0 }, params.areas[0].coordRange[0]);
         const x1 = myChart.convertToPixel({ xAxisIndex: 0 }, params.areas[0].coordRange[1]);
diff --git a/web-console/src/views/explore-view/query-macros/aggregate.spec.ts b/web-console/src/views/explore-view/query-macros/aggregate.spec.ts
index c0d7629031e7..7cf58bfd716e 100644
--- a/web-console/src/views/explore-view/query-macros/aggregate.spec.ts
+++ b/web-console/src/views/explore-view/query-macros/aggregate.spec.ts
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-import { sane, SqlQuery } from '@druid-toolkit/query';
+import { sane, SqlQuery } from 'druid-query-toolkit';
 
 import { Measure } from '../models';
 
diff --git a/web-console/src/views/explore-view/query-macros/aggregate.ts b/web-console/src/views/explore-view/query-macros/aggregate.ts
index 9af7e79ebe25..18c58929eea5 100644
--- a/web-console/src/views/explore-view/query-macros/aggregate.ts
+++ b/web-console/src/views/explore-view/query-macros/aggregate.ts
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-import { C, SqlFunction, SqlQuery } from '@druid-toolkit/query';
+import { C, SqlFunction, SqlQuery } from 'druid-query-toolkit';
 
 import { filterMap, uniq } from '../../../utils';
 import { Measure } from '../models';
diff --git a/web-console/src/views/explore-view/query-macros/max-data-time.ts b/web-console/src/views/explore-view/query-macros/max-data-time.ts
index c6cc409a1001..d689d0a8386f 100644
--- a/web-console/src/views/explore-view/query-macros/max-data-time.ts
+++ b/web-console/src/views/explore-view/query-macros/max-data-time.ts
@@ -16,8 +16,8 @@
  * limitations under the License.
  */
 
-import type { SqlQuery } from '@druid-toolkit/query';
-import { L, SqlFunction } from '@druid-toolkit/query';
+import type { SqlQuery } from 'druid-query-toolkit';
+import { L, SqlFunction } from 'druid-query-toolkit';
 
 import { getMaxTimeForTable } from '../utils';
 
diff --git a/web-console/src/views/explore-view/utils/duration.spec.ts b/web-console/src/views/explore-view/utils/duration.spec.ts
deleted file mode 100644
index 0d7e0473131a..000000000000
--- a/web-console/src/views/explore-view/utils/duration.spec.ts
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import { formatDuration } from './duration';
-
-describe('formatDuration', () => {
-  it('works with 0', () => {
-    expect(formatDuration('PT0S')).toEqual('0 seconds');
-  });
-
-  it('works with single span', () => {
-    expect(formatDuration('P1D')).toEqual('1 day');
-    expect(formatDuration('PT1M')).toEqual('1 minute');
-  });
-
-  it('works with single span (compact)', () => {
-    expect(formatDuration('PT1M', true)).toEqual('minute');
-  });
-
-  it('works with multiple spans', () => {
-    expect(formatDuration('PT2H30M15S')).toEqual('2 hours, 30 minutes, 15 seconds');
-    expect(formatDuration('PT2H30M15S', true)).toEqual('2 hours, 30 minutes, 15 seconds');
-  });
-});
diff --git a/web-console/src/views/explore-view/utils/duration.ts b/web-console/src/views/explore-view/utils/duration.ts
deleted file mode 100644
index 621aa0a57a0f..000000000000
--- a/web-console/src/views/explore-view/utils/duration.ts
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import { sum } from 'd3-array';
-
-import { filterMap, pluralIfNeeded } from '../../../utils';
-
-const SPANS = ['year', 'month', 'day', 'hour', 'minute', 'second'];
-
-export function formatDuration(duration: string, preferCompact = false): string {
-  // Regular expressions to match ISO 8601 duration parts
-  const regex = /P(?:(\d+)Y)?(?:(\d+)M)?(?:(\d+)D)?(?:T(?:(\d+)H)?(?:(\d+)M)?(?:(\d+)S)?)?/;
-  const matches = regex.exec(duration);
-  if (!matches) return duration;
-
-  // Extract the relevant parts
-  const counts = SPANS.map((_, i) => parseInt(matches[i + 1] || '0', 10));
-
-  // Construct the human-readable format based on the parsed values
-  let parts: string[];
-  if (preferCompact && sum(counts) === 1) {
-    parts = filterMap(SPANS, (span, i) => (counts[i] ? span : undefined));
-  } else {
-    parts = filterMap(SPANS, (span, i) =>
-      counts[i] ? pluralIfNeeded(counts[i], span) : undefined,
-    );
-  }
-
-  // Join the parts with commas, and return the result
-  return parts.length > 0 ? parts.join(', ') : '0 seconds';
-}
diff --git a/web-console/src/views/explore-view/utils/filter-pattern-helpers.ts b/web-console/src/views/explore-view/utils/filter-pattern-helpers.ts
index 6b2245dbd38e..faf643aef578 100644
--- a/web-console/src/views/explore-view/utils/filter-pattern-helpers.ts
+++ b/web-console/src/views/explore-view/utils/filter-pattern-helpers.ts
@@ -16,10 +16,11 @@
  * limitations under the License.
  */
 
-import type { Column, FilterPattern } from '@druid-toolkit/query';
+import type { Column, FilterPattern } from 'druid-query-toolkit';
+
+import { Duration } from '../../../utils';
 
 import { DATE_FORMAT } from './date-format';
-import { formatDuration } from './duration';
 
 const TIME_RELATIVE_TYPES: Record<string, string> = {
   'maxDataTime/': 'latest',
@@ -82,10 +83,9 @@ export function formatPatternWithoutNegation(pattern: FilterPattern): string {
 
     case 'timeRelative': {
       const type = TIME_RELATIVE_TYPES[`${pattern.anchor}/${pattern.alignType || ''}`];
-      return `${pattern.column} in ${type ? `${type} ` : ''}${formatDuration(
+      return `${pattern.column} in ${type ? `${type} ` : ''}${new Duration(
         pattern.rangeDuration,
-        true,
-      )}`;
+      ).getDescription()}`;
     }
 
     case 'numberRange':
diff --git a/web-console/src/views/explore-view/utils/general.ts b/web-console/src/views/explore-view/utils/general.ts
index 186619593cce..b6151306a94a 100644
--- a/web-console/src/views/explore-view/utils/general.ts
+++ b/web-console/src/views/explore-view/utils/general.ts
@@ -16,8 +16,8 @@
  * limitations under the License.
  */
 
-import type { SqlExpression } from '@druid-toolkit/query';
-import { SqlColumn } from '@druid-toolkit/query';
+import type { SqlExpression } from 'druid-query-toolkit';
+import { SqlColumn } from 'druid-query-toolkit';
 
 export function addTableScope(expression: SqlExpression, newTableScope: string): SqlExpression {
   return expression.walk(ex => {
diff --git a/web-console/src/views/explore-view/utils/get-auto-granularity.ts b/web-console/src/views/explore-view/utils/get-auto-granularity.ts
index f8928f3b86be..64acd5002487 100644
--- a/web-console/src/views/explore-view/utils/get-auto-granularity.ts
+++ b/web-console/src/views/explore-view/utils/get-auto-granularity.ts
@@ -16,67 +16,48 @@
  * limitations under the License.
  */
 
-import type { SqlExpression } from '@druid-toolkit/query';
-import { fitFilterPattern, SqlMulti } from '@druid-toolkit/query';
-import { day, Duration, hour } from 'chronoshift';
+import type { SqlExpression } from 'druid-query-toolkit';
+import { fitFilterPatterns } from 'druid-query-toolkit';
 
-function getCanonicalDuration(
+import { Duration } from '../../../utils';
+
+function getTimeSpanInExpression(
   expression: SqlExpression,
   timeColumnName: string,
 ): number | undefined {
-  const pattern = fitFilterPattern(expression);
-  if ('column' in pattern && pattern.column !== timeColumnName) return undefined;
-
-  switch (pattern.type) {
-    case 'timeInterval':
+  const patterns = fitFilterPatterns(expression);
+  for (const pattern of patterns) {
+    if (pattern.type === 'timeInterval' && pattern.column === timeColumnName) {
       return pattern.end.valueOf() - pattern.start.valueOf();
-
-    case 'timeRelative':
-      return Duration.fromJS(pattern.rangeDuration).getCanonicalLength();
-
-    case 'custom':
-      if (pattern.expression instanceof SqlMulti) {
-        for (const value of pattern.expression.args.values) {
-          const canonicalDuration = getCanonicalDuration(value, timeColumnName);
-          if (canonicalDuration !== undefined) return canonicalDuration;
-        }
-      }
-
-      break;
-
-    default:
-      break;
+    } else if (pattern.type === 'timeRelative' && pattern.column === timeColumnName) {
+      return new Duration(pattern.rangeDuration).getCanonicalLength();
+    }
   }
 
-  return undefined;
+  return;
 }
 
-const DEFAULT_GRANULARITY = 'PT1H';
-
-/**
- * Computes the granularity string from a where clause. If the where clause is TRUE, the default
- * granularity is returned (PT1H). Otherwise, the granularity is computed from the time column and the
- * duration of the where clause.
- *
- * @param where the where SQLExpression to read from
- * @param timeColumnName the name of the time column (any other time column will be ignored)
- * @returns the granularity string (default is PT1H)
- */
 export function getAutoGranularity(where: SqlExpression, timeColumnName: string): string {
-  if (where.toString() === 'TRUE') return DEFAULT_GRANULARITY;
-
-  const canonicalDuration = getCanonicalDuration(where, timeColumnName);
-
-  if (canonicalDuration) {
-    if (canonicalDuration > day.canonicalLength * 95) return 'P1W';
-    if (canonicalDuration > day.canonicalLength * 8) return 'P1D';
-    if (canonicalDuration > hour.canonicalLength * 8) return 'PT1H';
-    if (canonicalDuration > hour.canonicalLength * 3) return 'PT5M';
-
-    return 'PT1M';
-  }
-
-  console.debug('Unable to determine granularity from where clause', where.toString());
-
-  return DEFAULT_GRANULARITY;
+  const timeSpan = getTimeSpanInExpression(where, timeColumnName);
+  if (!timeSpan) return 'P1D';
+  return Duration.pickSmallestGranularityThatFits(
+    [
+      'PT1S',
+      'PT5S',
+      'PT20S',
+      'PT1M',
+      'PT5M',
+      'PT20M',
+      'PT1H',
+      'PT3H',
+      'PT6H',
+      'P1D',
+      'P1W',
+      'P1M',
+      'P3M',
+      'P1Y',
+    ].map(s => new Duration(s)),
+    timeSpan,
+    200,
+  ).toString();
 }
diff --git a/web-console/src/views/explore-view/utils/index.ts b/web-console/src/views/explore-view/utils/index.ts
index 8469c83b9279..57c72e2c0e7e 100644
--- a/web-console/src/views/explore-view/utils/index.ts
+++ b/web-console/src/views/explore-view/utils/index.ts
@@ -17,7 +17,6 @@
  */
 
 export * from './date-format';
-export * from './duration';
 export * from './filter-pattern-helpers';
 export * from './general';
 export * from './get-auto-granularity';
@@ -25,6 +24,5 @@ export * from './known-aggregations';
 export * from './max-time-for-table';
 export * from './misc';
 export * from './query-log';
-export * from './snap-to-granularity';
 export * from './table-query';
 export * from './time-manipulation';
diff --git a/web-console/src/views/explore-view/utils/max-time-for-table.ts b/web-console/src/views/explore-view/utils/max-time-for-table.ts
index b93dea9adf39..8ec4e6d16bbd 100644
--- a/web-console/src/views/explore-view/utils/max-time-for-table.ts
+++ b/web-console/src/views/explore-view/utils/max-time-for-table.ts
@@ -17,7 +17,7 @@
  */
 
 // micro-cache
-import { sql, T } from '@druid-toolkit/query';
+import { sql, T } from 'druid-query-toolkit';
 
 import { deepGet, queryDruidSql } from '../../../utils';
 
diff --git a/web-console/src/views/explore-view/utils/snap-to-granularity.ts b/web-console/src/views/explore-view/utils/snap-to-granularity.ts
deleted file mode 100644
index 15b0cce03518..000000000000
--- a/web-console/src/views/explore-view/utils/snap-to-granularity.ts
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import { Duration, Timezone } from 'chronoshift';
-
-/**
- * Will try to snap start and end to the closest available dates, given the granularity.
- *
- * @param start the start date
- * @param end the end date
- * @param granularity the granularity
- * @param timezone the timezone
- * @returns an object with the start and end dates snapped to the given granularity
- */
-export function snapToGranularity(
-  start: Date,
-  end: Date,
-  granularity: string,
-  timezone?: string,
-): { start: Date; end: Date } {
-  const tz = Timezone.fromJS(timezone || 'Etc/UTC');
-  const duration = Duration.fromJS(granularity);
-
-  // get closest to start
-  const flooredStart = duration.floor(start, tz);
-  const ceiledStart = duration.shift(flooredStart, tz, 1);
-  const distanceToFlooredStart = Math.abs(start.valueOf() - flooredStart.valueOf());
-  const distanceToCeiledStart = Math.abs(start.valueOf() - ceiledStart.valueOf());
-  const closestStart = distanceToFlooredStart < distanceToCeiledStart ? flooredStart : ceiledStart;
-
-  // get closest to end
-  const flooredEnd = duration.floor(end, tz);
-  const ceiledEnd = duration.shift(flooredEnd, tz, 1);
-  const distanceToFlooredEnd = Math.abs(end.valueOf() - flooredEnd.valueOf());
-  const distanceToCeiledEnd = Math.abs(end.valueOf() - ceiledEnd.valueOf());
-  const closestEnd = distanceToFlooredEnd < distanceToCeiledEnd ? flooredEnd : ceiledEnd;
-
-  return {
-    start: closestStart,
-    end: closestEnd,
-  };
-}
diff --git a/web-console/src/views/explore-view/utils/table-query.spec.ts b/web-console/src/views/explore-view/utils/table-query.spec.ts
index b388b2c1280a..1e1126cc1807 100644
--- a/web-console/src/views/explore-view/utils/table-query.spec.ts
+++ b/web-console/src/views/explore-view/utils/table-query.spec.ts
@@ -16,8 +16,8 @@
  * limitations under the License.
  */
 
-import type { SqlOrderByExpression } from '@druid-toolkit/query';
-import { C, sql, SqlExpression, SqlQuery, T } from '@druid-toolkit/query';
+import type { SqlOrderByExpression } from 'druid-query-toolkit';
+import { C, sql, SqlExpression, SqlQuery, T } from 'druid-query-toolkit';
 
 import { nodePostJson } from '../../../test-utils';
 import { ExpressionMeta, Measure } from '../models';
diff --git a/web-console/src/views/explore-view/utils/table-query.ts b/web-console/src/views/explore-view/utils/table-query.ts
index bc5b6484c9a3..d46d68edb5e1 100644
--- a/web-console/src/views/explore-view/utils/table-query.ts
+++ b/web-console/src/views/explore-view/utils/table-query.ts
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-import type { SqlAlias, SqlExpression, SqlOrderByExpression, SqlTable } from '@druid-toolkit/query';
+import type { SqlAlias, SqlExpression, SqlOrderByExpression, SqlTable } from 'druid-query-toolkit';
 import {
   C,
   F,
@@ -28,14 +28,13 @@ import {
   SqlType,
   SqlWithPart,
   T,
-} from '@druid-toolkit/query';
+} from 'druid-query-toolkit';
 
 import type { ColumnHint } from '../../../utils';
-import { forceSignInNumberFormatter, formatNumber, formatPercent } from '../../../utils';
+import { Duration, forceSignInNumberFormatter, formatNumber, formatPercent } from '../../../utils';
 import type { ExpressionMeta } from '../models';
 import { Measure } from '../models';
 
-import { formatDuration } from './duration';
 import { addTableScope } from './general';
 import { KNOWN_AGGREGATIONS } from './known-aggregations';
 import type { Compare } from './time-manipulation';
@@ -103,7 +102,7 @@ function makeBaseColumnHints(
       ).getUnderlyingExpression(),
     };
     if (isTimestamp(splitColumn)) {
-      hint.displayName = `${splitColumn.name} (by ${formatDuration(timeBucket, true)})`;
+      hint.displayName = `${splitColumn.name} (by ${new Duration(timeBucket).getDescription()})`;
     }
     columnHints.set(splitColumn.name, hint);
   }
@@ -291,7 +290,7 @@ function makeCompareAggregatorsAndAddHints(
   prevMeasure: SqlExpression,
   columnHints: Map<string, ColumnHint>,
 ): SqlExpression[] {
-  const group = `Previous ${formatDuration(compare, true)}`;
+  const group = `Previous ${new Duration(compare).getDescription()}`;
   const diff = mainMeasure.subtract(prevMeasure);
 
   const ret: SqlExpression[] = [];
diff --git a/web-console/src/views/explore-view/utils/time-manipulation.spec.ts b/web-console/src/views/explore-view/utils/time-manipulation.spec.ts
index fd92d5c3081e..70bdcf1e85ef 100644
--- a/web-console/src/views/explore-view/utils/time-manipulation.spec.ts
+++ b/web-console/src/views/explore-view/utils/time-manipulation.spec.ts
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-import { SqlExpression } from '@druid-toolkit/query';
+import { SqlExpression } from 'druid-query-toolkit';
 
 import { decomposeTimeInInterval, shiftBackAndExpandTimeInExpression } from './time-manipulation';
 
diff --git a/web-console/src/views/explore-view/utils/time-manipulation.ts b/web-console/src/views/explore-view/utils/time-manipulation.ts
index fab9a9a7946d..671ed3080f74 100644
--- a/web-console/src/views/explore-view/utils/time-manipulation.ts
+++ b/web-console/src/views/explore-view/utils/time-manipulation.ts
@@ -24,7 +24,7 @@ import {
   SqlExpression,
   SqlFunction,
   SqlLiteral,
-} from '@druid-toolkit/query';
+} from 'druid-query-toolkit';
 
 import { partition } from '../../../utils';
 
diff --git a/web-console/src/views/home-view/datasources-card/datasources-card.tsx b/web-console/src/views/home-view/datasources-card/datasources-card.tsx
index 811187117e70..d2a219776c55 100644
--- a/web-console/src/views/home-view/datasources-card/datasources-card.tsx
+++ b/web-console/src/views/home-view/datasources-card/datasources-card.tsx
@@ -21,8 +21,7 @@ import React from 'react';
 
 import type { Capabilities } from '../../../helpers';
 import { useQueryManager } from '../../../hooks';
-import { Api } from '../../../singletons';
-import { pluralIfNeeded, queryDruidSql } from '../../../utils';
+import { getApiArray, pluralIfNeeded, queryDruidSql } from '../../../utils';
 import { HomeViewCard } from '../home-view-card/home-view-card';
 
 export interface DatasourcesCardProps {
@@ -33,7 +32,7 @@ export const DatasourcesCard = React.memo(function DatasourcesCard(props: Dataso
   const [datasourceCountState] = useQueryManager<Capabilities, number>({
     initQuery: props.capabilities,
     processQuery: async (capabilities, cancelToken) => {
-      let datasources: any[];
+      let datasources: string[];
       if (capabilities.hasSql()) {
         datasources = await queryDruidSql(
           {
@@ -42,10 +41,7 @@ export const DatasourcesCard = React.memo(function DatasourcesCard(props: Dataso
           cancelToken,
         );
       } else if (capabilities.hasCoordinatorAccess()) {
-        const datasourcesResp = await Api.instance.get('/druid/coordinator/v1/datasources', {
-          cancelToken,
-        });
-        datasources = datasourcesResp.data;
+        datasources = await getApiArray<string>('/druid/coordinator/v1/datasources', cancelToken);
       } else {
         throw new Error(`must have SQL or coordinator access`);
       }
diff --git a/web-console/src/views/home-view/segments-card/segments-card.tsx b/web-console/src/views/home-view/segments-card/segments-card.tsx
index d5d157a523b0..6a86fe5f18e1 100644
--- a/web-console/src/views/home-view/segments-card/segments-card.tsx
+++ b/web-console/src/views/home-view/segments-card/segments-card.tsx
@@ -23,7 +23,7 @@ import React from 'react';
 import type { Capabilities } from '../../../helpers';
 import { useQueryManager } from '../../../hooks';
 import { Api } from '../../../singletons';
-import { deepGet, pluralIfNeeded, queryDruidSql } from '../../../utils';
+import { deepGet, getApiArray, pluralIfNeeded, queryDruidSql } from '../../../utils';
 import { HomeViewCard } from '../home-view-card/home-view-card';
 
 export interface SegmentCounts {
@@ -62,11 +62,10 @@ WHERE is_active = 1`,
         const loadstatus = loadstatusResp.data;
         const unavailableSegmentNum = sum(Object.keys(loadstatus), key => loadstatus[key]);
 
-        const datasourcesMetaResp = await Api.instance.get(
+        const datasourcesMeta = await getApiArray(
           '/druid/coordinator/v1/datasources?simple',
-          { cancelToken },
+          cancelToken,
         );
-        const datasourcesMeta = datasourcesMetaResp.data;
         const availableSegmentNum = sum(datasourcesMeta, (curr: any) =>
           deepGet(curr, 'properties.segments.count'),
         );
diff --git a/web-console/src/views/home-view/services-card/services-card.tsx b/web-console/src/views/home-view/services-card/services-card.tsx
index 18a66b832187..a04680237a41 100644
--- a/web-console/src/views/home-view/services-card/services-card.tsx
+++ b/web-console/src/views/home-view/services-card/services-card.tsx
@@ -22,8 +22,7 @@ import React from 'react';
 import { PluralPairIfNeeded } from '../../../components';
 import type { Capabilities } from '../../../helpers';
 import { useQueryManager } from '../../../hooks';
-import { Api } from '../../../singletons';
-import { lookupBy, queryDruidSql } from '../../../utils';
+import { getApiArray, lookupBy, queryDruidSql } from '../../../utils';
 import { HomeViewCard } from '../home-view-card/home-view-card';
 
 export interface ServiceCounts {
@@ -45,10 +44,10 @@ export const ServicesCard = React.memo(function ServicesCard(props: ServicesCard
   const [serviceCountState] = useQueryManager<Capabilities, ServiceCounts>({
     processQuery: async (capabilities, cancelToken) => {
       if (capabilities.hasSql()) {
-        const serviceCountsFromQuery: {
+        const serviceCountsFromQuery = await queryDruidSql<{
           service_type: string;
           count: number;
-        }[] = await queryDruidSql(
+        }>(
           {
             query: `SELECT server_type AS "service_type", COUNT(*) as "count" FROM sys.servers GROUP BY 1`,
           },
@@ -60,12 +59,10 @@ export const ServicesCard = React.memo(function ServicesCard(props: ServicesCard
           x => x.count,
         );
       } else if (capabilities.hasCoordinatorAccess()) {
-        const services = (
-          await Api.instance.get('/druid/coordinator/v1/servers?simple', { cancelToken })
-        ).data;
+        const services = await getApiArray('/druid/coordinator/v1/servers?simple', cancelToken);
 
         const middleManager = capabilities.hasOverlordAccess()
-          ? (await Api.instance.get('/druid/indexer/v1/workers', { cancelToken })).data
+          ? await getApiArray('/druid/indexer/v1/workers', cancelToken)
           : [];
 
         return {
diff --git a/web-console/src/views/home-view/supervisors-card/supervisors-card.tsx b/web-console/src/views/home-view/supervisors-card/supervisors-card.tsx
index ab63e0205ac8..dca25e32d367 100644
--- a/web-console/src/views/home-view/supervisors-card/supervisors-card.tsx
+++ b/web-console/src/views/home-view/supervisors-card/supervisors-card.tsx
@@ -19,10 +19,10 @@
 import { IconNames } from '@blueprintjs/icons';
 import React from 'react';
 
+import type { IngestionSpec } from '../../../druid-models';
 import type { Capabilities } from '../../../helpers';
 import { useQueryManager } from '../../../hooks';
-import { Api } from '../../../singletons';
-import { pluralIfNeeded, queryDruidSql } from '../../../utils';
+import { getApiArray, partition, pluralIfNeeded, queryDruidSql } from '../../../utils';
 import { HomeViewCard } from '../home-view-card/home-view-card';
 
 export interface SupervisorCounts {
@@ -50,11 +50,14 @@ FROM sys.supervisors`,
           )
         )[0];
       } else if (capabilities.hasOverlordAccess()) {
-        const resp = await Api.instance.get('/druid/indexer/v1/supervisor?full', { cancelToken });
-        const data = resp.data;
+        const supervisors = await getApiArray<{ spec: IngestionSpec }>(
+          '/druid/indexer/v1/supervisor?full',
+          cancelToken,
+        );
+        const [running, suspended] = partition(supervisors, d => !d.spec.suspended);
         return {
-          running: data.filter((d: any) => d.spec.suspended === false).length,
-          suspended: data.filter((d: any) => d.spec.suspended === true).length,
+          running: running.length,
+          suspended: suspended.length,
         };
       } else {
         throw new Error(`must have SQL or overlord access`);
diff --git a/web-console/src/views/home-view/tasks-card/tasks-card.tsx b/web-console/src/views/home-view/tasks-card/tasks-card.tsx
index fa91b8a141e3..901a4e15581e 100644
--- a/web-console/src/views/home-view/tasks-card/tasks-card.tsx
+++ b/web-console/src/views/home-view/tasks-card/tasks-card.tsx
@@ -25,8 +25,7 @@ import type { CapacityInfo } from '../../../druid-models';
 import type { Capabilities } from '../../../helpers';
 import { getClusterCapacity } from '../../../helpers';
 import { useQueryManager } from '../../../hooks';
-import { Api } from '../../../singletons';
-import { lookupBy, pluralIfNeeded, queryDruidSql } from '../../../utils';
+import { getApiArray, groupByAsMap, lookupBy, pluralIfNeeded, queryDruidSql } from '../../../utils';
 import { HomeViewCard } from '../home-view-card/home-view-card';
 
 function getTaskStatus(d: any) {
@@ -62,14 +61,12 @@ GROUP BY 1`,
       x => x.count,
     );
   } else if (capabilities.hasOverlordAccess()) {
-    const tasks: any[] = (await Api.instance.get('/druid/indexer/v1/tasks', { cancelToken })).data;
-    return {
-      success: tasks.filter(d => getTaskStatus(d) === 'SUCCESS').length,
-      failed: tasks.filter(d => getTaskStatus(d) === 'FAILED').length,
-      running: tasks.filter(d => getTaskStatus(d) === 'RUNNING').length,
-      pending: tasks.filter(d => getTaskStatus(d) === 'PENDING').length,
-      waiting: tasks.filter(d => getTaskStatus(d) === 'WAITING').length,
-    };
+    const tasks: any[] = await getApiArray('/druid/indexer/v1/tasks', cancelToken);
+    return groupByAsMap(
+      tasks,
+      d => getTaskStatus(d).toLowerCase(),
+      xs => xs.length,
+    );
   } else {
     throw new Error(`must have SQL or overlord access`);
   }
diff --git a/web-console/src/views/load-data-view/load-data-view.tsx b/web-console/src/views/load-data-view/load-data-view.tsx
index b4bd0d841b60..3767a9852e99 100644
--- a/web-console/src/views/load-data-view/load-data-view.tsx
+++ b/web-console/src/views/load-data-view/load-data-view.tsx
@@ -157,6 +157,7 @@ import {
   EMPTY_ARRAY,
   EMPTY_OBJECT,
   filterMap,
+  getApiArray,
   getDruidErrorMessage,
   localStorageGetJson,
   LocalStorageKeys,
@@ -3559,8 +3560,7 @@ export class LoadDataView extends React.PureComponent<LoadDataViewProps, LoadDat
 
     let existingDatasources: string[];
     try {
-      existingDatasources = (await Api.instance.get<string[]>('/druid/coordinator/v1/datasources'))
-        .data;
+      existingDatasources = await getApiArray<string>('/druid/coordinator/v1/datasources');
     } catch {
       return;
     }
diff --git a/web-console/src/views/lookups-view/lookups-view.tsx b/web-console/src/views/lookups-view/lookups-view.tsx
index 2fbfb70703ed..25f45455e224 100644
--- a/web-console/src/views/lookups-view/lookups-view.tsx
+++ b/web-console/src/views/lookups-view/lookups-view.tsx
@@ -41,8 +41,9 @@ import { STANDARD_TABLE_PAGE_SIZE, STANDARD_TABLE_PAGE_SIZE_OPTIONS } from '../.
 import { Api, AppToaster } from '../../singletons';
 import {
   deepGet,
+  getApiArray,
   getDruidErrorMessage,
-  hasPopoverOpen,
+  hasOverlayOpen,
   isLookupsUninitialized,
   LocalStorageBackedVisibility,
   LocalStorageKeys,
@@ -124,14 +125,12 @@ export class LookupsView extends React.PureComponent<LookupsViewProps, LookupsVi
 
     this.lookupsQueryManager = new QueryManager({
       processQuery: async (_, cancelToken) => {
-        const tiersResp = await Api.instance.get(
+        const tiersResp = await getApiArray(
           '/druid/coordinator/v1/lookups/config?discover=true',
-          { cancelToken },
+          cancelToken,
         );
         const tiers =
-          tiersResp.data && tiersResp.data.length > 0
-            ? tiersResp.data.sort(tierNameCompare)
-            : [DEFAULT_LOOKUP_TIER];
+          tiersResp.length > 0 ? tiersResp.sort(tierNameCompare) : [DEFAULT_LOOKUP_TIER];
 
         const lookupResp = await Api.instance.get('/druid/coordinator/v1/lookups/config/all', {
           cancelToken,
@@ -388,6 +387,7 @@ export class LookupsView extends React.PureComponent<LookupsViewProps, LookupsVi
             width: 200,
             Cell: ({ value, original }) => (
               <TableClickableCell
+                tooltip="Show detail"
                 onClick={() => this.onDetail(original)}
                 hoverIcon={IconNames.SEARCH_TEMPLATE}
               >
@@ -511,7 +511,7 @@ export class LookupsView extends React.PureComponent<LookupsViewProps, LookupsVi
         <ViewControlBar label="Lookups">
           <RefreshButton
             onRefresh={auto => {
-              if (auto && hasPopoverOpen()) return;
+              if (auto && hasOverlayOpen()) return;
               this.lookupsQueryManager.rerunLastQuery(auto);
             }}
             localStorageKey={LocalStorageKeys.LOOKUPS_REFRESH_RATE}
diff --git a/web-console/src/views/segments-view/__snapshots__/segments-view.spec.tsx.snap b/web-console/src/views/segments-view/__snapshots__/segments-view.spec.tsx.snap
index e177003b7eed..0e6b64e844d5 100755
--- a/web-console/src/views/segments-view/__snapshots__/segments-view.spec.tsx.snap
+++ b/web-console/src/views/segments-view/__snapshots__/segments-view.spec.tsx.snap
@@ -54,10 +54,7 @@ exports[`SegmentsView matches snapshot 1`] = `
           "Start",
           "End",
           "Version",
-          {
-            "label": "𝑓(sys.segments)",
-            "text": "Time span",
-          },
+          "Time span",
           "Shard type",
           "Shard spec",
           "Partition",
@@ -77,7 +74,6 @@ exports[`SegmentsView matches snapshot 1`] = `
       onClose={[Function]}
       tableColumnsHidden={
         [
-          "Time span",
           "Is published",
           "Is overshadowed",
         ]
@@ -85,6 +81,7 @@ exports[`SegmentsView matches snapshot 1`] = `
     />
   </Memo(ViewControlBar)>
   <SplitterLayout
+    className="timeline-segments-splitter"
     percentage={true}
     primaryIndex={1}
     primaryMinSize={20}
@@ -155,7 +152,6 @@ exports[`SegmentsView matches snapshot 1`] = `
             "accessor": "segment_id",
             "filterable": true,
             "show": true,
-            "sortable": true,
             "width": 280,
           },
           {
@@ -172,7 +168,6 @@ exports[`SegmentsView matches snapshot 1`] = `
             "defaultSortDesc": true,
             "filterable": true,
             "show": false,
-            "sortable": true,
             "width": 120,
           },
           {
@@ -183,8 +178,7 @@ exports[`SegmentsView matches snapshot 1`] = `
             "filterable": true,
             "headerClassName": "enable-comparisons",
             "show": true,
-            "sortable": true,
-            "width": 160,
+            "width": 180,
           },
           {
             "Cell": [Function],
@@ -194,8 +188,7 @@ exports[`SegmentsView matches snapshot 1`] = `
             "filterable": true,
             "headerClassName": "enable-comparisons",
             "show": true,
-            "sortable": true,
-            "width": 160,
+            "width": 180,
           },
           {
             "Cell": [Function],
@@ -204,16 +197,16 @@ exports[`SegmentsView matches snapshot 1`] = `
             "defaultSortDesc": true,
             "filterable": true,
             "show": true,
-            "sortable": true,
-            "width": 160,
+            "width": 180,
           },
           {
-            "Cell": [Function],
             "Header": "Time span",
-            "accessor": "time_span",
-            "filterable": true,
-            "show": false,
-            "sortable": true,
+            "accessor": [Function],
+            "className": "padded",
+            "filterable": false,
+            "id": "time_span",
+            "show": true,
+            "sortable": false,
             "width": 100,
           },
           {
@@ -242,7 +235,6 @@ exports[`SegmentsView matches snapshot 1`] = `
             "className": "padded",
             "filterable": false,
             "show": true,
-            "sortable": true,
             "width": 60,
           },
           {
@@ -253,7 +245,6 @@ exports[`SegmentsView matches snapshot 1`] = `
             "defaultSortDesc": true,
             "filterable": false,
             "show": true,
-            "sortable": true,
             "width": 120,
           },
           {
@@ -374,18 +365,11 @@ exports[`SegmentsView matches snapshot 1`] = `
       defaultFilterMethod={[Function]}
       defaultFiltered={[]}
       defaultPage={0}
-      defaultPageSize={50}
+      defaultPageSize={20}
       defaultResized={[]}
       defaultSortDesc={false}
       defaultSortMethod={[Function]}
-      defaultSorted={
-        [
-          {
-            "desc": true,
-            "id": "start",
-          },
-        ]
-      }
+      defaultSorted={[]}
       expanderDefaults={
         {
           "filterable": false,
@@ -421,7 +405,7 @@ exports[`SegmentsView matches snapshot 1`] = `
       getTrProps={[Function]}
       groupedByPivotKey="_groupedByPivot"
       indexKey="_index"
-      loading={false}
+      loading={true}
       loadingText="Loading..."
       manual={true}
       multiSort={true}
@@ -431,8 +415,13 @@ exports[`SegmentsView matches snapshot 1`] = `
       ofText=""
       onFetchData={[Function]}
       onFilteredChange={[Function]}
+      onPageChange={[Function]}
+      onPageSizeChange={[Function]}
+      onSortedChange={[Function]}
       originalKey="_original"
+      page={0}
       pageJumpText="jump to page"
+      pageSize={50}
       pageSizeOptions={
         [
           50,
@@ -457,6 +446,14 @@ exports[`SegmentsView matches snapshot 1`] = `
       showPaginationBottom={true}
       showPaginationTop={false}
       sortable={true}
+      sorted={
+        [
+          {
+            "desc": true,
+            "id": "start",
+          },
+        ]
+      }
       style={{}}
       subRowsKey="_subRows"
     />
diff --git a/web-console/src/views/segments-view/segments-view.scss b/web-console/src/views/segments-view/segments-view.scss
index a45d8860db1f..f64f881fe4c5 100644
--- a/web-console/src/views/segments-view/segments-view.scss
+++ b/web-console/src/views/segments-view/segments-view.scss
@@ -22,7 +22,7 @@
   height: 100%;
   width: 100%;
 
-  .splitter-layout {
+  .splitter-layout.timeline-segments-splitter {
     position: absolute;
     top: $view-control-bar-height + $standard-padding;
     bottom: 0;
diff --git a/web-console/src/views/segments-view/segments-view.tsx b/web-console/src/views/segments-view/segments-view.tsx
index 9e0d680c8547..da11d5af5cb6 100644
--- a/web-console/src/views/segments-view/segments-view.tsx
+++ b/web-console/src/views/segments-view/segments-view.tsx
@@ -18,10 +18,11 @@
 
 import { Button, ButtonGroup, Intent, Label, MenuItem, Switch, Tag } from '@blueprintjs/core';
 import { IconNames } from '@blueprintjs/icons';
-import { C, L, SqlComparison, SqlExpression } from '@druid-toolkit/query';
+import { C, L, SqlComparison, SqlExpression } from 'druid-query-toolkit';
 import * as JSONBig from 'json-bigint-native';
+import type { ReactNode } from 'react';
 import React from 'react';
-import type { Filter } from 'react-table';
+import type { Filter, SortingRule } from 'react-table';
 import ReactTable from 'react-table';
 
 import {
@@ -43,7 +44,8 @@ import {
 import { AsyncActionDialog } from '../../dialogs';
 import { SegmentTableActionDialog } from '../../dialogs/segments-table-action-dialog/segment-table-action-dialog';
 import { ShowValueDialog } from '../../dialogs/show-value-dialog/show-value-dialog';
-import type { QueryWithContext } from '../../druid-models';
+import type { QueryWithContext, ShardSpec } from '../../druid-models';
+import { computeSegmentTimeSpan, getDatasourceColor } from '../../druid-models';
 import type { Capabilities, CapabilitiesMode } from '../../helpers';
 import {
   booleanCustomTableFilter,
@@ -56,13 +58,14 @@ import {
 import { Api } from '../../singletons';
 import type { NumberLike, TableState } from '../../utils';
 import {
+  applySorting,
   compact,
   countBy,
-  deepGet,
   filterMap,
   formatBytes,
   formatInteger,
-  hasPopoverOpen,
+  getApiArray,
+  hasOverlayOpen,
   isNumberLikeNaN,
   LocalStorageBackedVisibility,
   LocalStorageKeys,
@@ -84,7 +87,7 @@ const TABLE_COLUMNS_BY_MODE: Record<CapabilitiesMode, TableColumnSelectorColumn[
     'Start',
     'End',
     'Version',
-    { text: 'Time span', label: '𝑓(sys.segments)' },
+    'Time span',
     'Shard type',
     'Shard spec',
     'Partition',
@@ -99,14 +102,13 @@ const TABLE_COLUMNS_BY_MODE: Record<CapabilitiesMode, TableColumnSelectorColumn[
     'Is published',
     'Is overshadowed',
   ],
-  'no-sql': ['Segment ID', 'Datasource', 'Start', 'End', 'Version', 'Partition', 'Size'],
   'no-proxy': [
     'Segment ID',
     'Datasource',
     'Start',
     'End',
     'Version',
-    { text: 'Time span', label: '𝑓(sys.segments)' },
+    'Time span',
     'Shard type',
     'Shard spec',
     'Partition',
@@ -121,12 +123,72 @@ const TABLE_COLUMNS_BY_MODE: Record<CapabilitiesMode, TableColumnSelectorColumn[
     'Is published',
     'Is overshadowed',
   ],
+  'no-sql': [
+    'Segment ID',
+    'Datasource',
+    'Start',
+    'End',
+    'Version',
+    'Time span',
+    'Shard type',
+    'Shard spec',
+    'Partition',
+    'Size',
+    'Replication factor',
+    'Is realtime',
+    'Is overshadowed',
+  ],
 };
 
+function maybeParseJsonBig(str: string): any {
+  try {
+    return JSONBig.parse(str);
+  } catch {
+    return undefined;
+  }
+}
+
 function formatRangeDimensionValue(dimension: any, value: any): string {
   return `${C(String(dimension))}=${L(String(value))}`;
 }
 
+function segmentFiltersToExpression(filters: Filter[]): SqlExpression {
+  return SqlExpression.and(
+    ...filterMap(filters, filter => {
+      if (filter.id === 'shard_type') {
+        // Special handling for shard_type that needs to be searched for in the shard_spec
+        // Creates filters like `shard_spec LIKE '%"type":"numbered"%'`
+        const modeAndNeedle = parseFilterModeAndNeedle(filter);
+        if (!modeAndNeedle) return;
+        const shardSpecColumn = C('shard_spec');
+        switch (modeAndNeedle.mode) {
+          case '=':
+            return SqlComparison.like(shardSpecColumn, `%"type":"${modeAndNeedle.needle}"%`);
+
+          case '!=':
+            return SqlComparison.notLike(shardSpecColumn, `%"type":"${modeAndNeedle.needle}"%`);
+
+          default:
+            return SqlComparison.like(shardSpecColumn, `%"type":"${modeAndNeedle.needle}%`);
+        }
+      } else if (filter.id.startsWith('is_')) {
+        switch (filter.value) {
+          case '=false':
+            return C(filter.id).equal(0);
+
+          case '=true':
+            return C(filter.id).equal(1);
+
+          default:
+            return;
+        }
+      } else {
+        return sqlQueryCustomTableFilter(filter);
+      }
+    }),
+  );
+}
+
 interface SegmentsQuery extends TableState {
   visibleColumns: LocalStorageBackedVisibility;
   capabilities: Capabilities;
@@ -140,8 +202,7 @@ interface SegmentQueryResultRow {
   interval: string;
   segment_id: string;
   version: string;
-  time_span: string;
-  shard_spec: string;
+  shard_spec: ShardSpec;
   partition_num: number;
   size: number;
   num_rows: NumberLike;
@@ -167,11 +228,16 @@ export interface SegmentsViewState {
   segmentTableActionDialogId?: string;
   datasourceTableActionDialogId?: string;
   actions: BasicAction[];
-  terminateSegmentId?: string;
-  terminateDatasourceId?: string;
+
   visibleColumns: LocalStorageBackedVisibility;
   groupByInterval: boolean;
-  showSegmentTimeline: boolean;
+  showSegmentTimeline?: { capabilities: Capabilities; datasource?: string };
+  page: number;
+  pageSize: number;
+  sorted: SortingRule[];
+
+  terminateSegmentId?: string;
+  terminateDatasourceId?: string;
   showFullShardSpec?: string;
 }
 
@@ -183,16 +249,6 @@ export class SegmentsView extends React.PureComponent<SegmentsViewProps, Segment
       `"start"`,
       `"end"`,
       `"version"`,
-      visibleColumns.shown('Time span') &&
-        `CASE
-  WHEN "start" = '-146136543-09-08T08:23:32.096Z' AND "end" = '146140482-04-24T15:36:27.903Z' THEN 'All'
-  WHEN "start" LIKE '%-01-01T00:00:00.000Z' AND "end" LIKE '%-01-01T00:00:00.000Z' THEN 'Year'
-  WHEN "start" LIKE '%-01T00:00:00.000Z' AND "end" LIKE '%-01T00:00:00.000Z' THEN 'Month'
-  WHEN "start" LIKE '%T00:00:00.000Z' AND "end" LIKE '%T00:00:00.000Z' THEN 'Day'
-  WHEN "start" LIKE '%:00:00.000Z' AND "end" LIKE '%:00:00.000Z' THEN 'Hour'
-  WHEN "start" LIKE '%:00.000Z' AND "end" LIKE '%:00.000Z' THEN 'Minute'
-  ELSE 'Sub minute'
-END AS "time_span"`,
       visibleColumns.shown('Shard type', 'Shard spec') && `"shard_spec"`,
       visibleColumns.shown('Partition') && `"partition_num"`,
       visibleColumns.shown('Size') && `"size"`,
@@ -211,34 +267,8 @@ END AS "time_span"`,
     return `WITH s AS (SELECT\n${columns.join(',\n')}\nFROM sys.segments)`;
   }
 
-  static computeTimeSpan(start: string, end: string): string {
-    if (start.endsWith('-01-01T00:00:00.000Z') && end.endsWith('-01-01T00:00:00.000Z')) {
-      return 'Year';
-    }
-
-    if (start.endsWith('-01T00:00:00.000Z') && end.endsWith('-01T00:00:00.000Z')) {
-      return 'Month';
-    }
-
-    if (start.endsWith('T00:00:00.000Z') && end.endsWith('T00:00:00.000Z')) {
-      return 'Day';
-    }
-
-    if (start.endsWith(':00:00.000Z') && end.endsWith(':00:00.000Z')) {
-      return 'Hour';
-    }
-
-    if (start.endsWith(':00.000Z') && end.endsWith(':00.000Z')) {
-      return 'Minute';
-    }
-
-    return 'Sub minute';
-  }
-
   private readonly segmentsQueryManager: QueryManager<SegmentsQuery, SegmentQueryResultRow[]>;
 
-  private lastTableState: TableState | undefined;
-
   constructor(props: SegmentsViewProps) {
     super(props);
 
@@ -247,10 +277,16 @@ END AS "time_span"`,
       segmentsState: QueryState.INIT,
       visibleColumns: new LocalStorageBackedVisibility(
         LocalStorageKeys.SEGMENT_TABLE_COLUMN_SELECTION,
-        ['Time span', 'Is published', 'Is overshadowed'],
+        ['Is published', 'Is overshadowed'],
       ),
       groupByInterval: false,
-      showSegmentTimeline: false,
+      page: 0,
+      pageSize: STANDARD_TABLE_PAGE_SIZE,
+      sorted: [
+        props.capabilities.hasSql()
+          ? { id: 'start', desc: true }
+          : { id: 'datasource', desc: false },
+      ],
     };
 
     this.segmentsQueryManager = new QueryManager({
@@ -260,47 +296,11 @@ END AS "time_span"`,
           query;
 
         if (capabilities.hasSql()) {
-          const whereParts = filterMap(filtered, (f: Filter) => {
-            if (f.id === 'shard_type') {
-              // Special handling for shard_type that needs to be searched for in the shard_spec
-              // Creates filters like `shard_spec LIKE '%"type":"numbered"%'`
-              const modeAndNeedle = parseFilterModeAndNeedle(f);
-              if (!modeAndNeedle) return;
-              const shardSpecColumn = C('shard_spec');
-              switch (modeAndNeedle.mode) {
-                case '=':
-                  return SqlComparison.like(shardSpecColumn, `%"type":"${modeAndNeedle.needle}"%`);
-
-                case '!=':
-                  return SqlComparison.notLike(
-                    shardSpecColumn,
-                    `%"type":"${modeAndNeedle.needle}"%`,
-                  );
-
-                default:
-                  return SqlComparison.like(shardSpecColumn, `%"type":"${modeAndNeedle.needle}%`);
-              }
-            } else if (f.id.startsWith('is_')) {
-              switch (f.value) {
-                case '=false':
-                  return C(f.id).equal(0);
-
-                case '=true':
-                  return C(f.id).equal(1);
-
-                default:
-                  return;
-              }
-            } else {
-              return sqlQueryCustomTableFilter(f);
-            }
-          });
-
-          let queryParts: string[];
+          const whereExpression = segmentFiltersToExpression(filtered);
 
           let filterClause = '';
-          if (whereParts.length) {
-            filterClause = SqlExpression.and(...whereParts).toString();
+          if (whereExpression.toString() !== 'TRUE') {
+            filterClause = whereExpression.toString();
           }
 
           let effectiveSorted = sorted;
@@ -317,6 +317,7 @@ END AS "time_span"`,
           const base = SegmentsView.baseQuery(visibleColumns);
           const orderByClause = sortedToOrderByClause(effectiveSorted);
 
+          let queryParts: string[];
           if (groupByInterval) {
             const innerQuery = compact([
               `SELECT "start", "end"`,
@@ -356,78 +357,71 @@ END AS "time_span"`,
           }
           const sqlQuery = queryParts.join('\n');
           setIntermediateQuery(sqlQuery);
-          return await queryDruidSql({ query: sqlQuery }, cancelToken);
-        } else if (capabilities.hasCoordinatorAccess()) {
-          let datasourceList: string[] = (
-            await Api.instance.get('/druid/coordinator/v1/metadata/datasources', { cancelToken })
-          ).data;
+          let result = await queryDruidSql({ query: sqlQuery }, cancelToken);
 
+          if (visibleColumns.shown('Shard type', 'Shard spec')) {
+            result = result.map(sr => ({
+              ...sr,
+              shard_spec: maybeParseJsonBig(sr.shard_spec),
+            }));
+          }
+
+          return result as SegmentQueryResultRow[];
+        } else if (capabilities.hasCoordinatorAccess()) {
+          let datasourceList: string[] = [];
           const datasourceFilter = filtered.find(({ id }) => id === 'datasource');
           if (datasourceFilter) {
-            datasourceList = datasourceList.filter(datasource =>
+            datasourceList = (
+              await getApiArray('/druid/coordinator/v1/metadata/datasources', cancelToken)
+            ).filter((datasource: string) =>
               booleanCustomTableFilter(datasourceFilter, datasource),
             );
           }
 
-          if (sorted.length && sorted[0].id === 'datasource') {
-            datasourceList.sort(
-              sorted[0].desc ? (d1, d2) => d1.localeCompare(d2) : (d1, d2) => d2.localeCompare(d1),
-            );
-          }
-
-          const maxResults = (page + 1) * pageSize;
-          let results: SegmentQueryResultRow[] = [];
-
-          const n = Math.min(datasourceList.length, maxResults);
-          for (let i = 0; i < n && results.length < maxResults; i++) {
-            const segments = (
-              await Api.instance.get(
-                `/druid/coordinator/v1/datasources/${Api.encodePath(datasourceList[i])}?full`,
-                { cancelToken },
-              )
-            ).data?.segments;
-            if (!Array.isArray(segments)) continue;
-
-            let segmentQueryResultRows: SegmentQueryResultRow[] = segments.map((segment: any) => {
-              const [start, end] = segment.interval.split('/');
-              return {
-                segment_id: segment.identifier,
-                datasource: segment.dataSource,
-                start,
-                end,
-                interval: segment.interval,
-                version: segment.version,
-                time_span: SegmentsView.computeTimeSpan(start, end),
-                shard_spec: deepGet(segment, 'shardSpec'),
-                partition_num: deepGet(segment, 'shardSpec.partitionNum') || 0,
-                size: segment.size,
-                num_rows: -1,
-                avg_row_size: -1,
-                num_replicas: -1,
-                replication_factor: -1,
-                is_available: -1,
-                is_active: -1,
-                is_realtime: -1,
-                is_published: -1,
-                is_overshadowed: -1,
-              };
-            });
+          let results = (
+            await getApiArray(
+              `/druid/coordinator/v1/metadata/segments?includeOvershadowedStatus&includeRealtimeSegments${datasourceList
+                .map(d => `&datasources=${Api.encodePath(d)}`)
+                .join('')}`,
+              cancelToken,
+            )
+          ).map((segment: any) => {
+            const [start, end] = segment.interval.split('/');
+            return {
+              segment_id: segment.identifier,
+              datasource: segment.dataSource,
+              start,
+              end,
+              interval: segment.interval,
+              version: segment.version,
+              shard_spec: segment.shardSpec,
+              partition_num: segment.shardSpec?.partitionNum || 0,
+              size: segment.size,
+              num_rows: -1,
+              avg_row_size: -1,
+              num_replicas: -1,
+              replication_factor: segment.replicationFactor,
+              is_available: -1,
+              is_active: -1,
+              is_realtime: Number(segment.realtime),
+              is_published: -1,
+              is_overshadowed: Number(segment.overshadowed),
+            };
+          });
 
-            if (filtered.length) {
-              segmentQueryResultRows = segmentQueryResultRows.filter((d: SegmentQueryResultRow) => {
-                return filtered.every(filter => {
-                  return booleanCustomTableFilter(
-                    filter,
-                    d[filter.id as keyof SegmentQueryResultRow],
-                  );
-                });
+          if (filtered.length) {
+            results = results.filter((d: SegmentQueryResultRow) => {
+              return filtered.every(filter => {
+                return booleanCustomTableFilter(
+                  filter,
+                  d[filter.id as keyof SegmentQueryResultRow],
+                );
               });
-            }
-
-            results = results.concat(segmentQueryResultRows);
+            });
           }
 
-          return results.slice(page * pageSize, maxResults);
+          const maxResults = (page + 1) * pageSize;
+          return applySorting(results, sorted).slice(page * pageSize, maxResults);
         } else {
           throw new Error('must have SQL or coordinator access to load this view');
         }
@@ -440,20 +434,54 @@ END AS "time_span"`,
     });
   }
 
+  componentDidMount() {
+    this.fetchData();
+  }
+
   componentWillUnmount(): void {
     this.segmentsQueryManager.terminate();
   }
 
-  private readonly fetchData = (groupByInterval: boolean, tableState?: TableState) => {
-    const { capabilities } = this.props;
-    const { visibleColumns } = this.state;
-    if (tableState) this.lastTableState = tableState;
-    if (!this.lastTableState) return;
-    const { page, pageSize, filtered, sorted } = this.lastTableState;
+  componentDidUpdate(
+    prevProps: Readonly<SegmentsViewProps>,
+    prevState: Readonly<SegmentsViewState>,
+  ) {
+    const { filters } = this.props;
+    const { groupByInterval, page, pageSize, sorted } = this.state;
+    if (
+      !segmentFiltersToExpression(filters).equals(segmentFiltersToExpression(prevProps.filters)) ||
+      groupByInterval !== prevState.groupByInterval ||
+      page !== prevState.page ||
+      pageSize !== prevState.pageSize ||
+      sortedToOrderByClause(sorted) !== sortedToOrderByClause(prevState.sorted)
+    ) {
+      this.fetchData();
+    }
+  }
+
+  private readonly refresh = (auto: boolean): void => {
+    if (auto && hasOverlayOpen()) return;
+    this.segmentsQueryManager.rerunLastQuery(auto);
+
+    const { showSegmentTimeline } = this.state;
+    if (showSegmentTimeline) {
+      // Create a new capabilities object to force the segment timeline to re-render
+      this.setState(({ showSegmentTimeline }) => ({
+        showSegmentTimeline: {
+          ...showSegmentTimeline,
+          capabilities: this.props.capabilities.clone(),
+        },
+      }));
+    }
+  };
+
+  private readonly fetchData = () => {
+    const { capabilities, filters } = this.props;
+    const { visibleColumns, groupByInterval, page, pageSize, sorted } = this.state;
     this.segmentsQueryManager.runQuery({
       page,
       pageSize,
-      filtered,
+      filtered: filters,
       sorted,
       visibleColumns,
       capabilities,
@@ -480,7 +508,11 @@ END AS "time_span"`,
     });
   }
 
-  private renderFilterableCell(field: string, enableComparisons = false) {
+  private renderFilterableCell(
+    field: string,
+    enableComparisons = false,
+    valueFn: (value: string) => ReactNode = String,
+  ) {
     const { filters, onFiltersChange } = this.props;
 
     // eslint-disable-next-line react/display-name
@@ -492,14 +524,22 @@ END AS "time_span"`,
         onFiltersChange={onFiltersChange}
         enableComparisons={enableComparisons}
       >
-        {row.value}
+        {valueFn(row.value)}
       </TableFilterableCell>
     );
   }
 
   renderSegmentsTable() {
     const { capabilities, filters, onFiltersChange } = this.props;
-    const { segmentsState, visibleColumns, groupByInterval } = this.state;
+    const {
+      segmentsState,
+      visibleColumns,
+      groupByInterval,
+      page,
+      pageSize,
+      sorted,
+      showSegmentTimeline,
+    } = this.state;
 
     const segments = segmentsState.data || [];
 
@@ -532,26 +572,27 @@ END AS "time_span"`,
         filterable
         filtered={filters}
         onFilteredChange={onFiltersChange}
-        defaultSorted={[hasSql ? { id: 'start', desc: true } : { id: 'datasource', desc: false }]}
-        onFetchData={tableState => {
-          this.fetchData(groupByInterval, tableState);
-        }}
+        sorted={sorted}
+        onSortedChange={sorted => this.setState({ sorted })}
+        page={page}
+        onPageChange={page => this.setState({ page })}
+        pageSize={pageSize}
+        onPageSizeChange={pageSize => this.setState({ pageSize })}
+        pageSizeOptions={STANDARD_TABLE_PAGE_SIZE_OPTIONS}
+        showPagination
         showPageJump={false}
         ofText=""
         pivotBy={groupByInterval ? ['interval'] : []}
-        defaultPageSize={STANDARD_TABLE_PAGE_SIZE}
-        pageSizeOptions={STANDARD_TABLE_PAGE_SIZE_OPTIONS}
-        showPagination
         columns={[
           {
             Header: 'Segment ID',
             show: visibleColumns.shown('Segment ID'),
             accessor: 'segment_id',
             width: 280,
-            sortable: hasSql,
             filterable: allowGeneralFilter,
             Cell: row => (
               <TableClickableCell
+                tooltip="Show detail"
                 onClick={() => this.onDetail(row.value, row.row.datasource)}
                 hoverIcon={IconNames.SEARCH_TEMPLATE}
               >
@@ -564,14 +605,23 @@ END AS "time_span"`,
             show: visibleColumns.shown('Datasource'),
             accessor: 'datasource',
             width: 140,
-            Cell: this.renderFilterableCell('datasource'),
+            Cell: this.renderFilterableCell(
+              'datasource',
+              false,
+              showSegmentTimeline
+                ? value => (
+                    <>
+                      <span style={{ color: getDatasourceColor(value) }}>&#9632;</span> {value}
+                    </>
+                  )
+                : String,
+            ),
           },
           {
             Header: 'Interval',
             show: groupByInterval,
             accessor: 'interval',
             width: 120,
-            sortable: hasSql,
             defaultSortDesc: true,
             filterable: allowGeneralFilter,
             Cell: this.renderFilterableCell('interval'),
@@ -581,8 +631,7 @@ END AS "time_span"`,
             show: visibleColumns.shown('Start'),
             accessor: 'start',
             headerClassName: 'enable-comparisons',
-            width: 160,
-            sortable: hasSql,
+            width: 180,
             defaultSortDesc: true,
             filterable: allowGeneralFilter,
             Cell: this.renderFilterableCell('start', true),
@@ -592,8 +641,7 @@ END AS "time_span"`,
             show: visibleColumns.shown('End'),
             accessor: 'end',
             headerClassName: 'enable-comparisons',
-            width: 160,
-            sortable: hasSql,
+            width: 180,
             defaultSortDesc: true,
             filterable: allowGeneralFilter,
             Cell: this.renderFilterableCell('end', true),
@@ -602,20 +650,20 @@ END AS "time_span"`,
             Header: 'Version',
             show: visibleColumns.shown('Version'),
             accessor: 'version',
-            width: 160,
-            sortable: hasSql,
+            width: 180,
             defaultSortDesc: true,
             filterable: allowGeneralFilter,
-            Cell: this.renderFilterableCell('version'),
+            Cell: this.renderFilterableCell('version', true),
           },
           {
             Header: 'Time span',
             show: visibleColumns.shown('Time span'),
-            accessor: 'time_span',
+            id: 'time_span',
+            className: 'padded',
+            accessor: ({ start, end }) => computeSegmentTimeSpan(start, end),
             width: 100,
-            sortable: hasSql,
-            filterable: allowGeneralFilter,
-            Cell: this.renderFilterableCell('time_span'),
+            sortable: false,
+            filterable: false,
           },
           {
             Header: 'Shard type',
@@ -623,14 +671,9 @@ END AS "time_span"`,
             id: 'shard_type',
             width: 100,
             sortable: false,
-            accessor: d => {
-              let v: any;
-              try {
-                v = JSONBig.parse(d.shard_spec);
-              } catch {}
-
-              if (typeof v?.type !== 'string') return '-';
-              return v?.type;
+            accessor: ({ shard_spec }) => {
+              if (typeof shard_spec?.type !== 'string') return '-';
+              return shard_spec?.type;
             },
             Cell: this.renderFilterableCell('shard_type', true),
           },
@@ -643,35 +686,33 @@ END AS "time_span"`,
             sortable: false,
             filterable: false,
             Cell: ({ value }) => {
-              let v: any;
-              try {
-                v = JSONBig.parse(value);
-              } catch {}
-
               const onShowFullShardSpec = () => {
                 this.setState({
                   showFullShardSpec:
-                    v && typeof v === 'object' ? JSONBig.stringify(v, undefined, 2) : String(value),
+                    value && typeof value === 'object'
+                      ? JSONBig.stringify(value, undefined, 2)
+                      : String(value),
                 });
               };
 
-              switch (v?.type) {
+              switch (value?.type) {
                 case 'range': {
-                  const dimensions: string[] = v.dimensions || [];
+                  const dimensions: string[] = value.dimensions || [];
                   const formatEdge = (values: string[]) =>
                     dimensions.map((d, i) => formatRangeDimensionValue(d, values[i])).join('; ');
 
                   return (
                     <TableClickableCell
                       className="range-detail"
+                      tooltip="Show full shardSpec"
                       onClick={onShowFullShardSpec}
                       hoverIcon={IconNames.EYE_OPEN}
                     >
                       <span className="range-label">Start:</span>
-                      {Array.isArray(v.start) ? formatEdge(v.start) : '-∞'}
+                      {Array.isArray(value.start) ? formatEdge(value.start) : '-∞'}
                       <br />
                       <span className="range-label">End:</span>
-                      {Array.isArray(v.end) ? formatEdge(v.end) : '∞'}
+                      {Array.isArray(value.end) ? formatEdge(value.end) : '∞'}
                     </TableClickableCell>
                   );
                 }
@@ -680,23 +721,29 @@ END AS "time_span"`,
                   return (
                     <TableClickableCell
                       className="range-detail"
+                      tooltip="Show full shardSpec"
                       onClick={onShowFullShardSpec}
                       hoverIcon={IconNames.EYE_OPEN}
                     >
                       <span className="range-label">Start:</span>
-                      {v.start != null ? formatRangeDimensionValue(v.dimension, v.start) : '-∞'}
+                      {value.start != null
+                        ? formatRangeDimensionValue(value.dimension, value.start)
+                        : '-∞'}
                       <br />
                       <span className="range-label">End:</span>
-                      {v.end != null ? formatRangeDimensionValue(v.dimension, v.end) : '∞'}
+                      {value.end != null
+                        ? formatRangeDimensionValue(value.dimension, value.end)
+                        : '∞'}
                     </TableClickableCell>
                   );
                 }
 
                 case 'hashed': {
-                  const { partitionDimensions } = v;
-                  if (!Array.isArray(partitionDimensions)) return value;
+                  const { partitionDimensions } = value;
+                  if (!Array.isArray(partitionDimensions)) return JSONBig.stringify(value);
                   return (
                     <TableClickableCell
+                      tooltip="Show full shardSpec"
                       onClick={onShowFullShardSpec}
                       hoverIcon={IconNames.EYE_OPEN}
                     >
@@ -714,6 +761,7 @@ END AS "time_span"`,
                 case 'tombstone':
                   return (
                     <TableClickableCell
+                      tooltip="Show full shardSpec"
                       onClick={onShowFullShardSpec}
                       hoverIcon={IconNames.EYE_OPEN}
                     >
@@ -724,10 +772,11 @@ END AS "time_span"`,
                 default:
                   return (
                     <TableClickableCell
+                      tooltip="Show full shardSpec"
                       onClick={onShowFullShardSpec}
                       hoverIcon={IconNames.EYE_OPEN}
                     >
-                      {String(value)}
+                      {JSONBig.stringify(value)}
                     </TableClickableCell>
                   );
               }
@@ -752,7 +801,6 @@ END AS "time_span"`,
             accessor: 'partition_num',
             width: 60,
             filterable: false,
-            sortable: hasSql,
             className: 'padded',
           },
           {
@@ -760,7 +808,6 @@ END AS "time_span"`,
             show: visibleColumns.shown('Size'),
             accessor: 'size',
             filterable: false,
-            sortable: hasSql,
             defaultSortDesc: true,
             width: 120,
             className: 'padded',
@@ -820,7 +867,7 @@ END AS "time_span"`,
           },
           {
             Header: twoLines('Replication factor', <i>(desired)</i>),
-            show: hasSql && visibleColumns.shown('Replication factor'),
+            show: visibleColumns.shown('Replication factor'),
             accessor: 'replication_factor',
             width: 80,
             filterable: false,
@@ -847,7 +894,7 @@ END AS "time_span"`,
           },
           {
             Header: 'Is realtime',
-            show: hasSql && visibleColumns.shown('Is realtime'),
+            show: visibleColumns.shown('Is realtime'),
             id: 'is_realtime',
             accessor: row => String(Boolean(row.is_realtime)),
             Filter: BooleanFilterInput,
@@ -865,7 +912,7 @@ END AS "time_span"`,
           },
           {
             Header: 'Is overshadowed',
-            show: hasSql && visibleColumns.shown('Is overshadowed'),
+            show: visibleColumns.shown('Is overshadowed'),
             id: 'is_overshadowed',
             accessor: row => String(Boolean(row.is_overshadowed)),
             Filter: BooleanFilterInput,
@@ -945,9 +992,9 @@ END AS "time_span"`,
           <MenuItem
             icon={IconNames.APPLICATION}
             text="View SQL query for table"
-            disabled={!lastSegmentsQuery}
+            disabled={typeof lastSegmentsQuery !== 'string'}
             onClick={() => {
-              if (!lastSegmentsQuery) return;
+              if (typeof lastSegmentsQuery !== 'string') return;
               goToQuery({ queryString: lastSegmentsQuery });
             }}
           />
@@ -957,6 +1004,7 @@ END AS "time_span"`,
   }
 
   render() {
+    const { capabilities, onFiltersChange } = this.props;
     const {
       segmentTableActionDialogId,
       datasourceTableActionDialogId,
@@ -964,18 +1012,14 @@ END AS "time_span"`,
       visibleColumns,
       showSegmentTimeline,
       showFullShardSpec,
+      groupByInterval,
     } = this.state;
-    const { capabilities } = this.props;
-    const { groupByInterval } = this.state;
 
     return (
       <div className="segments-view app-view">
         <ViewControlBar label="Segments">
           <RefreshButton
-            onRefresh={auto => {
-              if (auto && hasPopoverOpen()) return;
-              this.segmentsQueryManager.rerunLastQuery(auto);
-            }}
+            onRefresh={this.refresh}
             localStorageKey={LocalStorageKeys.SEGMENTS_REFRESH_RATE}
           />
           <Label>Group by</Label>
@@ -984,7 +1028,6 @@ END AS "time_span"`,
               active={!groupByInterval}
               onClick={() => {
                 this.setState({ groupByInterval: false });
-                this.fetchData(false);
               }}
             >
               None
@@ -993,7 +1036,6 @@ END AS "time_span"`,
               active={groupByInterval}
               onClick={() => {
                 this.setState({ groupByInterval: true });
-                this.fetchData(true);
               }}
             >
               Interval
@@ -1001,9 +1043,13 @@ END AS "time_span"`,
           </ButtonGroup>
           {this.renderBulkSegmentsActions()}
           <Switch
-            checked={showSegmentTimeline}
+            checked={Boolean(showSegmentTimeline)}
             label="Show segment timeline"
-            onChange={() => this.setState({ showSegmentTimeline: !showSegmentTimeline })}
+            onChange={() =>
+              this.setState({
+                showSegmentTimeline: showSegmentTimeline ? undefined : { capabilities },
+              })
+            }
             disabled={!capabilities.hasSqlOrCoordinatorAccess()}
           />
           <TableColumnSelector
@@ -1015,12 +1061,13 @@ END AS "time_span"`,
             }
             onClose={added => {
               if (!added) return;
-              this.fetchData(groupByInterval);
+              this.fetchData();
             }}
             tableColumnsHidden={visibleColumns.getHiddenColumns()}
           />
         </ViewControlBar>
         <SplitterLayout
+          className="timeline-segments-splitter"
           vertical
           percentage
           secondaryInitialSize={35}
@@ -1028,7 +1075,33 @@ END AS "time_span"`,
           primaryMinSize={20}
           secondaryMinSize={10}
         >
-          {showSegmentTimeline && <SegmentTimeline capabilities={capabilities} />}
+          {showSegmentTimeline && (
+            <SegmentTimeline
+              capabilities={showSegmentTimeline.capabilities}
+              datasource={showSegmentTimeline.datasource}
+              getIntervalActionButton={(start, end, datasource, realtime) => {
+                return (
+                  <Button
+                    text="Apply fitler to table"
+                    small
+                    rightIcon={IconNames.ARROW_DOWN}
+                    onClick={() =>
+                      onFiltersChange(
+                        compact([
+                          start && { id: 'start', value: `>=${start.toISOString()}` },
+                          end && { id: 'end', value: `<${end.toISOString()}` },
+                          datasource && { id: 'datasource', value: `=${datasource}` },
+                          typeof realtime === 'boolean'
+                            ? { id: 'is_realtime', value: `=${realtime}` }
+                            : undefined,
+                        ]),
+                      )
+                    }
+                  />
+                );
+              }}
+            />
+          )}
           {this.renderSegmentsTable()}
         </SplitterLayout>
         {this.renderTerminateSegmentAction()}
diff --git a/web-console/src/views/services-view/services-view.tsx b/web-console/src/views/services-view/services-view.tsx
index 88a5be35c527..e658d9355947 100644
--- a/web-console/src/views/services-view/services-view.tsx
+++ b/web-console/src/views/services-view/services-view.tsx
@@ -48,7 +48,8 @@ import {
   formatBytes,
   formatBytesCompact,
   formatDurationWithMsIfNeeded,
-  hasPopoverOpen,
+  getApiArray,
+  hasOverlayOpen,
   LocalStorageBackedVisibility,
   LocalStorageKeys,
   lookupBy,
@@ -257,24 +258,24 @@ ORDER BY
         if (capabilities.hasSql()) {
           services = await queryDruidSql({ query: ServicesView.SERVICE_SQL }, cancelToken);
         } else if (capabilities.hasCoordinatorAccess()) {
-          services = (
-            await Api.instance.get('/druid/coordinator/v1/servers?simple', { cancelToken })
-          ).data.map((s: any): ServiceResultRow => {
-            const hostParts = s.host.split(':');
-            const port = parseInt(hostParts[1], 10);
-            return {
-              service: s.host,
-              service_type: s.type === 'indexer-executor' ? 'peon' : s.type,
-              tier: s.tier,
-              host: hostParts[0],
-              plaintext_port: port < 9000 ? port : -1,
-              tls_port: port < 9000 ? -1 : port,
-              curr_size: s.currSize,
-              max_size: s.maxSize,
-              start_time: '1970:01:01T00:00:00Z',
-              is_leader: 0,
-            };
-          });
+          services = (await getApiArray('/druid/coordinator/v1/servers?simple', cancelToken)).map(
+            (s: any): ServiceResultRow => {
+              const hostParts = s.host.split(':');
+              const port = parseInt(hostParts[1], 10);
+              return {
+                service: s.host,
+                service_type: s.type === 'indexer-executor' ? 'peon' : s.type,
+                tier: s.tier,
+                host: hostParts[0],
+                plaintext_port: port < 9000 ? port : -1,
+                tls_port: port < 9000 ? -1 : port,
+                curr_size: s.currSize,
+                max_size: s.maxSize,
+                start_time: '1970:01:01T00:00:00Z',
+                is_leader: 0,
+              };
+            },
+          );
         } else {
           throw new Error(`must have SQL or coordinator access`);
         }
@@ -308,9 +309,10 @@ ORDER BY
         if (capabilities.hasOverlordAccess()) {
           auxiliaryQueries.push(async (services, cancelToken) => {
             try {
-              const workerInfos = (
-                await Api.instance.get<WorkerInfo[]>('/druid/indexer/v1/workers', { cancelToken })
-              ).data;
+              const workerInfos = await getApiArray<WorkerInfo>(
+                '/druid/indexer/v1/workers',
+                cancelToken,
+              );
 
               const workerInfoLookup: Record<string, WorkerInfo> = lookupBy(
                 workerInfos,
@@ -808,7 +810,7 @@ ORDER BY
           </ButtonGroup>
           <RefreshButton
             onRefresh={auto => {
-              if (auto && hasPopoverOpen()) return;
+              if (auto && hasOverlayOpen()) return;
               this.serviceQueryManager.rerunLastQuery(auto);
             }}
             localStorageKey={LocalStorageKeys.SERVICES_REFRESH_RATE}
diff --git a/web-console/src/views/sql-data-loader-view/column-actions/column-actions.tsx b/web-console/src/views/sql-data-loader-view/column-actions/column-actions.tsx
index 03ea12c738fa..64738e86e5f5 100644
--- a/web-console/src/views/sql-data-loader-view/column-actions/column-actions.tsx
+++ b/web-console/src/views/sql-data-loader-view/column-actions/column-actions.tsx
@@ -18,8 +18,8 @@
 
 import { Button, FormGroup, Menu, MenuItem, Popover } from '@blueprintjs/core';
 import { IconNames } from '@blueprintjs/icons';
-import type { QueryResult, SqlExpression } from '@druid-toolkit/query';
-import { F } from '@druid-toolkit/query';
+import type { QueryResult, SqlExpression } from 'druid-query-toolkit';
+import { F } from 'druid-query-toolkit';
 import type { JSX } from 'react';
 import React from 'react';
 
diff --git a/web-console/src/views/sql-data-loader-view/column-editor/column-editor.tsx b/web-console/src/views/sql-data-loader-view/column-editor/column-editor.tsx
index 6e1cd3092bc0..b10f0d5c78a8 100644
--- a/web-console/src/views/sql-data-loader-view/column-editor/column-editor.tsx
+++ b/web-console/src/views/sql-data-loader-view/column-editor/column-editor.tsx
@@ -28,8 +28,8 @@ import {
   Position,
 } from '@blueprintjs/core';
 import { IconNames } from '@blueprintjs/icons';
-import type { QueryResult } from '@druid-toolkit/query';
-import { F, SqlExpression, SqlFunction, SqlType } from '@druid-toolkit/query';
+import type { QueryResult } from 'druid-query-toolkit';
+import { F, SqlExpression, SqlFunction, SqlType } from 'druid-query-toolkit';
 import type { JSX } from 'react';
 import React, { useState } from 'react';
 
diff --git a/web-console/src/views/sql-data-loader-view/expression-editor-dialog/expression-editor-dialog.tsx b/web-console/src/views/sql-data-loader-view/expression-editor-dialog/expression-editor-dialog.tsx
index 1b6d08df20ae..bb7b4227b4ee 100644
--- a/web-console/src/views/sql-data-loader-view/expression-editor-dialog/expression-editor-dialog.tsx
+++ b/web-console/src/views/sql-data-loader-view/expression-editor-dialog/expression-editor-dialog.tsx
@@ -18,7 +18,7 @@
 
 import { Button, Classes, Dialog, FormGroup, InputGroup, Intent } from '@blueprintjs/core';
 import { IconNames } from '@blueprintjs/icons';
-import { SqlExpression } from '@druid-toolkit/query';
+import { SqlExpression } from 'druid-query-toolkit';
 import React, { useState } from 'react';
 
 import { FlexibleQueryInput } from '../../workbench-view/flexible-query-input/flexible-query-input';
diff --git a/web-console/src/views/sql-data-loader-view/ingestion-progress-dialog/ingestion-progress-dialog.tsx b/web-console/src/views/sql-data-loader-view/ingestion-progress-dialog/ingestion-progress-dialog.tsx
index ac6def8151c0..43e03a91e912 100644
--- a/web-console/src/views/sql-data-loader-view/ingestion-progress-dialog/ingestion-progress-dialog.tsx
+++ b/web-console/src/views/sql-data-loader-view/ingestion-progress-dialog/ingestion-progress-dialog.tsx
@@ -18,8 +18,8 @@
 
 import { Button, Classes, Dialog, Intent } from '@blueprintjs/core';
 import { IconNames } from '@blueprintjs/icons';
-import { T } from '@druid-toolkit/query';
 import classNames from 'classnames';
+import { T } from 'druid-query-toolkit';
 import React, { useState } from 'react';
 
 import type { Execution, QueryWithContext } from '../../../druid-models';
diff --git a/web-console/src/views/sql-data-loader-view/schema-step/column-list/column-list.tsx b/web-console/src/views/sql-data-loader-view/schema-step/column-list/column-list.tsx
index feba2bfda885..3d771cc725c6 100644
--- a/web-console/src/views/sql-data-loader-view/schema-step/column-list/column-list.tsx
+++ b/web-console/src/views/sql-data-loader-view/schema-step/column-list/column-list.tsx
@@ -18,7 +18,7 @@
 
 import { Icon, Popover } from '@blueprintjs/core';
 import { IconNames } from '@blueprintjs/icons';
-import type { QueryResult, SqlExpression } from '@druid-toolkit/query';
+import type { QueryResult, SqlExpression } from 'druid-query-toolkit';
 import { useMemo } from 'react';
 
 import { LearnMore, PopoverText } from '../../../../components';
diff --git a/web-console/src/views/sql-data-loader-view/schema-step/column-list/expression-entry/expression-entry.tsx b/web-console/src/views/sql-data-loader-view/schema-step/column-list/expression-entry/expression-entry.tsx
index 9eed114a8e64..802cbec77673 100644
--- a/web-console/src/views/sql-data-loader-view/schema-step/column-list/expression-entry/expression-entry.tsx
+++ b/web-console/src/views/sql-data-loader-view/schema-step/column-list/expression-entry/expression-entry.tsx
@@ -17,9 +17,9 @@
  */
 
 import { Icon } from '@blueprintjs/core';
-import type { Column, QueryResult } from '@druid-toolkit/query';
-import { SqlColumn } from '@druid-toolkit/query';
 import classNames from 'classnames';
+import type { Column, QueryResult } from 'druid-query-toolkit';
+import { SqlColumn } from 'druid-query-toolkit';
 
 import { columnToIcon } from '../../../../../utils';
 
diff --git a/web-console/src/views/sql-data-loader-view/schema-step/preview-table/preview-table.tsx b/web-console/src/views/sql-data-loader-view/schema-step/preview-table/preview-table.tsx
index 0bbfd85f5462..d332459b55f7 100644
--- a/web-console/src/views/sql-data-loader-view/schema-step/preview-table/preview-table.tsx
+++ b/web-console/src/views/sql-data-loader-view/schema-step/preview-table/preview-table.tsx
@@ -18,9 +18,9 @@
 
 import { Icon, Popover } from '@blueprintjs/core';
 import { IconNames } from '@blueprintjs/icons';
-import type { Column, QueryResult, SqlExpression, SqlQuery } from '@druid-toolkit/query';
-import { SqlAlias, SqlFunction, SqlStar } from '@druid-toolkit/query';
 import classNames from 'classnames';
+import type { Column, QueryResult, SqlExpression, SqlQuery } from 'druid-query-toolkit';
+import { SqlAlias, SqlFunction, SqlStar } from 'druid-query-toolkit';
 import React, { useState } from 'react';
 import type { RowRenderProps } from 'react-table';
 import ReactTable from 'react-table';
@@ -77,7 +77,7 @@ export const PreviewTable = React.memo(function PreviewTable(props: PreviewTable
   const { queryResult, onQueryAction, columnFilter, selectedColumnIndex, onEditColumn } = props;
   const [showValue, setShowValue] = useState<string>();
 
-  const parsedQuery: SqlQuery = queryResult.sqlQuery!;
+  const parsedQuery = queryResult.sqlQuery;
   if (!parsedQuery) return null;
 
   function hasFilterOnHeader(header: string, headerIndex: number): boolean {
diff --git a/web-console/src/views/sql-data-loader-view/schema-step/rollup-analysis-pane/rollup-analysis-pane.tsx b/web-console/src/views/sql-data-loader-view/schema-step/rollup-analysis-pane/rollup-analysis-pane.tsx
index d39927ac6fdb..e93ec9e9a005 100644
--- a/web-console/src/views/sql-data-loader-view/schema-step/rollup-analysis-pane/rollup-analysis-pane.tsx
+++ b/web-console/src/views/sql-data-loader-view/schema-step/rollup-analysis-pane/rollup-analysis-pane.tsx
@@ -18,9 +18,9 @@
 
 import { Button, Callout, Intent, Tag } from '@blueprintjs/core';
 import { IconNames } from '@blueprintjs/icons';
-import type { QueryResult, SqlQuery } from '@druid-toolkit/query';
-import { F, SqlExpression, SqlFunction } from '@druid-toolkit/query';
 import type { CancelToken } from 'axios';
+import type { QueryResult, SqlQuery } from 'druid-query-toolkit';
+import { F, SqlExpression, SqlFunction } from 'druid-query-toolkit';
 import type { JSX } from 'react';
 import React, { useEffect } from 'react';
 
diff --git a/web-console/src/views/sql-data-loader-view/schema-step/schema-step.tsx b/web-console/src/views/sql-data-loader-view/schema-step/schema-step.tsx
index a7b8f83bdbea..d9b8e1089b9d 100644
--- a/web-console/src/views/sql-data-loader-view/schema-step/schema-step.tsx
+++ b/web-console/src/views/sql-data-loader-view/schema-step/schema-step.tsx
@@ -31,6 +31,8 @@ import {
   Tag,
 } from '@blueprintjs/core';
 import { IconNames } from '@blueprintjs/icons';
+import classNames from 'classnames';
+import { select, selectAll } from 'd3-selection';
 import {
   C,
   Column,
@@ -40,9 +42,7 @@ import {
   SqlExpression,
   SqlQuery,
   SqlType,
-} from '@druid-toolkit/query';
-import classNames from 'classnames';
-import { select, selectAll } from 'd3-selection';
+} from 'druid-query-toolkit';
 import type { JSX } from 'react';
 import { useCallback, useEffect, useLayoutEffect, useMemo, useRef, useState } from 'react';
 
diff --git a/web-console/src/views/sql-data-loader-view/sql-data-loader-view.tsx b/web-console/src/views/sql-data-loader-view/sql-data-loader-view.tsx
index 8238384d9aed..84e3901a566c 100644
--- a/web-console/src/views/sql-data-loader-view/sql-data-loader-view.tsx
+++ b/web-console/src/views/sql-data-loader-view/sql-data-loader-view.tsx
@@ -19,7 +19,7 @@
 import type { IconName } from '@blueprintjs/core';
 import { Card, Icon, Intent } from '@blueprintjs/core';
 import { IconNames } from '@blueprintjs/icons';
-import { SqlQuery, SqlTable } from '@druid-toolkit/query';
+import { SqlQuery, SqlTable } from 'druid-query-toolkit';
 import type { JSX } from 'react';
 import React, { useState } from 'react';
 
diff --git a/web-console/src/views/supervisors-view/__snapshots__/supervisors-view.spec.tsx.snap b/web-console/src/views/supervisors-view/__snapshots__/supervisors-view.spec.tsx.snap
index e3458f4749ca..f9a450468e79 100644
--- a/web-console/src/views/supervisors-view/__snapshots__/supervisors-view.spec.tsx.snap
+++ b/web-console/src/views/supervisors-view/__snapshots__/supervisors-view.spec.tsx.snap
@@ -15,7 +15,7 @@ exports[`SupervisorsView matches snapshot 1`] = `
       <Memo(MoreButton)>
         <Blueprint5.MenuItem
           active={false}
-          disabled={false}
+          disabled={true}
           icon="application"
           multiline={false}
           onClick={[Function]}
@@ -326,7 +326,7 @@ exports[`SupervisorsView matches snapshot 1`] = `
     defaultFilterMethod={[Function]}
     defaultFiltered={[]}
     defaultPage={0}
-    defaultPageSize={25}
+    defaultPageSize={20}
     defaultResized={[]}
     defaultSortDesc={false}
     defaultSortMethod={[Function]}
@@ -366,7 +366,7 @@ exports[`SupervisorsView matches snapshot 1`] = `
     getTrProps={[Function]}
     groupedByPivotKey="_groupedByPivot"
     indexKey="_index"
-    loading={false}
+    loading={true}
     loadingText="Loading..."
     manual={true}
     multiSort={true}
@@ -376,8 +376,13 @@ exports[`SupervisorsView matches snapshot 1`] = `
     ofText=""
     onFetchData={[Function]}
     onFilteredChange={[Function]}
+    onPageChange={[Function]}
+    onPageSizeChange={[Function]}
+    onSortedChange={[Function]}
     originalKey="_original"
+    page={0}
     pageJumpText="jump to page"
+    pageSize={25}
     pageSizeOptions={
       [
         25,
@@ -401,6 +406,7 @@ exports[`SupervisorsView matches snapshot 1`] = `
     showPaginationBottom={true}
     showPaginationTop={false}
     sortable={true}
+    sorted={[]}
     style={{}}
     subRowsKey="_subRows"
   />
diff --git a/web-console/src/views/supervisors-view/supervisors-view.tsx b/web-console/src/views/supervisors-view/supervisors-view.tsx
index 2474782e0aeb..f75d533cf3f0 100644
--- a/web-console/src/views/supervisors-view/supervisors-view.tsx
+++ b/web-console/src/views/supervisors-view/supervisors-view.tsx
@@ -18,11 +18,10 @@
 
 import { Icon, Intent, Menu, MenuItem, Popover, Position, Tag } from '@blueprintjs/core';
 import { IconNames } from '@blueprintjs/icons';
-import { SqlExpression } from '@druid-toolkit/query';
 import * as JSONBig from 'json-bigint-native';
 import type { JSX } from 'react';
 import React from 'react';
-import type { Filter } from 'react-table';
+import type { Filter, SortingRule } from 'react-table';
 import ReactTable from 'react-table';
 
 import type { TableColumnSelectorColumn } from '../../components';
@@ -58,7 +57,7 @@ import type { Capabilities } from '../../helpers';
 import {
   SMALL_TABLE_PAGE_SIZE,
   SMALL_TABLE_PAGE_SIZE_OPTIONS,
-  sqlQueryCustomTableFilter,
+  sqlQueryCustomTableFilters,
 } from '../../react-table';
 import { Api, AppToaster } from '../../singletons';
 import type { AuxiliaryQueryFn, TableState } from '../../utils';
@@ -67,13 +66,13 @@ import {
   changeByIndex,
   checkedCircleIcon,
   deepGet,
-  filterMap,
   formatByteRate,
   formatBytes,
   formatInteger,
   formatRate,
+  getApiArray,
   getDruidErrorMessage,
-  hasPopoverOpen,
+  hasOverlayOpen,
   isNumberLike,
   LocalStorageBackedVisibility,
   LocalStorageKeys,
@@ -162,7 +161,11 @@ export interface SupervisorsViewState {
 
   supervisorTableActionDialogId?: string;
   supervisorTableActionDialogActions: BasicAction[];
+
   visibleColumns: LocalStorageBackedVisibility;
+  page: number;
+  pageSize: number;
+  sorted: SortingRule[];
 }
 
 function detailedStateToColor(detailedState: string): string {
@@ -223,6 +226,9 @@ export class SupervisorsView extends React.PureComponent<
       visibleColumns: new LocalStorageBackedVisibility(
         LocalStorageKeys.SUPERVISOR_TABLE_COLUMN_SELECTION,
       ),
+      page: 0,
+      pageSize: SMALL_TABLE_PAGE_SIZE,
+      sorted: [],
     };
 
     this.supervisorQueryManager = new QueryManager({
@@ -233,10 +239,11 @@ export class SupervisorsView extends React.PureComponent<
       ) => {
         let supervisors: SupervisorQueryResultRow[];
         if (capabilities.hasSql()) {
+          const whereExpression = sqlQueryCustomTableFilters(filtered);
+
           let filterClause = '';
-          const whereParts = filterMap(filtered, sqlQueryCustomTableFilter);
-          if (whereParts.length) {
-            filterClause = SqlExpression.and(...whereParts).toString();
+          if (whereExpression.toString() !== 'TRUE') {
+            filterClause = whereExpression.toString();
           }
 
           const sqlQuery = assemble(
@@ -269,26 +276,22 @@ export class SupervisorsView extends React.PureComponent<
             return { ...supervisor, spec: JSONBig.parse(spec) };
           });
         } else if (capabilities.hasOverlordAccess()) {
-          const supervisorList = (
-            await Api.instance.get('/druid/indexer/v1/supervisor?full', { cancelToken })
-          ).data;
-          if (!Array.isArray(supervisorList)) {
-            throw new Error(`Unexpected result from /druid/indexer/v1/supervisor?full`);
-          }
-          supervisors = supervisorList.map((sup: any) => {
-            return {
-              supervisor_id: deepGet(sup, 'id'),
-              type: deepGet(sup, 'spec.tuningConfig.type'),
-              source:
-                deepGet(sup, 'spec.ioConfig.topic') ||
-                deepGet(sup, 'spec.ioConfig.stream') ||
-                'n/a',
-              state: deepGet(sup, 'state'),
-              detailed_state: deepGet(sup, 'detailedState'),
-              spec: sup.spec,
-              suspended: Boolean(deepGet(sup, 'suspended')),
-            };
-          });
+          supervisors = (await getApiArray('/druid/indexer/v1/supervisor?full', cancelToken)).map(
+            (sup: any) => {
+              return {
+                supervisor_id: deepGet(sup, 'id'),
+                type: deepGet(sup, 'spec.tuningConfig.type'),
+                source:
+                  deepGet(sup, 'spec.ioConfig.topic') ||
+                  deepGet(sup, 'spec.ioConfig.stream') ||
+                  'n/a',
+                state: deepGet(sup, 'state'),
+                detailed_state: deepGet(sup, 'detailedState'),
+                spec: sup.spec,
+                suspended: Boolean(deepGet(sup, 'suspended')),
+              };
+            },
+          );
 
           const firstSorted = sorted[0];
           if (firstSorted) {
@@ -355,22 +358,37 @@ export class SupervisorsView extends React.PureComponent<
     });
   }
 
-  private lastTableState: TableState | undefined;
+  componentDidMount() {
+    this.fetchData();
+  }
 
   componentWillUnmount(): void {
     this.supervisorQueryManager.terminate();
   }
 
-  private readonly fetchData = (tableState?: TableState) => {
-    const { capabilities } = this.props;
-    const { visibleColumns } = this.state;
-    if (tableState) this.lastTableState = tableState;
-    if (!this.lastTableState) return;
-    const { page, pageSize, filtered, sorted } = this.lastTableState;
+  componentDidUpdate(
+    prevProps: Readonly<SupervisorsViewProps>,
+    prevState: Readonly<SupervisorsViewState>,
+  ) {
+    const { filters } = this.props;
+    const { page, pageSize, sorted } = this.state;
+    if (
+      !sqlQueryCustomTableFilters(filters).equals(sqlQueryCustomTableFilters(prevProps.filters)) ||
+      page !== prevState.page ||
+      pageSize !== prevState.pageSize ||
+      sortedToOrderByClause(sorted) !== sortedToOrderByClause(prevState.sorted)
+    ) {
+      this.fetchData();
+    }
+  }
+
+  private readonly fetchData = () => {
+    const { capabilities, filters } = this.props;
+    const { visibleColumns, page, pageSize, sorted } = this.state;
     this.supervisorQueryManager.runQuery({
       page,
       pageSize,
-      filtered,
+      filtered: filters,
       sorted,
       visibleColumns,
       capabilities,
@@ -663,7 +681,7 @@ export class SupervisorsView extends React.PureComponent<
 
   private renderSupervisorTable() {
     const { goToTasks, filters, onFiltersChange } = this.props;
-    const { supervisorsState, statsKey, visibleColumns } = this.state;
+    const { supervisorsState, statsKey, visibleColumns, page, pageSize, sorted } = this.state;
 
     const supervisors = supervisorsState.data || [];
     return (
@@ -678,14 +696,16 @@ export class SupervisorsView extends React.PureComponent<
         filterable
         filtered={filters}
         onFilteredChange={onFiltersChange}
-        onFetchData={tableState => {
-          this.fetchData(tableState);
-        }}
-        showPageJump={false}
-        ofText=""
-        defaultPageSize={SMALL_TABLE_PAGE_SIZE}
+        sorted={sorted}
+        onSortedChange={sorted => this.setState({ sorted })}
+        page={page}
+        onPageChange={page => this.setState({ page })}
+        pageSize={pageSize}
+        onPageSizeChange={pageSize => this.setState({ pageSize })}
         pageSizeOptions={SMALL_TABLE_PAGE_SIZE_OPTIONS}
         showPagination={supervisors.length > SMALL_TABLE_PAGE_SIZE}
+        showPageJump={false}
+        ofText=""
         columns={[
           {
             Header: twoLines('Supervisor ID', <i>(datasource)</i>),
@@ -695,6 +715,7 @@ export class SupervisorsView extends React.PureComponent<
             show: visibleColumns.shown('Supervisor ID'),
             Cell: ({ value, original }) => (
               <TableClickableCell
+                tooltip="Show detail"
                 onClick={() => this.onSupervisorDetail(original)}
                 hoverIcon={IconNames.SEARCH_TEMPLATE}
               >
@@ -791,9 +812,9 @@ export class SupervisorsView extends React.PureComponent<
               }
               return (
                 <TableClickableCell
+                  tooltip="Go to tasks"
                   onClick={() => goToTasks(original.supervisor_id, `index_${original.type}`)}
                   hoverIcon={IconNames.ARROW_TOP_RIGHT}
-                  title="Go to tasks"
                 >
                   {label}
                 </TableClickableCell>
@@ -903,9 +924,9 @@ export class SupervisorsView extends React.PureComponent<
               if (!value) return null;
               return (
                 <TableClickableCell
+                  tooltip="Show errors"
                   onClick={() => this.onSupervisorDetail(original)}
                   hoverIcon={IconNames.SEARCH_TEMPLATE}
-                  title="See errors"
                 >
                   {pluralIfNeeded(value.length, 'error')}
                 </TableClickableCell>
@@ -949,7 +970,11 @@ export class SupervisorsView extends React.PureComponent<
             <MenuItem
               icon={IconNames.APPLICATION}
               text="View SQL query for table"
-              onClick={() => goToQuery({ queryString: lastSupervisorQuery })}
+              disabled={typeof lastSupervisorQuery !== 'string'}
+              onClick={() => {
+                if (typeof lastSupervisorQuery !== 'string') return;
+                goToQuery({ queryString: lastSupervisorQuery });
+              }}
             />
           )}
           <MenuItem
@@ -1074,7 +1099,7 @@ export class SupervisorsView extends React.PureComponent<
           <RefreshButton
             localStorageKey={LocalStorageKeys.SUPERVISORS_REFRESH_RATE}
             onRefresh={auto => {
-              if (auto && hasPopoverOpen()) return;
+              if (auto && hasOverlayOpen()) return;
               this.supervisorQueryManager.rerunLastQuery(auto);
             }}
           />
diff --git a/web-console/src/views/tasks-view/tasks-view.tsx b/web-console/src/views/tasks-view/tasks-view.tsx
index 2bad1a29f66b..f968b7d4925f 100644
--- a/web-console/src/views/tasks-view/tasks-view.tsx
+++ b/web-console/src/views/tasks-view/tasks-view.tsx
@@ -42,8 +42,9 @@ import { SMALL_TABLE_PAGE_SIZE, SMALL_TABLE_PAGE_SIZE_OPTIONS } from '../../reac
 import { Api, AppToaster } from '../../singletons';
 import {
   formatDuration,
+  getApiArray,
   getDruidErrorMessage,
-  hasPopoverOpen,
+  hasOverlayOpen,
   LocalStorageBackedVisibility,
   LocalStorageKeys,
   oneOf,
@@ -174,8 +175,19 @@ ORDER BY
             cancelToken,
           );
         } else if (capabilities.hasOverlordAccess()) {
-          const resp = await Api.instance.get(`/druid/indexer/v1/tasks`, { cancelToken });
-          return TasksView.parseTasks(resp.data);
+          return (await getApiArray(`/druid/indexer/v1/tasks`, cancelToken)).map(d => {
+            return {
+              task_id: d.id,
+              group_id: d.groupId,
+              type: d.type,
+              created_time: d.createdTime,
+              datasource: d.dataSource,
+              duration: d.duration ? d.duration : 0,
+              error_msg: d.errorMsg,
+              location: d.location.host ? `${d.location.host}:${d.location.port}` : null,
+              status: d.statusCode === 'RUNNING' ? d.runnerStatusCode : d.statusCode,
+            };
+          });
         } else {
           throw new Error(`must have SQL or overlord access`);
         }
@@ -188,22 +200,6 @@ ORDER BY
     });
   }
 
-  static parseTasks = (data: any[]): TaskQueryResultRow[] => {
-    return data.map(d => {
-      return {
-        task_id: d.id,
-        group_id: d.groupId,
-        type: d.type,
-        created_time: d.createdTime,
-        datasource: d.dataSource,
-        duration: d.duration ? d.duration : 0,
-        error_msg: d.errorMsg,
-        location: d.location.host ? `${d.location.host}:${d.location.port}` : null,
-        status: d.statusCode === 'RUNNING' ? d.runnerStatusCode : d.statusCode,
-      };
-    });
-  };
-
   componentDidMount(): void {
     const { capabilities } = this.props;
 
@@ -376,6 +372,7 @@ ORDER BY
             width: 440,
             Cell: ({ value, original }) => (
               <TableClickableCell
+                tooltip="Show detail"
                 onClick={() => this.onTaskDetail(original)}
                 hoverIcon={IconNames.SEARCH_TEMPLATE}
               >
@@ -594,7 +591,7 @@ ORDER BY
           <RefreshButton
             localStorageKey={LocalStorageKeys.TASKS_REFRESH_RATE}
             onRefresh={auto => {
-              if (auto && hasPopoverOpen()) return;
+              if (auto && hasOverlayOpen()) return;
               this.taskQueryManager.rerunLastQuery(auto);
             }}
           />
diff --git a/web-console/src/views/workbench-view/column-tree/column-tree-menu/complex-menu-items/complex-menu-items.spec.tsx b/web-console/src/views/workbench-view/column-tree/column-tree-menu/complex-menu-items/complex-menu-items.spec.tsx
index e11ca98e0d9d..6e095388cb39 100644
--- a/web-console/src/views/workbench-view/column-tree/column-tree-menu/complex-menu-items/complex-menu-items.spec.tsx
+++ b/web-console/src/views/workbench-view/column-tree/column-tree-menu/complex-menu-items/complex-menu-items.spec.tsx
@@ -16,8 +16,8 @@
  * limitations under the License.
  */
 
-import { SqlQuery } from '@druid-toolkit/query';
 import { render } from '@testing-library/react';
+import { SqlQuery } from 'druid-query-toolkit';
 
 import { ComplexMenuItems } from './complex-menu-items';
 
diff --git a/web-console/src/views/workbench-view/column-tree/column-tree-menu/complex-menu-items/complex-menu-items.tsx b/web-console/src/views/workbench-view/column-tree/column-tree-menu/complex-menu-items/complex-menu-items.tsx
index fa172262f07c..fc92568715e9 100644
--- a/web-console/src/views/workbench-view/column-tree/column-tree-menu/complex-menu-items/complex-menu-items.tsx
+++ b/web-console/src/views/workbench-view/column-tree/column-tree-menu/complex-menu-items/complex-menu-items.tsx
@@ -18,8 +18,8 @@
 
 import { MenuItem } from '@blueprintjs/core';
 import { IconNames } from '@blueprintjs/icons';
-import type { SqlExpression, SqlQuery } from '@druid-toolkit/query';
-import { C, F } from '@druid-toolkit/query';
+import type { SqlExpression, SqlQuery } from 'druid-query-toolkit';
+import { C, F } from 'druid-query-toolkit';
 import type { JSX } from 'react';
 import React from 'react';
 
diff --git a/web-console/src/views/workbench-view/column-tree/column-tree-menu/number-menu-items/number-menu-items.spec.tsx b/web-console/src/views/workbench-view/column-tree/column-tree-menu/number-menu-items/number-menu-items.spec.tsx
index 80c7d22eda46..80216b02e5fe 100644
--- a/web-console/src/views/workbench-view/column-tree/column-tree-menu/number-menu-items/number-menu-items.spec.tsx
+++ b/web-console/src/views/workbench-view/column-tree/column-tree-menu/number-menu-items/number-menu-items.spec.tsx
@@ -16,8 +16,8 @@
  * limitations under the License.
  */
 
-import { SqlQuery } from '@druid-toolkit/query';
 import { render } from '@testing-library/react';
+import { SqlQuery } from 'druid-query-toolkit';
 
 import { NumberMenuItems } from './number-menu-items';
 
diff --git a/web-console/src/views/workbench-view/column-tree/column-tree-menu/number-menu-items/number-menu-items.tsx b/web-console/src/views/workbench-view/column-tree/column-tree-menu/number-menu-items/number-menu-items.tsx
index bf383f99254a..e62e5cebbf6b 100644
--- a/web-console/src/views/workbench-view/column-tree/column-tree-menu/number-menu-items/number-menu-items.tsx
+++ b/web-console/src/views/workbench-view/column-tree/column-tree-menu/number-menu-items/number-menu-items.tsx
@@ -18,8 +18,8 @@
 
 import { MenuItem } from '@blueprintjs/core';
 import { IconNames } from '@blueprintjs/icons';
-import type { SqlExpression, SqlQuery } from '@druid-toolkit/query';
-import { C, F, L } from '@druid-toolkit/query';
+import type { SqlExpression, SqlQuery } from 'druid-query-toolkit';
+import { C, F, L } from 'druid-query-toolkit';
 import type { JSX } from 'react';
 import React from 'react';
 
diff --git a/web-console/src/views/workbench-view/column-tree/column-tree-menu/string-menu-items/string-menu-items.spec.tsx b/web-console/src/views/workbench-view/column-tree/column-tree-menu/string-menu-items/string-menu-items.spec.tsx
index d50105d951ba..d2717d04cac9 100644
--- a/web-console/src/views/workbench-view/column-tree/column-tree-menu/string-menu-items/string-menu-items.spec.tsx
+++ b/web-console/src/views/workbench-view/column-tree/column-tree-menu/string-menu-items/string-menu-items.spec.tsx
@@ -16,8 +16,8 @@
  * limitations under the License.
  */
 
-import { SqlQuery } from '@druid-toolkit/query';
 import { render } from '@testing-library/react';
+import { SqlQuery } from 'druid-query-toolkit';
 
 import { StringMenuItems } from './string-menu-items';
 
diff --git a/web-console/src/views/workbench-view/column-tree/column-tree-menu/string-menu-items/string-menu-items.tsx b/web-console/src/views/workbench-view/column-tree/column-tree-menu/string-menu-items/string-menu-items.tsx
index 0dc0c684e453..c52b807032b4 100644
--- a/web-console/src/views/workbench-view/column-tree/column-tree-menu/string-menu-items/string-menu-items.tsx
+++ b/web-console/src/views/workbench-view/column-tree/column-tree-menu/string-menu-items/string-menu-items.tsx
@@ -18,8 +18,8 @@
 
 import { MenuItem } from '@blueprintjs/core';
 import { IconNames } from '@blueprintjs/icons';
-import type { SqlExpression, SqlQuery } from '@druid-toolkit/query';
-import { C, F, N, SqlJoinPart, SqlPlaceholder, T } from '@druid-toolkit/query';
+import type { SqlExpression, SqlQuery } from 'druid-query-toolkit';
+import { C, F, N, SqlJoinPart, SqlPlaceholder, T } from 'druid-query-toolkit';
 import type { JSX } from 'react';
 import React from 'react';
 
diff --git a/web-console/src/views/workbench-view/column-tree/column-tree-menu/time-menu-items/time-menu-items.spec.tsx b/web-console/src/views/workbench-view/column-tree/column-tree-menu/time-menu-items/time-menu-items.spec.tsx
index 402b2029eda4..af79bd578cd9 100644
--- a/web-console/src/views/workbench-view/column-tree/column-tree-menu/time-menu-items/time-menu-items.spec.tsx
+++ b/web-console/src/views/workbench-view/column-tree/column-tree-menu/time-menu-items/time-menu-items.spec.tsx
@@ -16,8 +16,8 @@
  * limitations under the License.
  */
 
-import { SqlQuery } from '@druid-toolkit/query';
 import { render } from '@testing-library/react';
+import { SqlQuery } from 'druid-query-toolkit';
 
 import { TimeMenuItems } from './time-menu-items';
 
diff --git a/web-console/src/views/workbench-view/column-tree/column-tree-menu/time-menu-items/time-menu-items.tsx b/web-console/src/views/workbench-view/column-tree/column-tree-menu/time-menu-items/time-menu-items.tsx
index cbe569ac6ded..3723a5235bd5 100644
--- a/web-console/src/views/workbench-view/column-tree/column-tree-menu/time-menu-items/time-menu-items.tsx
+++ b/web-console/src/views/workbench-view/column-tree/column-tree-menu/time-menu-items/time-menu-items.tsx
@@ -18,12 +18,12 @@
 
 import { MenuDivider, MenuItem } from '@blueprintjs/core';
 import { IconNames } from '@blueprintjs/icons';
-import type { SqlQuery } from '@druid-toolkit/query';
-import { C, F, SqlExpression } from '@druid-toolkit/query';
+import type { SqlQuery } from 'druid-query-toolkit';
+import { C, F, SqlExpression } from 'druid-query-toolkit';
 import type { JSX } from 'react';
 import React from 'react';
 
-import { prettyPrintSql } from '../../../../../utils';
+import { day, hour, month, prettyPrintSql, TZ_UTC, year } from '../../../../../utils';
 
 const LATEST_HOUR: SqlExpression = SqlExpression.parse(
   `? >= CURRENT_TIMESTAMP - INTERVAL '1' HOUR`,
@@ -52,58 +52,6 @@ function fillWithColumnStartEnd(columnName: string, start: Date, end: Date): Sql
   return BETWEEN.fillPlaceholders([start, column, column, end]);
 }
 
-// ------------------------------------
-
-function floorHour(dt: Date): Date {
-  dt = new Date(dt.valueOf());
-  dt.setUTCMinutes(0, 0, 0);
-  return dt;
-}
-
-function nextHour(dt: Date): Date {
-  dt = new Date(dt.valueOf());
-  dt.setUTCHours(dt.getUTCHours() + 1);
-  return dt;
-}
-
-function floorDay(dt: Date): Date {
-  dt = new Date(dt.valueOf());
-  dt.setUTCHours(0, 0, 0, 0);
-  return dt;
-}
-
-function nextDay(dt: Date): Date {
-  dt = new Date(dt.valueOf());
-  dt.setUTCDate(dt.getUTCDate() + 1);
-  return dt;
-}
-
-function floorMonth(dt: Date): Date {
-  dt = new Date(dt.valueOf());
-  dt.setUTCHours(0, 0, 0, 0);
-  dt.setUTCDate(1);
-  return dt;
-}
-
-function nextMonth(dt: Date): Date {
-  dt = new Date(dt.valueOf());
-  dt.setUTCMonth(dt.getUTCMonth() + 1);
-  return dt;
-}
-
-function floorYear(dt: Date): Date {
-  dt = new Date(dt.valueOf());
-  dt.setUTCHours(0, 0, 0, 0);
-  dt.setUTCMonth(0, 1);
-  return dt;
-}
-
-function nextYear(dt: Date): Date {
-  dt = new Date(dt.valueOf());
-  dt.setUTCFullYear(dt.getUTCFullYear() + 1);
-  return dt;
-}
-
 export interface TimeMenuItemsProps {
   table: string;
   schema: string;
@@ -129,10 +77,10 @@ export const TimeMenuItems = React.memo(function TimeMenuItems(props: TimeMenuIt
     }
 
     const now = new Date();
-    const hourStart = floorHour(now);
-    const dayStart = floorDay(now);
-    const monthStart = floorMonth(now);
-    const yearStart = floorYear(now);
+    const hourStart = hour.floor(now, TZ_UTC);
+    const dayStart = day.floor(now, TZ_UTC);
+    const monthStart = month.floor(now, TZ_UTC);
+    const yearStart = year.floor(now, TZ_UTC);
     return (
       <MenuItem icon={IconNames.FILTER} text="Filter">
         {filterMenuItem(`Latest hour`, fillWithColumn(LATEST_HOUR, columnName))}
@@ -143,19 +91,19 @@ export const TimeMenuItems = React.memo(function TimeMenuItems(props: TimeMenuIt
         <MenuDivider />
         {filterMenuItem(
           `Current hour`,
-          fillWithColumnStartEnd(columnName, hourStart, nextHour(hourStart)),
+          fillWithColumnStartEnd(columnName, hourStart, hour.shift(hourStart, TZ_UTC, 1)),
         )}
         {filterMenuItem(
           `Current day`,
-          fillWithColumnStartEnd(columnName, dayStart, nextDay(dayStart)),
+          fillWithColumnStartEnd(columnName, dayStart, day.shift(dayStart, TZ_UTC, 1)),
         )}
         {filterMenuItem(
           `Current month`,
-          fillWithColumnStartEnd(columnName, monthStart, nextMonth(monthStart)),
+          fillWithColumnStartEnd(columnName, monthStart, month.shift(monthStart, TZ_UTC, 1)),
         )}
         {filterMenuItem(
           `Current year`,
-          fillWithColumnStartEnd(columnName, yearStart, nextYear(yearStart)),
+          fillWithColumnStartEnd(columnName, yearStart, year.shift(yearStart, TZ_UTC, 1)),
         )}
       </MenuItem>
     );
diff --git a/web-console/src/views/workbench-view/column-tree/column-tree.spec.tsx b/web-console/src/views/workbench-view/column-tree/column-tree.spec.tsx
index 26410834e136..07e5167f79fe 100644
--- a/web-console/src/views/workbench-view/column-tree/column-tree.spec.tsx
+++ b/web-console/src/views/workbench-view/column-tree/column-tree.spec.tsx
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-import { SqlQuery } from '@druid-toolkit/query';
+import { SqlQuery } from 'druid-query-toolkit';
 
 import type { ColumnMetadata } from '../../../utils';
 import { shallow } from '../../../utils/shallow-renderer';
diff --git a/web-console/src/views/workbench-view/column-tree/column-tree.tsx b/web-console/src/views/workbench-view/column-tree/column-tree.tsx
index 385cab937cef..438dece7f6fb 100644
--- a/web-console/src/views/workbench-view/column-tree/column-tree.tsx
+++ b/web-console/src/views/workbench-view/column-tree/column-tree.tsx
@@ -32,7 +32,7 @@ import {
   Tree,
 } from '@blueprintjs/core';
 import { IconNames } from '@blueprintjs/icons';
-import type { SqlExpression } from '@druid-toolkit/query';
+import type { SqlExpression } from 'druid-query-toolkit';
 import {
   C,
   F,
@@ -43,7 +43,7 @@ import {
   SqlQuery,
   SqlTable,
   T,
-} from '@druid-toolkit/query';
+} from 'druid-query-toolkit';
 import type { ChangeEvent } from 'react';
 import React from 'react';
 
diff --git a/web-console/src/views/workbench-view/connect-external-data-dialog/connect-external-data-dialog.tsx b/web-console/src/views/workbench-view/connect-external-data-dialog/connect-external-data-dialog.tsx
index 124b4441194b..795158102625 100644
--- a/web-console/src/views/workbench-view/connect-external-data-dialog/connect-external-data-dialog.tsx
+++ b/web-console/src/views/workbench-view/connect-external-data-dialog/connect-external-data-dialog.tsx
@@ -17,7 +17,7 @@
  */
 
 import { Classes, Dialog } from '@blueprintjs/core';
-import type { SqlExpression } from '@druid-toolkit/query';
+import type { SqlExpression } from 'druid-query-toolkit';
 import React, { useState } from 'react';
 
 import type { ArrayMode, ExternalConfig, InputFormat, InputSource } from '../../../druid-models';
diff --git a/web-console/src/views/workbench-view/current-dart-panel/current-dart-panel.tsx b/web-console/src/views/workbench-view/current-dart-panel/current-dart-panel.tsx
index 321ad40fc8f0..5f104b75f2df 100644
--- a/web-console/src/views/workbench-view/current-dart-panel/current-dart-panel.tsx
+++ b/web-console/src/views/workbench-view/current-dart-panel/current-dart-panel.tsx
@@ -20,7 +20,7 @@ import { Button, Icon, Intent, Menu, MenuDivider, MenuItem, Popover } from '@blu
 import { type IconName, IconNames } from '@blueprintjs/icons';
 import classNames from 'classnames';
 import copy from 'copy-to-clipboard';
-import React, { useCallback, useState } from 'react';
+import React, { useState } from 'react';
 import { useStore } from 'zustand';
 
 import { Loader } from '../../../components';
@@ -30,7 +30,7 @@ import { Api, AppToaster } from '../../../singletons';
 import { formatDuration, prettyFormatIsoDate } from '../../../utils';
 import { CancelQueryDialog } from '../cancel-query-dialog/cancel-query-dialog';
 import { DartDetailsDialog } from '../dart-details-dialog/dart-details-dialog';
-import { workStateStore } from '../work-state-store';
+import { getMsqDartVersion, WORK_STATE_STORE } from '../work-state-store';
 
 import './current-dart-panel.scss';
 
@@ -59,13 +59,8 @@ export const CurrentDartPanel = React.memo(function CurrentViberPanel(
   const [showSql, setShowSql] = useState<string | undefined>();
   const [confirmCancelId, setConfirmCancelId] = useState<string | undefined>();
 
-  const workStateVersion = useStore(
-    workStateStore,
-    useCallback(state => state.version, []),
-  );
-
   const [dartQueryEntriesState, queryManager] = useQueryManager<number, DartQueryEntry[]>({
-    query: workStateVersion,
+    query: useStore(WORK_STATE_STORE, getMsqDartVersion),
     processQuery: async (_, cancelToken) => {
       return (await Api.instance.get('/druid/v2/sql/dart', { cancelToken })).data.queries;
     },
@@ -178,6 +173,7 @@ export const CurrentDartPanel = React.memo(function CurrentViberPanel(
                 message: 'Query canceled',
                 intent: Intent.SUCCESS,
               });
+              queryManager.rerunLastQuery();
             } catch {
               AppToaster.show({
                 message: 'Could not cancel query',
diff --git a/web-console/src/views/workbench-view/execution-details-pane/execution-details-pane.tsx b/web-console/src/views/workbench-view/execution-details-pane/execution-details-pane.tsx
index b758313ea74e..e59cdb879396 100644
--- a/web-console/src/views/workbench-view/execution-details-pane/execution-details-pane.tsx
+++ b/web-console/src/views/workbench-view/execution-details-pane/execution-details-pane.tsx
@@ -18,7 +18,7 @@
 
 import { Tag } from '@blueprintjs/core';
 import { IconNames } from '@blueprintjs/icons';
-import { T } from '@druid-toolkit/query';
+import { T } from 'druid-query-toolkit';
 import * as JSONBig from 'json-bigint-native';
 import React, { useState } from 'react';
 
diff --git a/web-console/src/views/workbench-view/execution-stages-pane/execution-stages-pane.tsx b/web-console/src/views/workbench-view/execution-stages-pane/execution-stages-pane.tsx
index 5ea2e97bb091..d7c447d090cf 100644
--- a/web-console/src/views/workbench-view/execution-stages-pane/execution-stages-pane.tsx
+++ b/web-console/src/views/workbench-view/execution-stages-pane/execution-stages-pane.tsx
@@ -251,7 +251,7 @@ export const ExecutionStagesPane = React.memo(function ExecutionStagesPane(
               return (
                 <TableClickableCell
                   hoverIcon={IconNames.SHARE}
-                  data-tooltip={`Go to task: ${taskId}`}
+                  tooltip={`Go to task: ${taskId}`}
                   onClick={() => {
                     goToTask(taskId);
                   }}
diff --git a/web-console/src/views/workbench-view/flexible-query-input/flexible-query-input.tsx b/web-console/src/views/workbench-view/flexible-query-input/flexible-query-input.tsx
index a77ed004ea26..0cf280f14e7c 100644
--- a/web-console/src/views/workbench-view/flexible-query-input/flexible-query-input.tsx
+++ b/web-console/src/views/workbench-view/flexible-query-input/flexible-query-input.tsx
@@ -18,10 +18,10 @@
 
 import { Intent, ResizeSensor } from '@blueprintjs/core';
 import { IconNames } from '@blueprintjs/icons';
-import { C, dedupe, T } from '@druid-toolkit/query';
 import type { Ace } from 'ace-builds';
 import ace from 'ace-builds';
 import classNames from 'classnames';
+import { C, dedupe, T } from 'druid-query-toolkit';
 import debounce from 'lodash.debounce';
 import React from 'react';
 import AceEditor from 'react-ace';
diff --git a/web-console/src/views/workbench-view/ingest-success-pane/ingest-success-pane.tsx b/web-console/src/views/workbench-view/ingest-success-pane/ingest-success-pane.tsx
index 2319f5d14a00..0aa42e60b782 100644
--- a/web-console/src/views/workbench-view/ingest-success-pane/ingest-success-pane.tsx
+++ b/web-console/src/views/workbench-view/ingest-success-pane/ingest-success-pane.tsx
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-import { T } from '@druid-toolkit/query';
+import { T } from 'druid-query-toolkit';
 import React from 'react';
 
 import type { Execution } from '../../../druid-models';
diff --git a/web-console/src/views/workbench-view/input-format-step/input-format-step.tsx b/web-console/src/views/workbench-view/input-format-step/input-format-step.tsx
index 4a05b36d70a5..781a01966804 100644
--- a/web-console/src/views/workbench-view/input-format-step/input-format-step.tsx
+++ b/web-console/src/views/workbench-view/input-format-step/input-format-step.tsx
@@ -18,8 +18,8 @@
 
 import { Button, Callout, FormGroup, Icon, Intent, Tag } from '@blueprintjs/core';
 import { IconNames } from '@blueprintjs/icons';
-import type { SqlExpression } from '@druid-toolkit/query';
-import { C, SqlColumnDeclaration, SqlType } from '@druid-toolkit/query';
+import type { SqlExpression } from 'druid-query-toolkit';
+import { C, SqlColumnDeclaration, SqlType } from 'druid-query-toolkit';
 import React, { useState } from 'react';
 
 import { ArrayModeSwitch, AutoForm, CenterMessage, LearnMore, Loader } from '../../../components';
diff --git a/web-console/src/views/workbench-view/input-source-step/input-source-step.tsx b/web-console/src/views/workbench-view/input-source-step/input-source-step.tsx
index 67b6fadaa794..b5ef35146d6e 100644
--- a/web-console/src/views/workbench-view/input-source-step/input-source-step.tsx
+++ b/web-console/src/views/workbench-view/input-source-step/input-source-step.tsx
@@ -27,8 +27,8 @@ import {
   RadioGroup,
 } from '@blueprintjs/core';
 import { IconNames } from '@blueprintjs/icons';
-import type { QueryResult } from '@druid-toolkit/query';
 import classNames from 'classnames';
+import type { QueryResult } from 'druid-query-toolkit';
 import type { JSX } from 'react';
 import React, { useEffect, useState } from 'react';
 
diff --git a/web-console/src/views/workbench-view/query-parameters-dialog/query-parameters-dialog.tsx b/web-console/src/views/workbench-view/query-parameters-dialog/query-parameters-dialog.tsx
index b9915bc7c0cf..49a9ebb587df 100644
--- a/web-console/src/views/workbench-view/query-parameters-dialog/query-parameters-dialog.tsx
+++ b/web-console/src/views/workbench-view/query-parameters-dialog/query-parameters-dialog.tsx
@@ -31,8 +31,8 @@ import {
   Position,
 } from '@blueprintjs/core';
 import { IconNames } from '@blueprintjs/icons';
-import type { QueryParameter } from '@druid-toolkit/query';
-import { isEmptyArray } from '@druid-toolkit/query';
+import type { QueryParameter } from 'druid-query-toolkit';
+import { isEmptyArray } from 'druid-query-toolkit';
 import React, { useState } from 'react';
 
 import { FancyNumericInput } from '../../../components/fancy-numeric-input/fancy-numeric-input';
diff --git a/web-console/src/views/workbench-view/query-tab/query-tab.tsx b/web-console/src/views/workbench-view/query-tab/query-tab.tsx
index 63865054446f..1ff438308591 100644
--- a/web-console/src/views/workbench-view/query-tab/query-tab.tsx
+++ b/web-console/src/views/workbench-view/query-tab/query-tab.tsx
@@ -18,8 +18,8 @@
 
 import { Code, Intent } from '@blueprintjs/core';
 import { IconNames } from '@blueprintjs/icons';
-import { QueryResult, QueryRunner, SqlQuery } from '@druid-toolkit/query';
 import axios from 'axios';
+import { QueryResult, QueryRunner, SqlQuery } from 'druid-query-toolkit';
 import type { JSX } from 'react';
 import React, { useCallback, useEffect, useRef, useState } from 'react';
 import { useStore } from 'zustand';
@@ -61,7 +61,7 @@ import { metadataStateStore } from '../metadata-state-store';
 import { ResultTablePane } from '../result-table-pane/result-table-pane';
 import type { RunPanelProps } from '../run-panel/run-panel';
 import { RunPanel } from '../run-panel/run-panel';
-import { workStateStore } from '../work-state-store';
+import { WORK_STATE_STORE } from '../work-state-store';
 
 import './query-tab.scss';
 
@@ -362,12 +362,13 @@ export const QueryTab = React.memo(function QueryTab(props: QueryTabProps) {
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [executionState.data, executionState.error]);
 
-  const incrementWorkVersion = useStore(
-    workStateStore,
-    useCallback(state => state.increment, []),
-  );
   useEffect(() => {
-    incrementWorkVersion();
+    const effectiveEngine = query.getEffectiveEngine();
+    if (effectiveEngine === 'sql-msq-task') {
+      WORK_STATE_STORE.getState().incrementMsqTask();
+    } else if (effectiveEngine === 'sql-msq-dart') {
+      WORK_STATE_STORE.getState().incrementMsqDart();
+    }
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [executionState.loading, Boolean(executionState.intermediate)]);
 
diff --git a/web-console/src/views/workbench-view/recent-query-task-panel/recent-query-task-panel.tsx b/web-console/src/views/workbench-view/recent-query-task-panel/recent-query-task-panel.tsx
index 682f5fd4d38b..734826cfeb37 100644
--- a/web-console/src/views/workbench-view/recent-query-task-panel/recent-query-task-panel.tsx
+++ b/web-console/src/views/workbench-view/recent-query-task-panel/recent-query-task-panel.tsx
@@ -19,10 +19,10 @@
 import { Button, Icon, Intent, Menu, MenuDivider, MenuItem, Popover } from '@blueprintjs/core';
 import type { IconName } from '@blueprintjs/icons';
 import { IconNames } from '@blueprintjs/icons';
-import { T } from '@druid-toolkit/query';
 import classNames from 'classnames';
 import copy from 'copy-to-clipboard';
-import React, { useCallback, useState } from 'react';
+import { T } from 'druid-query-toolkit';
+import React, { useState } from 'react';
 import { useStore } from 'zustand';
 
 import { Loader } from '../../../components';
@@ -38,7 +38,7 @@ import {
   queryDruidSql,
 } from '../../../utils';
 import { CancelQueryDialog } from '../cancel-query-dialog/cancel-query-dialog';
-import { workStateStore } from '../work-state-store';
+import { getMsqTaskVersion, WORK_STATE_STORE } from '../work-state-store';
 
 import './recent-query-task-panel.scss';
 
@@ -83,13 +83,8 @@ export const RecentQueryTaskPanel = React.memo(function RecentQueryTaskPanel(
 
   const [confirmCancelId, setConfirmCancelId] = useState<string | undefined>();
 
-  const workStateVersion = useStore(
-    workStateStore,
-    useCallback(state => state.version, []),
-  );
-
   const [queryTaskHistoryState, queryManager] = useQueryManager<number, RecentQueryEntry[]>({
-    query: workStateVersion,
+    query: useStore(WORK_STATE_STORE, getMsqTaskVersion),
     processQuery: async (_, cancelToken) => {
       return await queryDruidSql<RecentQueryEntry>(
         {
@@ -116,11 +111,6 @@ LIMIT 100`,
 
   const now = useClock();
 
-  const incrementWorkVersion = useStore(
-    workStateStore,
-    useCallback(state => state.increment, []),
-  );
-
   const queryTaskHistory = queryTaskHistoryState.getSomeData();
   return (
     <div className="recent-query-task-panel">
@@ -275,7 +265,7 @@ LIMIT 100`,
                 message: 'Query canceled',
                 intent: Intent.SUCCESS,
               });
-              incrementWorkVersion();
+              queryManager.rerunLastQuery();
             } catch {
               AppToaster.show({
                 message: 'Could not cancel query',
diff --git a/web-console/src/views/workbench-view/result-table-pane/result-table-pane.tsx b/web-console/src/views/workbench-view/result-table-pane/result-table-pane.tsx
index dfead18c63ec..c16a24c9740b 100644
--- a/web-console/src/views/workbench-view/result-table-pane/result-table-pane.tsx
+++ b/web-console/src/views/workbench-view/result-table-pane/result-table-pane.tsx
@@ -18,9 +18,9 @@
 
 import { Button, Icon, Intent, Menu, MenuItem, Popover } from '@blueprintjs/core';
 import { IconNames } from '@blueprintjs/icons';
-import type { Column, QueryResult, SqlExpression, SqlQuery } from '@druid-toolkit/query';
-import { C, F, SqlAlias, SqlFunction, SqlLiteral, SqlStar } from '@druid-toolkit/query';
 import classNames from 'classnames';
+import type { Column, QueryResult, SqlExpression, SqlQuery } from 'druid-query-toolkit';
+import { C, F, SqlAlias, SqlFunction, SqlLiteral, SqlStar } from 'druid-query-toolkit';
 import * as JSONBig from 'json-bigint-native';
 import type { JSX } from 'react';
 import React, { useEffect, useState } from 'react';
diff --git a/web-console/src/views/workbench-view/run-panel/run-panel.tsx b/web-console/src/views/workbench-view/run-panel/run-panel.tsx
index d586959357a4..2747179d6d44 100644
--- a/web-console/src/views/workbench-view/run-panel/run-panel.tsx
+++ b/web-console/src/views/workbench-view/run-panel/run-panel.tsx
@@ -51,31 +51,10 @@ import { deepGet, pluralIfNeeded, removeUndefinedValues, tickIcon } from '../../
 import type { MaxTasksButtonProps } from '../max-tasks-button/max-tasks-button';
 import { MaxTasksButton } from '../max-tasks-button/max-tasks-button';
 import { QueryParametersDialog } from '../query-parameters-dialog/query-parameters-dialog';
+import { TimezoneMenuItems } from '../timezone-menu-items/timezone-menu-items';
 
 import './run-panel.scss';
 
-const NAMED_TIMEZONES: string[] = [
-  'America/Juneau', // -9.0
-  'America/Los_Angeles', // -8.0
-  'America/Yellowknife', // -7.0
-  'America/Phoenix', // -7.0
-  'America/Denver', // -7.0
-  'America/Mexico_City', // -6.0
-  'America/Chicago', // -6.0
-  'America/New_York', // -5.0
-  'America/Argentina/Buenos_Aires', // -4.0
-  'Etc/UTC', // +0.0
-  'Europe/London', // +0.0
-  'Europe/Paris', // +1.0
-  'Asia/Jerusalem', // +2.0
-  'Asia/Shanghai', // +8.0
-  'Asia/Hong_Kong', // +8.0
-  'Asia/Seoul', // +9.0
-  'Asia/Tokyo', // +9.0
-  'Pacific/Guam', // +10.0
-  'Australia/Sydney', // +11.0
-];
-
 const ARRAY_INGEST_MODE_LABEL: Record<ArrayIngestMode, string> = {
   array: 'Array',
   mvd: 'MVD',
@@ -314,25 +293,6 @@ export const RunPanel = React.memo(function RunPanel(props: RunPanelProps) {
     onQueryChange(query.changeQueryContext(removeUndefinedValues(queryContext)));
   }
 
-  function offsetOptions(): JSX.Element[] {
-    const items: JSX.Element[] = [];
-
-    for (let i = -12; i <= 14; i++) {
-      const offset = `${i < 0 ? '-' : '+'}${String(Math.abs(i)).padStart(2, '0')}:00`;
-      items.push(
-        <MenuItem
-          key={offset}
-          icon={tickIcon(offset === sqlTimeZone)}
-          text={offset}
-          shouldDismissPopover={false}
-          onClick={() => changeQueryContext({ ...queryContext, sqlTimeZone: offset })}
-        />,
-      );
-    }
-
-    return items;
-  }
-
   const overloadWarning =
     query.unlimited &&
     (queryEngine === 'sql-native' ||
@@ -424,32 +384,13 @@ export const RunPanel = React.memo(function RunPanel(props: RunPanelProps) {
                     text="Timezone"
                     label={sqlTimeZone ?? defaultQueryContext.sqlTimeZone}
                   >
-                    <MenuDivider title="Timezone type" />
-                    <MenuItem
-                      icon={tickIcon(!sqlTimeZone)}
-                      text="Default"
-                      label={defaultQueryContext.sqlTimeZone}
-                      shouldDismissPopover={false}
-                      onClick={() =>
-                        changeQueryContext({ ...queryContext, sqlTimeZone: undefined })
+                    <TimezoneMenuItems
+                      sqlTimeZone={sqlTimeZone}
+                      setSqlTimeZone={sqlTimeZone =>
+                        changeQueryContext({ ...queryContext, sqlTimeZone })
                       }
+                      defaultSqlTimeZone={defaultQueryContext.sqlTimeZone}
                     />
-                    <MenuItem icon={tickIcon(String(sqlTimeZone).includes('/'))} text="Named">
-                      {NAMED_TIMEZONES.map(namedTimezone => (
-                        <MenuItem
-                          key={namedTimezone}
-                          icon={tickIcon(namedTimezone === sqlTimeZone)}
-                          text={namedTimezone}
-                          shouldDismissPopover={false}
-                          onClick={() =>
-                            changeQueryContext({ ...queryContext, sqlTimeZone: namedTimezone })
-                          }
-                        />
-                      ))}
-                    </MenuItem>
-                    <MenuItem icon={tickIcon(String(sqlTimeZone).includes(':'))} text="Offset">
-                      {offsetOptions()}
-                    </MenuItem>
                     <MenuItem
                       icon={IconNames.BLANK}
                       text="Custom"
diff --git a/web-console/src/views/workbench-view/time-floor-menu-item/time-floor-menu-item.tsx b/web-console/src/views/workbench-view/time-floor-menu-item/time-floor-menu-item.tsx
index fd7bea12a45e..f2576a561a55 100644
--- a/web-console/src/views/workbench-view/time-floor-menu-item/time-floor-menu-item.tsx
+++ b/web-console/src/views/workbench-view/time-floor-menu-item/time-floor-menu-item.tsx
@@ -18,8 +18,8 @@
 
 import { MenuItem } from '@blueprintjs/core';
 import { IconNames } from '@blueprintjs/icons';
-import type { SqlExpression } from '@druid-toolkit/query';
-import { F, SqlFunction } from '@druid-toolkit/query';
+import type { SqlExpression } from 'druid-query-toolkit';
+import { F, SqlFunction } from 'druid-query-toolkit';
 
 import { oneOf, tickIcon } from '../../../utils';
 
diff --git a/web-console/src/views/workbench-view/timezone-menu-items/__snapshots__/timezone-menu-items.spec.tsx.snap b/web-console/src/views/workbench-view/timezone-menu-items/__snapshots__/timezone-menu-items.spec.tsx.snap
new file mode 100644
index 000000000000..9c958fb88001
--- /dev/null
+++ b/web-console/src/views/workbench-view/timezone-menu-items/__snapshots__/timezone-menu-items.spec.tsx.snap
@@ -0,0 +1,563 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`TimezoneMenuItems matches snapshot 1`] = `
+[
+  <Blueprint5.MenuDivider
+    title="Timezone type"
+  />,
+  <Blueprint5.MenuItem
+    active={false}
+    disabled={false}
+    icon="blank"
+    label="Etc/UTC"
+    multiline={false}
+    onClick={[Function]}
+    popoverProps={{}}
+    shouldDismissPopover={false}
+    text="Default"
+  />,
+  <Blueprint5.MenuItem
+    active={false}
+    disabled={false}
+    icon="blank"
+    multiline={false}
+    popoverProps={{}}
+    shouldDismissPopover={true}
+    text="Named"
+  >
+    <Blueprint5.MenuItem
+      active={false}
+      disabled={false}
+      icon="blank"
+      label="UTC-8:00"
+      multiline={false}
+      onClick={[Function]}
+      popoverProps={{}}
+      shouldDismissPopover={false}
+      text="America/Juneau"
+    />
+    <Blueprint5.MenuItem
+      active={false}
+      disabled={false}
+      icon="blank"
+      label="UTC-7:00"
+      multiline={false}
+      onClick={[Function]}
+      popoverProps={{}}
+      shouldDismissPopover={false}
+      text="America/Los_Angeles"
+    />
+    <Blueprint5.MenuItem
+      active={false}
+      disabled={false}
+      icon="blank"
+      label="UTC-7:00"
+      multiline={false}
+      onClick={[Function]}
+      popoverProps={{}}
+      shouldDismissPopover={false}
+      text="America/Phoenix"
+    />
+    <Blueprint5.MenuItem
+      active={false}
+      disabled={false}
+      icon="blank"
+      label="UTC-6:00"
+      multiline={false}
+      onClick={[Function]}
+      popoverProps={{}}
+      shouldDismissPopover={false}
+      text="America/Yellowknife"
+    />
+    <Blueprint5.MenuItem
+      active={false}
+      disabled={false}
+      icon="blank"
+      label="UTC-6:00"
+      multiline={false}
+      onClick={[Function]}
+      popoverProps={{}}
+      shouldDismissPopover={false}
+      text="America/Denver"
+    />
+    <Blueprint5.MenuItem
+      active={false}
+      disabled={false}
+      icon="blank"
+      label="UTC-6:00"
+      multiline={false}
+      onClick={[Function]}
+      popoverProps={{}}
+      shouldDismissPopover={false}
+      text="America/Mexico_City"
+    />
+    <Blueprint5.MenuItem
+      active={false}
+      disabled={false}
+      icon="blank"
+      label="UTC-5:00"
+      multiline={false}
+      onClick={[Function]}
+      popoverProps={{}}
+      shouldDismissPopover={false}
+      text="America/Chicago"
+    />
+    <Blueprint5.MenuItem
+      active={false}
+      disabled={false}
+      icon="blank"
+      label="UTC-4:00"
+      multiline={false}
+      onClick={[Function]}
+      popoverProps={{}}
+      shouldDismissPopover={false}
+      text="America/New_York"
+    />
+    <Blueprint5.MenuItem
+      active={false}
+      disabled={false}
+      icon="blank"
+      label="UTC-3:00"
+      multiline={false}
+      onClick={[Function]}
+      popoverProps={{}}
+      shouldDismissPopover={false}
+      text="America/Argentina/Buenos_Aires"
+    />
+    <Blueprint5.MenuItem
+      active={false}
+      disabled={false}
+      icon="blank"
+      label="UTC+0:00"
+      multiline={false}
+      onClick={[Function]}
+      popoverProps={{}}
+      shouldDismissPopover={false}
+      text="Etc/UTC"
+    />
+    <Blueprint5.MenuItem
+      active={false}
+      disabled={false}
+      icon="blank"
+      label="UTC+0:00"
+      multiline={false}
+      onClick={[Function]}
+      popoverProps={{}}
+      shouldDismissPopover={false}
+      text={
+        <React.Fragment>
+          UTC
+           
+          <Blueprint5.Icon
+            autoLoad={true}
+            data-tooltip="Browser timezone"
+            icon="star"
+            tagName="span"
+          />
+        </React.Fragment>
+      }
+    />
+    <Blueprint5.MenuItem
+      active={false}
+      disabled={false}
+      icon="blank"
+      label="UTC+1:00"
+      multiline={false}
+      onClick={[Function]}
+      popoverProps={{}}
+      shouldDismissPopover={false}
+      text="Europe/London"
+    />
+    <Blueprint5.MenuItem
+      active={false}
+      disabled={false}
+      icon="blank"
+      label="UTC+2:00"
+      multiline={false}
+      onClick={[Function]}
+      popoverProps={{}}
+      shouldDismissPopover={false}
+      text="Europe/Paris"
+    />
+    <Blueprint5.MenuItem
+      active={false}
+      disabled={false}
+      icon="blank"
+      label="UTC+3:00"
+      multiline={false}
+      onClick={[Function]}
+      popoverProps={{}}
+      shouldDismissPopover={false}
+      text="Asia/Jerusalem"
+    />
+    <Blueprint5.MenuItem
+      active={false}
+      disabled={false}
+      icon="blank"
+      label="UTC+5:30"
+      multiline={false}
+      onClick={[Function]}
+      popoverProps={{}}
+      shouldDismissPopover={false}
+      text="Asia/Kolkata"
+    />
+    <Blueprint5.MenuItem
+      active={false}
+      disabled={false}
+      icon="blank"
+      label="UTC+8:00"
+      multiline={false}
+      onClick={[Function]}
+      popoverProps={{}}
+      shouldDismissPopover={false}
+      text="Asia/Shanghai"
+    />
+    <Blueprint5.MenuItem
+      active={false}
+      disabled={false}
+      icon="blank"
+      label="UTC+8:00"
+      multiline={false}
+      onClick={[Function]}
+      popoverProps={{}}
+      shouldDismissPopover={false}
+      text="Asia/Hong_Kong"
+    />
+    <Blueprint5.MenuItem
+      active={false}
+      disabled={false}
+      icon="blank"
+      label="UTC+9:00"
+      multiline={false}
+      onClick={[Function]}
+      popoverProps={{}}
+      shouldDismissPopover={false}
+      text="Asia/Seoul"
+    />
+    <Blueprint5.MenuItem
+      active={false}
+      disabled={false}
+      icon="blank"
+      label="UTC+9:00"
+      multiline={false}
+      onClick={[Function]}
+      popoverProps={{}}
+      shouldDismissPopover={false}
+      text="Asia/Tokyo"
+    />
+    <Blueprint5.MenuItem
+      active={false}
+      disabled={false}
+      icon="blank"
+      label="UTC+10:00"
+      multiline={false}
+      onClick={[Function]}
+      popoverProps={{}}
+      shouldDismissPopover={false}
+      text="Pacific/Guam"
+    />
+    <Blueprint5.MenuItem
+      active={false}
+      disabled={false}
+      icon="blank"
+      label="UTC+10:00"
+      multiline={false}
+      onClick={[Function]}
+      popoverProps={{}}
+      shouldDismissPopover={false}
+      text="Australia/Sydney"
+    />
+  </Blueprint5.MenuItem>,
+  <Blueprint5.MenuItem
+    active={false}
+    disabled={false}
+    icon="blank"
+    multiline={false}
+    popoverProps={{}}
+    shouldDismissPopover={true}
+    text="Offset"
+  >
+    <Blueprint5.MenuItem
+      active={false}
+      disabled={false}
+      icon="blank"
+      multiline={false}
+      onClick={[Function]}
+      popoverProps={{}}
+      shouldDismissPopover={false}
+      text="-12:00"
+    />
+    <Blueprint5.MenuItem
+      active={false}
+      disabled={false}
+      icon="blank"
+      multiline={false}
+      onClick={[Function]}
+      popoverProps={{}}
+      shouldDismissPopover={false}
+      text="-11:00"
+    />
+    <Blueprint5.MenuItem
+      active={false}
+      disabled={false}
+      icon="blank"
+      multiline={false}
+      onClick={[Function]}
+      popoverProps={{}}
+      shouldDismissPopover={false}
+      text="-10:00"
+    />
+    <Blueprint5.MenuItem
+      active={false}
+      disabled={false}
+      icon="blank"
+      multiline={false}
+      onClick={[Function]}
+      popoverProps={{}}
+      shouldDismissPopover={false}
+      text="-09:00"
+    />
+    <Blueprint5.MenuItem
+      active={false}
+      disabled={false}
+      icon="blank"
+      multiline={false}
+      onClick={[Function]}
+      popoverProps={{}}
+      shouldDismissPopover={false}
+      text="-08:00"
+    />
+    <Blueprint5.MenuItem
+      active={false}
+      disabled={false}
+      icon="blank"
+      multiline={false}
+      onClick={[Function]}
+      popoverProps={{}}
+      shouldDismissPopover={false}
+      text="-07:00"
+    />
+    <Blueprint5.MenuItem
+      active={false}
+      disabled={false}
+      icon="blank"
+      multiline={false}
+      onClick={[Function]}
+      popoverProps={{}}
+      shouldDismissPopover={false}
+      text="-06:00"
+    />
+    <Blueprint5.MenuItem
+      active={false}
+      disabled={false}
+      icon="blank"
+      multiline={false}
+      onClick={[Function]}
+      popoverProps={{}}
+      shouldDismissPopover={false}
+      text="-05:00"
+    />
+    <Blueprint5.MenuItem
+      active={false}
+      disabled={false}
+      icon="blank"
+      multiline={false}
+      onClick={[Function]}
+      popoverProps={{}}
+      shouldDismissPopover={false}
+      text="-04:00"
+    />
+    <Blueprint5.MenuItem
+      active={false}
+      disabled={false}
+      icon="blank"
+      multiline={false}
+      onClick={[Function]}
+      popoverProps={{}}
+      shouldDismissPopover={false}
+      text="-03:00"
+    />
+    <Blueprint5.MenuItem
+      active={false}
+      disabled={false}
+      icon="blank"
+      multiline={false}
+      onClick={[Function]}
+      popoverProps={{}}
+      shouldDismissPopover={false}
+      text="-02:00"
+    />
+    <Blueprint5.MenuItem
+      active={false}
+      disabled={false}
+      icon="blank"
+      multiline={false}
+      onClick={[Function]}
+      popoverProps={{}}
+      shouldDismissPopover={false}
+      text="-01:00"
+    />
+    <Blueprint5.MenuItem
+      active={false}
+      disabled={false}
+      icon="blank"
+      multiline={false}
+      onClick={[Function]}
+      popoverProps={{}}
+      shouldDismissPopover={false}
+      text={
+        <React.Fragment>
+          +00:00
+           
+          <Blueprint5.Icon
+            autoLoad={true}
+            data-tooltip="Browser offset"
+            icon="star"
+            tagName="span"
+          />
+        </React.Fragment>
+      }
+    />
+    <Blueprint5.MenuItem
+      active={false}
+      disabled={false}
+      icon="blank"
+      multiline={false}
+      onClick={[Function]}
+      popoverProps={{}}
+      shouldDismissPopover={false}
+      text="+01:00"
+    />
+    <Blueprint5.MenuItem
+      active={false}
+      disabled={false}
+      icon="blank"
+      multiline={false}
+      onClick={[Function]}
+      popoverProps={{}}
+      shouldDismissPopover={false}
+      text="+02:00"
+    />
+    <Blueprint5.MenuItem
+      active={false}
+      disabled={false}
+      icon="blank"
+      multiline={false}
+      onClick={[Function]}
+      popoverProps={{}}
+      shouldDismissPopover={false}
+      text="+03:00"
+    />
+    <Blueprint5.MenuItem
+      active={false}
+      disabled={false}
+      icon="blank"
+      multiline={false}
+      onClick={[Function]}
+      popoverProps={{}}
+      shouldDismissPopover={false}
+      text="+04:00"
+    />
+    <Blueprint5.MenuItem
+      active={false}
+      disabled={false}
+      icon="blank"
+      multiline={false}
+      onClick={[Function]}
+      popoverProps={{}}
+      shouldDismissPopover={false}
+      text="+05:00"
+    />
+    <Blueprint5.MenuItem
+      active={false}
+      disabled={false}
+      icon="blank"
+      multiline={false}
+      onClick={[Function]}
+      popoverProps={{}}
+      shouldDismissPopover={false}
+      text="+06:00"
+    />
+    <Blueprint5.MenuItem
+      active={false}
+      disabled={false}
+      icon="blank"
+      multiline={false}
+      onClick={[Function]}
+      popoverProps={{}}
+      shouldDismissPopover={false}
+      text="+07:00"
+    />
+    <Blueprint5.MenuItem
+      active={false}
+      disabled={false}
+      icon="blank"
+      multiline={false}
+      onClick={[Function]}
+      popoverProps={{}}
+      shouldDismissPopover={false}
+      text="+08:00"
+    />
+    <Blueprint5.MenuItem
+      active={false}
+      disabled={false}
+      icon="blank"
+      multiline={false}
+      onClick={[Function]}
+      popoverProps={{}}
+      shouldDismissPopover={false}
+      text="+09:00"
+    />
+    <Blueprint5.MenuItem
+      active={false}
+      disabled={false}
+      icon="blank"
+      multiline={false}
+      onClick={[Function]}
+      popoverProps={{}}
+      shouldDismissPopover={false}
+      text="+10:00"
+    />
+    <Blueprint5.MenuItem
+      active={false}
+      disabled={false}
+      icon="blank"
+      multiline={false}
+      onClick={[Function]}
+      popoverProps={{}}
+      shouldDismissPopover={false}
+      text="+11:00"
+    />
+    <Blueprint5.MenuItem
+      active={false}
+      disabled={false}
+      icon="blank"
+      multiline={false}
+      onClick={[Function]}
+      popoverProps={{}}
+      shouldDismissPopover={false}
+      text="+12:00"
+    />
+    <Blueprint5.MenuItem
+      active={false}
+      disabled={false}
+      icon="blank"
+      multiline={false}
+      onClick={[Function]}
+      popoverProps={{}}
+      shouldDismissPopover={false}
+      text="+13:00"
+    />
+    <Blueprint5.MenuItem
+      active={false}
+      disabled={false}
+      icon="blank"
+      multiline={false}
+      onClick={[Function]}
+      popoverProps={{}}
+      shouldDismissPopover={false}
+      text="+14:00"
+    />
+  </Blueprint5.MenuItem>,
+]
+`;
diff --git a/web-console/src/components/segment-timeline/bar-unit.tsx b/web-console/src/views/workbench-view/timezone-menu-items/timezone-menu-items.spec.tsx
similarity index 58%
rename from web-console/src/components/segment-timeline/bar-unit.tsx
rename to web-console/src/views/workbench-view/timezone-menu-items/timezone-menu-items.spec.tsx
index 8591f68cc2e3..5a1a2b9ce51b 100644
--- a/web-console/src/components/segment-timeline/bar-unit.tsx
+++ b/web-console/src/views/workbench-view/timezone-menu-items/timezone-menu-items.spec.tsx
@@ -16,30 +16,26 @@
  * limitations under the License.
  */
 
-interface BarChartUnitProps {
-  x: number | undefined;
-  y: number;
-  width: number;
-  height: number;
-  style?: any;
-  onClick?: () => void;
-  onHover?: () => void;
-  offHover?: () => void;
-}
+import { shallow } from '../../../utils/shallow-renderer';
 
-export function BarUnit(props: BarChartUnitProps) {
-  const { x, y, width, height, style, onClick, onHover, offHover } = props;
-  return (
-    <rect
-      className="bar-unit"
-      x={x}
-      y={y}
-      width={width}
-      height={height}
-      style={style}
-      onClick={onClick}
-      onMouseOver={onHover}
-      onMouseLeave={offHover}
-    />
-  );
-}
+import { TimezoneMenuItems } from './timezone-menu-items';
+
+jest.useFakeTimers('modern').setSystemTime(Date.parse('2024-06-08T12:34:56Z'));
+
+describe('TimezoneMenuItems', () => {
+  it('ensure UTC', () => {
+    expect(new Date().getTimezoneOffset()).toBe(0);
+  });
+
+  it('matches snapshot', () => {
+    const comp = shallow(
+      <TimezoneMenuItems
+        sqlTimeZone="Blah"
+        setSqlTimeZone={() => {}}
+        defaultSqlTimeZone="Etc/UTC"
+      />,
+    );
+
+    expect(comp).toMatchSnapshot();
+  });
+});
diff --git a/web-console/src/views/workbench-view/timezone-menu-items/timezone-menu-items.tsx b/web-console/src/views/workbench-view/timezone-menu-items/timezone-menu-items.tsx
new file mode 100644
index 000000000000..2340302d0a56
--- /dev/null
+++ b/web-console/src/views/workbench-view/timezone-menu-items/timezone-menu-items.tsx
@@ -0,0 +1,151 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { Icon, MenuDivider, MenuItem } from '@blueprintjs/core';
+import { IconNames } from '@blueprintjs/icons';
+import { fromDate, getLocalTimeZone } from '@internationalized/date';
+import { useMemo } from 'react';
+
+import { minute, tickIcon, timezoneOffsetInMinutesToString } from '../../../utils';
+
+const NAMED_TIMEZONES: string[] = [
+  'America/Juneau', // -9:00
+  'America/Los_Angeles', // -8:00
+  'America/Yellowknife', // -7:00
+  'America/Phoenix', // -7:00
+  'America/Denver', // -7:00
+  'America/Mexico_City', // -6:00
+  'America/Chicago', // -6:00
+  'America/New_York', // -5:00
+  'America/Argentina/Buenos_Aires', // -4:00
+  'Etc/UTC', // +0:00
+  'Europe/London', // +0:00
+  'Europe/Paris', // +1:00
+  'Asia/Jerusalem', // +2:00
+  'Asia/Kolkata', // +5:30
+  'Asia/Shanghai', // +8:00
+  'Asia/Hong_Kong', // +8:00
+  'Asia/Seoul', // +9:00
+  'Asia/Tokyo', // +9:00
+  'Pacific/Guam', // +10:00
+  'Australia/Sydney', // +11:00
+];
+
+export interface TimezoneMenuItemsProps {
+  sqlTimeZone: string | undefined;
+  setSqlTimeZone(sqlTimeZone: string | undefined): void;
+  defaultSqlTimeZone: string | undefined;
+}
+
+export const TimezoneMenuItems = function TimezoneMenuItems(props: TimezoneMenuItemsProps) {
+  const { sqlTimeZone, setSqlTimeZone, defaultSqlTimeZone } = props;
+
+  const { timezones, myTimezone, offsetsInMinutes, myOffsetInMinutes } = useMemo(() => {
+    const now = new Date();
+
+    const timezones: { timezone: string; offsetInMinutes: number }[] = NAMED_TIMEZONES.map(
+      timezone => ({
+        timezone,
+        offsetInMinutes: fromDate(now, timezone).offset / minute.canonicalLength,
+      }),
+    );
+    const myTimezone = getLocalTimeZone();
+    const myOffsetInMinutes = -now.getTimezoneOffset();
+
+    // Make sure the browsers timezone is in the list
+    if (!timezones.find(({ timezone }) => timezone === myTimezone)) {
+      timezones.push({
+        timezone: myTimezone,
+        offsetInMinutes: myOffsetInMinutes,
+      });
+    }
+    timezones.sort((a, b) => a.offsetInMinutes - b.offsetInMinutes);
+
+    const offsetsInMinutes: number[] = [];
+    for (let offsetInMinutes = -12 * 60; offsetInMinutes <= 14 * 60; offsetInMinutes += 60) {
+      offsetsInMinutes.push(offsetInMinutes);
+    }
+
+    // Make sure the browser offset is in the list
+    if (!offsetsInMinutes.includes(myOffsetInMinutes)) {
+      offsetsInMinutes.push(myOffsetInMinutes);
+      offsetsInMinutes.sort((a, b) => a - b);
+    }
+
+    return {
+      timezones,
+      myTimezone,
+      offsetsInMinutes,
+      myOffsetInMinutes,
+    };
+  }, []);
+
+  return [
+    <MenuDivider key="type" title="Timezone type" />,
+    <MenuItem
+      key="default"
+      icon={tickIcon(!sqlTimeZone)}
+      text="Default"
+      label={defaultSqlTimeZone}
+      shouldDismissPopover={false}
+      onClick={() => setSqlTimeZone(undefined)}
+    />,
+    <MenuItem key="named" icon={tickIcon(String(sqlTimeZone).includes('/'))} text="Named">
+      {timezones.map(({ timezone, offsetInMinutes }) => (
+        <MenuItem
+          key={timezone}
+          icon={tickIcon(timezone === sqlTimeZone)}
+          text={
+            timezone === myTimezone ? (
+              <>
+                {timezone} <Icon icon={IconNames.STAR} data-tooltip="Browser timezone" />
+              </>
+            ) : (
+              timezone
+            )
+          }
+          label={`UTC${timezoneOffsetInMinutesToString(offsetInMinutes, false)}`}
+          shouldDismissPopover={false}
+          onClick={() => setSqlTimeZone(timezone)}
+        />
+      ))}
+    </MenuItem>,
+    <MenuItem key="offset" icon={tickIcon(String(sqlTimeZone).includes(':'))} text="Offset">
+      {offsetsInMinutes.map(offsetInMinutes => {
+        const offset = timezoneOffsetInMinutesToString(offsetInMinutes, true);
+        return (
+          <MenuItem
+            key={offset}
+            icon={tickIcon(offset === sqlTimeZone)}
+            text={
+              myOffsetInMinutes === offsetInMinutes ? (
+                <>
+                  {offset} <Icon icon={IconNames.STAR} data-tooltip="Browser offset" />
+                </>
+              ) : (
+                offset
+              )
+            }
+            shouldDismissPopover={false}
+            onClick={() => setSqlTimeZone(offset)}
+          />
+        );
+      })}
+    </MenuItem>,
+  ];
+};
diff --git a/web-console/src/views/workbench-view/work-state-store.ts b/web-console/src/views/workbench-view/work-state-store.ts
index ee03a70c030d..38fb8d8e673b 100644
--- a/web-console/src/views/workbench-view/work-state-store.ts
+++ b/web-console/src/views/workbench-view/work-state-store.ts
@@ -19,11 +19,23 @@
 import { createStore } from 'zustand';
 
 interface WorkState {
-  version: number;
-  increment(): void;
+  msqTaskVersion: number;
+  msqDartVersion: number;
+  incrementMsqTask(): void;
+  incrementMsqDart(): void;
 }
 
-export const workStateStore = createStore<WorkState>(set => ({
-  version: 0,
-  increment: () => set(state => ({ version: state.version + 1 })),
+export const WORK_STATE_STORE = createStore<WorkState>(set => ({
+  msqTaskVersion: 0,
+  msqDartVersion: 0,
+  incrementMsqTask: () => set(state => ({ msqTaskVersion: state.msqTaskVersion + 1 })),
+  incrementMsqDart: () => set(state => ({ msqDartVersion: state.msqDartVersion + 1 })),
 }));
+
+export function getMsqTaskVersion(store: WorkState): number {
+  return store.msqTaskVersion;
+}
+
+export function getMsqDartVersion(store: WorkState): number {
+  return store.msqDartVersion;
+}
diff --git a/web-console/src/views/workbench-view/workbench-view.tsx b/web-console/src/views/workbench-view/workbench-view.tsx
index f647bfbc5c7c..567fd51d4c8c 100644
--- a/web-console/src/views/workbench-view/workbench-view.tsx
+++ b/web-console/src/views/workbench-view/workbench-view.tsx
@@ -26,10 +26,10 @@ import {
   Popover,
 } from '@blueprintjs/core';
 import { IconNames } from '@blueprintjs/icons';
-import type { SqlQuery } from '@druid-toolkit/query';
-import { SqlExpression } from '@druid-toolkit/query';
 import classNames from 'classnames';
 import copy from 'copy-to-clipboard';
+import type { SqlQuery } from 'druid-query-toolkit';
+import { SqlExpression } from 'druid-query-toolkit';
 import React from 'react';
 
 import { MenuCheckbox, SplitterLayout } from '../../components';

From f3e1f1e586fd5f81e5eccd72cadb80b9be9ea562 Mon Sep 17 00:00:00 2001
From: Vadim Ogievetsky <vadim@ogievetsky.com>
Date: Wed, 27 Nov 2024 09:38:48 -0800
Subject: [PATCH 06/56] Revert "Web console: refactor and improve the segment
 timeline (#17508)" (#17520)

This reverts commit 09432c099beb38fb0e79a497c589ab83da87ce81.
---
 licenses.yaml                                 |  94 +-
 web-console/e2e-tests/tutorial-batch.spec.ts  |   2 +-
 web-console/jest.common.config.js             |   2 -
 web-console/lib/keywords.ts                   |   8 -
 web-console/package-lock.json                 | 205 ++--
 web-console/package.json                      |   5 +-
 web-console/script/create-sql-docs.mjs        |   6 -
 web-console/script/licenses                   |   1 -
 web-console/src/bootstrap/json-parser.tsx     |   2 +-
 .../__snapshots__/auto-form.spec.tsx.snap     |   1 +
 .../src/components/auto-form/auto-form.tsx    |   1 +
 .../cell-filter-menu/cell-filter-menu.tsx     |   4 +-
 .../fancy-numeric-input.tsx                   |   2 +-
 web-console/src/components/index.ts           |   1 -
 .../portal-bubble/portal-bubble.scss          |  86 --
 .../portal-bubble/portal-bubble.tsx           |  93 --
 .../record-table-pane/record-table-pane.tsx   |   2 +-
 .../__snapshots__/rule-editor.spec.tsx.snap   |  10 +-
 .../components/rule-editor/rule-editor.scss   |   4 -
 .../components/rule-editor/rule-editor.tsx    |   6 +-
 .../__snapshots__/bar-unit.spec.tsx.snap      |  13 +
 .../segment-timeline.spec.tsx.snap            | 422 +++------
 .../components/segment-timeline/bar-group.tsx |  75 ++
 ...gment-bar-chart.scss => bar-unit.spec.tsx} |  18 +-
 .../segment-timeline/bar-unit.tsx}            |  48 +-
 .../segment-timeline/chart-axis.tsx           |  14 +-
 .../src/components/segment-timeline/common.ts |  87 --
 .../segment-bar-chart-render.scss             | 169 ----
 .../segment-bar-chart-render.tsx              | 793 ----------------
 .../segment-timeline/segment-bar-chart.tsx    | 162 ----
 .../segment-timeline/segment-timeline.scss    |  32 +-
 .../segment-timeline.spec.tsx                 |  52 +-
 .../segment-timeline/segment-timeline.tsx     | 887 ++++++++++++------
 .../segment-timeline/stacked-bar-chart.scss}  |  55 +-
 .../segment-timeline/stacked-bar-chart.tsx    | 174 ++++
 .../supervisor-history-panel.tsx              |  13 +-
 .../table-clickable-cell.tsx                  |   5 +-
 .../table-filterable-cell.tsx                 |   2 +-
 web-console/src/console-application.tsx       |  18 +-
 .../compaction-history-dialog.tsx             |   7 +-
 .../coordinator-dynamic-config-dialog.tsx     |   7 +-
 .../datasource-columns-table.tsx              |   2 +-
 .../datasource-preview-pane.tsx               |   4 +-
 .../lookup-values-table.tsx                   |   2 +-
 .../overlord-dynamic-config-dialog.tsx        |   7 +-
 .../retention-dialog.spec.tsx.snap            |   4 +-
 .../retention-dialog/retention-dialog.tsx     |  17 +-
 .../segments-preview-pane.tsx                 |   4 +-
 .../dialogs/status-dialog/status-dialog.tsx   |   3 +-
 .../supervisor-reset-offsets-dialog.tsx       |  11 +-
 .../src/druid-models/execution/execution.ts   |   2 +-
 .../external-config/external-config.ts        |   4 +-
 web-console/src/druid-models/index.ts         |   3 -
 .../ingest-query-pattern.spec.ts              |   2 +-
 .../ingest-query-pattern.ts                   |   2 +-
 .../src/druid-models/segment/segment.ts       |  50 -
 web-console/src/druid-models/task/task.ts     |   2 +-
 .../workbench-query/workbench-query.spec.ts   |   2 +-
 .../workbench-query/workbench-query.ts        |   4 +-
 web-console/src/entry.scss                    |   1 -
 web-console/src/entry.tsx                     |   2 +-
 web-console/src/helpers/capabilities.ts       |   4 -
 web-console/src/helpers/execution/general.ts  |   2 +-
 .../helpers/execution/sql-task-execution.ts   |   2 +-
 web-console/src/helpers/spec-conversion.ts    |   2 +-
 web-console/src/hooks/use-clock.ts            |  18 +-
 .../src/react-table/react-table-utils.spec.ts |   4 -
 .../src/react-table/react-table-utils.ts      |  50 +-
 .../date-floor-shift-ceil-utc.spec.ts         | 169 ----
 .../date-floor-shift-ceil.spec.ts             | 181 ----
 .../date-floor-shift-ceil.ts                  | 296 ------
 web-console/src/utils/date.spec.ts            |   9 +
 web-console/src/utils/date.ts                 |  11 +-
 web-console/src/utils/download.ts             |   2 +-
 web-console/src/utils/druid-query.spec.ts     |   2 +-
 web-console/src/utils/druid-query.ts          |   8 +-
 .../src/utils/duration/duration.spec.ts       | 505 ----------
 web-console/src/utils/duration/duration.ts    | 388 --------
 web-console/src/utils/general.spec.ts         |  14 +-
 web-console/src/utils/general.tsx             |  28 +-
 web-console/src/utils/index.tsx               |   2 -
 .../load-rule => utils}/load-rule.ts          |   3 +-
 web-console/src/utils/query-action.ts         |   2 +-
 .../src/utils/query-manager/query-manager.ts  |   2 +-
 web-console/src/utils/sampler.ts              |   2 +-
 web-console/src/utils/sql.spec.ts             |   2 +-
 web-console/src/utils/sql.ts                  |   4 +-
 web-console/src/utils/table-helpers.ts        |  26 +-
 web-console/src/utils/types.ts                |   2 +-
 web-console/src/utils/values-query.spec.tsx   |   2 +-
 web-console/src/utils/values-query.tsx        |   4 +-
 .../datasources-view.spec.tsx.snap            |   1 -
 .../datasources-view/datasources-view.scss    |   9 +-
 .../datasources-view/datasources-view.tsx     | 145 +--
 .../column-picker-menu/column-picker-menu.tsx |   2 +-
 .../column-picker/column-picker.tsx           |   2 +-
 .../components/control-pane/control-pane.tsx  |   4 +-
 .../control-pane/expression-menu.tsx          |   4 +-
 .../components/control-pane/measure-menu.tsx  |   4 +-
 .../droppable-container.tsx                   |   2 +-
 .../contains-filter-control.tsx               |   4 +-
 .../filter-pane/filter-menu/filter-menu.tsx   |   4 +-
 .../number-range-filter-control.tsx           |   2 +-
 .../regexp-filter-control.tsx                 |   4 +-
 .../time-interval-filter-control.tsx          |   2 +-
 .../time-relative-filter-control.tsx          |   2 +-
 .../values-filter-control.tsx                 |   4 +-
 .../components/filter-pane/filter-pane.tsx    |   6 +-
 .../generic-output-table.tsx                  |   4 +-
 .../components/module-pane/module-pane.tsx    |   5 +-
 .../components/preview-pane/preview-pane.tsx  |   2 +-
 .../column-dialog/column-dialog.tsx           |   4 +-
 .../measure-dialog/measure-dialog.tsx         |   2 +-
 .../nested-column-dialog.tsx                  |   4 +-
 .../resource-pane/resource-pane.tsx           |   2 +-
 .../components/source-pane/source-pane.tsx    |   6 +-
 .../components/sql-input/sql-input.tsx        |   4 +-
 .../src/views/explore-view/drag-helper.ts     |   2 +-
 .../src/views/explore-view/explore-state.ts   |   4 +-
 .../src/views/explore-view/explore-view.tsx   |   4 +-
 .../explore-view/models/expression-meta.ts    |   4 +-
 .../src/views/explore-view/models/index.ts    |   1 +
 .../explore-view/models/measure-pattern.ts    |   4 +-
 .../src/views/explore-view/models/measure.ts  |   4 +-
 .../views/explore-view/models/query-source.ts |   4 +-
 .../explore-view/models}/stage.ts             |  14 -
 .../module-repository/module-repository.ts    |   5 +-
 .../explore-view/modules/bar-chart-module.tsx |   2 +-
 .../modules/grouping-table-module.tsx         |   4 +-
 .../modules/multi-axis-chart-module.tsx       |  16 +-
 .../explore-view/modules/pie-chart-module.tsx |   2 +-
 .../modules/record-table-module.tsx           |   2 +-
 .../modules/time-chart-module.tsx             |  19 +-
 .../query-macros/aggregate.spec.ts            |   2 +-
 .../explore-view/query-macros/aggregate.ts    |   2 +-
 .../query-macros/max-data-time.ts             |   4 +-
 .../views/explore-view/utils/duration.spec.ts |  39 +
 .../src/views/explore-view/utils/duration.ts  |  46 +
 .../utils/filter-pattern-helpers.ts           |  10 +-
 .../src/views/explore-view/utils/general.ts   |   4 +-
 .../utils/get-auto-granularity.ts             |  87 +-
 .../src/views/explore-view/utils/index.ts     |   2 +
 .../explore-view/utils/max-time-for-table.ts  |   2 +-
 .../explore-view/utils/snap-to-granularity.ts |  57 ++
 .../explore-view/utils/table-query.spec.ts    |   4 +-
 .../views/explore-view/utils/table-query.ts   |  11 +-
 .../utils/time-manipulation.spec.ts           |   2 +-
 .../explore-view/utils/time-manipulation.ts   |   2 +-
 .../datasources-card/datasources-card.tsx     |  10 +-
 .../home-view/segments-card/segments-card.tsx |   7 +-
 .../home-view/services-card/services-card.tsx |  13 +-
 .../supervisors-card/supervisors-card.tsx     |  15 +-
 .../views/home-view/tasks-card/tasks-card.tsx |  17 +-
 .../views/load-data-view/load-data-view.tsx   |   4 +-
 .../src/views/lookups-view/lookups-view.tsx   |  14 +-
 .../__snapshots__/segments-view.spec.tsx.snap |  57 +-
 .../views/segments-view/segments-view.scss    |   2 +-
 .../src/views/segments-view/segments-view.tsx | 521 +++++-----
 .../src/views/services-view/services-view.tsx |  48 +-
 .../column-actions/column-actions.tsx         |   4 +-
 .../column-editor/column-editor.tsx           |   4 +-
 .../expression-editor-dialog.tsx              |   2 +-
 .../ingestion-progress-dialog.tsx             |   2 +-
 .../schema-step/column-list/column-list.tsx   |   2 +-
 .../expression-entry/expression-entry.tsx     |   4 +-
 .../preview-table/preview-table.tsx           |   6 +-
 .../rollup-analysis-pane.tsx                  |   4 +-
 .../schema-step/schema-step.tsx               |   6 +-
 .../sql-data-loader-view.tsx                  |   2 +-
 .../supervisors-view.spec.tsx.snap            |  12 +-
 .../supervisors-view/supervisors-view.tsx     | 119 +--
 .../src/views/tasks-view/tasks-view.tsx       |  37 +-
 .../complex-menu-items.spec.tsx               |   2 +-
 .../complex-menu-items/complex-menu-items.tsx |   4 +-
 .../number-menu-items.spec.tsx                |   2 +-
 .../number-menu-items/number-menu-items.tsx   |   4 +-
 .../string-menu-items.spec.tsx                |   2 +-
 .../string-menu-items/string-menu-items.tsx   |   4 +-
 .../time-menu-items/time-menu-items.spec.tsx  |   2 +-
 .../time-menu-items/time-menu-items.tsx       |  74 +-
 .../column-tree/column-tree.spec.tsx          |   2 +-
 .../column-tree/column-tree.tsx               |   4 +-
 .../connect-external-data-dialog.tsx          |   2 +-
 .../current-dart-panel/current-dart-panel.tsx |  12 +-
 .../execution-details-pane.tsx                |   2 +-
 .../execution-stages-pane.tsx                 |   2 +-
 .../flexible-query-input.tsx                  |   2 +-
 .../ingest-success-pane.tsx                   |   2 +-
 .../input-format-step/input-format-step.tsx   |   4 +-
 .../input-source-step/input-source-step.tsx   |   2 +-
 .../query-parameters-dialog.tsx               |   4 +-
 .../workbench-view/query-tab/query-tab.tsx    |  15 +-
 .../recent-query-task-panel.tsx               |  20 +-
 .../result-table-pane/result-table-pane.tsx   |   4 +-
 .../workbench-view/run-panel/run-panel.tsx    |  71 +-
 .../time-floor-menu-item.tsx                  |   4 +-
 .../timezone-menu-items.spec.tsx.snap         | 563 -----------
 .../timezone-menu-items.tsx                   | 151 ---
 .../views/workbench-view/work-state-store.ts  |  22 +-
 .../views/workbench-view/workbench-view.tsx   |   4 +-
 200 files changed, 2379 insertions(+), 5580 deletions(-)
 delete mode 100644 web-console/src/components/portal-bubble/portal-bubble.scss
 delete mode 100644 web-console/src/components/portal-bubble/portal-bubble.tsx
 create mode 100644 web-console/src/components/segment-timeline/__snapshots__/bar-unit.spec.tsx.snap
 create mode 100644 web-console/src/components/segment-timeline/bar-group.tsx
 rename web-console/src/components/segment-timeline/{segment-bar-chart.scss => bar-unit.spec.tsx} (68%)
 rename web-console/src/{views/workbench-view/timezone-menu-items/timezone-menu-items.spec.tsx => components/segment-timeline/bar-unit.tsx} (58%)
 delete mode 100644 web-console/src/components/segment-timeline/common.ts
 delete mode 100644 web-console/src/components/segment-timeline/segment-bar-chart-render.scss
 delete mode 100644 web-console/src/components/segment-timeline/segment-bar-chart-render.tsx
 delete mode 100644 web-console/src/components/segment-timeline/segment-bar-chart.tsx
 rename web-console/src/{druid-models/datasource/datasource.ts => components/segment-timeline/stacked-bar-chart.scss} (64%)
 create mode 100644 web-console/src/components/segment-timeline/stacked-bar-chart.tsx
 delete mode 100644 web-console/src/druid-models/segment/segment.ts
 delete mode 100755 web-console/src/utils/date-floor-shift-ceil/date-floor-shift-ceil-utc.spec.ts
 delete mode 100755 web-console/src/utils/date-floor-shift-ceil/date-floor-shift-ceil.spec.ts
 delete mode 100755 web-console/src/utils/date-floor-shift-ceil/date-floor-shift-ceil.ts
 delete mode 100755 web-console/src/utils/duration/duration.spec.ts
 delete mode 100755 web-console/src/utils/duration/duration.ts
 rename web-console/src/{druid-models/load-rule => utils}/load-rule.ts (97%)
 rename web-console/src/{utils => views/explore-view/models}/stage.ts (80%)
 create mode 100644 web-console/src/views/explore-view/utils/duration.spec.ts
 create mode 100644 web-console/src/views/explore-view/utils/duration.ts
 create mode 100644 web-console/src/views/explore-view/utils/snap-to-granularity.ts
 delete mode 100644 web-console/src/views/workbench-view/timezone-menu-items/__snapshots__/timezone-menu-items.spec.tsx.snap
 delete mode 100644 web-console/src/views/workbench-view/timezone-menu-items/timezone-menu-items.tsx

diff --git a/licenses.yaml b/licenses.yaml
index 8044beb12bab..1f05bb5d1d7f 100644
--- a/licenses.yaml
+++ b/licenses.yaml
@@ -5125,6 +5125,15 @@ version: 5.2.5
 
 ---
 
+name: "@druid-toolkit/query"
+license_category: binary
+module: web-console
+license_name: Apache License version 2.0
+copyright: Imply Data
+version: 0.22.23
+
+---
+
 name: "@emotion/cache"
 license_category: binary
 module: web-console
@@ -5215,16 +5224,6 @@ license_file_path: licenses/bin/@emotion-weak-memoize.MIT
 
 ---
 
-name: "@flatten-js/interval-tree"
-license_category: binary
-module: web-console
-license_name: MIT License
-copyright: Alex Bol
-version: 1.1.3
-license_file_path: licenses/bin/@flatten-js-interval-tree.MIT
-
----
-
 name: "@fontsource/open-sans"
 license_category: binary
 module: web-console
@@ -5235,15 +5234,6 @@ license_file_path: licenses/bin/@fontsource-open-sans.OFL
 
 ---
 
-name: "@internationalized/date"
-license_category: binary
-module: web-console
-license_name: Apache License version 2.0
-copyright: Adobe
-version: 3.5.6
-
----
-
 name: "@popperjs/core"
 license_category: binary
 module: web-console
@@ -5254,15 +5244,6 @@ license_file_path: licenses/bin/@popperjs-core.MIT
 
 ---
 
-name: "@swc/helpers"
-license_category: binary
-module: web-console
-license_name: Apache License version 2.0
-copyright: 강동윤
-version: 0.5.13
-
----
-
 name: "@types/parse-json"
 license_category: binary
 module: web-console
@@ -5423,6 +5404,15 @@ license_file_path: licenses/bin/change-case.MIT
 
 ---
 
+name: "chronoshift"
+license_category: binary
+module: web-console
+license_name: Apache License version 2.0
+copyright: Vadim Ogievetsky
+version: 0.10.0
+
+---
+
 name: "classnames"
 license_category: binary
 module: web-console
@@ -5712,15 +5702,6 @@ license_file_path: licenses/bin/dot-case.MIT
 
 ---
 
-name: "druid-query-toolkit"
-license_category: binary
-module: web-console
-license_name: Apache License version 2.0
-copyright: Imply Data
-version: 1.0.0
-
----
-
 name: "echarts"
 license_category: binary
 module: web-console
@@ -5820,6 +5801,16 @@ license_file_path: licenses/bin/has-flag.MIT
 
 ---
 
+name: "has-own-prop"
+license_category: binary
+module: web-console
+license_name: MIT License
+copyright: Sindre Sorhus
+version: 2.0.0
+license_file_path: licenses/bin/has-own-prop.MIT
+
+---
+
 name: "hasown"
 license_category: binary
 module: web-console
@@ -5880,6 +5871,15 @@ license_file_path: licenses/bin/iconv-lite.MIT
 
 ---
 
+name: "immutable-class"
+license_category: binary
+module: web-console
+license_name: Apache License version 2.0
+copyright: Vadim Ogievetsky
+version: 0.11.2
+
+---
+
 name: "import-fresh"
 license_category: binary
 module: web-console
@@ -6060,6 +6060,26 @@ license_file_path: licenses/bin/mime-types.MIT
 
 ---
 
+name: "moment-timezone"
+license_category: binary
+module: web-console
+license_name: MIT License
+copyright: Tim Wood
+version: 0.5.43
+license_file_path: licenses/bin/moment-timezone.MIT
+
+---
+
+name: "moment"
+license_category: binary
+module: web-console
+license_name: MIT License
+copyright: Iskren Ivov Chernev
+version: 2.29.4
+license_file_path: licenses/bin/moment.MIT
+
+---
+
 name: "no-case"
 license_category: binary
 module: web-console
diff --git a/web-console/e2e-tests/tutorial-batch.spec.ts b/web-console/e2e-tests/tutorial-batch.spec.ts
index 59ac0a407810..3fa15af9d2a4 100644
--- a/web-console/e2e-tests/tutorial-batch.spec.ts
+++ b/web-console/e2e-tests/tutorial-batch.spec.ts
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-import { T } from 'druid-query-toolkit';
+import { T } from '@druid-toolkit/query';
 import type * as playwright from 'playwright-chromium';
 
 import { DatasourcesOverview } from './component/datasources/overview';
diff --git a/web-console/jest.common.config.js b/web-console/jest.common.config.js
index 1ea8f55ad18b..89e3dab5852b 100644
--- a/web-console/jest.common.config.js
+++ b/web-console/jest.common.config.js
@@ -18,8 +18,6 @@
 
 const { createJsWithTsPreset } = require('ts-jest');
 
-process.env.TZ = 'UTC';
-
 module.exports = {
   testEnvironment: 'jsdom',
   transformIgnorePatterns: ['/node_modules/(?!(d3-.+)/)'],
diff --git a/web-console/lib/keywords.ts b/web-console/lib/keywords.ts
index 5985ae0a6aa6..06d7ccdcc949 100644
--- a/web-console/lib/keywords.ts
+++ b/web-console/lib/keywords.ts
@@ -100,23 +100,15 @@ export const SQL_EXPRESSION_PARTS = [
   'TRAILING',
   'EPOCH',
   'SECOND',
-  'SECONDS',
   'MINUTE',
-  'MINUTES',
   'HOUR',
-  'HOURS',
   'DAY',
-  'DAYS',
   'DOW',
   'DOY',
   'WEEK',
-  'WEEKS',
   'MONTH',
-  'MONTHS',
   'QUARTER',
-  'QUARTERS',
   'YEAR',
-  'YEARS',
   'TIMESTAMP',
   'INTERVAL',
   'CSV',
diff --git a/web-console/package-lock.json b/web-console/package-lock.json
index 27a3d463aad2..95768117648c 100644
--- a/web-console/package-lock.json
+++ b/web-console/package-lock.json
@@ -14,11 +14,11 @@
         "@blueprintjs/datetime2": "^2.3.11",
         "@blueprintjs/icons": "^5.13.0",
         "@blueprintjs/select": "^5.2.5",
-        "@flatten-js/interval-tree": "^1.1.3",
+        "@druid-toolkit/query": "^0.22.23",
         "@fontsource/open-sans": "^5.0.30",
-        "@internationalized/date": "^3.5.6",
         "ace-builds": "~1.5.3",
         "axios": "^1.7.7",
+        "chronoshift": "^0.10.0",
         "classnames": "^2.2.6",
         "copy-to-clipboard": "^3.3.3",
         "d3-array": "^3.2.4",
@@ -28,7 +28,6 @@
         "d3-scale-chromatic": "^3.1.0",
         "d3-selection": "^3.0.0",
         "date-fns": "^2.28.0",
-        "druid-query-toolkit": "^1.0.0",
         "echarts": "^5.5.1",
         "file-saver": "^2.0.5",
         "hjson": "^3.2.2",
@@ -2086,6 +2085,15 @@
         "node": ">=10.0.0"
       }
     },
+    "node_modules/@druid-toolkit/query": {
+      "version": "0.22.23",
+      "resolved": "https://registry.npmjs.org/@druid-toolkit/query/-/query-0.22.23.tgz",
+      "integrity": "sha512-yQOUAQJP63rzsTCdLcqNB8aRtsYPw8rYBfPSXc4zfAA4y/GJc9OJeHcLFRMdUtpwBtm0ueARMUlTSQcTsyV8gQ==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "tslib": "^2.5.2"
+      }
+    },
     "node_modules/@dual-bundle/import-meta-resolve": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/@dual-bundle/import-meta-resolve/-/import-meta-resolve-4.1.0.tgz",
@@ -2365,9 +2373,9 @@
       }
     },
     "node_modules/@eslint/plugin-kit": {
-      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.2.3.tgz",
-      "integrity": "sha512-2b/g5hRmpbb1o4GnTZax9N9m0FXzz9OV42ZzI4rDDMDuHUqigAiQCEWChBWCY4ztAGVRjoWT19v0yMmc5/L5kA==",
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.2.0.tgz",
+      "integrity": "sha512-vH9PiIMMwvhCx31Af3HiGzsVNULDbyVkHXwlemn/B0TFj/00ho3y55efXrUZTfQipxoHC5u4xq6zblww1zm1Ig==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
@@ -2377,12 +2385,6 @@
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       }
     },
-    "node_modules/@flatten-js/interval-tree": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/@flatten-js/interval-tree/-/interval-tree-1.1.3.tgz",
-      "integrity": "sha512-xhFWUBoHJFF77cJO1D6REjdgJEMRf2Y2Z+eKEPav8evGKcLSnj1ud5pLXQSbGuxF3VSvT1rWhMfVpXEKJLTL+A==",
-      "license": "MIT"
-    },
     "node_modules/@fontsource/open-sans": {
       "version": "5.1.0",
       "resolved": "https://registry.npmjs.org/@fontsource/open-sans/-/open-sans-5.1.0.tgz",
@@ -2440,15 +2442,6 @@
         "url": "https://github.com/sponsors/nzakas"
       }
     },
-    "node_modules/@internationalized/date": {
-      "version": "3.5.6",
-      "resolved": "https://registry.npmjs.org/@internationalized/date/-/date-3.5.6.tgz",
-      "integrity": "sha512-jLxQjefH9VI5P9UQuqB6qNKnvFt1Ky1TPIzHGsIlCi7sZZoMR8SdYbBGRvM0y+Jtb+ez4ieBzmiAUcpmPYpyOw==",
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@swc/helpers": "^0.5.0"
-      }
-    },
     "node_modules/@istanbuljs/load-nyc-config": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz",
@@ -3480,15 +3473,6 @@
         "url": "https://opencollective.com/eslint"
       }
     },
-    "node_modules/@swc/helpers": {
-      "version": "0.5.13",
-      "resolved": "https://registry.npmjs.org/@swc/helpers/-/helpers-0.5.13.tgz",
-      "integrity": "sha512-UoKGxQ3r5kYI9dALKJapMmuK+1zWM/H17Z1+iwnNmzcJRnfFuevZs375TA5rW31pu4BS4NoSy1fRsexDXfWn5w==",
-      "license": "Apache-2.0",
-      "dependencies": {
-        "tslib": "^2.4.0"
-      }
-    },
     "node_modules/@testing-library/dom": {
       "version": "10.4.0",
       "resolved": "https://registry.npmjs.org/@testing-library/dom/-/dom-10.4.0.tgz",
@@ -5818,6 +5802,16 @@
         "node": ">=6.0"
       }
     },
+    "node_modules/chronoshift": {
+      "version": "0.10.0",
+      "resolved": "https://registry.npmjs.org/chronoshift/-/chronoshift-0.10.0.tgz",
+      "integrity": "sha512-dNvumPg7R6ACUOKbGo1zH6DtmTo5ut9/LNbzqaKGnpC9VdArIos8+kApHOVIZH4FCpm9M9XYh++jwlRHhc1PyA==",
+      "dependencies": {
+        "immutable-class": "^0.11.0",
+        "moment-timezone": "^0.5.26",
+        "tslib": "^2.3.1"
+      }
+    },
     "node_modules/ci-info": {
       "version": "3.3.0",
       "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.3.0.tgz",
@@ -6211,11 +6205,10 @@
       "dev": true
     },
     "node_modules/cross-spawn": {
-      "version": "7.0.6",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
-      "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==",
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
+      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "path-key": "^3.1.0",
         "shebang-command": "^2.0.0",
@@ -7020,15 +7013,6 @@
         "tslib": "^2.0.3"
       }
     },
-    "node_modules/druid-query-toolkit": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/druid-query-toolkit/-/druid-query-toolkit-1.0.0.tgz",
-      "integrity": "sha512-yBQR4uDcks0lcsRSWoLQy16YQ4dx264m6i7TNQDFrACUKHlMtnw5l+4+UDZKbXbpUFLMLWCr/kLhmXzLJk50+Q==",
-      "license": "Apache-2.0",
-      "dependencies": {
-        "tslib": "^2.5.2"
-      }
-    },
     "node_modules/duplexer": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.2.tgz",
@@ -8925,6 +8909,14 @@
         "node": ">=4"
       }
     },
+    "node_modules/has-own-prop": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/has-own-prop/-/has-own-prop-2.0.0.tgz",
+      "integrity": "sha512-Pq0h+hvsVm6dDEa8x82GnLSYHOzNDt7f0ddFa3FqcQlgzEiptPqL+XrOJNavjOzSYiYWIrgeVYYgGlLmnxwilQ==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/has-property-descriptors": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz",
@@ -9221,11 +9213,10 @@
       "dev": true
     },
     "node_modules/http-proxy-middleware": {
-      "version": "2.0.7",
-      "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-2.0.7.tgz",
-      "integrity": "sha512-fgVY8AV7qU7z/MmXJ/rxwbrtQH4jBQ9m7kp3llF0liB7glmFeVZFBepQb32T3y8n8k2+AEYuMPCpinYW+/CuRA==",
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-2.0.6.tgz",
+      "integrity": "sha512-ya/UeJ6HVBYxrgYotAZo1KvPWlgB48kUJLDePFeneHsVujFaW5WNj2NgWCAE//B1Dl02BIfYlpNgBy8Kf8Rjmw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@types/http-proxy": "^1.17.8",
         "http-proxy": "^1.18.1",
@@ -9363,6 +9354,15 @@
       "integrity": "sha512-0AOCmOip+xgJwEVTQj1EfiDDOkPmuyllDuTuEX+DDXUgapLAsBIfkg3sxCYyCEA8mQqZrrxPUGjcOQ2JS3WLkg==",
       "dev": true
     },
+    "node_modules/immutable-class": {
+      "version": "0.11.2",
+      "resolved": "https://registry.npmjs.org/immutable-class/-/immutable-class-0.11.2.tgz",
+      "integrity": "sha512-CzkVPkJXzkspt6RX+ipNgtvt16+rzEBUlA3yNPLkK5/S042c9wvuyfE4F5TfMfPJ6XF86Fp+OCwu6eeAnMICuw==",
+      "dependencies": {
+        "has-own-prop": "^2.0.0",
+        "tslib": "^2.3.1"
+      }
+    },
     "node_modules/import-fresh": {
       "version": "3.3.0",
       "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
@@ -12889,6 +12889,25 @@
         "mkdirp": "bin/cmd.js"
       }
     },
+    "node_modules/moment": {
+      "version": "2.29.4",
+      "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.4.tgz",
+      "integrity": "sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w==",
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/moment-timezone": {
+      "version": "0.5.43",
+      "resolved": "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.43.tgz",
+      "integrity": "sha512-72j3aNyuIsDxdF1i7CEgV2FfxM1r6aaqJyLB2vwb33mXYyoyLly+F1zbWqhA3/bVIoJ4szlUoMbUnVdid32NUQ==",
+      "dependencies": {
+        "moment": "^2.29.4"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
     "node_modules/mrmime": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/mrmime/-/mrmime-1.0.1.tgz",
@@ -19541,6 +19560,14 @@
       "integrity": "sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw==",
       "dev": true
     },
+    "@druid-toolkit/query": {
+      "version": "0.22.23",
+      "resolved": "https://registry.npmjs.org/@druid-toolkit/query/-/query-0.22.23.tgz",
+      "integrity": "sha512-yQOUAQJP63rzsTCdLcqNB8aRtsYPw8rYBfPSXc4zfAA4y/GJc9OJeHcLFRMdUtpwBtm0ueARMUlTSQcTsyV8gQ==",
+      "requires": {
+        "tslib": "^2.5.2"
+      }
+    },
     "@dual-bundle/import-meta-resolve": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/@dual-bundle/import-meta-resolve/-/import-meta-resolve-4.1.0.tgz",
@@ -19747,19 +19774,14 @@
       "dev": true
     },
     "@eslint/plugin-kit": {
-      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.2.3.tgz",
-      "integrity": "sha512-2b/g5hRmpbb1o4GnTZax9N9m0FXzz9OV42ZzI4rDDMDuHUqigAiQCEWChBWCY4ztAGVRjoWT19v0yMmc5/L5kA==",
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.2.0.tgz",
+      "integrity": "sha512-vH9PiIMMwvhCx31Af3HiGzsVNULDbyVkHXwlemn/B0TFj/00ho3y55efXrUZTfQipxoHC5u4xq6zblww1zm1Ig==",
       "dev": true,
       "requires": {
         "levn": "^0.4.1"
       }
     },
-    "@flatten-js/interval-tree": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/@flatten-js/interval-tree/-/interval-tree-1.1.3.tgz",
-      "integrity": "sha512-xhFWUBoHJFF77cJO1D6REjdgJEMRf2Y2Z+eKEPav8evGKcLSnj1ud5pLXQSbGuxF3VSvT1rWhMfVpXEKJLTL+A=="
-    },
     "@fontsource/open-sans": {
       "version": "5.1.0",
       "resolved": "https://registry.npmjs.org/@fontsource/open-sans/-/open-sans-5.1.0.tgz",
@@ -19793,14 +19815,6 @@
       "integrity": "sha512-JBxkERygn7Bv/GbN5Rv8Ul6LVknS+5Bp6RgDC/O8gEBU/yeH5Ui5C/OlWrTb6qct7LjjfT6Re2NxB0ln0yYybA==",
       "dev": true
     },
-    "@internationalized/date": {
-      "version": "3.5.6",
-      "resolved": "https://registry.npmjs.org/@internationalized/date/-/date-3.5.6.tgz",
-      "integrity": "sha512-jLxQjefH9VI5P9UQuqB6qNKnvFt1Ky1TPIzHGsIlCi7sZZoMR8SdYbBGRvM0y+Jtb+ez4ieBzmiAUcpmPYpyOw==",
-      "requires": {
-        "@swc/helpers": "^0.5.0"
-      }
-    },
     "@istanbuljs/load-nyc-config": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz",
@@ -20600,14 +20614,6 @@
         }
       }
     },
-    "@swc/helpers": {
-      "version": "0.5.13",
-      "resolved": "https://registry.npmjs.org/@swc/helpers/-/helpers-0.5.13.tgz",
-      "integrity": "sha512-UoKGxQ3r5kYI9dALKJapMmuK+1zWM/H17Z1+iwnNmzcJRnfFuevZs375TA5rW31pu4BS4NoSy1fRsexDXfWn5w==",
-      "requires": {
-        "tslib": "^2.4.0"
-      }
-    },
     "@testing-library/dom": {
       "version": "10.4.0",
       "resolved": "https://registry.npmjs.org/@testing-library/dom/-/dom-10.4.0.tgz",
@@ -22405,6 +22411,16 @@
       "integrity": "sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==",
       "dev": true
     },
+    "chronoshift": {
+      "version": "0.10.0",
+      "resolved": "https://registry.npmjs.org/chronoshift/-/chronoshift-0.10.0.tgz",
+      "integrity": "sha512-dNvumPg7R6ACUOKbGo1zH6DtmTo5ut9/LNbzqaKGnpC9VdArIos8+kApHOVIZH4FCpm9M9XYh++jwlRHhc1PyA==",
+      "requires": {
+        "immutable-class": "^0.11.0",
+        "moment-timezone": "^0.5.26",
+        "tslib": "^2.3.1"
+      }
+    },
     "ci-info": {
       "version": "3.3.0",
       "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.3.0.tgz",
@@ -22719,9 +22735,9 @@
       "dev": true
     },
     "cross-spawn": {
-      "version": "7.0.6",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
-      "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==",
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
+      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
       "dev": true,
       "requires": {
         "path-key": "^3.1.0",
@@ -23260,14 +23276,6 @@
         "tslib": "^2.0.3"
       }
     },
-    "druid-query-toolkit": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/druid-query-toolkit/-/druid-query-toolkit-1.0.0.tgz",
-      "integrity": "sha512-yBQR4uDcks0lcsRSWoLQy16YQ4dx264m6i7TNQDFrACUKHlMtnw5l+4+UDZKbXbpUFLMLWCr/kLhmXzLJk50+Q==",
-      "requires": {
-        "tslib": "^2.5.2"
-      }
-    },
     "duplexer": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.2.tgz",
@@ -24642,6 +24650,11 @@
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
       "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0="
     },
+    "has-own-prop": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/has-own-prop/-/has-own-prop-2.0.0.tgz",
+      "integrity": "sha512-Pq0h+hvsVm6dDEa8x82GnLSYHOzNDt7f0ddFa3FqcQlgzEiptPqL+XrOJNavjOzSYiYWIrgeVYYgGlLmnxwilQ=="
+    },
     "has-property-descriptors": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz",
@@ -24871,9 +24884,9 @@
       }
     },
     "http-proxy-middleware": {
-      "version": "2.0.7",
-      "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-2.0.7.tgz",
-      "integrity": "sha512-fgVY8AV7qU7z/MmXJ/rxwbrtQH4jBQ9m7kp3llF0liB7glmFeVZFBepQb32T3y8n8k2+AEYuMPCpinYW+/CuRA==",
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-2.0.6.tgz",
+      "integrity": "sha512-ya/UeJ6HVBYxrgYotAZo1KvPWlgB48kUJLDePFeneHsVujFaW5WNj2NgWCAE//B1Dl02BIfYlpNgBy8Kf8Rjmw==",
       "dev": true,
       "requires": {
         "@types/http-proxy": "^1.17.8",
@@ -24969,6 +24982,15 @@
       "integrity": "sha512-0AOCmOip+xgJwEVTQj1EfiDDOkPmuyllDuTuEX+DDXUgapLAsBIfkg3sxCYyCEA8mQqZrrxPUGjcOQ2JS3WLkg==",
       "dev": true
     },
+    "immutable-class": {
+      "version": "0.11.2",
+      "resolved": "https://registry.npmjs.org/immutable-class/-/immutable-class-0.11.2.tgz",
+      "integrity": "sha512-CzkVPkJXzkspt6RX+ipNgtvt16+rzEBUlA3yNPLkK5/S042c9wvuyfE4F5TfMfPJ6XF86Fp+OCwu6eeAnMICuw==",
+      "requires": {
+        "has-own-prop": "^2.0.0",
+        "tslib": "^2.3.1"
+      }
+    },
     "import-fresh": {
       "version": "3.3.0",
       "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
@@ -27535,6 +27557,19 @@
         "minimist": "^1.2.5"
       }
     },
+    "moment": {
+      "version": "2.29.4",
+      "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.4.tgz",
+      "integrity": "sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w=="
+    },
+    "moment-timezone": {
+      "version": "0.5.43",
+      "resolved": "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.43.tgz",
+      "integrity": "sha512-72j3aNyuIsDxdF1i7CEgV2FfxM1r6aaqJyLB2vwb33mXYyoyLly+F1zbWqhA3/bVIoJ4szlUoMbUnVdid32NUQ==",
+      "requires": {
+        "moment": "^2.29.4"
+      }
+    },
     "mrmime": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/mrmime/-/mrmime-1.0.1.tgz",
diff --git a/web-console/package.json b/web-console/package.json
index 39eae99e101b..1e76234841ab 100644
--- a/web-console/package.json
+++ b/web-console/package.json
@@ -55,11 +55,11 @@
     "@blueprintjs/datetime2": "^2.3.11",
     "@blueprintjs/icons": "^5.13.0",
     "@blueprintjs/select": "^5.2.5",
-    "@flatten-js/interval-tree": "^1.1.3",
+    "@druid-toolkit/query": "^0.22.23",
     "@fontsource/open-sans": "^5.0.30",
-    "@internationalized/date": "^3.5.6",
     "ace-builds": "~1.5.3",
     "axios": "^1.7.7",
+    "chronoshift": "^0.10.0",
     "classnames": "^2.2.6",
     "copy-to-clipboard": "^3.3.3",
     "d3-array": "^3.2.4",
@@ -69,7 +69,6 @@
     "d3-scale-chromatic": "^3.1.0",
     "d3-selection": "^3.0.0",
     "date-fns": "^2.28.0",
-    "druid-query-toolkit": "^1.0.0",
     "echarts": "^5.5.1",
     "file-saver": "^2.0.5",
     "hjson": "^3.2.2",
diff --git a/web-console/script/create-sql-docs.mjs b/web-console/script/create-sql-docs.mjs
index b14055341a0d..62e1f44d0177 100755
--- a/web-console/script/create-sql-docs.mjs
+++ b/web-console/script/create-sql-docs.mjs
@@ -39,12 +39,6 @@ const initialFunctionDocs = {
       ),
     ],
   ],
-  UNNEST: [
-    [
-      'arrayExpression',
-      convertMarkdownToHtml("Unnests ARRAY typed values. The source for UNNEST can be an array type column, or an input that's been transformed into an array, such as with helper functions like `MV_TO_ARRAY` or `ARRAY`.")
-    ]
-  ]
 };
 
 function hasHtmlTags(str) {
diff --git a/web-console/script/licenses b/web-console/script/licenses
index f4e67862d011..90f1420282ae 100755
--- a/web-console/script/licenses
+++ b/web-console/script/licenses
@@ -193,7 +193,6 @@ checker.init(
           if (name === 'diff-match-patch') publisher = 'Google';
           if (name === 'esutils') publisher = 'Yusuke Suzuki'; // https://github.com/estools/esutils#license
           if (name === 'echarts') publisher = 'Apache Software Foundation';
-          if (name === '@internationalized/date') publisher = 'Adobe';
         }
 
         if (!publisher) {
diff --git a/web-console/src/bootstrap/json-parser.tsx b/web-console/src/bootstrap/json-parser.tsx
index d8fd232795e7..7e8fc0994610 100644
--- a/web-console/src/bootstrap/json-parser.tsx
+++ b/web-console/src/bootstrap/json-parser.tsx
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-import { QueryResult } from 'druid-query-toolkit';
+import { QueryResult } from '@druid-toolkit/query';
 import * as JSONBig from 'json-bigint-native';
 
 export function bootstrapJsonParse() {
diff --git a/web-console/src/components/auto-form/__snapshots__/auto-form.spec.tsx.snap b/web-console/src/components/auto-form/__snapshots__/auto-form.spec.tsx.snap
index 0016d1c90323..dc566363abee 100644
--- a/web-console/src/components/auto-form/__snapshots__/auto-form.spec.tsx.snap
+++ b/web-console/src/components/auto-form/__snapshots__/auto-form.spec.tsx.snap
@@ -170,6 +170,7 @@ exports[`AutoForm matches snapshot 1`] = `
   </Memo(FormGroupWithInfo)>
   <Blueprint5.FormGroup>
     <Blueprint5.Button
+      fill={true}
       minimal={true}
       onClick={[Function]}
       rightIcon="chevron-down"
diff --git a/web-console/src/components/auto-form/auto-form.tsx b/web-console/src/components/auto-form/auto-form.tsx
index 7026ca5d5dc6..4c51d2cbf5a9 100644
--- a/web-console/src/components/auto-form/auto-form.tsx
+++ b/web-console/src/components/auto-form/auto-form.tsx
@@ -539,6 +539,7 @@ export class AutoForm<T extends Record<string, any>> extends React.PureComponent
           text={showMore ? 'Show less' : 'Show more'}
           rightIcon={showMore ? IconNames.CHEVRON_UP : IconNames.CHEVRON_DOWN}
           minimal
+          fill
           onClick={() => {
             this.setState(({ showMore }) => ({ showMore: !showMore }));
           }}
diff --git a/web-console/src/components/cell-filter-menu/cell-filter-menu.tsx b/web-console/src/components/cell-filter-menu/cell-filter-menu.tsx
index 5d2098c7db4d..dac3e2fc1979 100644
--- a/web-console/src/components/cell-filter-menu/cell-filter-menu.tsx
+++ b/web-console/src/components/cell-filter-menu/cell-filter-menu.tsx
@@ -18,8 +18,8 @@
 
 import { Menu, MenuItem } from '@blueprintjs/core';
 import { IconNames } from '@blueprintjs/icons';
-import type { Column, SqlExpression, SqlQuery } from 'druid-query-toolkit';
-import { C, L, SqlComparison, SqlLiteral, SqlRecord, trimString } from 'druid-query-toolkit';
+import type { Column, SqlExpression, SqlQuery } from '@druid-toolkit/query';
+import { C, L, SqlComparison, SqlLiteral, SqlRecord, trimString } from '@druid-toolkit/query';
 
 import type { QueryAction } from '../../utils';
 import { copyAndAlert, prettyPrintSql, stringifyValue } from '../../utils';
diff --git a/web-console/src/components/fancy-numeric-input/fancy-numeric-input.tsx b/web-console/src/components/fancy-numeric-input/fancy-numeric-input.tsx
index dad7c9a0617a..cb389ff532dc 100644
--- a/web-console/src/components/fancy-numeric-input/fancy-numeric-input.tsx
+++ b/web-console/src/components/fancy-numeric-input/fancy-numeric-input.tsx
@@ -19,8 +19,8 @@
 import type { InputGroupProps2, Intent } from '@blueprintjs/core';
 import { Button, ButtonGroup, Classes, ControlGroup, InputGroup, Keys } from '@blueprintjs/core';
 import { IconNames } from '@blueprintjs/icons';
+import { SqlExpression, SqlFunction, SqlLiteral, SqlMulti } from '@druid-toolkit/query';
 import classNames from 'classnames';
-import { SqlExpression, SqlFunction, SqlLiteral, SqlMulti } from 'druid-query-toolkit';
 import React, { useEffect, useState } from 'react';
 
 import { clamp } from '../../utils';
diff --git a/web-console/src/components/index.ts b/web-console/src/components/index.ts
index 18a4c21e72c2..d885bf07434a 100644
--- a/web-console/src/components/index.ts
+++ b/web-console/src/components/index.ts
@@ -43,7 +43,6 @@ export * from './menu-checkbox/menu-checkbox';
 export * from './more-button/more-button';
 export * from './plural-pair-if-needed/plural-pair-if-needed';
 export * from './popover-text/popover-text';
-export * from './portal-bubble/portal-bubble';
 export * from './query-error-pane/query-error-pane';
 export * from './record-table-pane/record-table-pane';
 export * from './refresh-button/refresh-button';
diff --git a/web-console/src/components/portal-bubble/portal-bubble.scss b/web-console/src/components/portal-bubble/portal-bubble.scss
deleted file mode 100644
index f29091150afc..000000000000
--- a/web-console/src/components/portal-bubble/portal-bubble.scss
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-@import '../../variables';
-
-$shpitz-size: 9px;
-
-.portal-bubble {
-  position: absolute;
-  @include card-like;
-
-  .#{$bp-ns}-dark & {
-    background: $dark-gray1;
-  }
-
-  &.up {
-    transform: translate(-50%, -100%);
-  }
-
-  &.down {
-    transform: translate(-50%, 0);
-  }
-
-  &.mute {
-    pointer-events: none;
-  }
-
-  & > .shpitz {
-    content: '';
-    position: absolute;
-    transform: translate(-50%, 0);
-    border-right: $shpitz-size solid transparent;
-    border-left: $shpitz-size solid transparent;
-  }
-
-  &.up > .shpitz {
-    bottom: -$shpitz-size;
-    border-top: $shpitz-size solid $dark-gray1;
-  }
-
-  &.down > .shpitz {
-    top: -$shpitz-size;
-    border-bottom: $shpitz-size solid $dark-gray1;
-  }
-
-  & > .bubble-title-bar {
-    position: relative;
-    padding: 5px 5px 0 5px;
-    white-space: nowrap;
-    font-weight: bold;
-
-    &.with-close {
-      padding-right: 26px;
-
-      .close-button {
-        position: absolute;
-        top: 0;
-        right: 0;
-      }
-    }
-  }
-
-  & > .bubble-content {
-    padding: 5px;
-    white-space: nowrap;
-  }
-
-  .bubble-title-bar + .bubble-content {
-    padding-top: 0;
-  }
-}
diff --git a/web-console/src/components/portal-bubble/portal-bubble.tsx b/web-console/src/components/portal-bubble/portal-bubble.tsx
deleted file mode 100644
index b8831c84bb09..000000000000
--- a/web-console/src/components/portal-bubble/portal-bubble.tsx
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import { Button } from '@blueprintjs/core';
-import { IconNames } from '@blueprintjs/icons';
-import classNames from 'classnames';
-import type { ReactNode } from 'react';
-import { useState } from 'react';
-import { createPortal } from 'react-dom';
-
-import { clamp } from '../../utils';
-
-import './portal-bubble.scss';
-
-const SHPITZ_SIZE = 10;
-
-export interface PortalBubbleOpenOn {
-  x: number;
-  y: number;
-  title?: string;
-  text: ReactNode;
-}
-
-export interface PortalBubbleProps {
-  className?: string;
-  openOn: PortalBubbleOpenOn | undefined;
-  direction?: 'up' | 'down';
-  onClose?(): void;
-  mute?: boolean;
-  minimal?: boolean;
-}
-
-export const PortalBubble = function PortalBubble(props: PortalBubbleProps) {
-  const { className, openOn, direction = 'up', onClose, mute, minimal } = props;
-  const [myWidth, setMyWidth] = useState(200);
-  if (!openOn) return null;
-
-  const halfMyWidth = myWidth / 2;
-
-  const x = clamp(openOn.x, halfMyWidth, window.innerWidth - halfMyWidth);
-  const offset = clamp(x - openOn.x, -halfMyWidth, halfMyWidth);
-
-  return createPortal(
-    <div
-      className={classNames('portal-bubble', className, direction, {
-        mute: mute && !onClose,
-      })}
-      ref={element => {
-        if (!element) return;
-        setMyWidth(element.offsetWidth);
-      }}
-      style={{
-        left: x,
-        top: openOn.y + (minimal ? 0 : direction === 'up' ? -SHPITZ_SIZE : SHPITZ_SIZE),
-      }}
-    >
-      {(openOn.title || onClose) && (
-        <div className={classNames('bubble-title-bar', { 'with-close': Boolean(onClose) })}>
-          {openOn.title}
-          {onClose && (
-            <Button
-              className="close-button"
-              icon={IconNames.CROSS}
-              small
-              minimal
-              onClick={onClose}
-            />
-          )}
-        </div>
-      )}
-      <div className="bubble-content">{openOn.text}</div>
-      {!minimal && (
-        <div className="shpitz" style={{ left: offset ? `calc(50% - ${offset}px)` : '50%' }} />
-      )}
-    </div>,
-    document.body,
-  );
-};
diff --git a/web-console/src/components/record-table-pane/record-table-pane.tsx b/web-console/src/components/record-table-pane/record-table-pane.tsx
index 803ee783c2cd..e44eab355602 100644
--- a/web-console/src/components/record-table-pane/record-table-pane.tsx
+++ b/web-console/src/components/record-table-pane/record-table-pane.tsx
@@ -18,8 +18,8 @@
 
 import { Button, Icon, Popover } from '@blueprintjs/core';
 import { IconNames } from '@blueprintjs/icons';
+import type { Column, QueryResult } from '@druid-toolkit/query';
 import classNames from 'classnames';
-import type { Column, QueryResult } from 'druid-query-toolkit';
 import React, { useEffect, useState } from 'react';
 import type { RowRenderProps } from 'react-table';
 import ReactTable from 'react-table';
diff --git a/web-console/src/components/rule-editor/__snapshots__/rule-editor.spec.tsx.snap b/web-console/src/components/rule-editor/__snapshots__/rule-editor.spec.tsx.snap
index 7246fe89490f..2769c8af739e 100644
--- a/web-console/src/components/rule-editor/__snapshots__/rule-editor.spec.tsx.snap
+++ b/web-console/src/components/rule-editor/__snapshots__/rule-editor.spec.tsx.snap
@@ -70,7 +70,7 @@ exports[`RuleEditor matches snapshot no tier in rule 1`] = `
       style="transform: translateY(0); transition: none;"
     >
       <div
-        class="rule-detail bp5-card bp5-elevation-2"
+        class="bp5-card bp5-elevation-2"
       >
         <div
           class="bp5-form-group"
@@ -451,7 +451,7 @@ exports[`RuleEditor matches snapshot with broadcast rule 1`] = `
       style="transform: translateY(0); transition: none;"
     >
       <div
-        class="rule-detail bp5-card bp5-elevation-2"
+        class="bp5-card bp5-elevation-2"
       >
         <div
           class="bp5-form-group"
@@ -629,7 +629,7 @@ exports[`RuleEditor matches snapshot with existing tier and non existing tier in
       style="transform: translateY(0); transition: none;"
     >
       <div
-        class="rule-detail bp5-card bp5-elevation-2"
+        class="bp5-card bp5-elevation-2"
       >
         <div
           class="bp5-form-group"
@@ -1190,7 +1190,7 @@ exports[`RuleEditor matches snapshot with existing tier in rule 1`] = `
       style="transform: translateY(0); transition: none;"
     >
       <div
-        class="rule-detail bp5-card bp5-elevation-2"
+        class="bp5-card bp5-elevation-2"
       >
         <div
           class="bp5-form-group"
@@ -1581,7 +1581,7 @@ exports[`RuleEditor matches snapshot with non existing tier in rule 1`] = `
       style="transform: translateY(0); transition: none;"
     >
       <div
-        class="rule-detail bp5-card bp5-elevation-2"
+        class="bp5-card bp5-elevation-2"
       >
         <div
           class="bp5-form-group"
diff --git a/web-console/src/components/rule-editor/rule-editor.scss b/web-console/src/components/rule-editor/rule-editor.scss
index cb021e85c01b..e5757bc2999d 100644
--- a/web-console/src/components/rule-editor/rule-editor.scss
+++ b/web-console/src/components/rule-editor/rule-editor.scss
@@ -28,8 +28,4 @@
   .include-future {
     margin-left: 15px;
   }
-
-  .rule-detail {
-    border: 1px solid rgba(255, 255, 255, 0.15);
-  }
 }
diff --git a/web-console/src/components/rule-editor/rule-editor.tsx b/web-console/src/components/rule-editor/rule-editor.tsx
index 8cea5321cfd7..c5dfb24ddf06 100644
--- a/web-console/src/components/rule-editor/rule-editor.tsx
+++ b/web-console/src/components/rule-editor/rule-editor.tsx
@@ -30,9 +30,9 @@ import {
 import { IconNames } from '@blueprintjs/icons';
 import React, { useState } from 'react';
 
-import type { Rule } from '../../druid-models';
-import { RuleUtil } from '../../druid-models';
 import { durationSanitizer } from '../../utils';
+import type { Rule } from '../../utils/load-rule';
+import { RuleUtil } from '../../utils/load-rule';
 import { SuggestibleInput } from '../suggestible-input/suggestible-input';
 
 import './rule-editor.scss';
@@ -170,7 +170,7 @@ export const RuleEditor = React.memo(function RuleEditor(props: RuleEditorProps)
       </div>
 
       <Collapse isOpen={isOpen}>
-        <Card className="rule-detail" elevation={2}>
+        <Card elevation={2}>
           <FormGroup>
             <ControlGroup>
               <HTMLSelect
diff --git a/web-console/src/components/segment-timeline/__snapshots__/bar-unit.spec.tsx.snap b/web-console/src/components/segment-timeline/__snapshots__/bar-unit.spec.tsx.snap
new file mode 100644
index 000000000000..7d98145d4b5e
--- /dev/null
+++ b/web-console/src/components/segment-timeline/__snapshots__/bar-unit.spec.tsx.snap
@@ -0,0 +1,13 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`BarUnit matches snapshot 1`] = `
+<svg>
+  <rect
+    class="bar-unit"
+    height="10"
+    width="10"
+    x="10"
+    y="10"
+  />
+</svg>
+`;
diff --git a/web-console/src/components/segment-timeline/__snapshots__/segment-timeline.spec.tsx.snap b/web-console/src/components/segment-timeline/__snapshots__/segment-timeline.spec.tsx.snap
index 206c2be703bd..ae30df246c2b 100644
--- a/web-console/src/components/segment-timeline/__snapshots__/segment-timeline.spec.tsx.snap
+++ b/web-console/src/components/segment-timeline/__snapshots__/segment-timeline.spec.tsx.snap
@@ -4,309 +4,191 @@ exports[`SegmentTimeline matches snapshot 1`] = `
 <div
   class="segment-timeline"
 >
-  <div
-    class="control-bar"
-  >
+  <div>
     <div
-      class="bp5-button-group"
+      class="loader"
     >
       <div
-        aria-controls="listbox-0"
-        aria-disabled="false"
-        aria-expanded="false"
-        aria-haspopup="listbox"
-        class="bp5-popover-target"
-        role="combobox"
+        class="loader-logo"
       >
-        <button
-          class="bp5-button bp5-small"
-          type="button"
+        <svg
+          viewBox="0 0 100 100"
         >
-          <span
-            class="bp5-button-text"
-          >
-            Datasource: all
-          </span>
-          <span
-            aria-hidden="true"
-            class="bp5-icon bp5-icon-caret-down"
-          >
-            <svg
-              data-icon="caret-down"
-              height="16"
-              role="img"
-              viewBox="0 0 16 16"
-              width="16"
-            >
-              <path
-                d="M12 6.5c0-.28-.22-.5-.5-.5h-7a.495.495 0 00-.37.83l3.5 4c.09.1.22.17.37.17s.28-.07.37-.17l3.5-4c.08-.09.13-.2.13-.33z"
-                fill-rule="evenodd"
-              />
-            </svg>
-          </span>
-        </button>
+          <path
+            class="one"
+            d="M54.2,69.8h-2.7c-0.7,0-1.3-0.6-1.3-1.3c0-0.7,0.6-1.3,1.3-1.3h2.7c11.5,0,23.8-7.4,23.8-23.7
+          c0-9.1-6.9-15.8-16.4-15.8H38c-0.7,0-1.3-0.6-1.3-1.3s0.6-1.3,1.3-1.3h23.6c5.3,0,10.1,1.9,13.6,5.3c3.5,3.4,5.4,8,5.4,13.1
+          c0,6.6-2.3,13-6.3,17.7C69.5,66.8,62.5,69.8,54.2,69.8z"
+          />
+          <path
+            class="two"
+            d="M55.7,59.5h-26c-0.7,0-1.3-0.6-1.3-1.3c0-0.7,0.6-1.3,1.3-1.3h26c7.5,0,11.5-5.8,11.5-11.5
+            c0-4.2-3.2-7.3-7.7-7.3h-26c-0.7,0-1.3-0.6-1.3-1.3s0.6-1.3,1.3-1.3h26c5.9,0,10.3,4.3,10.3,9.9c0,3.7-1.3,7.2-3.7,9.8
+            C63.5,58,59.9,59.5,55.7,59.5z"
+          />
+          <path
+            class="three"
+            d="M27.2,38h-6.3c-0.7,0-1.3-0.6-1.3-1.3s0.6-1.3,1.3-1.3h6.3c0.7,0,1.3,0.6,1.3,1.3S27.9,38,27.2,38z"
+          />
+          <path
+            class="four"
+            d="M45.1,69.8h-5.8c-0.7,0-1.3-0.6-1.3-1.3c0-0.7,0.6-1.3,1.3-1.3h5.8c0.7,0,1.3,0.6,1.3,1.3
+            C46.4,69.2,45.8,69.8,45.1,69.8z"
+          />
+        </svg>
       </div>
     </div>
-    <span
-      class="bp5-popover-target"
+  </div>
+  <div
+    class="side-control"
+  >
+    <div
+      class="bp5-form-group"
     >
-      <button
-        aria-expanded="false"
-        aria-haspopup="menu"
-        class="bp5-button bp5-small"
-        type="button"
+      <label
+        class="bp5-label"
       >
+        Show
+         
         <span
-          class="bp5-button-text"
-        >
-          Show: Size
-        </span>
-        <span
-          aria-hidden="true"
-          class="bp5-icon bp5-icon-caret-down"
+          class="bp5-text-muted"
+        />
+      </label>
+      <div
+        class="bp5-form-content"
+      >
+        <div
+          class="bp5-segmented-control bp5-fill"
+          role="radiogroup"
         >
-          <svg
-            data-icon="caret-down"
-            height="16"
-            role="img"
-            viewBox="0 0 16 16"
-            width="16"
+          <button
+            aria-checked="true"
+            class="bp5-button"
+            role="radio"
+            tabindex="0"
+            type="button"
           >
-            <path
-              d="M12 6.5c0-.28-.22-.5-.5-.5h-7a.495.495 0 00-.37.83l3.5 4c.09.1.22.17.37.17s.28-.07.37-.17l3.5-4c.08-.09.13-.2.13-.33z"
-              fill-rule="evenodd"
-            />
-          </svg>
-        </span>
-      </button>
-    </span>
-    <div
-      class="expander"
-    />
+            <span
+              class="bp5-button-text"
+            >
+              Total size
+            </span>
+          </button>
+          <button
+            aria-checked="false"
+            class="bp5-button bp5-minimal"
+            role="radio"
+            tabindex="-1"
+            type="button"
+          >
+            <span
+              class="bp5-button-text"
+            >
+              Segment count
+            </span>
+          </button>
+        </div>
+      </div>
+    </div>
     <div
-      class="bp5-button-group"
+      class="bp5-form-group"
     >
-      <button
-        class="bp5-button bp5-small"
-        data-tooltip="Previous time period
-2024-10-15 → 2024-11-01"
-        type="button"
+      <label
+        class="bp5-label"
       >
+        Interval
+         
         <span
-          aria-hidden="true"
-          class="bp5-icon bp5-icon-caret-left"
-        >
-          <svg
-            data-icon="caret-left"
-            height="16"
-            role="img"
-            viewBox="0 0 16 16"
-            width="16"
-          >
-            <path
-              d="M9.5 4c-.13 0-.24.05-.33.13l-4 3.5c-.1.09-.17.22-.17.37s.07.28.17.37l4 3.5a.495.495 0 00.83-.37v-7c0-.28-.22-.5-.5-.5z"
-              fill-rule="evenodd"
-            />
-          </svg>
-        </span>
-      </button>
-      <button
-        class="bp5-button bp5-small"
-        data-tooltip="Zoom out
-2024-10-15 → 2024-11-20"
-        type="button"
+          class="bp5-text-muted"
+        />
+      </label>
+      <div
+        class="bp5-form-content"
       >
-        <span
-          aria-hidden="true"
-          class="bp5-icon bp5-icon-zoom-out"
+        <div
+          aria-expanded="false"
+          aria-haspopup="menu"
+          class="bp5-control-group bp5-date-range-input bp5-popover-target bp5-fill"
         >
-          <svg
-            data-icon="zoom-out"
-            height="16"
-            role="img"
-            viewBox="0 0 16 16"
-            width="16"
+          <div
+            class="bp5-input-group bp5-fill"
           >
-            <path
-              d="M3.99 5.99c-.55 0-1 .45-1 1s.45 1 1 1h6c.55 0 1-.45 1-1s-.45-1-1-1h-6zm11.56 7.44l-2.67-2.68a6.94 6.94 0 001.11-3.76c0-3.87-3.13-7-7-7s-7 3.13-7 7 3.13 7 7 7c1.39 0 2.68-.42 3.76-1.11l2.68 2.67a1.498 1.498 0 102.12-2.12zm-8.56-1.44c-2.76 0-5-2.24-5-5s2.24-5 5-5 5 2.24 5 5-2.24 5-5 5z"
-              fill-rule="evenodd"
+            <input
+              aria-disabled="false"
+              autocomplete="off"
+              class="bp5-input"
+              placeholder="Start date"
+              type="text"
+              value="2021-03-09"
             />
-          </svg>
-        </span>
-      </button>
-      <button
-        class="bp5-button bp5-small"
-        data-tooltip="Next time period
-2024-11-18 → 2024-12-05"
-        type="button"
-      >
-        <span
-          aria-hidden="true"
-          class="bp5-icon bp5-icon-caret-right"
-        >
-          <svg
-            data-icon="caret-right"
-            height="16"
-            role="img"
-            viewBox="0 0 16 16"
-            width="16"
+          </div>
+          <div
+            class="bp5-input-group bp5-fill"
           >
-            <path
-              d="M11 8c0-.15-.07-.28-.17-.37l-4-3.5A.495.495 0 006 4.5v7a.495.495 0 00.83.37l4-3.5c.1-.09.17-.22.17-.37z"
-              fill-rule="evenodd"
+            <input
+              aria-disabled="false"
+              autocomplete="off"
+              class="bp5-input"
+              placeholder="End date"
+              type="text"
+              value="2021-06-09"
             />
-          </svg>
-        </span>
-      </button>
+          </div>
+        </div>
+      </div>
     </div>
     <div
-      class="bp5-button-group"
+      class="bp5-form-group"
     >
-      <button
-        class="bp5-button bp5-small"
-        data-tooltip="Show last day
-2024-11-19 → 2024-11-20"
-        type="button"
+      <label
+        class="bp5-label"
       >
+        Datasource
+         
         <span
-          class="bp5-button-text"
-        >
-          1D
-        </span>
-      </button>
-      <button
-        class="bp5-button bp5-small"
-        data-tooltip="Show last week
-2024-11-13 → 2024-11-20"
-        type="button"
-      >
-        <span
-          class="bp5-button-text"
-        >
-          1W
-        </span>
-      </button>
-      <button
-        class="bp5-button bp5-small"
-        data-tooltip="Show last month
-2024-10-20 → 2024-11-20"
-        type="button"
-      >
-        <span
-          class="bp5-button-text"
-        >
-          1M
-        </span>
-      </button>
-      <button
-        class="bp5-button bp5-small"
-        data-tooltip="Show last 3 months
-2024-08-20 → 2024-11-20"
-        type="button"
-      >
-        <span
-          class="bp5-button-text"
-        >
-          3M
-        </span>
-      </button>
-      <button
-        class="bp5-button bp5-small"
-        data-tooltip="Show last year
-2023-11-20 → 2024-11-20"
-        type="button"
-      >
-        <span
-          class="bp5-button-text"
-        >
-          1Y
-        </span>
-      </button>
-      <button
-        class="bp5-button bp5-small"
-        data-tooltip="Show last 5 years
-2019-11-20 → 2024-11-20"
-        type="button"
-      >
-        <span
-          class="bp5-button-text"
-        >
-          5Y
-        </span>
-      </button>
-      <button
-        class="bp5-button bp5-small"
-        data-tooltip="Show last 10 years
-2014-11-20 → 2024-11-20"
-        type="button"
-      >
-        <span
-          class="bp5-button-text"
-        >
-          10Y
-        </span>
-      </button>
-      <span
-        class="bp5-popover-target"
+          class="bp5-text-muted"
+        />
+      </label>
+      <div
+        class="bp5-form-content"
       >
-        <button
+        <div
+          aria-controls="listbox-1"
           aria-expanded="false"
-          aria-haspopup="menu"
-          class="bp5-button bp5-small"
-          data-tooltip="Select a custom date range"
-          type="button"
+          aria-haspopup="listbox"
+          class="bp5-popover-target bp5-fill"
+          role="combobox"
         >
-          <span
-            aria-hidden="true"
-            class="bp5-icon bp5-icon-calendar"
+          <button
+            class="bp5-button bp5-fill"
+            type="button"
           >
-            <svg
-              data-icon="calendar"
-              height="16"
-              role="img"
-              viewBox="0 0 16 16"
-              width="16"
+            <span
+              class="bp5-button-text"
             >
-              <path
-                d="M11 3c.6 0 1-.5 1-1V1c0-.6-.4-1-1-1s-1 .4-1 1v1c0 .5.4 1 1 1zm3-2h-1v1c0 1.1-.9 2-2 2s-2-.9-2-2V1H6v1c0 1.1-.9 2-2 2s-2-.9-2-2V1H1c-.6 0-1 .5-1 1v12c0 .6.4 1 1 1h13c.6 0 1-.4 1-1V2c0-.6-.5-1-1-1zM5 13H2v-3h3v3zm0-4H2V6h3v3zm4 4H6v-3h3v3zm0-4H6V6h3v3zm4 4h-3v-3h3v3zm0-4h-3V6h3v3zM4 3c.6 0 1-.5 1-1V1c0-.6-.4-1-1-1S3 .4 3 1v1c0 .5.4 1 1 1z"
-                fill-rule="evenodd"
-              />
-            </svg>
-          </span>
-          <span
-            class="bp5-button-text"
-          >
-            2024-11-01 → 2024-11-18
-          </span>
-        </button>
-      </span>
-      <button
-        class="bp5-button bp5-small"
-        data-tooltip="Auto determine date range to fit datasource"
-        type="button"
-      >
-        <span
-          aria-hidden="true"
-          class="bp5-icon bp5-icon-pin"
-        >
-          <svg
-            data-icon="pin"
-            height="16"
-            role="img"
-            viewBox="0 0 16 16"
-            width="16"
-          >
-            <path
-              d="M9.41.92c-.51.51-.41 1.5.15 2.56L4.34 7.54C2.8 6.48 1.45 6.05.92 6.58l3.54 3.54-3.54 4.95 4.95-3.54 3.54 3.54c.53-.53.1-1.88-.96-3.42l4.06-5.22c1.06.56 2.04.66 2.55.15L9.41.92z"
-              fill-rule="evenodd"
-            />
-          </svg>
-        </span>
-      </button>
+              Show all
+            </span>
+            <span
+              aria-hidden="true"
+              class="bp5-icon bp5-icon-caret-down"
+            >
+              <svg
+                data-icon="caret-down"
+                height="16"
+                role="img"
+                viewBox="0 0 16 16"
+                width="16"
+              >
+                <path
+                  d="M12 6.5c0-.28-.22-.5-.5-.5h-7a.495.495 0 00-.37.83l3.5 4c.09.1.22.17.37.17s.28-.07.37-.17l3.5-4c.08-.09.13-.2.13-.33z"
+                  fill-rule="evenodd"
+                />
+              </svg>
+            </span>
+          </button>
+        </div>
+      </div>
     </div>
   </div>
-  <div
-    class="chart-container"
-  />
 </div>
 `;
diff --git a/web-console/src/components/segment-timeline/bar-group.tsx b/web-console/src/components/segment-timeline/bar-group.tsx
new file mode 100644
index 000000000000..d0cf867e2b2d
--- /dev/null
+++ b/web-console/src/components/segment-timeline/bar-group.tsx
@@ -0,0 +1,75 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import type { AxisScale } from 'd3-axis';
+import React from 'react';
+
+import { BarUnit } from './bar-unit';
+import type { BarUnitData, HoveredBarInfo } from './stacked-bar-chart';
+
+interface BarGroupProps {
+  dataToRender: BarUnitData[];
+  changeActiveDatasource: (dataSource: string) => void;
+  formatTick: (e: number) => string;
+  xScale: AxisScale<Date>;
+  yScale: AxisScale<number>;
+  barWidth: number;
+  onHoverBar?: (e: any) => void;
+  offHoverBar?: () => void;
+  hoverOn?: HoveredBarInfo | null;
+}
+
+export class BarGroup extends React.Component<BarGroupProps> {
+  shouldComponentUpdate(nextProps: BarGroupProps): boolean {
+    return nextProps.hoverOn === this.props.hoverOn;
+  }
+
+  render() {
+    const { dataToRender, changeActiveDatasource, xScale, yScale, onHoverBar, barWidth } =
+      this.props;
+    if (dataToRender === undefined) return null;
+
+    return dataToRender.map((entry: BarUnitData, i: number) => {
+      const y0 = yScale(entry.y0 || 0) || 0;
+      const x = xScale(new Date(entry.x + 'T00:00:00Z'));
+      const y = yScale((entry.y0 || 0) + entry.y) || 0;
+      const height = Math.max(y0 - y, 0);
+      const barInfo: HoveredBarInfo = {
+        xCoordinate: x,
+        yCoordinate: y,
+        height,
+        datasource: entry.datasource,
+        xValue: entry.x,
+        yValue: entry.y,
+        dailySize: entry.dailySize,
+      };
+      return (
+        <BarUnit
+          key={i}
+          x={x}
+          y={y}
+          width={barWidth}
+          height={height}
+          style={{ fill: entry.color }}
+          onClick={() => changeActiveDatasource(entry.datasource)}
+          onHover={() => onHoverBar && onHoverBar(barInfo)}
+        />
+      );
+    });
+  }
+}
diff --git a/web-console/src/components/segment-timeline/segment-bar-chart.scss b/web-console/src/components/segment-timeline/bar-unit.spec.tsx
similarity index 68%
rename from web-console/src/components/segment-timeline/segment-bar-chart.scss
rename to web-console/src/components/segment-timeline/bar-unit.spec.tsx
index 130997119e3e..d5926dcf69f0 100644
--- a/web-console/src/components/segment-timeline/segment-bar-chart.scss
+++ b/web-console/src/components/segment-timeline/bar-unit.spec.tsx
@@ -16,6 +16,18 @@
  * limitations under the License.
  */
 
-.segment-bar-chart {
-  position: relative;
-}
+import { render } from '@testing-library/react';
+
+import { BarUnit } from './bar-unit';
+
+describe('BarUnit', () => {
+  it('matches snapshot', () => {
+    const barGroup = (
+      <svg>
+        <BarUnit x={10} y={10} width={10} height={10} />
+      </svg>
+    );
+    const { container } = render(barGroup);
+    expect(container.firstChild).toMatchSnapshot();
+  });
+});
diff --git a/web-console/src/views/workbench-view/timezone-menu-items/timezone-menu-items.spec.tsx b/web-console/src/components/segment-timeline/bar-unit.tsx
similarity index 58%
rename from web-console/src/views/workbench-view/timezone-menu-items/timezone-menu-items.spec.tsx
rename to web-console/src/components/segment-timeline/bar-unit.tsx
index 5a1a2b9ce51b..8591f68cc2e3 100644
--- a/web-console/src/views/workbench-view/timezone-menu-items/timezone-menu-items.spec.tsx
+++ b/web-console/src/components/segment-timeline/bar-unit.tsx
@@ -16,26 +16,30 @@
  * limitations under the License.
  */
 
-import { shallow } from '../../../utils/shallow-renderer';
+interface BarChartUnitProps {
+  x: number | undefined;
+  y: number;
+  width: number;
+  height: number;
+  style?: any;
+  onClick?: () => void;
+  onHover?: () => void;
+  offHover?: () => void;
+}
 
-import { TimezoneMenuItems } from './timezone-menu-items';
-
-jest.useFakeTimers('modern').setSystemTime(Date.parse('2024-06-08T12:34:56Z'));
-
-describe('TimezoneMenuItems', () => {
-  it('ensure UTC', () => {
-    expect(new Date().getTimezoneOffset()).toBe(0);
-  });
-
-  it('matches snapshot', () => {
-    const comp = shallow(
-      <TimezoneMenuItems
-        sqlTimeZone="Blah"
-        setSqlTimeZone={() => {}}
-        defaultSqlTimeZone="Etc/UTC"
-      />,
-    );
-
-    expect(comp).toMatchSnapshot();
-  });
-});
+export function BarUnit(props: BarChartUnitProps) {
+  const { x, y, width, height, style, onClick, onHover, offHover } = props;
+  return (
+    <rect
+      className="bar-unit"
+      x={x}
+      y={y}
+      width={width}
+      height={height}
+      style={style}
+      onClick={onClick}
+      onMouseOver={onHover}
+      onMouseLeave={offHover}
+    />
+  );
+}
diff --git a/web-console/src/components/segment-timeline/chart-axis.tsx b/web-console/src/components/segment-timeline/chart-axis.tsx
index b8ee4e9cbb11..bc333d33b773 100644
--- a/web-console/src/components/segment-timeline/chart-axis.tsx
+++ b/web-console/src/components/segment-timeline/chart-axis.tsx
@@ -16,22 +16,22 @@
  * limitations under the License.
  */
 
-import type { Axis } from 'd3-axis';
 import { select } from 'd3-selection';
+import React from 'react';
 
 interface ChartAxisProps {
-  className?: string;
   transform?: string;
-  axis: Axis<any>;
+  scale: any;
+  className?: string;
 }
 
-export const ChartAxis = function ChartAxis(props: ChartAxisProps) {
-  const { transform, axis, className } = props;
+export const ChartAxis = React.memo(function ChartAxis(props: ChartAxisProps) {
+  const { transform, scale, className } = props;
   return (
     <g
       className={`chart-axis ${className}`}
       transform={transform}
-      ref={node => select(node).call(axis as any)}
+      ref={node => select(node).call(scale)}
     />
   );
-};
+});
diff --git a/web-console/src/components/segment-timeline/common.ts b/web-console/src/components/segment-timeline/common.ts
deleted file mode 100644
index 48aa5ce48d46..000000000000
--- a/web-console/src/components/segment-timeline/common.ts
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import { sum } from 'd3-array';
-
-import type { Duration } from '../../utils';
-import { formatBytes, formatInteger } from '../../utils';
-
-export type IntervalStat = 'segments' | 'size' | 'rows';
-
-export const INTERVAL_STATS: IntervalStat[] = ['segments', 'size', 'rows'];
-
-export function getIntervalStatTitle(intervalStat: IntervalStat): string {
-  switch (intervalStat) {
-    case 'segments':
-      return 'Num. segments';
-
-    case 'size':
-      return 'Size';
-
-    case 'rows':
-      return 'Rows';
-
-    default:
-      return intervalStat;
-  }
-}
-
-export function aggregateSegmentStats(
-  xs: readonly Record<IntervalStat, number>[],
-): Record<IntervalStat, number> {
-  return {
-    segments: sum(xs, s => s.segments),
-    size: sum(xs, s => s.size),
-    rows: sum(xs, s => s.rows),
-  };
-}
-
-export function formatIntervalStat(stat: IntervalStat, n: number) {
-  switch (stat) {
-    case 'segments':
-    case 'rows':
-      return formatInteger(n);
-
-    case 'size':
-      return formatBytes(n);
-
-    default:
-      return '';
-  }
-}
-
-export interface IntervalRow extends Record<IntervalStat, number> {
-  start: Date;
-  end: Date;
-  datasource: string;
-  realtime: boolean;
-  originalTimeSpan: Duration;
-}
-
-export interface TrimmedIntervalRow extends IntervalRow {
-  shownDays: number;
-  normalized: Record<IntervalStat, number>;
-}
-
-export interface IntervalBar extends TrimmedIntervalRow {
-  offset: Record<IntervalStat, number>;
-}
-
-export function formatIsoDateOnly(date: Date): string {
-  return date.toISOString().slice(0, 10);
-}
diff --git a/web-console/src/components/segment-timeline/segment-bar-chart-render.scss b/web-console/src/components/segment-timeline/segment-bar-chart-render.scss
deleted file mode 100644
index 762772a0f5c5..000000000000
--- a/web-console/src/components/segment-timeline/segment-bar-chart-render.scss
+++ /dev/null
@@ -1,169 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-@import '../../variables';
-
-.segment-bar-chart-render {
-  position: relative;
-  overflow: hidden;
-
-  @keyframes pulseOpacity {
-    0% {
-      opacity: 0.8;
-    }
-    100% {
-      opacity: 0.95;
-    }
-  }
-
-  svg {
-    position: absolute;
-
-    .chart-axis text {
-      user-select: none;
-    }
-
-    .hover-highlight {
-      fill: white;
-      fill-opacity: 0.1;
-    }
-
-    .hovered-bar {
-      fill: none;
-      stroke: #ffffff;
-      stroke-width: 1.5px;
-    }
-
-    .selection {
-      fill: transparent;
-      stroke: #ffffff;
-      stroke-width: 1px;
-      opacity: 0.8;
-
-      &.done {
-        opacity: 1;
-      }
-    }
-
-    .shifter {
-      fill: white;
-      fill-opacity: 0.2;
-      filter: blur(1px);
-    }
-
-    .time-shift-indicator {
-      fill: white;
-      fill-opacity: 0.001;
-      cursor: grab;
-
-      &:hover {
-        fill-opacity: 0.1;
-      }
-
-      &.shifting {
-        fill-opacity: 0.2;
-        cursor: grabbing;
-      }
-    }
-
-    .gridline-x {
-      line {
-        stroke-dasharray: 5, 5;
-        opacity: 0.5;
-      }
-    }
-
-    .now-line {
-      stroke: $orange4;
-      stroke-dasharray: 2, 2;
-      opacity: 0.7;
-    }
-
-    .bar-unit {
-      &.realtime {
-        animation: pulseOpacity 3s alternate infinite;
-      }
-    }
-  }
-
-  .rule-tape {
-    position: absolute;
-    top: 5px;
-    height: 15px;
-    font-size: 10px;
-
-    .rule-error {
-      @include pin-full();
-      background-color: $red3;
-      color: $white;
-    }
-
-    .load-rule {
-      position: absolute;
-      overflow: hidden;
-      padding-left: 2px;
-      border-left: 1px solid $dark-gray2;
-      border-right: 1px solid $dark-gray2;
-      top: 0;
-      height: 100%;
-      text-overflow: ellipsis;
-
-      &.load {
-        background-color: $green1;
-
-        &:nth-child(even) {
-          background-color: $green3;
-        }
-      }
-
-      &.drop {
-        background-color: $dark-gray5;
-
-        &:nth-child(even) {
-          background-color: $gray1;
-        }
-      }
-
-      &.broadcast {
-        background-color: $indigo1;
-
-        &:nth-child(even) {
-          background-color: $indigo3;
-        }
-      }
-    }
-  }
-
-  .empty-placeholder {
-    @include pin-full;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    font-size: 20px;
-    user-select: none;
-    pointer-events: none;
-  }
-}
-
-.segment-bar-chart-bubble {
-  .button-bar {
-    padding-top: 5px;
-    display: flex;
-    gap: 5px;
-  }
-}
diff --git a/web-console/src/components/segment-timeline/segment-bar-chart-render.tsx b/web-console/src/components/segment-timeline/segment-bar-chart-render.tsx
deleted file mode 100644
index 6f2817a202eb..000000000000
--- a/web-console/src/components/segment-timeline/segment-bar-chart-render.tsx
+++ /dev/null
@@ -1,793 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import { Button, Intent } from '@blueprintjs/core';
-import type { NonNullDateRange } from '@blueprintjs/datetime';
-import { IconNames } from '@blueprintjs/icons';
-import IntervalTree from '@flatten-js/interval-tree';
-import classNames from 'classnames';
-import { max, sort, sum } from 'd3-array';
-import { axisBottom, axisLeft } from 'd3-axis';
-import { scaleLinear, scaleUtc } from 'd3-scale';
-import type { MouseEvent as ReactMouseEvent, ReactNode } from 'react';
-import { useMemo, useRef, useState } from 'react';
-
-import type { Rule } from '../../druid-models';
-import { getDatasourceColor, RuleUtil } from '../../druid-models';
-import { useClock, useGlobalEventListener } from '../../hooks';
-import {
-  allSameValue,
-  arraysEqualByElement,
-  clamp,
-  day,
-  Duration,
-  formatBytes,
-  formatNumber,
-  groupBy,
-  groupByAsMap,
-  minute,
-  month,
-  pluralIfNeeded,
-  TZ_UTC,
-  uniq,
-} from '../../utils';
-import type { Margin, Stage } from '../../utils/stage';
-import type { PortalBubbleOpenOn } from '../portal-bubble/portal-bubble';
-import { PortalBubble } from '../portal-bubble/portal-bubble';
-
-import { ChartAxis } from './chart-axis';
-import type { IntervalBar, IntervalRow, IntervalStat, TrimmedIntervalRow } from './common';
-import { aggregateSegmentStats, formatIntervalStat, formatIsoDateOnly } from './common';
-
-import './segment-bar-chart-render.scss';
-
-const CHART_MARGIN: Margin = { top: 20, right: 0, bottom: 25, left: 70 };
-const MIN_BAR_WIDTH = 4;
-const POSSIBLE_GRANULARITIES = [
-  new Duration('PT15M'),
-  new Duration('PT1H'),
-  new Duration('PT6H'),
-  new Duration('P1D'),
-  new Duration('P1M'),
-  new Duration('P1Y'),
-];
-
-const EXTEND_X_SCALE_DOMAIN_BY = 1;
-
-function formatStartDuration(start: Date, duration: Duration): string {
-  let sliceLength;
-  const { singleSpan } = duration;
-  switch (singleSpan) {
-    case 'year':
-      sliceLength = 4;
-      break;
-
-    case 'month':
-      sliceLength = 7;
-      break;
-
-    case 'day':
-      sliceLength = 10;
-      break;
-
-    case 'hour':
-      sliceLength = 13;
-      break;
-
-    case 'minute':
-      sliceLength = 16;
-      break;
-
-    default:
-      sliceLength = 19;
-      break;
-  }
-
-  return `${start.toISOString().slice(0, sliceLength)}/${duration}`;
-}
-
-// ---------------------------------------
-// Load rule stuff
-
-function loadRuleToBaseType(loadRule: Rule): string {
-  const m = /^(load|drop|broadcast)/.exec(loadRule.type);
-  return m ? m[1] : 'load';
-}
-
-const NEGATIVE_INFINITY_DATE = new Date(Date.UTC(1000, 0, 1));
-const POSITIVE_INFINITY_DATE = new Date(Date.UTC(3000, 0, 1));
-
-function loadRuleToDateRange(loadRule: Rule): NonNullDateRange {
-  switch (loadRule.type) {
-    case 'loadByInterval':
-    case 'dropByInterval':
-    case 'broadcastByInterval':
-      return String(loadRule.interval)
-        .split('/')
-        .map(d => new Date(d)) as NonNullDateRange;
-
-    case 'loadByPeriod':
-    case 'dropByPeriod':
-    case 'broadcastByPeriod':
-      return [
-        new Duration(loadRule.period || 'P1D').shift(new Date(), TZ_UTC, -1),
-        loadRule.includeFuture ? POSITIVE_INFINITY_DATE : new Date(),
-      ];
-
-    case 'dropBeforeByPeriod':
-      return [
-        NEGATIVE_INFINITY_DATE,
-        new Duration(loadRule.period || 'P1D').shift(new Date(), TZ_UTC, -1),
-      ];
-
-    default:
-      return [NEGATIVE_INFINITY_DATE, POSITIVE_INFINITY_DATE];
-  }
-}
-
-// ---------------------------------------
-
-function offsetDateRange(dateRange: NonNullDateRange, offset: number): NonNullDateRange {
-  return [new Date(dateRange[0].valueOf() + offset), new Date(dateRange[1].valueOf() + offset)];
-}
-
-function stackIntervalRows(trimmedIntervalRows: TrimmedIntervalRow[]): {
-  intervalBars: IntervalBar[];
-  intervalTree: IntervalTree;
-} {
-  // Total size of the datasource will be user as an ordering tiebreaker
-  const datasourceToTotalSize = groupByAsMap(
-    trimmedIntervalRows,
-    intervalRow => intervalRow.datasource,
-    intervalRows => sum(intervalRows, intervalRow => intervalRow.size),
-  );
-
-  const sortedIntervalRows = sort(trimmedIntervalRows, (a, b) => {
-    const shownDaysDiff = b.shownDays - a.shownDays;
-    if (shownDaysDiff) return shownDaysDiff;
-
-    const timeSpanDiff =
-      b.originalTimeSpan.getCanonicalLength() - a.originalTimeSpan.getCanonicalLength();
-    if (timeSpanDiff) return timeSpanDiff;
-
-    const totalSizeDiff = datasourceToTotalSize[b.datasource] - datasourceToTotalSize[a.datasource];
-    if (totalSizeDiff) return totalSizeDiff;
-
-    return Number(a.realtime) - Number(b.realtime);
-  });
-
-  const intervalTree = new IntervalTree();
-  const intervalBars = sortedIntervalRows.map(intervalRow => {
-    const startMs = intervalRow.start.valueOf();
-    const endMs = intervalRow.end.valueOf();
-    const intervalRowsBelow = intervalTree.search([startMs + 1, startMs + 2]) as IntervalBar[];
-    const intervalBar: IntervalBar = {
-      ...intervalRow,
-      offset: aggregateSegmentStats(intervalRowsBelow.map(i => i.normalized)),
-    };
-    intervalTree.insert([startMs, endMs], intervalBar);
-    return intervalBar;
-  });
-
-  return {
-    intervalBars,
-    intervalTree,
-  };
-}
-
-interface BubbleInfo {
-  start: Date;
-  end: Date;
-  timeLabel: string;
-  intervalBars: IntervalBar[];
-}
-
-interface SelectionRange {
-  start: Date;
-  end: Date;
-  done?: boolean;
-}
-
-export interface DatasourceRules {
-  loadRules: Rule[];
-  defaultLoadRules: Rule[];
-}
-
-export interface SegmentBarChartRenderProps {
-  intervalRows: IntervalRow[];
-  datasourceRules: DatasourceRules | undefined;
-  datasourceRulesError: string | undefined;
-
-  stage: Stage;
-  dateRange: NonNullDateRange;
-  changeDateRange(dateRange: NonNullDateRange): void;
-  shownIntervalStat: IntervalStat;
-  shownDatasource: string | undefined;
-  changeShownDatasource(datasource: string | undefined): void;
-  getIntervalActionButton?(
-    start: Date,
-    end: Date,
-    datasource?: string,
-    realtime?: boolean,
-  ): ReactNode;
-}
-
-export const SegmentBarChartRender = function SegmentBarChartRender(
-  props: SegmentBarChartRenderProps,
-) {
-  const {
-    intervalRows,
-    datasourceRules,
-    datasourceRulesError,
-
-    stage,
-    shownIntervalStat,
-    dateRange,
-    changeDateRange,
-    shownDatasource,
-    changeShownDatasource,
-    getIntervalActionButton,
-  } = props;
-  const [mouseDownAt, setMouseDownAt] = useState<
-    { time: Date; action: 'select' | 'shift' } | undefined
-  >();
-  const [selection, setSelection] = useState<SelectionRange | undefined>();
-
-  function setSelectionIfNeeded(newSelection: SelectionRange) {
-    if (
-      selection &&
-      selection.start.valueOf() === newSelection.start.valueOf() &&
-      selection.end.valueOf() === newSelection.end.valueOf() &&
-      selection.done === newSelection.done
-    ) {
-      return;
-    }
-    setSelection(newSelection);
-  }
-
-  const [bubbleInfo, setBubbleInfo] = useState<BubbleInfo | undefined>();
-
-  function setBubbleInfoIfNeeded(newBubbleInfo: BubbleInfo) {
-    if (
-      bubbleInfo &&
-      bubbleInfo.start.valueOf() === newBubbleInfo.start.valueOf() &&
-      bubbleInfo.end.valueOf() === newBubbleInfo.end.valueOf() &&
-      bubbleInfo.timeLabel === newBubbleInfo.timeLabel &&
-      arraysEqualByElement(bubbleInfo.intervalBars, newBubbleInfo.intervalBars)
-    ) {
-      return;
-    }
-    setBubbleInfo(newBubbleInfo);
-  }
-
-  const [shiftOffset, setShiftOffset] = useState<number | undefined>();
-
-  const now = useClock(minute.canonicalLength);
-  const svgRef = useRef<SVGSVGElement | null>(null);
-
-  const trimGranularity = useMemo(() => {
-    return Duration.pickSmallestGranularityThatFits(
-      POSSIBLE_GRANULARITIES,
-      dateRange[1].valueOf() - dateRange[0].valueOf(),
-      Math.floor(stage.width / MIN_BAR_WIDTH),
-    ).toString();
-  }, [dateRange, stage.width]);
-
-  const { intervalBars, intervalTree } = useMemo(() => {
-    const shownIntervalRows = intervalRows.filter(
-      ({ start, end, datasource }) =>
-        start <= dateRange[1] &&
-        dateRange[0] < end &&
-        (!shownDatasource || datasource === shownDatasource),
-    );
-    const averageRowSizeByDatasource = groupByAsMap(
-      shownIntervalRows.filter(intervalRow => intervalRow.size > 0 && intervalRow.rows > 0),
-      intervalRow => intervalRow.datasource,
-      intervalRows => sum(intervalRows, d => d.size) / sum(intervalRows, d => d.rows),
-    );
-
-    const trimDuration = new Duration(trimGranularity);
-    const trimmedIntervalRows = shownIntervalRows.map(intervalRow => {
-      const { start, end, segments, size, rows } = intervalRow;
-      const startTrimmed = trimDuration.floor(start, TZ_UTC);
-      let endTrimmed = trimDuration.ceil(end, TZ_UTC);
-
-      // Special handling to catch WEEK intervals when trimming to month.
-      if (trimGranularity === 'P1M' && intervalRow.originalTimeSpan.toString() === 'P7D') {
-        endTrimmed = trimDuration.shift(startTrimmed, TZ_UTC);
-      }
-
-      const shownDays = (endTrimmed.valueOf() - startTrimmed.valueOf()) / day.canonicalLength;
-      const shownSize =
-        size === 0 ? rows * averageRowSizeByDatasource[intervalRow.datasource] : size;
-      return {
-        ...intervalRow,
-        start: startTrimmed,
-        end: endTrimmed,
-        shownDays,
-        size: shownSize,
-        normalized: {
-          size: shownSize / shownDays,
-          rows: rows / shownDays,
-          segments: segments / shownDays,
-        },
-      };
-    });
-
-    const fullyGroupedSegmentRows = groupBy(
-      trimmedIntervalRows,
-      trimmedIntervalRow =>
-        [
-          trimmedIntervalRow.start.toISOString(),
-          trimmedIntervalRow.end.toISOString(),
-          trimmedIntervalRow.originalTimeSpan,
-          trimmedIntervalRow.datasource,
-          trimmedIntervalRow.realtime,
-        ].join('/'),
-      (trimmedIntervalRows): TrimmedIntervalRow => {
-        const firstIntervalRow = trimmedIntervalRows[0];
-        return {
-          ...firstIntervalRow,
-          ...aggregateSegmentStats(trimmedIntervalRows),
-          normalized: aggregateSegmentStats(trimmedIntervalRows.map(t => t.normalized)),
-        };
-      },
-    );
-
-    return stackIntervalRows(fullyGroupedSegmentRows);
-  }, [intervalRows, trimGranularity, dateRange, shownDatasource]);
-
-  const innerStage = stage.applyMargin(CHART_MARGIN);
-
-  const baseTimeScale = scaleUtc()
-    .domain(dateRange)
-    .range([EXTEND_X_SCALE_DOMAIN_BY, innerStage.width - EXTEND_X_SCALE_DOMAIN_BY]);
-  const timeScale = shiftOffset
-    ? baseTimeScale.copy().domain(offsetDateRange(dateRange, shiftOffset))
-    : baseTimeScale;
-
-  const maxNormalizedStat = max(
-    intervalBars,
-    d => d.normalized[shownIntervalStat] + d.offset[shownIntervalStat],
-  );
-  const statScale = scaleLinear()
-    .rangeRound([innerStage.height, 0])
-    .domain([0, (maxNormalizedStat ?? 1) * 1.05]);
-
-  const formatTickRate = (n: number) => {
-    switch (shownIntervalStat) {
-      case 'segments':
-        return formatNumber(n); // + ' seg/day';
-
-      case 'rows':
-        return formatNumber(n); // + ' row/day';
-
-      case 'size':
-        return formatBytes(n);
-    }
-  };
-
-  function handleMouseDown(e: ReactMouseEvent) {
-    const svg = svgRef.current;
-    if (!svg) return;
-    e.preventDefault();
-
-    if (selection) {
-      setSelection(undefined);
-    } else {
-      const rect = svg.getBoundingClientRect();
-      const x = e.clientX - rect.x - CHART_MARGIN.left;
-      const y = e.clientY - rect.y - CHART_MARGIN.top;
-      const time = baseTimeScale.invert(x);
-      const action = y > innerStage.height || e.shiftKey ? 'shift' : 'select';
-      setBubbleInfo(undefined);
-      setMouseDownAt({
-        time,
-        action,
-      });
-    }
-  }
-
-  useGlobalEventListener('mousemove', (e: MouseEvent) => {
-    const svg = svgRef.current;
-    if (!svg) return;
-    const rect = svg.getBoundingClientRect();
-    const x = e.clientX - rect.x - CHART_MARGIN.left;
-    const y = e.clientY - rect.y - CHART_MARGIN.top;
-
-    if (mouseDownAt) {
-      e.preventDefault();
-
-      const b = baseTimeScale.invert(x);
-      if (mouseDownAt.action === 'shift' || e.shiftKey) {
-        setShiftOffset(mouseDownAt.time.valueOf() - b.valueOf());
-      } else {
-        if (mouseDownAt.time < b) {
-          setSelectionIfNeeded({
-            start: day.floor(mouseDownAt.time, TZ_UTC),
-            end: day.ceil(b, TZ_UTC),
-          });
-        } else {
-          setSelectionIfNeeded({
-            start: day.floor(b, TZ_UTC),
-            end: day.ceil(mouseDownAt.time, TZ_UTC),
-          });
-        }
-      }
-    } else if (!selection) {
-      if (
-        0 <= x &&
-        x <= innerStage.width &&
-        0 <= y &&
-        y <= innerStage.height + CHART_MARGIN.bottom
-      ) {
-        const time = baseTimeScale.invert(x);
-        const shifter =
-          new Duration(trimGranularity).getCanonicalLength() > day.canonicalLength * 25
-            ? month
-            : day;
-        const start = shifter.floor(time, TZ_UTC);
-        const end = shifter.ceil(time, TZ_UTC);
-
-        let intervalBars: IntervalBar[] = [];
-        if (y <= innerStage.height) {
-          const bars = intervalTree.search([
-            time.valueOf() + 1,
-            time.valueOf() + 2,
-          ]) as IntervalBar[];
-
-          if (bars.length) {
-            const stat = statScale.invert(y);
-            const hoverBar = bars.find(
-              bar =>
-                bar.offset[shownIntervalStat] <= stat &&
-                stat < bar.offset[shownIntervalStat] + bar.normalized[shownIntervalStat],
-            );
-            intervalBars = hoverBar ? [hoverBar] : bars;
-          }
-        }
-        setBubbleInfoIfNeeded({
-          start,
-          end,
-          timeLabel: start.toISOString().slice(0, shifter === day ? 10 : 7),
-          intervalBars,
-        });
-      } else {
-        setBubbleInfo(undefined);
-      }
-    }
-  });
-
-  useGlobalEventListener('mouseup', (e: MouseEvent) => {
-    if (!mouseDownAt) return;
-    e.preventDefault();
-    setMouseDownAt(undefined);
-
-    const svg = svgRef.current;
-    if (!svg) return;
-    const rect = svg.getBoundingClientRect();
-    const x = e.clientX - rect.x - CHART_MARGIN.left;
-    const y = e.clientY - rect.y - CHART_MARGIN.top;
-
-    if (shiftOffset || selection) {
-      setShiftOffset(undefined);
-      if (mouseDownAt.action === 'shift' || e.shiftKey) {
-        if (shiftOffset) {
-          changeDateRange(offsetDateRange(dateRange, shiftOffset));
-        }
-      } else {
-        if (selection) {
-          setSelection({ ...selection, done: true });
-        }
-      }
-    } else if (0 <= x && x <= innerStage.width && 0 <= y && y <= innerStage.height) {
-      const time = baseTimeScale.invert(x);
-
-      const bars = intervalTree.search([time.valueOf() + 1, time.valueOf() + 2]) as IntervalBar[];
-
-      if (bars.length) {
-        const stat = statScale.invert(y);
-        const hoverBar = bars.find(
-          bar =>
-            bar.offset[shownIntervalStat] <= stat &&
-            stat < bar.offset[shownIntervalStat] + bar.normalized[shownIntervalStat],
-        );
-        if (hoverBar) {
-          changeShownDatasource(shownDatasource ? undefined : hoverBar.datasource);
-        }
-      }
-    }
-  });
-
-  useGlobalEventListener('keydown', (e: KeyboardEvent) => {
-    if (e.key === 'Escape' && mouseDownAt) {
-      setMouseDownAt(undefined);
-      setSelection(undefined);
-    }
-  });
-
-  function startEndToXWidth({ start, end }: { start: Date; end: Date }) {
-    const xStart = clamp(timeScale(start), 0, innerStage.width);
-    const xEnd = clamp(timeScale(end), 0, innerStage.width);
-
-    return {
-      x: xStart,
-      width: Math.max(xEnd - xStart - 1, 1),
-    };
-  }
-
-  function segmentBarToRect(intervalBar: IntervalBar) {
-    const y0 = statScale(intervalBar.offset[shownIntervalStat]);
-    const y = statScale(
-      intervalBar.normalized[shownIntervalStat] + intervalBar.offset[shownIntervalStat],
-    );
-
-    return {
-      ...startEndToXWidth(intervalBar),
-      y: y,
-      height: y0 - y,
-    };
-  }
-
-  let hoveredOpenOn: PortalBubbleOpenOn | undefined;
-  if (svgRef.current) {
-    const rect = svgRef.current.getBoundingClientRect();
-
-    if (bubbleInfo) {
-      const hoveredIntervalBars = bubbleInfo.intervalBars;
-
-      let title: string | undefined;
-      let text: ReactNode;
-      if (hoveredIntervalBars.length === 0) {
-        title = bubbleInfo.timeLabel;
-        text = '';
-      } else if (hoveredIntervalBars.length === 1) {
-        const hoveredIntervalBar = hoveredIntervalBars[0];
-        title = `${formatStartDuration(
-          hoveredIntervalBar.start,
-          hoveredIntervalBar.originalTimeSpan,
-        )}${hoveredIntervalBar.realtime ? ' (realtime)' : ''}`;
-        text = (
-          <>
-            {!shownDatasource && <div>{`Datasource: ${hoveredIntervalBar.datasource}`}</div>}
-            <div>{`Size: ${
-              hoveredIntervalBar.realtime
-                ? 'estimated for realtime'
-                : formatIntervalStat('size', hoveredIntervalBar.size)
-            }`}</div>
-            <div>{`Rows: ${formatIntervalStat('rows', hoveredIntervalBar.rows)}`}</div>
-            <div>{`Segments: ${formatIntervalStat('segments', hoveredIntervalBar.segments)}`}</div>
-          </>
-        );
-      } else {
-        const datasources = uniq(hoveredIntervalBars.map(b => b.datasource));
-        const agg = aggregateSegmentStats(hoveredIntervalBars);
-        title = bubbleInfo.timeLabel;
-        text = (
-          <>
-            {!shownDatasource && (
-              <div>{`Totals for ${pluralIfNeeded(datasources.length, 'datasource')}`}</div>
-            )}
-            <div>{`Size: ${formatIntervalStat('size', agg.size)}`}</div>
-            <div>{`Rows: ${formatIntervalStat('rows', agg.rows)}`}</div>
-            <div>{`Segments: ${formatIntervalStat('segments', agg.segments)}`}</div>
-          </>
-        );
-      }
-
-      hoveredOpenOn = {
-        x:
-          rect.x +
-          CHART_MARGIN.left +
-          timeScale(new Date((bubbleInfo.start.valueOf() + bubbleInfo.end.valueOf()) / 2)),
-        y: rect.y + CHART_MARGIN.top,
-        title,
-        text,
-      };
-    } else if (selection) {
-      const selectedBars = intervalTree.search([
-        selection.start.valueOf() + 1,
-        selection.end.valueOf() - 1,
-      ]) as IntervalBar[];
-      const datasources = uniq(selectedBars.map(b => b.datasource));
-      const realtime = allSameValue(selectedBars.map(b => b.realtime));
-      const agg = aggregateSegmentStats(selectedBars);
-      hoveredOpenOn = {
-        x:
-          rect.x +
-          CHART_MARGIN.left +
-          timeScale(new Date((selection.start.valueOf() + selection.end.valueOf()) / 2)),
-        y: rect.y + CHART_MARGIN.top,
-        title: `${formatIsoDateOnly(selection.start)} → ${formatIsoDateOnly(selection.end)}`,
-        text: (
-          <>
-            {selectedBars.length ? (
-              <>
-                {!shownDatasource && (
-                  <div>{`Totals for ${pluralIfNeeded(datasources.length, 'datasource')}`}</div>
-                )}
-                <div>{`Size: ${formatIntervalStat('size', agg.size)}`}</div>
-                <div>{`Rows: ${formatIntervalStat('rows', agg.rows)}`}</div>
-                <div>{`Segments: ${formatIntervalStat('segments', agg.segments)}`}</div>
-              </>
-            ) : (
-              <div>No segments in this interval</div>
-            )}
-            {selection.done && (
-              <div className="button-bar">
-                <Button
-                  icon={IconNames.ZOOM_IN}
-                  text="Zoom in"
-                  intent={Intent.PRIMARY}
-                  small
-                  onClick={() => {
-                    if (!selection) return;
-                    setSelection(undefined);
-                    changeDateRange([selection.start, selection.end]);
-                  }}
-                />
-                {getIntervalActionButton?.(
-                  selection.start,
-                  selection.end,
-                  datasources.length === 1 ? datasources[0] : undefined,
-                  realtime,
-                )}
-              </div>
-            )}
-          </>
-        ),
-      };
-    }
-  }
-
-  function renderLoadRule(loadRule: Rule, i: number, isDefault: boolean) {
-    const [start, end] = loadRuleToDateRange(loadRule);
-    const { x, width } = startEndToXWidth({ start, end });
-    const title = RuleUtil.ruleToString(loadRule) + (isDefault ? ' (cluster default)' : '');
-    return (
-      <div
-        key={i}
-        className={classNames('load-rule', loadRuleToBaseType(loadRule))}
-        data-tooltip={title}
-        style={{
-          left: x,
-          width,
-        }}
-      >
-        {title}
-      </div>
-    );
-  }
-
-  const nowX = timeScale(now);
-  return (
-    <div className="segment-bar-chart-render">
-      <svg
-        ref={svgRef}
-        width={stage.width}
-        height={stage.height}
-        viewBox={`0 0 ${stage.width} ${stage.height}`}
-        preserveAspectRatio="xMinYMin meet"
-        onMouseDown={handleMouseDown}
-      >
-        <g transform={`translate(${CHART_MARGIN.left},${CHART_MARGIN.top})`}>
-          <ChartAxis
-            className="gridline-x"
-            transform="translate(0,0)"
-            axis={axisLeft(statScale)
-              .tickValues(statScale.ticks(3).filter(v => v !== 0))
-              .tickSize(-innerStage.width)
-              .tickFormat(() => '')
-              .tickSizeOuter(0)}
-          />
-          <ChartAxis
-            className="axis-x"
-            transform={`translate(0,${innerStage.height})`}
-            axis={axisBottom(timeScale)}
-          />
-          <rect
-            className={classNames('time-shift-indicator', {
-              shifting: typeof shiftOffset === 'number',
-            })}
-            x={0}
-            y={innerStage.height}
-            width={innerStage.width}
-            height={CHART_MARGIN.bottom}
-          />
-          <ChartAxis
-            className="axis-y"
-            axis={axisLeft(statScale)
-              .ticks(3)
-              .tickFormat(e => formatTickRate(e.valueOf()))}
-          />
-          <g className="bar-group">
-            {bubbleInfo && (
-              <rect
-                className="hover-highlight"
-                {...startEndToXWidth(bubbleInfo)}
-                y={0}
-                height={innerStage.height}
-              />
-            )}
-            {0 < nowX && nowX < innerStage.width && (
-              <line className="now-line" x1={nowX} x2={nowX} y1={0} y2={innerStage.height + 8} />
-            )}
-            {intervalBars.map((intervalBar, i) => {
-              return (
-                <rect
-                  key={i}
-                  className={classNames('bar-unit', { realtime: intervalBar.realtime })}
-                  {...segmentBarToRect(intervalBar)}
-                  fill={getDatasourceColor(intervalBar.datasource)}
-                />
-              );
-            })}
-            {bubbleInfo?.intervalBars.length === 1 &&
-              bubbleInfo.intervalBars.map((intervalBar, i) => (
-                <rect key={i} className="hovered-bar" {...segmentBarToRect(intervalBar)} />
-              ))}
-            {selection && (
-              <rect
-                className={classNames('selection', { done: selection.done })}
-                {...startEndToXWidth(selection)}
-                y={0}
-                height={innerStage.height}
-              />
-            )}
-            {!!shiftOffset && (
-              <rect
-                className="shifter"
-                x={shiftOffset > 0 ? timeScale(dateRange[1]) : 0}
-                y={0}
-                height={innerStage.height}
-                width={
-                  shiftOffset > 0
-                    ? innerStage.width - timeScale(dateRange[1])
-                    : timeScale(dateRange[0])
-                }
-              />
-            )}
-          </g>
-        </g>
-      </svg>
-      {(datasourceRules || datasourceRulesError) && (
-        <div className="rule-tape" style={{ left: CHART_MARGIN.left, right: CHART_MARGIN.right }}>
-          {datasourceRules?.defaultLoadRules.map((rule, index) =>
-            renderLoadRule(rule, index, true),
-          )}
-          {datasourceRules?.loadRules.map((rule, index) => renderLoadRule(rule, index, false))}
-          {datasourceRulesError && (
-            <div className="rule-error">Rule loading error: {datasourceRulesError}</div>
-          )}
-        </div>
-      )}
-      {!intervalRows.length && (
-        <div className="empty-placeholder">
-          <div className="no-data-text">There are no segments in the selected range</div>
-        </div>
-      )}
-      <PortalBubble
-        className="segment-bar-chart-bubble"
-        openOn={hoveredOpenOn}
-        onClose={selection?.done ? () => setSelection(undefined) : undefined}
-        mute
-        direction="up"
-      />
-    </div>
-  );
-};
diff --git a/web-console/src/components/segment-timeline/segment-bar-chart.tsx b/web-console/src/components/segment-timeline/segment-bar-chart.tsx
deleted file mode 100644
index 297ea4afe617..000000000000
--- a/web-console/src/components/segment-timeline/segment-bar-chart.tsx
+++ /dev/null
@@ -1,162 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import { C, F, L, N, sql, SqlExpression, SqlQuery } from 'druid-query-toolkit';
-import { useMemo } from 'react';
-
-import { END_OF_TIME_DATE, type Rule, RuleUtil, START_OF_TIME_DATE } from '../../druid-models';
-import type { Capabilities } from '../../helpers';
-import { useQueryManager } from '../../hooks';
-import { Api } from '../../singletons';
-import { Duration, filterMap, getApiArray, queryDruidSql, TZ_UTC } from '../../utils';
-import { Loader } from '../loader/loader';
-
-import type { IntervalRow } from './common';
-import type { SegmentBarChartRenderProps } from './segment-bar-chart-render';
-import { SegmentBarChartRender } from './segment-bar-chart-render';
-
-import './segment-bar-chart.scss';
-
-export interface SegmentBarChartProps
-  extends Omit<
-    SegmentBarChartRenderProps,
-    'intervalRows' | 'datasourceRules' | 'datasourceRulesError'
-  > {
-  capabilities: Capabilities;
-}
-
-export const SegmentBarChart = function SegmentBarChart(props: SegmentBarChartProps) {
-  const { capabilities, dateRange, shownDatasource, ...otherProps } = props;
-
-  const intervalsQuery = useMemo(
-    () => ({ capabilities, dateRange, shownDatasource: shownDatasource }),
-    [capabilities, dateRange, shownDatasource],
-  );
-
-  const [intervalRowsState] = useQueryManager({
-    query: intervalsQuery,
-    processQuery: async ({ capabilities, dateRange, shownDatasource }, cancelToken) => {
-      if (capabilities.hasSql()) {
-        const query = SqlQuery.from(N('sys').table('segments'))
-          .changeWhereExpression(
-            SqlExpression.and(
-              sql`"start" <= '${dateRange[1].toISOString()}' AND '${dateRange[0].toISOString()}' < "end"`,
-              C('start').unequal(START_OF_TIME_DATE),
-              C('end').unequal(END_OF_TIME_DATE),
-              C('is_overshadowed').equal(0),
-              shownDatasource ? C('datasource').equal(L(shownDatasource)) : undefined,
-            ),
-          )
-          .addSelect(C('start'), { addToGroupBy: 'end' })
-          .addSelect(C('end'), { addToGroupBy: 'end' })
-          .addSelect(C('datasource'), { addToGroupBy: 'end' })
-          .addSelect(C('is_realtime').as('realtime'), { addToGroupBy: 'end' })
-          .addSelect(F.count().as('segments'))
-          .addSelect(F.sum(C('size')).as('size'))
-          .addSelect(F.sum(C('num_rows')).as('rows'))
-          .toString();
-
-        return (await queryDruidSql({ query }, cancelToken)).map(sr => {
-          const start = new Date(sr.start);
-          const end = new Date(sr.end);
-
-          return {
-            ...sr,
-            start,
-            end,
-            realtime: Boolean(sr.realtime),
-            originalTimeSpan: Duration.fromRange(start, end, TZ_UTC),
-          } as IntervalRow;
-        });
-      } else {
-        return filterMap(
-          await getApiArray(
-            `/druid/coordinator/v1/metadata/segments?includeOvershadowedStatus&includeRealtimeSegments&${
-              shownDatasource ? `datasources=${Api.encodePath(shownDatasource)}` : ''
-            }`,
-            cancelToken,
-          ),
-          (segment: any) => {
-            if (segment.overshadowed) return; // We have to include overshadowed segments to get the realtime segments in this API
-            const [startStr, endStr] = segment.interval.split('/');
-            if (startStr === START_OF_TIME_DATE && endStr === END_OF_TIME_DATE) return;
-            const start = new Date(startStr);
-            const end = new Date(endStr);
-            if (!(start <= dateRange[1] && dateRange[0] < end)) return;
-
-            return {
-              start,
-              end,
-              datasource: segment.dataSource,
-              realtime: Boolean(segment.realtime),
-              originalTimeSpan: Duration.fromRange(start, end, TZ_UTC),
-              segments: 1,
-              size: segment.size,
-              rows: segment.num_rows || 0, // segment.num_rows is really null on this API :-(
-            } as IntervalRow;
-          },
-        );
-      }
-    },
-  });
-
-  const [allLoadRulesState] = useQueryManager({
-    query: shownDatasource ? '' : undefined,
-    processQuery: async (_, cancelToken) => {
-      return (
-        await Api.instance.get<Record<string, Rule[]>>('/druid/coordinator/v1/rules', {
-          cancelToken,
-        })
-      ).data;
-    },
-  });
-
-  const datasourceRules = useMemo(() => {
-    const allLoadRules = allLoadRulesState.data;
-    if (!allLoadRules || !shownDatasource) return;
-    return {
-      loadRules: (allLoadRules[shownDatasource] || []).toReversed(),
-      defaultLoadRules: (allLoadRules[RuleUtil.DEFAULT_RULES_KEY] || []).toReversed(),
-    };
-  }, [allLoadRulesState.data, shownDatasource]);
-
-  if (intervalRowsState.error) {
-    return (
-      <div className="empty-placeholder">
-        <span className="error-text">{`Error when loading data: ${intervalRowsState.getErrorMessage()}`}</span>
-      </div>
-    );
-  }
-
-  const intervalRows = intervalRowsState.getSomeData();
-  return (
-    <>
-      {intervalRows && (
-        <SegmentBarChartRender
-          intervalRows={intervalRows}
-          datasourceRules={datasourceRules}
-          datasourceRulesError={allLoadRulesState.getErrorMessage()}
-          dateRange={dateRange}
-          shownDatasource={shownDatasource}
-          {...otherProps}
-        />
-      )}
-      {intervalRowsState.loading && <Loader />}
-    </>
-  );
-};
diff --git a/web-console/src/components/segment-timeline/segment-timeline.scss b/web-console/src/components/segment-timeline/segment-timeline.scss
index 4224c1cab89d..aa437052d617 100644
--- a/web-console/src/components/segment-timeline/segment-timeline.scss
+++ b/web-console/src/components/segment-timeline/segment-timeline.scss
@@ -16,20 +16,12 @@
  * limitations under the License.
  */
 
-@import '../../variables';
-
 .segment-timeline {
-  .control-bar {
-    @include card-like;
-    height: 34px;
-    display: flex;
-    align-items: start;
-    padding: 5px;
-    gap: 10px;
+  display: grid;
+  grid-template-columns: 1fr 220px;
 
-    & > .expander {
-      flex: 1;
-    }
+  .loader {
+    width: 85%;
   }
 
   .loading-error {
@@ -39,16 +31,14 @@
     transform: translate(-50%, -50%);
   }
 
-  .chart-container {
+  .no-data-text {
     position: absolute;
-    top: 34px;
-    width: 100%;
-    bottom: 0;
-    overflow: hidden;
+    left: 30vw;
+    top: 15vh;
+    font-size: 20px;
+  }
 
-    .segment-bar-chart,
-    .segment-bar-chart-render {
-      @include pin-full;
-    }
+  .side-control {
+    padding-top: 20px;
   }
 }
diff --git a/web-console/src/components/segment-timeline/segment-timeline.spec.tsx b/web-console/src/components/segment-timeline/segment-timeline.spec.tsx
index ebc83ae143c7..4f95842801a4 100644
--- a/web-console/src/components/segment-timeline/segment-timeline.spec.tsx
+++ b/web-console/src/components/segment-timeline/segment-timeline.spec.tsx
@@ -16,42 +16,40 @@
  * limitations under the License.
  */
 
+import { sane } from '@druid-toolkit/query';
 import { render } from '@testing-library/react';
 
 import { Capabilities } from '../../helpers';
-import { QueryState } from '../../utils';
 
 import { SegmentTimeline } from './segment-timeline';
 
-jest.useFakeTimers('modern').setSystemTime(Date.parse('2024-11-19T12:34:56Z'));
-
-jest.mock('../../hooks', () => {
-  return {
-    useQueryManager: (options: any) => {
-      if (options.initQuery instanceof Capabilities) {
-        // This is a query for data sources
-        return [new QueryState({ data: ['ds1', 'ds2'] })];
-      }
-
-      if (options.query === null) {
-        // This is a query for the data source time range
-        return [
-          new QueryState({
-            data: [new Date('2024-11-01 00:00:00Z'), new Date('2024-11-18 00:00:00Z')],
-          }),
-        ];
-      }
-
-      return new QueryState({ error: new Error('not covered') });
-    },
-  };
-});
+jest.useFakeTimers('modern').setSystemTime(Date.parse('2021-06-08T12:34:56Z'));
 
 describe('SegmentTimeline', () => {
+  it('.getSqlQuery', () => {
+    expect(
+      SegmentTimeline.getSqlQuery([
+        new Date('2020-01-01T00:00:00Z'),
+        new Date('2021-02-01T00:00:00Z'),
+      ]),
+    ).toEqual(sane`
+      SELECT
+        "start", "end", "datasource",
+        COUNT(*) AS "count",
+        SUM("size") AS "size"
+      FROM sys.segments
+      WHERE
+        '2020-01-01T00:00:00.000Z' <= "start" AND
+        "end" <= '2021-02-01T00:00:00.000Z' AND
+        is_published = 1 AND
+        is_overshadowed = 0
+      GROUP BY 1, 2, 3
+      ORDER BY "start" DESC
+    `);
+  });
+
   it('matches snapshot', () => {
-    const segmentTimeline = (
-      <SegmentTimeline capabilities={Capabilities.FULL} datasource={undefined} />
-    );
+    const segmentTimeline = <SegmentTimeline capabilities={Capabilities.FULL} />;
     const { container } = render(segmentTimeline);
     expect(container.firstChild).toMatchSnapshot();
   });
diff --git a/web-console/src/components/segment-timeline/segment-timeline.tsx b/web-console/src/components/segment-timeline/segment-timeline.tsx
index 2774c73276eb..8aee0c66d477 100644
--- a/web-console/src/components/segment-timeline/segment-timeline.tsx
+++ b/web-console/src/components/segment-timeline/segment-timeline.tsx
@@ -16,361 +16,628 @@
  * limitations under the License.
  */
 
-import {
-  Button,
-  ButtonGroup,
-  Intent,
-  Menu,
-  MenuItem,
-  Popover,
-  Position,
-  ResizeSensor,
-} from '@blueprintjs/core';
-import type { NonNullDateRange } from '@blueprintjs/datetime';
-import { DateRangePicker3 } from '@blueprintjs/datetime2';
+import { Button, FormGroup, MenuItem, ResizeSensor, SegmentedControl } from '@blueprintjs/core';
+import type { DateRange, NonNullDateRange } from '@blueprintjs/datetime';
+import { DateRangeInput3 } from '@blueprintjs/datetime2';
 import { IconNames } from '@blueprintjs/icons';
+import type { ItemPredicate, ItemRenderer } from '@blueprintjs/select';
 import { Select } from '@blueprintjs/select';
-import { C, L, N, SqlExpression, SqlQuery } from 'druid-query-toolkit';
-import { useEffect, useMemo, useState } from 'react';
+import type { AxisScale } from 'd3-axis';
+import { scaleLinear, scaleUtc } from 'd3-scale';
+import enUS from 'date-fns/locale/en-US';
+import React from 'react';
 
-import { END_OF_TIME_DATE, START_OF_TIME_DATE } from '../../druid-models';
 import type { Capabilities } from '../../helpers';
-import { useQueryManager } from '../../hooks';
+import { Api } from '../../singletons';
 import {
-  checkedCircleIcon,
-  day,
-  Duration,
-  getApiArray,
+  ceilToUtcDay,
+  formatBytes,
+  formatInteger,
   isNonNullRange,
   localToUtcDateRange,
-  maxDate,
   queryDruidSql,
-  TZ_UTC,
+  QueryManager,
+  uniq,
   utcToLocalDateRange,
 } from '../../utils';
-import { Stage } from '../../utils/stage';
 import { Loader } from '../loader/loader';
 
-import type { IntervalStat } from './common';
-import { formatIsoDateOnly, getIntervalStatTitle, INTERVAL_STATS } from './common';
-import type { SegmentBarChartProps } from './segment-bar-chart';
-import { SegmentBarChart } from './segment-bar-chart';
+import type { BarUnitData } from './stacked-bar-chart';
+import { StackedBarChart } from './stacked-bar-chart';
 
 import './segment-timeline.scss';
 
-const DEFAULT_SHOWN_DURATION = new Duration('P1Y');
-const SHOWN_DURATION_OPTIONS: Duration[] = [
-  new Duration('P1D'),
-  new Duration('P1W'),
-  new Duration('P1M'),
-  new Duration('P3M'),
-  new Duration('P1Y'),
-  new Duration('P5Y'),
-  new Duration('P10Y'),
-];
-
-function getDateRange(shownDuration: Duration): NonNullDateRange {
-  const end = day.ceil(new Date(), TZ_UTC);
-  return [shownDuration.shift(end, TZ_UTC, -1), end];
+interface SegmentTimelineProps {
+  capabilities: Capabilities;
 }
 
-function formatDateRange(dateRange: NonNullDateRange): string {
-  return `${formatIsoDateOnly(dateRange[0])} → ${formatIsoDateOnly(dateRange[1])}`;
+type ActiveDataType = 'sizeData' | 'countData';
+
+interface SegmentTimelineState {
+  chartHeight: number;
+  chartWidth: number;
+  data?: Record<string, any>;
+  datasources: string[];
+  stackedData?: Record<string, BarUnitData[]>;
+  singleDatasourceData?: Record<string, Record<string, BarUnitData[]>>;
+  activeDatasource: string | null;
+  activeDataType: ActiveDataType;
+  dataToRender: BarUnitData[];
+  loading: boolean;
+  error?: Error;
+  xScale: AxisScale<Date> | null;
+  yScale: AxisScale<number> | null;
+  dateRange: NonNullDateRange;
+  selectedDateRange?: DateRange;
 }
 
-function dateRangesEqual(dr1: NonNullDateRange, dr2: NonNullDateRange): boolean {
-  return dr1[0].valueOf() === dr2[0].valueOf() && dr2[1].valueOf() === dr2[1].valueOf();
+interface BarChartScales {
+  xScale: AxisScale<Date>;
+  yScale: AxisScale<number>;
 }
 
-interface SegmentTimelineProps extends Pick<SegmentBarChartProps, 'getIntervalActionButton'> {
-  capabilities: Capabilities;
-  datasource: string | undefined;
+interface IntervalRow {
+  start: string;
+  end: string;
+  datasource: string;
+  count: number;
+  size: number;
 }
 
-export const SegmentTimeline = function SegmentTimeline(props: SegmentTimelineProps) {
-  const { capabilities, datasource, ...otherProps } = props;
-  const [stage, setStage] = useState<Stage | undefined>();
-  const [activeSegmentStat, setActiveSegmentStat] = useState<IntervalStat>('size');
-  const [shownDatasource, setShownDatasource] = useState<string | undefined>(datasource);
-  const [dateRange, setDateRange] = useState<NonNullDateRange | undefined>();
-  const [showCustomDatePicker, setShowCustomDatePicker] = useState(false);
-
-  useEffect(() => {
-    setShownDatasource(datasource);
-  }, [datasource]);
-
-  const defaultDateRange = useMemo(() => {
-    return getDateRange(DEFAULT_SHOWN_DURATION);
-  }, []);
-
-  const [datasourcesState] = useQueryManager<Capabilities, string[]>({
-    initQuery: capabilities,
-    processQuery: async (capabilities, cancelToken) => {
-      if (capabilities.hasSql()) {
-        const tables = await queryDruidSql<{ TABLE_NAME: string }>(
-          {
-            query: `SELECT TABLE_NAME FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_TYPE = 'TABLE'`,
-          },
-          cancelToken,
-        );
+const DEFAULT_TIME_SPAN_MONTHS = 3;
+
+function getDefaultDateRange(): NonNullDateRange {
+  const start = ceilToUtcDay(new Date());
+  const end = new Date(start.valueOf());
+  start.setUTCMonth(start.getUTCMonth() - DEFAULT_TIME_SPAN_MONTHS);
+  return [start, end];
+}
+
+export class SegmentTimeline extends React.PureComponent<
+  SegmentTimelineProps,
+  SegmentTimelineState
+> {
+  static COLORS = [
+    '#b33040',
+    '#d25c4d',
+    '#f2b447',
+    '#d9d574',
+    '#4FAA7E',
+    '#57ceff',
+    '#789113',
+    '#098777',
+    '#b33040',
+    '#d2757b',
+    '#f29063',
+    '#d9a241',
+    '#80aa61',
+    '#c4ff9e',
+    '#915412',
+    '#87606c',
+  ];
+
+  static getColor(index: number): string {
+    return SegmentTimeline.COLORS[index % SegmentTimeline.COLORS.length];
+  }
+
+  static getSqlQuery(dateRange: NonNullDateRange): string {
+    return `SELECT
+  "start", "end", "datasource",
+  COUNT(*) AS "count",
+  SUM("size") AS "size"
+FROM sys.segments
+WHERE
+  '${dateRange[0].toISOString()}' <= "start" AND
+  "end" <= '${dateRange[1].toISOString()}' AND
+  is_published = 1 AND
+  is_overshadowed = 0
+GROUP BY 1, 2, 3
+ORDER BY "start" DESC`;
+  }
+
+  static processRawData(data: IntervalRow[]) {
+    if (data === null) return [];
 
-        return tables.map(d => d.TABLE_NAME);
+    const countData: Record<string, any> = {};
+    const sizeData: Record<string, any> = {};
+    data.forEach(entry => {
+      const start = entry.start;
+      const day = start.split('T')[0];
+      const datasource = entry.datasource;
+      const count = entry.count;
+      const segmentSize = entry.size;
+      if (countData[day] === undefined) {
+        countData[day] = {
+          day,
+          [datasource]: count,
+          total: count,
+        };
+        sizeData[day] = {
+          day,
+          [datasource]: segmentSize,
+          total: segmentSize,
+        };
       } else {
-        return await getApiArray(`/druid/coordinator/v1/datasources`, cancelToken);
+        const countDataEntry: number | undefined = countData[day][datasource];
+        countData[day][datasource] = count + (countDataEntry === undefined ? 0 : countDataEntry);
+        const sizeDataEntry: number | undefined = sizeData[day][datasource];
+        sizeData[day][datasource] = segmentSize + (sizeDataEntry === undefined ? 0 : sizeDataEntry);
+        countData[day].total += count;
+        sizeData[day].total += segmentSize;
       }
-    },
-  });
-
-  const [initDatasourceDateRangeState] = useQueryManager<string | null, NonNullDateRange>({
-    query: dateRange ? undefined : shownDatasource ?? null,
-    processQuery: async (datasource, cancelToken) => {
-      let queriedStart: Date;
-      let queriedEnd: Date;
-      if (capabilities.hasSql()) {
-        const baseQuery = SqlQuery.from(N('sys').table('segments'))
-          .changeWhereExpression(
-            SqlExpression.and(
-              C('start').unequal(START_OF_TIME_DATE),
-              C('end').unequal(END_OF_TIME_DATE),
-              C('is_overshadowed').equal(0),
-              datasource ? C('datasource').equal(L(datasource)) : undefined,
-            ),
-          )
-          .changeLimitValue(1);
+    });
 
-        const endQuery = baseQuery
-          .addSelect(C('end'), { addToOrderBy: 'end', direction: 'DESC' })
-          .toString();
+    const countDataArray = Object.keys(countData)
+      .reverse()
+      .map((time: any) => {
+        return countData[time];
+      });
 
-        const endRes = await queryDruidSql<{ end: string }>({ query: endQuery }, cancelToken).catch(
-          () => [],
-        );
-        if (endRes.length !== 1) {
-          return getDateRange(DEFAULT_SHOWN_DURATION);
+    const sizeDataArray = Object.keys(sizeData)
+      .reverse()
+      .map((time: any) => {
+        return sizeData[time];
+      });
+
+    return { countData: countDataArray, sizeData: sizeDataArray };
+  }
+
+  static calculateStackedData(
+    data: Record<string, any>,
+    datasources: string[],
+  ): Record<string, BarUnitData[]> {
+    const newStackedData: Record<string, BarUnitData[]> = {};
+    Object.keys(data).forEach((type: any) => {
+      const stackedData: any = data[type].map((d: any) => {
+        let y0 = 0;
+        return datasources.map((datasource: string, i) => {
+          const barUnitData = {
+            x: d.day,
+            y: d[datasource] === undefined ? 0 : d[datasource],
+            y0,
+            datasource,
+            color: SegmentTimeline.getColor(i),
+            dailySize: d.total,
+          };
+          y0 += d[datasource] === undefined ? 0 : d[datasource];
+          return barUnitData;
+        });
+      });
+      newStackedData[type] = stackedData.flat();
+    });
+
+    return newStackedData;
+  }
+
+  static calculateSingleDatasourceData(
+    data: Record<string, any>,
+    datasources: string[],
+  ): Record<string, Record<string, BarUnitData[]>> {
+    const singleDatasourceData: Record<string, Record<string, BarUnitData[]>> = {};
+    Object.keys(data).forEach(dataType => {
+      singleDatasourceData[dataType] = {};
+      datasources.forEach((datasource, i) => {
+        const currentData = data[dataType];
+        if (currentData.length === 0) return;
+        const dataResult = currentData.map((d: any) => {
+          let y = 0;
+          if (d[datasource] !== undefined) {
+            y = d[datasource];
+          }
+          return {
+            x: d.day,
+            y,
+            datasource,
+            color: SegmentTimeline.getColor(i),
+            dailySize: d.total,
+          };
+        });
+        if (!dataResult.every((d: any) => d.y === 0)) {
+          singleDatasourceData[dataType][datasource] = dataResult;
         }
+      });
+    });
 
-        queriedEnd = day.ceil(new Date(endRes[0].end), TZ_UTC);
+    return singleDatasourceData;
+  }
+
+  private readonly dataQueryManager: QueryManager<
+    { capabilities: Capabilities; dateRange: NonNullDateRange },
+    any
+  >;
+
+  private readonly chartMargin = { top: 40, right: 15, bottom: 20, left: 60 };
+
+  constructor(props: SegmentTimelineProps) {
+    super(props);
+    const dateRange = getDefaultDateRange();
+
+    this.state = {
+      chartWidth: 1, // Dummy init values to be replaced
+      chartHeight: 1, // after first render
+      data: {},
+      datasources: [],
+      stackedData: {},
+      singleDatasourceData: {},
+      dataToRender: [],
+      activeDatasource: null,
+      activeDataType: 'sizeData',
+      loading: true,
+      xScale: null,
+      yScale: null,
+      dateRange,
+    };
+
+    this.dataQueryManager = new QueryManager({
+      processQuery: async ({ capabilities, dateRange }, cancelToken) => {
+        let intervals: IntervalRow[];
+        let datasources: string[];
+        if (capabilities.hasSql()) {
+          intervals = await queryDruidSql(
+            {
+              query: SegmentTimeline.getSqlQuery(dateRange),
+            },
+            cancelToken,
+          );
+          datasources = uniq(intervals.map(r => r.datasource).sort());
+        } else if (capabilities.hasCoordinatorAccess()) {
+          const startIso = dateRange[0].toISOString();
 
-        const startQuery = baseQuery
-          .addSelect(C('start'), { addToOrderBy: 'end', direction: 'ASC' })
-          .toString();
+          datasources = (
+            await Api.instance.get(`/druid/coordinator/v1/datasources`, { cancelToken })
+          ).data;
+          intervals = (
+            await Promise.all(
+              datasources.map(async datasource => {
+                const intervalMap = (
+                  await Api.instance.get(
+                    `/druid/coordinator/v1/datasources/${Api.encodePath(
+                      datasource,
+                    )}/intervals?simple`,
+                    { cancelToken },
+                  )
+                ).data;
 
-        const startRes = await queryDruidSql<{ start: string }>(
-          { query: startQuery },
-          cancelToken,
-        ).catch(() => []);
-        if (startRes.length !== 1) {
-          return [DEFAULT_SHOWN_DURATION.shift(queriedEnd, TZ_UTC, -1), queriedEnd]; // Should not really get here
+                return Object.keys(intervalMap)
+                  .map(interval => {
+                    const [start, end] = interval.split('/');
+                    const { count, size } = intervalMap[interval];
+                    return {
+                      start,
+                      end,
+                      datasource,
+                      count,
+                      size,
+                    };
+                  })
+                  .filter(a => startIso < a.start);
+              }),
+            )
+          )
+            .flat()
+            .sort((a, b) => b.start.localeCompare(a.start));
+        } else {
+          throw new Error(`must have SQL or coordinator access`);
         }
 
-        queriedStart = day.floor(new Date(startRes[0].start), TZ_UTC);
-      } else {
-        // Don't bother querying if there is no SQL
-        return getDateRange(DEFAULT_SHOWN_DURATION);
+        const data = SegmentTimeline.processRawData(intervals);
+        const stackedData = SegmentTimeline.calculateStackedData(data, datasources);
+        const singleDatasourceData = SegmentTimeline.calculateSingleDatasourceData(
+          data,
+          datasources,
+        );
+        return { data, datasources, stackedData, singleDatasourceData };
+      },
+      onStateChange: ({ data, loading, error }) => {
+        this.setState({
+          data: data ? data.data : undefined,
+          datasources: data ? data.datasources : [],
+          stackedData: data ? data.stackedData : undefined,
+          singleDatasourceData: data ? data.singleDatasourceData : undefined,
+          loading,
+          error,
+        });
+      },
+    });
+  }
+
+  componentDidMount(): void {
+    const { capabilities } = this.props;
+    const { dateRange } = this.state;
+
+    if (isNonNullRange(dateRange)) {
+      this.dataQueryManager.runQuery({ capabilities, dateRange });
+    }
+  }
+
+  componentWillUnmount(): void {
+    this.dataQueryManager.terminate();
+  }
+
+  componentDidUpdate(_prevProps: SegmentTimelineProps, prevState: SegmentTimelineState): void {
+    const { activeDatasource, activeDataType, singleDatasourceData, stackedData } = this.state;
+    if (
+      prevState.data !== this.state.data ||
+      prevState.activeDataType !== this.state.activeDataType ||
+      prevState.activeDatasource !== this.state.activeDatasource ||
+      prevState.chartWidth !== this.state.chartWidth ||
+      prevState.chartHeight !== this.state.chartHeight
+    ) {
+      const scales: BarChartScales | undefined = this.calculateScales();
+      const dataToRender: BarUnitData[] | undefined = activeDatasource
+        ? singleDatasourceData
+          ? singleDatasourceData[activeDataType][activeDatasource]
+          : undefined
+        : stackedData
+        ? stackedData[activeDataType]
+        : undefined;
+
+      if (scales && dataToRender) {
+        this.setState({
+          dataToRender,
+          xScale: scales.xScale,
+          yScale: scales.yScale,
+        });
       }
+    }
+  }
+
+  private calculateScales(): BarChartScales | undefined {
+    const {
+      chartWidth,
+      chartHeight,
+      data,
+      activeDataType,
+      activeDatasource,
+      singleDatasourceData,
+      dateRange,
+    } = this.state;
+    if (!data || !Object.keys(data).length || !isNonNullRange(dateRange)) return;
+    const activeData = data[activeDataType];
 
-      return [
-        maxDate(queriedStart, DEFAULT_SHOWN_DURATION.shift(queriedEnd, TZ_UTC, -1)),
-        queriedEnd,
+    let yDomain: number[] = [
+      0,
+      activeData.length === 0
+        ? 0
+        : activeData.reduce((max: any, d: any) => (max.total > d.total ? max : d)).total,
+    ];
+
+    if (
+      activeDatasource !== null &&
+      singleDatasourceData![activeDataType][activeDatasource] !== undefined
+    ) {
+      yDomain = [
+        0,
+        singleDatasourceData![activeDataType][activeDatasource].reduce((max: any, d: any) =>
+          max.y > d.y ? max : d,
+        ).y,
       ];
-    },
-  });
-
-  const effectiveDateRange =
-    dateRange ||
-    initDatasourceDateRangeState.data ||
-    (initDatasourceDateRangeState.isLoading() ? undefined : defaultDateRange);
-
-  let previousDateRange: NonNullDateRange | undefined;
-  let zoomedOutDateRange: NonNullDateRange | undefined;
-  let nextDateRange: NonNullDateRange | undefined;
-  if (effectiveDateRange) {
-    const d = Duration.fromRange(effectiveDateRange[0], effectiveDateRange[1], TZ_UTC);
-    const shiftStartBack = d.shift(effectiveDateRange[0], TZ_UTC, -1);
-    const shiftEndForward = d.shift(effectiveDateRange[1], TZ_UTC);
-    const now = day.ceil(new Date(), TZ_UTC);
-    previousDateRange = [shiftStartBack, effectiveDateRange[0]];
-    zoomedOutDateRange = [shiftStartBack, shiftEndForward < now ? shiftEndForward : now];
-    nextDateRange = [effectiveDateRange[1], shiftEndForward];
+    }
+
+    const xScale: AxisScale<Date> = scaleUtc()
+      .domain(dateRange)
+      .range([0, chartWidth - this.chartMargin.left - this.chartMargin.right]);
+
+    const yScale: AxisScale<number> = scaleLinear()
+      .rangeRound([chartHeight - this.chartMargin.top - this.chartMargin.bottom, 0])
+      .domain(yDomain);
+
+    return {
+      xScale,
+      yScale,
+    };
   }
 
-  return (
-    <div className="segment-timeline">
-      <div className="control-bar">
-        <ButtonGroup>
-          <Select<string>
-            items={datasourcesState.data || []}
-            disabled={datasourcesState.isError()}
-            onItemSelect={setShownDatasource}
-            itemRenderer={(val, { handleClick, handleFocus, modifiers }) => {
-              if (!modifiers.matchesPredicate) return null;
-              return (
-                <MenuItem
-                  key={val}
-                  disabled={modifiers.disabled}
-                  active={modifiers.active}
-                  onClick={handleClick}
-                  onFocus={handleFocus}
-                  roleStructure="listoption"
-                  text={val}
-                />
-              );
-            }}
-            noResults={<MenuItem disabled text="No results" roleStructure="listoption" />}
-            itemPredicate={(query, val, _index, exactMatch) => {
-              const normalizedTitle = val.toLowerCase();
-              const normalizedQuery = query.toLowerCase();
-
-              if (exactMatch) {
-                return normalizedTitle === normalizedQuery;
-              } else {
-                return normalizedTitle.includes(normalizedQuery);
-              }
-            }}
-          >
-            <Button
-              text={`Datasource: ${shownDatasource ?? 'all'}`}
-              small
-              rightIcon={IconNames.CARET_DOWN}
-              intent={datasourcesState.isError() ? Intent.WARNING : undefined}
-              data-tooltip={
-                datasourcesState.isError()
-                  ? `Error: ${datasourcesState.getErrorMessage()}`
-                  : undefined
-              }
-            />
-          </Select>
-          {shownDatasource && (
-            <Button icon={IconNames.CROSS} small onClick={() => setShownDatasource(undefined)} />
-          )}
-        </ButtonGroup>
-        <Popover
-          position={Position.BOTTOM_LEFT}
-          content={
-            <Menu>
-              {INTERVAL_STATS.map(stat => (
-                <MenuItem
-                  key={stat}
-                  icon={checkedCircleIcon(stat === activeSegmentStat)}
-                  text={getIntervalStatTitle(stat)}
-                  onClick={() => setActiveSegmentStat(stat)}
-                />
-              ))}
-            </Menu>
+  private readonly formatTick = (n: number) => {
+    if (isNaN(n)) return '';
+    const { activeDataType } = this.state;
+    if (activeDataType === 'countData') {
+      return formatInteger(n);
+    } else {
+      return formatBytes(n);
+    }
+  };
+
+  private readonly handleResize = (entries: ResizeObserverEntry[]) => {
+    const chartRect = entries[0].contentRect;
+    this.setState({
+      chartWidth: chartRect.width,
+      chartHeight: chartRect.height,
+    });
+  };
+
+  renderStackedBarChart() {
+    const {
+      chartWidth,
+      chartHeight,
+      loading,
+      dataToRender,
+      activeDataType,
+      error,
+      xScale,
+      yScale,
+      data,
+      activeDatasource,
+      dateRange,
+    } = this.state;
+
+    if (loading) {
+      return (
+        <div>
+          <Loader loading={loading} />
+        </div>
+      );
+    }
+
+    if (error) {
+      return (
+        <div>
+          <span className="no-data-text">Error when loading data: {error.message}</span>
+        </div>
+      );
+    }
+
+    if (xScale === null || yScale === null) {
+      return (
+        <div>
+          <span className="no-data-text">Error when calculating scales</span>
+        </div>
+      );
+    }
+
+    if (data![activeDataType].length === 0) {
+      return (
+        <div>
+          <span className="no-data-text">There are no segments for the selected interval</span>
+        </div>
+      );
+    }
+
+    if (
+      activeDatasource !== null &&
+      data![activeDataType].every((d: any) => d[activeDatasource] === undefined)
+    ) {
+      return (
+        <div>
+          <span className="no-data-text">
+            No data available for <i>{activeDatasource}</i>
+          </span>
+        </div>
+      );
+    }
+
+    const millisecondsPerDay = 24 * 60 * 60 * 1000;
+    const barCounts = (dateRange[1].getTime() - dateRange[0].getTime()) / millisecondsPerDay;
+    const barWidth = Math.max(
+      0,
+      (chartWidth - this.chartMargin.left - this.chartMargin.right) / barCounts,
+    );
+    return (
+      <ResizeSensor onResize={this.handleResize}>
+        <StackedBarChart
+          dataToRender={dataToRender}
+          svgHeight={chartHeight}
+          svgWidth={chartWidth}
+          margin={this.chartMargin}
+          changeActiveDatasource={(datasource: string | null) =>
+            this.setState(prevState => ({
+              activeDatasource: prevState.activeDatasource ? null : datasource,
+            }))
           }
+          activeDataType={activeDataType}
+          formatTick={(n: number) => this.formatTick(n)}
+          xScale={xScale}
+          yScale={yScale}
+          barWidth={barWidth}
+        />
+      </ResizeSensor>
+    );
+  }
+
+  render() {
+    const { capabilities } = this.props;
+    const { datasources, activeDataType, activeDatasource, dateRange, selectedDateRange } =
+      this.state;
+
+    const filterDatasource: ItemPredicate<string> = (query, val, _index, exactMatch) => {
+      const normalizedTitle = val.toLowerCase();
+      const normalizedQuery = query.toLowerCase();
+
+      if (exactMatch) {
+        return normalizedTitle === normalizedQuery;
+      } else {
+        return ` ${normalizedTitle}`.includes(normalizedQuery);
+      }
+    };
+
+    const datasourceRenderer: ItemRenderer<string> = (
+      val,
+      { handleClick, handleFocus, modifiers },
+    ) => {
+      if (!modifiers.matchesPredicate) {
+        return null;
+      }
+      return (
+        <MenuItem
+          key={val}
+          disabled={modifiers.disabled}
+          active={modifiers.active}
+          onClick={handleClick}
+          onFocus={handleFocus}
+          roleStructure="listoption"
+          text={val}
+        />
+      );
+    };
+
+    const DatasourceSelect: React.FC = () => {
+      const showAll = 'Show all';
+      const handleItemSelected = (selectedItem: string) => {
+        this.setState({
+          activeDatasource: selectedItem === showAll ? null : selectedItem,
+        });
+      };
+      const datasourcesWzAll = [showAll].concat(datasources);
+      return (
+        <Select<string>
+          items={datasourcesWzAll}
+          onItemSelect={handleItemSelected}
+          itemRenderer={datasourceRenderer}
+          noResults={<MenuItem disabled text="No results." roleStructure="listoption" />}
+          itemPredicate={filterDatasource}
+          fill
         >
           <Button
-            text={`Show: ${getIntervalStatTitle(activeSegmentStat)}`}
-            small
+            text={activeDatasource === null ? showAll : activeDatasource}
+            fill
             rightIcon={IconNames.CARET_DOWN}
           />
-        </Popover>
-        <div className="expander" />
-        <ButtonGroup>
-          <Button
-            icon={IconNames.CARET_LEFT}
-            data-tooltip={
-              previousDateRange && `Previous time period\n${formatDateRange(previousDateRange)}`
-            }
-            small
-            disabled={!previousDateRange}
-            onClick={() => setDateRange(previousDateRange)}
-          />
-          <Button
-            icon={IconNames.ZOOM_OUT}
-            data-tooltip={zoomedOutDateRange && `Zoom out\n${formatDateRange(zoomedOutDateRange)}`}
-            small
-            disabled={!zoomedOutDateRange}
-            onClick={() => setDateRange(zoomedOutDateRange)}
-          />
-          <Button
-            icon={IconNames.CARET_RIGHT}
-            data-tooltip={nextDateRange && `Next time period\n${formatDateRange(nextDateRange)}`}
-            small
-            disabled={!nextDateRange}
-            onClick={() => setDateRange(nextDateRange)}
-          />
-        </ButtonGroup>
-        <ButtonGroup>
-          {SHOWN_DURATION_OPTIONS.map((d, i) => {
-            const dr = getDateRange(d);
-            return (
-              <Button
-                key={i}
-                text={d.toString().replace('P', '')}
-                data-tooltip={`Show last ${d.getDescription()}\n${formatDateRange(dr)}`}
-                active={effectiveDateRange && dateRangesEqual(effectiveDateRange, dr)}
-                small
-                onClick={() => setDateRange(dr)}
-              />
-            );
-          })}
-          <Popover
-            isOpen={showCustomDatePicker}
-            onInteraction={setShowCustomDatePicker}
-            content={
-              <DateRangePicker3
-                defaultValue={utcToLocalDateRange(
-                  effectiveDateRange || getDateRange(DEFAULT_SHOWN_DURATION),
-                )}
-                onChange={newDateRange => {
-                  const newUtcDateRange = localToUtcDateRange(newDateRange);
-                  if (!isNonNullRange(newUtcDateRange)) return;
-                  setDateRange(newUtcDateRange);
-                  setShowCustomDatePicker(false);
-                }}
-                contiguousCalendarMonths={false}
-                reverseMonthAndYearMenus
-                timePickerProps={undefined}
-                shortcuts={false}
-              />
-            }
-          >
-            <Button
-              icon={IconNames.CALENDAR}
-              text={
-                effectiveDateRange
-                  ? formatDateRange(effectiveDateRange)
-                  : `Loading datasource date range`
+        </Select>
+      );
+    };
+
+    return (
+      <div className="segment-timeline">
+        {this.renderStackedBarChart()}
+        <div className="side-control">
+          <FormGroup label="Show">
+            <SegmentedControl
+              value={activeDataType}
+              onValueChange={activeDataType =>
+                this.setState({ activeDataType: activeDataType as ActiveDataType })
               }
-              data-tooltip={showCustomDatePicker ? undefined : `Select a custom date range`}
-              small
+              options={[
+                {
+                  label: 'Total size',
+                  value: 'sizeData',
+                },
+                {
+                  label: 'Segment count',
+                  value: 'countData',
+                },
+              ]}
+              fill
             />
-          </Popover>
-          <Button
-            icon={IconNames.PIN}
-            data-tooltip={
-              dateRange ? 'Pin the date range' : 'Auto determine date range to fit datasource'
-            }
-            active={Boolean(dateRange)}
-            disabled={!effectiveDateRange}
-            small
-            onClick={() => setDateRange(dateRange ? undefined : effectiveDateRange)}
-          />
-        </ButtonGroup>
-      </div>
-      <ResizeSensor
-        onResize={(entries: ResizeObserverEntry[]) => {
-          const rect = entries[0].contentRect;
-          setStage(new Stage(rect.width, rect.height));
-        }}
-      >
-        <div className="chart-container">
-          {stage && effectiveDateRange && (
-            <SegmentBarChart
-              capabilities={capabilities}
-              stage={stage}
-              dateRange={effectiveDateRange}
-              changeDateRange={setDateRange}
-              shownIntervalStat={activeSegmentStat}
-              shownDatasource={shownDatasource}
-              changeShownDatasource={setShownDatasource}
-              {...otherProps}
+          </FormGroup>
+          <FormGroup label="Interval">
+            <DateRangeInput3
+              value={utcToLocalDateRange(selectedDateRange || dateRange)}
+              onChange={newDateRange => {
+                const newUtcDateRange = localToUtcDateRange(newDateRange);
+                if (!isNonNullRange(newUtcDateRange)) return;
+                this.setState({ dateRange: newUtcDateRange, selectedDateRange: undefined }, () => {
+                  this.dataQueryManager.runQuery({ capabilities, dateRange: newUtcDateRange });
+                });
+              }}
+              fill
+              locale={enUS}
             />
-          )}
-          {initDatasourceDateRangeState.isLoading() && <Loader />}
+          </FormGroup>
+          <FormGroup label="Datasource">
+            <DatasourceSelect />
+          </FormGroup>
         </div>
-      </ResizeSensor>
-    </div>
-  );
-};
+      </div>
+    );
+  }
+}
diff --git a/web-console/src/druid-models/datasource/datasource.ts b/web-console/src/components/segment-timeline/stacked-bar-chart.scss
similarity index 64%
rename from web-console/src/druid-models/datasource/datasource.ts
rename to web-console/src/components/segment-timeline/stacked-bar-chart.scss
index 313d711b35c2..26e5f5186b5f 100644
--- a/web-console/src/druid-models/datasource/datasource.ts
+++ b/web-console/src/components/segment-timeline/stacked-bar-chart.scss
@@ -16,32 +16,35 @@
  * limitations under the License.
  */
 
-import { hashJoaat } from '../../utils';
+.stacked-bar-chart {
+  position: relative;
+  overflow: hidden;
 
-const COLORS = [
-  '#1f77b4',
-  '#aec7e8',
-  '#ff7f0e',
-  '#ffbb78',
-  '#2ca02c',
-  '#98df8a',
-  '#d62728',
-  '#ff9896',
-  '#9467bd',
-  '#c5b0d5',
-  '#8c564b',
-  '#c49c94',
-  '#e377c2',
-  '#f7b6d2',
-  '#7f7f7f',
-  '#c7c7c7',
-  '#bcbd22',
-  '#dbdb8d',
-  '#17becf',
-  '#9edae5',
-];
+  .bar-chart-tooltip {
+    position: absolute;
+    left: 100px;
+    right: 0;
 
-export function getDatasourceColor(datasource: string) {
-  const hash = hashJoaat(datasource);
-  return COLORS[hash % COLORS.length];
+    div {
+      display: inline-block;
+      width: 230px;
+    }
+  }
+
+  svg {
+    position: absolute;
+
+    .hovered-bar {
+      fill: transparent;
+      stroke: #ffffff;
+      stroke-width: 1.5px;
+    }
+
+    .gridline-x {
+      line {
+        stroke-dasharray: 5, 5;
+        opacity: 0.5;
+      }
+    }
+  }
 }
diff --git a/web-console/src/components/segment-timeline/stacked-bar-chart.tsx b/web-console/src/components/segment-timeline/stacked-bar-chart.tsx
new file mode 100644
index 000000000000..8018aaee5f6f
--- /dev/null
+++ b/web-console/src/components/segment-timeline/stacked-bar-chart.tsx
@@ -0,0 +1,174 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import type { AxisScale } from 'd3-axis';
+import { axisBottom, axisLeft } from 'd3-axis';
+import React, { useState } from 'react';
+
+import { BarGroup } from './bar-group';
+import { ChartAxis } from './chart-axis';
+
+import './stacked-bar-chart.scss';
+
+export interface BarUnitData {
+  x: number;
+  y: number;
+  y0?: number;
+  width: number;
+  datasource: string;
+  color: string;
+  dailySize?: number;
+}
+
+export interface BarChartMargin {
+  top: number;
+  right: number;
+  bottom: number;
+  left: number;
+}
+
+export interface HoveredBarInfo {
+  xCoordinate?: number;
+  yCoordinate?: number;
+  height?: number;
+  width?: number;
+  datasource?: string;
+  xValue?: number;
+  yValue?: number;
+  dailySize?: number;
+}
+
+interface StackedBarChartProps {
+  svgWidth: number;
+  svgHeight: number;
+  margin: BarChartMargin;
+  activeDataType?: string;
+  dataToRender: BarUnitData[];
+  changeActiveDatasource: (e: string | null) => void;
+  formatTick: (e: number) => string;
+  xScale: AxisScale<Date>;
+  yScale: AxisScale<number>;
+  barWidth: number;
+}
+
+export const StackedBarChart = React.forwardRef(function StackedBarChart(
+  props: StackedBarChartProps,
+  ref,
+) {
+  const {
+    activeDataType,
+    svgWidth,
+    svgHeight,
+    margin,
+    formatTick,
+    xScale,
+    yScale,
+    dataToRender,
+    changeActiveDatasource,
+    barWidth,
+  } = props;
+  const [hoverOn, setHoverOn] = useState<HoveredBarInfo>();
+
+  const width = svgWidth - margin.left - margin.right;
+  const height = svgHeight - margin.top - margin.bottom;
+
+  function renderBarChart() {
+    return (
+      <svg
+        width={svgWidth}
+        height={svgHeight}
+        viewBox={`0 0 ${svgWidth} ${svgHeight}`}
+        preserveAspectRatio="xMinYMin meet"
+      >
+        <g
+          transform={`translate(${margin.left}, ${margin.top})`}
+          onMouseLeave={() => setHoverOn(undefined)}
+        >
+          <ChartAxis
+            className="gridline-x"
+            transform="translate(0, 0)"
+            scale={axisLeft(yScale)
+              .ticks(5)
+              .tickSize(-width)
+              .tickFormat(() => '')
+              .tickSizeOuter(0)}
+          />
+          <BarGroup
+            dataToRender={dataToRender}
+            changeActiveDatasource={changeActiveDatasource}
+            formatTick={formatTick}
+            xScale={xScale}
+            yScale={yScale}
+            onHoverBar={(e: HoveredBarInfo) => setHoverOn(e)}
+            hoverOn={hoverOn}
+            barWidth={barWidth}
+          />
+          <ChartAxis
+            className="axis-x"
+            transform={`translate(0, ${height})`}
+            scale={axisBottom(xScale)}
+          />
+          <ChartAxis
+            className="axis-y"
+            scale={axisLeft(yScale)
+              .ticks(5)
+              .tickFormat((e: number) => formatTick(e))}
+          />
+          {hoverOn && (
+            <g
+              className="hovered-bar"
+              onClick={() => {
+                setHoverOn(undefined);
+                changeActiveDatasource(hoverOn.datasource ?? null);
+              }}
+            >
+              <rect
+                x={hoverOn.xCoordinate}
+                y={hoverOn.yCoordinate}
+                width={barWidth}
+                height={hoverOn.height}
+              />
+            </g>
+          )}
+        </g>
+      </svg>
+    );
+  }
+
+  return (
+    <div className="stacked-bar-chart" ref={ref as any}>
+      {hoverOn && (
+        <div className="bar-chart-tooltip">
+          <div>Datasource: {hoverOn.datasource}</div>
+          <div>Time: {hoverOn.xValue}</div>
+          <div>
+            {`${
+              activeDataType === 'countData' ? 'Daily total count:' : 'Daily total size:'
+            } ${formatTick(hoverOn.dailySize!)}`}
+          </div>
+          <div>
+            {`${activeDataType === 'countData' ? 'Count:' : 'Size:'} ${formatTick(
+              hoverOn.yValue!,
+            )}`}
+          </div>
+        </div>
+      )}
+      {renderBarChart()}
+    </div>
+  );
+});
diff --git a/web-console/src/components/supervisor-history-panel/supervisor-history-panel.tsx b/web-console/src/components/supervisor-history-panel/supervisor-history-panel.tsx
index a7fa38fd445c..74cb55682f30 100644
--- a/web-console/src/components/supervisor-history-panel/supervisor-history-panel.tsx
+++ b/web-console/src/components/supervisor-history-panel/supervisor-history-panel.tsx
@@ -25,7 +25,7 @@ import type { IngestionSpec } from '../../druid-models';
 import { cleanSpec } from '../../druid-models';
 import { useQueryManager } from '../../hooks';
 import { Api } from '../../singletons';
-import { deepSet, getApiArray } from '../../utils';
+import { deepSet } from '../../utils';
 import { Loader } from '../loader/loader';
 import { ShowValue } from '../show-value/show-value';
 
@@ -49,12 +49,11 @@ export const SupervisorHistoryPanel = React.memo(function SupervisorHistoryPanel
   const [historyState] = useQueryManager<string, SupervisorHistoryEntry[]>({
     initQuery: supervisorId,
     processQuery: async (supervisorId, cancelToken) => {
-      return (
-        await getApiArray<SupervisorHistoryEntry>(
-          `/druid/indexer/v1/supervisor/${Api.encodePath(supervisorId)}/history`,
-          cancelToken,
-        )
-      ).map(vs => deepSet(vs, 'spec', cleanSpec(vs.spec)));
+      const resp = await Api.instance.get(
+        `/druid/indexer/v1/supervisor/${Api.encodePath(supervisorId)}/history`,
+        { cancelToken },
+      );
+      return resp.data.map((vs: SupervisorHistoryEntry) => deepSet(vs, 'spec', cleanSpec(vs.spec)));
     },
   });
 
diff --git a/web-console/src/components/table-clickable-cell/table-clickable-cell.tsx b/web-console/src/components/table-clickable-cell/table-clickable-cell.tsx
index 38c69e297e0c..aec706a50fc0 100644
--- a/web-console/src/components/table-clickable-cell/table-clickable-cell.tsx
+++ b/web-console/src/components/table-clickable-cell/table-clickable-cell.tsx
@@ -28,7 +28,7 @@ export interface TableClickableCellProps {
   className?: string;
   onClick: MouseEventHandler<any>;
   hoverIcon?: IconName;
-  tooltip?: string;
+  title?: string;
   disabled?: boolean;
   children?: ReactNode;
 }
@@ -36,13 +36,12 @@ export interface TableClickableCellProps {
 export const TableClickableCell = React.memo(function TableClickableCell(
   props: TableClickableCellProps,
 ) {
-  const { className, onClick, hoverIcon, disabled, children, tooltip, ...rest } = props;
+  const { className, onClick, hoverIcon, disabled, children, ...rest } = props;
 
   return (
     <div
       className={classNames('table-clickable-cell', className, { disabled })}
       onClick={disabled ? undefined : onClick}
-      data-tooltip={tooltip}
       {...rest}
     >
       {children}
diff --git a/web-console/src/components/table-filterable-cell/table-filterable-cell.tsx b/web-console/src/components/table-filterable-cell/table-filterable-cell.tsx
index c03f0038cc7f..631fa224aaf4 100644
--- a/web-console/src/components/table-filterable-cell/table-filterable-cell.tsx
+++ b/web-console/src/components/table-filterable-cell/table-filterable-cell.tsx
@@ -27,7 +27,7 @@ import { Deferred } from '../deferred/deferred';
 
 import './table-filterable-cell.scss';
 
-const FILTER_MODES: FilterMode[] = ['=', '!=', '<', '>='];
+const FILTER_MODES: FilterMode[] = ['=', '!=', '<=', '>='];
 const FILTER_MODES_NO_COMPARISONS: FilterMode[] = ['=', '!='];
 
 export interface TableFilterableCellProps {
diff --git a/web-console/src/console-application.tsx b/web-console/src/console-application.tsx
index 5dfbba77101a..95336713dbb6 100644
--- a/web-console/src/console-application.tsx
+++ b/web-console/src/console-application.tsx
@@ -182,24 +182,12 @@ export class ConsoleApplication extends React.PureComponent<
     changeTabWithFilter('datasources', [{ id: 'datasource', value: `=${datasource}` }]);
   };
 
-  private readonly goToSegments = ({
-    start,
-    end,
-    datasource,
-    realtime,
-  }: {
-    start?: Date;
-    end?: Date;
-    datasource?: string;
-    realtime?: boolean;
-  }) => {
+  private readonly goToSegments = (datasource: string, onlyUnavailable = false) => {
     changeTabWithFilter(
       'segments',
       compact([
-        start && { id: 'start', value: `>=${start.toISOString()}` },
-        end && { id: 'end', value: `<${end.toISOString()}` },
-        datasource && { id: 'datasource', value: `=${datasource}` },
-        typeof realtime === 'boolean' ? { id: 'is_realtime', value: `=${realtime}` } : undefined,
+        { id: 'datasource', value: `=${datasource}` },
+        onlyUnavailable ? { id: 'is_available', value: '=false' } : undefined,
       ]),
     );
   };
diff --git a/web-console/src/dialogs/compaction-history-dialog/compaction-history-dialog.tsx b/web-console/src/dialogs/compaction-history-dialog/compaction-history-dialog.tsx
index 8ee0ffdbfbc3..9e19e043c713 100644
--- a/web-console/src/dialogs/compaction-history-dialog/compaction-history-dialog.tsx
+++ b/web-console/src/dialogs/compaction-history-dialog/compaction-history-dialog.tsx
@@ -24,7 +24,7 @@ import { Loader, ShowValue } from '../../components';
 import type { CompactionConfig } from '../../druid-models';
 import { useQueryManager } from '../../hooks';
 import { Api } from '../../singletons';
-import { formatInteger, formatPercent, getApiArray } from '../../utils';
+import { formatInteger, formatPercent } from '../../utils';
 import { DiffDialog } from '../diff-dialog/diff-dialog';
 
 import './compaction-history-dialog.scss';
@@ -65,10 +65,11 @@ export const CompactionHistoryDialog = React.memo(function CompactionHistoryDial
     initQuery: datasource,
     processQuery: async (datasource, cancelToken) => {
       try {
-        return await getApiArray<CompactionHistoryEntry>(
+        const resp = await Api.instance.get(
           `/druid/coordinator/v1/config/compaction/${Api.encodePath(datasource)}/history?count=20`,
-          cancelToken,
+          { cancelToken },
         );
+        return resp.data;
       } catch (e) {
         if (e.response?.status === 404) return [];
         throw e;
diff --git a/web-console/src/dialogs/coordinator-dynamic-config-dialog/coordinator-dynamic-config-dialog.tsx b/web-console/src/dialogs/coordinator-dynamic-config-dialog/coordinator-dynamic-config-dialog.tsx
index ab4fed8ae1ad..ec964f5507ee 100644
--- a/web-console/src/dialogs/coordinator-dynamic-config-dialog/coordinator-dynamic-config-dialog.tsx
+++ b/web-console/src/dialogs/coordinator-dynamic-config-dialog/coordinator-dynamic-config-dialog.tsx
@@ -27,7 +27,7 @@ import { COORDINATOR_DYNAMIC_CONFIG_FIELDS } from '../../druid-models';
 import { useQueryManager } from '../../hooks';
 import { getLink } from '../../links';
 import { Api, AppToaster } from '../../singletons';
-import { getApiArray, getDruidErrorMessage } from '../../utils';
+import { getDruidErrorMessage } from '../../utils';
 import { SnitchDialog } from '..';
 
 import './coordinator-dynamic-config-dialog.scss';
@@ -47,7 +47,10 @@ export const CoordinatorDynamicConfigDialog = React.memo(function CoordinatorDyn
   const [historyRecordsState] = useQueryManager<null, any[]>({
     initQuery: null,
     processQuery: async (_, cancelToken) => {
-      return await getApiArray(`/druid/coordinator/v1/config/history?count=100`, cancelToken);
+      const historyResp = await Api.instance.get(`/druid/coordinator/v1/config/history?count=100`, {
+        cancelToken,
+      });
+      return historyResp.data;
     },
   });
 
diff --git a/web-console/src/dialogs/datasource-table-action-dialog/datasource-columns-table/datasource-columns-table.tsx b/web-console/src/dialogs/datasource-table-action-dialog/datasource-columns-table/datasource-columns-table.tsx
index 3dfb2f7879d7..82187c866f44 100644
--- a/web-console/src/dialogs/datasource-table-action-dialog/datasource-columns-table/datasource-columns-table.tsx
+++ b/web-console/src/dialogs/datasource-table-action-dialog/datasource-columns-table/datasource-columns-table.tsx
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-import { L } from 'druid-query-toolkit';
+import { L } from '@druid-toolkit/query';
 import React from 'react';
 import ReactTable from 'react-table';
 
diff --git a/web-console/src/dialogs/datasource-table-action-dialog/datasource-preview-pane/datasource-preview-pane.tsx b/web-console/src/dialogs/datasource-table-action-dialog/datasource-preview-pane/datasource-preview-pane.tsx
index c48cbfa51989..1ca92787c1cb 100644
--- a/web-console/src/dialogs/datasource-table-action-dialog/datasource-preview-pane/datasource-preview-pane.tsx
+++ b/web-console/src/dialogs/datasource-table-action-dialog/datasource-preview-pane/datasource-preview-pane.tsx
@@ -16,8 +16,8 @@
  * limitations under the License.
  */
 
-import type { QueryResult } from 'druid-query-toolkit';
-import { QueryRunner, T } from 'druid-query-toolkit';
+import type { QueryResult } from '@druid-toolkit/query';
+import { QueryRunner, T } from '@druid-toolkit/query';
 import React from 'react';
 
 import { Loader, RecordTablePane } from '../../../components';
diff --git a/web-console/src/dialogs/lookup-table-action-dialog/lookup-values-table/lookup-values-table.tsx b/web-console/src/dialogs/lookup-table-action-dialog/lookup-values-table/lookup-values-table.tsx
index 122cc4566b85..c36445d17731 100644
--- a/web-console/src/dialogs/lookup-table-action-dialog/lookup-values-table/lookup-values-table.tsx
+++ b/web-console/src/dialogs/lookup-table-action-dialog/lookup-values-table/lookup-values-table.tsx
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-import { N } from 'druid-query-toolkit';
+import { N } from '@druid-toolkit/query';
 import React from 'react';
 import ReactTable from 'react-table';
 
diff --git a/web-console/src/dialogs/overlord-dynamic-config-dialog/overlord-dynamic-config-dialog.tsx b/web-console/src/dialogs/overlord-dynamic-config-dialog/overlord-dynamic-config-dialog.tsx
index 5b1233c6384e..ba30118b0a32 100644
--- a/web-console/src/dialogs/overlord-dynamic-config-dialog/overlord-dynamic-config-dialog.tsx
+++ b/web-console/src/dialogs/overlord-dynamic-config-dialog/overlord-dynamic-config-dialog.tsx
@@ -27,7 +27,7 @@ import { OVERLORD_DYNAMIC_CONFIG_FIELDS } from '../../druid-models';
 import { useQueryManager } from '../../hooks';
 import { getLink } from '../../links';
 import { Api, AppToaster } from '../../singletons';
-import { getApiArray, getDruidErrorMessage } from '../../utils';
+import { getDruidErrorMessage } from '../../utils';
 import { SnitchDialog } from '..';
 
 import './overlord-dynamic-config-dialog.scss';
@@ -47,7 +47,10 @@ export const OverlordDynamicConfigDialog = React.memo(function OverlordDynamicCo
   const [historyRecordsState] = useQueryManager<null, any[]>({
     initQuery: null,
     processQuery: async (_, cancelToken) => {
-      return await getApiArray(`/druid/indexer/v1/worker/history?count=100`, cancelToken);
+      const historyResp = await Api.instance.get(`/druid/indexer/v1/worker/history?count=100`, {
+        cancelToken,
+      });
+      return historyResp.data;
     },
   });
 
diff --git a/web-console/src/dialogs/retention-dialog/__snapshots__/retention-dialog.spec.tsx.snap b/web-console/src/dialogs/retention-dialog/__snapshots__/retention-dialog.spec.tsx.snap
index 8bba057fac2d..19c90c7de335 100644
--- a/web-console/src/dialogs/retention-dialog/__snapshots__/retention-dialog.spec.tsx.snap
+++ b/web-console/src/dialogs/retention-dialog/__snapshots__/retention-dialog.spec.tsx.snap
@@ -188,7 +188,7 @@ exports[`RetentionDialog matches snapshot 1`] = `
                         style="transform: translateY(0); transition: none;"
                       >
                         <div
-                          class="rule-detail bp5-card bp5-elevation-2"
+                          class="bp5-card bp5-elevation-2"
                         >
                           <div
                             class="bp5-form-group"
@@ -653,7 +653,7 @@ exports[`RetentionDialog matches snapshot 1`] = `
                         style="transform: translateY(0); transition: none;"
                       >
                         <div
-                          class="rule-detail bp5-card bp5-elevation-2"
+                          class="bp5-card bp5-elevation-2"
                         >
                           <div
                             class="bp5-form-group"
diff --git a/web-console/src/dialogs/retention-dialog/retention-dialog.tsx b/web-console/src/dialogs/retention-dialog/retention-dialog.tsx
index e656a4cbdff2..9b657622d89c 100644
--- a/web-console/src/dialogs/retention-dialog/retention-dialog.tsx
+++ b/web-console/src/dialogs/retention-dialog/retention-dialog.tsx
@@ -22,12 +22,12 @@ import React, { useState } from 'react';
 
 import type { FormJsonTabs } from '../../components';
 import { ExternalLink, FormJsonSelector, JsonInput, RuleEditor } from '../../components';
-import type { Rule } from '../../druid-models';
 import type { Capabilities } from '../../helpers';
 import { useQueryManager } from '../../hooks';
 import { getLink } from '../../links';
 import { Api } from '../../singletons';
-import { filterMap, getApiArray, queryDruidSql, swapElements } from '../../utils';
+import { filterMap, queryDruidSql, swapElements } from '../../utils';
+import type { Rule } from '../../utils/load-rule';
 import { SnitchDialog } from '..';
 
 import './retention-dialog.scss';
@@ -67,9 +67,11 @@ ORDER BY 1`,
 
         return sqlResp.map(d => d.tier);
       } else if (capabilities.hasCoordinatorAccess()) {
-        return filterMap(
-          await getApiArray('/druid/coordinator/v1/servers?simple', cancelToken),
-          (s: any) => (s.type === 'historical' ? s.tier : undefined),
+        const allServiceResp = await Api.instance.get('/druid/coordinator/v1/servers?simple', {
+          cancelToken,
+        });
+        return filterMap(allServiceResp.data, (s: any) =>
+          s.type === 'historical' ? s.tier : undefined,
         );
       } else {
         throw new Error(`must have sql or coordinator access`);
@@ -82,10 +84,11 @@ ORDER BY 1`,
   const [historyQueryState] = useQueryManager<string, any[]>({
     initQuery: props.datasource,
     processQuery: async (datasource, cancelToken) => {
-      return await getApiArray(
+      const historyResp = await Api.instance.get(
         `/druid/coordinator/v1/rules/${Api.encodePath(datasource)}/history?count=200`,
-        cancelToken,
+        { cancelToken },
       );
+      return historyResp.data;
     },
   });
 
diff --git a/web-console/src/dialogs/segments-table-action-dialog/segments-preview-pane/segments-preview-pane.tsx b/web-console/src/dialogs/segments-table-action-dialog/segments-preview-pane/segments-preview-pane.tsx
index 2925482d9901..4c2487ce0cc6 100644
--- a/web-console/src/dialogs/segments-table-action-dialog/segments-preview-pane/segments-preview-pane.tsx
+++ b/web-console/src/dialogs/segments-table-action-dialog/segments-preview-pane/segments-preview-pane.tsx
@@ -16,8 +16,8 @@
  * limitations under the License.
  */
 
-import type { QueryResult } from 'druid-query-toolkit';
-import { QueryRunner } from 'druid-query-toolkit';
+import type { QueryResult } from '@druid-toolkit/query';
+import { QueryRunner } from '@druid-toolkit/query';
 import React from 'react';
 
 import { Loader, RecordTablePane } from '../../../components';
diff --git a/web-console/src/dialogs/status-dialog/status-dialog.tsx b/web-console/src/dialogs/status-dialog/status-dialog.tsx
index 672fc40910f3..311f3e056646 100644
--- a/web-console/src/dialogs/status-dialog/status-dialog.tsx
+++ b/web-console/src/dialogs/status-dialog/status-dialog.tsx
@@ -50,7 +50,8 @@ export const StatusDialog = React.memo(function StatusDialog(props: StatusDialog
   const [responseState] = useQueryManager<null, StatusResponse>({
     initQuery: null,
     processQuery: async (_, cancelToken) => {
-      return (await Api.instance.get(`/status`, { cancelToken })).data;
+      const resp = await Api.instance.get(`/status`, { cancelToken });
+      return resp.data;
     },
   });
 
diff --git a/web-console/src/dialogs/supervisor-reset-offsets-dialog/supervisor-reset-offsets-dialog.tsx b/web-console/src/dialogs/supervisor-reset-offsets-dialog/supervisor-reset-offsets-dialog.tsx
index d10fc00eb5ce..009d83260604 100644
--- a/web-console/src/dialogs/supervisor-reset-offsets-dialog/supervisor-reset-offsets-dialog.tsx
+++ b/web-console/src/dialogs/supervisor-reset-offsets-dialog/supervisor-reset-offsets-dialog.tsx
@@ -106,12 +106,11 @@ export const SupervisorResetOffsetsDialog = React.memo(function SupervisorResetO
   const [statusResp] = useQueryManager<string, SupervisorStatus>({
     initQuery: supervisorId,
     processQuery: async (supervisorId, cancelToken) => {
-      return (
-        await Api.instance.get(
-          `/druid/indexer/v1/supervisor/${Api.encodePath(supervisorId)}/status`,
-          { cancelToken },
-        )
-      ).data;
+      const statusResp = await Api.instance.get(
+        `/druid/indexer/v1/supervisor/${Api.encodePath(supervisorId)}/status`,
+        { cancelToken },
+      );
+      return statusResp.data;
     },
   });
 
diff --git a/web-console/src/druid-models/execution/execution.ts b/web-console/src/druid-models/execution/execution.ts
index 1237b49e62da..f4a73eb97207 100644
--- a/web-console/src/druid-models/execution/execution.ts
+++ b/web-console/src/druid-models/execution/execution.ts
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-import { Column, QueryResult, SqlExpression, SqlQuery, SqlWithQuery } from 'druid-query-toolkit';
+import { Column, QueryResult, SqlExpression, SqlQuery, SqlWithQuery } from '@druid-toolkit/query';
 
 import { maybeGetClusterCapacity } from '../../helpers';
 import {
diff --git a/web-console/src/druid-models/external-config/external-config.ts b/web-console/src/druid-models/external-config/external-config.ts
index 6fa74eb038bd..d6541747ce5a 100644
--- a/web-console/src/druid-models/external-config/external-config.ts
+++ b/web-console/src/druid-models/external-config/external-config.ts
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-import type { SqlQuery } from 'druid-query-toolkit';
+import type { SqlQuery } from '@druid-toolkit/query';
 import {
   C,
   F,
@@ -28,7 +28,7 @@ import {
   SqlLiteral,
   SqlStar,
   SqlType,
-} from 'druid-query-toolkit';
+} from '@druid-toolkit/query';
 import * as JSONBig from 'json-bigint-native';
 
 import { nonEmptyArray } from '../../utils';
diff --git a/web-console/src/druid-models/index.ts b/web-console/src/druid-models/index.ts
index e31eedeea738..dfeeeeaac837 100644
--- a/web-console/src/druid-models/index.ts
+++ b/web-console/src/druid-models/index.ts
@@ -21,7 +21,6 @@ export * from './compaction-config/compaction-config';
 export * from './compaction-status/compaction-status';
 export * from './coordinator-dynamic-config/coordinator-dynamic-config';
 export * from './dart/dart-query-entry';
-export * from './datasource/datasource';
 export * from './dimension-spec/dimension-spec';
 export * from './druid-engine/druid-engine';
 export * from './execution/execution';
@@ -33,12 +32,10 @@ export * from './ingest-query-pattern/ingest-query-pattern';
 export * from './ingestion-spec/ingestion-spec';
 export * from './input-format/input-format';
 export * from './input-source/input-source';
-export * from './load-rule/load-rule';
 export * from './lookup-spec/lookup-spec';
 export * from './metric-spec/metric-spec';
 export * from './overlord-dynamic-config/overlord-dynamic-config';
 export * from './query-context/query-context';
-export * from './segment/segment';
 export * from './stages/stages';
 export * from './supervisor-status/supervisor-status';
 export * from './task/task';
diff --git a/web-console/src/druid-models/ingest-query-pattern/ingest-query-pattern.spec.ts b/web-console/src/druid-models/ingest-query-pattern/ingest-query-pattern.spec.ts
index cf108c2b3890..996385fc08ff 100644
--- a/web-console/src/druid-models/ingest-query-pattern/ingest-query-pattern.spec.ts
+++ b/web-console/src/druid-models/ingest-query-pattern/ingest-query-pattern.spec.ts
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-import { sane, SqlQuery } from 'druid-query-toolkit';
+import { sane, SqlQuery } from '@druid-toolkit/query';
 
 import { fitIngestQueryPattern, ingestQueryPatternToQuery } from './ingest-query-pattern';
 
diff --git a/web-console/src/druid-models/ingest-query-pattern/ingest-query-pattern.ts b/web-console/src/druid-models/ingest-query-pattern/ingest-query-pattern.ts
index d2009ad2e5ee..f0ce8a0eb288 100644
--- a/web-console/src/druid-models/ingest-query-pattern/ingest-query-pattern.ts
+++ b/web-console/src/druid-models/ingest-query-pattern/ingest-query-pattern.ts
@@ -26,7 +26,7 @@ import {
   SqlTable,
   SqlWithPart,
   T,
-} from 'druid-query-toolkit';
+} from '@druid-toolkit/query';
 
 import { filterMap, oneOf } from '../../utils';
 import type { ExternalConfig } from '../external-config/external-config';
diff --git a/web-console/src/druid-models/segment/segment.ts b/web-console/src/druid-models/segment/segment.ts
deleted file mode 100644
index 1bff0711fcdf..000000000000
--- a/web-console/src/druid-models/segment/segment.ts
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import { Duration } from '../../utils';
-
-export const START_OF_TIME_DATE = '-146136543-09-08T08:23:32.096Z';
-export const END_OF_TIME_DATE = '146140482-04-24T15:36:27.903Z';
-
-export function computeSegmentTimeSpan(start: string, end: string): string {
-  if (start === START_OF_TIME_DATE && end === END_OF_TIME_DATE) {
-    return 'All';
-  }
-
-  const startDate = new Date(start);
-  if (isNaN(startDate.valueOf())) {
-    return 'Invalid start';
-  }
-
-  const endDate = new Date(end);
-  if (isNaN(endDate.valueOf())) {
-    return 'Invalid end';
-  }
-
-  return Duration.fromRange(startDate, endDate, 'Etc/UTC').getDescription(true);
-}
-
-export interface ShardSpec {
-  type: string;
-  partitionNum?: number;
-  partitions?: number;
-  dimensions?: string[];
-  partitionDimensions?: string[];
-  start?: string[];
-  end?: string[];
-}
diff --git a/web-console/src/druid-models/task/task.ts b/web-console/src/druid-models/task/task.ts
index e1743c116897..3445cc5fb45f 100644
--- a/web-console/src/druid-models/task/task.ts
+++ b/web-console/src/druid-models/task/task.ts
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-import { C } from 'druid-query-toolkit';
+import { C } from '@druid-toolkit/query';
 
 import type { Counters, StageDefinition } from '../stages/stages';
 
diff --git a/web-console/src/druid-models/workbench-query/workbench-query.spec.ts b/web-console/src/druid-models/workbench-query/workbench-query.spec.ts
index 8456b0d065d5..02bb3e399b02 100644
--- a/web-console/src/druid-models/workbench-query/workbench-query.spec.ts
+++ b/web-console/src/druid-models/workbench-query/workbench-query.spec.ts
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-import { sane } from 'druid-query-toolkit';
+import { sane } from '@druid-toolkit/query';
 
 import { WorkbenchQuery } from './workbench-query';
 
diff --git a/web-console/src/druid-models/workbench-query/workbench-query.ts b/web-console/src/druid-models/workbench-query/workbench-query.ts
index 9b1ed42b516b..da37127f1d2d 100644
--- a/web-console/src/druid-models/workbench-query/workbench-query.ts
+++ b/web-console/src/druid-models/workbench-query/workbench-query.ts
@@ -22,7 +22,7 @@ import type {
   SqlClusteredByClause,
   SqlExpression,
   SqlPartitionedByClause,
-} from 'druid-query-toolkit';
+} from '@druid-toolkit/query';
 import {
   C,
   F,
@@ -30,7 +30,7 @@ import {
   SqlOrderByClause,
   SqlOrderByExpression,
   SqlQuery,
-} from 'druid-query-toolkit';
+} from '@druid-toolkit/query';
 import Hjson from 'hjson';
 import * as JSONBig from 'json-bigint-native';
 import { v4 as uuidv4 } from 'uuid';
diff --git a/web-console/src/entry.scss b/web-console/src/entry.scss
index 46ea9d298d0f..8d368a4146b7 100644
--- a/web-console/src/entry.scss
+++ b/web-console/src/entry.scss
@@ -56,7 +56,6 @@ body {
   position: absolute;
   height: 100%;
   width: 100%;
-  z-index: 0;
 
   .console-application {
     position: absolute;
diff --git a/web-console/src/entry.tsx b/web-console/src/entry.tsx
index 55f7abfc59a2..42cfe08ad13c 100644
--- a/web-console/src/entry.tsx
+++ b/web-console/src/entry.tsx
@@ -20,7 +20,7 @@ import 'regenerator-runtime/runtime';
 import './bootstrap/ace';
 
 import { OverlaysProvider } from '@blueprintjs/core';
-import { QueryRunner } from 'druid-query-toolkit';
+import { QueryRunner } from '@druid-toolkit/query';
 import { createRoot } from 'react-dom/client';
 
 import { bootstrapJsonParse } from './bootstrap/json-parser';
diff --git a/web-console/src/helpers/capabilities.ts b/web-console/src/helpers/capabilities.ts
index 3255ec93be73..013f9368c58c 100644
--- a/web-console/src/helpers/capabilities.ts
+++ b/web-console/src/helpers/capabilities.ts
@@ -211,10 +211,6 @@ export class Capabilities {
     };
   }
 
-  public clone(): Capabilities {
-    return new Capabilities(this.valueOf());
-  }
-
   public getMode(): CapabilitiesMode {
     if (!this.hasSql()) return 'no-sql';
     if (!this.hasCoordinatorAccess()) return 'no-proxy';
diff --git a/web-console/src/helpers/execution/general.ts b/web-console/src/helpers/execution/general.ts
index 0e78834172b1..a90c02a63061 100644
--- a/web-console/src/helpers/execution/general.ts
+++ b/web-console/src/helpers/execution/general.ts
@@ -16,8 +16,8 @@
  * limitations under the License.
  */
 
+import type { QueryResult } from '@druid-toolkit/query';
 import type { CancelToken } from 'axios';
-import type { QueryResult } from 'druid-query-toolkit';
 
 import type { Execution } from '../../druid-models';
 import { IntermediateQueryState } from '../../utils';
diff --git a/web-console/src/helpers/execution/sql-task-execution.ts b/web-console/src/helpers/execution/sql-task-execution.ts
index 68cf0763b425..f4dd45a2cb91 100644
--- a/web-console/src/helpers/execution/sql-task-execution.ts
+++ b/web-console/src/helpers/execution/sql-task-execution.ts
@@ -16,8 +16,8 @@
  * limitations under the License.
  */
 
+import { QueryResult } from '@druid-toolkit/query';
 import type { AxiosResponse, CancelToken } from 'axios';
-import { QueryResult } from 'druid-query-toolkit';
 
 import type { AsyncStatusResponse, MsqTaskPayloadResponse, QueryContext } from '../../druid-models';
 import { Execution } from '../../druid-models';
diff --git a/web-console/src/helpers/spec-conversion.ts b/web-console/src/helpers/spec-conversion.ts
index 9fc95d3b60f5..00bc3d5f832c 100644
--- a/web-console/src/helpers/spec-conversion.ts
+++ b/web-console/src/helpers/spec-conversion.ts
@@ -25,7 +25,7 @@ import {
   SqlExpression,
   SqlType,
   T,
-} from 'druid-query-toolkit';
+} from '@druid-toolkit/query';
 import * as JSONBig from 'json-bigint-native';
 
 import type {
diff --git a/web-console/src/hooks/use-clock.ts b/web-console/src/hooks/use-clock.ts
index a909a2c1f740..5d1264421957 100644
--- a/web-console/src/hooks/use-clock.ts
+++ b/web-console/src/hooks/use-clock.ts
@@ -16,9 +16,7 @@
  * limitations under the License.
  */
 
-import { useState } from 'react';
-
-import { useInterval } from './use-interval';
+import { useEffect, useState } from 'react';
 
 function getNowToSecond(): Date {
   const now = new Date();
@@ -26,12 +24,18 @@ function getNowToSecond(): Date {
   return now;
 }
 
-export function useClock(updateInterval = 1000) {
+export function useClock() {
   const [now, setNow] = useState<Date>(getNowToSecond);
 
-  useInterval(() => {
-    setNow(getNowToSecond());
-  }, updateInterval);
+  useEffect(() => {
+    const checkInterval = setInterval(() => {
+      setNow(getNowToSecond());
+    }, 1000);
+
+    return () => {
+      clearInterval(checkInterval);
+    };
+  }, []);
 
   return now;
 }
diff --git a/web-console/src/react-table/react-table-utils.spec.ts b/web-console/src/react-table/react-table-utils.spec.ts
index 1dd245b49f70..0a1bbf3f9ad5 100644
--- a/web-console/src/react-table/react-table-utils.spec.ts
+++ b/web-console/src/react-table/react-table-utils.spec.ts
@@ -75,9 +75,5 @@ describe('react-table-utils', () => {
       { id: 'x', value: '~y' },
       { id: 'z', value: '=w&' },
     ]);
-    expect(stringToTableFilters('x<3&y<=3')).toEqual([
-      { id: 'x', value: '<3' },
-      { id: 'y', value: '<=3' },
-    ]);
   });
 });
diff --git a/web-console/src/react-table/react-table-utils.ts b/web-console/src/react-table/react-table-utils.ts
index 7732c90b231c..ce9497a1209a 100644
--- a/web-console/src/react-table/react-table-utils.ts
+++ b/web-console/src/react-table/react-table-utils.ts
@@ -18,7 +18,8 @@
 
 import type { IconName } from '@blueprintjs/core';
 import { IconNames } from '@blueprintjs/icons';
-import { C, F, SqlExpression } from 'druid-query-toolkit';
+import type { SqlExpression } from '@druid-toolkit/query';
+import { C, F } from '@druid-toolkit/query';
 import type { Filter } from 'react-table';
 
 import { addOrUpdate, caseInsensitiveContains, filterMap } from '../utils';
@@ -31,9 +32,9 @@ export const STANDARD_TABLE_PAGE_SIZE_OPTIONS = [50, 100, 200];
 export const SMALL_TABLE_PAGE_SIZE = 25;
 export const SMALL_TABLE_PAGE_SIZE_OPTIONS = [25, 50, 100];
 
-export type FilterMode = '~' | '=' | '!=' | '<' | '<=' | '>' | '>=';
+export type FilterMode = '~' | '=' | '!=' | '<=' | '>=';
 
-export const FILTER_MODES: FilterMode[] = ['~', '=', '!=', '<', '<=', '>', '>='];
+export const FILTER_MODES: FilterMode[] = ['~', '=', '!=', '<=', '>='];
 export const FILTER_MODES_NO_COMPARISON: FilterMode[] = ['~', '=', '!='];
 
 export function filterModeToIcon(mode: FilterMode): IconName {
@@ -44,12 +45,8 @@ export function filterModeToIcon(mode: FilterMode): IconName {
       return IconNames.EQUALS;
     case '!=':
       return IconNames.NOT_EQUAL_TO;
-    case '<':
-      return IconNames.LESS_THAN;
     case '<=':
       return IconNames.LESS_THAN_OR_EQUAL_TO;
-    case '>':
-      return IconNames.GREATER_THAN;
     case '>=':
       return IconNames.GREATER_THAN_OR_EQUAL_TO;
     default:
@@ -65,12 +62,8 @@ export function filterModeToTitle(mode: FilterMode): string {
       return 'Equals';
     case '!=':
       return 'Not equals';
-    case '<':
-      return 'Less than';
     case '<=':
       return 'Less than or equal';
-    case '>':
-      return 'Greater than';
     case '>=':
       return 'Greater than or equal';
     default:
@@ -96,7 +89,7 @@ export function parseFilterModeAndNeedle(
   filter: Filter,
   loose = false,
 ): FilterModeAndNeedle | undefined {
-  const m = /^(~|=|!=|<(?!=)|<=|>(?!=)|>=)?(.*)$/.exec(String(filter.value));
+  const m = /^(~|=|!=|<=|>=)?(.*)$/.exec(String(filter.value));
   if (!m) return;
   if (!loose && !m[2]) return;
   const mode = (m[1] as FilterMode) || '~';
@@ -119,28 +112,21 @@ export function booleanCustomTableFilter(filter: Filter, value: unknown): boolea
   const modeAndNeedle = parseFilterModeAndNeedle(filter);
   if (!modeAndNeedle) return true;
   const { mode, needle } = modeAndNeedle;
-  const strValue = String(value);
   switch (mode) {
     case '=':
-      return strValue === needle;
+      return String(value) === needle;
 
     case '!=':
-      return strValue !== needle;
-
-    case '<':
-      return strValue < needle;
+      return String(value) !== needle;
 
     case '<=':
-      return strValue <= needle;
-
-    case '>':
-      return strValue > needle;
+      return String(value) <= needle;
 
     case '>=':
-      return strValue >= needle;
+      return String(value) >= needle;
 
     default:
-      return caseInsensitiveContains(strValue, needle);
+      return caseInsensitiveContains(String(value), needle);
   }
 }
 
@@ -156,15 +142,9 @@ export function sqlQueryCustomTableFilter(filter: Filter): SqlExpression | undef
     case '!=':
       return column.unequal(needle);
 
-    case '<':
-      return column.lessThan(needle);
-
     case '<=':
       return column.lessThanOrEqual(needle);
 
-    case '>':
-      return column.greaterThan(needle);
-
     case '>=':
       return column.greaterThanOrEqual(needle);
 
@@ -173,10 +153,6 @@ export function sqlQueryCustomTableFilter(filter: Filter): SqlExpression | undef
   }
 }
 
-export function sqlQueryCustomTableFilters(filters: Filter[]): SqlExpression {
-  return SqlExpression.and(...filterMap(filters, sqlQueryCustomTableFilter));
-}
-
 export function tableFiltersToString(tableFilters: Filter[]): string {
   return tableFilters
     .map(({ id, value }) => `${id}${value.replace(/[&%]/g, encodeURIComponent)}`)
@@ -185,11 +161,9 @@ export function tableFiltersToString(tableFilters: Filter[]): string {
 
 export function stringToTableFilters(str: string | undefined): Filter[] {
   if (!str) return [];
-  // '~' | '=' | '!=' | '<' | '<=' | '>' | '>=';
+  // '~' | '=' | '!=' | '<=' | '>=';
   return filterMap(str.split('&'), clause => {
-    const m = /^(\w+)((?:~|=|!=|<(?!=)|<=|>(?!=)|>=).*)$/.exec(
-      clause.replace(/%2[56]/g, decodeURIComponent),
-    );
+    const m = /^(\w+)((?:~|=|!=|<=|>=).*)$/.exec(clause.replace(/%2[56]/g, decodeURIComponent));
     if (!m) return;
     return { id: m[1], value: m[2] };
   });
diff --git a/web-console/src/utils/date-floor-shift-ceil/date-floor-shift-ceil-utc.spec.ts b/web-console/src/utils/date-floor-shift-ceil/date-floor-shift-ceil-utc.spec.ts
deleted file mode 100755
index 5ba63b04468f..000000000000
--- a/web-console/src/utils/date-floor-shift-ceil/date-floor-shift-ceil-utc.spec.ts
+++ /dev/null
@@ -1,169 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import { shifters } from './date-floor-shift-ceil';
-
-function pairwise<T>(array: T[], callback: (t1: T, t2: T) => void) {
-  for (let i = 0; i < array.length - 1; i++) {
-    callback(array[i], array[i + 1]);
-  }
-}
-
-describe('floor, shift, ceil (UTC)', () => {
-  const tz = 'Etc/UTC';
-
-  it('moves seconds', () => {
-    const dates: Date[] = [
-      new Date('2012-11-04T00:00:00Z'),
-      new Date('2012-11-04T00:00:03Z'),
-      new Date('2012-11-04T00:00:06Z'),
-      new Date('2012-11-04T00:00:09Z'),
-      new Date('2012-11-04T00:00:12Z'),
-    ];
-    pairwise(dates, (d1, d2) => expect(shifters.second.shift(d1, tz, 3)).toEqual(d2));
-  });
-
-  it('rounds minutes', () => {
-    expect(shifters.minute.round(new Date('2012-11-04T00:29:00Z'), 15, tz)).toEqual(
-      new Date('2012-11-04T00:15:00Z'),
-    );
-
-    expect(shifters.minute.round(new Date('2012-11-04T00:29:00Z'), 4, tz)).toEqual(
-      new Date('2012-11-04T00:28:00Z'),
-    );
-  });
-
-  it('moves minutes', () => {
-    const dates: Date[] = [
-      new Date('2012-11-04T00:00:00Z'),
-      new Date('2012-11-04T00:03:00Z'),
-      new Date('2012-11-04T00:06:00Z'),
-      new Date('2012-11-04T00:09:00Z'),
-      new Date('2012-11-04T00:12:00Z'),
-    ];
-    pairwise(dates, (d1, d2) => expect(shifters.minute.shift(d1, tz, 3)).toEqual(d2));
-  });
-
-  it('floors hour correctly', () => {
-    expect(shifters.hour.floor(new Date('2012-11-04T00:30:00Z'), tz)).toEqual(
-      new Date('2012-11-04T00:00:00Z'),
-    );
-
-    expect(shifters.hour.floor(new Date('2012-11-04T01:30:00Z'), tz)).toEqual(
-      new Date('2012-11-04T01:00:00Z'),
-    );
-
-    expect(shifters.hour.floor(new Date('2012-11-04T01:30:00Z'), tz)).toEqual(
-      new Date('2012-11-04T01:00:00Z'),
-    );
-
-    expect(shifters.hour.floor(new Date('2012-11-04T02:30:00Z'), tz)).toEqual(
-      new Date('2012-11-04T02:00:00Z'),
-    );
-
-    expect(shifters.hour.floor(new Date('2012-11-04T03:30:00Z'), tz)).toEqual(
-      new Date('2012-11-04T03:00:00Z'),
-    );
-  });
-
-  it('moves hour', () => {
-    const dates: Date[] = [
-      new Date('2012-11-04T00:00:00Z'),
-      new Date('2012-11-04T01:00:00Z'),
-      new Date('2012-11-04T02:00:00Z'),
-      new Date('2012-11-04T03:00:00Z'),
-    ];
-    pairwise(dates, (d1, d2) => expect(shifters.hour.shift(d1, tz, 1)).toEqual(d2));
-  });
-
-  it('moves day', () => {
-    const dates: Date[] = [
-      new Date('2012-11-03T00:00:00Z'),
-      new Date('2012-11-04T00:00:00Z'),
-      new Date('2012-11-05T00:00:00Z'),
-      new Date('2012-11-06T00:00:00Z'),
-    ];
-    pairwise(dates, (d1, d2) => expect(shifters.day.shift(d1, tz, 1)).toEqual(d2));
-  });
-
-  it('ceils day', () => {
-    let d1 = new Date('2014-12-11T22:11:57.469Z');
-    let d2 = new Date('2014-12-12T00:00:00.000Z');
-    expect(shifters.day.ceil(d1, tz)).toEqual(d2);
-
-    d1 = new Date('2014-12-08T00:00:00.000Z');
-    d2 = new Date('2014-12-08T00:00:00.000Z');
-    expect(shifters.day.ceil(d1, tz)).toEqual(d2);
-  });
-
-  it('moves week', () => {
-    const dates: Date[] = [
-      new Date('2012-10-29T00:00:00Z'),
-      new Date('2012-11-05T00:00:00Z'),
-      new Date('2012-11-12T00:00:00Z'),
-      new Date('2012-11-19T00:00:00Z'),
-    ];
-    pairwise(dates, (d1, d2) => expect(shifters.week.shift(d1, tz, 1)).toEqual(d2));
-  });
-
-  it('floors week correctly', () => {
-    let d1 = new Date('2014-12-11T22:11:57.469Z');
-    let d2 = new Date('2014-12-08T00:00:00.000Z');
-    expect(shifters.week.floor(d1, tz)).toEqual(d2);
-
-    d1 = new Date('2014-12-07T12:11:57.469Z');
-    d2 = new Date('2014-12-01T00:00:00.000Z');
-    expect(shifters.week.floor(d1, tz)).toEqual(d2);
-  });
-
-  it('ceils week correctly', () => {
-    let d1 = new Date('2014-12-11T22:11:57.469Z');
-    let d2 = new Date('2014-12-15T00:00:00.000Z');
-    expect(shifters.week.ceil(d1, tz)).toEqual(d2);
-
-    d1 = new Date('2014-12-07T12:11:57.469Z');
-    d2 = new Date('2014-12-08T00:00:00.000Z');
-    expect(shifters.week.ceil(d1, tz)).toEqual(d2);
-  });
-
-  it('moves month', () => {
-    const dates: Date[] = [
-      new Date('2012-11-01T00:00:00Z'),
-      new Date('2012-12-01T00:00:00Z'),
-      new Date('2013-01-01T00:00:00Z'),
-      new Date('2013-02-01T00:00:00Z'),
-    ];
-    pairwise(dates, (d1, d2) => expect(shifters.month.shift(d1, tz, 1)).toEqual(d2));
-  });
-
-  it('shifts month on the 31st', () => {
-    const d1 = new Date('2016-03-31T00:00:00.000Z');
-    const d2 = new Date('2016-05-01T00:00:00.000Z');
-    expect(shifters.month.shift(d1, tz, 1)).toEqual(d2);
-  });
-
-  it('moves year', () => {
-    const dates: Date[] = [
-      new Date('2010-01-01T00:00:00Z'),
-      new Date('2011-01-01T00:00:00Z'),
-      new Date('2012-01-01T00:00:00Z'),
-      new Date('2013-01-01T00:00:00Z'),
-    ];
-    pairwise(dates, (d1, d2) => expect(shifters.year.shift(d1, tz, 1)).toEqual(d2));
-  });
-});
diff --git a/web-console/src/utils/date-floor-shift-ceil/date-floor-shift-ceil.spec.ts b/web-console/src/utils/date-floor-shift-ceil/date-floor-shift-ceil.spec.ts
deleted file mode 100755
index 1612c9ce5792..000000000000
--- a/web-console/src/utils/date-floor-shift-ceil/date-floor-shift-ceil.spec.ts
+++ /dev/null
@@ -1,181 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import { shifters } from './date-floor-shift-ceil';
-
-function pairwise<T>(array: T[], callback: (t1: T, t2: T) => void) {
-  for (let i = 0; i < array.length - 1; i++) {
-    callback(array[i], array[i + 1]);
-  }
-}
-
-describe('floor/shift/ceil', () => {
-  const tz = 'America/Los_Angeles';
-
-  it('shifts seconds', () => {
-    const dates: Date[] = [
-      new Date('2012-11-04T00:00:00-07:00'),
-      new Date('2012-11-04T00:00:03-07:00'),
-      new Date('2012-11-04T00:00:06-07:00'),
-      new Date('2012-11-04T00:00:09-07:00'),
-      new Date('2012-11-04T00:00:12-07:00'),
-    ];
-    pairwise(dates, (d1, d2) => expect(shifters.second.shift(d1, tz, 3)).toEqual(d2));
-  });
-
-  it('shifts minutes', () => {
-    const dates: Date[] = [
-      new Date('2012-11-04T00:00:00-07:00'),
-      new Date('2012-11-04T00:03:00-07:00'),
-      new Date('2012-11-04T00:06:00-07:00'),
-      new Date('2012-11-04T00:09:00-07:00'),
-      new Date('2012-11-04T00:12:00-07:00'),
-    ];
-    pairwise(dates, (d1, d2) => expect(shifters.minute.shift(d1, tz, 3)).toEqual(d2));
-  });
-
-  it('floors hour correctly', () => {
-    expect(shifters.hour.floor(new Date('2012-11-04T00:30:00-07:00'), tz)).toEqual(
-      new Date('2012-11-04T00:00:00-07:00'),
-    );
-
-    expect(shifters.hour.floor(new Date('2012-11-04T01:30:00-07:00'), tz)).toEqual(
-      new Date('2012-11-04T01:00:00-07:00'),
-    );
-
-    expect(shifters.hour.floor(new Date('2012-11-04T01:30:00-08:00'), tz)).toEqual(
-      new Date('2012-11-04T01:00:00-07:00'),
-    );
-
-    expect(shifters.hour.floor(new Date('2012-11-04T02:30:00-08:00'), tz)).toEqual(
-      new Date('2012-11-04T02:00:00-08:00'),
-    );
-
-    expect(shifters.hour.floor(new Date('2012-11-04T03:30:00-08:00'), tz)).toEqual(
-      new Date('2012-11-04T03:00:00-08:00'),
-    );
-  });
-
-  it('shifting 24 hours over DST is not the same as shifting a day', () => {
-    const start = new Date('2012-11-04T07:00:00Z');
-
-    const shift1Day = shifters.day.shift(start, tz, 1);
-    const shift24Hours = shifters.hour.shift(start, tz, 24);
-
-    expect(shift1Day).toEqual(new Date('2012-11-05T08:00:00Z'));
-    expect(shift24Hours).toEqual(new Date('2012-11-05T07:00:00Z'));
-  });
-
-  it('shifts hour over DST 1', () => {
-    const dates: Date[] = [
-      new Date('2012-11-04T00:00:00-07:00'),
-      new Date('2012-11-04T08:00:00Z'),
-      new Date('2012-11-04T09:00:00Z'),
-      new Date('2012-11-04T10:00:00Z'),
-      new Date('2012-11-04T11:00:00Z'),
-    ];
-    pairwise(dates, (d1, d2) => expect(shifters.hour.shift(d1, tz, 1)).toEqual(d2));
-  });
-
-  it('floors hour over DST 1', () => {
-    expect(shifters.hour.floor(new Date('2012-11-04T00:05:00-07:00'), tz)).toEqual(
-      new Date('2012-11-04T00:00:00-07:00'),
-    );
-    expect(shifters.hour.floor(new Date('2012-11-04T01:05:00-07:00'), tz)).toEqual(
-      new Date('2012-11-04T01:00:00-07:00'),
-    );
-    expect(shifters.hour.floor(new Date('2012-11-04T02:05:00-07:00'), tz)).toEqual(
-      new Date('2012-11-04T01:00:00-07:00'),
-    );
-    expect(shifters.hour.floor(new Date('2012-11-04T03:05:00-07:00'), tz)).toEqual(
-      new Date('2012-11-04T03:00:00-07:00'),
-    );
-  });
-
-  it('shifts hour over DST 2', () => {
-    // "2018-03-11T09:00:00Z"
-    const dates: Date[] = [
-      new Date('2018-03-11T01:00:00-07:00'),
-      new Date('2018-03-11T09:00:00Z'),
-      new Date('2018-03-11T10:00:00Z'),
-      new Date('2018-03-11T11:00:00Z'),
-      new Date('2018-03-11T12:00:00Z'),
-    ];
-    pairwise(dates, (d1, d2) => expect(shifters.hour.shift(d1, tz, 1)).toEqual(d2));
-  });
-
-  it('shifts day over DST', () => {
-    const dates: Date[] = [
-      new Date('2012-11-03T00:00:00-07:00'),
-      new Date('2012-11-04T00:00:00-07:00'),
-      new Date('2012-11-05T00:00:00-08:00'),
-      new Date('2012-11-06T00:00:00-08:00'),
-    ];
-    pairwise(dates, (d1, d2) => expect(shifters.day.shift(d1, tz, 1)).toEqual(d2));
-  });
-
-  it('shifts week over DST', () => {
-    const dates: Date[] = [
-      new Date('2012-10-29T00:00:00-07:00'),
-      new Date('2012-11-05T00:00:00-08:00'),
-      new Date('2012-11-12T00:00:00-08:00'),
-      new Date('2012-11-19T00:00:00-08:00'),
-    ];
-    pairwise(dates, (d1, d2) => expect(shifters.week.shift(d1, tz, 1)).toEqual(d2));
-  });
-
-  it('floors week correctly', () => {
-    let d1 = new Date('2014-12-11T22:11:57.469Z');
-    let d2 = new Date('2014-12-08T08:00:00.000Z');
-    expect(shifters.week.floor(d1, tz)).toEqual(d2);
-
-    d1 = new Date('2014-12-07T12:11:57.469Z');
-    d2 = new Date('2014-12-01T08:00:00.000Z');
-    expect(shifters.week.floor(d1, tz)).toEqual(d2);
-  });
-
-  it('ceils week correctly', () => {
-    let d1 = new Date('2014-12-11T22:11:57.469Z');
-    let d2 = new Date('2014-12-15T08:00:00.000Z');
-    expect(shifters.week.ceil(d1, tz)).toEqual(d2);
-
-    d1 = new Date('2014-12-07T12:11:57.469Z');
-    d2 = new Date('2014-12-08T08:00:00.000Z');
-    expect(shifters.week.ceil(d1, tz)).toEqual(d2);
-  });
-
-  it('shifts month over DST', () => {
-    const dates: Date[] = [
-      new Date('2012-11-01T00:00:00-07:00'),
-      new Date('2012-12-01T00:00:00-08:00'),
-      new Date('2013-01-01T00:00:00-08:00'),
-      new Date('2013-02-01T00:00:00-08:00'),
-    ];
-    pairwise(dates, (d1, d2) => expect(shifters.month.shift(d1, tz, 1)).toEqual(d2));
-  });
-
-  it('shifts year', () => {
-    const dates: Date[] = [
-      new Date('2010-01-01T00:00:00-08:00'),
-      new Date('2011-01-01T00:00:00-08:00'),
-      new Date('2012-01-01T00:00:00-08:00'),
-      new Date('2013-01-01T00:00:00-08:00'),
-    ];
-    pairwise(dates, (d1, d2) => expect(shifters.year.shift(d1, tz, 1)).toEqual(d2));
-  });
-});
diff --git a/web-console/src/utils/date-floor-shift-ceil/date-floor-shift-ceil.ts b/web-console/src/utils/date-floor-shift-ceil/date-floor-shift-ceil.ts
deleted file mode 100755
index 3306b05267d9..000000000000
--- a/web-console/src/utils/date-floor-shift-ceil/date-floor-shift-ceil.ts
+++ /dev/null
@@ -1,296 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import { fromDate, startOfWeek } from '@internationalized/date';
-
-export type AlignFn = (dt: Date, tz: string) => Date;
-
-export type ShiftFn = (dt: Date, tz: string, step: number) => Date;
-
-export type RoundFn = (dt: Date, roundTo: number, tz: string) => Date;
-
-export interface TimeShifterNoCeil {
-  canonicalLength: number;
-  siblings?: number;
-  floor: AlignFn;
-  round: RoundFn;
-  shift: ShiftFn;
-}
-
-export interface TimeShifter extends TimeShifterNoCeil {
-  ceil: AlignFn;
-}
-
-function isUTC(tz: string): boolean {
-  return tz === 'Etc/UTC';
-}
-
-function adjustDay(day: number): number {
-  return (day + 6) % 7;
-}
-
-function floorTo(n: number, roundTo: number): number {
-  return Math.floor(n / roundTo) * roundTo;
-}
-
-function timeShifterFiller(tm: TimeShifterNoCeil): TimeShifter {
-  const { floor, shift } = tm;
-  return {
-    ...tm,
-    ceil: (dt: Date, tz: string) => {
-      const floored = floor(dt, tz);
-      if (floored.valueOf() === dt.valueOf()) return dt; // Just like ceil(3) is 3 and not 4
-      return shift(floored, tz, 1);
-    },
-  };
-}
-
-export const second = timeShifterFiller({
-  canonicalLength: 1000,
-  siblings: 60,
-  floor: (dt, _tz) => {
-    // Seconds do not actually need a timezone because all timezones align on seconds... for now...
-    dt = new Date(dt.valueOf());
-    dt.setUTCMilliseconds(0);
-    return dt;
-  },
-  round: (dt, roundTo, _tz) => {
-    const cur = dt.getUTCSeconds();
-    const adj = floorTo(cur, roundTo);
-    if (cur !== adj) dt.setUTCSeconds(adj);
-    return dt;
-  },
-  shift: (dt, _tz, step) => {
-    dt = new Date(dt.valueOf());
-    dt.setUTCSeconds(dt.getUTCSeconds() + step);
-    return dt;
-  },
-});
-
-export const minute = timeShifterFiller({
-  canonicalLength: 60000,
-  siblings: 60,
-  floor: (dt, _tz) => {
-    // Minutes do not actually need a timezone because all timezones align on minutes... for now...
-    dt = new Date(dt.valueOf());
-    dt.setUTCSeconds(0, 0);
-    return dt;
-  },
-  round: (dt, roundTo, _tz) => {
-    const cur = dt.getUTCMinutes();
-    const adj = floorTo(cur, roundTo);
-    if (cur !== adj) dt.setUTCMinutes(adj);
-    return dt;
-  },
-  shift: (dt, _tz, step) => {
-    dt = new Date(dt.valueOf());
-    dt.setUTCMinutes(dt.getUTCMinutes() + step);
-    return dt;
-  },
-});
-
-// Movement by hour is tz independent because in every timezone an hour is 60 min
-function hourMove(dt: Date, _tz: string, step: number) {
-  dt = new Date(dt.valueOf());
-  dt.setUTCHours(dt.getUTCHours() + step);
-  return dt;
-}
-
-export const hour = timeShifterFiller({
-  canonicalLength: 3600000,
-  siblings: 24,
-  floor: (dt, tz) => {
-    if (isUTC(tz)) {
-      dt = new Date(dt.valueOf());
-      dt.setUTCMinutes(0, 0, 0);
-      return dt;
-    } else {
-      return fromDate(dt, tz).set({ second: 0, minute: 0, millisecond: 0 }).toDate();
-    }
-  },
-  round: (dt, roundTo, tz) => {
-    if (isUTC(tz)) {
-      const cur = dt.getUTCHours();
-      const adj = floorTo(cur, roundTo);
-      if (cur !== adj) dt.setUTCHours(adj);
-    } else {
-      const cur = fromDate(dt, tz).hour;
-      const adj = floorTo(cur, roundTo);
-      if (cur !== adj) return hourMove(dt, tz, adj - cur);
-    }
-    return dt;
-  },
-  shift: hourMove,
-});
-
-export const day = timeShifterFiller({
-  canonicalLength: 24 * 3600000,
-  floor: (dt, tz) => {
-    if (isUTC(tz)) {
-      dt = new Date(dt.valueOf());
-      dt.setUTCHours(0, 0, 0, 0);
-      return dt;
-    } else {
-      return fromDate(dt, tz).set({ hour: 0, second: 0, minute: 0, millisecond: 0 }).toDate();
-    }
-  },
-  shift: (dt, tz, step) => {
-    if (isUTC(tz)) {
-      dt = new Date(dt.valueOf());
-      dt.setUTCDate(dt.getUTCDate() + step);
-      return dt;
-    } else {
-      return fromDate(dt, tz).add({ days: step }).toDate();
-    }
-  },
-  round: () => {
-    throw new Error('missing day round');
-  },
-});
-
-export const week = timeShifterFiller({
-  canonicalLength: 7 * 24 * 3600000,
-  floor: (dt, tz) => {
-    if (isUTC(tz)) {
-      dt = new Date(dt.valueOf());
-      dt.setUTCHours(0, 0, 0, 0);
-      dt.setUTCDate(dt.getUTCDate() - adjustDay(dt.getUTCDay()));
-    } else {
-      const zd = fromDate(dt, tz);
-      return startOfWeek(
-        zd.set({ hour: 0, second: 0, minute: 0, millisecond: 0 }),
-        'fr-FR', // We want the week to start on Monday
-      ).toDate();
-    }
-    return dt;
-  },
-  shift: (dt, tz, step) => {
-    if (isUTC(tz)) {
-      dt = new Date(dt.valueOf());
-      dt.setUTCDate(dt.getUTCDate() + step * 7);
-      return dt;
-    } else {
-      return fromDate(dt, tz).add({ weeks: step }).toDate();
-    }
-  },
-  round: () => {
-    throw new Error('missing week round');
-  },
-});
-
-function monthShift(dt: Date, tz: string, step: number) {
-  if (isUTC(tz)) {
-    dt = new Date(dt.valueOf());
-    dt.setUTCMonth(dt.getUTCMonth() + step);
-    return dt;
-  } else {
-    return fromDate(dt, tz).add({ months: step }).toDate();
-  }
-}
-
-export const month = timeShifterFiller({
-  canonicalLength: 30 * 24 * 3600000,
-  siblings: 12,
-  floor: (dt, tz) => {
-    if (isUTC(tz)) {
-      dt = new Date(dt.valueOf());
-      dt.setUTCHours(0, 0, 0, 0);
-      dt.setUTCDate(1);
-      return dt;
-    } else {
-      return fromDate(dt, tz)
-        .set({ day: 1, hour: 0, second: 0, minute: 0, millisecond: 0 })
-        .toDate();
-    }
-  },
-  round: (dt, roundTo, tz) => {
-    if (isUTC(tz)) {
-      const cur = dt.getUTCMonth();
-      const adj = floorTo(cur, roundTo);
-      if (cur !== adj) dt.setUTCMonth(adj);
-    } else {
-      const cur = fromDate(dt, tz).month - 1; // Needs to be zero indexed
-      const adj = floorTo(cur, roundTo);
-      if (cur !== adj) return monthShift(dt, tz, adj - cur);
-    }
-    return dt;
-  },
-  shift: monthShift,
-});
-
-function yearShift(dt: Date, tz: string, step: number) {
-  if (isUTC(tz)) {
-    dt = new Date(dt.valueOf());
-    dt.setUTCFullYear(dt.getUTCFullYear() + step);
-    return dt;
-  } else {
-    return fromDate(dt, tz).add({ years: step }).toDate();
-  }
-}
-
-export const year = timeShifterFiller({
-  canonicalLength: 365 * 24 * 3600000,
-  siblings: 1000,
-  floor: (dt, tz) => {
-    if (isUTC(tz)) {
-      dt = new Date(dt.valueOf());
-      dt.setUTCHours(0, 0, 0, 0);
-      dt.setUTCMonth(0, 1);
-      return dt;
-    } else {
-      return fromDate(dt, tz)
-        .set({ month: 1, day: 1, hour: 0, second: 0, minute: 0, millisecond: 0 })
-        .toDate();
-    }
-  },
-  round: (dt, roundTo, tz) => {
-    if (isUTC(tz)) {
-      const cur = dt.getUTCFullYear();
-      const adj = floorTo(cur, roundTo);
-      if (cur !== adj) dt.setUTCFullYear(adj);
-    } else {
-      const cur = fromDate(dt, tz).year;
-      const adj = floorTo(cur, roundTo);
-      if (cur !== adj) return yearShift(dt, tz, adj - cur);
-    }
-    return dt;
-  },
-  shift: yearShift,
-});
-
-export interface Shifters {
-  second: TimeShifter;
-  minute: TimeShifter;
-  hour: TimeShifter;
-  day: TimeShifter;
-  week: TimeShifter;
-  month: TimeShifter;
-  year: TimeShifter;
-
-  [key: string]: TimeShifter;
-}
-
-export const shifters: Shifters = {
-  second,
-  minute,
-  hour,
-  day,
-  week,
-  month,
-  year,
-};
diff --git a/web-console/src/utils/date.spec.ts b/web-console/src/utils/date.spec.ts
index b219ee17af06..843c144244ef 100644
--- a/web-console/src/utils/date.spec.ts
+++ b/web-console/src/utils/date.spec.ts
@@ -17,6 +17,7 @@
  */
 
 import {
+  ceilToUtcDay,
   dateToIsoDateString,
   intervalToLocalDateRange,
   localDateRangeToInterval,
@@ -59,4 +60,12 @@ describe('date', () => {
       expect(localDateRangeToInterval(intervalToLocalDateRange(interval))).toEqual(interval);
     });
   });
+
+  describe('ceilToUtcDay', () => {
+    it('works', () => {
+      expect(ceilToUtcDay(new Date('2021-02-03T12:03:02.001Z'))).toEqual(
+        new Date('2021-02-04T00:00:00Z'),
+      );
+    });
+  });
 });
diff --git a/web-console/src/utils/date.ts b/web-console/src/utils/date.ts
index 08f1d1df43ba..1d5aa4f61e95 100644
--- a/web-console/src/utils/date.ts
+++ b/web-console/src/utils/date.ts
@@ -99,10 +99,9 @@ export function localDateRangeToInterval(localRange: DateRange): string {
   }`;
 }
 
-export function maxDate(a: Date, b: Date): Date {
-  return a > b ? a : b;
-}
-
-export function minDate(a: Date, b: Date): Date {
-  return a < b ? a : b;
+export function ceilToUtcDay(date: Date): Date {
+  date = new Date(date.valueOf());
+  date.setUTCHours(0, 0, 0, 0);
+  date.setUTCDate(date.getUTCDate() + 1);
+  return date;
 }
diff --git a/web-console/src/utils/download.ts b/web-console/src/utils/download.ts
index 40b0d95e8b91..4fb3342e523c 100644
--- a/web-console/src/utils/download.ts
+++ b/web-console/src/utils/download.ts
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-import type { QueryResult } from 'druid-query-toolkit';
+import type { QueryResult } from '@druid-toolkit/query';
 import FileSaver from 'file-saver';
 import * as JSONBig from 'json-bigint-native';
 
diff --git a/web-console/src/utils/druid-query.spec.ts b/web-console/src/utils/druid-query.spec.ts
index a940b8ac7bb6..ee867ff47ea5 100644
--- a/web-console/src/utils/druid-query.spec.ts
+++ b/web-console/src/utils/druid-query.spec.ts
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-import { sane } from 'druid-query-toolkit';
+import { sane } from '@druid-toolkit/query';
 
 import { DruidError, getDruidErrorMessage } from './druid-query';
 
diff --git a/web-console/src/utils/druid-query.ts b/web-console/src/utils/druid-query.ts
index ee1ba1ef4a8c..8102db89ca3a 100644
--- a/web-console/src/utils/druid-query.ts
+++ b/web-console/src/utils/druid-query.ts
@@ -16,9 +16,9 @@
  * limitations under the License.
  */
 
+import { C } from '@druid-toolkit/query';
 import type { AxiosResponse, CancelToken } from 'axios';
 import axios from 'axios';
-import { C } from 'druid-query-toolkit';
 
 import { Api } from '../singletons';
 
@@ -358,12 +358,6 @@ export async function queryDruidSqlDart<T = any>(
   return sqlResultResp.data;
 }
 
-export async function getApiArray<T = any>(url: string, cancelToken?: CancelToken): Promise<T[]> {
-  const result = (await Api.instance.get(url, { cancelToken })).data;
-  if (!Array.isArray(result)) throw new Error('unexpected result');
-  return result;
-}
-
 export interface QueryExplanation {
   query: any;
   signature: { name: string; type: string }[];
diff --git a/web-console/src/utils/duration/duration.spec.ts b/web-console/src/utils/duration/duration.spec.ts
deleted file mode 100755
index 8b20ac0a6b2a..000000000000
--- a/web-console/src/utils/duration/duration.spec.ts
+++ /dev/null
@@ -1,505 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import { Duration } from './duration';
-
-describe('Duration', () => {
-  const TZ_LA = 'America/Los_Angeles';
-  const TZ_JUNEAU = 'America/Juneau';
-
-  describe('errors', () => {
-    it('throws error if invalid duration', () => {
-      expect(() => new Duration('')).toThrow("Can not parse duration ''");
-
-      expect(() => new Duration('P00')).toThrow("Can not parse duration 'P00'");
-
-      expect(() => new Duration('P')).toThrow('Duration can not be empty');
-
-      expect(() => new Duration('P0YT0H')).toThrow('Duration can not be empty');
-
-      expect(() => new Duration('P0W').shift(new Date(), TZ_LA)).toThrow(
-        'Duration can not have empty weeks',
-      );
-
-      expect(() => new Duration('P0Y0MT0H0M0S').shift(new Date(), TZ_LA)).toThrow(
-        'Duration can not be empty',
-      );
-    });
-
-    it('throws error if fromJS is not given a string', () => {
-      expect(() => new Duration(new Date() as any)).toThrow('Duration can not be empty');
-    });
-  });
-
-  describe('#toString', () => {
-    it('gives back the correct string', () => {
-      let durationStr: string;
-
-      durationStr = 'P3Y';
-      expect(new Duration(durationStr).toString()).toEqual(durationStr);
-
-      durationStr = 'P2W';
-      expect(new Duration(durationStr).toString()).toEqual(durationStr);
-
-      durationStr = 'PT5H';
-      expect(new Duration(durationStr).toString()).toEqual(durationStr);
-
-      durationStr = 'P3DT15H';
-      expect(new Duration(durationStr).toString()).toEqual(durationStr);
-    });
-
-    it('eliminates 0', () => {
-      expect(new Duration('P0DT15H').toString()).toEqual('PT15H');
-    });
-  });
-
-  describe('fromCanonicalLength', () => {
-    it('handles zero', () => {
-      expect(() => {
-        Duration.fromCanonicalLength(0);
-      }).toThrow('length must be positive');
-    });
-
-    it('works 1', () => {
-      expect(Duration.fromCanonicalLength(86400000).toString()).toEqual('P1D');
-    });
-
-    it('works 2', () => {
-      const len =
-        new Date('2018-03-01T00:00:00Z').valueOf() - new Date('2016-02-22T00:00:00Z').valueOf();
-      expect(Duration.fromCanonicalLength(len).toString()).toEqual('P2Y8D');
-    });
-
-    it('works 3', () => {
-      const len =
-        new Date('2018-09-15T00:00:00Z').valueOf() - new Date('2018-09-04T00:00:00Z').valueOf();
-      expect(Duration.fromCanonicalLength(len).toString()).toEqual('P11D');
-    });
-
-    it('works with months', () => {
-      expect(Duration.fromCanonicalLength(2592000000).toString()).toEqual('P1M');
-      expect(Duration.fromCanonicalLength(2678400000).toString()).toEqual('P1M1D');
-    });
-
-    it('works without months', () => {
-      expect(Duration.fromCanonicalLength(2592000000, true).toString()).toEqual('P30D');
-      expect(Duration.fromCanonicalLength(2678400000, true).toString()).toEqual('P31D');
-    });
-  });
-
-  describe('construct from span', () => {
-    it('parses days over DST', () => {
-      expect(
-        Duration.fromRange(
-          new Date('2012-10-29T00:00:00-07:00'),
-          new Date('2012-11-05T00:00:00-08:00'),
-          TZ_LA,
-        ).toString(),
-      ).toEqual('P7D');
-
-      expect(
-        Duration.fromRange(
-          new Date('2012-10-29T00:00:00-07:00'),
-          new Date('2012-11-12T00:00:00-08:00'),
-          TZ_LA,
-        ).toString(),
-      ).toEqual('P14D');
-    });
-
-    it('parses complex case', () => {
-      expect(
-        Duration.fromRange(
-          new Date('2012-10-29T00:00:00-07:00'),
-          new Date(new Date('2012-11-05T00:00:00-08:00').valueOf() - 1000),
-          TZ_LA,
-        ).toString(),
-      ).toEqual('P6DT24H59M59S');
-
-      expect(
-        Duration.fromRange(
-          new Date('2012-01-01T00:00:00-08:00'),
-          new Date('2013-03-04T04:05:06-08:00'),
-          TZ_LA,
-        ).toString(),
-      ).toEqual('P1Y2M3DT4H5M6S');
-    });
-  });
-
-  describe('#isFloorable', () => {
-    const floorable = 'P1Y P5Y P10Y P100Y P1M P2M P3M P4M P1D'.split(' ');
-    for (const v of floorable) {
-      it(`works on floorable ${v}`, () => {
-        expect(new Duration(v).isFloorable()).toEqual(true);
-      });
-    }
-
-    const unfloorable = 'P1Y1M P5M P2D P3D'.split(' ');
-    for (const v of unfloorable) {
-      it(`works on not floorable ${v}`, () => {
-        expect(new Duration(v).isFloorable()).toEqual(false);
-      });
-    }
-  });
-
-  describe('#floor', () => {
-    it('throws error if complex duration', () => {
-      expect(() => new Duration('P1Y2D').floor(new Date(), TZ_LA)).toThrow(
-        'Can not floor on a complex duration',
-      );
-
-      expect(() => new Duration('P3DT15H').floor(new Date(), TZ_LA)).toThrow(
-        'Can not floor on a complex duration',
-      );
-
-      expect(() => new Duration('PT5H').floor(new Date(), TZ_LA)).toThrow(
-        'Can not floor on a hour duration that does not divide into 24',
-      );
-    });
-
-    it('works for year', () => {
-      const p1y = new Duration('P1Y');
-      expect(p1y.floor(new Date('2013-09-29T01:02:03.456-07:00'), TZ_LA)).toEqual(
-        new Date('2013-01-01T00:00:00.000-08:00'),
-      );
-    });
-
-    it('works for PT2M', () => {
-      const pt2h = new Duration('PT2M');
-      expect(pt2h.floor(new Date('2013-09-29T03:03:03.456-07:00'), TZ_LA)).toEqual(
-        new Date('2013-09-29T03:02:00.000-07:00'),
-      );
-    });
-
-    it('works for P2H', () => {
-      const pt2h = new Duration('PT2H');
-      expect(pt2h.floor(new Date('2013-09-29T03:02:03.456-07:00'), TZ_LA)).toEqual(
-        new Date('2013-09-29T02:00:00.000-07:00'),
-      );
-    });
-
-    it('works for PT12H', () => {
-      const pt12h = new Duration('PT12H');
-      expect(pt12h.floor(new Date('2015-09-12T13:05:00-08:00'), TZ_JUNEAU)).toEqual(
-        new Date('2015-09-12T12:00:00-08:00'),
-      );
-    });
-
-    it('works for P1W', () => {
-      const p1w = new Duration('P1W');
-
-      expect(p1w.floor(new Date('2013-09-29T01:02:03.456-07:00'), TZ_LA)).toEqual(
-        new Date('2013-09-23T07:00:00.000Z'),
-      );
-
-      expect(p1w.floor(new Date('2013-10-03T01:02:03.456-07:00'), TZ_LA)).toEqual(
-        new Date('2013-09-30T00:00:00.000-07:00'),
-      );
-    });
-
-    it('works for P3M', () => {
-      const p3m = new Duration('P3M');
-      expect(p3m.floor(new Date('2013-09-29T03:02:03.456-07:00'), TZ_LA)).toEqual(
-        new Date('2013-07-01T00:00:00.000-07:00'),
-      );
-
-      expect(p3m.floor(new Date('2013-02-29T03:02:03.456-07:00'), TZ_LA)).toEqual(
-        new Date('2013-01-01T00:00:00.000-08:00'),
-      );
-    });
-
-    it('works for P4Y', () => {
-      const p4y = new Duration('P4Y');
-      expect(p4y.floor(new Date('2013-09-29T03:02:03.456-07:00'), TZ_LA)).toEqual(
-        new Date('2012-01-01T00:00:00.000-08:00'),
-      );
-    });
-  });
-
-  describe('#shift', () => {
-    it('works for weeks', () => {
-      let p1w = new Duration('P1W');
-      expect(p1w.shift(new Date('2012-10-29T00:00:00-07:00'), TZ_LA)).toEqual(
-        new Date('2012-11-05T00:00:00-08:00'),
-      );
-
-      p1w = new Duration('P1W');
-      expect(p1w.shift(new Date('2012-10-29T00:00:00-07:00'), TZ_LA, 2)).toEqual(
-        new Date('2012-11-12T00:00:00-08:00'),
-      );
-
-      const p2w = new Duration('P2W');
-      expect(p2w.shift(new Date('2012-10-29T05:16:17-07:00'), TZ_LA)).toEqual(
-        new Date('2012-11-12T05:16:17-08:00'),
-      );
-    });
-
-    it('works for general complex case', () => {
-      const pComplex = new Duration('P1Y2M3DT4H5M6S');
-      expect(pComplex.shift(new Date('2012-01-01T00:00:00-08:00'), TZ_LA)).toEqual(
-        new Date('2013-03-04T04:05:06-08:00'),
-      );
-    });
-  });
-
-  describe('#materialize', () => {
-    it('works for weeks', () => {
-      const p1w = new Duration('P1W');
-
-      expect(
-        p1w.materialize(
-          new Date('2012-10-29T00:00:00-07:00'),
-          new Date('2012-12-01T00:00:00-08:00'),
-          TZ_LA,
-        ),
-      ).toEqual([
-        new Date('2012-10-29T07:00:00.000Z'),
-        new Date('2012-11-05T08:00:00.000Z'),
-        new Date('2012-11-12T08:00:00.000Z'),
-        new Date('2012-11-19T08:00:00.000Z'),
-        new Date('2012-11-26T08:00:00.000Z'),
-      ]);
-
-      expect(
-        p1w.materialize(
-          new Date('2012-10-29T00:00:00-07:00'),
-          new Date('2012-12-01T00:00:00-08:00'),
-          TZ_LA,
-          2,
-        ),
-      ).toEqual([
-        new Date('2012-10-29T07:00:00.000Z'),
-        new Date('2012-11-12T08:00:00.000Z'),
-        new Date('2012-11-26T08:00:00.000Z'),
-      ]);
-    });
-  });
-
-  describe('#isAligned', () => {
-    it('works for weeks', () => {
-      const p1w = new Duration('P1W');
-      expect(p1w.isAligned(new Date('2012-10-29T00:00:00-07:00'), TZ_LA)).toEqual(true);
-      expect(p1w.isAligned(new Date('2012-10-29T00:00:00-07:00'), 'Etc/UTC')).toEqual(false);
-    });
-  });
-
-  describe('#dividesBy', () => {
-    const divisible = 'P5Y/P1Y P1D/P1D P1M/P1D P1W/P1D P1D/PT6H PT3H/PT1H'.split(' ');
-    for (const v of divisible) {
-      it(`works for ${v} (true)`, () => {
-        const p = v.split('/');
-        expect(new Duration(p[0]).dividesBy(new Duration(p[1]))).toEqual(true);
-      });
-    }
-
-    const undivisible = 'P1D/P1M PT5H/PT1H'.split(' ');
-    for (const v of undivisible) {
-      it(`works for ${v} (false)`, () => {
-        const p = v.split('/');
-        expect(new Duration(p[0]).dividesBy(new Duration(p[1]))).toEqual(false);
-      });
-    }
-  });
-
-  describe('#getCanonicalLength', () => {
-    it('gives back the correct canonical length', () => {
-      let durationStr: string;
-
-      durationStr = 'P3Y';
-      expect(new Duration(durationStr).getCanonicalLength()).toEqual(94608000000);
-
-      durationStr = 'P2W';
-      expect(new Duration(durationStr).getCanonicalLength()).toEqual(1209600000);
-
-      durationStr = 'PT5H';
-      expect(new Duration(durationStr).getCanonicalLength()).toEqual(18000000);
-
-      durationStr = 'P3DT15H';
-      expect(new Duration(durationStr).getCanonicalLength()).toEqual(313200000);
-    });
-  });
-
-  describe('#add()', () => {
-    it('works with a simple duration', () => {
-      const d1 = new Duration('P1D');
-      const d2 = new Duration('P1D');
-
-      expect(d1.add(d2).toString()).toEqual('P2D');
-    });
-
-    it('works with heterogeneous spans', () => {
-      const d1 = new Duration('P1D');
-      const d2 = new Duration('P1Y');
-
-      expect(d1.add(d2).toString()).toEqual('P1Y1D');
-    });
-
-    it('works with weeks', () => {
-      let d1 = new Duration('P1W');
-      let d2 = new Duration('P2W');
-      expect(d1.add(d2).toString()).toEqual('P3W');
-
-      d1 = new Duration('P6D');
-      d2 = new Duration('P1D');
-      expect(d1.add(d2).toString()).toEqual('P1W');
-    });
-  });
-
-  describe('#subtract()', () => {
-    it('works with a simple duration', () => {
-      const d1 = new Duration('P1DT2H');
-      const d2 = new Duration('PT1H');
-
-      expect(d1.subtract(d2).toString()).toEqual('P1DT1H');
-    });
-
-    it('works with a less simple duration', () => {
-      const d1 = new Duration('P1D');
-      const d2 = new Duration('PT1H');
-
-      expect(d1.subtract(d2).toString()).toEqual('PT23H');
-    });
-
-    it('works with weeks', () => {
-      const d1 = new Duration('P1W');
-      const d2 = new Duration('P1D');
-
-      expect(d1.subtract(d2).toString()).toEqual('P6D');
-    });
-
-    it('throws an error if result is going to be negative', () => {
-      const d1 = new Duration('P1D');
-      const d2 = new Duration('P2D');
-
-      expect(() => d1.subtract(d2)).toThrow();
-    });
-  });
-
-  describe('#multiply()', () => {
-    it('works with a simple duration', () => {
-      const d = new Duration('P1D');
-      expect(d.multiply(5).toString()).toEqual('P5D');
-    });
-
-    it('works with a less simple duration', () => {
-      const d = new Duration('P1DT2H');
-      expect(d.multiply(2).toString()).toEqual('P2DT4H');
-    });
-
-    it('works with weeks', () => {
-      const d = new Duration('P1W');
-      expect(d.multiply(5).toString()).toEqual('P5W');
-    });
-
-    it('throws an error if result is going to be negative', () => {
-      const d = new Duration('P1D');
-      expect(() => d.multiply(-1)).toThrow('Multiplier must be positive non-zero');
-    });
-
-    it('gets description properly', () => {
-      const d = new Duration('P2D');
-      expect(d.multiply(2).getDescription(true)).toEqual('4 Days');
-    });
-  });
-
-  describe('#getDescription()', () => {
-    it('gives back the correct description', () => {
-      let durationStr: string;
-
-      durationStr = 'P1D';
-      expect(new Duration(durationStr).getDescription()).toEqual('day');
-
-      durationStr = 'P1DT2H';
-      expect(new Duration(durationStr).getDescription()).toEqual('1 day, 2 hours');
-
-      durationStr = 'P3Y';
-      expect(new Duration(durationStr).getDescription()).toEqual('3 years');
-
-      durationStr = 'P2W';
-      expect(new Duration(durationStr).getDescription()).toEqual('2 weeks');
-
-      durationStr = 'PT5H';
-      expect(new Duration(durationStr).getDescription()).toEqual('5 hours');
-
-      durationStr = 'P3DT15H';
-      expect(new Duration(durationStr).getDescription()).toEqual('3 days, 15 hours');
-
-      durationStr = 'P3DT15H';
-      expect(new Duration(durationStr).getDescription(true)).toEqual('3 Days, 15 Hours');
-    });
-  });
-
-  describe('#getSingleSpan()', () => {
-    it('gives back the correct span', () => {
-      let durationStr: string;
-
-      durationStr = 'P1D';
-      expect(new Duration(durationStr).getSingleSpan()).toEqual('day');
-
-      durationStr = 'P3Y';
-      expect(new Duration(durationStr).getSingleSpan()).toEqual('year');
-
-      durationStr = 'P2W';
-      expect(new Duration(durationStr).getSingleSpan()).toEqual('week');
-
-      durationStr = 'PT5H';
-      expect(new Duration(durationStr).getSingleSpan()).toEqual('hour');
-
-      durationStr = 'P3DT15H';
-      expect(new Duration(durationStr).getSingleSpan()).toBeUndefined();
-
-      durationStr = 'P3DT15H';
-      expect(new Duration(durationStr).getSingleSpan()).toBeUndefined();
-    });
-  });
-
-  describe('#getSingleSpanValue()', () => {
-    it('gives back the correct span value', () => {
-      let durationStr: string;
-
-      durationStr = 'P1D';
-      expect(new Duration(durationStr).getSingleSpanValue()).toEqual(1);
-
-      durationStr = 'P3Y';
-      expect(new Duration(durationStr).getSingleSpanValue()).toEqual(3);
-
-      durationStr = 'P2W';
-      expect(new Duration(durationStr).getSingleSpanValue()).toEqual(2);
-
-      durationStr = 'PT5H';
-      expect(new Duration(durationStr).getSingleSpanValue()).toEqual(5);
-
-      durationStr = 'P3DT15H';
-      expect(new Duration(durationStr).getSingleSpanValue()).toBeUndefined();
-
-      durationStr = 'P3DT15H';
-      expect(new Duration(durationStr).getSingleSpanValue()).toBeUndefined();
-    });
-  });
-
-  describe('#limitToDays', () => {
-    it('works', () => {
-      expect(new Duration('P6D').limitToDays().toString()).toEqual('P6D');
-
-      expect(new Duration('P1M').limitToDays().toString()).toEqual('P30D');
-
-      expect(new Duration('P1Y').limitToDays().toString()).toEqual('P365D');
-
-      expect(new Duration('P1Y2M').limitToDays().toString()).toEqual('P425D');
-    });
-  });
-});
diff --git a/web-console/src/utils/duration/duration.ts b/web-console/src/utils/duration/duration.ts
deleted file mode 100755
index bc7236821f12..000000000000
--- a/web-console/src/utils/duration/duration.ts
+++ /dev/null
@@ -1,388 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import { second, shifters } from '../date-floor-shift-ceil/date-floor-shift-ceil';
-import { capitalizeFirst, pluralIfNeeded } from '../general';
-
-export const TZ_UTC = 'Etc/UTC';
-
-export type DurationSpan = 'year' | 'month' | 'week' | 'day' | 'hour' | 'minute' | 'second';
-
-const SPANS_WITH_WEEK: DurationSpan[] = [
-  'year',
-  'month',
-  'week',
-  'day',
-  'hour',
-  'minute',
-  'second',
-];
-const SPANS_WITHOUT_WEEK: DurationSpan[] = ['year', 'month', 'day', 'hour', 'minute', 'second'];
-const SPANS_WITHOUT_WEEK_OR_MONTH: DurationSpan[] = ['year', 'day', 'hour', 'minute', 'second'];
-const SPANS_UP_TO_DAY: DurationSpan[] = ['day', 'hour', 'minute', 'second'];
-
-export type DurationValue = Partial<Record<DurationSpan, number>>;
-
-const periodWeekRegExp = /^P(\d+)W$/;
-const periodRegExp = /^P(?:(\d+)Y)?(?:(\d+)M)?(?:(\d+)D)?(?:T(?:(\d+)H)?(?:(\d+)M)?(?:(\d+)S)?)?$/;
-//                     P   (year ) (month   ) (day     )    T(hour    ) (minute  ) (second  )
-
-function getSpansFromString(durationStr: string): DurationValue {
-  const spans: DurationValue = {};
-  let matches: RegExpExecArray | null;
-  if ((matches = periodWeekRegExp.exec(durationStr))) {
-    spans.week = Number(matches[1]);
-    if (!spans.week) throw new Error('Duration can not have empty weeks');
-  } else if ((matches = periodRegExp.exec(durationStr))) {
-    const nums = matches.map(Number);
-    for (let i = 0; i < SPANS_WITHOUT_WEEK.length; i++) {
-      const span = SPANS_WITHOUT_WEEK[i];
-      const value = nums[i + 1];
-      if (value) spans[span] = value;
-    }
-  } else {
-    throw new Error("Can not parse duration '" + durationStr + "'");
-  }
-  return spans;
-}
-
-function getSpansFromStartEnd(start: Date, end: Date, timezone: string): DurationValue {
-  start = second.floor(start, timezone);
-  end = second.floor(end, timezone);
-  if (end <= start) throw new Error('start must come before end');
-
-  const spans: DurationValue = {};
-  let iterator: Date = start;
-  for (let i = 0; i < SPANS_WITHOUT_WEEK.length; i++) {
-    const span = SPANS_WITHOUT_WEEK[i];
-    let spanCount = 0;
-
-    // Shortcut
-    const length = end.valueOf() - iterator.valueOf();
-    const canonicalLength: number = shifters[span].canonicalLength;
-    if (length < canonicalLength / 4) continue;
-    const numberToFit = Math.min(0, Math.floor(length / canonicalLength) - 1);
-    let iteratorMove: Date;
-    if (numberToFit > 0) {
-      // try to skip by numberToFit
-      iteratorMove = shifters[span].shift(iterator, timezone, numberToFit);
-      if (iteratorMove <= end) {
-        spanCount += numberToFit;
-        iterator = iteratorMove;
-      }
-    }
-
-    while (true) {
-      iteratorMove = shifters[span].shift(iterator, timezone, 1);
-      if (iteratorMove <= end) {
-        iterator = iteratorMove;
-        spanCount++;
-      } else {
-        break;
-      }
-    }
-
-    if (spanCount) {
-      spans[span] = spanCount;
-    }
-  }
-  return spans;
-}
-
-function removeZeros(spans: DurationValue): DurationValue {
-  const newSpans: DurationValue = {};
-  for (let i = 0; i < SPANS_WITH_WEEK.length; i++) {
-    const span = SPANS_WITH_WEEK[i];
-    if (Number(spans[span]) > 0) {
-      newSpans[span] = spans[span];
-    }
-  }
-  return newSpans;
-}
-
-function fitIntoSpans(length: number, spansToCheck: DurationSpan[]): DurationValue {
-  const spans: DurationValue = {};
-
-  let lengthLeft = length;
-  for (let i = 0; i < spansToCheck.length; i++) {
-    const span = spansToCheck[i];
-    const spanLength = shifters[span].canonicalLength;
-    const count = Math.floor(lengthLeft / spanLength);
-
-    if (count) {
-      lengthLeft -= spanLength * count;
-      spans[span] = count;
-    }
-  }
-
-  return spans;
-}
-
-/**
- * Represents an ISO duration like P1DT3H
- */
-export class Duration {
-  public readonly singleSpan?: DurationSpan;
-  public readonly spans: Readonly<DurationValue>;
-
-  static fromCanonicalLength(length: number, skipMonths = false): Duration {
-    if (length <= 0) throw new Error('length must be positive');
-    let spans = fitIntoSpans(length, skipMonths ? SPANS_WITHOUT_WEEK_OR_MONTH : SPANS_WITHOUT_WEEK);
-
-    if (
-      length % shifters['week'].canonicalLength === 0 && // Weeks fits
-      (Object.keys(spans).length > 1 || // We already have a more complex span
-        spans['day']) // or... we only have days and it might be simpler to express as weeks
-    ) {
-      spans = { week: length / shifters['week'].canonicalLength };
-    }
-
-    return new Duration(spans);
-  }
-
-  static fromCanonicalLengthUpToDays(length: number): Duration {
-    if (length <= 0) throw new Error('length must be positive');
-    return new Duration(fitIntoSpans(length, SPANS_UP_TO_DAY));
-  }
-
-  static fromRange(start: Date, end: Date, timezone: string): Duration {
-    return new Duration(getSpansFromStartEnd(start, end, timezone));
-  }
-
-  static pickSmallestGranularityThatFits(
-    granularities: Duration[],
-    span: number,
-    maxEntities: number,
-  ): Duration {
-    for (const granularity of granularities) {
-      if (span / granularity.getCanonicalLength() < maxEntities) return granularity;
-    }
-    return granularities[granularities.length - 1];
-  }
-
-  constructor(spans: DurationValue | string) {
-    const effectiveSpans: DurationValue =
-      typeof spans === 'string' ? getSpansFromString(spans) : removeZeros(spans);
-
-    const usedSpans = Object.keys(effectiveSpans) as DurationSpan[];
-    if (!usedSpans.length) throw new Error('Duration can not be empty');
-    if (usedSpans.length === 1) {
-      this.singleSpan = usedSpans[0];
-    } else if (effectiveSpans.week) {
-      throw new Error("Can not mix 'week' and other spans");
-    }
-    this.spans = effectiveSpans;
-  }
-
-  public toString() {
-    const strArr: string[] = ['P'];
-    const spans = this.spans;
-    if (spans.week) {
-      strArr.push(String(spans.week), 'W');
-    } else {
-      let addedT = false;
-      for (let i = 0; i < SPANS_WITHOUT_WEEK.length; i++) {
-        const span = SPANS_WITHOUT_WEEK[i];
-        const value = spans[span];
-        if (!value) continue;
-        if (!addedT && i >= 3) {
-          strArr.push('T');
-          addedT = true;
-        }
-        strArr.push(String(value), span[0].toUpperCase());
-      }
-    }
-    return strArr.join('');
-  }
-
-  public add(duration: Duration): Duration {
-    return Duration.fromCanonicalLength(this.getCanonicalLength() + duration.getCanonicalLength());
-  }
-
-  public subtract(duration: Duration): Duration {
-    const newCanonicalDuration = this.getCanonicalLength() - duration.getCanonicalLength();
-    if (newCanonicalDuration < 0) throw new Error('A duration can not be negative.');
-    return Duration.fromCanonicalLength(newCanonicalDuration);
-  }
-
-  public multiply(multiplier: number): Duration {
-    if (multiplier <= 0) throw new Error('Multiplier must be positive non-zero');
-    if (multiplier === 1) return this;
-    const newCanonicalDuration = this.getCanonicalLength() * multiplier;
-    return Duration.fromCanonicalLength(newCanonicalDuration);
-  }
-
-  public valueOf() {
-    return this.spans;
-  }
-
-  public equals(other: Duration | undefined): boolean {
-    return other instanceof Duration && this.toString() === other.toString();
-  }
-
-  public isSimple(): boolean {
-    const { singleSpan } = this;
-    if (!singleSpan) return false;
-    return this.spans[singleSpan] === 1;
-  }
-
-  public isFloorable(): boolean {
-    const { singleSpan } = this;
-    if (!singleSpan) return false;
-    const span = Number(this.spans[singleSpan]);
-    if (span === 1) return true;
-    const { siblings } = shifters[singleSpan];
-    if (!siblings) return false;
-    return siblings % span === 0;
-  }
-
-  /**
-   * Floors the date according to this duration.
-   * @param date The date to floor
-   * @param timezone The timezone within which to floor
-   */
-  public floor(date: Date, timezone: string): Date {
-    const { singleSpan } = this;
-    if (!singleSpan) throw new Error('Can not floor on a complex duration');
-    const span = this.spans[singleSpan]!;
-    const mover = shifters[singleSpan];
-    let dt = mover.floor(date, timezone);
-    if (span !== 1) {
-      if (!mover.siblings) {
-        throw new Error(`Can not floor on a ${singleSpan} duration that is not 1`);
-      }
-      if (mover.siblings % span !== 0) {
-        throw new Error(
-          `Can not floor on a ${singleSpan} duration that does not divide into ${mover.siblings}`,
-        );
-      }
-      dt = mover.round(dt, span, timezone);
-    }
-    return dt;
-  }
-
-  /**
-   * Moves the given date by 'step' times of the duration
-   * Negative step value will move back in time.
-   * @param date The date to move
-   * @param timezone The timezone within which to make the move
-   * @param step The number of times to step by the duration
-   */
-  public shift(date: Date, timezone: string, step = 1): Date {
-    const spans = this.spans;
-    for (const span of SPANS_WITH_WEEK) {
-      const value = spans[span];
-      if (value) date = shifters[span].shift(date, timezone, step * value);
-    }
-    return date;
-  }
-
-  public ceil(date: Date, timezone: string): Date {
-    const floored = this.floor(date, timezone);
-    if (floored.valueOf() === date.valueOf()) return date; // Just like ceil(3) is 3 and not 4
-    return this.shift(floored, timezone, 1);
-  }
-
-  public round(date: Date, timezone: string): Date {
-    const floorDate = this.floor(date, timezone);
-    const ceilDate = this.ceil(date, timezone);
-    const distanceToFloor = Math.abs(date.valueOf() - floorDate.valueOf());
-    const distanceToCeil = Math.abs(date.valueOf() - ceilDate.valueOf());
-    return distanceToFloor < distanceToCeil ? floorDate : ceilDate;
-  }
-
-  /**
-   * Materializes all the values of this duration form start to end
-   * @param start The date to start on
-   * @param end The date to start on
-   * @param timezone The timezone within which to materialize
-   * @param step The number of times to step by the duration
-   */
-  public materialize(start: Date, end: Date, timezone: string, step = 1): Date[] {
-    const values: Date[] = [];
-    let iter = this.floor(start, timezone);
-    while (iter <= end) {
-      values.push(iter);
-      iter = this.shift(iter, timezone, step);
-    }
-    return values;
-  }
-
-  /**
-   * Checks to see if date is aligned to this duration within the timezone (floors to itself)
-   * @param date The date to check
-   * @param timezone The timezone within which to make the check
-   */
-  public isAligned(date: Date, timezone: string): boolean {
-    return this.floor(date, timezone).valueOf() === date.valueOf();
-  }
-
-  /**
-   * Check to see if this duration can be divided by the given duration
-   * @param smaller The smaller duration to divide by
-   */
-  public dividesBy(smaller: Duration): boolean {
-    const myCanonicalLength = this.getCanonicalLength();
-    const smallerCanonicalLength = smaller.getCanonicalLength();
-    return (
-      myCanonicalLength % smallerCanonicalLength === 0 &&
-      this.isFloorable() &&
-      smaller.isFloorable()
-    );
-  }
-
-  public getCanonicalLength(): number {
-    const spans = this.spans;
-    let length = 0;
-    for (const span of SPANS_WITH_WEEK) {
-      const value = spans[span];
-      if (value) length += value * shifters[span].canonicalLength;
-    }
-    return length;
-  }
-
-  public getDescription(capitalize?: boolean): string {
-    const spans = this.spans;
-    const description: string[] = [];
-    for (const span of SPANS_WITH_WEEK) {
-      const value = spans[span];
-      const spanTitle = capitalize ? capitalizeFirst(span) : span;
-      if (value) {
-        if (value === 1 && this.singleSpan) {
-          description.push(spanTitle);
-        } else {
-          description.push(pluralIfNeeded(value, spanTitle));
-        }
-      }
-    }
-    return description.join(', ');
-  }
-
-  public getSingleSpan(): string | undefined {
-    return this.singleSpan;
-  }
-
-  public getSingleSpanValue(): number | undefined {
-    if (!this.singleSpan) return;
-    return this.spans[this.singleSpan];
-  }
-
-  public limitToDays(): Duration {
-    return Duration.fromCanonicalLengthUpToDays(this.getCanonicalLength());
-  }
-}
diff --git a/web-console/src/utils/general.spec.ts b/web-console/src/utils/general.spec.ts
index 39deab9420aa..4b97cb19acb0 100644
--- a/web-console/src/utils/general.spec.ts
+++ b/web-console/src/utils/general.spec.ts
@@ -29,8 +29,8 @@ import {
   hashJoaat,
   moveElement,
   moveToIndex,
+  objectHash,
   offsetToRowColumn,
-  OVERLAY_OPEN_SELECTOR,
   parseCsvLine,
   swapElements,
 } from './general';
@@ -178,6 +178,12 @@ describe('general', () => {
     });
   });
 
+  describe('objectHash', () => {
+    it('works', () => {
+      expect(objectHash({ hello: 'world1' })).toEqual('cc14ad13');
+    });
+  });
+
   describe('offsetToRowColumn', () => {
     it('works', () => {
       const str = 'Hello\nThis is a test\nstring.';
@@ -211,10 +217,4 @@ describe('general', () => {
       expect(caseInsensitiveEquals(undefined, '')).toEqual(false);
     });
   });
-
-  describe('OVERLAY_OPEN_SELECTOR', () => {
-    it('is what it is', () => {
-      expect(OVERLAY_OPEN_SELECTOR).toEqual('.bp5-portal .bp5-overlay-open');
-    });
-  });
 });
diff --git a/web-console/src/utils/general.tsx b/web-console/src/utils/general.tsx
index d128d47f3462..b742013b2e83 100644
--- a/web-console/src/utils/general.tsx
+++ b/web-console/src/utils/general.tsx
@@ -59,10 +59,6 @@ export function isSimpleArray(a: any): a is (string | number | boolean)[] {
   );
 }
 
-export function arraysEqualByElement<T>(xs: T[], ys: T[]): boolean {
-  return xs.length === ys.length && xs.every((x, i) => x === ys[i]);
-}
-
 export function wait(ms: number): Promise<void> {
   return new Promise(resolve => {
     setTimeout(resolve, ms);
@@ -255,14 +251,6 @@ export function uniq(array: readonly string[]): string[] {
   });
 }
 
-export function allSameValue<T>(xs: readonly T[]): T | undefined {
-  const sameValue: T | undefined = xs[0];
-  for (let i = 1; i < xs.length; i++) {
-    if (sameValue !== xs[i]) return;
-  }
-  return sameValue;
-}
-
 // ----------------------------
 
 export function formatEmpty(str: string): string {
@@ -385,14 +373,6 @@ export function formatDurationHybrid(ms: NumberLike): string {
   }
 }
 
-export function timezoneOffsetInMinutesToString(offsetInMinutes: number, padHour: boolean): string {
-  const sign = offsetInMinutes < 0 ? '-' : '+';
-  const absOffset = Math.abs(offsetInMinutes);
-  const h = Math.floor(absOffset / 60);
-  const m = absOffset % 60;
-  return `${sign}${padHour ? pad2(h) : h}:${pad2(m)}`;
-}
-
 function pluralize(word: string): string {
   // Ignoring irregular plurals.
   if (/(s|x|z|ch|sh)$/.test(word)) {
@@ -632,10 +612,12 @@ export function hashJoaat(str: string): number {
   return (hash & 4294967295) >>> 0;
 }
 
-export const OVERLAY_OPEN_SELECTOR = `.${Classes.PORTAL} .${Classes.OVERLAY_OPEN}`;
+export function objectHash(obj: any): string {
+  return hashJoaat(JSONBig.stringify(obj)).toString(16).padStart(8);
+}
 
-export function hasOverlayOpen(): boolean {
-  return Boolean(document.querySelector(OVERLAY_OPEN_SELECTOR));
+export function hasPopoverOpen(): boolean {
+  return Boolean(document.querySelector(`${Classes.PORTAL} ${Classes.OVERLAY} ${Classes.POPOVER}`));
 }
 
 export function checkedCircleIcon(checked: boolean): IconName {
diff --git a/web-console/src/utils/index.tsx b/web-console/src/utils/index.tsx
index 096f0dfe0634..edea5ad0a520 100644
--- a/web-console/src/utils/index.tsx
+++ b/web-console/src/utils/index.tsx
@@ -19,12 +19,10 @@
 export * from './base64-url';
 export * from './column-metadata';
 export * from './date';
-export * from './date-floor-shift-ceil/date-floor-shift-ceil';
 export * from './download';
 export * from './download-query-detail-archive';
 export * from './druid-lookup';
 export * from './druid-query';
-export * from './duration/duration';
 export * from './formatter';
 export * from './general';
 export * from './local-storage-backed-visibility';
diff --git a/web-console/src/druid-models/load-rule/load-rule.ts b/web-console/src/utils/load-rule.ts
similarity index 97%
rename from web-console/src/druid-models/load-rule/load-rule.ts
rename to web-console/src/utils/load-rule.ts
index 31b4d600585a..a32422bbb6a4 100644
--- a/web-console/src/druid-models/load-rule/load-rule.ts
+++ b/web-console/src/utils/load-rule.ts
@@ -18,7 +18,7 @@
 
 import { sum } from 'd3-array';
 
-import { deepMove, deepSet } from '../../utils';
+import { deepMove, deepSet } from './object-change';
 
 export type RuleType =
   | 'loadForever'
@@ -41,7 +41,6 @@ export interface Rule {
 }
 
 export class RuleUtil {
-  static DEFAULT_RULES_KEY = '_default';
   static TYPES: RuleType[] = [
     'loadForever',
     'loadByInterval',
diff --git a/web-console/src/utils/query-action.ts b/web-console/src/utils/query-action.ts
index 3f17f22b67d2..45ade6961388 100644
--- a/web-console/src/utils/query-action.ts
+++ b/web-console/src/utils/query-action.ts
@@ -16,6 +16,6 @@
  * limitations under the License.
  */
 
-import type { SqlQuery } from 'druid-query-toolkit';
+import type { SqlQuery } from '@druid-toolkit/query';
 
 export type QueryAction = (query: SqlQuery) => SqlQuery;
diff --git a/web-console/src/utils/query-manager/query-manager.ts b/web-console/src/utils/query-manager/query-manager.ts
index 1023b23412ad..5b141c7c89db 100644
--- a/web-console/src/utils/query-manager/query-manager.ts
+++ b/web-console/src/utils/query-manager/query-manager.ts
@@ -288,7 +288,7 @@ export class QueryManager<Q, R, I = never, E extends Error = Error> {
     return this.lastQuery;
   }
 
-  public getLastIntermediateQuery(): unknown {
+  public getLastIntermediateQuery(): any {
     return this.lastIntermediateQuery;
   }
 
diff --git a/web-console/src/utils/sampler.ts b/web-console/src/utils/sampler.ts
index 5333013c12b4..7fd3d67364cc 100644
--- a/web-console/src/utils/sampler.ts
+++ b/web-console/src/utils/sampler.ts
@@ -16,8 +16,8 @@
  * limitations under the License.
  */
 
+import { dedupe, F, SqlExpression, SqlFunction } from '@druid-toolkit/query';
 import type { CancelToken } from 'axios';
-import { dedupe, F, SqlExpression, SqlFunction } from 'druid-query-toolkit';
 import * as JSONBig from 'json-bigint-native';
 
 import type {
diff --git a/web-console/src/utils/sql.spec.ts b/web-console/src/utils/sql.spec.ts
index 57e7bce95fe8..9e5533ee4e62 100644
--- a/web-console/src/utils/sql.spec.ts
+++ b/web-console/src/utils/sql.spec.ts
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-import { sane } from 'druid-query-toolkit';
+import { sane } from '@druid-toolkit/query';
 
 import { findAllSqlQueriesInText, findSqlQueryPrefix } from './sql';
 
diff --git a/web-console/src/utils/sql.ts b/web-console/src/utils/sql.ts
index 6c168002078a..1cdf243819d2 100644
--- a/web-console/src/utils/sql.ts
+++ b/web-console/src/utils/sql.ts
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-import type { SqlBase } from 'druid-query-toolkit';
+import type { SqlBase } from '@druid-toolkit/query';
 import {
   SqlColumn,
   SqlExpression,
@@ -24,7 +24,7 @@ import {
   SqlLiteral,
   SqlQuery,
   SqlStar,
-} from 'druid-query-toolkit';
+} from '@druid-toolkit/query';
 
 import type { RowColumn } from './general';
 import { offsetToRowColumn } from './general';
diff --git a/web-console/src/utils/table-helpers.ts b/web-console/src/utils/table-helpers.ts
index a4ba4fce7ddf..45e8758bf6f8 100644
--- a/web-console/src/utils/table-helpers.ts
+++ b/web-console/src/utils/table-helpers.ts
@@ -16,10 +16,9 @@
  * limitations under the License.
  */
 
-import { ascending, descending, sort } from 'd3-array';
-import type { QueryResult, SqlExpression } from 'druid-query-toolkit';
-import { C } from 'druid-query-toolkit';
-import type { Filter, SortingRule } from 'react-table';
+import type { QueryResult, SqlExpression } from '@druid-toolkit/query';
+import { C } from '@druid-toolkit/query';
+import type { Filter } from 'react-table';
 
 import { filterMap, formatNumber, isNumberLike, oneOf } from './general';
 import { deepSet } from './object-change';
@@ -68,24 +67,19 @@ export function getNumericColumnBraces(
   return numericColumnBraces;
 }
 
+export interface Sorted {
+  id: string;
+  desc: boolean;
+}
+
 export interface TableState {
   page: number;
   pageSize: number;
   filtered: Filter[];
-  sorted: SortingRule[];
+  sorted: Sorted[];
 }
 
-export function sortedToOrderByClause(sorted: SortingRule[]): string | undefined {
+export function sortedToOrderByClause(sorted: Sorted[]): string | undefined {
   if (!sorted.length) return;
   return 'ORDER BY ' + sorted.map(sort => `${C(sort.id)} ${sort.desc ? 'DESC' : 'ASC'}`).join(', ');
 }
-
-export function applySorting(xs: any[], sorted: SortingRule[]): any[] {
-  const firstSortingRule = sorted[0];
-  if (!firstSortingRule) return xs;
-  const { id, desc } = firstSortingRule;
-  return sort(
-    xs,
-    desc ? (d1, d2) => descending(d1[id], d2[id]) : (d1, d2) => ascending(d1[id], d2[id]),
-  );
-}
diff --git a/web-console/src/utils/types.ts b/web-console/src/utils/types.ts
index a3e38a2c8218..7f48655cb1c4 100644
--- a/web-console/src/utils/types.ts
+++ b/web-console/src/utils/types.ts
@@ -18,7 +18,7 @@
 
 import type { IconName } from '@blueprintjs/core';
 import { IconNames } from '@blueprintjs/icons';
-import type { Column } from 'druid-query-toolkit';
+import type { Column } from '@druid-toolkit/query';
 
 export function columnToSummary(column: Column): string {
   const lines: string[] = [column.name];
diff --git a/web-console/src/utils/values-query.spec.tsx b/web-console/src/utils/values-query.spec.tsx
index 89f4a4d2f14f..7bc093bc3e82 100644
--- a/web-console/src/utils/values-query.spec.tsx
+++ b/web-console/src/utils/values-query.spec.tsx
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-import { QueryResult, sane } from 'druid-query-toolkit';
+import { QueryResult, sane } from '@druid-toolkit/query';
 
 import { queryResultToValuesQuery } from './values-query';
 
diff --git a/web-console/src/utils/values-query.tsx b/web-console/src/utils/values-query.tsx
index 69130d380e75..1b5e62b44c23 100644
--- a/web-console/src/utils/values-query.tsx
+++ b/web-console/src/utils/values-query.tsx
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-import type { Column, QueryResult, SqlExpression } from 'druid-query-toolkit';
+import type { Column, QueryResult, SqlExpression } from '@druid-toolkit/query';
 import {
   C,
   F,
@@ -28,7 +28,7 @@ import {
   SqlRecord,
   SqlType,
   SqlValues,
-} from 'druid-query-toolkit';
+} from '@druid-toolkit/query';
 import * as JSONBig from 'json-bigint-native';
 
 import { oneOf } from './general';
diff --git a/web-console/src/views/datasources-view/__snapshots__/datasources-view.spec.tsx.snap b/web-console/src/views/datasources-view/__snapshots__/datasources-view.spec.tsx.snap
index 5f471fa1e390..6da41f6eb763 100644
--- a/web-console/src/views/datasources-view/__snapshots__/datasources-view.spec.tsx.snap
+++ b/web-console/src/views/datasources-view/__snapshots__/datasources-view.spec.tsx.snap
@@ -109,7 +109,6 @@ exports[`DatasourcesView matches snapshot 1`] = `
     />
   </Memo(ViewControlBar)>
   <SplitterLayout
-    className="timeline-datasources-splitter"
     percentage={true}
     primaryIndex={1}
     primaryMinSize={20}
diff --git a/web-console/src/views/datasources-view/datasources-view.scss b/web-console/src/views/datasources-view/datasources-view.scss
index 91a95bc32a0f..b0abe78ec56a 100644
--- a/web-console/src/views/datasources-view/datasources-view.scss
+++ b/web-console/src/views/datasources-view/datasources-view.scss
@@ -23,7 +23,7 @@
   width: 100%;
   overflow: auto;
 
-  .splitter-layout.timeline-datasources-splitter {
+  .splitter-layout {
     position: absolute;
     top: $view-control-bar-height + $standard-padding;
     bottom: 0;
@@ -45,13 +45,6 @@
   .ReactTable {
     @include pin-full;
 
-    .datasource-color-tab {
-      display: inline-block;
-      width: 10px;
-      height: 20px;
-      border-radius: 3px;
-    }
-
     .clickable-cell {
       cursor: pointer;
     }
diff --git a/web-console/src/views/datasources-view/datasources-view.tsx b/web-console/src/views/datasources-view/datasources-view.tsx
index f4f652befed6..3fb6a5be40d8 100644
--- a/web-console/src/views/datasources-view/datasources-view.tsx
+++ b/web-console/src/views/datasources-view/datasources-view.tsx
@@ -16,10 +16,10 @@
  * limitations under the License.
  */
 
-import { Button, FormGroup, InputGroup, Intent, MenuItem, Switch, Tag } from '@blueprintjs/core';
+import { FormGroup, InputGroup, Intent, MenuItem, Switch, Tag } from '@blueprintjs/core';
 import { IconNames } from '@blueprintjs/icons';
+import { SqlQuery, T } from '@druid-toolkit/query';
 import { sum } from 'd3-array';
-import { SqlQuery, T } from 'druid-query-toolkit';
 import React from 'react';
 import type { Filter } from 'react-table';
 import ReactTable from 'react-table';
@@ -51,16 +51,8 @@ import type {
   CompactionInfo,
   CompactionStatus,
   QueryWithContext,
-  Rule,
-} from '../../druid-models';
-import {
-  END_OF_TIME_DATE,
-  formatCompactionInfo,
-  getDatasourceColor,
-  RuleUtil,
-  START_OF_TIME_DATE,
-  zeroCompactionStatus,
 } from '../../druid-models';
+import { formatCompactionInfo, zeroCompactionStatus } from '../../druid-models';
 import type { Capabilities, CapabilitiesMode } from '../../helpers';
 import { STANDARD_TABLE_PAGE_SIZE, STANDARD_TABLE_PAGE_SIZE_OPTIONS } from '../../react-table';
 import { Api, AppToaster } from '../../singletons';
@@ -74,10 +66,9 @@ import {
   formatInteger,
   formatMillions,
   formatPercent,
-  getApiArray,
   getDruidErrorMessage,
   groupByAsMap,
-  hasOverlayOpen,
+  hasPopoverOpen,
   isNumberLikeNaN,
   LocalStorageBackedVisibility,
   LocalStorageKeys,
@@ -91,6 +82,8 @@ import {
   twoLines,
 } from '../../utils';
 import type { BasicAction } from '../../utils/basic-action';
+import type { Rule } from '../../utils/load-rule';
+import { RuleUtil } from '../../utils/load-rule';
 
 import './datasources-view.scss';
 
@@ -138,6 +131,8 @@ const TABLE_COLUMNS_BY_MODE: Record<CapabilitiesMode, TableColumnSelectorColumn[
   ],
 };
 
+const DEFAULT_RULES_KEY = '_default';
+
 function formatLoadDrop(segmentsToLoad: NumberLike, segmentsToDrop: NumberLike): string {
   const loadDrop: string[] = [];
   if (segmentsToLoad) {
@@ -245,7 +240,6 @@ interface DatasourcesAndDefaultRules {
 interface RetentionDialogOpenOn {
   readonly datasource: string;
   readonly rules: Rule[];
-  readonly defaultRules: Rule[];
 }
 
 interface CompactionConfigDialogOpenOn {
@@ -305,12 +299,7 @@ export interface DatasourcesViewProps {
   onFiltersChange(filters: Filter[]): void;
   goToQuery(queryWithContext: QueryWithContext): void;
   goToTasks(datasource?: string): void;
-  goToSegments(options: {
-    start?: Date;
-    end?: Date;
-    datasource?: string;
-    realtime?: boolean;
-  }): void;
+  goToSegments(datasource: string, onlyUnavailable?: boolean): void;
   capabilities: Capabilities;
 }
 
@@ -328,7 +317,7 @@ export interface DatasourcesViewState {
   useUnuseInterval: string;
   showForceCompact: boolean;
   visibleColumns: LocalStorageBackedVisibility;
-  showSegmentTimeline?: { capabilities: Capabilities; datasource?: string };
+  showSegmentTimeline: boolean;
 
   datasourceTableActionDialogId?: string;
   actions: BasicAction[];
@@ -373,7 +362,7 @@ export class DatasourcesView extends React.PureComponent<
           `COUNT(*) FILTER (WHERE is_active = 1 AND "start" LIKE '%T00:00:00.000Z' AND "end" LIKE '%T00:00:00.000Z') AS day_aligned_segments`,
           `COUNT(*) FILTER (WHERE is_active = 1 AND "start" LIKE '%-01T00:00:00.000Z' AND "end" LIKE '%-01T00:00:00.000Z') AS month_aligned_segments`,
           `COUNT(*) FILTER (WHERE is_active = 1 AND "start" LIKE '%-01-01T00:00:00.000Z' AND "end" LIKE '%-01-01T00:00:00.000Z') AS year_aligned_segments`,
-          `COUNT(*) FILTER (WHERE is_active = 1 AND "start" = '${START_OF_TIME_DATE}' AND "end" = '${END_OF_TIME_DATE}') AS all_granularity_segments`,
+          `COUNT(*) FILTER (WHERE is_active = 1 AND "start" = '-146136543-09-08T08:23:32.096Z' AND "end" = '146140482-04-24T15:36:27.903Z') AS all_granularity_segments`,
         ],
         visibleColumns.shown('Total rows') &&
           `SUM("num_rows") FILTER (WHERE is_active = 1) AS total_rows`,
@@ -429,6 +418,7 @@ GROUP BY 1, 2`;
         LocalStorageKeys.DATASOURCE_TABLE_COLUMN_SELECTION,
         ['Segment size', 'Segment granularity'],
       ),
+      showSegmentTimeline: false,
 
       actions: [],
     };
@@ -445,15 +435,15 @@ GROUP BY 1, 2`;
           setIntermediateQuery(query);
           datasources = await queryDruidSql({ query }, cancelToken);
         } else if (capabilities.hasCoordinatorAccess()) {
-          const datasourcesResp = await getApiArray(
+          const datasourcesResp = await Api.instance.get(
             '/druid/coordinator/v1/datasources?simple',
-            cancelToken,
+            { cancelToken },
           );
           const loadstatusResp = await Api.instance.get('/druid/coordinator/v1/loadstatus?simple', {
             cancelToken,
           });
           const loadstatus = loadstatusResp.data;
-          datasources = datasourcesResp.map((d: any): DatasourceQueryResultRow => {
+          datasources = datasourcesResp.data.map((d: any): DatasourceQueryResultRow => {
             const totalDataSize = deepGet(d, 'properties.segments.size') || -1;
             const segmentsToLoad = Number(loadstatus[d.name] || 0);
             const availableSegments = Number(deepGet(d, 'properties.segments.count'));
@@ -531,10 +521,9 @@ GROUP BY 1, 2`;
           if (capabilities.hasOverlordAccess()) {
             auxiliaryQueries.push(async (datasourcesAndDefaultRules, cancelToken) => {
               try {
-                const taskList = await getApiArray(
-                  `/druid/indexer/v1/tasks?state=running`,
-                  cancelToken,
-                );
+                const taskList = (
+                  await Api.instance.get(`/druid/indexer/v1/tasks?state=running`, { cancelToken })
+                ).data;
 
                 const runningTasksByDatasource = groupByAsMap(
                   taskList,
@@ -573,10 +562,10 @@ GROUP BY 1, 2`;
           if (showUnused) {
             try {
               unused = (
-                await getApiArray<string>(
+                await Api.instance.get<string[]>(
                   '/druid/coordinator/v1/metadata/datasources?includeUnused',
                 )
-              ).filter(d => !seen[d]);
+              ).data.filter(d => !seen[d]);
             } catch {
               AppToaster.show({
                 icon: IconNames.ERROR,
@@ -589,7 +578,7 @@ GROUP BY 1, 2`;
           // Rules
           auxiliaryQueries.push(async (datasourcesAndDefaultRules, cancelToken) => {
             try {
-              const rules = (
+              const rules: Record<string, Rule[]> = (
                 await Api.instance.get<Record<string, Rule[]>>('/druid/coordinator/v1/rules', {
                   cancelToken,
                 })
@@ -600,7 +589,7 @@ GROUP BY 1, 2`;
                   ...ds,
                   rules: rules[ds.datasource] || [],
                 })),
-                defaultRules: rules[RuleUtil.DEFAULT_RULES_KEY],
+                defaultRules: rules[DEFAULT_RULES_KEY],
               };
             } catch {
               AppToaster.show({
@@ -668,19 +657,8 @@ GROUP BY 1, 2`;
   }
 
   private readonly refresh = (auto: boolean): void => {
-    if (auto && hasOverlayOpen()) return;
+    if (auto && hasPopoverOpen()) return;
     this.datasourceQueryManager.rerunLastQuery(auto);
-
-    const { showSegmentTimeline } = this.state;
-    if (showSegmentTimeline) {
-      // Create a new capabilities object to force the segment timeline to re-render
-      this.setState(({ showSegmentTimeline }) => ({
-        showSegmentTimeline: {
-          ...showSegmentTimeline,
-          capabilities: this.props.capabilities.clone(),
-        },
-      }));
-    }
   };
 
   private fetchDatasourceData() {
@@ -868,9 +846,9 @@ GROUP BY 1, 2`;
           <MenuItem
             icon={IconNames.APPLICATION}
             text="View SQL query for table"
-            disabled={typeof lastDatasourcesQuery !== 'string'}
+            disabled={!lastDatasourcesQuery}
             onClick={() => {
-              if (typeof lastDatasourcesQuery !== 'string') return;
+              if (!lastDatasourcesQuery) return;
               goToQuery({ queryString: lastDatasourcesQuery });
             }}
           />
@@ -943,7 +921,6 @@ GROUP BY 1, 2`;
           retentionDialogOpenOn: {
             datasource: '_default',
             rules: defaultRules,
-            defaultRules,
           },
         };
       });
@@ -1053,13 +1030,10 @@ GROUP BY 1, 2`;
             icon: IconNames.AUTOMATIC_UPDATES,
             title: 'Edit retention rules',
             onAction: () => {
-              const defaultRules = this.state.datasourcesAndDefaultRulesState.data?.defaultRules;
-              if (!defaultRules) return;
               this.setState({
                 retentionDialogOpenOn: {
                   datasource,
                   rules: rules || [],
-                  defaultRules,
                 },
               });
             },
@@ -1123,8 +1097,9 @@ GROUP BY 1, 2`;
 
   private renderRetentionDialog() {
     const { capabilities } = this.props;
-    const { retentionDialogOpenOn } = this.state;
-    if (!retentionDialogOpenOn) return;
+    const { retentionDialogOpenOn, datasourcesAndDefaultRulesState } = this.state;
+    const defaultRules = datasourcesAndDefaultRulesState.data?.defaultRules;
+    if (!retentionDialogOpenOn || !defaultRules) return;
 
     return (
       <RetentionDialog
@@ -1132,7 +1107,7 @@ GROUP BY 1, 2`;
         rules={retentionDialogOpenOn.rules}
         capabilities={capabilities}
         onEditDefaults={this.editDefaultRules}
-        defaultRules={retentionDialogOpenOn.defaultRules}
+        defaultRules={defaultRules}
         onCancel={() => this.setState({ retentionDialogOpenOn: undefined })}
         onSave={this.saveRules}
       />
@@ -1164,9 +1139,8 @@ GROUP BY 1, 2`;
   }
 
   private renderDatasourcesTable() {
-    const { goToTasks, capabilities, filters, onFiltersChange } = this.props;
-    const { datasourcesAndDefaultRulesState, showUnused, visibleColumns, showSegmentTimeline } =
-      this.state;
+    const { goToSegments, goToTasks, capabilities, filters, onFiltersChange } = this.props;
+    const { datasourcesAndDefaultRulesState, showUnused, visibleColumns } = this.state;
 
     let { datasources, defaultRules } = datasourcesAndDefaultRulesState.data || { datasources: [] };
 
@@ -1220,19 +1194,12 @@ GROUP BY 1, 2`;
             show: visibleColumns.shown('Datasource name'),
             accessor: 'datasource',
             width: 150,
-            Cell: ({ value, original }) => (
+            Cell: row => (
               <TableClickableCell
-                onClick={() => this.onDetail(original)}
+                onClick={() => this.onDetail(row.original)}
                 hoverIcon={IconNames.SEARCH_TEMPLATE}
-                tooltip="Show detail"
               >
-                {showSegmentTimeline ? (
-                  <>
-                    <span style={{ color: getDatasourceColor(value) }}>&#9632;</span> {value}
-                  </>
-                ) : (
-                  value
-                )}
+                {row.value}
               </TableClickableCell>
             ),
           },
@@ -1258,12 +1225,7 @@ GROUP BY 1, 2`;
               const hasZeroReplicationRule = RuleUtil.hasZeroReplicaRule(rules, defaultRules);
               const descriptor = hasZeroReplicationRule ? 'pre-cached' : 'available';
               const segmentsEl = (
-                <a
-                  onClick={() =>
-                    this.setState({ showSegmentTimeline: { capabilities, datasource } })
-                  }
-                  data-tooltip="Show in segment timeline"
-                >
+                <a onClick={() => goToSegments(datasource)}>
                   {pluralIfNeeded(num_segments, 'segment')}
                 </a>
               );
@@ -1356,7 +1318,7 @@ GROUP BY 1, 2`;
                 <TableClickableCell
                   onClick={() => goToTasks(original.datasource)}
                   hoverIcon={IconNames.ARROW_TOP_RIGHT}
-                  tooltip="Go to tasks"
+                  title="Go to tasks"
                 >
                   {formatRunningTasks(runningTasks)}
                 </TableClickableCell>
@@ -1536,7 +1498,6 @@ GROUP BY 1, 2`;
               if (!compaction) return;
               return (
                 <TableClickableCell
-                  tooltip="Open compaction configuration"
                   disabled={!compaction}
                   onClick={() => {
                     if (!compaction) return;
@@ -1653,7 +1614,6 @@ GROUP BY 1, 2`;
 
               return (
                 <TableClickableCell
-                  tooltip="Open retention (load rule) configuration"
                   disabled={!defaultRules}
                   onClick={() => {
                     if (!defaultRules) return;
@@ -1661,7 +1621,6 @@ GROUP BY 1, 2`;
                       retentionDialogOpenOn: {
                         datasource,
                         rules,
-                        defaultRules,
                       },
                     });
                   }}
@@ -1709,7 +1668,7 @@ GROUP BY 1, 2`;
   }
 
   render() {
-    const { capabilities, goToSegments } = this.props;
+    const { capabilities } = this.props;
     const {
       showUnused,
       visibleColumns,
@@ -1722,7 +1681,9 @@ GROUP BY 1, 2`;
       <div className="datasources-view app-view">
         <ViewControlBar label="Datasources">
           <RefreshButton
-            onRefresh={this.refresh}
+            onRefresh={auto => {
+              this.refresh(auto);
+            }}
             localStorageKey={LocalStorageKeys.DATASOURCES_REFRESH_RATE}
           />
           {this.renderBulkDatasourceActions()}
@@ -1733,13 +1694,9 @@ GROUP BY 1, 2`;
             disabled={!capabilities.hasCoordinatorAccess()}
           />
           <Switch
-            checked={Boolean(showSegmentTimeline)}
+            checked={showSegmentTimeline}
             label="Show segment timeline"
-            onChange={() =>
-              this.setState({
-                showSegmentTimeline: showSegmentTimeline ? undefined : { capabilities },
-              })
-            }
+            onChange={() => this.setState({ showSegmentTimeline: !showSegmentTimeline })}
             disabled={!capabilities.hasSqlOrCoordinatorAccess()}
           />
           <TableColumnSelector
@@ -1757,7 +1714,6 @@ GROUP BY 1, 2`;
           />
         </ViewControlBar>
         <SplitterLayout
-          className="timeline-datasources-splitter"
           vertical
           percentage
           secondaryInitialSize={35}
@@ -1765,22 +1721,7 @@ GROUP BY 1, 2`;
           primaryMinSize={20}
           secondaryMinSize={10}
         >
-          {showSegmentTimeline && (
-            <SegmentTimeline
-              capabilities={showSegmentTimeline.capabilities}
-              datasource={showSegmentTimeline.datasource}
-              getIntervalActionButton={(start, end, datasource, realtime) => {
-                return (
-                  <Button
-                    text="Open in segments view"
-                    small
-                    rightIcon={IconNames.ARROW_TOP_RIGHT}
-                    onClick={() => goToSegments({ start, end, datasource, realtime })}
-                  />
-                );
-              }}
-            />
-          )}
+          {showSegmentTimeline && <SegmentTimeline capabilities={capabilities} />}
           {this.renderDatasourcesTable()}
         </SplitterLayout>
         {datasourceTableActionDialogId && (
diff --git a/web-console/src/views/explore-view/components/column-picker-menu/column-picker-menu.tsx b/web-console/src/views/explore-view/components/column-picker-menu/column-picker-menu.tsx
index 7634cbae4ccd..1d227e864bc8 100644
--- a/web-console/src/views/explore-view/components/column-picker-menu/column-picker-menu.tsx
+++ b/web-console/src/views/explore-view/components/column-picker-menu/column-picker-menu.tsx
@@ -19,8 +19,8 @@
 import type { IconName } from '@blueprintjs/core';
 import { Icon, InputGroup, Menu, MenuItem } from '@blueprintjs/core';
 import { IconNames } from '@blueprintjs/icons';
+import type { Column } from '@druid-toolkit/query';
 import classNames from 'classnames';
-import type { Column } from 'druid-query-toolkit';
 import { useState } from 'react';
 
 import { caseInsensitiveContains, columnToIcon, filterMap } from '../../../../utils';
diff --git a/web-console/src/views/explore-view/components/column-picker/column-picker.tsx b/web-console/src/views/explore-view/components/column-picker/column-picker.tsx
index c61927d5b478..81c88fbf9b78 100644
--- a/web-console/src/views/explore-view/components/column-picker/column-picker.tsx
+++ b/web-console/src/views/explore-view/components/column-picker/column-picker.tsx
@@ -18,7 +18,7 @@
 
 import { Button, Menu, MenuItem, Popover, Position } from '@blueprintjs/core';
 import { IconNames } from '@blueprintjs/icons';
-import type { Column } from 'druid-query-toolkit';
+import type { Column } from '@druid-toolkit/query';
 import React, { useState } from 'react';
 
 import { columnToIcon } from '../../../../utils';
diff --git a/web-console/src/views/explore-view/components/control-pane/control-pane.tsx b/web-console/src/views/explore-view/components/control-pane/control-pane.tsx
index d93aefb634ab..5e7d5c0ec000 100644
--- a/web-console/src/views/explore-view/components/control-pane/control-pane.tsx
+++ b/web-console/src/views/explore-view/components/control-pane/control-pane.tsx
@@ -27,8 +27,8 @@ import {
   Tag,
 } from '@blueprintjs/core';
 import { IconNames } from '@blueprintjs/icons';
-import type { Column, SqlExpression } from 'druid-query-toolkit';
-import { SqlColumn } from 'druid-query-toolkit';
+import type { Column, SqlExpression } from '@druid-toolkit/query';
+import { SqlColumn } from '@druid-toolkit/query';
 import type { JSX } from 'react';
 
 import {
diff --git a/web-console/src/views/explore-view/components/control-pane/expression-menu.tsx b/web-console/src/views/explore-view/components/control-pane/expression-menu.tsx
index 5c6639929ca3..8742cbd46689 100644
--- a/web-console/src/views/explore-view/components/control-pane/expression-menu.tsx
+++ b/web-console/src/views/explore-view/components/control-pane/expression-menu.tsx
@@ -29,8 +29,8 @@ import {
   Position,
 } from '@blueprintjs/core';
 import { IconNames } from '@blueprintjs/icons';
-import type { Column } from 'druid-query-toolkit';
-import { SqlColumn, SqlExpression } from 'druid-query-toolkit';
+import type { Column } from '@druid-toolkit/query';
+import { SqlColumn, SqlExpression } from '@druid-toolkit/query';
 import { useState } from 'react';
 
 import { AppToaster } from '../../../../singletons';
diff --git a/web-console/src/views/explore-view/components/control-pane/measure-menu.tsx b/web-console/src/views/explore-view/components/control-pane/measure-menu.tsx
index 18c8a61e7bb9..4d841f352f5b 100644
--- a/web-console/src/views/explore-view/components/control-pane/measure-menu.tsx
+++ b/web-console/src/views/explore-view/components/control-pane/measure-menu.tsx
@@ -30,8 +30,8 @@ import {
   Position,
 } from '@blueprintjs/core';
 import { IconNames } from '@blueprintjs/icons';
-import type { Column } from 'druid-query-toolkit';
-import { SqlAlias, SqlExpression } from 'druid-query-toolkit';
+import type { Column } from '@druid-toolkit/query';
+import { SqlAlias, SqlExpression } from '@druid-toolkit/query';
 import { useState } from 'react';
 
 import { AppToaster } from '../../../../singletons';
diff --git a/web-console/src/views/explore-view/components/droppable-container/droppable-container.tsx b/web-console/src/views/explore-view/components/droppable-container/droppable-container.tsx
index 36c9ff979efe..eceb4e750ddf 100644
--- a/web-console/src/views/explore-view/components/droppable-container/droppable-container.tsx
+++ b/web-console/src/views/explore-view/components/droppable-container/droppable-container.tsx
@@ -16,8 +16,8 @@
  * limitations under the License.
  */
 
+import type { Column } from '@druid-toolkit/query';
 import classNames from 'classnames';
-import type { Column } from 'druid-query-toolkit';
 import type React from 'react';
 import { forwardRef, useState } from 'react';
 
diff --git a/web-console/src/views/explore-view/components/filter-pane/filter-menu/contains-filter-control/contains-filter-control.tsx b/web-console/src/views/explore-view/components/filter-pane/filter-menu/contains-filter-control/contains-filter-control.tsx
index fdf28d34b8d6..d2a9bcdd93eb 100644
--- a/web-console/src/views/explore-view/components/filter-pane/filter-menu/contains-filter-control/contains-filter-control.tsx
+++ b/web-console/src/views/explore-view/components/filter-pane/filter-menu/contains-filter-control/contains-filter-control.tsx
@@ -18,8 +18,8 @@
 
 import { FormGroup, InputGroup, Menu, MenuItem } from '@blueprintjs/core';
 import { IconNames } from '@blueprintjs/icons';
-import type { ContainsFilterPattern, QueryResult, SqlQuery } from 'druid-query-toolkit';
-import { C, F, filterPatternToExpression, SqlExpression } from 'druid-query-toolkit';
+import type { ContainsFilterPattern, QueryResult, SqlQuery } from '@druid-toolkit/query';
+import { C, F, filterPatternToExpression, SqlExpression } from '@druid-toolkit/query';
 import React, { useMemo } from 'react';
 
 import { useQueryManager } from '../../../../../../hooks';
diff --git a/web-console/src/views/explore-view/components/filter-pane/filter-menu/filter-menu.tsx b/web-console/src/views/explore-view/components/filter-pane/filter-menu/filter-menu.tsx
index f0b7f21346f0..8cbca7e8d53e 100644
--- a/web-console/src/views/explore-view/components/filter-pane/filter-menu/filter-menu.tsx
+++ b/web-console/src/views/explore-view/components/filter-pane/filter-menu/filter-menu.tsx
@@ -35,14 +35,14 @@ import type {
   FilterPatternType,
   QueryResult,
   SqlQuery,
-} from 'druid-query-toolkit';
+} from '@druid-toolkit/query';
 import {
   C,
   changeFilterPatternType,
   filterPatternToExpression,
   fitFilterPattern,
   SqlExpression,
-} from 'druid-query-toolkit';
+} from '@druid-toolkit/query';
 import type { JSX } from 'react';
 import React, { useState } from 'react';
 
diff --git a/web-console/src/views/explore-view/components/filter-pane/filter-menu/number-range-filter-control/number-range-filter-control.tsx b/web-console/src/views/explore-view/components/filter-pane/filter-menu/number-range-filter-control/number-range-filter-control.tsx
index d66e1ffcc414..eb5adc9c4a74 100644
--- a/web-console/src/views/explore-view/components/filter-pane/filter-menu/number-range-filter-control/number-range-filter-control.tsx
+++ b/web-console/src/views/explore-view/components/filter-pane/filter-menu/number-range-filter-control/number-range-filter-control.tsx
@@ -18,7 +18,7 @@
 
 import { Button, ControlGroup, FormGroup, NumericInput } from '@blueprintjs/core';
 import { IconNames } from '@blueprintjs/icons';
-import type { NumberRangeFilterPattern } from 'druid-query-toolkit';
+import type { NumberRangeFilterPattern } from '@druid-toolkit/query';
 import React from 'react';
 
 import type { QuerySource } from '../../../../models';
diff --git a/web-console/src/views/explore-view/components/filter-pane/filter-menu/regexp-filter-control/regexp-filter-control.tsx b/web-console/src/views/explore-view/components/filter-pane/filter-menu/regexp-filter-control/regexp-filter-control.tsx
index b2479bf7022a..3b86189558ae 100644
--- a/web-console/src/views/explore-view/components/filter-pane/filter-menu/regexp-filter-control/regexp-filter-control.tsx
+++ b/web-console/src/views/explore-view/components/filter-pane/filter-menu/regexp-filter-control/regexp-filter-control.tsx
@@ -18,8 +18,8 @@
 
 import { FormGroup, InputGroup, Menu, MenuItem } from '@blueprintjs/core';
 import { IconNames } from '@blueprintjs/icons';
-import type { QueryResult, RegexpFilterPattern, SqlQuery } from 'druid-query-toolkit';
-import { C, F, filterPatternToExpression, SqlExpression } from 'druid-query-toolkit';
+import type { QueryResult, RegexpFilterPattern, SqlQuery } from '@druid-toolkit/query';
+import { C, F, filterPatternToExpression, SqlExpression } from '@druid-toolkit/query';
 import React, { useMemo } from 'react';
 
 import { useQueryManager } from '../../../../../../hooks';
diff --git a/web-console/src/views/explore-view/components/filter-pane/filter-menu/time-interval-filter-control/time-interval-filter-control.tsx b/web-console/src/views/explore-view/components/filter-pane/filter-menu/time-interval-filter-control/time-interval-filter-control.tsx
index 9200ee9e07e1..acb21c309d2f 100644
--- a/web-console/src/views/explore-view/components/filter-pane/filter-menu/time-interval-filter-control/time-interval-filter-control.tsx
+++ b/web-console/src/views/explore-view/components/filter-pane/filter-menu/time-interval-filter-control/time-interval-filter-control.tsx
@@ -17,7 +17,7 @@
  */
 
 import { FormGroup } from '@blueprintjs/core';
-import type { TimeIntervalFilterPattern } from 'druid-query-toolkit';
+import type { TimeIntervalFilterPattern } from '@druid-toolkit/query';
 import React from 'react';
 
 import type { QuerySource } from '../../../../models';
diff --git a/web-console/src/views/explore-view/components/filter-pane/filter-menu/time-relative-filter-control/time-relative-filter-control.tsx b/web-console/src/views/explore-view/components/filter-pane/filter-menu/time-relative-filter-control/time-relative-filter-control.tsx
index 0854a75cd5ee..32687c0c1b5d 100644
--- a/web-console/src/views/explore-view/components/filter-pane/filter-menu/time-relative-filter-control/time-relative-filter-control.tsx
+++ b/web-console/src/views/explore-view/components/filter-pane/filter-menu/time-relative-filter-control/time-relative-filter-control.tsx
@@ -17,7 +17,7 @@
  */
 
 import { Button, ButtonGroup, FormGroup } from '@blueprintjs/core';
-import type { TimeRelativeFilterPattern } from 'druid-query-toolkit';
+import type { TimeRelativeFilterPattern } from '@druid-toolkit/query';
 import React from 'react';
 
 import type { QuerySource } from '../../../../models';
diff --git a/web-console/src/views/explore-view/components/filter-pane/filter-menu/values-filter-control/values-filter-control.tsx b/web-console/src/views/explore-view/components/filter-pane/filter-menu/values-filter-control/values-filter-control.tsx
index e19af96c2106..169f95a51433 100644
--- a/web-console/src/views/explore-view/components/filter-pane/filter-menu/values-filter-control/values-filter-control.tsx
+++ b/web-console/src/views/explore-view/components/filter-pane/filter-menu/values-filter-control/values-filter-control.tsx
@@ -18,8 +18,8 @@
 
 import { FormGroup, Menu, MenuItem } from '@blueprintjs/core';
 import { IconNames } from '@blueprintjs/icons';
-import type { QueryResult, SqlQuery, ValuesFilterPattern } from 'druid-query-toolkit';
-import { C, F, SqlExpression } from 'druid-query-toolkit';
+import type { QueryResult, SqlQuery, ValuesFilterPattern } from '@druid-toolkit/query';
+import { C, F, SqlExpression } from '@druid-toolkit/query';
 import React, { useMemo, useState } from 'react';
 
 import { ClearableInput } from '../../../../../../components';
diff --git a/web-console/src/views/explore-view/components/filter-pane/filter-pane.tsx b/web-console/src/views/explore-view/components/filter-pane/filter-pane.tsx
index 7314528bb7b2..9cc5ad3e6e79 100644
--- a/web-console/src/views/explore-view/components/filter-pane/filter-pane.tsx
+++ b/web-console/src/views/explore-view/components/filter-pane/filter-pane.tsx
@@ -18,15 +18,15 @@
 
 import { Button, Popover } from '@blueprintjs/core';
 import { IconNames } from '@blueprintjs/icons';
-import classNames from 'classnames';
 import type {
   Column,
   FilterPattern,
   QueryResult,
   SqlExpression,
   SqlQuery,
-} from 'druid-query-toolkit';
-import { filterPatternsToExpression, fitFilterPatterns } from 'druid-query-toolkit';
+} from '@druid-toolkit/query';
+import { filterPatternsToExpression, fitFilterPatterns } from '@druid-toolkit/query';
+import classNames from 'classnames';
 import { forwardRef, useImperativeHandle, useState } from 'react';
 
 import type { QuerySource } from '../../models';
diff --git a/web-console/src/views/explore-view/components/generic-output-table/generic-output-table.tsx b/web-console/src/views/explore-view/components/generic-output-table/generic-output-table.tsx
index a7ea7f1f1c6f..b557d99b4fde 100644
--- a/web-console/src/views/explore-view/components/generic-output-table/generic-output-table.tsx
+++ b/web-console/src/views/explore-view/components/generic-output-table/generic-output-table.tsx
@@ -19,9 +19,9 @@
 import { Button, Icon, Intent, Menu, MenuItem, Popover } from '@blueprintjs/core';
 import type { IconName } from '@blueprintjs/icons';
 import { IconNames } from '@blueprintjs/icons';
+import type { Column, QueryResult } from '@druid-toolkit/query';
+import { SqlColumn, SqlExpression, SqlLiteral, trimString } from '@druid-toolkit/query';
 import classNames from 'classnames';
-import type { Column, QueryResult } from 'druid-query-toolkit';
-import { SqlColumn, SqlExpression, SqlLiteral, trimString } from 'druid-query-toolkit';
 import type { JSX } from 'react';
 import React, { useEffect, useState } from 'react';
 import type { Column as TableColumn } from 'react-table';
diff --git a/web-console/src/views/explore-view/components/module-pane/module-pane.tsx b/web-console/src/views/explore-view/components/module-pane/module-pane.tsx
index 7155a7eff32a..b360effc87c1 100644
--- a/web-console/src/views/explore-view/components/module-pane/module-pane.tsx
+++ b/web-console/src/views/explore-view/components/module-pane/module-pane.tsx
@@ -17,12 +17,11 @@
  */
 
 import { ResizeSensor } from '@blueprintjs/core';
-import type { QueryResult, SqlExpression, SqlQuery } from 'druid-query-toolkit';
+import type { QueryResult, SqlExpression, SqlQuery } from '@druid-toolkit/query';
 import React, { useMemo, useState } from 'react';
 
-import { Stage } from '../../../../utils/stage';
 import type { ParameterDefinition, ParameterValues, QuerySource } from '../../models';
-import { effectiveParameterDefault } from '../../models';
+import { effectiveParameterDefault, Stage } from '../../models';
 import { ModuleRepository } from '../../module-repository/module-repository';
 import { Issue } from '../issue/issue';
 
diff --git a/web-console/src/views/explore-view/components/preview-pane/preview-pane.tsx b/web-console/src/views/explore-view/components/preview-pane/preview-pane.tsx
index 41bfd4bd14ac..b0d49128e740 100644
--- a/web-console/src/views/explore-view/components/preview-pane/preview-pane.tsx
+++ b/web-console/src/views/explore-view/components/preview-pane/preview-pane.tsx
@@ -17,8 +17,8 @@
  */
 
 import { Callout } from '@blueprintjs/core';
+import type { QueryResult, SqlQuery } from '@druid-toolkit/query';
 import classNames from 'classnames';
-import type { QueryResult, SqlQuery } from 'druid-query-toolkit';
 import React from 'react';
 
 import { useQueryManager } from '../../../../hooks';
diff --git a/web-console/src/views/explore-view/components/resource-pane/column-dialog/column-dialog.tsx b/web-console/src/views/explore-view/components/resource-pane/column-dialog/column-dialog.tsx
index d220106ec76b..d11210bf2842 100644
--- a/web-console/src/views/explore-view/components/resource-pane/column-dialog/column-dialog.tsx
+++ b/web-console/src/views/explore-view/components/resource-pane/column-dialog/column-dialog.tsx
@@ -17,8 +17,8 @@
  */
 
 import { Button, Classes, Dialog, FormGroup, InputGroup, Intent, Tag } from '@blueprintjs/core';
-import type { QueryResult, SqlQuery } from 'druid-query-toolkit';
-import { F, sql, SqlExpression } from 'druid-query-toolkit';
+import type { QueryResult, SqlQuery } from '@druid-toolkit/query';
+import { F, sql, SqlExpression } from '@druid-toolkit/query';
 import React, { useMemo, useState } from 'react';
 
 import { AppToaster } from '../../../../../singletons';
diff --git a/web-console/src/views/explore-view/components/resource-pane/measure-dialog/measure-dialog.tsx b/web-console/src/views/explore-view/components/resource-pane/measure-dialog/measure-dialog.tsx
index 308e2563ebf0..4d56d1b3aab4 100644
--- a/web-console/src/views/explore-view/components/resource-pane/measure-dialog/measure-dialog.tsx
+++ b/web-console/src/views/explore-view/components/resource-pane/measure-dialog/measure-dialog.tsx
@@ -24,7 +24,7 @@ import {
   SqlExpression,
   SqlQuery,
   SqlWithPart,
-} from 'druid-query-toolkit';
+} from '@druid-toolkit/query';
 import React, { useMemo, useState } from 'react';
 
 import { AppToaster } from '../../../../../singletons';
diff --git a/web-console/src/views/explore-view/components/resource-pane/nested-column-dialog/nested-column-dialog.tsx b/web-console/src/views/explore-view/components/resource-pane/nested-column-dialog/nested-column-dialog.tsx
index 4103dc35bb2a..5cd057ead2fd 100644
--- a/web-console/src/views/explore-view/components/resource-pane/nested-column-dialog/nested-column-dialog.tsx
+++ b/web-console/src/views/explore-view/components/resource-pane/nested-column-dialog/nested-column-dialog.tsx
@@ -27,8 +27,8 @@ import {
   Menu,
   Tag,
 } from '@blueprintjs/core';
-import type { QueryResult, SqlExpression, SqlQuery } from 'druid-query-toolkit';
-import { F, sql, SqlFunction } from 'druid-query-toolkit';
+import type { QueryResult, SqlExpression, SqlQuery } from '@druid-toolkit/query';
+import { F, sql, SqlFunction } from '@druid-toolkit/query';
 import React, { useState } from 'react';
 
 import { ClearableInput, Loader, MenuCheckbox } from '../../../../../components';
diff --git a/web-console/src/views/explore-view/components/resource-pane/resource-pane.tsx b/web-console/src/views/explore-view/components/resource-pane/resource-pane.tsx
index dda84fdbf05f..09eaa96fea7d 100644
--- a/web-console/src/views/explore-view/components/resource-pane/resource-pane.tsx
+++ b/web-console/src/views/explore-view/components/resource-pane/resource-pane.tsx
@@ -28,8 +28,8 @@ import {
   Popover,
 } from '@blueprintjs/core';
 import { IconNames } from '@blueprintjs/icons';
+import type { Column, QueryResult, SqlExpression, SqlQuery } from '@druid-toolkit/query';
 import classNames from 'classnames';
-import type { Column, QueryResult, SqlExpression, SqlQuery } from 'druid-query-toolkit';
 import { useState } from 'react';
 
 import { ClearableInput } from '../../../../components';
diff --git a/web-console/src/views/explore-view/components/source-pane/source-pane.tsx b/web-console/src/views/explore-view/components/source-pane/source-pane.tsx
index fc0a2688cee4..c97f736d9bc7 100644
--- a/web-console/src/views/explore-view/components/source-pane/source-pane.tsx
+++ b/web-console/src/views/explore-view/components/source-pane/source-pane.tsx
@@ -18,7 +18,7 @@
 
 import { Button, Menu, MenuDivider, MenuItem, Popover, Position } from '@blueprintjs/core';
 import { IconNames } from '@blueprintjs/icons';
-import { SqlQuery, SqlTable } from 'druid-query-toolkit';
+import { SqlQuery, SqlTable } from '@druid-toolkit/query';
 import type { JSX } from 'react';
 import React from 'react';
 
@@ -53,8 +53,8 @@ export interface SourcePaneProps {
 export const SourcePane = React.memo(function SourcePane(props: SourcePaneProps) {
   const { selectedSource, onSelectTable, onShowSourceQuery, fill, minimal, disabled } = props;
 
-  const [tables] = useQueryManager<null, string[]>({
-    initQuery: null,
+  const [tables] = useQueryManager<string, string[]>({
+    initQuery: '',
     processQuery: async () => {
       const tables = await queryDruidSql<{ TABLE_NAME: string }>({
         query: `SELECT TABLE_NAME FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_TYPE = 'TABLE'`,
diff --git a/web-console/src/views/explore-view/components/sql-input/sql-input.tsx b/web-console/src/views/explore-view/components/sql-input/sql-input.tsx
index 4347d0962d9d..80534d36d6b3 100644
--- a/web-console/src/views/explore-view/components/sql-input/sql-input.tsx
+++ b/web-console/src/views/explore-view/components/sql-input/sql-input.tsx
@@ -16,10 +16,10 @@
  * limitations under the License.
  */
 
+import type { Column } from '@druid-toolkit/query';
+import { C } from '@druid-toolkit/query';
 import type { Ace } from 'ace-builds';
 import ace from 'ace-builds';
-import type { Column } from 'druid-query-toolkit';
-import { C } from 'druid-query-toolkit';
 import React from 'react';
 import AceEditor from 'react-ace';
 
diff --git a/web-console/src/views/explore-view/drag-helper.ts b/web-console/src/views/explore-view/drag-helper.ts
index 82b247e70872..a9e1188e9898 100644
--- a/web-console/src/views/explore-view/drag-helper.ts
+++ b/web-console/src/views/explore-view/drag-helper.ts
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-import type { Column } from 'druid-query-toolkit';
+import type { Column } from '@druid-toolkit/query';
 
 import type { Measure } from './models';
 
diff --git a/web-console/src/views/explore-view/explore-state.ts b/web-console/src/views/explore-view/explore-state.ts
index a5faba0a26f4..07a53d6de702 100644
--- a/web-console/src/views/explore-view/explore-state.ts
+++ b/web-console/src/views/explore-view/explore-state.ts
@@ -16,13 +16,13 @@
  * limitations under the License.
  */
 
-import type { Column } from 'druid-query-toolkit';
+import type { Column } from '@druid-toolkit/query';
 import {
   filterPatternToExpression,
   SqlExpression,
   SqlLiteral,
   SqlQuery,
-} from 'druid-query-toolkit';
+} from '@druid-toolkit/query';
 
 import { isEmpty } from '../../utils';
 
diff --git a/web-console/src/views/explore-view/explore-view.tsx b/web-console/src/views/explore-view/explore-view.tsx
index 21c98b067fa8..91e7b91306b0 100644
--- a/web-console/src/views/explore-view/explore-view.tsx
+++ b/web-console/src/views/explore-view/explore-view.tsx
@@ -20,11 +20,11 @@ import './modules';
 
 import { Button, Intent, Menu, MenuDivider, MenuItem } from '@blueprintjs/core';
 import { IconNames } from '@blueprintjs/icons';
+import type { Column, QueryResult, SqlExpression } from '@druid-toolkit/query';
+import { QueryRunner, SqlQuery } from '@druid-toolkit/query';
 import type { CancelToken } from 'axios';
 import classNames from 'classnames';
 import copy from 'copy-to-clipboard';
-import type { Column, QueryResult, SqlExpression } from 'druid-query-toolkit';
-import { QueryRunner, SqlQuery } from 'druid-query-toolkit';
 import React, { useEffect, useMemo, useRef, useState } from 'react';
 import { useStore } from 'zustand';
 
diff --git a/web-console/src/views/explore-view/models/expression-meta.ts b/web-console/src/views/explore-view/models/expression-meta.ts
index ac8e07aa8a32..7bdb00de6e89 100644
--- a/web-console/src/views/explore-view/models/expression-meta.ts
+++ b/web-console/src/views/explore-view/models/expression-meta.ts
@@ -16,8 +16,8 @@
  * limitations under the License.
  */
 
-import type { Column } from 'druid-query-toolkit';
-import { C, filterMap, SqlColumn, SqlExpression } from 'druid-query-toolkit';
+import type { Column } from '@druid-toolkit/query';
+import { C, filterMap, SqlColumn, SqlExpression } from '@druid-toolkit/query';
 
 import { renameColumnsInExpression } from '../utils';
 
diff --git a/web-console/src/views/explore-view/models/index.ts b/web-console/src/views/explore-view/models/index.ts
index 8938818acc20..1e3c58ea09fb 100644
--- a/web-console/src/views/explore-view/models/index.ts
+++ b/web-console/src/views/explore-view/models/index.ts
@@ -22,3 +22,4 @@ export * from './measure';
 export * from './measure-pattern';
 export * from './parameter';
 export * from './query-source';
+export * from './stage';
diff --git a/web-console/src/views/explore-view/models/measure-pattern.ts b/web-console/src/views/explore-view/models/measure-pattern.ts
index cd2998c4d841..fd0d567440cc 100644
--- a/web-console/src/views/explore-view/models/measure-pattern.ts
+++ b/web-console/src/views/explore-view/models/measure-pattern.ts
@@ -16,8 +16,8 @@
  * limitations under the License.
  */
 
-import type { Column, SqlExpression } from 'druid-query-toolkit';
-import { C, F, SqlColumn, SqlFunction, SqlStar } from 'druid-query-toolkit';
+import type { Column, SqlExpression } from '@druid-toolkit/query';
+import { C, F, SqlColumn, SqlFunction, SqlStar } from '@druid-toolkit/query';
 
 import { capitalizeFirst } from '../../../utils';
 
diff --git a/web-console/src/views/explore-view/models/measure.ts b/web-console/src/views/explore-view/models/measure.ts
index a3aadab89b67..018f11bbcc11 100644
--- a/web-console/src/views/explore-view/models/measure.ts
+++ b/web-console/src/views/explore-view/models/measure.ts
@@ -16,8 +16,8 @@
  * limitations under the License.
  */
 
-import type { Column, SqlBase, SqlQuery } from 'druid-query-toolkit';
-import { C, F, filterMap, L, SqlAlias, SqlExpression, SqlFunction } from 'druid-query-toolkit';
+import type { Column, SqlBase, SqlQuery } from '@druid-toolkit/query';
+import { C, F, filterMap, L, SqlAlias, SqlExpression, SqlFunction } from '@druid-toolkit/query';
 
 import { uniq } from '../../../utils';
 
diff --git a/web-console/src/views/explore-view/models/query-source.ts b/web-console/src/views/explore-view/models/query-source.ts
index 24c4021d94c4..6c6f42c78053 100644
--- a/web-console/src/views/explore-view/models/query-source.ts
+++ b/web-console/src/views/explore-view/models/query-source.ts
@@ -16,8 +16,8 @@
  * limitations under the License.
  */
 
-import type { Column } from 'druid-query-toolkit';
-import { C, F, SqlColumn, SqlExpression, SqlQuery, SqlStar } from 'druid-query-toolkit';
+import type { Column } from '@druid-toolkit/query';
+import { C, F, SqlColumn, SqlExpression, SqlQuery, SqlStar } from '@druid-toolkit/query';
 
 import { filterMap, mapRecordIfChanged } from '../../../utils';
 
diff --git a/web-console/src/utils/stage.ts b/web-console/src/views/explore-view/models/stage.ts
similarity index 80%
rename from web-console/src/utils/stage.ts
rename to web-console/src/views/explore-view/models/stage.ts
index 7b65cfebd9cb..a1d01258f0a2 100644
--- a/web-console/src/utils/stage.ts
+++ b/web-console/src/views/explore-view/models/stage.ts
@@ -16,13 +16,6 @@
  * limitations under the License.
  */
 
-export interface Margin {
-  top: number;
-  right: number;
-  bottom: number;
-  left: number;
-}
-
 export class Stage {
   public readonly width: number;
   public readonly height: number;
@@ -35,11 +28,4 @@ export class Stage {
   public equals(other: Stage | undefined): boolean {
     return Boolean(other && this.width === other.width && this.height === other.height);
   }
-
-  public applyMargin(margin: Margin): Stage {
-    return new Stage(
-      this.width - margin.left - margin.right,
-      this.height - margin.top - margin.bottom,
-    );
-  }
 }
diff --git a/web-console/src/views/explore-view/module-repository/module-repository.ts b/web-console/src/views/explore-view/module-repository/module-repository.ts
index 5f82dbc6dfe1..d050a2779c51 100644
--- a/web-console/src/views/explore-view/module-repository/module-repository.ts
+++ b/web-console/src/views/explore-view/module-repository/module-repository.ts
@@ -17,11 +17,10 @@
  */
 
 import type { IconName } from '@blueprintjs/icons';
+import type { QueryResult, SqlExpression, SqlQuery } from '@druid-toolkit/query';
 import type { CancelToken } from 'axios';
-import type { QueryResult, SqlExpression, SqlQuery } from 'druid-query-toolkit';
 
-import type { Stage } from '../../../utils/stage';
-import type { ParameterDefinition, QuerySource } from '../models';
+import type { ParameterDefinition, QuerySource, Stage } from '../models';
 
 interface ModuleDefinition<P> {
   id: string;
diff --git a/web-console/src/views/explore-view/modules/bar-chart-module.tsx b/web-console/src/views/explore-view/modules/bar-chart-module.tsx
index 34af0404ee6c..0ff203c70519 100644
--- a/web-console/src/views/explore-view/modules/bar-chart-module.tsx
+++ b/web-console/src/views/explore-view/modules/bar-chart-module.tsx
@@ -17,7 +17,7 @@
  */
 
 import { IconNames } from '@blueprintjs/icons';
-import { L } from 'druid-query-toolkit';
+import { L } from '@druid-toolkit/query';
 import type { ECharts } from 'echarts';
 import * as echarts from 'echarts';
 import { useEffect, useMemo, useRef } from 'react';
diff --git a/web-console/src/views/explore-view/modules/grouping-table-module.tsx b/web-console/src/views/explore-view/modules/grouping-table-module.tsx
index 81e7d1924799..5cb5650c94e0 100644
--- a/web-console/src/views/explore-view/modules/grouping-table-module.tsx
+++ b/web-console/src/views/explore-view/modules/grouping-table-module.tsx
@@ -18,8 +18,8 @@
 
 import { Button } from '@blueprintjs/core';
 import { IconNames } from '@blueprintjs/icons';
-import type { SqlExpression, SqlOrderByDirection, SqlQuery } from 'druid-query-toolkit';
-import { C, F } from 'druid-query-toolkit';
+import type { SqlExpression, SqlOrderByDirection, SqlQuery } from '@druid-toolkit/query';
+import { C, F } from '@druid-toolkit/query';
 import { useMemo } from 'react';
 
 import { Loader } from '../../../components';
diff --git a/web-console/src/views/explore-view/modules/multi-axis-chart-module.tsx b/web-console/src/views/explore-view/modules/multi-axis-chart-module.tsx
index 3c3f4c48e646..e5f2fb47f9a5 100644
--- a/web-console/src/views/explore-view/modules/multi-axis-chart-module.tsx
+++ b/web-console/src/views/explore-view/modules/multi-axis-chart-module.tsx
@@ -17,8 +17,8 @@
  */
 
 import { IconNames } from '@blueprintjs/icons';
-import type { SqlQuery } from 'druid-query-toolkit';
-import { C, F, L } from 'druid-query-toolkit';
+import type { SqlQuery } from '@druid-toolkit/query';
+import { C, F, L } from '@druid-toolkit/query';
 import type { ECharts } from 'echarts';
 import * as echarts from 'echarts';
 import { useEffect, useMemo, useRef } from 'react';
@@ -26,7 +26,6 @@ import { useEffect, useMemo, useRef } from 'react';
 import { Loader } from '../../../components';
 import { useQueryManager } from '../../../hooks';
 import {
-  Duration,
   formatInteger,
   formatNumber,
   prettyFormatIsoDateTick,
@@ -36,7 +35,7 @@ import { Issue } from '../components';
 import { highlightStore } from '../highlight-store/highlight-store';
 import type { ExpressionMeta } from '../models';
 import { ModuleRepository } from '../module-repository/module-repository';
-import { DATE_FORMAT, getAutoGranularity } from '../utils';
+import { DATE_FORMAT, getAutoGranularity, snapToGranularity } from '../utils';
 
 import './record-table-module.scss';
 
@@ -224,9 +223,12 @@ ModuleRepository.registerModule<MultiAxisChartParameterValues>({
         // this is only used for the label and the data saved in the highlight
         // the positioning is done with the true coordinates until the user
         // releases the mouse button (in the `brushend` event)
-        const duration = new Duration(timeGranularity);
-        const start = duration.round(params.areas[0].coordRange[0], 'Etc/UTC');
-        const end = duration.round(params.areas[0].coordRange[1], 'Etc/UTC');
+        const { start, end } = snapToGranularity(
+          params.areas[0].coordRange[0],
+          params.areas[0].coordRange[1],
+          timeGranularity,
+          undefined, // context.timezone,
+        );
 
         const x0 = myChart.convertToPixel({ xAxisIndex: 0 }, params.areas[0].coordRange[0]);
         const x1 = myChart.convertToPixel({ xAxisIndex: 0 }, params.areas[0].coordRange[1]);
diff --git a/web-console/src/views/explore-view/modules/pie-chart-module.tsx b/web-console/src/views/explore-view/modules/pie-chart-module.tsx
index d90dfbeae606..80ff41b0f348 100644
--- a/web-console/src/views/explore-view/modules/pie-chart-module.tsx
+++ b/web-console/src/views/explore-view/modules/pie-chart-module.tsx
@@ -17,7 +17,7 @@
  */
 
 import { IconNames } from '@blueprintjs/icons';
-import { C, L } from 'druid-query-toolkit';
+import { C, L } from '@druid-toolkit/query';
 import type { ECharts } from 'echarts';
 import * as echarts from 'echarts';
 import { useEffect, useMemo, useRef } from 'react';
diff --git a/web-console/src/views/explore-view/modules/record-table-module.tsx b/web-console/src/views/explore-view/modules/record-table-module.tsx
index d7a812e4c167..37c6483f7841 100644
--- a/web-console/src/views/explore-view/modules/record-table-module.tsx
+++ b/web-console/src/views/explore-view/modules/record-table-module.tsx
@@ -17,7 +17,7 @@
  */
 
 import { IconNames } from '@blueprintjs/icons';
-import { C, SqlQuery } from 'druid-query-toolkit';
+import { C, SqlQuery } from '@druid-toolkit/query';
 import { useMemo } from 'react';
 
 import { Loader } from '../../../components';
diff --git a/web-console/src/views/explore-view/modules/time-chart-module.tsx b/web-console/src/views/explore-view/modules/time-chart-module.tsx
index a07455b547a5..1c19963b1ed5 100644
--- a/web-console/src/views/explore-view/modules/time-chart-module.tsx
+++ b/web-console/src/views/explore-view/modules/time-chart-module.tsx
@@ -17,7 +17,7 @@
  */
 
 import { IconNames } from '@blueprintjs/icons';
-import { C, F, L, SqlCase } from 'druid-query-toolkit';
+import { C, F, L, SqlCase } from '@druid-toolkit/query';
 import type { ECharts } from 'echarts';
 import * as echarts from 'echarts';
 import { useEffect, useMemo, useRef } from 'react';
@@ -25,7 +25,6 @@ import { useEffect, useMemo, useRef } from 'react';
 import { Loader } from '../../../components';
 import { useQueryManager } from '../../../hooks';
 import {
-  Duration,
   formatInteger,
   formatNumber,
   prettyFormatIsoDateTick,
@@ -35,7 +34,7 @@ import { Issue } from '../components';
 import { highlightStore } from '../highlight-store/highlight-store';
 import type { ExpressionMeta } from '../models';
 import { ModuleRepository } from '../module-repository/module-repository';
-import { DATE_FORMAT, getAutoGranularity } from '../utils';
+import { DATE_FORMAT, getAutoGranularity, snapToGranularity } from '../utils';
 
 import './record-table-module.scss';
 
@@ -296,13 +295,13 @@ ModuleRepository.registerModule<TimeChartParameterValues>({
         // this is only used for the label and the data saved in the highlight
         // the positioning is done with the true coordinates until the user
         // releases the mouse button (in the `brushend` event)
-        let start = params.areas[0].coordRange[0];
-        let end = params.areas[0].coordRange[1];
-        if (snappyHighlight) {
-          const duration = new Duration(timeGranularity);
-          start = duration.round(start, 'Etc/UTC');
-          end = duration.round(end, 'Etc/UTC');
-        }
+        const { start, end } = snappyHighlight
+          ? snapToGranularity(
+              params.areas[0].coordRange[0],
+              params.areas[0].coordRange[1],
+              timeGranularity,
+            )
+          : { start: params.areas[0].coordRange[0], end: params.areas[0].coordRange[1] };
 
         const x0 = myChart.convertToPixel({ xAxisIndex: 0 }, params.areas[0].coordRange[0]);
         const x1 = myChart.convertToPixel({ xAxisIndex: 0 }, params.areas[0].coordRange[1]);
diff --git a/web-console/src/views/explore-view/query-macros/aggregate.spec.ts b/web-console/src/views/explore-view/query-macros/aggregate.spec.ts
index 7cf58bfd716e..c0d7629031e7 100644
--- a/web-console/src/views/explore-view/query-macros/aggregate.spec.ts
+++ b/web-console/src/views/explore-view/query-macros/aggregate.spec.ts
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-import { sane, SqlQuery } from 'druid-query-toolkit';
+import { sane, SqlQuery } from '@druid-toolkit/query';
 
 import { Measure } from '../models';
 
diff --git a/web-console/src/views/explore-view/query-macros/aggregate.ts b/web-console/src/views/explore-view/query-macros/aggregate.ts
index 18c58929eea5..9af7e79ebe25 100644
--- a/web-console/src/views/explore-view/query-macros/aggregate.ts
+++ b/web-console/src/views/explore-view/query-macros/aggregate.ts
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-import { C, SqlFunction, SqlQuery } from 'druid-query-toolkit';
+import { C, SqlFunction, SqlQuery } from '@druid-toolkit/query';
 
 import { filterMap, uniq } from '../../../utils';
 import { Measure } from '../models';
diff --git a/web-console/src/views/explore-view/query-macros/max-data-time.ts b/web-console/src/views/explore-view/query-macros/max-data-time.ts
index d689d0a8386f..c6cc409a1001 100644
--- a/web-console/src/views/explore-view/query-macros/max-data-time.ts
+++ b/web-console/src/views/explore-view/query-macros/max-data-time.ts
@@ -16,8 +16,8 @@
  * limitations under the License.
  */
 
-import type { SqlQuery } from 'druid-query-toolkit';
-import { L, SqlFunction } from 'druid-query-toolkit';
+import type { SqlQuery } from '@druid-toolkit/query';
+import { L, SqlFunction } from '@druid-toolkit/query';
 
 import { getMaxTimeForTable } from '../utils';
 
diff --git a/web-console/src/views/explore-view/utils/duration.spec.ts b/web-console/src/views/explore-view/utils/duration.spec.ts
new file mode 100644
index 000000000000..0d7e0473131a
--- /dev/null
+++ b/web-console/src/views/explore-view/utils/duration.spec.ts
@@ -0,0 +1,39 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { formatDuration } from './duration';
+
+describe('formatDuration', () => {
+  it('works with 0', () => {
+    expect(formatDuration('PT0S')).toEqual('0 seconds');
+  });
+
+  it('works with single span', () => {
+    expect(formatDuration('P1D')).toEqual('1 day');
+    expect(formatDuration('PT1M')).toEqual('1 minute');
+  });
+
+  it('works with single span (compact)', () => {
+    expect(formatDuration('PT1M', true)).toEqual('minute');
+  });
+
+  it('works with multiple spans', () => {
+    expect(formatDuration('PT2H30M15S')).toEqual('2 hours, 30 minutes, 15 seconds');
+    expect(formatDuration('PT2H30M15S', true)).toEqual('2 hours, 30 minutes, 15 seconds');
+  });
+});
diff --git a/web-console/src/views/explore-view/utils/duration.ts b/web-console/src/views/explore-view/utils/duration.ts
new file mode 100644
index 000000000000..621aa0a57a0f
--- /dev/null
+++ b/web-console/src/views/explore-view/utils/duration.ts
@@ -0,0 +1,46 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { sum } from 'd3-array';
+
+import { filterMap, pluralIfNeeded } from '../../../utils';
+
+const SPANS = ['year', 'month', 'day', 'hour', 'minute', 'second'];
+
+export function formatDuration(duration: string, preferCompact = false): string {
+  // Regular expressions to match ISO 8601 duration parts
+  const regex = /P(?:(\d+)Y)?(?:(\d+)M)?(?:(\d+)D)?(?:T(?:(\d+)H)?(?:(\d+)M)?(?:(\d+)S)?)?/;
+  const matches = regex.exec(duration);
+  if (!matches) return duration;
+
+  // Extract the relevant parts
+  const counts = SPANS.map((_, i) => parseInt(matches[i + 1] || '0', 10));
+
+  // Construct the human-readable format based on the parsed values
+  let parts: string[];
+  if (preferCompact && sum(counts) === 1) {
+    parts = filterMap(SPANS, (span, i) => (counts[i] ? span : undefined));
+  } else {
+    parts = filterMap(SPANS, (span, i) =>
+      counts[i] ? pluralIfNeeded(counts[i], span) : undefined,
+    );
+  }
+
+  // Join the parts with commas, and return the result
+  return parts.length > 0 ? parts.join(', ') : '0 seconds';
+}
diff --git a/web-console/src/views/explore-view/utils/filter-pattern-helpers.ts b/web-console/src/views/explore-view/utils/filter-pattern-helpers.ts
index faf643aef578..6b2245dbd38e 100644
--- a/web-console/src/views/explore-view/utils/filter-pattern-helpers.ts
+++ b/web-console/src/views/explore-view/utils/filter-pattern-helpers.ts
@@ -16,11 +16,10 @@
  * limitations under the License.
  */
 
-import type { Column, FilterPattern } from 'druid-query-toolkit';
-
-import { Duration } from '../../../utils';
+import type { Column, FilterPattern } from '@druid-toolkit/query';
 
 import { DATE_FORMAT } from './date-format';
+import { formatDuration } from './duration';
 
 const TIME_RELATIVE_TYPES: Record<string, string> = {
   'maxDataTime/': 'latest',
@@ -83,9 +82,10 @@ export function formatPatternWithoutNegation(pattern: FilterPattern): string {
 
     case 'timeRelative': {
       const type = TIME_RELATIVE_TYPES[`${pattern.anchor}/${pattern.alignType || ''}`];
-      return `${pattern.column} in ${type ? `${type} ` : ''}${new Duration(
+      return `${pattern.column} in ${type ? `${type} ` : ''}${formatDuration(
         pattern.rangeDuration,
-      ).getDescription()}`;
+        true,
+      )}`;
     }
 
     case 'numberRange':
diff --git a/web-console/src/views/explore-view/utils/general.ts b/web-console/src/views/explore-view/utils/general.ts
index b6151306a94a..186619593cce 100644
--- a/web-console/src/views/explore-view/utils/general.ts
+++ b/web-console/src/views/explore-view/utils/general.ts
@@ -16,8 +16,8 @@
  * limitations under the License.
  */
 
-import type { SqlExpression } from 'druid-query-toolkit';
-import { SqlColumn } from 'druid-query-toolkit';
+import type { SqlExpression } from '@druid-toolkit/query';
+import { SqlColumn } from '@druid-toolkit/query';
 
 export function addTableScope(expression: SqlExpression, newTableScope: string): SqlExpression {
   return expression.walk(ex => {
diff --git a/web-console/src/views/explore-view/utils/get-auto-granularity.ts b/web-console/src/views/explore-view/utils/get-auto-granularity.ts
index 64acd5002487..f8928f3b86be 100644
--- a/web-console/src/views/explore-view/utils/get-auto-granularity.ts
+++ b/web-console/src/views/explore-view/utils/get-auto-granularity.ts
@@ -16,48 +16,67 @@
  * limitations under the License.
  */
 
-import type { SqlExpression } from 'druid-query-toolkit';
-import { fitFilterPatterns } from 'druid-query-toolkit';
+import type { SqlExpression } from '@druid-toolkit/query';
+import { fitFilterPattern, SqlMulti } from '@druid-toolkit/query';
+import { day, Duration, hour } from 'chronoshift';
 
-import { Duration } from '../../../utils';
-
-function getTimeSpanInExpression(
+function getCanonicalDuration(
   expression: SqlExpression,
   timeColumnName: string,
 ): number | undefined {
-  const patterns = fitFilterPatterns(expression);
-  for (const pattern of patterns) {
-    if (pattern.type === 'timeInterval' && pattern.column === timeColumnName) {
+  const pattern = fitFilterPattern(expression);
+  if ('column' in pattern && pattern.column !== timeColumnName) return undefined;
+
+  switch (pattern.type) {
+    case 'timeInterval':
       return pattern.end.valueOf() - pattern.start.valueOf();
-    } else if (pattern.type === 'timeRelative' && pattern.column === timeColumnName) {
-      return new Duration(pattern.rangeDuration).getCanonicalLength();
-    }
+
+    case 'timeRelative':
+      return Duration.fromJS(pattern.rangeDuration).getCanonicalLength();
+
+    case 'custom':
+      if (pattern.expression instanceof SqlMulti) {
+        for (const value of pattern.expression.args.values) {
+          const canonicalDuration = getCanonicalDuration(value, timeColumnName);
+          if (canonicalDuration !== undefined) return canonicalDuration;
+        }
+      }
+
+      break;
+
+    default:
+      break;
   }
 
-  return;
+  return undefined;
 }
 
+const DEFAULT_GRANULARITY = 'PT1H';
+
+/**
+ * Computes the granularity string from a where clause. If the where clause is TRUE, the default
+ * granularity is returned (PT1H). Otherwise, the granularity is computed from the time column and the
+ * duration of the where clause.
+ *
+ * @param where the where SQLExpression to read from
+ * @param timeColumnName the name of the time column (any other time column will be ignored)
+ * @returns the granularity string (default is PT1H)
+ */
 export function getAutoGranularity(where: SqlExpression, timeColumnName: string): string {
-  const timeSpan = getTimeSpanInExpression(where, timeColumnName);
-  if (!timeSpan) return 'P1D';
-  return Duration.pickSmallestGranularityThatFits(
-    [
-      'PT1S',
-      'PT5S',
-      'PT20S',
-      'PT1M',
-      'PT5M',
-      'PT20M',
-      'PT1H',
-      'PT3H',
-      'PT6H',
-      'P1D',
-      'P1W',
-      'P1M',
-      'P3M',
-      'P1Y',
-    ].map(s => new Duration(s)),
-    timeSpan,
-    200,
-  ).toString();
+  if (where.toString() === 'TRUE') return DEFAULT_GRANULARITY;
+
+  const canonicalDuration = getCanonicalDuration(where, timeColumnName);
+
+  if (canonicalDuration) {
+    if (canonicalDuration > day.canonicalLength * 95) return 'P1W';
+    if (canonicalDuration > day.canonicalLength * 8) return 'P1D';
+    if (canonicalDuration > hour.canonicalLength * 8) return 'PT1H';
+    if (canonicalDuration > hour.canonicalLength * 3) return 'PT5M';
+
+    return 'PT1M';
+  }
+
+  console.debug('Unable to determine granularity from where clause', where.toString());
+
+  return DEFAULT_GRANULARITY;
 }
diff --git a/web-console/src/views/explore-view/utils/index.ts b/web-console/src/views/explore-view/utils/index.ts
index 57c72e2c0e7e..8469c83b9279 100644
--- a/web-console/src/views/explore-view/utils/index.ts
+++ b/web-console/src/views/explore-view/utils/index.ts
@@ -17,6 +17,7 @@
  */
 
 export * from './date-format';
+export * from './duration';
 export * from './filter-pattern-helpers';
 export * from './general';
 export * from './get-auto-granularity';
@@ -24,5 +25,6 @@ export * from './known-aggregations';
 export * from './max-time-for-table';
 export * from './misc';
 export * from './query-log';
+export * from './snap-to-granularity';
 export * from './table-query';
 export * from './time-manipulation';
diff --git a/web-console/src/views/explore-view/utils/max-time-for-table.ts b/web-console/src/views/explore-view/utils/max-time-for-table.ts
index 8ec4e6d16bbd..b93dea9adf39 100644
--- a/web-console/src/views/explore-view/utils/max-time-for-table.ts
+++ b/web-console/src/views/explore-view/utils/max-time-for-table.ts
@@ -17,7 +17,7 @@
  */
 
 // micro-cache
-import { sql, T } from 'druid-query-toolkit';
+import { sql, T } from '@druid-toolkit/query';
 
 import { deepGet, queryDruidSql } from '../../../utils';
 
diff --git a/web-console/src/views/explore-view/utils/snap-to-granularity.ts b/web-console/src/views/explore-view/utils/snap-to-granularity.ts
new file mode 100644
index 000000000000..15b0cce03518
--- /dev/null
+++ b/web-console/src/views/explore-view/utils/snap-to-granularity.ts
@@ -0,0 +1,57 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { Duration, Timezone } from 'chronoshift';
+
+/**
+ * Will try to snap start and end to the closest available dates, given the granularity.
+ *
+ * @param start the start date
+ * @param end the end date
+ * @param granularity the granularity
+ * @param timezone the timezone
+ * @returns an object with the start and end dates snapped to the given granularity
+ */
+export function snapToGranularity(
+  start: Date,
+  end: Date,
+  granularity: string,
+  timezone?: string,
+): { start: Date; end: Date } {
+  const tz = Timezone.fromJS(timezone || 'Etc/UTC');
+  const duration = Duration.fromJS(granularity);
+
+  // get closest to start
+  const flooredStart = duration.floor(start, tz);
+  const ceiledStart = duration.shift(flooredStart, tz, 1);
+  const distanceToFlooredStart = Math.abs(start.valueOf() - flooredStart.valueOf());
+  const distanceToCeiledStart = Math.abs(start.valueOf() - ceiledStart.valueOf());
+  const closestStart = distanceToFlooredStart < distanceToCeiledStart ? flooredStart : ceiledStart;
+
+  // get closest to end
+  const flooredEnd = duration.floor(end, tz);
+  const ceiledEnd = duration.shift(flooredEnd, tz, 1);
+  const distanceToFlooredEnd = Math.abs(end.valueOf() - flooredEnd.valueOf());
+  const distanceToCeiledEnd = Math.abs(end.valueOf() - ceiledEnd.valueOf());
+  const closestEnd = distanceToFlooredEnd < distanceToCeiledEnd ? flooredEnd : ceiledEnd;
+
+  return {
+    start: closestStart,
+    end: closestEnd,
+  };
+}
diff --git a/web-console/src/views/explore-view/utils/table-query.spec.ts b/web-console/src/views/explore-view/utils/table-query.spec.ts
index 1e1126cc1807..b388b2c1280a 100644
--- a/web-console/src/views/explore-view/utils/table-query.spec.ts
+++ b/web-console/src/views/explore-view/utils/table-query.spec.ts
@@ -16,8 +16,8 @@
  * limitations under the License.
  */
 
-import type { SqlOrderByExpression } from 'druid-query-toolkit';
-import { C, sql, SqlExpression, SqlQuery, T } from 'druid-query-toolkit';
+import type { SqlOrderByExpression } from '@druid-toolkit/query';
+import { C, sql, SqlExpression, SqlQuery, T } from '@druid-toolkit/query';
 
 import { nodePostJson } from '../../../test-utils';
 import { ExpressionMeta, Measure } from '../models';
diff --git a/web-console/src/views/explore-view/utils/table-query.ts b/web-console/src/views/explore-view/utils/table-query.ts
index d46d68edb5e1..bc5b6484c9a3 100644
--- a/web-console/src/views/explore-view/utils/table-query.ts
+++ b/web-console/src/views/explore-view/utils/table-query.ts
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-import type { SqlAlias, SqlExpression, SqlOrderByExpression, SqlTable } from 'druid-query-toolkit';
+import type { SqlAlias, SqlExpression, SqlOrderByExpression, SqlTable } from '@druid-toolkit/query';
 import {
   C,
   F,
@@ -28,13 +28,14 @@ import {
   SqlType,
   SqlWithPart,
   T,
-} from 'druid-query-toolkit';
+} from '@druid-toolkit/query';
 
 import type { ColumnHint } from '../../../utils';
-import { Duration, forceSignInNumberFormatter, formatNumber, formatPercent } from '../../../utils';
+import { forceSignInNumberFormatter, formatNumber, formatPercent } from '../../../utils';
 import type { ExpressionMeta } from '../models';
 import { Measure } from '../models';
 
+import { formatDuration } from './duration';
 import { addTableScope } from './general';
 import { KNOWN_AGGREGATIONS } from './known-aggregations';
 import type { Compare } from './time-manipulation';
@@ -102,7 +103,7 @@ function makeBaseColumnHints(
       ).getUnderlyingExpression(),
     };
     if (isTimestamp(splitColumn)) {
-      hint.displayName = `${splitColumn.name} (by ${new Duration(timeBucket).getDescription()})`;
+      hint.displayName = `${splitColumn.name} (by ${formatDuration(timeBucket, true)})`;
     }
     columnHints.set(splitColumn.name, hint);
   }
@@ -290,7 +291,7 @@ function makeCompareAggregatorsAndAddHints(
   prevMeasure: SqlExpression,
   columnHints: Map<string, ColumnHint>,
 ): SqlExpression[] {
-  const group = `Previous ${new Duration(compare).getDescription()}`;
+  const group = `Previous ${formatDuration(compare, true)}`;
   const diff = mainMeasure.subtract(prevMeasure);
 
   const ret: SqlExpression[] = [];
diff --git a/web-console/src/views/explore-view/utils/time-manipulation.spec.ts b/web-console/src/views/explore-view/utils/time-manipulation.spec.ts
index 70bdcf1e85ef..fd92d5c3081e 100644
--- a/web-console/src/views/explore-view/utils/time-manipulation.spec.ts
+++ b/web-console/src/views/explore-view/utils/time-manipulation.spec.ts
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-import { SqlExpression } from 'druid-query-toolkit';
+import { SqlExpression } from '@druid-toolkit/query';
 
 import { decomposeTimeInInterval, shiftBackAndExpandTimeInExpression } from './time-manipulation';
 
diff --git a/web-console/src/views/explore-view/utils/time-manipulation.ts b/web-console/src/views/explore-view/utils/time-manipulation.ts
index 671ed3080f74..fab9a9a7946d 100644
--- a/web-console/src/views/explore-view/utils/time-manipulation.ts
+++ b/web-console/src/views/explore-view/utils/time-manipulation.ts
@@ -24,7 +24,7 @@ import {
   SqlExpression,
   SqlFunction,
   SqlLiteral,
-} from 'druid-query-toolkit';
+} from '@druid-toolkit/query';
 
 import { partition } from '../../../utils';
 
diff --git a/web-console/src/views/home-view/datasources-card/datasources-card.tsx b/web-console/src/views/home-view/datasources-card/datasources-card.tsx
index d2a219776c55..811187117e70 100644
--- a/web-console/src/views/home-view/datasources-card/datasources-card.tsx
+++ b/web-console/src/views/home-view/datasources-card/datasources-card.tsx
@@ -21,7 +21,8 @@ import React from 'react';
 
 import type { Capabilities } from '../../../helpers';
 import { useQueryManager } from '../../../hooks';
-import { getApiArray, pluralIfNeeded, queryDruidSql } from '../../../utils';
+import { Api } from '../../../singletons';
+import { pluralIfNeeded, queryDruidSql } from '../../../utils';
 import { HomeViewCard } from '../home-view-card/home-view-card';
 
 export interface DatasourcesCardProps {
@@ -32,7 +33,7 @@ export const DatasourcesCard = React.memo(function DatasourcesCard(props: Dataso
   const [datasourceCountState] = useQueryManager<Capabilities, number>({
     initQuery: props.capabilities,
     processQuery: async (capabilities, cancelToken) => {
-      let datasources: string[];
+      let datasources: any[];
       if (capabilities.hasSql()) {
         datasources = await queryDruidSql(
           {
@@ -41,7 +42,10 @@ export const DatasourcesCard = React.memo(function DatasourcesCard(props: Dataso
           cancelToken,
         );
       } else if (capabilities.hasCoordinatorAccess()) {
-        datasources = await getApiArray<string>('/druid/coordinator/v1/datasources', cancelToken);
+        const datasourcesResp = await Api.instance.get('/druid/coordinator/v1/datasources', {
+          cancelToken,
+        });
+        datasources = datasourcesResp.data;
       } else {
         throw new Error(`must have SQL or coordinator access`);
       }
diff --git a/web-console/src/views/home-view/segments-card/segments-card.tsx b/web-console/src/views/home-view/segments-card/segments-card.tsx
index 6a86fe5f18e1..d5d157a523b0 100644
--- a/web-console/src/views/home-view/segments-card/segments-card.tsx
+++ b/web-console/src/views/home-view/segments-card/segments-card.tsx
@@ -23,7 +23,7 @@ import React from 'react';
 import type { Capabilities } from '../../../helpers';
 import { useQueryManager } from '../../../hooks';
 import { Api } from '../../../singletons';
-import { deepGet, getApiArray, pluralIfNeeded, queryDruidSql } from '../../../utils';
+import { deepGet, pluralIfNeeded, queryDruidSql } from '../../../utils';
 import { HomeViewCard } from '../home-view-card/home-view-card';
 
 export interface SegmentCounts {
@@ -62,10 +62,11 @@ WHERE is_active = 1`,
         const loadstatus = loadstatusResp.data;
         const unavailableSegmentNum = sum(Object.keys(loadstatus), key => loadstatus[key]);
 
-        const datasourcesMeta = await getApiArray(
+        const datasourcesMetaResp = await Api.instance.get(
           '/druid/coordinator/v1/datasources?simple',
-          cancelToken,
+          { cancelToken },
         );
+        const datasourcesMeta = datasourcesMetaResp.data;
         const availableSegmentNum = sum(datasourcesMeta, (curr: any) =>
           deepGet(curr, 'properties.segments.count'),
         );
diff --git a/web-console/src/views/home-view/services-card/services-card.tsx b/web-console/src/views/home-view/services-card/services-card.tsx
index a04680237a41..18a66b832187 100644
--- a/web-console/src/views/home-view/services-card/services-card.tsx
+++ b/web-console/src/views/home-view/services-card/services-card.tsx
@@ -22,7 +22,8 @@ import React from 'react';
 import { PluralPairIfNeeded } from '../../../components';
 import type { Capabilities } from '../../../helpers';
 import { useQueryManager } from '../../../hooks';
-import { getApiArray, lookupBy, queryDruidSql } from '../../../utils';
+import { Api } from '../../../singletons';
+import { lookupBy, queryDruidSql } from '../../../utils';
 import { HomeViewCard } from '../home-view-card/home-view-card';
 
 export interface ServiceCounts {
@@ -44,10 +45,10 @@ export const ServicesCard = React.memo(function ServicesCard(props: ServicesCard
   const [serviceCountState] = useQueryManager<Capabilities, ServiceCounts>({
     processQuery: async (capabilities, cancelToken) => {
       if (capabilities.hasSql()) {
-        const serviceCountsFromQuery = await queryDruidSql<{
+        const serviceCountsFromQuery: {
           service_type: string;
           count: number;
-        }>(
+        }[] = await queryDruidSql(
           {
             query: `SELECT server_type AS "service_type", COUNT(*) as "count" FROM sys.servers GROUP BY 1`,
           },
@@ -59,10 +60,12 @@ export const ServicesCard = React.memo(function ServicesCard(props: ServicesCard
           x => x.count,
         );
       } else if (capabilities.hasCoordinatorAccess()) {
-        const services = await getApiArray('/druid/coordinator/v1/servers?simple', cancelToken);
+        const services = (
+          await Api.instance.get('/druid/coordinator/v1/servers?simple', { cancelToken })
+        ).data;
 
         const middleManager = capabilities.hasOverlordAccess()
-          ? await getApiArray('/druid/indexer/v1/workers', cancelToken)
+          ? (await Api.instance.get('/druid/indexer/v1/workers', { cancelToken })).data
           : [];
 
         return {
diff --git a/web-console/src/views/home-view/supervisors-card/supervisors-card.tsx b/web-console/src/views/home-view/supervisors-card/supervisors-card.tsx
index dca25e32d367..ab63e0205ac8 100644
--- a/web-console/src/views/home-view/supervisors-card/supervisors-card.tsx
+++ b/web-console/src/views/home-view/supervisors-card/supervisors-card.tsx
@@ -19,10 +19,10 @@
 import { IconNames } from '@blueprintjs/icons';
 import React from 'react';
 
-import type { IngestionSpec } from '../../../druid-models';
 import type { Capabilities } from '../../../helpers';
 import { useQueryManager } from '../../../hooks';
-import { getApiArray, partition, pluralIfNeeded, queryDruidSql } from '../../../utils';
+import { Api } from '../../../singletons';
+import { pluralIfNeeded, queryDruidSql } from '../../../utils';
 import { HomeViewCard } from '../home-view-card/home-view-card';
 
 export interface SupervisorCounts {
@@ -50,14 +50,11 @@ FROM sys.supervisors`,
           )
         )[0];
       } else if (capabilities.hasOverlordAccess()) {
-        const supervisors = await getApiArray<{ spec: IngestionSpec }>(
-          '/druid/indexer/v1/supervisor?full',
-          cancelToken,
-        );
-        const [running, suspended] = partition(supervisors, d => !d.spec.suspended);
+        const resp = await Api.instance.get('/druid/indexer/v1/supervisor?full', { cancelToken });
+        const data = resp.data;
         return {
-          running: running.length,
-          suspended: suspended.length,
+          running: data.filter((d: any) => d.spec.suspended === false).length,
+          suspended: data.filter((d: any) => d.spec.suspended === true).length,
         };
       } else {
         throw new Error(`must have SQL or overlord access`);
diff --git a/web-console/src/views/home-view/tasks-card/tasks-card.tsx b/web-console/src/views/home-view/tasks-card/tasks-card.tsx
index 901a4e15581e..fa91b8a141e3 100644
--- a/web-console/src/views/home-view/tasks-card/tasks-card.tsx
+++ b/web-console/src/views/home-view/tasks-card/tasks-card.tsx
@@ -25,7 +25,8 @@ import type { CapacityInfo } from '../../../druid-models';
 import type { Capabilities } from '../../../helpers';
 import { getClusterCapacity } from '../../../helpers';
 import { useQueryManager } from '../../../hooks';
-import { getApiArray, groupByAsMap, lookupBy, pluralIfNeeded, queryDruidSql } from '../../../utils';
+import { Api } from '../../../singletons';
+import { lookupBy, pluralIfNeeded, queryDruidSql } from '../../../utils';
 import { HomeViewCard } from '../home-view-card/home-view-card';
 
 function getTaskStatus(d: any) {
@@ -61,12 +62,14 @@ GROUP BY 1`,
       x => x.count,
     );
   } else if (capabilities.hasOverlordAccess()) {
-    const tasks: any[] = await getApiArray('/druid/indexer/v1/tasks', cancelToken);
-    return groupByAsMap(
-      tasks,
-      d => getTaskStatus(d).toLowerCase(),
-      xs => xs.length,
-    );
+    const tasks: any[] = (await Api.instance.get('/druid/indexer/v1/tasks', { cancelToken })).data;
+    return {
+      success: tasks.filter(d => getTaskStatus(d) === 'SUCCESS').length,
+      failed: tasks.filter(d => getTaskStatus(d) === 'FAILED').length,
+      running: tasks.filter(d => getTaskStatus(d) === 'RUNNING').length,
+      pending: tasks.filter(d => getTaskStatus(d) === 'PENDING').length,
+      waiting: tasks.filter(d => getTaskStatus(d) === 'WAITING').length,
+    };
   } else {
     throw new Error(`must have SQL or overlord access`);
   }
diff --git a/web-console/src/views/load-data-view/load-data-view.tsx b/web-console/src/views/load-data-view/load-data-view.tsx
index 3767a9852e99..b4bd0d841b60 100644
--- a/web-console/src/views/load-data-view/load-data-view.tsx
+++ b/web-console/src/views/load-data-view/load-data-view.tsx
@@ -157,7 +157,6 @@ import {
   EMPTY_ARRAY,
   EMPTY_OBJECT,
   filterMap,
-  getApiArray,
   getDruidErrorMessage,
   localStorageGetJson,
   LocalStorageKeys,
@@ -3560,7 +3559,8 @@ export class LoadDataView extends React.PureComponent<LoadDataViewProps, LoadDat
 
     let existingDatasources: string[];
     try {
-      existingDatasources = await getApiArray<string>('/druid/coordinator/v1/datasources');
+      existingDatasources = (await Api.instance.get<string[]>('/druid/coordinator/v1/datasources'))
+        .data;
     } catch {
       return;
     }
diff --git a/web-console/src/views/lookups-view/lookups-view.tsx b/web-console/src/views/lookups-view/lookups-view.tsx
index 25f45455e224..2fbfb70703ed 100644
--- a/web-console/src/views/lookups-view/lookups-view.tsx
+++ b/web-console/src/views/lookups-view/lookups-view.tsx
@@ -41,9 +41,8 @@ import { STANDARD_TABLE_PAGE_SIZE, STANDARD_TABLE_PAGE_SIZE_OPTIONS } from '../.
 import { Api, AppToaster } from '../../singletons';
 import {
   deepGet,
-  getApiArray,
   getDruidErrorMessage,
-  hasOverlayOpen,
+  hasPopoverOpen,
   isLookupsUninitialized,
   LocalStorageBackedVisibility,
   LocalStorageKeys,
@@ -125,12 +124,14 @@ export class LookupsView extends React.PureComponent<LookupsViewProps, LookupsVi
 
     this.lookupsQueryManager = new QueryManager({
       processQuery: async (_, cancelToken) => {
-        const tiersResp = await getApiArray(
+        const tiersResp = await Api.instance.get(
           '/druid/coordinator/v1/lookups/config?discover=true',
-          cancelToken,
+          { cancelToken },
         );
         const tiers =
-          tiersResp.length > 0 ? tiersResp.sort(tierNameCompare) : [DEFAULT_LOOKUP_TIER];
+          tiersResp.data && tiersResp.data.length > 0
+            ? tiersResp.data.sort(tierNameCompare)
+            : [DEFAULT_LOOKUP_TIER];
 
         const lookupResp = await Api.instance.get('/druid/coordinator/v1/lookups/config/all', {
           cancelToken,
@@ -387,7 +388,6 @@ export class LookupsView extends React.PureComponent<LookupsViewProps, LookupsVi
             width: 200,
             Cell: ({ value, original }) => (
               <TableClickableCell
-                tooltip="Show detail"
                 onClick={() => this.onDetail(original)}
                 hoverIcon={IconNames.SEARCH_TEMPLATE}
               >
@@ -511,7 +511,7 @@ export class LookupsView extends React.PureComponent<LookupsViewProps, LookupsVi
         <ViewControlBar label="Lookups">
           <RefreshButton
             onRefresh={auto => {
-              if (auto && hasOverlayOpen()) return;
+              if (auto && hasPopoverOpen()) return;
               this.lookupsQueryManager.rerunLastQuery(auto);
             }}
             localStorageKey={LocalStorageKeys.LOOKUPS_REFRESH_RATE}
diff --git a/web-console/src/views/segments-view/__snapshots__/segments-view.spec.tsx.snap b/web-console/src/views/segments-view/__snapshots__/segments-view.spec.tsx.snap
index 0e6b64e844d5..e177003b7eed 100755
--- a/web-console/src/views/segments-view/__snapshots__/segments-view.spec.tsx.snap
+++ b/web-console/src/views/segments-view/__snapshots__/segments-view.spec.tsx.snap
@@ -54,7 +54,10 @@ exports[`SegmentsView matches snapshot 1`] = `
           "Start",
           "End",
           "Version",
-          "Time span",
+          {
+            "label": "𝑓(sys.segments)",
+            "text": "Time span",
+          },
           "Shard type",
           "Shard spec",
           "Partition",
@@ -74,6 +77,7 @@ exports[`SegmentsView matches snapshot 1`] = `
       onClose={[Function]}
       tableColumnsHidden={
         [
+          "Time span",
           "Is published",
           "Is overshadowed",
         ]
@@ -81,7 +85,6 @@ exports[`SegmentsView matches snapshot 1`] = `
     />
   </Memo(ViewControlBar)>
   <SplitterLayout
-    className="timeline-segments-splitter"
     percentage={true}
     primaryIndex={1}
     primaryMinSize={20}
@@ -152,6 +155,7 @@ exports[`SegmentsView matches snapshot 1`] = `
             "accessor": "segment_id",
             "filterable": true,
             "show": true,
+            "sortable": true,
             "width": 280,
           },
           {
@@ -168,6 +172,7 @@ exports[`SegmentsView matches snapshot 1`] = `
             "defaultSortDesc": true,
             "filterable": true,
             "show": false,
+            "sortable": true,
             "width": 120,
           },
           {
@@ -178,7 +183,8 @@ exports[`SegmentsView matches snapshot 1`] = `
             "filterable": true,
             "headerClassName": "enable-comparisons",
             "show": true,
-            "width": 180,
+            "sortable": true,
+            "width": 160,
           },
           {
             "Cell": [Function],
@@ -188,7 +194,8 @@ exports[`SegmentsView matches snapshot 1`] = `
             "filterable": true,
             "headerClassName": "enable-comparisons",
             "show": true,
-            "width": 180,
+            "sortable": true,
+            "width": 160,
           },
           {
             "Cell": [Function],
@@ -197,16 +204,16 @@ exports[`SegmentsView matches snapshot 1`] = `
             "defaultSortDesc": true,
             "filterable": true,
             "show": true,
-            "width": 180,
+            "sortable": true,
+            "width": 160,
           },
           {
+            "Cell": [Function],
             "Header": "Time span",
-            "accessor": [Function],
-            "className": "padded",
-            "filterable": false,
-            "id": "time_span",
-            "show": true,
-            "sortable": false,
+            "accessor": "time_span",
+            "filterable": true,
+            "show": false,
+            "sortable": true,
             "width": 100,
           },
           {
@@ -235,6 +242,7 @@ exports[`SegmentsView matches snapshot 1`] = `
             "className": "padded",
             "filterable": false,
             "show": true,
+            "sortable": true,
             "width": 60,
           },
           {
@@ -245,6 +253,7 @@ exports[`SegmentsView matches snapshot 1`] = `
             "defaultSortDesc": true,
             "filterable": false,
             "show": true,
+            "sortable": true,
             "width": 120,
           },
           {
@@ -365,11 +374,18 @@ exports[`SegmentsView matches snapshot 1`] = `
       defaultFilterMethod={[Function]}
       defaultFiltered={[]}
       defaultPage={0}
-      defaultPageSize={20}
+      defaultPageSize={50}
       defaultResized={[]}
       defaultSortDesc={false}
       defaultSortMethod={[Function]}
-      defaultSorted={[]}
+      defaultSorted={
+        [
+          {
+            "desc": true,
+            "id": "start",
+          },
+        ]
+      }
       expanderDefaults={
         {
           "filterable": false,
@@ -405,7 +421,7 @@ exports[`SegmentsView matches snapshot 1`] = `
       getTrProps={[Function]}
       groupedByPivotKey="_groupedByPivot"
       indexKey="_index"
-      loading={true}
+      loading={false}
       loadingText="Loading..."
       manual={true}
       multiSort={true}
@@ -415,13 +431,8 @@ exports[`SegmentsView matches snapshot 1`] = `
       ofText=""
       onFetchData={[Function]}
       onFilteredChange={[Function]}
-      onPageChange={[Function]}
-      onPageSizeChange={[Function]}
-      onSortedChange={[Function]}
       originalKey="_original"
-      page={0}
       pageJumpText="jump to page"
-      pageSize={50}
       pageSizeOptions={
         [
           50,
@@ -446,14 +457,6 @@ exports[`SegmentsView matches snapshot 1`] = `
       showPaginationBottom={true}
       showPaginationTop={false}
       sortable={true}
-      sorted={
-        [
-          {
-            "desc": true,
-            "id": "start",
-          },
-        ]
-      }
       style={{}}
       subRowsKey="_subRows"
     />
diff --git a/web-console/src/views/segments-view/segments-view.scss b/web-console/src/views/segments-view/segments-view.scss
index f64f881fe4c5..a45d8860db1f 100644
--- a/web-console/src/views/segments-view/segments-view.scss
+++ b/web-console/src/views/segments-view/segments-view.scss
@@ -22,7 +22,7 @@
   height: 100%;
   width: 100%;
 
-  .splitter-layout.timeline-segments-splitter {
+  .splitter-layout {
     position: absolute;
     top: $view-control-bar-height + $standard-padding;
     bottom: 0;
diff --git a/web-console/src/views/segments-view/segments-view.tsx b/web-console/src/views/segments-view/segments-view.tsx
index da11d5af5cb6..9e0d680c8547 100644
--- a/web-console/src/views/segments-view/segments-view.tsx
+++ b/web-console/src/views/segments-view/segments-view.tsx
@@ -18,11 +18,10 @@
 
 import { Button, ButtonGroup, Intent, Label, MenuItem, Switch, Tag } from '@blueprintjs/core';
 import { IconNames } from '@blueprintjs/icons';
-import { C, L, SqlComparison, SqlExpression } from 'druid-query-toolkit';
+import { C, L, SqlComparison, SqlExpression } from '@druid-toolkit/query';
 import * as JSONBig from 'json-bigint-native';
-import type { ReactNode } from 'react';
 import React from 'react';
-import type { Filter, SortingRule } from 'react-table';
+import type { Filter } from 'react-table';
 import ReactTable from 'react-table';
 
 import {
@@ -44,8 +43,7 @@ import {
 import { AsyncActionDialog } from '../../dialogs';
 import { SegmentTableActionDialog } from '../../dialogs/segments-table-action-dialog/segment-table-action-dialog';
 import { ShowValueDialog } from '../../dialogs/show-value-dialog/show-value-dialog';
-import type { QueryWithContext, ShardSpec } from '../../druid-models';
-import { computeSegmentTimeSpan, getDatasourceColor } from '../../druid-models';
+import type { QueryWithContext } from '../../druid-models';
 import type { Capabilities, CapabilitiesMode } from '../../helpers';
 import {
   booleanCustomTableFilter,
@@ -58,14 +56,13 @@ import {
 import { Api } from '../../singletons';
 import type { NumberLike, TableState } from '../../utils';
 import {
-  applySorting,
   compact,
   countBy,
+  deepGet,
   filterMap,
   formatBytes,
   formatInteger,
-  getApiArray,
-  hasOverlayOpen,
+  hasPopoverOpen,
   isNumberLikeNaN,
   LocalStorageBackedVisibility,
   LocalStorageKeys,
@@ -87,7 +84,7 @@ const TABLE_COLUMNS_BY_MODE: Record<CapabilitiesMode, TableColumnSelectorColumn[
     'Start',
     'End',
     'Version',
-    'Time span',
+    { text: 'Time span', label: '𝑓(sys.segments)' },
     'Shard type',
     'Shard spec',
     'Partition',
@@ -102,13 +99,14 @@ const TABLE_COLUMNS_BY_MODE: Record<CapabilitiesMode, TableColumnSelectorColumn[
     'Is published',
     'Is overshadowed',
   ],
+  'no-sql': ['Segment ID', 'Datasource', 'Start', 'End', 'Version', 'Partition', 'Size'],
   'no-proxy': [
     'Segment ID',
     'Datasource',
     'Start',
     'End',
     'Version',
-    'Time span',
+    { text: 'Time span', label: '𝑓(sys.segments)' },
     'Shard type',
     'Shard spec',
     'Partition',
@@ -123,72 +121,12 @@ const TABLE_COLUMNS_BY_MODE: Record<CapabilitiesMode, TableColumnSelectorColumn[
     'Is published',
     'Is overshadowed',
   ],
-  'no-sql': [
-    'Segment ID',
-    'Datasource',
-    'Start',
-    'End',
-    'Version',
-    'Time span',
-    'Shard type',
-    'Shard spec',
-    'Partition',
-    'Size',
-    'Replication factor',
-    'Is realtime',
-    'Is overshadowed',
-  ],
 };
 
-function maybeParseJsonBig(str: string): any {
-  try {
-    return JSONBig.parse(str);
-  } catch {
-    return undefined;
-  }
-}
-
 function formatRangeDimensionValue(dimension: any, value: any): string {
   return `${C(String(dimension))}=${L(String(value))}`;
 }
 
-function segmentFiltersToExpression(filters: Filter[]): SqlExpression {
-  return SqlExpression.and(
-    ...filterMap(filters, filter => {
-      if (filter.id === 'shard_type') {
-        // Special handling for shard_type that needs to be searched for in the shard_spec
-        // Creates filters like `shard_spec LIKE '%"type":"numbered"%'`
-        const modeAndNeedle = parseFilterModeAndNeedle(filter);
-        if (!modeAndNeedle) return;
-        const shardSpecColumn = C('shard_spec');
-        switch (modeAndNeedle.mode) {
-          case '=':
-            return SqlComparison.like(shardSpecColumn, `%"type":"${modeAndNeedle.needle}"%`);
-
-          case '!=':
-            return SqlComparison.notLike(shardSpecColumn, `%"type":"${modeAndNeedle.needle}"%`);
-
-          default:
-            return SqlComparison.like(shardSpecColumn, `%"type":"${modeAndNeedle.needle}%`);
-        }
-      } else if (filter.id.startsWith('is_')) {
-        switch (filter.value) {
-          case '=false':
-            return C(filter.id).equal(0);
-
-          case '=true':
-            return C(filter.id).equal(1);
-
-          default:
-            return;
-        }
-      } else {
-        return sqlQueryCustomTableFilter(filter);
-      }
-    }),
-  );
-}
-
 interface SegmentsQuery extends TableState {
   visibleColumns: LocalStorageBackedVisibility;
   capabilities: Capabilities;
@@ -202,7 +140,8 @@ interface SegmentQueryResultRow {
   interval: string;
   segment_id: string;
   version: string;
-  shard_spec: ShardSpec;
+  time_span: string;
+  shard_spec: string;
   partition_num: number;
   size: number;
   num_rows: NumberLike;
@@ -228,16 +167,11 @@ export interface SegmentsViewState {
   segmentTableActionDialogId?: string;
   datasourceTableActionDialogId?: string;
   actions: BasicAction[];
-
-  visibleColumns: LocalStorageBackedVisibility;
-  groupByInterval: boolean;
-  showSegmentTimeline?: { capabilities: Capabilities; datasource?: string };
-  page: number;
-  pageSize: number;
-  sorted: SortingRule[];
-
   terminateSegmentId?: string;
   terminateDatasourceId?: string;
+  visibleColumns: LocalStorageBackedVisibility;
+  groupByInterval: boolean;
+  showSegmentTimeline: boolean;
   showFullShardSpec?: string;
 }
 
@@ -249,6 +183,16 @@ export class SegmentsView extends React.PureComponent<SegmentsViewProps, Segment
       `"start"`,
       `"end"`,
       `"version"`,
+      visibleColumns.shown('Time span') &&
+        `CASE
+  WHEN "start" = '-146136543-09-08T08:23:32.096Z' AND "end" = '146140482-04-24T15:36:27.903Z' THEN 'All'
+  WHEN "start" LIKE '%-01-01T00:00:00.000Z' AND "end" LIKE '%-01-01T00:00:00.000Z' THEN 'Year'
+  WHEN "start" LIKE '%-01T00:00:00.000Z' AND "end" LIKE '%-01T00:00:00.000Z' THEN 'Month'
+  WHEN "start" LIKE '%T00:00:00.000Z' AND "end" LIKE '%T00:00:00.000Z' THEN 'Day'
+  WHEN "start" LIKE '%:00:00.000Z' AND "end" LIKE '%:00:00.000Z' THEN 'Hour'
+  WHEN "start" LIKE '%:00.000Z' AND "end" LIKE '%:00.000Z' THEN 'Minute'
+  ELSE 'Sub minute'
+END AS "time_span"`,
       visibleColumns.shown('Shard type', 'Shard spec') && `"shard_spec"`,
       visibleColumns.shown('Partition') && `"partition_num"`,
       visibleColumns.shown('Size') && `"size"`,
@@ -267,8 +211,34 @@ export class SegmentsView extends React.PureComponent<SegmentsViewProps, Segment
     return `WITH s AS (SELECT\n${columns.join(',\n')}\nFROM sys.segments)`;
   }
 
+  static computeTimeSpan(start: string, end: string): string {
+    if (start.endsWith('-01-01T00:00:00.000Z') && end.endsWith('-01-01T00:00:00.000Z')) {
+      return 'Year';
+    }
+
+    if (start.endsWith('-01T00:00:00.000Z') && end.endsWith('-01T00:00:00.000Z')) {
+      return 'Month';
+    }
+
+    if (start.endsWith('T00:00:00.000Z') && end.endsWith('T00:00:00.000Z')) {
+      return 'Day';
+    }
+
+    if (start.endsWith(':00:00.000Z') && end.endsWith(':00:00.000Z')) {
+      return 'Hour';
+    }
+
+    if (start.endsWith(':00.000Z') && end.endsWith(':00.000Z')) {
+      return 'Minute';
+    }
+
+    return 'Sub minute';
+  }
+
   private readonly segmentsQueryManager: QueryManager<SegmentsQuery, SegmentQueryResultRow[]>;
 
+  private lastTableState: TableState | undefined;
+
   constructor(props: SegmentsViewProps) {
     super(props);
 
@@ -277,16 +247,10 @@ export class SegmentsView extends React.PureComponent<SegmentsViewProps, Segment
       segmentsState: QueryState.INIT,
       visibleColumns: new LocalStorageBackedVisibility(
         LocalStorageKeys.SEGMENT_TABLE_COLUMN_SELECTION,
-        ['Is published', 'Is overshadowed'],
+        ['Time span', 'Is published', 'Is overshadowed'],
       ),
       groupByInterval: false,
-      page: 0,
-      pageSize: STANDARD_TABLE_PAGE_SIZE,
-      sorted: [
-        props.capabilities.hasSql()
-          ? { id: 'start', desc: true }
-          : { id: 'datasource', desc: false },
-      ],
+      showSegmentTimeline: false,
     };
 
     this.segmentsQueryManager = new QueryManager({
@@ -296,11 +260,47 @@ export class SegmentsView extends React.PureComponent<SegmentsViewProps, Segment
           query;
 
         if (capabilities.hasSql()) {
-          const whereExpression = segmentFiltersToExpression(filtered);
+          const whereParts = filterMap(filtered, (f: Filter) => {
+            if (f.id === 'shard_type') {
+              // Special handling for shard_type that needs to be searched for in the shard_spec
+              // Creates filters like `shard_spec LIKE '%"type":"numbered"%'`
+              const modeAndNeedle = parseFilterModeAndNeedle(f);
+              if (!modeAndNeedle) return;
+              const shardSpecColumn = C('shard_spec');
+              switch (modeAndNeedle.mode) {
+                case '=':
+                  return SqlComparison.like(shardSpecColumn, `%"type":"${modeAndNeedle.needle}"%`);
+
+                case '!=':
+                  return SqlComparison.notLike(
+                    shardSpecColumn,
+                    `%"type":"${modeAndNeedle.needle}"%`,
+                  );
+
+                default:
+                  return SqlComparison.like(shardSpecColumn, `%"type":"${modeAndNeedle.needle}%`);
+              }
+            } else if (f.id.startsWith('is_')) {
+              switch (f.value) {
+                case '=false':
+                  return C(f.id).equal(0);
+
+                case '=true':
+                  return C(f.id).equal(1);
+
+                default:
+                  return;
+              }
+            } else {
+              return sqlQueryCustomTableFilter(f);
+            }
+          });
+
+          let queryParts: string[];
 
           let filterClause = '';
-          if (whereExpression.toString() !== 'TRUE') {
-            filterClause = whereExpression.toString();
+          if (whereParts.length) {
+            filterClause = SqlExpression.and(...whereParts).toString();
           }
 
           let effectiveSorted = sorted;
@@ -317,7 +317,6 @@ export class SegmentsView extends React.PureComponent<SegmentsViewProps, Segment
           const base = SegmentsView.baseQuery(visibleColumns);
           const orderByClause = sortedToOrderByClause(effectiveSorted);
 
-          let queryParts: string[];
           if (groupByInterval) {
             const innerQuery = compact([
               `SELECT "start", "end"`,
@@ -357,71 +356,78 @@ export class SegmentsView extends React.PureComponent<SegmentsViewProps, Segment
           }
           const sqlQuery = queryParts.join('\n');
           setIntermediateQuery(sqlQuery);
-          let result = await queryDruidSql({ query: sqlQuery }, cancelToken);
-
-          if (visibleColumns.shown('Shard type', 'Shard spec')) {
-            result = result.map(sr => ({
-              ...sr,
-              shard_spec: maybeParseJsonBig(sr.shard_spec),
-            }));
-          }
-
-          return result as SegmentQueryResultRow[];
+          return await queryDruidSql({ query: sqlQuery }, cancelToken);
         } else if (capabilities.hasCoordinatorAccess()) {
-          let datasourceList: string[] = [];
+          let datasourceList: string[] = (
+            await Api.instance.get('/druid/coordinator/v1/metadata/datasources', { cancelToken })
+          ).data;
+
           const datasourceFilter = filtered.find(({ id }) => id === 'datasource');
           if (datasourceFilter) {
-            datasourceList = (
-              await getApiArray('/druid/coordinator/v1/metadata/datasources', cancelToken)
-            ).filter((datasource: string) =>
+            datasourceList = datasourceList.filter(datasource =>
               booleanCustomTableFilter(datasourceFilter, datasource),
             );
           }
 
-          let results = (
-            await getApiArray(
-              `/druid/coordinator/v1/metadata/segments?includeOvershadowedStatus&includeRealtimeSegments${datasourceList
-                .map(d => `&datasources=${Api.encodePath(d)}`)
-                .join('')}`,
-              cancelToken,
-            )
-          ).map((segment: any) => {
-            const [start, end] = segment.interval.split('/');
-            return {
-              segment_id: segment.identifier,
-              datasource: segment.dataSource,
-              start,
-              end,
-              interval: segment.interval,
-              version: segment.version,
-              shard_spec: segment.shardSpec,
-              partition_num: segment.shardSpec?.partitionNum || 0,
-              size: segment.size,
-              num_rows: -1,
-              avg_row_size: -1,
-              num_replicas: -1,
-              replication_factor: segment.replicationFactor,
-              is_available: -1,
-              is_active: -1,
-              is_realtime: Number(segment.realtime),
-              is_published: -1,
-              is_overshadowed: Number(segment.overshadowed),
-            };
-          });
+          if (sorted.length && sorted[0].id === 'datasource') {
+            datasourceList.sort(
+              sorted[0].desc ? (d1, d2) => d1.localeCompare(d2) : (d1, d2) => d2.localeCompare(d1),
+            );
+          }
 
-          if (filtered.length) {
-            results = results.filter((d: SegmentQueryResultRow) => {
-              return filtered.every(filter => {
-                return booleanCustomTableFilter(
-                  filter,
-                  d[filter.id as keyof SegmentQueryResultRow],
-                );
-              });
+          const maxResults = (page + 1) * pageSize;
+          let results: SegmentQueryResultRow[] = [];
+
+          const n = Math.min(datasourceList.length, maxResults);
+          for (let i = 0; i < n && results.length < maxResults; i++) {
+            const segments = (
+              await Api.instance.get(
+                `/druid/coordinator/v1/datasources/${Api.encodePath(datasourceList[i])}?full`,
+                { cancelToken },
+              )
+            ).data?.segments;
+            if (!Array.isArray(segments)) continue;
+
+            let segmentQueryResultRows: SegmentQueryResultRow[] = segments.map((segment: any) => {
+              const [start, end] = segment.interval.split('/');
+              return {
+                segment_id: segment.identifier,
+                datasource: segment.dataSource,
+                start,
+                end,
+                interval: segment.interval,
+                version: segment.version,
+                time_span: SegmentsView.computeTimeSpan(start, end),
+                shard_spec: deepGet(segment, 'shardSpec'),
+                partition_num: deepGet(segment, 'shardSpec.partitionNum') || 0,
+                size: segment.size,
+                num_rows: -1,
+                avg_row_size: -1,
+                num_replicas: -1,
+                replication_factor: -1,
+                is_available: -1,
+                is_active: -1,
+                is_realtime: -1,
+                is_published: -1,
+                is_overshadowed: -1,
+              };
             });
+
+            if (filtered.length) {
+              segmentQueryResultRows = segmentQueryResultRows.filter((d: SegmentQueryResultRow) => {
+                return filtered.every(filter => {
+                  return booleanCustomTableFilter(
+                    filter,
+                    d[filter.id as keyof SegmentQueryResultRow],
+                  );
+                });
+              });
+            }
+
+            results = results.concat(segmentQueryResultRows);
           }
 
-          const maxResults = (page + 1) * pageSize;
-          return applySorting(results, sorted).slice(page * pageSize, maxResults);
+          return results.slice(page * pageSize, maxResults);
         } else {
           throw new Error('must have SQL or coordinator access to load this view');
         }
@@ -434,54 +440,20 @@ export class SegmentsView extends React.PureComponent<SegmentsViewProps, Segment
     });
   }
 
-  componentDidMount() {
-    this.fetchData();
-  }
-
   componentWillUnmount(): void {
     this.segmentsQueryManager.terminate();
   }
 
-  componentDidUpdate(
-    prevProps: Readonly<SegmentsViewProps>,
-    prevState: Readonly<SegmentsViewState>,
-  ) {
-    const { filters } = this.props;
-    const { groupByInterval, page, pageSize, sorted } = this.state;
-    if (
-      !segmentFiltersToExpression(filters).equals(segmentFiltersToExpression(prevProps.filters)) ||
-      groupByInterval !== prevState.groupByInterval ||
-      page !== prevState.page ||
-      pageSize !== prevState.pageSize ||
-      sortedToOrderByClause(sorted) !== sortedToOrderByClause(prevState.sorted)
-    ) {
-      this.fetchData();
-    }
-  }
-
-  private readonly refresh = (auto: boolean): void => {
-    if (auto && hasOverlayOpen()) return;
-    this.segmentsQueryManager.rerunLastQuery(auto);
-
-    const { showSegmentTimeline } = this.state;
-    if (showSegmentTimeline) {
-      // Create a new capabilities object to force the segment timeline to re-render
-      this.setState(({ showSegmentTimeline }) => ({
-        showSegmentTimeline: {
-          ...showSegmentTimeline,
-          capabilities: this.props.capabilities.clone(),
-        },
-      }));
-    }
-  };
-
-  private readonly fetchData = () => {
-    const { capabilities, filters } = this.props;
-    const { visibleColumns, groupByInterval, page, pageSize, sorted } = this.state;
+  private readonly fetchData = (groupByInterval: boolean, tableState?: TableState) => {
+    const { capabilities } = this.props;
+    const { visibleColumns } = this.state;
+    if (tableState) this.lastTableState = tableState;
+    if (!this.lastTableState) return;
+    const { page, pageSize, filtered, sorted } = this.lastTableState;
     this.segmentsQueryManager.runQuery({
       page,
       pageSize,
-      filtered: filters,
+      filtered,
       sorted,
       visibleColumns,
       capabilities,
@@ -508,11 +480,7 @@ export class SegmentsView extends React.PureComponent<SegmentsViewProps, Segment
     });
   }
 
-  private renderFilterableCell(
-    field: string,
-    enableComparisons = false,
-    valueFn: (value: string) => ReactNode = String,
-  ) {
+  private renderFilterableCell(field: string, enableComparisons = false) {
     const { filters, onFiltersChange } = this.props;
 
     // eslint-disable-next-line react/display-name
@@ -524,22 +492,14 @@ export class SegmentsView extends React.PureComponent<SegmentsViewProps, Segment
         onFiltersChange={onFiltersChange}
         enableComparisons={enableComparisons}
       >
-        {valueFn(row.value)}
+        {row.value}
       </TableFilterableCell>
     );
   }
 
   renderSegmentsTable() {
     const { capabilities, filters, onFiltersChange } = this.props;
-    const {
-      segmentsState,
-      visibleColumns,
-      groupByInterval,
-      page,
-      pageSize,
-      sorted,
-      showSegmentTimeline,
-    } = this.state;
+    const { segmentsState, visibleColumns, groupByInterval } = this.state;
 
     const segments = segmentsState.data || [];
 
@@ -572,27 +532,26 @@ export class SegmentsView extends React.PureComponent<SegmentsViewProps, Segment
         filterable
         filtered={filters}
         onFilteredChange={onFiltersChange}
-        sorted={sorted}
-        onSortedChange={sorted => this.setState({ sorted })}
-        page={page}
-        onPageChange={page => this.setState({ page })}
-        pageSize={pageSize}
-        onPageSizeChange={pageSize => this.setState({ pageSize })}
-        pageSizeOptions={STANDARD_TABLE_PAGE_SIZE_OPTIONS}
-        showPagination
+        defaultSorted={[hasSql ? { id: 'start', desc: true } : { id: 'datasource', desc: false }]}
+        onFetchData={tableState => {
+          this.fetchData(groupByInterval, tableState);
+        }}
         showPageJump={false}
         ofText=""
         pivotBy={groupByInterval ? ['interval'] : []}
+        defaultPageSize={STANDARD_TABLE_PAGE_SIZE}
+        pageSizeOptions={STANDARD_TABLE_PAGE_SIZE_OPTIONS}
+        showPagination
         columns={[
           {
             Header: 'Segment ID',
             show: visibleColumns.shown('Segment ID'),
             accessor: 'segment_id',
             width: 280,
+            sortable: hasSql,
             filterable: allowGeneralFilter,
             Cell: row => (
               <TableClickableCell
-                tooltip="Show detail"
                 onClick={() => this.onDetail(row.value, row.row.datasource)}
                 hoverIcon={IconNames.SEARCH_TEMPLATE}
               >
@@ -605,23 +564,14 @@ export class SegmentsView extends React.PureComponent<SegmentsViewProps, Segment
             show: visibleColumns.shown('Datasource'),
             accessor: 'datasource',
             width: 140,
-            Cell: this.renderFilterableCell(
-              'datasource',
-              false,
-              showSegmentTimeline
-                ? value => (
-                    <>
-                      <span style={{ color: getDatasourceColor(value) }}>&#9632;</span> {value}
-                    </>
-                  )
-                : String,
-            ),
+            Cell: this.renderFilterableCell('datasource'),
           },
           {
             Header: 'Interval',
             show: groupByInterval,
             accessor: 'interval',
             width: 120,
+            sortable: hasSql,
             defaultSortDesc: true,
             filterable: allowGeneralFilter,
             Cell: this.renderFilterableCell('interval'),
@@ -631,7 +581,8 @@ export class SegmentsView extends React.PureComponent<SegmentsViewProps, Segment
             show: visibleColumns.shown('Start'),
             accessor: 'start',
             headerClassName: 'enable-comparisons',
-            width: 180,
+            width: 160,
+            sortable: hasSql,
             defaultSortDesc: true,
             filterable: allowGeneralFilter,
             Cell: this.renderFilterableCell('start', true),
@@ -641,7 +592,8 @@ export class SegmentsView extends React.PureComponent<SegmentsViewProps, Segment
             show: visibleColumns.shown('End'),
             accessor: 'end',
             headerClassName: 'enable-comparisons',
-            width: 180,
+            width: 160,
+            sortable: hasSql,
             defaultSortDesc: true,
             filterable: allowGeneralFilter,
             Cell: this.renderFilterableCell('end', true),
@@ -650,20 +602,20 @@ export class SegmentsView extends React.PureComponent<SegmentsViewProps, Segment
             Header: 'Version',
             show: visibleColumns.shown('Version'),
             accessor: 'version',
-            width: 180,
+            width: 160,
+            sortable: hasSql,
             defaultSortDesc: true,
             filterable: allowGeneralFilter,
-            Cell: this.renderFilterableCell('version', true),
+            Cell: this.renderFilterableCell('version'),
           },
           {
             Header: 'Time span',
             show: visibleColumns.shown('Time span'),
-            id: 'time_span',
-            className: 'padded',
-            accessor: ({ start, end }) => computeSegmentTimeSpan(start, end),
+            accessor: 'time_span',
             width: 100,
-            sortable: false,
-            filterable: false,
+            sortable: hasSql,
+            filterable: allowGeneralFilter,
+            Cell: this.renderFilterableCell('time_span'),
           },
           {
             Header: 'Shard type',
@@ -671,9 +623,14 @@ export class SegmentsView extends React.PureComponent<SegmentsViewProps, Segment
             id: 'shard_type',
             width: 100,
             sortable: false,
-            accessor: ({ shard_spec }) => {
-              if (typeof shard_spec?.type !== 'string') return '-';
-              return shard_spec?.type;
+            accessor: d => {
+              let v: any;
+              try {
+                v = JSONBig.parse(d.shard_spec);
+              } catch {}
+
+              if (typeof v?.type !== 'string') return '-';
+              return v?.type;
             },
             Cell: this.renderFilterableCell('shard_type', true),
           },
@@ -686,33 +643,35 @@ export class SegmentsView extends React.PureComponent<SegmentsViewProps, Segment
             sortable: false,
             filterable: false,
             Cell: ({ value }) => {
+              let v: any;
+              try {
+                v = JSONBig.parse(value);
+              } catch {}
+
               const onShowFullShardSpec = () => {
                 this.setState({
                   showFullShardSpec:
-                    value && typeof value === 'object'
-                      ? JSONBig.stringify(value, undefined, 2)
-                      : String(value),
+                    v && typeof v === 'object' ? JSONBig.stringify(v, undefined, 2) : String(value),
                 });
               };
 
-              switch (value?.type) {
+              switch (v?.type) {
                 case 'range': {
-                  const dimensions: string[] = value.dimensions || [];
+                  const dimensions: string[] = v.dimensions || [];
                   const formatEdge = (values: string[]) =>
                     dimensions.map((d, i) => formatRangeDimensionValue(d, values[i])).join('; ');
 
                   return (
                     <TableClickableCell
                       className="range-detail"
-                      tooltip="Show full shardSpec"
                       onClick={onShowFullShardSpec}
                       hoverIcon={IconNames.EYE_OPEN}
                     >
                       <span className="range-label">Start:</span>
-                      {Array.isArray(value.start) ? formatEdge(value.start) : '-∞'}
+                      {Array.isArray(v.start) ? formatEdge(v.start) : '-∞'}
                       <br />
                       <span className="range-label">End:</span>
-                      {Array.isArray(value.end) ? formatEdge(value.end) : '∞'}
+                      {Array.isArray(v.end) ? formatEdge(v.end) : '∞'}
                     </TableClickableCell>
                   );
                 }
@@ -721,29 +680,23 @@ export class SegmentsView extends React.PureComponent<SegmentsViewProps, Segment
                   return (
                     <TableClickableCell
                       className="range-detail"
-                      tooltip="Show full shardSpec"
                       onClick={onShowFullShardSpec}
                       hoverIcon={IconNames.EYE_OPEN}
                     >
                       <span className="range-label">Start:</span>
-                      {value.start != null
-                        ? formatRangeDimensionValue(value.dimension, value.start)
-                        : '-∞'}
+                      {v.start != null ? formatRangeDimensionValue(v.dimension, v.start) : '-∞'}
                       <br />
                       <span className="range-label">End:</span>
-                      {value.end != null
-                        ? formatRangeDimensionValue(value.dimension, value.end)
-                        : '∞'}
+                      {v.end != null ? formatRangeDimensionValue(v.dimension, v.end) : '∞'}
                     </TableClickableCell>
                   );
                 }
 
                 case 'hashed': {
-                  const { partitionDimensions } = value;
-                  if (!Array.isArray(partitionDimensions)) return JSONBig.stringify(value);
+                  const { partitionDimensions } = v;
+                  if (!Array.isArray(partitionDimensions)) return value;
                   return (
                     <TableClickableCell
-                      tooltip="Show full shardSpec"
                       onClick={onShowFullShardSpec}
                       hoverIcon={IconNames.EYE_OPEN}
                     >
@@ -761,7 +714,6 @@ export class SegmentsView extends React.PureComponent<SegmentsViewProps, Segment
                 case 'tombstone':
                   return (
                     <TableClickableCell
-                      tooltip="Show full shardSpec"
                       onClick={onShowFullShardSpec}
                       hoverIcon={IconNames.EYE_OPEN}
                     >
@@ -772,11 +724,10 @@ export class SegmentsView extends React.PureComponent<SegmentsViewProps, Segment
                 default:
                   return (
                     <TableClickableCell
-                      tooltip="Show full shardSpec"
                       onClick={onShowFullShardSpec}
                       hoverIcon={IconNames.EYE_OPEN}
                     >
-                      {JSONBig.stringify(value)}
+                      {String(value)}
                     </TableClickableCell>
                   );
               }
@@ -801,6 +752,7 @@ export class SegmentsView extends React.PureComponent<SegmentsViewProps, Segment
             accessor: 'partition_num',
             width: 60,
             filterable: false,
+            sortable: hasSql,
             className: 'padded',
           },
           {
@@ -808,6 +760,7 @@ export class SegmentsView extends React.PureComponent<SegmentsViewProps, Segment
             show: visibleColumns.shown('Size'),
             accessor: 'size',
             filterable: false,
+            sortable: hasSql,
             defaultSortDesc: true,
             width: 120,
             className: 'padded',
@@ -867,7 +820,7 @@ export class SegmentsView extends React.PureComponent<SegmentsViewProps, Segment
           },
           {
             Header: twoLines('Replication factor', <i>(desired)</i>),
-            show: visibleColumns.shown('Replication factor'),
+            show: hasSql && visibleColumns.shown('Replication factor'),
             accessor: 'replication_factor',
             width: 80,
             filterable: false,
@@ -894,7 +847,7 @@ export class SegmentsView extends React.PureComponent<SegmentsViewProps, Segment
           },
           {
             Header: 'Is realtime',
-            show: visibleColumns.shown('Is realtime'),
+            show: hasSql && visibleColumns.shown('Is realtime'),
             id: 'is_realtime',
             accessor: row => String(Boolean(row.is_realtime)),
             Filter: BooleanFilterInput,
@@ -912,7 +865,7 @@ export class SegmentsView extends React.PureComponent<SegmentsViewProps, Segment
           },
           {
             Header: 'Is overshadowed',
-            show: visibleColumns.shown('Is overshadowed'),
+            show: hasSql && visibleColumns.shown('Is overshadowed'),
             id: 'is_overshadowed',
             accessor: row => String(Boolean(row.is_overshadowed)),
             Filter: BooleanFilterInput,
@@ -992,9 +945,9 @@ export class SegmentsView extends React.PureComponent<SegmentsViewProps, Segment
           <MenuItem
             icon={IconNames.APPLICATION}
             text="View SQL query for table"
-            disabled={typeof lastSegmentsQuery !== 'string'}
+            disabled={!lastSegmentsQuery}
             onClick={() => {
-              if (typeof lastSegmentsQuery !== 'string') return;
+              if (!lastSegmentsQuery) return;
               goToQuery({ queryString: lastSegmentsQuery });
             }}
           />
@@ -1004,7 +957,6 @@ export class SegmentsView extends React.PureComponent<SegmentsViewProps, Segment
   }
 
   render() {
-    const { capabilities, onFiltersChange } = this.props;
     const {
       segmentTableActionDialogId,
       datasourceTableActionDialogId,
@@ -1012,14 +964,18 @@ export class SegmentsView extends React.PureComponent<SegmentsViewProps, Segment
       visibleColumns,
       showSegmentTimeline,
       showFullShardSpec,
-      groupByInterval,
     } = this.state;
+    const { capabilities } = this.props;
+    const { groupByInterval } = this.state;
 
     return (
       <div className="segments-view app-view">
         <ViewControlBar label="Segments">
           <RefreshButton
-            onRefresh={this.refresh}
+            onRefresh={auto => {
+              if (auto && hasPopoverOpen()) return;
+              this.segmentsQueryManager.rerunLastQuery(auto);
+            }}
             localStorageKey={LocalStorageKeys.SEGMENTS_REFRESH_RATE}
           />
           <Label>Group by</Label>
@@ -1028,6 +984,7 @@ export class SegmentsView extends React.PureComponent<SegmentsViewProps, Segment
               active={!groupByInterval}
               onClick={() => {
                 this.setState({ groupByInterval: false });
+                this.fetchData(false);
               }}
             >
               None
@@ -1036,6 +993,7 @@ export class SegmentsView extends React.PureComponent<SegmentsViewProps, Segment
               active={groupByInterval}
               onClick={() => {
                 this.setState({ groupByInterval: true });
+                this.fetchData(true);
               }}
             >
               Interval
@@ -1043,13 +1001,9 @@ export class SegmentsView extends React.PureComponent<SegmentsViewProps, Segment
           </ButtonGroup>
           {this.renderBulkSegmentsActions()}
           <Switch
-            checked={Boolean(showSegmentTimeline)}
+            checked={showSegmentTimeline}
             label="Show segment timeline"
-            onChange={() =>
-              this.setState({
-                showSegmentTimeline: showSegmentTimeline ? undefined : { capabilities },
-              })
-            }
+            onChange={() => this.setState({ showSegmentTimeline: !showSegmentTimeline })}
             disabled={!capabilities.hasSqlOrCoordinatorAccess()}
           />
           <TableColumnSelector
@@ -1061,13 +1015,12 @@ export class SegmentsView extends React.PureComponent<SegmentsViewProps, Segment
             }
             onClose={added => {
               if (!added) return;
-              this.fetchData();
+              this.fetchData(groupByInterval);
             }}
             tableColumnsHidden={visibleColumns.getHiddenColumns()}
           />
         </ViewControlBar>
         <SplitterLayout
-          className="timeline-segments-splitter"
           vertical
           percentage
           secondaryInitialSize={35}
@@ -1075,33 +1028,7 @@ export class SegmentsView extends React.PureComponent<SegmentsViewProps, Segment
           primaryMinSize={20}
           secondaryMinSize={10}
         >
-          {showSegmentTimeline && (
-            <SegmentTimeline
-              capabilities={showSegmentTimeline.capabilities}
-              datasource={showSegmentTimeline.datasource}
-              getIntervalActionButton={(start, end, datasource, realtime) => {
-                return (
-                  <Button
-                    text="Apply fitler to table"
-                    small
-                    rightIcon={IconNames.ARROW_DOWN}
-                    onClick={() =>
-                      onFiltersChange(
-                        compact([
-                          start && { id: 'start', value: `>=${start.toISOString()}` },
-                          end && { id: 'end', value: `<${end.toISOString()}` },
-                          datasource && { id: 'datasource', value: `=${datasource}` },
-                          typeof realtime === 'boolean'
-                            ? { id: 'is_realtime', value: `=${realtime}` }
-                            : undefined,
-                        ]),
-                      )
-                    }
-                  />
-                );
-              }}
-            />
-          )}
+          {showSegmentTimeline && <SegmentTimeline capabilities={capabilities} />}
           {this.renderSegmentsTable()}
         </SplitterLayout>
         {this.renderTerminateSegmentAction()}
diff --git a/web-console/src/views/services-view/services-view.tsx b/web-console/src/views/services-view/services-view.tsx
index e658d9355947..88a5be35c527 100644
--- a/web-console/src/views/services-view/services-view.tsx
+++ b/web-console/src/views/services-view/services-view.tsx
@@ -48,8 +48,7 @@ import {
   formatBytes,
   formatBytesCompact,
   formatDurationWithMsIfNeeded,
-  getApiArray,
-  hasOverlayOpen,
+  hasPopoverOpen,
   LocalStorageBackedVisibility,
   LocalStorageKeys,
   lookupBy,
@@ -258,24 +257,24 @@ ORDER BY
         if (capabilities.hasSql()) {
           services = await queryDruidSql({ query: ServicesView.SERVICE_SQL }, cancelToken);
         } else if (capabilities.hasCoordinatorAccess()) {
-          services = (await getApiArray('/druid/coordinator/v1/servers?simple', cancelToken)).map(
-            (s: any): ServiceResultRow => {
-              const hostParts = s.host.split(':');
-              const port = parseInt(hostParts[1], 10);
-              return {
-                service: s.host,
-                service_type: s.type === 'indexer-executor' ? 'peon' : s.type,
-                tier: s.tier,
-                host: hostParts[0],
-                plaintext_port: port < 9000 ? port : -1,
-                tls_port: port < 9000 ? -1 : port,
-                curr_size: s.currSize,
-                max_size: s.maxSize,
-                start_time: '1970:01:01T00:00:00Z',
-                is_leader: 0,
-              };
-            },
-          );
+          services = (
+            await Api.instance.get('/druid/coordinator/v1/servers?simple', { cancelToken })
+          ).data.map((s: any): ServiceResultRow => {
+            const hostParts = s.host.split(':');
+            const port = parseInt(hostParts[1], 10);
+            return {
+              service: s.host,
+              service_type: s.type === 'indexer-executor' ? 'peon' : s.type,
+              tier: s.tier,
+              host: hostParts[0],
+              plaintext_port: port < 9000 ? port : -1,
+              tls_port: port < 9000 ? -1 : port,
+              curr_size: s.currSize,
+              max_size: s.maxSize,
+              start_time: '1970:01:01T00:00:00Z',
+              is_leader: 0,
+            };
+          });
         } else {
           throw new Error(`must have SQL or coordinator access`);
         }
@@ -309,10 +308,9 @@ ORDER BY
         if (capabilities.hasOverlordAccess()) {
           auxiliaryQueries.push(async (services, cancelToken) => {
             try {
-              const workerInfos = await getApiArray<WorkerInfo>(
-                '/druid/indexer/v1/workers',
-                cancelToken,
-              );
+              const workerInfos = (
+                await Api.instance.get<WorkerInfo[]>('/druid/indexer/v1/workers', { cancelToken })
+              ).data;
 
               const workerInfoLookup: Record<string, WorkerInfo> = lookupBy(
                 workerInfos,
@@ -810,7 +808,7 @@ ORDER BY
           </ButtonGroup>
           <RefreshButton
             onRefresh={auto => {
-              if (auto && hasOverlayOpen()) return;
+              if (auto && hasPopoverOpen()) return;
               this.serviceQueryManager.rerunLastQuery(auto);
             }}
             localStorageKey={LocalStorageKeys.SERVICES_REFRESH_RATE}
diff --git a/web-console/src/views/sql-data-loader-view/column-actions/column-actions.tsx b/web-console/src/views/sql-data-loader-view/column-actions/column-actions.tsx
index 64738e86e5f5..03ea12c738fa 100644
--- a/web-console/src/views/sql-data-loader-view/column-actions/column-actions.tsx
+++ b/web-console/src/views/sql-data-loader-view/column-actions/column-actions.tsx
@@ -18,8 +18,8 @@
 
 import { Button, FormGroup, Menu, MenuItem, Popover } from '@blueprintjs/core';
 import { IconNames } from '@blueprintjs/icons';
-import type { QueryResult, SqlExpression } from 'druid-query-toolkit';
-import { F } from 'druid-query-toolkit';
+import type { QueryResult, SqlExpression } from '@druid-toolkit/query';
+import { F } from '@druid-toolkit/query';
 import type { JSX } from 'react';
 import React from 'react';
 
diff --git a/web-console/src/views/sql-data-loader-view/column-editor/column-editor.tsx b/web-console/src/views/sql-data-loader-view/column-editor/column-editor.tsx
index b10f0d5c78a8..6e1cd3092bc0 100644
--- a/web-console/src/views/sql-data-loader-view/column-editor/column-editor.tsx
+++ b/web-console/src/views/sql-data-loader-view/column-editor/column-editor.tsx
@@ -28,8 +28,8 @@ import {
   Position,
 } from '@blueprintjs/core';
 import { IconNames } from '@blueprintjs/icons';
-import type { QueryResult } from 'druid-query-toolkit';
-import { F, SqlExpression, SqlFunction, SqlType } from 'druid-query-toolkit';
+import type { QueryResult } from '@druid-toolkit/query';
+import { F, SqlExpression, SqlFunction, SqlType } from '@druid-toolkit/query';
 import type { JSX } from 'react';
 import React, { useState } from 'react';
 
diff --git a/web-console/src/views/sql-data-loader-view/expression-editor-dialog/expression-editor-dialog.tsx b/web-console/src/views/sql-data-loader-view/expression-editor-dialog/expression-editor-dialog.tsx
index bb7b4227b4ee..1b6d08df20ae 100644
--- a/web-console/src/views/sql-data-loader-view/expression-editor-dialog/expression-editor-dialog.tsx
+++ b/web-console/src/views/sql-data-loader-view/expression-editor-dialog/expression-editor-dialog.tsx
@@ -18,7 +18,7 @@
 
 import { Button, Classes, Dialog, FormGroup, InputGroup, Intent } from '@blueprintjs/core';
 import { IconNames } from '@blueprintjs/icons';
-import { SqlExpression } from 'druid-query-toolkit';
+import { SqlExpression } from '@druid-toolkit/query';
 import React, { useState } from 'react';
 
 import { FlexibleQueryInput } from '../../workbench-view/flexible-query-input/flexible-query-input';
diff --git a/web-console/src/views/sql-data-loader-view/ingestion-progress-dialog/ingestion-progress-dialog.tsx b/web-console/src/views/sql-data-loader-view/ingestion-progress-dialog/ingestion-progress-dialog.tsx
index 43e03a91e912..ac6def8151c0 100644
--- a/web-console/src/views/sql-data-loader-view/ingestion-progress-dialog/ingestion-progress-dialog.tsx
+++ b/web-console/src/views/sql-data-loader-view/ingestion-progress-dialog/ingestion-progress-dialog.tsx
@@ -18,8 +18,8 @@
 
 import { Button, Classes, Dialog, Intent } from '@blueprintjs/core';
 import { IconNames } from '@blueprintjs/icons';
+import { T } from '@druid-toolkit/query';
 import classNames from 'classnames';
-import { T } from 'druid-query-toolkit';
 import React, { useState } from 'react';
 
 import type { Execution, QueryWithContext } from '../../../druid-models';
diff --git a/web-console/src/views/sql-data-loader-view/schema-step/column-list/column-list.tsx b/web-console/src/views/sql-data-loader-view/schema-step/column-list/column-list.tsx
index 3d771cc725c6..feba2bfda885 100644
--- a/web-console/src/views/sql-data-loader-view/schema-step/column-list/column-list.tsx
+++ b/web-console/src/views/sql-data-loader-view/schema-step/column-list/column-list.tsx
@@ -18,7 +18,7 @@
 
 import { Icon, Popover } from '@blueprintjs/core';
 import { IconNames } from '@blueprintjs/icons';
-import type { QueryResult, SqlExpression } from 'druid-query-toolkit';
+import type { QueryResult, SqlExpression } from '@druid-toolkit/query';
 import { useMemo } from 'react';
 
 import { LearnMore, PopoverText } from '../../../../components';
diff --git a/web-console/src/views/sql-data-loader-view/schema-step/column-list/expression-entry/expression-entry.tsx b/web-console/src/views/sql-data-loader-view/schema-step/column-list/expression-entry/expression-entry.tsx
index 802cbec77673..9eed114a8e64 100644
--- a/web-console/src/views/sql-data-loader-view/schema-step/column-list/expression-entry/expression-entry.tsx
+++ b/web-console/src/views/sql-data-loader-view/schema-step/column-list/expression-entry/expression-entry.tsx
@@ -17,9 +17,9 @@
  */
 
 import { Icon } from '@blueprintjs/core';
+import type { Column, QueryResult } from '@druid-toolkit/query';
+import { SqlColumn } from '@druid-toolkit/query';
 import classNames from 'classnames';
-import type { Column, QueryResult } from 'druid-query-toolkit';
-import { SqlColumn } from 'druid-query-toolkit';
 
 import { columnToIcon } from '../../../../../utils';
 
diff --git a/web-console/src/views/sql-data-loader-view/schema-step/preview-table/preview-table.tsx b/web-console/src/views/sql-data-loader-view/schema-step/preview-table/preview-table.tsx
index d332459b55f7..0bbfd85f5462 100644
--- a/web-console/src/views/sql-data-loader-view/schema-step/preview-table/preview-table.tsx
+++ b/web-console/src/views/sql-data-loader-view/schema-step/preview-table/preview-table.tsx
@@ -18,9 +18,9 @@
 
 import { Icon, Popover } from '@blueprintjs/core';
 import { IconNames } from '@blueprintjs/icons';
+import type { Column, QueryResult, SqlExpression, SqlQuery } from '@druid-toolkit/query';
+import { SqlAlias, SqlFunction, SqlStar } from '@druid-toolkit/query';
 import classNames from 'classnames';
-import type { Column, QueryResult, SqlExpression, SqlQuery } from 'druid-query-toolkit';
-import { SqlAlias, SqlFunction, SqlStar } from 'druid-query-toolkit';
 import React, { useState } from 'react';
 import type { RowRenderProps } from 'react-table';
 import ReactTable from 'react-table';
@@ -77,7 +77,7 @@ export const PreviewTable = React.memo(function PreviewTable(props: PreviewTable
   const { queryResult, onQueryAction, columnFilter, selectedColumnIndex, onEditColumn } = props;
   const [showValue, setShowValue] = useState<string>();
 
-  const parsedQuery = queryResult.sqlQuery;
+  const parsedQuery: SqlQuery = queryResult.sqlQuery!;
   if (!parsedQuery) return null;
 
   function hasFilterOnHeader(header: string, headerIndex: number): boolean {
diff --git a/web-console/src/views/sql-data-loader-view/schema-step/rollup-analysis-pane/rollup-analysis-pane.tsx b/web-console/src/views/sql-data-loader-view/schema-step/rollup-analysis-pane/rollup-analysis-pane.tsx
index e93ec9e9a005..d39927ac6fdb 100644
--- a/web-console/src/views/sql-data-loader-view/schema-step/rollup-analysis-pane/rollup-analysis-pane.tsx
+++ b/web-console/src/views/sql-data-loader-view/schema-step/rollup-analysis-pane/rollup-analysis-pane.tsx
@@ -18,9 +18,9 @@
 
 import { Button, Callout, Intent, Tag } from '@blueprintjs/core';
 import { IconNames } from '@blueprintjs/icons';
+import type { QueryResult, SqlQuery } from '@druid-toolkit/query';
+import { F, SqlExpression, SqlFunction } from '@druid-toolkit/query';
 import type { CancelToken } from 'axios';
-import type { QueryResult, SqlQuery } from 'druid-query-toolkit';
-import { F, SqlExpression, SqlFunction } from 'druid-query-toolkit';
 import type { JSX } from 'react';
 import React, { useEffect } from 'react';
 
diff --git a/web-console/src/views/sql-data-loader-view/schema-step/schema-step.tsx b/web-console/src/views/sql-data-loader-view/schema-step/schema-step.tsx
index d9b8e1089b9d..a7b8f83bdbea 100644
--- a/web-console/src/views/sql-data-loader-view/schema-step/schema-step.tsx
+++ b/web-console/src/views/sql-data-loader-view/schema-step/schema-step.tsx
@@ -31,8 +31,6 @@ import {
   Tag,
 } from '@blueprintjs/core';
 import { IconNames } from '@blueprintjs/icons';
-import classNames from 'classnames';
-import { select, selectAll } from 'd3-selection';
 import {
   C,
   Column,
@@ -42,7 +40,9 @@ import {
   SqlExpression,
   SqlQuery,
   SqlType,
-} from 'druid-query-toolkit';
+} from '@druid-toolkit/query';
+import classNames from 'classnames';
+import { select, selectAll } from 'd3-selection';
 import type { JSX } from 'react';
 import { useCallback, useEffect, useLayoutEffect, useMemo, useRef, useState } from 'react';
 
diff --git a/web-console/src/views/sql-data-loader-view/sql-data-loader-view.tsx b/web-console/src/views/sql-data-loader-view/sql-data-loader-view.tsx
index 84e3901a566c..8238384d9aed 100644
--- a/web-console/src/views/sql-data-loader-view/sql-data-loader-view.tsx
+++ b/web-console/src/views/sql-data-loader-view/sql-data-loader-view.tsx
@@ -19,7 +19,7 @@
 import type { IconName } from '@blueprintjs/core';
 import { Card, Icon, Intent } from '@blueprintjs/core';
 import { IconNames } from '@blueprintjs/icons';
-import { SqlQuery, SqlTable } from 'druid-query-toolkit';
+import { SqlQuery, SqlTable } from '@druid-toolkit/query';
 import type { JSX } from 'react';
 import React, { useState } from 'react';
 
diff --git a/web-console/src/views/supervisors-view/__snapshots__/supervisors-view.spec.tsx.snap b/web-console/src/views/supervisors-view/__snapshots__/supervisors-view.spec.tsx.snap
index f9a450468e79..e3458f4749ca 100644
--- a/web-console/src/views/supervisors-view/__snapshots__/supervisors-view.spec.tsx.snap
+++ b/web-console/src/views/supervisors-view/__snapshots__/supervisors-view.spec.tsx.snap
@@ -15,7 +15,7 @@ exports[`SupervisorsView matches snapshot 1`] = `
       <Memo(MoreButton)>
         <Blueprint5.MenuItem
           active={false}
-          disabled={true}
+          disabled={false}
           icon="application"
           multiline={false}
           onClick={[Function]}
@@ -326,7 +326,7 @@ exports[`SupervisorsView matches snapshot 1`] = `
     defaultFilterMethod={[Function]}
     defaultFiltered={[]}
     defaultPage={0}
-    defaultPageSize={20}
+    defaultPageSize={25}
     defaultResized={[]}
     defaultSortDesc={false}
     defaultSortMethod={[Function]}
@@ -366,7 +366,7 @@ exports[`SupervisorsView matches snapshot 1`] = `
     getTrProps={[Function]}
     groupedByPivotKey="_groupedByPivot"
     indexKey="_index"
-    loading={true}
+    loading={false}
     loadingText="Loading..."
     manual={true}
     multiSort={true}
@@ -376,13 +376,8 @@ exports[`SupervisorsView matches snapshot 1`] = `
     ofText=""
     onFetchData={[Function]}
     onFilteredChange={[Function]}
-    onPageChange={[Function]}
-    onPageSizeChange={[Function]}
-    onSortedChange={[Function]}
     originalKey="_original"
-    page={0}
     pageJumpText="jump to page"
-    pageSize={25}
     pageSizeOptions={
       [
         25,
@@ -406,7 +401,6 @@ exports[`SupervisorsView matches snapshot 1`] = `
     showPaginationBottom={true}
     showPaginationTop={false}
     sortable={true}
-    sorted={[]}
     style={{}}
     subRowsKey="_subRows"
   />
diff --git a/web-console/src/views/supervisors-view/supervisors-view.tsx b/web-console/src/views/supervisors-view/supervisors-view.tsx
index f75d533cf3f0..2474782e0aeb 100644
--- a/web-console/src/views/supervisors-view/supervisors-view.tsx
+++ b/web-console/src/views/supervisors-view/supervisors-view.tsx
@@ -18,10 +18,11 @@
 
 import { Icon, Intent, Menu, MenuItem, Popover, Position, Tag } from '@blueprintjs/core';
 import { IconNames } from '@blueprintjs/icons';
+import { SqlExpression } from '@druid-toolkit/query';
 import * as JSONBig from 'json-bigint-native';
 import type { JSX } from 'react';
 import React from 'react';
-import type { Filter, SortingRule } from 'react-table';
+import type { Filter } from 'react-table';
 import ReactTable from 'react-table';
 
 import type { TableColumnSelectorColumn } from '../../components';
@@ -57,7 +58,7 @@ import type { Capabilities } from '../../helpers';
 import {
   SMALL_TABLE_PAGE_SIZE,
   SMALL_TABLE_PAGE_SIZE_OPTIONS,
-  sqlQueryCustomTableFilters,
+  sqlQueryCustomTableFilter,
 } from '../../react-table';
 import { Api, AppToaster } from '../../singletons';
 import type { AuxiliaryQueryFn, TableState } from '../../utils';
@@ -66,13 +67,13 @@ import {
   changeByIndex,
   checkedCircleIcon,
   deepGet,
+  filterMap,
   formatByteRate,
   formatBytes,
   formatInteger,
   formatRate,
-  getApiArray,
   getDruidErrorMessage,
-  hasOverlayOpen,
+  hasPopoverOpen,
   isNumberLike,
   LocalStorageBackedVisibility,
   LocalStorageKeys,
@@ -161,11 +162,7 @@ export interface SupervisorsViewState {
 
   supervisorTableActionDialogId?: string;
   supervisorTableActionDialogActions: BasicAction[];
-
   visibleColumns: LocalStorageBackedVisibility;
-  page: number;
-  pageSize: number;
-  sorted: SortingRule[];
 }
 
 function detailedStateToColor(detailedState: string): string {
@@ -226,9 +223,6 @@ export class SupervisorsView extends React.PureComponent<
       visibleColumns: new LocalStorageBackedVisibility(
         LocalStorageKeys.SUPERVISOR_TABLE_COLUMN_SELECTION,
       ),
-      page: 0,
-      pageSize: SMALL_TABLE_PAGE_SIZE,
-      sorted: [],
     };
 
     this.supervisorQueryManager = new QueryManager({
@@ -239,11 +233,10 @@ export class SupervisorsView extends React.PureComponent<
       ) => {
         let supervisors: SupervisorQueryResultRow[];
         if (capabilities.hasSql()) {
-          const whereExpression = sqlQueryCustomTableFilters(filtered);
-
           let filterClause = '';
-          if (whereExpression.toString() !== 'TRUE') {
-            filterClause = whereExpression.toString();
+          const whereParts = filterMap(filtered, sqlQueryCustomTableFilter);
+          if (whereParts.length) {
+            filterClause = SqlExpression.and(...whereParts).toString();
           }
 
           const sqlQuery = assemble(
@@ -276,22 +269,26 @@ export class SupervisorsView extends React.PureComponent<
             return { ...supervisor, spec: JSONBig.parse(spec) };
           });
         } else if (capabilities.hasOverlordAccess()) {
-          supervisors = (await getApiArray('/druid/indexer/v1/supervisor?full', cancelToken)).map(
-            (sup: any) => {
-              return {
-                supervisor_id: deepGet(sup, 'id'),
-                type: deepGet(sup, 'spec.tuningConfig.type'),
-                source:
-                  deepGet(sup, 'spec.ioConfig.topic') ||
-                  deepGet(sup, 'spec.ioConfig.stream') ||
-                  'n/a',
-                state: deepGet(sup, 'state'),
-                detailed_state: deepGet(sup, 'detailedState'),
-                spec: sup.spec,
-                suspended: Boolean(deepGet(sup, 'suspended')),
-              };
-            },
-          );
+          const supervisorList = (
+            await Api.instance.get('/druid/indexer/v1/supervisor?full', { cancelToken })
+          ).data;
+          if (!Array.isArray(supervisorList)) {
+            throw new Error(`Unexpected result from /druid/indexer/v1/supervisor?full`);
+          }
+          supervisors = supervisorList.map((sup: any) => {
+            return {
+              supervisor_id: deepGet(sup, 'id'),
+              type: deepGet(sup, 'spec.tuningConfig.type'),
+              source:
+                deepGet(sup, 'spec.ioConfig.topic') ||
+                deepGet(sup, 'spec.ioConfig.stream') ||
+                'n/a',
+              state: deepGet(sup, 'state'),
+              detailed_state: deepGet(sup, 'detailedState'),
+              spec: sup.spec,
+              suspended: Boolean(deepGet(sup, 'suspended')),
+            };
+          });
 
           const firstSorted = sorted[0];
           if (firstSorted) {
@@ -358,37 +355,22 @@ export class SupervisorsView extends React.PureComponent<
     });
   }
 
-  componentDidMount() {
-    this.fetchData();
-  }
+  private lastTableState: TableState | undefined;
 
   componentWillUnmount(): void {
     this.supervisorQueryManager.terminate();
   }
 
-  componentDidUpdate(
-    prevProps: Readonly<SupervisorsViewProps>,
-    prevState: Readonly<SupervisorsViewState>,
-  ) {
-    const { filters } = this.props;
-    const { page, pageSize, sorted } = this.state;
-    if (
-      !sqlQueryCustomTableFilters(filters).equals(sqlQueryCustomTableFilters(prevProps.filters)) ||
-      page !== prevState.page ||
-      pageSize !== prevState.pageSize ||
-      sortedToOrderByClause(sorted) !== sortedToOrderByClause(prevState.sorted)
-    ) {
-      this.fetchData();
-    }
-  }
-
-  private readonly fetchData = () => {
-    const { capabilities, filters } = this.props;
-    const { visibleColumns, page, pageSize, sorted } = this.state;
+  private readonly fetchData = (tableState?: TableState) => {
+    const { capabilities } = this.props;
+    const { visibleColumns } = this.state;
+    if (tableState) this.lastTableState = tableState;
+    if (!this.lastTableState) return;
+    const { page, pageSize, filtered, sorted } = this.lastTableState;
     this.supervisorQueryManager.runQuery({
       page,
       pageSize,
-      filtered: filters,
+      filtered,
       sorted,
       visibleColumns,
       capabilities,
@@ -681,7 +663,7 @@ export class SupervisorsView extends React.PureComponent<
 
   private renderSupervisorTable() {
     const { goToTasks, filters, onFiltersChange } = this.props;
-    const { supervisorsState, statsKey, visibleColumns, page, pageSize, sorted } = this.state;
+    const { supervisorsState, statsKey, visibleColumns } = this.state;
 
     const supervisors = supervisorsState.data || [];
     return (
@@ -696,16 +678,14 @@ export class SupervisorsView extends React.PureComponent<
         filterable
         filtered={filters}
         onFilteredChange={onFiltersChange}
-        sorted={sorted}
-        onSortedChange={sorted => this.setState({ sorted })}
-        page={page}
-        onPageChange={page => this.setState({ page })}
-        pageSize={pageSize}
-        onPageSizeChange={pageSize => this.setState({ pageSize })}
-        pageSizeOptions={SMALL_TABLE_PAGE_SIZE_OPTIONS}
-        showPagination={supervisors.length > SMALL_TABLE_PAGE_SIZE}
+        onFetchData={tableState => {
+          this.fetchData(tableState);
+        }}
         showPageJump={false}
         ofText=""
+        defaultPageSize={SMALL_TABLE_PAGE_SIZE}
+        pageSizeOptions={SMALL_TABLE_PAGE_SIZE_OPTIONS}
+        showPagination={supervisors.length > SMALL_TABLE_PAGE_SIZE}
         columns={[
           {
             Header: twoLines('Supervisor ID', <i>(datasource)</i>),
@@ -715,7 +695,6 @@ export class SupervisorsView extends React.PureComponent<
             show: visibleColumns.shown('Supervisor ID'),
             Cell: ({ value, original }) => (
               <TableClickableCell
-                tooltip="Show detail"
                 onClick={() => this.onSupervisorDetail(original)}
                 hoverIcon={IconNames.SEARCH_TEMPLATE}
               >
@@ -812,9 +791,9 @@ export class SupervisorsView extends React.PureComponent<
               }
               return (
                 <TableClickableCell
-                  tooltip="Go to tasks"
                   onClick={() => goToTasks(original.supervisor_id, `index_${original.type}`)}
                   hoverIcon={IconNames.ARROW_TOP_RIGHT}
+                  title="Go to tasks"
                 >
                   {label}
                 </TableClickableCell>
@@ -924,9 +903,9 @@ export class SupervisorsView extends React.PureComponent<
               if (!value) return null;
               return (
                 <TableClickableCell
-                  tooltip="Show errors"
                   onClick={() => this.onSupervisorDetail(original)}
                   hoverIcon={IconNames.SEARCH_TEMPLATE}
+                  title="See errors"
                 >
                   {pluralIfNeeded(value.length, 'error')}
                 </TableClickableCell>
@@ -970,11 +949,7 @@ export class SupervisorsView extends React.PureComponent<
             <MenuItem
               icon={IconNames.APPLICATION}
               text="View SQL query for table"
-              disabled={typeof lastSupervisorQuery !== 'string'}
-              onClick={() => {
-                if (typeof lastSupervisorQuery !== 'string') return;
-                goToQuery({ queryString: lastSupervisorQuery });
-              }}
+              onClick={() => goToQuery({ queryString: lastSupervisorQuery })}
             />
           )}
           <MenuItem
@@ -1099,7 +1074,7 @@ export class SupervisorsView extends React.PureComponent<
           <RefreshButton
             localStorageKey={LocalStorageKeys.SUPERVISORS_REFRESH_RATE}
             onRefresh={auto => {
-              if (auto && hasOverlayOpen()) return;
+              if (auto && hasPopoverOpen()) return;
               this.supervisorQueryManager.rerunLastQuery(auto);
             }}
           />
diff --git a/web-console/src/views/tasks-view/tasks-view.tsx b/web-console/src/views/tasks-view/tasks-view.tsx
index f968b7d4925f..2bad1a29f66b 100644
--- a/web-console/src/views/tasks-view/tasks-view.tsx
+++ b/web-console/src/views/tasks-view/tasks-view.tsx
@@ -42,9 +42,8 @@ import { SMALL_TABLE_PAGE_SIZE, SMALL_TABLE_PAGE_SIZE_OPTIONS } from '../../reac
 import { Api, AppToaster } from '../../singletons';
 import {
   formatDuration,
-  getApiArray,
   getDruidErrorMessage,
-  hasOverlayOpen,
+  hasPopoverOpen,
   LocalStorageBackedVisibility,
   LocalStorageKeys,
   oneOf,
@@ -175,19 +174,8 @@ ORDER BY
             cancelToken,
           );
         } else if (capabilities.hasOverlordAccess()) {
-          return (await getApiArray(`/druid/indexer/v1/tasks`, cancelToken)).map(d => {
-            return {
-              task_id: d.id,
-              group_id: d.groupId,
-              type: d.type,
-              created_time: d.createdTime,
-              datasource: d.dataSource,
-              duration: d.duration ? d.duration : 0,
-              error_msg: d.errorMsg,
-              location: d.location.host ? `${d.location.host}:${d.location.port}` : null,
-              status: d.statusCode === 'RUNNING' ? d.runnerStatusCode : d.statusCode,
-            };
-          });
+          const resp = await Api.instance.get(`/druid/indexer/v1/tasks`, { cancelToken });
+          return TasksView.parseTasks(resp.data);
         } else {
           throw new Error(`must have SQL or overlord access`);
         }
@@ -200,6 +188,22 @@ ORDER BY
     });
   }
 
+  static parseTasks = (data: any[]): TaskQueryResultRow[] => {
+    return data.map(d => {
+      return {
+        task_id: d.id,
+        group_id: d.groupId,
+        type: d.type,
+        created_time: d.createdTime,
+        datasource: d.dataSource,
+        duration: d.duration ? d.duration : 0,
+        error_msg: d.errorMsg,
+        location: d.location.host ? `${d.location.host}:${d.location.port}` : null,
+        status: d.statusCode === 'RUNNING' ? d.runnerStatusCode : d.statusCode,
+      };
+    });
+  };
+
   componentDidMount(): void {
     const { capabilities } = this.props;
 
@@ -372,7 +376,6 @@ ORDER BY
             width: 440,
             Cell: ({ value, original }) => (
               <TableClickableCell
-                tooltip="Show detail"
                 onClick={() => this.onTaskDetail(original)}
                 hoverIcon={IconNames.SEARCH_TEMPLATE}
               >
@@ -591,7 +594,7 @@ ORDER BY
           <RefreshButton
             localStorageKey={LocalStorageKeys.TASKS_REFRESH_RATE}
             onRefresh={auto => {
-              if (auto && hasOverlayOpen()) return;
+              if (auto && hasPopoverOpen()) return;
               this.taskQueryManager.rerunLastQuery(auto);
             }}
           />
diff --git a/web-console/src/views/workbench-view/column-tree/column-tree-menu/complex-menu-items/complex-menu-items.spec.tsx b/web-console/src/views/workbench-view/column-tree/column-tree-menu/complex-menu-items/complex-menu-items.spec.tsx
index 6e095388cb39..e11ca98e0d9d 100644
--- a/web-console/src/views/workbench-view/column-tree/column-tree-menu/complex-menu-items/complex-menu-items.spec.tsx
+++ b/web-console/src/views/workbench-view/column-tree/column-tree-menu/complex-menu-items/complex-menu-items.spec.tsx
@@ -16,8 +16,8 @@
  * limitations under the License.
  */
 
+import { SqlQuery } from '@druid-toolkit/query';
 import { render } from '@testing-library/react';
-import { SqlQuery } from 'druid-query-toolkit';
 
 import { ComplexMenuItems } from './complex-menu-items';
 
diff --git a/web-console/src/views/workbench-view/column-tree/column-tree-menu/complex-menu-items/complex-menu-items.tsx b/web-console/src/views/workbench-view/column-tree/column-tree-menu/complex-menu-items/complex-menu-items.tsx
index fc92568715e9..fa172262f07c 100644
--- a/web-console/src/views/workbench-view/column-tree/column-tree-menu/complex-menu-items/complex-menu-items.tsx
+++ b/web-console/src/views/workbench-view/column-tree/column-tree-menu/complex-menu-items/complex-menu-items.tsx
@@ -18,8 +18,8 @@
 
 import { MenuItem } from '@blueprintjs/core';
 import { IconNames } from '@blueprintjs/icons';
-import type { SqlExpression, SqlQuery } from 'druid-query-toolkit';
-import { C, F } from 'druid-query-toolkit';
+import type { SqlExpression, SqlQuery } from '@druid-toolkit/query';
+import { C, F } from '@druid-toolkit/query';
 import type { JSX } from 'react';
 import React from 'react';
 
diff --git a/web-console/src/views/workbench-view/column-tree/column-tree-menu/number-menu-items/number-menu-items.spec.tsx b/web-console/src/views/workbench-view/column-tree/column-tree-menu/number-menu-items/number-menu-items.spec.tsx
index 80216b02e5fe..80c7d22eda46 100644
--- a/web-console/src/views/workbench-view/column-tree/column-tree-menu/number-menu-items/number-menu-items.spec.tsx
+++ b/web-console/src/views/workbench-view/column-tree/column-tree-menu/number-menu-items/number-menu-items.spec.tsx
@@ -16,8 +16,8 @@
  * limitations under the License.
  */
 
+import { SqlQuery } from '@druid-toolkit/query';
 import { render } from '@testing-library/react';
-import { SqlQuery } from 'druid-query-toolkit';
 
 import { NumberMenuItems } from './number-menu-items';
 
diff --git a/web-console/src/views/workbench-view/column-tree/column-tree-menu/number-menu-items/number-menu-items.tsx b/web-console/src/views/workbench-view/column-tree/column-tree-menu/number-menu-items/number-menu-items.tsx
index e62e5cebbf6b..bf383f99254a 100644
--- a/web-console/src/views/workbench-view/column-tree/column-tree-menu/number-menu-items/number-menu-items.tsx
+++ b/web-console/src/views/workbench-view/column-tree/column-tree-menu/number-menu-items/number-menu-items.tsx
@@ -18,8 +18,8 @@
 
 import { MenuItem } from '@blueprintjs/core';
 import { IconNames } from '@blueprintjs/icons';
-import type { SqlExpression, SqlQuery } from 'druid-query-toolkit';
-import { C, F, L } from 'druid-query-toolkit';
+import type { SqlExpression, SqlQuery } from '@druid-toolkit/query';
+import { C, F, L } from '@druid-toolkit/query';
 import type { JSX } from 'react';
 import React from 'react';
 
diff --git a/web-console/src/views/workbench-view/column-tree/column-tree-menu/string-menu-items/string-menu-items.spec.tsx b/web-console/src/views/workbench-view/column-tree/column-tree-menu/string-menu-items/string-menu-items.spec.tsx
index d2717d04cac9..d50105d951ba 100644
--- a/web-console/src/views/workbench-view/column-tree/column-tree-menu/string-menu-items/string-menu-items.spec.tsx
+++ b/web-console/src/views/workbench-view/column-tree/column-tree-menu/string-menu-items/string-menu-items.spec.tsx
@@ -16,8 +16,8 @@
  * limitations under the License.
  */
 
+import { SqlQuery } from '@druid-toolkit/query';
 import { render } from '@testing-library/react';
-import { SqlQuery } from 'druid-query-toolkit';
 
 import { StringMenuItems } from './string-menu-items';
 
diff --git a/web-console/src/views/workbench-view/column-tree/column-tree-menu/string-menu-items/string-menu-items.tsx b/web-console/src/views/workbench-view/column-tree/column-tree-menu/string-menu-items/string-menu-items.tsx
index c52b807032b4..0dc0c684e453 100644
--- a/web-console/src/views/workbench-view/column-tree/column-tree-menu/string-menu-items/string-menu-items.tsx
+++ b/web-console/src/views/workbench-view/column-tree/column-tree-menu/string-menu-items/string-menu-items.tsx
@@ -18,8 +18,8 @@
 
 import { MenuItem } from '@blueprintjs/core';
 import { IconNames } from '@blueprintjs/icons';
-import type { SqlExpression, SqlQuery } from 'druid-query-toolkit';
-import { C, F, N, SqlJoinPart, SqlPlaceholder, T } from 'druid-query-toolkit';
+import type { SqlExpression, SqlQuery } from '@druid-toolkit/query';
+import { C, F, N, SqlJoinPart, SqlPlaceholder, T } from '@druid-toolkit/query';
 import type { JSX } from 'react';
 import React from 'react';
 
diff --git a/web-console/src/views/workbench-view/column-tree/column-tree-menu/time-menu-items/time-menu-items.spec.tsx b/web-console/src/views/workbench-view/column-tree/column-tree-menu/time-menu-items/time-menu-items.spec.tsx
index af79bd578cd9..402b2029eda4 100644
--- a/web-console/src/views/workbench-view/column-tree/column-tree-menu/time-menu-items/time-menu-items.spec.tsx
+++ b/web-console/src/views/workbench-view/column-tree/column-tree-menu/time-menu-items/time-menu-items.spec.tsx
@@ -16,8 +16,8 @@
  * limitations under the License.
  */
 
+import { SqlQuery } from '@druid-toolkit/query';
 import { render } from '@testing-library/react';
-import { SqlQuery } from 'druid-query-toolkit';
 
 import { TimeMenuItems } from './time-menu-items';
 
diff --git a/web-console/src/views/workbench-view/column-tree/column-tree-menu/time-menu-items/time-menu-items.tsx b/web-console/src/views/workbench-view/column-tree/column-tree-menu/time-menu-items/time-menu-items.tsx
index 3723a5235bd5..cbe569ac6ded 100644
--- a/web-console/src/views/workbench-view/column-tree/column-tree-menu/time-menu-items/time-menu-items.tsx
+++ b/web-console/src/views/workbench-view/column-tree/column-tree-menu/time-menu-items/time-menu-items.tsx
@@ -18,12 +18,12 @@
 
 import { MenuDivider, MenuItem } from '@blueprintjs/core';
 import { IconNames } from '@blueprintjs/icons';
-import type { SqlQuery } from 'druid-query-toolkit';
-import { C, F, SqlExpression } from 'druid-query-toolkit';
+import type { SqlQuery } from '@druid-toolkit/query';
+import { C, F, SqlExpression } from '@druid-toolkit/query';
 import type { JSX } from 'react';
 import React from 'react';
 
-import { day, hour, month, prettyPrintSql, TZ_UTC, year } from '../../../../../utils';
+import { prettyPrintSql } from '../../../../../utils';
 
 const LATEST_HOUR: SqlExpression = SqlExpression.parse(
   `? >= CURRENT_TIMESTAMP - INTERVAL '1' HOUR`,
@@ -52,6 +52,58 @@ function fillWithColumnStartEnd(columnName: string, start: Date, end: Date): Sql
   return BETWEEN.fillPlaceholders([start, column, column, end]);
 }
 
+// ------------------------------------
+
+function floorHour(dt: Date): Date {
+  dt = new Date(dt.valueOf());
+  dt.setUTCMinutes(0, 0, 0);
+  return dt;
+}
+
+function nextHour(dt: Date): Date {
+  dt = new Date(dt.valueOf());
+  dt.setUTCHours(dt.getUTCHours() + 1);
+  return dt;
+}
+
+function floorDay(dt: Date): Date {
+  dt = new Date(dt.valueOf());
+  dt.setUTCHours(0, 0, 0, 0);
+  return dt;
+}
+
+function nextDay(dt: Date): Date {
+  dt = new Date(dt.valueOf());
+  dt.setUTCDate(dt.getUTCDate() + 1);
+  return dt;
+}
+
+function floorMonth(dt: Date): Date {
+  dt = new Date(dt.valueOf());
+  dt.setUTCHours(0, 0, 0, 0);
+  dt.setUTCDate(1);
+  return dt;
+}
+
+function nextMonth(dt: Date): Date {
+  dt = new Date(dt.valueOf());
+  dt.setUTCMonth(dt.getUTCMonth() + 1);
+  return dt;
+}
+
+function floorYear(dt: Date): Date {
+  dt = new Date(dt.valueOf());
+  dt.setUTCHours(0, 0, 0, 0);
+  dt.setUTCMonth(0, 1);
+  return dt;
+}
+
+function nextYear(dt: Date): Date {
+  dt = new Date(dt.valueOf());
+  dt.setUTCFullYear(dt.getUTCFullYear() + 1);
+  return dt;
+}
+
 export interface TimeMenuItemsProps {
   table: string;
   schema: string;
@@ -77,10 +129,10 @@ export const TimeMenuItems = React.memo(function TimeMenuItems(props: TimeMenuIt
     }
 
     const now = new Date();
-    const hourStart = hour.floor(now, TZ_UTC);
-    const dayStart = day.floor(now, TZ_UTC);
-    const monthStart = month.floor(now, TZ_UTC);
-    const yearStart = year.floor(now, TZ_UTC);
+    const hourStart = floorHour(now);
+    const dayStart = floorDay(now);
+    const monthStart = floorMonth(now);
+    const yearStart = floorYear(now);
     return (
       <MenuItem icon={IconNames.FILTER} text="Filter">
         {filterMenuItem(`Latest hour`, fillWithColumn(LATEST_HOUR, columnName))}
@@ -91,19 +143,19 @@ export const TimeMenuItems = React.memo(function TimeMenuItems(props: TimeMenuIt
         <MenuDivider />
         {filterMenuItem(
           `Current hour`,
-          fillWithColumnStartEnd(columnName, hourStart, hour.shift(hourStart, TZ_UTC, 1)),
+          fillWithColumnStartEnd(columnName, hourStart, nextHour(hourStart)),
         )}
         {filterMenuItem(
           `Current day`,
-          fillWithColumnStartEnd(columnName, dayStart, day.shift(dayStart, TZ_UTC, 1)),
+          fillWithColumnStartEnd(columnName, dayStart, nextDay(dayStart)),
         )}
         {filterMenuItem(
           `Current month`,
-          fillWithColumnStartEnd(columnName, monthStart, month.shift(monthStart, TZ_UTC, 1)),
+          fillWithColumnStartEnd(columnName, monthStart, nextMonth(monthStart)),
         )}
         {filterMenuItem(
           `Current year`,
-          fillWithColumnStartEnd(columnName, yearStart, year.shift(yearStart, TZ_UTC, 1)),
+          fillWithColumnStartEnd(columnName, yearStart, nextYear(yearStart)),
         )}
       </MenuItem>
     );
diff --git a/web-console/src/views/workbench-view/column-tree/column-tree.spec.tsx b/web-console/src/views/workbench-view/column-tree/column-tree.spec.tsx
index 07e5167f79fe..26410834e136 100644
--- a/web-console/src/views/workbench-view/column-tree/column-tree.spec.tsx
+++ b/web-console/src/views/workbench-view/column-tree/column-tree.spec.tsx
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-import { SqlQuery } from 'druid-query-toolkit';
+import { SqlQuery } from '@druid-toolkit/query';
 
 import type { ColumnMetadata } from '../../../utils';
 import { shallow } from '../../../utils/shallow-renderer';
diff --git a/web-console/src/views/workbench-view/column-tree/column-tree.tsx b/web-console/src/views/workbench-view/column-tree/column-tree.tsx
index 438dece7f6fb..385cab937cef 100644
--- a/web-console/src/views/workbench-view/column-tree/column-tree.tsx
+++ b/web-console/src/views/workbench-view/column-tree/column-tree.tsx
@@ -32,7 +32,7 @@ import {
   Tree,
 } from '@blueprintjs/core';
 import { IconNames } from '@blueprintjs/icons';
-import type { SqlExpression } from 'druid-query-toolkit';
+import type { SqlExpression } from '@druid-toolkit/query';
 import {
   C,
   F,
@@ -43,7 +43,7 @@ import {
   SqlQuery,
   SqlTable,
   T,
-} from 'druid-query-toolkit';
+} from '@druid-toolkit/query';
 import type { ChangeEvent } from 'react';
 import React from 'react';
 
diff --git a/web-console/src/views/workbench-view/connect-external-data-dialog/connect-external-data-dialog.tsx b/web-console/src/views/workbench-view/connect-external-data-dialog/connect-external-data-dialog.tsx
index 795158102625..124b4441194b 100644
--- a/web-console/src/views/workbench-view/connect-external-data-dialog/connect-external-data-dialog.tsx
+++ b/web-console/src/views/workbench-view/connect-external-data-dialog/connect-external-data-dialog.tsx
@@ -17,7 +17,7 @@
  */
 
 import { Classes, Dialog } from '@blueprintjs/core';
-import type { SqlExpression } from 'druid-query-toolkit';
+import type { SqlExpression } from '@druid-toolkit/query';
 import React, { useState } from 'react';
 
 import type { ArrayMode, ExternalConfig, InputFormat, InputSource } from '../../../druid-models';
diff --git a/web-console/src/views/workbench-view/current-dart-panel/current-dart-panel.tsx b/web-console/src/views/workbench-view/current-dart-panel/current-dart-panel.tsx
index 5f104b75f2df..321ad40fc8f0 100644
--- a/web-console/src/views/workbench-view/current-dart-panel/current-dart-panel.tsx
+++ b/web-console/src/views/workbench-view/current-dart-panel/current-dart-panel.tsx
@@ -20,7 +20,7 @@ import { Button, Icon, Intent, Menu, MenuDivider, MenuItem, Popover } from '@blu
 import { type IconName, IconNames } from '@blueprintjs/icons';
 import classNames from 'classnames';
 import copy from 'copy-to-clipboard';
-import React, { useState } from 'react';
+import React, { useCallback, useState } from 'react';
 import { useStore } from 'zustand';
 
 import { Loader } from '../../../components';
@@ -30,7 +30,7 @@ import { Api, AppToaster } from '../../../singletons';
 import { formatDuration, prettyFormatIsoDate } from '../../../utils';
 import { CancelQueryDialog } from '../cancel-query-dialog/cancel-query-dialog';
 import { DartDetailsDialog } from '../dart-details-dialog/dart-details-dialog';
-import { getMsqDartVersion, WORK_STATE_STORE } from '../work-state-store';
+import { workStateStore } from '../work-state-store';
 
 import './current-dart-panel.scss';
 
@@ -59,8 +59,13 @@ export const CurrentDartPanel = React.memo(function CurrentViberPanel(
   const [showSql, setShowSql] = useState<string | undefined>();
   const [confirmCancelId, setConfirmCancelId] = useState<string | undefined>();
 
+  const workStateVersion = useStore(
+    workStateStore,
+    useCallback(state => state.version, []),
+  );
+
   const [dartQueryEntriesState, queryManager] = useQueryManager<number, DartQueryEntry[]>({
-    query: useStore(WORK_STATE_STORE, getMsqDartVersion),
+    query: workStateVersion,
     processQuery: async (_, cancelToken) => {
       return (await Api.instance.get('/druid/v2/sql/dart', { cancelToken })).data.queries;
     },
@@ -173,7 +178,6 @@ export const CurrentDartPanel = React.memo(function CurrentViberPanel(
                 message: 'Query canceled',
                 intent: Intent.SUCCESS,
               });
-              queryManager.rerunLastQuery();
             } catch {
               AppToaster.show({
                 message: 'Could not cancel query',
diff --git a/web-console/src/views/workbench-view/execution-details-pane/execution-details-pane.tsx b/web-console/src/views/workbench-view/execution-details-pane/execution-details-pane.tsx
index e59cdb879396..b758313ea74e 100644
--- a/web-console/src/views/workbench-view/execution-details-pane/execution-details-pane.tsx
+++ b/web-console/src/views/workbench-view/execution-details-pane/execution-details-pane.tsx
@@ -18,7 +18,7 @@
 
 import { Tag } from '@blueprintjs/core';
 import { IconNames } from '@blueprintjs/icons';
-import { T } from 'druid-query-toolkit';
+import { T } from '@druid-toolkit/query';
 import * as JSONBig from 'json-bigint-native';
 import React, { useState } from 'react';
 
diff --git a/web-console/src/views/workbench-view/execution-stages-pane/execution-stages-pane.tsx b/web-console/src/views/workbench-view/execution-stages-pane/execution-stages-pane.tsx
index d7c447d090cf..5ea2e97bb091 100644
--- a/web-console/src/views/workbench-view/execution-stages-pane/execution-stages-pane.tsx
+++ b/web-console/src/views/workbench-view/execution-stages-pane/execution-stages-pane.tsx
@@ -251,7 +251,7 @@ export const ExecutionStagesPane = React.memo(function ExecutionStagesPane(
               return (
                 <TableClickableCell
                   hoverIcon={IconNames.SHARE}
-                  tooltip={`Go to task: ${taskId}`}
+                  data-tooltip={`Go to task: ${taskId}`}
                   onClick={() => {
                     goToTask(taskId);
                   }}
diff --git a/web-console/src/views/workbench-view/flexible-query-input/flexible-query-input.tsx b/web-console/src/views/workbench-view/flexible-query-input/flexible-query-input.tsx
index 0cf280f14e7c..a77ed004ea26 100644
--- a/web-console/src/views/workbench-view/flexible-query-input/flexible-query-input.tsx
+++ b/web-console/src/views/workbench-view/flexible-query-input/flexible-query-input.tsx
@@ -18,10 +18,10 @@
 
 import { Intent, ResizeSensor } from '@blueprintjs/core';
 import { IconNames } from '@blueprintjs/icons';
+import { C, dedupe, T } from '@druid-toolkit/query';
 import type { Ace } from 'ace-builds';
 import ace from 'ace-builds';
 import classNames from 'classnames';
-import { C, dedupe, T } from 'druid-query-toolkit';
 import debounce from 'lodash.debounce';
 import React from 'react';
 import AceEditor from 'react-ace';
diff --git a/web-console/src/views/workbench-view/ingest-success-pane/ingest-success-pane.tsx b/web-console/src/views/workbench-view/ingest-success-pane/ingest-success-pane.tsx
index 0aa42e60b782..2319f5d14a00 100644
--- a/web-console/src/views/workbench-view/ingest-success-pane/ingest-success-pane.tsx
+++ b/web-console/src/views/workbench-view/ingest-success-pane/ingest-success-pane.tsx
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-import { T } from 'druid-query-toolkit';
+import { T } from '@druid-toolkit/query';
 import React from 'react';
 
 import type { Execution } from '../../../druid-models';
diff --git a/web-console/src/views/workbench-view/input-format-step/input-format-step.tsx b/web-console/src/views/workbench-view/input-format-step/input-format-step.tsx
index 781a01966804..4a05b36d70a5 100644
--- a/web-console/src/views/workbench-view/input-format-step/input-format-step.tsx
+++ b/web-console/src/views/workbench-view/input-format-step/input-format-step.tsx
@@ -18,8 +18,8 @@
 
 import { Button, Callout, FormGroup, Icon, Intent, Tag } from '@blueprintjs/core';
 import { IconNames } from '@blueprintjs/icons';
-import type { SqlExpression } from 'druid-query-toolkit';
-import { C, SqlColumnDeclaration, SqlType } from 'druid-query-toolkit';
+import type { SqlExpression } from '@druid-toolkit/query';
+import { C, SqlColumnDeclaration, SqlType } from '@druid-toolkit/query';
 import React, { useState } from 'react';
 
 import { ArrayModeSwitch, AutoForm, CenterMessage, LearnMore, Loader } from '../../../components';
diff --git a/web-console/src/views/workbench-view/input-source-step/input-source-step.tsx b/web-console/src/views/workbench-view/input-source-step/input-source-step.tsx
index b5ef35146d6e..67b6fadaa794 100644
--- a/web-console/src/views/workbench-view/input-source-step/input-source-step.tsx
+++ b/web-console/src/views/workbench-view/input-source-step/input-source-step.tsx
@@ -27,8 +27,8 @@ import {
   RadioGroup,
 } from '@blueprintjs/core';
 import { IconNames } from '@blueprintjs/icons';
+import type { QueryResult } from '@druid-toolkit/query';
 import classNames from 'classnames';
-import type { QueryResult } from 'druid-query-toolkit';
 import type { JSX } from 'react';
 import React, { useEffect, useState } from 'react';
 
diff --git a/web-console/src/views/workbench-view/query-parameters-dialog/query-parameters-dialog.tsx b/web-console/src/views/workbench-view/query-parameters-dialog/query-parameters-dialog.tsx
index 49a9ebb587df..b9915bc7c0cf 100644
--- a/web-console/src/views/workbench-view/query-parameters-dialog/query-parameters-dialog.tsx
+++ b/web-console/src/views/workbench-view/query-parameters-dialog/query-parameters-dialog.tsx
@@ -31,8 +31,8 @@ import {
   Position,
 } from '@blueprintjs/core';
 import { IconNames } from '@blueprintjs/icons';
-import type { QueryParameter } from 'druid-query-toolkit';
-import { isEmptyArray } from 'druid-query-toolkit';
+import type { QueryParameter } from '@druid-toolkit/query';
+import { isEmptyArray } from '@druid-toolkit/query';
 import React, { useState } from 'react';
 
 import { FancyNumericInput } from '../../../components/fancy-numeric-input/fancy-numeric-input';
diff --git a/web-console/src/views/workbench-view/query-tab/query-tab.tsx b/web-console/src/views/workbench-view/query-tab/query-tab.tsx
index 1ff438308591..63865054446f 100644
--- a/web-console/src/views/workbench-view/query-tab/query-tab.tsx
+++ b/web-console/src/views/workbench-view/query-tab/query-tab.tsx
@@ -18,8 +18,8 @@
 
 import { Code, Intent } from '@blueprintjs/core';
 import { IconNames } from '@blueprintjs/icons';
+import { QueryResult, QueryRunner, SqlQuery } from '@druid-toolkit/query';
 import axios from 'axios';
-import { QueryResult, QueryRunner, SqlQuery } from 'druid-query-toolkit';
 import type { JSX } from 'react';
 import React, { useCallback, useEffect, useRef, useState } from 'react';
 import { useStore } from 'zustand';
@@ -61,7 +61,7 @@ import { metadataStateStore } from '../metadata-state-store';
 import { ResultTablePane } from '../result-table-pane/result-table-pane';
 import type { RunPanelProps } from '../run-panel/run-panel';
 import { RunPanel } from '../run-panel/run-panel';
-import { WORK_STATE_STORE } from '../work-state-store';
+import { workStateStore } from '../work-state-store';
 
 import './query-tab.scss';
 
@@ -362,13 +362,12 @@ export const QueryTab = React.memo(function QueryTab(props: QueryTabProps) {
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [executionState.data, executionState.error]);
 
+  const incrementWorkVersion = useStore(
+    workStateStore,
+    useCallback(state => state.increment, []),
+  );
   useEffect(() => {
-    const effectiveEngine = query.getEffectiveEngine();
-    if (effectiveEngine === 'sql-msq-task') {
-      WORK_STATE_STORE.getState().incrementMsqTask();
-    } else if (effectiveEngine === 'sql-msq-dart') {
-      WORK_STATE_STORE.getState().incrementMsqDart();
-    }
+    incrementWorkVersion();
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [executionState.loading, Boolean(executionState.intermediate)]);
 
diff --git a/web-console/src/views/workbench-view/recent-query-task-panel/recent-query-task-panel.tsx b/web-console/src/views/workbench-view/recent-query-task-panel/recent-query-task-panel.tsx
index 734826cfeb37..682f5fd4d38b 100644
--- a/web-console/src/views/workbench-view/recent-query-task-panel/recent-query-task-panel.tsx
+++ b/web-console/src/views/workbench-view/recent-query-task-panel/recent-query-task-panel.tsx
@@ -19,10 +19,10 @@
 import { Button, Icon, Intent, Menu, MenuDivider, MenuItem, Popover } from '@blueprintjs/core';
 import type { IconName } from '@blueprintjs/icons';
 import { IconNames } from '@blueprintjs/icons';
+import { T } from '@druid-toolkit/query';
 import classNames from 'classnames';
 import copy from 'copy-to-clipboard';
-import { T } from 'druid-query-toolkit';
-import React, { useState } from 'react';
+import React, { useCallback, useState } from 'react';
 import { useStore } from 'zustand';
 
 import { Loader } from '../../../components';
@@ -38,7 +38,7 @@ import {
   queryDruidSql,
 } from '../../../utils';
 import { CancelQueryDialog } from '../cancel-query-dialog/cancel-query-dialog';
-import { getMsqTaskVersion, WORK_STATE_STORE } from '../work-state-store';
+import { workStateStore } from '../work-state-store';
 
 import './recent-query-task-panel.scss';
 
@@ -83,8 +83,13 @@ export const RecentQueryTaskPanel = React.memo(function RecentQueryTaskPanel(
 
   const [confirmCancelId, setConfirmCancelId] = useState<string | undefined>();
 
+  const workStateVersion = useStore(
+    workStateStore,
+    useCallback(state => state.version, []),
+  );
+
   const [queryTaskHistoryState, queryManager] = useQueryManager<number, RecentQueryEntry[]>({
-    query: useStore(WORK_STATE_STORE, getMsqTaskVersion),
+    query: workStateVersion,
     processQuery: async (_, cancelToken) => {
       return await queryDruidSql<RecentQueryEntry>(
         {
@@ -111,6 +116,11 @@ LIMIT 100`,
 
   const now = useClock();
 
+  const incrementWorkVersion = useStore(
+    workStateStore,
+    useCallback(state => state.increment, []),
+  );
+
   const queryTaskHistory = queryTaskHistoryState.getSomeData();
   return (
     <div className="recent-query-task-panel">
@@ -265,7 +275,7 @@ LIMIT 100`,
                 message: 'Query canceled',
                 intent: Intent.SUCCESS,
               });
-              queryManager.rerunLastQuery();
+              incrementWorkVersion();
             } catch {
               AppToaster.show({
                 message: 'Could not cancel query',
diff --git a/web-console/src/views/workbench-view/result-table-pane/result-table-pane.tsx b/web-console/src/views/workbench-view/result-table-pane/result-table-pane.tsx
index c16a24c9740b..dfead18c63ec 100644
--- a/web-console/src/views/workbench-view/result-table-pane/result-table-pane.tsx
+++ b/web-console/src/views/workbench-view/result-table-pane/result-table-pane.tsx
@@ -18,9 +18,9 @@
 
 import { Button, Icon, Intent, Menu, MenuItem, Popover } from '@blueprintjs/core';
 import { IconNames } from '@blueprintjs/icons';
+import type { Column, QueryResult, SqlExpression, SqlQuery } from '@druid-toolkit/query';
+import { C, F, SqlAlias, SqlFunction, SqlLiteral, SqlStar } from '@druid-toolkit/query';
 import classNames from 'classnames';
-import type { Column, QueryResult, SqlExpression, SqlQuery } from 'druid-query-toolkit';
-import { C, F, SqlAlias, SqlFunction, SqlLiteral, SqlStar } from 'druid-query-toolkit';
 import * as JSONBig from 'json-bigint-native';
 import type { JSX } from 'react';
 import React, { useEffect, useState } from 'react';
diff --git a/web-console/src/views/workbench-view/run-panel/run-panel.tsx b/web-console/src/views/workbench-view/run-panel/run-panel.tsx
index 2747179d6d44..d586959357a4 100644
--- a/web-console/src/views/workbench-view/run-panel/run-panel.tsx
+++ b/web-console/src/views/workbench-view/run-panel/run-panel.tsx
@@ -51,10 +51,31 @@ import { deepGet, pluralIfNeeded, removeUndefinedValues, tickIcon } from '../../
 import type { MaxTasksButtonProps } from '../max-tasks-button/max-tasks-button';
 import { MaxTasksButton } from '../max-tasks-button/max-tasks-button';
 import { QueryParametersDialog } from '../query-parameters-dialog/query-parameters-dialog';
-import { TimezoneMenuItems } from '../timezone-menu-items/timezone-menu-items';
 
 import './run-panel.scss';
 
+const NAMED_TIMEZONES: string[] = [
+  'America/Juneau', // -9.0
+  'America/Los_Angeles', // -8.0
+  'America/Yellowknife', // -7.0
+  'America/Phoenix', // -7.0
+  'America/Denver', // -7.0
+  'America/Mexico_City', // -6.0
+  'America/Chicago', // -6.0
+  'America/New_York', // -5.0
+  'America/Argentina/Buenos_Aires', // -4.0
+  'Etc/UTC', // +0.0
+  'Europe/London', // +0.0
+  'Europe/Paris', // +1.0
+  'Asia/Jerusalem', // +2.0
+  'Asia/Shanghai', // +8.0
+  'Asia/Hong_Kong', // +8.0
+  'Asia/Seoul', // +9.0
+  'Asia/Tokyo', // +9.0
+  'Pacific/Guam', // +10.0
+  'Australia/Sydney', // +11.0
+];
+
 const ARRAY_INGEST_MODE_LABEL: Record<ArrayIngestMode, string> = {
   array: 'Array',
   mvd: 'MVD',
@@ -293,6 +314,25 @@ export const RunPanel = React.memo(function RunPanel(props: RunPanelProps) {
     onQueryChange(query.changeQueryContext(removeUndefinedValues(queryContext)));
   }
 
+  function offsetOptions(): JSX.Element[] {
+    const items: JSX.Element[] = [];
+
+    for (let i = -12; i <= 14; i++) {
+      const offset = `${i < 0 ? '-' : '+'}${String(Math.abs(i)).padStart(2, '0')}:00`;
+      items.push(
+        <MenuItem
+          key={offset}
+          icon={tickIcon(offset === sqlTimeZone)}
+          text={offset}
+          shouldDismissPopover={false}
+          onClick={() => changeQueryContext({ ...queryContext, sqlTimeZone: offset })}
+        />,
+      );
+    }
+
+    return items;
+  }
+
   const overloadWarning =
     query.unlimited &&
     (queryEngine === 'sql-native' ||
@@ -384,13 +424,32 @@ export const RunPanel = React.memo(function RunPanel(props: RunPanelProps) {
                     text="Timezone"
                     label={sqlTimeZone ?? defaultQueryContext.sqlTimeZone}
                   >
-                    <TimezoneMenuItems
-                      sqlTimeZone={sqlTimeZone}
-                      setSqlTimeZone={sqlTimeZone =>
-                        changeQueryContext({ ...queryContext, sqlTimeZone })
+                    <MenuDivider title="Timezone type" />
+                    <MenuItem
+                      icon={tickIcon(!sqlTimeZone)}
+                      text="Default"
+                      label={defaultQueryContext.sqlTimeZone}
+                      shouldDismissPopover={false}
+                      onClick={() =>
+                        changeQueryContext({ ...queryContext, sqlTimeZone: undefined })
                       }
-                      defaultSqlTimeZone={defaultQueryContext.sqlTimeZone}
                     />
+                    <MenuItem icon={tickIcon(String(sqlTimeZone).includes('/'))} text="Named">
+                      {NAMED_TIMEZONES.map(namedTimezone => (
+                        <MenuItem
+                          key={namedTimezone}
+                          icon={tickIcon(namedTimezone === sqlTimeZone)}
+                          text={namedTimezone}
+                          shouldDismissPopover={false}
+                          onClick={() =>
+                            changeQueryContext({ ...queryContext, sqlTimeZone: namedTimezone })
+                          }
+                        />
+                      ))}
+                    </MenuItem>
+                    <MenuItem icon={tickIcon(String(sqlTimeZone).includes(':'))} text="Offset">
+                      {offsetOptions()}
+                    </MenuItem>
                     <MenuItem
                       icon={IconNames.BLANK}
                       text="Custom"
diff --git a/web-console/src/views/workbench-view/time-floor-menu-item/time-floor-menu-item.tsx b/web-console/src/views/workbench-view/time-floor-menu-item/time-floor-menu-item.tsx
index f2576a561a55..fd7bea12a45e 100644
--- a/web-console/src/views/workbench-view/time-floor-menu-item/time-floor-menu-item.tsx
+++ b/web-console/src/views/workbench-view/time-floor-menu-item/time-floor-menu-item.tsx
@@ -18,8 +18,8 @@
 
 import { MenuItem } from '@blueprintjs/core';
 import { IconNames } from '@blueprintjs/icons';
-import type { SqlExpression } from 'druid-query-toolkit';
-import { F, SqlFunction } from 'druid-query-toolkit';
+import type { SqlExpression } from '@druid-toolkit/query';
+import { F, SqlFunction } from '@druid-toolkit/query';
 
 import { oneOf, tickIcon } from '../../../utils';
 
diff --git a/web-console/src/views/workbench-view/timezone-menu-items/__snapshots__/timezone-menu-items.spec.tsx.snap b/web-console/src/views/workbench-view/timezone-menu-items/__snapshots__/timezone-menu-items.spec.tsx.snap
deleted file mode 100644
index 9c958fb88001..000000000000
--- a/web-console/src/views/workbench-view/timezone-menu-items/__snapshots__/timezone-menu-items.spec.tsx.snap
+++ /dev/null
@@ -1,563 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`TimezoneMenuItems matches snapshot 1`] = `
-[
-  <Blueprint5.MenuDivider
-    title="Timezone type"
-  />,
-  <Blueprint5.MenuItem
-    active={false}
-    disabled={false}
-    icon="blank"
-    label="Etc/UTC"
-    multiline={false}
-    onClick={[Function]}
-    popoverProps={{}}
-    shouldDismissPopover={false}
-    text="Default"
-  />,
-  <Blueprint5.MenuItem
-    active={false}
-    disabled={false}
-    icon="blank"
-    multiline={false}
-    popoverProps={{}}
-    shouldDismissPopover={true}
-    text="Named"
-  >
-    <Blueprint5.MenuItem
-      active={false}
-      disabled={false}
-      icon="blank"
-      label="UTC-8:00"
-      multiline={false}
-      onClick={[Function]}
-      popoverProps={{}}
-      shouldDismissPopover={false}
-      text="America/Juneau"
-    />
-    <Blueprint5.MenuItem
-      active={false}
-      disabled={false}
-      icon="blank"
-      label="UTC-7:00"
-      multiline={false}
-      onClick={[Function]}
-      popoverProps={{}}
-      shouldDismissPopover={false}
-      text="America/Los_Angeles"
-    />
-    <Blueprint5.MenuItem
-      active={false}
-      disabled={false}
-      icon="blank"
-      label="UTC-7:00"
-      multiline={false}
-      onClick={[Function]}
-      popoverProps={{}}
-      shouldDismissPopover={false}
-      text="America/Phoenix"
-    />
-    <Blueprint5.MenuItem
-      active={false}
-      disabled={false}
-      icon="blank"
-      label="UTC-6:00"
-      multiline={false}
-      onClick={[Function]}
-      popoverProps={{}}
-      shouldDismissPopover={false}
-      text="America/Yellowknife"
-    />
-    <Blueprint5.MenuItem
-      active={false}
-      disabled={false}
-      icon="blank"
-      label="UTC-6:00"
-      multiline={false}
-      onClick={[Function]}
-      popoverProps={{}}
-      shouldDismissPopover={false}
-      text="America/Denver"
-    />
-    <Blueprint5.MenuItem
-      active={false}
-      disabled={false}
-      icon="blank"
-      label="UTC-6:00"
-      multiline={false}
-      onClick={[Function]}
-      popoverProps={{}}
-      shouldDismissPopover={false}
-      text="America/Mexico_City"
-    />
-    <Blueprint5.MenuItem
-      active={false}
-      disabled={false}
-      icon="blank"
-      label="UTC-5:00"
-      multiline={false}
-      onClick={[Function]}
-      popoverProps={{}}
-      shouldDismissPopover={false}
-      text="America/Chicago"
-    />
-    <Blueprint5.MenuItem
-      active={false}
-      disabled={false}
-      icon="blank"
-      label="UTC-4:00"
-      multiline={false}
-      onClick={[Function]}
-      popoverProps={{}}
-      shouldDismissPopover={false}
-      text="America/New_York"
-    />
-    <Blueprint5.MenuItem
-      active={false}
-      disabled={false}
-      icon="blank"
-      label="UTC-3:00"
-      multiline={false}
-      onClick={[Function]}
-      popoverProps={{}}
-      shouldDismissPopover={false}
-      text="America/Argentina/Buenos_Aires"
-    />
-    <Blueprint5.MenuItem
-      active={false}
-      disabled={false}
-      icon="blank"
-      label="UTC+0:00"
-      multiline={false}
-      onClick={[Function]}
-      popoverProps={{}}
-      shouldDismissPopover={false}
-      text="Etc/UTC"
-    />
-    <Blueprint5.MenuItem
-      active={false}
-      disabled={false}
-      icon="blank"
-      label="UTC+0:00"
-      multiline={false}
-      onClick={[Function]}
-      popoverProps={{}}
-      shouldDismissPopover={false}
-      text={
-        <React.Fragment>
-          UTC
-           
-          <Blueprint5.Icon
-            autoLoad={true}
-            data-tooltip="Browser timezone"
-            icon="star"
-            tagName="span"
-          />
-        </React.Fragment>
-      }
-    />
-    <Blueprint5.MenuItem
-      active={false}
-      disabled={false}
-      icon="blank"
-      label="UTC+1:00"
-      multiline={false}
-      onClick={[Function]}
-      popoverProps={{}}
-      shouldDismissPopover={false}
-      text="Europe/London"
-    />
-    <Blueprint5.MenuItem
-      active={false}
-      disabled={false}
-      icon="blank"
-      label="UTC+2:00"
-      multiline={false}
-      onClick={[Function]}
-      popoverProps={{}}
-      shouldDismissPopover={false}
-      text="Europe/Paris"
-    />
-    <Blueprint5.MenuItem
-      active={false}
-      disabled={false}
-      icon="blank"
-      label="UTC+3:00"
-      multiline={false}
-      onClick={[Function]}
-      popoverProps={{}}
-      shouldDismissPopover={false}
-      text="Asia/Jerusalem"
-    />
-    <Blueprint5.MenuItem
-      active={false}
-      disabled={false}
-      icon="blank"
-      label="UTC+5:30"
-      multiline={false}
-      onClick={[Function]}
-      popoverProps={{}}
-      shouldDismissPopover={false}
-      text="Asia/Kolkata"
-    />
-    <Blueprint5.MenuItem
-      active={false}
-      disabled={false}
-      icon="blank"
-      label="UTC+8:00"
-      multiline={false}
-      onClick={[Function]}
-      popoverProps={{}}
-      shouldDismissPopover={false}
-      text="Asia/Shanghai"
-    />
-    <Blueprint5.MenuItem
-      active={false}
-      disabled={false}
-      icon="blank"
-      label="UTC+8:00"
-      multiline={false}
-      onClick={[Function]}
-      popoverProps={{}}
-      shouldDismissPopover={false}
-      text="Asia/Hong_Kong"
-    />
-    <Blueprint5.MenuItem
-      active={false}
-      disabled={false}
-      icon="blank"
-      label="UTC+9:00"
-      multiline={false}
-      onClick={[Function]}
-      popoverProps={{}}
-      shouldDismissPopover={false}
-      text="Asia/Seoul"
-    />
-    <Blueprint5.MenuItem
-      active={false}
-      disabled={false}
-      icon="blank"
-      label="UTC+9:00"
-      multiline={false}
-      onClick={[Function]}
-      popoverProps={{}}
-      shouldDismissPopover={false}
-      text="Asia/Tokyo"
-    />
-    <Blueprint5.MenuItem
-      active={false}
-      disabled={false}
-      icon="blank"
-      label="UTC+10:00"
-      multiline={false}
-      onClick={[Function]}
-      popoverProps={{}}
-      shouldDismissPopover={false}
-      text="Pacific/Guam"
-    />
-    <Blueprint5.MenuItem
-      active={false}
-      disabled={false}
-      icon="blank"
-      label="UTC+10:00"
-      multiline={false}
-      onClick={[Function]}
-      popoverProps={{}}
-      shouldDismissPopover={false}
-      text="Australia/Sydney"
-    />
-  </Blueprint5.MenuItem>,
-  <Blueprint5.MenuItem
-    active={false}
-    disabled={false}
-    icon="blank"
-    multiline={false}
-    popoverProps={{}}
-    shouldDismissPopover={true}
-    text="Offset"
-  >
-    <Blueprint5.MenuItem
-      active={false}
-      disabled={false}
-      icon="blank"
-      multiline={false}
-      onClick={[Function]}
-      popoverProps={{}}
-      shouldDismissPopover={false}
-      text="-12:00"
-    />
-    <Blueprint5.MenuItem
-      active={false}
-      disabled={false}
-      icon="blank"
-      multiline={false}
-      onClick={[Function]}
-      popoverProps={{}}
-      shouldDismissPopover={false}
-      text="-11:00"
-    />
-    <Blueprint5.MenuItem
-      active={false}
-      disabled={false}
-      icon="blank"
-      multiline={false}
-      onClick={[Function]}
-      popoverProps={{}}
-      shouldDismissPopover={false}
-      text="-10:00"
-    />
-    <Blueprint5.MenuItem
-      active={false}
-      disabled={false}
-      icon="blank"
-      multiline={false}
-      onClick={[Function]}
-      popoverProps={{}}
-      shouldDismissPopover={false}
-      text="-09:00"
-    />
-    <Blueprint5.MenuItem
-      active={false}
-      disabled={false}
-      icon="blank"
-      multiline={false}
-      onClick={[Function]}
-      popoverProps={{}}
-      shouldDismissPopover={false}
-      text="-08:00"
-    />
-    <Blueprint5.MenuItem
-      active={false}
-      disabled={false}
-      icon="blank"
-      multiline={false}
-      onClick={[Function]}
-      popoverProps={{}}
-      shouldDismissPopover={false}
-      text="-07:00"
-    />
-    <Blueprint5.MenuItem
-      active={false}
-      disabled={false}
-      icon="blank"
-      multiline={false}
-      onClick={[Function]}
-      popoverProps={{}}
-      shouldDismissPopover={false}
-      text="-06:00"
-    />
-    <Blueprint5.MenuItem
-      active={false}
-      disabled={false}
-      icon="blank"
-      multiline={false}
-      onClick={[Function]}
-      popoverProps={{}}
-      shouldDismissPopover={false}
-      text="-05:00"
-    />
-    <Blueprint5.MenuItem
-      active={false}
-      disabled={false}
-      icon="blank"
-      multiline={false}
-      onClick={[Function]}
-      popoverProps={{}}
-      shouldDismissPopover={false}
-      text="-04:00"
-    />
-    <Blueprint5.MenuItem
-      active={false}
-      disabled={false}
-      icon="blank"
-      multiline={false}
-      onClick={[Function]}
-      popoverProps={{}}
-      shouldDismissPopover={false}
-      text="-03:00"
-    />
-    <Blueprint5.MenuItem
-      active={false}
-      disabled={false}
-      icon="blank"
-      multiline={false}
-      onClick={[Function]}
-      popoverProps={{}}
-      shouldDismissPopover={false}
-      text="-02:00"
-    />
-    <Blueprint5.MenuItem
-      active={false}
-      disabled={false}
-      icon="blank"
-      multiline={false}
-      onClick={[Function]}
-      popoverProps={{}}
-      shouldDismissPopover={false}
-      text="-01:00"
-    />
-    <Blueprint5.MenuItem
-      active={false}
-      disabled={false}
-      icon="blank"
-      multiline={false}
-      onClick={[Function]}
-      popoverProps={{}}
-      shouldDismissPopover={false}
-      text={
-        <React.Fragment>
-          +00:00
-           
-          <Blueprint5.Icon
-            autoLoad={true}
-            data-tooltip="Browser offset"
-            icon="star"
-            tagName="span"
-          />
-        </React.Fragment>
-      }
-    />
-    <Blueprint5.MenuItem
-      active={false}
-      disabled={false}
-      icon="blank"
-      multiline={false}
-      onClick={[Function]}
-      popoverProps={{}}
-      shouldDismissPopover={false}
-      text="+01:00"
-    />
-    <Blueprint5.MenuItem
-      active={false}
-      disabled={false}
-      icon="blank"
-      multiline={false}
-      onClick={[Function]}
-      popoverProps={{}}
-      shouldDismissPopover={false}
-      text="+02:00"
-    />
-    <Blueprint5.MenuItem
-      active={false}
-      disabled={false}
-      icon="blank"
-      multiline={false}
-      onClick={[Function]}
-      popoverProps={{}}
-      shouldDismissPopover={false}
-      text="+03:00"
-    />
-    <Blueprint5.MenuItem
-      active={false}
-      disabled={false}
-      icon="blank"
-      multiline={false}
-      onClick={[Function]}
-      popoverProps={{}}
-      shouldDismissPopover={false}
-      text="+04:00"
-    />
-    <Blueprint5.MenuItem
-      active={false}
-      disabled={false}
-      icon="blank"
-      multiline={false}
-      onClick={[Function]}
-      popoverProps={{}}
-      shouldDismissPopover={false}
-      text="+05:00"
-    />
-    <Blueprint5.MenuItem
-      active={false}
-      disabled={false}
-      icon="blank"
-      multiline={false}
-      onClick={[Function]}
-      popoverProps={{}}
-      shouldDismissPopover={false}
-      text="+06:00"
-    />
-    <Blueprint5.MenuItem
-      active={false}
-      disabled={false}
-      icon="blank"
-      multiline={false}
-      onClick={[Function]}
-      popoverProps={{}}
-      shouldDismissPopover={false}
-      text="+07:00"
-    />
-    <Blueprint5.MenuItem
-      active={false}
-      disabled={false}
-      icon="blank"
-      multiline={false}
-      onClick={[Function]}
-      popoverProps={{}}
-      shouldDismissPopover={false}
-      text="+08:00"
-    />
-    <Blueprint5.MenuItem
-      active={false}
-      disabled={false}
-      icon="blank"
-      multiline={false}
-      onClick={[Function]}
-      popoverProps={{}}
-      shouldDismissPopover={false}
-      text="+09:00"
-    />
-    <Blueprint5.MenuItem
-      active={false}
-      disabled={false}
-      icon="blank"
-      multiline={false}
-      onClick={[Function]}
-      popoverProps={{}}
-      shouldDismissPopover={false}
-      text="+10:00"
-    />
-    <Blueprint5.MenuItem
-      active={false}
-      disabled={false}
-      icon="blank"
-      multiline={false}
-      onClick={[Function]}
-      popoverProps={{}}
-      shouldDismissPopover={false}
-      text="+11:00"
-    />
-    <Blueprint5.MenuItem
-      active={false}
-      disabled={false}
-      icon="blank"
-      multiline={false}
-      onClick={[Function]}
-      popoverProps={{}}
-      shouldDismissPopover={false}
-      text="+12:00"
-    />
-    <Blueprint5.MenuItem
-      active={false}
-      disabled={false}
-      icon="blank"
-      multiline={false}
-      onClick={[Function]}
-      popoverProps={{}}
-      shouldDismissPopover={false}
-      text="+13:00"
-    />
-    <Blueprint5.MenuItem
-      active={false}
-      disabled={false}
-      icon="blank"
-      multiline={false}
-      onClick={[Function]}
-      popoverProps={{}}
-      shouldDismissPopover={false}
-      text="+14:00"
-    />
-  </Blueprint5.MenuItem>,
-]
-`;
diff --git a/web-console/src/views/workbench-view/timezone-menu-items/timezone-menu-items.tsx b/web-console/src/views/workbench-view/timezone-menu-items/timezone-menu-items.tsx
deleted file mode 100644
index 2340302d0a56..000000000000
--- a/web-console/src/views/workbench-view/timezone-menu-items/timezone-menu-items.tsx
+++ /dev/null
@@ -1,151 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import { Icon, MenuDivider, MenuItem } from '@blueprintjs/core';
-import { IconNames } from '@blueprintjs/icons';
-import { fromDate, getLocalTimeZone } from '@internationalized/date';
-import { useMemo } from 'react';
-
-import { minute, tickIcon, timezoneOffsetInMinutesToString } from '../../../utils';
-
-const NAMED_TIMEZONES: string[] = [
-  'America/Juneau', // -9:00
-  'America/Los_Angeles', // -8:00
-  'America/Yellowknife', // -7:00
-  'America/Phoenix', // -7:00
-  'America/Denver', // -7:00
-  'America/Mexico_City', // -6:00
-  'America/Chicago', // -6:00
-  'America/New_York', // -5:00
-  'America/Argentina/Buenos_Aires', // -4:00
-  'Etc/UTC', // +0:00
-  'Europe/London', // +0:00
-  'Europe/Paris', // +1:00
-  'Asia/Jerusalem', // +2:00
-  'Asia/Kolkata', // +5:30
-  'Asia/Shanghai', // +8:00
-  'Asia/Hong_Kong', // +8:00
-  'Asia/Seoul', // +9:00
-  'Asia/Tokyo', // +9:00
-  'Pacific/Guam', // +10:00
-  'Australia/Sydney', // +11:00
-];
-
-export interface TimezoneMenuItemsProps {
-  sqlTimeZone: string | undefined;
-  setSqlTimeZone(sqlTimeZone: string | undefined): void;
-  defaultSqlTimeZone: string | undefined;
-}
-
-export const TimezoneMenuItems = function TimezoneMenuItems(props: TimezoneMenuItemsProps) {
-  const { sqlTimeZone, setSqlTimeZone, defaultSqlTimeZone } = props;
-
-  const { timezones, myTimezone, offsetsInMinutes, myOffsetInMinutes } = useMemo(() => {
-    const now = new Date();
-
-    const timezones: { timezone: string; offsetInMinutes: number }[] = NAMED_TIMEZONES.map(
-      timezone => ({
-        timezone,
-        offsetInMinutes: fromDate(now, timezone).offset / minute.canonicalLength,
-      }),
-    );
-    const myTimezone = getLocalTimeZone();
-    const myOffsetInMinutes = -now.getTimezoneOffset();
-
-    // Make sure the browsers timezone is in the list
-    if (!timezones.find(({ timezone }) => timezone === myTimezone)) {
-      timezones.push({
-        timezone: myTimezone,
-        offsetInMinutes: myOffsetInMinutes,
-      });
-    }
-    timezones.sort((a, b) => a.offsetInMinutes - b.offsetInMinutes);
-
-    const offsetsInMinutes: number[] = [];
-    for (let offsetInMinutes = -12 * 60; offsetInMinutes <= 14 * 60; offsetInMinutes += 60) {
-      offsetsInMinutes.push(offsetInMinutes);
-    }
-
-    // Make sure the browser offset is in the list
-    if (!offsetsInMinutes.includes(myOffsetInMinutes)) {
-      offsetsInMinutes.push(myOffsetInMinutes);
-      offsetsInMinutes.sort((a, b) => a - b);
-    }
-
-    return {
-      timezones,
-      myTimezone,
-      offsetsInMinutes,
-      myOffsetInMinutes,
-    };
-  }, []);
-
-  return [
-    <MenuDivider key="type" title="Timezone type" />,
-    <MenuItem
-      key="default"
-      icon={tickIcon(!sqlTimeZone)}
-      text="Default"
-      label={defaultSqlTimeZone}
-      shouldDismissPopover={false}
-      onClick={() => setSqlTimeZone(undefined)}
-    />,
-    <MenuItem key="named" icon={tickIcon(String(sqlTimeZone).includes('/'))} text="Named">
-      {timezones.map(({ timezone, offsetInMinutes }) => (
-        <MenuItem
-          key={timezone}
-          icon={tickIcon(timezone === sqlTimeZone)}
-          text={
-            timezone === myTimezone ? (
-              <>
-                {timezone} <Icon icon={IconNames.STAR} data-tooltip="Browser timezone" />
-              </>
-            ) : (
-              timezone
-            )
-          }
-          label={`UTC${timezoneOffsetInMinutesToString(offsetInMinutes, false)}`}
-          shouldDismissPopover={false}
-          onClick={() => setSqlTimeZone(timezone)}
-        />
-      ))}
-    </MenuItem>,
-    <MenuItem key="offset" icon={tickIcon(String(sqlTimeZone).includes(':'))} text="Offset">
-      {offsetsInMinutes.map(offsetInMinutes => {
-        const offset = timezoneOffsetInMinutesToString(offsetInMinutes, true);
-        return (
-          <MenuItem
-            key={offset}
-            icon={tickIcon(offset === sqlTimeZone)}
-            text={
-              myOffsetInMinutes === offsetInMinutes ? (
-                <>
-                  {offset} <Icon icon={IconNames.STAR} data-tooltip="Browser offset" />
-                </>
-              ) : (
-                offset
-              )
-            }
-            shouldDismissPopover={false}
-            onClick={() => setSqlTimeZone(offset)}
-          />
-        );
-      })}
-    </MenuItem>,
-  ];
-};
diff --git a/web-console/src/views/workbench-view/work-state-store.ts b/web-console/src/views/workbench-view/work-state-store.ts
index 38fb8d8e673b..ee03a70c030d 100644
--- a/web-console/src/views/workbench-view/work-state-store.ts
+++ b/web-console/src/views/workbench-view/work-state-store.ts
@@ -19,23 +19,11 @@
 import { createStore } from 'zustand';
 
 interface WorkState {
-  msqTaskVersion: number;
-  msqDartVersion: number;
-  incrementMsqTask(): void;
-  incrementMsqDart(): void;
+  version: number;
+  increment(): void;
 }
 
-export const WORK_STATE_STORE = createStore<WorkState>(set => ({
-  msqTaskVersion: 0,
-  msqDartVersion: 0,
-  incrementMsqTask: () => set(state => ({ msqTaskVersion: state.msqTaskVersion + 1 })),
-  incrementMsqDart: () => set(state => ({ msqDartVersion: state.msqDartVersion + 1 })),
+export const workStateStore = createStore<WorkState>(set => ({
+  version: 0,
+  increment: () => set(state => ({ version: state.version + 1 })),
 }));
-
-export function getMsqTaskVersion(store: WorkState): number {
-  return store.msqTaskVersion;
-}
-
-export function getMsqDartVersion(store: WorkState): number {
-  return store.msqDartVersion;
-}
diff --git a/web-console/src/views/workbench-view/workbench-view.tsx b/web-console/src/views/workbench-view/workbench-view.tsx
index 567fd51d4c8c..f647bfbc5c7c 100644
--- a/web-console/src/views/workbench-view/workbench-view.tsx
+++ b/web-console/src/views/workbench-view/workbench-view.tsx
@@ -26,10 +26,10 @@ import {
   Popover,
 } from '@blueprintjs/core';
 import { IconNames } from '@blueprintjs/icons';
+import type { SqlQuery } from '@druid-toolkit/query';
+import { SqlExpression } from '@druid-toolkit/query';
 import classNames from 'classnames';
 import copy from 'copy-to-clipboard';
-import type { SqlQuery } from 'druid-query-toolkit';
-import { SqlExpression } from 'druid-query-toolkit';
 import React from 'react';
 
 import { MenuCheckbox, SplitterLayout } from '../../components';

From 0325f62af2f1fd7502153c48dd22f1afade669bd Mon Sep 17 00:00:00 2001
From: Charles Smith <techdocsmith@gmail.com>
Date: Wed, 27 Nov 2024 11:41:28 -0800
Subject: [PATCH 07/56] [Docs] Remove ambiguous advice regarding TopN
 correctness (#17522)

---
 docs/querying/topnquery.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/querying/topnquery.md b/docs/querying/topnquery.md
index 663ae2ce7db5..25d8b2248028 100644
--- a/docs/querying/topnquery.md
+++ b/docs/querying/topnquery.md
@@ -32,7 +32,7 @@ sidebar_label: "TopN"
 
 Apache Druid TopN queries return a sorted set of results for the values in a given dimension according to some criteria. Conceptually, they can be thought of as an approximate [GroupByQuery](../querying/groupbyquery.md) over a single dimension with an [Ordering](../querying/limitspec.md) spec. TopNs are much faster and resource efficient than GroupBys for this use case. These types of queries take a topN query object and return an array of JSON objects where each object represents a value asked for by the topN query.
 
-TopNs are approximate in that each data process will rank their top K results and only return those top K results to the Broker. K, by default in Druid, is `max(1000, threshold)`. In practice, this means that if you ask for the top 1000 items ordered, the correctness of the first ~900 items will be 100%, and the ordering of the results after that is not guaranteed. TopNs can be made more accurate by increasing the threshold.
+TopNs are approximate in that each data process will rank their top K results and only return those top K results to the Broker. K, by default in Druid, is `max(1000, threshold)`.
 
 A topN query object looks like:
 

From ddbb985369a169b809343909a824a03873e48e36 Mon Sep 17 00:00:00 2001
From: Vadim Ogievetsky <vadim@ogievetsky.com>
Date: Wed, 27 Nov 2024 19:30:40 -0800
Subject: [PATCH 08/56] Web console: refactor and improve the segment timeline
 (try 2) (#17521)

* refactor and improve the segment timeline

* us consistent state

* type cleanup

* add shpitz

* better bubble

* Update web-console/src/components/segment-timeline/segment-bar-chart-render.tsx

Co-authored-by: Clint Wylie <cjwylie@gmail.com>

---------

Co-authored-by: Clint Wylie <cjwylie@gmail.com>
---
 licenses.yaml                                 |  94 +-
 web-console/e2e-tests/tutorial-batch.spec.ts  |   2 +-
 web-console/jest.common.config.js             |   2 +
 web-console/lib/keywords.ts                   |   8 +
 web-console/package-lock.json                 | 205 ++--
 web-console/package.json                      |   5 +-
 web-console/script/create-sql-docs.mjs        |   6 +
 web-console/script/licenses                   |   1 +
 web-console/src/bootstrap/json-parser.tsx     |   2 +-
 .../__snapshots__/auto-form.spec.tsx.snap     |   1 -
 .../src/components/auto-form/auto-form.tsx    |   1 -
 .../cell-filter-menu/cell-filter-menu.tsx     |   4 +-
 .../fancy-numeric-input.tsx                   |   2 +-
 web-console/src/components/index.ts           |   1 +
 .../portal-bubble/portal-bubble.scss          |  86 ++
 .../portal-bubble/portal-bubble.tsx           |  93 ++
 .../record-table-pane/record-table-pane.tsx   |   2 +-
 .../__snapshots__/rule-editor.spec.tsx.snap   |  10 +-
 .../components/rule-editor/rule-editor.scss   |   4 +
 .../components/rule-editor/rule-editor.tsx    |   6 +-
 .../__snapshots__/bar-unit.spec.tsx.snap      |  13 -
 .../segment-timeline.spec.tsx.snap            | 422 ++++++---
 .../components/segment-timeline/bar-group.tsx |  75 --
 .../segment-timeline/chart-axis.tsx           |  14 +-
 .../src/components/segment-timeline/common.ts |  87 ++
 .../segment-bar-chart-render.scss             | 169 ++++
 .../segment-bar-chart-render.tsx              | 793 ++++++++++++++++
 ...r-unit.spec.tsx => segment-bar-chart.scss} |  18 +-
 .../segment-timeline/segment-bar-chart.tsx    | 162 ++++
 .../segment-timeline/segment-timeline.scss    |  32 +-
 .../segment-timeline.spec.tsx                 |  52 +-
 .../segment-timeline/segment-timeline.tsx     | 887 ++++++------------
 .../segment-timeline/stacked-bar-chart.tsx    | 174 ----
 .../supervisor-history-panel.tsx              |  13 +-
 .../table-clickable-cell.tsx                  |   5 +-
 .../table-filterable-cell.tsx                 |   2 +-
 web-console/src/console-application.tsx       |  18 +-
 .../compaction-history-dialog.tsx             |   7 +-
 .../coordinator-dynamic-config-dialog.tsx     |   7 +-
 .../datasource-columns-table.tsx              |   2 +-
 .../datasource-preview-pane.tsx               |   4 +-
 .../lookup-values-table.tsx                   |   2 +-
 .../overlord-dynamic-config-dialog.tsx        |   7 +-
 .../retention-dialog.spec.tsx.snap            |   4 +-
 .../retention-dialog/retention-dialog.tsx     |  17 +-
 .../segments-preview-pane.tsx                 |   4 +-
 .../dialogs/status-dialog/status-dialog.tsx   |   3 +-
 .../supervisor-reset-offsets-dialog.tsx       |  11 +-
 .../datasource/datasource.ts}                 |  55 +-
 .../src/druid-models/execution/execution.ts   |   2 +-
 .../external-config/external-config.ts        |   4 +-
 web-console/src/druid-models/index.ts         |   3 +
 .../ingest-query-pattern.spec.ts              |   2 +-
 .../ingest-query-pattern.ts                   |   2 +-
 .../load-rule}/load-rule.ts                   |   3 +-
 .../src/druid-models/segment/segment.ts       |  50 +
 web-console/src/druid-models/task/task.ts     |   2 +-
 .../workbench-query/workbench-query.spec.ts   |   2 +-
 .../workbench-query/workbench-query.ts        |   4 +-
 web-console/src/entry.scss                    |   1 +
 web-console/src/entry.tsx                     |   2 +-
 web-console/src/helpers/capabilities.ts       |   4 +
 web-console/src/helpers/execution/general.ts  |   2 +-
 .../helpers/execution/sql-task-execution.ts   |   2 +-
 web-console/src/helpers/spec-conversion.ts    |   2 +-
 web-console/src/hooks/use-clock.ts            |  18 +-
 .../src/react-table/react-table-utils.spec.ts |   4 +
 .../src/react-table/react-table-utils.ts      |  50 +-
 .../date-floor-shift-ceil-utc.spec.ts         | 169 ++++
 .../date-floor-shift-ceil.spec.ts             | 181 ++++
 .../date-floor-shift-ceil.ts                  | 296 ++++++
 web-console/src/utils/date.spec.ts            |   9 -
 web-console/src/utils/date.ts                 |  11 +-
 web-console/src/utils/download.ts             |   2 +-
 web-console/src/utils/druid-query.spec.ts     |   2 +-
 web-console/src/utils/druid-query.ts          |   8 +-
 .../src/utils/duration/duration.spec.ts       | 505 ++++++++++
 web-console/src/utils/duration/duration.ts    | 388 ++++++++
 web-console/src/utils/general.spec.ts         |  14 +-
 web-console/src/utils/general.tsx             |  28 +-
 web-console/src/utils/index.tsx               |   2 +
 web-console/src/utils/query-action.ts         |   2 +-
 .../src/utils/query-manager/query-manager.ts  |   2 +-
 web-console/src/utils/sampler.ts              |   2 +-
 web-console/src/utils/sql.spec.ts             |   2 +-
 web-console/src/utils/sql.ts                  |   4 +-
 .../explore-view/models => utils}/stage.ts    |  14 +
 web-console/src/utils/table-helpers.ts        |  26 +-
 web-console/src/utils/types.ts                |   2 +-
 web-console/src/utils/values-query.spec.tsx   |   2 +-
 web-console/src/utils/values-query.tsx        |   4 +-
 .../datasources-view.spec.tsx.snap            |   1 +
 .../datasources-view/datasources-view.scss    |   9 +-
 .../datasources-view/datasources-view.tsx     | 145 ++-
 .../column-picker-menu/column-picker-menu.tsx |   2 +-
 .../column-picker/column-picker.tsx           |   2 +-
 .../components/control-pane/control-pane.tsx  |   4 +-
 .../control-pane/expression-menu.tsx          |   4 +-
 .../components/control-pane/measure-menu.tsx  |   4 +-
 .../droppable-container.tsx                   |   2 +-
 .../contains-filter-control.tsx               |   4 +-
 .../filter-pane/filter-menu/filter-menu.tsx   |   4 +-
 .../number-range-filter-control.tsx           |   2 +-
 .../regexp-filter-control.tsx                 |   4 +-
 .../time-interval-filter-control.tsx          |   2 +-
 .../time-relative-filter-control.tsx          |   2 +-
 .../values-filter-control.tsx                 |   4 +-
 .../components/filter-pane/filter-pane.tsx    |   6 +-
 .../generic-output-table.tsx                  |   4 +-
 .../components/module-pane/module-pane.tsx    |   5 +-
 .../components/preview-pane/preview-pane.tsx  |   2 +-
 .../column-dialog/column-dialog.tsx           |   4 +-
 .../measure-dialog/measure-dialog.tsx         |   2 +-
 .../nested-column-dialog.tsx                  |   4 +-
 .../resource-pane/resource-pane.tsx           |   2 +-
 .../components/source-pane/source-pane.tsx    |   6 +-
 .../components/sql-input/sql-input.tsx        |   4 +-
 .../src/views/explore-view/drag-helper.ts     |   2 +-
 .../src/views/explore-view/explore-state.ts   |   4 +-
 .../src/views/explore-view/explore-view.tsx   |   4 +-
 .../explore-view/models/expression-meta.ts    |   4 +-
 .../src/views/explore-view/models/index.ts    |   1 -
 .../explore-view/models/measure-pattern.ts    |   4 +-
 .../src/views/explore-view/models/measure.ts  |   4 +-
 .../views/explore-view/models/query-source.ts |   4 +-
 .../module-repository/module-repository.ts    |   5 +-
 .../explore-view/modules/bar-chart-module.tsx |   2 +-
 .../modules/grouping-table-module.tsx         |   4 +-
 .../modules/multi-axis-chart-module.tsx       |  16 +-
 .../explore-view/modules/pie-chart-module.tsx |   2 +-
 .../modules/record-table-module.tsx           |   2 +-
 .../modules/time-chart-module.tsx             |  19 +-
 .../query-macros/aggregate.spec.ts            |   2 +-
 .../explore-view/query-macros/aggregate.ts    |   2 +-
 .../query-macros/max-data-time.ts             |   4 +-
 .../views/explore-view/utils/duration.spec.ts |  39 -
 .../src/views/explore-view/utils/duration.ts  |  46 -
 .../utils/filter-pattern-helpers.ts           |  10 +-
 .../src/views/explore-view/utils/general.ts   |   4 +-
 .../utils/get-auto-granularity.ts             |  87 +-
 .../src/views/explore-view/utils/index.ts     |   2 -
 .../explore-view/utils/max-time-for-table.ts  |   2 +-
 .../explore-view/utils/snap-to-granularity.ts |  57 --
 .../explore-view/utils/table-query.spec.ts    |   4 +-
 .../views/explore-view/utils/table-query.ts   |  11 +-
 .../utils/time-manipulation.spec.ts           |   2 +-
 .../explore-view/utils/time-manipulation.ts   |   2 +-
 .../datasources-card/datasources-card.tsx     |  10 +-
 .../home-view/segments-card/segments-card.tsx |   7 +-
 .../home-view/services-card/services-card.tsx |  13 +-
 .../supervisors-card/supervisors-card.tsx     |  15 +-
 .../views/home-view/tasks-card/tasks-card.tsx |  17 +-
 .../views/load-data-view/load-data-view.tsx   |   4 +-
 .../src/views/lookups-view/lookups-view.tsx   |  14 +-
 .../__snapshots__/segments-view.spec.tsx.snap |  57 +-
 .../views/segments-view/segments-view.scss    |   2 +-
 .../src/views/segments-view/segments-view.tsx | 521 +++++-----
 .../src/views/services-view/services-view.tsx |  48 +-
 .../column-actions/column-actions.tsx         |   4 +-
 .../column-editor/column-editor.tsx           |   4 +-
 .../expression-editor-dialog.tsx              |   2 +-
 .../ingestion-progress-dialog.tsx             |   2 +-
 .../schema-step/column-list/column-list.tsx   |   2 +-
 .../expression-entry/expression-entry.tsx     |   4 +-
 .../preview-table/preview-table.tsx           |   6 +-
 .../rollup-analysis-pane.tsx                  |   4 +-
 .../schema-step/schema-step.tsx               |   6 +-
 .../sql-data-loader-view.tsx                  |   2 +-
 .../supervisors-view.spec.tsx.snap            |  12 +-
 .../supervisors-view/supervisors-view.tsx     | 119 ++-
 .../src/views/tasks-view/tasks-view.tsx       |  37 +-
 .../complex-menu-items.spec.tsx               |   2 +-
 .../complex-menu-items/complex-menu-items.tsx |   4 +-
 .../number-menu-items.spec.tsx                |   2 +-
 .../number-menu-items/number-menu-items.tsx   |   4 +-
 .../string-menu-items.spec.tsx                |   2 +-
 .../string-menu-items/string-menu-items.tsx   |   4 +-
 .../time-menu-items/time-menu-items.spec.tsx  |   2 +-
 .../time-menu-items/time-menu-items.tsx       |  74 +-
 .../column-tree/column-tree.spec.tsx          |   2 +-
 .../column-tree/column-tree.tsx               |   4 +-
 .../connect-external-data-dialog.tsx          |   2 +-
 .../current-dart-panel/current-dart-panel.tsx |  12 +-
 .../execution-details-pane.tsx                |   2 +-
 .../execution-stages-pane.tsx                 |   2 +-
 .../flexible-query-input.tsx                  |   2 +-
 .../ingest-success-pane.tsx                   |   2 +-
 .../input-format-step/input-format-step.tsx   |   4 +-
 .../input-source-step/input-source-step.tsx   |   2 +-
 .../query-parameters-dialog.tsx               |   4 +-
 .../workbench-view/query-tab/query-tab.tsx    |  15 +-
 .../recent-query-task-panel.tsx               |  20 +-
 .../result-table-pane/result-table-pane.tsx   |   4 +-
 .../workbench-view/run-panel/run-panel.tsx    |  71 +-
 .../time-floor-menu-item.tsx                  |   4 +-
 .../timezone-menu-items.spec.tsx.snap         | 563 +++++++++++
 .../timezone-menu-items.spec.tsx}             |  48 +-
 .../timezone-menu-items.tsx                   | 151 +++
 .../views/workbench-view/work-state-store.ts  |  22 +-
 .../views/workbench-view/workbench-view.tsx   |   4 +-
 200 files changed, 5580 insertions(+), 2379 deletions(-)
 create mode 100644 web-console/src/components/portal-bubble/portal-bubble.scss
 create mode 100644 web-console/src/components/portal-bubble/portal-bubble.tsx
 delete mode 100644 web-console/src/components/segment-timeline/__snapshots__/bar-unit.spec.tsx.snap
 delete mode 100644 web-console/src/components/segment-timeline/bar-group.tsx
 create mode 100644 web-console/src/components/segment-timeline/common.ts
 create mode 100644 web-console/src/components/segment-timeline/segment-bar-chart-render.scss
 create mode 100644 web-console/src/components/segment-timeline/segment-bar-chart-render.tsx
 rename web-console/src/components/segment-timeline/{bar-unit.spec.tsx => segment-bar-chart.scss} (68%)
 create mode 100644 web-console/src/components/segment-timeline/segment-bar-chart.tsx
 delete mode 100644 web-console/src/components/segment-timeline/stacked-bar-chart.tsx
 rename web-console/src/{components/segment-timeline/stacked-bar-chart.scss => druid-models/datasource/datasource.ts} (64%)
 rename web-console/src/{utils => druid-models/load-rule}/load-rule.ts (97%)
 create mode 100644 web-console/src/druid-models/segment/segment.ts
 create mode 100755 web-console/src/utils/date-floor-shift-ceil/date-floor-shift-ceil-utc.spec.ts
 create mode 100755 web-console/src/utils/date-floor-shift-ceil/date-floor-shift-ceil.spec.ts
 create mode 100755 web-console/src/utils/date-floor-shift-ceil/date-floor-shift-ceil.ts
 create mode 100755 web-console/src/utils/duration/duration.spec.ts
 create mode 100755 web-console/src/utils/duration/duration.ts
 rename web-console/src/{views/explore-view/models => utils}/stage.ts (80%)
 delete mode 100644 web-console/src/views/explore-view/utils/duration.spec.ts
 delete mode 100644 web-console/src/views/explore-view/utils/duration.ts
 delete mode 100644 web-console/src/views/explore-view/utils/snap-to-granularity.ts
 create mode 100644 web-console/src/views/workbench-view/timezone-menu-items/__snapshots__/timezone-menu-items.spec.tsx.snap
 rename web-console/src/{components/segment-timeline/bar-unit.tsx => views/workbench-view/timezone-menu-items/timezone-menu-items.spec.tsx} (58%)
 create mode 100644 web-console/src/views/workbench-view/timezone-menu-items/timezone-menu-items.tsx

diff --git a/licenses.yaml b/licenses.yaml
index 1f05bb5d1d7f..8044beb12bab 100644
--- a/licenses.yaml
+++ b/licenses.yaml
@@ -5125,15 +5125,6 @@ version: 5.2.5
 
 ---
 
-name: "@druid-toolkit/query"
-license_category: binary
-module: web-console
-license_name: Apache License version 2.0
-copyright: Imply Data
-version: 0.22.23
-
----
-
 name: "@emotion/cache"
 license_category: binary
 module: web-console
@@ -5224,6 +5215,16 @@ license_file_path: licenses/bin/@emotion-weak-memoize.MIT
 
 ---
 
+name: "@flatten-js/interval-tree"
+license_category: binary
+module: web-console
+license_name: MIT License
+copyright: Alex Bol
+version: 1.1.3
+license_file_path: licenses/bin/@flatten-js-interval-tree.MIT
+
+---
+
 name: "@fontsource/open-sans"
 license_category: binary
 module: web-console
@@ -5234,6 +5235,15 @@ license_file_path: licenses/bin/@fontsource-open-sans.OFL
 
 ---
 
+name: "@internationalized/date"
+license_category: binary
+module: web-console
+license_name: Apache License version 2.0
+copyright: Adobe
+version: 3.5.6
+
+---
+
 name: "@popperjs/core"
 license_category: binary
 module: web-console
@@ -5244,6 +5254,15 @@ license_file_path: licenses/bin/@popperjs-core.MIT
 
 ---
 
+name: "@swc/helpers"
+license_category: binary
+module: web-console
+license_name: Apache License version 2.0
+copyright: 강동윤
+version: 0.5.13
+
+---
+
 name: "@types/parse-json"
 license_category: binary
 module: web-console
@@ -5404,15 +5423,6 @@ license_file_path: licenses/bin/change-case.MIT
 
 ---
 
-name: "chronoshift"
-license_category: binary
-module: web-console
-license_name: Apache License version 2.0
-copyright: Vadim Ogievetsky
-version: 0.10.0
-
----
-
 name: "classnames"
 license_category: binary
 module: web-console
@@ -5702,6 +5712,15 @@ license_file_path: licenses/bin/dot-case.MIT
 
 ---
 
+name: "druid-query-toolkit"
+license_category: binary
+module: web-console
+license_name: Apache License version 2.0
+copyright: Imply Data
+version: 1.0.0
+
+---
+
 name: "echarts"
 license_category: binary
 module: web-console
@@ -5801,16 +5820,6 @@ license_file_path: licenses/bin/has-flag.MIT
 
 ---
 
-name: "has-own-prop"
-license_category: binary
-module: web-console
-license_name: MIT License
-copyright: Sindre Sorhus
-version: 2.0.0
-license_file_path: licenses/bin/has-own-prop.MIT
-
----
-
 name: "hasown"
 license_category: binary
 module: web-console
@@ -5871,15 +5880,6 @@ license_file_path: licenses/bin/iconv-lite.MIT
 
 ---
 
-name: "immutable-class"
-license_category: binary
-module: web-console
-license_name: Apache License version 2.0
-copyright: Vadim Ogievetsky
-version: 0.11.2
-
----
-
 name: "import-fresh"
 license_category: binary
 module: web-console
@@ -6060,26 +6060,6 @@ license_file_path: licenses/bin/mime-types.MIT
 
 ---
 
-name: "moment-timezone"
-license_category: binary
-module: web-console
-license_name: MIT License
-copyright: Tim Wood
-version: 0.5.43
-license_file_path: licenses/bin/moment-timezone.MIT
-
----
-
-name: "moment"
-license_category: binary
-module: web-console
-license_name: MIT License
-copyright: Iskren Ivov Chernev
-version: 2.29.4
-license_file_path: licenses/bin/moment.MIT
-
----
-
 name: "no-case"
 license_category: binary
 module: web-console
diff --git a/web-console/e2e-tests/tutorial-batch.spec.ts b/web-console/e2e-tests/tutorial-batch.spec.ts
index 3fa15af9d2a4..59ac0a407810 100644
--- a/web-console/e2e-tests/tutorial-batch.spec.ts
+++ b/web-console/e2e-tests/tutorial-batch.spec.ts
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-import { T } from '@druid-toolkit/query';
+import { T } from 'druid-query-toolkit';
 import type * as playwright from 'playwright-chromium';
 
 import { DatasourcesOverview } from './component/datasources/overview';
diff --git a/web-console/jest.common.config.js b/web-console/jest.common.config.js
index 89e3dab5852b..1ea8f55ad18b 100644
--- a/web-console/jest.common.config.js
+++ b/web-console/jest.common.config.js
@@ -18,6 +18,8 @@
 
 const { createJsWithTsPreset } = require('ts-jest');
 
+process.env.TZ = 'UTC';
+
 module.exports = {
   testEnvironment: 'jsdom',
   transformIgnorePatterns: ['/node_modules/(?!(d3-.+)/)'],
diff --git a/web-console/lib/keywords.ts b/web-console/lib/keywords.ts
index 06d7ccdcc949..5985ae0a6aa6 100644
--- a/web-console/lib/keywords.ts
+++ b/web-console/lib/keywords.ts
@@ -100,15 +100,23 @@ export const SQL_EXPRESSION_PARTS = [
   'TRAILING',
   'EPOCH',
   'SECOND',
+  'SECONDS',
   'MINUTE',
+  'MINUTES',
   'HOUR',
+  'HOURS',
   'DAY',
+  'DAYS',
   'DOW',
   'DOY',
   'WEEK',
+  'WEEKS',
   'MONTH',
+  'MONTHS',
   'QUARTER',
+  'QUARTERS',
   'YEAR',
+  'YEARS',
   'TIMESTAMP',
   'INTERVAL',
   'CSV',
diff --git a/web-console/package-lock.json b/web-console/package-lock.json
index 95768117648c..27a3d463aad2 100644
--- a/web-console/package-lock.json
+++ b/web-console/package-lock.json
@@ -14,11 +14,11 @@
         "@blueprintjs/datetime2": "^2.3.11",
         "@blueprintjs/icons": "^5.13.0",
         "@blueprintjs/select": "^5.2.5",
-        "@druid-toolkit/query": "^0.22.23",
+        "@flatten-js/interval-tree": "^1.1.3",
         "@fontsource/open-sans": "^5.0.30",
+        "@internationalized/date": "^3.5.6",
         "ace-builds": "~1.5.3",
         "axios": "^1.7.7",
-        "chronoshift": "^0.10.0",
         "classnames": "^2.2.6",
         "copy-to-clipboard": "^3.3.3",
         "d3-array": "^3.2.4",
@@ -28,6 +28,7 @@
         "d3-scale-chromatic": "^3.1.0",
         "d3-selection": "^3.0.0",
         "date-fns": "^2.28.0",
+        "druid-query-toolkit": "^1.0.0",
         "echarts": "^5.5.1",
         "file-saver": "^2.0.5",
         "hjson": "^3.2.2",
@@ -2085,15 +2086,6 @@
         "node": ">=10.0.0"
       }
     },
-    "node_modules/@druid-toolkit/query": {
-      "version": "0.22.23",
-      "resolved": "https://registry.npmjs.org/@druid-toolkit/query/-/query-0.22.23.tgz",
-      "integrity": "sha512-yQOUAQJP63rzsTCdLcqNB8aRtsYPw8rYBfPSXc4zfAA4y/GJc9OJeHcLFRMdUtpwBtm0ueARMUlTSQcTsyV8gQ==",
-      "license": "Apache-2.0",
-      "dependencies": {
-        "tslib": "^2.5.2"
-      }
-    },
     "node_modules/@dual-bundle/import-meta-resolve": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/@dual-bundle/import-meta-resolve/-/import-meta-resolve-4.1.0.tgz",
@@ -2373,9 +2365,9 @@
       }
     },
     "node_modules/@eslint/plugin-kit": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.2.0.tgz",
-      "integrity": "sha512-vH9PiIMMwvhCx31Af3HiGzsVNULDbyVkHXwlemn/B0TFj/00ho3y55efXrUZTfQipxoHC5u4xq6zblww1zm1Ig==",
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.2.3.tgz",
+      "integrity": "sha512-2b/g5hRmpbb1o4GnTZax9N9m0FXzz9OV42ZzI4rDDMDuHUqigAiQCEWChBWCY4ztAGVRjoWT19v0yMmc5/L5kA==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
@@ -2385,6 +2377,12 @@
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       }
     },
+    "node_modules/@flatten-js/interval-tree": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/@flatten-js/interval-tree/-/interval-tree-1.1.3.tgz",
+      "integrity": "sha512-xhFWUBoHJFF77cJO1D6REjdgJEMRf2Y2Z+eKEPav8evGKcLSnj1ud5pLXQSbGuxF3VSvT1rWhMfVpXEKJLTL+A==",
+      "license": "MIT"
+    },
     "node_modules/@fontsource/open-sans": {
       "version": "5.1.0",
       "resolved": "https://registry.npmjs.org/@fontsource/open-sans/-/open-sans-5.1.0.tgz",
@@ -2442,6 +2440,15 @@
         "url": "https://github.com/sponsors/nzakas"
       }
     },
+    "node_modules/@internationalized/date": {
+      "version": "3.5.6",
+      "resolved": "https://registry.npmjs.org/@internationalized/date/-/date-3.5.6.tgz",
+      "integrity": "sha512-jLxQjefH9VI5P9UQuqB6qNKnvFt1Ky1TPIzHGsIlCi7sZZoMR8SdYbBGRvM0y+Jtb+ez4ieBzmiAUcpmPYpyOw==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@swc/helpers": "^0.5.0"
+      }
+    },
     "node_modules/@istanbuljs/load-nyc-config": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz",
@@ -3473,6 +3480,15 @@
         "url": "https://opencollective.com/eslint"
       }
     },
+    "node_modules/@swc/helpers": {
+      "version": "0.5.13",
+      "resolved": "https://registry.npmjs.org/@swc/helpers/-/helpers-0.5.13.tgz",
+      "integrity": "sha512-UoKGxQ3r5kYI9dALKJapMmuK+1zWM/H17Z1+iwnNmzcJRnfFuevZs375TA5rW31pu4BS4NoSy1fRsexDXfWn5w==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "tslib": "^2.4.0"
+      }
+    },
     "node_modules/@testing-library/dom": {
       "version": "10.4.0",
       "resolved": "https://registry.npmjs.org/@testing-library/dom/-/dom-10.4.0.tgz",
@@ -5802,16 +5818,6 @@
         "node": ">=6.0"
       }
     },
-    "node_modules/chronoshift": {
-      "version": "0.10.0",
-      "resolved": "https://registry.npmjs.org/chronoshift/-/chronoshift-0.10.0.tgz",
-      "integrity": "sha512-dNvumPg7R6ACUOKbGo1zH6DtmTo5ut9/LNbzqaKGnpC9VdArIos8+kApHOVIZH4FCpm9M9XYh++jwlRHhc1PyA==",
-      "dependencies": {
-        "immutable-class": "^0.11.0",
-        "moment-timezone": "^0.5.26",
-        "tslib": "^2.3.1"
-      }
-    },
     "node_modules/ci-info": {
       "version": "3.3.0",
       "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.3.0.tgz",
@@ -6205,10 +6211,11 @@
       "dev": true
     },
     "node_modules/cross-spawn": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+      "version": "7.0.6",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
+      "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "path-key": "^3.1.0",
         "shebang-command": "^2.0.0",
@@ -7013,6 +7020,15 @@
         "tslib": "^2.0.3"
       }
     },
+    "node_modules/druid-query-toolkit": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/druid-query-toolkit/-/druid-query-toolkit-1.0.0.tgz",
+      "integrity": "sha512-yBQR4uDcks0lcsRSWoLQy16YQ4dx264m6i7TNQDFrACUKHlMtnw5l+4+UDZKbXbpUFLMLWCr/kLhmXzLJk50+Q==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "tslib": "^2.5.2"
+      }
+    },
     "node_modules/duplexer": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.2.tgz",
@@ -8909,14 +8925,6 @@
         "node": ">=4"
       }
     },
-    "node_modules/has-own-prop": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/has-own-prop/-/has-own-prop-2.0.0.tgz",
-      "integrity": "sha512-Pq0h+hvsVm6dDEa8x82GnLSYHOzNDt7f0ddFa3FqcQlgzEiptPqL+XrOJNavjOzSYiYWIrgeVYYgGlLmnxwilQ==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/has-property-descriptors": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz",
@@ -9213,10 +9221,11 @@
       "dev": true
     },
     "node_modules/http-proxy-middleware": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-2.0.6.tgz",
-      "integrity": "sha512-ya/UeJ6HVBYxrgYotAZo1KvPWlgB48kUJLDePFeneHsVujFaW5WNj2NgWCAE//B1Dl02BIfYlpNgBy8Kf8Rjmw==",
+      "version": "2.0.7",
+      "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-2.0.7.tgz",
+      "integrity": "sha512-fgVY8AV7qU7z/MmXJ/rxwbrtQH4jBQ9m7kp3llF0liB7glmFeVZFBepQb32T3y8n8k2+AEYuMPCpinYW+/CuRA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/http-proxy": "^1.17.8",
         "http-proxy": "^1.18.1",
@@ -9354,15 +9363,6 @@
       "integrity": "sha512-0AOCmOip+xgJwEVTQj1EfiDDOkPmuyllDuTuEX+DDXUgapLAsBIfkg3sxCYyCEA8mQqZrrxPUGjcOQ2JS3WLkg==",
       "dev": true
     },
-    "node_modules/immutable-class": {
-      "version": "0.11.2",
-      "resolved": "https://registry.npmjs.org/immutable-class/-/immutable-class-0.11.2.tgz",
-      "integrity": "sha512-CzkVPkJXzkspt6RX+ipNgtvt16+rzEBUlA3yNPLkK5/S042c9wvuyfE4F5TfMfPJ6XF86Fp+OCwu6eeAnMICuw==",
-      "dependencies": {
-        "has-own-prop": "^2.0.0",
-        "tslib": "^2.3.1"
-      }
-    },
     "node_modules/import-fresh": {
       "version": "3.3.0",
       "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
@@ -12889,25 +12889,6 @@
         "mkdirp": "bin/cmd.js"
       }
     },
-    "node_modules/moment": {
-      "version": "2.29.4",
-      "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.4.tgz",
-      "integrity": "sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w==",
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/moment-timezone": {
-      "version": "0.5.43",
-      "resolved": "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.43.tgz",
-      "integrity": "sha512-72j3aNyuIsDxdF1i7CEgV2FfxM1r6aaqJyLB2vwb33mXYyoyLly+F1zbWqhA3/bVIoJ4szlUoMbUnVdid32NUQ==",
-      "dependencies": {
-        "moment": "^2.29.4"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
     "node_modules/mrmime": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/mrmime/-/mrmime-1.0.1.tgz",
@@ -19560,14 +19541,6 @@
       "integrity": "sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw==",
       "dev": true
     },
-    "@druid-toolkit/query": {
-      "version": "0.22.23",
-      "resolved": "https://registry.npmjs.org/@druid-toolkit/query/-/query-0.22.23.tgz",
-      "integrity": "sha512-yQOUAQJP63rzsTCdLcqNB8aRtsYPw8rYBfPSXc4zfAA4y/GJc9OJeHcLFRMdUtpwBtm0ueARMUlTSQcTsyV8gQ==",
-      "requires": {
-        "tslib": "^2.5.2"
-      }
-    },
     "@dual-bundle/import-meta-resolve": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/@dual-bundle/import-meta-resolve/-/import-meta-resolve-4.1.0.tgz",
@@ -19774,14 +19747,19 @@
       "dev": true
     },
     "@eslint/plugin-kit": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.2.0.tgz",
-      "integrity": "sha512-vH9PiIMMwvhCx31Af3HiGzsVNULDbyVkHXwlemn/B0TFj/00ho3y55efXrUZTfQipxoHC5u4xq6zblww1zm1Ig==",
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.2.3.tgz",
+      "integrity": "sha512-2b/g5hRmpbb1o4GnTZax9N9m0FXzz9OV42ZzI4rDDMDuHUqigAiQCEWChBWCY4ztAGVRjoWT19v0yMmc5/L5kA==",
       "dev": true,
       "requires": {
         "levn": "^0.4.1"
       }
     },
+    "@flatten-js/interval-tree": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/@flatten-js/interval-tree/-/interval-tree-1.1.3.tgz",
+      "integrity": "sha512-xhFWUBoHJFF77cJO1D6REjdgJEMRf2Y2Z+eKEPav8evGKcLSnj1ud5pLXQSbGuxF3VSvT1rWhMfVpXEKJLTL+A=="
+    },
     "@fontsource/open-sans": {
       "version": "5.1.0",
       "resolved": "https://registry.npmjs.org/@fontsource/open-sans/-/open-sans-5.1.0.tgz",
@@ -19815,6 +19793,14 @@
       "integrity": "sha512-JBxkERygn7Bv/GbN5Rv8Ul6LVknS+5Bp6RgDC/O8gEBU/yeH5Ui5C/OlWrTb6qct7LjjfT6Re2NxB0ln0yYybA==",
       "dev": true
     },
+    "@internationalized/date": {
+      "version": "3.5.6",
+      "resolved": "https://registry.npmjs.org/@internationalized/date/-/date-3.5.6.tgz",
+      "integrity": "sha512-jLxQjefH9VI5P9UQuqB6qNKnvFt1Ky1TPIzHGsIlCi7sZZoMR8SdYbBGRvM0y+Jtb+ez4ieBzmiAUcpmPYpyOw==",
+      "requires": {
+        "@swc/helpers": "^0.5.0"
+      }
+    },
     "@istanbuljs/load-nyc-config": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz",
@@ -20614,6 +20600,14 @@
         }
       }
     },
+    "@swc/helpers": {
+      "version": "0.5.13",
+      "resolved": "https://registry.npmjs.org/@swc/helpers/-/helpers-0.5.13.tgz",
+      "integrity": "sha512-UoKGxQ3r5kYI9dALKJapMmuK+1zWM/H17Z1+iwnNmzcJRnfFuevZs375TA5rW31pu4BS4NoSy1fRsexDXfWn5w==",
+      "requires": {
+        "tslib": "^2.4.0"
+      }
+    },
     "@testing-library/dom": {
       "version": "10.4.0",
       "resolved": "https://registry.npmjs.org/@testing-library/dom/-/dom-10.4.0.tgz",
@@ -22411,16 +22405,6 @@
       "integrity": "sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==",
       "dev": true
     },
-    "chronoshift": {
-      "version": "0.10.0",
-      "resolved": "https://registry.npmjs.org/chronoshift/-/chronoshift-0.10.0.tgz",
-      "integrity": "sha512-dNvumPg7R6ACUOKbGo1zH6DtmTo5ut9/LNbzqaKGnpC9VdArIos8+kApHOVIZH4FCpm9M9XYh++jwlRHhc1PyA==",
-      "requires": {
-        "immutable-class": "^0.11.0",
-        "moment-timezone": "^0.5.26",
-        "tslib": "^2.3.1"
-      }
-    },
     "ci-info": {
       "version": "3.3.0",
       "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.3.0.tgz",
@@ -22735,9 +22719,9 @@
       "dev": true
     },
     "cross-spawn": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+      "version": "7.0.6",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
+      "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==",
       "dev": true,
       "requires": {
         "path-key": "^3.1.0",
@@ -23276,6 +23260,14 @@
         "tslib": "^2.0.3"
       }
     },
+    "druid-query-toolkit": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/druid-query-toolkit/-/druid-query-toolkit-1.0.0.tgz",
+      "integrity": "sha512-yBQR4uDcks0lcsRSWoLQy16YQ4dx264m6i7TNQDFrACUKHlMtnw5l+4+UDZKbXbpUFLMLWCr/kLhmXzLJk50+Q==",
+      "requires": {
+        "tslib": "^2.5.2"
+      }
+    },
     "duplexer": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.2.tgz",
@@ -24650,11 +24642,6 @@
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
       "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0="
     },
-    "has-own-prop": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/has-own-prop/-/has-own-prop-2.0.0.tgz",
-      "integrity": "sha512-Pq0h+hvsVm6dDEa8x82GnLSYHOzNDt7f0ddFa3FqcQlgzEiptPqL+XrOJNavjOzSYiYWIrgeVYYgGlLmnxwilQ=="
-    },
     "has-property-descriptors": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz",
@@ -24884,9 +24871,9 @@
       }
     },
     "http-proxy-middleware": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-2.0.6.tgz",
-      "integrity": "sha512-ya/UeJ6HVBYxrgYotAZo1KvPWlgB48kUJLDePFeneHsVujFaW5WNj2NgWCAE//B1Dl02BIfYlpNgBy8Kf8Rjmw==",
+      "version": "2.0.7",
+      "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-2.0.7.tgz",
+      "integrity": "sha512-fgVY8AV7qU7z/MmXJ/rxwbrtQH4jBQ9m7kp3llF0liB7glmFeVZFBepQb32T3y8n8k2+AEYuMPCpinYW+/CuRA==",
       "dev": true,
       "requires": {
         "@types/http-proxy": "^1.17.8",
@@ -24982,15 +24969,6 @@
       "integrity": "sha512-0AOCmOip+xgJwEVTQj1EfiDDOkPmuyllDuTuEX+DDXUgapLAsBIfkg3sxCYyCEA8mQqZrrxPUGjcOQ2JS3WLkg==",
       "dev": true
     },
-    "immutable-class": {
-      "version": "0.11.2",
-      "resolved": "https://registry.npmjs.org/immutable-class/-/immutable-class-0.11.2.tgz",
-      "integrity": "sha512-CzkVPkJXzkspt6RX+ipNgtvt16+rzEBUlA3yNPLkK5/S042c9wvuyfE4F5TfMfPJ6XF86Fp+OCwu6eeAnMICuw==",
-      "requires": {
-        "has-own-prop": "^2.0.0",
-        "tslib": "^2.3.1"
-      }
-    },
     "import-fresh": {
       "version": "3.3.0",
       "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
@@ -27557,19 +27535,6 @@
         "minimist": "^1.2.5"
       }
     },
-    "moment": {
-      "version": "2.29.4",
-      "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.4.tgz",
-      "integrity": "sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w=="
-    },
-    "moment-timezone": {
-      "version": "0.5.43",
-      "resolved": "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.43.tgz",
-      "integrity": "sha512-72j3aNyuIsDxdF1i7CEgV2FfxM1r6aaqJyLB2vwb33mXYyoyLly+F1zbWqhA3/bVIoJ4szlUoMbUnVdid32NUQ==",
-      "requires": {
-        "moment": "^2.29.4"
-      }
-    },
     "mrmime": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/mrmime/-/mrmime-1.0.1.tgz",
diff --git a/web-console/package.json b/web-console/package.json
index 1e76234841ab..39eae99e101b 100644
--- a/web-console/package.json
+++ b/web-console/package.json
@@ -55,11 +55,11 @@
     "@blueprintjs/datetime2": "^2.3.11",
     "@blueprintjs/icons": "^5.13.0",
     "@blueprintjs/select": "^5.2.5",
-    "@druid-toolkit/query": "^0.22.23",
+    "@flatten-js/interval-tree": "^1.1.3",
     "@fontsource/open-sans": "^5.0.30",
+    "@internationalized/date": "^3.5.6",
     "ace-builds": "~1.5.3",
     "axios": "^1.7.7",
-    "chronoshift": "^0.10.0",
     "classnames": "^2.2.6",
     "copy-to-clipboard": "^3.3.3",
     "d3-array": "^3.2.4",
@@ -69,6 +69,7 @@
     "d3-scale-chromatic": "^3.1.0",
     "d3-selection": "^3.0.0",
     "date-fns": "^2.28.0",
+    "druid-query-toolkit": "^1.0.0",
     "echarts": "^5.5.1",
     "file-saver": "^2.0.5",
     "hjson": "^3.2.2",
diff --git a/web-console/script/create-sql-docs.mjs b/web-console/script/create-sql-docs.mjs
index 62e1f44d0177..b14055341a0d 100755
--- a/web-console/script/create-sql-docs.mjs
+++ b/web-console/script/create-sql-docs.mjs
@@ -39,6 +39,12 @@ const initialFunctionDocs = {
       ),
     ],
   ],
+  UNNEST: [
+    [
+      'arrayExpression',
+      convertMarkdownToHtml("Unnests ARRAY typed values. The source for UNNEST can be an array type column, or an input that's been transformed into an array, such as with helper functions like `MV_TO_ARRAY` or `ARRAY`.")
+    ]
+  ]
 };
 
 function hasHtmlTags(str) {
diff --git a/web-console/script/licenses b/web-console/script/licenses
index 90f1420282ae..f4e67862d011 100755
--- a/web-console/script/licenses
+++ b/web-console/script/licenses
@@ -193,6 +193,7 @@ checker.init(
           if (name === 'diff-match-patch') publisher = 'Google';
           if (name === 'esutils') publisher = 'Yusuke Suzuki'; // https://github.com/estools/esutils#license
           if (name === 'echarts') publisher = 'Apache Software Foundation';
+          if (name === '@internationalized/date') publisher = 'Adobe';
         }
 
         if (!publisher) {
diff --git a/web-console/src/bootstrap/json-parser.tsx b/web-console/src/bootstrap/json-parser.tsx
index 7e8fc0994610..d8fd232795e7 100644
--- a/web-console/src/bootstrap/json-parser.tsx
+++ b/web-console/src/bootstrap/json-parser.tsx
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-import { QueryResult } from '@druid-toolkit/query';
+import { QueryResult } from 'druid-query-toolkit';
 import * as JSONBig from 'json-bigint-native';
 
 export function bootstrapJsonParse() {
diff --git a/web-console/src/components/auto-form/__snapshots__/auto-form.spec.tsx.snap b/web-console/src/components/auto-form/__snapshots__/auto-form.spec.tsx.snap
index dc566363abee..0016d1c90323 100644
--- a/web-console/src/components/auto-form/__snapshots__/auto-form.spec.tsx.snap
+++ b/web-console/src/components/auto-form/__snapshots__/auto-form.spec.tsx.snap
@@ -170,7 +170,6 @@ exports[`AutoForm matches snapshot 1`] = `
   </Memo(FormGroupWithInfo)>
   <Blueprint5.FormGroup>
     <Blueprint5.Button
-      fill={true}
       minimal={true}
       onClick={[Function]}
       rightIcon="chevron-down"
diff --git a/web-console/src/components/auto-form/auto-form.tsx b/web-console/src/components/auto-form/auto-form.tsx
index 4c51d2cbf5a9..7026ca5d5dc6 100644
--- a/web-console/src/components/auto-form/auto-form.tsx
+++ b/web-console/src/components/auto-form/auto-form.tsx
@@ -539,7 +539,6 @@ export class AutoForm<T extends Record<string, any>> extends React.PureComponent
           text={showMore ? 'Show less' : 'Show more'}
           rightIcon={showMore ? IconNames.CHEVRON_UP : IconNames.CHEVRON_DOWN}
           minimal
-          fill
           onClick={() => {
             this.setState(({ showMore }) => ({ showMore: !showMore }));
           }}
diff --git a/web-console/src/components/cell-filter-menu/cell-filter-menu.tsx b/web-console/src/components/cell-filter-menu/cell-filter-menu.tsx
index dac3e2fc1979..5d2098c7db4d 100644
--- a/web-console/src/components/cell-filter-menu/cell-filter-menu.tsx
+++ b/web-console/src/components/cell-filter-menu/cell-filter-menu.tsx
@@ -18,8 +18,8 @@
 
 import { Menu, MenuItem } from '@blueprintjs/core';
 import { IconNames } from '@blueprintjs/icons';
-import type { Column, SqlExpression, SqlQuery } from '@druid-toolkit/query';
-import { C, L, SqlComparison, SqlLiteral, SqlRecord, trimString } from '@druid-toolkit/query';
+import type { Column, SqlExpression, SqlQuery } from 'druid-query-toolkit';
+import { C, L, SqlComparison, SqlLiteral, SqlRecord, trimString } from 'druid-query-toolkit';
 
 import type { QueryAction } from '../../utils';
 import { copyAndAlert, prettyPrintSql, stringifyValue } from '../../utils';
diff --git a/web-console/src/components/fancy-numeric-input/fancy-numeric-input.tsx b/web-console/src/components/fancy-numeric-input/fancy-numeric-input.tsx
index cb389ff532dc..dad7c9a0617a 100644
--- a/web-console/src/components/fancy-numeric-input/fancy-numeric-input.tsx
+++ b/web-console/src/components/fancy-numeric-input/fancy-numeric-input.tsx
@@ -19,8 +19,8 @@
 import type { InputGroupProps2, Intent } from '@blueprintjs/core';
 import { Button, ButtonGroup, Classes, ControlGroup, InputGroup, Keys } from '@blueprintjs/core';
 import { IconNames } from '@blueprintjs/icons';
-import { SqlExpression, SqlFunction, SqlLiteral, SqlMulti } from '@druid-toolkit/query';
 import classNames from 'classnames';
+import { SqlExpression, SqlFunction, SqlLiteral, SqlMulti } from 'druid-query-toolkit';
 import React, { useEffect, useState } from 'react';
 
 import { clamp } from '../../utils';
diff --git a/web-console/src/components/index.ts b/web-console/src/components/index.ts
index d885bf07434a..18a4c21e72c2 100644
--- a/web-console/src/components/index.ts
+++ b/web-console/src/components/index.ts
@@ -43,6 +43,7 @@ export * from './menu-checkbox/menu-checkbox';
 export * from './more-button/more-button';
 export * from './plural-pair-if-needed/plural-pair-if-needed';
 export * from './popover-text/popover-text';
+export * from './portal-bubble/portal-bubble';
 export * from './query-error-pane/query-error-pane';
 export * from './record-table-pane/record-table-pane';
 export * from './refresh-button/refresh-button';
diff --git a/web-console/src/components/portal-bubble/portal-bubble.scss b/web-console/src/components/portal-bubble/portal-bubble.scss
new file mode 100644
index 000000000000..f29091150afc
--- /dev/null
+++ b/web-console/src/components/portal-bubble/portal-bubble.scss
@@ -0,0 +1,86 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+@import '../../variables';
+
+$shpitz-size: 9px;
+
+.portal-bubble {
+  position: absolute;
+  @include card-like;
+
+  .#{$bp-ns}-dark & {
+    background: $dark-gray1;
+  }
+
+  &.up {
+    transform: translate(-50%, -100%);
+  }
+
+  &.down {
+    transform: translate(-50%, 0);
+  }
+
+  &.mute {
+    pointer-events: none;
+  }
+
+  & > .shpitz {
+    content: '';
+    position: absolute;
+    transform: translate(-50%, 0);
+    border-right: $shpitz-size solid transparent;
+    border-left: $shpitz-size solid transparent;
+  }
+
+  &.up > .shpitz {
+    bottom: -$shpitz-size;
+    border-top: $shpitz-size solid $dark-gray1;
+  }
+
+  &.down > .shpitz {
+    top: -$shpitz-size;
+    border-bottom: $shpitz-size solid $dark-gray1;
+  }
+
+  & > .bubble-title-bar {
+    position: relative;
+    padding: 5px 5px 0 5px;
+    white-space: nowrap;
+    font-weight: bold;
+
+    &.with-close {
+      padding-right: 26px;
+
+      .close-button {
+        position: absolute;
+        top: 0;
+        right: 0;
+      }
+    }
+  }
+
+  & > .bubble-content {
+    padding: 5px;
+    white-space: nowrap;
+  }
+
+  .bubble-title-bar + .bubble-content {
+    padding-top: 0;
+  }
+}
diff --git a/web-console/src/components/portal-bubble/portal-bubble.tsx b/web-console/src/components/portal-bubble/portal-bubble.tsx
new file mode 100644
index 000000000000..b8831c84bb09
--- /dev/null
+++ b/web-console/src/components/portal-bubble/portal-bubble.tsx
@@ -0,0 +1,93 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { Button } from '@blueprintjs/core';
+import { IconNames } from '@blueprintjs/icons';
+import classNames from 'classnames';
+import type { ReactNode } from 'react';
+import { useState } from 'react';
+import { createPortal } from 'react-dom';
+
+import { clamp } from '../../utils';
+
+import './portal-bubble.scss';
+
+const SHPITZ_SIZE = 10;
+
+export interface PortalBubbleOpenOn {
+  x: number;
+  y: number;
+  title?: string;
+  text: ReactNode;
+}
+
+export interface PortalBubbleProps {
+  className?: string;
+  openOn: PortalBubbleOpenOn | undefined;
+  direction?: 'up' | 'down';
+  onClose?(): void;
+  mute?: boolean;
+  minimal?: boolean;
+}
+
+export const PortalBubble = function PortalBubble(props: PortalBubbleProps) {
+  const { className, openOn, direction = 'up', onClose, mute, minimal } = props;
+  const [myWidth, setMyWidth] = useState(200);
+  if (!openOn) return null;
+
+  const halfMyWidth = myWidth / 2;
+
+  const x = clamp(openOn.x, halfMyWidth, window.innerWidth - halfMyWidth);
+  const offset = clamp(x - openOn.x, -halfMyWidth, halfMyWidth);
+
+  return createPortal(
+    <div
+      className={classNames('portal-bubble', className, direction, {
+        mute: mute && !onClose,
+      })}
+      ref={element => {
+        if (!element) return;
+        setMyWidth(element.offsetWidth);
+      }}
+      style={{
+        left: x,
+        top: openOn.y + (minimal ? 0 : direction === 'up' ? -SHPITZ_SIZE : SHPITZ_SIZE),
+      }}
+    >
+      {(openOn.title || onClose) && (
+        <div className={classNames('bubble-title-bar', { 'with-close': Boolean(onClose) })}>
+          {openOn.title}
+          {onClose && (
+            <Button
+              className="close-button"
+              icon={IconNames.CROSS}
+              small
+              minimal
+              onClick={onClose}
+            />
+          )}
+        </div>
+      )}
+      <div className="bubble-content">{openOn.text}</div>
+      {!minimal && (
+        <div className="shpitz" style={{ left: offset ? `calc(50% - ${offset}px)` : '50%' }} />
+      )}
+    </div>,
+    document.body,
+  );
+};
diff --git a/web-console/src/components/record-table-pane/record-table-pane.tsx b/web-console/src/components/record-table-pane/record-table-pane.tsx
index e44eab355602..803ee783c2cd 100644
--- a/web-console/src/components/record-table-pane/record-table-pane.tsx
+++ b/web-console/src/components/record-table-pane/record-table-pane.tsx
@@ -18,8 +18,8 @@
 
 import { Button, Icon, Popover } from '@blueprintjs/core';
 import { IconNames } from '@blueprintjs/icons';
-import type { Column, QueryResult } from '@druid-toolkit/query';
 import classNames from 'classnames';
+import type { Column, QueryResult } from 'druid-query-toolkit';
 import React, { useEffect, useState } from 'react';
 import type { RowRenderProps } from 'react-table';
 import ReactTable from 'react-table';
diff --git a/web-console/src/components/rule-editor/__snapshots__/rule-editor.spec.tsx.snap b/web-console/src/components/rule-editor/__snapshots__/rule-editor.spec.tsx.snap
index 2769c8af739e..7246fe89490f 100644
--- a/web-console/src/components/rule-editor/__snapshots__/rule-editor.spec.tsx.snap
+++ b/web-console/src/components/rule-editor/__snapshots__/rule-editor.spec.tsx.snap
@@ -70,7 +70,7 @@ exports[`RuleEditor matches snapshot no tier in rule 1`] = `
       style="transform: translateY(0); transition: none;"
     >
       <div
-        class="bp5-card bp5-elevation-2"
+        class="rule-detail bp5-card bp5-elevation-2"
       >
         <div
           class="bp5-form-group"
@@ -451,7 +451,7 @@ exports[`RuleEditor matches snapshot with broadcast rule 1`] = `
       style="transform: translateY(0); transition: none;"
     >
       <div
-        class="bp5-card bp5-elevation-2"
+        class="rule-detail bp5-card bp5-elevation-2"
       >
         <div
           class="bp5-form-group"
@@ -629,7 +629,7 @@ exports[`RuleEditor matches snapshot with existing tier and non existing tier in
       style="transform: translateY(0); transition: none;"
     >
       <div
-        class="bp5-card bp5-elevation-2"
+        class="rule-detail bp5-card bp5-elevation-2"
       >
         <div
           class="bp5-form-group"
@@ -1190,7 +1190,7 @@ exports[`RuleEditor matches snapshot with existing tier in rule 1`] = `
       style="transform: translateY(0); transition: none;"
     >
       <div
-        class="bp5-card bp5-elevation-2"
+        class="rule-detail bp5-card bp5-elevation-2"
       >
         <div
           class="bp5-form-group"
@@ -1581,7 +1581,7 @@ exports[`RuleEditor matches snapshot with non existing tier in rule 1`] = `
       style="transform: translateY(0); transition: none;"
     >
       <div
-        class="bp5-card bp5-elevation-2"
+        class="rule-detail bp5-card bp5-elevation-2"
       >
         <div
           class="bp5-form-group"
diff --git a/web-console/src/components/rule-editor/rule-editor.scss b/web-console/src/components/rule-editor/rule-editor.scss
index e5757bc2999d..cb021e85c01b 100644
--- a/web-console/src/components/rule-editor/rule-editor.scss
+++ b/web-console/src/components/rule-editor/rule-editor.scss
@@ -28,4 +28,8 @@
   .include-future {
     margin-left: 15px;
   }
+
+  .rule-detail {
+    border: 1px solid rgba(255, 255, 255, 0.15);
+  }
 }
diff --git a/web-console/src/components/rule-editor/rule-editor.tsx b/web-console/src/components/rule-editor/rule-editor.tsx
index c5dfb24ddf06..8cea5321cfd7 100644
--- a/web-console/src/components/rule-editor/rule-editor.tsx
+++ b/web-console/src/components/rule-editor/rule-editor.tsx
@@ -30,9 +30,9 @@ import {
 import { IconNames } from '@blueprintjs/icons';
 import React, { useState } from 'react';
 
+import type { Rule } from '../../druid-models';
+import { RuleUtil } from '../../druid-models';
 import { durationSanitizer } from '../../utils';
-import type { Rule } from '../../utils/load-rule';
-import { RuleUtil } from '../../utils/load-rule';
 import { SuggestibleInput } from '../suggestible-input/suggestible-input';
 
 import './rule-editor.scss';
@@ -170,7 +170,7 @@ export const RuleEditor = React.memo(function RuleEditor(props: RuleEditorProps)
       </div>
 
       <Collapse isOpen={isOpen}>
-        <Card elevation={2}>
+        <Card className="rule-detail" elevation={2}>
           <FormGroup>
             <ControlGroup>
               <HTMLSelect
diff --git a/web-console/src/components/segment-timeline/__snapshots__/bar-unit.spec.tsx.snap b/web-console/src/components/segment-timeline/__snapshots__/bar-unit.spec.tsx.snap
deleted file mode 100644
index 7d98145d4b5e..000000000000
--- a/web-console/src/components/segment-timeline/__snapshots__/bar-unit.spec.tsx.snap
+++ /dev/null
@@ -1,13 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`BarUnit matches snapshot 1`] = `
-<svg>
-  <rect
-    class="bar-unit"
-    height="10"
-    width="10"
-    x="10"
-    y="10"
-  />
-</svg>
-`;
diff --git a/web-console/src/components/segment-timeline/__snapshots__/segment-timeline.spec.tsx.snap b/web-console/src/components/segment-timeline/__snapshots__/segment-timeline.spec.tsx.snap
index ae30df246c2b..206c2be703bd 100644
--- a/web-console/src/components/segment-timeline/__snapshots__/segment-timeline.spec.tsx.snap
+++ b/web-console/src/components/segment-timeline/__snapshots__/segment-timeline.spec.tsx.snap
@@ -4,191 +4,309 @@ exports[`SegmentTimeline matches snapshot 1`] = `
 <div
   class="segment-timeline"
 >
-  <div>
-    <div
-      class="loader"
-    >
-      <div
-        class="loader-logo"
-      >
-        <svg
-          viewBox="0 0 100 100"
-        >
-          <path
-            class="one"
-            d="M54.2,69.8h-2.7c-0.7,0-1.3-0.6-1.3-1.3c0-0.7,0.6-1.3,1.3-1.3h2.7c11.5,0,23.8-7.4,23.8-23.7
-          c0-9.1-6.9-15.8-16.4-15.8H38c-0.7,0-1.3-0.6-1.3-1.3s0.6-1.3,1.3-1.3h23.6c5.3,0,10.1,1.9,13.6,5.3c3.5,3.4,5.4,8,5.4,13.1
-          c0,6.6-2.3,13-6.3,17.7C69.5,66.8,62.5,69.8,54.2,69.8z"
-          />
-          <path
-            class="two"
-            d="M55.7,59.5h-26c-0.7,0-1.3-0.6-1.3-1.3c0-0.7,0.6-1.3,1.3-1.3h26c7.5,0,11.5-5.8,11.5-11.5
-            c0-4.2-3.2-7.3-7.7-7.3h-26c-0.7,0-1.3-0.6-1.3-1.3s0.6-1.3,1.3-1.3h26c5.9,0,10.3,4.3,10.3,9.9c0,3.7-1.3,7.2-3.7,9.8
-            C63.5,58,59.9,59.5,55.7,59.5z"
-          />
-          <path
-            class="three"
-            d="M27.2,38h-6.3c-0.7,0-1.3-0.6-1.3-1.3s0.6-1.3,1.3-1.3h6.3c0.7,0,1.3,0.6,1.3,1.3S27.9,38,27.2,38z"
-          />
-          <path
-            class="four"
-            d="M45.1,69.8h-5.8c-0.7,0-1.3-0.6-1.3-1.3c0-0.7,0.6-1.3,1.3-1.3h5.8c0.7,0,1.3,0.6,1.3,1.3
-            C46.4,69.2,45.8,69.8,45.1,69.8z"
-          />
-        </svg>
-      </div>
-    </div>
-  </div>
   <div
-    class="side-control"
+    class="control-bar"
   >
     <div
-      class="bp5-form-group"
+      class="bp5-button-group"
     >
-      <label
-        class="bp5-label"
-      >
-        Show
-         
-        <span
-          class="bp5-text-muted"
-        />
-      </label>
       <div
-        class="bp5-form-content"
+        aria-controls="listbox-0"
+        aria-disabled="false"
+        aria-expanded="false"
+        aria-haspopup="listbox"
+        class="bp5-popover-target"
+        role="combobox"
       >
-        <div
-          class="bp5-segmented-control bp5-fill"
-          role="radiogroup"
+        <button
+          class="bp5-button bp5-small"
+          type="button"
         >
-          <button
-            aria-checked="true"
-            class="bp5-button"
-            role="radio"
-            tabindex="0"
-            type="button"
+          <span
+            class="bp5-button-text"
           >
-            <span
-              class="bp5-button-text"
-            >
-              Total size
-            </span>
-          </button>
-          <button
-            aria-checked="false"
-            class="bp5-button bp5-minimal"
-            role="radio"
-            tabindex="-1"
-            type="button"
+            Datasource: all
+          </span>
+          <span
+            aria-hidden="true"
+            class="bp5-icon bp5-icon-caret-down"
           >
-            <span
-              class="bp5-button-text"
+            <svg
+              data-icon="caret-down"
+              height="16"
+              role="img"
+              viewBox="0 0 16 16"
+              width="16"
             >
-              Segment count
-            </span>
-          </button>
-        </div>
+              <path
+                d="M12 6.5c0-.28-.22-.5-.5-.5h-7a.495.495 0 00-.37.83l3.5 4c.09.1.22.17.37.17s.28-.07.37-.17l3.5-4c.08-.09.13-.2.13-.33z"
+                fill-rule="evenodd"
+              />
+            </svg>
+          </span>
+        </button>
       </div>
     </div>
+    <span
+      class="bp5-popover-target"
+    >
+      <button
+        aria-expanded="false"
+        aria-haspopup="menu"
+        class="bp5-button bp5-small"
+        type="button"
+      >
+        <span
+          class="bp5-button-text"
+        >
+          Show: Size
+        </span>
+        <span
+          aria-hidden="true"
+          class="bp5-icon bp5-icon-caret-down"
+        >
+          <svg
+            data-icon="caret-down"
+            height="16"
+            role="img"
+            viewBox="0 0 16 16"
+            width="16"
+          >
+            <path
+              d="M12 6.5c0-.28-.22-.5-.5-.5h-7a.495.495 0 00-.37.83l3.5 4c.09.1.22.17.37.17s.28-.07.37-.17l3.5-4c.08-.09.13-.2.13-.33z"
+              fill-rule="evenodd"
+            />
+          </svg>
+        </span>
+      </button>
+    </span>
+    <div
+      class="expander"
+    />
     <div
-      class="bp5-form-group"
+      class="bp5-button-group"
     >
-      <label
-        class="bp5-label"
+      <button
+        class="bp5-button bp5-small"
+        data-tooltip="Previous time period
+2024-10-15 → 2024-11-01"
+        type="button"
       >
-        Interval
-         
         <span
-          class="bp5-text-muted"
-        />
-      </label>
-      <div
-        class="bp5-form-content"
+          aria-hidden="true"
+          class="bp5-icon bp5-icon-caret-left"
+        >
+          <svg
+            data-icon="caret-left"
+            height="16"
+            role="img"
+            viewBox="0 0 16 16"
+            width="16"
+          >
+            <path
+              d="M9.5 4c-.13 0-.24.05-.33.13l-4 3.5c-.1.09-.17.22-.17.37s.07.28.17.37l4 3.5a.495.495 0 00.83-.37v-7c0-.28-.22-.5-.5-.5z"
+              fill-rule="evenodd"
+            />
+          </svg>
+        </span>
+      </button>
+      <button
+        class="bp5-button bp5-small"
+        data-tooltip="Zoom out
+2024-10-15 → 2024-11-20"
+        type="button"
       >
-        <div
-          aria-expanded="false"
-          aria-haspopup="menu"
-          class="bp5-control-group bp5-date-range-input bp5-popover-target bp5-fill"
+        <span
+          aria-hidden="true"
+          class="bp5-icon bp5-icon-zoom-out"
         >
-          <div
-            class="bp5-input-group bp5-fill"
+          <svg
+            data-icon="zoom-out"
+            height="16"
+            role="img"
+            viewBox="0 0 16 16"
+            width="16"
           >
-            <input
-              aria-disabled="false"
-              autocomplete="off"
-              class="bp5-input"
-              placeholder="Start date"
-              type="text"
-              value="2021-03-09"
+            <path
+              d="M3.99 5.99c-.55 0-1 .45-1 1s.45 1 1 1h6c.55 0 1-.45 1-1s-.45-1-1-1h-6zm11.56 7.44l-2.67-2.68a6.94 6.94 0 001.11-3.76c0-3.87-3.13-7-7-7s-7 3.13-7 7 3.13 7 7 7c1.39 0 2.68-.42 3.76-1.11l2.68 2.67a1.498 1.498 0 102.12-2.12zm-8.56-1.44c-2.76 0-5-2.24-5-5s2.24-5 5-5 5 2.24 5 5-2.24 5-5 5z"
+              fill-rule="evenodd"
             />
-          </div>
-          <div
-            class="bp5-input-group bp5-fill"
+          </svg>
+        </span>
+      </button>
+      <button
+        class="bp5-button bp5-small"
+        data-tooltip="Next time period
+2024-11-18 → 2024-12-05"
+        type="button"
+      >
+        <span
+          aria-hidden="true"
+          class="bp5-icon bp5-icon-caret-right"
+        >
+          <svg
+            data-icon="caret-right"
+            height="16"
+            role="img"
+            viewBox="0 0 16 16"
+            width="16"
           >
-            <input
-              aria-disabled="false"
-              autocomplete="off"
-              class="bp5-input"
-              placeholder="End date"
-              type="text"
-              value="2021-06-09"
+            <path
+              d="M11 8c0-.15-.07-.28-.17-.37l-4-3.5A.495.495 0 006 4.5v7a.495.495 0 00.83.37l4-3.5c.1-.09.17-.22.17-.37z"
+              fill-rule="evenodd"
             />
-          </div>
-        </div>
-      </div>
+          </svg>
+        </span>
+      </button>
     </div>
     <div
-      class="bp5-form-group"
+      class="bp5-button-group"
     >
-      <label
-        class="bp5-label"
+      <button
+        class="bp5-button bp5-small"
+        data-tooltip="Show last day
+2024-11-19 → 2024-11-20"
+        type="button"
       >
-        Datasource
-         
         <span
-          class="bp5-text-muted"
-        />
-      </label>
-      <div
-        class="bp5-form-content"
+          class="bp5-button-text"
+        >
+          1D
+        </span>
+      </button>
+      <button
+        class="bp5-button bp5-small"
+        data-tooltip="Show last week
+2024-11-13 → 2024-11-20"
+        type="button"
+      >
+        <span
+          class="bp5-button-text"
+        >
+          1W
+        </span>
+      </button>
+      <button
+        class="bp5-button bp5-small"
+        data-tooltip="Show last month
+2024-10-20 → 2024-11-20"
+        type="button"
+      >
+        <span
+          class="bp5-button-text"
+        >
+          1M
+        </span>
+      </button>
+      <button
+        class="bp5-button bp5-small"
+        data-tooltip="Show last 3 months
+2024-08-20 → 2024-11-20"
+        type="button"
+      >
+        <span
+          class="bp5-button-text"
+        >
+          3M
+        </span>
+      </button>
+      <button
+        class="bp5-button bp5-small"
+        data-tooltip="Show last year
+2023-11-20 → 2024-11-20"
+        type="button"
+      >
+        <span
+          class="bp5-button-text"
+        >
+          1Y
+        </span>
+      </button>
+      <button
+        class="bp5-button bp5-small"
+        data-tooltip="Show last 5 years
+2019-11-20 → 2024-11-20"
+        type="button"
+      >
+        <span
+          class="bp5-button-text"
+        >
+          5Y
+        </span>
+      </button>
+      <button
+        class="bp5-button bp5-small"
+        data-tooltip="Show last 10 years
+2014-11-20 → 2024-11-20"
+        type="button"
+      >
+        <span
+          class="bp5-button-text"
+        >
+          10Y
+        </span>
+      </button>
+      <span
+        class="bp5-popover-target"
       >
-        <div
-          aria-controls="listbox-1"
+        <button
           aria-expanded="false"
-          aria-haspopup="listbox"
-          class="bp5-popover-target bp5-fill"
-          role="combobox"
+          aria-haspopup="menu"
+          class="bp5-button bp5-small"
+          data-tooltip="Select a custom date range"
+          type="button"
         >
-          <button
-            class="bp5-button bp5-fill"
-            type="button"
+          <span
+            aria-hidden="true"
+            class="bp5-icon bp5-icon-calendar"
           >
-            <span
-              class="bp5-button-text"
+            <svg
+              data-icon="calendar"
+              height="16"
+              role="img"
+              viewBox="0 0 16 16"
+              width="16"
             >
-              Show all
-            </span>
-            <span
-              aria-hidden="true"
-              class="bp5-icon bp5-icon-caret-down"
-            >
-              <svg
-                data-icon="caret-down"
-                height="16"
-                role="img"
-                viewBox="0 0 16 16"
-                width="16"
-              >
-                <path
-                  d="M12 6.5c0-.28-.22-.5-.5-.5h-7a.495.495 0 00-.37.83l3.5 4c.09.1.22.17.37.17s.28-.07.37-.17l3.5-4c.08-.09.13-.2.13-.33z"
-                  fill-rule="evenodd"
-                />
-              </svg>
-            </span>
-          </button>
-        </div>
-      </div>
+              <path
+                d="M11 3c.6 0 1-.5 1-1V1c0-.6-.4-1-1-1s-1 .4-1 1v1c0 .5.4 1 1 1zm3-2h-1v1c0 1.1-.9 2-2 2s-2-.9-2-2V1H6v1c0 1.1-.9 2-2 2s-2-.9-2-2V1H1c-.6 0-1 .5-1 1v12c0 .6.4 1 1 1h13c.6 0 1-.4 1-1V2c0-.6-.5-1-1-1zM5 13H2v-3h3v3zm0-4H2V6h3v3zm4 4H6v-3h3v3zm0-4H6V6h3v3zm4 4h-3v-3h3v3zm0-4h-3V6h3v3zM4 3c.6 0 1-.5 1-1V1c0-.6-.4-1-1-1S3 .4 3 1v1c0 .5.4 1 1 1z"
+                fill-rule="evenodd"
+              />
+            </svg>
+          </span>
+          <span
+            class="bp5-button-text"
+          >
+            2024-11-01 → 2024-11-18
+          </span>
+        </button>
+      </span>
+      <button
+        class="bp5-button bp5-small"
+        data-tooltip="Auto determine date range to fit datasource"
+        type="button"
+      >
+        <span
+          aria-hidden="true"
+          class="bp5-icon bp5-icon-pin"
+        >
+          <svg
+            data-icon="pin"
+            height="16"
+            role="img"
+            viewBox="0 0 16 16"
+            width="16"
+          >
+            <path
+              d="M9.41.92c-.51.51-.41 1.5.15 2.56L4.34 7.54C2.8 6.48 1.45 6.05.92 6.58l3.54 3.54-3.54 4.95 4.95-3.54 3.54 3.54c.53-.53.1-1.88-.96-3.42l4.06-5.22c1.06.56 2.04.66 2.55.15L9.41.92z"
+              fill-rule="evenodd"
+            />
+          </svg>
+        </span>
+      </button>
     </div>
   </div>
+  <div
+    class="chart-container"
+  />
 </div>
 `;
diff --git a/web-console/src/components/segment-timeline/bar-group.tsx b/web-console/src/components/segment-timeline/bar-group.tsx
deleted file mode 100644
index d0cf867e2b2d..000000000000
--- a/web-console/src/components/segment-timeline/bar-group.tsx
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import type { AxisScale } from 'd3-axis';
-import React from 'react';
-
-import { BarUnit } from './bar-unit';
-import type { BarUnitData, HoveredBarInfo } from './stacked-bar-chart';
-
-interface BarGroupProps {
-  dataToRender: BarUnitData[];
-  changeActiveDatasource: (dataSource: string) => void;
-  formatTick: (e: number) => string;
-  xScale: AxisScale<Date>;
-  yScale: AxisScale<number>;
-  barWidth: number;
-  onHoverBar?: (e: any) => void;
-  offHoverBar?: () => void;
-  hoverOn?: HoveredBarInfo | null;
-}
-
-export class BarGroup extends React.Component<BarGroupProps> {
-  shouldComponentUpdate(nextProps: BarGroupProps): boolean {
-    return nextProps.hoverOn === this.props.hoverOn;
-  }
-
-  render() {
-    const { dataToRender, changeActiveDatasource, xScale, yScale, onHoverBar, barWidth } =
-      this.props;
-    if (dataToRender === undefined) return null;
-
-    return dataToRender.map((entry: BarUnitData, i: number) => {
-      const y0 = yScale(entry.y0 || 0) || 0;
-      const x = xScale(new Date(entry.x + 'T00:00:00Z'));
-      const y = yScale((entry.y0 || 0) + entry.y) || 0;
-      const height = Math.max(y0 - y, 0);
-      const barInfo: HoveredBarInfo = {
-        xCoordinate: x,
-        yCoordinate: y,
-        height,
-        datasource: entry.datasource,
-        xValue: entry.x,
-        yValue: entry.y,
-        dailySize: entry.dailySize,
-      };
-      return (
-        <BarUnit
-          key={i}
-          x={x}
-          y={y}
-          width={barWidth}
-          height={height}
-          style={{ fill: entry.color }}
-          onClick={() => changeActiveDatasource(entry.datasource)}
-          onHover={() => onHoverBar && onHoverBar(barInfo)}
-        />
-      );
-    });
-  }
-}
diff --git a/web-console/src/components/segment-timeline/chart-axis.tsx b/web-console/src/components/segment-timeline/chart-axis.tsx
index bc333d33b773..b8ee4e9cbb11 100644
--- a/web-console/src/components/segment-timeline/chart-axis.tsx
+++ b/web-console/src/components/segment-timeline/chart-axis.tsx
@@ -16,22 +16,22 @@
  * limitations under the License.
  */
 
+import type { Axis } from 'd3-axis';
 import { select } from 'd3-selection';
-import React from 'react';
 
 interface ChartAxisProps {
-  transform?: string;
-  scale: any;
   className?: string;
+  transform?: string;
+  axis: Axis<any>;
 }
 
-export const ChartAxis = React.memo(function ChartAxis(props: ChartAxisProps) {
-  const { transform, scale, className } = props;
+export const ChartAxis = function ChartAxis(props: ChartAxisProps) {
+  const { transform, axis, className } = props;
   return (
     <g
       className={`chart-axis ${className}`}
       transform={transform}
-      ref={node => select(node).call(scale)}
+      ref={node => select(node).call(axis as any)}
     />
   );
-});
+};
diff --git a/web-console/src/components/segment-timeline/common.ts b/web-console/src/components/segment-timeline/common.ts
new file mode 100644
index 000000000000..48aa5ce48d46
--- /dev/null
+++ b/web-console/src/components/segment-timeline/common.ts
@@ -0,0 +1,87 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { sum } from 'd3-array';
+
+import type { Duration } from '../../utils';
+import { formatBytes, formatInteger } from '../../utils';
+
+export type IntervalStat = 'segments' | 'size' | 'rows';
+
+export const INTERVAL_STATS: IntervalStat[] = ['segments', 'size', 'rows'];
+
+export function getIntervalStatTitle(intervalStat: IntervalStat): string {
+  switch (intervalStat) {
+    case 'segments':
+      return 'Num. segments';
+
+    case 'size':
+      return 'Size';
+
+    case 'rows':
+      return 'Rows';
+
+    default:
+      return intervalStat;
+  }
+}
+
+export function aggregateSegmentStats(
+  xs: readonly Record<IntervalStat, number>[],
+): Record<IntervalStat, number> {
+  return {
+    segments: sum(xs, s => s.segments),
+    size: sum(xs, s => s.size),
+    rows: sum(xs, s => s.rows),
+  };
+}
+
+export function formatIntervalStat(stat: IntervalStat, n: number) {
+  switch (stat) {
+    case 'segments':
+    case 'rows':
+      return formatInteger(n);
+
+    case 'size':
+      return formatBytes(n);
+
+    default:
+      return '';
+  }
+}
+
+export interface IntervalRow extends Record<IntervalStat, number> {
+  start: Date;
+  end: Date;
+  datasource: string;
+  realtime: boolean;
+  originalTimeSpan: Duration;
+}
+
+export interface TrimmedIntervalRow extends IntervalRow {
+  shownDays: number;
+  normalized: Record<IntervalStat, number>;
+}
+
+export interface IntervalBar extends TrimmedIntervalRow {
+  offset: Record<IntervalStat, number>;
+}
+
+export function formatIsoDateOnly(date: Date): string {
+  return date.toISOString().slice(0, 10);
+}
diff --git a/web-console/src/components/segment-timeline/segment-bar-chart-render.scss b/web-console/src/components/segment-timeline/segment-bar-chart-render.scss
new file mode 100644
index 000000000000..762772a0f5c5
--- /dev/null
+++ b/web-console/src/components/segment-timeline/segment-bar-chart-render.scss
@@ -0,0 +1,169 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+@import '../../variables';
+
+.segment-bar-chart-render {
+  position: relative;
+  overflow: hidden;
+
+  @keyframes pulseOpacity {
+    0% {
+      opacity: 0.8;
+    }
+    100% {
+      opacity: 0.95;
+    }
+  }
+
+  svg {
+    position: absolute;
+
+    .chart-axis text {
+      user-select: none;
+    }
+
+    .hover-highlight {
+      fill: white;
+      fill-opacity: 0.1;
+    }
+
+    .hovered-bar {
+      fill: none;
+      stroke: #ffffff;
+      stroke-width: 1.5px;
+    }
+
+    .selection {
+      fill: transparent;
+      stroke: #ffffff;
+      stroke-width: 1px;
+      opacity: 0.8;
+
+      &.done {
+        opacity: 1;
+      }
+    }
+
+    .shifter {
+      fill: white;
+      fill-opacity: 0.2;
+      filter: blur(1px);
+    }
+
+    .time-shift-indicator {
+      fill: white;
+      fill-opacity: 0.001;
+      cursor: grab;
+
+      &:hover {
+        fill-opacity: 0.1;
+      }
+
+      &.shifting {
+        fill-opacity: 0.2;
+        cursor: grabbing;
+      }
+    }
+
+    .gridline-x {
+      line {
+        stroke-dasharray: 5, 5;
+        opacity: 0.5;
+      }
+    }
+
+    .now-line {
+      stroke: $orange4;
+      stroke-dasharray: 2, 2;
+      opacity: 0.7;
+    }
+
+    .bar-unit {
+      &.realtime {
+        animation: pulseOpacity 3s alternate infinite;
+      }
+    }
+  }
+
+  .rule-tape {
+    position: absolute;
+    top: 5px;
+    height: 15px;
+    font-size: 10px;
+
+    .rule-error {
+      @include pin-full();
+      background-color: $red3;
+      color: $white;
+    }
+
+    .load-rule {
+      position: absolute;
+      overflow: hidden;
+      padding-left: 2px;
+      border-left: 1px solid $dark-gray2;
+      border-right: 1px solid $dark-gray2;
+      top: 0;
+      height: 100%;
+      text-overflow: ellipsis;
+
+      &.load {
+        background-color: $green1;
+
+        &:nth-child(even) {
+          background-color: $green3;
+        }
+      }
+
+      &.drop {
+        background-color: $dark-gray5;
+
+        &:nth-child(even) {
+          background-color: $gray1;
+        }
+      }
+
+      &.broadcast {
+        background-color: $indigo1;
+
+        &:nth-child(even) {
+          background-color: $indigo3;
+        }
+      }
+    }
+  }
+
+  .empty-placeholder {
+    @include pin-full;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    font-size: 20px;
+    user-select: none;
+    pointer-events: none;
+  }
+}
+
+.segment-bar-chart-bubble {
+  .button-bar {
+    padding-top: 5px;
+    display: flex;
+    gap: 5px;
+  }
+}
diff --git a/web-console/src/components/segment-timeline/segment-bar-chart-render.tsx b/web-console/src/components/segment-timeline/segment-bar-chart-render.tsx
new file mode 100644
index 000000000000..11c7d36834f5
--- /dev/null
+++ b/web-console/src/components/segment-timeline/segment-bar-chart-render.tsx
@@ -0,0 +1,793 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { Button, Intent } from '@blueprintjs/core';
+import type { NonNullDateRange } from '@blueprintjs/datetime';
+import { IconNames } from '@blueprintjs/icons';
+import IntervalTree from '@flatten-js/interval-tree';
+import classNames from 'classnames';
+import { max, sort, sum } from 'd3-array';
+import { axisBottom, axisLeft } from 'd3-axis';
+import { scaleLinear, scaleUtc } from 'd3-scale';
+import type { MouseEvent as ReactMouseEvent, ReactNode } from 'react';
+import { useMemo, useRef, useState } from 'react';
+
+import type { Rule } from '../../druid-models';
+import { getDatasourceColor, RuleUtil } from '../../druid-models';
+import { useClock, useGlobalEventListener } from '../../hooks';
+import {
+  allSameValue,
+  arraysEqualByElement,
+  clamp,
+  day,
+  Duration,
+  formatBytes,
+  formatNumber,
+  groupBy,
+  groupByAsMap,
+  minute,
+  month,
+  pluralIfNeeded,
+  TZ_UTC,
+  uniq,
+} from '../../utils';
+import type { Margin, Stage } from '../../utils/stage';
+import type { PortalBubbleOpenOn } from '../portal-bubble/portal-bubble';
+import { PortalBubble } from '../portal-bubble/portal-bubble';
+
+import { ChartAxis } from './chart-axis';
+import type { IntervalBar, IntervalRow, IntervalStat, TrimmedIntervalRow } from './common';
+import { aggregateSegmentStats, formatIntervalStat, formatIsoDateOnly } from './common';
+
+import './segment-bar-chart-render.scss';
+
+const CHART_MARGIN: Margin = { top: 20, right: 0, bottom: 25, left: 70 };
+const MIN_BAR_WIDTH = 4;
+const POSSIBLE_GRANULARITIES = [
+  new Duration('PT15M'),
+  new Duration('PT1H'),
+  new Duration('PT6H'),
+  new Duration('P1D'),
+  new Duration('P1M'),
+  new Duration('P1Y'),
+];
+
+const EXTEND_X_SCALE_DOMAIN_BY = 1;
+
+function formatStartDuration(start: Date, duration: Duration): string {
+  let sliceLength;
+  const { singleSpan } = duration;
+  switch (singleSpan) {
+    case 'year':
+      sliceLength = 4;
+      break;
+
+    case 'month':
+      sliceLength = 7;
+      break;
+
+    case 'day':
+      sliceLength = 10;
+      break;
+
+    case 'hour':
+      sliceLength = 13;
+      break;
+
+    case 'minute':
+      sliceLength = 16;
+      break;
+
+    default:
+      sliceLength = 19;
+      break;
+  }
+
+  return `${start.toISOString().slice(0, sliceLength)}/${duration}`;
+}
+
+// ---------------------------------------
+// Load rule stuff
+
+function loadRuleToBaseType(loadRule: Rule): string {
+  const m = /^(load|drop|broadcast)/.exec(loadRule.type);
+  return m ? m[1] : 'load';
+}
+
+const NEGATIVE_INFINITY_DATE = new Date(Date.UTC(1000, 0, 1));
+const POSITIVE_INFINITY_DATE = new Date(Date.UTC(3000, 0, 1));
+
+function loadRuleToDateRange(loadRule: Rule): NonNullDateRange {
+  switch (loadRule.type) {
+    case 'loadByInterval':
+    case 'dropByInterval':
+    case 'broadcastByInterval':
+      return String(loadRule.interval)
+        .split('/')
+        .map(d => new Date(d)) as NonNullDateRange;
+
+    case 'loadByPeriod':
+    case 'dropByPeriod':
+    case 'broadcastByPeriod':
+      return [
+        new Duration(loadRule.period || 'P1D').shift(new Date(), TZ_UTC, -1),
+        loadRule.includeFuture ? POSITIVE_INFINITY_DATE : new Date(),
+      ];
+
+    case 'dropBeforeByPeriod':
+      return [
+        NEGATIVE_INFINITY_DATE,
+        new Duration(loadRule.period || 'P1D').shift(new Date(), TZ_UTC, -1),
+      ];
+
+    default:
+      return [NEGATIVE_INFINITY_DATE, POSITIVE_INFINITY_DATE];
+  }
+}
+
+// ---------------------------------------
+
+function offsetDateRange(dateRange: NonNullDateRange, offset: number): NonNullDateRange {
+  return [new Date(dateRange[0].valueOf() + offset), new Date(dateRange[1].valueOf() + offset)];
+}
+
+function stackIntervalRows(trimmedIntervalRows: TrimmedIntervalRow[]): {
+  intervalBars: IntervalBar[];
+  intervalTree: IntervalTree;
+} {
+  // Total size of the datasource will be used as an ordering tiebreaker
+  const datasourceToTotalSize = groupByAsMap(
+    trimmedIntervalRows,
+    intervalRow => intervalRow.datasource,
+    intervalRows => sum(intervalRows, intervalRow => intervalRow.size),
+  );
+
+  const sortedIntervalRows = sort(trimmedIntervalRows, (a, b) => {
+    const shownDaysDiff = b.shownDays - a.shownDays;
+    if (shownDaysDiff) return shownDaysDiff;
+
+    const timeSpanDiff =
+      b.originalTimeSpan.getCanonicalLength() - a.originalTimeSpan.getCanonicalLength();
+    if (timeSpanDiff) return timeSpanDiff;
+
+    const totalSizeDiff = datasourceToTotalSize[b.datasource] - datasourceToTotalSize[a.datasource];
+    if (totalSizeDiff) return totalSizeDiff;
+
+    return Number(a.realtime) - Number(b.realtime);
+  });
+
+  const intervalTree = new IntervalTree();
+  const intervalBars = sortedIntervalRows.map(intervalRow => {
+    const startMs = intervalRow.start.valueOf();
+    const endMs = intervalRow.end.valueOf();
+    const intervalRowsBelow = intervalTree.search([startMs + 1, startMs + 2]) as IntervalBar[];
+    const intervalBar: IntervalBar = {
+      ...intervalRow,
+      offset: aggregateSegmentStats(intervalRowsBelow.map(i => i.normalized)),
+    };
+    intervalTree.insert([startMs, endMs], intervalBar);
+    return intervalBar;
+  });
+
+  return {
+    intervalBars,
+    intervalTree,
+  };
+}
+
+interface BubbleInfo {
+  start: Date;
+  end: Date;
+  timeLabel: string;
+  intervalBars: IntervalBar[];
+}
+
+interface SelectionRange {
+  start: Date;
+  end: Date;
+  done?: boolean;
+}
+
+export interface DatasourceRules {
+  loadRules: Rule[];
+  defaultLoadRules: Rule[];
+}
+
+export interface SegmentBarChartRenderProps {
+  intervalRows: IntervalRow[];
+  datasourceRules: DatasourceRules | undefined;
+  datasourceRulesError: string | undefined;
+
+  stage: Stage;
+  dateRange: NonNullDateRange;
+  changeDateRange(dateRange: NonNullDateRange): void;
+  shownIntervalStat: IntervalStat;
+  shownDatasource: string | undefined;
+  changeShownDatasource(datasource: string | undefined): void;
+  getIntervalActionButton?(
+    start: Date,
+    end: Date,
+    datasource?: string,
+    realtime?: boolean,
+  ): ReactNode;
+}
+
+export const SegmentBarChartRender = function SegmentBarChartRender(
+  props: SegmentBarChartRenderProps,
+) {
+  const {
+    intervalRows,
+    datasourceRules,
+    datasourceRulesError,
+
+    stage,
+    shownIntervalStat,
+    dateRange,
+    changeDateRange,
+    shownDatasource,
+    changeShownDatasource,
+    getIntervalActionButton,
+  } = props;
+  const [mouseDownAt, setMouseDownAt] = useState<
+    { time: Date; action: 'select' | 'shift' } | undefined
+  >();
+  const [selection, setSelection] = useState<SelectionRange | undefined>();
+
+  function setSelectionIfNeeded(newSelection: SelectionRange) {
+    if (
+      selection &&
+      selection.start.valueOf() === newSelection.start.valueOf() &&
+      selection.end.valueOf() === newSelection.end.valueOf() &&
+      selection.done === newSelection.done
+    ) {
+      return;
+    }
+    setSelection(newSelection);
+  }
+
+  const [bubbleInfo, setBubbleInfo] = useState<BubbleInfo | undefined>();
+
+  function setBubbleInfoIfNeeded(newBubbleInfo: BubbleInfo) {
+    if (
+      bubbleInfo &&
+      bubbleInfo.start.valueOf() === newBubbleInfo.start.valueOf() &&
+      bubbleInfo.end.valueOf() === newBubbleInfo.end.valueOf() &&
+      bubbleInfo.timeLabel === newBubbleInfo.timeLabel &&
+      arraysEqualByElement(bubbleInfo.intervalBars, newBubbleInfo.intervalBars)
+    ) {
+      return;
+    }
+    setBubbleInfo(newBubbleInfo);
+  }
+
+  const [shiftOffset, setShiftOffset] = useState<number | undefined>();
+
+  const now = useClock(minute.canonicalLength);
+  const svgRef = useRef<SVGSVGElement | null>(null);
+
+  const trimGranularity = useMemo(() => {
+    return Duration.pickSmallestGranularityThatFits(
+      POSSIBLE_GRANULARITIES,
+      dateRange[1].valueOf() - dateRange[0].valueOf(),
+      Math.floor(stage.width / MIN_BAR_WIDTH),
+    ).toString();
+  }, [dateRange, stage.width]);
+
+  const { intervalBars, intervalTree } = useMemo(() => {
+    const shownIntervalRows = intervalRows.filter(
+      ({ start, end, datasource }) =>
+        start <= dateRange[1] &&
+        dateRange[0] < end &&
+        (!shownDatasource || datasource === shownDatasource),
+    );
+    const averageRowSizeByDatasource = groupByAsMap(
+      shownIntervalRows.filter(intervalRow => intervalRow.size > 0 && intervalRow.rows > 0),
+      intervalRow => intervalRow.datasource,
+      intervalRows => sum(intervalRows, d => d.size) / sum(intervalRows, d => d.rows),
+    );
+
+    const trimDuration = new Duration(trimGranularity);
+    const trimmedIntervalRows = shownIntervalRows.map(intervalRow => {
+      const { start, end, segments, size, rows } = intervalRow;
+      const startTrimmed = trimDuration.floor(start, TZ_UTC);
+      let endTrimmed = trimDuration.ceil(end, TZ_UTC);
+
+      // Special handling to catch WEEK intervals when trimming to month.
+      if (trimGranularity === 'P1M' && intervalRow.originalTimeSpan.toString() === 'P7D') {
+        endTrimmed = trimDuration.shift(startTrimmed, TZ_UTC);
+      }
+
+      const shownDays = (endTrimmed.valueOf() - startTrimmed.valueOf()) / day.canonicalLength;
+      const shownSize =
+        size === 0 ? rows * averageRowSizeByDatasource[intervalRow.datasource] : size;
+      return {
+        ...intervalRow,
+        start: startTrimmed,
+        end: endTrimmed,
+        shownDays,
+        size: shownSize,
+        normalized: {
+          size: shownSize / shownDays,
+          rows: rows / shownDays,
+          segments: segments / shownDays,
+        },
+      };
+    });
+
+    const fullyGroupedSegmentRows = groupBy(
+      trimmedIntervalRows,
+      trimmedIntervalRow =>
+        [
+          trimmedIntervalRow.start.toISOString(),
+          trimmedIntervalRow.end.toISOString(),
+          trimmedIntervalRow.originalTimeSpan,
+          trimmedIntervalRow.datasource,
+          trimmedIntervalRow.realtime,
+        ].join('/'),
+      (trimmedIntervalRows): TrimmedIntervalRow => {
+        const firstIntervalRow = trimmedIntervalRows[0];
+        return {
+          ...firstIntervalRow,
+          ...aggregateSegmentStats(trimmedIntervalRows),
+          normalized: aggregateSegmentStats(trimmedIntervalRows.map(t => t.normalized)),
+        };
+      },
+    );
+
+    return stackIntervalRows(fullyGroupedSegmentRows);
+  }, [intervalRows, trimGranularity, dateRange, shownDatasource]);
+
+  const innerStage = stage.applyMargin(CHART_MARGIN);
+
+  const baseTimeScale = scaleUtc()
+    .domain(dateRange)
+    .range([EXTEND_X_SCALE_DOMAIN_BY, innerStage.width - EXTEND_X_SCALE_DOMAIN_BY]);
+  const timeScale = shiftOffset
+    ? baseTimeScale.copy().domain(offsetDateRange(dateRange, shiftOffset))
+    : baseTimeScale;
+
+  const maxNormalizedStat = max(
+    intervalBars,
+    d => d.normalized[shownIntervalStat] + d.offset[shownIntervalStat],
+  );
+  const statScale = scaleLinear()
+    .rangeRound([innerStage.height, 0])
+    .domain([0, (maxNormalizedStat ?? 1) * 1.05]);
+
+  const formatTickRate = (n: number) => {
+    switch (shownIntervalStat) {
+      case 'segments':
+        return formatNumber(n); // + ' seg/day';
+
+      case 'rows':
+        return formatNumber(n); // + ' row/day';
+
+      case 'size':
+        return formatBytes(n);
+    }
+  };
+
+  function handleMouseDown(e: ReactMouseEvent) {
+    const svg = svgRef.current;
+    if (!svg) return;
+    e.preventDefault();
+
+    if (selection) {
+      setSelection(undefined);
+    } else {
+      const rect = svg.getBoundingClientRect();
+      const x = e.clientX - rect.x - CHART_MARGIN.left;
+      const y = e.clientY - rect.y - CHART_MARGIN.top;
+      const time = baseTimeScale.invert(x);
+      const action = y > innerStage.height || e.shiftKey ? 'shift' : 'select';
+      setBubbleInfo(undefined);
+      setMouseDownAt({
+        time,
+        action,
+      });
+    }
+  }
+
+  useGlobalEventListener('mousemove', (e: MouseEvent) => {
+    const svg = svgRef.current;
+    if (!svg) return;
+    const rect = svg.getBoundingClientRect();
+    const x = e.clientX - rect.x - CHART_MARGIN.left;
+    const y = e.clientY - rect.y - CHART_MARGIN.top;
+
+    if (mouseDownAt) {
+      e.preventDefault();
+
+      const b = baseTimeScale.invert(x);
+      if (mouseDownAt.action === 'shift' || e.shiftKey) {
+        setShiftOffset(mouseDownAt.time.valueOf() - b.valueOf());
+      } else {
+        if (mouseDownAt.time < b) {
+          setSelectionIfNeeded({
+            start: day.floor(mouseDownAt.time, TZ_UTC),
+            end: day.ceil(b, TZ_UTC),
+          });
+        } else {
+          setSelectionIfNeeded({
+            start: day.floor(b, TZ_UTC),
+            end: day.ceil(mouseDownAt.time, TZ_UTC),
+          });
+        }
+      }
+    } else if (!selection) {
+      if (
+        0 <= x &&
+        x <= innerStage.width &&
+        0 <= y &&
+        y <= innerStage.height + CHART_MARGIN.bottom
+      ) {
+        const time = baseTimeScale.invert(x);
+        const shifter =
+          new Duration(trimGranularity).getCanonicalLength() > day.canonicalLength * 25
+            ? month
+            : day;
+        const start = shifter.floor(time, TZ_UTC);
+        const end = shifter.ceil(time, TZ_UTC);
+
+        let intervalBars: IntervalBar[] = [];
+        if (y <= innerStage.height) {
+          const bars = intervalTree.search([
+            time.valueOf() + 1,
+            time.valueOf() + 2,
+          ]) as IntervalBar[];
+
+          if (bars.length) {
+            const stat = statScale.invert(y);
+            const hoverBar = bars.find(
+              bar =>
+                bar.offset[shownIntervalStat] <= stat &&
+                stat < bar.offset[shownIntervalStat] + bar.normalized[shownIntervalStat],
+            );
+            intervalBars = hoverBar ? [hoverBar] : bars;
+          }
+        }
+        setBubbleInfoIfNeeded({
+          start,
+          end,
+          timeLabel: start.toISOString().slice(0, shifter === day ? 10 : 7),
+          intervalBars,
+        });
+      } else {
+        setBubbleInfo(undefined);
+      }
+    }
+  });
+
+  useGlobalEventListener('mouseup', (e: MouseEvent) => {
+    if (!mouseDownAt) return;
+    e.preventDefault();
+    setMouseDownAt(undefined);
+
+    const svg = svgRef.current;
+    if (!svg) return;
+    const rect = svg.getBoundingClientRect();
+    const x = e.clientX - rect.x - CHART_MARGIN.left;
+    const y = e.clientY - rect.y - CHART_MARGIN.top;
+
+    if (shiftOffset || selection) {
+      setShiftOffset(undefined);
+      if (mouseDownAt.action === 'shift' || e.shiftKey) {
+        if (shiftOffset) {
+          changeDateRange(offsetDateRange(dateRange, shiftOffset));
+        }
+      } else {
+        if (selection) {
+          setSelection({ ...selection, done: true });
+        }
+      }
+    } else if (0 <= x && x <= innerStage.width && 0 <= y && y <= innerStage.height) {
+      const time = baseTimeScale.invert(x);
+
+      const bars = intervalTree.search([time.valueOf() + 1, time.valueOf() + 2]) as IntervalBar[];
+
+      if (bars.length) {
+        const stat = statScale.invert(y);
+        const hoverBar = bars.find(
+          bar =>
+            bar.offset[shownIntervalStat] <= stat &&
+            stat < bar.offset[shownIntervalStat] + bar.normalized[shownIntervalStat],
+        );
+        if (hoverBar) {
+          changeShownDatasource(shownDatasource ? undefined : hoverBar.datasource);
+        }
+      }
+    }
+  });
+
+  useGlobalEventListener('keydown', (e: KeyboardEvent) => {
+    if (e.key === 'Escape' && mouseDownAt) {
+      setMouseDownAt(undefined);
+      setSelection(undefined);
+    }
+  });
+
+  function startEndToXWidth({ start, end }: { start: Date; end: Date }) {
+    const xStart = clamp(timeScale(start), 0, innerStage.width);
+    const xEnd = clamp(timeScale(end), 0, innerStage.width);
+
+    return {
+      x: xStart,
+      width: Math.max(xEnd - xStart - 1, 1),
+    };
+  }
+
+  function segmentBarToRect(intervalBar: IntervalBar) {
+    const y0 = statScale(intervalBar.offset[shownIntervalStat]);
+    const y = statScale(
+      intervalBar.normalized[shownIntervalStat] + intervalBar.offset[shownIntervalStat],
+    );
+
+    return {
+      ...startEndToXWidth(intervalBar),
+      y: y,
+      height: y0 - y,
+    };
+  }
+
+  let hoveredOpenOn: PortalBubbleOpenOn | undefined;
+  if (svgRef.current) {
+    const rect = svgRef.current.getBoundingClientRect();
+
+    if (bubbleInfo) {
+      const hoveredIntervalBars = bubbleInfo.intervalBars;
+
+      let title: string | undefined;
+      let text: ReactNode;
+      if (hoveredIntervalBars.length === 0) {
+        title = bubbleInfo.timeLabel;
+        text = '';
+      } else if (hoveredIntervalBars.length === 1) {
+        const hoveredIntervalBar = hoveredIntervalBars[0];
+        title = `${formatStartDuration(
+          hoveredIntervalBar.start,
+          hoveredIntervalBar.originalTimeSpan,
+        )}${hoveredIntervalBar.realtime ? ' (realtime)' : ''}`;
+        text = (
+          <>
+            {!shownDatasource && <div>{`Datasource: ${hoveredIntervalBar.datasource}`}</div>}
+            <div>{`Size: ${
+              hoveredIntervalBar.realtime
+                ? 'estimated for realtime'
+                : formatIntervalStat('size', hoveredIntervalBar.size)
+            }`}</div>
+            <div>{`Rows: ${formatIntervalStat('rows', hoveredIntervalBar.rows)}`}</div>
+            <div>{`Segments: ${formatIntervalStat('segments', hoveredIntervalBar.segments)}`}</div>
+          </>
+        );
+      } else {
+        const datasources = uniq(hoveredIntervalBars.map(b => b.datasource));
+        const agg = aggregateSegmentStats(hoveredIntervalBars);
+        title = bubbleInfo.timeLabel;
+        text = (
+          <>
+            {!shownDatasource && (
+              <div>{`Totals for ${pluralIfNeeded(datasources.length, 'datasource')}`}</div>
+            )}
+            <div>{`Size: ${formatIntervalStat('size', agg.size)}`}</div>
+            <div>{`Rows: ${formatIntervalStat('rows', agg.rows)}`}</div>
+            <div>{`Segments: ${formatIntervalStat('segments', agg.segments)}`}</div>
+          </>
+        );
+      }
+
+      hoveredOpenOn = {
+        x:
+          rect.x +
+          CHART_MARGIN.left +
+          timeScale(new Date((bubbleInfo.start.valueOf() + bubbleInfo.end.valueOf()) / 2)),
+        y: rect.y + CHART_MARGIN.top,
+        title,
+        text,
+      };
+    } else if (selection) {
+      const selectedBars = intervalTree.search([
+        selection.start.valueOf() + 1,
+        selection.end.valueOf() - 1,
+      ]) as IntervalBar[];
+      const datasources = uniq(selectedBars.map(b => b.datasource));
+      const realtime = allSameValue(selectedBars.map(b => b.realtime));
+      const agg = aggregateSegmentStats(selectedBars);
+      hoveredOpenOn = {
+        x:
+          rect.x +
+          CHART_MARGIN.left +
+          timeScale(new Date((selection.start.valueOf() + selection.end.valueOf()) / 2)),
+        y: rect.y + CHART_MARGIN.top,
+        title: `${formatIsoDateOnly(selection.start)} → ${formatIsoDateOnly(selection.end)}`,
+        text: (
+          <>
+            {selectedBars.length ? (
+              <>
+                {!shownDatasource && (
+                  <div>{`Totals for ${pluralIfNeeded(datasources.length, 'datasource')}`}</div>
+                )}
+                <div>{`Size: ${formatIntervalStat('size', agg.size)}`}</div>
+                <div>{`Rows: ${formatIntervalStat('rows', agg.rows)}`}</div>
+                <div>{`Segments: ${formatIntervalStat('segments', agg.segments)}`}</div>
+              </>
+            ) : (
+              <div>No segments in this interval</div>
+            )}
+            {selection.done && (
+              <div className="button-bar">
+                <Button
+                  icon={IconNames.ZOOM_IN}
+                  text="Zoom in"
+                  intent={Intent.PRIMARY}
+                  small
+                  onClick={() => {
+                    if (!selection) return;
+                    setSelection(undefined);
+                    changeDateRange([selection.start, selection.end]);
+                  }}
+                />
+                {getIntervalActionButton?.(
+                  selection.start,
+                  selection.end,
+                  datasources.length === 1 ? datasources[0] : undefined,
+                  realtime,
+                )}
+              </div>
+            )}
+          </>
+        ),
+      };
+    }
+  }
+
+  function renderLoadRule(loadRule: Rule, i: number, isDefault: boolean) {
+    const [start, end] = loadRuleToDateRange(loadRule);
+    const { x, width } = startEndToXWidth({ start, end });
+    const title = RuleUtil.ruleToString(loadRule) + (isDefault ? ' (cluster default)' : '');
+    return (
+      <div
+        key={i}
+        className={classNames('load-rule', loadRuleToBaseType(loadRule))}
+        data-tooltip={title}
+        style={{
+          left: x,
+          width,
+        }}
+      >
+        {title}
+      </div>
+    );
+  }
+
+  const nowX = timeScale(now);
+  return (
+    <div className="segment-bar-chart-render">
+      <svg
+        ref={svgRef}
+        width={stage.width}
+        height={stage.height}
+        viewBox={`0 0 ${stage.width} ${stage.height}`}
+        preserveAspectRatio="xMinYMin meet"
+        onMouseDown={handleMouseDown}
+      >
+        <g transform={`translate(${CHART_MARGIN.left},${CHART_MARGIN.top})`}>
+          <ChartAxis
+            className="gridline-x"
+            transform="translate(0,0)"
+            axis={axisLeft(statScale)
+              .tickValues(statScale.ticks(3).filter(v => v !== 0))
+              .tickSize(-innerStage.width)
+              .tickFormat(() => '')
+              .tickSizeOuter(0)}
+          />
+          <ChartAxis
+            className="axis-x"
+            transform={`translate(0,${innerStage.height})`}
+            axis={axisBottom(timeScale)}
+          />
+          <rect
+            className={classNames('time-shift-indicator', {
+              shifting: typeof shiftOffset === 'number',
+            })}
+            x={0}
+            y={innerStage.height}
+            width={innerStage.width}
+            height={CHART_MARGIN.bottom}
+          />
+          <ChartAxis
+            className="axis-y"
+            axis={axisLeft(statScale)
+              .ticks(3)
+              .tickFormat(e => formatTickRate(e.valueOf()))}
+          />
+          <g className="bar-group">
+            {bubbleInfo && (
+              <rect
+                className="hover-highlight"
+                {...startEndToXWidth(bubbleInfo)}
+                y={0}
+                height={innerStage.height}
+              />
+            )}
+            {0 < nowX && nowX < innerStage.width && (
+              <line className="now-line" x1={nowX} x2={nowX} y1={0} y2={innerStage.height + 8} />
+            )}
+            {intervalBars.map((intervalBar, i) => {
+              return (
+                <rect
+                  key={i}
+                  className={classNames('bar-unit', { realtime: intervalBar.realtime })}
+                  {...segmentBarToRect(intervalBar)}
+                  fill={getDatasourceColor(intervalBar.datasource)}
+                />
+              );
+            })}
+            {bubbleInfo?.intervalBars.length === 1 &&
+              bubbleInfo.intervalBars.map((intervalBar, i) => (
+                <rect key={i} className="hovered-bar" {...segmentBarToRect(intervalBar)} />
+              ))}
+            {selection && (
+              <rect
+                className={classNames('selection', { done: selection.done })}
+                {...startEndToXWidth(selection)}
+                y={0}
+                height={innerStage.height}
+              />
+            )}
+            {!!shiftOffset && (
+              <rect
+                className="shifter"
+                x={shiftOffset > 0 ? timeScale(dateRange[1]) : 0}
+                y={0}
+                height={innerStage.height}
+                width={
+                  shiftOffset > 0
+                    ? innerStage.width - timeScale(dateRange[1])
+                    : timeScale(dateRange[0])
+                }
+              />
+            )}
+          </g>
+        </g>
+      </svg>
+      {(datasourceRules || datasourceRulesError) && (
+        <div className="rule-tape" style={{ left: CHART_MARGIN.left, right: CHART_MARGIN.right }}>
+          {datasourceRules?.defaultLoadRules.map((rule, index) =>
+            renderLoadRule(rule, index, true),
+          )}
+          {datasourceRules?.loadRules.map((rule, index) => renderLoadRule(rule, index, false))}
+          {datasourceRulesError && (
+            <div className="rule-error">Rule loading error: {datasourceRulesError}</div>
+          )}
+        </div>
+      )}
+      {!intervalRows.length && (
+        <div className="empty-placeholder">
+          <div className="no-data-text">There are no segments in the selected range</div>
+        </div>
+      )}
+      <PortalBubble
+        className="segment-bar-chart-bubble"
+        openOn={hoveredOpenOn}
+        onClose={selection?.done ? () => setSelection(undefined) : undefined}
+        mute
+        direction="up"
+      />
+    </div>
+  );
+};
diff --git a/web-console/src/components/segment-timeline/bar-unit.spec.tsx b/web-console/src/components/segment-timeline/segment-bar-chart.scss
similarity index 68%
rename from web-console/src/components/segment-timeline/bar-unit.spec.tsx
rename to web-console/src/components/segment-timeline/segment-bar-chart.scss
index d5926dcf69f0..130997119e3e 100644
--- a/web-console/src/components/segment-timeline/bar-unit.spec.tsx
+++ b/web-console/src/components/segment-timeline/segment-bar-chart.scss
@@ -16,18 +16,6 @@
  * limitations under the License.
  */
 
-import { render } from '@testing-library/react';
-
-import { BarUnit } from './bar-unit';
-
-describe('BarUnit', () => {
-  it('matches snapshot', () => {
-    const barGroup = (
-      <svg>
-        <BarUnit x={10} y={10} width={10} height={10} />
-      </svg>
-    );
-    const { container } = render(barGroup);
-    expect(container.firstChild).toMatchSnapshot();
-  });
-});
+.segment-bar-chart {
+  position: relative;
+}
diff --git a/web-console/src/components/segment-timeline/segment-bar-chart.tsx b/web-console/src/components/segment-timeline/segment-bar-chart.tsx
new file mode 100644
index 000000000000..297ea4afe617
--- /dev/null
+++ b/web-console/src/components/segment-timeline/segment-bar-chart.tsx
@@ -0,0 +1,162 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { C, F, L, N, sql, SqlExpression, SqlQuery } from 'druid-query-toolkit';
+import { useMemo } from 'react';
+
+import { END_OF_TIME_DATE, type Rule, RuleUtil, START_OF_TIME_DATE } from '../../druid-models';
+import type { Capabilities } from '../../helpers';
+import { useQueryManager } from '../../hooks';
+import { Api } from '../../singletons';
+import { Duration, filterMap, getApiArray, queryDruidSql, TZ_UTC } from '../../utils';
+import { Loader } from '../loader/loader';
+
+import type { IntervalRow } from './common';
+import type { SegmentBarChartRenderProps } from './segment-bar-chart-render';
+import { SegmentBarChartRender } from './segment-bar-chart-render';
+
+import './segment-bar-chart.scss';
+
+export interface SegmentBarChartProps
+  extends Omit<
+    SegmentBarChartRenderProps,
+    'intervalRows' | 'datasourceRules' | 'datasourceRulesError'
+  > {
+  capabilities: Capabilities;
+}
+
+export const SegmentBarChart = function SegmentBarChart(props: SegmentBarChartProps) {
+  const { capabilities, dateRange, shownDatasource, ...otherProps } = props;
+
+  const intervalsQuery = useMemo(
+    () => ({ capabilities, dateRange, shownDatasource: shownDatasource }),
+    [capabilities, dateRange, shownDatasource],
+  );
+
+  const [intervalRowsState] = useQueryManager({
+    query: intervalsQuery,
+    processQuery: async ({ capabilities, dateRange, shownDatasource }, cancelToken) => {
+      if (capabilities.hasSql()) {
+        const query = SqlQuery.from(N('sys').table('segments'))
+          .changeWhereExpression(
+            SqlExpression.and(
+              sql`"start" <= '${dateRange[1].toISOString()}' AND '${dateRange[0].toISOString()}' < "end"`,
+              C('start').unequal(START_OF_TIME_DATE),
+              C('end').unequal(END_OF_TIME_DATE),
+              C('is_overshadowed').equal(0),
+              shownDatasource ? C('datasource').equal(L(shownDatasource)) : undefined,
+            ),
+          )
+          .addSelect(C('start'), { addToGroupBy: 'end' })
+          .addSelect(C('end'), { addToGroupBy: 'end' })
+          .addSelect(C('datasource'), { addToGroupBy: 'end' })
+          .addSelect(C('is_realtime').as('realtime'), { addToGroupBy: 'end' })
+          .addSelect(F.count().as('segments'))
+          .addSelect(F.sum(C('size')).as('size'))
+          .addSelect(F.sum(C('num_rows')).as('rows'))
+          .toString();
+
+        return (await queryDruidSql({ query }, cancelToken)).map(sr => {
+          const start = new Date(sr.start);
+          const end = new Date(sr.end);
+
+          return {
+            ...sr,
+            start,
+            end,
+            realtime: Boolean(sr.realtime),
+            originalTimeSpan: Duration.fromRange(start, end, TZ_UTC),
+          } as IntervalRow;
+        });
+      } else {
+        return filterMap(
+          await getApiArray(
+            `/druid/coordinator/v1/metadata/segments?includeOvershadowedStatus&includeRealtimeSegments&${
+              shownDatasource ? `datasources=${Api.encodePath(shownDatasource)}` : ''
+            }`,
+            cancelToken,
+          ),
+          (segment: any) => {
+            if (segment.overshadowed) return; // We have to include overshadowed segments to get the realtime segments in this API
+            const [startStr, endStr] = segment.interval.split('/');
+            if (startStr === START_OF_TIME_DATE && endStr === END_OF_TIME_DATE) return;
+            const start = new Date(startStr);
+            const end = new Date(endStr);
+            if (!(start <= dateRange[1] && dateRange[0] < end)) return;
+
+            return {
+              start,
+              end,
+              datasource: segment.dataSource,
+              realtime: Boolean(segment.realtime),
+              originalTimeSpan: Duration.fromRange(start, end, TZ_UTC),
+              segments: 1,
+              size: segment.size,
+              rows: segment.num_rows || 0, // segment.num_rows is really null on this API :-(
+            } as IntervalRow;
+          },
+        );
+      }
+    },
+  });
+
+  const [allLoadRulesState] = useQueryManager({
+    query: shownDatasource ? '' : undefined,
+    processQuery: async (_, cancelToken) => {
+      return (
+        await Api.instance.get<Record<string, Rule[]>>('/druid/coordinator/v1/rules', {
+          cancelToken,
+        })
+      ).data;
+    },
+  });
+
+  const datasourceRules = useMemo(() => {
+    const allLoadRules = allLoadRulesState.data;
+    if (!allLoadRules || !shownDatasource) return;
+    return {
+      loadRules: (allLoadRules[shownDatasource] || []).toReversed(),
+      defaultLoadRules: (allLoadRules[RuleUtil.DEFAULT_RULES_KEY] || []).toReversed(),
+    };
+  }, [allLoadRulesState.data, shownDatasource]);
+
+  if (intervalRowsState.error) {
+    return (
+      <div className="empty-placeholder">
+        <span className="error-text">{`Error when loading data: ${intervalRowsState.getErrorMessage()}`}</span>
+      </div>
+    );
+  }
+
+  const intervalRows = intervalRowsState.getSomeData();
+  return (
+    <>
+      {intervalRows && (
+        <SegmentBarChartRender
+          intervalRows={intervalRows}
+          datasourceRules={datasourceRules}
+          datasourceRulesError={allLoadRulesState.getErrorMessage()}
+          dateRange={dateRange}
+          shownDatasource={shownDatasource}
+          {...otherProps}
+        />
+      )}
+      {intervalRowsState.loading && <Loader />}
+    </>
+  );
+};
diff --git a/web-console/src/components/segment-timeline/segment-timeline.scss b/web-console/src/components/segment-timeline/segment-timeline.scss
index aa437052d617..4224c1cab89d 100644
--- a/web-console/src/components/segment-timeline/segment-timeline.scss
+++ b/web-console/src/components/segment-timeline/segment-timeline.scss
@@ -16,12 +16,20 @@
  * limitations under the License.
  */
 
+@import '../../variables';
+
 .segment-timeline {
-  display: grid;
-  grid-template-columns: 1fr 220px;
+  .control-bar {
+    @include card-like;
+    height: 34px;
+    display: flex;
+    align-items: start;
+    padding: 5px;
+    gap: 10px;
 
-  .loader {
-    width: 85%;
+    & > .expander {
+      flex: 1;
+    }
   }
 
   .loading-error {
@@ -31,14 +39,16 @@
     transform: translate(-50%, -50%);
   }
 
-  .no-data-text {
+  .chart-container {
     position: absolute;
-    left: 30vw;
-    top: 15vh;
-    font-size: 20px;
-  }
+    top: 34px;
+    width: 100%;
+    bottom: 0;
+    overflow: hidden;
 
-  .side-control {
-    padding-top: 20px;
+    .segment-bar-chart,
+    .segment-bar-chart-render {
+      @include pin-full;
+    }
   }
 }
diff --git a/web-console/src/components/segment-timeline/segment-timeline.spec.tsx b/web-console/src/components/segment-timeline/segment-timeline.spec.tsx
index 4f95842801a4..ebc83ae143c7 100644
--- a/web-console/src/components/segment-timeline/segment-timeline.spec.tsx
+++ b/web-console/src/components/segment-timeline/segment-timeline.spec.tsx
@@ -16,40 +16,42 @@
  * limitations under the License.
  */
 
-import { sane } from '@druid-toolkit/query';
 import { render } from '@testing-library/react';
 
 import { Capabilities } from '../../helpers';
+import { QueryState } from '../../utils';
 
 import { SegmentTimeline } from './segment-timeline';
 
-jest.useFakeTimers('modern').setSystemTime(Date.parse('2021-06-08T12:34:56Z'));
+jest.useFakeTimers('modern').setSystemTime(Date.parse('2024-11-19T12:34:56Z'));
 
-describe('SegmentTimeline', () => {
-  it('.getSqlQuery', () => {
-    expect(
-      SegmentTimeline.getSqlQuery([
-        new Date('2020-01-01T00:00:00Z'),
-        new Date('2021-02-01T00:00:00Z'),
-      ]),
-    ).toEqual(sane`
-      SELECT
-        "start", "end", "datasource",
-        COUNT(*) AS "count",
-        SUM("size") AS "size"
-      FROM sys.segments
-      WHERE
-        '2020-01-01T00:00:00.000Z' <= "start" AND
-        "end" <= '2021-02-01T00:00:00.000Z' AND
-        is_published = 1 AND
-        is_overshadowed = 0
-      GROUP BY 1, 2, 3
-      ORDER BY "start" DESC
-    `);
-  });
+jest.mock('../../hooks', () => {
+  return {
+    useQueryManager: (options: any) => {
+      if (options.initQuery instanceof Capabilities) {
+        // This is a query for data sources
+        return [new QueryState({ data: ['ds1', 'ds2'] })];
+      }
+
+      if (options.query === null) {
+        // This is a query for the data source time range
+        return [
+          new QueryState({
+            data: [new Date('2024-11-01 00:00:00Z'), new Date('2024-11-18 00:00:00Z')],
+          }),
+        ];
+      }
 
+      return new QueryState({ error: new Error('not covered') });
+    },
+  };
+});
+
+describe('SegmentTimeline', () => {
   it('matches snapshot', () => {
-    const segmentTimeline = <SegmentTimeline capabilities={Capabilities.FULL} />;
+    const segmentTimeline = (
+      <SegmentTimeline capabilities={Capabilities.FULL} datasource={undefined} />
+    );
     const { container } = render(segmentTimeline);
     expect(container.firstChild).toMatchSnapshot();
   });
diff --git a/web-console/src/components/segment-timeline/segment-timeline.tsx b/web-console/src/components/segment-timeline/segment-timeline.tsx
index 8aee0c66d477..2774c73276eb 100644
--- a/web-console/src/components/segment-timeline/segment-timeline.tsx
+++ b/web-console/src/components/segment-timeline/segment-timeline.tsx
@@ -16,628 +16,361 @@
  * limitations under the License.
  */
 
-import { Button, FormGroup, MenuItem, ResizeSensor, SegmentedControl } from '@blueprintjs/core';
-import type { DateRange, NonNullDateRange } from '@blueprintjs/datetime';
-import { DateRangeInput3 } from '@blueprintjs/datetime2';
+import {
+  Button,
+  ButtonGroup,
+  Intent,
+  Menu,
+  MenuItem,
+  Popover,
+  Position,
+  ResizeSensor,
+} from '@blueprintjs/core';
+import type { NonNullDateRange } from '@blueprintjs/datetime';
+import { DateRangePicker3 } from '@blueprintjs/datetime2';
 import { IconNames } from '@blueprintjs/icons';
-import type { ItemPredicate, ItemRenderer } from '@blueprintjs/select';
 import { Select } from '@blueprintjs/select';
-import type { AxisScale } from 'd3-axis';
-import { scaleLinear, scaleUtc } from 'd3-scale';
-import enUS from 'date-fns/locale/en-US';
-import React from 'react';
+import { C, L, N, SqlExpression, SqlQuery } from 'druid-query-toolkit';
+import { useEffect, useMemo, useState } from 'react';
 
+import { END_OF_TIME_DATE, START_OF_TIME_DATE } from '../../druid-models';
 import type { Capabilities } from '../../helpers';
-import { Api } from '../../singletons';
+import { useQueryManager } from '../../hooks';
 import {
-  ceilToUtcDay,
-  formatBytes,
-  formatInteger,
+  checkedCircleIcon,
+  day,
+  Duration,
+  getApiArray,
   isNonNullRange,
   localToUtcDateRange,
+  maxDate,
   queryDruidSql,
-  QueryManager,
-  uniq,
+  TZ_UTC,
   utcToLocalDateRange,
 } from '../../utils';
+import { Stage } from '../../utils/stage';
 import { Loader } from '../loader/loader';
 
-import type { BarUnitData } from './stacked-bar-chart';
-import { StackedBarChart } from './stacked-bar-chart';
+import type { IntervalStat } from './common';
+import { formatIsoDateOnly, getIntervalStatTitle, INTERVAL_STATS } from './common';
+import type { SegmentBarChartProps } from './segment-bar-chart';
+import { SegmentBarChart } from './segment-bar-chart';
 
 import './segment-timeline.scss';
 
-interface SegmentTimelineProps {
-  capabilities: Capabilities;
-}
-
-type ActiveDataType = 'sizeData' | 'countData';
-
-interface SegmentTimelineState {
-  chartHeight: number;
-  chartWidth: number;
-  data?: Record<string, any>;
-  datasources: string[];
-  stackedData?: Record<string, BarUnitData[]>;
-  singleDatasourceData?: Record<string, Record<string, BarUnitData[]>>;
-  activeDatasource: string | null;
-  activeDataType: ActiveDataType;
-  dataToRender: BarUnitData[];
-  loading: boolean;
-  error?: Error;
-  xScale: AxisScale<Date> | null;
-  yScale: AxisScale<number> | null;
-  dateRange: NonNullDateRange;
-  selectedDateRange?: DateRange;
+const DEFAULT_SHOWN_DURATION = new Duration('P1Y');
+const SHOWN_DURATION_OPTIONS: Duration[] = [
+  new Duration('P1D'),
+  new Duration('P1W'),
+  new Duration('P1M'),
+  new Duration('P3M'),
+  new Duration('P1Y'),
+  new Duration('P5Y'),
+  new Duration('P10Y'),
+];
+
+function getDateRange(shownDuration: Duration): NonNullDateRange {
+  const end = day.ceil(new Date(), TZ_UTC);
+  return [shownDuration.shift(end, TZ_UTC, -1), end];
 }
 
-interface BarChartScales {
-  xScale: AxisScale<Date>;
-  yScale: AxisScale<number>;
+function formatDateRange(dateRange: NonNullDateRange): string {
+  return `${formatIsoDateOnly(dateRange[0])} → ${formatIsoDateOnly(dateRange[1])}`;
 }
 
-interface IntervalRow {
-  start: string;
-  end: string;
-  datasource: string;
-  count: number;
-  size: number;
+function dateRangesEqual(dr1: NonNullDateRange, dr2: NonNullDateRange): boolean {
+  return dr1[0].valueOf() === dr2[0].valueOf() && dr2[1].valueOf() === dr2[1].valueOf();
 }
 
-const DEFAULT_TIME_SPAN_MONTHS = 3;
-
-function getDefaultDateRange(): NonNullDateRange {
-  const start = ceilToUtcDay(new Date());
-  const end = new Date(start.valueOf());
-  start.setUTCMonth(start.getUTCMonth() - DEFAULT_TIME_SPAN_MONTHS);
-  return [start, end];
+interface SegmentTimelineProps extends Pick<SegmentBarChartProps, 'getIntervalActionButton'> {
+  capabilities: Capabilities;
+  datasource: string | undefined;
 }
 
-export class SegmentTimeline extends React.PureComponent<
-  SegmentTimelineProps,
-  SegmentTimelineState
-> {
-  static COLORS = [
-    '#b33040',
-    '#d25c4d',
-    '#f2b447',
-    '#d9d574',
-    '#4FAA7E',
-    '#57ceff',
-    '#789113',
-    '#098777',
-    '#b33040',
-    '#d2757b',
-    '#f29063',
-    '#d9a241',
-    '#80aa61',
-    '#c4ff9e',
-    '#915412',
-    '#87606c',
-  ];
-
-  static getColor(index: number): string {
-    return SegmentTimeline.COLORS[index % SegmentTimeline.COLORS.length];
-  }
-
-  static getSqlQuery(dateRange: NonNullDateRange): string {
-    return `SELECT
-  "start", "end", "datasource",
-  COUNT(*) AS "count",
-  SUM("size") AS "size"
-FROM sys.segments
-WHERE
-  '${dateRange[0].toISOString()}' <= "start" AND
-  "end" <= '${dateRange[1].toISOString()}' AND
-  is_published = 1 AND
-  is_overshadowed = 0
-GROUP BY 1, 2, 3
-ORDER BY "start" DESC`;
-  }
-
-  static processRawData(data: IntervalRow[]) {
-    if (data === null) return [];
+export const SegmentTimeline = function SegmentTimeline(props: SegmentTimelineProps) {
+  const { capabilities, datasource, ...otherProps } = props;
+  const [stage, setStage] = useState<Stage | undefined>();
+  const [activeSegmentStat, setActiveSegmentStat] = useState<IntervalStat>('size');
+  const [shownDatasource, setShownDatasource] = useState<string | undefined>(datasource);
+  const [dateRange, setDateRange] = useState<NonNullDateRange | undefined>();
+  const [showCustomDatePicker, setShowCustomDatePicker] = useState(false);
+
+  useEffect(() => {
+    setShownDatasource(datasource);
+  }, [datasource]);
+
+  const defaultDateRange = useMemo(() => {
+    return getDateRange(DEFAULT_SHOWN_DURATION);
+  }, []);
+
+  const [datasourcesState] = useQueryManager<Capabilities, string[]>({
+    initQuery: capabilities,
+    processQuery: async (capabilities, cancelToken) => {
+      if (capabilities.hasSql()) {
+        const tables = await queryDruidSql<{ TABLE_NAME: string }>(
+          {
+            query: `SELECT TABLE_NAME FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_TYPE = 'TABLE'`,
+          },
+          cancelToken,
+        );
 
-    const countData: Record<string, any> = {};
-    const sizeData: Record<string, any> = {};
-    data.forEach(entry => {
-      const start = entry.start;
-      const day = start.split('T')[0];
-      const datasource = entry.datasource;
-      const count = entry.count;
-      const segmentSize = entry.size;
-      if (countData[day] === undefined) {
-        countData[day] = {
-          day,
-          [datasource]: count,
-          total: count,
-        };
-        sizeData[day] = {
-          day,
-          [datasource]: segmentSize,
-          total: segmentSize,
-        };
+        return tables.map(d => d.TABLE_NAME);
       } else {
-        const countDataEntry: number | undefined = countData[day][datasource];
-        countData[day][datasource] = count + (countDataEntry === undefined ? 0 : countDataEntry);
-        const sizeDataEntry: number | undefined = sizeData[day][datasource];
-        sizeData[day][datasource] = segmentSize + (sizeDataEntry === undefined ? 0 : sizeDataEntry);
-        countData[day].total += count;
-        sizeData[day].total += segmentSize;
+        return await getApiArray(`/druid/coordinator/v1/datasources`, cancelToken);
       }
-    });
-
-    const countDataArray = Object.keys(countData)
-      .reverse()
-      .map((time: any) => {
-        return countData[time];
-      });
-
-    const sizeDataArray = Object.keys(sizeData)
-      .reverse()
-      .map((time: any) => {
-        return sizeData[time];
-      });
-
-    return { countData: countDataArray, sizeData: sizeDataArray };
-  }
-
-  static calculateStackedData(
-    data: Record<string, any>,
-    datasources: string[],
-  ): Record<string, BarUnitData[]> {
-    const newStackedData: Record<string, BarUnitData[]> = {};
-    Object.keys(data).forEach((type: any) => {
-      const stackedData: any = data[type].map((d: any) => {
-        let y0 = 0;
-        return datasources.map((datasource: string, i) => {
-          const barUnitData = {
-            x: d.day,
-            y: d[datasource] === undefined ? 0 : d[datasource],
-            y0,
-            datasource,
-            color: SegmentTimeline.getColor(i),
-            dailySize: d.total,
-          };
-          y0 += d[datasource] === undefined ? 0 : d[datasource];
-          return barUnitData;
-        });
-      });
-      newStackedData[type] = stackedData.flat();
-    });
+    },
+  });
+
+  const [initDatasourceDateRangeState] = useQueryManager<string | null, NonNullDateRange>({
+    query: dateRange ? undefined : shownDatasource ?? null,
+    processQuery: async (datasource, cancelToken) => {
+      let queriedStart: Date;
+      let queriedEnd: Date;
+      if (capabilities.hasSql()) {
+        const baseQuery = SqlQuery.from(N('sys').table('segments'))
+          .changeWhereExpression(
+            SqlExpression.and(
+              C('start').unequal(START_OF_TIME_DATE),
+              C('end').unequal(END_OF_TIME_DATE),
+              C('is_overshadowed').equal(0),
+              datasource ? C('datasource').equal(L(datasource)) : undefined,
+            ),
+          )
+          .changeLimitValue(1);
 
-    return newStackedData;
-  }
+        const endQuery = baseQuery
+          .addSelect(C('end'), { addToOrderBy: 'end', direction: 'DESC' })
+          .toString();
 
-  static calculateSingleDatasourceData(
-    data: Record<string, any>,
-    datasources: string[],
-  ): Record<string, Record<string, BarUnitData[]>> {
-    const singleDatasourceData: Record<string, Record<string, BarUnitData[]>> = {};
-    Object.keys(data).forEach(dataType => {
-      singleDatasourceData[dataType] = {};
-      datasources.forEach((datasource, i) => {
-        const currentData = data[dataType];
-        if (currentData.length === 0) return;
-        const dataResult = currentData.map((d: any) => {
-          let y = 0;
-          if (d[datasource] !== undefined) {
-            y = d[datasource];
-          }
-          return {
-            x: d.day,
-            y,
-            datasource,
-            color: SegmentTimeline.getColor(i),
-            dailySize: d.total,
-          };
-        });
-        if (!dataResult.every((d: any) => d.y === 0)) {
-          singleDatasourceData[dataType][datasource] = dataResult;
+        const endRes = await queryDruidSql<{ end: string }>({ query: endQuery }, cancelToken).catch(
+          () => [],
+        );
+        if (endRes.length !== 1) {
+          return getDateRange(DEFAULT_SHOWN_DURATION);
         }
-      });
-    });
 
-    return singleDatasourceData;
-  }
-
-  private readonly dataQueryManager: QueryManager<
-    { capabilities: Capabilities; dateRange: NonNullDateRange },
-    any
-  >;
-
-  private readonly chartMargin = { top: 40, right: 15, bottom: 20, left: 60 };
-
-  constructor(props: SegmentTimelineProps) {
-    super(props);
-    const dateRange = getDefaultDateRange();
-
-    this.state = {
-      chartWidth: 1, // Dummy init values to be replaced
-      chartHeight: 1, // after first render
-      data: {},
-      datasources: [],
-      stackedData: {},
-      singleDatasourceData: {},
-      dataToRender: [],
-      activeDatasource: null,
-      activeDataType: 'sizeData',
-      loading: true,
-      xScale: null,
-      yScale: null,
-      dateRange,
-    };
-
-    this.dataQueryManager = new QueryManager({
-      processQuery: async ({ capabilities, dateRange }, cancelToken) => {
-        let intervals: IntervalRow[];
-        let datasources: string[];
-        if (capabilities.hasSql()) {
-          intervals = await queryDruidSql(
-            {
-              query: SegmentTimeline.getSqlQuery(dateRange),
-            },
-            cancelToken,
-          );
-          datasources = uniq(intervals.map(r => r.datasource).sort());
-        } else if (capabilities.hasCoordinatorAccess()) {
-          const startIso = dateRange[0].toISOString();
+        queriedEnd = day.ceil(new Date(endRes[0].end), TZ_UTC);
 
-          datasources = (
-            await Api.instance.get(`/druid/coordinator/v1/datasources`, { cancelToken })
-          ).data;
-          intervals = (
-            await Promise.all(
-              datasources.map(async datasource => {
-                const intervalMap = (
-                  await Api.instance.get(
-                    `/druid/coordinator/v1/datasources/${Api.encodePath(
-                      datasource,
-                    )}/intervals?simple`,
-                    { cancelToken },
-                  )
-                ).data;
+        const startQuery = baseQuery
+          .addSelect(C('start'), { addToOrderBy: 'end', direction: 'ASC' })
+          .toString();
 
-                return Object.keys(intervalMap)
-                  .map(interval => {
-                    const [start, end] = interval.split('/');
-                    const { count, size } = intervalMap[interval];
-                    return {
-                      start,
-                      end,
-                      datasource,
-                      count,
-                      size,
-                    };
-                  })
-                  .filter(a => startIso < a.start);
-              }),
-            )
-          )
-            .flat()
-            .sort((a, b) => b.start.localeCompare(a.start));
-        } else {
-          throw new Error(`must have SQL or coordinator access`);
+        const startRes = await queryDruidSql<{ start: string }>(
+          { query: startQuery },
+          cancelToken,
+        ).catch(() => []);
+        if (startRes.length !== 1) {
+          return [DEFAULT_SHOWN_DURATION.shift(queriedEnd, TZ_UTC, -1), queriedEnd]; // Should not really get here
         }
 
-        const data = SegmentTimeline.processRawData(intervals);
-        const stackedData = SegmentTimeline.calculateStackedData(data, datasources);
-        const singleDatasourceData = SegmentTimeline.calculateSingleDatasourceData(
-          data,
-          datasources,
-        );
-        return { data, datasources, stackedData, singleDatasourceData };
-      },
-      onStateChange: ({ data, loading, error }) => {
-        this.setState({
-          data: data ? data.data : undefined,
-          datasources: data ? data.datasources : [],
-          stackedData: data ? data.stackedData : undefined,
-          singleDatasourceData: data ? data.singleDatasourceData : undefined,
-          loading,
-          error,
-        });
-      },
-    });
-  }
-
-  componentDidMount(): void {
-    const { capabilities } = this.props;
-    const { dateRange } = this.state;
-
-    if (isNonNullRange(dateRange)) {
-      this.dataQueryManager.runQuery({ capabilities, dateRange });
-    }
-  }
-
-  componentWillUnmount(): void {
-    this.dataQueryManager.terminate();
-  }
-
-  componentDidUpdate(_prevProps: SegmentTimelineProps, prevState: SegmentTimelineState): void {
-    const { activeDatasource, activeDataType, singleDatasourceData, stackedData } = this.state;
-    if (
-      prevState.data !== this.state.data ||
-      prevState.activeDataType !== this.state.activeDataType ||
-      prevState.activeDatasource !== this.state.activeDatasource ||
-      prevState.chartWidth !== this.state.chartWidth ||
-      prevState.chartHeight !== this.state.chartHeight
-    ) {
-      const scales: BarChartScales | undefined = this.calculateScales();
-      const dataToRender: BarUnitData[] | undefined = activeDatasource
-        ? singleDatasourceData
-          ? singleDatasourceData[activeDataType][activeDatasource]
-          : undefined
-        : stackedData
-        ? stackedData[activeDataType]
-        : undefined;
-
-      if (scales && dataToRender) {
-        this.setState({
-          dataToRender,
-          xScale: scales.xScale,
-          yScale: scales.yScale,
-        });
+        queriedStart = day.floor(new Date(startRes[0].start), TZ_UTC);
+      } else {
+        // Don't bother querying if there is no SQL
+        return getDateRange(DEFAULT_SHOWN_DURATION);
       }
-    }
-  }
-
-  private calculateScales(): BarChartScales | undefined {
-    const {
-      chartWidth,
-      chartHeight,
-      data,
-      activeDataType,
-      activeDatasource,
-      singleDatasourceData,
-      dateRange,
-    } = this.state;
-    if (!data || !Object.keys(data).length || !isNonNullRange(dateRange)) return;
-    const activeData = data[activeDataType];
 
-    let yDomain: number[] = [
-      0,
-      activeData.length === 0
-        ? 0
-        : activeData.reduce((max: any, d: any) => (max.total > d.total ? max : d)).total,
-    ];
-
-    if (
-      activeDatasource !== null &&
-      singleDatasourceData![activeDataType][activeDatasource] !== undefined
-    ) {
-      yDomain = [
-        0,
-        singleDatasourceData![activeDataType][activeDatasource].reduce((max: any, d: any) =>
-          max.y > d.y ? max : d,
-        ).y,
+      return [
+        maxDate(queriedStart, DEFAULT_SHOWN_DURATION.shift(queriedEnd, TZ_UTC, -1)),
+        queriedEnd,
       ];
-    }
-
-    const xScale: AxisScale<Date> = scaleUtc()
-      .domain(dateRange)
-      .range([0, chartWidth - this.chartMargin.left - this.chartMargin.right]);
-
-    const yScale: AxisScale<number> = scaleLinear()
-      .rangeRound([chartHeight - this.chartMargin.top - this.chartMargin.bottom, 0])
-      .domain(yDomain);
-
-    return {
-      xScale,
-      yScale,
-    };
+    },
+  });
+
+  const effectiveDateRange =
+    dateRange ||
+    initDatasourceDateRangeState.data ||
+    (initDatasourceDateRangeState.isLoading() ? undefined : defaultDateRange);
+
+  let previousDateRange: NonNullDateRange | undefined;
+  let zoomedOutDateRange: NonNullDateRange | undefined;
+  let nextDateRange: NonNullDateRange | undefined;
+  if (effectiveDateRange) {
+    const d = Duration.fromRange(effectiveDateRange[0], effectiveDateRange[1], TZ_UTC);
+    const shiftStartBack = d.shift(effectiveDateRange[0], TZ_UTC, -1);
+    const shiftEndForward = d.shift(effectiveDateRange[1], TZ_UTC);
+    const now = day.ceil(new Date(), TZ_UTC);
+    previousDateRange = [shiftStartBack, effectiveDateRange[0]];
+    zoomedOutDateRange = [shiftStartBack, shiftEndForward < now ? shiftEndForward : now];
+    nextDateRange = [effectiveDateRange[1], shiftEndForward];
   }
 
-  private readonly formatTick = (n: number) => {
-    if (isNaN(n)) return '';
-    const { activeDataType } = this.state;
-    if (activeDataType === 'countData') {
-      return formatInteger(n);
-    } else {
-      return formatBytes(n);
-    }
-  };
-
-  private readonly handleResize = (entries: ResizeObserverEntry[]) => {
-    const chartRect = entries[0].contentRect;
-    this.setState({
-      chartWidth: chartRect.width,
-      chartHeight: chartRect.height,
-    });
-  };
-
-  renderStackedBarChart() {
-    const {
-      chartWidth,
-      chartHeight,
-      loading,
-      dataToRender,
-      activeDataType,
-      error,
-      xScale,
-      yScale,
-      data,
-      activeDatasource,
-      dateRange,
-    } = this.state;
-
-    if (loading) {
-      return (
-        <div>
-          <Loader loading={loading} />
-        </div>
-      );
-    }
-
-    if (error) {
-      return (
-        <div>
-          <span className="no-data-text">Error when loading data: {error.message}</span>
-        </div>
-      );
-    }
-
-    if (xScale === null || yScale === null) {
-      return (
-        <div>
-          <span className="no-data-text">Error when calculating scales</span>
-        </div>
-      );
-    }
-
-    if (data![activeDataType].length === 0) {
-      return (
-        <div>
-          <span className="no-data-text">There are no segments for the selected interval</span>
-        </div>
-      );
-    }
-
-    if (
-      activeDatasource !== null &&
-      data![activeDataType].every((d: any) => d[activeDatasource] === undefined)
-    ) {
-      return (
-        <div>
-          <span className="no-data-text">
-            No data available for <i>{activeDatasource}</i>
-          </span>
-        </div>
-      );
-    }
-
-    const millisecondsPerDay = 24 * 60 * 60 * 1000;
-    const barCounts = (dateRange[1].getTime() - dateRange[0].getTime()) / millisecondsPerDay;
-    const barWidth = Math.max(
-      0,
-      (chartWidth - this.chartMargin.left - this.chartMargin.right) / barCounts,
-    );
-    return (
-      <ResizeSensor onResize={this.handleResize}>
-        <StackedBarChart
-          dataToRender={dataToRender}
-          svgHeight={chartHeight}
-          svgWidth={chartWidth}
-          margin={this.chartMargin}
-          changeActiveDatasource={(datasource: string | null) =>
-            this.setState(prevState => ({
-              activeDatasource: prevState.activeDatasource ? null : datasource,
-            }))
+  return (
+    <div className="segment-timeline">
+      <div className="control-bar">
+        <ButtonGroup>
+          <Select<string>
+            items={datasourcesState.data || []}
+            disabled={datasourcesState.isError()}
+            onItemSelect={setShownDatasource}
+            itemRenderer={(val, { handleClick, handleFocus, modifiers }) => {
+              if (!modifiers.matchesPredicate) return null;
+              return (
+                <MenuItem
+                  key={val}
+                  disabled={modifiers.disabled}
+                  active={modifiers.active}
+                  onClick={handleClick}
+                  onFocus={handleFocus}
+                  roleStructure="listoption"
+                  text={val}
+                />
+              );
+            }}
+            noResults={<MenuItem disabled text="No results" roleStructure="listoption" />}
+            itemPredicate={(query, val, _index, exactMatch) => {
+              const normalizedTitle = val.toLowerCase();
+              const normalizedQuery = query.toLowerCase();
+
+              if (exactMatch) {
+                return normalizedTitle === normalizedQuery;
+              } else {
+                return normalizedTitle.includes(normalizedQuery);
+              }
+            }}
+          >
+            <Button
+              text={`Datasource: ${shownDatasource ?? 'all'}`}
+              small
+              rightIcon={IconNames.CARET_DOWN}
+              intent={datasourcesState.isError() ? Intent.WARNING : undefined}
+              data-tooltip={
+                datasourcesState.isError()
+                  ? `Error: ${datasourcesState.getErrorMessage()}`
+                  : undefined
+              }
+            />
+          </Select>
+          {shownDatasource && (
+            <Button icon={IconNames.CROSS} small onClick={() => setShownDatasource(undefined)} />
+          )}
+        </ButtonGroup>
+        <Popover
+          position={Position.BOTTOM_LEFT}
+          content={
+            <Menu>
+              {INTERVAL_STATS.map(stat => (
+                <MenuItem
+                  key={stat}
+                  icon={checkedCircleIcon(stat === activeSegmentStat)}
+                  text={getIntervalStatTitle(stat)}
+                  onClick={() => setActiveSegmentStat(stat)}
+                />
+              ))}
+            </Menu>
           }
-          activeDataType={activeDataType}
-          formatTick={(n: number) => this.formatTick(n)}
-          xScale={xScale}
-          yScale={yScale}
-          barWidth={barWidth}
-        />
-      </ResizeSensor>
-    );
-  }
-
-  render() {
-    const { capabilities } = this.props;
-    const { datasources, activeDataType, activeDatasource, dateRange, selectedDateRange } =
-      this.state;
-
-    const filterDatasource: ItemPredicate<string> = (query, val, _index, exactMatch) => {
-      const normalizedTitle = val.toLowerCase();
-      const normalizedQuery = query.toLowerCase();
-
-      if (exactMatch) {
-        return normalizedTitle === normalizedQuery;
-      } else {
-        return ` ${normalizedTitle}`.includes(normalizedQuery);
-      }
-    };
-
-    const datasourceRenderer: ItemRenderer<string> = (
-      val,
-      { handleClick, handleFocus, modifiers },
-    ) => {
-      if (!modifiers.matchesPredicate) {
-        return null;
-      }
-      return (
-        <MenuItem
-          key={val}
-          disabled={modifiers.disabled}
-          active={modifiers.active}
-          onClick={handleClick}
-          onFocus={handleFocus}
-          roleStructure="listoption"
-          text={val}
-        />
-      );
-    };
-
-    const DatasourceSelect: React.FC = () => {
-      const showAll = 'Show all';
-      const handleItemSelected = (selectedItem: string) => {
-        this.setState({
-          activeDatasource: selectedItem === showAll ? null : selectedItem,
-        });
-      };
-      const datasourcesWzAll = [showAll].concat(datasources);
-      return (
-        <Select<string>
-          items={datasourcesWzAll}
-          onItemSelect={handleItemSelected}
-          itemRenderer={datasourceRenderer}
-          noResults={<MenuItem disabled text="No results." roleStructure="listoption" />}
-          itemPredicate={filterDatasource}
-          fill
         >
           <Button
-            text={activeDatasource === null ? showAll : activeDatasource}
-            fill
+            text={`Show: ${getIntervalStatTitle(activeSegmentStat)}`}
+            small
             rightIcon={IconNames.CARET_DOWN}
           />
-        </Select>
-      );
-    };
-
-    return (
-      <div className="segment-timeline">
-        {this.renderStackedBarChart()}
-        <div className="side-control">
-          <FormGroup label="Show">
-            <SegmentedControl
-              value={activeDataType}
-              onValueChange={activeDataType =>
-                this.setState({ activeDataType: activeDataType as ActiveDataType })
+        </Popover>
+        <div className="expander" />
+        <ButtonGroup>
+          <Button
+            icon={IconNames.CARET_LEFT}
+            data-tooltip={
+              previousDateRange && `Previous time period\n${formatDateRange(previousDateRange)}`
+            }
+            small
+            disabled={!previousDateRange}
+            onClick={() => setDateRange(previousDateRange)}
+          />
+          <Button
+            icon={IconNames.ZOOM_OUT}
+            data-tooltip={zoomedOutDateRange && `Zoom out\n${formatDateRange(zoomedOutDateRange)}`}
+            small
+            disabled={!zoomedOutDateRange}
+            onClick={() => setDateRange(zoomedOutDateRange)}
+          />
+          <Button
+            icon={IconNames.CARET_RIGHT}
+            data-tooltip={nextDateRange && `Next time period\n${formatDateRange(nextDateRange)}`}
+            small
+            disabled={!nextDateRange}
+            onClick={() => setDateRange(nextDateRange)}
+          />
+        </ButtonGroup>
+        <ButtonGroup>
+          {SHOWN_DURATION_OPTIONS.map((d, i) => {
+            const dr = getDateRange(d);
+            return (
+              <Button
+                key={i}
+                text={d.toString().replace('P', '')}
+                data-tooltip={`Show last ${d.getDescription()}\n${formatDateRange(dr)}`}
+                active={effectiveDateRange && dateRangesEqual(effectiveDateRange, dr)}
+                small
+                onClick={() => setDateRange(dr)}
+              />
+            );
+          })}
+          <Popover
+            isOpen={showCustomDatePicker}
+            onInteraction={setShowCustomDatePicker}
+            content={
+              <DateRangePicker3
+                defaultValue={utcToLocalDateRange(
+                  effectiveDateRange || getDateRange(DEFAULT_SHOWN_DURATION),
+                )}
+                onChange={newDateRange => {
+                  const newUtcDateRange = localToUtcDateRange(newDateRange);
+                  if (!isNonNullRange(newUtcDateRange)) return;
+                  setDateRange(newUtcDateRange);
+                  setShowCustomDatePicker(false);
+                }}
+                contiguousCalendarMonths={false}
+                reverseMonthAndYearMenus
+                timePickerProps={undefined}
+                shortcuts={false}
+              />
+            }
+          >
+            <Button
+              icon={IconNames.CALENDAR}
+              text={
+                effectiveDateRange
+                  ? formatDateRange(effectiveDateRange)
+                  : `Loading datasource date range`
               }
-              options={[
-                {
-                  label: 'Total size',
-                  value: 'sizeData',
-                },
-                {
-                  label: 'Segment count',
-                  value: 'countData',
-                },
-              ]}
-              fill
+              data-tooltip={showCustomDatePicker ? undefined : `Select a custom date range`}
+              small
             />
-          </FormGroup>
-          <FormGroup label="Interval">
-            <DateRangeInput3
-              value={utcToLocalDateRange(selectedDateRange || dateRange)}
-              onChange={newDateRange => {
-                const newUtcDateRange = localToUtcDateRange(newDateRange);
-                if (!isNonNullRange(newUtcDateRange)) return;
-                this.setState({ dateRange: newUtcDateRange, selectedDateRange: undefined }, () => {
-                  this.dataQueryManager.runQuery({ capabilities, dateRange: newUtcDateRange });
-                });
-              }}
-              fill
-              locale={enUS}
+          </Popover>
+          <Button
+            icon={IconNames.PIN}
+            data-tooltip={
+              dateRange ? 'Pin the date range' : 'Auto determine date range to fit datasource'
+            }
+            active={Boolean(dateRange)}
+            disabled={!effectiveDateRange}
+            small
+            onClick={() => setDateRange(dateRange ? undefined : effectiveDateRange)}
+          />
+        </ButtonGroup>
+      </div>
+      <ResizeSensor
+        onResize={(entries: ResizeObserverEntry[]) => {
+          const rect = entries[0].contentRect;
+          setStage(new Stage(rect.width, rect.height));
+        }}
+      >
+        <div className="chart-container">
+          {stage && effectiveDateRange && (
+            <SegmentBarChart
+              capabilities={capabilities}
+              stage={stage}
+              dateRange={effectiveDateRange}
+              changeDateRange={setDateRange}
+              shownIntervalStat={activeSegmentStat}
+              shownDatasource={shownDatasource}
+              changeShownDatasource={setShownDatasource}
+              {...otherProps}
             />
-          </FormGroup>
-          <FormGroup label="Datasource">
-            <DatasourceSelect />
-          </FormGroup>
+          )}
+          {initDatasourceDateRangeState.isLoading() && <Loader />}
         </div>
-      </div>
-    );
-  }
-}
+      </ResizeSensor>
+    </div>
+  );
+};
diff --git a/web-console/src/components/segment-timeline/stacked-bar-chart.tsx b/web-console/src/components/segment-timeline/stacked-bar-chart.tsx
deleted file mode 100644
index 8018aaee5f6f..000000000000
--- a/web-console/src/components/segment-timeline/stacked-bar-chart.tsx
+++ /dev/null
@@ -1,174 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import type { AxisScale } from 'd3-axis';
-import { axisBottom, axisLeft } from 'd3-axis';
-import React, { useState } from 'react';
-
-import { BarGroup } from './bar-group';
-import { ChartAxis } from './chart-axis';
-
-import './stacked-bar-chart.scss';
-
-export interface BarUnitData {
-  x: number;
-  y: number;
-  y0?: number;
-  width: number;
-  datasource: string;
-  color: string;
-  dailySize?: number;
-}
-
-export interface BarChartMargin {
-  top: number;
-  right: number;
-  bottom: number;
-  left: number;
-}
-
-export interface HoveredBarInfo {
-  xCoordinate?: number;
-  yCoordinate?: number;
-  height?: number;
-  width?: number;
-  datasource?: string;
-  xValue?: number;
-  yValue?: number;
-  dailySize?: number;
-}
-
-interface StackedBarChartProps {
-  svgWidth: number;
-  svgHeight: number;
-  margin: BarChartMargin;
-  activeDataType?: string;
-  dataToRender: BarUnitData[];
-  changeActiveDatasource: (e: string | null) => void;
-  formatTick: (e: number) => string;
-  xScale: AxisScale<Date>;
-  yScale: AxisScale<number>;
-  barWidth: number;
-}
-
-export const StackedBarChart = React.forwardRef(function StackedBarChart(
-  props: StackedBarChartProps,
-  ref,
-) {
-  const {
-    activeDataType,
-    svgWidth,
-    svgHeight,
-    margin,
-    formatTick,
-    xScale,
-    yScale,
-    dataToRender,
-    changeActiveDatasource,
-    barWidth,
-  } = props;
-  const [hoverOn, setHoverOn] = useState<HoveredBarInfo>();
-
-  const width = svgWidth - margin.left - margin.right;
-  const height = svgHeight - margin.top - margin.bottom;
-
-  function renderBarChart() {
-    return (
-      <svg
-        width={svgWidth}
-        height={svgHeight}
-        viewBox={`0 0 ${svgWidth} ${svgHeight}`}
-        preserveAspectRatio="xMinYMin meet"
-      >
-        <g
-          transform={`translate(${margin.left}, ${margin.top})`}
-          onMouseLeave={() => setHoverOn(undefined)}
-        >
-          <ChartAxis
-            className="gridline-x"
-            transform="translate(0, 0)"
-            scale={axisLeft(yScale)
-              .ticks(5)
-              .tickSize(-width)
-              .tickFormat(() => '')
-              .tickSizeOuter(0)}
-          />
-          <BarGroup
-            dataToRender={dataToRender}
-            changeActiveDatasource={changeActiveDatasource}
-            formatTick={formatTick}
-            xScale={xScale}
-            yScale={yScale}
-            onHoverBar={(e: HoveredBarInfo) => setHoverOn(e)}
-            hoverOn={hoverOn}
-            barWidth={barWidth}
-          />
-          <ChartAxis
-            className="axis-x"
-            transform={`translate(0, ${height})`}
-            scale={axisBottom(xScale)}
-          />
-          <ChartAxis
-            className="axis-y"
-            scale={axisLeft(yScale)
-              .ticks(5)
-              .tickFormat((e: number) => formatTick(e))}
-          />
-          {hoverOn && (
-            <g
-              className="hovered-bar"
-              onClick={() => {
-                setHoverOn(undefined);
-                changeActiveDatasource(hoverOn.datasource ?? null);
-              }}
-            >
-              <rect
-                x={hoverOn.xCoordinate}
-                y={hoverOn.yCoordinate}
-                width={barWidth}
-                height={hoverOn.height}
-              />
-            </g>
-          )}
-        </g>
-      </svg>
-    );
-  }
-
-  return (
-    <div className="stacked-bar-chart" ref={ref as any}>
-      {hoverOn && (
-        <div className="bar-chart-tooltip">
-          <div>Datasource: {hoverOn.datasource}</div>
-          <div>Time: {hoverOn.xValue}</div>
-          <div>
-            {`${
-              activeDataType === 'countData' ? 'Daily total count:' : 'Daily total size:'
-            } ${formatTick(hoverOn.dailySize!)}`}
-          </div>
-          <div>
-            {`${activeDataType === 'countData' ? 'Count:' : 'Size:'} ${formatTick(
-              hoverOn.yValue!,
-            )}`}
-          </div>
-        </div>
-      )}
-      {renderBarChart()}
-    </div>
-  );
-});
diff --git a/web-console/src/components/supervisor-history-panel/supervisor-history-panel.tsx b/web-console/src/components/supervisor-history-panel/supervisor-history-panel.tsx
index 74cb55682f30..a7fa38fd445c 100644
--- a/web-console/src/components/supervisor-history-panel/supervisor-history-panel.tsx
+++ b/web-console/src/components/supervisor-history-panel/supervisor-history-panel.tsx
@@ -25,7 +25,7 @@ import type { IngestionSpec } from '../../druid-models';
 import { cleanSpec } from '../../druid-models';
 import { useQueryManager } from '../../hooks';
 import { Api } from '../../singletons';
-import { deepSet } from '../../utils';
+import { deepSet, getApiArray } from '../../utils';
 import { Loader } from '../loader/loader';
 import { ShowValue } from '../show-value/show-value';
 
@@ -49,11 +49,12 @@ export const SupervisorHistoryPanel = React.memo(function SupervisorHistoryPanel
   const [historyState] = useQueryManager<string, SupervisorHistoryEntry[]>({
     initQuery: supervisorId,
     processQuery: async (supervisorId, cancelToken) => {
-      const resp = await Api.instance.get(
-        `/druid/indexer/v1/supervisor/${Api.encodePath(supervisorId)}/history`,
-        { cancelToken },
-      );
-      return resp.data.map((vs: SupervisorHistoryEntry) => deepSet(vs, 'spec', cleanSpec(vs.spec)));
+      return (
+        await getApiArray<SupervisorHistoryEntry>(
+          `/druid/indexer/v1/supervisor/${Api.encodePath(supervisorId)}/history`,
+          cancelToken,
+        )
+      ).map(vs => deepSet(vs, 'spec', cleanSpec(vs.spec)));
     },
   });
 
diff --git a/web-console/src/components/table-clickable-cell/table-clickable-cell.tsx b/web-console/src/components/table-clickable-cell/table-clickable-cell.tsx
index aec706a50fc0..38c69e297e0c 100644
--- a/web-console/src/components/table-clickable-cell/table-clickable-cell.tsx
+++ b/web-console/src/components/table-clickable-cell/table-clickable-cell.tsx
@@ -28,7 +28,7 @@ export interface TableClickableCellProps {
   className?: string;
   onClick: MouseEventHandler<any>;
   hoverIcon?: IconName;
-  title?: string;
+  tooltip?: string;
   disabled?: boolean;
   children?: ReactNode;
 }
@@ -36,12 +36,13 @@ export interface TableClickableCellProps {
 export const TableClickableCell = React.memo(function TableClickableCell(
   props: TableClickableCellProps,
 ) {
-  const { className, onClick, hoverIcon, disabled, children, ...rest } = props;
+  const { className, onClick, hoverIcon, disabled, children, tooltip, ...rest } = props;
 
   return (
     <div
       className={classNames('table-clickable-cell', className, { disabled })}
       onClick={disabled ? undefined : onClick}
+      data-tooltip={tooltip}
       {...rest}
     >
       {children}
diff --git a/web-console/src/components/table-filterable-cell/table-filterable-cell.tsx b/web-console/src/components/table-filterable-cell/table-filterable-cell.tsx
index 631fa224aaf4..c03f0038cc7f 100644
--- a/web-console/src/components/table-filterable-cell/table-filterable-cell.tsx
+++ b/web-console/src/components/table-filterable-cell/table-filterable-cell.tsx
@@ -27,7 +27,7 @@ import { Deferred } from '../deferred/deferred';
 
 import './table-filterable-cell.scss';
 
-const FILTER_MODES: FilterMode[] = ['=', '!=', '<=', '>='];
+const FILTER_MODES: FilterMode[] = ['=', '!=', '<', '>='];
 const FILTER_MODES_NO_COMPARISONS: FilterMode[] = ['=', '!='];
 
 export interface TableFilterableCellProps {
diff --git a/web-console/src/console-application.tsx b/web-console/src/console-application.tsx
index 95336713dbb6..5dfbba77101a 100644
--- a/web-console/src/console-application.tsx
+++ b/web-console/src/console-application.tsx
@@ -182,12 +182,24 @@ export class ConsoleApplication extends React.PureComponent<
     changeTabWithFilter('datasources', [{ id: 'datasource', value: `=${datasource}` }]);
   };
 
-  private readonly goToSegments = (datasource: string, onlyUnavailable = false) => {
+  private readonly goToSegments = ({
+    start,
+    end,
+    datasource,
+    realtime,
+  }: {
+    start?: Date;
+    end?: Date;
+    datasource?: string;
+    realtime?: boolean;
+  }) => {
     changeTabWithFilter(
       'segments',
       compact([
-        { id: 'datasource', value: `=${datasource}` },
-        onlyUnavailable ? { id: 'is_available', value: '=false' } : undefined,
+        start && { id: 'start', value: `>=${start.toISOString()}` },
+        end && { id: 'end', value: `<${end.toISOString()}` },
+        datasource && { id: 'datasource', value: `=${datasource}` },
+        typeof realtime === 'boolean' ? { id: 'is_realtime', value: `=${realtime}` } : undefined,
       ]),
     );
   };
diff --git a/web-console/src/dialogs/compaction-history-dialog/compaction-history-dialog.tsx b/web-console/src/dialogs/compaction-history-dialog/compaction-history-dialog.tsx
index 9e19e043c713..8ee0ffdbfbc3 100644
--- a/web-console/src/dialogs/compaction-history-dialog/compaction-history-dialog.tsx
+++ b/web-console/src/dialogs/compaction-history-dialog/compaction-history-dialog.tsx
@@ -24,7 +24,7 @@ import { Loader, ShowValue } from '../../components';
 import type { CompactionConfig } from '../../druid-models';
 import { useQueryManager } from '../../hooks';
 import { Api } from '../../singletons';
-import { formatInteger, formatPercent } from '../../utils';
+import { formatInteger, formatPercent, getApiArray } from '../../utils';
 import { DiffDialog } from '../diff-dialog/diff-dialog';
 
 import './compaction-history-dialog.scss';
@@ -65,11 +65,10 @@ export const CompactionHistoryDialog = React.memo(function CompactionHistoryDial
     initQuery: datasource,
     processQuery: async (datasource, cancelToken) => {
       try {
-        const resp = await Api.instance.get(
+        return await getApiArray<CompactionHistoryEntry>(
           `/druid/coordinator/v1/config/compaction/${Api.encodePath(datasource)}/history?count=20`,
-          { cancelToken },
+          cancelToken,
         );
-        return resp.data;
       } catch (e) {
         if (e.response?.status === 404) return [];
         throw e;
diff --git a/web-console/src/dialogs/coordinator-dynamic-config-dialog/coordinator-dynamic-config-dialog.tsx b/web-console/src/dialogs/coordinator-dynamic-config-dialog/coordinator-dynamic-config-dialog.tsx
index ec964f5507ee..ab4fed8ae1ad 100644
--- a/web-console/src/dialogs/coordinator-dynamic-config-dialog/coordinator-dynamic-config-dialog.tsx
+++ b/web-console/src/dialogs/coordinator-dynamic-config-dialog/coordinator-dynamic-config-dialog.tsx
@@ -27,7 +27,7 @@ import { COORDINATOR_DYNAMIC_CONFIG_FIELDS } from '../../druid-models';
 import { useQueryManager } from '../../hooks';
 import { getLink } from '../../links';
 import { Api, AppToaster } from '../../singletons';
-import { getDruidErrorMessage } from '../../utils';
+import { getApiArray, getDruidErrorMessage } from '../../utils';
 import { SnitchDialog } from '..';
 
 import './coordinator-dynamic-config-dialog.scss';
@@ -47,10 +47,7 @@ export const CoordinatorDynamicConfigDialog = React.memo(function CoordinatorDyn
   const [historyRecordsState] = useQueryManager<null, any[]>({
     initQuery: null,
     processQuery: async (_, cancelToken) => {
-      const historyResp = await Api.instance.get(`/druid/coordinator/v1/config/history?count=100`, {
-        cancelToken,
-      });
-      return historyResp.data;
+      return await getApiArray(`/druid/coordinator/v1/config/history?count=100`, cancelToken);
     },
   });
 
diff --git a/web-console/src/dialogs/datasource-table-action-dialog/datasource-columns-table/datasource-columns-table.tsx b/web-console/src/dialogs/datasource-table-action-dialog/datasource-columns-table/datasource-columns-table.tsx
index 82187c866f44..3dfb2f7879d7 100644
--- a/web-console/src/dialogs/datasource-table-action-dialog/datasource-columns-table/datasource-columns-table.tsx
+++ b/web-console/src/dialogs/datasource-table-action-dialog/datasource-columns-table/datasource-columns-table.tsx
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-import { L } from '@druid-toolkit/query';
+import { L } from 'druid-query-toolkit';
 import React from 'react';
 import ReactTable from 'react-table';
 
diff --git a/web-console/src/dialogs/datasource-table-action-dialog/datasource-preview-pane/datasource-preview-pane.tsx b/web-console/src/dialogs/datasource-table-action-dialog/datasource-preview-pane/datasource-preview-pane.tsx
index 1ca92787c1cb..c48cbfa51989 100644
--- a/web-console/src/dialogs/datasource-table-action-dialog/datasource-preview-pane/datasource-preview-pane.tsx
+++ b/web-console/src/dialogs/datasource-table-action-dialog/datasource-preview-pane/datasource-preview-pane.tsx
@@ -16,8 +16,8 @@
  * limitations under the License.
  */
 
-import type { QueryResult } from '@druid-toolkit/query';
-import { QueryRunner, T } from '@druid-toolkit/query';
+import type { QueryResult } from 'druid-query-toolkit';
+import { QueryRunner, T } from 'druid-query-toolkit';
 import React from 'react';
 
 import { Loader, RecordTablePane } from '../../../components';
diff --git a/web-console/src/dialogs/lookup-table-action-dialog/lookup-values-table/lookup-values-table.tsx b/web-console/src/dialogs/lookup-table-action-dialog/lookup-values-table/lookup-values-table.tsx
index c36445d17731..122cc4566b85 100644
--- a/web-console/src/dialogs/lookup-table-action-dialog/lookup-values-table/lookup-values-table.tsx
+++ b/web-console/src/dialogs/lookup-table-action-dialog/lookup-values-table/lookup-values-table.tsx
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-import { N } from '@druid-toolkit/query';
+import { N } from 'druid-query-toolkit';
 import React from 'react';
 import ReactTable from 'react-table';
 
diff --git a/web-console/src/dialogs/overlord-dynamic-config-dialog/overlord-dynamic-config-dialog.tsx b/web-console/src/dialogs/overlord-dynamic-config-dialog/overlord-dynamic-config-dialog.tsx
index ba30118b0a32..5b1233c6384e 100644
--- a/web-console/src/dialogs/overlord-dynamic-config-dialog/overlord-dynamic-config-dialog.tsx
+++ b/web-console/src/dialogs/overlord-dynamic-config-dialog/overlord-dynamic-config-dialog.tsx
@@ -27,7 +27,7 @@ import { OVERLORD_DYNAMIC_CONFIG_FIELDS } from '../../druid-models';
 import { useQueryManager } from '../../hooks';
 import { getLink } from '../../links';
 import { Api, AppToaster } from '../../singletons';
-import { getDruidErrorMessage } from '../../utils';
+import { getApiArray, getDruidErrorMessage } from '../../utils';
 import { SnitchDialog } from '..';
 
 import './overlord-dynamic-config-dialog.scss';
@@ -47,10 +47,7 @@ export const OverlordDynamicConfigDialog = React.memo(function OverlordDynamicCo
   const [historyRecordsState] = useQueryManager<null, any[]>({
     initQuery: null,
     processQuery: async (_, cancelToken) => {
-      const historyResp = await Api.instance.get(`/druid/indexer/v1/worker/history?count=100`, {
-        cancelToken,
-      });
-      return historyResp.data;
+      return await getApiArray(`/druid/indexer/v1/worker/history?count=100`, cancelToken);
     },
   });
 
diff --git a/web-console/src/dialogs/retention-dialog/__snapshots__/retention-dialog.spec.tsx.snap b/web-console/src/dialogs/retention-dialog/__snapshots__/retention-dialog.spec.tsx.snap
index 19c90c7de335..8bba057fac2d 100644
--- a/web-console/src/dialogs/retention-dialog/__snapshots__/retention-dialog.spec.tsx.snap
+++ b/web-console/src/dialogs/retention-dialog/__snapshots__/retention-dialog.spec.tsx.snap
@@ -188,7 +188,7 @@ exports[`RetentionDialog matches snapshot 1`] = `
                         style="transform: translateY(0); transition: none;"
                       >
                         <div
-                          class="bp5-card bp5-elevation-2"
+                          class="rule-detail bp5-card bp5-elevation-2"
                         >
                           <div
                             class="bp5-form-group"
@@ -653,7 +653,7 @@ exports[`RetentionDialog matches snapshot 1`] = `
                         style="transform: translateY(0); transition: none;"
                       >
                         <div
-                          class="bp5-card bp5-elevation-2"
+                          class="rule-detail bp5-card bp5-elevation-2"
                         >
                           <div
                             class="bp5-form-group"
diff --git a/web-console/src/dialogs/retention-dialog/retention-dialog.tsx b/web-console/src/dialogs/retention-dialog/retention-dialog.tsx
index 9b657622d89c..e656a4cbdff2 100644
--- a/web-console/src/dialogs/retention-dialog/retention-dialog.tsx
+++ b/web-console/src/dialogs/retention-dialog/retention-dialog.tsx
@@ -22,12 +22,12 @@ import React, { useState } from 'react';
 
 import type { FormJsonTabs } from '../../components';
 import { ExternalLink, FormJsonSelector, JsonInput, RuleEditor } from '../../components';
+import type { Rule } from '../../druid-models';
 import type { Capabilities } from '../../helpers';
 import { useQueryManager } from '../../hooks';
 import { getLink } from '../../links';
 import { Api } from '../../singletons';
-import { filterMap, queryDruidSql, swapElements } from '../../utils';
-import type { Rule } from '../../utils/load-rule';
+import { filterMap, getApiArray, queryDruidSql, swapElements } from '../../utils';
 import { SnitchDialog } from '..';
 
 import './retention-dialog.scss';
@@ -67,11 +67,9 @@ ORDER BY 1`,
 
         return sqlResp.map(d => d.tier);
       } else if (capabilities.hasCoordinatorAccess()) {
-        const allServiceResp = await Api.instance.get('/druid/coordinator/v1/servers?simple', {
-          cancelToken,
-        });
-        return filterMap(allServiceResp.data, (s: any) =>
-          s.type === 'historical' ? s.tier : undefined,
+        return filterMap(
+          await getApiArray('/druid/coordinator/v1/servers?simple', cancelToken),
+          (s: any) => (s.type === 'historical' ? s.tier : undefined),
         );
       } else {
         throw new Error(`must have sql or coordinator access`);
@@ -84,11 +82,10 @@ ORDER BY 1`,
   const [historyQueryState] = useQueryManager<string, any[]>({
     initQuery: props.datasource,
     processQuery: async (datasource, cancelToken) => {
-      const historyResp = await Api.instance.get(
+      return await getApiArray(
         `/druid/coordinator/v1/rules/${Api.encodePath(datasource)}/history?count=200`,
-        { cancelToken },
+        cancelToken,
       );
-      return historyResp.data;
     },
   });
 
diff --git a/web-console/src/dialogs/segments-table-action-dialog/segments-preview-pane/segments-preview-pane.tsx b/web-console/src/dialogs/segments-table-action-dialog/segments-preview-pane/segments-preview-pane.tsx
index 4c2487ce0cc6..2925482d9901 100644
--- a/web-console/src/dialogs/segments-table-action-dialog/segments-preview-pane/segments-preview-pane.tsx
+++ b/web-console/src/dialogs/segments-table-action-dialog/segments-preview-pane/segments-preview-pane.tsx
@@ -16,8 +16,8 @@
  * limitations under the License.
  */
 
-import type { QueryResult } from '@druid-toolkit/query';
-import { QueryRunner } from '@druid-toolkit/query';
+import type { QueryResult } from 'druid-query-toolkit';
+import { QueryRunner } from 'druid-query-toolkit';
 import React from 'react';
 
 import { Loader, RecordTablePane } from '../../../components';
diff --git a/web-console/src/dialogs/status-dialog/status-dialog.tsx b/web-console/src/dialogs/status-dialog/status-dialog.tsx
index 311f3e056646..672fc40910f3 100644
--- a/web-console/src/dialogs/status-dialog/status-dialog.tsx
+++ b/web-console/src/dialogs/status-dialog/status-dialog.tsx
@@ -50,8 +50,7 @@ export const StatusDialog = React.memo(function StatusDialog(props: StatusDialog
   const [responseState] = useQueryManager<null, StatusResponse>({
     initQuery: null,
     processQuery: async (_, cancelToken) => {
-      const resp = await Api.instance.get(`/status`, { cancelToken });
-      return resp.data;
+      return (await Api.instance.get(`/status`, { cancelToken })).data;
     },
   });
 
diff --git a/web-console/src/dialogs/supervisor-reset-offsets-dialog/supervisor-reset-offsets-dialog.tsx b/web-console/src/dialogs/supervisor-reset-offsets-dialog/supervisor-reset-offsets-dialog.tsx
index 009d83260604..d10fc00eb5ce 100644
--- a/web-console/src/dialogs/supervisor-reset-offsets-dialog/supervisor-reset-offsets-dialog.tsx
+++ b/web-console/src/dialogs/supervisor-reset-offsets-dialog/supervisor-reset-offsets-dialog.tsx
@@ -106,11 +106,12 @@ export const SupervisorResetOffsetsDialog = React.memo(function SupervisorResetO
   const [statusResp] = useQueryManager<string, SupervisorStatus>({
     initQuery: supervisorId,
     processQuery: async (supervisorId, cancelToken) => {
-      const statusResp = await Api.instance.get(
-        `/druid/indexer/v1/supervisor/${Api.encodePath(supervisorId)}/status`,
-        { cancelToken },
-      );
-      return statusResp.data;
+      return (
+        await Api.instance.get(
+          `/druid/indexer/v1/supervisor/${Api.encodePath(supervisorId)}/status`,
+          { cancelToken },
+        )
+      ).data;
     },
   });
 
diff --git a/web-console/src/components/segment-timeline/stacked-bar-chart.scss b/web-console/src/druid-models/datasource/datasource.ts
similarity index 64%
rename from web-console/src/components/segment-timeline/stacked-bar-chart.scss
rename to web-console/src/druid-models/datasource/datasource.ts
index 26e5f5186b5f..313d711b35c2 100644
--- a/web-console/src/components/segment-timeline/stacked-bar-chart.scss
+++ b/web-console/src/druid-models/datasource/datasource.ts
@@ -16,35 +16,32 @@
  * limitations under the License.
  */
 
-.stacked-bar-chart {
-  position: relative;
-  overflow: hidden;
+import { hashJoaat } from '../../utils';
 
-  .bar-chart-tooltip {
-    position: absolute;
-    left: 100px;
-    right: 0;
+const COLORS = [
+  '#1f77b4',
+  '#aec7e8',
+  '#ff7f0e',
+  '#ffbb78',
+  '#2ca02c',
+  '#98df8a',
+  '#d62728',
+  '#ff9896',
+  '#9467bd',
+  '#c5b0d5',
+  '#8c564b',
+  '#c49c94',
+  '#e377c2',
+  '#f7b6d2',
+  '#7f7f7f',
+  '#c7c7c7',
+  '#bcbd22',
+  '#dbdb8d',
+  '#17becf',
+  '#9edae5',
+];
 
-    div {
-      display: inline-block;
-      width: 230px;
-    }
-  }
-
-  svg {
-    position: absolute;
-
-    .hovered-bar {
-      fill: transparent;
-      stroke: #ffffff;
-      stroke-width: 1.5px;
-    }
-
-    .gridline-x {
-      line {
-        stroke-dasharray: 5, 5;
-        opacity: 0.5;
-      }
-    }
-  }
+export function getDatasourceColor(datasource: string) {
+  const hash = hashJoaat(datasource);
+  return COLORS[hash % COLORS.length];
 }
diff --git a/web-console/src/druid-models/execution/execution.ts b/web-console/src/druid-models/execution/execution.ts
index f4a73eb97207..1237b49e62da 100644
--- a/web-console/src/druid-models/execution/execution.ts
+++ b/web-console/src/druid-models/execution/execution.ts
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-import { Column, QueryResult, SqlExpression, SqlQuery, SqlWithQuery } from '@druid-toolkit/query';
+import { Column, QueryResult, SqlExpression, SqlQuery, SqlWithQuery } from 'druid-query-toolkit';
 
 import { maybeGetClusterCapacity } from '../../helpers';
 import {
diff --git a/web-console/src/druid-models/external-config/external-config.ts b/web-console/src/druid-models/external-config/external-config.ts
index d6541747ce5a..6fa74eb038bd 100644
--- a/web-console/src/druid-models/external-config/external-config.ts
+++ b/web-console/src/druid-models/external-config/external-config.ts
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-import type { SqlQuery } from '@druid-toolkit/query';
+import type { SqlQuery } from 'druid-query-toolkit';
 import {
   C,
   F,
@@ -28,7 +28,7 @@ import {
   SqlLiteral,
   SqlStar,
   SqlType,
-} from '@druid-toolkit/query';
+} from 'druid-query-toolkit';
 import * as JSONBig from 'json-bigint-native';
 
 import { nonEmptyArray } from '../../utils';
diff --git a/web-console/src/druid-models/index.ts b/web-console/src/druid-models/index.ts
index dfeeeeaac837..e31eedeea738 100644
--- a/web-console/src/druid-models/index.ts
+++ b/web-console/src/druid-models/index.ts
@@ -21,6 +21,7 @@ export * from './compaction-config/compaction-config';
 export * from './compaction-status/compaction-status';
 export * from './coordinator-dynamic-config/coordinator-dynamic-config';
 export * from './dart/dart-query-entry';
+export * from './datasource/datasource';
 export * from './dimension-spec/dimension-spec';
 export * from './druid-engine/druid-engine';
 export * from './execution/execution';
@@ -32,10 +33,12 @@ export * from './ingest-query-pattern/ingest-query-pattern';
 export * from './ingestion-spec/ingestion-spec';
 export * from './input-format/input-format';
 export * from './input-source/input-source';
+export * from './load-rule/load-rule';
 export * from './lookup-spec/lookup-spec';
 export * from './metric-spec/metric-spec';
 export * from './overlord-dynamic-config/overlord-dynamic-config';
 export * from './query-context/query-context';
+export * from './segment/segment';
 export * from './stages/stages';
 export * from './supervisor-status/supervisor-status';
 export * from './task/task';
diff --git a/web-console/src/druid-models/ingest-query-pattern/ingest-query-pattern.spec.ts b/web-console/src/druid-models/ingest-query-pattern/ingest-query-pattern.spec.ts
index 996385fc08ff..cf108c2b3890 100644
--- a/web-console/src/druid-models/ingest-query-pattern/ingest-query-pattern.spec.ts
+++ b/web-console/src/druid-models/ingest-query-pattern/ingest-query-pattern.spec.ts
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-import { sane, SqlQuery } from '@druid-toolkit/query';
+import { sane, SqlQuery } from 'druid-query-toolkit';
 
 import { fitIngestQueryPattern, ingestQueryPatternToQuery } from './ingest-query-pattern';
 
diff --git a/web-console/src/druid-models/ingest-query-pattern/ingest-query-pattern.ts b/web-console/src/druid-models/ingest-query-pattern/ingest-query-pattern.ts
index f0ce8a0eb288..d2009ad2e5ee 100644
--- a/web-console/src/druid-models/ingest-query-pattern/ingest-query-pattern.ts
+++ b/web-console/src/druid-models/ingest-query-pattern/ingest-query-pattern.ts
@@ -26,7 +26,7 @@ import {
   SqlTable,
   SqlWithPart,
   T,
-} from '@druid-toolkit/query';
+} from 'druid-query-toolkit';
 
 import { filterMap, oneOf } from '../../utils';
 import type { ExternalConfig } from '../external-config/external-config';
diff --git a/web-console/src/utils/load-rule.ts b/web-console/src/druid-models/load-rule/load-rule.ts
similarity index 97%
rename from web-console/src/utils/load-rule.ts
rename to web-console/src/druid-models/load-rule/load-rule.ts
index a32422bbb6a4..31b4d600585a 100644
--- a/web-console/src/utils/load-rule.ts
+++ b/web-console/src/druid-models/load-rule/load-rule.ts
@@ -18,7 +18,7 @@
 
 import { sum } from 'd3-array';
 
-import { deepMove, deepSet } from './object-change';
+import { deepMove, deepSet } from '../../utils';
 
 export type RuleType =
   | 'loadForever'
@@ -41,6 +41,7 @@ export interface Rule {
 }
 
 export class RuleUtil {
+  static DEFAULT_RULES_KEY = '_default';
   static TYPES: RuleType[] = [
     'loadForever',
     'loadByInterval',
diff --git a/web-console/src/druid-models/segment/segment.ts b/web-console/src/druid-models/segment/segment.ts
new file mode 100644
index 000000000000..1bff0711fcdf
--- /dev/null
+++ b/web-console/src/druid-models/segment/segment.ts
@@ -0,0 +1,50 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { Duration } from '../../utils';
+
+export const START_OF_TIME_DATE = '-146136543-09-08T08:23:32.096Z';
+export const END_OF_TIME_DATE = '146140482-04-24T15:36:27.903Z';
+
+export function computeSegmentTimeSpan(start: string, end: string): string {
+  if (start === START_OF_TIME_DATE && end === END_OF_TIME_DATE) {
+    return 'All';
+  }
+
+  const startDate = new Date(start);
+  if (isNaN(startDate.valueOf())) {
+    return 'Invalid start';
+  }
+
+  const endDate = new Date(end);
+  if (isNaN(endDate.valueOf())) {
+    return 'Invalid end';
+  }
+
+  return Duration.fromRange(startDate, endDate, 'Etc/UTC').getDescription(true);
+}
+
+export interface ShardSpec {
+  type: string;
+  partitionNum?: number;
+  partitions?: number;
+  dimensions?: string[];
+  partitionDimensions?: string[];
+  start?: string[];
+  end?: string[];
+}
diff --git a/web-console/src/druid-models/task/task.ts b/web-console/src/druid-models/task/task.ts
index 3445cc5fb45f..e1743c116897 100644
--- a/web-console/src/druid-models/task/task.ts
+++ b/web-console/src/druid-models/task/task.ts
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-import { C } from '@druid-toolkit/query';
+import { C } from 'druid-query-toolkit';
 
 import type { Counters, StageDefinition } from '../stages/stages';
 
diff --git a/web-console/src/druid-models/workbench-query/workbench-query.spec.ts b/web-console/src/druid-models/workbench-query/workbench-query.spec.ts
index 02bb3e399b02..8456b0d065d5 100644
--- a/web-console/src/druid-models/workbench-query/workbench-query.spec.ts
+++ b/web-console/src/druid-models/workbench-query/workbench-query.spec.ts
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-import { sane } from '@druid-toolkit/query';
+import { sane } from 'druid-query-toolkit';
 
 import { WorkbenchQuery } from './workbench-query';
 
diff --git a/web-console/src/druid-models/workbench-query/workbench-query.ts b/web-console/src/druid-models/workbench-query/workbench-query.ts
index da37127f1d2d..9b1ed42b516b 100644
--- a/web-console/src/druid-models/workbench-query/workbench-query.ts
+++ b/web-console/src/druid-models/workbench-query/workbench-query.ts
@@ -22,7 +22,7 @@ import type {
   SqlClusteredByClause,
   SqlExpression,
   SqlPartitionedByClause,
-} from '@druid-toolkit/query';
+} from 'druid-query-toolkit';
 import {
   C,
   F,
@@ -30,7 +30,7 @@ import {
   SqlOrderByClause,
   SqlOrderByExpression,
   SqlQuery,
-} from '@druid-toolkit/query';
+} from 'druid-query-toolkit';
 import Hjson from 'hjson';
 import * as JSONBig from 'json-bigint-native';
 import { v4 as uuidv4 } from 'uuid';
diff --git a/web-console/src/entry.scss b/web-console/src/entry.scss
index 8d368a4146b7..46ea9d298d0f 100644
--- a/web-console/src/entry.scss
+++ b/web-console/src/entry.scss
@@ -56,6 +56,7 @@ body {
   position: absolute;
   height: 100%;
   width: 100%;
+  z-index: 0;
 
   .console-application {
     position: absolute;
diff --git a/web-console/src/entry.tsx b/web-console/src/entry.tsx
index 42cfe08ad13c..55f7abfc59a2 100644
--- a/web-console/src/entry.tsx
+++ b/web-console/src/entry.tsx
@@ -20,7 +20,7 @@ import 'regenerator-runtime/runtime';
 import './bootstrap/ace';
 
 import { OverlaysProvider } from '@blueprintjs/core';
-import { QueryRunner } from '@druid-toolkit/query';
+import { QueryRunner } from 'druid-query-toolkit';
 import { createRoot } from 'react-dom/client';
 
 import { bootstrapJsonParse } from './bootstrap/json-parser';
diff --git a/web-console/src/helpers/capabilities.ts b/web-console/src/helpers/capabilities.ts
index 013f9368c58c..3255ec93be73 100644
--- a/web-console/src/helpers/capabilities.ts
+++ b/web-console/src/helpers/capabilities.ts
@@ -211,6 +211,10 @@ export class Capabilities {
     };
   }
 
+  public clone(): Capabilities {
+    return new Capabilities(this.valueOf());
+  }
+
   public getMode(): CapabilitiesMode {
     if (!this.hasSql()) return 'no-sql';
     if (!this.hasCoordinatorAccess()) return 'no-proxy';
diff --git a/web-console/src/helpers/execution/general.ts b/web-console/src/helpers/execution/general.ts
index a90c02a63061..0e78834172b1 100644
--- a/web-console/src/helpers/execution/general.ts
+++ b/web-console/src/helpers/execution/general.ts
@@ -16,8 +16,8 @@
  * limitations under the License.
  */
 
-import type { QueryResult } from '@druid-toolkit/query';
 import type { CancelToken } from 'axios';
+import type { QueryResult } from 'druid-query-toolkit';
 
 import type { Execution } from '../../druid-models';
 import { IntermediateQueryState } from '../../utils';
diff --git a/web-console/src/helpers/execution/sql-task-execution.ts b/web-console/src/helpers/execution/sql-task-execution.ts
index f4dd45a2cb91..68cf0763b425 100644
--- a/web-console/src/helpers/execution/sql-task-execution.ts
+++ b/web-console/src/helpers/execution/sql-task-execution.ts
@@ -16,8 +16,8 @@
  * limitations under the License.
  */
 
-import { QueryResult } from '@druid-toolkit/query';
 import type { AxiosResponse, CancelToken } from 'axios';
+import { QueryResult } from 'druid-query-toolkit';
 
 import type { AsyncStatusResponse, MsqTaskPayloadResponse, QueryContext } from '../../druid-models';
 import { Execution } from '../../druid-models';
diff --git a/web-console/src/helpers/spec-conversion.ts b/web-console/src/helpers/spec-conversion.ts
index 00bc3d5f832c..9fc95d3b60f5 100644
--- a/web-console/src/helpers/spec-conversion.ts
+++ b/web-console/src/helpers/spec-conversion.ts
@@ -25,7 +25,7 @@ import {
   SqlExpression,
   SqlType,
   T,
-} from '@druid-toolkit/query';
+} from 'druid-query-toolkit';
 import * as JSONBig from 'json-bigint-native';
 
 import type {
diff --git a/web-console/src/hooks/use-clock.ts b/web-console/src/hooks/use-clock.ts
index 5d1264421957..a909a2c1f740 100644
--- a/web-console/src/hooks/use-clock.ts
+++ b/web-console/src/hooks/use-clock.ts
@@ -16,7 +16,9 @@
  * limitations under the License.
  */
 
-import { useEffect, useState } from 'react';
+import { useState } from 'react';
+
+import { useInterval } from './use-interval';
 
 function getNowToSecond(): Date {
   const now = new Date();
@@ -24,18 +26,12 @@ function getNowToSecond(): Date {
   return now;
 }
 
-export function useClock() {
+export function useClock(updateInterval = 1000) {
   const [now, setNow] = useState<Date>(getNowToSecond);
 
-  useEffect(() => {
-    const checkInterval = setInterval(() => {
-      setNow(getNowToSecond());
-    }, 1000);
-
-    return () => {
-      clearInterval(checkInterval);
-    };
-  }, []);
+  useInterval(() => {
+    setNow(getNowToSecond());
+  }, updateInterval);
 
   return now;
 }
diff --git a/web-console/src/react-table/react-table-utils.spec.ts b/web-console/src/react-table/react-table-utils.spec.ts
index 0a1bbf3f9ad5..1dd245b49f70 100644
--- a/web-console/src/react-table/react-table-utils.spec.ts
+++ b/web-console/src/react-table/react-table-utils.spec.ts
@@ -75,5 +75,9 @@ describe('react-table-utils', () => {
       { id: 'x', value: '~y' },
       { id: 'z', value: '=w&' },
     ]);
+    expect(stringToTableFilters('x<3&y<=3')).toEqual([
+      { id: 'x', value: '<3' },
+      { id: 'y', value: '<=3' },
+    ]);
   });
 });
diff --git a/web-console/src/react-table/react-table-utils.ts b/web-console/src/react-table/react-table-utils.ts
index ce9497a1209a..7732c90b231c 100644
--- a/web-console/src/react-table/react-table-utils.ts
+++ b/web-console/src/react-table/react-table-utils.ts
@@ -18,8 +18,7 @@
 
 import type { IconName } from '@blueprintjs/core';
 import { IconNames } from '@blueprintjs/icons';
-import type { SqlExpression } from '@druid-toolkit/query';
-import { C, F } from '@druid-toolkit/query';
+import { C, F, SqlExpression } from 'druid-query-toolkit';
 import type { Filter } from 'react-table';
 
 import { addOrUpdate, caseInsensitiveContains, filterMap } from '../utils';
@@ -32,9 +31,9 @@ export const STANDARD_TABLE_PAGE_SIZE_OPTIONS = [50, 100, 200];
 export const SMALL_TABLE_PAGE_SIZE = 25;
 export const SMALL_TABLE_PAGE_SIZE_OPTIONS = [25, 50, 100];
 
-export type FilterMode = '~' | '=' | '!=' | '<=' | '>=';
+export type FilterMode = '~' | '=' | '!=' | '<' | '<=' | '>' | '>=';
 
-export const FILTER_MODES: FilterMode[] = ['~', '=', '!=', '<=', '>='];
+export const FILTER_MODES: FilterMode[] = ['~', '=', '!=', '<', '<=', '>', '>='];
 export const FILTER_MODES_NO_COMPARISON: FilterMode[] = ['~', '=', '!='];
 
 export function filterModeToIcon(mode: FilterMode): IconName {
@@ -45,8 +44,12 @@ export function filterModeToIcon(mode: FilterMode): IconName {
       return IconNames.EQUALS;
     case '!=':
       return IconNames.NOT_EQUAL_TO;
+    case '<':
+      return IconNames.LESS_THAN;
     case '<=':
       return IconNames.LESS_THAN_OR_EQUAL_TO;
+    case '>':
+      return IconNames.GREATER_THAN;
     case '>=':
       return IconNames.GREATER_THAN_OR_EQUAL_TO;
     default:
@@ -62,8 +65,12 @@ export function filterModeToTitle(mode: FilterMode): string {
       return 'Equals';
     case '!=':
       return 'Not equals';
+    case '<':
+      return 'Less than';
     case '<=':
       return 'Less than or equal';
+    case '>':
+      return 'Greater than';
     case '>=':
       return 'Greater than or equal';
     default:
@@ -89,7 +96,7 @@ export function parseFilterModeAndNeedle(
   filter: Filter,
   loose = false,
 ): FilterModeAndNeedle | undefined {
-  const m = /^(~|=|!=|<=|>=)?(.*)$/.exec(String(filter.value));
+  const m = /^(~|=|!=|<(?!=)|<=|>(?!=)|>=)?(.*)$/.exec(String(filter.value));
   if (!m) return;
   if (!loose && !m[2]) return;
   const mode = (m[1] as FilterMode) || '~';
@@ -112,21 +119,28 @@ export function booleanCustomTableFilter(filter: Filter, value: unknown): boolea
   const modeAndNeedle = parseFilterModeAndNeedle(filter);
   if (!modeAndNeedle) return true;
   const { mode, needle } = modeAndNeedle;
+  const strValue = String(value);
   switch (mode) {
     case '=':
-      return String(value) === needle;
+      return strValue === needle;
 
     case '!=':
-      return String(value) !== needle;
+      return strValue !== needle;
+
+    case '<':
+      return strValue < needle;
 
     case '<=':
-      return String(value) <= needle;
+      return strValue <= needle;
+
+    case '>':
+      return strValue > needle;
 
     case '>=':
-      return String(value) >= needle;
+      return strValue >= needle;
 
     default:
-      return caseInsensitiveContains(String(value), needle);
+      return caseInsensitiveContains(strValue, needle);
   }
 }
 
@@ -142,9 +156,15 @@ export function sqlQueryCustomTableFilter(filter: Filter): SqlExpression | undef
     case '!=':
       return column.unequal(needle);
 
+    case '<':
+      return column.lessThan(needle);
+
     case '<=':
       return column.lessThanOrEqual(needle);
 
+    case '>':
+      return column.greaterThan(needle);
+
     case '>=':
       return column.greaterThanOrEqual(needle);
 
@@ -153,6 +173,10 @@ export function sqlQueryCustomTableFilter(filter: Filter): SqlExpression | undef
   }
 }
 
+export function sqlQueryCustomTableFilters(filters: Filter[]): SqlExpression {
+  return SqlExpression.and(...filterMap(filters, sqlQueryCustomTableFilter));
+}
+
 export function tableFiltersToString(tableFilters: Filter[]): string {
   return tableFilters
     .map(({ id, value }) => `${id}${value.replace(/[&%]/g, encodeURIComponent)}`)
@@ -161,9 +185,11 @@ export function tableFiltersToString(tableFilters: Filter[]): string {
 
 export function stringToTableFilters(str: string | undefined): Filter[] {
   if (!str) return [];
-  // '~' | '=' | '!=' | '<=' | '>=';
+  // '~' | '=' | '!=' | '<' | '<=' | '>' | '>=';
   return filterMap(str.split('&'), clause => {
-    const m = /^(\w+)((?:~|=|!=|<=|>=).*)$/.exec(clause.replace(/%2[56]/g, decodeURIComponent));
+    const m = /^(\w+)((?:~|=|!=|<(?!=)|<=|>(?!=)|>=).*)$/.exec(
+      clause.replace(/%2[56]/g, decodeURIComponent),
+    );
     if (!m) return;
     return { id: m[1], value: m[2] };
   });
diff --git a/web-console/src/utils/date-floor-shift-ceil/date-floor-shift-ceil-utc.spec.ts b/web-console/src/utils/date-floor-shift-ceil/date-floor-shift-ceil-utc.spec.ts
new file mode 100755
index 000000000000..5ba63b04468f
--- /dev/null
+++ b/web-console/src/utils/date-floor-shift-ceil/date-floor-shift-ceil-utc.spec.ts
@@ -0,0 +1,169 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { shifters } from './date-floor-shift-ceil';
+
+function pairwise<T>(array: T[], callback: (t1: T, t2: T) => void) {
+  for (let i = 0; i < array.length - 1; i++) {
+    callback(array[i], array[i + 1]);
+  }
+}
+
+describe('floor, shift, ceil (UTC)', () => {
+  const tz = 'Etc/UTC';
+
+  it('moves seconds', () => {
+    const dates: Date[] = [
+      new Date('2012-11-04T00:00:00Z'),
+      new Date('2012-11-04T00:00:03Z'),
+      new Date('2012-11-04T00:00:06Z'),
+      new Date('2012-11-04T00:00:09Z'),
+      new Date('2012-11-04T00:00:12Z'),
+    ];
+    pairwise(dates, (d1, d2) => expect(shifters.second.shift(d1, tz, 3)).toEqual(d2));
+  });
+
+  it('rounds minutes', () => {
+    expect(shifters.minute.round(new Date('2012-11-04T00:29:00Z'), 15, tz)).toEqual(
+      new Date('2012-11-04T00:15:00Z'),
+    );
+
+    expect(shifters.minute.round(new Date('2012-11-04T00:29:00Z'), 4, tz)).toEqual(
+      new Date('2012-11-04T00:28:00Z'),
+    );
+  });
+
+  it('moves minutes', () => {
+    const dates: Date[] = [
+      new Date('2012-11-04T00:00:00Z'),
+      new Date('2012-11-04T00:03:00Z'),
+      new Date('2012-11-04T00:06:00Z'),
+      new Date('2012-11-04T00:09:00Z'),
+      new Date('2012-11-04T00:12:00Z'),
+    ];
+    pairwise(dates, (d1, d2) => expect(shifters.minute.shift(d1, tz, 3)).toEqual(d2));
+  });
+
+  it('floors hour correctly', () => {
+    expect(shifters.hour.floor(new Date('2012-11-04T00:30:00Z'), tz)).toEqual(
+      new Date('2012-11-04T00:00:00Z'),
+    );
+
+    expect(shifters.hour.floor(new Date('2012-11-04T01:30:00Z'), tz)).toEqual(
+      new Date('2012-11-04T01:00:00Z'),
+    );
+
+    expect(shifters.hour.floor(new Date('2012-11-04T01:30:00Z'), tz)).toEqual(
+      new Date('2012-11-04T01:00:00Z'),
+    );
+
+    expect(shifters.hour.floor(new Date('2012-11-04T02:30:00Z'), tz)).toEqual(
+      new Date('2012-11-04T02:00:00Z'),
+    );
+
+    expect(shifters.hour.floor(new Date('2012-11-04T03:30:00Z'), tz)).toEqual(
+      new Date('2012-11-04T03:00:00Z'),
+    );
+  });
+
+  it('moves hour', () => {
+    const dates: Date[] = [
+      new Date('2012-11-04T00:00:00Z'),
+      new Date('2012-11-04T01:00:00Z'),
+      new Date('2012-11-04T02:00:00Z'),
+      new Date('2012-11-04T03:00:00Z'),
+    ];
+    pairwise(dates, (d1, d2) => expect(shifters.hour.shift(d1, tz, 1)).toEqual(d2));
+  });
+
+  it('moves day', () => {
+    const dates: Date[] = [
+      new Date('2012-11-03T00:00:00Z'),
+      new Date('2012-11-04T00:00:00Z'),
+      new Date('2012-11-05T00:00:00Z'),
+      new Date('2012-11-06T00:00:00Z'),
+    ];
+    pairwise(dates, (d1, d2) => expect(shifters.day.shift(d1, tz, 1)).toEqual(d2));
+  });
+
+  it('ceils day', () => {
+    let d1 = new Date('2014-12-11T22:11:57.469Z');
+    let d2 = new Date('2014-12-12T00:00:00.000Z');
+    expect(shifters.day.ceil(d1, tz)).toEqual(d2);
+
+    d1 = new Date('2014-12-08T00:00:00.000Z');
+    d2 = new Date('2014-12-08T00:00:00.000Z');
+    expect(shifters.day.ceil(d1, tz)).toEqual(d2);
+  });
+
+  it('moves week', () => {
+    const dates: Date[] = [
+      new Date('2012-10-29T00:00:00Z'),
+      new Date('2012-11-05T00:00:00Z'),
+      new Date('2012-11-12T00:00:00Z'),
+      new Date('2012-11-19T00:00:00Z'),
+    ];
+    pairwise(dates, (d1, d2) => expect(shifters.week.shift(d1, tz, 1)).toEqual(d2));
+  });
+
+  it('floors week correctly', () => {
+    let d1 = new Date('2014-12-11T22:11:57.469Z');
+    let d2 = new Date('2014-12-08T00:00:00.000Z');
+    expect(shifters.week.floor(d1, tz)).toEqual(d2);
+
+    d1 = new Date('2014-12-07T12:11:57.469Z');
+    d2 = new Date('2014-12-01T00:00:00.000Z');
+    expect(shifters.week.floor(d1, tz)).toEqual(d2);
+  });
+
+  it('ceils week correctly', () => {
+    let d1 = new Date('2014-12-11T22:11:57.469Z');
+    let d2 = new Date('2014-12-15T00:00:00.000Z');
+    expect(shifters.week.ceil(d1, tz)).toEqual(d2);
+
+    d1 = new Date('2014-12-07T12:11:57.469Z');
+    d2 = new Date('2014-12-08T00:00:00.000Z');
+    expect(shifters.week.ceil(d1, tz)).toEqual(d2);
+  });
+
+  it('moves month', () => {
+    const dates: Date[] = [
+      new Date('2012-11-01T00:00:00Z'),
+      new Date('2012-12-01T00:00:00Z'),
+      new Date('2013-01-01T00:00:00Z'),
+      new Date('2013-02-01T00:00:00Z'),
+    ];
+    pairwise(dates, (d1, d2) => expect(shifters.month.shift(d1, tz, 1)).toEqual(d2));
+  });
+
+  it('shifts month on the 31st', () => {
+    const d1 = new Date('2016-03-31T00:00:00.000Z');
+    const d2 = new Date('2016-05-01T00:00:00.000Z');
+    expect(shifters.month.shift(d1, tz, 1)).toEqual(d2);
+  });
+
+  it('moves year', () => {
+    const dates: Date[] = [
+      new Date('2010-01-01T00:00:00Z'),
+      new Date('2011-01-01T00:00:00Z'),
+      new Date('2012-01-01T00:00:00Z'),
+      new Date('2013-01-01T00:00:00Z'),
+    ];
+    pairwise(dates, (d1, d2) => expect(shifters.year.shift(d1, tz, 1)).toEqual(d2));
+  });
+});
diff --git a/web-console/src/utils/date-floor-shift-ceil/date-floor-shift-ceil.spec.ts b/web-console/src/utils/date-floor-shift-ceil/date-floor-shift-ceil.spec.ts
new file mode 100755
index 000000000000..1612c9ce5792
--- /dev/null
+++ b/web-console/src/utils/date-floor-shift-ceil/date-floor-shift-ceil.spec.ts
@@ -0,0 +1,181 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { shifters } from './date-floor-shift-ceil';
+
+function pairwise<T>(array: T[], callback: (t1: T, t2: T) => void) {
+  for (let i = 0; i < array.length - 1; i++) {
+    callback(array[i], array[i + 1]);
+  }
+}
+
+describe('floor/shift/ceil', () => {
+  const tz = 'America/Los_Angeles';
+
+  it('shifts seconds', () => {
+    const dates: Date[] = [
+      new Date('2012-11-04T00:00:00-07:00'),
+      new Date('2012-11-04T00:00:03-07:00'),
+      new Date('2012-11-04T00:00:06-07:00'),
+      new Date('2012-11-04T00:00:09-07:00'),
+      new Date('2012-11-04T00:00:12-07:00'),
+    ];
+    pairwise(dates, (d1, d2) => expect(shifters.second.shift(d1, tz, 3)).toEqual(d2));
+  });
+
+  it('shifts minutes', () => {
+    const dates: Date[] = [
+      new Date('2012-11-04T00:00:00-07:00'),
+      new Date('2012-11-04T00:03:00-07:00'),
+      new Date('2012-11-04T00:06:00-07:00'),
+      new Date('2012-11-04T00:09:00-07:00'),
+      new Date('2012-11-04T00:12:00-07:00'),
+    ];
+    pairwise(dates, (d1, d2) => expect(shifters.minute.shift(d1, tz, 3)).toEqual(d2));
+  });
+
+  it('floors hour correctly', () => {
+    expect(shifters.hour.floor(new Date('2012-11-04T00:30:00-07:00'), tz)).toEqual(
+      new Date('2012-11-04T00:00:00-07:00'),
+    );
+
+    expect(shifters.hour.floor(new Date('2012-11-04T01:30:00-07:00'), tz)).toEqual(
+      new Date('2012-11-04T01:00:00-07:00'),
+    );
+
+    expect(shifters.hour.floor(new Date('2012-11-04T01:30:00-08:00'), tz)).toEqual(
+      new Date('2012-11-04T01:00:00-07:00'),
+    );
+
+    expect(shifters.hour.floor(new Date('2012-11-04T02:30:00-08:00'), tz)).toEqual(
+      new Date('2012-11-04T02:00:00-08:00'),
+    );
+
+    expect(shifters.hour.floor(new Date('2012-11-04T03:30:00-08:00'), tz)).toEqual(
+      new Date('2012-11-04T03:00:00-08:00'),
+    );
+  });
+
+  it('shifting 24 hours over DST is not the same as shifting a day', () => {
+    const start = new Date('2012-11-04T07:00:00Z');
+
+    const shift1Day = shifters.day.shift(start, tz, 1);
+    const shift24Hours = shifters.hour.shift(start, tz, 24);
+
+    expect(shift1Day).toEqual(new Date('2012-11-05T08:00:00Z'));
+    expect(shift24Hours).toEqual(new Date('2012-11-05T07:00:00Z'));
+  });
+
+  it('shifts hour over DST 1', () => {
+    const dates: Date[] = [
+      new Date('2012-11-04T00:00:00-07:00'),
+      new Date('2012-11-04T08:00:00Z'),
+      new Date('2012-11-04T09:00:00Z'),
+      new Date('2012-11-04T10:00:00Z'),
+      new Date('2012-11-04T11:00:00Z'),
+    ];
+    pairwise(dates, (d1, d2) => expect(shifters.hour.shift(d1, tz, 1)).toEqual(d2));
+  });
+
+  it('floors hour over DST 1', () => {
+    expect(shifters.hour.floor(new Date('2012-11-04T00:05:00-07:00'), tz)).toEqual(
+      new Date('2012-11-04T00:00:00-07:00'),
+    );
+    expect(shifters.hour.floor(new Date('2012-11-04T01:05:00-07:00'), tz)).toEqual(
+      new Date('2012-11-04T01:00:00-07:00'),
+    );
+    expect(shifters.hour.floor(new Date('2012-11-04T02:05:00-07:00'), tz)).toEqual(
+      new Date('2012-11-04T01:00:00-07:00'),
+    );
+    expect(shifters.hour.floor(new Date('2012-11-04T03:05:00-07:00'), tz)).toEqual(
+      new Date('2012-11-04T03:00:00-07:00'),
+    );
+  });
+
+  it('shifts hour over DST 2', () => {
+    // "2018-03-11T09:00:00Z"
+    const dates: Date[] = [
+      new Date('2018-03-11T01:00:00-07:00'),
+      new Date('2018-03-11T09:00:00Z'),
+      new Date('2018-03-11T10:00:00Z'),
+      new Date('2018-03-11T11:00:00Z'),
+      new Date('2018-03-11T12:00:00Z'),
+    ];
+    pairwise(dates, (d1, d2) => expect(shifters.hour.shift(d1, tz, 1)).toEqual(d2));
+  });
+
+  it('shifts day over DST', () => {
+    const dates: Date[] = [
+      new Date('2012-11-03T00:00:00-07:00'),
+      new Date('2012-11-04T00:00:00-07:00'),
+      new Date('2012-11-05T00:00:00-08:00'),
+      new Date('2012-11-06T00:00:00-08:00'),
+    ];
+    pairwise(dates, (d1, d2) => expect(shifters.day.shift(d1, tz, 1)).toEqual(d2));
+  });
+
+  it('shifts week over DST', () => {
+    const dates: Date[] = [
+      new Date('2012-10-29T00:00:00-07:00'),
+      new Date('2012-11-05T00:00:00-08:00'),
+      new Date('2012-11-12T00:00:00-08:00'),
+      new Date('2012-11-19T00:00:00-08:00'),
+    ];
+    pairwise(dates, (d1, d2) => expect(shifters.week.shift(d1, tz, 1)).toEqual(d2));
+  });
+
+  it('floors week correctly', () => {
+    let d1 = new Date('2014-12-11T22:11:57.469Z');
+    let d2 = new Date('2014-12-08T08:00:00.000Z');
+    expect(shifters.week.floor(d1, tz)).toEqual(d2);
+
+    d1 = new Date('2014-12-07T12:11:57.469Z');
+    d2 = new Date('2014-12-01T08:00:00.000Z');
+    expect(shifters.week.floor(d1, tz)).toEqual(d2);
+  });
+
+  it('ceils week correctly', () => {
+    let d1 = new Date('2014-12-11T22:11:57.469Z');
+    let d2 = new Date('2014-12-15T08:00:00.000Z');
+    expect(shifters.week.ceil(d1, tz)).toEqual(d2);
+
+    d1 = new Date('2014-12-07T12:11:57.469Z');
+    d2 = new Date('2014-12-08T08:00:00.000Z');
+    expect(shifters.week.ceil(d1, tz)).toEqual(d2);
+  });
+
+  it('shifts month over DST', () => {
+    const dates: Date[] = [
+      new Date('2012-11-01T00:00:00-07:00'),
+      new Date('2012-12-01T00:00:00-08:00'),
+      new Date('2013-01-01T00:00:00-08:00'),
+      new Date('2013-02-01T00:00:00-08:00'),
+    ];
+    pairwise(dates, (d1, d2) => expect(shifters.month.shift(d1, tz, 1)).toEqual(d2));
+  });
+
+  it('shifts year', () => {
+    const dates: Date[] = [
+      new Date('2010-01-01T00:00:00-08:00'),
+      new Date('2011-01-01T00:00:00-08:00'),
+      new Date('2012-01-01T00:00:00-08:00'),
+      new Date('2013-01-01T00:00:00-08:00'),
+    ];
+    pairwise(dates, (d1, d2) => expect(shifters.year.shift(d1, tz, 1)).toEqual(d2));
+  });
+});
diff --git a/web-console/src/utils/date-floor-shift-ceil/date-floor-shift-ceil.ts b/web-console/src/utils/date-floor-shift-ceil/date-floor-shift-ceil.ts
new file mode 100755
index 000000000000..3306b05267d9
--- /dev/null
+++ b/web-console/src/utils/date-floor-shift-ceil/date-floor-shift-ceil.ts
@@ -0,0 +1,296 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { fromDate, startOfWeek } from '@internationalized/date';
+
+export type AlignFn = (dt: Date, tz: string) => Date;
+
+export type ShiftFn = (dt: Date, tz: string, step: number) => Date;
+
+export type RoundFn = (dt: Date, roundTo: number, tz: string) => Date;
+
+export interface TimeShifterNoCeil {
+  canonicalLength: number;
+  siblings?: number;
+  floor: AlignFn;
+  round: RoundFn;
+  shift: ShiftFn;
+}
+
+export interface TimeShifter extends TimeShifterNoCeil {
+  ceil: AlignFn;
+}
+
+function isUTC(tz: string): boolean {
+  return tz === 'Etc/UTC';
+}
+
+function adjustDay(day: number): number {
+  return (day + 6) % 7;
+}
+
+function floorTo(n: number, roundTo: number): number {
+  return Math.floor(n / roundTo) * roundTo;
+}
+
+function timeShifterFiller(tm: TimeShifterNoCeil): TimeShifter {
+  const { floor, shift } = tm;
+  return {
+    ...tm,
+    ceil: (dt: Date, tz: string) => {
+      const floored = floor(dt, tz);
+      if (floored.valueOf() === dt.valueOf()) return dt; // Just like ceil(3) is 3 and not 4
+      return shift(floored, tz, 1);
+    },
+  };
+}
+
+export const second = timeShifterFiller({
+  canonicalLength: 1000,
+  siblings: 60,
+  floor: (dt, _tz) => {
+    // Seconds do not actually need a timezone because all timezones align on seconds... for now...
+    dt = new Date(dt.valueOf());
+    dt.setUTCMilliseconds(0);
+    return dt;
+  },
+  round: (dt, roundTo, _tz) => {
+    const cur = dt.getUTCSeconds();
+    const adj = floorTo(cur, roundTo);
+    if (cur !== adj) dt.setUTCSeconds(adj);
+    return dt;
+  },
+  shift: (dt, _tz, step) => {
+    dt = new Date(dt.valueOf());
+    dt.setUTCSeconds(dt.getUTCSeconds() + step);
+    return dt;
+  },
+});
+
+export const minute = timeShifterFiller({
+  canonicalLength: 60000,
+  siblings: 60,
+  floor: (dt, _tz) => {
+    // Minutes do not actually need a timezone because all timezones align on minutes... for now...
+    dt = new Date(dt.valueOf());
+    dt.setUTCSeconds(0, 0);
+    return dt;
+  },
+  round: (dt, roundTo, _tz) => {
+    const cur = dt.getUTCMinutes();
+    const adj = floorTo(cur, roundTo);
+    if (cur !== adj) dt.setUTCMinutes(adj);
+    return dt;
+  },
+  shift: (dt, _tz, step) => {
+    dt = new Date(dt.valueOf());
+    dt.setUTCMinutes(dt.getUTCMinutes() + step);
+    return dt;
+  },
+});
+
+// Movement by hour is tz independent because in every timezone an hour is 60 min
+function hourMove(dt: Date, _tz: string, step: number) {
+  dt = new Date(dt.valueOf());
+  dt.setUTCHours(dt.getUTCHours() + step);
+  return dt;
+}
+
+export const hour = timeShifterFiller({
+  canonicalLength: 3600000,
+  siblings: 24,
+  floor: (dt, tz) => {
+    if (isUTC(tz)) {
+      dt = new Date(dt.valueOf());
+      dt.setUTCMinutes(0, 0, 0);
+      return dt;
+    } else {
+      return fromDate(dt, tz).set({ second: 0, minute: 0, millisecond: 0 }).toDate();
+    }
+  },
+  round: (dt, roundTo, tz) => {
+    if (isUTC(tz)) {
+      const cur = dt.getUTCHours();
+      const adj = floorTo(cur, roundTo);
+      if (cur !== adj) dt.setUTCHours(adj);
+    } else {
+      const cur = fromDate(dt, tz).hour;
+      const adj = floorTo(cur, roundTo);
+      if (cur !== adj) return hourMove(dt, tz, adj - cur);
+    }
+    return dt;
+  },
+  shift: hourMove,
+});
+
+export const day = timeShifterFiller({
+  canonicalLength: 24 * 3600000,
+  floor: (dt, tz) => {
+    if (isUTC(tz)) {
+      dt = new Date(dt.valueOf());
+      dt.setUTCHours(0, 0, 0, 0);
+      return dt;
+    } else {
+      return fromDate(dt, tz).set({ hour: 0, second: 0, minute: 0, millisecond: 0 }).toDate();
+    }
+  },
+  shift: (dt, tz, step) => {
+    if (isUTC(tz)) {
+      dt = new Date(dt.valueOf());
+      dt.setUTCDate(dt.getUTCDate() + step);
+      return dt;
+    } else {
+      return fromDate(dt, tz).add({ days: step }).toDate();
+    }
+  },
+  round: () => {
+    throw new Error('missing day round');
+  },
+});
+
+export const week = timeShifterFiller({
+  canonicalLength: 7 * 24 * 3600000,
+  floor: (dt, tz) => {
+    if (isUTC(tz)) {
+      dt = new Date(dt.valueOf());
+      dt.setUTCHours(0, 0, 0, 0);
+      dt.setUTCDate(dt.getUTCDate() - adjustDay(dt.getUTCDay()));
+    } else {
+      const zd = fromDate(dt, tz);
+      return startOfWeek(
+        zd.set({ hour: 0, second: 0, minute: 0, millisecond: 0 }),
+        'fr-FR', // We want the week to start on Monday
+      ).toDate();
+    }
+    return dt;
+  },
+  shift: (dt, tz, step) => {
+    if (isUTC(tz)) {
+      dt = new Date(dt.valueOf());
+      dt.setUTCDate(dt.getUTCDate() + step * 7);
+      return dt;
+    } else {
+      return fromDate(dt, tz).add({ weeks: step }).toDate();
+    }
+  },
+  round: () => {
+    throw new Error('missing week round');
+  },
+});
+
+function monthShift(dt: Date, tz: string, step: number) {
+  if (isUTC(tz)) {
+    dt = new Date(dt.valueOf());
+    dt.setUTCMonth(dt.getUTCMonth() + step);
+    return dt;
+  } else {
+    return fromDate(dt, tz).add({ months: step }).toDate();
+  }
+}
+
+export const month = timeShifterFiller({
+  canonicalLength: 30 * 24 * 3600000,
+  siblings: 12,
+  floor: (dt, tz) => {
+    if (isUTC(tz)) {
+      dt = new Date(dt.valueOf());
+      dt.setUTCHours(0, 0, 0, 0);
+      dt.setUTCDate(1);
+      return dt;
+    } else {
+      return fromDate(dt, tz)
+        .set({ day: 1, hour: 0, second: 0, minute: 0, millisecond: 0 })
+        .toDate();
+    }
+  },
+  round: (dt, roundTo, tz) => {
+    if (isUTC(tz)) {
+      const cur = dt.getUTCMonth();
+      const adj = floorTo(cur, roundTo);
+      if (cur !== adj) dt.setUTCMonth(adj);
+    } else {
+      const cur = fromDate(dt, tz).month - 1; // Needs to be zero indexed
+      const adj = floorTo(cur, roundTo);
+      if (cur !== adj) return monthShift(dt, tz, adj - cur);
+    }
+    return dt;
+  },
+  shift: monthShift,
+});
+
+function yearShift(dt: Date, tz: string, step: number) {
+  if (isUTC(tz)) {
+    dt = new Date(dt.valueOf());
+    dt.setUTCFullYear(dt.getUTCFullYear() + step);
+    return dt;
+  } else {
+    return fromDate(dt, tz).add({ years: step }).toDate();
+  }
+}
+
+export const year = timeShifterFiller({
+  canonicalLength: 365 * 24 * 3600000,
+  siblings: 1000,
+  floor: (dt, tz) => {
+    if (isUTC(tz)) {
+      dt = new Date(dt.valueOf());
+      dt.setUTCHours(0, 0, 0, 0);
+      dt.setUTCMonth(0, 1);
+      return dt;
+    } else {
+      return fromDate(dt, tz)
+        .set({ month: 1, day: 1, hour: 0, second: 0, minute: 0, millisecond: 0 })
+        .toDate();
+    }
+  },
+  round: (dt, roundTo, tz) => {
+    if (isUTC(tz)) {
+      const cur = dt.getUTCFullYear();
+      const adj = floorTo(cur, roundTo);
+      if (cur !== adj) dt.setUTCFullYear(adj);
+    } else {
+      const cur = fromDate(dt, tz).year;
+      const adj = floorTo(cur, roundTo);
+      if (cur !== adj) return yearShift(dt, tz, adj - cur);
+    }
+    return dt;
+  },
+  shift: yearShift,
+});
+
+export interface Shifters {
+  second: TimeShifter;
+  minute: TimeShifter;
+  hour: TimeShifter;
+  day: TimeShifter;
+  week: TimeShifter;
+  month: TimeShifter;
+  year: TimeShifter;
+
+  [key: string]: TimeShifter;
+}
+
+export const shifters: Shifters = {
+  second,
+  minute,
+  hour,
+  day,
+  week,
+  month,
+  year,
+};
diff --git a/web-console/src/utils/date.spec.ts b/web-console/src/utils/date.spec.ts
index 843c144244ef..b219ee17af06 100644
--- a/web-console/src/utils/date.spec.ts
+++ b/web-console/src/utils/date.spec.ts
@@ -17,7 +17,6 @@
  */
 
 import {
-  ceilToUtcDay,
   dateToIsoDateString,
   intervalToLocalDateRange,
   localDateRangeToInterval,
@@ -60,12 +59,4 @@ describe('date', () => {
       expect(localDateRangeToInterval(intervalToLocalDateRange(interval))).toEqual(interval);
     });
   });
-
-  describe('ceilToUtcDay', () => {
-    it('works', () => {
-      expect(ceilToUtcDay(new Date('2021-02-03T12:03:02.001Z'))).toEqual(
-        new Date('2021-02-04T00:00:00Z'),
-      );
-    });
-  });
 });
diff --git a/web-console/src/utils/date.ts b/web-console/src/utils/date.ts
index 1d5aa4f61e95..08f1d1df43ba 100644
--- a/web-console/src/utils/date.ts
+++ b/web-console/src/utils/date.ts
@@ -99,9 +99,10 @@ export function localDateRangeToInterval(localRange: DateRange): string {
   }`;
 }
 
-export function ceilToUtcDay(date: Date): Date {
-  date = new Date(date.valueOf());
-  date.setUTCHours(0, 0, 0, 0);
-  date.setUTCDate(date.getUTCDate() + 1);
-  return date;
+export function maxDate(a: Date, b: Date): Date {
+  return a > b ? a : b;
+}
+
+export function minDate(a: Date, b: Date): Date {
+  return a < b ? a : b;
 }
diff --git a/web-console/src/utils/download.ts b/web-console/src/utils/download.ts
index 4fb3342e523c..40b0d95e8b91 100644
--- a/web-console/src/utils/download.ts
+++ b/web-console/src/utils/download.ts
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-import type { QueryResult } from '@druid-toolkit/query';
+import type { QueryResult } from 'druid-query-toolkit';
 import FileSaver from 'file-saver';
 import * as JSONBig from 'json-bigint-native';
 
diff --git a/web-console/src/utils/druid-query.spec.ts b/web-console/src/utils/druid-query.spec.ts
index ee867ff47ea5..a940b8ac7bb6 100644
--- a/web-console/src/utils/druid-query.spec.ts
+++ b/web-console/src/utils/druid-query.spec.ts
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-import { sane } from '@druid-toolkit/query';
+import { sane } from 'druid-query-toolkit';
 
 import { DruidError, getDruidErrorMessage } from './druid-query';
 
diff --git a/web-console/src/utils/druid-query.ts b/web-console/src/utils/druid-query.ts
index 8102db89ca3a..ee1ba1ef4a8c 100644
--- a/web-console/src/utils/druid-query.ts
+++ b/web-console/src/utils/druid-query.ts
@@ -16,9 +16,9 @@
  * limitations under the License.
  */
 
-import { C } from '@druid-toolkit/query';
 import type { AxiosResponse, CancelToken } from 'axios';
 import axios from 'axios';
+import { C } from 'druid-query-toolkit';
 
 import { Api } from '../singletons';
 
@@ -358,6 +358,12 @@ export async function queryDruidSqlDart<T = any>(
   return sqlResultResp.data;
 }
 
+export async function getApiArray<T = any>(url: string, cancelToken?: CancelToken): Promise<T[]> {
+  const result = (await Api.instance.get(url, { cancelToken })).data;
+  if (!Array.isArray(result)) throw new Error('unexpected result');
+  return result;
+}
+
 export interface QueryExplanation {
   query: any;
   signature: { name: string; type: string }[];
diff --git a/web-console/src/utils/duration/duration.spec.ts b/web-console/src/utils/duration/duration.spec.ts
new file mode 100755
index 000000000000..8b20ac0a6b2a
--- /dev/null
+++ b/web-console/src/utils/duration/duration.spec.ts
@@ -0,0 +1,505 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { Duration } from './duration';
+
+describe('Duration', () => {
+  const TZ_LA = 'America/Los_Angeles';
+  const TZ_JUNEAU = 'America/Juneau';
+
+  describe('errors', () => {
+    it('throws error if invalid duration', () => {
+      expect(() => new Duration('')).toThrow("Can not parse duration ''");
+
+      expect(() => new Duration('P00')).toThrow("Can not parse duration 'P00'");
+
+      expect(() => new Duration('P')).toThrow('Duration can not be empty');
+
+      expect(() => new Duration('P0YT0H')).toThrow('Duration can not be empty');
+
+      expect(() => new Duration('P0W').shift(new Date(), TZ_LA)).toThrow(
+        'Duration can not have empty weeks',
+      );
+
+      expect(() => new Duration('P0Y0MT0H0M0S').shift(new Date(), TZ_LA)).toThrow(
+        'Duration can not be empty',
+      );
+    });
+
+    it('throws error if fromJS is not given a string', () => {
+      expect(() => new Duration(new Date() as any)).toThrow('Duration can not be empty');
+    });
+  });
+
+  describe('#toString', () => {
+    it('gives back the correct string', () => {
+      let durationStr: string;
+
+      durationStr = 'P3Y';
+      expect(new Duration(durationStr).toString()).toEqual(durationStr);
+
+      durationStr = 'P2W';
+      expect(new Duration(durationStr).toString()).toEqual(durationStr);
+
+      durationStr = 'PT5H';
+      expect(new Duration(durationStr).toString()).toEqual(durationStr);
+
+      durationStr = 'P3DT15H';
+      expect(new Duration(durationStr).toString()).toEqual(durationStr);
+    });
+
+    it('eliminates 0', () => {
+      expect(new Duration('P0DT15H').toString()).toEqual('PT15H');
+    });
+  });
+
+  describe('fromCanonicalLength', () => {
+    it('handles zero', () => {
+      expect(() => {
+        Duration.fromCanonicalLength(0);
+      }).toThrow('length must be positive');
+    });
+
+    it('works 1', () => {
+      expect(Duration.fromCanonicalLength(86400000).toString()).toEqual('P1D');
+    });
+
+    it('works 2', () => {
+      const len =
+        new Date('2018-03-01T00:00:00Z').valueOf() - new Date('2016-02-22T00:00:00Z').valueOf();
+      expect(Duration.fromCanonicalLength(len).toString()).toEqual('P2Y8D');
+    });
+
+    it('works 3', () => {
+      const len =
+        new Date('2018-09-15T00:00:00Z').valueOf() - new Date('2018-09-04T00:00:00Z').valueOf();
+      expect(Duration.fromCanonicalLength(len).toString()).toEqual('P11D');
+    });
+
+    it('works with months', () => {
+      expect(Duration.fromCanonicalLength(2592000000).toString()).toEqual('P1M');
+      expect(Duration.fromCanonicalLength(2678400000).toString()).toEqual('P1M1D');
+    });
+
+    it('works without months', () => {
+      expect(Duration.fromCanonicalLength(2592000000, true).toString()).toEqual('P30D');
+      expect(Duration.fromCanonicalLength(2678400000, true).toString()).toEqual('P31D');
+    });
+  });
+
+  describe('construct from span', () => {
+    it('parses days over DST', () => {
+      expect(
+        Duration.fromRange(
+          new Date('2012-10-29T00:00:00-07:00'),
+          new Date('2012-11-05T00:00:00-08:00'),
+          TZ_LA,
+        ).toString(),
+      ).toEqual('P7D');
+
+      expect(
+        Duration.fromRange(
+          new Date('2012-10-29T00:00:00-07:00'),
+          new Date('2012-11-12T00:00:00-08:00'),
+          TZ_LA,
+        ).toString(),
+      ).toEqual('P14D');
+    });
+
+    it('parses complex case', () => {
+      expect(
+        Duration.fromRange(
+          new Date('2012-10-29T00:00:00-07:00'),
+          new Date(new Date('2012-11-05T00:00:00-08:00').valueOf() - 1000),
+          TZ_LA,
+        ).toString(),
+      ).toEqual('P6DT24H59M59S');
+
+      expect(
+        Duration.fromRange(
+          new Date('2012-01-01T00:00:00-08:00'),
+          new Date('2013-03-04T04:05:06-08:00'),
+          TZ_LA,
+        ).toString(),
+      ).toEqual('P1Y2M3DT4H5M6S');
+    });
+  });
+
+  describe('#isFloorable', () => {
+    const floorable = 'P1Y P5Y P10Y P100Y P1M P2M P3M P4M P1D'.split(' ');
+    for (const v of floorable) {
+      it(`works on floorable ${v}`, () => {
+        expect(new Duration(v).isFloorable()).toEqual(true);
+      });
+    }
+
+    const unfloorable = 'P1Y1M P5M P2D P3D'.split(' ');
+    for (const v of unfloorable) {
+      it(`works on not floorable ${v}`, () => {
+        expect(new Duration(v).isFloorable()).toEqual(false);
+      });
+    }
+  });
+
+  describe('#floor', () => {
+    it('throws error if complex duration', () => {
+      expect(() => new Duration('P1Y2D').floor(new Date(), TZ_LA)).toThrow(
+        'Can not floor on a complex duration',
+      );
+
+      expect(() => new Duration('P3DT15H').floor(new Date(), TZ_LA)).toThrow(
+        'Can not floor on a complex duration',
+      );
+
+      expect(() => new Duration('PT5H').floor(new Date(), TZ_LA)).toThrow(
+        'Can not floor on a hour duration that does not divide into 24',
+      );
+    });
+
+    it('works for year', () => {
+      const p1y = new Duration('P1Y');
+      expect(p1y.floor(new Date('2013-09-29T01:02:03.456-07:00'), TZ_LA)).toEqual(
+        new Date('2013-01-01T00:00:00.000-08:00'),
+      );
+    });
+
+    it('works for PT2M', () => {
+      const pt2h = new Duration('PT2M');
+      expect(pt2h.floor(new Date('2013-09-29T03:03:03.456-07:00'), TZ_LA)).toEqual(
+        new Date('2013-09-29T03:02:00.000-07:00'),
+      );
+    });
+
+    it('works for P2H', () => {
+      const pt2h = new Duration('PT2H');
+      expect(pt2h.floor(new Date('2013-09-29T03:02:03.456-07:00'), TZ_LA)).toEqual(
+        new Date('2013-09-29T02:00:00.000-07:00'),
+      );
+    });
+
+    it('works for PT12H', () => {
+      const pt12h = new Duration('PT12H');
+      expect(pt12h.floor(new Date('2015-09-12T13:05:00-08:00'), TZ_JUNEAU)).toEqual(
+        new Date('2015-09-12T12:00:00-08:00'),
+      );
+    });
+
+    it('works for P1W', () => {
+      const p1w = new Duration('P1W');
+
+      expect(p1w.floor(new Date('2013-09-29T01:02:03.456-07:00'), TZ_LA)).toEqual(
+        new Date('2013-09-23T07:00:00.000Z'),
+      );
+
+      expect(p1w.floor(new Date('2013-10-03T01:02:03.456-07:00'), TZ_LA)).toEqual(
+        new Date('2013-09-30T00:00:00.000-07:00'),
+      );
+    });
+
+    it('works for P3M', () => {
+      const p3m = new Duration('P3M');
+      expect(p3m.floor(new Date('2013-09-29T03:02:03.456-07:00'), TZ_LA)).toEqual(
+        new Date('2013-07-01T00:00:00.000-07:00'),
+      );
+
+      expect(p3m.floor(new Date('2013-02-29T03:02:03.456-07:00'), TZ_LA)).toEqual(
+        new Date('2013-01-01T00:00:00.000-08:00'),
+      );
+    });
+
+    it('works for P4Y', () => {
+      const p4y = new Duration('P4Y');
+      expect(p4y.floor(new Date('2013-09-29T03:02:03.456-07:00'), TZ_LA)).toEqual(
+        new Date('2012-01-01T00:00:00.000-08:00'),
+      );
+    });
+  });
+
+  describe('#shift', () => {
+    it('works for weeks', () => {
+      let p1w = new Duration('P1W');
+      expect(p1w.shift(new Date('2012-10-29T00:00:00-07:00'), TZ_LA)).toEqual(
+        new Date('2012-11-05T00:00:00-08:00'),
+      );
+
+      p1w = new Duration('P1W');
+      expect(p1w.shift(new Date('2012-10-29T00:00:00-07:00'), TZ_LA, 2)).toEqual(
+        new Date('2012-11-12T00:00:00-08:00'),
+      );
+
+      const p2w = new Duration('P2W');
+      expect(p2w.shift(new Date('2012-10-29T05:16:17-07:00'), TZ_LA)).toEqual(
+        new Date('2012-11-12T05:16:17-08:00'),
+      );
+    });
+
+    it('works for general complex case', () => {
+      const pComplex = new Duration('P1Y2M3DT4H5M6S');
+      expect(pComplex.shift(new Date('2012-01-01T00:00:00-08:00'), TZ_LA)).toEqual(
+        new Date('2013-03-04T04:05:06-08:00'),
+      );
+    });
+  });
+
+  describe('#materialize', () => {
+    it('works for weeks', () => {
+      const p1w = new Duration('P1W');
+
+      expect(
+        p1w.materialize(
+          new Date('2012-10-29T00:00:00-07:00'),
+          new Date('2012-12-01T00:00:00-08:00'),
+          TZ_LA,
+        ),
+      ).toEqual([
+        new Date('2012-10-29T07:00:00.000Z'),
+        new Date('2012-11-05T08:00:00.000Z'),
+        new Date('2012-11-12T08:00:00.000Z'),
+        new Date('2012-11-19T08:00:00.000Z'),
+        new Date('2012-11-26T08:00:00.000Z'),
+      ]);
+
+      expect(
+        p1w.materialize(
+          new Date('2012-10-29T00:00:00-07:00'),
+          new Date('2012-12-01T00:00:00-08:00'),
+          TZ_LA,
+          2,
+        ),
+      ).toEqual([
+        new Date('2012-10-29T07:00:00.000Z'),
+        new Date('2012-11-12T08:00:00.000Z'),
+        new Date('2012-11-26T08:00:00.000Z'),
+      ]);
+    });
+  });
+
+  describe('#isAligned', () => {
+    it('works for weeks', () => {
+      const p1w = new Duration('P1W');
+      expect(p1w.isAligned(new Date('2012-10-29T00:00:00-07:00'), TZ_LA)).toEqual(true);
+      expect(p1w.isAligned(new Date('2012-10-29T00:00:00-07:00'), 'Etc/UTC')).toEqual(false);
+    });
+  });
+
+  describe('#dividesBy', () => {
+    const divisible = 'P5Y/P1Y P1D/P1D P1M/P1D P1W/P1D P1D/PT6H PT3H/PT1H'.split(' ');
+    for (const v of divisible) {
+      it(`works for ${v} (true)`, () => {
+        const p = v.split('/');
+        expect(new Duration(p[0]).dividesBy(new Duration(p[1]))).toEqual(true);
+      });
+    }
+
+    const undivisible = 'P1D/P1M PT5H/PT1H'.split(' ');
+    for (const v of undivisible) {
+      it(`works for ${v} (false)`, () => {
+        const p = v.split('/');
+        expect(new Duration(p[0]).dividesBy(new Duration(p[1]))).toEqual(false);
+      });
+    }
+  });
+
+  describe('#getCanonicalLength', () => {
+    it('gives back the correct canonical length', () => {
+      let durationStr: string;
+
+      durationStr = 'P3Y';
+      expect(new Duration(durationStr).getCanonicalLength()).toEqual(94608000000);
+
+      durationStr = 'P2W';
+      expect(new Duration(durationStr).getCanonicalLength()).toEqual(1209600000);
+
+      durationStr = 'PT5H';
+      expect(new Duration(durationStr).getCanonicalLength()).toEqual(18000000);
+
+      durationStr = 'P3DT15H';
+      expect(new Duration(durationStr).getCanonicalLength()).toEqual(313200000);
+    });
+  });
+
+  describe('#add()', () => {
+    it('works with a simple duration', () => {
+      const d1 = new Duration('P1D');
+      const d2 = new Duration('P1D');
+
+      expect(d1.add(d2).toString()).toEqual('P2D');
+    });
+
+    it('works with heterogeneous spans', () => {
+      const d1 = new Duration('P1D');
+      const d2 = new Duration('P1Y');
+
+      expect(d1.add(d2).toString()).toEqual('P1Y1D');
+    });
+
+    it('works with weeks', () => {
+      let d1 = new Duration('P1W');
+      let d2 = new Duration('P2W');
+      expect(d1.add(d2).toString()).toEqual('P3W');
+
+      d1 = new Duration('P6D');
+      d2 = new Duration('P1D');
+      expect(d1.add(d2).toString()).toEqual('P1W');
+    });
+  });
+
+  describe('#subtract()', () => {
+    it('works with a simple duration', () => {
+      const d1 = new Duration('P1DT2H');
+      const d2 = new Duration('PT1H');
+
+      expect(d1.subtract(d2).toString()).toEqual('P1DT1H');
+    });
+
+    it('works with a less simple duration', () => {
+      const d1 = new Duration('P1D');
+      const d2 = new Duration('PT1H');
+
+      expect(d1.subtract(d2).toString()).toEqual('PT23H');
+    });
+
+    it('works with weeks', () => {
+      const d1 = new Duration('P1W');
+      const d2 = new Duration('P1D');
+
+      expect(d1.subtract(d2).toString()).toEqual('P6D');
+    });
+
+    it('throws an error if result is going to be negative', () => {
+      const d1 = new Duration('P1D');
+      const d2 = new Duration('P2D');
+
+      expect(() => d1.subtract(d2)).toThrow();
+    });
+  });
+
+  describe('#multiply()', () => {
+    it('works with a simple duration', () => {
+      const d = new Duration('P1D');
+      expect(d.multiply(5).toString()).toEqual('P5D');
+    });
+
+    it('works with a less simple duration', () => {
+      const d = new Duration('P1DT2H');
+      expect(d.multiply(2).toString()).toEqual('P2DT4H');
+    });
+
+    it('works with weeks', () => {
+      const d = new Duration('P1W');
+      expect(d.multiply(5).toString()).toEqual('P5W');
+    });
+
+    it('throws an error if result is going to be negative', () => {
+      const d = new Duration('P1D');
+      expect(() => d.multiply(-1)).toThrow('Multiplier must be positive non-zero');
+    });
+
+    it('gets description properly', () => {
+      const d = new Duration('P2D');
+      expect(d.multiply(2).getDescription(true)).toEqual('4 Days');
+    });
+  });
+
+  describe('#getDescription()', () => {
+    it('gives back the correct description', () => {
+      let durationStr: string;
+
+      durationStr = 'P1D';
+      expect(new Duration(durationStr).getDescription()).toEqual('day');
+
+      durationStr = 'P1DT2H';
+      expect(new Duration(durationStr).getDescription()).toEqual('1 day, 2 hours');
+
+      durationStr = 'P3Y';
+      expect(new Duration(durationStr).getDescription()).toEqual('3 years');
+
+      durationStr = 'P2W';
+      expect(new Duration(durationStr).getDescription()).toEqual('2 weeks');
+
+      durationStr = 'PT5H';
+      expect(new Duration(durationStr).getDescription()).toEqual('5 hours');
+
+      durationStr = 'P3DT15H';
+      expect(new Duration(durationStr).getDescription()).toEqual('3 days, 15 hours');
+
+      durationStr = 'P3DT15H';
+      expect(new Duration(durationStr).getDescription(true)).toEqual('3 Days, 15 Hours');
+    });
+  });
+
+  describe('#getSingleSpan()', () => {
+    it('gives back the correct span', () => {
+      let durationStr: string;
+
+      durationStr = 'P1D';
+      expect(new Duration(durationStr).getSingleSpan()).toEqual('day');
+
+      durationStr = 'P3Y';
+      expect(new Duration(durationStr).getSingleSpan()).toEqual('year');
+
+      durationStr = 'P2W';
+      expect(new Duration(durationStr).getSingleSpan()).toEqual('week');
+
+      durationStr = 'PT5H';
+      expect(new Duration(durationStr).getSingleSpan()).toEqual('hour');
+
+      durationStr = 'P3DT15H';
+      expect(new Duration(durationStr).getSingleSpan()).toBeUndefined();
+
+      durationStr = 'P3DT15H';
+      expect(new Duration(durationStr).getSingleSpan()).toBeUndefined();
+    });
+  });
+
+  describe('#getSingleSpanValue()', () => {
+    it('gives back the correct span value', () => {
+      let durationStr: string;
+
+      durationStr = 'P1D';
+      expect(new Duration(durationStr).getSingleSpanValue()).toEqual(1);
+
+      durationStr = 'P3Y';
+      expect(new Duration(durationStr).getSingleSpanValue()).toEqual(3);
+
+      durationStr = 'P2W';
+      expect(new Duration(durationStr).getSingleSpanValue()).toEqual(2);
+
+      durationStr = 'PT5H';
+      expect(new Duration(durationStr).getSingleSpanValue()).toEqual(5);
+
+      durationStr = 'P3DT15H';
+      expect(new Duration(durationStr).getSingleSpanValue()).toBeUndefined();
+
+      durationStr = 'P3DT15H';
+      expect(new Duration(durationStr).getSingleSpanValue()).toBeUndefined();
+    });
+  });
+
+  describe('#limitToDays', () => {
+    it('works', () => {
+      expect(new Duration('P6D').limitToDays().toString()).toEqual('P6D');
+
+      expect(new Duration('P1M').limitToDays().toString()).toEqual('P30D');
+
+      expect(new Duration('P1Y').limitToDays().toString()).toEqual('P365D');
+
+      expect(new Duration('P1Y2M').limitToDays().toString()).toEqual('P425D');
+    });
+  });
+});
diff --git a/web-console/src/utils/duration/duration.ts b/web-console/src/utils/duration/duration.ts
new file mode 100755
index 000000000000..bc7236821f12
--- /dev/null
+++ b/web-console/src/utils/duration/duration.ts
@@ -0,0 +1,388 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { second, shifters } from '../date-floor-shift-ceil/date-floor-shift-ceil';
+import { capitalizeFirst, pluralIfNeeded } from '../general';
+
+export const TZ_UTC = 'Etc/UTC';
+
+export type DurationSpan = 'year' | 'month' | 'week' | 'day' | 'hour' | 'minute' | 'second';
+
+const SPANS_WITH_WEEK: DurationSpan[] = [
+  'year',
+  'month',
+  'week',
+  'day',
+  'hour',
+  'minute',
+  'second',
+];
+const SPANS_WITHOUT_WEEK: DurationSpan[] = ['year', 'month', 'day', 'hour', 'minute', 'second'];
+const SPANS_WITHOUT_WEEK_OR_MONTH: DurationSpan[] = ['year', 'day', 'hour', 'minute', 'second'];
+const SPANS_UP_TO_DAY: DurationSpan[] = ['day', 'hour', 'minute', 'second'];
+
+export type DurationValue = Partial<Record<DurationSpan, number>>;
+
+const periodWeekRegExp = /^P(\d+)W$/;
+const periodRegExp = /^P(?:(\d+)Y)?(?:(\d+)M)?(?:(\d+)D)?(?:T(?:(\d+)H)?(?:(\d+)M)?(?:(\d+)S)?)?$/;
+//                     P   (year ) (month   ) (day     )    T(hour    ) (minute  ) (second  )
+
+function getSpansFromString(durationStr: string): DurationValue {
+  const spans: DurationValue = {};
+  let matches: RegExpExecArray | null;
+  if ((matches = periodWeekRegExp.exec(durationStr))) {
+    spans.week = Number(matches[1]);
+    if (!spans.week) throw new Error('Duration can not have empty weeks');
+  } else if ((matches = periodRegExp.exec(durationStr))) {
+    const nums = matches.map(Number);
+    for (let i = 0; i < SPANS_WITHOUT_WEEK.length; i++) {
+      const span = SPANS_WITHOUT_WEEK[i];
+      const value = nums[i + 1];
+      if (value) spans[span] = value;
+    }
+  } else {
+    throw new Error("Can not parse duration '" + durationStr + "'");
+  }
+  return spans;
+}
+
+function getSpansFromStartEnd(start: Date, end: Date, timezone: string): DurationValue {
+  start = second.floor(start, timezone);
+  end = second.floor(end, timezone);
+  if (end <= start) throw new Error('start must come before end');
+
+  const spans: DurationValue = {};
+  let iterator: Date = start;
+  for (let i = 0; i < SPANS_WITHOUT_WEEK.length; i++) {
+    const span = SPANS_WITHOUT_WEEK[i];
+    let spanCount = 0;
+
+    // Shortcut
+    const length = end.valueOf() - iterator.valueOf();
+    const canonicalLength: number = shifters[span].canonicalLength;
+    if (length < canonicalLength / 4) continue;
+    const numberToFit = Math.min(0, Math.floor(length / canonicalLength) - 1);
+    let iteratorMove: Date;
+    if (numberToFit > 0) {
+      // try to skip by numberToFit
+      iteratorMove = shifters[span].shift(iterator, timezone, numberToFit);
+      if (iteratorMove <= end) {
+        spanCount += numberToFit;
+        iterator = iteratorMove;
+      }
+    }
+
+    while (true) {
+      iteratorMove = shifters[span].shift(iterator, timezone, 1);
+      if (iteratorMove <= end) {
+        iterator = iteratorMove;
+        spanCount++;
+      } else {
+        break;
+      }
+    }
+
+    if (spanCount) {
+      spans[span] = spanCount;
+    }
+  }
+  return spans;
+}
+
+function removeZeros(spans: DurationValue): DurationValue {
+  const newSpans: DurationValue = {};
+  for (let i = 0; i < SPANS_WITH_WEEK.length; i++) {
+    const span = SPANS_WITH_WEEK[i];
+    if (Number(spans[span]) > 0) {
+      newSpans[span] = spans[span];
+    }
+  }
+  return newSpans;
+}
+
+function fitIntoSpans(length: number, spansToCheck: DurationSpan[]): DurationValue {
+  const spans: DurationValue = {};
+
+  let lengthLeft = length;
+  for (let i = 0; i < spansToCheck.length; i++) {
+    const span = spansToCheck[i];
+    const spanLength = shifters[span].canonicalLength;
+    const count = Math.floor(lengthLeft / spanLength);
+
+    if (count) {
+      lengthLeft -= spanLength * count;
+      spans[span] = count;
+    }
+  }
+
+  return spans;
+}
+
+/**
+ * Represents an ISO duration like P1DT3H
+ */
+export class Duration {
+  public readonly singleSpan?: DurationSpan;
+  public readonly spans: Readonly<DurationValue>;
+
+  static fromCanonicalLength(length: number, skipMonths = false): Duration {
+    if (length <= 0) throw new Error('length must be positive');
+    let spans = fitIntoSpans(length, skipMonths ? SPANS_WITHOUT_WEEK_OR_MONTH : SPANS_WITHOUT_WEEK);
+
+    if (
+      length % shifters['week'].canonicalLength === 0 && // Weeks fits
+      (Object.keys(spans).length > 1 || // We already have a more complex span
+        spans['day']) // or... we only have days and it might be simpler to express as weeks
+    ) {
+      spans = { week: length / shifters['week'].canonicalLength };
+    }
+
+    return new Duration(spans);
+  }
+
+  static fromCanonicalLengthUpToDays(length: number): Duration {
+    if (length <= 0) throw new Error('length must be positive');
+    return new Duration(fitIntoSpans(length, SPANS_UP_TO_DAY));
+  }
+
+  static fromRange(start: Date, end: Date, timezone: string): Duration {
+    return new Duration(getSpansFromStartEnd(start, end, timezone));
+  }
+
+  static pickSmallestGranularityThatFits(
+    granularities: Duration[],
+    span: number,
+    maxEntities: number,
+  ): Duration {
+    for (const granularity of granularities) {
+      if (span / granularity.getCanonicalLength() < maxEntities) return granularity;
+    }
+    return granularities[granularities.length - 1];
+  }
+
+  constructor(spans: DurationValue | string) {
+    const effectiveSpans: DurationValue =
+      typeof spans === 'string' ? getSpansFromString(spans) : removeZeros(spans);
+
+    const usedSpans = Object.keys(effectiveSpans) as DurationSpan[];
+    if (!usedSpans.length) throw new Error('Duration can not be empty');
+    if (usedSpans.length === 1) {
+      this.singleSpan = usedSpans[0];
+    } else if (effectiveSpans.week) {
+      throw new Error("Can not mix 'week' and other spans");
+    }
+    this.spans = effectiveSpans;
+  }
+
+  public toString() {
+    const strArr: string[] = ['P'];
+    const spans = this.spans;
+    if (spans.week) {
+      strArr.push(String(spans.week), 'W');
+    } else {
+      let addedT = false;
+      for (let i = 0; i < SPANS_WITHOUT_WEEK.length; i++) {
+        const span = SPANS_WITHOUT_WEEK[i];
+        const value = spans[span];
+        if (!value) continue;
+        if (!addedT && i >= 3) {
+          strArr.push('T');
+          addedT = true;
+        }
+        strArr.push(String(value), span[0].toUpperCase());
+      }
+    }
+    return strArr.join('');
+  }
+
+  public add(duration: Duration): Duration {
+    return Duration.fromCanonicalLength(this.getCanonicalLength() + duration.getCanonicalLength());
+  }
+
+  public subtract(duration: Duration): Duration {
+    const newCanonicalDuration = this.getCanonicalLength() - duration.getCanonicalLength();
+    if (newCanonicalDuration < 0) throw new Error('A duration can not be negative.');
+    return Duration.fromCanonicalLength(newCanonicalDuration);
+  }
+
+  public multiply(multiplier: number): Duration {
+    if (multiplier <= 0) throw new Error('Multiplier must be positive non-zero');
+    if (multiplier === 1) return this;
+    const newCanonicalDuration = this.getCanonicalLength() * multiplier;
+    return Duration.fromCanonicalLength(newCanonicalDuration);
+  }
+
+  public valueOf() {
+    return this.spans;
+  }
+
+  public equals(other: Duration | undefined): boolean {
+    return other instanceof Duration && this.toString() === other.toString();
+  }
+
+  public isSimple(): boolean {
+    const { singleSpan } = this;
+    if (!singleSpan) return false;
+    return this.spans[singleSpan] === 1;
+  }
+
+  public isFloorable(): boolean {
+    const { singleSpan } = this;
+    if (!singleSpan) return false;
+    const span = Number(this.spans[singleSpan]);
+    if (span === 1) return true;
+    const { siblings } = shifters[singleSpan];
+    if (!siblings) return false;
+    return siblings % span === 0;
+  }
+
+  /**
+   * Floors the date according to this duration.
+   * @param date The date to floor
+   * @param timezone The timezone within which to floor
+   */
+  public floor(date: Date, timezone: string): Date {
+    const { singleSpan } = this;
+    if (!singleSpan) throw new Error('Can not floor on a complex duration');
+    const span = this.spans[singleSpan]!;
+    const mover = shifters[singleSpan];
+    let dt = mover.floor(date, timezone);
+    if (span !== 1) {
+      if (!mover.siblings) {
+        throw new Error(`Can not floor on a ${singleSpan} duration that is not 1`);
+      }
+      if (mover.siblings % span !== 0) {
+        throw new Error(
+          `Can not floor on a ${singleSpan} duration that does not divide into ${mover.siblings}`,
+        );
+      }
+      dt = mover.round(dt, span, timezone);
+    }
+    return dt;
+  }
+
+  /**
+   * Moves the given date by 'step' times of the duration
+   * Negative step value will move back in time.
+   * @param date The date to move
+   * @param timezone The timezone within which to make the move
+   * @param step The number of times to step by the duration
+   */
+  public shift(date: Date, timezone: string, step = 1): Date {
+    const spans = this.spans;
+    for (const span of SPANS_WITH_WEEK) {
+      const value = spans[span];
+      if (value) date = shifters[span].shift(date, timezone, step * value);
+    }
+    return date;
+  }
+
+  public ceil(date: Date, timezone: string): Date {
+    const floored = this.floor(date, timezone);
+    if (floored.valueOf() === date.valueOf()) return date; // Just like ceil(3) is 3 and not 4
+    return this.shift(floored, timezone, 1);
+  }
+
+  public round(date: Date, timezone: string): Date {
+    const floorDate = this.floor(date, timezone);
+    const ceilDate = this.ceil(date, timezone);
+    const distanceToFloor = Math.abs(date.valueOf() - floorDate.valueOf());
+    const distanceToCeil = Math.abs(date.valueOf() - ceilDate.valueOf());
+    return distanceToFloor < distanceToCeil ? floorDate : ceilDate;
+  }
+
+  /**
+   * Materializes all the values of this duration form start to end
+   * @param start The date to start on
+   * @param end The date to start on
+   * @param timezone The timezone within which to materialize
+   * @param step The number of times to step by the duration
+   */
+  public materialize(start: Date, end: Date, timezone: string, step = 1): Date[] {
+    const values: Date[] = [];
+    let iter = this.floor(start, timezone);
+    while (iter <= end) {
+      values.push(iter);
+      iter = this.shift(iter, timezone, step);
+    }
+    return values;
+  }
+
+  /**
+   * Checks to see if date is aligned to this duration within the timezone (floors to itself)
+   * @param date The date to check
+   * @param timezone The timezone within which to make the check
+   */
+  public isAligned(date: Date, timezone: string): boolean {
+    return this.floor(date, timezone).valueOf() === date.valueOf();
+  }
+
+  /**
+   * Check to see if this duration can be divided by the given duration
+   * @param smaller The smaller duration to divide by
+   */
+  public dividesBy(smaller: Duration): boolean {
+    const myCanonicalLength = this.getCanonicalLength();
+    const smallerCanonicalLength = smaller.getCanonicalLength();
+    return (
+      myCanonicalLength % smallerCanonicalLength === 0 &&
+      this.isFloorable() &&
+      smaller.isFloorable()
+    );
+  }
+
+  public getCanonicalLength(): number {
+    const spans = this.spans;
+    let length = 0;
+    for (const span of SPANS_WITH_WEEK) {
+      const value = spans[span];
+      if (value) length += value * shifters[span].canonicalLength;
+    }
+    return length;
+  }
+
+  public getDescription(capitalize?: boolean): string {
+    const spans = this.spans;
+    const description: string[] = [];
+    for (const span of SPANS_WITH_WEEK) {
+      const value = spans[span];
+      const spanTitle = capitalize ? capitalizeFirst(span) : span;
+      if (value) {
+        if (value === 1 && this.singleSpan) {
+          description.push(spanTitle);
+        } else {
+          description.push(pluralIfNeeded(value, spanTitle));
+        }
+      }
+    }
+    return description.join(', ');
+  }
+
+  public getSingleSpan(): string | undefined {
+    return this.singleSpan;
+  }
+
+  public getSingleSpanValue(): number | undefined {
+    if (!this.singleSpan) return;
+    return this.spans[this.singleSpan];
+  }
+
+  public limitToDays(): Duration {
+    return Duration.fromCanonicalLengthUpToDays(this.getCanonicalLength());
+  }
+}
diff --git a/web-console/src/utils/general.spec.ts b/web-console/src/utils/general.spec.ts
index 4b97cb19acb0..39deab9420aa 100644
--- a/web-console/src/utils/general.spec.ts
+++ b/web-console/src/utils/general.spec.ts
@@ -29,8 +29,8 @@ import {
   hashJoaat,
   moveElement,
   moveToIndex,
-  objectHash,
   offsetToRowColumn,
+  OVERLAY_OPEN_SELECTOR,
   parseCsvLine,
   swapElements,
 } from './general';
@@ -178,12 +178,6 @@ describe('general', () => {
     });
   });
 
-  describe('objectHash', () => {
-    it('works', () => {
-      expect(objectHash({ hello: 'world1' })).toEqual('cc14ad13');
-    });
-  });
-
   describe('offsetToRowColumn', () => {
     it('works', () => {
       const str = 'Hello\nThis is a test\nstring.';
@@ -217,4 +211,10 @@ describe('general', () => {
       expect(caseInsensitiveEquals(undefined, '')).toEqual(false);
     });
   });
+
+  describe('OVERLAY_OPEN_SELECTOR', () => {
+    it('is what it is', () => {
+      expect(OVERLAY_OPEN_SELECTOR).toEqual('.bp5-portal .bp5-overlay-open');
+    });
+  });
 });
diff --git a/web-console/src/utils/general.tsx b/web-console/src/utils/general.tsx
index b742013b2e83..d128d47f3462 100644
--- a/web-console/src/utils/general.tsx
+++ b/web-console/src/utils/general.tsx
@@ -59,6 +59,10 @@ export function isSimpleArray(a: any): a is (string | number | boolean)[] {
   );
 }
 
+export function arraysEqualByElement<T>(xs: T[], ys: T[]): boolean {
+  return xs.length === ys.length && xs.every((x, i) => x === ys[i]);
+}
+
 export function wait(ms: number): Promise<void> {
   return new Promise(resolve => {
     setTimeout(resolve, ms);
@@ -251,6 +255,14 @@ export function uniq(array: readonly string[]): string[] {
   });
 }
 
+export function allSameValue<T>(xs: readonly T[]): T | undefined {
+  const sameValue: T | undefined = xs[0];
+  for (let i = 1; i < xs.length; i++) {
+    if (sameValue !== xs[i]) return;
+  }
+  return sameValue;
+}
+
 // ----------------------------
 
 export function formatEmpty(str: string): string {
@@ -373,6 +385,14 @@ export function formatDurationHybrid(ms: NumberLike): string {
   }
 }
 
+export function timezoneOffsetInMinutesToString(offsetInMinutes: number, padHour: boolean): string {
+  const sign = offsetInMinutes < 0 ? '-' : '+';
+  const absOffset = Math.abs(offsetInMinutes);
+  const h = Math.floor(absOffset / 60);
+  const m = absOffset % 60;
+  return `${sign}${padHour ? pad2(h) : h}:${pad2(m)}`;
+}
+
 function pluralize(word: string): string {
   // Ignoring irregular plurals.
   if (/(s|x|z|ch|sh)$/.test(word)) {
@@ -612,12 +632,10 @@ export function hashJoaat(str: string): number {
   return (hash & 4294967295) >>> 0;
 }
 
-export function objectHash(obj: any): string {
-  return hashJoaat(JSONBig.stringify(obj)).toString(16).padStart(8);
-}
+export const OVERLAY_OPEN_SELECTOR = `.${Classes.PORTAL} .${Classes.OVERLAY_OPEN}`;
 
-export function hasPopoverOpen(): boolean {
-  return Boolean(document.querySelector(`${Classes.PORTAL} ${Classes.OVERLAY} ${Classes.POPOVER}`));
+export function hasOverlayOpen(): boolean {
+  return Boolean(document.querySelector(OVERLAY_OPEN_SELECTOR));
 }
 
 export function checkedCircleIcon(checked: boolean): IconName {
diff --git a/web-console/src/utils/index.tsx b/web-console/src/utils/index.tsx
index edea5ad0a520..096f0dfe0634 100644
--- a/web-console/src/utils/index.tsx
+++ b/web-console/src/utils/index.tsx
@@ -19,10 +19,12 @@
 export * from './base64-url';
 export * from './column-metadata';
 export * from './date';
+export * from './date-floor-shift-ceil/date-floor-shift-ceil';
 export * from './download';
 export * from './download-query-detail-archive';
 export * from './druid-lookup';
 export * from './druid-query';
+export * from './duration/duration';
 export * from './formatter';
 export * from './general';
 export * from './local-storage-backed-visibility';
diff --git a/web-console/src/utils/query-action.ts b/web-console/src/utils/query-action.ts
index 45ade6961388..3f17f22b67d2 100644
--- a/web-console/src/utils/query-action.ts
+++ b/web-console/src/utils/query-action.ts
@@ -16,6 +16,6 @@
  * limitations under the License.
  */
 
-import type { SqlQuery } from '@druid-toolkit/query';
+import type { SqlQuery } from 'druid-query-toolkit';
 
 export type QueryAction = (query: SqlQuery) => SqlQuery;
diff --git a/web-console/src/utils/query-manager/query-manager.ts b/web-console/src/utils/query-manager/query-manager.ts
index 5b141c7c89db..1023b23412ad 100644
--- a/web-console/src/utils/query-manager/query-manager.ts
+++ b/web-console/src/utils/query-manager/query-manager.ts
@@ -288,7 +288,7 @@ export class QueryManager<Q, R, I = never, E extends Error = Error> {
     return this.lastQuery;
   }
 
-  public getLastIntermediateQuery(): any {
+  public getLastIntermediateQuery(): unknown {
     return this.lastIntermediateQuery;
   }
 
diff --git a/web-console/src/utils/sampler.ts b/web-console/src/utils/sampler.ts
index 7fd3d67364cc..5333013c12b4 100644
--- a/web-console/src/utils/sampler.ts
+++ b/web-console/src/utils/sampler.ts
@@ -16,8 +16,8 @@
  * limitations under the License.
  */
 
-import { dedupe, F, SqlExpression, SqlFunction } from '@druid-toolkit/query';
 import type { CancelToken } from 'axios';
+import { dedupe, F, SqlExpression, SqlFunction } from 'druid-query-toolkit';
 import * as JSONBig from 'json-bigint-native';
 
 import type {
diff --git a/web-console/src/utils/sql.spec.ts b/web-console/src/utils/sql.spec.ts
index 9e5533ee4e62..57e7bce95fe8 100644
--- a/web-console/src/utils/sql.spec.ts
+++ b/web-console/src/utils/sql.spec.ts
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-import { sane } from '@druid-toolkit/query';
+import { sane } from 'druid-query-toolkit';
 
 import { findAllSqlQueriesInText, findSqlQueryPrefix } from './sql';
 
diff --git a/web-console/src/utils/sql.ts b/web-console/src/utils/sql.ts
index 1cdf243819d2..6c168002078a 100644
--- a/web-console/src/utils/sql.ts
+++ b/web-console/src/utils/sql.ts
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-import type { SqlBase } from '@druid-toolkit/query';
+import type { SqlBase } from 'druid-query-toolkit';
 import {
   SqlColumn,
   SqlExpression,
@@ -24,7 +24,7 @@ import {
   SqlLiteral,
   SqlQuery,
   SqlStar,
-} from '@druid-toolkit/query';
+} from 'druid-query-toolkit';
 
 import type { RowColumn } from './general';
 import { offsetToRowColumn } from './general';
diff --git a/web-console/src/views/explore-view/models/stage.ts b/web-console/src/utils/stage.ts
similarity index 80%
rename from web-console/src/views/explore-view/models/stage.ts
rename to web-console/src/utils/stage.ts
index a1d01258f0a2..7b65cfebd9cb 100644
--- a/web-console/src/views/explore-view/models/stage.ts
+++ b/web-console/src/utils/stage.ts
@@ -16,6 +16,13 @@
  * limitations under the License.
  */
 
+export interface Margin {
+  top: number;
+  right: number;
+  bottom: number;
+  left: number;
+}
+
 export class Stage {
   public readonly width: number;
   public readonly height: number;
@@ -28,4 +35,11 @@ export class Stage {
   public equals(other: Stage | undefined): boolean {
     return Boolean(other && this.width === other.width && this.height === other.height);
   }
+
+  public applyMargin(margin: Margin): Stage {
+    return new Stage(
+      this.width - margin.left - margin.right,
+      this.height - margin.top - margin.bottom,
+    );
+  }
 }
diff --git a/web-console/src/utils/table-helpers.ts b/web-console/src/utils/table-helpers.ts
index 45e8758bf6f8..a4ba4fce7ddf 100644
--- a/web-console/src/utils/table-helpers.ts
+++ b/web-console/src/utils/table-helpers.ts
@@ -16,9 +16,10 @@
  * limitations under the License.
  */
 
-import type { QueryResult, SqlExpression } from '@druid-toolkit/query';
-import { C } from '@druid-toolkit/query';
-import type { Filter } from 'react-table';
+import { ascending, descending, sort } from 'd3-array';
+import type { QueryResult, SqlExpression } from 'druid-query-toolkit';
+import { C } from 'druid-query-toolkit';
+import type { Filter, SortingRule } from 'react-table';
 
 import { filterMap, formatNumber, isNumberLike, oneOf } from './general';
 import { deepSet } from './object-change';
@@ -67,19 +68,24 @@ export function getNumericColumnBraces(
   return numericColumnBraces;
 }
 
-export interface Sorted {
-  id: string;
-  desc: boolean;
-}
-
 export interface TableState {
   page: number;
   pageSize: number;
   filtered: Filter[];
-  sorted: Sorted[];
+  sorted: SortingRule[];
 }
 
-export function sortedToOrderByClause(sorted: Sorted[]): string | undefined {
+export function sortedToOrderByClause(sorted: SortingRule[]): string | undefined {
   if (!sorted.length) return;
   return 'ORDER BY ' + sorted.map(sort => `${C(sort.id)} ${sort.desc ? 'DESC' : 'ASC'}`).join(', ');
 }
+
+export function applySorting(xs: any[], sorted: SortingRule[]): any[] {
+  const firstSortingRule = sorted[0];
+  if (!firstSortingRule) return xs;
+  const { id, desc } = firstSortingRule;
+  return sort(
+    xs,
+    desc ? (d1, d2) => descending(d1[id], d2[id]) : (d1, d2) => ascending(d1[id], d2[id]),
+  );
+}
diff --git a/web-console/src/utils/types.ts b/web-console/src/utils/types.ts
index 7f48655cb1c4..a3e38a2c8218 100644
--- a/web-console/src/utils/types.ts
+++ b/web-console/src/utils/types.ts
@@ -18,7 +18,7 @@
 
 import type { IconName } from '@blueprintjs/core';
 import { IconNames } from '@blueprintjs/icons';
-import type { Column } from '@druid-toolkit/query';
+import type { Column } from 'druid-query-toolkit';
 
 export function columnToSummary(column: Column): string {
   const lines: string[] = [column.name];
diff --git a/web-console/src/utils/values-query.spec.tsx b/web-console/src/utils/values-query.spec.tsx
index 7bc093bc3e82..89f4a4d2f14f 100644
--- a/web-console/src/utils/values-query.spec.tsx
+++ b/web-console/src/utils/values-query.spec.tsx
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-import { QueryResult, sane } from '@druid-toolkit/query';
+import { QueryResult, sane } from 'druid-query-toolkit';
 
 import { queryResultToValuesQuery } from './values-query';
 
diff --git a/web-console/src/utils/values-query.tsx b/web-console/src/utils/values-query.tsx
index 1b5e62b44c23..69130d380e75 100644
--- a/web-console/src/utils/values-query.tsx
+++ b/web-console/src/utils/values-query.tsx
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-import type { Column, QueryResult, SqlExpression } from '@druid-toolkit/query';
+import type { Column, QueryResult, SqlExpression } from 'druid-query-toolkit';
 import {
   C,
   F,
@@ -28,7 +28,7 @@ import {
   SqlRecord,
   SqlType,
   SqlValues,
-} from '@druid-toolkit/query';
+} from 'druid-query-toolkit';
 import * as JSONBig from 'json-bigint-native';
 
 import { oneOf } from './general';
diff --git a/web-console/src/views/datasources-view/__snapshots__/datasources-view.spec.tsx.snap b/web-console/src/views/datasources-view/__snapshots__/datasources-view.spec.tsx.snap
index 6da41f6eb763..5f471fa1e390 100644
--- a/web-console/src/views/datasources-view/__snapshots__/datasources-view.spec.tsx.snap
+++ b/web-console/src/views/datasources-view/__snapshots__/datasources-view.spec.tsx.snap
@@ -109,6 +109,7 @@ exports[`DatasourcesView matches snapshot 1`] = `
     />
   </Memo(ViewControlBar)>
   <SplitterLayout
+    className="timeline-datasources-splitter"
     percentage={true}
     primaryIndex={1}
     primaryMinSize={20}
diff --git a/web-console/src/views/datasources-view/datasources-view.scss b/web-console/src/views/datasources-view/datasources-view.scss
index b0abe78ec56a..91a95bc32a0f 100644
--- a/web-console/src/views/datasources-view/datasources-view.scss
+++ b/web-console/src/views/datasources-view/datasources-view.scss
@@ -23,7 +23,7 @@
   width: 100%;
   overflow: auto;
 
-  .splitter-layout {
+  .splitter-layout.timeline-datasources-splitter {
     position: absolute;
     top: $view-control-bar-height + $standard-padding;
     bottom: 0;
@@ -45,6 +45,13 @@
   .ReactTable {
     @include pin-full;
 
+    .datasource-color-tab {
+      display: inline-block;
+      width: 10px;
+      height: 20px;
+      border-radius: 3px;
+    }
+
     .clickable-cell {
       cursor: pointer;
     }
diff --git a/web-console/src/views/datasources-view/datasources-view.tsx b/web-console/src/views/datasources-view/datasources-view.tsx
index 3fb6a5be40d8..f4f652befed6 100644
--- a/web-console/src/views/datasources-view/datasources-view.tsx
+++ b/web-console/src/views/datasources-view/datasources-view.tsx
@@ -16,10 +16,10 @@
  * limitations under the License.
  */
 
-import { FormGroup, InputGroup, Intent, MenuItem, Switch, Tag } from '@blueprintjs/core';
+import { Button, FormGroup, InputGroup, Intent, MenuItem, Switch, Tag } from '@blueprintjs/core';
 import { IconNames } from '@blueprintjs/icons';
-import { SqlQuery, T } from '@druid-toolkit/query';
 import { sum } from 'd3-array';
+import { SqlQuery, T } from 'druid-query-toolkit';
 import React from 'react';
 import type { Filter } from 'react-table';
 import ReactTable from 'react-table';
@@ -51,8 +51,16 @@ import type {
   CompactionInfo,
   CompactionStatus,
   QueryWithContext,
+  Rule,
+} from '../../druid-models';
+import {
+  END_OF_TIME_DATE,
+  formatCompactionInfo,
+  getDatasourceColor,
+  RuleUtil,
+  START_OF_TIME_DATE,
+  zeroCompactionStatus,
 } from '../../druid-models';
-import { formatCompactionInfo, zeroCompactionStatus } from '../../druid-models';
 import type { Capabilities, CapabilitiesMode } from '../../helpers';
 import { STANDARD_TABLE_PAGE_SIZE, STANDARD_TABLE_PAGE_SIZE_OPTIONS } from '../../react-table';
 import { Api, AppToaster } from '../../singletons';
@@ -66,9 +74,10 @@ import {
   formatInteger,
   formatMillions,
   formatPercent,
+  getApiArray,
   getDruidErrorMessage,
   groupByAsMap,
-  hasPopoverOpen,
+  hasOverlayOpen,
   isNumberLikeNaN,
   LocalStorageBackedVisibility,
   LocalStorageKeys,
@@ -82,8 +91,6 @@ import {
   twoLines,
 } from '../../utils';
 import type { BasicAction } from '../../utils/basic-action';
-import type { Rule } from '../../utils/load-rule';
-import { RuleUtil } from '../../utils/load-rule';
 
 import './datasources-view.scss';
 
@@ -131,8 +138,6 @@ const TABLE_COLUMNS_BY_MODE: Record<CapabilitiesMode, TableColumnSelectorColumn[
   ],
 };
 
-const DEFAULT_RULES_KEY = '_default';
-
 function formatLoadDrop(segmentsToLoad: NumberLike, segmentsToDrop: NumberLike): string {
   const loadDrop: string[] = [];
   if (segmentsToLoad) {
@@ -240,6 +245,7 @@ interface DatasourcesAndDefaultRules {
 interface RetentionDialogOpenOn {
   readonly datasource: string;
   readonly rules: Rule[];
+  readonly defaultRules: Rule[];
 }
 
 interface CompactionConfigDialogOpenOn {
@@ -299,7 +305,12 @@ export interface DatasourcesViewProps {
   onFiltersChange(filters: Filter[]): void;
   goToQuery(queryWithContext: QueryWithContext): void;
   goToTasks(datasource?: string): void;
-  goToSegments(datasource: string, onlyUnavailable?: boolean): void;
+  goToSegments(options: {
+    start?: Date;
+    end?: Date;
+    datasource?: string;
+    realtime?: boolean;
+  }): void;
   capabilities: Capabilities;
 }
 
@@ -317,7 +328,7 @@ export interface DatasourcesViewState {
   useUnuseInterval: string;
   showForceCompact: boolean;
   visibleColumns: LocalStorageBackedVisibility;
-  showSegmentTimeline: boolean;
+  showSegmentTimeline?: { capabilities: Capabilities; datasource?: string };
 
   datasourceTableActionDialogId?: string;
   actions: BasicAction[];
@@ -362,7 +373,7 @@ export class DatasourcesView extends React.PureComponent<
           `COUNT(*) FILTER (WHERE is_active = 1 AND "start" LIKE '%T00:00:00.000Z' AND "end" LIKE '%T00:00:00.000Z') AS day_aligned_segments`,
           `COUNT(*) FILTER (WHERE is_active = 1 AND "start" LIKE '%-01T00:00:00.000Z' AND "end" LIKE '%-01T00:00:00.000Z') AS month_aligned_segments`,
           `COUNT(*) FILTER (WHERE is_active = 1 AND "start" LIKE '%-01-01T00:00:00.000Z' AND "end" LIKE '%-01-01T00:00:00.000Z') AS year_aligned_segments`,
-          `COUNT(*) FILTER (WHERE is_active = 1 AND "start" = '-146136543-09-08T08:23:32.096Z' AND "end" = '146140482-04-24T15:36:27.903Z') AS all_granularity_segments`,
+          `COUNT(*) FILTER (WHERE is_active = 1 AND "start" = '${START_OF_TIME_DATE}' AND "end" = '${END_OF_TIME_DATE}') AS all_granularity_segments`,
         ],
         visibleColumns.shown('Total rows') &&
           `SUM("num_rows") FILTER (WHERE is_active = 1) AS total_rows`,
@@ -418,7 +429,6 @@ GROUP BY 1, 2`;
         LocalStorageKeys.DATASOURCE_TABLE_COLUMN_SELECTION,
         ['Segment size', 'Segment granularity'],
       ),
-      showSegmentTimeline: false,
 
       actions: [],
     };
@@ -435,15 +445,15 @@ GROUP BY 1, 2`;
           setIntermediateQuery(query);
           datasources = await queryDruidSql({ query }, cancelToken);
         } else if (capabilities.hasCoordinatorAccess()) {
-          const datasourcesResp = await Api.instance.get(
+          const datasourcesResp = await getApiArray(
             '/druid/coordinator/v1/datasources?simple',
-            { cancelToken },
+            cancelToken,
           );
           const loadstatusResp = await Api.instance.get('/druid/coordinator/v1/loadstatus?simple', {
             cancelToken,
           });
           const loadstatus = loadstatusResp.data;
-          datasources = datasourcesResp.data.map((d: any): DatasourceQueryResultRow => {
+          datasources = datasourcesResp.map((d: any): DatasourceQueryResultRow => {
             const totalDataSize = deepGet(d, 'properties.segments.size') || -1;
             const segmentsToLoad = Number(loadstatus[d.name] || 0);
             const availableSegments = Number(deepGet(d, 'properties.segments.count'));
@@ -521,9 +531,10 @@ GROUP BY 1, 2`;
           if (capabilities.hasOverlordAccess()) {
             auxiliaryQueries.push(async (datasourcesAndDefaultRules, cancelToken) => {
               try {
-                const taskList = (
-                  await Api.instance.get(`/druid/indexer/v1/tasks?state=running`, { cancelToken })
-                ).data;
+                const taskList = await getApiArray(
+                  `/druid/indexer/v1/tasks?state=running`,
+                  cancelToken,
+                );
 
                 const runningTasksByDatasource = groupByAsMap(
                   taskList,
@@ -562,10 +573,10 @@ GROUP BY 1, 2`;
           if (showUnused) {
             try {
               unused = (
-                await Api.instance.get<string[]>(
+                await getApiArray<string>(
                   '/druid/coordinator/v1/metadata/datasources?includeUnused',
                 )
-              ).data.filter(d => !seen[d]);
+              ).filter(d => !seen[d]);
             } catch {
               AppToaster.show({
                 icon: IconNames.ERROR,
@@ -578,7 +589,7 @@ GROUP BY 1, 2`;
           // Rules
           auxiliaryQueries.push(async (datasourcesAndDefaultRules, cancelToken) => {
             try {
-              const rules: Record<string, Rule[]> = (
+              const rules = (
                 await Api.instance.get<Record<string, Rule[]>>('/druid/coordinator/v1/rules', {
                   cancelToken,
                 })
@@ -589,7 +600,7 @@ GROUP BY 1, 2`;
                   ...ds,
                   rules: rules[ds.datasource] || [],
                 })),
-                defaultRules: rules[DEFAULT_RULES_KEY],
+                defaultRules: rules[RuleUtil.DEFAULT_RULES_KEY],
               };
             } catch {
               AppToaster.show({
@@ -657,8 +668,19 @@ GROUP BY 1, 2`;
   }
 
   private readonly refresh = (auto: boolean): void => {
-    if (auto && hasPopoverOpen()) return;
+    if (auto && hasOverlayOpen()) return;
     this.datasourceQueryManager.rerunLastQuery(auto);
+
+    const { showSegmentTimeline } = this.state;
+    if (showSegmentTimeline) {
+      // Create a new capabilities object to force the segment timeline to re-render
+      this.setState(({ showSegmentTimeline }) => ({
+        showSegmentTimeline: {
+          ...showSegmentTimeline,
+          capabilities: this.props.capabilities.clone(),
+        },
+      }));
+    }
   };
 
   private fetchDatasourceData() {
@@ -846,9 +868,9 @@ GROUP BY 1, 2`;
           <MenuItem
             icon={IconNames.APPLICATION}
             text="View SQL query for table"
-            disabled={!lastDatasourcesQuery}
+            disabled={typeof lastDatasourcesQuery !== 'string'}
             onClick={() => {
-              if (!lastDatasourcesQuery) return;
+              if (typeof lastDatasourcesQuery !== 'string') return;
               goToQuery({ queryString: lastDatasourcesQuery });
             }}
           />
@@ -921,6 +943,7 @@ GROUP BY 1, 2`;
           retentionDialogOpenOn: {
             datasource: '_default',
             rules: defaultRules,
+            defaultRules,
           },
         };
       });
@@ -1030,10 +1053,13 @@ GROUP BY 1, 2`;
             icon: IconNames.AUTOMATIC_UPDATES,
             title: 'Edit retention rules',
             onAction: () => {
+              const defaultRules = this.state.datasourcesAndDefaultRulesState.data?.defaultRules;
+              if (!defaultRules) return;
               this.setState({
                 retentionDialogOpenOn: {
                   datasource,
                   rules: rules || [],
+                  defaultRules,
                 },
               });
             },
@@ -1097,9 +1123,8 @@ GROUP BY 1, 2`;
 
   private renderRetentionDialog() {
     const { capabilities } = this.props;
-    const { retentionDialogOpenOn, datasourcesAndDefaultRulesState } = this.state;
-    const defaultRules = datasourcesAndDefaultRulesState.data?.defaultRules;
-    if (!retentionDialogOpenOn || !defaultRules) return;
+    const { retentionDialogOpenOn } = this.state;
+    if (!retentionDialogOpenOn) return;
 
     return (
       <RetentionDialog
@@ -1107,7 +1132,7 @@ GROUP BY 1, 2`;
         rules={retentionDialogOpenOn.rules}
         capabilities={capabilities}
         onEditDefaults={this.editDefaultRules}
-        defaultRules={defaultRules}
+        defaultRules={retentionDialogOpenOn.defaultRules}
         onCancel={() => this.setState({ retentionDialogOpenOn: undefined })}
         onSave={this.saveRules}
       />
@@ -1139,8 +1164,9 @@ GROUP BY 1, 2`;
   }
 
   private renderDatasourcesTable() {
-    const { goToSegments, goToTasks, capabilities, filters, onFiltersChange } = this.props;
-    const { datasourcesAndDefaultRulesState, showUnused, visibleColumns } = this.state;
+    const { goToTasks, capabilities, filters, onFiltersChange } = this.props;
+    const { datasourcesAndDefaultRulesState, showUnused, visibleColumns, showSegmentTimeline } =
+      this.state;
 
     let { datasources, defaultRules } = datasourcesAndDefaultRulesState.data || { datasources: [] };
 
@@ -1194,12 +1220,19 @@ GROUP BY 1, 2`;
             show: visibleColumns.shown('Datasource name'),
             accessor: 'datasource',
             width: 150,
-            Cell: row => (
+            Cell: ({ value, original }) => (
               <TableClickableCell
-                onClick={() => this.onDetail(row.original)}
+                onClick={() => this.onDetail(original)}
                 hoverIcon={IconNames.SEARCH_TEMPLATE}
+                tooltip="Show detail"
               >
-                {row.value}
+                {showSegmentTimeline ? (
+                  <>
+                    <span style={{ color: getDatasourceColor(value) }}>&#9632;</span> {value}
+                  </>
+                ) : (
+                  value
+                )}
               </TableClickableCell>
             ),
           },
@@ -1225,7 +1258,12 @@ GROUP BY 1, 2`;
               const hasZeroReplicationRule = RuleUtil.hasZeroReplicaRule(rules, defaultRules);
               const descriptor = hasZeroReplicationRule ? 'pre-cached' : 'available';
               const segmentsEl = (
-                <a onClick={() => goToSegments(datasource)}>
+                <a
+                  onClick={() =>
+                    this.setState({ showSegmentTimeline: { capabilities, datasource } })
+                  }
+                  data-tooltip="Show in segment timeline"
+                >
                   {pluralIfNeeded(num_segments, 'segment')}
                 </a>
               );
@@ -1318,7 +1356,7 @@ GROUP BY 1, 2`;
                 <TableClickableCell
                   onClick={() => goToTasks(original.datasource)}
                   hoverIcon={IconNames.ARROW_TOP_RIGHT}
-                  title="Go to tasks"
+                  tooltip="Go to tasks"
                 >
                   {formatRunningTasks(runningTasks)}
                 </TableClickableCell>
@@ -1498,6 +1536,7 @@ GROUP BY 1, 2`;
               if (!compaction) return;
               return (
                 <TableClickableCell
+                  tooltip="Open compaction configuration"
                   disabled={!compaction}
                   onClick={() => {
                     if (!compaction) return;
@@ -1614,6 +1653,7 @@ GROUP BY 1, 2`;
 
               return (
                 <TableClickableCell
+                  tooltip="Open retention (load rule) configuration"
                   disabled={!defaultRules}
                   onClick={() => {
                     if (!defaultRules) return;
@@ -1621,6 +1661,7 @@ GROUP BY 1, 2`;
                       retentionDialogOpenOn: {
                         datasource,
                         rules,
+                        defaultRules,
                       },
                     });
                   }}
@@ -1668,7 +1709,7 @@ GROUP BY 1, 2`;
   }
 
   render() {
-    const { capabilities } = this.props;
+    const { capabilities, goToSegments } = this.props;
     const {
       showUnused,
       visibleColumns,
@@ -1681,9 +1722,7 @@ GROUP BY 1, 2`;
       <div className="datasources-view app-view">
         <ViewControlBar label="Datasources">
           <RefreshButton
-            onRefresh={auto => {
-              this.refresh(auto);
-            }}
+            onRefresh={this.refresh}
             localStorageKey={LocalStorageKeys.DATASOURCES_REFRESH_RATE}
           />
           {this.renderBulkDatasourceActions()}
@@ -1694,9 +1733,13 @@ GROUP BY 1, 2`;
             disabled={!capabilities.hasCoordinatorAccess()}
           />
           <Switch
-            checked={showSegmentTimeline}
+            checked={Boolean(showSegmentTimeline)}
             label="Show segment timeline"
-            onChange={() => this.setState({ showSegmentTimeline: !showSegmentTimeline })}
+            onChange={() =>
+              this.setState({
+                showSegmentTimeline: showSegmentTimeline ? undefined : { capabilities },
+              })
+            }
             disabled={!capabilities.hasSqlOrCoordinatorAccess()}
           />
           <TableColumnSelector
@@ -1714,6 +1757,7 @@ GROUP BY 1, 2`;
           />
         </ViewControlBar>
         <SplitterLayout
+          className="timeline-datasources-splitter"
           vertical
           percentage
           secondaryInitialSize={35}
@@ -1721,7 +1765,22 @@ GROUP BY 1, 2`;
           primaryMinSize={20}
           secondaryMinSize={10}
         >
-          {showSegmentTimeline && <SegmentTimeline capabilities={capabilities} />}
+          {showSegmentTimeline && (
+            <SegmentTimeline
+              capabilities={showSegmentTimeline.capabilities}
+              datasource={showSegmentTimeline.datasource}
+              getIntervalActionButton={(start, end, datasource, realtime) => {
+                return (
+                  <Button
+                    text="Open in segments view"
+                    small
+                    rightIcon={IconNames.ARROW_TOP_RIGHT}
+                    onClick={() => goToSegments({ start, end, datasource, realtime })}
+                  />
+                );
+              }}
+            />
+          )}
           {this.renderDatasourcesTable()}
         </SplitterLayout>
         {datasourceTableActionDialogId && (
diff --git a/web-console/src/views/explore-view/components/column-picker-menu/column-picker-menu.tsx b/web-console/src/views/explore-view/components/column-picker-menu/column-picker-menu.tsx
index 1d227e864bc8..7634cbae4ccd 100644
--- a/web-console/src/views/explore-view/components/column-picker-menu/column-picker-menu.tsx
+++ b/web-console/src/views/explore-view/components/column-picker-menu/column-picker-menu.tsx
@@ -19,8 +19,8 @@
 import type { IconName } from '@blueprintjs/core';
 import { Icon, InputGroup, Menu, MenuItem } from '@blueprintjs/core';
 import { IconNames } from '@blueprintjs/icons';
-import type { Column } from '@druid-toolkit/query';
 import classNames from 'classnames';
+import type { Column } from 'druid-query-toolkit';
 import { useState } from 'react';
 
 import { caseInsensitiveContains, columnToIcon, filterMap } from '../../../../utils';
diff --git a/web-console/src/views/explore-view/components/column-picker/column-picker.tsx b/web-console/src/views/explore-view/components/column-picker/column-picker.tsx
index 81c88fbf9b78..c61927d5b478 100644
--- a/web-console/src/views/explore-view/components/column-picker/column-picker.tsx
+++ b/web-console/src/views/explore-view/components/column-picker/column-picker.tsx
@@ -18,7 +18,7 @@
 
 import { Button, Menu, MenuItem, Popover, Position } from '@blueprintjs/core';
 import { IconNames } from '@blueprintjs/icons';
-import type { Column } from '@druid-toolkit/query';
+import type { Column } from 'druid-query-toolkit';
 import React, { useState } from 'react';
 
 import { columnToIcon } from '../../../../utils';
diff --git a/web-console/src/views/explore-view/components/control-pane/control-pane.tsx b/web-console/src/views/explore-view/components/control-pane/control-pane.tsx
index 5e7d5c0ec000..d93aefb634ab 100644
--- a/web-console/src/views/explore-view/components/control-pane/control-pane.tsx
+++ b/web-console/src/views/explore-view/components/control-pane/control-pane.tsx
@@ -27,8 +27,8 @@ import {
   Tag,
 } from '@blueprintjs/core';
 import { IconNames } from '@blueprintjs/icons';
-import type { Column, SqlExpression } from '@druid-toolkit/query';
-import { SqlColumn } from '@druid-toolkit/query';
+import type { Column, SqlExpression } from 'druid-query-toolkit';
+import { SqlColumn } from 'druid-query-toolkit';
 import type { JSX } from 'react';
 
 import {
diff --git a/web-console/src/views/explore-view/components/control-pane/expression-menu.tsx b/web-console/src/views/explore-view/components/control-pane/expression-menu.tsx
index 8742cbd46689..5c6639929ca3 100644
--- a/web-console/src/views/explore-view/components/control-pane/expression-menu.tsx
+++ b/web-console/src/views/explore-view/components/control-pane/expression-menu.tsx
@@ -29,8 +29,8 @@ import {
   Position,
 } from '@blueprintjs/core';
 import { IconNames } from '@blueprintjs/icons';
-import type { Column } from '@druid-toolkit/query';
-import { SqlColumn, SqlExpression } from '@druid-toolkit/query';
+import type { Column } from 'druid-query-toolkit';
+import { SqlColumn, SqlExpression } from 'druid-query-toolkit';
 import { useState } from 'react';
 
 import { AppToaster } from '../../../../singletons';
diff --git a/web-console/src/views/explore-view/components/control-pane/measure-menu.tsx b/web-console/src/views/explore-view/components/control-pane/measure-menu.tsx
index 4d841f352f5b..18c8a61e7bb9 100644
--- a/web-console/src/views/explore-view/components/control-pane/measure-menu.tsx
+++ b/web-console/src/views/explore-view/components/control-pane/measure-menu.tsx
@@ -30,8 +30,8 @@ import {
   Position,
 } from '@blueprintjs/core';
 import { IconNames } from '@blueprintjs/icons';
-import type { Column } from '@druid-toolkit/query';
-import { SqlAlias, SqlExpression } from '@druid-toolkit/query';
+import type { Column } from 'druid-query-toolkit';
+import { SqlAlias, SqlExpression } from 'druid-query-toolkit';
 import { useState } from 'react';
 
 import { AppToaster } from '../../../../singletons';
diff --git a/web-console/src/views/explore-view/components/droppable-container/droppable-container.tsx b/web-console/src/views/explore-view/components/droppable-container/droppable-container.tsx
index eceb4e750ddf..36c9ff979efe 100644
--- a/web-console/src/views/explore-view/components/droppable-container/droppable-container.tsx
+++ b/web-console/src/views/explore-view/components/droppable-container/droppable-container.tsx
@@ -16,8 +16,8 @@
  * limitations under the License.
  */
 
-import type { Column } from '@druid-toolkit/query';
 import classNames from 'classnames';
+import type { Column } from 'druid-query-toolkit';
 import type React from 'react';
 import { forwardRef, useState } from 'react';
 
diff --git a/web-console/src/views/explore-view/components/filter-pane/filter-menu/contains-filter-control/contains-filter-control.tsx b/web-console/src/views/explore-view/components/filter-pane/filter-menu/contains-filter-control/contains-filter-control.tsx
index d2a9bcdd93eb..fdf28d34b8d6 100644
--- a/web-console/src/views/explore-view/components/filter-pane/filter-menu/contains-filter-control/contains-filter-control.tsx
+++ b/web-console/src/views/explore-view/components/filter-pane/filter-menu/contains-filter-control/contains-filter-control.tsx
@@ -18,8 +18,8 @@
 
 import { FormGroup, InputGroup, Menu, MenuItem } from '@blueprintjs/core';
 import { IconNames } from '@blueprintjs/icons';
-import type { ContainsFilterPattern, QueryResult, SqlQuery } from '@druid-toolkit/query';
-import { C, F, filterPatternToExpression, SqlExpression } from '@druid-toolkit/query';
+import type { ContainsFilterPattern, QueryResult, SqlQuery } from 'druid-query-toolkit';
+import { C, F, filterPatternToExpression, SqlExpression } from 'druid-query-toolkit';
 import React, { useMemo } from 'react';
 
 import { useQueryManager } from '../../../../../../hooks';
diff --git a/web-console/src/views/explore-view/components/filter-pane/filter-menu/filter-menu.tsx b/web-console/src/views/explore-view/components/filter-pane/filter-menu/filter-menu.tsx
index 8cbca7e8d53e..f0b7f21346f0 100644
--- a/web-console/src/views/explore-view/components/filter-pane/filter-menu/filter-menu.tsx
+++ b/web-console/src/views/explore-view/components/filter-pane/filter-menu/filter-menu.tsx
@@ -35,14 +35,14 @@ import type {
   FilterPatternType,
   QueryResult,
   SqlQuery,
-} from '@druid-toolkit/query';
+} from 'druid-query-toolkit';
 import {
   C,
   changeFilterPatternType,
   filterPatternToExpression,
   fitFilterPattern,
   SqlExpression,
-} from '@druid-toolkit/query';
+} from 'druid-query-toolkit';
 import type { JSX } from 'react';
 import React, { useState } from 'react';
 
diff --git a/web-console/src/views/explore-view/components/filter-pane/filter-menu/number-range-filter-control/number-range-filter-control.tsx b/web-console/src/views/explore-view/components/filter-pane/filter-menu/number-range-filter-control/number-range-filter-control.tsx
index eb5adc9c4a74..d66e1ffcc414 100644
--- a/web-console/src/views/explore-view/components/filter-pane/filter-menu/number-range-filter-control/number-range-filter-control.tsx
+++ b/web-console/src/views/explore-view/components/filter-pane/filter-menu/number-range-filter-control/number-range-filter-control.tsx
@@ -18,7 +18,7 @@
 
 import { Button, ControlGroup, FormGroup, NumericInput } from '@blueprintjs/core';
 import { IconNames } from '@blueprintjs/icons';
-import type { NumberRangeFilterPattern } from '@druid-toolkit/query';
+import type { NumberRangeFilterPattern } from 'druid-query-toolkit';
 import React from 'react';
 
 import type { QuerySource } from '../../../../models';
diff --git a/web-console/src/views/explore-view/components/filter-pane/filter-menu/regexp-filter-control/regexp-filter-control.tsx b/web-console/src/views/explore-view/components/filter-pane/filter-menu/regexp-filter-control/regexp-filter-control.tsx
index 3b86189558ae..b2479bf7022a 100644
--- a/web-console/src/views/explore-view/components/filter-pane/filter-menu/regexp-filter-control/regexp-filter-control.tsx
+++ b/web-console/src/views/explore-view/components/filter-pane/filter-menu/regexp-filter-control/regexp-filter-control.tsx
@@ -18,8 +18,8 @@
 
 import { FormGroup, InputGroup, Menu, MenuItem } from '@blueprintjs/core';
 import { IconNames } from '@blueprintjs/icons';
-import type { QueryResult, RegexpFilterPattern, SqlQuery } from '@druid-toolkit/query';
-import { C, F, filterPatternToExpression, SqlExpression } from '@druid-toolkit/query';
+import type { QueryResult, RegexpFilterPattern, SqlQuery } from 'druid-query-toolkit';
+import { C, F, filterPatternToExpression, SqlExpression } from 'druid-query-toolkit';
 import React, { useMemo } from 'react';
 
 import { useQueryManager } from '../../../../../../hooks';
diff --git a/web-console/src/views/explore-view/components/filter-pane/filter-menu/time-interval-filter-control/time-interval-filter-control.tsx b/web-console/src/views/explore-view/components/filter-pane/filter-menu/time-interval-filter-control/time-interval-filter-control.tsx
index acb21c309d2f..9200ee9e07e1 100644
--- a/web-console/src/views/explore-view/components/filter-pane/filter-menu/time-interval-filter-control/time-interval-filter-control.tsx
+++ b/web-console/src/views/explore-view/components/filter-pane/filter-menu/time-interval-filter-control/time-interval-filter-control.tsx
@@ -17,7 +17,7 @@
  */
 
 import { FormGroup } from '@blueprintjs/core';
-import type { TimeIntervalFilterPattern } from '@druid-toolkit/query';
+import type { TimeIntervalFilterPattern } from 'druid-query-toolkit';
 import React from 'react';
 
 import type { QuerySource } from '../../../../models';
diff --git a/web-console/src/views/explore-view/components/filter-pane/filter-menu/time-relative-filter-control/time-relative-filter-control.tsx b/web-console/src/views/explore-view/components/filter-pane/filter-menu/time-relative-filter-control/time-relative-filter-control.tsx
index 32687c0c1b5d..0854a75cd5ee 100644
--- a/web-console/src/views/explore-view/components/filter-pane/filter-menu/time-relative-filter-control/time-relative-filter-control.tsx
+++ b/web-console/src/views/explore-view/components/filter-pane/filter-menu/time-relative-filter-control/time-relative-filter-control.tsx
@@ -17,7 +17,7 @@
  */
 
 import { Button, ButtonGroup, FormGroup } from '@blueprintjs/core';
-import type { TimeRelativeFilterPattern } from '@druid-toolkit/query';
+import type { TimeRelativeFilterPattern } from 'druid-query-toolkit';
 import React from 'react';
 
 import type { QuerySource } from '../../../../models';
diff --git a/web-console/src/views/explore-view/components/filter-pane/filter-menu/values-filter-control/values-filter-control.tsx b/web-console/src/views/explore-view/components/filter-pane/filter-menu/values-filter-control/values-filter-control.tsx
index 169f95a51433..e19af96c2106 100644
--- a/web-console/src/views/explore-view/components/filter-pane/filter-menu/values-filter-control/values-filter-control.tsx
+++ b/web-console/src/views/explore-view/components/filter-pane/filter-menu/values-filter-control/values-filter-control.tsx
@@ -18,8 +18,8 @@
 
 import { FormGroup, Menu, MenuItem } from '@blueprintjs/core';
 import { IconNames } from '@blueprintjs/icons';
-import type { QueryResult, SqlQuery, ValuesFilterPattern } from '@druid-toolkit/query';
-import { C, F, SqlExpression } from '@druid-toolkit/query';
+import type { QueryResult, SqlQuery, ValuesFilterPattern } from 'druid-query-toolkit';
+import { C, F, SqlExpression } from 'druid-query-toolkit';
 import React, { useMemo, useState } from 'react';
 
 import { ClearableInput } from '../../../../../../components';
diff --git a/web-console/src/views/explore-view/components/filter-pane/filter-pane.tsx b/web-console/src/views/explore-view/components/filter-pane/filter-pane.tsx
index 9cc5ad3e6e79..7314528bb7b2 100644
--- a/web-console/src/views/explore-view/components/filter-pane/filter-pane.tsx
+++ b/web-console/src/views/explore-view/components/filter-pane/filter-pane.tsx
@@ -18,15 +18,15 @@
 
 import { Button, Popover } from '@blueprintjs/core';
 import { IconNames } from '@blueprintjs/icons';
+import classNames from 'classnames';
 import type {
   Column,
   FilterPattern,
   QueryResult,
   SqlExpression,
   SqlQuery,
-} from '@druid-toolkit/query';
-import { filterPatternsToExpression, fitFilterPatterns } from '@druid-toolkit/query';
-import classNames from 'classnames';
+} from 'druid-query-toolkit';
+import { filterPatternsToExpression, fitFilterPatterns } from 'druid-query-toolkit';
 import { forwardRef, useImperativeHandle, useState } from 'react';
 
 import type { QuerySource } from '../../models';
diff --git a/web-console/src/views/explore-view/components/generic-output-table/generic-output-table.tsx b/web-console/src/views/explore-view/components/generic-output-table/generic-output-table.tsx
index b557d99b4fde..a7ea7f1f1c6f 100644
--- a/web-console/src/views/explore-view/components/generic-output-table/generic-output-table.tsx
+++ b/web-console/src/views/explore-view/components/generic-output-table/generic-output-table.tsx
@@ -19,9 +19,9 @@
 import { Button, Icon, Intent, Menu, MenuItem, Popover } from '@blueprintjs/core';
 import type { IconName } from '@blueprintjs/icons';
 import { IconNames } from '@blueprintjs/icons';
-import type { Column, QueryResult } from '@druid-toolkit/query';
-import { SqlColumn, SqlExpression, SqlLiteral, trimString } from '@druid-toolkit/query';
 import classNames from 'classnames';
+import type { Column, QueryResult } from 'druid-query-toolkit';
+import { SqlColumn, SqlExpression, SqlLiteral, trimString } from 'druid-query-toolkit';
 import type { JSX } from 'react';
 import React, { useEffect, useState } from 'react';
 import type { Column as TableColumn } from 'react-table';
diff --git a/web-console/src/views/explore-view/components/module-pane/module-pane.tsx b/web-console/src/views/explore-view/components/module-pane/module-pane.tsx
index b360effc87c1..7155a7eff32a 100644
--- a/web-console/src/views/explore-view/components/module-pane/module-pane.tsx
+++ b/web-console/src/views/explore-view/components/module-pane/module-pane.tsx
@@ -17,11 +17,12 @@
  */
 
 import { ResizeSensor } from '@blueprintjs/core';
-import type { QueryResult, SqlExpression, SqlQuery } from '@druid-toolkit/query';
+import type { QueryResult, SqlExpression, SqlQuery } from 'druid-query-toolkit';
 import React, { useMemo, useState } from 'react';
 
+import { Stage } from '../../../../utils/stage';
 import type { ParameterDefinition, ParameterValues, QuerySource } from '../../models';
-import { effectiveParameterDefault, Stage } from '../../models';
+import { effectiveParameterDefault } from '../../models';
 import { ModuleRepository } from '../../module-repository/module-repository';
 import { Issue } from '../issue/issue';
 
diff --git a/web-console/src/views/explore-view/components/preview-pane/preview-pane.tsx b/web-console/src/views/explore-view/components/preview-pane/preview-pane.tsx
index b0d49128e740..41bfd4bd14ac 100644
--- a/web-console/src/views/explore-view/components/preview-pane/preview-pane.tsx
+++ b/web-console/src/views/explore-view/components/preview-pane/preview-pane.tsx
@@ -17,8 +17,8 @@
  */
 
 import { Callout } from '@blueprintjs/core';
-import type { QueryResult, SqlQuery } from '@druid-toolkit/query';
 import classNames from 'classnames';
+import type { QueryResult, SqlQuery } from 'druid-query-toolkit';
 import React from 'react';
 
 import { useQueryManager } from '../../../../hooks';
diff --git a/web-console/src/views/explore-view/components/resource-pane/column-dialog/column-dialog.tsx b/web-console/src/views/explore-view/components/resource-pane/column-dialog/column-dialog.tsx
index d11210bf2842..d220106ec76b 100644
--- a/web-console/src/views/explore-view/components/resource-pane/column-dialog/column-dialog.tsx
+++ b/web-console/src/views/explore-view/components/resource-pane/column-dialog/column-dialog.tsx
@@ -17,8 +17,8 @@
  */
 
 import { Button, Classes, Dialog, FormGroup, InputGroup, Intent, Tag } from '@blueprintjs/core';
-import type { QueryResult, SqlQuery } from '@druid-toolkit/query';
-import { F, sql, SqlExpression } from '@druid-toolkit/query';
+import type { QueryResult, SqlQuery } from 'druid-query-toolkit';
+import { F, sql, SqlExpression } from 'druid-query-toolkit';
 import React, { useMemo, useState } from 'react';
 
 import { AppToaster } from '../../../../../singletons';
diff --git a/web-console/src/views/explore-view/components/resource-pane/measure-dialog/measure-dialog.tsx b/web-console/src/views/explore-view/components/resource-pane/measure-dialog/measure-dialog.tsx
index 4d56d1b3aab4..308e2563ebf0 100644
--- a/web-console/src/views/explore-view/components/resource-pane/measure-dialog/measure-dialog.tsx
+++ b/web-console/src/views/explore-view/components/resource-pane/measure-dialog/measure-dialog.tsx
@@ -24,7 +24,7 @@ import {
   SqlExpression,
   SqlQuery,
   SqlWithPart,
-} from '@druid-toolkit/query';
+} from 'druid-query-toolkit';
 import React, { useMemo, useState } from 'react';
 
 import { AppToaster } from '../../../../../singletons';
diff --git a/web-console/src/views/explore-view/components/resource-pane/nested-column-dialog/nested-column-dialog.tsx b/web-console/src/views/explore-view/components/resource-pane/nested-column-dialog/nested-column-dialog.tsx
index 5cd057ead2fd..4103dc35bb2a 100644
--- a/web-console/src/views/explore-view/components/resource-pane/nested-column-dialog/nested-column-dialog.tsx
+++ b/web-console/src/views/explore-view/components/resource-pane/nested-column-dialog/nested-column-dialog.tsx
@@ -27,8 +27,8 @@ import {
   Menu,
   Tag,
 } from '@blueprintjs/core';
-import type { QueryResult, SqlExpression, SqlQuery } from '@druid-toolkit/query';
-import { F, sql, SqlFunction } from '@druid-toolkit/query';
+import type { QueryResult, SqlExpression, SqlQuery } from 'druid-query-toolkit';
+import { F, sql, SqlFunction } from 'druid-query-toolkit';
 import React, { useState } from 'react';
 
 import { ClearableInput, Loader, MenuCheckbox } from '../../../../../components';
diff --git a/web-console/src/views/explore-view/components/resource-pane/resource-pane.tsx b/web-console/src/views/explore-view/components/resource-pane/resource-pane.tsx
index 09eaa96fea7d..dda84fdbf05f 100644
--- a/web-console/src/views/explore-view/components/resource-pane/resource-pane.tsx
+++ b/web-console/src/views/explore-view/components/resource-pane/resource-pane.tsx
@@ -28,8 +28,8 @@ import {
   Popover,
 } from '@blueprintjs/core';
 import { IconNames } from '@blueprintjs/icons';
-import type { Column, QueryResult, SqlExpression, SqlQuery } from '@druid-toolkit/query';
 import classNames from 'classnames';
+import type { Column, QueryResult, SqlExpression, SqlQuery } from 'druid-query-toolkit';
 import { useState } from 'react';
 
 import { ClearableInput } from '../../../../components';
diff --git a/web-console/src/views/explore-view/components/source-pane/source-pane.tsx b/web-console/src/views/explore-view/components/source-pane/source-pane.tsx
index c97f736d9bc7..fc0a2688cee4 100644
--- a/web-console/src/views/explore-view/components/source-pane/source-pane.tsx
+++ b/web-console/src/views/explore-view/components/source-pane/source-pane.tsx
@@ -18,7 +18,7 @@
 
 import { Button, Menu, MenuDivider, MenuItem, Popover, Position } from '@blueprintjs/core';
 import { IconNames } from '@blueprintjs/icons';
-import { SqlQuery, SqlTable } from '@druid-toolkit/query';
+import { SqlQuery, SqlTable } from 'druid-query-toolkit';
 import type { JSX } from 'react';
 import React from 'react';
 
@@ -53,8 +53,8 @@ export interface SourcePaneProps {
 export const SourcePane = React.memo(function SourcePane(props: SourcePaneProps) {
   const { selectedSource, onSelectTable, onShowSourceQuery, fill, minimal, disabled } = props;
 
-  const [tables] = useQueryManager<string, string[]>({
-    initQuery: '',
+  const [tables] = useQueryManager<null, string[]>({
+    initQuery: null,
     processQuery: async () => {
       const tables = await queryDruidSql<{ TABLE_NAME: string }>({
         query: `SELECT TABLE_NAME FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_TYPE = 'TABLE'`,
diff --git a/web-console/src/views/explore-view/components/sql-input/sql-input.tsx b/web-console/src/views/explore-view/components/sql-input/sql-input.tsx
index 80534d36d6b3..4347d0962d9d 100644
--- a/web-console/src/views/explore-view/components/sql-input/sql-input.tsx
+++ b/web-console/src/views/explore-view/components/sql-input/sql-input.tsx
@@ -16,10 +16,10 @@
  * limitations under the License.
  */
 
-import type { Column } from '@druid-toolkit/query';
-import { C } from '@druid-toolkit/query';
 import type { Ace } from 'ace-builds';
 import ace from 'ace-builds';
+import type { Column } from 'druid-query-toolkit';
+import { C } from 'druid-query-toolkit';
 import React from 'react';
 import AceEditor from 'react-ace';
 
diff --git a/web-console/src/views/explore-view/drag-helper.ts b/web-console/src/views/explore-view/drag-helper.ts
index a9e1188e9898..82b247e70872 100644
--- a/web-console/src/views/explore-view/drag-helper.ts
+++ b/web-console/src/views/explore-view/drag-helper.ts
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-import type { Column } from '@druid-toolkit/query';
+import type { Column } from 'druid-query-toolkit';
 
 import type { Measure } from './models';
 
diff --git a/web-console/src/views/explore-view/explore-state.ts b/web-console/src/views/explore-view/explore-state.ts
index 07a53d6de702..a5faba0a26f4 100644
--- a/web-console/src/views/explore-view/explore-state.ts
+++ b/web-console/src/views/explore-view/explore-state.ts
@@ -16,13 +16,13 @@
  * limitations under the License.
  */
 
-import type { Column } from '@druid-toolkit/query';
+import type { Column } from 'druid-query-toolkit';
 import {
   filterPatternToExpression,
   SqlExpression,
   SqlLiteral,
   SqlQuery,
-} from '@druid-toolkit/query';
+} from 'druid-query-toolkit';
 
 import { isEmpty } from '../../utils';
 
diff --git a/web-console/src/views/explore-view/explore-view.tsx b/web-console/src/views/explore-view/explore-view.tsx
index 91e7b91306b0..21c98b067fa8 100644
--- a/web-console/src/views/explore-view/explore-view.tsx
+++ b/web-console/src/views/explore-view/explore-view.tsx
@@ -20,11 +20,11 @@ import './modules';
 
 import { Button, Intent, Menu, MenuDivider, MenuItem } from '@blueprintjs/core';
 import { IconNames } from '@blueprintjs/icons';
-import type { Column, QueryResult, SqlExpression } from '@druid-toolkit/query';
-import { QueryRunner, SqlQuery } from '@druid-toolkit/query';
 import type { CancelToken } from 'axios';
 import classNames from 'classnames';
 import copy from 'copy-to-clipboard';
+import type { Column, QueryResult, SqlExpression } from 'druid-query-toolkit';
+import { QueryRunner, SqlQuery } from 'druid-query-toolkit';
 import React, { useEffect, useMemo, useRef, useState } from 'react';
 import { useStore } from 'zustand';
 
diff --git a/web-console/src/views/explore-view/models/expression-meta.ts b/web-console/src/views/explore-view/models/expression-meta.ts
index 7bdb00de6e89..ac8e07aa8a32 100644
--- a/web-console/src/views/explore-view/models/expression-meta.ts
+++ b/web-console/src/views/explore-view/models/expression-meta.ts
@@ -16,8 +16,8 @@
  * limitations under the License.
  */
 
-import type { Column } from '@druid-toolkit/query';
-import { C, filterMap, SqlColumn, SqlExpression } from '@druid-toolkit/query';
+import type { Column } from 'druid-query-toolkit';
+import { C, filterMap, SqlColumn, SqlExpression } from 'druid-query-toolkit';
 
 import { renameColumnsInExpression } from '../utils';
 
diff --git a/web-console/src/views/explore-view/models/index.ts b/web-console/src/views/explore-view/models/index.ts
index 1e3c58ea09fb..8938818acc20 100644
--- a/web-console/src/views/explore-view/models/index.ts
+++ b/web-console/src/views/explore-view/models/index.ts
@@ -22,4 +22,3 @@ export * from './measure';
 export * from './measure-pattern';
 export * from './parameter';
 export * from './query-source';
-export * from './stage';
diff --git a/web-console/src/views/explore-view/models/measure-pattern.ts b/web-console/src/views/explore-view/models/measure-pattern.ts
index fd0d567440cc..cd2998c4d841 100644
--- a/web-console/src/views/explore-view/models/measure-pattern.ts
+++ b/web-console/src/views/explore-view/models/measure-pattern.ts
@@ -16,8 +16,8 @@
  * limitations under the License.
  */
 
-import type { Column, SqlExpression } from '@druid-toolkit/query';
-import { C, F, SqlColumn, SqlFunction, SqlStar } from '@druid-toolkit/query';
+import type { Column, SqlExpression } from 'druid-query-toolkit';
+import { C, F, SqlColumn, SqlFunction, SqlStar } from 'druid-query-toolkit';
 
 import { capitalizeFirst } from '../../../utils';
 
diff --git a/web-console/src/views/explore-view/models/measure.ts b/web-console/src/views/explore-view/models/measure.ts
index 018f11bbcc11..a3aadab89b67 100644
--- a/web-console/src/views/explore-view/models/measure.ts
+++ b/web-console/src/views/explore-view/models/measure.ts
@@ -16,8 +16,8 @@
  * limitations under the License.
  */
 
-import type { Column, SqlBase, SqlQuery } from '@druid-toolkit/query';
-import { C, F, filterMap, L, SqlAlias, SqlExpression, SqlFunction } from '@druid-toolkit/query';
+import type { Column, SqlBase, SqlQuery } from 'druid-query-toolkit';
+import { C, F, filterMap, L, SqlAlias, SqlExpression, SqlFunction } from 'druid-query-toolkit';
 
 import { uniq } from '../../../utils';
 
diff --git a/web-console/src/views/explore-view/models/query-source.ts b/web-console/src/views/explore-view/models/query-source.ts
index 6c6f42c78053..24c4021d94c4 100644
--- a/web-console/src/views/explore-view/models/query-source.ts
+++ b/web-console/src/views/explore-view/models/query-source.ts
@@ -16,8 +16,8 @@
  * limitations under the License.
  */
 
-import type { Column } from '@druid-toolkit/query';
-import { C, F, SqlColumn, SqlExpression, SqlQuery, SqlStar } from '@druid-toolkit/query';
+import type { Column } from 'druid-query-toolkit';
+import { C, F, SqlColumn, SqlExpression, SqlQuery, SqlStar } from 'druid-query-toolkit';
 
 import { filterMap, mapRecordIfChanged } from '../../../utils';
 
diff --git a/web-console/src/views/explore-view/module-repository/module-repository.ts b/web-console/src/views/explore-view/module-repository/module-repository.ts
index d050a2779c51..5f82dbc6dfe1 100644
--- a/web-console/src/views/explore-view/module-repository/module-repository.ts
+++ b/web-console/src/views/explore-view/module-repository/module-repository.ts
@@ -17,10 +17,11 @@
  */
 
 import type { IconName } from '@blueprintjs/icons';
-import type { QueryResult, SqlExpression, SqlQuery } from '@druid-toolkit/query';
 import type { CancelToken } from 'axios';
+import type { QueryResult, SqlExpression, SqlQuery } from 'druid-query-toolkit';
 
-import type { ParameterDefinition, QuerySource, Stage } from '../models';
+import type { Stage } from '../../../utils/stage';
+import type { ParameterDefinition, QuerySource } from '../models';
 
 interface ModuleDefinition<P> {
   id: string;
diff --git a/web-console/src/views/explore-view/modules/bar-chart-module.tsx b/web-console/src/views/explore-view/modules/bar-chart-module.tsx
index 0ff203c70519..34af0404ee6c 100644
--- a/web-console/src/views/explore-view/modules/bar-chart-module.tsx
+++ b/web-console/src/views/explore-view/modules/bar-chart-module.tsx
@@ -17,7 +17,7 @@
  */
 
 import { IconNames } from '@blueprintjs/icons';
-import { L } from '@druid-toolkit/query';
+import { L } from 'druid-query-toolkit';
 import type { ECharts } from 'echarts';
 import * as echarts from 'echarts';
 import { useEffect, useMemo, useRef } from 'react';
diff --git a/web-console/src/views/explore-view/modules/grouping-table-module.tsx b/web-console/src/views/explore-view/modules/grouping-table-module.tsx
index 5cb5650c94e0..81e7d1924799 100644
--- a/web-console/src/views/explore-view/modules/grouping-table-module.tsx
+++ b/web-console/src/views/explore-view/modules/grouping-table-module.tsx
@@ -18,8 +18,8 @@
 
 import { Button } from '@blueprintjs/core';
 import { IconNames } from '@blueprintjs/icons';
-import type { SqlExpression, SqlOrderByDirection, SqlQuery } from '@druid-toolkit/query';
-import { C, F } from '@druid-toolkit/query';
+import type { SqlExpression, SqlOrderByDirection, SqlQuery } from 'druid-query-toolkit';
+import { C, F } from 'druid-query-toolkit';
 import { useMemo } from 'react';
 
 import { Loader } from '../../../components';
diff --git a/web-console/src/views/explore-view/modules/multi-axis-chart-module.tsx b/web-console/src/views/explore-view/modules/multi-axis-chart-module.tsx
index e5f2fb47f9a5..3c3f4c48e646 100644
--- a/web-console/src/views/explore-view/modules/multi-axis-chart-module.tsx
+++ b/web-console/src/views/explore-view/modules/multi-axis-chart-module.tsx
@@ -17,8 +17,8 @@
  */
 
 import { IconNames } from '@blueprintjs/icons';
-import type { SqlQuery } from '@druid-toolkit/query';
-import { C, F, L } from '@druid-toolkit/query';
+import type { SqlQuery } from 'druid-query-toolkit';
+import { C, F, L } from 'druid-query-toolkit';
 import type { ECharts } from 'echarts';
 import * as echarts from 'echarts';
 import { useEffect, useMemo, useRef } from 'react';
@@ -26,6 +26,7 @@ import { useEffect, useMemo, useRef } from 'react';
 import { Loader } from '../../../components';
 import { useQueryManager } from '../../../hooks';
 import {
+  Duration,
   formatInteger,
   formatNumber,
   prettyFormatIsoDateTick,
@@ -35,7 +36,7 @@ import { Issue } from '../components';
 import { highlightStore } from '../highlight-store/highlight-store';
 import type { ExpressionMeta } from '../models';
 import { ModuleRepository } from '../module-repository/module-repository';
-import { DATE_FORMAT, getAutoGranularity, snapToGranularity } from '../utils';
+import { DATE_FORMAT, getAutoGranularity } from '../utils';
 
 import './record-table-module.scss';
 
@@ -223,12 +224,9 @@ ModuleRepository.registerModule<MultiAxisChartParameterValues>({
         // this is only used for the label and the data saved in the highlight
         // the positioning is done with the true coordinates until the user
         // releases the mouse button (in the `brushend` event)
-        const { start, end } = snapToGranularity(
-          params.areas[0].coordRange[0],
-          params.areas[0].coordRange[1],
-          timeGranularity,
-          undefined, // context.timezone,
-        );
+        const duration = new Duration(timeGranularity);
+        const start = duration.round(params.areas[0].coordRange[0], 'Etc/UTC');
+        const end = duration.round(params.areas[0].coordRange[1], 'Etc/UTC');
 
         const x0 = myChart.convertToPixel({ xAxisIndex: 0 }, params.areas[0].coordRange[0]);
         const x1 = myChart.convertToPixel({ xAxisIndex: 0 }, params.areas[0].coordRange[1]);
diff --git a/web-console/src/views/explore-view/modules/pie-chart-module.tsx b/web-console/src/views/explore-view/modules/pie-chart-module.tsx
index 80ff41b0f348..d90dfbeae606 100644
--- a/web-console/src/views/explore-view/modules/pie-chart-module.tsx
+++ b/web-console/src/views/explore-view/modules/pie-chart-module.tsx
@@ -17,7 +17,7 @@
  */
 
 import { IconNames } from '@blueprintjs/icons';
-import { C, L } from '@druid-toolkit/query';
+import { C, L } from 'druid-query-toolkit';
 import type { ECharts } from 'echarts';
 import * as echarts from 'echarts';
 import { useEffect, useMemo, useRef } from 'react';
diff --git a/web-console/src/views/explore-view/modules/record-table-module.tsx b/web-console/src/views/explore-view/modules/record-table-module.tsx
index 37c6483f7841..d7a812e4c167 100644
--- a/web-console/src/views/explore-view/modules/record-table-module.tsx
+++ b/web-console/src/views/explore-view/modules/record-table-module.tsx
@@ -17,7 +17,7 @@
  */
 
 import { IconNames } from '@blueprintjs/icons';
-import { C, SqlQuery } from '@druid-toolkit/query';
+import { C, SqlQuery } from 'druid-query-toolkit';
 import { useMemo } from 'react';
 
 import { Loader } from '../../../components';
diff --git a/web-console/src/views/explore-view/modules/time-chart-module.tsx b/web-console/src/views/explore-view/modules/time-chart-module.tsx
index 1c19963b1ed5..a07455b547a5 100644
--- a/web-console/src/views/explore-view/modules/time-chart-module.tsx
+++ b/web-console/src/views/explore-view/modules/time-chart-module.tsx
@@ -17,7 +17,7 @@
  */
 
 import { IconNames } from '@blueprintjs/icons';
-import { C, F, L, SqlCase } from '@druid-toolkit/query';
+import { C, F, L, SqlCase } from 'druid-query-toolkit';
 import type { ECharts } from 'echarts';
 import * as echarts from 'echarts';
 import { useEffect, useMemo, useRef } from 'react';
@@ -25,6 +25,7 @@ import { useEffect, useMemo, useRef } from 'react';
 import { Loader } from '../../../components';
 import { useQueryManager } from '../../../hooks';
 import {
+  Duration,
   formatInteger,
   formatNumber,
   prettyFormatIsoDateTick,
@@ -34,7 +35,7 @@ import { Issue } from '../components';
 import { highlightStore } from '../highlight-store/highlight-store';
 import type { ExpressionMeta } from '../models';
 import { ModuleRepository } from '../module-repository/module-repository';
-import { DATE_FORMAT, getAutoGranularity, snapToGranularity } from '../utils';
+import { DATE_FORMAT, getAutoGranularity } from '../utils';
 
 import './record-table-module.scss';
 
@@ -295,13 +296,13 @@ ModuleRepository.registerModule<TimeChartParameterValues>({
         // this is only used for the label and the data saved in the highlight
         // the positioning is done with the true coordinates until the user
         // releases the mouse button (in the `brushend` event)
-        const { start, end } = snappyHighlight
-          ? snapToGranularity(
-              params.areas[0].coordRange[0],
-              params.areas[0].coordRange[1],
-              timeGranularity,
-            )
-          : { start: params.areas[0].coordRange[0], end: params.areas[0].coordRange[1] };
+        let start = params.areas[0].coordRange[0];
+        let end = params.areas[0].coordRange[1];
+        if (snappyHighlight) {
+          const duration = new Duration(timeGranularity);
+          start = duration.round(start, 'Etc/UTC');
+          end = duration.round(end, 'Etc/UTC');
+        }
 
         const x0 = myChart.convertToPixel({ xAxisIndex: 0 }, params.areas[0].coordRange[0]);
         const x1 = myChart.convertToPixel({ xAxisIndex: 0 }, params.areas[0].coordRange[1]);
diff --git a/web-console/src/views/explore-view/query-macros/aggregate.spec.ts b/web-console/src/views/explore-view/query-macros/aggregate.spec.ts
index c0d7629031e7..7cf58bfd716e 100644
--- a/web-console/src/views/explore-view/query-macros/aggregate.spec.ts
+++ b/web-console/src/views/explore-view/query-macros/aggregate.spec.ts
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-import { sane, SqlQuery } from '@druid-toolkit/query';
+import { sane, SqlQuery } from 'druid-query-toolkit';
 
 import { Measure } from '../models';
 
diff --git a/web-console/src/views/explore-view/query-macros/aggregate.ts b/web-console/src/views/explore-view/query-macros/aggregate.ts
index 9af7e79ebe25..18c58929eea5 100644
--- a/web-console/src/views/explore-view/query-macros/aggregate.ts
+++ b/web-console/src/views/explore-view/query-macros/aggregate.ts
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-import { C, SqlFunction, SqlQuery } from '@druid-toolkit/query';
+import { C, SqlFunction, SqlQuery } from 'druid-query-toolkit';
 
 import { filterMap, uniq } from '../../../utils';
 import { Measure } from '../models';
diff --git a/web-console/src/views/explore-view/query-macros/max-data-time.ts b/web-console/src/views/explore-view/query-macros/max-data-time.ts
index c6cc409a1001..d689d0a8386f 100644
--- a/web-console/src/views/explore-view/query-macros/max-data-time.ts
+++ b/web-console/src/views/explore-view/query-macros/max-data-time.ts
@@ -16,8 +16,8 @@
  * limitations under the License.
  */
 
-import type { SqlQuery } from '@druid-toolkit/query';
-import { L, SqlFunction } from '@druid-toolkit/query';
+import type { SqlQuery } from 'druid-query-toolkit';
+import { L, SqlFunction } from 'druid-query-toolkit';
 
 import { getMaxTimeForTable } from '../utils';
 
diff --git a/web-console/src/views/explore-view/utils/duration.spec.ts b/web-console/src/views/explore-view/utils/duration.spec.ts
deleted file mode 100644
index 0d7e0473131a..000000000000
--- a/web-console/src/views/explore-view/utils/duration.spec.ts
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import { formatDuration } from './duration';
-
-describe('formatDuration', () => {
-  it('works with 0', () => {
-    expect(formatDuration('PT0S')).toEqual('0 seconds');
-  });
-
-  it('works with single span', () => {
-    expect(formatDuration('P1D')).toEqual('1 day');
-    expect(formatDuration('PT1M')).toEqual('1 minute');
-  });
-
-  it('works with single span (compact)', () => {
-    expect(formatDuration('PT1M', true)).toEqual('minute');
-  });
-
-  it('works with multiple spans', () => {
-    expect(formatDuration('PT2H30M15S')).toEqual('2 hours, 30 minutes, 15 seconds');
-    expect(formatDuration('PT2H30M15S', true)).toEqual('2 hours, 30 minutes, 15 seconds');
-  });
-});
diff --git a/web-console/src/views/explore-view/utils/duration.ts b/web-console/src/views/explore-view/utils/duration.ts
deleted file mode 100644
index 621aa0a57a0f..000000000000
--- a/web-console/src/views/explore-view/utils/duration.ts
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import { sum } from 'd3-array';
-
-import { filterMap, pluralIfNeeded } from '../../../utils';
-
-const SPANS = ['year', 'month', 'day', 'hour', 'minute', 'second'];
-
-export function formatDuration(duration: string, preferCompact = false): string {
-  // Regular expressions to match ISO 8601 duration parts
-  const regex = /P(?:(\d+)Y)?(?:(\d+)M)?(?:(\d+)D)?(?:T(?:(\d+)H)?(?:(\d+)M)?(?:(\d+)S)?)?/;
-  const matches = regex.exec(duration);
-  if (!matches) return duration;
-
-  // Extract the relevant parts
-  const counts = SPANS.map((_, i) => parseInt(matches[i + 1] || '0', 10));
-
-  // Construct the human-readable format based on the parsed values
-  let parts: string[];
-  if (preferCompact && sum(counts) === 1) {
-    parts = filterMap(SPANS, (span, i) => (counts[i] ? span : undefined));
-  } else {
-    parts = filterMap(SPANS, (span, i) =>
-      counts[i] ? pluralIfNeeded(counts[i], span) : undefined,
-    );
-  }
-
-  // Join the parts with commas, and return the result
-  return parts.length > 0 ? parts.join(', ') : '0 seconds';
-}
diff --git a/web-console/src/views/explore-view/utils/filter-pattern-helpers.ts b/web-console/src/views/explore-view/utils/filter-pattern-helpers.ts
index 6b2245dbd38e..faf643aef578 100644
--- a/web-console/src/views/explore-view/utils/filter-pattern-helpers.ts
+++ b/web-console/src/views/explore-view/utils/filter-pattern-helpers.ts
@@ -16,10 +16,11 @@
  * limitations under the License.
  */
 
-import type { Column, FilterPattern } from '@druid-toolkit/query';
+import type { Column, FilterPattern } from 'druid-query-toolkit';
+
+import { Duration } from '../../../utils';
 
 import { DATE_FORMAT } from './date-format';
-import { formatDuration } from './duration';
 
 const TIME_RELATIVE_TYPES: Record<string, string> = {
   'maxDataTime/': 'latest',
@@ -82,10 +83,9 @@ export function formatPatternWithoutNegation(pattern: FilterPattern): string {
 
     case 'timeRelative': {
       const type = TIME_RELATIVE_TYPES[`${pattern.anchor}/${pattern.alignType || ''}`];
-      return `${pattern.column} in ${type ? `${type} ` : ''}${formatDuration(
+      return `${pattern.column} in ${type ? `${type} ` : ''}${new Duration(
         pattern.rangeDuration,
-        true,
-      )}`;
+      ).getDescription()}`;
     }
 
     case 'numberRange':
diff --git a/web-console/src/views/explore-view/utils/general.ts b/web-console/src/views/explore-view/utils/general.ts
index 186619593cce..b6151306a94a 100644
--- a/web-console/src/views/explore-view/utils/general.ts
+++ b/web-console/src/views/explore-view/utils/general.ts
@@ -16,8 +16,8 @@
  * limitations under the License.
  */
 
-import type { SqlExpression } from '@druid-toolkit/query';
-import { SqlColumn } from '@druid-toolkit/query';
+import type { SqlExpression } from 'druid-query-toolkit';
+import { SqlColumn } from 'druid-query-toolkit';
 
 export function addTableScope(expression: SqlExpression, newTableScope: string): SqlExpression {
   return expression.walk(ex => {
diff --git a/web-console/src/views/explore-view/utils/get-auto-granularity.ts b/web-console/src/views/explore-view/utils/get-auto-granularity.ts
index f8928f3b86be..64acd5002487 100644
--- a/web-console/src/views/explore-view/utils/get-auto-granularity.ts
+++ b/web-console/src/views/explore-view/utils/get-auto-granularity.ts
@@ -16,67 +16,48 @@
  * limitations under the License.
  */
 
-import type { SqlExpression } from '@druid-toolkit/query';
-import { fitFilterPattern, SqlMulti } from '@druid-toolkit/query';
-import { day, Duration, hour } from 'chronoshift';
+import type { SqlExpression } from 'druid-query-toolkit';
+import { fitFilterPatterns } from 'druid-query-toolkit';
 
-function getCanonicalDuration(
+import { Duration } from '../../../utils';
+
+function getTimeSpanInExpression(
   expression: SqlExpression,
   timeColumnName: string,
 ): number | undefined {
-  const pattern = fitFilterPattern(expression);
-  if ('column' in pattern && pattern.column !== timeColumnName) return undefined;
-
-  switch (pattern.type) {
-    case 'timeInterval':
+  const patterns = fitFilterPatterns(expression);
+  for (const pattern of patterns) {
+    if (pattern.type === 'timeInterval' && pattern.column === timeColumnName) {
       return pattern.end.valueOf() - pattern.start.valueOf();
-
-    case 'timeRelative':
-      return Duration.fromJS(pattern.rangeDuration).getCanonicalLength();
-
-    case 'custom':
-      if (pattern.expression instanceof SqlMulti) {
-        for (const value of pattern.expression.args.values) {
-          const canonicalDuration = getCanonicalDuration(value, timeColumnName);
-          if (canonicalDuration !== undefined) return canonicalDuration;
-        }
-      }
-
-      break;
-
-    default:
-      break;
+    } else if (pattern.type === 'timeRelative' && pattern.column === timeColumnName) {
+      return new Duration(pattern.rangeDuration).getCanonicalLength();
+    }
   }
 
-  return undefined;
+  return;
 }
 
-const DEFAULT_GRANULARITY = 'PT1H';
-
-/**
- * Computes the granularity string from a where clause. If the where clause is TRUE, the default
- * granularity is returned (PT1H). Otherwise, the granularity is computed from the time column and the
- * duration of the where clause.
- *
- * @param where the where SQLExpression to read from
- * @param timeColumnName the name of the time column (any other time column will be ignored)
- * @returns the granularity string (default is PT1H)
- */
 export function getAutoGranularity(where: SqlExpression, timeColumnName: string): string {
-  if (where.toString() === 'TRUE') return DEFAULT_GRANULARITY;
-
-  const canonicalDuration = getCanonicalDuration(where, timeColumnName);
-
-  if (canonicalDuration) {
-    if (canonicalDuration > day.canonicalLength * 95) return 'P1W';
-    if (canonicalDuration > day.canonicalLength * 8) return 'P1D';
-    if (canonicalDuration > hour.canonicalLength * 8) return 'PT1H';
-    if (canonicalDuration > hour.canonicalLength * 3) return 'PT5M';
-
-    return 'PT1M';
-  }
-
-  console.debug('Unable to determine granularity from where clause', where.toString());
-
-  return DEFAULT_GRANULARITY;
+  const timeSpan = getTimeSpanInExpression(where, timeColumnName);
+  if (!timeSpan) return 'P1D';
+  return Duration.pickSmallestGranularityThatFits(
+    [
+      'PT1S',
+      'PT5S',
+      'PT20S',
+      'PT1M',
+      'PT5M',
+      'PT20M',
+      'PT1H',
+      'PT3H',
+      'PT6H',
+      'P1D',
+      'P1W',
+      'P1M',
+      'P3M',
+      'P1Y',
+    ].map(s => new Duration(s)),
+    timeSpan,
+    200,
+  ).toString();
 }
diff --git a/web-console/src/views/explore-view/utils/index.ts b/web-console/src/views/explore-view/utils/index.ts
index 8469c83b9279..57c72e2c0e7e 100644
--- a/web-console/src/views/explore-view/utils/index.ts
+++ b/web-console/src/views/explore-view/utils/index.ts
@@ -17,7 +17,6 @@
  */
 
 export * from './date-format';
-export * from './duration';
 export * from './filter-pattern-helpers';
 export * from './general';
 export * from './get-auto-granularity';
@@ -25,6 +24,5 @@ export * from './known-aggregations';
 export * from './max-time-for-table';
 export * from './misc';
 export * from './query-log';
-export * from './snap-to-granularity';
 export * from './table-query';
 export * from './time-manipulation';
diff --git a/web-console/src/views/explore-view/utils/max-time-for-table.ts b/web-console/src/views/explore-view/utils/max-time-for-table.ts
index b93dea9adf39..8ec4e6d16bbd 100644
--- a/web-console/src/views/explore-view/utils/max-time-for-table.ts
+++ b/web-console/src/views/explore-view/utils/max-time-for-table.ts
@@ -17,7 +17,7 @@
  */
 
 // micro-cache
-import { sql, T } from '@druid-toolkit/query';
+import { sql, T } from 'druid-query-toolkit';
 
 import { deepGet, queryDruidSql } from '../../../utils';
 
diff --git a/web-console/src/views/explore-view/utils/snap-to-granularity.ts b/web-console/src/views/explore-view/utils/snap-to-granularity.ts
deleted file mode 100644
index 15b0cce03518..000000000000
--- a/web-console/src/views/explore-view/utils/snap-to-granularity.ts
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import { Duration, Timezone } from 'chronoshift';
-
-/**
- * Will try to snap start and end to the closest available dates, given the granularity.
- *
- * @param start the start date
- * @param end the end date
- * @param granularity the granularity
- * @param timezone the timezone
- * @returns an object with the start and end dates snapped to the given granularity
- */
-export function snapToGranularity(
-  start: Date,
-  end: Date,
-  granularity: string,
-  timezone?: string,
-): { start: Date; end: Date } {
-  const tz = Timezone.fromJS(timezone || 'Etc/UTC');
-  const duration = Duration.fromJS(granularity);
-
-  // get closest to start
-  const flooredStart = duration.floor(start, tz);
-  const ceiledStart = duration.shift(flooredStart, tz, 1);
-  const distanceToFlooredStart = Math.abs(start.valueOf() - flooredStart.valueOf());
-  const distanceToCeiledStart = Math.abs(start.valueOf() - ceiledStart.valueOf());
-  const closestStart = distanceToFlooredStart < distanceToCeiledStart ? flooredStart : ceiledStart;
-
-  // get closest to end
-  const flooredEnd = duration.floor(end, tz);
-  const ceiledEnd = duration.shift(flooredEnd, tz, 1);
-  const distanceToFlooredEnd = Math.abs(end.valueOf() - flooredEnd.valueOf());
-  const distanceToCeiledEnd = Math.abs(end.valueOf() - ceiledEnd.valueOf());
-  const closestEnd = distanceToFlooredEnd < distanceToCeiledEnd ? flooredEnd : ceiledEnd;
-
-  return {
-    start: closestStart,
-    end: closestEnd,
-  };
-}
diff --git a/web-console/src/views/explore-view/utils/table-query.spec.ts b/web-console/src/views/explore-view/utils/table-query.spec.ts
index b388b2c1280a..1e1126cc1807 100644
--- a/web-console/src/views/explore-view/utils/table-query.spec.ts
+++ b/web-console/src/views/explore-view/utils/table-query.spec.ts
@@ -16,8 +16,8 @@
  * limitations under the License.
  */
 
-import type { SqlOrderByExpression } from '@druid-toolkit/query';
-import { C, sql, SqlExpression, SqlQuery, T } from '@druid-toolkit/query';
+import type { SqlOrderByExpression } from 'druid-query-toolkit';
+import { C, sql, SqlExpression, SqlQuery, T } from 'druid-query-toolkit';
 
 import { nodePostJson } from '../../../test-utils';
 import { ExpressionMeta, Measure } from '../models';
diff --git a/web-console/src/views/explore-view/utils/table-query.ts b/web-console/src/views/explore-view/utils/table-query.ts
index bc5b6484c9a3..d46d68edb5e1 100644
--- a/web-console/src/views/explore-view/utils/table-query.ts
+++ b/web-console/src/views/explore-view/utils/table-query.ts
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-import type { SqlAlias, SqlExpression, SqlOrderByExpression, SqlTable } from '@druid-toolkit/query';
+import type { SqlAlias, SqlExpression, SqlOrderByExpression, SqlTable } from 'druid-query-toolkit';
 import {
   C,
   F,
@@ -28,14 +28,13 @@ import {
   SqlType,
   SqlWithPart,
   T,
-} from '@druid-toolkit/query';
+} from 'druid-query-toolkit';
 
 import type { ColumnHint } from '../../../utils';
-import { forceSignInNumberFormatter, formatNumber, formatPercent } from '../../../utils';
+import { Duration, forceSignInNumberFormatter, formatNumber, formatPercent } from '../../../utils';
 import type { ExpressionMeta } from '../models';
 import { Measure } from '../models';
 
-import { formatDuration } from './duration';
 import { addTableScope } from './general';
 import { KNOWN_AGGREGATIONS } from './known-aggregations';
 import type { Compare } from './time-manipulation';
@@ -103,7 +102,7 @@ function makeBaseColumnHints(
       ).getUnderlyingExpression(),
     };
     if (isTimestamp(splitColumn)) {
-      hint.displayName = `${splitColumn.name} (by ${formatDuration(timeBucket, true)})`;
+      hint.displayName = `${splitColumn.name} (by ${new Duration(timeBucket).getDescription()})`;
     }
     columnHints.set(splitColumn.name, hint);
   }
@@ -291,7 +290,7 @@ function makeCompareAggregatorsAndAddHints(
   prevMeasure: SqlExpression,
   columnHints: Map<string, ColumnHint>,
 ): SqlExpression[] {
-  const group = `Previous ${formatDuration(compare, true)}`;
+  const group = `Previous ${new Duration(compare).getDescription()}`;
   const diff = mainMeasure.subtract(prevMeasure);
 
   const ret: SqlExpression[] = [];
diff --git a/web-console/src/views/explore-view/utils/time-manipulation.spec.ts b/web-console/src/views/explore-view/utils/time-manipulation.spec.ts
index fd92d5c3081e..70bdcf1e85ef 100644
--- a/web-console/src/views/explore-view/utils/time-manipulation.spec.ts
+++ b/web-console/src/views/explore-view/utils/time-manipulation.spec.ts
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-import { SqlExpression } from '@druid-toolkit/query';
+import { SqlExpression } from 'druid-query-toolkit';
 
 import { decomposeTimeInInterval, shiftBackAndExpandTimeInExpression } from './time-manipulation';
 
diff --git a/web-console/src/views/explore-view/utils/time-manipulation.ts b/web-console/src/views/explore-view/utils/time-manipulation.ts
index fab9a9a7946d..671ed3080f74 100644
--- a/web-console/src/views/explore-view/utils/time-manipulation.ts
+++ b/web-console/src/views/explore-view/utils/time-manipulation.ts
@@ -24,7 +24,7 @@ import {
   SqlExpression,
   SqlFunction,
   SqlLiteral,
-} from '@druid-toolkit/query';
+} from 'druid-query-toolkit';
 
 import { partition } from '../../../utils';
 
diff --git a/web-console/src/views/home-view/datasources-card/datasources-card.tsx b/web-console/src/views/home-view/datasources-card/datasources-card.tsx
index 811187117e70..d2a219776c55 100644
--- a/web-console/src/views/home-view/datasources-card/datasources-card.tsx
+++ b/web-console/src/views/home-view/datasources-card/datasources-card.tsx
@@ -21,8 +21,7 @@ import React from 'react';
 
 import type { Capabilities } from '../../../helpers';
 import { useQueryManager } from '../../../hooks';
-import { Api } from '../../../singletons';
-import { pluralIfNeeded, queryDruidSql } from '../../../utils';
+import { getApiArray, pluralIfNeeded, queryDruidSql } from '../../../utils';
 import { HomeViewCard } from '../home-view-card/home-view-card';
 
 export interface DatasourcesCardProps {
@@ -33,7 +32,7 @@ export const DatasourcesCard = React.memo(function DatasourcesCard(props: Dataso
   const [datasourceCountState] = useQueryManager<Capabilities, number>({
     initQuery: props.capabilities,
     processQuery: async (capabilities, cancelToken) => {
-      let datasources: any[];
+      let datasources: string[];
       if (capabilities.hasSql()) {
         datasources = await queryDruidSql(
           {
@@ -42,10 +41,7 @@ export const DatasourcesCard = React.memo(function DatasourcesCard(props: Dataso
           cancelToken,
         );
       } else if (capabilities.hasCoordinatorAccess()) {
-        const datasourcesResp = await Api.instance.get('/druid/coordinator/v1/datasources', {
-          cancelToken,
-        });
-        datasources = datasourcesResp.data;
+        datasources = await getApiArray<string>('/druid/coordinator/v1/datasources', cancelToken);
       } else {
         throw new Error(`must have SQL or coordinator access`);
       }
diff --git a/web-console/src/views/home-view/segments-card/segments-card.tsx b/web-console/src/views/home-view/segments-card/segments-card.tsx
index d5d157a523b0..6a86fe5f18e1 100644
--- a/web-console/src/views/home-view/segments-card/segments-card.tsx
+++ b/web-console/src/views/home-view/segments-card/segments-card.tsx
@@ -23,7 +23,7 @@ import React from 'react';
 import type { Capabilities } from '../../../helpers';
 import { useQueryManager } from '../../../hooks';
 import { Api } from '../../../singletons';
-import { deepGet, pluralIfNeeded, queryDruidSql } from '../../../utils';
+import { deepGet, getApiArray, pluralIfNeeded, queryDruidSql } from '../../../utils';
 import { HomeViewCard } from '../home-view-card/home-view-card';
 
 export interface SegmentCounts {
@@ -62,11 +62,10 @@ WHERE is_active = 1`,
         const loadstatus = loadstatusResp.data;
         const unavailableSegmentNum = sum(Object.keys(loadstatus), key => loadstatus[key]);
 
-        const datasourcesMetaResp = await Api.instance.get(
+        const datasourcesMeta = await getApiArray(
           '/druid/coordinator/v1/datasources?simple',
-          { cancelToken },
+          cancelToken,
         );
-        const datasourcesMeta = datasourcesMetaResp.data;
         const availableSegmentNum = sum(datasourcesMeta, (curr: any) =>
           deepGet(curr, 'properties.segments.count'),
         );
diff --git a/web-console/src/views/home-view/services-card/services-card.tsx b/web-console/src/views/home-view/services-card/services-card.tsx
index 18a66b832187..a04680237a41 100644
--- a/web-console/src/views/home-view/services-card/services-card.tsx
+++ b/web-console/src/views/home-view/services-card/services-card.tsx
@@ -22,8 +22,7 @@ import React from 'react';
 import { PluralPairIfNeeded } from '../../../components';
 import type { Capabilities } from '../../../helpers';
 import { useQueryManager } from '../../../hooks';
-import { Api } from '../../../singletons';
-import { lookupBy, queryDruidSql } from '../../../utils';
+import { getApiArray, lookupBy, queryDruidSql } from '../../../utils';
 import { HomeViewCard } from '../home-view-card/home-view-card';
 
 export interface ServiceCounts {
@@ -45,10 +44,10 @@ export const ServicesCard = React.memo(function ServicesCard(props: ServicesCard
   const [serviceCountState] = useQueryManager<Capabilities, ServiceCounts>({
     processQuery: async (capabilities, cancelToken) => {
       if (capabilities.hasSql()) {
-        const serviceCountsFromQuery: {
+        const serviceCountsFromQuery = await queryDruidSql<{
           service_type: string;
           count: number;
-        }[] = await queryDruidSql(
+        }>(
           {
             query: `SELECT server_type AS "service_type", COUNT(*) as "count" FROM sys.servers GROUP BY 1`,
           },
@@ -60,12 +59,10 @@ export const ServicesCard = React.memo(function ServicesCard(props: ServicesCard
           x => x.count,
         );
       } else if (capabilities.hasCoordinatorAccess()) {
-        const services = (
-          await Api.instance.get('/druid/coordinator/v1/servers?simple', { cancelToken })
-        ).data;
+        const services = await getApiArray('/druid/coordinator/v1/servers?simple', cancelToken);
 
         const middleManager = capabilities.hasOverlordAccess()
-          ? (await Api.instance.get('/druid/indexer/v1/workers', { cancelToken })).data
+          ? await getApiArray('/druid/indexer/v1/workers', cancelToken)
           : [];
 
         return {
diff --git a/web-console/src/views/home-view/supervisors-card/supervisors-card.tsx b/web-console/src/views/home-view/supervisors-card/supervisors-card.tsx
index ab63e0205ac8..dca25e32d367 100644
--- a/web-console/src/views/home-view/supervisors-card/supervisors-card.tsx
+++ b/web-console/src/views/home-view/supervisors-card/supervisors-card.tsx
@@ -19,10 +19,10 @@
 import { IconNames } from '@blueprintjs/icons';
 import React from 'react';
 
+import type { IngestionSpec } from '../../../druid-models';
 import type { Capabilities } from '../../../helpers';
 import { useQueryManager } from '../../../hooks';
-import { Api } from '../../../singletons';
-import { pluralIfNeeded, queryDruidSql } from '../../../utils';
+import { getApiArray, partition, pluralIfNeeded, queryDruidSql } from '../../../utils';
 import { HomeViewCard } from '../home-view-card/home-view-card';
 
 export interface SupervisorCounts {
@@ -50,11 +50,14 @@ FROM sys.supervisors`,
           )
         )[0];
       } else if (capabilities.hasOverlordAccess()) {
-        const resp = await Api.instance.get('/druid/indexer/v1/supervisor?full', { cancelToken });
-        const data = resp.data;
+        const supervisors = await getApiArray<{ spec: IngestionSpec }>(
+          '/druid/indexer/v1/supervisor?full',
+          cancelToken,
+        );
+        const [running, suspended] = partition(supervisors, d => !d.spec.suspended);
         return {
-          running: data.filter((d: any) => d.spec.suspended === false).length,
-          suspended: data.filter((d: any) => d.spec.suspended === true).length,
+          running: running.length,
+          suspended: suspended.length,
         };
       } else {
         throw new Error(`must have SQL or overlord access`);
diff --git a/web-console/src/views/home-view/tasks-card/tasks-card.tsx b/web-console/src/views/home-view/tasks-card/tasks-card.tsx
index fa91b8a141e3..901a4e15581e 100644
--- a/web-console/src/views/home-view/tasks-card/tasks-card.tsx
+++ b/web-console/src/views/home-view/tasks-card/tasks-card.tsx
@@ -25,8 +25,7 @@ import type { CapacityInfo } from '../../../druid-models';
 import type { Capabilities } from '../../../helpers';
 import { getClusterCapacity } from '../../../helpers';
 import { useQueryManager } from '../../../hooks';
-import { Api } from '../../../singletons';
-import { lookupBy, pluralIfNeeded, queryDruidSql } from '../../../utils';
+import { getApiArray, groupByAsMap, lookupBy, pluralIfNeeded, queryDruidSql } from '../../../utils';
 import { HomeViewCard } from '../home-view-card/home-view-card';
 
 function getTaskStatus(d: any) {
@@ -62,14 +61,12 @@ GROUP BY 1`,
       x => x.count,
     );
   } else if (capabilities.hasOverlordAccess()) {
-    const tasks: any[] = (await Api.instance.get('/druid/indexer/v1/tasks', { cancelToken })).data;
-    return {
-      success: tasks.filter(d => getTaskStatus(d) === 'SUCCESS').length,
-      failed: tasks.filter(d => getTaskStatus(d) === 'FAILED').length,
-      running: tasks.filter(d => getTaskStatus(d) === 'RUNNING').length,
-      pending: tasks.filter(d => getTaskStatus(d) === 'PENDING').length,
-      waiting: tasks.filter(d => getTaskStatus(d) === 'WAITING').length,
-    };
+    const tasks: any[] = await getApiArray('/druid/indexer/v1/tasks', cancelToken);
+    return groupByAsMap(
+      tasks,
+      d => getTaskStatus(d).toLowerCase(),
+      xs => xs.length,
+    );
   } else {
     throw new Error(`must have SQL or overlord access`);
   }
diff --git a/web-console/src/views/load-data-view/load-data-view.tsx b/web-console/src/views/load-data-view/load-data-view.tsx
index b4bd0d841b60..3767a9852e99 100644
--- a/web-console/src/views/load-data-view/load-data-view.tsx
+++ b/web-console/src/views/load-data-view/load-data-view.tsx
@@ -157,6 +157,7 @@ import {
   EMPTY_ARRAY,
   EMPTY_OBJECT,
   filterMap,
+  getApiArray,
   getDruidErrorMessage,
   localStorageGetJson,
   LocalStorageKeys,
@@ -3559,8 +3560,7 @@ export class LoadDataView extends React.PureComponent<LoadDataViewProps, LoadDat
 
     let existingDatasources: string[];
     try {
-      existingDatasources = (await Api.instance.get<string[]>('/druid/coordinator/v1/datasources'))
-        .data;
+      existingDatasources = await getApiArray<string>('/druid/coordinator/v1/datasources');
     } catch {
       return;
     }
diff --git a/web-console/src/views/lookups-view/lookups-view.tsx b/web-console/src/views/lookups-view/lookups-view.tsx
index 2fbfb70703ed..25f45455e224 100644
--- a/web-console/src/views/lookups-view/lookups-view.tsx
+++ b/web-console/src/views/lookups-view/lookups-view.tsx
@@ -41,8 +41,9 @@ import { STANDARD_TABLE_PAGE_SIZE, STANDARD_TABLE_PAGE_SIZE_OPTIONS } from '../.
 import { Api, AppToaster } from '../../singletons';
 import {
   deepGet,
+  getApiArray,
   getDruidErrorMessage,
-  hasPopoverOpen,
+  hasOverlayOpen,
   isLookupsUninitialized,
   LocalStorageBackedVisibility,
   LocalStorageKeys,
@@ -124,14 +125,12 @@ export class LookupsView extends React.PureComponent<LookupsViewProps, LookupsVi
 
     this.lookupsQueryManager = new QueryManager({
       processQuery: async (_, cancelToken) => {
-        const tiersResp = await Api.instance.get(
+        const tiersResp = await getApiArray(
           '/druid/coordinator/v1/lookups/config?discover=true',
-          { cancelToken },
+          cancelToken,
         );
         const tiers =
-          tiersResp.data && tiersResp.data.length > 0
-            ? tiersResp.data.sort(tierNameCompare)
-            : [DEFAULT_LOOKUP_TIER];
+          tiersResp.length > 0 ? tiersResp.sort(tierNameCompare) : [DEFAULT_LOOKUP_TIER];
 
         const lookupResp = await Api.instance.get('/druid/coordinator/v1/lookups/config/all', {
           cancelToken,
@@ -388,6 +387,7 @@ export class LookupsView extends React.PureComponent<LookupsViewProps, LookupsVi
             width: 200,
             Cell: ({ value, original }) => (
               <TableClickableCell
+                tooltip="Show detail"
                 onClick={() => this.onDetail(original)}
                 hoverIcon={IconNames.SEARCH_TEMPLATE}
               >
@@ -511,7 +511,7 @@ export class LookupsView extends React.PureComponent<LookupsViewProps, LookupsVi
         <ViewControlBar label="Lookups">
           <RefreshButton
             onRefresh={auto => {
-              if (auto && hasPopoverOpen()) return;
+              if (auto && hasOverlayOpen()) return;
               this.lookupsQueryManager.rerunLastQuery(auto);
             }}
             localStorageKey={LocalStorageKeys.LOOKUPS_REFRESH_RATE}
diff --git a/web-console/src/views/segments-view/__snapshots__/segments-view.spec.tsx.snap b/web-console/src/views/segments-view/__snapshots__/segments-view.spec.tsx.snap
index e177003b7eed..0e6b64e844d5 100755
--- a/web-console/src/views/segments-view/__snapshots__/segments-view.spec.tsx.snap
+++ b/web-console/src/views/segments-view/__snapshots__/segments-view.spec.tsx.snap
@@ -54,10 +54,7 @@ exports[`SegmentsView matches snapshot 1`] = `
           "Start",
           "End",
           "Version",
-          {
-            "label": "𝑓(sys.segments)",
-            "text": "Time span",
-          },
+          "Time span",
           "Shard type",
           "Shard spec",
           "Partition",
@@ -77,7 +74,6 @@ exports[`SegmentsView matches snapshot 1`] = `
       onClose={[Function]}
       tableColumnsHidden={
         [
-          "Time span",
           "Is published",
           "Is overshadowed",
         ]
@@ -85,6 +81,7 @@ exports[`SegmentsView matches snapshot 1`] = `
     />
   </Memo(ViewControlBar)>
   <SplitterLayout
+    className="timeline-segments-splitter"
     percentage={true}
     primaryIndex={1}
     primaryMinSize={20}
@@ -155,7 +152,6 @@ exports[`SegmentsView matches snapshot 1`] = `
             "accessor": "segment_id",
             "filterable": true,
             "show": true,
-            "sortable": true,
             "width": 280,
           },
           {
@@ -172,7 +168,6 @@ exports[`SegmentsView matches snapshot 1`] = `
             "defaultSortDesc": true,
             "filterable": true,
             "show": false,
-            "sortable": true,
             "width": 120,
           },
           {
@@ -183,8 +178,7 @@ exports[`SegmentsView matches snapshot 1`] = `
             "filterable": true,
             "headerClassName": "enable-comparisons",
             "show": true,
-            "sortable": true,
-            "width": 160,
+            "width": 180,
           },
           {
             "Cell": [Function],
@@ -194,8 +188,7 @@ exports[`SegmentsView matches snapshot 1`] = `
             "filterable": true,
             "headerClassName": "enable-comparisons",
             "show": true,
-            "sortable": true,
-            "width": 160,
+            "width": 180,
           },
           {
             "Cell": [Function],
@@ -204,16 +197,16 @@ exports[`SegmentsView matches snapshot 1`] = `
             "defaultSortDesc": true,
             "filterable": true,
             "show": true,
-            "sortable": true,
-            "width": 160,
+            "width": 180,
           },
           {
-            "Cell": [Function],
             "Header": "Time span",
-            "accessor": "time_span",
-            "filterable": true,
-            "show": false,
-            "sortable": true,
+            "accessor": [Function],
+            "className": "padded",
+            "filterable": false,
+            "id": "time_span",
+            "show": true,
+            "sortable": false,
             "width": 100,
           },
           {
@@ -242,7 +235,6 @@ exports[`SegmentsView matches snapshot 1`] = `
             "className": "padded",
             "filterable": false,
             "show": true,
-            "sortable": true,
             "width": 60,
           },
           {
@@ -253,7 +245,6 @@ exports[`SegmentsView matches snapshot 1`] = `
             "defaultSortDesc": true,
             "filterable": false,
             "show": true,
-            "sortable": true,
             "width": 120,
           },
           {
@@ -374,18 +365,11 @@ exports[`SegmentsView matches snapshot 1`] = `
       defaultFilterMethod={[Function]}
       defaultFiltered={[]}
       defaultPage={0}
-      defaultPageSize={50}
+      defaultPageSize={20}
       defaultResized={[]}
       defaultSortDesc={false}
       defaultSortMethod={[Function]}
-      defaultSorted={
-        [
-          {
-            "desc": true,
-            "id": "start",
-          },
-        ]
-      }
+      defaultSorted={[]}
       expanderDefaults={
         {
           "filterable": false,
@@ -421,7 +405,7 @@ exports[`SegmentsView matches snapshot 1`] = `
       getTrProps={[Function]}
       groupedByPivotKey="_groupedByPivot"
       indexKey="_index"
-      loading={false}
+      loading={true}
       loadingText="Loading..."
       manual={true}
       multiSort={true}
@@ -431,8 +415,13 @@ exports[`SegmentsView matches snapshot 1`] = `
       ofText=""
       onFetchData={[Function]}
       onFilteredChange={[Function]}
+      onPageChange={[Function]}
+      onPageSizeChange={[Function]}
+      onSortedChange={[Function]}
       originalKey="_original"
+      page={0}
       pageJumpText="jump to page"
+      pageSize={50}
       pageSizeOptions={
         [
           50,
@@ -457,6 +446,14 @@ exports[`SegmentsView matches snapshot 1`] = `
       showPaginationBottom={true}
       showPaginationTop={false}
       sortable={true}
+      sorted={
+        [
+          {
+            "desc": true,
+            "id": "start",
+          },
+        ]
+      }
       style={{}}
       subRowsKey="_subRows"
     />
diff --git a/web-console/src/views/segments-view/segments-view.scss b/web-console/src/views/segments-view/segments-view.scss
index a45d8860db1f..f64f881fe4c5 100644
--- a/web-console/src/views/segments-view/segments-view.scss
+++ b/web-console/src/views/segments-view/segments-view.scss
@@ -22,7 +22,7 @@
   height: 100%;
   width: 100%;
 
-  .splitter-layout {
+  .splitter-layout.timeline-segments-splitter {
     position: absolute;
     top: $view-control-bar-height + $standard-padding;
     bottom: 0;
diff --git a/web-console/src/views/segments-view/segments-view.tsx b/web-console/src/views/segments-view/segments-view.tsx
index 9e0d680c8547..da11d5af5cb6 100644
--- a/web-console/src/views/segments-view/segments-view.tsx
+++ b/web-console/src/views/segments-view/segments-view.tsx
@@ -18,10 +18,11 @@
 
 import { Button, ButtonGroup, Intent, Label, MenuItem, Switch, Tag } from '@blueprintjs/core';
 import { IconNames } from '@blueprintjs/icons';
-import { C, L, SqlComparison, SqlExpression } from '@druid-toolkit/query';
+import { C, L, SqlComparison, SqlExpression } from 'druid-query-toolkit';
 import * as JSONBig from 'json-bigint-native';
+import type { ReactNode } from 'react';
 import React from 'react';
-import type { Filter } from 'react-table';
+import type { Filter, SortingRule } from 'react-table';
 import ReactTable from 'react-table';
 
 import {
@@ -43,7 +44,8 @@ import {
 import { AsyncActionDialog } from '../../dialogs';
 import { SegmentTableActionDialog } from '../../dialogs/segments-table-action-dialog/segment-table-action-dialog';
 import { ShowValueDialog } from '../../dialogs/show-value-dialog/show-value-dialog';
-import type { QueryWithContext } from '../../druid-models';
+import type { QueryWithContext, ShardSpec } from '../../druid-models';
+import { computeSegmentTimeSpan, getDatasourceColor } from '../../druid-models';
 import type { Capabilities, CapabilitiesMode } from '../../helpers';
 import {
   booleanCustomTableFilter,
@@ -56,13 +58,14 @@ import {
 import { Api } from '../../singletons';
 import type { NumberLike, TableState } from '../../utils';
 import {
+  applySorting,
   compact,
   countBy,
-  deepGet,
   filterMap,
   formatBytes,
   formatInteger,
-  hasPopoverOpen,
+  getApiArray,
+  hasOverlayOpen,
   isNumberLikeNaN,
   LocalStorageBackedVisibility,
   LocalStorageKeys,
@@ -84,7 +87,7 @@ const TABLE_COLUMNS_BY_MODE: Record<CapabilitiesMode, TableColumnSelectorColumn[
     'Start',
     'End',
     'Version',
-    { text: 'Time span', label: '𝑓(sys.segments)' },
+    'Time span',
     'Shard type',
     'Shard spec',
     'Partition',
@@ -99,14 +102,13 @@ const TABLE_COLUMNS_BY_MODE: Record<CapabilitiesMode, TableColumnSelectorColumn[
     'Is published',
     'Is overshadowed',
   ],
-  'no-sql': ['Segment ID', 'Datasource', 'Start', 'End', 'Version', 'Partition', 'Size'],
   'no-proxy': [
     'Segment ID',
     'Datasource',
     'Start',
     'End',
     'Version',
-    { text: 'Time span', label: '𝑓(sys.segments)' },
+    'Time span',
     'Shard type',
     'Shard spec',
     'Partition',
@@ -121,12 +123,72 @@ const TABLE_COLUMNS_BY_MODE: Record<CapabilitiesMode, TableColumnSelectorColumn[
     'Is published',
     'Is overshadowed',
   ],
+  'no-sql': [
+    'Segment ID',
+    'Datasource',
+    'Start',
+    'End',
+    'Version',
+    'Time span',
+    'Shard type',
+    'Shard spec',
+    'Partition',
+    'Size',
+    'Replication factor',
+    'Is realtime',
+    'Is overshadowed',
+  ],
 };
 
+function maybeParseJsonBig(str: string): any {
+  try {
+    return JSONBig.parse(str);
+  } catch {
+    return undefined;
+  }
+}
+
 function formatRangeDimensionValue(dimension: any, value: any): string {
   return `${C(String(dimension))}=${L(String(value))}`;
 }
 
+function segmentFiltersToExpression(filters: Filter[]): SqlExpression {
+  return SqlExpression.and(
+    ...filterMap(filters, filter => {
+      if (filter.id === 'shard_type') {
+        // Special handling for shard_type that needs to be searched for in the shard_spec
+        // Creates filters like `shard_spec LIKE '%"type":"numbered"%'`
+        const modeAndNeedle = parseFilterModeAndNeedle(filter);
+        if (!modeAndNeedle) return;
+        const shardSpecColumn = C('shard_spec');
+        switch (modeAndNeedle.mode) {
+          case '=':
+            return SqlComparison.like(shardSpecColumn, `%"type":"${modeAndNeedle.needle}"%`);
+
+          case '!=':
+            return SqlComparison.notLike(shardSpecColumn, `%"type":"${modeAndNeedle.needle}"%`);
+
+          default:
+            return SqlComparison.like(shardSpecColumn, `%"type":"${modeAndNeedle.needle}%`);
+        }
+      } else if (filter.id.startsWith('is_')) {
+        switch (filter.value) {
+          case '=false':
+            return C(filter.id).equal(0);
+
+          case '=true':
+            return C(filter.id).equal(1);
+
+          default:
+            return;
+        }
+      } else {
+        return sqlQueryCustomTableFilter(filter);
+      }
+    }),
+  );
+}
+
 interface SegmentsQuery extends TableState {
   visibleColumns: LocalStorageBackedVisibility;
   capabilities: Capabilities;
@@ -140,8 +202,7 @@ interface SegmentQueryResultRow {
   interval: string;
   segment_id: string;
   version: string;
-  time_span: string;
-  shard_spec: string;
+  shard_spec: ShardSpec;
   partition_num: number;
   size: number;
   num_rows: NumberLike;
@@ -167,11 +228,16 @@ export interface SegmentsViewState {
   segmentTableActionDialogId?: string;
   datasourceTableActionDialogId?: string;
   actions: BasicAction[];
-  terminateSegmentId?: string;
-  terminateDatasourceId?: string;
+
   visibleColumns: LocalStorageBackedVisibility;
   groupByInterval: boolean;
-  showSegmentTimeline: boolean;
+  showSegmentTimeline?: { capabilities: Capabilities; datasource?: string };
+  page: number;
+  pageSize: number;
+  sorted: SortingRule[];
+
+  terminateSegmentId?: string;
+  terminateDatasourceId?: string;
   showFullShardSpec?: string;
 }
 
@@ -183,16 +249,6 @@ export class SegmentsView extends React.PureComponent<SegmentsViewProps, Segment
       `"start"`,
       `"end"`,
       `"version"`,
-      visibleColumns.shown('Time span') &&
-        `CASE
-  WHEN "start" = '-146136543-09-08T08:23:32.096Z' AND "end" = '146140482-04-24T15:36:27.903Z' THEN 'All'
-  WHEN "start" LIKE '%-01-01T00:00:00.000Z' AND "end" LIKE '%-01-01T00:00:00.000Z' THEN 'Year'
-  WHEN "start" LIKE '%-01T00:00:00.000Z' AND "end" LIKE '%-01T00:00:00.000Z' THEN 'Month'
-  WHEN "start" LIKE '%T00:00:00.000Z' AND "end" LIKE '%T00:00:00.000Z' THEN 'Day'
-  WHEN "start" LIKE '%:00:00.000Z' AND "end" LIKE '%:00:00.000Z' THEN 'Hour'
-  WHEN "start" LIKE '%:00.000Z' AND "end" LIKE '%:00.000Z' THEN 'Minute'
-  ELSE 'Sub minute'
-END AS "time_span"`,
       visibleColumns.shown('Shard type', 'Shard spec') && `"shard_spec"`,
       visibleColumns.shown('Partition') && `"partition_num"`,
       visibleColumns.shown('Size') && `"size"`,
@@ -211,34 +267,8 @@ END AS "time_span"`,
     return `WITH s AS (SELECT\n${columns.join(',\n')}\nFROM sys.segments)`;
   }
 
-  static computeTimeSpan(start: string, end: string): string {
-    if (start.endsWith('-01-01T00:00:00.000Z') && end.endsWith('-01-01T00:00:00.000Z')) {
-      return 'Year';
-    }
-
-    if (start.endsWith('-01T00:00:00.000Z') && end.endsWith('-01T00:00:00.000Z')) {
-      return 'Month';
-    }
-
-    if (start.endsWith('T00:00:00.000Z') && end.endsWith('T00:00:00.000Z')) {
-      return 'Day';
-    }
-
-    if (start.endsWith(':00:00.000Z') && end.endsWith(':00:00.000Z')) {
-      return 'Hour';
-    }
-
-    if (start.endsWith(':00.000Z') && end.endsWith(':00.000Z')) {
-      return 'Minute';
-    }
-
-    return 'Sub minute';
-  }
-
   private readonly segmentsQueryManager: QueryManager<SegmentsQuery, SegmentQueryResultRow[]>;
 
-  private lastTableState: TableState | undefined;
-
   constructor(props: SegmentsViewProps) {
     super(props);
 
@@ -247,10 +277,16 @@ END AS "time_span"`,
       segmentsState: QueryState.INIT,
       visibleColumns: new LocalStorageBackedVisibility(
         LocalStorageKeys.SEGMENT_TABLE_COLUMN_SELECTION,
-        ['Time span', 'Is published', 'Is overshadowed'],
+        ['Is published', 'Is overshadowed'],
       ),
       groupByInterval: false,
-      showSegmentTimeline: false,
+      page: 0,
+      pageSize: STANDARD_TABLE_PAGE_SIZE,
+      sorted: [
+        props.capabilities.hasSql()
+          ? { id: 'start', desc: true }
+          : { id: 'datasource', desc: false },
+      ],
     };
 
     this.segmentsQueryManager = new QueryManager({
@@ -260,47 +296,11 @@ END AS "time_span"`,
           query;
 
         if (capabilities.hasSql()) {
-          const whereParts = filterMap(filtered, (f: Filter) => {
-            if (f.id === 'shard_type') {
-              // Special handling for shard_type that needs to be searched for in the shard_spec
-              // Creates filters like `shard_spec LIKE '%"type":"numbered"%'`
-              const modeAndNeedle = parseFilterModeAndNeedle(f);
-              if (!modeAndNeedle) return;
-              const shardSpecColumn = C('shard_spec');
-              switch (modeAndNeedle.mode) {
-                case '=':
-                  return SqlComparison.like(shardSpecColumn, `%"type":"${modeAndNeedle.needle}"%`);
-
-                case '!=':
-                  return SqlComparison.notLike(
-                    shardSpecColumn,
-                    `%"type":"${modeAndNeedle.needle}"%`,
-                  );
-
-                default:
-                  return SqlComparison.like(shardSpecColumn, `%"type":"${modeAndNeedle.needle}%`);
-              }
-            } else if (f.id.startsWith('is_')) {
-              switch (f.value) {
-                case '=false':
-                  return C(f.id).equal(0);
-
-                case '=true':
-                  return C(f.id).equal(1);
-
-                default:
-                  return;
-              }
-            } else {
-              return sqlQueryCustomTableFilter(f);
-            }
-          });
-
-          let queryParts: string[];
+          const whereExpression = segmentFiltersToExpression(filtered);
 
           let filterClause = '';
-          if (whereParts.length) {
-            filterClause = SqlExpression.and(...whereParts).toString();
+          if (whereExpression.toString() !== 'TRUE') {
+            filterClause = whereExpression.toString();
           }
 
           let effectiveSorted = sorted;
@@ -317,6 +317,7 @@ END AS "time_span"`,
           const base = SegmentsView.baseQuery(visibleColumns);
           const orderByClause = sortedToOrderByClause(effectiveSorted);
 
+          let queryParts: string[];
           if (groupByInterval) {
             const innerQuery = compact([
               `SELECT "start", "end"`,
@@ -356,78 +357,71 @@ END AS "time_span"`,
           }
           const sqlQuery = queryParts.join('\n');
           setIntermediateQuery(sqlQuery);
-          return await queryDruidSql({ query: sqlQuery }, cancelToken);
-        } else if (capabilities.hasCoordinatorAccess()) {
-          let datasourceList: string[] = (
-            await Api.instance.get('/druid/coordinator/v1/metadata/datasources', { cancelToken })
-          ).data;
+          let result = await queryDruidSql({ query: sqlQuery }, cancelToken);
 
+          if (visibleColumns.shown('Shard type', 'Shard spec')) {
+            result = result.map(sr => ({
+              ...sr,
+              shard_spec: maybeParseJsonBig(sr.shard_spec),
+            }));
+          }
+
+          return result as SegmentQueryResultRow[];
+        } else if (capabilities.hasCoordinatorAccess()) {
+          let datasourceList: string[] = [];
           const datasourceFilter = filtered.find(({ id }) => id === 'datasource');
           if (datasourceFilter) {
-            datasourceList = datasourceList.filter(datasource =>
+            datasourceList = (
+              await getApiArray('/druid/coordinator/v1/metadata/datasources', cancelToken)
+            ).filter((datasource: string) =>
               booleanCustomTableFilter(datasourceFilter, datasource),
             );
           }
 
-          if (sorted.length && sorted[0].id === 'datasource') {
-            datasourceList.sort(
-              sorted[0].desc ? (d1, d2) => d1.localeCompare(d2) : (d1, d2) => d2.localeCompare(d1),
-            );
-          }
-
-          const maxResults = (page + 1) * pageSize;
-          let results: SegmentQueryResultRow[] = [];
-
-          const n = Math.min(datasourceList.length, maxResults);
-          for (let i = 0; i < n && results.length < maxResults; i++) {
-            const segments = (
-              await Api.instance.get(
-                `/druid/coordinator/v1/datasources/${Api.encodePath(datasourceList[i])}?full`,
-                { cancelToken },
-              )
-            ).data?.segments;
-            if (!Array.isArray(segments)) continue;
-
-            let segmentQueryResultRows: SegmentQueryResultRow[] = segments.map((segment: any) => {
-              const [start, end] = segment.interval.split('/');
-              return {
-                segment_id: segment.identifier,
-                datasource: segment.dataSource,
-                start,
-                end,
-                interval: segment.interval,
-                version: segment.version,
-                time_span: SegmentsView.computeTimeSpan(start, end),
-                shard_spec: deepGet(segment, 'shardSpec'),
-                partition_num: deepGet(segment, 'shardSpec.partitionNum') || 0,
-                size: segment.size,
-                num_rows: -1,
-                avg_row_size: -1,
-                num_replicas: -1,
-                replication_factor: -1,
-                is_available: -1,
-                is_active: -1,
-                is_realtime: -1,
-                is_published: -1,
-                is_overshadowed: -1,
-              };
-            });
+          let results = (
+            await getApiArray(
+              `/druid/coordinator/v1/metadata/segments?includeOvershadowedStatus&includeRealtimeSegments${datasourceList
+                .map(d => `&datasources=${Api.encodePath(d)}`)
+                .join('')}`,
+              cancelToken,
+            )
+          ).map((segment: any) => {
+            const [start, end] = segment.interval.split('/');
+            return {
+              segment_id: segment.identifier,
+              datasource: segment.dataSource,
+              start,
+              end,
+              interval: segment.interval,
+              version: segment.version,
+              shard_spec: segment.shardSpec,
+              partition_num: segment.shardSpec?.partitionNum || 0,
+              size: segment.size,
+              num_rows: -1,
+              avg_row_size: -1,
+              num_replicas: -1,
+              replication_factor: segment.replicationFactor,
+              is_available: -1,
+              is_active: -1,
+              is_realtime: Number(segment.realtime),
+              is_published: -1,
+              is_overshadowed: Number(segment.overshadowed),
+            };
+          });
 
-            if (filtered.length) {
-              segmentQueryResultRows = segmentQueryResultRows.filter((d: SegmentQueryResultRow) => {
-                return filtered.every(filter => {
-                  return booleanCustomTableFilter(
-                    filter,
-                    d[filter.id as keyof SegmentQueryResultRow],
-                  );
-                });
+          if (filtered.length) {
+            results = results.filter((d: SegmentQueryResultRow) => {
+              return filtered.every(filter => {
+                return booleanCustomTableFilter(
+                  filter,
+                  d[filter.id as keyof SegmentQueryResultRow],
+                );
               });
-            }
-
-            results = results.concat(segmentQueryResultRows);
+            });
           }
 
-          return results.slice(page * pageSize, maxResults);
+          const maxResults = (page + 1) * pageSize;
+          return applySorting(results, sorted).slice(page * pageSize, maxResults);
         } else {
           throw new Error('must have SQL or coordinator access to load this view');
         }
@@ -440,20 +434,54 @@ END AS "time_span"`,
     });
   }
 
+  componentDidMount() {
+    this.fetchData();
+  }
+
   componentWillUnmount(): void {
     this.segmentsQueryManager.terminate();
   }
 
-  private readonly fetchData = (groupByInterval: boolean, tableState?: TableState) => {
-    const { capabilities } = this.props;
-    const { visibleColumns } = this.state;
-    if (tableState) this.lastTableState = tableState;
-    if (!this.lastTableState) return;
-    const { page, pageSize, filtered, sorted } = this.lastTableState;
+  componentDidUpdate(
+    prevProps: Readonly<SegmentsViewProps>,
+    prevState: Readonly<SegmentsViewState>,
+  ) {
+    const { filters } = this.props;
+    const { groupByInterval, page, pageSize, sorted } = this.state;
+    if (
+      !segmentFiltersToExpression(filters).equals(segmentFiltersToExpression(prevProps.filters)) ||
+      groupByInterval !== prevState.groupByInterval ||
+      page !== prevState.page ||
+      pageSize !== prevState.pageSize ||
+      sortedToOrderByClause(sorted) !== sortedToOrderByClause(prevState.sorted)
+    ) {
+      this.fetchData();
+    }
+  }
+
+  private readonly refresh = (auto: boolean): void => {
+    if (auto && hasOverlayOpen()) return;
+    this.segmentsQueryManager.rerunLastQuery(auto);
+
+    const { showSegmentTimeline } = this.state;
+    if (showSegmentTimeline) {
+      // Create a new capabilities object to force the segment timeline to re-render
+      this.setState(({ showSegmentTimeline }) => ({
+        showSegmentTimeline: {
+          ...showSegmentTimeline,
+          capabilities: this.props.capabilities.clone(),
+        },
+      }));
+    }
+  };
+
+  private readonly fetchData = () => {
+    const { capabilities, filters } = this.props;
+    const { visibleColumns, groupByInterval, page, pageSize, sorted } = this.state;
     this.segmentsQueryManager.runQuery({
       page,
       pageSize,
-      filtered,
+      filtered: filters,
       sorted,
       visibleColumns,
       capabilities,
@@ -480,7 +508,11 @@ END AS "time_span"`,
     });
   }
 
-  private renderFilterableCell(field: string, enableComparisons = false) {
+  private renderFilterableCell(
+    field: string,
+    enableComparisons = false,
+    valueFn: (value: string) => ReactNode = String,
+  ) {
     const { filters, onFiltersChange } = this.props;
 
     // eslint-disable-next-line react/display-name
@@ -492,14 +524,22 @@ END AS "time_span"`,
         onFiltersChange={onFiltersChange}
         enableComparisons={enableComparisons}
       >
-        {row.value}
+        {valueFn(row.value)}
       </TableFilterableCell>
     );
   }
 
   renderSegmentsTable() {
     const { capabilities, filters, onFiltersChange } = this.props;
-    const { segmentsState, visibleColumns, groupByInterval } = this.state;
+    const {
+      segmentsState,
+      visibleColumns,
+      groupByInterval,
+      page,
+      pageSize,
+      sorted,
+      showSegmentTimeline,
+    } = this.state;
 
     const segments = segmentsState.data || [];
 
@@ -532,26 +572,27 @@ END AS "time_span"`,
         filterable
         filtered={filters}
         onFilteredChange={onFiltersChange}
-        defaultSorted={[hasSql ? { id: 'start', desc: true } : { id: 'datasource', desc: false }]}
-        onFetchData={tableState => {
-          this.fetchData(groupByInterval, tableState);
-        }}
+        sorted={sorted}
+        onSortedChange={sorted => this.setState({ sorted })}
+        page={page}
+        onPageChange={page => this.setState({ page })}
+        pageSize={pageSize}
+        onPageSizeChange={pageSize => this.setState({ pageSize })}
+        pageSizeOptions={STANDARD_TABLE_PAGE_SIZE_OPTIONS}
+        showPagination
         showPageJump={false}
         ofText=""
         pivotBy={groupByInterval ? ['interval'] : []}
-        defaultPageSize={STANDARD_TABLE_PAGE_SIZE}
-        pageSizeOptions={STANDARD_TABLE_PAGE_SIZE_OPTIONS}
-        showPagination
         columns={[
           {
             Header: 'Segment ID',
             show: visibleColumns.shown('Segment ID'),
             accessor: 'segment_id',
             width: 280,
-            sortable: hasSql,
             filterable: allowGeneralFilter,
             Cell: row => (
               <TableClickableCell
+                tooltip="Show detail"
                 onClick={() => this.onDetail(row.value, row.row.datasource)}
                 hoverIcon={IconNames.SEARCH_TEMPLATE}
               >
@@ -564,14 +605,23 @@ END AS "time_span"`,
             show: visibleColumns.shown('Datasource'),
             accessor: 'datasource',
             width: 140,
-            Cell: this.renderFilterableCell('datasource'),
+            Cell: this.renderFilterableCell(
+              'datasource',
+              false,
+              showSegmentTimeline
+                ? value => (
+                    <>
+                      <span style={{ color: getDatasourceColor(value) }}>&#9632;</span> {value}
+                    </>
+                  )
+                : String,
+            ),
           },
           {
             Header: 'Interval',
             show: groupByInterval,
             accessor: 'interval',
             width: 120,
-            sortable: hasSql,
             defaultSortDesc: true,
             filterable: allowGeneralFilter,
             Cell: this.renderFilterableCell('interval'),
@@ -581,8 +631,7 @@ END AS "time_span"`,
             show: visibleColumns.shown('Start'),
             accessor: 'start',
             headerClassName: 'enable-comparisons',
-            width: 160,
-            sortable: hasSql,
+            width: 180,
             defaultSortDesc: true,
             filterable: allowGeneralFilter,
             Cell: this.renderFilterableCell('start', true),
@@ -592,8 +641,7 @@ END AS "time_span"`,
             show: visibleColumns.shown('End'),
             accessor: 'end',
             headerClassName: 'enable-comparisons',
-            width: 160,
-            sortable: hasSql,
+            width: 180,
             defaultSortDesc: true,
             filterable: allowGeneralFilter,
             Cell: this.renderFilterableCell('end', true),
@@ -602,20 +650,20 @@ END AS "time_span"`,
             Header: 'Version',
             show: visibleColumns.shown('Version'),
             accessor: 'version',
-            width: 160,
-            sortable: hasSql,
+            width: 180,
             defaultSortDesc: true,
             filterable: allowGeneralFilter,
-            Cell: this.renderFilterableCell('version'),
+            Cell: this.renderFilterableCell('version', true),
           },
           {
             Header: 'Time span',
             show: visibleColumns.shown('Time span'),
-            accessor: 'time_span',
+            id: 'time_span',
+            className: 'padded',
+            accessor: ({ start, end }) => computeSegmentTimeSpan(start, end),
             width: 100,
-            sortable: hasSql,
-            filterable: allowGeneralFilter,
-            Cell: this.renderFilterableCell('time_span'),
+            sortable: false,
+            filterable: false,
           },
           {
             Header: 'Shard type',
@@ -623,14 +671,9 @@ END AS "time_span"`,
             id: 'shard_type',
             width: 100,
             sortable: false,
-            accessor: d => {
-              let v: any;
-              try {
-                v = JSONBig.parse(d.shard_spec);
-              } catch {}
-
-              if (typeof v?.type !== 'string') return '-';
-              return v?.type;
+            accessor: ({ shard_spec }) => {
+              if (typeof shard_spec?.type !== 'string') return '-';
+              return shard_spec?.type;
             },
             Cell: this.renderFilterableCell('shard_type', true),
           },
@@ -643,35 +686,33 @@ END AS "time_span"`,
             sortable: false,
             filterable: false,
             Cell: ({ value }) => {
-              let v: any;
-              try {
-                v = JSONBig.parse(value);
-              } catch {}
-
               const onShowFullShardSpec = () => {
                 this.setState({
                   showFullShardSpec:
-                    v && typeof v === 'object' ? JSONBig.stringify(v, undefined, 2) : String(value),
+                    value && typeof value === 'object'
+                      ? JSONBig.stringify(value, undefined, 2)
+                      : String(value),
                 });
               };
 
-              switch (v?.type) {
+              switch (value?.type) {
                 case 'range': {
-                  const dimensions: string[] = v.dimensions || [];
+                  const dimensions: string[] = value.dimensions || [];
                   const formatEdge = (values: string[]) =>
                     dimensions.map((d, i) => formatRangeDimensionValue(d, values[i])).join('; ');
 
                   return (
                     <TableClickableCell
                       className="range-detail"
+                      tooltip="Show full shardSpec"
                       onClick={onShowFullShardSpec}
                       hoverIcon={IconNames.EYE_OPEN}
                     >
                       <span className="range-label">Start:</span>
-                      {Array.isArray(v.start) ? formatEdge(v.start) : '-∞'}
+                      {Array.isArray(value.start) ? formatEdge(value.start) : '-∞'}
                       <br />
                       <span className="range-label">End:</span>
-                      {Array.isArray(v.end) ? formatEdge(v.end) : '∞'}
+                      {Array.isArray(value.end) ? formatEdge(value.end) : '∞'}
                     </TableClickableCell>
                   );
                 }
@@ -680,23 +721,29 @@ END AS "time_span"`,
                   return (
                     <TableClickableCell
                       className="range-detail"
+                      tooltip="Show full shardSpec"
                       onClick={onShowFullShardSpec}
                       hoverIcon={IconNames.EYE_OPEN}
                     >
                       <span className="range-label">Start:</span>
-                      {v.start != null ? formatRangeDimensionValue(v.dimension, v.start) : '-∞'}
+                      {value.start != null
+                        ? formatRangeDimensionValue(value.dimension, value.start)
+                        : '-∞'}
                       <br />
                       <span className="range-label">End:</span>
-                      {v.end != null ? formatRangeDimensionValue(v.dimension, v.end) : '∞'}
+                      {value.end != null
+                        ? formatRangeDimensionValue(value.dimension, value.end)
+                        : '∞'}
                     </TableClickableCell>
                   );
                 }
 
                 case 'hashed': {
-                  const { partitionDimensions } = v;
-                  if (!Array.isArray(partitionDimensions)) return value;
+                  const { partitionDimensions } = value;
+                  if (!Array.isArray(partitionDimensions)) return JSONBig.stringify(value);
                   return (
                     <TableClickableCell
+                      tooltip="Show full shardSpec"
                       onClick={onShowFullShardSpec}
                       hoverIcon={IconNames.EYE_OPEN}
                     >
@@ -714,6 +761,7 @@ END AS "time_span"`,
                 case 'tombstone':
                   return (
                     <TableClickableCell
+                      tooltip="Show full shardSpec"
                       onClick={onShowFullShardSpec}
                       hoverIcon={IconNames.EYE_OPEN}
                     >
@@ -724,10 +772,11 @@ END AS "time_span"`,
                 default:
                   return (
                     <TableClickableCell
+                      tooltip="Show full shardSpec"
                       onClick={onShowFullShardSpec}
                       hoverIcon={IconNames.EYE_OPEN}
                     >
-                      {String(value)}
+                      {JSONBig.stringify(value)}
                     </TableClickableCell>
                   );
               }
@@ -752,7 +801,6 @@ END AS "time_span"`,
             accessor: 'partition_num',
             width: 60,
             filterable: false,
-            sortable: hasSql,
             className: 'padded',
           },
           {
@@ -760,7 +808,6 @@ END AS "time_span"`,
             show: visibleColumns.shown('Size'),
             accessor: 'size',
             filterable: false,
-            sortable: hasSql,
             defaultSortDesc: true,
             width: 120,
             className: 'padded',
@@ -820,7 +867,7 @@ END AS "time_span"`,
           },
           {
             Header: twoLines('Replication factor', <i>(desired)</i>),
-            show: hasSql && visibleColumns.shown('Replication factor'),
+            show: visibleColumns.shown('Replication factor'),
             accessor: 'replication_factor',
             width: 80,
             filterable: false,
@@ -847,7 +894,7 @@ END AS "time_span"`,
           },
           {
             Header: 'Is realtime',
-            show: hasSql && visibleColumns.shown('Is realtime'),
+            show: visibleColumns.shown('Is realtime'),
             id: 'is_realtime',
             accessor: row => String(Boolean(row.is_realtime)),
             Filter: BooleanFilterInput,
@@ -865,7 +912,7 @@ END AS "time_span"`,
           },
           {
             Header: 'Is overshadowed',
-            show: hasSql && visibleColumns.shown('Is overshadowed'),
+            show: visibleColumns.shown('Is overshadowed'),
             id: 'is_overshadowed',
             accessor: row => String(Boolean(row.is_overshadowed)),
             Filter: BooleanFilterInput,
@@ -945,9 +992,9 @@ END AS "time_span"`,
           <MenuItem
             icon={IconNames.APPLICATION}
             text="View SQL query for table"
-            disabled={!lastSegmentsQuery}
+            disabled={typeof lastSegmentsQuery !== 'string'}
             onClick={() => {
-              if (!lastSegmentsQuery) return;
+              if (typeof lastSegmentsQuery !== 'string') return;
               goToQuery({ queryString: lastSegmentsQuery });
             }}
           />
@@ -957,6 +1004,7 @@ END AS "time_span"`,
   }
 
   render() {
+    const { capabilities, onFiltersChange } = this.props;
     const {
       segmentTableActionDialogId,
       datasourceTableActionDialogId,
@@ -964,18 +1012,14 @@ END AS "time_span"`,
       visibleColumns,
       showSegmentTimeline,
       showFullShardSpec,
+      groupByInterval,
     } = this.state;
-    const { capabilities } = this.props;
-    const { groupByInterval } = this.state;
 
     return (
       <div className="segments-view app-view">
         <ViewControlBar label="Segments">
           <RefreshButton
-            onRefresh={auto => {
-              if (auto && hasPopoverOpen()) return;
-              this.segmentsQueryManager.rerunLastQuery(auto);
-            }}
+            onRefresh={this.refresh}
             localStorageKey={LocalStorageKeys.SEGMENTS_REFRESH_RATE}
           />
           <Label>Group by</Label>
@@ -984,7 +1028,6 @@ END AS "time_span"`,
               active={!groupByInterval}
               onClick={() => {
                 this.setState({ groupByInterval: false });
-                this.fetchData(false);
               }}
             >
               None
@@ -993,7 +1036,6 @@ END AS "time_span"`,
               active={groupByInterval}
               onClick={() => {
                 this.setState({ groupByInterval: true });
-                this.fetchData(true);
               }}
             >
               Interval
@@ -1001,9 +1043,13 @@ END AS "time_span"`,
           </ButtonGroup>
           {this.renderBulkSegmentsActions()}
           <Switch
-            checked={showSegmentTimeline}
+            checked={Boolean(showSegmentTimeline)}
             label="Show segment timeline"
-            onChange={() => this.setState({ showSegmentTimeline: !showSegmentTimeline })}
+            onChange={() =>
+              this.setState({
+                showSegmentTimeline: showSegmentTimeline ? undefined : { capabilities },
+              })
+            }
             disabled={!capabilities.hasSqlOrCoordinatorAccess()}
           />
           <TableColumnSelector
@@ -1015,12 +1061,13 @@ END AS "time_span"`,
             }
             onClose={added => {
               if (!added) return;
-              this.fetchData(groupByInterval);
+              this.fetchData();
             }}
             tableColumnsHidden={visibleColumns.getHiddenColumns()}
           />
         </ViewControlBar>
         <SplitterLayout
+          className="timeline-segments-splitter"
           vertical
           percentage
           secondaryInitialSize={35}
@@ -1028,7 +1075,33 @@ END AS "time_span"`,
           primaryMinSize={20}
           secondaryMinSize={10}
         >
-          {showSegmentTimeline && <SegmentTimeline capabilities={capabilities} />}
+          {showSegmentTimeline && (
+            <SegmentTimeline
+              capabilities={showSegmentTimeline.capabilities}
+              datasource={showSegmentTimeline.datasource}
+              getIntervalActionButton={(start, end, datasource, realtime) => {
+                return (
+                  <Button
+                    text="Apply fitler to table"
+                    small
+                    rightIcon={IconNames.ARROW_DOWN}
+                    onClick={() =>
+                      onFiltersChange(
+                        compact([
+                          start && { id: 'start', value: `>=${start.toISOString()}` },
+                          end && { id: 'end', value: `<${end.toISOString()}` },
+                          datasource && { id: 'datasource', value: `=${datasource}` },
+                          typeof realtime === 'boolean'
+                            ? { id: 'is_realtime', value: `=${realtime}` }
+                            : undefined,
+                        ]),
+                      )
+                    }
+                  />
+                );
+              }}
+            />
+          )}
           {this.renderSegmentsTable()}
         </SplitterLayout>
         {this.renderTerminateSegmentAction()}
diff --git a/web-console/src/views/services-view/services-view.tsx b/web-console/src/views/services-view/services-view.tsx
index 88a5be35c527..e658d9355947 100644
--- a/web-console/src/views/services-view/services-view.tsx
+++ b/web-console/src/views/services-view/services-view.tsx
@@ -48,7 +48,8 @@ import {
   formatBytes,
   formatBytesCompact,
   formatDurationWithMsIfNeeded,
-  hasPopoverOpen,
+  getApiArray,
+  hasOverlayOpen,
   LocalStorageBackedVisibility,
   LocalStorageKeys,
   lookupBy,
@@ -257,24 +258,24 @@ ORDER BY
         if (capabilities.hasSql()) {
           services = await queryDruidSql({ query: ServicesView.SERVICE_SQL }, cancelToken);
         } else if (capabilities.hasCoordinatorAccess()) {
-          services = (
-            await Api.instance.get('/druid/coordinator/v1/servers?simple', { cancelToken })
-          ).data.map((s: any): ServiceResultRow => {
-            const hostParts = s.host.split(':');
-            const port = parseInt(hostParts[1], 10);
-            return {
-              service: s.host,
-              service_type: s.type === 'indexer-executor' ? 'peon' : s.type,
-              tier: s.tier,
-              host: hostParts[0],
-              plaintext_port: port < 9000 ? port : -1,
-              tls_port: port < 9000 ? -1 : port,
-              curr_size: s.currSize,
-              max_size: s.maxSize,
-              start_time: '1970:01:01T00:00:00Z',
-              is_leader: 0,
-            };
-          });
+          services = (await getApiArray('/druid/coordinator/v1/servers?simple', cancelToken)).map(
+            (s: any): ServiceResultRow => {
+              const hostParts = s.host.split(':');
+              const port = parseInt(hostParts[1], 10);
+              return {
+                service: s.host,
+                service_type: s.type === 'indexer-executor' ? 'peon' : s.type,
+                tier: s.tier,
+                host: hostParts[0],
+                plaintext_port: port < 9000 ? port : -1,
+                tls_port: port < 9000 ? -1 : port,
+                curr_size: s.currSize,
+                max_size: s.maxSize,
+                start_time: '1970:01:01T00:00:00Z',
+                is_leader: 0,
+              };
+            },
+          );
         } else {
           throw new Error(`must have SQL or coordinator access`);
         }
@@ -308,9 +309,10 @@ ORDER BY
         if (capabilities.hasOverlordAccess()) {
           auxiliaryQueries.push(async (services, cancelToken) => {
             try {
-              const workerInfos = (
-                await Api.instance.get<WorkerInfo[]>('/druid/indexer/v1/workers', { cancelToken })
-              ).data;
+              const workerInfos = await getApiArray<WorkerInfo>(
+                '/druid/indexer/v1/workers',
+                cancelToken,
+              );
 
               const workerInfoLookup: Record<string, WorkerInfo> = lookupBy(
                 workerInfos,
@@ -808,7 +810,7 @@ ORDER BY
           </ButtonGroup>
           <RefreshButton
             onRefresh={auto => {
-              if (auto && hasPopoverOpen()) return;
+              if (auto && hasOverlayOpen()) return;
               this.serviceQueryManager.rerunLastQuery(auto);
             }}
             localStorageKey={LocalStorageKeys.SERVICES_REFRESH_RATE}
diff --git a/web-console/src/views/sql-data-loader-view/column-actions/column-actions.tsx b/web-console/src/views/sql-data-loader-view/column-actions/column-actions.tsx
index 03ea12c738fa..64738e86e5f5 100644
--- a/web-console/src/views/sql-data-loader-view/column-actions/column-actions.tsx
+++ b/web-console/src/views/sql-data-loader-view/column-actions/column-actions.tsx
@@ -18,8 +18,8 @@
 
 import { Button, FormGroup, Menu, MenuItem, Popover } from '@blueprintjs/core';
 import { IconNames } from '@blueprintjs/icons';
-import type { QueryResult, SqlExpression } from '@druid-toolkit/query';
-import { F } from '@druid-toolkit/query';
+import type { QueryResult, SqlExpression } from 'druid-query-toolkit';
+import { F } from 'druid-query-toolkit';
 import type { JSX } from 'react';
 import React from 'react';
 
diff --git a/web-console/src/views/sql-data-loader-view/column-editor/column-editor.tsx b/web-console/src/views/sql-data-loader-view/column-editor/column-editor.tsx
index 6e1cd3092bc0..b10f0d5c78a8 100644
--- a/web-console/src/views/sql-data-loader-view/column-editor/column-editor.tsx
+++ b/web-console/src/views/sql-data-loader-view/column-editor/column-editor.tsx
@@ -28,8 +28,8 @@ import {
   Position,
 } from '@blueprintjs/core';
 import { IconNames } from '@blueprintjs/icons';
-import type { QueryResult } from '@druid-toolkit/query';
-import { F, SqlExpression, SqlFunction, SqlType } from '@druid-toolkit/query';
+import type { QueryResult } from 'druid-query-toolkit';
+import { F, SqlExpression, SqlFunction, SqlType } from 'druid-query-toolkit';
 import type { JSX } from 'react';
 import React, { useState } from 'react';
 
diff --git a/web-console/src/views/sql-data-loader-view/expression-editor-dialog/expression-editor-dialog.tsx b/web-console/src/views/sql-data-loader-view/expression-editor-dialog/expression-editor-dialog.tsx
index 1b6d08df20ae..bb7b4227b4ee 100644
--- a/web-console/src/views/sql-data-loader-view/expression-editor-dialog/expression-editor-dialog.tsx
+++ b/web-console/src/views/sql-data-loader-view/expression-editor-dialog/expression-editor-dialog.tsx
@@ -18,7 +18,7 @@
 
 import { Button, Classes, Dialog, FormGroup, InputGroup, Intent } from '@blueprintjs/core';
 import { IconNames } from '@blueprintjs/icons';
-import { SqlExpression } from '@druid-toolkit/query';
+import { SqlExpression } from 'druid-query-toolkit';
 import React, { useState } from 'react';
 
 import { FlexibleQueryInput } from '../../workbench-view/flexible-query-input/flexible-query-input';
diff --git a/web-console/src/views/sql-data-loader-view/ingestion-progress-dialog/ingestion-progress-dialog.tsx b/web-console/src/views/sql-data-loader-view/ingestion-progress-dialog/ingestion-progress-dialog.tsx
index ac6def8151c0..43e03a91e912 100644
--- a/web-console/src/views/sql-data-loader-view/ingestion-progress-dialog/ingestion-progress-dialog.tsx
+++ b/web-console/src/views/sql-data-loader-view/ingestion-progress-dialog/ingestion-progress-dialog.tsx
@@ -18,8 +18,8 @@
 
 import { Button, Classes, Dialog, Intent } from '@blueprintjs/core';
 import { IconNames } from '@blueprintjs/icons';
-import { T } from '@druid-toolkit/query';
 import classNames from 'classnames';
+import { T } from 'druid-query-toolkit';
 import React, { useState } from 'react';
 
 import type { Execution, QueryWithContext } from '../../../druid-models';
diff --git a/web-console/src/views/sql-data-loader-view/schema-step/column-list/column-list.tsx b/web-console/src/views/sql-data-loader-view/schema-step/column-list/column-list.tsx
index feba2bfda885..3d771cc725c6 100644
--- a/web-console/src/views/sql-data-loader-view/schema-step/column-list/column-list.tsx
+++ b/web-console/src/views/sql-data-loader-view/schema-step/column-list/column-list.tsx
@@ -18,7 +18,7 @@
 
 import { Icon, Popover } from '@blueprintjs/core';
 import { IconNames } from '@blueprintjs/icons';
-import type { QueryResult, SqlExpression } from '@druid-toolkit/query';
+import type { QueryResult, SqlExpression } from 'druid-query-toolkit';
 import { useMemo } from 'react';
 
 import { LearnMore, PopoverText } from '../../../../components';
diff --git a/web-console/src/views/sql-data-loader-view/schema-step/column-list/expression-entry/expression-entry.tsx b/web-console/src/views/sql-data-loader-view/schema-step/column-list/expression-entry/expression-entry.tsx
index 9eed114a8e64..802cbec77673 100644
--- a/web-console/src/views/sql-data-loader-view/schema-step/column-list/expression-entry/expression-entry.tsx
+++ b/web-console/src/views/sql-data-loader-view/schema-step/column-list/expression-entry/expression-entry.tsx
@@ -17,9 +17,9 @@
  */
 
 import { Icon } from '@blueprintjs/core';
-import type { Column, QueryResult } from '@druid-toolkit/query';
-import { SqlColumn } from '@druid-toolkit/query';
 import classNames from 'classnames';
+import type { Column, QueryResult } from 'druid-query-toolkit';
+import { SqlColumn } from 'druid-query-toolkit';
 
 import { columnToIcon } from '../../../../../utils';
 
diff --git a/web-console/src/views/sql-data-loader-view/schema-step/preview-table/preview-table.tsx b/web-console/src/views/sql-data-loader-view/schema-step/preview-table/preview-table.tsx
index 0bbfd85f5462..d332459b55f7 100644
--- a/web-console/src/views/sql-data-loader-view/schema-step/preview-table/preview-table.tsx
+++ b/web-console/src/views/sql-data-loader-view/schema-step/preview-table/preview-table.tsx
@@ -18,9 +18,9 @@
 
 import { Icon, Popover } from '@blueprintjs/core';
 import { IconNames } from '@blueprintjs/icons';
-import type { Column, QueryResult, SqlExpression, SqlQuery } from '@druid-toolkit/query';
-import { SqlAlias, SqlFunction, SqlStar } from '@druid-toolkit/query';
 import classNames from 'classnames';
+import type { Column, QueryResult, SqlExpression, SqlQuery } from 'druid-query-toolkit';
+import { SqlAlias, SqlFunction, SqlStar } from 'druid-query-toolkit';
 import React, { useState } from 'react';
 import type { RowRenderProps } from 'react-table';
 import ReactTable from 'react-table';
@@ -77,7 +77,7 @@ export const PreviewTable = React.memo(function PreviewTable(props: PreviewTable
   const { queryResult, onQueryAction, columnFilter, selectedColumnIndex, onEditColumn } = props;
   const [showValue, setShowValue] = useState<string>();
 
-  const parsedQuery: SqlQuery = queryResult.sqlQuery!;
+  const parsedQuery = queryResult.sqlQuery;
   if (!parsedQuery) return null;
 
   function hasFilterOnHeader(header: string, headerIndex: number): boolean {
diff --git a/web-console/src/views/sql-data-loader-view/schema-step/rollup-analysis-pane/rollup-analysis-pane.tsx b/web-console/src/views/sql-data-loader-view/schema-step/rollup-analysis-pane/rollup-analysis-pane.tsx
index d39927ac6fdb..e93ec9e9a005 100644
--- a/web-console/src/views/sql-data-loader-view/schema-step/rollup-analysis-pane/rollup-analysis-pane.tsx
+++ b/web-console/src/views/sql-data-loader-view/schema-step/rollup-analysis-pane/rollup-analysis-pane.tsx
@@ -18,9 +18,9 @@
 
 import { Button, Callout, Intent, Tag } from '@blueprintjs/core';
 import { IconNames } from '@blueprintjs/icons';
-import type { QueryResult, SqlQuery } from '@druid-toolkit/query';
-import { F, SqlExpression, SqlFunction } from '@druid-toolkit/query';
 import type { CancelToken } from 'axios';
+import type { QueryResult, SqlQuery } from 'druid-query-toolkit';
+import { F, SqlExpression, SqlFunction } from 'druid-query-toolkit';
 import type { JSX } from 'react';
 import React, { useEffect } from 'react';
 
diff --git a/web-console/src/views/sql-data-loader-view/schema-step/schema-step.tsx b/web-console/src/views/sql-data-loader-view/schema-step/schema-step.tsx
index a7b8f83bdbea..d9b8e1089b9d 100644
--- a/web-console/src/views/sql-data-loader-view/schema-step/schema-step.tsx
+++ b/web-console/src/views/sql-data-loader-view/schema-step/schema-step.tsx
@@ -31,6 +31,8 @@ import {
   Tag,
 } from '@blueprintjs/core';
 import { IconNames } from '@blueprintjs/icons';
+import classNames from 'classnames';
+import { select, selectAll } from 'd3-selection';
 import {
   C,
   Column,
@@ -40,9 +42,7 @@ import {
   SqlExpression,
   SqlQuery,
   SqlType,
-} from '@druid-toolkit/query';
-import classNames from 'classnames';
-import { select, selectAll } from 'd3-selection';
+} from 'druid-query-toolkit';
 import type { JSX } from 'react';
 import { useCallback, useEffect, useLayoutEffect, useMemo, useRef, useState } from 'react';
 
diff --git a/web-console/src/views/sql-data-loader-view/sql-data-loader-view.tsx b/web-console/src/views/sql-data-loader-view/sql-data-loader-view.tsx
index 8238384d9aed..84e3901a566c 100644
--- a/web-console/src/views/sql-data-loader-view/sql-data-loader-view.tsx
+++ b/web-console/src/views/sql-data-loader-view/sql-data-loader-view.tsx
@@ -19,7 +19,7 @@
 import type { IconName } from '@blueprintjs/core';
 import { Card, Icon, Intent } from '@blueprintjs/core';
 import { IconNames } from '@blueprintjs/icons';
-import { SqlQuery, SqlTable } from '@druid-toolkit/query';
+import { SqlQuery, SqlTable } from 'druid-query-toolkit';
 import type { JSX } from 'react';
 import React, { useState } from 'react';
 
diff --git a/web-console/src/views/supervisors-view/__snapshots__/supervisors-view.spec.tsx.snap b/web-console/src/views/supervisors-view/__snapshots__/supervisors-view.spec.tsx.snap
index e3458f4749ca..f9a450468e79 100644
--- a/web-console/src/views/supervisors-view/__snapshots__/supervisors-view.spec.tsx.snap
+++ b/web-console/src/views/supervisors-view/__snapshots__/supervisors-view.spec.tsx.snap
@@ -15,7 +15,7 @@ exports[`SupervisorsView matches snapshot 1`] = `
       <Memo(MoreButton)>
         <Blueprint5.MenuItem
           active={false}
-          disabled={false}
+          disabled={true}
           icon="application"
           multiline={false}
           onClick={[Function]}
@@ -326,7 +326,7 @@ exports[`SupervisorsView matches snapshot 1`] = `
     defaultFilterMethod={[Function]}
     defaultFiltered={[]}
     defaultPage={0}
-    defaultPageSize={25}
+    defaultPageSize={20}
     defaultResized={[]}
     defaultSortDesc={false}
     defaultSortMethod={[Function]}
@@ -366,7 +366,7 @@ exports[`SupervisorsView matches snapshot 1`] = `
     getTrProps={[Function]}
     groupedByPivotKey="_groupedByPivot"
     indexKey="_index"
-    loading={false}
+    loading={true}
     loadingText="Loading..."
     manual={true}
     multiSort={true}
@@ -376,8 +376,13 @@ exports[`SupervisorsView matches snapshot 1`] = `
     ofText=""
     onFetchData={[Function]}
     onFilteredChange={[Function]}
+    onPageChange={[Function]}
+    onPageSizeChange={[Function]}
+    onSortedChange={[Function]}
     originalKey="_original"
+    page={0}
     pageJumpText="jump to page"
+    pageSize={25}
     pageSizeOptions={
       [
         25,
@@ -401,6 +406,7 @@ exports[`SupervisorsView matches snapshot 1`] = `
     showPaginationBottom={true}
     showPaginationTop={false}
     sortable={true}
+    sorted={[]}
     style={{}}
     subRowsKey="_subRows"
   />
diff --git a/web-console/src/views/supervisors-view/supervisors-view.tsx b/web-console/src/views/supervisors-view/supervisors-view.tsx
index 2474782e0aeb..f75d533cf3f0 100644
--- a/web-console/src/views/supervisors-view/supervisors-view.tsx
+++ b/web-console/src/views/supervisors-view/supervisors-view.tsx
@@ -18,11 +18,10 @@
 
 import { Icon, Intent, Menu, MenuItem, Popover, Position, Tag } from '@blueprintjs/core';
 import { IconNames } from '@blueprintjs/icons';
-import { SqlExpression } from '@druid-toolkit/query';
 import * as JSONBig from 'json-bigint-native';
 import type { JSX } from 'react';
 import React from 'react';
-import type { Filter } from 'react-table';
+import type { Filter, SortingRule } from 'react-table';
 import ReactTable from 'react-table';
 
 import type { TableColumnSelectorColumn } from '../../components';
@@ -58,7 +57,7 @@ import type { Capabilities } from '../../helpers';
 import {
   SMALL_TABLE_PAGE_SIZE,
   SMALL_TABLE_PAGE_SIZE_OPTIONS,
-  sqlQueryCustomTableFilter,
+  sqlQueryCustomTableFilters,
 } from '../../react-table';
 import { Api, AppToaster } from '../../singletons';
 import type { AuxiliaryQueryFn, TableState } from '../../utils';
@@ -67,13 +66,13 @@ import {
   changeByIndex,
   checkedCircleIcon,
   deepGet,
-  filterMap,
   formatByteRate,
   formatBytes,
   formatInteger,
   formatRate,
+  getApiArray,
   getDruidErrorMessage,
-  hasPopoverOpen,
+  hasOverlayOpen,
   isNumberLike,
   LocalStorageBackedVisibility,
   LocalStorageKeys,
@@ -162,7 +161,11 @@ export interface SupervisorsViewState {
 
   supervisorTableActionDialogId?: string;
   supervisorTableActionDialogActions: BasicAction[];
+
   visibleColumns: LocalStorageBackedVisibility;
+  page: number;
+  pageSize: number;
+  sorted: SortingRule[];
 }
 
 function detailedStateToColor(detailedState: string): string {
@@ -223,6 +226,9 @@ export class SupervisorsView extends React.PureComponent<
       visibleColumns: new LocalStorageBackedVisibility(
         LocalStorageKeys.SUPERVISOR_TABLE_COLUMN_SELECTION,
       ),
+      page: 0,
+      pageSize: SMALL_TABLE_PAGE_SIZE,
+      sorted: [],
     };
 
     this.supervisorQueryManager = new QueryManager({
@@ -233,10 +239,11 @@ export class SupervisorsView extends React.PureComponent<
       ) => {
         let supervisors: SupervisorQueryResultRow[];
         if (capabilities.hasSql()) {
+          const whereExpression = sqlQueryCustomTableFilters(filtered);
+
           let filterClause = '';
-          const whereParts = filterMap(filtered, sqlQueryCustomTableFilter);
-          if (whereParts.length) {
-            filterClause = SqlExpression.and(...whereParts).toString();
+          if (whereExpression.toString() !== 'TRUE') {
+            filterClause = whereExpression.toString();
           }
 
           const sqlQuery = assemble(
@@ -269,26 +276,22 @@ export class SupervisorsView extends React.PureComponent<
             return { ...supervisor, spec: JSONBig.parse(spec) };
           });
         } else if (capabilities.hasOverlordAccess()) {
-          const supervisorList = (
-            await Api.instance.get('/druid/indexer/v1/supervisor?full', { cancelToken })
-          ).data;
-          if (!Array.isArray(supervisorList)) {
-            throw new Error(`Unexpected result from /druid/indexer/v1/supervisor?full`);
-          }
-          supervisors = supervisorList.map((sup: any) => {
-            return {
-              supervisor_id: deepGet(sup, 'id'),
-              type: deepGet(sup, 'spec.tuningConfig.type'),
-              source:
-                deepGet(sup, 'spec.ioConfig.topic') ||
-                deepGet(sup, 'spec.ioConfig.stream') ||
-                'n/a',
-              state: deepGet(sup, 'state'),
-              detailed_state: deepGet(sup, 'detailedState'),
-              spec: sup.spec,
-              suspended: Boolean(deepGet(sup, 'suspended')),
-            };
-          });
+          supervisors = (await getApiArray('/druid/indexer/v1/supervisor?full', cancelToken)).map(
+            (sup: any) => {
+              return {
+                supervisor_id: deepGet(sup, 'id'),
+                type: deepGet(sup, 'spec.tuningConfig.type'),
+                source:
+                  deepGet(sup, 'spec.ioConfig.topic') ||
+                  deepGet(sup, 'spec.ioConfig.stream') ||
+                  'n/a',
+                state: deepGet(sup, 'state'),
+                detailed_state: deepGet(sup, 'detailedState'),
+                spec: sup.spec,
+                suspended: Boolean(deepGet(sup, 'suspended')),
+              };
+            },
+          );
 
           const firstSorted = sorted[0];
           if (firstSorted) {
@@ -355,22 +358,37 @@ export class SupervisorsView extends React.PureComponent<
     });
   }
 
-  private lastTableState: TableState | undefined;
+  componentDidMount() {
+    this.fetchData();
+  }
 
   componentWillUnmount(): void {
     this.supervisorQueryManager.terminate();
   }
 
-  private readonly fetchData = (tableState?: TableState) => {
-    const { capabilities } = this.props;
-    const { visibleColumns } = this.state;
-    if (tableState) this.lastTableState = tableState;
-    if (!this.lastTableState) return;
-    const { page, pageSize, filtered, sorted } = this.lastTableState;
+  componentDidUpdate(
+    prevProps: Readonly<SupervisorsViewProps>,
+    prevState: Readonly<SupervisorsViewState>,
+  ) {
+    const { filters } = this.props;
+    const { page, pageSize, sorted } = this.state;
+    if (
+      !sqlQueryCustomTableFilters(filters).equals(sqlQueryCustomTableFilters(prevProps.filters)) ||
+      page !== prevState.page ||
+      pageSize !== prevState.pageSize ||
+      sortedToOrderByClause(sorted) !== sortedToOrderByClause(prevState.sorted)
+    ) {
+      this.fetchData();
+    }
+  }
+
+  private readonly fetchData = () => {
+    const { capabilities, filters } = this.props;
+    const { visibleColumns, page, pageSize, sorted } = this.state;
     this.supervisorQueryManager.runQuery({
       page,
       pageSize,
-      filtered,
+      filtered: filters,
       sorted,
       visibleColumns,
       capabilities,
@@ -663,7 +681,7 @@ export class SupervisorsView extends React.PureComponent<
 
   private renderSupervisorTable() {
     const { goToTasks, filters, onFiltersChange } = this.props;
-    const { supervisorsState, statsKey, visibleColumns } = this.state;
+    const { supervisorsState, statsKey, visibleColumns, page, pageSize, sorted } = this.state;
 
     const supervisors = supervisorsState.data || [];
     return (
@@ -678,14 +696,16 @@ export class SupervisorsView extends React.PureComponent<
         filterable
         filtered={filters}
         onFilteredChange={onFiltersChange}
-        onFetchData={tableState => {
-          this.fetchData(tableState);
-        }}
-        showPageJump={false}
-        ofText=""
-        defaultPageSize={SMALL_TABLE_PAGE_SIZE}
+        sorted={sorted}
+        onSortedChange={sorted => this.setState({ sorted })}
+        page={page}
+        onPageChange={page => this.setState({ page })}
+        pageSize={pageSize}
+        onPageSizeChange={pageSize => this.setState({ pageSize })}
         pageSizeOptions={SMALL_TABLE_PAGE_SIZE_OPTIONS}
         showPagination={supervisors.length > SMALL_TABLE_PAGE_SIZE}
+        showPageJump={false}
+        ofText=""
         columns={[
           {
             Header: twoLines('Supervisor ID', <i>(datasource)</i>),
@@ -695,6 +715,7 @@ export class SupervisorsView extends React.PureComponent<
             show: visibleColumns.shown('Supervisor ID'),
             Cell: ({ value, original }) => (
               <TableClickableCell
+                tooltip="Show detail"
                 onClick={() => this.onSupervisorDetail(original)}
                 hoverIcon={IconNames.SEARCH_TEMPLATE}
               >
@@ -791,9 +812,9 @@ export class SupervisorsView extends React.PureComponent<
               }
               return (
                 <TableClickableCell
+                  tooltip="Go to tasks"
                   onClick={() => goToTasks(original.supervisor_id, `index_${original.type}`)}
                   hoverIcon={IconNames.ARROW_TOP_RIGHT}
-                  title="Go to tasks"
                 >
                   {label}
                 </TableClickableCell>
@@ -903,9 +924,9 @@ export class SupervisorsView extends React.PureComponent<
               if (!value) return null;
               return (
                 <TableClickableCell
+                  tooltip="Show errors"
                   onClick={() => this.onSupervisorDetail(original)}
                   hoverIcon={IconNames.SEARCH_TEMPLATE}
-                  title="See errors"
                 >
                   {pluralIfNeeded(value.length, 'error')}
                 </TableClickableCell>
@@ -949,7 +970,11 @@ export class SupervisorsView extends React.PureComponent<
             <MenuItem
               icon={IconNames.APPLICATION}
               text="View SQL query for table"
-              onClick={() => goToQuery({ queryString: lastSupervisorQuery })}
+              disabled={typeof lastSupervisorQuery !== 'string'}
+              onClick={() => {
+                if (typeof lastSupervisorQuery !== 'string') return;
+                goToQuery({ queryString: lastSupervisorQuery });
+              }}
             />
           )}
           <MenuItem
@@ -1074,7 +1099,7 @@ export class SupervisorsView extends React.PureComponent<
           <RefreshButton
             localStorageKey={LocalStorageKeys.SUPERVISORS_REFRESH_RATE}
             onRefresh={auto => {
-              if (auto && hasPopoverOpen()) return;
+              if (auto && hasOverlayOpen()) return;
               this.supervisorQueryManager.rerunLastQuery(auto);
             }}
           />
diff --git a/web-console/src/views/tasks-view/tasks-view.tsx b/web-console/src/views/tasks-view/tasks-view.tsx
index 2bad1a29f66b..f968b7d4925f 100644
--- a/web-console/src/views/tasks-view/tasks-view.tsx
+++ b/web-console/src/views/tasks-view/tasks-view.tsx
@@ -42,8 +42,9 @@ import { SMALL_TABLE_PAGE_SIZE, SMALL_TABLE_PAGE_SIZE_OPTIONS } from '../../reac
 import { Api, AppToaster } from '../../singletons';
 import {
   formatDuration,
+  getApiArray,
   getDruidErrorMessage,
-  hasPopoverOpen,
+  hasOverlayOpen,
   LocalStorageBackedVisibility,
   LocalStorageKeys,
   oneOf,
@@ -174,8 +175,19 @@ ORDER BY
             cancelToken,
           );
         } else if (capabilities.hasOverlordAccess()) {
-          const resp = await Api.instance.get(`/druid/indexer/v1/tasks`, { cancelToken });
-          return TasksView.parseTasks(resp.data);
+          return (await getApiArray(`/druid/indexer/v1/tasks`, cancelToken)).map(d => {
+            return {
+              task_id: d.id,
+              group_id: d.groupId,
+              type: d.type,
+              created_time: d.createdTime,
+              datasource: d.dataSource,
+              duration: d.duration ? d.duration : 0,
+              error_msg: d.errorMsg,
+              location: d.location.host ? `${d.location.host}:${d.location.port}` : null,
+              status: d.statusCode === 'RUNNING' ? d.runnerStatusCode : d.statusCode,
+            };
+          });
         } else {
           throw new Error(`must have SQL or overlord access`);
         }
@@ -188,22 +200,6 @@ ORDER BY
     });
   }
 
-  static parseTasks = (data: any[]): TaskQueryResultRow[] => {
-    return data.map(d => {
-      return {
-        task_id: d.id,
-        group_id: d.groupId,
-        type: d.type,
-        created_time: d.createdTime,
-        datasource: d.dataSource,
-        duration: d.duration ? d.duration : 0,
-        error_msg: d.errorMsg,
-        location: d.location.host ? `${d.location.host}:${d.location.port}` : null,
-        status: d.statusCode === 'RUNNING' ? d.runnerStatusCode : d.statusCode,
-      };
-    });
-  };
-
   componentDidMount(): void {
     const { capabilities } = this.props;
 
@@ -376,6 +372,7 @@ ORDER BY
             width: 440,
             Cell: ({ value, original }) => (
               <TableClickableCell
+                tooltip="Show detail"
                 onClick={() => this.onTaskDetail(original)}
                 hoverIcon={IconNames.SEARCH_TEMPLATE}
               >
@@ -594,7 +591,7 @@ ORDER BY
           <RefreshButton
             localStorageKey={LocalStorageKeys.TASKS_REFRESH_RATE}
             onRefresh={auto => {
-              if (auto && hasPopoverOpen()) return;
+              if (auto && hasOverlayOpen()) return;
               this.taskQueryManager.rerunLastQuery(auto);
             }}
           />
diff --git a/web-console/src/views/workbench-view/column-tree/column-tree-menu/complex-menu-items/complex-menu-items.spec.tsx b/web-console/src/views/workbench-view/column-tree/column-tree-menu/complex-menu-items/complex-menu-items.spec.tsx
index e11ca98e0d9d..6e095388cb39 100644
--- a/web-console/src/views/workbench-view/column-tree/column-tree-menu/complex-menu-items/complex-menu-items.spec.tsx
+++ b/web-console/src/views/workbench-view/column-tree/column-tree-menu/complex-menu-items/complex-menu-items.spec.tsx
@@ -16,8 +16,8 @@
  * limitations under the License.
  */
 
-import { SqlQuery } from '@druid-toolkit/query';
 import { render } from '@testing-library/react';
+import { SqlQuery } from 'druid-query-toolkit';
 
 import { ComplexMenuItems } from './complex-menu-items';
 
diff --git a/web-console/src/views/workbench-view/column-tree/column-tree-menu/complex-menu-items/complex-menu-items.tsx b/web-console/src/views/workbench-view/column-tree/column-tree-menu/complex-menu-items/complex-menu-items.tsx
index fa172262f07c..fc92568715e9 100644
--- a/web-console/src/views/workbench-view/column-tree/column-tree-menu/complex-menu-items/complex-menu-items.tsx
+++ b/web-console/src/views/workbench-view/column-tree/column-tree-menu/complex-menu-items/complex-menu-items.tsx
@@ -18,8 +18,8 @@
 
 import { MenuItem } from '@blueprintjs/core';
 import { IconNames } from '@blueprintjs/icons';
-import type { SqlExpression, SqlQuery } from '@druid-toolkit/query';
-import { C, F } from '@druid-toolkit/query';
+import type { SqlExpression, SqlQuery } from 'druid-query-toolkit';
+import { C, F } from 'druid-query-toolkit';
 import type { JSX } from 'react';
 import React from 'react';
 
diff --git a/web-console/src/views/workbench-view/column-tree/column-tree-menu/number-menu-items/number-menu-items.spec.tsx b/web-console/src/views/workbench-view/column-tree/column-tree-menu/number-menu-items/number-menu-items.spec.tsx
index 80c7d22eda46..80216b02e5fe 100644
--- a/web-console/src/views/workbench-view/column-tree/column-tree-menu/number-menu-items/number-menu-items.spec.tsx
+++ b/web-console/src/views/workbench-view/column-tree/column-tree-menu/number-menu-items/number-menu-items.spec.tsx
@@ -16,8 +16,8 @@
  * limitations under the License.
  */
 
-import { SqlQuery } from '@druid-toolkit/query';
 import { render } from '@testing-library/react';
+import { SqlQuery } from 'druid-query-toolkit';
 
 import { NumberMenuItems } from './number-menu-items';
 
diff --git a/web-console/src/views/workbench-view/column-tree/column-tree-menu/number-menu-items/number-menu-items.tsx b/web-console/src/views/workbench-view/column-tree/column-tree-menu/number-menu-items/number-menu-items.tsx
index bf383f99254a..e62e5cebbf6b 100644
--- a/web-console/src/views/workbench-view/column-tree/column-tree-menu/number-menu-items/number-menu-items.tsx
+++ b/web-console/src/views/workbench-view/column-tree/column-tree-menu/number-menu-items/number-menu-items.tsx
@@ -18,8 +18,8 @@
 
 import { MenuItem } from '@blueprintjs/core';
 import { IconNames } from '@blueprintjs/icons';
-import type { SqlExpression, SqlQuery } from '@druid-toolkit/query';
-import { C, F, L } from '@druid-toolkit/query';
+import type { SqlExpression, SqlQuery } from 'druid-query-toolkit';
+import { C, F, L } from 'druid-query-toolkit';
 import type { JSX } from 'react';
 import React from 'react';
 
diff --git a/web-console/src/views/workbench-view/column-tree/column-tree-menu/string-menu-items/string-menu-items.spec.tsx b/web-console/src/views/workbench-view/column-tree/column-tree-menu/string-menu-items/string-menu-items.spec.tsx
index d50105d951ba..d2717d04cac9 100644
--- a/web-console/src/views/workbench-view/column-tree/column-tree-menu/string-menu-items/string-menu-items.spec.tsx
+++ b/web-console/src/views/workbench-view/column-tree/column-tree-menu/string-menu-items/string-menu-items.spec.tsx
@@ -16,8 +16,8 @@
  * limitations under the License.
  */
 
-import { SqlQuery } from '@druid-toolkit/query';
 import { render } from '@testing-library/react';
+import { SqlQuery } from 'druid-query-toolkit';
 
 import { StringMenuItems } from './string-menu-items';
 
diff --git a/web-console/src/views/workbench-view/column-tree/column-tree-menu/string-menu-items/string-menu-items.tsx b/web-console/src/views/workbench-view/column-tree/column-tree-menu/string-menu-items/string-menu-items.tsx
index 0dc0c684e453..c52b807032b4 100644
--- a/web-console/src/views/workbench-view/column-tree/column-tree-menu/string-menu-items/string-menu-items.tsx
+++ b/web-console/src/views/workbench-view/column-tree/column-tree-menu/string-menu-items/string-menu-items.tsx
@@ -18,8 +18,8 @@
 
 import { MenuItem } from '@blueprintjs/core';
 import { IconNames } from '@blueprintjs/icons';
-import type { SqlExpression, SqlQuery } from '@druid-toolkit/query';
-import { C, F, N, SqlJoinPart, SqlPlaceholder, T } from '@druid-toolkit/query';
+import type { SqlExpression, SqlQuery } from 'druid-query-toolkit';
+import { C, F, N, SqlJoinPart, SqlPlaceholder, T } from 'druid-query-toolkit';
 import type { JSX } from 'react';
 import React from 'react';
 
diff --git a/web-console/src/views/workbench-view/column-tree/column-tree-menu/time-menu-items/time-menu-items.spec.tsx b/web-console/src/views/workbench-view/column-tree/column-tree-menu/time-menu-items/time-menu-items.spec.tsx
index 402b2029eda4..af79bd578cd9 100644
--- a/web-console/src/views/workbench-view/column-tree/column-tree-menu/time-menu-items/time-menu-items.spec.tsx
+++ b/web-console/src/views/workbench-view/column-tree/column-tree-menu/time-menu-items/time-menu-items.spec.tsx
@@ -16,8 +16,8 @@
  * limitations under the License.
  */
 
-import { SqlQuery } from '@druid-toolkit/query';
 import { render } from '@testing-library/react';
+import { SqlQuery } from 'druid-query-toolkit';
 
 import { TimeMenuItems } from './time-menu-items';
 
diff --git a/web-console/src/views/workbench-view/column-tree/column-tree-menu/time-menu-items/time-menu-items.tsx b/web-console/src/views/workbench-view/column-tree/column-tree-menu/time-menu-items/time-menu-items.tsx
index cbe569ac6ded..3723a5235bd5 100644
--- a/web-console/src/views/workbench-view/column-tree/column-tree-menu/time-menu-items/time-menu-items.tsx
+++ b/web-console/src/views/workbench-view/column-tree/column-tree-menu/time-menu-items/time-menu-items.tsx
@@ -18,12 +18,12 @@
 
 import { MenuDivider, MenuItem } from '@blueprintjs/core';
 import { IconNames } from '@blueprintjs/icons';
-import type { SqlQuery } from '@druid-toolkit/query';
-import { C, F, SqlExpression } from '@druid-toolkit/query';
+import type { SqlQuery } from 'druid-query-toolkit';
+import { C, F, SqlExpression } from 'druid-query-toolkit';
 import type { JSX } from 'react';
 import React from 'react';
 
-import { prettyPrintSql } from '../../../../../utils';
+import { day, hour, month, prettyPrintSql, TZ_UTC, year } from '../../../../../utils';
 
 const LATEST_HOUR: SqlExpression = SqlExpression.parse(
   `? >= CURRENT_TIMESTAMP - INTERVAL '1' HOUR`,
@@ -52,58 +52,6 @@ function fillWithColumnStartEnd(columnName: string, start: Date, end: Date): Sql
   return BETWEEN.fillPlaceholders([start, column, column, end]);
 }
 
-// ------------------------------------
-
-function floorHour(dt: Date): Date {
-  dt = new Date(dt.valueOf());
-  dt.setUTCMinutes(0, 0, 0);
-  return dt;
-}
-
-function nextHour(dt: Date): Date {
-  dt = new Date(dt.valueOf());
-  dt.setUTCHours(dt.getUTCHours() + 1);
-  return dt;
-}
-
-function floorDay(dt: Date): Date {
-  dt = new Date(dt.valueOf());
-  dt.setUTCHours(0, 0, 0, 0);
-  return dt;
-}
-
-function nextDay(dt: Date): Date {
-  dt = new Date(dt.valueOf());
-  dt.setUTCDate(dt.getUTCDate() + 1);
-  return dt;
-}
-
-function floorMonth(dt: Date): Date {
-  dt = new Date(dt.valueOf());
-  dt.setUTCHours(0, 0, 0, 0);
-  dt.setUTCDate(1);
-  return dt;
-}
-
-function nextMonth(dt: Date): Date {
-  dt = new Date(dt.valueOf());
-  dt.setUTCMonth(dt.getUTCMonth() + 1);
-  return dt;
-}
-
-function floorYear(dt: Date): Date {
-  dt = new Date(dt.valueOf());
-  dt.setUTCHours(0, 0, 0, 0);
-  dt.setUTCMonth(0, 1);
-  return dt;
-}
-
-function nextYear(dt: Date): Date {
-  dt = new Date(dt.valueOf());
-  dt.setUTCFullYear(dt.getUTCFullYear() + 1);
-  return dt;
-}
-
 export interface TimeMenuItemsProps {
   table: string;
   schema: string;
@@ -129,10 +77,10 @@ export const TimeMenuItems = React.memo(function TimeMenuItems(props: TimeMenuIt
     }
 
     const now = new Date();
-    const hourStart = floorHour(now);
-    const dayStart = floorDay(now);
-    const monthStart = floorMonth(now);
-    const yearStart = floorYear(now);
+    const hourStart = hour.floor(now, TZ_UTC);
+    const dayStart = day.floor(now, TZ_UTC);
+    const monthStart = month.floor(now, TZ_UTC);
+    const yearStart = year.floor(now, TZ_UTC);
     return (
       <MenuItem icon={IconNames.FILTER} text="Filter">
         {filterMenuItem(`Latest hour`, fillWithColumn(LATEST_HOUR, columnName))}
@@ -143,19 +91,19 @@ export const TimeMenuItems = React.memo(function TimeMenuItems(props: TimeMenuIt
         <MenuDivider />
         {filterMenuItem(
           `Current hour`,
-          fillWithColumnStartEnd(columnName, hourStart, nextHour(hourStart)),
+          fillWithColumnStartEnd(columnName, hourStart, hour.shift(hourStart, TZ_UTC, 1)),
         )}
         {filterMenuItem(
           `Current day`,
-          fillWithColumnStartEnd(columnName, dayStart, nextDay(dayStart)),
+          fillWithColumnStartEnd(columnName, dayStart, day.shift(dayStart, TZ_UTC, 1)),
         )}
         {filterMenuItem(
           `Current month`,
-          fillWithColumnStartEnd(columnName, monthStart, nextMonth(monthStart)),
+          fillWithColumnStartEnd(columnName, monthStart, month.shift(monthStart, TZ_UTC, 1)),
         )}
         {filterMenuItem(
           `Current year`,
-          fillWithColumnStartEnd(columnName, yearStart, nextYear(yearStart)),
+          fillWithColumnStartEnd(columnName, yearStart, year.shift(yearStart, TZ_UTC, 1)),
         )}
       </MenuItem>
     );
diff --git a/web-console/src/views/workbench-view/column-tree/column-tree.spec.tsx b/web-console/src/views/workbench-view/column-tree/column-tree.spec.tsx
index 26410834e136..07e5167f79fe 100644
--- a/web-console/src/views/workbench-view/column-tree/column-tree.spec.tsx
+++ b/web-console/src/views/workbench-view/column-tree/column-tree.spec.tsx
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-import { SqlQuery } from '@druid-toolkit/query';
+import { SqlQuery } from 'druid-query-toolkit';
 
 import type { ColumnMetadata } from '../../../utils';
 import { shallow } from '../../../utils/shallow-renderer';
diff --git a/web-console/src/views/workbench-view/column-tree/column-tree.tsx b/web-console/src/views/workbench-view/column-tree/column-tree.tsx
index 385cab937cef..438dece7f6fb 100644
--- a/web-console/src/views/workbench-view/column-tree/column-tree.tsx
+++ b/web-console/src/views/workbench-view/column-tree/column-tree.tsx
@@ -32,7 +32,7 @@ import {
   Tree,
 } from '@blueprintjs/core';
 import { IconNames } from '@blueprintjs/icons';
-import type { SqlExpression } from '@druid-toolkit/query';
+import type { SqlExpression } from 'druid-query-toolkit';
 import {
   C,
   F,
@@ -43,7 +43,7 @@ import {
   SqlQuery,
   SqlTable,
   T,
-} from '@druid-toolkit/query';
+} from 'druid-query-toolkit';
 import type { ChangeEvent } from 'react';
 import React from 'react';
 
diff --git a/web-console/src/views/workbench-view/connect-external-data-dialog/connect-external-data-dialog.tsx b/web-console/src/views/workbench-view/connect-external-data-dialog/connect-external-data-dialog.tsx
index 124b4441194b..795158102625 100644
--- a/web-console/src/views/workbench-view/connect-external-data-dialog/connect-external-data-dialog.tsx
+++ b/web-console/src/views/workbench-view/connect-external-data-dialog/connect-external-data-dialog.tsx
@@ -17,7 +17,7 @@
  */
 
 import { Classes, Dialog } from '@blueprintjs/core';
-import type { SqlExpression } from '@druid-toolkit/query';
+import type { SqlExpression } from 'druid-query-toolkit';
 import React, { useState } from 'react';
 
 import type { ArrayMode, ExternalConfig, InputFormat, InputSource } from '../../../druid-models';
diff --git a/web-console/src/views/workbench-view/current-dart-panel/current-dart-panel.tsx b/web-console/src/views/workbench-view/current-dart-panel/current-dart-panel.tsx
index 321ad40fc8f0..5f104b75f2df 100644
--- a/web-console/src/views/workbench-view/current-dart-panel/current-dart-panel.tsx
+++ b/web-console/src/views/workbench-view/current-dart-panel/current-dart-panel.tsx
@@ -20,7 +20,7 @@ import { Button, Icon, Intent, Menu, MenuDivider, MenuItem, Popover } from '@blu
 import { type IconName, IconNames } from '@blueprintjs/icons';
 import classNames from 'classnames';
 import copy from 'copy-to-clipboard';
-import React, { useCallback, useState } from 'react';
+import React, { useState } from 'react';
 import { useStore } from 'zustand';
 
 import { Loader } from '../../../components';
@@ -30,7 +30,7 @@ import { Api, AppToaster } from '../../../singletons';
 import { formatDuration, prettyFormatIsoDate } from '../../../utils';
 import { CancelQueryDialog } from '../cancel-query-dialog/cancel-query-dialog';
 import { DartDetailsDialog } from '../dart-details-dialog/dart-details-dialog';
-import { workStateStore } from '../work-state-store';
+import { getMsqDartVersion, WORK_STATE_STORE } from '../work-state-store';
 
 import './current-dart-panel.scss';
 
@@ -59,13 +59,8 @@ export const CurrentDartPanel = React.memo(function CurrentViberPanel(
   const [showSql, setShowSql] = useState<string | undefined>();
   const [confirmCancelId, setConfirmCancelId] = useState<string | undefined>();
 
-  const workStateVersion = useStore(
-    workStateStore,
-    useCallback(state => state.version, []),
-  );
-
   const [dartQueryEntriesState, queryManager] = useQueryManager<number, DartQueryEntry[]>({
-    query: workStateVersion,
+    query: useStore(WORK_STATE_STORE, getMsqDartVersion),
     processQuery: async (_, cancelToken) => {
       return (await Api.instance.get('/druid/v2/sql/dart', { cancelToken })).data.queries;
     },
@@ -178,6 +173,7 @@ export const CurrentDartPanel = React.memo(function CurrentViberPanel(
                 message: 'Query canceled',
                 intent: Intent.SUCCESS,
               });
+              queryManager.rerunLastQuery();
             } catch {
               AppToaster.show({
                 message: 'Could not cancel query',
diff --git a/web-console/src/views/workbench-view/execution-details-pane/execution-details-pane.tsx b/web-console/src/views/workbench-view/execution-details-pane/execution-details-pane.tsx
index b758313ea74e..e59cdb879396 100644
--- a/web-console/src/views/workbench-view/execution-details-pane/execution-details-pane.tsx
+++ b/web-console/src/views/workbench-view/execution-details-pane/execution-details-pane.tsx
@@ -18,7 +18,7 @@
 
 import { Tag } from '@blueprintjs/core';
 import { IconNames } from '@blueprintjs/icons';
-import { T } from '@druid-toolkit/query';
+import { T } from 'druid-query-toolkit';
 import * as JSONBig from 'json-bigint-native';
 import React, { useState } from 'react';
 
diff --git a/web-console/src/views/workbench-view/execution-stages-pane/execution-stages-pane.tsx b/web-console/src/views/workbench-view/execution-stages-pane/execution-stages-pane.tsx
index 5ea2e97bb091..d7c447d090cf 100644
--- a/web-console/src/views/workbench-view/execution-stages-pane/execution-stages-pane.tsx
+++ b/web-console/src/views/workbench-view/execution-stages-pane/execution-stages-pane.tsx
@@ -251,7 +251,7 @@ export const ExecutionStagesPane = React.memo(function ExecutionStagesPane(
               return (
                 <TableClickableCell
                   hoverIcon={IconNames.SHARE}
-                  data-tooltip={`Go to task: ${taskId}`}
+                  tooltip={`Go to task: ${taskId}`}
                   onClick={() => {
                     goToTask(taskId);
                   }}
diff --git a/web-console/src/views/workbench-view/flexible-query-input/flexible-query-input.tsx b/web-console/src/views/workbench-view/flexible-query-input/flexible-query-input.tsx
index a77ed004ea26..0cf280f14e7c 100644
--- a/web-console/src/views/workbench-view/flexible-query-input/flexible-query-input.tsx
+++ b/web-console/src/views/workbench-view/flexible-query-input/flexible-query-input.tsx
@@ -18,10 +18,10 @@
 
 import { Intent, ResizeSensor } from '@blueprintjs/core';
 import { IconNames } from '@blueprintjs/icons';
-import { C, dedupe, T } from '@druid-toolkit/query';
 import type { Ace } from 'ace-builds';
 import ace from 'ace-builds';
 import classNames from 'classnames';
+import { C, dedupe, T } from 'druid-query-toolkit';
 import debounce from 'lodash.debounce';
 import React from 'react';
 import AceEditor from 'react-ace';
diff --git a/web-console/src/views/workbench-view/ingest-success-pane/ingest-success-pane.tsx b/web-console/src/views/workbench-view/ingest-success-pane/ingest-success-pane.tsx
index 2319f5d14a00..0aa42e60b782 100644
--- a/web-console/src/views/workbench-view/ingest-success-pane/ingest-success-pane.tsx
+++ b/web-console/src/views/workbench-view/ingest-success-pane/ingest-success-pane.tsx
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-import { T } from '@druid-toolkit/query';
+import { T } from 'druid-query-toolkit';
 import React from 'react';
 
 import type { Execution } from '../../../druid-models';
diff --git a/web-console/src/views/workbench-view/input-format-step/input-format-step.tsx b/web-console/src/views/workbench-view/input-format-step/input-format-step.tsx
index 4a05b36d70a5..781a01966804 100644
--- a/web-console/src/views/workbench-view/input-format-step/input-format-step.tsx
+++ b/web-console/src/views/workbench-view/input-format-step/input-format-step.tsx
@@ -18,8 +18,8 @@
 
 import { Button, Callout, FormGroup, Icon, Intent, Tag } from '@blueprintjs/core';
 import { IconNames } from '@blueprintjs/icons';
-import type { SqlExpression } from '@druid-toolkit/query';
-import { C, SqlColumnDeclaration, SqlType } from '@druid-toolkit/query';
+import type { SqlExpression } from 'druid-query-toolkit';
+import { C, SqlColumnDeclaration, SqlType } from 'druid-query-toolkit';
 import React, { useState } from 'react';
 
 import { ArrayModeSwitch, AutoForm, CenterMessage, LearnMore, Loader } from '../../../components';
diff --git a/web-console/src/views/workbench-view/input-source-step/input-source-step.tsx b/web-console/src/views/workbench-view/input-source-step/input-source-step.tsx
index 67b6fadaa794..b5ef35146d6e 100644
--- a/web-console/src/views/workbench-view/input-source-step/input-source-step.tsx
+++ b/web-console/src/views/workbench-view/input-source-step/input-source-step.tsx
@@ -27,8 +27,8 @@ import {
   RadioGroup,
 } from '@blueprintjs/core';
 import { IconNames } from '@blueprintjs/icons';
-import type { QueryResult } from '@druid-toolkit/query';
 import classNames from 'classnames';
+import type { QueryResult } from 'druid-query-toolkit';
 import type { JSX } from 'react';
 import React, { useEffect, useState } from 'react';
 
diff --git a/web-console/src/views/workbench-view/query-parameters-dialog/query-parameters-dialog.tsx b/web-console/src/views/workbench-view/query-parameters-dialog/query-parameters-dialog.tsx
index b9915bc7c0cf..49a9ebb587df 100644
--- a/web-console/src/views/workbench-view/query-parameters-dialog/query-parameters-dialog.tsx
+++ b/web-console/src/views/workbench-view/query-parameters-dialog/query-parameters-dialog.tsx
@@ -31,8 +31,8 @@ import {
   Position,
 } from '@blueprintjs/core';
 import { IconNames } from '@blueprintjs/icons';
-import type { QueryParameter } from '@druid-toolkit/query';
-import { isEmptyArray } from '@druid-toolkit/query';
+import type { QueryParameter } from 'druid-query-toolkit';
+import { isEmptyArray } from 'druid-query-toolkit';
 import React, { useState } from 'react';
 
 import { FancyNumericInput } from '../../../components/fancy-numeric-input/fancy-numeric-input';
diff --git a/web-console/src/views/workbench-view/query-tab/query-tab.tsx b/web-console/src/views/workbench-view/query-tab/query-tab.tsx
index 63865054446f..1ff438308591 100644
--- a/web-console/src/views/workbench-view/query-tab/query-tab.tsx
+++ b/web-console/src/views/workbench-view/query-tab/query-tab.tsx
@@ -18,8 +18,8 @@
 
 import { Code, Intent } from '@blueprintjs/core';
 import { IconNames } from '@blueprintjs/icons';
-import { QueryResult, QueryRunner, SqlQuery } from '@druid-toolkit/query';
 import axios from 'axios';
+import { QueryResult, QueryRunner, SqlQuery } from 'druid-query-toolkit';
 import type { JSX } from 'react';
 import React, { useCallback, useEffect, useRef, useState } from 'react';
 import { useStore } from 'zustand';
@@ -61,7 +61,7 @@ import { metadataStateStore } from '../metadata-state-store';
 import { ResultTablePane } from '../result-table-pane/result-table-pane';
 import type { RunPanelProps } from '../run-panel/run-panel';
 import { RunPanel } from '../run-panel/run-panel';
-import { workStateStore } from '../work-state-store';
+import { WORK_STATE_STORE } from '../work-state-store';
 
 import './query-tab.scss';
 
@@ -362,12 +362,13 @@ export const QueryTab = React.memo(function QueryTab(props: QueryTabProps) {
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [executionState.data, executionState.error]);
 
-  const incrementWorkVersion = useStore(
-    workStateStore,
-    useCallback(state => state.increment, []),
-  );
   useEffect(() => {
-    incrementWorkVersion();
+    const effectiveEngine = query.getEffectiveEngine();
+    if (effectiveEngine === 'sql-msq-task') {
+      WORK_STATE_STORE.getState().incrementMsqTask();
+    } else if (effectiveEngine === 'sql-msq-dart') {
+      WORK_STATE_STORE.getState().incrementMsqDart();
+    }
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [executionState.loading, Boolean(executionState.intermediate)]);
 
diff --git a/web-console/src/views/workbench-view/recent-query-task-panel/recent-query-task-panel.tsx b/web-console/src/views/workbench-view/recent-query-task-panel/recent-query-task-panel.tsx
index 682f5fd4d38b..734826cfeb37 100644
--- a/web-console/src/views/workbench-view/recent-query-task-panel/recent-query-task-panel.tsx
+++ b/web-console/src/views/workbench-view/recent-query-task-panel/recent-query-task-panel.tsx
@@ -19,10 +19,10 @@
 import { Button, Icon, Intent, Menu, MenuDivider, MenuItem, Popover } from '@blueprintjs/core';
 import type { IconName } from '@blueprintjs/icons';
 import { IconNames } from '@blueprintjs/icons';
-import { T } from '@druid-toolkit/query';
 import classNames from 'classnames';
 import copy from 'copy-to-clipboard';
-import React, { useCallback, useState } from 'react';
+import { T } from 'druid-query-toolkit';
+import React, { useState } from 'react';
 import { useStore } from 'zustand';
 
 import { Loader } from '../../../components';
@@ -38,7 +38,7 @@ import {
   queryDruidSql,
 } from '../../../utils';
 import { CancelQueryDialog } from '../cancel-query-dialog/cancel-query-dialog';
-import { workStateStore } from '../work-state-store';
+import { getMsqTaskVersion, WORK_STATE_STORE } from '../work-state-store';
 
 import './recent-query-task-panel.scss';
 
@@ -83,13 +83,8 @@ export const RecentQueryTaskPanel = React.memo(function RecentQueryTaskPanel(
 
   const [confirmCancelId, setConfirmCancelId] = useState<string | undefined>();
 
-  const workStateVersion = useStore(
-    workStateStore,
-    useCallback(state => state.version, []),
-  );
-
   const [queryTaskHistoryState, queryManager] = useQueryManager<number, RecentQueryEntry[]>({
-    query: workStateVersion,
+    query: useStore(WORK_STATE_STORE, getMsqTaskVersion),
     processQuery: async (_, cancelToken) => {
       return await queryDruidSql<RecentQueryEntry>(
         {
@@ -116,11 +111,6 @@ LIMIT 100`,
 
   const now = useClock();
 
-  const incrementWorkVersion = useStore(
-    workStateStore,
-    useCallback(state => state.increment, []),
-  );
-
   const queryTaskHistory = queryTaskHistoryState.getSomeData();
   return (
     <div className="recent-query-task-panel">
@@ -275,7 +265,7 @@ LIMIT 100`,
                 message: 'Query canceled',
                 intent: Intent.SUCCESS,
               });
-              incrementWorkVersion();
+              queryManager.rerunLastQuery();
             } catch {
               AppToaster.show({
                 message: 'Could not cancel query',
diff --git a/web-console/src/views/workbench-view/result-table-pane/result-table-pane.tsx b/web-console/src/views/workbench-view/result-table-pane/result-table-pane.tsx
index dfead18c63ec..c16a24c9740b 100644
--- a/web-console/src/views/workbench-view/result-table-pane/result-table-pane.tsx
+++ b/web-console/src/views/workbench-view/result-table-pane/result-table-pane.tsx
@@ -18,9 +18,9 @@
 
 import { Button, Icon, Intent, Menu, MenuItem, Popover } from '@blueprintjs/core';
 import { IconNames } from '@blueprintjs/icons';
-import type { Column, QueryResult, SqlExpression, SqlQuery } from '@druid-toolkit/query';
-import { C, F, SqlAlias, SqlFunction, SqlLiteral, SqlStar } from '@druid-toolkit/query';
 import classNames from 'classnames';
+import type { Column, QueryResult, SqlExpression, SqlQuery } from 'druid-query-toolkit';
+import { C, F, SqlAlias, SqlFunction, SqlLiteral, SqlStar } from 'druid-query-toolkit';
 import * as JSONBig from 'json-bigint-native';
 import type { JSX } from 'react';
 import React, { useEffect, useState } from 'react';
diff --git a/web-console/src/views/workbench-view/run-panel/run-panel.tsx b/web-console/src/views/workbench-view/run-panel/run-panel.tsx
index d586959357a4..2747179d6d44 100644
--- a/web-console/src/views/workbench-view/run-panel/run-panel.tsx
+++ b/web-console/src/views/workbench-view/run-panel/run-panel.tsx
@@ -51,31 +51,10 @@ import { deepGet, pluralIfNeeded, removeUndefinedValues, tickIcon } from '../../
 import type { MaxTasksButtonProps } from '../max-tasks-button/max-tasks-button';
 import { MaxTasksButton } from '../max-tasks-button/max-tasks-button';
 import { QueryParametersDialog } from '../query-parameters-dialog/query-parameters-dialog';
+import { TimezoneMenuItems } from '../timezone-menu-items/timezone-menu-items';
 
 import './run-panel.scss';
 
-const NAMED_TIMEZONES: string[] = [
-  'America/Juneau', // -9.0
-  'America/Los_Angeles', // -8.0
-  'America/Yellowknife', // -7.0
-  'America/Phoenix', // -7.0
-  'America/Denver', // -7.0
-  'America/Mexico_City', // -6.0
-  'America/Chicago', // -6.0
-  'America/New_York', // -5.0
-  'America/Argentina/Buenos_Aires', // -4.0
-  'Etc/UTC', // +0.0
-  'Europe/London', // +0.0
-  'Europe/Paris', // +1.0
-  'Asia/Jerusalem', // +2.0
-  'Asia/Shanghai', // +8.0
-  'Asia/Hong_Kong', // +8.0
-  'Asia/Seoul', // +9.0
-  'Asia/Tokyo', // +9.0
-  'Pacific/Guam', // +10.0
-  'Australia/Sydney', // +11.0
-];
-
 const ARRAY_INGEST_MODE_LABEL: Record<ArrayIngestMode, string> = {
   array: 'Array',
   mvd: 'MVD',
@@ -314,25 +293,6 @@ export const RunPanel = React.memo(function RunPanel(props: RunPanelProps) {
     onQueryChange(query.changeQueryContext(removeUndefinedValues(queryContext)));
   }
 
-  function offsetOptions(): JSX.Element[] {
-    const items: JSX.Element[] = [];
-
-    for (let i = -12; i <= 14; i++) {
-      const offset = `${i < 0 ? '-' : '+'}${String(Math.abs(i)).padStart(2, '0')}:00`;
-      items.push(
-        <MenuItem
-          key={offset}
-          icon={tickIcon(offset === sqlTimeZone)}
-          text={offset}
-          shouldDismissPopover={false}
-          onClick={() => changeQueryContext({ ...queryContext, sqlTimeZone: offset })}
-        />,
-      );
-    }
-
-    return items;
-  }
-
   const overloadWarning =
     query.unlimited &&
     (queryEngine === 'sql-native' ||
@@ -424,32 +384,13 @@ export const RunPanel = React.memo(function RunPanel(props: RunPanelProps) {
                     text="Timezone"
                     label={sqlTimeZone ?? defaultQueryContext.sqlTimeZone}
                   >
-                    <MenuDivider title="Timezone type" />
-                    <MenuItem
-                      icon={tickIcon(!sqlTimeZone)}
-                      text="Default"
-                      label={defaultQueryContext.sqlTimeZone}
-                      shouldDismissPopover={false}
-                      onClick={() =>
-                        changeQueryContext({ ...queryContext, sqlTimeZone: undefined })
+                    <TimezoneMenuItems
+                      sqlTimeZone={sqlTimeZone}
+                      setSqlTimeZone={sqlTimeZone =>
+                        changeQueryContext({ ...queryContext, sqlTimeZone })
                       }
+                      defaultSqlTimeZone={defaultQueryContext.sqlTimeZone}
                     />
-                    <MenuItem icon={tickIcon(String(sqlTimeZone).includes('/'))} text="Named">
-                      {NAMED_TIMEZONES.map(namedTimezone => (
-                        <MenuItem
-                          key={namedTimezone}
-                          icon={tickIcon(namedTimezone === sqlTimeZone)}
-                          text={namedTimezone}
-                          shouldDismissPopover={false}
-                          onClick={() =>
-                            changeQueryContext({ ...queryContext, sqlTimeZone: namedTimezone })
-                          }
-                        />
-                      ))}
-                    </MenuItem>
-                    <MenuItem icon={tickIcon(String(sqlTimeZone).includes(':'))} text="Offset">
-                      {offsetOptions()}
-                    </MenuItem>
                     <MenuItem
                       icon={IconNames.BLANK}
                       text="Custom"
diff --git a/web-console/src/views/workbench-view/time-floor-menu-item/time-floor-menu-item.tsx b/web-console/src/views/workbench-view/time-floor-menu-item/time-floor-menu-item.tsx
index fd7bea12a45e..f2576a561a55 100644
--- a/web-console/src/views/workbench-view/time-floor-menu-item/time-floor-menu-item.tsx
+++ b/web-console/src/views/workbench-view/time-floor-menu-item/time-floor-menu-item.tsx
@@ -18,8 +18,8 @@
 
 import { MenuItem } from '@blueprintjs/core';
 import { IconNames } from '@blueprintjs/icons';
-import type { SqlExpression } from '@druid-toolkit/query';
-import { F, SqlFunction } from '@druid-toolkit/query';
+import type { SqlExpression } from 'druid-query-toolkit';
+import { F, SqlFunction } from 'druid-query-toolkit';
 
 import { oneOf, tickIcon } from '../../../utils';
 
diff --git a/web-console/src/views/workbench-view/timezone-menu-items/__snapshots__/timezone-menu-items.spec.tsx.snap b/web-console/src/views/workbench-view/timezone-menu-items/__snapshots__/timezone-menu-items.spec.tsx.snap
new file mode 100644
index 000000000000..9c958fb88001
--- /dev/null
+++ b/web-console/src/views/workbench-view/timezone-menu-items/__snapshots__/timezone-menu-items.spec.tsx.snap
@@ -0,0 +1,563 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`TimezoneMenuItems matches snapshot 1`] = `
+[
+  <Blueprint5.MenuDivider
+    title="Timezone type"
+  />,
+  <Blueprint5.MenuItem
+    active={false}
+    disabled={false}
+    icon="blank"
+    label="Etc/UTC"
+    multiline={false}
+    onClick={[Function]}
+    popoverProps={{}}
+    shouldDismissPopover={false}
+    text="Default"
+  />,
+  <Blueprint5.MenuItem
+    active={false}
+    disabled={false}
+    icon="blank"
+    multiline={false}
+    popoverProps={{}}
+    shouldDismissPopover={true}
+    text="Named"
+  >
+    <Blueprint5.MenuItem
+      active={false}
+      disabled={false}
+      icon="blank"
+      label="UTC-8:00"
+      multiline={false}
+      onClick={[Function]}
+      popoverProps={{}}
+      shouldDismissPopover={false}
+      text="America/Juneau"
+    />
+    <Blueprint5.MenuItem
+      active={false}
+      disabled={false}
+      icon="blank"
+      label="UTC-7:00"
+      multiline={false}
+      onClick={[Function]}
+      popoverProps={{}}
+      shouldDismissPopover={false}
+      text="America/Los_Angeles"
+    />
+    <Blueprint5.MenuItem
+      active={false}
+      disabled={false}
+      icon="blank"
+      label="UTC-7:00"
+      multiline={false}
+      onClick={[Function]}
+      popoverProps={{}}
+      shouldDismissPopover={false}
+      text="America/Phoenix"
+    />
+    <Blueprint5.MenuItem
+      active={false}
+      disabled={false}
+      icon="blank"
+      label="UTC-6:00"
+      multiline={false}
+      onClick={[Function]}
+      popoverProps={{}}
+      shouldDismissPopover={false}
+      text="America/Yellowknife"
+    />
+    <Blueprint5.MenuItem
+      active={false}
+      disabled={false}
+      icon="blank"
+      label="UTC-6:00"
+      multiline={false}
+      onClick={[Function]}
+      popoverProps={{}}
+      shouldDismissPopover={false}
+      text="America/Denver"
+    />
+    <Blueprint5.MenuItem
+      active={false}
+      disabled={false}
+      icon="blank"
+      label="UTC-6:00"
+      multiline={false}
+      onClick={[Function]}
+      popoverProps={{}}
+      shouldDismissPopover={false}
+      text="America/Mexico_City"
+    />
+    <Blueprint5.MenuItem
+      active={false}
+      disabled={false}
+      icon="blank"
+      label="UTC-5:00"
+      multiline={false}
+      onClick={[Function]}
+      popoverProps={{}}
+      shouldDismissPopover={false}
+      text="America/Chicago"
+    />
+    <Blueprint5.MenuItem
+      active={false}
+      disabled={false}
+      icon="blank"
+      label="UTC-4:00"
+      multiline={false}
+      onClick={[Function]}
+      popoverProps={{}}
+      shouldDismissPopover={false}
+      text="America/New_York"
+    />
+    <Blueprint5.MenuItem
+      active={false}
+      disabled={false}
+      icon="blank"
+      label="UTC-3:00"
+      multiline={false}
+      onClick={[Function]}
+      popoverProps={{}}
+      shouldDismissPopover={false}
+      text="America/Argentina/Buenos_Aires"
+    />
+    <Blueprint5.MenuItem
+      active={false}
+      disabled={false}
+      icon="blank"
+      label="UTC+0:00"
+      multiline={false}
+      onClick={[Function]}
+      popoverProps={{}}
+      shouldDismissPopover={false}
+      text="Etc/UTC"
+    />
+    <Blueprint5.MenuItem
+      active={false}
+      disabled={false}
+      icon="blank"
+      label="UTC+0:00"
+      multiline={false}
+      onClick={[Function]}
+      popoverProps={{}}
+      shouldDismissPopover={false}
+      text={
+        <React.Fragment>
+          UTC
+           
+          <Blueprint5.Icon
+            autoLoad={true}
+            data-tooltip="Browser timezone"
+            icon="star"
+            tagName="span"
+          />
+        </React.Fragment>
+      }
+    />
+    <Blueprint5.MenuItem
+      active={false}
+      disabled={false}
+      icon="blank"
+      label="UTC+1:00"
+      multiline={false}
+      onClick={[Function]}
+      popoverProps={{}}
+      shouldDismissPopover={false}
+      text="Europe/London"
+    />
+    <Blueprint5.MenuItem
+      active={false}
+      disabled={false}
+      icon="blank"
+      label="UTC+2:00"
+      multiline={false}
+      onClick={[Function]}
+      popoverProps={{}}
+      shouldDismissPopover={false}
+      text="Europe/Paris"
+    />
+    <Blueprint5.MenuItem
+      active={false}
+      disabled={false}
+      icon="blank"
+      label="UTC+3:00"
+      multiline={false}
+      onClick={[Function]}
+      popoverProps={{}}
+      shouldDismissPopover={false}
+      text="Asia/Jerusalem"
+    />
+    <Blueprint5.MenuItem
+      active={false}
+      disabled={false}
+      icon="blank"
+      label="UTC+5:30"
+      multiline={false}
+      onClick={[Function]}
+      popoverProps={{}}
+      shouldDismissPopover={false}
+      text="Asia/Kolkata"
+    />
+    <Blueprint5.MenuItem
+      active={false}
+      disabled={false}
+      icon="blank"
+      label="UTC+8:00"
+      multiline={false}
+      onClick={[Function]}
+      popoverProps={{}}
+      shouldDismissPopover={false}
+      text="Asia/Shanghai"
+    />
+    <Blueprint5.MenuItem
+      active={false}
+      disabled={false}
+      icon="blank"
+      label="UTC+8:00"
+      multiline={false}
+      onClick={[Function]}
+      popoverProps={{}}
+      shouldDismissPopover={false}
+      text="Asia/Hong_Kong"
+    />
+    <Blueprint5.MenuItem
+      active={false}
+      disabled={false}
+      icon="blank"
+      label="UTC+9:00"
+      multiline={false}
+      onClick={[Function]}
+      popoverProps={{}}
+      shouldDismissPopover={false}
+      text="Asia/Seoul"
+    />
+    <Blueprint5.MenuItem
+      active={false}
+      disabled={false}
+      icon="blank"
+      label="UTC+9:00"
+      multiline={false}
+      onClick={[Function]}
+      popoverProps={{}}
+      shouldDismissPopover={false}
+      text="Asia/Tokyo"
+    />
+    <Blueprint5.MenuItem
+      active={false}
+      disabled={false}
+      icon="blank"
+      label="UTC+10:00"
+      multiline={false}
+      onClick={[Function]}
+      popoverProps={{}}
+      shouldDismissPopover={false}
+      text="Pacific/Guam"
+    />
+    <Blueprint5.MenuItem
+      active={false}
+      disabled={false}
+      icon="blank"
+      label="UTC+10:00"
+      multiline={false}
+      onClick={[Function]}
+      popoverProps={{}}
+      shouldDismissPopover={false}
+      text="Australia/Sydney"
+    />
+  </Blueprint5.MenuItem>,
+  <Blueprint5.MenuItem
+    active={false}
+    disabled={false}
+    icon="blank"
+    multiline={false}
+    popoverProps={{}}
+    shouldDismissPopover={true}
+    text="Offset"
+  >
+    <Blueprint5.MenuItem
+      active={false}
+      disabled={false}
+      icon="blank"
+      multiline={false}
+      onClick={[Function]}
+      popoverProps={{}}
+      shouldDismissPopover={false}
+      text="-12:00"
+    />
+    <Blueprint5.MenuItem
+      active={false}
+      disabled={false}
+      icon="blank"
+      multiline={false}
+      onClick={[Function]}
+      popoverProps={{}}
+      shouldDismissPopover={false}
+      text="-11:00"
+    />
+    <Blueprint5.MenuItem
+      active={false}
+      disabled={false}
+      icon="blank"
+      multiline={false}
+      onClick={[Function]}
+      popoverProps={{}}
+      shouldDismissPopover={false}
+      text="-10:00"
+    />
+    <Blueprint5.MenuItem
+      active={false}
+      disabled={false}
+      icon="blank"
+      multiline={false}
+      onClick={[Function]}
+      popoverProps={{}}
+      shouldDismissPopover={false}
+      text="-09:00"
+    />
+    <Blueprint5.MenuItem
+      active={false}
+      disabled={false}
+      icon="blank"
+      multiline={false}
+      onClick={[Function]}
+      popoverProps={{}}
+      shouldDismissPopover={false}
+      text="-08:00"
+    />
+    <Blueprint5.MenuItem
+      active={false}
+      disabled={false}
+      icon="blank"
+      multiline={false}
+      onClick={[Function]}
+      popoverProps={{}}
+      shouldDismissPopover={false}
+      text="-07:00"
+    />
+    <Blueprint5.MenuItem
+      active={false}
+      disabled={false}
+      icon="blank"
+      multiline={false}
+      onClick={[Function]}
+      popoverProps={{}}
+      shouldDismissPopover={false}
+      text="-06:00"
+    />
+    <Blueprint5.MenuItem
+      active={false}
+      disabled={false}
+      icon="blank"
+      multiline={false}
+      onClick={[Function]}
+      popoverProps={{}}
+      shouldDismissPopover={false}
+      text="-05:00"
+    />
+    <Blueprint5.MenuItem
+      active={false}
+      disabled={false}
+      icon="blank"
+      multiline={false}
+      onClick={[Function]}
+      popoverProps={{}}
+      shouldDismissPopover={false}
+      text="-04:00"
+    />
+    <Blueprint5.MenuItem
+      active={false}
+      disabled={false}
+      icon="blank"
+      multiline={false}
+      onClick={[Function]}
+      popoverProps={{}}
+      shouldDismissPopover={false}
+      text="-03:00"
+    />
+    <Blueprint5.MenuItem
+      active={false}
+      disabled={false}
+      icon="blank"
+      multiline={false}
+      onClick={[Function]}
+      popoverProps={{}}
+      shouldDismissPopover={false}
+      text="-02:00"
+    />
+    <Blueprint5.MenuItem
+      active={false}
+      disabled={false}
+      icon="blank"
+      multiline={false}
+      onClick={[Function]}
+      popoverProps={{}}
+      shouldDismissPopover={false}
+      text="-01:00"
+    />
+    <Blueprint5.MenuItem
+      active={false}
+      disabled={false}
+      icon="blank"
+      multiline={false}
+      onClick={[Function]}
+      popoverProps={{}}
+      shouldDismissPopover={false}
+      text={
+        <React.Fragment>
+          +00:00
+           
+          <Blueprint5.Icon
+            autoLoad={true}
+            data-tooltip="Browser offset"
+            icon="star"
+            tagName="span"
+          />
+        </React.Fragment>
+      }
+    />
+    <Blueprint5.MenuItem
+      active={false}
+      disabled={false}
+      icon="blank"
+      multiline={false}
+      onClick={[Function]}
+      popoverProps={{}}
+      shouldDismissPopover={false}
+      text="+01:00"
+    />
+    <Blueprint5.MenuItem
+      active={false}
+      disabled={false}
+      icon="blank"
+      multiline={false}
+      onClick={[Function]}
+      popoverProps={{}}
+      shouldDismissPopover={false}
+      text="+02:00"
+    />
+    <Blueprint5.MenuItem
+      active={false}
+      disabled={false}
+      icon="blank"
+      multiline={false}
+      onClick={[Function]}
+      popoverProps={{}}
+      shouldDismissPopover={false}
+      text="+03:00"
+    />
+    <Blueprint5.MenuItem
+      active={false}
+      disabled={false}
+      icon="blank"
+      multiline={false}
+      onClick={[Function]}
+      popoverProps={{}}
+      shouldDismissPopover={false}
+      text="+04:00"
+    />
+    <Blueprint5.MenuItem
+      active={false}
+      disabled={false}
+      icon="blank"
+      multiline={false}
+      onClick={[Function]}
+      popoverProps={{}}
+      shouldDismissPopover={false}
+      text="+05:00"
+    />
+    <Blueprint5.MenuItem
+      active={false}
+      disabled={false}
+      icon="blank"
+      multiline={false}
+      onClick={[Function]}
+      popoverProps={{}}
+      shouldDismissPopover={false}
+      text="+06:00"
+    />
+    <Blueprint5.MenuItem
+      active={false}
+      disabled={false}
+      icon="blank"
+      multiline={false}
+      onClick={[Function]}
+      popoverProps={{}}
+      shouldDismissPopover={false}
+      text="+07:00"
+    />
+    <Blueprint5.MenuItem
+      active={false}
+      disabled={false}
+      icon="blank"
+      multiline={false}
+      onClick={[Function]}
+      popoverProps={{}}
+      shouldDismissPopover={false}
+      text="+08:00"
+    />
+    <Blueprint5.MenuItem
+      active={false}
+      disabled={false}
+      icon="blank"
+      multiline={false}
+      onClick={[Function]}
+      popoverProps={{}}
+      shouldDismissPopover={false}
+      text="+09:00"
+    />
+    <Blueprint5.MenuItem
+      active={false}
+      disabled={false}
+      icon="blank"
+      multiline={false}
+      onClick={[Function]}
+      popoverProps={{}}
+      shouldDismissPopover={false}
+      text="+10:00"
+    />
+    <Blueprint5.MenuItem
+      active={false}
+      disabled={false}
+      icon="blank"
+      multiline={false}
+      onClick={[Function]}
+      popoverProps={{}}
+      shouldDismissPopover={false}
+      text="+11:00"
+    />
+    <Blueprint5.MenuItem
+      active={false}
+      disabled={false}
+      icon="blank"
+      multiline={false}
+      onClick={[Function]}
+      popoverProps={{}}
+      shouldDismissPopover={false}
+      text="+12:00"
+    />
+    <Blueprint5.MenuItem
+      active={false}
+      disabled={false}
+      icon="blank"
+      multiline={false}
+      onClick={[Function]}
+      popoverProps={{}}
+      shouldDismissPopover={false}
+      text="+13:00"
+    />
+    <Blueprint5.MenuItem
+      active={false}
+      disabled={false}
+      icon="blank"
+      multiline={false}
+      onClick={[Function]}
+      popoverProps={{}}
+      shouldDismissPopover={false}
+      text="+14:00"
+    />
+  </Blueprint5.MenuItem>,
+]
+`;
diff --git a/web-console/src/components/segment-timeline/bar-unit.tsx b/web-console/src/views/workbench-view/timezone-menu-items/timezone-menu-items.spec.tsx
similarity index 58%
rename from web-console/src/components/segment-timeline/bar-unit.tsx
rename to web-console/src/views/workbench-view/timezone-menu-items/timezone-menu-items.spec.tsx
index 8591f68cc2e3..5a1a2b9ce51b 100644
--- a/web-console/src/components/segment-timeline/bar-unit.tsx
+++ b/web-console/src/views/workbench-view/timezone-menu-items/timezone-menu-items.spec.tsx
@@ -16,30 +16,26 @@
  * limitations under the License.
  */
 
-interface BarChartUnitProps {
-  x: number | undefined;
-  y: number;
-  width: number;
-  height: number;
-  style?: any;
-  onClick?: () => void;
-  onHover?: () => void;
-  offHover?: () => void;
-}
+import { shallow } from '../../../utils/shallow-renderer';
 
-export function BarUnit(props: BarChartUnitProps) {
-  const { x, y, width, height, style, onClick, onHover, offHover } = props;
-  return (
-    <rect
-      className="bar-unit"
-      x={x}
-      y={y}
-      width={width}
-      height={height}
-      style={style}
-      onClick={onClick}
-      onMouseOver={onHover}
-      onMouseLeave={offHover}
-    />
-  );
-}
+import { TimezoneMenuItems } from './timezone-menu-items';
+
+jest.useFakeTimers('modern').setSystemTime(Date.parse('2024-06-08T12:34:56Z'));
+
+describe('TimezoneMenuItems', () => {
+  it('ensure UTC', () => {
+    expect(new Date().getTimezoneOffset()).toBe(0);
+  });
+
+  it('matches snapshot', () => {
+    const comp = shallow(
+      <TimezoneMenuItems
+        sqlTimeZone="Blah"
+        setSqlTimeZone={() => {}}
+        defaultSqlTimeZone="Etc/UTC"
+      />,
+    );
+
+    expect(comp).toMatchSnapshot();
+  });
+});
diff --git a/web-console/src/views/workbench-view/timezone-menu-items/timezone-menu-items.tsx b/web-console/src/views/workbench-view/timezone-menu-items/timezone-menu-items.tsx
new file mode 100644
index 000000000000..2340302d0a56
--- /dev/null
+++ b/web-console/src/views/workbench-view/timezone-menu-items/timezone-menu-items.tsx
@@ -0,0 +1,151 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { Icon, MenuDivider, MenuItem } from '@blueprintjs/core';
+import { IconNames } from '@blueprintjs/icons';
+import { fromDate, getLocalTimeZone } from '@internationalized/date';
+import { useMemo } from 'react';
+
+import { minute, tickIcon, timezoneOffsetInMinutesToString } from '../../../utils';
+
+const NAMED_TIMEZONES: string[] = [
+  'America/Juneau', // -9:00
+  'America/Los_Angeles', // -8:00
+  'America/Yellowknife', // -7:00
+  'America/Phoenix', // -7:00
+  'America/Denver', // -7:00
+  'America/Mexico_City', // -6:00
+  'America/Chicago', // -6:00
+  'America/New_York', // -5:00
+  'America/Argentina/Buenos_Aires', // -4:00
+  'Etc/UTC', // +0:00
+  'Europe/London', // +0:00
+  'Europe/Paris', // +1:00
+  'Asia/Jerusalem', // +2:00
+  'Asia/Kolkata', // +5:30
+  'Asia/Shanghai', // +8:00
+  'Asia/Hong_Kong', // +8:00
+  'Asia/Seoul', // +9:00
+  'Asia/Tokyo', // +9:00
+  'Pacific/Guam', // +10:00
+  'Australia/Sydney', // +11:00
+];
+
+export interface TimezoneMenuItemsProps {
+  sqlTimeZone: string | undefined;
+  setSqlTimeZone(sqlTimeZone: string | undefined): void;
+  defaultSqlTimeZone: string | undefined;
+}
+
+export const TimezoneMenuItems = function TimezoneMenuItems(props: TimezoneMenuItemsProps) {
+  const { sqlTimeZone, setSqlTimeZone, defaultSqlTimeZone } = props;
+
+  const { timezones, myTimezone, offsetsInMinutes, myOffsetInMinutes } = useMemo(() => {
+    const now = new Date();
+
+    const timezones: { timezone: string; offsetInMinutes: number }[] = NAMED_TIMEZONES.map(
+      timezone => ({
+        timezone,
+        offsetInMinutes: fromDate(now, timezone).offset / minute.canonicalLength,
+      }),
+    );
+    const myTimezone = getLocalTimeZone();
+    const myOffsetInMinutes = -now.getTimezoneOffset();
+
+    // Make sure the browsers timezone is in the list
+    if (!timezones.find(({ timezone }) => timezone === myTimezone)) {
+      timezones.push({
+        timezone: myTimezone,
+        offsetInMinutes: myOffsetInMinutes,
+      });
+    }
+    timezones.sort((a, b) => a.offsetInMinutes - b.offsetInMinutes);
+
+    const offsetsInMinutes: number[] = [];
+    for (let offsetInMinutes = -12 * 60; offsetInMinutes <= 14 * 60; offsetInMinutes += 60) {
+      offsetsInMinutes.push(offsetInMinutes);
+    }
+
+    // Make sure the browser offset is in the list
+    if (!offsetsInMinutes.includes(myOffsetInMinutes)) {
+      offsetsInMinutes.push(myOffsetInMinutes);
+      offsetsInMinutes.sort((a, b) => a - b);
+    }
+
+    return {
+      timezones,
+      myTimezone,
+      offsetsInMinutes,
+      myOffsetInMinutes,
+    };
+  }, []);
+
+  return [
+    <MenuDivider key="type" title="Timezone type" />,
+    <MenuItem
+      key="default"
+      icon={tickIcon(!sqlTimeZone)}
+      text="Default"
+      label={defaultSqlTimeZone}
+      shouldDismissPopover={false}
+      onClick={() => setSqlTimeZone(undefined)}
+    />,
+    <MenuItem key="named" icon={tickIcon(String(sqlTimeZone).includes('/'))} text="Named">
+      {timezones.map(({ timezone, offsetInMinutes }) => (
+        <MenuItem
+          key={timezone}
+          icon={tickIcon(timezone === sqlTimeZone)}
+          text={
+            timezone === myTimezone ? (
+              <>
+                {timezone} <Icon icon={IconNames.STAR} data-tooltip="Browser timezone" />
+              </>
+            ) : (
+              timezone
+            )
+          }
+          label={`UTC${timezoneOffsetInMinutesToString(offsetInMinutes, false)}`}
+          shouldDismissPopover={false}
+          onClick={() => setSqlTimeZone(timezone)}
+        />
+      ))}
+    </MenuItem>,
+    <MenuItem key="offset" icon={tickIcon(String(sqlTimeZone).includes(':'))} text="Offset">
+      {offsetsInMinutes.map(offsetInMinutes => {
+        const offset = timezoneOffsetInMinutesToString(offsetInMinutes, true);
+        return (
+          <MenuItem
+            key={offset}
+            icon={tickIcon(offset === sqlTimeZone)}
+            text={
+              myOffsetInMinutes === offsetInMinutes ? (
+                <>
+                  {offset} <Icon icon={IconNames.STAR} data-tooltip="Browser offset" />
+                </>
+              ) : (
+                offset
+              )
+            }
+            shouldDismissPopover={false}
+            onClick={() => setSqlTimeZone(offset)}
+          />
+        );
+      })}
+    </MenuItem>,
+  ];
+};
diff --git a/web-console/src/views/workbench-view/work-state-store.ts b/web-console/src/views/workbench-view/work-state-store.ts
index ee03a70c030d..38fb8d8e673b 100644
--- a/web-console/src/views/workbench-view/work-state-store.ts
+++ b/web-console/src/views/workbench-view/work-state-store.ts
@@ -19,11 +19,23 @@
 import { createStore } from 'zustand';
 
 interface WorkState {
-  version: number;
-  increment(): void;
+  msqTaskVersion: number;
+  msqDartVersion: number;
+  incrementMsqTask(): void;
+  incrementMsqDart(): void;
 }
 
-export const workStateStore = createStore<WorkState>(set => ({
-  version: 0,
-  increment: () => set(state => ({ version: state.version + 1 })),
+export const WORK_STATE_STORE = createStore<WorkState>(set => ({
+  msqTaskVersion: 0,
+  msqDartVersion: 0,
+  incrementMsqTask: () => set(state => ({ msqTaskVersion: state.msqTaskVersion + 1 })),
+  incrementMsqDart: () => set(state => ({ msqDartVersion: state.msqDartVersion + 1 })),
 }));
+
+export function getMsqTaskVersion(store: WorkState): number {
+  return store.msqTaskVersion;
+}
+
+export function getMsqDartVersion(store: WorkState): number {
+  return store.msqDartVersion;
+}
diff --git a/web-console/src/views/workbench-view/workbench-view.tsx b/web-console/src/views/workbench-view/workbench-view.tsx
index f647bfbc5c7c..567fd51d4c8c 100644
--- a/web-console/src/views/workbench-view/workbench-view.tsx
+++ b/web-console/src/views/workbench-view/workbench-view.tsx
@@ -26,10 +26,10 @@ import {
   Popover,
 } from '@blueprintjs/core';
 import { IconNames } from '@blueprintjs/icons';
-import type { SqlQuery } from '@druid-toolkit/query';
-import { SqlExpression } from '@druid-toolkit/query';
 import classNames from 'classnames';
 import copy from 'copy-to-clipboard';
+import type { SqlQuery } from 'druid-query-toolkit';
+import { SqlExpression } from 'druid-query-toolkit';
 import React from 'react';
 
 import { MenuCheckbox, SplitterLayout } from '../../components';

From c1ef38b0526554bceedd78001aed8e9fb86ef126 Mon Sep 17 00:00:00 2001
From: Zoltan Haindrich <kirk@rxd.hu>
Date: Thu, 28 Nov 2024 10:05:12 +0100
Subject: [PATCH 09/56] Minor fixes and enhancements in UnionQuery handling
 (#17483)

* plan consistently with either UnionDataSource or UnionQuery for decoupled mode
* expose errors
* move decoupled related setting from PlannerConfig to QueryContexts
---
 .../msq/test/CalciteUnionQueryMSQTest.java    |   3 +-
 .../org/apache/druid/query/QueryContext.java  |   9 +
 .../org/apache/druid/query/QueryContexts.java |   5 +
 .../apache/druid/query/UnionDataSource.java   |   5 +
 .../query/timeseries/TimeseriesQuery.java     |   3 +-
 .../druid/query/union/UnionQueryLogic.java    |   1 +
 .../apache/druid/query/QueryContextTest.java  |  22 ++
 .../druid/query/UnionDataSourceTest.java      |  15 +-
 sql/pom.xml                                   |   9 +-
 .../sql/calcite/planner/PlannerConfig.java    |   8 +-
 .../sql/calcite/planner/PlannerContext.java   |   4 +
 .../sql/calcite/planner/PlannerFactory.java   |   3 +-
 .../sql/calcite/planner/QueryHandler.java     |   3 +-
 .../planner/querygen/DruidQueryGenerator.java | 148 +++++++++++---
 .../planner/querygen/SourceDescProducer.java  |   7 +
 .../druid/sql/calcite/rel/DruidQuery.java     |  19 +-
 .../sql/calcite/rel/logical/DruidUnion.java   |  93 +++------
 .../calcite/CalciteNestedDataQueryTest.java   |   4 +-
 .../druid/sql/calcite/CalciteQueryTest.java   |   2 -
 .../sql/calcite/CalciteUnionQueryTest.java    | 190 ++++++++++++++----
 .../druid/sql/calcite/DecoupledExtension.java |   2 +-
 .../druid/sql/calcite/NotYetSupported.java    |   3 -
 .../druid/sql/calcite/QueryTestBuilder.java   |   4 +-
 23 files changed, 388 insertions(+), 174 deletions(-)

diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/test/CalciteUnionQueryMSQTest.java b/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/test/CalciteUnionQueryMSQTest.java
index f0686498786e..a470615fd0d4 100644
--- a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/test/CalciteUnionQueryMSQTest.java
+++ b/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/test/CalciteUnionQueryMSQTest.java
@@ -62,13 +62,12 @@ protected QueryTestBuilder testBuilder()
    */
   @Test
   @Override
-  public void testUnionIsUnplannable()
+  public void testUnionDifferentColumnOrder()
   {
     assertQueryIsUnplannable(
         "SELECT dim2, dim1, m1 FROM foo2 UNION SELECT dim1, dim2, m1 FROM foo",
         "SQL requires union between two tables and column names queried for each table are different Left: [dim2, dim1, m1], Right: [dim1, dim2, m1]."
     );
-
   }
 
   @Disabled("Ignored till MSQ can plan UNION ALL with any operand")
diff --git a/processing/src/main/java/org/apache/druid/query/QueryContext.java b/processing/src/main/java/org/apache/druid/query/QueryContext.java
index d44e0153f0b8..1a79f524d5c2 100644
--- a/processing/src/main/java/org/apache/druid/query/QueryContext.java
+++ b/processing/src/main/java/org/apache/druid/query/QueryContext.java
@@ -661,4 +661,13 @@ public String toString()
            "context=" + context +
            '}';
   }
+
+  public boolean isDecoupledMode()
+  {
+    String value = getString(
+        QueryContexts.CTX_NATIVE_QUERY_SQL_PLANNING_MODE,
+        QueryContexts.NATIVE_QUERY_SQL_PLANNING_MODE_COUPLED
+    );
+    return QueryContexts.NATIVE_QUERY_SQL_PLANNING_MODE_DECOUPLED.equals(value);
+  }
 }
diff --git a/processing/src/main/java/org/apache/druid/query/QueryContexts.java b/processing/src/main/java/org/apache/druid/query/QueryContexts.java
index 759a9b49437e..950dea52e907 100644
--- a/processing/src/main/java/org/apache/druid/query/QueryContexts.java
+++ b/processing/src/main/java/org/apache/druid/query/QueryContexts.java
@@ -29,6 +29,7 @@
 import org.apache.druid.java.util.common.StringUtils;
 
 import javax.annotation.Nullable;
+
 import java.math.BigDecimal;
 import java.util.Arrays;
 import java.util.HashMap;
@@ -105,6 +106,10 @@ public class QueryContexts
   // SQL statement resource specific keys
   public static final String CTX_EXECUTION_MODE = "executionMode";
 
+  public static final String CTX_NATIVE_QUERY_SQL_PLANNING_MODE = "plannerStrategy";
+  public static final String NATIVE_QUERY_SQL_PLANNING_MODE_COUPLED = "COUPLED";
+  public static final String NATIVE_QUERY_SQL_PLANNING_MODE_DECOUPLED = "DECOUPLED";
+
   // Defaults
   public static final boolean DEFAULT_BY_SEGMENT = false;
   public static final boolean DEFAULT_POPULATE_CACHE = true;
diff --git a/processing/src/main/java/org/apache/druid/query/UnionDataSource.java b/processing/src/main/java/org/apache/druid/query/UnionDataSource.java
index 27a0113d76f1..0384ecbc8852 100644
--- a/processing/src/main/java/org/apache/druid/query/UnionDataSource.java
+++ b/processing/src/main/java/org/apache/druid/query/UnionDataSource.java
@@ -198,4 +198,9 @@ public String toString()
            "dataSources=" + dataSources +
            '}';
   }
+
+  public static boolean isCompatibleDataSource(DataSource dataSource)
+  {
+    return (dataSource instanceof TableDataSource || dataSource instanceof InlineDataSource);
+  }
 }
diff --git a/processing/src/main/java/org/apache/druid/query/timeseries/TimeseriesQuery.java b/processing/src/main/java/org/apache/druid/query/timeseries/TimeseriesQuery.java
index b5e135968a89..b2165cd5b704 100644
--- a/processing/src/main/java/org/apache/druid/query/timeseries/TimeseriesQuery.java
+++ b/processing/src/main/java/org/apache/druid/query/timeseries/TimeseriesQuery.java
@@ -185,14 +185,13 @@ public boolean isSkipEmptyBuckets()
   @Override
   public RowSignature getResultRowSignature(Finalization finalization)
   {
-    final Finalization finalization1 = finalization;
     final RowSignature.Builder builder = RowSignature.builder();
     builder.addTimeColumn();
     String timestampResultField = getTimestampResultField();
     if (StringUtils.isNotEmpty(timestampResultField)) {
       builder.add(timestampResultField, ColumnType.LONG);
     }
-    builder.addAggregators(aggregatorSpecs, finalization1);
+    builder.addAggregators(aggregatorSpecs, finalization);
     builder.addPostAggregators(postAggregatorSpecs);
     return builder.build();
   }
diff --git a/processing/src/main/java/org/apache/druid/query/union/UnionQueryLogic.java b/processing/src/main/java/org/apache/druid/query/union/UnionQueryLogic.java
index 42f031487a24..750e369054ff 100644
--- a/processing/src/main/java/org/apache/druid/query/union/UnionQueryLogic.java
+++ b/processing/src/main/java/org/apache/druid/query/union/UnionQueryLogic.java
@@ -96,6 +96,7 @@ public Sequence<Object> run(QueryPlus<Object> queryPlus, ResponseContext respons
         Sequence run = runner.run(queryPlus.withQuery(q), responseContext);
         seqs.add(run);
       }
+
       return Sequences.concat(seqs);
     }
   }
diff --git a/processing/src/test/java/org/apache/druid/query/QueryContextTest.java b/processing/src/test/java/org/apache/druid/query/QueryContextTest.java
index d0d6a5126278..0b32c391cc8d 100644
--- a/processing/src/test/java/org/apache/druid/query/QueryContextTest.java
+++ b/processing/src/test/java/org/apache/druid/query/QueryContextTest.java
@@ -372,6 +372,28 @@ public void testDefaultEnableQueryDebugging()
     assertTrue(QueryContext.of(ImmutableMap.of(QueryContexts.ENABLE_DEBUG, true)).isDebug());
   }
 
+  @Test
+  public void testIsDecoupled()
+  {
+    assertFalse(QueryContext.empty().isDecoupledMode());
+    assertTrue(
+        QueryContext.of(
+            ImmutableMap.of(
+                QueryContexts.CTX_NATIVE_QUERY_SQL_PLANNING_MODE,
+                QueryContexts.NATIVE_QUERY_SQL_PLANNING_MODE_DECOUPLED
+            )
+        ).isDecoupledMode()
+    );
+    assertFalse(
+        QueryContext.of(
+            ImmutableMap.of(
+                QueryContexts.CTX_NATIVE_QUERY_SQL_PLANNING_MODE,
+                "garbage"
+            )
+        ).isDecoupledMode()
+    );
+  }
+
   // This test is a bit silly. It is retained because another test uses the
   // LegacyContextQuery test.
   @Test
diff --git a/processing/src/test/java/org/apache/druid/query/UnionDataSourceTest.java b/processing/src/test/java/org/apache/druid/query/UnionDataSourceTest.java
index 12522df08df3..864a7442926e 100644
--- a/processing/src/test/java/org/apache/druid/query/UnionDataSourceTest.java
+++ b/processing/src/test/java/org/apache/druid/query/UnionDataSourceTest.java
@@ -24,6 +24,8 @@
 import com.google.common.collect.ImmutableSet;
 import nl.jqno.equalsverifier.EqualsVerifier;
 import org.apache.druid.segment.TestHelper;
+import org.apache.druid.segment.column.RowSignature;
+import org.apache.druid.segment.join.NoopDataSource;
 import org.junit.Assert;
 import org.junit.Rule;
 import org.junit.Test;
@@ -62,6 +64,17 @@ public void test_constructor_empty()
     new UnionDataSource(Collections.emptyList());
   }
 
+  @Test
+  public void test_isCompatible()
+  {
+    TableDataSource tableDataSource = new TableDataSource("foo");
+    InlineDataSource inlineDataSource = InlineDataSource.fromIterable(Collections.emptyList(), RowSignature.empty());
+
+    Assert.assertTrue(UnionDataSource.isCompatibleDataSource(tableDataSource));
+    Assert.assertTrue(UnionDataSource.isCompatibleDataSource(inlineDataSource));
+    Assert.assertFalse(UnionDataSource.isCompatibleDataSource(new NoopDataSource()));
+  }
+
   @Test
   public void test_getTableNames()
   {
@@ -131,7 +144,7 @@ public void test_withChildren_sameNumber()
     //noinspection unchecked
     Assert.assertEquals(
         new UnionDataSource(newDataSources),
-        unionDataSource.withChildren((List) newDataSources)
+        unionDataSource.withChildren(newDataSources)
     );
   }
 
diff --git a/sql/pom.xml b/sql/pom.xml
index 20bf288d90db..1c68ad0c0ed5 100644
--- a/sql/pom.xml
+++ b/sql/pom.xml
@@ -165,6 +165,10 @@
       <groupId>org.apache.calcite.avatica</groupId>
       <artifactId>avatica-metrics</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-lang3</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.checkerframework</groupId>
       <artifactId>checker-qual</artifactId>
@@ -239,11 +243,6 @@
       <version>1.3.0</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-lang3</artifactId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>pl.pragmatists</groupId>
       <artifactId>JUnitParams</artifactId>
diff --git a/sql/src/main/java/org/apache/druid/sql/calcite/planner/PlannerConfig.java b/sql/src/main/java/org/apache/druid/sql/calcite/planner/PlannerConfig.java
index 6e2e6685a08b..7fb10041734d 100644
--- a/sql/src/main/java/org/apache/druid/sql/calcite/planner/PlannerConfig.java
+++ b/sql/src/main/java/org/apache/druid/sql/calcite/planner/PlannerConfig.java
@@ -38,9 +38,7 @@ public class PlannerConfig
   public static final String CTX_KEY_USE_NATIVE_QUERY_EXPLAIN = "useNativeQueryExplain";
   public static final String CTX_KEY_FORCE_EXPRESSION_VIRTUAL_COLUMNS = "forceExpressionVirtualColumns";
   public static final String CTX_MAX_NUMERIC_IN_FILTERS = "maxNumericInFilters";
-  public static final String CTX_NATIVE_QUERY_SQL_PLANNING_MODE = "plannerStrategy";
   public static final int NUM_FILTER_NOT_USED = -1;
-
   @JsonProperty
   private int maxTopNLimit = 100_000;
 
@@ -75,9 +73,7 @@ public class PlannerConfig
   private int maxNumericInFilters = NUM_FILTER_NOT_USED;
 
   @JsonProperty
-  private String nativeQuerySqlPlanningMode = NATIVE_QUERY_SQL_PLANNING_MODE_COUPLED; // can be COUPLED or DECOUPLED
-  public static final String NATIVE_QUERY_SQL_PLANNING_MODE_COUPLED = "COUPLED";
-  public static final String NATIVE_QUERY_SQL_PLANNING_MODE_DECOUPLED = "DECOUPLED";
+  private String nativeQuerySqlPlanningMode = QueryContexts.NATIVE_QUERY_SQL_PLANNING_MODE_COUPLED; // can be COUPLED or DECOUPLED
 
   private boolean serializeComplexValues = true;
 
@@ -383,7 +379,7 @@ public Builder withOverrides(final Map<String, Object> queryContext)
           maxNumericInFilters);
       nativeQuerySqlPlanningMode = QueryContexts.parseString(
           queryContext,
-          CTX_NATIVE_QUERY_SQL_PLANNING_MODE,
+          QueryContexts.CTX_NATIVE_QUERY_SQL_PLANNING_MODE,
           nativeQuerySqlPlanningMode
       );
       return this;
diff --git a/sql/src/main/java/org/apache/druid/sql/calcite/planner/PlannerContext.java b/sql/src/main/java/org/apache/druid/sql/calcite/planner/PlannerContext.java
index cd2e9401954e..c02cb3cd8bd7 100644
--- a/sql/src/main/java/org/apache/druid/sql/calcite/planner/PlannerContext.java
+++ b/sql/src/main/java/org/apache/druid/sql/calcite/planner/PlannerContext.java
@@ -29,6 +29,7 @@
 import org.apache.calcite.linq4j.QueryProvider;
 import org.apache.calcite.schema.SchemaPlus;
 import org.apache.druid.common.config.NullHandling;
+import org.apache.druid.error.InvalidSqlInput;
 import org.apache.druid.java.util.common.DateTimes;
 import org.apache.druid.java.util.common.ISE;
 import org.apache.druid.java.util.common.Numbers;
@@ -508,6 +509,9 @@ public String getPlanningError()
    */
   public void setPlanningError(String formatText, Object... arguments)
   {
+    if (queryContext().isDecoupledMode()) {
+      throw InvalidSqlInput.exception(formatText, arguments);
+    }
     planningError = StringUtils.nonStrictFormat(formatText, arguments);
   }
 
diff --git a/sql/src/main/java/org/apache/druid/sql/calcite/planner/PlannerFactory.java b/sql/src/main/java/org/apache/druid/sql/calcite/planner/PlannerFactory.java
index 514952972d39..c21f6408b52f 100644
--- a/sql/src/main/java/org/apache/druid/sql/calcite/planner/PlannerFactory.java
+++ b/sql/src/main/java/org/apache/druid/sql/calcite/planner/PlannerFactory.java
@@ -39,6 +39,7 @@
 import org.apache.calcite.tools.Frameworks;
 import org.apache.druid.guice.annotations.Json;
 import org.apache.druid.math.expr.ExprMacroTable;
+import org.apache.druid.query.QueryContexts;
 import org.apache.druid.segment.join.JoinableFactoryWrapper;
 import org.apache.druid.server.security.Access;
 import org.apache.druid.server.security.AuthConfig;
@@ -196,7 +197,7 @@ public SqlConformance conformance()
           }
         });
 
-    if (PlannerConfig.NATIVE_QUERY_SQL_PLANNING_MODE_DECOUPLED
+    if (QueryContexts.NATIVE_QUERY_SQL_PLANNING_MODE_DECOUPLED
         .equals(plannerConfig().getNativeQuerySqlPlanningMode())
     ) {
       frameworkConfigBuilder.costFactory(new DruidVolcanoCost.Factory());
diff --git a/sql/src/main/java/org/apache/druid/sql/calcite/planner/QueryHandler.java b/sql/src/main/java/org/apache/druid/sql/calcite/planner/QueryHandler.java
index 2fca51e8dc03..67cc7f2f44c1 100644
--- a/sql/src/main/java/org/apache/druid/sql/calcite/planner/QueryHandler.java
+++ b/sql/src/main/java/org/apache/druid/sql/calcite/planner/QueryHandler.java
@@ -62,6 +62,7 @@
 import org.apache.druid.java.util.common.guava.Sequences;
 import org.apache.druid.java.util.emitter.EmittingLogger;
 import org.apache.druid.query.Query;
+import org.apache.druid.query.QueryContexts;
 import org.apache.druid.server.QueryResponse;
 import org.apache.druid.server.security.Action;
 import org.apache.druid.server.security.Resource;
@@ -540,7 +541,7 @@ protected PlannerResult planWithDruidConvention() throws ValidationException
 
     if (plannerContext.getPlannerConfig()
                       .getNativeQuerySqlPlanningMode()
-                      .equals(PlannerConfig.NATIVE_QUERY_SQL_PLANNING_MODE_DECOUPLED)
+                      .equals(QueryContexts.NATIVE_QUERY_SQL_PLANNING_MODE_DECOUPLED)
     ) {
       RelNode newRoot = parameterized;
       newRoot = planner.transform(
diff --git a/sql/src/main/java/org/apache/druid/sql/calcite/planner/querygen/DruidQueryGenerator.java b/sql/src/main/java/org/apache/druid/sql/calcite/planner/querygen/DruidQueryGenerator.java
index 511065b2c4f4..280d2d85cd58 100644
--- a/sql/src/main/java/org/apache/druid/sql/calcite/planner/querygen/DruidQueryGenerator.java
+++ b/sql/src/main/java/org/apache/druid/sql/calcite/planner/querygen/DruidQueryGenerator.java
@@ -27,10 +27,13 @@
 import org.apache.calcite.rel.core.Sort;
 import org.apache.calcite.rel.core.Window;
 import org.apache.calcite.rex.RexBuilder;
+import org.apache.calcite.rex.RexInputRef;
+import org.apache.calcite.rex.RexNode;
 import org.apache.druid.error.DruidException;
 import org.apache.druid.query.DataSource;
 import org.apache.druid.query.FilteredDataSource;
 import org.apache.druid.query.QueryDataSource;
+import org.apache.druid.query.UnionDataSource;
 import org.apache.druid.query.filter.DimFilter;
 import org.apache.druid.sql.calcite.filtration.Filtration;
 import org.apache.druid.sql.calcite.planner.PlannerContext;
@@ -43,6 +46,7 @@
 import org.apache.druid.sql.calcite.rel.logical.DruidJoin;
 import org.apache.druid.sql.calcite.rel.logical.DruidLogicalNode;
 import org.apache.druid.sql.calcite.rel.logical.DruidSort;
+import org.apache.druid.sql.calcite.rel.logical.DruidUnion;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -202,31 +206,22 @@ private interface Vertex
     SourceDesc unwrapSourceDesc();
   }
 
-  enum JoinSupportTweaks
+  private static class VertexTweaks
   {
-    NONE,
-    LEFT,
-    RIGHT;
+    public final JoinPosition joinType;
+    public final boolean isParentUnion;
 
-    static JoinSupportTweaks analyze(DruidNodeStack stack)
+    public VertexTweaks(JoinPosition joinType, boolean isParentUnion)
     {
-      if (stack.size() < 2) {
-        return NONE;
-      }
-      DruidLogicalNode possibleJoin = stack.parentNode();
-      if (!(possibleJoin instanceof DruidJoin)) {
-        return NONE;
-      }
-      if (stack.peekOperandIndex() == 0) {
-        return LEFT;
-      } else {
-        return RIGHT;
-      }
+      this.joinType = joinType;
+      this.isParentUnion = isParentUnion;
     }
 
-    boolean finalizeSubQuery()
+    static VertexTweaks analyze(DruidNodeStack stack)
     {
-      return this == NONE;
+      JoinPosition joinType = JoinPosition.analyze(stack);
+      boolean isParentUnion = stack.size() > 2 && stack.parentNode() instanceof DruidUnion;
+      return new VertexTweaks(joinType, isParentUnion);
     }
 
     boolean forceSubQuery(SourceDesc sourceDesc)
@@ -234,12 +229,43 @@ boolean forceSubQuery(SourceDesc sourceDesc)
       if (sourceDesc.dataSource.isGlobal()) {
         return false;
       }
-      return this == RIGHT;
+      return joinType == JoinPosition.RIGHT;
     }
 
     boolean filteredDatasourceAllowed()
     {
-      return this == NONE;
+      return joinType == JoinPosition.NONE;
+    }
+
+    boolean finalizeSubQuery()
+    {
+      return joinType == JoinPosition.NONE;
+    }
+
+    boolean mayUnwrapWithRename()
+    {
+      return !isParentUnion;
+    }
+
+    enum JoinPosition
+    {
+      NONE, LEFT, RIGHT;
+
+      public static JoinPosition analyze(DruidNodeStack stack)
+      {
+        if (stack.size() < 2) {
+          return NONE;
+        }
+        DruidLogicalNode possibleJoin = stack.parentNode();
+        if (!(possibleJoin instanceof DruidJoin)) {
+          return NONE;
+        }
+        if (stack.peekOperandIndex() == 0) {
+          return LEFT;
+        } else {
+          return RIGHT;
+        }
+      }
     }
   }
 
@@ -259,22 +285,22 @@ public PDQVertexFactory(PlannerContext plannerContext, RexBuilder rexBuilder)
 
     Vertex createVertex(DruidNodeStack stack, PartialDruidQuery partialDruidQuery, List<Vertex> inputs)
     {
-      JoinSupportTweaks jst = JoinSupportTweaks.analyze(stack);
-      return new PDQVertex(partialDruidQuery, inputs, jst);
+      VertexTweaks tweaks = VertexTweaks.analyze(stack);
+      return new PDQVertex(partialDruidQuery, inputs, tweaks);
     }
 
     public class PDQVertex implements Vertex
     {
       final PartialDruidQuery partialDruidQuery;
       final List<Vertex> inputs;
-      final JoinSupportTweaks jst;
+      final VertexTweaks tweaks;
       private SourceDesc source;
 
-      public PDQVertex(PartialDruidQuery partialDruidQuery, List<Vertex> inputs, JoinSupportTweaks jst)
+      public PDQVertex(PartialDruidQuery partialDruidQuery, List<Vertex> inputs, VertexTweaks tweaks)
       {
         this.partialDruidQuery = partialDruidQuery;
         this.inputs = inputs;
-        this.jst = jst;
+        this.tweaks = tweaks;
       }
 
       @Override
@@ -286,7 +312,7 @@ public DruidQuery buildQuery(boolean topLevel)
             source.rowSignature,
             plannerContext,
             rexBuilder,
-            !(topLevel) && jst.finalizeSubQuery()
+            !(topLevel) && tweaks.finalizeSubQuery()
         );
       }
 
@@ -304,9 +330,10 @@ private SourceDesc getSource()
       private SourceDesc realGetSource()
       {
         List<SourceDesc> sourceDescs = new ArrayList<>();
+        boolean mayUnwrap = mayUnwrapInputs();
         for (Vertex inputVertex : inputs) {
           final SourceDesc desc;
-          if (inputVertex.canUnwrapSourceDesc()) {
+          if (mayUnwrap && inputVertex.canUnwrapSourceDesc()) {
             desc = inputVertex.unwrapSourceDesc();
           } else {
             DruidQuery inputQuery = inputVertex.buildQuery(false);
@@ -325,6 +352,20 @@ private SourceDesc realGetSource()
         throw DruidException.defensive("Unable to create SourceDesc for Operator [%s]", scan);
       }
 
+      private boolean mayUnwrapInputs()
+      {
+        if (!(partialDruidQuery.getScan() instanceof DruidUnion)) {
+          return true;
+        }
+        boolean mayUnwrap = true;
+        for (Vertex vertex : inputs) {
+          if (!vertex.canUnwrapSourceDesc()) {
+            mayUnwrap = false;
+          }
+        }
+        return mayUnwrap;
+      }
+
       /**
        * Extends the the current partial query with the new parent if possible.
        */
@@ -424,22 +465,65 @@ public SourceDesc unwrapSourceDesc()
       @Override
       public boolean canUnwrapSourceDesc()
       {
-        if (jst.forceSubQuery(getSource())) {
+        if (tweaks.forceSubQuery(getSource())) {
           return false;
         }
         if (partialDruidQuery.stage() == Stage.SCAN) {
           return true;
         }
-        if (jst.filteredDatasourceAllowed() && partialDruidQuery.stage() == PartialDruidQuery.Stage.WHERE_FILTER) {
+        if (tweaks.filteredDatasourceAllowed() && partialDruidQuery.stage() == PartialDruidQuery.Stage.WHERE_FILTER) {
           return true;
         }
         if (partialDruidQuery.stage() == PartialDruidQuery.Stage.SELECT_PROJECT &&
-            (jst.filteredDatasourceAllowed() || partialDruidQuery.getWhereFilter() == null) &&
-            partialDruidQuery.getSelectProject().isMapping()) {
+            (tweaks.filteredDatasourceAllowed() || partialDruidQuery.getWhereFilter() == null) &&
+            mayDiscardSelectProject()) {
           return true;
         }
         return false;
       }
+
+      private boolean mayDiscardSelectProject()
+      {
+        if (!partialDruidQuery.getSelectProject().isMapping()) {
+          return false;
+        }
+        if (!tweaks.isParentUnion) {
+          return true;
+        }
+        SourceDesc src = getSource();
+        List<String> inputFieldNames = src.rowSignature.getColumnNames();
+        List<String> outputFieldNames = partialDruidQuery.getRowType().getFieldNames();
+
+        if (!isNameConsistentMapping(partialDruidQuery.getSelectProject(), inputFieldNames, outputFieldNames)) {
+          return false;
+        }
+
+        boolean isAssociative = UnionDataSource.isCompatibleDataSource(src.dataSource);
+
+        if (!isAssociative) {
+          if (!outputFieldNames.equals(inputFieldNames.subList(0, outputFieldNames.size()))) {
+            return false;
+          }
+        }
+        return true;
+      }
+
+      private boolean isNameConsistentMapping(
+          Project selectProject,
+          List<String> inputFieldNames,
+          List<String> outputFieldNames)
+      {
+        List<RexNode> projects = selectProject.getProjects();
+        for (int i = 0; i < projects.size(); i++) {
+          RexInputRef p = (RexInputRef) projects.get(i);
+          String inputName = inputFieldNames.get(p.getIndex());
+          String outputName = outputFieldNames.get(i);
+          if (!inputName.equals(outputName)) {
+            return false;
+          }
+        }
+        return true;
+      }
     }
   }
 
diff --git a/sql/src/main/java/org/apache/druid/sql/calcite/planner/querygen/SourceDescProducer.java b/sql/src/main/java/org/apache/druid/sql/calcite/planner/querygen/SourceDescProducer.java
index 5e2fa2dc4d06..7816e5db3830 100644
--- a/sql/src/main/java/org/apache/druid/sql/calcite/planner/querygen/SourceDescProducer.java
+++ b/sql/src/main/java/org/apache/druid/sql/calcite/planner/querygen/SourceDescProducer.java
@@ -19,6 +19,7 @@
 
 package org.apache.druid.sql.calcite.planner.querygen;
 
+import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.druid.query.DataSource;
 import org.apache.druid.segment.column.RowSignature;
 import org.apache.druid.sql.calcite.planner.PlannerContext;
@@ -55,6 +56,12 @@ public SourceDesc(DataSource dataSource, RowSignature rowSignature, VirtualColum
       this.rowSignature = rowSignature;
       this.virtualColumnRegistry = virtualColumnRegistry;
     }
+
+    @Override
+    public String toString()
+    {
+      return ToStringBuilder.reflectionToString(this);
+    }
   }
 
   SourceDesc getSourceDesc(PlannerContext plannerContext, List<SourceDesc> sources);
diff --git a/sql/src/main/java/org/apache/druid/sql/calcite/rel/DruidQuery.java b/sql/src/main/java/org/apache/druid/sql/calcite/rel/DruidQuery.java
index 4470ebde361b..5d6fc2d2899a 100644
--- a/sql/src/main/java/org/apache/druid/sql/calcite/rel/DruidQuery.java
+++ b/sql/src/main/java/org/apache/druid/sql/calcite/rel/DruidQuery.java
@@ -1654,21 +1654,24 @@ private ScanQuery toScanQuery(final boolean considerSorting)
                   : Order.ASCENDING
               )
       ).collect(Collectors.toList());
+
     } else {
       orderByColumns = Collections.emptyList();
     }
 
     if (!plannerContext.featureAvailable(EngineFeature.SCAN_ORDER_BY_NON_TIME) && !orderByColumns.isEmpty()) {
       if (orderByColumns.size() > 1
-          || orderByColumns.stream()
-                           .anyMatch(orderBy -> !orderBy.getColumnName().equals(ColumnHolder.TIME_COLUMN_NAME))) {
-        // We cannot handle this ordering, but we encounter this ordering as part of the exploration of the volcano
-        // planner, which means that the query that we are looking right now might only be doing this as one of the
-        // potential branches of exploration rather than being a semantic requirement of the query itself.  So, it is
-        // not safe to send an error message telling the end-user exactly what is happening, instead we need to set the
-        // planning error and hope.
-        setPlanningErrorOrderByNonTimeIsUnsupported();
+          || orderByColumns.stream().anyMatch(orderBy -> !orderBy.getColumnName().equals(ColumnHolder.TIME_COLUMN_NAME))) {
+        if (!plannerContext.queryContext().isDecoupledMode()) {
+          // We cannot handle this ordering, but we encounter this ordering as part of the exploration of the volcano
+          // planner, which means that the query that we are looking right now might only be doing this as one of the
+          // potential branches of exploration rather than being a semantic requirement of the query itself.  So, it is
+          // not safe to send an error message telling the end-user exactly what is happening, instead we need to set the
+          // planning error and hope.
+          setPlanningErrorOrderByNonTimeIsUnsupported();
+        }
         return null;
+
       }
     }
 
diff --git a/sql/src/main/java/org/apache/druid/sql/calcite/rel/logical/DruidUnion.java b/sql/src/main/java/org/apache/druid/sql/calcite/rel/logical/DruidUnion.java
index ec50e3b5025c..2de100483ddb 100644
--- a/sql/src/main/java/org/apache/druid/sql/calcite/rel/logical/DruidUnion.java
+++ b/sql/src/main/java/org/apache/druid/sql/calcite/rel/logical/DruidUnion.java
@@ -29,16 +29,16 @@
 import org.apache.calcite.rel.hint.RelHint;
 import org.apache.calcite.rel.metadata.RelMetadataQuery;
 import org.apache.druid.error.DruidException;
+import org.apache.druid.error.InvalidSqlInput;
 import org.apache.druid.query.DataSource;
-import org.apache.druid.query.InlineDataSource;
 import org.apache.druid.query.Query;
 import org.apache.druid.query.QueryDataSource;
-import org.apache.druid.query.TableDataSource;
 import org.apache.druid.query.UnionDataSource;
 import org.apache.druid.query.union.UnionQuery;
 import org.apache.druid.segment.column.RowSignature;
 import org.apache.druid.sql.calcite.planner.PlannerContext;
 import org.apache.druid.sql.calcite.planner.querygen.SourceDescProducer;
+import org.apache.druid.sql.calcite.table.RowSignatures;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -53,6 +53,9 @@ public DruidUnion(
       boolean all)
   {
     super(cluster, traits, hints, inputs, all);
+    if (!all) {
+      throw InvalidSqlInput.exception("SQL requires 'UNION' but only 'UNION ALL' is supported.");
+    }
   }
 
   @Override
@@ -70,79 +73,47 @@ public RelOptCost computeSelfCost(RelOptPlanner planner, RelMetadataQuery mq)
   @Override
   public SourceDesc getSourceDesc(PlannerContext plannerContext, List<SourceDesc> sources)
   {
-    if (mayUseUnionDataSource(sources)) {
-      List<DataSource> dataSources = new ArrayList<>();
-      RowSignature signature = null;
-      for (SourceDesc sourceDesc : sources) {
-        checkDataSourceSupported(sourceDesc.dataSource);
-        dataSources.add(sourceDesc.dataSource);
-        if (signature == null) {
-          signature = sourceDesc.rowSignature;
-        } else {
-          if (!signature.equals(sourceDesc.rowSignature)) {
-            throw DruidException.defensive(
-                "Row signature mismatch in Union inputs [%s] and [%s]",
-                signature,
-                sourceDesc.rowSignature
-            );
-          }
-        }
-      }
-      return new SourceDesc(new UnionDataSource(dataSources), signature);
-    }
-    if (mayUseUnionQuery(sources)) {
-      RowSignature signature = null;
-      List<Query<?>> queries = new ArrayList<>();
-      for (SourceDesc sourceDesc : sources) {
-        QueryDataSource qds = (QueryDataSource) sourceDesc.dataSource;
-        queries.add(qds.getQuery());
-        if (signature == null) {
-          signature = sourceDesc.rowSignature;
-        } else {
-          if (!signature.equals(sourceDesc.rowSignature)) {
-            throw DruidException.defensive(
-                "Row signature mismatch in Union inputs [%s] and [%s]",
-                signature,
-                sourceDesc.rowSignature
-            );
-          }
-        }
-      }
-      return new SourceDesc(new QueryDataSource(new UnionQuery(queries)), signature);
-    }
+    RowSignature signature = RowSignatures.fromRelDataType(
+        sources.get(0).rowSignature.getColumnNames(),
+        getRowType()
+    );
+    UnionDataSource unionDataSource = buildUnionDataSource(sources);
+    if (unionDataSource != null) {
+      return new SourceDesc(unionDataSource, signature);
 
-    throw DruidException.defensive("Union with input [%s] is not supported. This should not happen.", sources);
+    }
+    // all other cases are handled via UnionQuery
+    UnionQuery unionQuery = makeUnionQuery(sources);
+    return new SourceDesc(new QueryDataSource(unionQuery), signature);
   }
 
-  private boolean mayUseUnionQuery(List<SourceDesc> sources)
+  private UnionDataSource buildUnionDataSource(List<SourceDesc> sources)
   {
+    List<DataSource> dataSources = new ArrayList<>();
     for (SourceDesc sourceDesc : sources) {
       DataSource dataSource = sourceDesc.dataSource;
-      if (dataSource instanceof QueryDataSource) {
-        continue;
+      if (!UnionDataSource.isCompatibleDataSource(dataSource)) {
+        return null;
       }
-      return false;
+      dataSources.add(dataSource);
     }
-    return true;
+    return new UnionDataSource(dataSources);
   }
 
-  private boolean mayUseUnionDataSource(List<SourceDesc> sources)
+  private UnionQuery makeUnionQuery(List<SourceDesc> sources)
   {
+    List<Query<?>> queries = new ArrayList<>();
     for (SourceDesc sourceDesc : sources) {
       DataSource dataSource = sourceDesc.dataSource;
-      if (dataSource instanceof TableDataSource || dataSource instanceof InlineDataSource) {
-        continue;
+      if (dataSource instanceof QueryDataSource) {
+        queries.add(((QueryDataSource) dataSource).getQuery());
+      } else {
+        throw DruidException.defensive(
+            "Expected that all inputs are QueryDataSource-s! Encountered something else [%s].",
+            dataSource
+        );
       }
-      return false;
-    }
-    return true;
-  }
-
-  private void checkDataSourceSupported(DataSource dataSource)
-  {
-    if (dataSource instanceof TableDataSource || dataSource instanceof InlineDataSource) {
-      return;
     }
-    throw DruidException.defensive("Only Table and Values are supported as inputs for Union [%s]", dataSource);
+    return new UnionQuery(queries);
   }
 }
diff --git a/sql/src/test/java/org/apache/druid/sql/calcite/CalciteNestedDataQueryTest.java b/sql/src/test/java/org/apache/druid/sql/calcite/CalciteNestedDataQueryTest.java
index 328e9cbdd5ba..9f33756e7b59 100644
--- a/sql/src/test/java/org/apache/druid/sql/calcite/CalciteNestedDataQueryTest.java
+++ b/sql/src/test/java/org/apache/druid/sql/calcite/CalciteNestedDataQueryTest.java
@@ -75,7 +75,6 @@
 import org.apache.druid.segment.writeout.OffHeapMemorySegmentWriteOutMediumFactory;
 import org.apache.druid.server.SpecificSegmentsQuerySegmentWalker;
 import org.apache.druid.sql.calcite.CalciteNestedDataQueryTest.NestedComponentSupplier;
-import org.apache.druid.sql.calcite.NotYetSupported.Modes;
 import org.apache.druid.sql.calcite.filtration.Filtration;
 import org.apache.druid.sql.calcite.util.SqlTestFramework.StandardComponentSupplier;
 import org.apache.druid.sql.calcite.util.TestDataBuilder;
@@ -7373,13 +7372,12 @@ public void testNvlJsonValueDoubleSometimesMissingRangeFilter()
     );
   }
 
-  @NotYetSupported(Modes.ERROR_CANNOT_TRANSLATE_COUNT_DISTINCT)
   @Test
   public void testApproxCountDistinctOnUnsupportedComplexColumn()
   {
     assertQueryIsUnplannable(
         "SELECT COUNT(DISTINCT nester) FROM druid.nested",
-        "Query could not be planned. A possible reason is [Using APPROX_COUNT_DISTINCT() or enabling "
+        "Using APPROX_COUNT_DISTINCT() or enabling "
         + "approximation with COUNT(DISTINCT) is not supported for column type [COMPLEX<json>]. "
         + "You can disable approximation by setting [useApproximateCountDistinct: false] in the query context."
     );
diff --git a/sql/src/test/java/org/apache/druid/sql/calcite/CalciteQueryTest.java b/sql/src/test/java/org/apache/druid/sql/calcite/CalciteQueryTest.java
index 492625020a6c..f2a85b4a4a90 100644
--- a/sql/src/test/java/org/apache/druid/sql/calcite/CalciteQueryTest.java
+++ b/sql/src/test/java/org/apache/druid/sql/calcite/CalciteQueryTest.java
@@ -6414,7 +6414,6 @@ public void testCountStarWithNotOfDegenerateFilter()
     );
   }
 
-  @NotYetSupported(Modes.ERROR_HANDLING)
   @Test
   public void testUnplannableScanOrderByNonTime()
   {
@@ -6531,7 +6530,6 @@ public void testCountStarWithBoundFilterSimplifyOr()
     );
   }
 
-  @NotYetSupported(Modes.ERROR_HANDLING)
   @Test
   public void testUnplannableExactCountDistinctOnSketch()
   {
diff --git a/sql/src/test/java/org/apache/druid/sql/calcite/CalciteUnionQueryTest.java b/sql/src/test/java/org/apache/druid/sql/calcite/CalciteUnionQueryTest.java
index e172470279cc..c3b91458227a 100644
--- a/sql/src/test/java/org/apache/druid/sql/calcite/CalciteUnionQueryTest.java
+++ b/sql/src/test/java/org/apache/druid/sql/calcite/CalciteUnionQueryTest.java
@@ -20,6 +20,7 @@
 package org.apache.druid.sql.calcite;
 
 import com.google.common.collect.ImmutableList;
+import org.apache.druid.common.config.NullHandling;
 import org.apache.druid.error.DruidException;
 import org.apache.druid.java.util.common.granularity.Granularities;
 import org.apache.druid.query.TableDataSource;
@@ -28,7 +29,6 @@
 import org.apache.druid.query.aggregation.DoubleSumAggregatorFactory;
 import org.apache.druid.query.dimension.DefaultDimensionSpec;
 import org.apache.druid.query.groupby.GroupByQuery;
-import org.apache.druid.sql.calcite.NotYetSupported.Modes;
 import org.apache.druid.sql.calcite.filtration.Filtration;
 import org.apache.druid.sql.calcite.util.CalciteTests;
 import org.junit.Assert;
@@ -142,7 +142,6 @@ public void testUnionAllTablesColumnCountMismatch()
     }
   }
 
-  @NotYetSupported(Modes.UNION_MORE_STRICT_ROWTYPE_CHECK)
   @Test
   public void testUnionAllTablesColumnTypeMismatchFloatLong()
   {
@@ -189,66 +188,157 @@ public void testUnionAllTablesColumnTypeMismatchFloatLong()
     );
   }
 
-  @NotYetSupported(Modes.ERROR_HANDLING)
   @Test
-  public void testUnionAllTablesColumnTypeMismatchStringLong()
+  public void testUnionFlipFlop()
   {
-    // "dim3" has a different type in foo and foo2 (string vs long), which requires a casting subquery, so this
-    // query cannot be planned.
+    String sql = "SELECT\n"
+        + "dim1,dim2,count(1) \n"
+        + "FROM (SELECT dim1 as dim1, dim2 as dim2 FROM foo UNION ALL SELECT dim2 as dim1, dim1 as dim2 FROM foo)\n"
+        + "WHERE dim1 = 'def' OR dim2 = 'def'\n"
+        + "GROUP BY 1, 2";
+    if (testBuilder().isDecoupledMode()) {
+      cannotVectorize();
+      testBuilder()
+          .sql(sql)
+          .expectedResults(
+              ImmutableList.of(
+                  new Object[] {"abc", "def", 1L},
+                  new Object[] {"def", "abc", 1L}
+              )
+          )
+          .run();
+    } else {
+      assertQueryIsUnplannable(
+          sql,
+          "names queried for each table are different"
+      );
+    }
+  }
 
-    assertQueryIsUnplannable(
-        "SELECT\n"
+
+  @Test
+  public void testUnionAllTablesColumnTypeMismatchStringLong()
+  {
+    String sql = "SELECT\n"
         + "dim3, dim2, SUM(m1), COUNT(*)\n"
         + "FROM (SELECT dim3, dim2, m1 FROM foo2 UNION ALL SELECT dim3, dim2, m1 FROM foo)\n"
         + "WHERE dim2 = 'a' OR dim2 = 'en'\n"
-        + "GROUP BY 1, 2",
-        "SQL requires union between inputs that are not simple table scans and involve a " +
-        "filter or aliasing. Or column types of tables being unioned are not of same type."
-    );
+        + "GROUP BY 1, 2";
+    if (testBuilder().isDecoupledMode()) {
+      cannotVectorize();
+      testBuilder()
+          .sql(sql)
+          .expectedResults(
+              ImmutableList.of(
+                  new Object[] {"", "a", 4.0D, 1L},
+                  new Object[] {"11", "en", 1.0D, 1L},
+                  new Object[] {"a", "a", 1.0D, 1L},
+                  new Object[] {"b", "a", 1.0D, 1L}
+              )
+          )
+          .run();
+    } else {
+      // "dim3" has a different type in foo and foo2 (string vs long), which requires a casting subquery, so this
+      // query cannot be planned.
+      assertQueryIsUnplannable(
+          sql,
+          "SQL requires union between inputs that are not simple table scans and involve a " +
+          "filter or aliasing. Or column types of tables being unioned are not of same type."
+      );
+    }
   }
 
-  @NotYetSupported(Modes.ERROR_HANDLING)
   @Test
   public void testUnionAllTablesWhenMappingIsRequired()
   {
-    // Cannot plan this UNION ALL operation, because the column swap would require generating a subquery.
-
-    assertQueryIsUnplannable(
-        "SELECT\n"
+    String sql = "SELECT\n"
         + "c, COUNT(*)\n"
         + "FROM (SELECT dim1 AS c, m1 FROM foo UNION ALL SELECT dim2 AS c, m1 FROM numfoo)\n"
         + "WHERE c = 'a' OR c = 'def'\n"
-        + "GROUP BY 1",
-        "SQL requires union between two tables " +
-        "and column names queried for each table are different Left: [dim1], Right: [dim2]."
-    );
+        + "GROUP BY 1";
+    if (testBuilder().isDecoupledMode()) {
+      cannotVectorize();
+      testBuilder()
+          .sql(sql)
+          .expectedResults(
+              ImmutableList.of(
+                  new Object[] {"a", 2L},
+                  new Object[] {"def", 1L}
+              )
+          )
+          .run();
+    } else {
+      // Cannot plan this UNION ALL operation, because the column swap would require generating a subquery.
+      assertQueryIsUnplannable(
+          sql,
+          "SQL requires union between two tables " +
+          "and column names queried for each table are different Left: [dim1], Right: [dim2]."
+      );
+    }
   }
 
-  @NotYetSupported(Modes.ERROR_HANDLING)
   @Test
-  public void testUnionIsUnplannable()
+  public void testUnionDifferentColumnOrder()
   {
-    // Cannot plan this UNION operation
-    assertQueryIsUnplannable(
-        "SELECT dim2, dim1, m1 FROM foo2 UNION SELECT dim1, dim2, m1 FROM foo",
-        "SQL requires 'UNION' but only 'UNION ALL' is supported."
-    );
+    String sql = "SELECT dim2, dim1, m1 FROM foo2 UNION SELECT dim1, dim2, m1 FROM foo";
+    if (testBuilder().isDecoupledMode()) {
+      // UnionToDistinctRule
+      testBuilder()
+          .sql(sql)
+          .expectedResults(ImmutableList.of(new Object[] {"def", 2L}))
+          .expectedResults(
+              ResultMatchMode.RELAX_NULLS,
+              ImmutableList.of(
+                  new Object[] {null, "10.1", 2.0F},
+                  // these 2 results invert order because in compatible mode `null` becomes "" and thus they change order
+                  NullHandling.sqlCompatible() ? new Object[] {null, "abc", 6.0F} : new Object[] {"", "2", 3.0F},
+                  NullHandling.sqlCompatible() ? new Object[] {"", "2", 3.0F} : new Object[] {null, "abc", 6.0F},
+                  new Object[] {"a", "", 1.0F},
+                  new Object[] {"a", "1", 4.0F},
+                  new Object[] {"abc", "def", 5.0F},
+                  new Object[] {"en", "druid", 1.0F},
+                  new Object[] {"he", "\u05D3\u05E8\u05D5\u05D0\u05D9\u05D3", 1.0F},
+                  new Object[] {"ru", "\u0434\u0440\u0443\u0438\u0434", 1.0F}
+              )
+
+          )
+          .run();
+    } else {
+      // Cannot plan this UNION operation
+      assertQueryIsUnplannable(
+          sql,
+          "SQL requires 'UNION' but only 'UNION ALL' is supported."
+      );
+    }
   }
 
-  @NotYetSupported(Modes.ERROR_HANDLING)
   @Test
   public void testUnionAllTablesWhenCastAndMappingIsRequired()
   {
-    // Cannot plan this UNION ALL operation, because the column swap would require generating a subquery.
-    assertQueryIsUnplannable(
-        "SELECT\n"
+    String sql = "SELECT\n"
         + "c, COUNT(*)\n"
         + "FROM (SELECT dim1 AS c, m1 FROM foo UNION ALL SELECT cnt AS c, m1 FROM numfoo)\n"
-        + "WHERE c = 'a' OR c = 'def'\n"
-        + "GROUP BY 1",
-        "SQL requires union between inputs that are not simple table scans and involve " +
-        "a filter or aliasing. Or column types of tables being unioned are not of same type."
-    );
+        + "WHERE c = '1' OR c = 'def'\n"
+        + "GROUP BY 1";
+    if (testBuilder().isDecoupledMode()) {
+      cannotVectorize();
+      testBuilder()
+          .sql(sql)
+          .expectedResults(
+              ImmutableList.of(
+                  new Object[]{"1", 7L},
+                  new Object[]{"def", 1L}
+              )
+          )
+          .run();
+    } else {
+      // Cannot plan this UNION ALL operation, because the column swap would require generating a subquery.
+      assertQueryIsUnplannable(
+          sql,
+          "SQL requires union between inputs that are not simple table scans and involve " +
+          "a filter or aliasing. Or column types of tables being unioned are not of same type."
+      );
+    }
   }
 
   @Test
@@ -335,19 +425,31 @@ public void testUnionAllSameTableTwiceWithSameMapping()
     );
   }
 
-  @NotYetSupported(Modes.ERROR_HANDLING)
   @Test
   public void testUnionAllSameTableTwiceWithDifferentMapping()
   {
-    // Cannot plan this UNION ALL operation, because the column swap would require generating a subquery.
-    assertQueryIsUnplannable(
-        "SELECT\n"
+    String sql = "SELECT\n"
         + "dim1, dim2, SUM(m1), COUNT(*)\n"
         + "FROM (SELECT dim1, dim2, m1 FROM foo UNION ALL SELECT dim2, dim1, m1 FROM foo)\n"
         + "WHERE dim2 = 'a' OR dim2 = 'def'\n"
-        + "GROUP BY 1, 2",
-        "SQL requires union between two tables and column names queried for each table are different Left: [dim1, dim2, m1], Right: [dim2, dim1, m1]."
-    );
+        + "GROUP BY 1, 2";
+    if (testBuilder().isDecoupledMode()) {
+      testBuilder()
+          .sql(sql)
+          .expectedResults(
+              ImmutableList.of(
+                  new Object[] {"", "a", 2.0D, 2L},
+                  new Object[] {"1", "a", 8.0D, 2L}
+              )
+          )
+          .run();
+    } else {
+      // Cannot plan this UNION ALL operation, because the column swap would require generating a subquery.
+      assertQueryIsUnplannable(
+          sql,
+          "SQL requires union between two tables and column names queried for each table are different Left: [dim1, dim2, m1], Right: [dim2, dim1, m1]."
+      );
+    }
   }
 
   @Test
diff --git a/sql/src/test/java/org/apache/druid/sql/calcite/DecoupledExtension.java b/sql/src/test/java/org/apache/druid/sql/calcite/DecoupledExtension.java
index c4ba1f77a67e..be9e388fb39e 100644
--- a/sql/src/test/java/org/apache/druid/sql/calcite/DecoupledExtension.java
+++ b/sql/src/test/java/org/apache/druid/sql/calcite/DecoupledExtension.java
@@ -56,7 +56,7 @@ public void beforeEach(ExtensionContext context)
 
   private static final ImmutableMap<String, Object> CONTEXT_OVERRIDES = ImmutableMap.<String, Object>builder()
       .putAll(BaseCalciteQueryTest.QUERY_CONTEXT_DEFAULT)
-      .put(PlannerConfig.CTX_NATIVE_QUERY_SQL_PLANNING_MODE, PlannerConfig.NATIVE_QUERY_SQL_PLANNING_MODE_DECOUPLED)
+      .put(QueryContexts.CTX_NATIVE_QUERY_SQL_PLANNING_MODE, QueryContexts.NATIVE_QUERY_SQL_PLANNING_MODE_DECOUPLED)
       .put(QueryContexts.ENABLE_DEBUG, true)
       .build();
 
diff --git a/sql/src/test/java/org/apache/druid/sql/calcite/NotYetSupported.java b/sql/src/test/java/org/apache/druid/sql/calcite/NotYetSupported.java
index f456bae91f78..2f4199d429a3 100644
--- a/sql/src/test/java/org/apache/druid/sql/calcite/NotYetSupported.java
+++ b/sql/src/test/java/org/apache/druid/sql/calcite/NotYetSupported.java
@@ -78,7 +78,6 @@ enum Modes
   {
     // @formatter:off
     DISTINCT_AGGREGATE_NOT_SUPPORTED(DruidException.class, "DISTINCT is not supported"),
-    ERROR_HANDLING(AssertionError.class, "targetPersona: is <[A-Z]+> and category: is <[A-Z_]+> and errorCode: is"),
     EXPRESSION_NOT_GROUPED(DruidException.class, "Expression '[a-z]+' is not being grouped"),
     NULLS_FIRST_LAST(DruidException.class, "NULLS (FIRST|LAST)"),
     BIGINT_TO_DATE(DruidException.class, "BIGINT to type (DATE|TIME)"),
@@ -89,11 +88,9 @@ enum Modes
     RESULT_MISMATCH(AssertionError.class, "(assertResulEquals|AssertionError: column content mismatch)"),
     LONG_CASTING(AssertionError.class, "expected: java.lang.Long"),
     UNSUPPORTED_NULL_ORDERING(DruidException.class, "(A|DE)SCENDING ordering with NULLS (LAST|FIRST)"),
-    UNION_MORE_STRICT_ROWTYPE_CHECK(DruidException.class, "Row signature mismatch in Union inputs"),
     SORT_REMOVE_TROUBLE(DruidException.class, "Calcite assertion violated.*Sort\\.<init>"),
     SORT_REMOVE_CONSTANT_KEYS_CONFLICT(DruidException.class, "not enough rules"),
     REQUIRE_TIME_CONDITION(CannotBuildQueryException.class, "requireTimeCondition is enabled"),
-    ERROR_CANNOT_TRANSLATE_COUNT_DISTINCT(AssertionError.class, "Cannot translate aggregator.COUNT.DISTINCT"),
     UNNEST_INLINED(Exception.class, "Missing conversion is Uncollect"),
     UNNEST_RESULT_MISMATCH(AssertionError.class, "(Result count mismatch|column content mismatch)");
     // @formatter:on
diff --git a/sql/src/test/java/org/apache/druid/sql/calcite/QueryTestBuilder.java b/sql/src/test/java/org/apache/druid/sql/calcite/QueryTestBuilder.java
index 0c3ee685732a..f53b2f37b1f5 100644
--- a/sql/src/test/java/org/apache/druid/sql/calcite/QueryTestBuilder.java
+++ b/sql/src/test/java/org/apache/druid/sql/calcite/QueryTestBuilder.java
@@ -311,8 +311,8 @@ public QueryResults results()
 
   public boolean isDecoupledMode()
   {
-    String mode = (String) queryContext.getOrDefault(PlannerConfig.CTX_NATIVE_QUERY_SQL_PLANNING_MODE, "");
-    return PlannerConfig.NATIVE_QUERY_SQL_PLANNING_MODE_DECOUPLED.equalsIgnoreCase(mode);
+    String mode = (String) queryContext.getOrDefault(QueryContexts.CTX_NATIVE_QUERY_SQL_PLANNING_MODE, "");
+    return QueryContexts.NATIVE_QUERY_SQL_PLANNING_MODE_DECOUPLED.equalsIgnoreCase(mode);
   }
 
 }

From 9ef46fc92d7df8bcaf1f904d7a601cd3f6765a4d Mon Sep 17 00:00:00 2001
From: Clint Wylie <cwylie@apache.org>
Date: Mon, 2 Dec 2024 21:25:39 -0800
Subject: [PATCH 10/56] suppress kafka cve for ranger extension (#17531)

---
 owasp-dependency-check-suppressions.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/owasp-dependency-check-suppressions.xml b/owasp-dependency-check-suppressions.xml
index 8168a2cf58c6..3c634a0df358 100644
--- a/owasp-dependency-check-suppressions.xml
+++ b/owasp-dependency-check-suppressions.xml
@@ -182,13 +182,15 @@
   </suppress>
 
 
+  <!-- apache ranger extension kafka dependency -->
   <suppress>
     <notes><![CDATA[
-    file name: kafka-clients-3.2.0.jar
+    file name: kafka-clients-2.8.1.jar
     ]]></notes>
     <packageUrl regex="true">^pkg:maven/org\.apache\.kafka/kafka\-clients@.*$</packageUrl>
     <cve>CVE-2022-34917</cve>
     <cve>CVE-2023-25194</cve>
+    <cve>CVE-2024-31141</cve>
   </suppress>
 
   <suppress>

From 0eb8d733d42bb644dad65f74b8d8adba5a0fef8c Mon Sep 17 00:00:00 2001
From: Karan Kumar <karankumar1100@gmail.com>
Date: Tue, 3 Dec 2024 22:36:53 +0530
Subject: [PATCH 11/56] Adding leader and not being leader logging on the
 overlord. (#17519)

---
 .../java/org/apache/druid/indexing/overlord/DruidOverlord.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/overlord/DruidOverlord.java b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/DruidOverlord.java
index f8d011c70d80..547b63a70f07 100644
--- a/indexing-service/src/main/java/org/apache/druid/indexing/overlord/DruidOverlord.java
+++ b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/DruidOverlord.java
@@ -106,7 +106,7 @@ public void becomeLeader()
         giant.lock();
 
         // I AM THE MASTER OF THE UNIVERSE.
-        log.info("By the power of Grayskull, I have the power!");
+        log.info("By the power of Grayskull, I have the power. I am the leader");
 
         try {
           final TaskRunner taskRunner = runnerFactory.build();
@@ -193,6 +193,7 @@ public void stopBeingLeader()
         giant.lock();
         try {
           initialized = false;
+          log.info("I am no longer the leader...");
           final Lifecycle leaderLifecycle = leaderLifecycleRef.getAndSet(null);
 
           if (leaderLifecycle != null) {

From 3de46746ca651a37f3958ec09aad1f1f662f3b94 Mon Sep 17 00:00:00 2001
From: Kashif Faraz <kashif.faraz@gmail.com>
Date: Wed, 4 Dec 2024 23:28:47 -0800
Subject: [PATCH 12/56] Fix NPE in segment allocation when reduceMetadataIO is
 true (#17537)

---
 .../druid/metadata/IndexerSQLMetadataStorageCoordinator.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/src/main/java/org/apache/druid/metadata/IndexerSQLMetadataStorageCoordinator.java b/server/src/main/java/org/apache/druid/metadata/IndexerSQLMetadataStorageCoordinator.java
index e3a3ee047088..69d86ab80cf8 100644
--- a/server/src/main/java/org/apache/druid/metadata/IndexerSQLMetadataStorageCoordinator.java
+++ b/server/src/main/java/org/apache/druid/metadata/IndexerSQLMetadataStorageCoordinator.java
@@ -2943,7 +2943,7 @@ Set<DataSegment> retrieveUsedSegmentsForAllocation(
           = versionIntervalToSmallestSegmentId.computeIfAbsent(segmentId.getVersion(), v -> new HashMap<>());
       final SegmentId value = map.get(segmentId.getInterval());
       if (value == null || value.getPartitionNum() > segmentId.getPartitionNum()) {
-        map.put(interval, segmentId);
+        map.put(segmentId.getInterval(), segmentId);
       }
     }
 

From 93c123a482a5b5ed6533cc746a6bca79698ddb30 Mon Sep 17 00:00:00 2001
From: TessaIO <ahmedgrati1999@gmail.com>
Date: Fri, 6 Dec 2024 09:09:37 +0100
Subject: [PATCH 13/56] docs: fix cached lookup module documentation (#17527)

* docs: fix loading lookup documentation

Signed-off-by: TessaIO <ahmedgrati1999@gmail.com>

* docs: fix indentation and punctuation

Signed-off-by: TessaIO <ahmedgrati1999@gmail.com>

---------

Signed-off-by: TessaIO <ahmedgrati1999@gmail.com>
---
 .../extensions-core/druid-lookups.md          | 89 +++++++++++++++----
 1 file changed, 74 insertions(+), 15 deletions(-)

diff --git a/docs/development/extensions-core/druid-lookups.md b/docs/development/extensions-core/druid-lookups.md
index 06283ec4d722..e3514a0d0c2d 100644
--- a/docs/development/extensions-core/druid-lookups.md
+++ b/docs/development/extensions-core/druid-lookups.md
@@ -81,10 +81,22 @@ This example demonstrates a polling cache that will update its on-heap cache eve
 
 ```json
 {
-    "type":"pollingLookup",
-   "pollPeriod":"PT10M",
-   "dataFetcher":{ "type":"jdbcDataFetcher", "connectorConfig":"jdbc://mysql://localhost:3306/my_data_base", "table":"lookup_table_name", "keyColumn":"key_column_name", "valueColumn": "value_column_name"},
-   "cacheFactory":{"type":"onHeapPolling"}
+    "type": "pollingLookup",
+    "pollPeriod": "PT10M",
+    "dataFetcher": {
+       "type": "jdbcDataFetcher",
+       "connectorConfig": {
+          "connectURI": "jdbc://mysql://localhost:3306/my_data_base",
+          "user": "druid",
+          "password": "druid"
+       },
+       "table": "lookup_table_name",
+       "keyColumn": "key_column_name",
+       "valueColumn": "value_column_name"
+    },
+    "cacheFactory": {
+       "type": "onHeapPolling"
+    }
 }
 
 ```
@@ -94,9 +106,21 @@ This example demonstrates an off-heap lookup that will be cached once and never
 
 ```json
 {
-    "type":"pollingLookup",
-   "dataFetcher":{ "type":"jdbcDataFetcher", "connectorConfig":"jdbc://mysql://localhost:3306/my_data_base", "table":"lookup_table_name", "keyColumn":"key_column_name", "valueColumn": "value_column_name"},
-   "cacheFactory":{"type":"offHeapPolling"}
+   "type": "pollingLookup",
+   "dataFetcher": {
+      "type": "jdbcDataFetcher",
+      "connectorConfig": {
+         "connectURI": "jdbc://mysql://localhost:3306/my_data_base",
+         "user": "druid",
+         "password": "druid"
+      },
+      "table": "lookup_table_name",
+      "keyColumn": "key_column_name",
+      "valueColumn": "value_column_name"
+   },
+   "cacheFactory": {
+      "type": "offHeapPolling"
+   }
 }
 
 ```
@@ -125,10 +149,27 @@ Guava cache configuration spec.
 
 ```json
 {
-   "type":"loadingLookup",
-   "dataFetcher":{ "type":"jdbcDataFetcher", "connectorConfig":"jdbc://mysql://localhost:3306/my_data_base", "table":"lookup_table_name", "keyColumn":"key_column_name", "valueColumn": "value_column_name"},
-   "loadingCacheSpec":{"type":"guava"},
-   "reverseLoadingCacheSpec":{"type":"guava", "maximumSize":500000, "expireAfterAccess":100000, "expireAfterWrite":10000}
+   "type": "loadingLookup",
+   "dataFetcher": {
+      "type": "jdbcDataFetcher",
+      "connectorConfig": {
+         "connectURI": "jdbc://mysql://localhost:3306/my_data_base",
+         "user": "druid",
+         "password": "druid"
+      },
+      "table": "lookup_table_name",
+      "keyColumn": "key_column_name",
+      "valueColumn": "value_column_name"
+   },
+   "loadingCacheSpec": {
+      "type": "guava"
+   },
+   "reverseLoadingCacheSpec": {
+      "type": "guava",
+      "maximumSize": 500000,
+      "expireAfterAccess": 100000,
+      "expireAfterWrite": 10000
+   }
 }
 ```
 
@@ -146,10 +187,28 @@ Off heap cache is backed by [MapDB](http://www.mapdb.org/) implementation. MapDB
 
 ```json
 {
-   "type":"loadingLookup",
-   "dataFetcher":{ "type":"jdbcDataFetcher", "connectorConfig":"jdbc://mysql://localhost:3306/my_data_base", "table":"lookup_table_name", "keyColumn":"key_column_name", "valueColumn": "value_column_name"},
-   "loadingCacheSpec":{"type":"mapDb", "maxEntriesSize":100000},
-   "reverseLoadingCacheSpec":{"type":"mapDb", "maxStoreSize":5, "expireAfterAccess":100000, "expireAfterWrite":10000}
+   "type": "loadingLookup",
+   "dataFetcher": {
+      "type": "jdbcDataFetcher",
+      "connectorConfig": {
+         "connectURI": "jdbc://mysql://localhost:3306/my_data_base",
+         "user": "druid",
+         "password": "druid"
+      },
+      "table": "lookup_table_name",
+      "keyColumn": "key_column_name",
+      "valueColumn": "value_column_name"
+   },
+   "loadingCacheSpec": {
+      "type": "mapDb",
+      "maxEntriesSize": 100000
+   },
+   "reverseLoadingCacheSpec": {
+      "type": "mapDb",
+      "maxStoreSize": 5,
+      "expireAfterAccess": 100000,
+      "expireAfterWrite": 10000
+   }
 }
 ```
 

From 3a2220c68d5ce9f8443106f448c38c739929993d Mon Sep 17 00:00:00 2001
From: Abhishek Radhakrishnan <abhishek.rb19@gmail.com>
Date: Fri, 6 Dec 2024 11:32:03 -0600
Subject: [PATCH 14/56] Refactor: Move some classes from `sql` to `processing`
 & `server` for reusability (#17542)

This PR contains non-functional / refactoring changes of the following classes in the sql module:

1. Move ExplainPlan and ExplainAttributes fromsql/src/main/java/org/apache/druid/sql/http to processing/src/main/java/org/apache/druid/query/explain
2. Move sql/src/main/java/org/apache/druid/sql/SqlTaskStatus.java -> processing/src/main/java/org/apache/druid/query/http/SqlTaskStatus.java
3. Add a new class processing/src/main/java/org/apache/druid/query/http/ClientSqlQuery.java that is effectively a thin POJO version of SqlQuery in the sql module but without any of the Calcite functionality and business logic.
4. Move BrokerClient, BrokerClientImpl and Broker classes from sql/src/main/java/org/apache/druid/sql/client to server/src/main/java/org/apache/druid/client/broker.
5. Remove BrokerServiceModule that provided the BrokerClient. The functionality is now contained in ServiceClientModule in the server package itself which provides all the clients as well.

This is done so that we can reuse the said classes in #17353 without brining in Calcite and other dependencies to the Overlord.
---
 .../msq/sql/resources/SqlTaskResource.java    |   2 +-
 .../catalog/ITCatalogIngestAndQueryTest.java  |   2 +-
 .../catalog/ITCatalogIngestErrorTest.java     |   2 +-
 .../msq/ITKeyStatisticsSketchMergeMode.java   |   2 +-
 ...ITMultiStageQueryWorkerFaultTolerance.java |   2 +-
 .../druid/testsEx/msq/MultiStageQuery.java    |   2 +-
 .../testing/utils/MsqTestQueryHelper.java     |   2 +-
 .../query/explain}/ExplainAttributes.java     |   2 +-
 .../druid/query/explain}/ExplainPlan.java     |   3 +-
 .../druid/query/http/ClientSqlParameter.java  |  76 +++++++++
 .../druid/query/http/ClientSqlQuery.java      | 151 ++++++++++++++++++
 .../druid/query}/http/SqlTaskStatus.java      |   2 +-
 .../query/explain}/ExplainAttributesTest.java |   4 +-
 .../druid/query/explain}/ExplainPlanTest.java |   3 +-
 .../druid/query/http/ClientSqlQueryTest.java  |  62 +++++++
 .../druid/query}/http/SqlTaskStatusTest.java  |   2 +-
 .../apache/druid/client/broker}/Broker.java   |   2 +-
 .../druid/client/broker}/BrokerClient.java    |  12 +-
 .../client/broker}/BrokerClientImpl.java      |  14 +-
 .../druid/rpc/guice/ServiceClientModule.java  |  31 +++-
 .../client/broker}/BrokerClientImplTest.java  |  28 ++--
 .../rpc/guice/ServiceClientModuleTest.java    |   7 +
 .../sql/calcite/planner/IngestHandler.java    |   1 +
 .../sql/calcite/planner/PlannerContext.java   |   1 +
 .../sql/calcite/planner/QueryHandler.java     |   1 +
 .../calcite/planner/SqlStatementHandler.java  |   1 +
 .../druid/sql/guice/BrokerServiceModule.java  |  91 -----------
 .../apache/druid/sql/http/SqlParameter.java   |   5 +
 .../org/apache/druid/sql/http/SqlQuery.java   |   6 +
 .../druid/sql/calcite/http/SqlQueryTest.java  |  64 +++++++-
 .../sql/guice/BrokerServiceModuleTest.java    | 114 -------------
 31 files changed, 443 insertions(+), 254 deletions(-)
 rename {sql/src/main/java/org/apache/druid/sql/calcite/planner => processing/src/main/java/org/apache/druid/query/explain}/ExplainAttributes.java (99%)
 rename {sql/src/main/java/org/apache/druid/sql/http => processing/src/main/java/org/apache/druid/query/explain}/ExplainPlan.java (97%)
 create mode 100644 processing/src/main/java/org/apache/druid/query/http/ClientSqlParameter.java
 create mode 100644 processing/src/main/java/org/apache/druid/query/http/ClientSqlQuery.java
 rename {sql/src/main/java/org/apache/druid/sql => processing/src/main/java/org/apache/druid/query}/http/SqlTaskStatus.java (98%)
 rename {sql/src/test/java/org/apache/druid/sql/calcite/planner => processing/src/test/java/org/apache/druid/query/explain}/ExplainAttributesTest.java (98%)
 rename {sql/src/test/java/org/apache/druid/sql/http => processing/src/test/java/org/apache/druid/query/explain}/ExplainPlanTest.java (98%)
 create mode 100644 processing/src/test/java/org/apache/druid/query/http/ClientSqlQueryTest.java
 rename {sql/src/test/java/org/apache/druid/sql => processing/src/test/java/org/apache/druid/query}/http/SqlTaskStatusTest.java (98%)
 rename {sql/src/main/java/org/apache/druid/sql/client => server/src/main/java/org/apache/druid/client/broker}/Broker.java (96%)
 rename {sql/src/main/java/org/apache/druid/sql/client => server/src/main/java/org/apache/druid/client/broker}/BrokerClient.java (82%)
 rename {sql/src/main/java/org/apache/druid/sql/client => server/src/main/java/org/apache/druid/client/broker}/BrokerClientImpl.java (87%)
 rename {sql/src/test/java/org/apache/druid/sql/client => server/src/test/java/org/apache/druid/client/broker}/BrokerClientImplTest.java (88%)
 delete mode 100644 sql/src/main/java/org/apache/druid/sql/guice/BrokerServiceModule.java
 delete mode 100644 sql/src/test/java/org/apache/druid/sql/guice/BrokerServiceModuleTest.java

diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/sql/resources/SqlTaskResource.java b/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/sql/resources/SqlTaskResource.java
index a07ef2c403fb..11e39bfa1267 100644
--- a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/sql/resources/SqlTaskResource.java
+++ b/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/sql/resources/SqlTaskResource.java
@@ -34,6 +34,7 @@
 import org.apache.druid.msq.guice.MultiStageQuery;
 import org.apache.druid.msq.sql.MSQTaskSqlEngine;
 import org.apache.druid.query.QueryException;
+import org.apache.druid.query.http.SqlTaskStatus;
 import org.apache.druid.server.QueryResponse;
 import org.apache.druid.server.initialization.ServerConfig;
 import org.apache.druid.server.security.Access;
@@ -47,7 +48,6 @@
 import org.apache.druid.sql.http.ResultFormat;
 import org.apache.druid.sql.http.SqlQuery;
 import org.apache.druid.sql.http.SqlResource;
-import org.apache.druid.sql.http.SqlTaskStatus;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.ws.rs.Consumes;
diff --git a/integration-tests-ex/cases/src/test/java/org/apache/druid/testsEx/catalog/ITCatalogIngestAndQueryTest.java b/integration-tests-ex/cases/src/test/java/org/apache/druid/testsEx/catalog/ITCatalogIngestAndQueryTest.java
index 1a756910bf24..849ef1c4c2c0 100644
--- a/integration-tests-ex/cases/src/test/java/org/apache/druid/testsEx/catalog/ITCatalogIngestAndQueryTest.java
+++ b/integration-tests-ex/cases/src/test/java/org/apache/druid/testsEx/catalog/ITCatalogIngestAndQueryTest.java
@@ -30,8 +30,8 @@
 import org.apache.druid.java.util.common.StringUtils;
 import org.apache.druid.java.util.common.logger.Logger;
 import org.apache.druid.query.QueryContexts;
+import org.apache.druid.query.http.SqlTaskStatus;
 import org.apache.druid.sql.http.SqlQuery;
-import org.apache.druid.sql.http.SqlTaskStatus;
 import org.apache.druid.testing.utils.DataLoaderHelper;
 import org.apache.druid.testing.utils.MsqTestQueryHelper;
 import org.apache.druid.testsEx.cluster.CatalogClient;
diff --git a/integration-tests-ex/cases/src/test/java/org/apache/druid/testsEx/catalog/ITCatalogIngestErrorTest.java b/integration-tests-ex/cases/src/test/java/org/apache/druid/testsEx/catalog/ITCatalogIngestErrorTest.java
index e075462d0bb6..fa5489dca80c 100644
--- a/integration-tests-ex/cases/src/test/java/org/apache/druid/testsEx/catalog/ITCatalogIngestErrorTest.java
+++ b/integration-tests-ex/cases/src/test/java/org/apache/druid/testsEx/catalog/ITCatalogIngestErrorTest.java
@@ -27,8 +27,8 @@
 import org.apache.druid.catalog.model.table.DatasourceDefn;
 import org.apache.druid.catalog.model.table.TableBuilder;
 import org.apache.druid.java.util.common.StringUtils;
+import org.apache.druid.query.http.SqlTaskStatus;
 import org.apache.druid.sql.http.SqlQuery;
-import org.apache.druid.sql.http.SqlTaskStatus;
 import org.apache.druid.testing.utils.MsqTestQueryHelper;
 import org.apache.druid.testsEx.categories.Catalog;
 import org.apache.druid.testsEx.cluster.CatalogClient;
diff --git a/integration-tests-ex/cases/src/test/java/org/apache/druid/testsEx/msq/ITKeyStatisticsSketchMergeMode.java b/integration-tests-ex/cases/src/test/java/org/apache/druid/testsEx/msq/ITKeyStatisticsSketchMergeMode.java
index b0dee9e713eb..8fb325b1c651 100644
--- a/integration-tests-ex/cases/src/test/java/org/apache/druid/testsEx/msq/ITKeyStatisticsSketchMergeMode.java
+++ b/integration-tests-ex/cases/src/test/java/org/apache/druid/testsEx/msq/ITKeyStatisticsSketchMergeMode.java
@@ -24,8 +24,8 @@
 import org.apache.druid.java.util.common.StringUtils;
 import org.apache.druid.msq.exec.ClusterStatisticsMergeMode;
 import org.apache.druid.msq.util.MultiStageQueryContext;
+import org.apache.druid.query.http.SqlTaskStatus;
 import org.apache.druid.sql.http.SqlQuery;
-import org.apache.druid.sql.http.SqlTaskStatus;
 import org.apache.druid.testing.clients.CoordinatorResourceTestClient;
 import org.apache.druid.testing.utils.DataLoaderHelper;
 import org.apache.druid.testing.utils.MsqTestQueryHelper;
diff --git a/integration-tests-ex/cases/src/test/java/org/apache/druid/testsEx/msq/ITMultiStageQueryWorkerFaultTolerance.java b/integration-tests-ex/cases/src/test/java/org/apache/druid/testsEx/msq/ITMultiStageQueryWorkerFaultTolerance.java
index 13c3fdc38463..5cc405045fd1 100644
--- a/integration-tests-ex/cases/src/test/java/org/apache/druid/testsEx/msq/ITMultiStageQueryWorkerFaultTolerance.java
+++ b/integration-tests-ex/cases/src/test/java/org/apache/druid/testsEx/msq/ITMultiStageQueryWorkerFaultTolerance.java
@@ -26,7 +26,7 @@
 import org.apache.druid.java.util.common.StringUtils;
 import org.apache.druid.java.util.common.logger.Logger;
 import org.apache.druid.msq.util.MultiStageQueryContext;
-import org.apache.druid.sql.http.SqlTaskStatus;
+import org.apache.druid.query.http.SqlTaskStatus;
 import org.apache.druid.testing.clients.CoordinatorResourceTestClient;
 import org.apache.druid.testing.utils.DataLoaderHelper;
 import org.apache.druid.testing.utils.ITRetryUtil;
diff --git a/integration-tests-ex/cases/src/test/java/org/apache/druid/testsEx/msq/MultiStageQuery.java b/integration-tests-ex/cases/src/test/java/org/apache/druid/testsEx/msq/MultiStageQuery.java
index 3cdc57c37bfa..d77d5dfe2c99 100644
--- a/integration-tests-ex/cases/src/test/java/org/apache/druid/testsEx/msq/MultiStageQuery.java
+++ b/integration-tests-ex/cases/src/test/java/org/apache/druid/testsEx/msq/MultiStageQuery.java
@@ -29,7 +29,7 @@
 import org.apache.druid.msq.indexing.report.MSQResultsReport;
 import org.apache.druid.msq.indexing.report.MSQTaskReport;
 import org.apache.druid.msq.indexing.report.MSQTaskReportPayload;
-import org.apache.druid.sql.http.SqlTaskStatus;
+import org.apache.druid.query.http.SqlTaskStatus;
 import org.apache.druid.storage.local.LocalFileExportStorageProvider;
 import org.apache.druid.testing.clients.CoordinatorResourceTestClient;
 import org.apache.druid.testing.utils.DataLoaderHelper;
diff --git a/integration-tests/src/main/java/org/apache/druid/testing/utils/MsqTestQueryHelper.java b/integration-tests/src/main/java/org/apache/druid/testing/utils/MsqTestQueryHelper.java
index 2a4d04f42dbd..c4a70a475e5d 100644
--- a/integration-tests/src/main/java/org/apache/druid/testing/utils/MsqTestQueryHelper.java
+++ b/integration-tests/src/main/java/org/apache/druid/testing/utils/MsqTestQueryHelper.java
@@ -37,8 +37,8 @@
 import org.apache.druid.msq.indexing.report.MSQResultsReport;
 import org.apache.druid.msq.indexing.report.MSQTaskReport;
 import org.apache.druid.msq.indexing.report.MSQTaskReportPayload;
+import org.apache.druid.query.http.SqlTaskStatus;
 import org.apache.druid.sql.http.SqlQuery;
-import org.apache.druid.sql.http.SqlTaskStatus;
 import org.apache.druid.testing.IntegrationTestingConfig;
 import org.apache.druid.testing.clients.OverlordResourceTestClient;
 import org.apache.druid.testing.clients.SqlResourceTestClient;
diff --git a/sql/src/main/java/org/apache/druid/sql/calcite/planner/ExplainAttributes.java b/processing/src/main/java/org/apache/druid/query/explain/ExplainAttributes.java
similarity index 99%
rename from sql/src/main/java/org/apache/druid/sql/calcite/planner/ExplainAttributes.java
rename to processing/src/main/java/org/apache/druid/query/explain/ExplainAttributes.java
index 533de7d58f2f..5c5a47356062 100644
--- a/sql/src/main/java/org/apache/druid/sql/calcite/planner/ExplainAttributes.java
+++ b/processing/src/main/java/org/apache/druid/query/explain/ExplainAttributes.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.druid.sql.calcite.planner;
+package org.apache.druid.query.explain;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonInclude;
diff --git a/sql/src/main/java/org/apache/druid/sql/http/ExplainPlan.java b/processing/src/main/java/org/apache/druid/query/explain/ExplainPlan.java
similarity index 97%
rename from sql/src/main/java/org/apache/druid/sql/http/ExplainPlan.java
rename to processing/src/main/java/org/apache/druid/query/explain/ExplainPlan.java
index 68defc4b2a4d..5e19aef7758d 100644
--- a/sql/src/main/java/org/apache/druid/sql/http/ExplainPlan.java
+++ b/processing/src/main/java/org/apache/druid/query/explain/ExplainPlan.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.druid.sql.http;
+package org.apache.druid.query.explain;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
@@ -26,7 +26,6 @@
 import com.fasterxml.jackson.databind.JsonDeserializer;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import org.apache.druid.sql.calcite.planner.ExplainAttributes;
 
 import java.io.IOException;
 import java.util.Objects;
diff --git a/processing/src/main/java/org/apache/druid/query/http/ClientSqlParameter.java b/processing/src/main/java/org/apache/druid/query/http/ClientSqlParameter.java
new file mode 100644
index 000000000000..cc562034e93a
--- /dev/null
+++ b/processing/src/main/java/org/apache/druid/query/http/ClientSqlParameter.java
@@ -0,0 +1,76 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.druid.query.http;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import java.util.Objects;
+
+/**
+ * Client representation of {@link org.apache.druid.sql.http.SqlParameter}. This is effectively a lightweight POJO class
+ * for use by clients that excludes Calcite dependencies and server-side logic from the Broker.
+ */
+public class ClientSqlParameter
+{
+  @JsonProperty
+  private final String type;
+
+  @JsonProperty
+  private final Object value;
+
+  @JsonCreator
+  public ClientSqlParameter(
+      @JsonProperty("type") String type,
+      @JsonProperty("value") Object value
+  )
+  {
+    this.type = type;
+    this.value = value;
+  }
+
+  @Override
+  public boolean equals(Object o)
+  {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    ClientSqlParameter that = (ClientSqlParameter) o;
+    return Objects.equals(type, that.type) && Objects.equals(value, that.value);
+  }
+
+  @Override
+  public int hashCode()
+  {
+    return Objects.hash(type, value);
+  }
+
+  @Override
+  public String toString()
+  {
+    return "ClientSqlParameter{" +
+           "type='" + type + '\'' +
+           ", value=" + value +
+           '}';
+  }
+}
diff --git a/processing/src/main/java/org/apache/druid/query/http/ClientSqlQuery.java b/processing/src/main/java/org/apache/druid/query/http/ClientSqlQuery.java
new file mode 100644
index 000000000000..3b3a2a239806
--- /dev/null
+++ b/processing/src/main/java/org/apache/druid/query/http/ClientSqlQuery.java
@@ -0,0 +1,151 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.druid.query.http;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+
+/**
+ * Client representation of {@link org.apache.druid.sql.http.SqlQuery}. This is effectively a lightweight POJO class for
+ * use by clients such as {@link org.apache.druid.client.broker.BrokerClient} that doesn't bring in any of the
+ * Calcite dependencies and server-side logic from the Broker.
+ */
+public class ClientSqlQuery
+{
+  @JsonProperty
+  private final String query;
+
+  @JsonProperty
+  private final String resultFormat;
+
+  @JsonProperty
+  private final boolean header;
+
+  @JsonProperty
+  private final boolean typesHeader;
+
+  @JsonProperty
+  private final boolean sqlTypesHeader;
+
+  @JsonProperty
+  private final Map<String, Object> context;
+
+  @JsonProperty
+  private final List<ClientSqlParameter> parameters;
+
+  @JsonCreator
+  public ClientSqlQuery(
+      @JsonProperty("query") final String query,
+      @JsonProperty("resultFormat") final String resultFormat,
+      @JsonProperty("header") final boolean header,
+      @JsonProperty("typesHeader") final boolean typesHeader,
+      @JsonProperty("sqlTypesHeader") final boolean sqlTypesHeader,
+      @JsonProperty("context") final Map<String, Object> context,
+      @JsonProperty("parameters") final List<ClientSqlParameter> parameters
+  )
+  {
+    this.query = query;
+    this.resultFormat = resultFormat;
+    this.header = header;
+    this.typesHeader = typesHeader;
+    this.sqlTypesHeader = sqlTypesHeader;
+    this.context = context;
+    this.parameters = parameters;
+  }
+
+  public String getQuery()
+  {
+    return query;
+  }
+
+  public String getResultFormat()
+  {
+    return resultFormat;
+  }
+
+  public boolean isHeader()
+  {
+    return header;
+  }
+
+  public boolean isTypesHeader()
+  {
+    return typesHeader;
+  }
+
+  public boolean isSqlTypesHeader()
+  {
+    return sqlTypesHeader;
+  }
+
+  public Map<String, Object> getContext()
+  {
+    return context;
+  }
+
+  public List<ClientSqlParameter> getParameters()
+  {
+    return parameters;
+  }
+
+
+  @Override
+  public boolean equals(final Object o)
+  {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    final ClientSqlQuery sqlQuery = (ClientSqlQuery) o;
+    return header == sqlQuery.header &&
+           typesHeader == sqlQuery.typesHeader &&
+           sqlTypesHeader == sqlQuery.sqlTypesHeader &&
+           Objects.equals(query, sqlQuery.query) &&
+           Objects.equals(resultFormat, sqlQuery.resultFormat) &&
+           Objects.equals(context, sqlQuery.context) &&
+           Objects.equals(parameters, sqlQuery.parameters);
+  }
+
+  @Override
+  public int hashCode()
+  {
+    return Objects.hash(query, resultFormat, header, typesHeader, sqlTypesHeader, context, parameters);
+  }
+
+  @Override
+  public String toString()
+  {
+    return "ClientSqlQuery{" +
+           "query='" + query + '\'' +
+           ", resultFormat=" + resultFormat +
+           ", header=" + header +
+           ", typesHeader=" + typesHeader +
+           ", sqlTypesHeader=" + sqlTypesHeader +
+           ", context=" + context +
+           ", parameters=" + parameters +
+           '}';
+  }
+}
diff --git a/sql/src/main/java/org/apache/druid/sql/http/SqlTaskStatus.java b/processing/src/main/java/org/apache/druid/query/http/SqlTaskStatus.java
similarity index 98%
rename from sql/src/main/java/org/apache/druid/sql/http/SqlTaskStatus.java
rename to processing/src/main/java/org/apache/druid/query/http/SqlTaskStatus.java
index 765891ec20a1..557cc5a7db07 100644
--- a/sql/src/main/java/org/apache/druid/sql/http/SqlTaskStatus.java
+++ b/processing/src/main/java/org/apache/druid/query/http/SqlTaskStatus.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.druid.sql.http;
+package org.apache.druid.query.http;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonInclude;
diff --git a/sql/src/test/java/org/apache/druid/sql/calcite/planner/ExplainAttributesTest.java b/processing/src/test/java/org/apache/druid/query/explain/ExplainAttributesTest.java
similarity index 98%
rename from sql/src/test/java/org/apache/druid/sql/calcite/planner/ExplainAttributesTest.java
rename to processing/src/test/java/org/apache/druid/query/explain/ExplainAttributesTest.java
index d203dd340028..affaf6e3ddfb 100644
--- a/sql/src/test/java/org/apache/druid/sql/calcite/planner/ExplainAttributesTest.java
+++ b/processing/src/test/java/org/apache/druid/query/explain/ExplainAttributesTest.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.druid.sql.calcite.planner;
+package org.apache.druid.query.explain;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.apache.druid.error.DruidException;
@@ -38,7 +38,7 @@ public class ExplainAttributesTest
   public void testGetters()
   {
     final ExplainAttributes selectAttributes = new ExplainAttributes("SELECT", null, null, null, null);
-    Assert.assertEquals("SELECT", selectAttributes.getStatementType());
+    assertEquals("SELECT", selectAttributes.getStatementType());
     Assert.assertNull(selectAttributes.getTargetDataSource());
     Assert.assertNull(selectAttributes.getPartitionedBy());
     Assert.assertNull(selectAttributes.getClusteredBy());
diff --git a/sql/src/test/java/org/apache/druid/sql/http/ExplainPlanTest.java b/processing/src/test/java/org/apache/druid/query/explain/ExplainPlanTest.java
similarity index 98%
rename from sql/src/test/java/org/apache/druid/sql/http/ExplainPlanTest.java
rename to processing/src/test/java/org/apache/druid/query/explain/ExplainPlanTest.java
index e3385fc5f518..7ff56b7c6fd9 100644
--- a/sql/src/test/java/org/apache/druid/sql/http/ExplainPlanTest.java
+++ b/processing/src/test/java/org/apache/druid/query/explain/ExplainPlanTest.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.druid.sql.http;
+package org.apache.druid.query.explain;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.type.TypeReference;
@@ -27,7 +27,6 @@
 import org.apache.druid.error.DruidException;
 import org.apache.druid.jackson.DefaultObjectMapper;
 import org.apache.druid.java.util.common.granularity.Granularities;
-import org.apache.druid.sql.calcite.planner.ExplainAttributes;
 import org.junit.Test;
 
 import java.util.List;
diff --git a/processing/src/test/java/org/apache/druid/query/http/ClientSqlQueryTest.java b/processing/src/test/java/org/apache/druid/query/http/ClientSqlQueryTest.java
new file mode 100644
index 000000000000..10379b3146ac
--- /dev/null
+++ b/processing/src/test/java/org/apache/druid/query/http/ClientSqlQueryTest.java
@@ -0,0 +1,62 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.druid.query.http;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.google.common.collect.ImmutableList;
+import org.apache.druid.jackson.DefaultObjectMapper;
+import org.junit.Assert;
+import org.junit.Test;
+
+public class ClientSqlQueryTest
+{
+  @Test
+  public void testSerde() throws JsonProcessingException
+  {
+    final ObjectMapper jsonMapper = new DefaultObjectMapper();
+    final ClientSqlQuery query = new ClientSqlQuery(
+        "SELECT 1",
+        "array",
+        true,
+        true,
+        true,
+        null,
+        null
+    );
+    Assert.assertEquals(query, jsonMapper.readValue(jsonMapper.writeValueAsString(query), ClientSqlQuery.class));
+  }
+
+  @Test
+  public void testSerdeWithParameters() throws JsonProcessingException
+  {
+    final ObjectMapper jsonMapper = new DefaultObjectMapper();
+    final ClientSqlQuery query = new ClientSqlQuery(
+        "SELECT 1",
+        "array",
+        true,
+        true,
+        true,
+        null,
+        ImmutableList.of(new ClientSqlParameter("ARRAY", ImmutableList.of(-25.7, 20.2, 36.85)))
+    );
+    Assert.assertEquals(query, jsonMapper.readValue(jsonMapper.writeValueAsString(query), ClientSqlQuery.class));
+  }
+}
diff --git a/sql/src/test/java/org/apache/druid/sql/http/SqlTaskStatusTest.java b/processing/src/test/java/org/apache/druid/query/http/SqlTaskStatusTest.java
similarity index 98%
rename from sql/src/test/java/org/apache/druid/sql/http/SqlTaskStatusTest.java
rename to processing/src/test/java/org/apache/druid/query/http/SqlTaskStatusTest.java
index c73e8d3cddbd..c587f44fdccd 100644
--- a/sql/src/test/java/org/apache/druid/sql/http/SqlTaskStatusTest.java
+++ b/processing/src/test/java/org/apache/druid/query/http/SqlTaskStatusTest.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.druid.sql.http;
+package org.apache.druid.query.http;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import nl.jqno.equalsverifier.EqualsVerifier;
diff --git a/sql/src/main/java/org/apache/druid/sql/client/Broker.java b/server/src/main/java/org/apache/druid/client/broker/Broker.java
similarity index 96%
rename from sql/src/main/java/org/apache/druid/sql/client/Broker.java
rename to server/src/main/java/org/apache/druid/client/broker/Broker.java
index fb20c5166c8f..ac47c66a7cf5 100644
--- a/sql/src/main/java/org/apache/druid/sql/client/Broker.java
+++ b/server/src/main/java/org/apache/druid/client/broker/Broker.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.druid.sql.client;
+package org.apache.druid.client.broker;
 
 import com.google.inject.BindingAnnotation;
 
diff --git a/sql/src/main/java/org/apache/druid/sql/client/BrokerClient.java b/server/src/main/java/org/apache/druid/client/broker/BrokerClient.java
similarity index 82%
rename from sql/src/main/java/org/apache/druid/sql/client/BrokerClient.java
rename to server/src/main/java/org/apache/druid/client/broker/BrokerClient.java
index 14cbbb7bff6a..611e6399ee69 100644
--- a/sql/src/main/java/org/apache/druid/sql/client/BrokerClient.java
+++ b/server/src/main/java/org/apache/druid/client/broker/BrokerClient.java
@@ -17,12 +17,12 @@
  * under the License.
  */
 
-package org.apache.druid.sql.client;
+package org.apache.druid.client.broker;
 
 import com.google.common.util.concurrent.ListenableFuture;
-import org.apache.druid.sql.http.ExplainPlan;
-import org.apache.druid.sql.http.SqlQuery;
-import org.apache.druid.sql.http.SqlTaskStatus;
+import org.apache.druid.query.explain.ExplainPlan;
+import org.apache.druid.query.http.ClientSqlQuery;
+import org.apache.druid.query.http.SqlTaskStatus;
 
 import java.util.List;
 
@@ -40,12 +40,12 @@ public interface BrokerClient
   /**
    * Submit the given {@code sqlQuery} to the Broker's SQL task endpoint.
    */
-  ListenableFuture<SqlTaskStatus> submitSqlTask(SqlQuery sqlQuery);
+  ListenableFuture<SqlTaskStatus> submitSqlTask(ClientSqlQuery sqlQuery);
 
   /**
    * Fetches the explain plan for the given {@code sqlQuery} from the Broker's SQL task endpoint.
    *
    * @param sqlQuery the SQL query for which the {@code EXPLAIN PLAN FOR} information is to be fetched
    */
-  ListenableFuture<List<ExplainPlan>> fetchExplainPlan(SqlQuery sqlQuery);
+  ListenableFuture<List<ExplainPlan>> fetchExplainPlan(ClientSqlQuery sqlQuery);
 }
diff --git a/sql/src/main/java/org/apache/druid/sql/client/BrokerClientImpl.java b/server/src/main/java/org/apache/druid/client/broker/BrokerClientImpl.java
similarity index 87%
rename from sql/src/main/java/org/apache/druid/sql/client/BrokerClientImpl.java
rename to server/src/main/java/org/apache/druid/client/broker/BrokerClientImpl.java
index b3e064341e63..012aea746181 100644
--- a/sql/src/main/java/org/apache/druid/sql/client/BrokerClientImpl.java
+++ b/server/src/main/java/org/apache/druid/client/broker/BrokerClientImpl.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.druid.sql.client;
+package org.apache.druid.client.broker;
 
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -26,11 +26,11 @@
 import org.apache.druid.java.util.common.StringUtils;
 import org.apache.druid.java.util.common.jackson.JacksonUtils;
 import org.apache.druid.java.util.http.client.response.BytesFullResponseHandler;
+import org.apache.druid.query.explain.ExplainPlan;
+import org.apache.druid.query.http.ClientSqlQuery;
+import org.apache.druid.query.http.SqlTaskStatus;
 import org.apache.druid.rpc.RequestBuilder;
 import org.apache.druid.rpc.ServiceClient;
-import org.apache.druid.sql.http.ExplainPlan;
-import org.apache.druid.sql.http.SqlQuery;
-import org.apache.druid.sql.http.SqlTaskStatus;
 import org.jboss.netty.handler.codec.http.HttpMethod;
 
 import java.util.List;
@@ -47,7 +47,7 @@ public BrokerClientImpl(final ServiceClient client, final ObjectMapper jsonMappe
   }
 
   @Override
-  public ListenableFuture<SqlTaskStatus> submitSqlTask(final SqlQuery sqlQuery)
+  public ListenableFuture<SqlTaskStatus> submitSqlTask(final ClientSqlQuery sqlQuery)
   {
     return FutureUtils.transform(
         client.asyncRequest(
@@ -60,9 +60,9 @@ public ListenableFuture<SqlTaskStatus> submitSqlTask(final SqlQuery sqlQuery)
   }
 
   @Override
-  public ListenableFuture<List<ExplainPlan>> fetchExplainPlan(final SqlQuery sqlQuery)
+  public ListenableFuture<List<ExplainPlan>> fetchExplainPlan(final ClientSqlQuery sqlQuery)
   {
-    final SqlQuery explainSqlQuery = new SqlQuery(
+    final ClientSqlQuery explainSqlQuery = new ClientSqlQuery(
         StringUtils.format("EXPLAIN PLAN FOR %s", sqlQuery.getQuery()),
         null,
         false,
diff --git a/server/src/main/java/org/apache/druid/rpc/guice/ServiceClientModule.java b/server/src/main/java/org/apache/druid/rpc/guice/ServiceClientModule.java
index 94dfeb29d957..a0d9a5e3725c 100644
--- a/server/src/main/java/org/apache/druid/rpc/guice/ServiceClientModule.java
+++ b/server/src/main/java/org/apache/druid/rpc/guice/ServiceClientModule.java
@@ -22,6 +22,9 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.inject.Binder;
 import com.google.inject.Provides;
+import org.apache.druid.client.broker.Broker;
+import org.apache.druid.client.broker.BrokerClient;
+import org.apache.druid.client.broker.BrokerClientImpl;
 import org.apache.druid.client.coordinator.Coordinator;
 import org.apache.druid.client.coordinator.CoordinatorClient;
 import org.apache.druid.client.coordinator.CoordinatorClientImpl;
@@ -47,7 +50,7 @@
 
 public class ServiceClientModule implements DruidModule
 {
-  public static final int CLIENT_MAX_ATTEMPTS = 6;
+  private static final int CLIENT_MAX_ATTEMPTS = 6;
   private static final int CONNECT_EXEC_THREADS = 4;
 
   @Override
@@ -116,6 +119,32 @@ public CoordinatorClient makeCoordinatorClient(
     );
   }
 
+  @Provides
+  @ManageLifecycle
+  @Broker
+  public ServiceLocator makeBrokerServiceLocator(final DruidNodeDiscoveryProvider discoveryProvider)
+  {
+    return new DiscoveryServiceLocator(discoveryProvider, NodeRole.BROKER);
+  }
+
+  @Provides
+  @LazySingleton
+  public BrokerClient makeBrokerClient(
+      @Json final ObjectMapper jsonMapper,
+      @EscalatedGlobal final ServiceClientFactory clientFactory,
+      @Broker final ServiceLocator serviceLocator
+  )
+  {
+    return new BrokerClientImpl(
+        clientFactory.makeClient(
+            NodeRole.BROKER.getJsonName(),
+            serviceLocator,
+            StandardRetryPolicy.builder().maxAttempts(ServiceClientModule.CLIENT_MAX_ATTEMPTS).build()
+        ),
+        jsonMapper
+    );
+  }
+
   public static ServiceClientFactory makeServiceClientFactory(@EscalatedGlobal final HttpClient httpClient)
   {
     final ScheduledExecutorService connectExec =
diff --git a/sql/src/test/java/org/apache/druid/sql/client/BrokerClientImplTest.java b/server/src/test/java/org/apache/druid/client/broker/BrokerClientImplTest.java
similarity index 88%
rename from sql/src/test/java/org/apache/druid/sql/client/BrokerClientImplTest.java
rename to server/src/test/java/org/apache/druid/client/broker/BrokerClientImplTest.java
index 51d66f03816d..90d1b49534d3 100644
--- a/sql/src/test/java/org/apache/druid/sql/client/BrokerClientImplTest.java
+++ b/server/src/test/java/org/apache/druid/client/broker/BrokerClientImplTest.java
@@ -17,24 +17,21 @@
  * under the License.
  */
 
-package org.apache.druid.sql.client;
+package org.apache.druid.client.broker;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
-import org.apache.calcite.avatica.SqlType;
 import org.apache.druid.indexer.TaskState;
 import org.apache.druid.jackson.DefaultObjectMapper;
 import org.apache.druid.java.util.common.StringUtils;
 import org.apache.druid.java.util.common.granularity.Granularities;
+import org.apache.druid.query.explain.ExplainAttributes;
+import org.apache.druid.query.explain.ExplainPlan;
+import org.apache.druid.query.http.ClientSqlQuery;
+import org.apache.druid.query.http.SqlTaskStatus;
 import org.apache.druid.rpc.MockServiceClient;
 import org.apache.druid.rpc.RequestBuilder;
-import org.apache.druid.sql.calcite.planner.ExplainAttributes;
-import org.apache.druid.sql.http.ExplainPlan;
-import org.apache.druid.sql.http.ResultFormat;
-import org.apache.druid.sql.http.SqlParameter;
-import org.apache.druid.sql.http.SqlQuery;
-import org.apache.druid.sql.http.SqlTaskStatus;
 import org.jboss.netty.handler.codec.http.HttpMethod;
 import org.jboss.netty.handler.codec.http.HttpResponseStatus;
 import org.junit.After;
@@ -43,7 +40,6 @@
 
 import javax.ws.rs.core.HttpHeaders;
 import javax.ws.rs.core.MediaType;
-
 import java.util.List;
 import java.util.Map;
 
@@ -72,14 +68,14 @@ public void tearDown()
   @Test
   public void testSubmitSqlTask() throws Exception
   {
-    final SqlQuery query = new SqlQuery(
+    final ClientSqlQuery query = new ClientSqlQuery(
         "REPLACE INTO foo OVERWRITE ALL SELECT * FROM bar PARTITIONED BY ALL",
-        ResultFormat.ARRAY,
+        null,
         true,
         true,
         true,
         ImmutableMap.of("useCache", false),
-        ImmutableList.of(new SqlParameter(SqlType.INTEGER, 1))
+        null
     );
     final SqlTaskStatus taskStatus = new SqlTaskStatus("taskId1", TaskState.RUNNING, null);
 
@@ -97,16 +93,16 @@ public void testSubmitSqlTask() throws Exception
   @Test
   public void testFetchExplainPlan() throws Exception
   {
-    final SqlQuery query = new SqlQuery(
+    final ClientSqlQuery query = new ClientSqlQuery(
         "REPLACE INTO foo OVERWRITE ALL SELECT * FROM bar PARTITIONED BY ALL",
-        ResultFormat.ARRAY,
+        null,
         true,
         true,
         true,
         ImmutableMap.of("useCache", false),
-        ImmutableList.of(new SqlParameter(SqlType.INTEGER, 1))
+        null
     );
-    final SqlQuery explainQuery = new SqlQuery(
+    final ClientSqlQuery explainQuery = new ClientSqlQuery(
         StringUtils.format("EXPLAIN PLAN FOR %s", query.getQuery()),
         null,
         false,
diff --git a/server/src/test/java/org/apache/druid/rpc/guice/ServiceClientModuleTest.java b/server/src/test/java/org/apache/druid/rpc/guice/ServiceClientModuleTest.java
index 5d8a07d20a8a..94647fe64aef 100644
--- a/server/src/test/java/org/apache/druid/rpc/guice/ServiceClientModuleTest.java
+++ b/server/src/test/java/org/apache/druid/rpc/guice/ServiceClientModuleTest.java
@@ -22,6 +22,7 @@
 import com.google.common.collect.ImmutableList;
 import com.google.inject.Guice;
 import com.google.inject.Injector;
+import org.apache.druid.client.broker.BrokerClient;
 import org.apache.druid.client.coordinator.CoordinatorClient;
 import org.apache.druid.discovery.DruidNodeDiscoveryProvider;
 import org.apache.druid.guice.DruidGuiceExtensions;
@@ -96,4 +97,10 @@ public void testGetCoordinatorClient()
   {
     assertNotNull(injector.getInstance(CoordinatorClient.class));
   }
+
+  @Test
+  public void testGetBrokerClient()
+  {
+    assertNotNull(injector.getInstance(BrokerClient.class));
+  }
 }
diff --git a/sql/src/main/java/org/apache/druid/sql/calcite/planner/IngestHandler.java b/sql/src/main/java/org/apache/druid/sql/calcite/planner/IngestHandler.java
index 3569864cae78..49a943aded76 100644
--- a/sql/src/main/java/org/apache/druid/sql/calcite/planner/IngestHandler.java
+++ b/sql/src/main/java/org/apache/druid/sql/calcite/planner/IngestHandler.java
@@ -37,6 +37,7 @@
 import org.apache.druid.error.DruidException;
 import org.apache.druid.error.InvalidSqlInput;
 import org.apache.druid.java.util.common.granularity.Granularity;
+import org.apache.druid.query.explain.ExplainAttributes;
 import org.apache.druid.server.security.Action;
 import org.apache.druid.server.security.Resource;
 import org.apache.druid.server.security.ResourceAction;
diff --git a/sql/src/main/java/org/apache/druid/sql/calcite/planner/PlannerContext.java b/sql/src/main/java/org/apache/druid/sql/calcite/planner/PlannerContext.java
index c02cb3cd8bd7..51be1f93502a 100644
--- a/sql/src/main/java/org/apache/druid/sql/calcite/planner/PlannerContext.java
+++ b/sql/src/main/java/org/apache/druid/sql/calcite/planner/PlannerContext.java
@@ -39,6 +39,7 @@
 import org.apache.druid.math.expr.ExprMacroTable;
 import org.apache.druid.query.QueryContext;
 import org.apache.druid.query.QueryContexts;
+import org.apache.druid.query.explain.ExplainAttributes;
 import org.apache.druid.query.filter.InDimFilter;
 import org.apache.druid.query.filter.TypedInFilter;
 import org.apache.druid.query.lookup.LookupExtractor;
diff --git a/sql/src/main/java/org/apache/druid/sql/calcite/planner/QueryHandler.java b/sql/src/main/java/org/apache/druid/sql/calcite/planner/QueryHandler.java
index 67cc7f2f44c1..8481efdbcbd1 100644
--- a/sql/src/main/java/org/apache/druid/sql/calcite/planner/QueryHandler.java
+++ b/sql/src/main/java/org/apache/druid/sql/calcite/planner/QueryHandler.java
@@ -63,6 +63,7 @@
 import org.apache.druid.java.util.emitter.EmittingLogger;
 import org.apache.druid.query.Query;
 import org.apache.druid.query.QueryContexts;
+import org.apache.druid.query.explain.ExplainAttributes;
 import org.apache.druid.server.QueryResponse;
 import org.apache.druid.server.security.Action;
 import org.apache.druid.server.security.Resource;
diff --git a/sql/src/main/java/org/apache/druid/sql/calcite/planner/SqlStatementHandler.java b/sql/src/main/java/org/apache/druid/sql/calcite/planner/SqlStatementHandler.java
index 267feae1f0f3..393363587f7d 100644
--- a/sql/src/main/java/org/apache/druid/sql/calcite/planner/SqlStatementHandler.java
+++ b/sql/src/main/java/org/apache/druid/sql/calcite/planner/SqlStatementHandler.java
@@ -22,6 +22,7 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.apache.calcite.schema.SchemaPlus;
 import org.apache.druid.query.QueryContext;
+import org.apache.druid.query.explain.ExplainAttributes;
 import org.apache.druid.server.security.ResourceAction;
 import org.apache.druid.sql.calcite.run.SqlEngine;
 import org.joda.time.DateTimeZone;
diff --git a/sql/src/main/java/org/apache/druid/sql/guice/BrokerServiceModule.java b/sql/src/main/java/org/apache/druid/sql/guice/BrokerServiceModule.java
deleted file mode 100644
index 05e022f83107..000000000000
--- a/sql/src/main/java/org/apache/druid/sql/guice/BrokerServiceModule.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.druid.sql.guice;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.google.inject.Binder;
-import com.google.inject.Provides;
-import org.apache.druid.discovery.DruidNodeDiscoveryProvider;
-import org.apache.druid.discovery.NodeRole;
-import org.apache.druid.guice.LazySingleton;
-import org.apache.druid.guice.ManageLifecycle;
-import org.apache.druid.guice.annotations.EscalatedGlobal;
-import org.apache.druid.guice.annotations.Json;
-import org.apache.druid.initialization.DruidModule;
-import org.apache.druid.java.util.http.client.HttpClient;
-import org.apache.druid.rpc.DiscoveryServiceLocator;
-import org.apache.druid.rpc.ServiceClientFactory;
-import org.apache.druid.rpc.ServiceLocator;
-import org.apache.druid.rpc.StandardRetryPolicy;
-import org.apache.druid.rpc.guice.ServiceClientModule;
-import org.apache.druid.sql.client.Broker;
-import org.apache.druid.sql.client.BrokerClient;
-import org.apache.druid.sql.client.BrokerClientImpl;
-
-/**
- * Module that processes can install if they require a {@link BrokerClient}.
- * <p>
- * Similar to {@link ServiceClientModule}, but since {@link BrokerClient} depends
- * on classes from the sql module, this is a separate module within the sql package.
- * </p>
- */
-public class BrokerServiceModule implements DruidModule
-{
-  @Override
-  public void configure(Binder binder)
-  {
-    // Nothing to do.
-  }
-
-  @Provides
-  @LazySingleton
-  @EscalatedGlobal
-  public ServiceClientFactory getServiceClientFactory(@EscalatedGlobal final HttpClient httpClient)
-  {
-    return ServiceClientModule.makeServiceClientFactory(httpClient);
-  }
-
-  @Provides
-  @ManageLifecycle
-  @Broker
-  public ServiceLocator makeBrokerServiceLocator(final DruidNodeDiscoveryProvider discoveryProvider)
-  {
-    return new DiscoveryServiceLocator(discoveryProvider, NodeRole.BROKER);
-  }
-
-  @Provides
-  @LazySingleton
-  public BrokerClient makeBrokerClient(
-      @Json final ObjectMapper jsonMapper,
-      @EscalatedGlobal final ServiceClientFactory clientFactory,
-      @Broker final ServiceLocator serviceLocator
-  )
-  {
-    return new BrokerClientImpl(
-        clientFactory.makeClient(
-            NodeRole.BROKER.getJsonName(),
-            serviceLocator,
-            StandardRetryPolicy.builder().maxAttempts(ServiceClientModule.CLIENT_MAX_ATTEMPTS).build()
-        ),
-        jsonMapper
-    );
-  }
-}
-
diff --git a/sql/src/main/java/org/apache/druid/sql/http/SqlParameter.java b/sql/src/main/java/org/apache/druid/sql/http/SqlParameter.java
index 7e8e190d3efa..79c3a145fd61 100644
--- a/sql/src/main/java/org/apache/druid/sql/http/SqlParameter.java
+++ b/sql/src/main/java/org/apache/druid/sql/http/SqlParameter.java
@@ -34,6 +34,11 @@
 import java.sql.Date;
 import java.util.Objects;
 
+/**
+ * See {@link org.apache.druid.query.http.ClientSqlParameter} for the equivalent POJO class used on the client side.
+ * Note: The field {@link #type} relies on a Calcite data type, which prevents this class from being moved
+ * to the processing module for reuse.
+ */
 public class SqlParameter
 {
   private final SqlType type;
diff --git a/sql/src/main/java/org/apache/druid/sql/http/SqlQuery.java b/sql/src/main/java/org/apache/druid/sql/http/SqlQuery.java
index 1364332aaa13..7b54ae39fadf 100644
--- a/sql/src/main/java/org/apache/druid/sql/http/SqlQuery.java
+++ b/sql/src/main/java/org/apache/druid/sql/http/SqlQuery.java
@@ -28,6 +28,7 @@
 import org.apache.calcite.avatica.remote.TypedValue;
 import org.apache.druid.java.util.common.ISE;
 import org.apache.druid.query.QueryContext;
+import org.apache.druid.query.http.ClientSqlQuery;
 
 import javax.annotation.Nullable;
 import java.util.List;
@@ -35,6 +36,11 @@
 import java.util.Objects;
 import java.util.stream.Collectors;
 
+/**
+ * See {@link ClientSqlQuery} for the equivalent POJO class used on the client side to interact with the Broker.
+ * Note: The fields {@link #resultFormat} and {@link #parameters} rely on Calcite data types,
+ * preventing this class from being moved to the processing module for reuse.
+ */
 public class SqlQuery
 {
   public static List<TypedValue> getParameterList(List<SqlParameter> parameters)
diff --git a/sql/src/test/java/org/apache/druid/sql/calcite/http/SqlQueryTest.java b/sql/src/test/java/org/apache/druid/sql/calcite/http/SqlQueryTest.java
index f9c083864f34..fc62cb05fba7 100644
--- a/sql/src/test/java/org/apache/druid/sql/calcite/http/SqlQueryTest.java
+++ b/sql/src/test/java/org/apache/druid/sql/calcite/http/SqlQueryTest.java
@@ -19,11 +19,14 @@
 
 package org.apache.druid.sql.calcite.http;
 
+import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import nl.jqno.equalsverifier.EqualsVerifier;
 import org.apache.calcite.avatica.SqlType;
+import org.apache.druid.query.http.ClientSqlParameter;
+import org.apache.druid.query.http.ClientSqlQuery;
 import org.apache.druid.segment.TestHelper;
 import org.apache.druid.sql.calcite.util.CalciteTestBase;
 import org.apache.druid.sql.http.ResultFormat;
@@ -34,10 +37,11 @@
 
 public class SqlQueryTest extends CalciteTestBase
 {
+  private static final ObjectMapper JSON_MAPPER = TestHelper.makeJsonMapper();
+
   @Test
   public void testSerde() throws Exception
   {
-    final ObjectMapper jsonMapper = TestHelper.makeJsonMapper();
     final SqlQuery query = new SqlQuery(
         "SELECT ?",
         ResultFormat.ARRAY,
@@ -47,7 +51,63 @@ public void testSerde() throws Exception
         ImmutableMap.of("useCache", false),
         ImmutableList.of(new SqlParameter(SqlType.INTEGER, 1))
     );
-    Assert.assertEquals(query, jsonMapper.readValue(jsonMapper.writeValueAsString(query), SqlQuery.class));
+    Assert.assertEquals(query, JSON_MAPPER.readValue(JSON_MAPPER.writeValueAsString(query), SqlQuery.class));
+  }
+
+  @Test
+  public void testClientSqlQueryToSqlQueryConversion() throws JsonProcessingException
+  {
+    final ClientSqlQuery givenClientSqlQuery = new ClientSqlQuery(
+        "SELECT ?",
+        "array",
+        true,
+        true,
+        true,
+        ImmutableMap.of("useCache", false),
+        null
+    );
+
+    final SqlQuery expectedSqlQuery = new SqlQuery(
+        "SELECT ?",
+        ResultFormat.ARRAY,
+        true,
+        true,
+        true,
+        ImmutableMap.of("useCache", false),
+        null
+    );
+
+    final SqlQuery observedSqlQuery =
+        JSON_MAPPER.readValue(JSON_MAPPER.writeValueAsString(givenClientSqlQuery), SqlQuery.class);
+    Assert.assertEquals(expectedSqlQuery, observedSqlQuery);
+  }
+
+  @Test
+  public void testClientSqlQueryToSqlQueryConversion2() throws JsonProcessingException
+  {
+    final ClientSqlQuery givenClientSqlQuery = new ClientSqlQuery(
+        "SELECT ?",
+        "arrayLines",
+        false,
+        false,
+        false,
+        ImmutableMap.of("useCache", false),
+        ImmutableList.of(new ClientSqlParameter("INTEGER", 1), new ClientSqlParameter("VARCHAR", "foo"))
+    );
+
+    final SqlQuery expectedSqlQuery = new SqlQuery(
+        "SELECT ?",
+        ResultFormat.ARRAYLINES,
+        false,
+        false,
+        false,
+        ImmutableMap.of("useCache", false),
+        ImmutableList.of(new SqlParameter(SqlType.INTEGER, 1), new SqlParameter(SqlType.VARCHAR, "foo"))
+    );
+
+    final SqlQuery observedSqlQuery =
+        JSON_MAPPER.readValue(JSON_MAPPER.writeValueAsString(givenClientSqlQuery), SqlQuery.class);
+    Assert.assertEquals(expectedSqlQuery, observedSqlQuery);
   }
 
   @Test
diff --git a/sql/src/test/java/org/apache/druid/sql/guice/BrokerServiceModuleTest.java b/sql/src/test/java/org/apache/druid/sql/guice/BrokerServiceModuleTest.java
deleted file mode 100644
index 9b59ad86733e..000000000000
--- a/sql/src/test/java/org/apache/druid/sql/guice/BrokerServiceModuleTest.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.druid.sql.guice;
-
-import com.google.common.collect.ImmutableList;
-import com.google.inject.ConfigurationException;
-import com.google.inject.Guice;
-import com.google.inject.Injector;
-import org.apache.druid.client.coordinator.CoordinatorClient;
-import org.apache.druid.discovery.DruidNodeDiscoveryProvider;
-import org.apache.druid.guice.DruidGuiceExtensions;
-import org.apache.druid.guice.LifecycleModule;
-import org.apache.druid.guice.annotations.EscalatedGlobal;
-import org.apache.druid.jackson.JacksonModule;
-import org.apache.druid.java.util.http.client.HttpClient;
-import org.apache.druid.rpc.ServiceClientFactory;
-import org.apache.druid.rpc.ServiceLocator;
-import org.apache.druid.rpc.indexing.OverlordClient;
-import org.apache.druid.sql.client.BrokerClient;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnit;
-import org.mockito.junit.MockitoRule;
-
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertThrows;
-
-public class BrokerServiceModuleTest
-{
-  private Injector injector;
-
-  @Rule
-  public MockitoRule mockitoRule = MockitoJUnit.rule();
-
-  @Mock
-  private HttpClient httpClient;
-
-  @Mock
-  private DruidNodeDiscoveryProvider discoveryProvider;
-
-  @Mock
-  private ServiceLocator serviceLocator;
-
-  @Mock
-  private ServiceClientFactory serviceClientFactory;
-
-  @Before
-  public void setUp()
-  {
-    injector = Guice.createInjector(
-        ImmutableList.of(
-            new DruidGuiceExtensions(),
-            new LifecycleModule(),
-            new JacksonModule(),
-            new BrokerServiceModule(),
-            binder -> {
-              binder.bind(HttpClient.class).annotatedWith(EscalatedGlobal.class).toInstance(httpClient);
-              binder.bind(ServiceLocator.class).toInstance(serviceLocator);
-              binder.bind(DruidNodeDiscoveryProvider.class).toInstance(discoveryProvider);
-              binder.bind(ServiceClientFactory.class).toInstance(serviceClientFactory);
-            }
-        )
-    );
-  }
-
-  @Test
-  public void testGetServiceClientFactory()
-  {
-    assertNotNull(injector.getInstance(ServiceClientFactory.class));
-  }
-
-  @Test
-  public void testGetBrokerClient()
-  {
-    assertNotNull(injector.getInstance(BrokerClient.class));
-  }
-
-  @Test
-  public void testGetCoordinatorClient()
-  {
-    assertThrows(
-        ConfigurationException.class,
-        () -> injector.getInstance(CoordinatorClient.class)
-    );
-  }
-
-  @Test
-  public void testGetOverlordClient()
-  {
-    assertThrows(
-        ConfigurationException.class,
-        () -> injector.getInstance(OverlordClient.class)
-    );
-  }
-}

From f61ec0af8573582780f4c82677d4acf43a6638b5 Mon Sep 17 00:00:00 2001
From: Virushade <70288012+GWphua@users.noreply.github.com>
Date: Sat, 7 Dec 2024 01:57:38 +0800
Subject: [PATCH 15/56] Reduce occurrences of failed IT builds (#17543)

Reduce occurrences of failed IT builds: break up the setup command and add a few retries to improve resiliency.
---
 integration-tests/docker/Dockerfile | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/integration-tests/docker/Dockerfile b/integration-tests/docker/Dockerfile
index df8c6f2598be..89fd45c97784 100644
--- a/integration-tests/docker/Dockerfile
+++ b/integration-tests/docker/Dockerfile
@@ -25,7 +25,17 @@ ARG KAFKA_VERSION
 # This is passed in by maven at build time to align with the client version we depend on in the pom file
 ARG ZK_VERSION
 ARG APACHE_ARCHIVE_MIRROR_HOST=https://archive.apache.org
-RUN APACHE_ARCHIVE_MIRROR_HOST=${APACHE_ARCHIVE_MIRROR_HOST} /root/base-setup.sh && rm -f /root/base-setup.sh
+ARG SETUP_RETRIES=3
+# Retry mechanism for running the setup script up to limit of 3 times.
+RUN set -e; \
+    for i in $(seq 1 $SETUP_RETRIES); do \
+        echo "Attempt $i to run the setup script..."; \
+        APACHE_ARCHIVE_MIRROR_HOST=${APACHE_ARCHIVE_MIRROR_HOST} /root/base-setup.sh && break || { \
+            echo "Set up script attempt $i/$SETUP_RETRIES failed."; \
+            sleep 2; \
+        }; \
+    done; \
+    rm -f /root/base-setup.sh
 
 FROM druidbase
 ARG MYSQL_VERSION

From 7736228f37e5064bb682ca384178a83b54b1cd4e Mon Sep 17 00:00:00 2001
From: George Shiqi Wu <george.wu@imply.io>
Date: Fri, 6 Dec 2024 16:01:28 -0500
Subject: [PATCH 16/56] Separate stop/start logic for LeaderLatch (#17546)

---
 .../discovery/CuratorDruidLeaderSelector.java     | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/server/src/main/java/org/apache/druid/curator/discovery/CuratorDruidLeaderSelector.java b/server/src/main/java/org/apache/druid/curator/discovery/CuratorDruidLeaderSelector.java
index d11298031069..4c3d7de23a0f 100644
--- a/server/src/main/java/org/apache/druid/curator/discovery/CuratorDruidLeaderSelector.java
+++ b/server/src/main/java/org/apache/druid/curator/discovery/CuratorDruidLeaderSelector.java
@@ -105,8 +105,8 @@ public void isLeader()
             }
             catch (Exception ex) {
               log.makeAlert(ex, "listener becomeLeader() failed. Unable to become leader").emit();
-
-              recreateLeaderLatch();
+              stopAndCreateNewLeaderLatch();
+              startLeaderLatch();
             }
           }
 
@@ -120,8 +120,10 @@ public void notLeader()
               }
 
               leader = false;
+              // give others a chance to become leader.
+              stopAndCreateNewLeaderLatch();
               listener.stopBeingLeader();
-              recreateLeaderLatch();
+              startLeaderLatch();
             }
             catch (Exception ex) {
               log.makeAlert(ex, "listener.stopBeingLeader() failed. Unable to stopBeingLeader").emit();
@@ -206,15 +208,18 @@ public void unregisterListener()
     listenerExecutor.shutdownNow();
   }
 
-  private void recreateLeaderLatch()
+  private void stopAndCreateNewLeaderLatch()
   {
-    // give others a chance to become leader.
     CloseableUtils.closeAndSuppressExceptions(
         createNewLeaderLatchWithListener(),
         e -> log.warn("Could not close old leader latch; continuing with new one anyway.")
     );
 
     leader = false;
+  }
+
+  private void startLeaderLatch()
+  {
     try {
       //Small delay before starting the latch so that others waiting are chosen to become leader.
       Thread.sleep(ThreadLocalRandom.current().nextInt(1000, 5000));

From 3b6a3ae2222f820c7c7dd88a8f104ecbc7742f5a Mon Sep 17 00:00:00 2001
From: zachjsh <zachjsh@gmail.com>
Date: Fri, 6 Dec 2024 17:18:59 -0500
Subject: [PATCH 17/56] Add taskStatus dimension to service/heartbeat metric
 (#17488)

* SQL syntax error should target USER persona

* * revert change to queryHandler and related tests, based on review comments

* * add test

* * add taskStatus dimension to `service/heartbeat` metric

* * address review comments

* * fix compilation error from merge

* * improve test coverage

* Address review comments

* * remove unuused import

* * address remaining comments
---
 docs/operations/metrics.md                    |   2 +-
 .../resources/defaultMetricDimensions.json    |   2 +-
 .../indexing/kafka/KafkaIndexTaskTest.java    |   6 +
 .../SeekableStreamIndexTask.java              |  10 +
 .../SeekableStreamSupervisorStateTest.java    |  41 ++++-
 .../java/org/apache/druid/cli/CliPeon.java    |  39 ++--
 .../org/apache/druid/cli/CliPeonTest.java     | 171 ++++++++++++++++++
 7 files changed, 253 insertions(+), 18 deletions(-)

diff --git a/docs/operations/metrics.md b/docs/operations/metrics.md
index ccb20f2e6dd1..46ee96df5b8e 100644
--- a/docs/operations/metrics.md
+++ b/docs/operations/metrics.md
@@ -402,7 +402,7 @@ These metrics are emitted by the Druid Coordinator in every run of the correspon
 
 |Metric|Description|Dimensions|Normal value|
 |------|-----------|----------|------------|
-| `service/heartbeat` | Metric indicating the service is up. This metric is emitted only when `ServiceStatusMonitor` is enabled. | `leader` on the Overlord and Coordinator.<br />`workerVersion`, `category`, `status` on the Middle Manager.<br />`taskId`, `groupId`, `taskType`, `dataSource`, `tags` on the Peon |1|
+| `service/heartbeat` | Metric indicating the service is up. This metric is emitted only when `ServiceStatusMonitor` is enabled. | `leader` on the Overlord and Coordinator.<br />`workerVersion`, `category`, `status` on the Middle Manager.<br />`taskId`, `groupId`, `taskType`, `status`, `dataSource`, `tags` on the Peon |1|
 
 ### Historical
 
diff --git a/extensions-contrib/statsd-emitter/src/main/resources/defaultMetricDimensions.json b/extensions-contrib/statsd-emitter/src/main/resources/defaultMetricDimensions.json
index a83aeb1bc7e1..48bc72505fe5 100644
--- a/extensions-contrib/statsd-emitter/src/main/resources/defaultMetricDimensions.json
+++ b/extensions-contrib/statsd-emitter/src/main/resources/defaultMetricDimensions.json
@@ -190,7 +190,7 @@
   "namespace/cache/numEntries" : { "dimensions" : [], "type" : "gauge" },
   "namespace/cache/heapSizeInBytes" : { "dimensions" : [], "type" : "gauge" },
 
-  "service/heartbeat" : { "dimensions" : ["leader"], "type" : "count" },
+  "service/heartbeat" : { "dimensions" : ["leader", "workerVersion", "category", "status", "taskId", "groupId", "dataSource", "taskStatus" ], "type" : "count" },
 
   "killTask/availableSlot/count" : { "dimensions" : [], "type" : "count" },
   "killTask/maxSlot/count" : { "dimensions" : [], "type" : "count" },
diff --git a/extensions-core/kafka-indexing-service/src/test/java/org/apache/druid/indexing/kafka/KafkaIndexTaskTest.java b/extensions-core/kafka-indexing-service/src/test/java/org/apache/druid/indexing/kafka/KafkaIndexTaskTest.java
index 3bae10a1969b..0621f6f9ba15 100644
--- a/extensions-core/kafka-indexing-service/src/test/java/org/apache/druid/indexing/kafka/KafkaIndexTaskTest.java
+++ b/extensions-core/kafka-indexing-service/src/test/java/org/apache/druid/indexing/kafka/KafkaIndexTaskTest.java
@@ -2270,6 +2270,8 @@ public void testRunWithPauseAndResume() throws Exception
         )
     );
 
+    Assert.assertEquals(Status.NOT_STARTED.toString(), task.getCurrentRunnerStatus());
+
     final ListenableFuture<TaskStatus> future = runTask(task);
 
     // Insert some data, but not enough for the task to finish
@@ -2280,6 +2282,8 @@ public void testRunWithPauseAndResume() throws Exception
     }
     Assert.assertEquals(2, countEvents(task));
     Assert.assertEquals(Status.READING, task.getRunner().getStatus());
+    Assert.assertEquals(Status.READING.toString(), task.getCurrentRunnerStatus());
+
 
     Map<KafkaTopicPartition, Long> currentOffsets = OBJECT_MAPPER.readValue(
         task.getRunner().pause().getEntity().toString(),
@@ -2288,6 +2292,7 @@ public void testRunWithPauseAndResume() throws Exception
         }
     );
     Assert.assertEquals(Status.PAUSED, task.getRunner().getStatus());
+    Assert.assertEquals(Status.PAUSED.toString(), task.getCurrentRunnerStatus());
     // Insert remaining data
     insertData(Iterables.skip(records, 4));
 
@@ -2305,6 +2310,7 @@ public void testRunWithPauseAndResume() throws Exception
 
     Assert.assertEquals(TaskState.SUCCESS, future.get().getStatusCode());
     Assert.assertEquals(task.getRunner().getEndOffsets(), task.getRunner().getCurrentOffsets());
+    Assert.assertEquals(Status.PUBLISHING.toString(), task.getCurrentRunnerStatus());
     verifyTaskMetrics(task, RowMeters.with().bytes(getTotalSizeOfRecords(2, 5)).totalProcessed(3));
 
     // Check published metadata and segments in deep storage
diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/seekablestream/SeekableStreamIndexTask.java b/indexing-service/src/main/java/org/apache/druid/indexing/seekablestream/SeekableStreamIndexTask.java
index d43b83d78d07..7b10c0afdccf 100644
--- a/indexing-service/src/main/java/org/apache/druid/indexing/seekablestream/SeekableStreamIndexTask.java
+++ b/indexing-service/src/main/java/org/apache/druid/indexing/seekablestream/SeekableStreamIndexTask.java
@@ -179,6 +179,16 @@ public <T> QueryRunner<T> getQueryRunner(Query<T> query)
     return (queryPlus, responseContext) -> queryPlus.run(getRunner().getAppenderator(), responseContext);
   }
 
+  /**
+   * @return the current status of this task.
+   */
+  @Nullable
+  public String getCurrentRunnerStatus()
+  {
+    SeekableStreamIndexTaskRunner.Status status = (getRunner() != null) ? getRunner().getStatus() : null;
+    return (status != null) ? status.toString() : null;
+  }
+
   public Appenderator newAppenderator(
       TaskToolbox toolbox,
       SegmentGenerationMetrics metrics,
diff --git a/indexing-service/src/test/java/org/apache/druid/indexing/seekablestream/supervisor/SeekableStreamSupervisorStateTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/seekablestream/supervisor/SeekableStreamSupervisorStateTest.java
index 8a3d36ea67fe..f182ced69fbb 100644
--- a/indexing-service/src/test/java/org/apache/druid/indexing/seekablestream/supervisor/SeekableStreamSupervisorStateTest.java
+++ b/indexing-service/src/test/java/org/apache/druid/indexing/seekablestream/supervisor/SeekableStreamSupervisorStateTest.java
@@ -143,6 +143,7 @@ public class SeekableStreamSupervisorStateTest extends EasyMockSupport
   private SeekableStreamSupervisorSpec spec;
   private SeekableStreamIndexTaskClient indexTaskClient;
   private RecordSupplier<String, String, ByteEntity> recordSupplier;
+  private SeekableStreamIndexTaskRunner<String, String, ByteEntity> streamingTaskRunner;
 
   private RowIngestionMetersFactory rowIngestionMetersFactory;
   private SupervisorStateManagerConfig supervisorConfig;
@@ -161,6 +162,7 @@ public void setupTest()
     spec = createMock(SeekableStreamSupervisorSpec.class);
     indexTaskClient = createMock(SeekableStreamIndexTaskClient.class);
     recordSupplier = createMock(RecordSupplier.class);
+    streamingTaskRunner = createMock(SeekableStreamIndexTaskRunner.class);
 
     rowIngestionMetersFactory = new TestUtils().getRowIngestionMetersFactory();
 
@@ -1459,6 +1461,8 @@ public Duration getEmissionDuration()
     supervisor.start();
     supervisor.runInternal();
 
+    Assert.assertNull(id1.getCurrentRunnerStatus());
+
     supervisor.checkpoint(
         0,
         new TestSeekableStreamDataSourceMetadata(
@@ -1518,6 +1522,8 @@ public Duration getEmissionDuration()
     EasyMock.expect(spec.getContextValue("tags")).andReturn("").anyTimes();
     EasyMock.expect(recordSupplier.getPartitionIds(STREAM)).andReturn(ImmutableSet.of(SHARD_ID)).anyTimes();
     EasyMock.expect(taskQueue.add(EasyMock.anyObject())).andReturn(true).anyTimes();
+    EasyMock.expect(streamingTaskRunner.getStatus()).andReturn(null);
+    EasyMock.expect(streamingTaskRunner.getStatus()).andReturn(SeekableStreamIndexTaskRunner.Status.NOT_STARTED);
 
     SeekableStreamIndexTaskTuningConfig taskTuningConfig = getTuningConfig().convertToTaskTuningConfig();
 
@@ -1543,7 +1549,8 @@ public Duration getEmissionDuration()
             ioConfig
         ),
         context,
-        "0"
+        "0",
+        streamingTaskRunner
     );
 
     final TaskLocation location1 = TaskLocation.create("testHost", 1234, -1);
@@ -1595,6 +1602,9 @@ public Duration getEmissionDuration()
     supervisor.runInternal();
     supervisor.handoffTaskGroupsEarly(ImmutableList.of(0));
 
+    Assert.assertNull(id1.getCurrentRunnerStatus());
+    Assert.assertEquals("NOT_STARTED", id1.getCurrentRunnerStatus());
+
     while (supervisor.getNoticesQueueSize() > 0) {
       Thread.sleep(100);
     }
@@ -2704,6 +2714,8 @@ public String toString()
 
   private class TestSeekableStreamIndexTask extends SeekableStreamIndexTask<String, String, ByteEntity>
   {
+    private final SeekableStreamIndexTaskRunner<String, String, ByteEntity> streamingTaskRunner;
+
     public TestSeekableStreamIndexTask(
         String id,
         @Nullable TaskResource taskResource,
@@ -2713,6 +2725,29 @@ public TestSeekableStreamIndexTask(
         @Nullable Map<String, Object> context,
         @Nullable String groupId
     )
+    {
+      this(
+          id,
+          taskResource,
+          dataSchema,
+          tuningConfig,
+          ioConfig,
+          context,
+          groupId,
+          null
+      );
+    }
+
+    public TestSeekableStreamIndexTask(
+        String id,
+        @Nullable TaskResource taskResource,
+        DataSchema dataSchema,
+        SeekableStreamIndexTaskTuningConfig tuningConfig,
+        SeekableStreamIndexTaskIOConfig<String, String> ioConfig,
+        @Nullable Map<String, Object> context,
+        @Nullable String groupId,
+        @Nullable SeekableStreamIndexTaskRunner<String, String, ByteEntity> streamingTaskRunner
+    )
     {
       super(
           id,
@@ -2723,12 +2758,14 @@ public TestSeekableStreamIndexTask(
           context,
           groupId
       );
+      this.streamingTaskRunner = streamingTaskRunner;
     }
 
+    @Nullable
     @Override
     protected SeekableStreamIndexTaskRunner<String, String, ByteEntity> createTaskRunner()
     {
-      return null;
+      return streamingTaskRunner;
     }
 
     @Override
diff --git a/services/src/main/java/org/apache/druid/cli/CliPeon.java b/services/src/main/java/org/apache/druid/cli/CliPeon.java
index 15374625d301..9d4bffecb5a8 100644
--- a/services/src/main/java/org/apache/druid/cli/CliPeon.java
+++ b/services/src/main/java/org/apache/druid/cli/CliPeon.java
@@ -25,7 +25,6 @@
 import com.github.rvesse.airline.annotations.Option;
 import com.github.rvesse.airline.annotations.restrictions.Required;
 import com.google.common.base.Supplier;
-import com.google.common.base.Suppliers;
 import com.google.common.base.Throwables;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
@@ -91,6 +90,7 @@
 import org.apache.druid.indexing.overlord.SingleTaskBackgroundRunner;
 import org.apache.druid.indexing.overlord.TaskRunner;
 import org.apache.druid.indexing.overlord.TaskStorage;
+import org.apache.druid.indexing.seekablestream.SeekableStreamIndexTask;
 import org.apache.druid.indexing.worker.executor.ExecutorLifecycle;
 import org.apache.druid.indexing.worker.executor.ExecutorLifecycleConfig;
 import org.apache.druid.indexing.worker.shuffle.DeepStorageIntermediaryDataManager;
@@ -303,19 +303,7 @@ public void configure(Binder binder)
           @Named(ServiceStatusMonitor.HEARTBEAT_TAGS_BINDING)
           public Supplier<Map<String, Object>> heartbeatDimensions(Task task)
           {
-            ImmutableMap.Builder<String, Object> builder = ImmutableMap.builder();
-            builder.put(DruidMetrics.TASK_ID, task.getId());
-            builder.put(DruidMetrics.DATASOURCE, task.getDataSource());
-            builder.put(DruidMetrics.TASK_TYPE, task.getType());
-            builder.put(DruidMetrics.GROUP_ID, task.getGroupId());
-            Map<String, Object> tags = task.getContextValue(DruidMetrics.TAGS);
-            if (tags != null && !tags.isEmpty()) {
-              builder.put(DruidMetrics.TAGS, tags);
-            }
-
-            return Suppliers.ofInstance(
-                builder.build()
-            );
+            return () -> CliPeon.heartbeatDimensions(task);
           }
 
           @Provides
@@ -565,6 +553,29 @@ static void configureIntermediaryData(Binder binder)
     shuffleClientBiddy.addBinding("deepstore").to(DeepStorageShuffleClient.class).in(LazySingleton.class);
   }
 
+  static Map<String, Object> heartbeatDimensions(Task task)
+  {
+    ImmutableMap.Builder<String, Object> builder = ImmutableMap.builder();
+    builder.put(DruidMetrics.TASK_ID, task.getId());
+    builder.put(DruidMetrics.DATASOURCE, task.getDataSource());
+    builder.put(DruidMetrics.TASK_TYPE, task.getType());
+    builder.put(DruidMetrics.GROUP_ID, task.getGroupId());
+    Map<String, Object> tags = task.getContextValue(DruidMetrics.TAGS);
+    if (tags != null && !tags.isEmpty()) {
+      builder.put(DruidMetrics.TAGS, tags);
+    }
+
+    if (task instanceof SeekableStreamIndexTask) {
+      SeekableStreamIndexTask streamingTask = (SeekableStreamIndexTask) task;
+      String status = streamingTask.getCurrentRunnerStatus();
+      if (status != null) {
+        builder.put(DruidMetrics.STATUS, status);
+      }
+    }
+
+    return builder.build();
+  }
+
   public class BroadcastSegmentLoadingModule implements Module
   {
     @Override
diff --git a/services/src/test/java/org/apache/druid/cli/CliPeonTest.java b/services/src/test/java/org/apache/druid/cli/CliPeonTest.java
index ad611a12ac7d..c3ed57cac61d 100644
--- a/services/src/test/java/org/apache/druid/cli/CliPeonTest.java
+++ b/services/src/test/java/org/apache/druid/cli/CliPeonTest.java
@@ -19,20 +19,46 @@
 
 package org.apache.druid.cli;
 
+import com.google.common.collect.ImmutableMap;
 import com.google.inject.Injector;
 import org.apache.commons.io.FileUtils;
+import org.apache.druid.data.input.impl.ByteEntity;
+import org.apache.druid.data.input.impl.CsvInputFormat;
+import org.apache.druid.data.input.impl.DimensionsSpec;
+import org.apache.druid.data.input.impl.TimestampSpec;
 import org.apache.druid.guice.GuiceInjectors;
+import org.apache.druid.indexing.common.TaskToolbox;
+import org.apache.druid.indexing.common.task.NoopTask;
+import org.apache.druid.indexing.common.task.TaskResource;
+import org.apache.druid.indexing.seekablestream.SeekableStreamEndSequenceNumbers;
+import org.apache.druid.indexing.seekablestream.SeekableStreamIndexTask;
+import org.apache.druid.indexing.seekablestream.SeekableStreamIndexTaskIOConfig;
+import org.apache.druid.indexing.seekablestream.SeekableStreamIndexTaskRunner;
+import org.apache.druid.indexing.seekablestream.SeekableStreamIndexTaskTuningConfig;
+import org.apache.druid.indexing.seekablestream.SeekableStreamStartSequenceNumbers;
+import org.apache.druid.indexing.seekablestream.common.RecordSupplier;
+import org.apache.druid.java.util.common.DateTimes;
+import org.apache.druid.java.util.common.granularity.AllGranularity;
+import org.apache.druid.query.DruidMetrics;
+import org.apache.druid.segment.indexing.DataSchema;
+import org.apache.druid.segment.indexing.granularity.ArbitraryGranularitySpec;
+import org.joda.time.Duration;
 import org.junit.Assert;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
 
+import javax.annotation.Nullable;
 import java.io.File;
 import java.io.IOException;
 import java.lang.reflect.Field;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
+import java.util.Map;
+
+import static org.easymock.EasyMock.mock;
 
 public class CliPeonTest
 {
@@ -73,6 +99,50 @@ public void testCliPeonK8sANdWorkerIsK8sMode() throws IOException
     Assert.assertNotNull(runnable.makeInjector());
   }
 
+  @Test
+  public void testCliPeonHeartbeatDimensions() throws IOException
+  {
+    // non-streaming task
+    String taskId = "testTaskId";
+    String groupId = "testGroupId";
+    String datasource = "testDatasource";
+    Map<String, String> tags = ImmutableMap.of("tag1", "value1");
+    Assert.assertEquals(
+        ImmutableMap.of(
+            DruidMetrics.TASK_ID, taskId,
+            DruidMetrics.GROUP_ID, groupId,
+            DruidMetrics.DATASOURCE, datasource,
+            DruidMetrics.TASK_TYPE, NoopTask.TYPE
+        ),
+        CliPeon.heartbeatDimensions(new TestTask(taskId, groupId, datasource, 0, 0, ImmutableMap.of()))
+    );
+
+    // streaming task with empty ags
+    Assert.assertEquals(
+        ImmutableMap.of(
+            DruidMetrics.TASK_ID, taskId,
+            DruidMetrics.GROUP_ID, groupId,
+            DruidMetrics.DATASOURCE, datasource,
+            DruidMetrics.TASK_TYPE, TestStreamingTask.TYPE,
+            DruidMetrics.STATUS, TestStreamingTask.STATUS
+        ),
+        CliPeon.heartbeatDimensions(new TestStreamingTask(taskId, datasource, ImmutableMap.of(DruidMetrics.TAGS, ImmutableMap.of()), groupId))
+    );
+
+    // streaming task with non-empty ags
+    Assert.assertEquals(
+        ImmutableMap.of(
+            DruidMetrics.TASK_ID, taskId,
+            DruidMetrics.GROUP_ID, groupId,
+            DruidMetrics.DATASOURCE, datasource,
+            DruidMetrics.TASK_TYPE, TestStreamingTask.TYPE,
+            DruidMetrics.STATUS, TestStreamingTask.STATUS,
+            DruidMetrics.TAGS, tags
+        ),
+        CliPeon.heartbeatDimensions(new TestStreamingTask(taskId, datasource, ImmutableMap.of(DruidMetrics.TAGS, tags), groupId))
+    );
+  }
+
   private static class FakeCliPeon extends CliPeon
   {
     List<String> taskAndStatusFile = new ArrayList<>();
@@ -96,4 +166,105 @@ private static class FakeCliPeon extends CliPeon
 
     }
   }
+
+  private static class TestTask extends NoopTask
+  {
+
+    public TestTask(
+        String id,
+        String groupId,
+        String dataSource,
+        long runTimeMillis,
+        long isReadyTime,
+        Map<String, Object> context
+    )
+    {
+      super(id, groupId, dataSource, runTimeMillis, isReadyTime, context);
+    }
+  }
+
+  private static class TestStreamingTask extends SeekableStreamIndexTask<String, String, ByteEntity>
+  {
+    static final String TYPE = "testStreaming";
+    static final String STATUS = SeekableStreamIndexTaskRunner.Status.PAUSED.toString();
+
+    public TestStreamingTask(
+        String id,
+        String datasource,
+        @Nullable Map context,
+        @Nullable String groupId
+    )
+    {
+      this(
+          id,
+          null,
+          DataSchema.builder()
+              .withDataSource(datasource)
+              .withTimestamp(new TimestampSpec(null, null, null))
+              .withDimensions(new DimensionsSpec(Collections.emptyList()))
+              .withGranularity(new ArbitraryGranularitySpec(new AllGranularity(), Collections.emptyList()))
+              .build(),
+          mock(SeekableStreamIndexTaskTuningConfig.class),
+          new TestSeekableStreamIndexTaskIOConfig(),
+          context,
+          groupId
+      );
+    }
+
+    private TestStreamingTask(
+        String id,
+        @Nullable TaskResource taskResource,
+        DataSchema dataSchema,
+        SeekableStreamIndexTaskTuningConfig tuningConfig,
+        SeekableStreamIndexTaskIOConfig ioConfig,
+        @Nullable Map context,
+        @Nullable String groupId
+    )
+    {
+
+      super(id, taskResource, dataSchema, tuningConfig, ioConfig, context, groupId);
+    }
+
+    @Override
+    protected SeekableStreamIndexTaskRunner<String, String, ByteEntity> createTaskRunner()
+    {
+      return null;
+    }
+
+    @Override
+    protected RecordSupplier<String, String, ByteEntity> newTaskRecordSupplier(final TaskToolbox toolbox)
+    {
+      return null;
+    }
+
+    @Override
+    public String getCurrentRunnerStatus()
+    {
+      return STATUS;
+    }
+
+    @Override
+    public String getType()
+    {
+      return TYPE;
+    }
+  }
+
+  private static class TestSeekableStreamIndexTaskIOConfig extends SeekableStreamIndexTaskIOConfig<String, String>
+  {
+    public TestSeekableStreamIndexTaskIOConfig()
+    {
+      super(
+          null,
+          "someSequence",
+          new SeekableStreamStartSequenceNumbers<>("abc", "def", Collections.emptyMap(), Collections.emptyMap(), null),
+          new SeekableStreamEndSequenceNumbers<>("abc", "def", Collections.emptyMap(), Collections.emptyMap()),
+          false,
+          DateTimes.nowUtc().minusDays(2),
+          DateTimes.nowUtc(),
+          new CsvInputFormat(null, null, true, null, 0, null),
+          Duration.standardHours(2).getStandardMinutes()
+      );
+    }
+  }
 }

From b114807560ae390feeacf86b23fd32df7d8d4007 Mon Sep 17 00:00:00 2001
From: Akshat Jain <akjn11@gmail.com>
Date: Sat, 7 Dec 2024 04:06:27 +0530
Subject: [PATCH 18/56] Fix cron job ITs by using jdk17 as the runtime_jdk
 (#17544)

This PR changes runtime_jdk to 17 from 21.0.4 to fix the cron job ITs.
---
 .github/workflows/cron-job-its.yml | 8 ++++----
 .github/workflows/revised-its.yml  | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/cron-job-its.yml b/.github/workflows/cron-job-its.yml
index 31d15aaec715..d475b97bd1da 100644
--- a/.github/workflows/cron-job-its.yml
+++ b/.github/workflows/cron-job-its.yml
@@ -61,7 +61,7 @@ jobs:
     needs: build
     with:
       build_jdk: 17
-      runtime_jdk: 21.0.4
+      runtime_jdk: 17
       testing_groups: -Dgroups=${{ matrix.testing_group }}
       use_indexer: middleManager
       group: ${{ matrix.testing_group }}
@@ -75,7 +75,7 @@ jobs:
     needs: build
     with:
       build_jdk: 17
-      runtime_jdk: 21.0.4
+      runtime_jdk: 17
       testing_groups: -Dgroups=${{ matrix.testing_group }}
       use_indexer: indexer
       group: ${{ matrix.testing_group }}
@@ -89,7 +89,7 @@ jobs:
     needs: build
     with:
       build_jdk: 17
-      runtime_jdk: 21.0.4
+      runtime_jdk: 17
       testing_groups: -Dgroups=${{ matrix.testing_group }}
       use_indexer: middleManager
       override_config_path: ./environment-configs/test-groups/prepopulated-data
@@ -104,7 +104,7 @@ jobs:
     needs: build
     with:
       build_jdk: 17
-      runtime_jdk: 21.0.4
+      runtime_jdk: 17
       testing_groups: -DexcludedGroups=batch-index,input-format,input-source,perfect-rollup-parallel-batch-index,kafka-index,query,query-retry,query-error,realtime-index,security,ldap-security,s3-deep-storage,gcs-deep-storage,azure-deep-storage,hdfs-deep-storage,s3-ingestion,kinesis-index,kinesis-data-format,kafka-transactional-index,kafka-index-slow,kafka-transactional-index-slow,kafka-data-format,hadoop-s3-to-s3-deep-storage,hadoop-s3-to-hdfs-deep-storage,hadoop-azure-to-azure-deep-storage,hadoop-azure-to-hdfs-deep-storage,hadoop-gcs-to-gcs-deep-storage,hadoop-gcs-to-hdfs-deep-storage,aliyun-oss-deep-storage,append-ingestion,compaction,high-availability,upgrade,shuffle-deep-store,custom-coordinator-duties
       use_indexer: ${{ matrix.indexer }}
       group: other
diff --git a/.github/workflows/revised-its.yml b/.github/workflows/revised-its.yml
index 3e7394268020..bf3f45567bfb 100644
--- a/.github/workflows/revised-its.yml
+++ b/.github/workflows/revised-its.yml
@@ -87,7 +87,7 @@ jobs:
     if: ${{ needs.changes.outputs.core == 'true' || needs.changes.outputs.common-extensions == 'true' }}
     with:
       build_jdk: 17
-      runtime_jdk: 21.0.4
+      runtime_jdk: 17
       use_indexer: middleManager
       script: ./it.sh github S3DeepStorage
       it: S3DeepStorage

From ae4ea51352bc6d0a6b9d6078478b516aee36a073 Mon Sep 17 00:00:00 2001
From: Rohan Garg <7731512+rohangarg@users.noreply.github.com>
Date: Mon, 9 Dec 2024 09:48:38 -0500
Subject: [PATCH 19/56] Rewrite S3StorageConnectorTest using testcontainers and
 MinIO (#17539)

---
 .github/scripts/unit_tests_script.sh          |   2 +-
 extensions-core/s3-extensions/pom.xml         |  44 ++
 .../s3/ServerSideEncryptingAmazonS3.java      |   5 +
 .../storage/s3/output/S3StorageConnector.java |   4 +-
 .../s3/output/S3StorageConnectorTest.java     | 449 +++++++++---------
 pom.xml                                       |  15 +
 6 files changed, 303 insertions(+), 216 deletions(-)

diff --git a/.github/scripts/unit_tests_script.sh b/.github/scripts/unit_tests_script.sh
index e048a19c4af3..28de3e943796 100755
--- a/.github/scripts/unit_tests_script.sh
+++ b/.github/scripts/unit_tests_script.sh
@@ -22,7 +22,7 @@ unset _JAVA_OPTIONS
 # Set MAVEN_OPTS for Surefire launcher.
 MAVEN_OPTS='-Xmx2500m' ${MVN} test -pl ${MAVEN_PROJECTS} \
 ${MAVEN_SKIP} -Ddruid.generic.useDefaultValueForNull=${DRUID_USE_DEFAULT_VALUE_FOR_NULL} \
--DjfrProfilerArgLine="${JFR_PROFILER_ARG_LINE}"
+-DjfrProfilerArgLine="${JFR_PROFILER_ARG_LINE}" -Pci
 sh -c "dmesg | egrep -i '(oom|out of memory|kill process|killed).*' -C 1 || exit 0"
 free -m
 ${MVN} -pl ${MAVEN_PROJECTS} jacoco:report || { echo "coverage_failure=false" >> "$GITHUB_ENV" && false; }
diff --git a/extensions-core/s3-extensions/pom.xml b/extensions-core/s3-extensions/pom.xml
index b50d9c01a9e0..cb9a03a5bae8 100644
--- a/extensions-core/s3-extensions/pom.xml
+++ b/extensions-core/s3-extensions/pom.xml
@@ -159,6 +159,50 @@
       <artifactId>equalsverifier</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.testcontainers</groupId>
+      <artifactId>testcontainers</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.testcontainers</groupId>
+      <artifactId>junit-jupiter</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-api</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.testcontainers</groupId>
+      <artifactId>minio</artifactId>
+      <version>1.19.5</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
+  <profiles>
+    <profile>
+      <id>local</id>
+      <activation>
+        <activeByDefault>true</activeByDefault>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-surefire-plugin</artifactId>
+            <configuration>
+              <groups>!requires-dockerd</groups>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+    <profile>
+      <id>ci</id>
+    </profile>
+  </profiles>
+
 </project>
diff --git a/extensions-core/s3-extensions/src/main/java/org/apache/druid/storage/s3/ServerSideEncryptingAmazonS3.java b/extensions-core/s3-extensions/src/main/java/org/apache/druid/storage/s3/ServerSideEncryptingAmazonS3.java
index 0fb93a208337..31120ba883c4 100644
--- a/extensions-core/s3-extensions/src/main/java/org/apache/druid/storage/s3/ServerSideEncryptingAmazonS3.java
+++ b/extensions-core/s3-extensions/src/main/java/org/apache/druid/storage/s3/ServerSideEncryptingAmazonS3.java
@@ -72,6 +72,11 @@ public ServerSideEncryptingAmazonS3(AmazonS3 amazonS3, ServerSideEncryption serv
     this.serverSideEncryption = serverSideEncryption;
   }
 
+  public AmazonS3 getAmazonS3()
+  {
+    return amazonS3;
+  }
+
   public boolean doesObjectExist(String bucket, String objectName)
   {
     try {
diff --git a/extensions-core/s3-extensions/src/main/java/org/apache/druid/storage/s3/output/S3StorageConnector.java b/extensions-core/s3-extensions/src/main/java/org/apache/druid/storage/s3/output/S3StorageConnector.java
index 8eb391a24d39..9ea0e7a8ae03 100644
--- a/extensions-core/s3-extensions/src/main/java/org/apache/druid/storage/s3/output/S3StorageConnector.java
+++ b/extensions-core/s3-extensions/src/main/java/org/apache/druid/storage/s3/output/S3StorageConnector.java
@@ -57,8 +57,8 @@ public class S3StorageConnector extends ChunkingStorageConnector<GetObjectReques
   private final ServerSideEncryptingAmazonS3 s3Client;
   private final S3UploadManager s3UploadManager;
 
-  private static final String DELIM = "/";
-  private static final Joiner JOINER = Joiner.on(DELIM).skipNulls();
+  static final String DELIM = "/";
+  static final Joiner JOINER = Joiner.on(DELIM).skipNulls();
   private static final int MAX_NUMBER_OF_LISTINGS = 1000;
 
   public S3StorageConnector(S3OutputConfig config, ServerSideEncryptingAmazonS3 serverSideEncryptingAmazonS3, S3UploadManager s3UploadManager)
diff --git a/extensions-core/s3-extensions/src/test/java/org/apache/druid/storage/s3/output/S3StorageConnectorTest.java b/extensions-core/s3-extensions/src/test/java/org/apache/druid/storage/s3/output/S3StorageConnectorTest.java
index 68eaca1c42a3..56df24d21152 100644
--- a/extensions-core/s3-extensions/src/test/java/org/apache/druid/storage/s3/output/S3StorageConnectorTest.java
+++ b/extensions-core/s3-extensions/src/test/java/org/apache/druid/storage/s3/output/S3StorageConnectorTest.java
@@ -19,160 +19,147 @@
 
 package org.apache.druid.storage.s3.output;
 
+import com.amazonaws.ClientConfigurationFactory;
+import com.amazonaws.auth.AWSCredentials;
+import com.amazonaws.auth.BasicAWSCredentials;
+import com.amazonaws.client.builder.AwsClientBuilder;
+import com.amazonaws.internal.StaticCredentialsProvider;
 import com.amazonaws.services.s3.AmazonS3Client;
+import com.amazonaws.services.s3.AmazonS3ClientBuilder;
 import com.amazonaws.services.s3.model.AmazonS3Exception;
-import com.amazonaws.services.s3.model.DeleteObjectsRequest;
-import com.amazonaws.services.s3.model.GetObjectMetadataRequest;
-import com.amazonaws.services.s3.model.GetObjectRequest;
-import com.amazonaws.services.s3.model.ListObjectsV2Request;
-import com.amazonaws.services.s3.model.ListObjectsV2Result;
-import com.amazonaws.services.s3.model.ObjectMetadata;
-import com.amazonaws.services.s3.model.S3Object;
-import com.amazonaws.services.s3.model.S3ObjectSummary;
+import com.amazonaws.services.s3.model.CreateBucketRequest;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Lists;
 import org.apache.druid.java.util.common.HumanReadableBytes;
+import org.apache.druid.java.util.common.StringUtils;
 import org.apache.druid.java.util.metrics.StubServiceEmitter;
 import org.apache.druid.query.DruidProcessingConfigTest;
 import org.apache.druid.storage.StorageConnector;
-import org.apache.druid.storage.s3.NoopServerSideEncryption;
 import org.apache.druid.storage.s3.ServerSideEncryptingAmazonS3;
-import org.easymock.Capture;
-import org.easymock.EasyMock;
-import org.hamcrest.CoreMatchers;
-import org.hamcrest.MatcherAssert;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.internal.matchers.ThrowableCauseMatcher;
-import org.junit.rules.TemporaryFolder;
-
-import java.io.BufferedReader;
-import java.io.ByteArrayInputStream;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+import org.testcontainers.containers.MinIOContainer;
+import org.testcontainers.junit.jupiter.Container;
+import org.testcontainers.junit.jupiter.Testcontainers;
+import org.testcontainers.utility.DockerImageName;
+
+import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.InputStreamReader;
+import java.io.OutputStream;
 import java.nio.charset.StandardCharsets;
-import java.util.Collections;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.ArrayList;
 import java.util.List;
-import java.util.stream.Collectors;
+import java.util.UUID;
 
+import static org.apache.druid.storage.s3.output.S3StorageConnector.JOINER;
+
+@Testcontainers
+@Tag("requires-dockerd")
 public class S3StorageConnectorTest
 {
-  private static final String BUCKET = "BUCKET";
+  private static final String BUCKET = "testbucket";
   private static final String PREFIX = "P/R/E/F/I/X";
   public static final String TEST_FILE = "test.csv";
-
-  private final AmazonS3Client s3Client = EasyMock.createMock(AmazonS3Client.class);
-  private final ServerSideEncryptingAmazonS3 service = new ServerSideEncryptingAmazonS3(
-      s3Client,
-      new NoopServerSideEncryption()
-  );
-  private final ListObjectsV2Result testResult = EasyMock.createMock(ListObjectsV2Result.class);
-
-  @Rule
-  public TemporaryFolder temporaryFolder = new TemporaryFolder();
+  @Container
+  private static final MinIOContainer MINIO = MinioUtil.createContainer();
+  @TempDir
+  public static File temporaryFolder;
+  private ServerSideEncryptingAmazonS3 s3Client;
 
   private StorageConnector storageConnector;
 
-  @Before
-  public void setup()
+  @BeforeEach
+  public void setup() throws IOException
   {
-    try {
-      S3OutputConfig s3OutputConfig = new S3OutputConfig(
-          BUCKET,
-          PREFIX,
-          temporaryFolder.newFolder(),
-          null,
-          null,
-          true
-      );
-      storageConnector = new S3StorageConnector(s3OutputConfig, service, new S3UploadManager(
-          s3OutputConfig,
-          new S3ExportConfig("tempDir", new HumanReadableBytes("5MiB"), 1, null),
-          new DruidProcessingConfigTest.MockRuntimeInfo(10, 0, 0),
-          new StubServiceEmitter()));
-    }
-    catch (IOException e) {
-      throw new RuntimeException(e);
+    s3Client = MinioUtil.createS3Client(MINIO);
+    if (!s3Client.getAmazonS3().doesBucketExistV2(BUCKET)) {
+      s3Client.getAmazonS3().createBucket(new CreateBucketRequest(BUCKET));
     }
+
+    S3OutputConfig s3OutputConfig = new S3OutputConfig(
+        BUCKET,
+        PREFIX,
+        Files.createDirectory(Paths.get(temporaryFolder.getAbsolutePath(), UUID.randomUUID().toString())).toFile(),
+        null,
+        null,
+        true
+    );
+    storageConnector = new S3StorageConnector(
+        s3OutputConfig,
+        s3Client,
+        new S3UploadManager(
+            s3OutputConfig,
+            new S3ExportConfig("tempDir", new HumanReadableBytes("5MiB"), 1, null),
+            new DruidProcessingConfigTest.MockRuntimeInfo(10, 0, 0),
+            new StubServiceEmitter()
+        )
+    );
   }
 
   @Test
   public void pathExists_yes() throws IOException
   {
-    final Capture<GetObjectMetadataRequest> request = Capture.newInstance();
-    EasyMock.reset(s3Client);
-    EasyMock.expect(s3Client.getObjectMetadata(EasyMock.capture(request)))
-            .andReturn(new ObjectMetadata());
-    EasyMock.replay(s3Client);
-    Assert.assertTrue(storageConnector.pathExists(TEST_FILE));
-    Assert.assertEquals(BUCKET, request.getValue().getBucketName());
-    Assert.assertEquals(PREFIX + "/" + TEST_FILE, request.getValue().getKey());
-    EasyMock.verify(s3Client);
+    s3Client.putObject(
+        BUCKET,
+        JOINER.join(PREFIX, TEST_FILE),
+        Files.createFile(Path.of(temporaryFolder.toPath().toString(), TEST_FILE)).toFile()
+    );
+    Assertions.assertTrue(storageConnector.pathExists(TEST_FILE));
   }
 
   @Test
   public void pathExists_notFound() throws IOException
   {
-    final Capture<GetObjectMetadataRequest> request = Capture.newInstance();
-    final AmazonS3Exception e = new AmazonS3Exception("not found");
-    e.setStatusCode(404);
-
-    EasyMock.reset(s3Client);
-    EasyMock.expect(s3Client.getObjectMetadata(EasyMock.capture(request)))
-            .andThrow(e);
-    EasyMock.replay(s3Client);
-    Assert.assertFalse(storageConnector.pathExists(TEST_FILE));
-    Assert.assertEquals(BUCKET, request.getValue().getBucketName());
-    Assert.assertEquals(PREFIX + "/" + TEST_FILE, request.getValue().getKey());
-    EasyMock.verify(s3Client);
+    Assertions.assertFalse(storageConnector.pathExists(UUID.randomUUID().toString()));
   }
 
   @Test
-  public void pathExists_error()
+  public void pathExists_error() throws IOException
   {
-    final Capture<GetObjectMetadataRequest> request = Capture.newInstance();
-    final AmazonS3Exception e = new AmazonS3Exception("not found");
-    e.setStatusCode(403);
-
-    EasyMock.reset(s3Client);
-    EasyMock.expect(s3Client.getObjectMetadata(EasyMock.capture(request)))
-            .andThrow(e);
-    EasyMock.replay(s3Client);
-    final IOException e2 = Assert.assertThrows(
+    S3OutputConfig s3OutputConfig = new S3OutputConfig(
+        BUCKET,
+        PREFIX,
+        Files.createDirectory(Paths.get(temporaryFolder.getAbsolutePath(), UUID.randomUUID().toString())).toFile(),
+        null,
+        null,
+        true
+    );
+    StorageConnector unauthorizedStorageConnector = new S3StorageConnector(
+        s3OutputConfig,
+        MinioUtil.createUnauthorizedS3Client(MINIO),
+        new S3UploadManager(
+            s3OutputConfig,
+            new S3ExportConfig("tempDir", new HumanReadableBytes("5MiB"), 1, null),
+            new DruidProcessingConfigTest.MockRuntimeInfo(10, 0, 0),
+            new StubServiceEmitter()
+        )
+    );
+    final IOException e2 = Assertions.assertThrows(
         IOException.class,
-        () -> storageConnector.pathExists(TEST_FILE)
+        () -> unauthorizedStorageConnector.pathExists(TEST_FILE)
     );
-    Assert.assertEquals(BUCKET, request.getValue().getBucketName());
-    Assert.assertEquals(PREFIX + "/" + TEST_FILE, request.getValue().getKey());
-    MatcherAssert.assertThat(e2, ThrowableCauseMatcher.hasCause(CoreMatchers.instanceOf(AmazonS3Exception.class)));
-    EasyMock.verify(s3Client);
+    Assertions.assertEquals(AmazonS3Exception.class, e2.getCause().getClass());
+    AmazonS3Exception amazonS3Exception = (AmazonS3Exception) e2.getCause();
+    Assertions.assertEquals(403, amazonS3Exception.getStatusCode());
   }
 
   @Test
   public void pathRead() throws IOException
   {
-    EasyMock.reset(s3Client);
-    ObjectMetadata objectMetadata = new ObjectMetadata();
-    long contentLength = "test".getBytes(StandardCharsets.UTF_8).length;
-    objectMetadata.setContentLength(contentLength);
-    S3Object s3Object = new S3Object();
-    s3Object.setObjectContent(new ByteArrayInputStream("test".getBytes(StandardCharsets.UTF_8)));
-    EasyMock.expect(s3Client.getObjectMetadata(EasyMock.anyObject())).andReturn(objectMetadata);
-    EasyMock.expect(s3Client.getObject(
-        new GetObjectRequest(BUCKET, PREFIX + "/" + TEST_FILE).withRange(0, contentLength - 1))
-    ).andReturn(s3Object);
-    EasyMock.replay(s3Client);
-
-    String readText = new BufferedReader(
-        new InputStreamReader(storageConnector.read(TEST_FILE), StandardCharsets.UTF_8))
-        .lines()
-        .collect(Collectors.joining("\n"));
-
-    Assert.assertEquals("test", readText);
-    EasyMock.reset(s3Client);
+    try (OutputStream outputStream = storageConnector.write("readWrite1")) {
+      outputStream.write("test".getBytes(StandardCharsets.UTF_8));
+    }
+    try (InputStream inputStream = storageConnector.read("readWrite1")) {
+      byte[] bytes = inputStream.readAllBytes();
+      Assertions.assertEquals("test", new String(bytes, StandardCharsets.UTF_8));
+    }
   }
 
   @Test
@@ -180,139 +167,175 @@ public void testReadRange() throws IOException
   {
     String data = "test";
 
+    try (OutputStream outputStream = storageConnector.write("readWrite2")) {
+      outputStream.write(data.getBytes(StandardCharsets.UTF_8));
+    }
+
     // non empty reads
     for (int start = 0; start < data.length(); start++) {
       for (int length = 1; length <= data.length() - start; length++) {
         String dataQueried = data.substring(start, start + length);
-        EasyMock.reset(s3Client);
-        S3Object s3Object = new S3Object();
-        s3Object.setObjectContent(
-            new ByteArrayInputStream(dataQueried.getBytes(StandardCharsets.UTF_8))
-        );
-        EasyMock.expect(
-            s3Client.getObject(
-                new GetObjectRequest(BUCKET, PREFIX + "/" + TEST_FILE).withRange(start, start + length - 1)
-            )
-        ).andReturn(s3Object);
-        EasyMock.replay(s3Client);
-
-        InputStream is = storageConnector.readRange(TEST_FILE, start, length);
-        byte[] dataBytes = new byte[length];
-        Assert.assertEquals(length, is.read(dataBytes));
-        Assert.assertEquals(-1, is.read()); // reading further produces no data
-        Assert.assertEquals(dataQueried, new String(dataBytes, StandardCharsets.UTF_8));
-        EasyMock.reset(s3Client);
+        try (InputStream inputStream = storageConnector.readRange("readWrite2", start, length)) {
+          byte[] bytes = inputStream.readAllBytes();
+          Assertions.assertEquals(dataQueried, new String(bytes, StandardCharsets.UTF_8));
+        }
       }
     }
 
     // empty read
-    EasyMock.reset(s3Client);
-    S3Object s3Object = new S3Object();
-    s3Object.setObjectContent(
-        new ByteArrayInputStream("".getBytes(StandardCharsets.UTF_8))
-    );
-    EasyMock.expect(
-        s3Client.getObject(
-            new GetObjectRequest(BUCKET, PREFIX + "/" + TEST_FILE).withRange(0, -1)
-        )
-    ).andReturn(s3Object);
-    EasyMock.replay(s3Client);
-
-    InputStream is = storageConnector.readRange(TEST_FILE, 0, 0);
-    byte[] dataBytes = new byte[0];
-    Assert.assertEquals(is.read(dataBytes), -1);
-    Assert.assertEquals("", new String(dataBytes, StandardCharsets.UTF_8));
-    EasyMock.reset(s3Client);
+    try (InputStream inputStream = storageConnector.readRange("readWrite2", 0, 0)) {
+      byte[] bytes = inputStream.readAllBytes();
+      Assertions.assertEquals("", new String(bytes, StandardCharsets.UTF_8));
+    }
   }
 
   @Test
   public void testDeleteSinglePath() throws IOException
   {
-    EasyMock.reset(s3Client);
-    s3Client.deleteObject(BUCKET, PREFIX + "/" + TEST_FILE);
-    EasyMock.expectLastCall();
-    storageConnector.deleteFile(TEST_FILE);
-    EasyMock.reset(s3Client);
+    String deleteFolderName = UUID.randomUUID().toString();
+    try (OutputStream outputStream = storageConnector.write(StringUtils.format("%s/deleteSingle", deleteFolderName))) {
+      outputStream.write("delete".getBytes(StandardCharsets.UTF_8));
+    }
+
+    ArrayList<String> listResult = new ArrayList<>();
+    storageConnector.listDir(deleteFolderName + "/").forEachRemaining(listResult::add);
+    Assertions.assertEquals(1, listResult.size());
+    Assertions.assertEquals("deleteSingle", listResult.get(0));
+    storageConnector.deleteFile(StringUtils.format("%s/deleteSingle", deleteFolderName));
+
+    listResult.clear();
+    storageConnector.listDir(deleteFolderName + "/").forEachRemaining(listResult::add);
+    Assertions.assertEquals(0, listResult.size());
   }
 
   @Test
   public void testDeleteMultiplePaths() throws IOException
   {
-    EasyMock.reset(s3Client);
-    String testFile2 = "file2";
-    DeleteObjectsRequest deleteObjectsRequest = new DeleteObjectsRequest(BUCKET);
-    deleteObjectsRequest.withKeys(PREFIX + "/" + TEST_FILE, PREFIX + "/" + testFile2);
-    Capture<DeleteObjectsRequest> capturedArgument = EasyMock.newCapture();
-
-    EasyMock.expect(s3Client.deleteObjects(EasyMock.capture(capturedArgument))).andReturn(null).once();
-    EasyMock.replay(s3Client);
-    storageConnector.deleteFiles(Lists.newArrayList(TEST_FILE, testFile2));
-
-    Assert.assertEquals(
-        convertDeleteObjectsRequestToString(deleteObjectsRequest),
-        convertDeleteObjectsRequestToString(capturedArgument.getValue())
-    );
-    EasyMock.reset(s3Client);
+    String deleteFolderName = UUID.randomUUID().toString();
+    try (OutputStream outputStream = storageConnector.write(StringUtils.format("%s/deleteFirst", deleteFolderName))) {
+      outputStream.write("first".getBytes(StandardCharsets.UTF_8));
+    }
+    try (OutputStream outputStream = storageConnector.write(StringUtils.format("%s/deleteSecond", deleteFolderName))) {
+      outputStream.write("second".getBytes(StandardCharsets.UTF_8));
+    }
+
+    ArrayList<String> listResult = new ArrayList<>();
+    storageConnector.listDir(deleteFolderName + "/").forEachRemaining(listResult::add);
+    Assertions.assertEquals(2, listResult.size());
+    Assertions.assertEquals("deleteFirst", listResult.get(0));
+    Assertions.assertEquals("deleteSecond", listResult.get(1));
+
+    storageConnector.deleteFiles(ImmutableList.of(
+        StringUtils.format("%s/deleteFirst", deleteFolderName),
+        StringUtils.format("%s/deleteSecond", deleteFolderName)
+    ));
+
+    listResult.clear();
+    storageConnector.listDir(deleteFolderName + "/").forEachRemaining(listResult::add);
+    Assertions.assertEquals(0, listResult.size());
   }
 
   @Test
   public void testPathDeleteRecursively() throws IOException
   {
-    EasyMock.reset(s3Client, testResult);
-
-    S3ObjectSummary s3ObjectSummary = new S3ObjectSummary();
-    s3ObjectSummary.setBucketName(BUCKET);
-    s3ObjectSummary.setKey(PREFIX + "/test/" + TEST_FILE);
-    s3ObjectSummary.setSize(1);
-    EasyMock.expect(s3Client.listObjectsV2((ListObjectsV2Request) EasyMock.anyObject()))
-            .andReturn(testResult);
-
-    EasyMock.expect(testResult.getBucketName()).andReturn("123").anyTimes();
-    EasyMock.expect(testResult.getObjectSummaries()).andReturn(Collections.singletonList(s3ObjectSummary)).anyTimes();
-    EasyMock.expect(testResult.isTruncated()).andReturn(false).times(1);
-    EasyMock.expect(testResult.getNextContinuationToken()).andReturn(null);
-
-    Capture<DeleteObjectsRequest> capturedArgument = EasyMock.newCapture();
-    EasyMock.expect(s3Client.deleteObjects(EasyMock.and(
-        EasyMock.capture(capturedArgument),
-        EasyMock.isA(DeleteObjectsRequest.class)
-    ))).andReturn(null);
-    EasyMock.replay(s3Client, testResult);
-
-    storageConnector.deleteRecursively("test");
-
-    Assert.assertEquals(1, capturedArgument.getValue().getKeys().size());
-    Assert.assertEquals(PREFIX + "/test/" + TEST_FILE, capturedArgument.getValue().getKeys().get(0).getKey());
-    EasyMock.reset(s3Client, testResult);
+    String deleteFolderName = UUID.randomUUID().toString();
+    try (OutputStream outputStream = storageConnector.write(StringUtils.format("%s/deleteFirst", deleteFolderName))) {
+      outputStream.write("first".getBytes(StandardCharsets.UTF_8));
+    }
+    try (OutputStream outputStream = storageConnector.write(StringUtils.format("%s/inner/deleteSecond", deleteFolderName))) {
+      outputStream.write("second".getBytes(StandardCharsets.UTF_8));
+    }
+
+    ArrayList<String> listResult = new ArrayList<>();
+    storageConnector.listDir(deleteFolderName + "/").forEachRemaining(listResult::add);
+    Assertions.assertEquals(2, listResult.size());
+    Assertions.assertEquals("deleteFirst", listResult.get(0));
+    Assertions.assertEquals("inner/deleteSecond", listResult.get(1));
+
+    storageConnector.deleteRecursively(deleteFolderName);
+
+    listResult.clear();
+    storageConnector.listDir(deleteFolderName + "/").forEachRemaining(listResult::add);
+    Assertions.assertEquals(0, listResult.size());
   }
 
   @Test
   public void testListDir() throws IOException
   {
-    EasyMock.reset(s3Client, testResult);
-
-    S3ObjectSummary s3ObjectSummary = new S3ObjectSummary();
-    s3ObjectSummary.setBucketName(BUCKET);
-    s3ObjectSummary.setKey(PREFIX + "/test/" + TEST_FILE);
-    s3ObjectSummary.setSize(1);
-
-    EasyMock.expect(testResult.getObjectSummaries()).andReturn(Collections.singletonList(s3ObjectSummary)).times(2);
-    EasyMock.expect(testResult.isTruncated()).andReturn(false);
-    EasyMock.expect(testResult.getNextContinuationToken()).andReturn(null);
-    EasyMock.expect(s3Client.listObjectsV2((ListObjectsV2Request) EasyMock.anyObject()))
-            .andReturn(testResult);
-    EasyMock.replay(s3Client, testResult);
-
-    List<String> listDirResult = Lists.newArrayList(storageConnector.listDir("test/"));
-    Assert.assertEquals(ImmutableList.of(TEST_FILE), listDirResult);
+    String listFolderName = UUID.randomUUID().toString();
+    try (OutputStream outputStream = storageConnector.write(StringUtils.format("%s/listFirst", listFolderName))) {
+      outputStream.write("first".getBytes(StandardCharsets.UTF_8));
+    }
+    List<String> listDirResult = Lists.newArrayList(storageConnector.listDir(listFolderName + "/"));
+    Assertions.assertEquals(ImmutableList.of("listFirst"), listDirResult);
   }
 
-  private String convertDeleteObjectsRequestToString(DeleteObjectsRequest deleteObjectsRequest)
+  // adapted from apache iceberg tests
+  private static class MinioUtil
   {
-    return deleteObjectsRequest.getKeys()
-                               .stream()
-                               .map(keyVersion -> keyVersion.getKey() + keyVersion.getVersion())
-                               .collect(
-                                   Collectors.joining());
+    private MinioUtil()
+    {
+    }
+
+    public static MinIOContainer createContainer()
+    {
+      return createContainer(null);
+    }
+
+    public static MinIOContainer createContainer(AWSCredentials credentials)
+    {
+      MinIOContainer container = new MinIOContainer(DockerImageName.parse("minio/minio:latest"));
+
+      // this enables virtual-host-style requests. see
+      // https://github.com/minio/minio/tree/master/docs/config#domain
+      container.withEnv("MINIO_DOMAIN", "localhost");
+
+      if (credentials != null) {
+        container.withUserName(credentials.getAWSAccessKeyId());
+        container.withPassword(credentials.getAWSSecretKey());
+      }
+
+      return container;
+    }
+
+    public static ServerSideEncryptingAmazonS3 createS3Client(MinIOContainer container)
+    {
+      final AmazonS3ClientBuilder amazonS3ClientBuilder = AmazonS3Client
+          .builder()
+          .withEndpointConfiguration(
+              new AwsClientBuilder.EndpointConfiguration(
+                  container.getS3URL(),
+                  "us-east-1"
+              )
+          )
+          .withCredentials(new StaticCredentialsProvider(
+              new BasicAWSCredentials(container.getUserName(), container.getPassword())))
+          .withClientConfiguration(new ClientConfigurationFactory().getConfig())
+          .withPathStyleAccessEnabled(true); // OSX won't resolve subdomains
+
+      return ServerSideEncryptingAmazonS3.builder()
+                                         .setAmazonS3ClientBuilder(amazonS3ClientBuilder)
+                                         .build();
+    }
+
+    public static ServerSideEncryptingAmazonS3 createUnauthorizedS3Client(MinIOContainer container)
+    {
+      final AmazonS3ClientBuilder amazonS3ClientBuilder = AmazonS3Client
+          .builder()
+          .withEndpointConfiguration(
+              new AwsClientBuilder.EndpointConfiguration(
+                  container.getS3URL(),
+                  "us-east-1"
+              )
+          )
+          .withCredentials(new StaticCredentialsProvider(
+              new BasicAWSCredentials(container.getUserName(), "wrong")))
+          .withClientConfiguration(new ClientConfigurationFactory().getConfig())
+          .withPathStyleAccessEnabled(true); // OSX won't resolve subdomains
+
+      return ServerSideEncryptingAmazonS3.builder()
+                                         .setAmazonS3ClientBuilder(amazonS3ClientBuilder)
+                                         .build();
+    }
   }
 }
diff --git a/pom.xml b/pom.xml
index ac9b91d23d0b..3ee7600d5437 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1403,6 +1403,18 @@
               <artifactId>joni</artifactId>
               <version>2.1.34</version>
           </dependency>
+            <dependency>
+                <groupId>org.testcontainers</groupId>
+                <artifactId>testcontainers</artifactId>
+                <version>1.16.3</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.testcontainers</groupId>
+                <artifactId>junit-jupiter</artifactId>
+                <version>1.16.3</version>
+                <scope>test</scope>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
@@ -2257,5 +2269,8 @@
             <jacoco.skip>true</jacoco.skip>
           </properties>
         </profile>
+        <profile>
+            <id>ci</id>
+        </profile>
     </profiles>
 </project>

From 80d2cd36321ffc61026ccb94263d17c8a0fe7a10 Mon Sep 17 00:00:00 2001
From: Clint Wylie <cwylie@apache.org>
Date: Mon, 9 Dec 2024 08:44:54 -0800
Subject: [PATCH 20/56] snapshot column capabilities for realtime cursors
 (#17386)

* snapshot column capabilities for realtime cursors

changes:
* adds `CursorBuildSpec.getPhysicalColumns()` to allow specifying the set of required physical columns from a segment. if null, all columns are assumed to be required (e.g. full scan)
* `IncrementalIndexCursorFactory`/`IncrementalIndexCursorHolder` uses the physical columns from the cursor build spec to know which set of dimensions to 'snapshot' the capabilities for, allowing expression selectors on realtime queries to no longer be required to treat selectors from `StringDimensionIndexer` as multi-valued unless they truly are multi-valued. this fixes several bugs with expressions on realtime queries that change a value from `StringDimensionIndexer` to some type other than string, which would often result in a single element array from the column being handled as multi-valued
* `StringDimensionIndexer.setSparseIndexed()` now adds the default value to the dictionary when set
* `StringDimensionIndexer` column value selectors now always report that they are dictionary encoded, and that name lookup is possible in advance on their selectors (since set sparse adds the null value so the cardinality is correct)
* fixed a mistake that expression selectors for realtime queries with no null values could not use dictionary encoded selectors

* hmm

* test changes

* cleanup

* add test coverage

* fix test

* fixes

* cleanup
---
 .../segment/MapVirtualColumnTestBase.java     |    2 +-
 .../druid/query/groupby/GroupingEngine.java   |    1 +
 .../druid/query/scan/ScanQueryEngine.java     |    1 +
 .../query/search/CursorOnlyStrategy.java      |    1 +
 .../TimeBoundaryQueryRunnerFactory.java       |    1 +
 .../timeseries/TimeseriesQueryEngine.java     |    1 +
 .../druid/query/topn/TopNQueryEngine.java     |    1 +
 .../segment/AggregateProjectionMetadata.java  |   16 +-
 .../ColumnSelectorColumnIndexSelector.java    |    2 +-
 .../apache/druid/segment/CursorBuildSpec.java |   57 +-
 .../DictionaryEncodedColumnIndexer.java       |   16 +-
 .../druid/segment/FilteredCursorFactory.java  |   31 +-
 .../druid/segment/StringDimensionIndexer.java |  155 +--
 .../druid/segment/UnnestCursorFactory.java    |   25 +
 ...IncrementalIndexColumnSelectorFactory.java |   44 +-
 .../IncrementalIndexCursorFactory.java        |   25 +-
 .../IncrementalIndexCursorHolder.java         |    9 +-
 ...rementalIndexPhysicalSegmentInspector.java |    2 +-
 .../IncrementalIndexRowIterator.java          |    4 +-
 .../join/HashJoinSegmentCursorFactory.java    |   44 +
 .../segment/join/JoinConditionAnalysis.java   |   69 +-
 .../segment/join/JoinableFactoryWrapper.java  |   10 +-
 .../segment/projections/Projections.java      |   13 +
 .../druid/query/NestedDataTestUtils.java      |   17 +-
 .../druid/query/QueryRunnerTestHelper.java    |   19 +-
 .../first/StringFirstTimeseriesQueryTest.java |    2 +-
 .../last/StringLastTimeseriesQueryTest.java   |    2 +-
 .../aggregation/mean/SimpleTestIndex.java     |    2 +-
 .../query/metadata/SegmentAnalyzerTest.java   |   19 +-
 .../metadata/SegmentMetadataQueryTest.java    |    2 +-
 .../query/scan/MultiSegmentScanQueryTest.java |    4 +-
 .../query/scan/NestedDataScanQueryTest.java   |   31 +-
 .../query/search/SearchQueryRunnerTest.java   |    2 +-
 .../search/SearchQueryRunnerWithCaseTest.java |    8 +-
 .../TimeBoundaryQueryRunnerTest.java          |    4 +-
 .../segment/CustomSegmentizerFactoryTest.java |    4 +-
 .../druid/segment/SchemalessIndexTest.java    |    2 +-
 .../segment/SchemalessTestSimpleTest.java     |    2 +-
 .../org/apache/druid/segment/TestHelper.java  |    3 +
 .../org/apache/druid/segment/TestIndex.java   |  305 +++--
 .../segment/UnnestCursorFactoryTest.java      |    2 +-
 .../IncrementalIndexCursorFactoryTest.java    |   16 +-
 .../BroadcastSegmentIndexedTableTest.java     |    2 +-
 ...MappedQueryableSegmentizerFactoryTest.java |    2 +-
 .../NestedFieldColumnSelectorsTest.java       |    5 +-
 .../virtual/ExpressionSelectorsTest.java      |   46 +-
 .../druid.sample.numeric.bottom.json          |  732 ++++++++++
 .../test/resources/druid.sample.numeric.json  | 1209 +++++++++++++++++
 .../resources/druid.sample.numeric.top.json   |  477 +++++++
 .../quidem/KttmNestedComponentSupplier.java   |    3 +-
 ...tManagerBroadcastJoinIndexedTableTest.java |   10 +-
 .../org/apache/druid/cli/DumpSegmentTest.java |    3 +-
 52 files changed, 3041 insertions(+), 424 deletions(-)
 create mode 100644 processing/src/test/resources/druid.sample.numeric.bottom.json
 create mode 100644 processing/src/test/resources/druid.sample.numeric.json
 create mode 100644 processing/src/test/resources/druid.sample.numeric.top.json

diff --git a/extensions-contrib/virtual-columns/src/test/java/org/apache/druid/segment/MapVirtualColumnTestBase.java b/extensions-contrib/virtual-columns/src/test/java/org/apache/druid/segment/MapVirtualColumnTestBase.java
index 29270c0df734..c236ecb45ae0 100644
--- a/extensions-contrib/virtual-columns/src/test/java/org/apache/druid/segment/MapVirtualColumnTestBase.java
+++ b/extensions-contrib/virtual-columns/src/test/java/org/apache/druid/segment/MapVirtualColumnTestBase.java
@@ -62,7 +62,7 @@ static IncrementalIndex generateIndex() throws IOException
         .withMinTimestamp(DateTimes.of("2011-01-12T00:00:00.000Z").getMillis())
         .build();
 
-    return TestIndex.loadIncrementalIndex(
+    return TestIndex.loadIncrementalIndexFromCharSource(
         () -> new OnheapIncrementalIndex.Builder()
             .setIndexSchema(schema)
             .setMaxRowCount(10000)
diff --git a/processing/src/main/java/org/apache/druid/query/groupby/GroupingEngine.java b/processing/src/main/java/org/apache/druid/query/groupby/GroupingEngine.java
index 9d1b6132897a..5dc995b55386 100644
--- a/processing/src/main/java/org/apache/druid/query/groupby/GroupingEngine.java
+++ b/processing/src/main/java/org/apache/druid/query/groupby/GroupingEngine.java
@@ -869,6 +869,7 @@ public static CursorBuildSpec makeCursorBuildSpec(GroupByQuery query, @Nullable
                        .setInterval(query.getSingleInterval())
                        .setFilter(Filters.convertToCNFFromQueryContext(query, Filters.toFilter(query.getFilter())))
                        .setVirtualColumns(query.getVirtualColumns())
+                       .setPhysicalColumns(query.getRequiredColumns())
                        .setGroupingColumns(query.getGroupingColumns())
                        .setAggregators(query.getAggregatorSpecs())
                        .setQueryContext(query.context())
diff --git a/processing/src/main/java/org/apache/druid/query/scan/ScanQueryEngine.java b/processing/src/main/java/org/apache/druid/query/scan/ScanQueryEngine.java
index a24dc78468bd..0286b7b9886f 100644
--- a/processing/src/main/java/org/apache/druid/query/scan/ScanQueryEngine.java
+++ b/processing/src/main/java/org/apache/druid/query/scan/ScanQueryEngine.java
@@ -258,6 +258,7 @@ public static CursorBuildSpec makeCursorBuildSpec(ScanQuery query, @Nullable Que
                           .setInterval(query.getSingleInterval())
                           .setFilter(Filters.convertToCNFFromQueryContext(query, Filters.toFilter(query.getFilter())))
                           .setVirtualColumns(query.getVirtualColumns())
+                          .setPhysicalColumns(query.getRequiredColumns())
                           .setPreferredOrdering(query.getOrderBys())
                           .setQueryContext(query.context())
                           .setQueryMetrics(queryMetrics)
diff --git a/processing/src/main/java/org/apache/druid/query/search/CursorOnlyStrategy.java b/processing/src/main/java/org/apache/druid/query/search/CursorOnlyStrategy.java
index 01ad04e7aa8a..a3bd29059940 100644
--- a/processing/src/main/java/org/apache/druid/query/search/CursorOnlyStrategy.java
+++ b/processing/src/main/java/org/apache/druid/query/search/CursorOnlyStrategy.java
@@ -85,6 +85,7 @@ public Object2IntRBTreeMap<SearchHit> execute(final int limit)
                                                            )
                                                        )
                                                        .setVirtualColumns(query.getVirtualColumns())
+                                                       .setPhysicalColumns(query.getRequiredColumns())
                                                        .setQueryContext(query.context())
                                                        .build();
       try (final CursorHolder cursorHolder = adapter.makeCursorHolder(buildSpec)) {
diff --git a/processing/src/main/java/org/apache/druid/query/timeboundary/TimeBoundaryQueryRunnerFactory.java b/processing/src/main/java/org/apache/druid/query/timeboundary/TimeBoundaryQueryRunnerFactory.java
index f90ff67615e6..a5d8fa027d43 100644
--- a/processing/src/main/java/org/apache/druid/query/timeboundary/TimeBoundaryQueryRunnerFactory.java
+++ b/processing/src/main/java/org/apache/druid/query/timeboundary/TimeBoundaryQueryRunnerFactory.java
@@ -206,6 +206,7 @@ public static CursorBuildSpec makeCursorBuildSpec(TimeBoundaryQuery query)
                           .setInterval(query.getSingleInterval())
                           .setFilter(Filters.convertToCNFFromQueryContext(query, Filters.toFilter(query.getFilter())))
                           .setVirtualColumns(query.getVirtualColumns())
+                          .setPhysicalColumns(query.getRequiredColumns())
                           .setQueryContext(query.context())
                           .build();
   }
diff --git a/processing/src/main/java/org/apache/druid/query/timeseries/TimeseriesQueryEngine.java b/processing/src/main/java/org/apache/druid/query/timeseries/TimeseriesQueryEngine.java
index 4d4fe7f571ac..45872514b2e0 100644
--- a/processing/src/main/java/org/apache/druid/query/timeseries/TimeseriesQueryEngine.java
+++ b/processing/src/main/java/org/apache/druid/query/timeseries/TimeseriesQueryEngine.java
@@ -333,6 +333,7 @@ public static CursorBuildSpec makeCursorBuildSpec(TimeseriesQuery query, @Nullab
                        .setInterval(query.getSingleInterval())
                        .setFilter(Filters.convertToCNFFromQueryContext(query, Filters.toFilter(query.getFilter())))
                        .setVirtualColumns(query.getVirtualColumns())
+                       .setPhysicalColumns(query.getRequiredColumns())
                        .setAggregators(query.getAggregatorSpecs())
                        .setQueryContext(query.context())
                        .setPreferredOrdering(
diff --git a/processing/src/main/java/org/apache/druid/query/topn/TopNQueryEngine.java b/processing/src/main/java/org/apache/druid/query/topn/TopNQueryEngine.java
index 202a852c2be0..1382c9aaa4b7 100644
--- a/processing/src/main/java/org/apache/druid/query/topn/TopNQueryEngine.java
+++ b/processing/src/main/java/org/apache/druid/query/topn/TopNQueryEngine.java
@@ -297,6 +297,7 @@ public static CursorBuildSpec makeCursorBuildSpec(TopNQuery query, @Nullable Que
                        .setFilter(Filters.convertToCNFFromQueryContext(query, Filters.toFilter(query.getFilter())))
                        .setGroupingColumns(Collections.singletonList(query.getDimensionSpec().getDimension()))
                        .setVirtualColumns(query.getVirtualColumns())
+                       .setPhysicalColumns(query.getRequiredColumns())
                        .setAggregators(query.getAggregatorSpecs())
                        .setQueryContext(query.context())
                        .setQueryMetrics(queryMetrics)
diff --git a/processing/src/main/java/org/apache/druid/segment/AggregateProjectionMetadata.java b/processing/src/main/java/org/apache/druid/segment/AggregateProjectionMetadata.java
index cfd83fcbb0b4..d40f9299355a 100644
--- a/processing/src/main/java/org/apache/druid/segment/AggregateProjectionMetadata.java
+++ b/processing/src/main/java/org/apache/druid/segment/AggregateProjectionMetadata.java
@@ -292,12 +292,13 @@ public Projections.ProjectionMatch matches(
       if (!queryCursorBuildSpec.isCompatibleOrdering(orderingWithTimeSubstitution)) {
         return null;
       }
-      final List<String> queryGrouping = queryCursorBuildSpec.getGroupingColumns();
       Projections.ProjectionMatchBuilder matchBuilder = new Projections.ProjectionMatchBuilder();
 
       if (timeColumnName != null) {
-        matchBuilder.remapColumn(timeColumnName, ColumnHolder.TIME_COLUMN_NAME);
+        matchBuilder.remapColumn(timeColumnName, ColumnHolder.TIME_COLUMN_NAME)
+                    .addReferencedPhysicalColumn(ColumnHolder.TIME_COLUMN_NAME);
       }
+      final List<String> queryGrouping = queryCursorBuildSpec.getGroupingColumns();
       if (queryGrouping != null) {
         for (String queryColumn : queryGrouping) {
           matchBuilder = matchRequiredColumn(
@@ -331,7 +332,9 @@ public Projections.ProjectionMatch matches(
           for (AggregatorFactory projectionAgg : aggregators) {
             final AggregatorFactory combining = queryAgg.substituteCombiningFactory(projectionAgg);
             if (combining != null) {
-              matchBuilder.remapColumn(queryAgg.getName(), projectionAgg.getName()).addPreAggregatedAggregator(combining);
+              matchBuilder.remapColumn(queryAgg.getName(), projectionAgg.getName())
+                          .addReferencedPhysicalColumn(projectionAgg.getName())
+                          .addPreAggregatedAggregator(combining);
               foundMatch = true;
               break;
             }
@@ -388,7 +391,7 @@ private Projections.ProjectionMatchBuilder matchRequiredColumn(
                 projectionEquivalent.getOutputName()
             );
           }
-          return matchBuilder;
+          return matchBuilder.addReferencedPhysicalColumn(projectionEquivalent.getOutputName());
         }
 
         matchBuilder.addReferenceedVirtualColumn(buildSpecVirtualColumn);
@@ -401,7 +404,8 @@ private Projections.ProjectionMatchBuilder matchRequiredColumn(
             if (virtualGranularity.isFinerThan(granularity)) {
               return null;
             }
-            return matchBuilder.remapColumn(column, timeColumnName);
+            return matchBuilder.remapColumn(column, ColumnHolder.TIME_COLUMN_NAME)
+                               .addReferencedPhysicalColumn(ColumnHolder.TIME_COLUMN_NAME);
           } else {
             // anything else with __time requires none granularity
             if (Granularities.NONE.equals(granularity)) {
@@ -425,7 +429,7 @@ private Projections.ProjectionMatchBuilder matchRequiredColumn(
         }
       } else {
         if (physicalColumnChecker.check(name, column)) {
-          return matchBuilder;
+          return matchBuilder.addReferencedPhysicalColumn(column);
         }
         return null;
       }
diff --git a/processing/src/main/java/org/apache/druid/segment/ColumnSelectorColumnIndexSelector.java b/processing/src/main/java/org/apache/druid/segment/ColumnSelectorColumnIndexSelector.java
index b509d8d1a8bc..93b0d7412ee0 100644
--- a/processing/src/main/java/org/apache/druid/segment/ColumnSelectorColumnIndexSelector.java
+++ b/processing/src/main/java/org/apache/druid/segment/ColumnSelectorColumnIndexSelector.java
@@ -109,6 +109,6 @@ public ColumnCapabilities getColumnCapabilities(String column)
 
   private boolean isVirtualColumn(final String columnName)
   {
-    return virtualColumns.getVirtualColumn(columnName) != null;
+    return virtualColumns.exists(columnName);
   }
 }
diff --git a/processing/src/main/java/org/apache/druid/segment/CursorBuildSpec.java b/processing/src/main/java/org/apache/druid/segment/CursorBuildSpec.java
index d4f6a47b05dd..da1cd06b9b00 100644
--- a/processing/src/main/java/org/apache/druid/segment/CursorBuildSpec.java
+++ b/processing/src/main/java/org/apache/druid/segment/CursorBuildSpec.java
@@ -32,6 +32,7 @@
 import javax.annotation.Nullable;
 import java.util.Collections;
 import java.util.List;
+import java.util.Set;
 
 public class CursorBuildSpec
 {
@@ -61,14 +62,18 @@ public static CursorBuildSpecBuilder builder(CursorBuildSpec spec)
 
   private final boolean isAggregate;
 
+  @Nullable
+  private final Set<String> physicalColumns;
+
   @Nullable
   private final QueryMetrics<?> queryMetrics;
 
   public CursorBuildSpec(
       @Nullable Filter filter,
       Interval interval,
-      @Nullable List<String> groupingColumns,
+      @Nullable Set<String> physicalColumns,
       VirtualColumns virtualColumns,
+      @Nullable List<String> groupingColumns,
       @Nullable List<AggregatorFactory> aggregators,
       List<OrderBy> preferredOrdering,
       QueryContext queryContext,
@@ -77,8 +82,9 @@ public CursorBuildSpec(
   {
     this.filter = filter;
     this.interval = Preconditions.checkNotNull(interval, "interval");
-    this.groupingColumns = groupingColumns;
     this.virtualColumns = Preconditions.checkNotNull(virtualColumns, "virtualColumns");
+    this.physicalColumns = physicalColumns;
+    this.groupingColumns = groupingColumns;
     this.aggregators = aggregators;
     this.preferredOrdering = Preconditions.checkNotNull(preferredOrdering, "preferredOrdering");
     this.queryContext = Preconditions.checkNotNull(queryContext, "queryContext");
@@ -107,14 +113,13 @@ public Interval getInterval()
   }
 
   /**
-   * Any columns which will be used for grouping by a query engine for the {@link CursorHolder}, useful for
-   * specializing the {@link Cursor} or {@link org.apache.druid.segment.vector.VectorCursor} if any pre-aggregated
-   * data is available.
+   * Set of physical columns required from a cursor. If null, and {@link #groupingColumns} is null or empty and
+   * {@link #aggregators} is null or empty, then a {@link CursorHolder} must assume that ALL columns are required
    */
   @Nullable
-  public List<String> getGroupingColumns()
+  public Set<String> getPhysicalColumns()
   {
-    return groupingColumns;
+    return physicalColumns;
   }
 
   /**
@@ -126,6 +131,17 @@ public VirtualColumns getVirtualColumns()
     return virtualColumns;
   }
 
+  /**
+   * Any columns which will be used for grouping by a query engine for the {@link CursorHolder}, useful for
+   * specializing the {@link Cursor} or {@link org.apache.druid.segment.vector.VectorCursor} if any pre-aggregated
+   * data is available.
+   */
+  @Nullable
+  public List<String> getGroupingColumns()
+  {
+    return groupingColumns;
+  }
+
   /**
    * Any {@link AggregatorFactory} which will be used by a query engine for the {@link CursorHolder}, useful
    * to assist in determining if {@link CursorHolder#canVectorize()}, as well as specializing the {@link Cursor} or
@@ -208,10 +224,12 @@ public static class CursorBuildSpecBuilder
     @Nullable
     private Filter filter;
     private Interval interval = Intervals.ETERNITY;
+    private VirtualColumns virtualColumns = VirtualColumns.EMPTY;
+    @Nullable
+    private Set<String> physicalColumns;
 
     @Nullable
     private List<String> groupingColumns;
-    private VirtualColumns virtualColumns = VirtualColumns.EMPTY;
     @Nullable
     private List<AggregatorFactory> aggregators;
     private List<OrderBy> preferredOrdering = Collections.emptyList();
@@ -229,8 +247,9 @@ private CursorBuildSpecBuilder(CursorBuildSpec buildSpec)
     {
       this.filter = buildSpec.filter;
       this.interval = buildSpec.interval;
-      this.groupingColumns = buildSpec.groupingColumns;
+      this.physicalColumns = buildSpec.physicalColumns;
       this.virtualColumns = buildSpec.virtualColumns;
+      this.groupingColumns = buildSpec.groupingColumns;
       this.aggregators = buildSpec.aggregators;
       this.preferredOrdering = buildSpec.preferredOrdering;
       this.queryContext = buildSpec.queryContext;
@@ -256,13 +275,11 @@ public CursorBuildSpecBuilder setInterval(Interval interval)
     }
 
     /**
-     * @see CursorBuildSpec#getGroupingColumns()
+     * @see CursorBuildSpec#getPhysicalColumns()
      */
-    public CursorBuildSpecBuilder setGroupingColumns(
-        @Nullable List<String> groupingColumns
-    )
+    public CursorBuildSpecBuilder setPhysicalColumns(@Nullable Set<String> physicalColumns)
     {
-      this.groupingColumns = groupingColumns;
+      this.physicalColumns = physicalColumns;
       return this;
     }
 
@@ -275,6 +292,15 @@ public CursorBuildSpecBuilder setVirtualColumns(VirtualColumns virtualColumns)
       return this;
     }
 
+    /**
+     * @see CursorBuildSpec#getGroupingColumns()
+     */
+    public CursorBuildSpecBuilder setGroupingColumns(@Nullable List<String> groupingColumns)
+    {
+      this.groupingColumns = groupingColumns;
+      return this;
+    }
+
     /**
      * @see CursorBuildSpec#getAggregators()
      */
@@ -316,8 +342,9 @@ public CursorBuildSpec build()
       return new CursorBuildSpec(
           filter,
           interval,
-          groupingColumns,
+          physicalColumns,
           virtualColumns,
+          groupingColumns,
           aggregators,
           preferredOrdering,
           queryContext,
diff --git a/processing/src/main/java/org/apache/druid/segment/DictionaryEncodedColumnIndexer.java b/processing/src/main/java/org/apache/druid/segment/DictionaryEncodedColumnIndexer.java
index 5b51a29ce6a1..9a4d41ca10bf 100644
--- a/processing/src/main/java/org/apache/druid/segment/DictionaryEncodedColumnIndexer.java
+++ b/processing/src/main/java/org/apache/druid/segment/DictionaryEncodedColumnIndexer.java
@@ -58,7 +58,10 @@ public DictionaryEncodedColumnIndexer(@NotNull DimensionDictionary<ActualType> d
   @Override
   public void setSparseIndexed()
   {
-    isSparse = true;
+    if (!isSparse) {
+      dimLookup.add(null);
+      isSparse = true;
+    }
   }
 
   public int getSortedEncodedValueFromUnsorted(Integer unsortedIntermediateValue)
@@ -227,17 +230,6 @@ public Class classOfObject()
     return new SortedDimensionSelector();
   }
 
-  /**
-   * returns true if all values are encoded in {@link #dimLookup}
-   */
-  protected boolean dictionaryEncodesAllValues()
-  {
-    // name lookup is possible in advance if we explicitly process a value for every row, or if we've encountered an
-    // actual null value and it is present in our dictionary. otherwise the dictionary will be missing ids for implicit
-    // null values
-    return !isSparse || dimLookup.getIdForNull() != DimensionDictionary.ABSENT_VALUE_ID;
-  }
-
   protected SortedDimensionDictionary<ActualType> sortedLookup()
   {
     return sortedLookup == null ? sortedLookup = dimLookup.sort() : sortedLookup;
diff --git a/processing/src/main/java/org/apache/druid/segment/FilteredCursorFactory.java b/processing/src/main/java/org/apache/druid/segment/FilteredCursorFactory.java
index b1806f66342d..5a120f7ebb8b 100644
--- a/processing/src/main/java/org/apache/druid/segment/FilteredCursorFactory.java
+++ b/processing/src/main/java/org/apache/druid/segment/FilteredCursorFactory.java
@@ -19,14 +19,16 @@
 
 package org.apache.druid.segment;
 
-import com.google.common.collect.ImmutableList;
 import org.apache.druid.query.filter.DimFilter;
 import org.apache.druid.query.filter.Filter;
 import org.apache.druid.segment.column.ColumnCapabilities;
 import org.apache.druid.segment.column.RowSignature;
-import org.apache.druid.segment.filter.AndFilter;
+import org.apache.druid.segment.filter.Filters;
 
 import javax.annotation.Nullable;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
 
 public class FilteredCursorFactory implements CursorFactory
 {
@@ -45,20 +47,29 @@ public CursorHolder makeCursorHolder(CursorBuildSpec spec)
   {
     final CursorBuildSpec.CursorBuildSpecBuilder buildSpecBuilder = CursorBuildSpec.builder(spec);
     final Filter newFilter;
-    if (spec.getFilter() == null) {
-      if (filter != null) {
+    final Set<String> physicalColumns;
+    if (filter != null) {
+      if (spec.getFilter() == null) {
         newFilter = filter.toFilter();
       } else {
-        newFilter = null;
+        newFilter = Filters.and(Arrays.asList(spec.getFilter(), filter.toFilter()));
       }
-    } else {
-      if (filter != null) {
-        newFilter = new AndFilter(ImmutableList.of(spec.getFilter(), filter.toFilter()));
+      if (spec.getPhysicalColumns() != null) {
+        physicalColumns = new HashSet<>(spec.getPhysicalColumns());
+        for (String column : filter.getRequiredColumns()) {
+          if (!spec.getVirtualColumns().exists(column)) {
+            physicalColumns.add(column);
+          }
+        }
       } else {
-        newFilter = spec.getFilter();
+        physicalColumns = null;
       }
+    } else {
+      newFilter = spec.getFilter();
+      physicalColumns = spec.getPhysicalColumns();
     }
-    buildSpecBuilder.setFilter(newFilter);
+    buildSpecBuilder.setFilter(newFilter)
+                    .setPhysicalColumns(physicalColumns);
     return delegate.makeCursorHolder(buildSpecBuilder.build());
   }
 
diff --git a/processing/src/main/java/org/apache/druid/segment/StringDimensionIndexer.java b/processing/src/main/java/org/apache/druid/segment/StringDimensionIndexer.java
index 46d45024437f..42b1a9ae1f54 100644
--- a/processing/src/main/java/org/apache/druid/segment/StringDimensionIndexer.java
+++ b/processing/src/main/java/org/apache/druid/segment/StringDimensionIndexer.java
@@ -25,6 +25,7 @@
 import org.apache.druid.collections.bitmap.MutableBitmap;
 import org.apache.druid.common.config.NullHandling;
 import org.apache.druid.data.input.impl.DimensionSchema.MultiValueHandling;
+import org.apache.druid.error.DruidException;
 import org.apache.druid.java.util.common.ISE;
 import org.apache.druid.java.util.common.StringUtils;
 import org.apache.druid.java.util.common.guava.Comparators;
@@ -242,6 +243,7 @@ public ColumnCapabilities getColumnCapabilities()
     ColumnCapabilitiesImpl capabilites = new ColumnCapabilitiesImpl().setType(ColumnType.STRING)
                                                                      .setHasBitmapIndexes(hasBitmapIndexes)
                                                                      .setHasSpatialIndexes(hasSpatialIndexes)
+                                                                     .setDictionaryEncoded(true)
                                                                      .setDictionaryValuesUnique(true)
                                                                      .setDictionaryValuesSorted(false);
 
@@ -254,18 +256,8 @@ public ColumnCapabilities getColumnCapabilities()
     if (hasMultipleValues) {
       capabilites.setHasMultipleValues(true);
     }
-    // Likewise, only set dictionaryEncoded if explicitly if true for a similar reason as multi-valued handling. The
-    // dictionary is populated as rows are processed, but there might be implicit default values not accounted for in
-    // the dictionary yet. We can be certain that the dictionary has an entry for every value if either of
-    //    a) we have already processed an explitic default (null) valued row for this column
-    //    b) the processing was not 'sparse', meaning that this indexer has processed an explict value for every row
-    // is true.
-    final boolean allValuesEncoded = dictionaryEncodesAllValues();
-    if (allValuesEncoded) {
-      capabilites.setDictionaryEncoded(true);
-    }
 
-    if (isSparse || dimLookup.getIdForNull() != DimensionDictionary.ABSENT_VALUE_ID) {
+    if (dimLookup.getIdForNull() != DimensionDictionary.ABSENT_VALUE_ID) {
       capabilites.setHasNulls(true);
     }
     return capabilites;
@@ -303,6 +295,7 @@ public IndexedInts getRow()
       {
         final Object[] dims = currEntry.get().getDims();
 
+        @Nullable
         int[] indices;
         if (dimIndex < dims.length) {
           indices = (int[]) dims[dimIndex];
@@ -317,26 +310,19 @@ public IndexedInts getRow()
         if (indices == null || indices.length == 0) {
           if (hasMultipleValues) {
             row = IntArrays.EMPTY_ARRAY;
-            rowSize = 0;
           } else {
             final int nullId = getEncodedValue(null, false);
-            if (nullId >= 0 && nullId < maxId) {
-              // null was added to the dictionary before this selector was created; return its ID.
-              if (nullIdIntArray == null) {
-                nullIdIntArray = new int[]{nullId};
-              }
-              row = nullIdIntArray;
-              rowSize = 1;
-            } else {
-              // null doesn't exist in the dictionary; return an empty array.
-              // Choose to use ArrayBasedIndexedInts later, instead of special "empty" IndexedInts, for monomorphism
-              row = IntArrays.EMPTY_ARRAY;
-              rowSize = 0;
+            DruidException.conditionalDefensive(
+                nullId >= 0 && nullId < maxId,
+                "Null value not present in dictionary, how did this happen?"
+            );
+            if (nullIdIntArray == null) {
+              nullIdIntArray = new int[]{nullId};
             }
+            row = nullIdIntArray;
+            rowSize = 1;
           }
-        }
-
-        if (row == null && indices != null && indices.length > 0) {
+        } else {
           row = indices;
           rowSize = indices.length;
         }
@@ -346,75 +332,74 @@ public IndexedInts getRow()
       }
 
       @Override
-      public ValueMatcher makeValueMatcher(final String value)
+      public ValueMatcher makeValueMatcher(@Nullable final String value)
       {
-        if (extractionFn == null) {
-          final int valueId = lookupId(value);
-          final int nullValueId = lookupId(null);
-          if (valueId >= 0 || value == null) {
-            return new ValueMatcher()
+        if (extractionFn != null) {
+          // Employ caching BitSet optimization
+          return makeValueMatcher(StringPredicateDruidPredicateFactory.equalTo(value));
+        }
+        final int valueId = lookupId(value);
+        final int nullValueId = lookupId(null);
+        if (valueId >= 0 || value == null) {
+          return new ValueMatcher()
+          {
+            @Override
+            public boolean matches(boolean includeUnknown)
             {
-              @Override
-              public boolean matches(boolean includeUnknown)
-              {
-                Object[] dims = currEntry.get().getDims();
-                if (dimIndex >= dims.length) {
-                  return includeUnknown || value == null;
-                }
+              Object[] dims = currEntry.get().getDims();
+              if (dimIndex >= dims.length) {
+                return includeUnknown || value == null;
+              }
 
-                int[] dimsInt = (int[]) dims[dimIndex];
-                if (dimsInt == null || dimsInt.length == 0) {
-                  return includeUnknown || value == null;
-                }
+              int[] dimsInt = (int[]) dims[dimIndex];
+              if (dimsInt == null || dimsInt.length == 0) {
+                return includeUnknown || value == null;
+              }
 
-                for (int id : dimsInt) {
-                  if (id == valueId) {
-                    return true;
-                  }
-                  if (includeUnknown && (id == nullValueId)) {
-                    return true;
-                  }
+              for (int id : dimsInt) {
+                if (id == valueId) {
+                  return true;
+                }
+                if (includeUnknown && (id == nullValueId)) {
+                  return true;
                 }
-                return false;
               }
+              return false;
+            }
 
-              @Override
-              public void inspectRuntimeShape(RuntimeShapeInspector inspector)
-              {
-                // nothing to inspect
-              }
-            };
-          } else {
-            return new ValueMatcher()
+            @Override
+            public void inspectRuntimeShape(RuntimeShapeInspector inspector)
+            {
+              // nothing to inspect
+            }
+          };
+        } else {
+          return new ValueMatcher()
+          {
+            @Override
+            public boolean matches(boolean includeUnknown)
             {
-              @Override
-              public boolean matches(boolean includeUnknown)
-              {
-                if (includeUnknown) {
-                  IndexedInts row = getRow();
-                  final int size = row.size();
-                  if (size == 0) {
+              if (includeUnknown) {
+                IndexedInts row = getRow();
+                final int size = row.size();
+                if (size == 0) {
+                  return true;
+                }
+                for (int i = 0; i < size; i++) {
+                  if (row.get(i) == nullValueId) {
                     return true;
                   }
-                  for (int i = 0; i < size; i++) {
-                    if (row.get(i) == nullValueId) {
-                      return true;
-                    }
-                  }
                 }
-                return false;
               }
+              return false;
+            }
 
-              @Override
-              public void inspectRuntimeShape(RuntimeShapeInspector inspector)
-              {
-                // nothing to inspect
-              }
-            };
-          }
-        } else {
-          // Employ caching BitSet optimization
-          return makeValueMatcher(StringPredicateDruidPredicateFactory.equalTo(value));
+            @Override
+            public void inspectRuntimeShape(RuntimeShapeInspector inspector)
+            {
+              // nothing to inspect
+            }
+          };
         }
       }
 
@@ -486,7 +471,7 @@ public String lookupName(int id)
       @Override
       public boolean nameLookupPossibleInAdvance()
       {
-        return dictionaryEncodesAllValues();
+        return true;
       }
 
       @Nullable
@@ -497,7 +482,7 @@ public IdLookup idLookup()
       }
 
       @Override
-      public int lookupId(String name)
+      public int lookupId(@Nullable String name)
       {
         if (extractionFn != null) {
           throw new UnsupportedOperationException(
diff --git a/processing/src/main/java/org/apache/druid/segment/UnnestCursorFactory.java b/processing/src/main/java/org/apache/druid/segment/UnnestCursorFactory.java
index 3337f3b43363..e316022421b5 100644
--- a/processing/src/main/java/org/apache/druid/segment/UnnestCursorFactory.java
+++ b/processing/src/main/java/org/apache/druid/segment/UnnestCursorFactory.java
@@ -52,6 +52,7 @@
 import javax.annotation.Nullable;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 import java.util.function.Supplier;
@@ -86,9 +87,33 @@ public CursorHolder makeCursorHolder(CursorBuildSpec spec)
         input == null ? null : spec.getVirtualColumns()
                                    .getColumnCapabilitiesWithFallback(baseCursorFactory, input)
     );
+    final Set<String> physicalColumns;
+    if (spec.getPhysicalColumns() == null) {
+      physicalColumns = null;
+    } else {
+      physicalColumns = new HashSet<>();
+      for (String column : unnestColumn.requiredColumns()) {
+        if (!spec.getVirtualColumns().exists(column)) {
+          physicalColumns.add(column);
+        }
+      }
+      if (filter != null) {
+        for (String column : filter.getRequiredColumns()) {
+          if (!spec.getVirtualColumns().exists(column)) {
+            physicalColumns.add(column);
+          }
+        }
+      }
+      for (String column : spec.getPhysicalColumns()) {
+        if (!column.equals(unnestColumn.getOutputName())) {
+          physicalColumns.add(column);
+        }
+      }
+    }
     final CursorBuildSpec unnestBuildSpec =
         CursorBuildSpec.builder(spec)
                        .setFilter(filterPair.lhs)
+                       .setPhysicalColumns(physicalColumns)
                        .setVirtualColumns(VirtualColumns.create(Collections.singletonList(unnestColumn)))
                        .build();
 
diff --git a/processing/src/main/java/org/apache/druid/segment/incremental/IncrementalIndexColumnSelectorFactory.java b/processing/src/main/java/org/apache/druid/segment/incremental/IncrementalIndexColumnSelectorFactory.java
index 68cc263950df..af3f472e9a65 100644
--- a/processing/src/main/java/org/apache/druid/segment/incremental/IncrementalIndexColumnSelectorFactory.java
+++ b/processing/src/main/java/org/apache/druid/segment/incremental/IncrementalIndexColumnSelectorFactory.java
@@ -19,12 +19,14 @@
 
 package org.apache.druid.segment.incremental;
 
+import org.apache.druid.error.DruidException;
 import org.apache.druid.query.Order;
 import org.apache.druid.query.dimension.DimensionSpec;
 import org.apache.druid.query.extraction.ExtractionFn;
 import org.apache.druid.segment.ColumnInspector;
 import org.apache.druid.segment.ColumnSelectorFactory;
 import org.apache.druid.segment.ColumnValueSelector;
+import org.apache.druid.segment.CursorBuildSpec;
 import org.apache.druid.segment.DimensionIndexer;
 import org.apache.druid.segment.DimensionSelector;
 import org.apache.druid.segment.RowIdSupplier;
@@ -35,6 +37,8 @@
 import org.apache.druid.segment.column.ValueTypes;
 
 import javax.annotation.Nullable;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * The basic implementation of {@link ColumnSelectorFactory} over an {@link IncrementalIndex}. It's counterpart for
@@ -51,21 +55,52 @@ class IncrementalIndexColumnSelectorFactory implements ColumnSelectorFactory, Ro
   IncrementalIndexColumnSelectorFactory(
       IncrementalIndexRowSelector rowSelector,
       IncrementalIndexRowHolder rowHolder,
-      VirtualColumns virtualColumns,
+      CursorBuildSpec cursorBuildSpec,
       Order timeOrder
   )
   {
     this.rowSelector = rowSelector;
-    this.virtualColumns = virtualColumns;
+    this.virtualColumns = cursorBuildSpec.getVirtualColumns();
     this.timeOrder = timeOrder;
     this.rowHolder = rowHolder;
+
+    final Map<String, ColumnCapabilities> capabilitiesMap = new HashMap<>();
+    if (cursorBuildSpec.getPhysicalColumns() == null) {
+      // add everything
+      for (String column : rowSelector.getDimensionNames(true)) {
+        capabilitiesMap.put(column, IncrementalIndexCursorFactory.snapshotColumnCapabilities(rowSelector, column));
+      }
+      for (String column : rowSelector.getMetricNames()) {
+        capabilitiesMap.put(column, IncrementalIndexCursorFactory.snapshotColumnCapabilities(rowSelector, column));
+      }
+      for (String column : cursorBuildSpec.getVirtualColumns().getColumnNames()) {
+        capabilitiesMap.put(column, IncrementalIndexCursorFactory.snapshotColumnCapabilities(rowSelector, column));
+      }
+    } else {
+      // just add required columns
+      for (String column : cursorBuildSpec.getPhysicalColumns()) {
+        capabilitiesMap.put(column, IncrementalIndexCursorFactory.snapshotColumnCapabilities(rowSelector, column));
+      }
+      // and virtual columns
+      for (String column : cursorBuildSpec.getVirtualColumns().getColumnNames()) {
+        capabilitiesMap.put(column, IncrementalIndexCursorFactory.snapshotColumnCapabilities(rowSelector, column));
+      }
+    }
     this.snapshotColumnInspector = new ColumnInspector()
     {
       @Nullable
       @Override
       public ColumnCapabilities getColumnCapabilities(String column)
       {
-        return IncrementalIndexCursorFactory.snapshotColumnCapabilities(rowSelector, column);
+        final ColumnCapabilities capabilities = capabilitiesMap.get(column);
+
+        DruidException.conditionalDefensive(
+            cursorBuildSpec.getPhysicalColumns() == null || capabilities != null || capabilitiesMap.containsKey(column),
+            "Asked for physical column capabilities for column[%s] which wasn't specified as required by the query (specified columns[%s])",
+            column,
+            cursorBuildSpec.getPhysicalColumns()
+        );
+        return capabilities;
       }
     };
   }
@@ -135,7 +170,8 @@ public ColumnValueSelector<?> makeColumnValueSelector(String columnName)
   @Nullable
   public ColumnCapabilities getColumnCapabilities(String columnName)
   {
-    // Use snapshotColumnInspector instead of index.getCapabilities (see note in IncrementalIndexStorageAdapater)
+    // Use snapshotColumnInspector instead of 'live' rowSelector.getCapabilities because the snapshot is frozen in time
+    // at approximately when this selector factory was created (e.g. taken just after max row id)
     if (isTimeColumn(columnName)) {
       return virtualColumns.getColumnCapabilitiesWithFallback(snapshotColumnInspector, ColumnHolder.TIME_COLUMN_NAME);
     }
diff --git a/processing/src/main/java/org/apache/druid/segment/incremental/IncrementalIndexCursorFactory.java b/processing/src/main/java/org/apache/druid/segment/incremental/IncrementalIndexCursorFactory.java
index 5f42fbaaf474..516d9d84f10c 100644
--- a/processing/src/main/java/org/apache/druid/segment/incremental/IncrementalIndexCursorFactory.java
+++ b/processing/src/main/java/org/apache/druid/segment/incremental/IncrementalIndexCursorFactory.java
@@ -25,7 +25,6 @@
 import org.apache.druid.segment.CursorBuildSpec;
 import org.apache.druid.segment.CursorFactory;
 import org.apache.druid.segment.CursorHolder;
-import org.apache.druid.segment.NestedDataColumnIndexerV4;
 import org.apache.druid.segment.column.ColumnCapabilities;
 import org.apache.druid.segment.column.ColumnCapabilitiesImpl;
 import org.apache.druid.segment.column.ColumnType;
@@ -61,13 +60,13 @@ public boolean dictionaryValuesUnique()
         @Override
         public boolean multipleValues()
         {
-          return true;
+          return false;
         }
 
         @Override
         public boolean hasNulls()
         {
-          return true;
+          return false;
         }
       };
 
@@ -133,26 +132,6 @@ public ColumnCapabilities getColumnCapabilities(String column)
 
   static ColumnCapabilities snapshotColumnCapabilities(IncrementalIndexRowSelector selector, String column)
   {
-    IncrementalIndex.DimensionDesc desc = selector.getDimension(column);
-    // nested column indexer is a liar, and behaves like any type if it only processes unnested literals of a single
-    // type, so force it to use nested column type
-    if (desc != null && desc.getIndexer() instanceof NestedDataColumnIndexerV4) {
-      return ColumnCapabilitiesImpl.createDefault().setType(ColumnType.NESTED_DATA);
-    }
-
-    // Different from index.getColumnCapabilities because, in a way, IncrementalIndex's string-typed dimensions
-    // are always potentially multi-valued at query time. (Missing / null values for a row can potentially be
-    // represented by an empty array; see StringDimensionIndexer.IndexerDimensionSelector's getRow method.)
-    //
-    // We don't want to represent this as having-multiple-values in index.getCapabilities, because that's used
-    // at index-persisting time to determine if we need a multi-value column or not. However, that means we
-    // need to tweak the capabilities here in the CursorFactory (a query-time construct), so at query time
-    // they appear multi-valued.
-    //
-    // Note that this could be improved if we snapshot the capabilities at cursor creation time and feed those through
-    // to the StringDimensionIndexer so the selector built on top of it can produce values from the snapshot state of
-    // multi-valuedness at cursor creation time, instead of the latest state, and getSnapshotColumnCapabilities could
-    // be removed.
     return ColumnCapabilitiesImpl.snapshot(
         selector.getColumnCapabilities(column),
         COERCE_LOGIC
diff --git a/processing/src/main/java/org/apache/druid/segment/incremental/IncrementalIndexCursorHolder.java b/processing/src/main/java/org/apache/druid/segment/incremental/IncrementalIndexCursorHolder.java
index 43b887ef6332..b3d5d244178f 100644
--- a/processing/src/main/java/org/apache/druid/segment/incremental/IncrementalIndexCursorHolder.java
+++ b/processing/src/main/java/org/apache/druid/segment/incremental/IncrementalIndexCursorHolder.java
@@ -35,6 +35,7 @@
 
 import java.util.Iterator;
 import java.util.List;
+import java.util.function.Supplier;
 
 public class IncrementalIndexCursorHolder implements CursorHolder
 {
@@ -76,7 +77,7 @@ public Cursor asCursor()
     return new IncrementalIndexCursor(
         rowSelector,
         currentRow,
-        makeSelectorFactory(spec, currentRow),
+        () -> makeSelectorFactory(spec, currentRow),
         spec,
         getTimeOrder(ordering)
     );
@@ -93,7 +94,7 @@ public ColumnSelectorFactory makeSelectorFactory(CursorBuildSpec buildSpec, Incr
     return new IncrementalIndexColumnSelectorFactory(
         rowSelector,
         currEntry,
-        buildSpec.getVirtualColumns(),
+        buildSpec,
         getTimeOrder()
     );
   }
@@ -113,15 +114,15 @@ static class IncrementalIndexCursor implements Cursor
     IncrementalIndexCursor(
         IncrementalIndexRowSelector rowSelector,
         IncrementalIndexRowHolder currentRow,
-        ColumnSelectorFactory selectorFactory,
+        Supplier<ColumnSelectorFactory> columnSelectorFactorySupplier,
         CursorBuildSpec buildSpec,
         Order timeOrder
     )
     {
       currEntry = currentRow;
-      columnSelectorFactory = selectorFactory;
       // Set maxRowIndex before creating the filterMatcher. See https://github.com/apache/druid/pull/6340
       maxRowIndex = rowSelector.getLastRowIndex();
+      columnSelectorFactory = columnSelectorFactorySupplier.get();
       numAdvanced = -1;
 
       cursorIterable = rowSelector.getFacts().timeRangeIterable(
diff --git a/processing/src/main/java/org/apache/druid/segment/incremental/IncrementalIndexPhysicalSegmentInspector.java b/processing/src/main/java/org/apache/druid/segment/incremental/IncrementalIndexPhysicalSegmentInspector.java
index d8b6d46105aa..ec159c057bbd 100644
--- a/processing/src/main/java/org/apache/druid/segment/incremental/IncrementalIndexPhysicalSegmentInspector.java
+++ b/processing/src/main/java/org/apache/druid/segment/incremental/IncrementalIndexPhysicalSegmentInspector.java
@@ -31,7 +31,7 @@
 
 public class IncrementalIndexPhysicalSegmentInspector implements PhysicalSegmentInspector
 {
-  private static final ColumnCapabilities.CoercionLogic SNAPSHOT_COERCE_LOGIC =
+  static final ColumnCapabilities.CoercionLogic SNAPSHOT_COERCE_LOGIC =
       new ColumnCapabilities.CoercionLogic()
       {
         @Override
diff --git a/processing/src/main/java/org/apache/druid/segment/incremental/IncrementalIndexRowIterator.java b/processing/src/main/java/org/apache/druid/segment/incremental/IncrementalIndexRowIterator.java
index b0d5cbb45b74..fb453a7b5d8f 100644
--- a/processing/src/main/java/org/apache/druid/segment/incremental/IncrementalIndexRowIterator.java
+++ b/processing/src/main/java/org/apache/druid/segment/incremental/IncrementalIndexRowIterator.java
@@ -22,13 +22,13 @@
 import org.apache.druid.query.Order;
 import org.apache.druid.segment.ColumnSelectorFactory;
 import org.apache.druid.segment.ColumnValueSelector;
+import org.apache.druid.segment.CursorBuildSpec;
 import org.apache.druid.segment.DimensionHandler;
 import org.apache.druid.segment.IndexableAdapter;
 import org.apache.druid.segment.RowNumCounter;
 import org.apache.druid.segment.RowPointer;
 import org.apache.druid.segment.TimeAndDimsPointer;
 import org.apache.druid.segment.TransformableRowIterator;
-import org.apache.druid.segment.VirtualColumns;
 
 import java.util.Iterator;
 import java.util.List;
@@ -68,7 +68,7 @@ private static RowPointer makeRowPointer(
         new IncrementalIndexColumnSelectorFactory(
             incrementalIndex,
             rowHolder,
-            VirtualColumns.EMPTY,
+            CursorBuildSpec.FULL_SCAN,
             incrementalIndex.getTimePosition() == 0 ? Order.ASCENDING : Order.NONE
         );
     ColumnValueSelector[] dimensionSelectors = incrementalIndex
diff --git a/processing/src/main/java/org/apache/druid/segment/join/HashJoinSegmentCursorFactory.java b/processing/src/main/java/org/apache/druid/segment/join/HashJoinSegmentCursorFactory.java
index c359a96fad09..b608017d9a71 100644
--- a/processing/src/main/java/org/apache/druid/segment/join/HashJoinSegmentCursorFactory.java
+++ b/processing/src/main/java/org/apache/druid/segment/join/HashJoinSegmentCursorFactory.java
@@ -30,6 +30,7 @@
 import org.apache.druid.segment.CursorBuildSpec;
 import org.apache.druid.segment.CursorFactory;
 import org.apache.druid.segment.CursorHolder;
+import org.apache.druid.segment.VirtualColumn;
 import org.apache.druid.segment.VirtualColumns;
 import org.apache.druid.segment.column.ColumnCapabilities;
 import org.apache.druid.segment.column.ColumnType;
@@ -43,9 +44,11 @@
 
 import javax.annotation.Nullable;
 import java.util.Arrays;
+import java.util.HashSet;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Optional;
+import java.util.Set;
 
 public class HashJoinSegmentCursorFactory implements CursorFactory
 {
@@ -77,9 +80,23 @@ public CursorHolder makeCursorHolder(CursorBuildSpec spec)
 
     final Filter combinedFilter = baseFilterAnd(spec.getFilter());
 
+    // for physical column tracking, we start by copying base spec physical columns
+    final Set<String> physicalColumns = spec.getPhysicalColumns() != null
+                                        ? new HashSet<>(spec.getPhysicalColumns())
+                                        : null;
+
+    if (physicalColumns != null && combinedFilter != null) {
+      for (String column : combinedFilter.getRequiredColumns()) {
+        if (!spec.getVirtualColumns().exists(column)) {
+          physicalColumns.add(column);
+        }
+      }
+    }
+
     if (clauses.isEmpty()) {
       // if there are no clauses, we can just use the base cursor directly if we apply the combined filter
       final CursorBuildSpec newSpec = cursorBuildSpecBuilder.setFilter(combinedFilter)
+                                                            .setPhysicalColumns(physicalColumns)
                                                             .build();
       return baseCursorFactory.makeCursorHolder(newSpec);
     }
@@ -149,6 +166,33 @@ public CursorHolder makeCursorHolder(CursorBuildSpec spec)
         );
         cursorBuildSpecBuilder.setVirtualColumns(preJoinVirtualColumns);
 
+        // add all base table physical columns if they were originally set
+        if (physicalColumns != null) {
+          if (joinFilterSplit.getBaseTableFilter().isPresent()) {
+            for (String column : joinFilterSplit.getBaseTableFilter().get().getRequiredColumns()) {
+              if (!spec.getVirtualColumns().exists(column) && !preJoinVirtualColumns.exists(column)) {
+                physicalColumns.add(column);
+              }
+            }
+          }
+          for (VirtualColumn virtualColumn : preJoinVirtualColumns.getVirtualColumns()) {
+            for (String column : virtualColumn.requiredColumns()) {
+              if (!spec.getVirtualColumns().exists(column) && !preJoinVirtualColumns.exists(column)) {
+                physicalColumns.add(column);
+              }
+            }
+          }
+          final Set<String> prefixes = new HashSet<>();
+          for (JoinableClause clause : clauses) {
+            prefixes.add(clause.getPrefix());
+            physicalColumns.addAll(clause.getCondition().getRequiredColumns());
+          }
+          for (String prefix : prefixes) {
+            physicalColumns.removeIf(x -> JoinPrefixUtils.isPrefixedBy(x, prefix));
+          }
+          cursorBuildSpecBuilder.setPhysicalColumns(physicalColumns);
+        }
+
         baseCursorHolder = joinablesCloser.register(baseCursorFactory.makeCursorHolder(cursorBuildSpecBuilder.build()));
       }
 
diff --git a/processing/src/main/java/org/apache/druid/segment/join/JoinConditionAnalysis.java b/processing/src/main/java/org/apache/druid/segment/join/JoinConditionAnalysis.java
index 77d474720201..b8212d15fe77 100644
--- a/processing/src/main/java/org/apache/druid/segment/join/JoinConditionAnalysis.java
+++ b/processing/src/main/java/org/apache/druid/segment/join/JoinConditionAnalysis.java
@@ -21,6 +21,7 @@
 
 import com.google.common.base.Preconditions;
 import org.apache.druid.math.expr.Expr;
+import org.apache.druid.math.expr.ExprEval;
 import org.apache.druid.math.expr.ExprMacroTable;
 import org.apache.druid.math.expr.Exprs;
 import org.apache.druid.math.expr.InputBindings;
@@ -33,7 +34,6 @@
 import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
-import java.util.stream.Collectors;
 
 /**
  * Represents analysis of a join condition.
@@ -71,17 +71,42 @@ private JoinConditionAnalysis(
     this.rightPrefix = Preconditions.checkNotNull(rightPrefix, "rightPrefix");
     this.equiConditions = Collections.unmodifiableList(equiConditions);
     this.nonEquiConditions = Collections.unmodifiableList(nonEquiConditions);
-    // if any nonEquiCondition is an expression and it evaluates to false
-    isAlwaysFalse = nonEquiConditions.stream()
-                                     .anyMatch(expr -> expr.isLiteral() && !expr.eval(InputBindings.nilBindings())
-                                                                                .asBoolean());
-    // if there are no equiConditions and all nonEquiConditions are literals and the evaluate to true
-    isAlwaysTrue = equiConditions.isEmpty() && nonEquiConditions.stream()
-                                                                .allMatch(expr -> expr.isLiteral() && expr.eval(
-                                                                    InputBindings.nilBindings()).asBoolean());
-    canHashJoin = nonEquiConditions.stream().allMatch(Expr::isLiteral);
-    rightKeyColumns = getEquiConditions().stream().map(Equality::getRightColumn).collect(Collectors.toSet());
-    requiredColumns = computeRequiredColumns(rightPrefix, equiConditions, nonEquiConditions);
+
+    rightKeyColumns = new HashSet<>();
+    requiredColumns = new HashSet<>();
+
+    for (Equality equality : equiConditions) {
+      final Set<String> requiredLeft = equality.getLeftExpr().analyzeInputs().getRequiredBindings();
+      requiredColumns.addAll(requiredLeft);
+
+      rightKeyColumns.add(equality.getRightColumn());
+      requiredColumns.add(rightPrefix + equality.getRightColumn());
+    }
+
+    boolean alwaysFalse = false;
+    boolean alwaysTrue = equiConditions.isEmpty();
+    boolean hashJoin = true;
+
+    for (Expr expr : nonEquiConditions) {
+      hashJoin = hashJoin && expr.isLiteral();
+      if (expr.isLiteral()) {
+        if (hashJoin) {
+          // we only need to check if allTrue or allFalse if all conditions are literals
+          final ExprEval<?> eval = expr.eval(InputBindings.nilBindings());
+          alwaysTrue = alwaysTrue && eval.asBoolean();
+          // we don't need to check for null here because it is ok to consider UNKNOWN as false because
+          // UNKNOWN AND <anything> is UNKNOWN, and there is no possibility this condition can be wrapped in a NOT, so
+          // it is effectively FALSE and we can still short-circuit
+          alwaysFalse = alwaysFalse || !eval.asBoolean();
+        }
+      } else {
+        requiredColumns.addAll(expr.analyzeInputs().getRequiredBindings());
+      }
+    }
+
+    isAlwaysTrue = hashJoin && alwaysTrue;
+    isAlwaysFalse = hashJoin && alwaysFalse;
+    canHashJoin = hashJoin;
   }
 
   /**
@@ -222,24 +247,4 @@ public String toString()
   {
     return originalExpression;
   }
-
-  private static Set<String> computeRequiredColumns(
-      final String rightPrefix,
-      final List<Equality> equiConditions,
-      final List<Expr> nonEquiConditions
-  )
-  {
-    final Set<String> requiredColumns = new HashSet<>();
-
-    for (Equality equality : equiConditions) {
-      requiredColumns.add(rightPrefix + equality.getRightColumn());
-      requiredColumns.addAll(equality.getLeftExpr().analyzeInputs().getRequiredBindings());
-    }
-
-    for (Expr expr : nonEquiConditions) {
-      requiredColumns.addAll(expr.analyzeInputs().getRequiredBindings());
-    }
-
-    return requiredColumns;
-  }
 }
diff --git a/processing/src/main/java/org/apache/druid/segment/join/JoinableFactoryWrapper.java b/processing/src/main/java/org/apache/druid/segment/join/JoinableFactoryWrapper.java
index 0bebc5aab592..6ff410981a10 100644
--- a/processing/src/main/java/org/apache/druid/segment/join/JoinableFactoryWrapper.java
+++ b/processing/src/main/java/org/apache/druid/segment/join/JoinableFactoryWrapper.java
@@ -55,6 +55,11 @@ public JoinableFactoryWrapper(final JoinableFactory joinableFactory)
     this.joinableFactory = Preconditions.checkNotNull(joinableFactory, "joinableFactory");
   }
 
+  public JoinableFactory getJoinableFactory()
+  {
+    return joinableFactory;
+  }
+
   /**
    * Converts any join clauses to filters that can be converted, and returns the rest as-is.
    * <p>
@@ -192,11 +197,6 @@ static JoinClauseToFilterConversion convertJoinToFilter(
     return new JoinClauseToFilterConversion(null, false);
   }
 
-  public JoinableFactory getJoinableFactory()
-  {
-    return joinableFactory;
-  }
-
   /**
    * Encapsulates the conversion which happened for a joinable clause.
    * convertedFilter represents the filter which got generated from the conversion.
diff --git a/processing/src/main/java/org/apache/druid/segment/projections/Projections.java b/processing/src/main/java/org/apache/druid/segment/projections/Projections.java
index a5dd6c38436d..c87733d68e47 100644
--- a/processing/src/main/java/org/apache/druid/segment/projections/Projections.java
+++ b/processing/src/main/java/org/apache/druid/segment/projections/Projections.java
@@ -157,12 +157,14 @@ public Map<String, String> getRemapColumns()
 
   public static final class ProjectionMatchBuilder
   {
+    private final Set<String> referencedPhysicalColumns;
     private final Set<VirtualColumn> referencedVirtualColumns;
     private final Map<String, String> remapColumns;
     private final List<AggregatorFactory> combiningFactories;
 
     public ProjectionMatchBuilder()
     {
+      this.referencedPhysicalColumns = new HashSet<>();
       this.referencedVirtualColumns = new HashSet<>();
       this.remapColumns = new HashMap<>();
       this.combiningFactories = new ArrayList<>();
@@ -177,6 +179,16 @@ public ProjectionMatchBuilder remapColumn(String queryColumn, String projectionC
       return this;
     }
 
+    /**
+     * Add a projection physical column, which will later be added to {@link ProjectionMatch#getCursorBuildSpec()} if
+     * the projection matches
+     */
+    public ProjectionMatchBuilder addReferencedPhysicalColumn(String column)
+    {
+      referencedPhysicalColumns.add(column);
+      return this;
+    }
+
     /**
      * Add a query virtual column that can use projection physical columns as inputs to the match builder, which will
      * later be added to {@link ProjectionMatch#getCursorBuildSpec()} if the projection matches
@@ -202,6 +214,7 @@ public ProjectionMatch build(CursorBuildSpec queryCursorBuildSpec)
     {
       return new ProjectionMatch(
           CursorBuildSpec.builder(queryCursorBuildSpec)
+                         .setPhysicalColumns(referencedPhysicalColumns)
                          .setVirtualColumns(VirtualColumns.fromIterable(referencedVirtualColumns))
                          .setAggregators(combiningFactories)
                          .build(),
diff --git a/processing/src/test/java/org/apache/druid/query/NestedDataTestUtils.java b/processing/src/test/java/org/apache/druid/query/NestedDataTestUtils.java
index 9efeeb642e51..8361f6b0d32c 100644
--- a/processing/src/test/java/org/apache/druid/query/NestedDataTestUtils.java
+++ b/processing/src/test/java/org/apache/druid/query/NestedDataTestUtils.java
@@ -28,7 +28,6 @@
 import org.apache.druid.data.input.ResourceInputSource;
 import org.apache.druid.data.input.impl.DelimitedInputFormat;
 import org.apache.druid.data.input.impl.DimensionsSpec;
-import org.apache.druid.data.input.impl.JsonInputFormat;
 import org.apache.druid.data.input.impl.LocalInputSource;
 import org.apache.druid.data.input.impl.TimestampSpec;
 import org.apache.druid.guice.BuiltInTypesModule;
@@ -36,7 +35,6 @@
 import org.apache.druid.java.util.common.granularity.Granularities;
 import org.apache.druid.java.util.common.granularity.Granularity;
 import org.apache.druid.java.util.common.io.Closer;
-import org.apache.druid.java.util.common.parsers.JSONPathSpec;
 import org.apache.druid.query.aggregation.AggregatorFactory;
 import org.apache.druid.query.aggregation.CountAggregatorFactory;
 import org.apache.druid.query.expression.TestExprMacroTable;
@@ -48,6 +46,7 @@
 import org.apache.druid.segment.QueryableIndexSegment;
 import org.apache.druid.segment.Segment;
 import org.apache.druid.segment.TestHelper;
+import org.apache.druid.segment.TestIndex;
 import org.apache.druid.segment.column.StringEncodingStrategy;
 import org.apache.druid.segment.incremental.IncrementalIndexSchema;
 import org.apache.druid.segment.transform.ExpressionTransform;
@@ -88,14 +87,6 @@ public class NestedDataTestUtils
 
   public static final TimestampSpec TIMESTAMP_SPEC = new TimestampSpec("timestamp", null, null);
 
-  public static final JsonInputFormat DEFAULT_JSON_INPUT_FORMAT = new JsonInputFormat(
-      JSONPathSpec.DEFAULT,
-      null,
-      null,
-      null,
-      null
-  );
-
   public static final DimensionsSpec AUTO_DISCOVERY =
       DimensionsSpec.builder()
                     .useSchemaDiscovery(true)
@@ -271,7 +262,7 @@ public static Segment createIncrementalIndexForJsonInput(
     return createIncrementalIndex(
         tempFolder,
         file,
-        DEFAULT_JSON_INPUT_FORMAT,
+        TestIndex.DEFAULT_JSON_INPUT_FORMAT,
         TIMESTAMP_SPEC,
         AUTO_DISCOVERY,
         TransformSpec.NONE,
@@ -294,7 +285,7 @@ public static List<Segment> createSegmentsForJsonInput(
         tempFolder,
         closer,
         inputFile,
-        DEFAULT_JSON_INPUT_FORMAT,
+        TestIndex.DEFAULT_JSON_INPUT_FORMAT,
         TIMESTAMP_SPEC,
         AUTO_DISCOVERY,
         TransformSpec.NONE,
@@ -324,7 +315,7 @@ public static List<Segment> createSegmentsWithConcatenatedJsonInput(
         tempFolder,
         closer,
         inputFiles,
-        DEFAULT_JSON_INPUT_FORMAT,
+        TestIndex.DEFAULT_JSON_INPUT_FORMAT,
         TIMESTAMP_SPEC,
         AUTO_DISCOVERY,
         TransformSpec.NONE,
diff --git a/processing/src/test/java/org/apache/druid/query/QueryRunnerTestHelper.java b/processing/src/test/java/org/apache/druid/query/QueryRunnerTestHelper.java
index fdeb42ee1ca0..0a24a36cf74f 100644
--- a/processing/src/test/java/org/apache/druid/query/QueryRunnerTestHelper.java
+++ b/processing/src/test/java/org/apache/druid/query/QueryRunnerTestHelper.java
@@ -399,6 +399,7 @@ public static boolean isTestRunnerVectorizable(QueryRunner runner)
   {
     final String runnerName = runner.toString();
     return !("rtIndex".equals(runnerName)
+             || "rtIndexPartialSchemaStringDiscovery".equals(runnerName)
              || "noRollupRtIndex".equals(runnerName)
              || "nonTimeOrderedRtIndex".equals(runnerName)
              || "nonTimeOrderedNoRollupRtIndex".equals(runnerName));
@@ -426,6 +427,10 @@ public static <T, QueryType extends Query<T>> List<TestQueryRunner<T>> makeQuery
                 "rtIndex",
                 new IncrementalIndexSegment(TestIndex.getIncrementalTestIndex(), SEGMENT_ID)
             ),
+            maker.apply(
+                "rtIndexPartialSchemaStringDiscovery",
+                new IncrementalIndexSegment(TestIndex.getIncrementalTestIndex(), SEGMENT_ID)
+            ),
             maker.apply(
                 "noRollupRtIndex",
                 new IncrementalIndexSegment(TestIndex.getNoRollupIncrementalTestIndex(), SEGMENT_ID)
@@ -518,20 +523,6 @@ public static <T, QueryType extends Query<T>> ArrayList<TestQueryRunner<T>> mapQ
     return retVal;
   }
 
-  public static <T, QueryType extends Query<T>> TestQueryRunner<T> makeQueryRunner(
-      QueryRunnerFactory<T, QueryType> factory,
-      String resourceFileName,
-      final String runnerName
-  )
-  {
-    return makeQueryRunner(
-        factory,
-        SEGMENT_ID,
-        new IncrementalIndexSegment(TestIndex.makeRealtimeIndex(resourceFileName), SEGMENT_ID),
-        runnerName
-    );
-  }
-
   public static <T, QueryType extends Query<T>> TestQueryRunner<T> makeQueryRunner(
       QueryRunnerFactory<T, QueryType> factory,
       Segment adapter,
diff --git a/processing/src/test/java/org/apache/druid/query/aggregation/firstlast/first/StringFirstTimeseriesQueryTest.java b/processing/src/test/java/org/apache/druid/query/aggregation/firstlast/first/StringFirstTimeseriesQueryTest.java
index ee0f5c052c64..ecb30d16ddde 100644
--- a/processing/src/test/java/org/apache/druid/query/aggregation/firstlast/first/StringFirstTimeseriesQueryTest.java
+++ b/processing/src/test/java/org/apache/druid/query/aggregation/firstlast/first/StringFirstTimeseriesQueryTest.java
@@ -106,7 +106,7 @@ public void setUp() throws IndexSizeExceededException
         )
     );
 
-    queryableIndex = TestIndex.persistRealtimeAndLoadMMapped(incrementalIndex);
+    queryableIndex = TestIndex.persistAndMemoryMap(incrementalIndex);
   }
 
   @Test
diff --git a/processing/src/test/java/org/apache/druid/query/aggregation/firstlast/last/StringLastTimeseriesQueryTest.java b/processing/src/test/java/org/apache/druid/query/aggregation/firstlast/last/StringLastTimeseriesQueryTest.java
index fb189685544e..184c10c57506 100644
--- a/processing/src/test/java/org/apache/druid/query/aggregation/firstlast/last/StringLastTimeseriesQueryTest.java
+++ b/processing/src/test/java/org/apache/druid/query/aggregation/firstlast/last/StringLastTimeseriesQueryTest.java
@@ -108,7 +108,7 @@ public void setUp() throws IndexSizeExceededException
         )
     );
 
-    queryableIndex = TestIndex.persistRealtimeAndLoadMMapped(incrementalIndex);
+    queryableIndex = TestIndex.persistAndMemoryMap(incrementalIndex);
   }
 
   @Test
diff --git a/processing/src/test/java/org/apache/druid/query/aggregation/mean/SimpleTestIndex.java b/processing/src/test/java/org/apache/druid/query/aggregation/mean/SimpleTestIndex.java
index 1e9bca482164..da8471681bd4 100644
--- a/processing/src/test/java/org/apache/druid/query/aggregation/mean/SimpleTestIndex.java
+++ b/processing/src/test/java/org/apache/druid/query/aggregation/mean/SimpleTestIndex.java
@@ -59,7 +59,7 @@ public class SimpleTestIndex
   );
 
   private static Supplier<QueryableIndex> mmappedIndex = Suppliers.memoize(
-      () -> TestIndex.persistRealtimeAndLoadMMapped(realtimeIndex.get())
+      () -> TestIndex.persistAndMemoryMap(realtimeIndex.get())
   );
 
 
diff --git a/processing/src/test/java/org/apache/druid/query/metadata/SegmentAnalyzerTest.java b/processing/src/test/java/org/apache/druid/query/metadata/SegmentAnalyzerTest.java
index bd787a9d92a7..53cca7105b5c 100644
--- a/processing/src/test/java/org/apache/druid/query/metadata/SegmentAnalyzerTest.java
+++ b/processing/src/test/java/org/apache/druid/query/metadata/SegmentAnalyzerTest.java
@@ -20,8 +20,6 @@
 package org.apache.druid.query.metadata;
 
 import com.google.common.collect.ImmutableList;
-import com.google.common.io.CharSource;
-import com.google.common.io.Resources;
 import org.apache.druid.data.input.InputRowSchema;
 import org.apache.druid.data.input.impl.DimensionSchema;
 import org.apache.druid.data.input.impl.DimensionsSpec;
@@ -62,7 +60,6 @@
 import org.apache.druid.segment.data.ObjectStrategy;
 import org.apache.druid.segment.incremental.IncrementalIndex;
 import org.apache.druid.segment.incremental.IncrementalIndexSchema;
-import org.apache.druid.segment.incremental.OnheapIncrementalIndex;
 import org.apache.druid.segment.serde.ComplexMetricExtractor;
 import org.apache.druid.segment.serde.ComplexMetricSerde;
 import org.apache.druid.segment.serde.ComplexMetrics;
@@ -77,9 +74,7 @@
 import javax.annotation.Nullable;
 import java.io.File;
 import java.io.IOException;
-import java.net.URL;
 import java.nio.ByteBuffer;
-import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
@@ -302,8 +297,6 @@ public ObjectStrategy getObjectStrategy()
   @Test
   public void testAnalyzingSegmentWithNonExistentAggregator() throws IOException
   {
-    final URL resource = SegmentAnalyzerTest.class.getClassLoader().getResource("druid.sample.numeric.tsv");
-    CharSource source = Resources.asByteSource(resource).asCharSource(StandardCharsets.UTF_8);
     String invalid_aggregator = "invalid_aggregator";
     AggregatorFactory[] metrics = new AggregatorFactory[]{
         new DoubleSumAggregatorFactory(TestIndex.DOUBLE_METRICS[0], "index"),
@@ -312,17 +305,17 @@ public void testAnalyzingSegmentWithNonExistentAggregator() throws IOException
     };
     final IncrementalIndexSchema schema = new IncrementalIndexSchema.Builder()
         .withMinTimestamp(DateTimes.of("2011-01-12T00:00:00.000Z").getMillis())
-        .withTimestampSpec(new TimestampSpec("ds", "auto", null))
+        .withTimestampSpec(new TimestampSpec("ts", "auto", null))
         .withDimensionsSpec(TestIndex.DIMENSIONS_SPEC)
         .withMetrics(metrics)
         .withRollup(true)
         .build();
 
-    final IncrementalIndex retVal = new OnheapIncrementalIndex.Builder()
-        .setIndexSchema(schema)
-        .setMaxRowCount(10000)
-        .build();
-    IncrementalIndex incrementalIndex = TestIndex.loadIncrementalIndex(retVal, source);
+    IncrementalIndex incrementalIndex = TestIndex.makeIncrementalIndexFromResource(
+        TestIndex.SAMPLE_NUMERIC_JSON,
+        schema,
+        TestIndex.DEFAULT_JSON_INPUT_FORMAT
+    );
 
     // Analyze the in-memory segment.
     {
diff --git a/processing/src/test/java/org/apache/druid/query/metadata/SegmentMetadataQueryTest.java b/processing/src/test/java/org/apache/druid/query/metadata/SegmentMetadataQueryTest.java
index 8e39a640acb3..af17379367ed 100644
--- a/processing/src/test/java/org/apache/druid/query/metadata/SegmentMetadataQueryTest.java
+++ b/processing/src/test/java/org/apache/druid/query/metadata/SegmentMetadataQueryTest.java
@@ -910,7 +910,7 @@ public void testSegmentMetadataQueryWithTimestampSpecMerge()
         0,
         expectedSegmentAnalysis1.getNumRows() + expectedSegmentAnalysis2.getNumRows(),
         null,
-        new TimestampSpec("ds", "auto", null),
+        new TimestampSpec("ts", "iso", null),
         null,
         null
     );
diff --git a/processing/src/test/java/org/apache/druid/query/scan/MultiSegmentScanQueryTest.java b/processing/src/test/java/org/apache/druid/query/scan/MultiSegmentScanQueryTest.java
index 1ac4fff834b3..bbb93160403c 100644
--- a/processing/src/test/java/org/apache/druid/query/scan/MultiSegmentScanQueryTest.java
+++ b/processing/src/test/java/org/apache/druid/query/scan/MultiSegmentScanQueryTest.java
@@ -122,8 +122,8 @@ public static void setup() throws IOException
     CharSource v_0112 = CharSource.wrap(StringUtils.join(V_0112, "\n"));
     CharSource v_0113 = CharSource.wrap(StringUtils.join(V_0113, "\n"));
 
-    IncrementalIndex index0 = TestIndex.loadIncrementalIndex(newIndex("2011-01-12T00:00:00.000Z"), v_0112);
-    IncrementalIndex index1 = TestIndex.loadIncrementalIndex(newIndex("2011-01-13T00:00:00.000Z"), v_0113);
+    IncrementalIndex index0 = TestIndex.loadIncrementalIndexFromTsvCharSource(newIndex("2011-01-12T00:00:00.000Z"), v_0112);
+    IncrementalIndex index1 = TestIndex.loadIncrementalIndexFromTsvCharSource(newIndex("2011-01-13T00:00:00.000Z"), v_0113);
 
     segment0 = new IncrementalIndexSegment(index0, makeIdentifier(index0, "v1"));
     segment1 = new IncrementalIndexSegment(index1, makeIdentifier(index1, "v1"));
diff --git a/processing/src/test/java/org/apache/druid/query/scan/NestedDataScanQueryTest.java b/processing/src/test/java/org/apache/druid/query/scan/NestedDataScanQueryTest.java
index 80fa1fa0832c..b2c3d37d5892 100644
--- a/processing/src/test/java/org/apache/druid/query/scan/NestedDataScanQueryTest.java
+++ b/processing/src/test/java/org/apache/druid/query/scan/NestedDataScanQueryTest.java
@@ -46,6 +46,7 @@
 import org.apache.druid.segment.AutoTypeColumnSchema;
 import org.apache.druid.segment.IndexSpec;
 import org.apache.druid.segment.Segment;
+import org.apache.druid.segment.TestIndex;
 import org.apache.druid.segment.column.ColumnType;
 import org.apache.druid.segment.transform.TransformSpec;
 import org.apache.druid.segment.virtual.NestedFieldVirtualColumn;
@@ -135,7 +136,7 @@ public void testIngestAndScanSegmentsRollup() throws Exception
             tempFolder,
             closer,
             NestedDataTestUtils.NUMERIC_DATA_FILE,
-            NestedDataTestUtils.DEFAULT_JSON_INPUT_FORMAT,
+            TestIndex.DEFAULT_JSON_INPUT_FORMAT,
             NestedDataTestUtils.TIMESTAMP_SPEC,
             NestedDataTestUtils.AUTO_DISCOVERY,
             TransformSpec.NONE,
@@ -512,7 +513,7 @@ public void testIngestAndScanSegmentsRealtimeSchemaDiscovery() throws Exception
         NestedDataTestUtils.createIncrementalIndex(
             tempFolder,
             NestedDataTestUtils.TYPES_DATA_FILE,
-            NestedDataTestUtils.DEFAULT_JSON_INPUT_FORMAT,
+            TestIndex.DEFAULT_JSON_INPUT_FORMAT,
             NestedDataTestUtils.TIMESTAMP_SPEC,
             NestedDataTestUtils.AUTO_DISCOVERY,
             TransformSpec.NONE,
@@ -525,7 +526,7 @@ public void testIngestAndScanSegmentsRealtimeSchemaDiscovery() throws Exception
         tempFolder,
         closer,
         NestedDataTestUtils.TYPES_DATA_FILE,
-        NestedDataTestUtils.DEFAULT_JSON_INPUT_FORMAT,
+        TestIndex.DEFAULT_JSON_INPUT_FORMAT,
         NestedDataTestUtils.TIMESTAMP_SPEC,
         NestedDataTestUtils.AUTO_DISCOVERY,
         TransformSpec.NONE,
@@ -575,7 +576,7 @@ public void testIngestAndScanSegmentsRealtimeAutoExplicit() throws Exception
         NestedDataTestUtils.createIncrementalIndex(
             tempFolder,
             NestedDataTestUtils.TYPES_DATA_FILE,
-            NestedDataTestUtils.DEFAULT_JSON_INPUT_FORMAT,
+            TestIndex.DEFAULT_JSON_INPUT_FORMAT,
             NestedDataTestUtils.TIMESTAMP_SPEC,
             spec,
             TransformSpec.NONE,
@@ -588,7 +589,7 @@ public void testIngestAndScanSegmentsRealtimeAutoExplicit() throws Exception
         tempFolder,
         closer,
         NestedDataTestUtils.TYPES_DATA_FILE,
-        NestedDataTestUtils.DEFAULT_JSON_INPUT_FORMAT,
+        TestIndex.DEFAULT_JSON_INPUT_FORMAT,
         NestedDataTestUtils.TIMESTAMP_SPEC,
         spec,
         TransformSpec.NONE,
@@ -631,7 +632,7 @@ public void testIngestAndScanSegmentsRealtimeSchemaDiscoveryArrayTypes() throws
         NestedDataTestUtils.createIncrementalIndex(
             tempFolder,
             NestedDataTestUtils.ARRAY_TYPES_DATA_FILE,
-            NestedDataTestUtils.DEFAULT_JSON_INPUT_FORMAT,
+            TestIndex.DEFAULT_JSON_INPUT_FORMAT,
             NestedDataTestUtils.TIMESTAMP_SPEC,
             NestedDataTestUtils.AUTO_DISCOVERY,
             TransformSpec.NONE,
@@ -644,7 +645,7 @@ public void testIngestAndScanSegmentsRealtimeSchemaDiscoveryArrayTypes() throws
         tempFolder,
         closer,
         NestedDataTestUtils.ARRAY_TYPES_DATA_FILE,
-        NestedDataTestUtils.DEFAULT_JSON_INPUT_FORMAT,
+        TestIndex.DEFAULT_JSON_INPUT_FORMAT,
         NestedDataTestUtils.TIMESTAMP_SPEC,
         NestedDataTestUtils.AUTO_DISCOVERY,
         TransformSpec.NONE,
@@ -689,7 +690,7 @@ public void testIngestAndScanSegmentsRealtimeSchemaDiscoveryMoreArrayTypesNonStr
           NestedDataTestUtils.createIncrementalIndex(
               tempFolder,
               NestedDataTestUtils.ARRAY_TYPES_DATA_FILE_2,
-              NestedDataTestUtils.DEFAULT_JSON_INPUT_FORMAT,
+              TestIndex.DEFAULT_JSON_INPUT_FORMAT,
               NestedDataTestUtils.TIMESTAMP_SPEC,
               NestedDataTestUtils.AUTO_DISCOVERY,
               TransformSpec.NONE,
@@ -702,7 +703,7 @@ public void testIngestAndScanSegmentsRealtimeSchemaDiscoveryMoreArrayTypesNonStr
           tempFolder,
           closer,
           NestedDataTestUtils.ARRAY_TYPES_DATA_FILE_2,
-          NestedDataTestUtils.DEFAULT_JSON_INPUT_FORMAT,
+          TestIndex.DEFAULT_JSON_INPUT_FORMAT,
           NestedDataTestUtils.TIMESTAMP_SPEC,
           NestedDataTestUtils.AUTO_DISCOVERY,
           TransformSpec.NONE,
@@ -756,7 +757,7 @@ public void testIngestAndScanSegmentsRealtimeSchemaDiscoveryMoreArrayTypesStrict
         NestedDataTestUtils.createIncrementalIndex(
             tempFolder,
             NestedDataTestUtils.ARRAY_TYPES_DATA_FILE_2,
-            NestedDataTestUtils.DEFAULT_JSON_INPUT_FORMAT,
+            TestIndex.DEFAULT_JSON_INPUT_FORMAT,
             NestedDataTestUtils.TIMESTAMP_SPEC,
             NestedDataTestUtils.AUTO_DISCOVERY,
             TransformSpec.NONE,
@@ -769,7 +770,7 @@ public void testIngestAndScanSegmentsRealtimeSchemaDiscoveryMoreArrayTypesStrict
         tempFolder,
         closer,
         NestedDataTestUtils.ARRAY_TYPES_DATA_FILE_2,
-        NestedDataTestUtils.DEFAULT_JSON_INPUT_FORMAT,
+        TestIndex.DEFAULT_JSON_INPUT_FORMAT,
         NestedDataTestUtils.TIMESTAMP_SPEC,
         NestedDataTestUtils.AUTO_DISCOVERY,
         TransformSpec.NONE,
@@ -819,7 +820,7 @@ public void testIngestAndScanSegmentsRealtimeSchemaDiscoveryTypeGauntlet() throw
         NestedDataTestUtils.createIncrementalIndex(
             tempFolder,
             NestedDataTestUtils.ALL_TYPES_TEST_DATA_FILE,
-            NestedDataTestUtils.DEFAULT_JSON_INPUT_FORMAT,
+            TestIndex.DEFAULT_JSON_INPUT_FORMAT,
             NestedDataTestUtils.TIMESTAMP_SPEC,
             NestedDataTestUtils.AUTO_DISCOVERY,
             TransformSpec.NONE,
@@ -832,7 +833,7 @@ public void testIngestAndScanSegmentsRealtimeSchemaDiscoveryTypeGauntlet() throw
         tempFolder,
         closer,
         NestedDataTestUtils.ALL_TYPES_TEST_DATA_FILE,
-        NestedDataTestUtils.DEFAULT_JSON_INPUT_FORMAT,
+        TestIndex.DEFAULT_JSON_INPUT_FORMAT,
         NestedDataTestUtils.TIMESTAMP_SPEC,
         NestedDataTestUtils.AUTO_DISCOVERY,
         TransformSpec.NONE,
@@ -1003,7 +1004,7 @@ public void testIngestAndScanSegmentsNestedColumnNotNullFilter() throws Exceptio
         NestedDataTestUtils.createIncrementalIndex(
             tempFolder,
             NestedDataTestUtils.ALL_TYPES_TEST_DATA_FILE,
-            NestedDataTestUtils.DEFAULT_JSON_INPUT_FORMAT,
+            TestIndex.DEFAULT_JSON_INPUT_FORMAT,
             NestedDataTestUtils.TIMESTAMP_SPEC,
             NestedDataTestUtils.AUTO_DISCOVERY,
             TransformSpec.NONE,
@@ -1016,7 +1017,7 @@ public void testIngestAndScanSegmentsNestedColumnNotNullFilter() throws Exceptio
         tempFolder,
         closer,
         NestedDataTestUtils.ALL_TYPES_TEST_DATA_FILE,
-        NestedDataTestUtils.DEFAULT_JSON_INPUT_FORMAT,
+        TestIndex.DEFAULT_JSON_INPUT_FORMAT,
         NestedDataTestUtils.TIMESTAMP_SPEC,
         NestedDataTestUtils.AUTO_DISCOVERY,
         TransformSpec.NONE,
diff --git a/processing/src/test/java/org/apache/druid/query/search/SearchQueryRunnerTest.java b/processing/src/test/java/org/apache/druid/query/search/SearchQueryRunnerTest.java
index 486cfb950170..8e6156dbe761 100644
--- a/processing/src/test/java/org/apache/druid/query/search/SearchQueryRunnerTest.java
+++ b/processing/src/test/java/org/apache/druid/query/search/SearchQueryRunnerTest.java
@@ -766,7 +766,7 @@ public void testSearchWithNullValueInDimension() throws Exception
         QueryRunnerTestHelper.NOOP_QUERYWATCHER
     );
     QueryRunner runner = factory.createRunner(
-        new QueryableIndexSegment(TestIndex.persistRealtimeAndLoadMMapped(index), SegmentId.dummy("asdf"))
+        new QueryableIndexSegment(TestIndex.persistAndMemoryMap(index), SegmentId.dummy("asdf"))
     );
     List<SearchHit> expectedHits = new ArrayList<>();
     expectedHits.add(new SearchHit("table", "table", 1));
diff --git a/processing/src/test/java/org/apache/druid/query/search/SearchQueryRunnerWithCaseTest.java b/processing/src/test/java/org/apache/druid/query/search/SearchQueryRunnerWithCaseTest.java
index add73b86b397..11f4d2c6a73d 100644
--- a/processing/src/test/java/org/apache/druid/query/search/SearchQueryRunnerWithCaseTest.java
+++ b/processing/src/test/java/org/apache/druid/query/search/SearchQueryRunnerWithCaseTest.java
@@ -73,11 +73,11 @@ public static Iterable<Object[]> constructorFeeder()
         "2011-01-13T00:00:00.000Z\tspot\tautomotive\t1000\t10000.0\t10000.0\t100000\t10\t10.0\t10.0\tpreferred\ta\u0001preferred\t94.874713"
     );
 
-    IncrementalIndex index1 = TestIndex.makeRealtimeIndex(input);
-    IncrementalIndex index2 = TestIndex.makeRealtimeIndex(input);
+    IncrementalIndex index1 = TestIndex.makeIncrementalIndexFromTsvCharSource(input);
+    IncrementalIndex index2 = TestIndex.makeIncrementalIndexFromTsvCharSource(input);
 
-    QueryableIndex index3 = TestIndex.persistRealtimeAndLoadMMapped(index1);
-    QueryableIndex index4 = TestIndex.persistRealtimeAndLoadMMapped(index2);
+    QueryableIndex index3 = TestIndex.persistAndMemoryMap(index1);
+    QueryableIndex index4 = TestIndex.persistAndMemoryMap(index2);
 
     final List<QueryRunner<Result<SearchResultValue>>> runners = new ArrayList<>();
     for (SearchQueryConfig config : configs) {
diff --git a/processing/src/test/java/org/apache/druid/query/timeboundary/TimeBoundaryQueryRunnerTest.java b/processing/src/test/java/org/apache/druid/query/timeboundary/TimeBoundaryQueryRunnerTest.java
index d5cafdbb3423..f4659260cb12 100644
--- a/processing/src/test/java/org/apache/druid/query/timeboundary/TimeBoundaryQueryRunnerTest.java
+++ b/processing/src/test/java/org/apache/druid/query/timeboundary/TimeBoundaryQueryRunnerTest.java
@@ -152,8 +152,8 @@ private QueryRunner getCustomRunner() throws IOException
     CharSource v_0112 = CharSource.wrap(StringUtils.join(V_0112, "\n"));
     CharSource v_0113 = CharSource.wrap(StringUtils.join(V_0113, "\n"));
 
-    IncrementalIndex index0 = TestIndex.loadIncrementalIndex(newIndex("2011-01-12T00:00:00.000Z"), v_0112);
-    IncrementalIndex index1 = TestIndex.loadIncrementalIndex(newIndex("2011-01-14T00:00:00.000Z"), v_0113);
+    IncrementalIndex index0 = TestIndex.loadIncrementalIndexFromTsvCharSource(newIndex("2011-01-12T00:00:00.000Z"), v_0112);
+    IncrementalIndex index1 = TestIndex.loadIncrementalIndexFromTsvCharSource(newIndex("2011-01-14T00:00:00.000Z"), v_0113);
 
     segment0 = new IncrementalIndexSegment(index0, makeIdentifier(index0, "v1"));
     segment1 = new IncrementalIndexSegment(index1, makeIdentifier(index1, "v1"));
diff --git a/processing/src/test/java/org/apache/druid/segment/CustomSegmentizerFactoryTest.java b/processing/src/test/java/org/apache/druid/segment/CustomSegmentizerFactoryTest.java
index 227636b3eef6..11bef46dc686 100644
--- a/processing/src/test/java/org/apache/druid/segment/CustomSegmentizerFactoryTest.java
+++ b/processing/src/test/java/org/apache/druid/segment/CustomSegmentizerFactoryTest.java
@@ -77,7 +77,7 @@ public static void setup()
   @Test
   public void testDefaultSegmentizerPersist() throws IOException
   {
-    IncrementalIndex data = TestIndex.makeRealtimeIndex("druid.sample.numeric.tsv");
+    IncrementalIndex data = TestIndex.makeSampleNumericIncrementalIndex();
     File segment = new File(temporaryFolder.newFolder(), "segment");
     File persisted = INDEX_MERGER.persist(
         data,
@@ -96,7 +96,7 @@ public void testDefaultSegmentizerPersist() throws IOException
   @Test
   public void testCustomSegmentizerPersist() throws IOException
   {
-    IncrementalIndex data = TestIndex.makeRealtimeIndex("druid.sample.numeric.tsv");
+    IncrementalIndex data = TestIndex.makeSampleNumericIncrementalIndex();
     File segment = new File(temporaryFolder.newFolder(), "segment");
     File persisted = INDEX_MERGER.persist(
         data,
diff --git a/processing/src/test/java/org/apache/druid/segment/SchemalessIndexTest.java b/processing/src/test/java/org/apache/druid/segment/SchemalessIndexTest.java
index 273e2596597f..220baec27b77 100644
--- a/processing/src/test/java/org/apache/druid/segment/SchemalessIndexTest.java
+++ b/processing/src/test/java/org/apache/druid/segment/SchemalessIndexTest.java
@@ -171,7 +171,7 @@ public static QueryableIndex getIncrementalIndex(int index1, int index2)
 
         count++;
       }
-      QueryableIndex retVal = TestIndex.persistRealtimeAndLoadMMapped(theIndex);
+      QueryableIndex retVal = TestIndex.persistAndMemoryMap(theIndex);
       entry.put(index2, retVal);
       return retVal;
     }
diff --git a/processing/src/test/java/org/apache/druid/segment/SchemalessTestSimpleTest.java b/processing/src/test/java/org/apache/druid/segment/SchemalessTestSimpleTest.java
index d7bd054267cc..23498cf6d3ba 100644
--- a/processing/src/test/java/org/apache/druid/segment/SchemalessTestSimpleTest.java
+++ b/processing/src/test/java/org/apache/druid/segment/SchemalessTestSimpleTest.java
@@ -83,7 +83,7 @@ public static Collection<?> constructorFeeder()
     for (SegmentWriteOutMediumFactory segmentWriteOutMediumFactory : SegmentWriteOutMediumFactory.builtInFactories()) {
       SchemalessIndexTest schemalessIndexTest = new SchemalessIndexTest(segmentWriteOutMediumFactory);
       final IncrementalIndex incrementalIndex = SchemalessIndexTest.getIncrementalIndex();
-      final QueryableIndex persistedIncrementalIndex = TestIndex.persistRealtimeAndLoadMMapped(incrementalIndex);
+      final QueryableIndex persistedIncrementalIndex = TestIndex.persistAndMemoryMap(incrementalIndex);
       final QueryableIndex mergedIncrementalIndex = schemalessIndexTest.getMergedIncrementalIndex();
       argumentArrays.add(new Object[] {new IncrementalIndexSegment(incrementalIndex, null), false});
       argumentArrays.add(new Object[] {new QueryableIndexSegment(persistedIncrementalIndex, null), false});
diff --git a/processing/src/test/java/org/apache/druid/segment/TestHelper.java b/processing/src/test/java/org/apache/druid/segment/TestHelper.java
index ef9a91112163..23589ca065c2 100644
--- a/processing/src/test/java/org/apache/druid/segment/TestHelper.java
+++ b/processing/src/test/java/org/apache/druid/segment/TestHelper.java
@@ -447,6 +447,9 @@ public static void assertRow(String msg, ResultRow expected, ResultRow actual)
           );
         }
       } else if (expectedValue instanceof Float || expectedValue instanceof Double) {
+        if (actualValue == null) {
+          Assert.fail(message + ": failed because expected numeric value is actually null");
+        }
         Assert.assertEquals(
             message,
             ((Number) expectedValue).doubleValue(),
diff --git a/processing/src/test/java/org/apache/druid/segment/TestIndex.java b/processing/src/test/java/org/apache/druid/segment/TestIndex.java
index d0c93a270d0f..b4cd022e442c 100644
--- a/processing/src/test/java/org/apache/druid/segment/TestIndex.java
+++ b/processing/src/test/java/org/apache/druid/segment/TestIndex.java
@@ -21,15 +21,18 @@
 
 import com.google.common.base.Supplier;
 import com.google.common.base.Suppliers;
+import com.google.common.collect.ImmutableList;
 import com.google.common.io.CharSource;
 import com.google.common.io.LineProcessor;
 import com.google.common.io.Resources;
+import org.apache.druid.data.input.InputFormat;
 import org.apache.druid.data.input.ResourceInputSource;
 import org.apache.druid.data.input.impl.DelimitedParseSpec;
 import org.apache.druid.data.input.impl.DimensionSchema;
 import org.apache.druid.data.input.impl.DimensionsSpec;
 import org.apache.druid.data.input.impl.DoubleDimensionSchema;
 import org.apache.druid.data.input.impl.FloatDimensionSchema;
+import org.apache.druid.data.input.impl.JsonInputFormat;
 import org.apache.druid.data.input.impl.LongDimensionSchema;
 import org.apache.druid.data.input.impl.StringDimensionSchema;
 import org.apache.druid.data.input.impl.StringInputRowParser;
@@ -38,7 +41,7 @@
 import org.apache.druid.java.util.common.FileUtils;
 import org.apache.druid.java.util.common.Intervals;
 import org.apache.druid.java.util.common.logger.Logger;
-import org.apache.druid.query.NestedDataTestUtils;
+import org.apache.druid.java.util.common.parsers.JSONPathSpec;
 import org.apache.druid.query.aggregation.AggregatorFactory;
 import org.apache.druid.query.aggregation.DoubleMaxAggregatorFactory;
 import org.apache.druid.query.aggregation.DoubleMinAggregatorFactory;
@@ -69,12 +72,17 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicLong;
+import java.util.stream.Collectors;
 
 /**
  *
  */
 public class TestIndex
 {
+  public static final String SAMPLE_NUMERIC_JSON = "druid.sample.numeric.json";
+  public static final String SAMPLE_NUMERIC_JSON_TOP = "druid.sample.numeric.top.json";
+  public static final String SAMPLE_NUMERIC_JSON_BOTTOM = "druid.sample.numeric.bottom.json";
+
   public static final String[] COLUMNS = new String[]{
       "ts",
       "market",
@@ -108,7 +116,6 @@ public class TestIndex
       new DoubleDimensionSchema("doubleNumericNull"),
       new StringDimensionSchema("placement"),
       new StringDimensionSchema("placementish"),
-      new StringDimensionSchema("partial_null_column"),
       new StringDimensionSchema("null_column")
   );
 
@@ -146,6 +153,10 @@ public class TestIndex
   );
 
   public static final DimensionsSpec DIMENSIONS_SPEC = new DimensionsSpec(DIMENSION_SCHEMAS);
+  public static final DimensionsSpec DIMENSIONS_SPEC_PARTIAL_NO_STRINGS =
+      new DimensionsSpec(
+          DIMENSION_SCHEMAS.stream().filter(x -> !(x instanceof StringDimensionSchema)).collect(Collectors.toList())
+      );
   public static final DimensionsSpec DIMENSIONS_SPEC_NON_TIME_ORDERED =
       new DimensionsSpec(DIMENSION_SCHEMAS_NON_TIME_ORDERED);
   public static final DimensionsSpec DIMENSIONS_SPEC_NO_BITMAPS = new DimensionsSpec(DIMENSION_SCHEMAS_NO_BITMAP);
@@ -170,6 +181,14 @@ public class TestIndex
   };
   public static final IndexSpec INDEX_SPEC = IndexSpec.DEFAULT;
 
+  public static final JsonInputFormat DEFAULT_JSON_INPUT_FORMAT = new JsonInputFormat(
+      JSONPathSpec.DEFAULT,
+      null,
+      null,
+      null,
+      null
+  );
+
   public static final IndexMerger INDEX_MERGER =
       TestHelper.getTestIndexMergerV9(OffHeapMemorySegmentWriteOutMediumFactory.instance());
   public static final IndexIO INDEX_IO = TestHelper.getTestIndexIO();
@@ -179,46 +198,53 @@ public class TestIndex
   }
 
   private static Supplier<IncrementalIndex> realtimeIndex = Suppliers.memoize(
-      () -> makeRealtimeIndex("druid.sample.numeric.tsv")
+      TestIndex::makeSampleNumericIncrementalIndex
+  );
+  private static Supplier<IncrementalIndex> realtimeIndexPartialSchemaLegacyStringDiscovery = Suppliers.memoize(
+      () -> fromJsonResource(
+          SAMPLE_NUMERIC_JSON,
+          true,
+          DIMENSIONS_SPEC_PARTIAL_NO_STRINGS
+      )
   );
   private static Supplier<IncrementalIndex> nonTimeOrderedRealtimeIndex = Suppliers.memoize(
-      () -> makeRealtimeIndex("druid.sample.numeric.tsv", true, DIMENSIONS_SPEC_NON_TIME_ORDERED)
+      () -> fromJsonResource(SAMPLE_NUMERIC_JSON, true, DIMENSIONS_SPEC_NON_TIME_ORDERED)
   );
   private static Supplier<IncrementalIndex> nonTimeOrderedNoRollupRealtimeIndex = Suppliers.memoize(
-      () -> makeRealtimeIndex("druid.sample.numeric.tsv", false, DIMENSIONS_SPEC_NON_TIME_ORDERED)
+      () -> fromJsonResource(SAMPLE_NUMERIC_JSON, false, DIMENSIONS_SPEC_NON_TIME_ORDERED)
   );
   private static Supplier<IncrementalIndex> noRollupRealtimeIndex = Suppliers.memoize(
-      () -> makeRealtimeIndex("druid.sample.numeric.tsv", false)
+      () -> fromJsonResource(SAMPLE_NUMERIC_JSON, false, DIMENSIONS_SPEC)
   );
   private static Supplier<IncrementalIndex> noBitmapRealtimeIndex = Suppliers.memoize(
-      () -> makeRealtimeIndex("druid.sample.numeric.tsv", false, DIMENSIONS_SPEC_NO_BITMAPS)
+      () -> fromJsonResource(SAMPLE_NUMERIC_JSON, false, DIMENSIONS_SPEC_NO_BITMAPS)
   );
   private static Supplier<QueryableIndex> mmappedIndex = Suppliers.memoize(
-      () -> persistRealtimeAndLoadMMapped(realtimeIndex.get())
+      () -> persistAndMemoryMap(makeSampleNumericIncrementalIndex())
   );
 
   private static Supplier<QueryableIndex> mmappedIndexCompressedComplex = Suppliers.memoize(
-      () -> persistRealtimeAndLoadMMapped(
-          realtimeIndex.get(),
+      () -> persistAndMemoryMap(
+          makeSampleNumericIncrementalIndex(),
           IndexSpec.builder().withComplexMetricCompression(CompressionStrategy.LZ4).build()
       )
   );
   private static Supplier<QueryableIndex> nonTimeOrderedMmappedIndex = Suppliers.memoize(
-      () -> persistRealtimeAndLoadMMapped(nonTimeOrderedRealtimeIndex.get())
+      () -> persistAndMemoryMap(fromJsonResource(SAMPLE_NUMERIC_JSON, true, DIMENSIONS_SPEC_NON_TIME_ORDERED))
   );
   private static Supplier<QueryableIndex> nonTimeOrderedNoRollupMmappedIndex = Suppliers.memoize(
-      () -> persistRealtimeAndLoadMMapped(nonTimeOrderedNoRollupRealtimeIndex.get())
+      () -> persistAndMemoryMap(fromJsonResource(SAMPLE_NUMERIC_JSON, false, DIMENSIONS_SPEC_NON_TIME_ORDERED))
   );
   private static Supplier<QueryableIndex> noRollupMmappedIndex = Suppliers.memoize(
-      () -> persistRealtimeAndLoadMMapped(noRollupRealtimeIndex.get())
+      () -> persistAndMemoryMap(fromJsonResource(SAMPLE_NUMERIC_JSON, false, DIMENSIONS_SPEC))
   );
   private static Supplier<QueryableIndex> noBitmapMmappedIndex = Suppliers.memoize(
-      () -> persistRealtimeAndLoadMMapped(noBitmapRealtimeIndex.get())
+      () -> persistAndMemoryMap(fromJsonResource(SAMPLE_NUMERIC_JSON, false, DIMENSIONS_SPEC_NO_BITMAPS))
   );
   private static Supplier<QueryableIndex> mergedRealtime = Suppliers.memoize(() -> {
     try {
-      IncrementalIndex top = makeRealtimeIndex("druid.sample.numeric.tsv.top");
-      IncrementalIndex bottom = makeRealtimeIndex("druid.sample.numeric.tsv.bottom");
+      IncrementalIndex top = makeSampleNumericTopIncrementalIndex();
+      IncrementalIndex bottom = makeSampleNumericBottomIncrementalIndex();
 
       File tmpFile = File.createTempFile("yay", "who");
       tmpFile.delete();
@@ -254,8 +280,8 @@ public class TestIndex
     }
   });
   private static Supplier<QueryableIndex> frontCodedMmappedIndex = Suppliers.memoize(
-      () -> persistRealtimeAndLoadMMapped(
-          realtimeIndex.get(),
+      () -> persistAndMemoryMap(
+          makeSampleNumericIncrementalIndex(),
           IndexSpec.builder()
                    .withStringDictionaryEncoding(
                        new StringEncodingStrategy.FrontCoded(4, FrontCodedIndexed.V1)
@@ -264,7 +290,7 @@ public class TestIndex
       )
   );
   private static Supplier<QueryableIndex> wikipediaMMappedIndex = Suppliers.memoize(
-      () -> persistRealtimeAndLoadMMapped(makeWikipediaIncrementalIndex())
+      () -> persistAndMemoryMap(makeWikipediaIncrementalIndex())
   );
 
   public static IncrementalIndex getIncrementalTestIndex()
@@ -272,6 +298,11 @@ public static IncrementalIndex getIncrementalTestIndex()
     return realtimeIndex.get();
   }
 
+  public static IncrementalIndex getIncrementalTestIndexPartialSchemaLegacyStringDiscovery()
+  {
+    return realtimeIndexPartialSchemaLegacyStringDiscovery.get();
+  }
+
   public static IncrementalIndex getNoRollupIncrementalTestIndex()
   {
     return noRollupRealtimeIndex.get();
@@ -337,26 +368,143 @@ public static QueryableIndex getMMappedTestIndexCompressedComplex()
     return mmappedIndexCompressedComplex.get();
   }
 
-  public static IncrementalIndex makeRealtimeIndex(final String resourceFilename)
+  public static IncrementalIndex makeSampleNumericIncrementalIndex()
+  {
+    return fromJsonResource(
+        SAMPLE_NUMERIC_JSON,
+        true,
+        DIMENSIONS_SPEC
+    );
+  }
+
+  public static IncrementalIndex makeSampleNumericTopIncrementalIndex()
   {
-    return makeRealtimeIndex(resourceFilename, true);
+    return fromJsonResource(
+        SAMPLE_NUMERIC_JSON_TOP,
+        true,
+        DIMENSIONS_SPEC
+    );
   }
 
-  public static IncrementalIndex makeRealtimeIndex(final String resourceFilename, boolean rollup)
+  public static IncrementalIndex makeSampleNumericBottomIncrementalIndex()
   {
-    return makeRealtimeIndex(resourceFilename, rollup, DIMENSIONS_SPEC);
+    return fromJsonResource(
+        SAMPLE_NUMERIC_JSON_BOTTOM,
+        true,
+        DIMENSIONS_SPEC
+    );
   }
 
-  public static IncrementalIndex makeRealtimeIndex(
+  private static IncrementalIndex fromJsonResource(
       final String resourceFilename,
       boolean rollup,
       DimensionsSpec dimensionsSpec
   )
   {
-    CharSource stream = getResourceCharSource(resourceFilename);
-    return makeRealtimeIndex(stream, rollup, dimensionsSpec);
+    return makeIncrementalIndexFromResource(
+        resourceFilename,
+        new IncrementalIndexSchema.Builder()
+            .withMinTimestamp(DateTimes.of("2011-01-12T00:00:00.000Z").getMillis())
+            .withTimestampSpec(new TimestampSpec("ts", "iso", null))
+            .withDimensionsSpec(DimensionsSpec.builder().setDimensions(dimensionsSpec.getDimensions()).setDimensionExclusions(ImmutableList.of("index")).setIncludeAllDimensions(true).build())
+            .withVirtualColumns(VIRTUAL_COLUMNS)
+            .withMetrics(METRIC_AGGS)
+            .withRollup(rollup)
+            .build(),
+        DEFAULT_JSON_INPUT_FORMAT
+    );
+  }
+
+  public static IncrementalIndex makeWikipediaIncrementalIndex()
+  {
+    return makeIncrementalIndexFromResource(
+        "wikipedia/wikiticker-2015-09-12-sampled.json.gz",
+        IncrementalIndexSchema.builder()
+                              .withRollup(false)
+                              .withTimestampSpec(new TimestampSpec("time", null, null))
+                              .withDimensionsSpec(
+                                  DimensionsSpec.builder()
+                                                .setDimensions(
+                                                    Arrays.asList(
+                                                        new StringDimensionSchema("channel"),
+                                                        new StringDimensionSchema("cityName"),
+                                                        new StringDimensionSchema("comment"),
+                                                        new StringDimensionSchema("countryIsoCode"),
+                                                        new StringDimensionSchema("countryName"),
+                                                        new StringDimensionSchema("isAnonymous"),
+                                                        new StringDimensionSchema("isMinor"),
+                                                        new StringDimensionSchema("isNew"),
+                                                        new StringDimensionSchema("isRobot"),
+                                                        new StringDimensionSchema("isUnpatrolled"),
+                                                        new StringDimensionSchema("metroCode"),
+                                                        new StringDimensionSchema("namespace"),
+                                                        new StringDimensionSchema("page"),
+                                                        new StringDimensionSchema("regionIsoCode"),
+                                                        new StringDimensionSchema("regionName"),
+                                                        new StringDimensionSchema("user"),
+                                                        new LongDimensionSchema("delta"),
+                                                        new LongDimensionSchema("added"),
+                                                        new LongDimensionSchema("deleted")
+                                                    )
+                                                )
+                                                .build()
+                              )
+                              .build(),
+        DEFAULT_JSON_INPUT_FORMAT
+    );
+  }
+
+  public static IncrementalIndex makeIncrementalIndexFromResource(
+      final String resourceFilename,
+      IncrementalIndexSchema schema,
+      InputFormat inputFormat
+  )
+  {
+    File tmpDir = null;
+    try {
+      tmpDir = FileUtils.createTempDir("test-index-input-source");
+      return IndexBuilder
+          .create()
+          .tmpDir(tmpDir)
+          .segmentWriteOutMediumFactory(OffHeapMemorySegmentWriteOutMediumFactory.instance())
+          .schema(schema)
+          .inputSource(ResourceInputSource.of(TestIndex.class.getClassLoader(), resourceFilename))
+          .inputFormat(inputFormat)
+          .inputTmpDir(new File(tmpDir, resourceFilename))
+          .buildIncrementalIndex();
+    }
+    finally {
+      try {
+        FileUtils.deleteDirectory(tmpDir);
+      }
+      catch (IOException e) {
+        throw new RuntimeException(e);
+      }
+    }
+  }
+
+  public static QueryableIndex persistAndMemoryMap(IncrementalIndex index)
+  {
+    return persistAndMemoryMap(index, INDEX_SPEC);
+  }
+
+  public static QueryableIndex persistAndMemoryMap(IncrementalIndex index, IndexSpec indexSpec)
+  {
+    try {
+      File someTmpFile = File.createTempFile("billy", "yay");
+      someTmpFile.delete();
+      FileUtils.mkdirp(someTmpFile);
+      someTmpFile.deleteOnExit();
+
+      INDEX_MERGER.persist(index, someTmpFile, indexSpec, null);
+      return INDEX_IO.loadIndex(someTmpFile);
+    }
+    catch (IOException e) {
+      throw new RuntimeException(e);
+    }
   }
 
+
   public static CharSource getResourceCharSource(final String resourceFilename)
   {
     final URL resource = TestIndex.class.getClassLoader().getResource(resourceFilename);
@@ -367,24 +515,15 @@ public static CharSource getResourceCharSource(final String resourceFilename)
     return Resources.asByteSource(resource).asCharSource(StandardCharsets.UTF_8);
   }
 
-  public static IncrementalIndex makeRealtimeIndex(final CharSource source)
-  {
-    return makeRealtimeIndex(source, true, DIMENSIONS_SPEC);
-  }
-
-  public static IncrementalIndex makeRealtimeIndex(
-      final CharSource source,
-      boolean rollup,
-      DimensionsSpec dimensionsSpec
-  )
+  public static IncrementalIndex makeIncrementalIndexFromTsvCharSource(final CharSource source)
   {
     final IncrementalIndexSchema schema = new IncrementalIndexSchema.Builder()
         .withMinTimestamp(DateTimes.of("2011-01-12T00:00:00.000Z").getMillis())
         .withTimestampSpec(new TimestampSpec("ds", "auto", null))
-        .withDimensionsSpec(dimensionsSpec)
+        .withDimensionsSpec(DIMENSIONS_SPEC)
         .withVirtualColumns(VIRTUAL_COLUMNS)
         .withMetrics(METRIC_AGGS)
-        .withRollup(rollup)
+        .withRollup(true)
         .build();
     final IncrementalIndex retVal = new OnheapIncrementalIndex.Builder()
         .setIndexSchema(schema)
@@ -392,75 +531,14 @@ public static IncrementalIndex makeRealtimeIndex(
         .build();
 
     try {
-      return loadIncrementalIndex(retVal, source);
+      return loadIncrementalIndexFromTsvCharSource(retVal, source);
     }
     catch (Exception e) {
-      if (rollup) {
-        realtimeIndex = null;
-      } else {
-        noRollupRealtimeIndex = null;
-      }
-      throw new RuntimeException(e);
-    }
-  }
-
-  public static IncrementalIndex makeWikipediaIncrementalIndex()
-  {
-    final List<DimensionSchema> dimensions = Arrays.asList(
-        new StringDimensionSchema("channel"),
-        new StringDimensionSchema("cityName"),
-        new StringDimensionSchema("comment"),
-        new StringDimensionSchema("countryIsoCode"),
-        new StringDimensionSchema("countryName"),
-        new StringDimensionSchema("isAnonymous"),
-        new StringDimensionSchema("isMinor"),
-        new StringDimensionSchema("isNew"),
-        new StringDimensionSchema("isRobot"),
-        new StringDimensionSchema("isUnpatrolled"),
-        new StringDimensionSchema("metroCode"),
-        new StringDimensionSchema("namespace"),
-        new StringDimensionSchema("page"),
-        new StringDimensionSchema("regionIsoCode"),
-        new StringDimensionSchema("regionName"),
-        new StringDimensionSchema("user"),
-        new LongDimensionSchema("delta"),
-        new LongDimensionSchema("added"),
-        new LongDimensionSchema("deleted")
-    );
-
-    final File tmpDir;
-    try {
-      tmpDir = FileUtils.createTempDir("test-index-input-source");
-      try {
-        return IndexBuilder
-            .create()
-            .segmentWriteOutMediumFactory(OffHeapMemorySegmentWriteOutMediumFactory.instance())
-            .schema(new IncrementalIndexSchema.Builder()
-                        .withRollup(false)
-                        .withTimestampSpec(new TimestampSpec("time", null, null))
-                        .withDimensionsSpec(new DimensionsSpec(dimensions))
-                        .build()
-            )
-            .inputSource(
-                ResourceInputSource.of(
-                    TestIndex.class.getClassLoader(),
-                    "wikipedia/wikiticker-2015-09-12-sampled.json.gz"
-                )
-            )
-            .inputFormat(NestedDataTestUtils.DEFAULT_JSON_INPUT_FORMAT)
-            .inputTmpDir(new File(tmpDir, "tmpWikipedia1"))
-            .buildIncrementalIndex();
-      }
-      finally {
-        FileUtils.deleteDirectory(tmpDir);
-      }
-    }
-    catch (IOException e) {
       throw new RuntimeException(e);
     }
   }
 
-  public static IncrementalIndex loadIncrementalIndex(
+  public static IncrementalIndex loadIncrementalIndexFromTsvCharSource(
       final IncrementalIndex retVal,
       final CharSource source
   ) throws IOException
@@ -477,10 +555,10 @@ public static IncrementalIndex loadIncrementalIndex(
         ),
         "utf8"
     );
-    return loadIncrementalIndex(() -> retVal, source, parser);
+    return loadIncrementalIndexFromCharSource(() -> retVal, source, parser);
   }
 
-  public static IncrementalIndex loadIncrementalIndex(
+  public static IncrementalIndex loadIncrementalIndexFromCharSource(
       final Supplier<IncrementalIndex> indexSupplier,
       final CharSource source,
       final StringInputRowParser parser
@@ -519,25 +597,4 @@ public Integer getResult()
 
     return retVal;
   }
-
-  public static QueryableIndex persistRealtimeAndLoadMMapped(IncrementalIndex index)
-  {
-    return persistRealtimeAndLoadMMapped(index, INDEX_SPEC);
-  }
-
-  public static QueryableIndex persistRealtimeAndLoadMMapped(IncrementalIndex index, IndexSpec indexSpec)
-  {
-    try {
-      File someTmpFile = File.createTempFile("billy", "yay");
-      someTmpFile.delete();
-      FileUtils.mkdirp(someTmpFile);
-      someTmpFile.deleteOnExit();
-
-      INDEX_MERGER.persist(index, someTmpFile, indexSpec, null);
-      return INDEX_IO.loadIndex(someTmpFile);
-    }
-    catch (IOException e) {
-      throw new RuntimeException(e);
-    }
-  }
 }
diff --git a/processing/src/test/java/org/apache/druid/segment/UnnestCursorFactoryTest.java b/processing/src/test/java/org/apache/druid/segment/UnnestCursorFactoryTest.java
index 32770f91f2e5..d736b5622730 100644
--- a/processing/src/test/java/org/apache/druid/segment/UnnestCursorFactoryTest.java
+++ b/processing/src/test/java/org/apache/druid/segment/UnnestCursorFactoryTest.java
@@ -141,7 +141,7 @@ public static void setup() throws IOException
                                    )
                                    .indexSpec(IndexSpec.DEFAULT)
                                    .inputSource(inputSource)
-                                   .inputFormat(NestedDataTestUtils.DEFAULT_JSON_INPUT_FORMAT)
+                                   .inputFormat(TestIndex.DEFAULT_JSON_INPUT_FORMAT)
                                    .transform(TransformSpec.NONE)
                                    .inputTmpDir(tmp.newFolder());
     QUERYABLE_INDEX = CLOSER.register(bob.buildMMappedIndex());
diff --git a/processing/src/test/java/org/apache/druid/segment/incremental/IncrementalIndexCursorFactoryTest.java b/processing/src/test/java/org/apache/druid/segment/incremental/IncrementalIndexCursorFactoryTest.java
index 527139528113..e4c6396c0a00 100644
--- a/processing/src/test/java/org/apache/druid/segment/incremental/IncrementalIndexCursorFactoryTest.java
+++ b/processing/src/test/java/org/apache/druid/segment/incremental/IncrementalIndexCursorFactoryTest.java
@@ -234,10 +234,10 @@ public void testSanity() throws Exception
     Assert.assertEquals(2, results.size());
 
     ResultRow row = results.get(0);
-    Assert.assertArrayEquals(new Object[]{NullHandling.defaultStringValue(), "bo", 1L}, row.getArray());
+    Assert.assertArrayEquals(new Object[]{null, "bo", 1L}, row.getArray());
 
     row = results.get(1);
-    Assert.assertArrayEquals(new Object[]{"hi", NullHandling.defaultStringValue(), 1L}, row.getArray());
+    Assert.assertArrayEquals(new Object[]{"hi", null, 1L}, row.getArray());
   }
 
   @Test
@@ -297,7 +297,7 @@ public void testObjectColumnSelectorOnVaryingColumnSchema() throws Exception
     Assert.assertEquals(2, results.size());
 
     ResultRow row = results.get(0);
-    Assert.assertArrayEquals(new Object[]{"hi", NullHandling.defaultStringValue(), 1L, 2.0}, row.getArray());
+    Assert.assertArrayEquals(new Object[]{"hi", null, 1L, 2.0}, row.getArray());
 
     row = results.get(1);
     Assert.assertArrayEquals(
@@ -446,7 +446,7 @@ public void testFilterByNull() throws Exception
     Assert.assertEquals(1, results.size());
 
     ResultRow row = results.get(0);
-    Assert.assertArrayEquals(new Object[]{"hi", NullHandling.defaultStringValue(), 1L}, row.getArray());
+    Assert.assertArrayEquals(new Object[]{"hi", null, 1L}, row.getArray());
   }
 
   @Test
@@ -629,15 +629,15 @@ public void testCursoringAndSnapshot() throws Exception
         IndexedInts rowC = dimSelector1C.getRow();
         rowC.forEach(i -> Assert.assertTrue(i < cardinalityA));
         IndexedInts rowD = dimSelector2D.getRow();
-        // no null id, so should get empty dims array
-        Assert.assertEquals(0, rowD.size());
+        Assert.assertEquals(1, rowD.size());
+        Assert.assertEquals(1, rowD.get(0));
         IndexedInts rowE = dimSelector3E.getRow();
         if (NullHandling.replaceWithDefault()) {
           Assert.assertEquals(1, rowE.size());
-          // the null id
           Assert.assertEquals(0, rowE.get(0));
         } else {
-          Assert.assertEquals(0, rowE.size());
+          Assert.assertEquals(1, rowE.size());
+          Assert.assertEquals(1, rowE.get(0));
         }
         cursor.advance();
         rowNumInCursor++;
diff --git a/processing/src/test/java/org/apache/druid/segment/join/table/BroadcastSegmentIndexedTableTest.java b/processing/src/test/java/org/apache/druid/segment/join/table/BroadcastSegmentIndexedTableTest.java
index 8df2bffb2fd6..8946db13cc8e 100644
--- a/processing/src/test/java/org/apache/druid/segment/join/table/BroadcastSegmentIndexedTableTest.java
+++ b/processing/src/test/java/org/apache/druid/segment/join/table/BroadcastSegmentIndexedTableTest.java
@@ -118,7 +118,7 @@ public void setup() throws IOException, SegmentLoadingException
     final IndexMerger indexMerger =
         new IndexMergerV9(mapper, indexIO, OffHeapMemorySegmentWriteOutMediumFactory.instance());
     Interval testInterval = Intervals.of("2011-01-12T00:00:00.000Z/2011-05-01T00:00:00.000Z");
-    IncrementalIndex data = TestIndex.makeRealtimeIndex("druid.sample.numeric.tsv");
+    IncrementalIndex data = TestIndex.makeSampleNumericIncrementalIndex();
     File segment = new File(temporaryFolder.newFolder(), "segment");
     File persisted = indexMerger.persist(
         data,
diff --git a/processing/src/test/java/org/apache/druid/segment/loading/BroadcastJoinableMMappedQueryableSegmentizerFactoryTest.java b/processing/src/test/java/org/apache/druid/segment/loading/BroadcastJoinableMMappedQueryableSegmentizerFactoryTest.java
index 9ce676f5ba69..cbb948133814 100644
--- a/processing/src/test/java/org/apache/druid/segment/loading/BroadcastJoinableMMappedQueryableSegmentizerFactoryTest.java
+++ b/processing/src/test/java/org/apache/druid/segment/loading/BroadcastJoinableMMappedQueryableSegmentizerFactoryTest.java
@@ -84,7 +84,7 @@ public void testSegmentizer() throws IOException, SegmentLoadingException
         KEY_COLUMNS
     );
     Interval testInterval = Intervals.of("2011-01-12T00:00:00.000Z/2011-05-01T00:00:00.000Z");
-    IncrementalIndex data = TestIndex.makeRealtimeIndex("druid.sample.numeric.tsv");
+    IncrementalIndex data = TestIndex.makeSampleNumericIncrementalIndex();
 
     List<String> columnNames = data.getColumnNames();
     File segment = new File(temporaryFolder.newFolder(), "segment");
diff --git a/processing/src/test/java/org/apache/druid/segment/nested/NestedFieldColumnSelectorsTest.java b/processing/src/test/java/org/apache/druid/segment/nested/NestedFieldColumnSelectorsTest.java
index 377db0f4f54a..528364a1c039 100644
--- a/processing/src/test/java/org/apache/druid/segment/nested/NestedFieldColumnSelectorsTest.java
+++ b/processing/src/test/java/org/apache/druid/segment/nested/NestedFieldColumnSelectorsTest.java
@@ -37,6 +37,7 @@
 import org.apache.druid.segment.IndexSpec;
 import org.apache.druid.segment.LongColumnSelector;
 import org.apache.druid.segment.Segment;
+import org.apache.druid.segment.TestIndex;
 import org.apache.druid.segment.VirtualColumns;
 import org.apache.druid.segment.column.ColumnType;
 import org.apache.druid.segment.transform.TransformSpec;
@@ -333,7 +334,7 @@ private ColumnSelectorFactory getNumericColumnSelectorFactory(VirtualColumns vir
         tempFolder,
         closer,
         NestedDataTestUtils.NUMERIC_DATA_FILE,
-        NestedDataTestUtils.DEFAULT_JSON_INPUT_FORMAT,
+        TestIndex.DEFAULT_JSON_INPUT_FORMAT,
         NestedDataTestUtils.TIMESTAMP_SPEC,
         NestedDataTestUtils.AUTO_DISCOVERY,
         TransformSpec.NONE,
@@ -358,7 +359,7 @@ private VectorColumnSelectorFactory getVectorColumnSelectorFactory(VirtualColumn
         tempFolder,
         closer,
         NestedDataTestUtils.NUMERIC_DATA_FILE,
-        NestedDataTestUtils.DEFAULT_JSON_INPUT_FORMAT,
+        TestIndex.DEFAULT_JSON_INPUT_FORMAT,
         NestedDataTestUtils.TIMESTAMP_SPEC,
         NestedDataTestUtils.AUTO_DISCOVERY,
         TransformSpec.NONE,
diff --git a/processing/src/test/java/org/apache/druid/segment/virtual/ExpressionSelectorsTest.java b/processing/src/test/java/org/apache/druid/segment/virtual/ExpressionSelectorsTest.java
index a3060f078a2c..6bf483df36be 100644
--- a/processing/src/test/java/org/apache/druid/segment/virtual/ExpressionSelectorsTest.java
+++ b/processing/src/test/java/org/apache/druid/segment/virtual/ExpressionSelectorsTest.java
@@ -70,7 +70,6 @@
 import org.junit.Test;
 
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 
 public class ExpressionSelectorsTest extends InitializedNullHandlingTest
@@ -616,7 +615,7 @@ public void test_incrementalIndexStringSelector() throws IndexSizeExceededExcept
     // DimensionSelector.nameLookupPossibleInAdvance in the indexers of an IncrementalIndex, which resulted in an
     // exception trying to make an optimized string expression selector that was not appropriate to use for the
     // underlying dimension selector.
-    // This occurred during schemaless ingestion with spare dimension values and no explicit null rows, so the
+    // This occurred during schemaless ingestion with sparse dimension values and no explicit null rows, so the
     // conditions are replicated by this test. See https://github.com/apache/druid/pull/10248 for details
     IncrementalIndexSchema schema = IncrementalIndexSchema.builder()
                                                           .withTimestampSpec(new TimestampSpec("time", "millis", DateTimes.nowUtc()))
@@ -656,10 +655,8 @@ public void test_incrementalIndexStringSelector() throws IndexSizeExceededExcept
       while (!cursor.isDone()) {
         Object x = xExprSelector.getObject();
         Object y = yExprSelector.getObject();
-        List<String> expectedFoo = Collections.singletonList("foofoo");
-        List<String> expectedNull = NullHandling.replaceWithDefault()
-                                    ? Collections.singletonList("foo")
-                                    : Collections.singletonList(null);
+        String expectedFoo = "foofoo";
+        String expectedNull = NullHandling.replaceWithDefault() ? "foo" : null;
         if (rowCount == 0) {
           Assert.assertEquals(expectedFoo, x);
           Assert.assertEquals(expectedNull, y);
@@ -675,6 +672,43 @@ public void test_incrementalIndexStringSelector() throws IndexSizeExceededExcept
     }
   }
 
+  @Test
+  public void test_incrementalIndexStringSelectorCast() throws IndexSizeExceededException
+  {
+    IncrementalIndexSchema schema = IncrementalIndexSchema.builder()
+                                                          .withTimestampSpec(new TimestampSpec("time", "millis", DateTimes.nowUtc()))
+                                                          .withMetrics(new AggregatorFactory[]{new CountAggregatorFactory("count")})
+                                                          .build();
+
+    IncrementalIndex index = new OnheapIncrementalIndex.Builder().setMaxRowCount(100).setIndexSchema(schema).build();
+    index.add(
+        new MapBasedInputRow(
+            DateTimes.nowUtc().getMillis(),
+            ImmutableList.of("x"),
+            ImmutableMap.of("x", "1.1")
+        )
+    );
+
+    IncrementalIndexCursorFactory cursorFactory = new IncrementalIndexCursorFactory(index);
+    try (final CursorHolder cursorHolder = cursorFactory.makeCursorHolder(CursorBuildSpec.FULL_SCAN)) {
+      Cursor cursor = cursorHolder.asCursor();
+      ColumnValueSelector<?> xExprSelector = ExpressionSelectors.makeColumnValueSelector(
+          cursor.getColumnSelectorFactory(),
+          Parser.parse("cast(x, 'DOUBLE')", ExprMacroTable.nil())
+      );
+      int rowCount = 0;
+      while (!cursor.isDone()) {
+        Object x = xExprSelector.getObject();
+        double expectedFoo = 1.1;
+        Assert.assertEquals(expectedFoo, x);
+        rowCount++;
+        cursor.advance();
+      }
+
+      Assert.assertEquals(1, rowCount);
+    }
+  }
+
   private static DimensionSelector dimensionSelectorFromSupplier(
       final Supplier<String> supplier
   )
diff --git a/processing/src/test/resources/druid.sample.numeric.bottom.json b/processing/src/test/resources/druid.sample.numeric.bottom.json
new file mode 100644
index 000000000000..02cc00241aca
--- /dev/null
+++ b/processing/src/test/resources/druid.sample.numeric.bottom.json
@@ -0,0 +1,732 @@
+{"ts":"2011-01-12T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":100}
+{"ts":"2011-01-12T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":100}
+{"ts":"2011-01-12T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":100}
+{"ts":"2011-01-12T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":100}
+{"ts":"2011-01-12T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1000}
+{"ts":"2011-01-12T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":800,"partial_null_column":"value"}
+{"ts":"2011-01-13T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":94.874713}
+{"ts":"2011-01-13T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":110.087299}
+{"ts":"2011-01-13T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":104.465767}
+{"ts":"2011-01-13T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":108.863011}
+{"ts":"2011-01-13T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":106.236928}
+{"ts":"2011-01-13T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1689.012875}
+{"ts":"2011-01-13T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1564.617729,"partial_null_column":"value"}
+{"ts":"2011-01-14T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":102.670409}
+{"ts":"2011-01-14T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":94.000432}
+{"ts":"2011-01-14T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":101.38076}
+{"ts":"2011-01-14T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":114.974216}
+{"ts":"2011-01-14T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1049.141912}
+{"ts":"2011-01-14T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1006.402111,"partial_null_column":"value"}
+{"ts":"2011-01-15T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":82.840417}
+{"ts":"2011-01-15T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":100.551072}
+{"ts":"2011-01-15T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":100.582654}
+{"ts":"2011-01-15T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":102.366798}
+{"ts":"2011-01-15T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":120.48142}
+{"ts":"2011-01-15T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1545.708865}
+{"ts":"2011-01-15T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1458.402661,"partial_null_column":"value"}
+{"ts":"2011-01-16T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":100.591602}
+{"ts":"2011-01-16T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":93.085943}
+{"ts":"2011-01-16T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":100.192013}
+{"ts":"2011-01-16T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":87.280816}
+{"ts":"2011-01-16T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1016.965229}
+{"ts":"2011-01-16T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":852.437477,"partial_null_column":"value"}
+{"ts":"2011-01-17T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":105.442374}
+{"ts":"2011-01-17T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":99.189052}
+{"ts":"2011-01-17T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":103.692852}
+{"ts":"2011-01-17T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":106.696362}
+{"ts":"2011-01-17T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":134.415281}
+{"ts":"2011-01-17T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":953.995422}
+{"ts":"2011-01-17T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":712.774595,"partial_null_column":"value"}
+{"ts":"2011-01-18T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":107.244699}
+{"ts":"2011-01-18T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":103.018934}
+{"ts":"2011-01-18T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":104.724154}
+{"ts":"2011-01-18T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":88.764512}
+{"ts":"2011-01-18T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1022.78333}
+{"ts":"2011-01-18T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":846.267516,"partial_null_column":"value"}
+{"ts":"2011-01-19T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":85.681683}
+{"ts":"2011-01-19T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":92.314034}
+{"ts":"2011-01-19T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":105.087466}
+{"ts":"2011-01-19T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":104.568464}
+{"ts":"2011-01-19T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":109.772202}
+{"ts":"2011-01-19T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":849.877513}
+{"ts":"2011-01-19T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":594.381703,"partial_null_column":"value"}
+{"ts":"2011-01-20T01:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":106.367723}
+{"ts":"2011-01-20T01:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":96.112901}
+{"ts":"2011-01-20T01:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":105.225158}
+{"ts":"2011-01-20T01:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":77.759854}
+{"ts":"2011-01-20T01:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1066.208012}
+{"ts":"2011-01-20T01:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":870.115926,"partial_null_column":"value"}
+{"ts":"2011-01-22T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":105.282866}
+{"ts":"2011-01-22T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":103.527592}
+{"ts":"2011-01-22T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":103.399677}
+{"ts":"2011-01-22T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":107.627793}
+{"ts":"2011-01-22T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1240.525484}
+{"ts":"2011-01-22T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1410.278128,"partial_null_column":"value"}
+{"ts":"2011-01-23T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":100.43271}
+{"ts":"2011-01-23T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":92.789692}
+{"ts":"2011-01-23T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":103.73073}
+{"ts":"2011-01-23T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":101.573522}
+{"ts":"2011-01-23T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":128.699746}
+{"ts":"2011-01-23T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1349.254415}
+{"ts":"2011-01-23T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1224.501568,"partial_null_column":"value"}
+{"ts":"2011-01-24T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":104.48576}
+{"ts":"2011-01-24T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":189.385952}
+{"ts":"2011-01-24T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":104.167373}
+{"ts":"2011-01-24T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":105.345921}
+{"ts":"2011-01-24T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1102.866656}
+{"ts":"2011-01-24T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1215.589859,"partial_null_column":"value"}
+{"ts":"2011-01-25T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":90.111413}
+{"ts":"2011-01-25T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":85.974579}
+{"ts":"2011-01-25T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":96.594588}
+{"ts":"2011-01-25T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":102.512878}
+{"ts":"2011-01-25T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":122.077247}
+{"ts":"2011-01-25T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":997.994544}
+{"ts":"2011-01-25T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":786.363298,"partial_null_column":"value"}
+{"ts":"2011-01-26T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":105.873942}
+{"ts":"2011-01-26T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":159.988606}
+{"ts":"2011-01-26T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":105.266058}
+{"ts":"2011-01-26T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":105.617702}
+{"ts":"2011-01-26T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1037.449471}
+{"ts":"2011-01-26T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":989.931541,"partial_null_column":"value"}
+{"ts":"2011-01-27T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":134.127106}
+{"ts":"2011-01-27T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":90.806201}
+{"ts":"2011-01-27T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":100.643435}
+{"ts":"2011-01-27T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":102.612747}
+{"ts":"2011-01-27T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":149.125271}
+{"ts":"2011-01-27T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1486.201299}
+{"ts":"2011-01-27T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1367.638074,"partial_null_column":"value"}
+{"ts":"2011-01-28T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":111.641077}
+{"ts":"2011-01-28T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":107.788998}
+{"ts":"2011-01-28T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":108.106449}
+{"ts":"2011-01-28T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":93.869236}
+{"ts":"2011-01-28T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1300.30226}
+{"ts":"2011-01-28T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1627.598064,"partial_null_column":"value"}
+{"ts":"2011-01-29T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":127.450345}
+{"ts":"2011-01-29T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":103.345166}
+{"ts":"2011-01-29T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":106.663538}
+{"ts":"2011-01-29T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":104.311418}
+{"ts":"2011-01-29T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":138.865014}
+{"ts":"2011-01-29T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":792.326066}
+{"ts":"2011-01-29T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":545.990623,"partial_null_column":"value"}
+{"ts":"2011-01-30T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":106.064111}
+{"ts":"2011-01-30T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":137.198397}
+{"ts":"2011-01-30T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":106.009926}
+{"ts":"2011-01-30T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":110.528451}
+{"ts":"2011-01-30T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1233.448863}
+{"ts":"2011-01-30T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1870.061029,"partial_null_column":"value"}
+{"ts":"2011-01-31T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":133.740047}
+{"ts":"2011-01-31T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":104.548387}
+{"ts":"2011-01-31T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":97.017604}
+{"ts":"2011-01-31T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":103.021032}
+{"ts":"2011-01-31T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":155.744951}
+{"ts":"2011-01-31T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1127.231}
+{"ts":"2011-01-31T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":943.497198,"partial_null_column":"value"}
+{"ts":"2011-02-01T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":103.890175}
+{"ts":"2011-02-01T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":113.896016}
+{"ts":"2011-02-01T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":104.383662}
+{"ts":"2011-02-01T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":83.931272}
+{"ts":"2011-02-01T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1203.465595}
+{"ts":"2011-02-01T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1667.497773,"partial_null_column":"value"}
+{"ts":"2011-02-02T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":113.492245}
+{"ts":"2011-02-02T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":112.042996}
+{"ts":"2011-02-02T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":97.711139}
+{"ts":"2011-02-02T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":102.152053}
+{"ts":"2011-02-02T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":123.170962}
+{"ts":"2011-02-02T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1410.792943}
+{"ts":"2011-02-02T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1273.707453,"partial_null_column":"value"}
+{"ts":"2011-02-03T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":98.877952}
+{"ts":"2011-02-03T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":85.069784}
+{"ts":"2011-02-03T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":100.976362}
+{"ts":"2011-02-03T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":92.326431}
+{"ts":"2011-02-03T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1033.401241}
+{"ts":"2011-02-03T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":888.70528,"partial_null_column":"value"}
+{"ts":"2011-02-04T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":89.182906}
+{"ts":"2011-02-04T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":112.471918}
+{"ts":"2011-02-04T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":100.918373}
+{"ts":"2011-02-04T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":103.103922}
+{"ts":"2011-02-04T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":113.716758}
+{"ts":"2011-02-04T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1331.860983}
+{"ts":"2011-02-04T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1308.582051,"partial_null_column":"value"}
+{"ts":"2011-02-05T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":111.394244}
+{"ts":"2011-02-05T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":94.31296}
+{"ts":"2011-02-05T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":107.929804}
+{"ts":"2011-02-05T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":90.732978}
+{"ts":"2011-02-05T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1039.500513}
+{"ts":"2011-02-05T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":785.078869,"partial_null_column":"value"}
+{"ts":"2011-02-06T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":134.462521}
+{"ts":"2011-02-06T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":119.60831}
+{"ts":"2011-02-06T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":101.847544}
+{"ts":"2011-02-06T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":102.770913}
+{"ts":"2011-02-06T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":121.270562}
+{"ts":"2011-02-06T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1029.995236}
+{"ts":"2011-02-06T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":826.039207,"partial_null_column":"value"}
+{"ts":"2011-02-07T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":98.815847}
+{"ts":"2011-02-07T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":97.480779}
+{"ts":"2011-02-07T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":100.706057}
+{"ts":"2011-02-07T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":83.902353}
+{"ts":"2011-02-07T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1047.212887}
+{"ts":"2011-02-07T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1107.243787,"partial_null_column":"value"}
+{"ts":"2011-02-08T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":126.243536}
+{"ts":"2011-02-08T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":106.969799}
+{"ts":"2011-02-08T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":96.790543}
+{"ts":"2011-02-08T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":103.308255}
+{"ts":"2011-02-08T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":111.04015}
+{"ts":"2011-02-08T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1082.72764}
+{"ts":"2011-02-08T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":911.95679,"partial_null_column":"value"}
+{"ts":"2011-02-09T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":115.548444}
+{"ts":"2011-02-09T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":97.071703}
+{"ts":"2011-02-09T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":113.554588}
+{"ts":"2011-02-09T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":83.742151}
+{"ts":"2011-02-09T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":971.050764}
+{"ts":"2011-02-09T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":794.098825,"partial_null_column":"value"}
+{"ts":"2011-02-10T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":115.461691}
+{"ts":"2011-02-10T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":117.629065}
+{"ts":"2011-02-10T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":95.698374}
+{"ts":"2011-02-10T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":105.708103}
+{"ts":"2011-02-10T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":105.557241}
+{"ts":"2011-02-10T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1089.647884}
+{"ts":"2011-02-10T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":901.327272,"partial_null_column":"value"}
+{"ts":"2011-02-11T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":114.637486}
+{"ts":"2011-02-11T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":96.617339}
+{"ts":"2011-02-11T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":112.571724}
+{"ts":"2011-02-11T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":87.904114}
+{"ts":"2011-02-11T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":980.386611}
+{"ts":"2011-02-11T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":723.514254,"partial_null_column":"value"}
+{"ts":"2011-02-12T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":130.104979}
+{"ts":"2011-02-12T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":115.225386}
+{"ts":"2011-02-12T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":101.515571}
+{"ts":"2011-02-12T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":108.637522}
+{"ts":"2011-02-12T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":102.850696}
+{"ts":"2011-02-12T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1092.416967}
+{"ts":"2011-02-12T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":879.406101,"partial_null_column":"value"}
+{"ts":"2011-02-13T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":118.841176}
+{"ts":"2011-02-13T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":98.60749}
+{"ts":"2011-02-13T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":117.965974}
+{"ts":"2011-02-13T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":87.820236}
+{"ts":"2011-02-13T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":987.067381}
+{"ts":"2011-02-13T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":724.262526,"partial_null_column":"value"}
+{"ts":"2011-02-14T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":119.323168}
+{"ts":"2011-02-14T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":123.098262}
+{"ts":"2011-02-14T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":101.645725}
+{"ts":"2011-02-14T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":121.060464}
+{"ts":"2011-02-14T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":107.663239}
+{"ts":"2011-02-14T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1199.607472}
+{"ts":"2011-02-14T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":948.657939,"partial_null_column":"value"}
+{"ts":"2011-02-15T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":115.527003}
+{"ts":"2011-02-15T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":103.519393}
+{"ts":"2011-02-15T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":117.138956}
+{"ts":"2011-02-15T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":79.700998}
+{"ts":"2011-02-15T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1044.3843}
+{"ts":"2011-02-15T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":807.601674,"partial_null_column":"value"}
+{"ts":"2011-02-16T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":133.726576}
+{"ts":"2011-02-16T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":130.717934}
+{"ts":"2011-02-16T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":108.338531}
+{"ts":"2011-02-16T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":123.270869}
+{"ts":"2011-02-16T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":113.643571}
+{"ts":"2011-02-16T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1360.032423}
+{"ts":"2011-02-16T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1208.456692,"partial_null_column":"value"}
+{"ts":"2011-02-17T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":125.032692}
+{"ts":"2011-02-17T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":101.092779}
+{"ts":"2011-02-17T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":121.872569}
+{"ts":"2011-02-17T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":91.969195}
+{"ts":"2011-02-17T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":993.591221}
+{"ts":"2011-02-17T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":679.619354,"partial_null_column":"value"}
+{"ts":"2011-02-18T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":151.053296}
+{"ts":"2011-02-18T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":128.063524}
+{"ts":"2011-02-18T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":101.960196}
+{"ts":"2011-02-18T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":122.546253}
+{"ts":"2011-02-18T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":120.151389}
+{"ts":"2011-02-18T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1601.829436}
+{"ts":"2011-02-18T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1649.533329,"partial_null_column":"value"}
+{"ts":"2011-02-19T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":123.447481}
+{"ts":"2011-02-19T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":108.822138}
+{"ts":"2011-02-19T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":119.371511}
+{"ts":"2011-02-19T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":91.547944}
+{"ts":"2011-02-19T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1200.527201}
+{"ts":"2011-02-19T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1433.398801,"partial_null_column":"value"}
+{"ts":"2011-02-20T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":157.483005}
+{"ts":"2011-02-20T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":176.323916}
+{"ts":"2011-02-20T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":127.819268}
+{"ts":"2011-02-20T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":132.719065}
+{"ts":"2011-02-20T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":124.637709}
+{"ts":"2011-02-20T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1304.326111}
+{"ts":"2011-02-20T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1022.854576,"partial_null_column":"value"}
+{"ts":"2011-02-21T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":132.231346}
+{"ts":"2011-02-21T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":111.386745}
+{"ts":"2011-02-21T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":126.995117}
+{"ts":"2011-02-21T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":119.85015}
+{"ts":"2011-02-21T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1544.108134}
+{"ts":"2011-02-21T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1228.502469,"partial_null_column":"value"}
+{"ts":"2011-02-22T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":149.171056}
+{"ts":"2011-02-22T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":139.557139}
+{"ts":"2011-02-22T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":111.394542}
+{"ts":"2011-02-22T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":126.596847}
+{"ts":"2011-02-22T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":115.915849}
+{"ts":"2011-02-22T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1421.648704}
+{"ts":"2011-02-22T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1291.897942,"partial_null_column":"value"}
+{"ts":"2011-02-23T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":127.199815}
+{"ts":"2011-02-23T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":107.896489}
+{"ts":"2011-02-23T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":122.404192}
+{"ts":"2011-02-23T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":91.191071}
+{"ts":"2011-02-23T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1251.906228}
+{"ts":"2011-02-23T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1306.495696,"partial_null_column":"value"}
+{"ts":"2011-02-24T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":168.988478}
+{"ts":"2011-02-24T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":139.978575}
+{"ts":"2011-02-24T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":113.621184}
+{"ts":"2011-02-24T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":119.772575}
+{"ts":"2011-02-24T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":118.270052}
+{"ts":"2011-02-24T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":970.728273}
+{"ts":"2011-02-24T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":578.795979,"partial_null_column":"value"}
+{"ts":"2011-02-25T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":107.539869}
+{"ts":"2011-02-25T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":99.698015}
+{"ts":"2011-02-25T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":106.82763}
+{"ts":"2011-02-25T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":82.350556}
+{"ts":"2011-02-25T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1057.427269}
+{"ts":"2011-02-25T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1017.573185,"partial_null_column":"value"}
+{"ts":"2011-02-26T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":225.243186}
+{"ts":"2011-02-26T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":138.924835}
+{"ts":"2011-02-26T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":98.314744}
+{"ts":"2011-02-26T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":118.896845}
+{"ts":"2011-02-26T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":131.310541}
+{"ts":"2011-02-26T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1743.92175}
+{"ts":"2011-02-26T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1862.737933,"partial_null_column":"value"}
+{"ts":"2011-02-27T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":96.864384}
+{"ts":"2011-02-27T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":114.634278}
+{"ts":"2011-02-27T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":99.158839}
+{"ts":"2011-02-27T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":78.72795}
+{"ts":"2011-02-27T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1044.562903}
+{"ts":"2011-02-27T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":873.306547,"partial_null_column":"value"}
+{"ts":"2011-02-28T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":122.258195}
+{"ts":"2011-02-28T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":141.261324}
+{"ts":"2011-02-28T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":102.185098}
+{"ts":"2011-02-28T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":121.786785}
+{"ts":"2011-02-28T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":114.284569}
+{"ts":"2011-02-28T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1292.542896}
+{"ts":"2011-02-28T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1101.91827,"partial_null_column":"value"}
+{"ts":"2011-03-01T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":99.070796}
+{"ts":"2011-03-01T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":114.700932}
+{"ts":"2011-03-01T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":99.772347}
+{"ts":"2011-03-01T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":72.79297}
+{"ts":"2011-03-01T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1124.201419}
+{"ts":"2011-03-01T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1166.141121,"partial_null_column":"value"}
+{"ts":"2011-03-02T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":174.89052}
+{"ts":"2011-03-02T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":147.117434}
+{"ts":"2011-03-02T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":109.239196}
+{"ts":"2011-03-02T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":120.212473}
+{"ts":"2011-03-02T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":116.460744}
+{"ts":"2011-03-02T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1143.078414}
+{"ts":"2011-03-02T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":865.7779,"partial_null_column":"value"}
+{"ts":"2011-03-03T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":92.537499}
+{"ts":"2011-03-03T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":108.914095}
+{"ts":"2011-03-03T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":96.031371}
+{"ts":"2011-03-03T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":75.977564}
+{"ts":"2011-03-03T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1097.490771}
+{"ts":"2011-03-03T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":901.307577,"partial_null_column":"value"}
+{"ts":"2011-03-04T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":119.851231}
+{"ts":"2011-03-04T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":132.832331}
+{"ts":"2011-03-04T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":107.285615}
+{"ts":"2011-03-04T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":113.883056}
+{"ts":"2011-03-04T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":109.607245}
+{"ts":"2011-03-04T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1179.803776}
+{"ts":"2011-03-04T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":975.577927,"partial_null_column":"value"}
+{"ts":"2011-03-05T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":97.942645}
+{"ts":"2011-03-05T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":108.394611}
+{"ts":"2011-03-05T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":102.486832}
+{"ts":"2011-03-05T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":81.10511}
+{"ts":"2011-03-05T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1281.601175}
+{"ts":"2011-03-05T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1360.694785,"partial_null_column":"value"}
+{"ts":"2011-03-06T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":129.531062}
+{"ts":"2011-03-06T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":144.925734}
+{"ts":"2011-03-06T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":113.035167}
+{"ts":"2011-03-06T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":115.956859}
+{"ts":"2011-03-06T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":120.953163}
+{"ts":"2011-03-06T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1103.239788}
+{"ts":"2011-03-06T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":869.30836,"partial_null_column":"value"}
+{"ts":"2011-03-07T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":105.575929}
+{"ts":"2011-03-07T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":118.024245}
+{"ts":"2011-03-07T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":107.220218}
+{"ts":"2011-03-07T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":68.699125}
+{"ts":"2011-03-07T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1177.858403}
+{"ts":"2011-03-07T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1095.63752,"partial_null_column":"value"}
+{"ts":"2011-03-08T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":109.764955}
+{"ts":"2011-03-08T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":143.214331}
+{"ts":"2011-03-08T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":107.465492}
+{"ts":"2011-03-08T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":122.692722}
+{"ts":"2011-03-08T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":111.704071}
+{"ts":"2011-03-08T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1084.332554}
+{"ts":"2011-03-08T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":835.762631,"partial_null_column":"value"}
+{"ts":"2011-03-09T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":110.873407}
+{"ts":"2011-03-09T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":115.013313}
+{"ts":"2011-03-09T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":112.407868}
+{"ts":"2011-03-09T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":82.426362}
+{"ts":"2011-03-09T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1029.8025}
+{"ts":"2011-03-09T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":776.70294,"partial_null_column":"value"}
+{"ts":"2011-03-10T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":148.80915}
+{"ts":"2011-03-10T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":134.212714}
+{"ts":"2011-03-10T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":119.613508}
+{"ts":"2011-03-10T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":118.864028}
+{"ts":"2011-03-10T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":107.706257}
+{"ts":"2011-03-10T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1077.279402}
+{"ts":"2011-03-10T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":835.461226,"partial_null_column":"value"}
+{"ts":"2011-03-11T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":106.898536}
+{"ts":"2011-03-11T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":112.85623}
+{"ts":"2011-03-11T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":108.135811}
+{"ts":"2011-03-11T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":67.73117}
+{"ts":"2011-03-11T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1098.54317}
+{"ts":"2011-03-11T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":715.516125,"partial_null_column":"value"}
+{"ts":"2011-03-12T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":155.728048}
+{"ts":"2011-03-12T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":132.687079}
+{"ts":"2011-03-12T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":114.681603}
+{"ts":"2011-03-12T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":118.574721}
+{"ts":"2011-03-12T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":109.384493}
+{"ts":"2011-03-12T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1008.745525}
+{"ts":"2011-03-12T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":764.50807,"partial_null_column":"value"}
+{"ts":"2011-03-13T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":113.760384}
+{"ts":"2011-03-13T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":120.76013}
+{"ts":"2011-03-13T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":114.81407}
+{"ts":"2011-03-13T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":70.126017}
+{"ts":"2011-03-13T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":998.753955}
+{"ts":"2011-03-13T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":736.409261,"partial_null_column":"value"}
+{"ts":"2011-03-14T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":153.191744}
+{"ts":"2011-03-14T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":123.248581}
+{"ts":"2011-03-14T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":104.716583}
+{"ts":"2011-03-14T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":122.275869}
+{"ts":"2011-03-14T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":104.724023}
+{"ts":"2011-03-14T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1141.5884}
+{"ts":"2011-03-14T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":893.985017,"partial_null_column":"value"}
+{"ts":"2011-03-15T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":109.382273}
+{"ts":"2011-03-15T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":119.250945}
+{"ts":"2011-03-15T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":112.354294}
+{"ts":"2011-03-15T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":59.266595}
+{"ts":"2011-03-15T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1037.381049}
+{"ts":"2011-03-15T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":832.874861,"partial_null_column":"value"}
+{"ts":"2011-03-16T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":147.471464}
+{"ts":"2011-03-16T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":110.070846}
+{"ts":"2011-03-16T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":99.13798}
+{"ts":"2011-03-16T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":120.455865}
+{"ts":"2011-03-16T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":107.903885}
+{"ts":"2011-03-16T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1092.942008}
+{"ts":"2011-03-16T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":848.339888,"partial_null_column":"value"}
+{"ts":"2011-03-17T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":113.501786}
+{"ts":"2011-03-17T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":114.540037}
+{"ts":"2011-03-17T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":116.816958}
+{"ts":"2011-03-17T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":69.258523}
+{"ts":"2011-03-17T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1072.23932}
+{"ts":"2011-03-17T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":878.683776,"partial_null_column":"value"}
+{"ts":"2011-03-18T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":180.343171}
+{"ts":"2011-03-18T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":130.260926}
+{"ts":"2011-03-18T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":111.540639}
+{"ts":"2011-03-18T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":119.629977}
+{"ts":"2011-03-18T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":114.564808}
+{"ts":"2011-03-18T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1176.605164}
+{"ts":"2011-03-18T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":936.429632,"partial_null_column":"value"}
+{"ts":"2011-03-19T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":109.788875}
+{"ts":"2011-03-19T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":117.197085}
+{"ts":"2011-03-19T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":112.236468}
+{"ts":"2011-03-19T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":72.369471}
+{"ts":"2011-03-19T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1107.220174}
+{"ts":"2011-03-19T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":846.288386,"partial_null_column":"value"}
+{"ts":"2011-03-20T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":178.454262}
+{"ts":"2011-03-20T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":157.74933}
+{"ts":"2011-03-20T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":128.274705}
+{"ts":"2011-03-20T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":129.519442}
+{"ts":"2011-03-20T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":128.705337}
+{"ts":"2011-03-20T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1217.547439}
+{"ts":"2011-03-20T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":954.754185,"partial_null_column":"value"}
+{"ts":"2011-03-21T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":124.411632}
+{"ts":"2011-03-21T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":122.462424}
+{"ts":"2011-03-21T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":125.243882}
+{"ts":"2011-03-21T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":75.93664}
+{"ts":"2011-03-21T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1283.957016}
+{"ts":"2011-03-21T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1031.990042,"partial_null_column":"value"}
+{"ts":"2011-03-22T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":177.460613}
+{"ts":"2011-03-22T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":151.407583}
+{"ts":"2011-03-22T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":126.415884}
+{"ts":"2011-03-22T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":133.124963}
+{"ts":"2011-03-22T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":122.357549}
+{"ts":"2011-03-22T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1119.247202}
+{"ts":"2011-03-22T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":843.952139,"partial_null_column":"value"}
+{"ts":"2011-03-23T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":126.764513}
+{"ts":"2011-03-23T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":118.97231}
+{"ts":"2011-03-23T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":129.864384}
+{"ts":"2011-03-23T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":102.603152}
+{"ts":"2011-03-23T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1403.338838}
+{"ts":"2011-03-23T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1362.650586,"partial_null_column":"value"}
+{"ts":"2011-03-24T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":135.569784}
+{"ts":"2011-03-24T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":156.650862}
+{"ts":"2011-03-24T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":115.945757}
+{"ts":"2011-03-24T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":129.023978}
+{"ts":"2011-03-24T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":124.062061}
+{"ts":"2011-03-24T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1137.842315}
+{"ts":"2011-03-24T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":873.65203,"partial_null_column":"value"}
+{"ts":"2011-03-25T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":125.766952}
+{"ts":"2011-03-25T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":119.400783}
+{"ts":"2011-03-25T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":126.05796}
+{"ts":"2011-03-25T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":89.408906}
+{"ts":"2011-03-25T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1124.935193}
+{"ts":"2011-03-25T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":855.717712,"partial_null_column":"value"}
+{"ts":"2011-03-26T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":148.957194}
+{"ts":"2011-03-26T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":162.81545}
+{"ts":"2011-03-26T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":117.449116}
+{"ts":"2011-03-26T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":139.214665}
+{"ts":"2011-03-26T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":138.663182}
+{"ts":"2011-03-26T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1247.890809}
+{"ts":"2011-03-26T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":962.235801,"partial_null_column":"value"}
+{"ts":"2011-03-27T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":135.183271}
+{"ts":"2011-03-27T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":130.599006}
+{"ts":"2011-03-27T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":114.952545}
+{"ts":"2011-03-27T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":139.294248}
+{"ts":"2011-03-27T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":142.430177}
+{"ts":"2011-03-27T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":108.489598}
+{"ts":"2011-03-27T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":141.820068}
+{"ts":"2011-03-27T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1185.709973}
+{"ts":"2011-03-27T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1345.781728}
+{"ts":"2011-03-27T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1019.898509,"partial_null_column":"value"}
+{"ts":"2011-03-27T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1056.419292,"partial_null_column":"value"}
+{"ts":"2011-03-28T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":156.155294}
+{"ts":"2011-03-28T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":124.336139}
+{"ts":"2011-03-28T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":163.100154}
+{"ts":"2011-03-28T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":131.191818}
+{"ts":"2011-03-28T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":115.709767}
+{"ts":"2011-03-28T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":127.403089}
+{"ts":"2011-03-28T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":140.941296}
+{"ts":"2011-03-28T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":103.578536}
+{"ts":"2011-03-28T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":130.880788}
+{"ts":"2011-03-28T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1250.166788}
+{"ts":"2011-03-28T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1390.75405}
+{"ts":"2011-03-28T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1198.723103,"partial_null_column":"value"}
+{"ts":"2011-03-28T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1108.136072,"partial_null_column":"value"}
+{"ts":"2011-03-29T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":134.084672}
+{"ts":"2011-03-29T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":117.626804}
+{"ts":"2011-03-29T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":158.073319}
+{"ts":"2011-03-29T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":128.074393}
+{"ts":"2011-03-29T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":109.678515}
+{"ts":"2011-03-29T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":122.620188}
+{"ts":"2011-03-29T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":144.446039}
+{"ts":"2011-03-29T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":91.604463}
+{"ts":"2011-03-29T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":132.477651}
+{"ts":"2011-03-29T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1224.116225}
+{"ts":"2011-03-29T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1361.080245}
+{"ts":"2011-03-29T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1289.009485,"partial_null_column":"value"}
+{"ts":"2011-03-29T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1069.431801,"partial_null_column":"value"}
+{"ts":"2011-03-30T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":135.94282}
+{"ts":"2011-03-30T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":120.283054}
+{"ts":"2011-03-30T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":167.96062}
+{"ts":"2011-03-30T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":121.215839}
+{"ts":"2011-03-30T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":116.587746}
+{"ts":"2011-03-30T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":122.612114}
+{"ts":"2011-03-30T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":138.827311}
+{"ts":"2011-03-30T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":93.331887}
+{"ts":"2011-03-30T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":128.645571}
+{"ts":"2011-03-30T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1190.933753}
+{"ts":"2011-03-30T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1310.79707}
+{"ts":"2011-03-30T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1001.134025,"partial_null_column":"value"}
+{"ts":"2011-03-30T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1030.499562,"partial_null_column":"value"}
+{"ts":"2011-03-31T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":151.752485}
+{"ts":"2011-03-31T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":124.414321}
+{"ts":"2011-03-31T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":175.778647}
+{"ts":"2011-03-31T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":120.607382}
+{"ts":"2011-03-31T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":117.060598}
+{"ts":"2011-03-31T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":125.243245}
+{"ts":"2011-03-31T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":150.247713}
+{"ts":"2011-03-31T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":93.390841}
+{"ts":"2011-03-31T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":125.839686}
+{"ts":"2011-03-31T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1466.209327}
+{"ts":"2011-03-31T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1366.447617}
+{"ts":"2011-03-31T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1734.274909,"partial_null_column":"value"}
+{"ts":"2011-03-31T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1063.201156,"partial_null_column":"value"}
+{"ts":"2011-04-01T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":135.885094}
+{"ts":"2011-04-01T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":118.57034}
+{"ts":"2011-04-01T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":158.747224}
+{"ts":"2011-04-01T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":120.134704}
+{"ts":"2011-04-01T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":109.705815}
+{"ts":"2011-04-01T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":121.583581}
+{"ts":"2011-04-01T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":144.507368}
+{"ts":"2011-04-01T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":78.622547}
+{"ts":"2011-04-01T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":119.922742}
+{"ts":"2011-04-01T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1314.839715}
+{"ts":"2011-04-01T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1522.043733}
+{"ts":"2011-04-01T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1447.34116,"partial_null_column":"value"}
+{"ts":"2011-04-01T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1234.247546,"partial_null_column":"value"}
+{"ts":"2011-04-02T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":147.425935}
+{"ts":"2011-04-02T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":112.987027}
+{"ts":"2011-04-02T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":166.016049}
+{"ts":"2011-04-02T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":113.446008}
+{"ts":"2011-04-02T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":110.931934}
+{"ts":"2011-04-02T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":114.290141}
+{"ts":"2011-04-02T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":135.301506}
+{"ts":"2011-04-02T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":97.387433}
+{"ts":"2011-04-02T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":126.411364}
+{"ts":"2011-04-02T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1193.556278}
+{"ts":"2011-04-02T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1321.375057}
+{"ts":"2011-04-02T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1144.342401,"partial_null_column":"value"}
+{"ts":"2011-04-02T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1049.738585,"partial_null_column":"value"}
+{"ts":"2011-04-03T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":122.971856}
+{"ts":"2011-04-03T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":105.735462}
+{"ts":"2011-04-03T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":153.927965}
+{"ts":"2011-04-03T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":103.532351}
+{"ts":"2011-04-03T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":107.047773}
+{"ts":"2011-04-03T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":107.919674}
+{"ts":"2011-04-03T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":122.141707}
+{"ts":"2011-04-03T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":80.861743}
+{"ts":"2011-04-03T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":117.24707}
+{"ts":"2011-04-03T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1055.783661}
+{"ts":"2011-04-03T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1021.638673}
+{"ts":"2011-04-03T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":811.991286,"partial_null_column":"value"}
+{"ts":"2011-04-03T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":768.423077,"partial_null_column":"value"}
+{"ts":"2011-04-04T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":110.919829}
+{"ts":"2011-04-04T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":107.613577}
+{"ts":"2011-04-04T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":146.729242}
+{"ts":"2011-04-04T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":105.375351}
+{"ts":"2011-04-04T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":110.57367}
+{"ts":"2011-04-04T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":114.382255}
+{"ts":"2011-04-04T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":125.285894}
+{"ts":"2011-04-04T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":72.66843}
+{"ts":"2011-04-04T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":117.703023}
+{"ts":"2011-04-04T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1197.008423}
+{"ts":"2011-04-04T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1131.531986}
+{"ts":"2011-04-04T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1151.069173,"partial_null_column":"value"}
+{"ts":"2011-04-04T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":877.079396,"partial_null_column":"value"}
+{"ts":"2011-04-05T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":113.318712}
+{"ts":"2011-04-05T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":105.615563}
+{"ts":"2011-04-05T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":141.713507}
+{"ts":"2011-04-05T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":106.207931}
+{"ts":"2011-04-05T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":109.890586}
+{"ts":"2011-04-05T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":110.012987}
+{"ts":"2011-04-05T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":124.478408}
+{"ts":"2011-04-05T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":86.683603}
+{"ts":"2011-04-05T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":117.051694}
+{"ts":"2011-04-05T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1192.144303}
+{"ts":"2011-04-05T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1154.289559}
+{"ts":"2011-04-05T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1146.423036,"partial_null_column":"value"}
+{"ts":"2011-04-05T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":902.615706,"partial_null_column":"value"}
+{"ts":"2011-04-06T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":115.334018}
+{"ts":"2011-04-06T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":109.700256}
+{"ts":"2011-04-06T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":147.553562}
+{"ts":"2011-04-06T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":100.775597}
+{"ts":"2011-04-06T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":108.659345}
+{"ts":"2011-04-06T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":113.408308}
+{"ts":"2011-04-06T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":121.079585}
+{"ts":"2011-04-06T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":92.336403}
+{"ts":"2011-04-06T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":112.921482}
+{"ts":"2011-04-06T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1272.677122}
+{"ts":"2011-04-06T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1141.514652}
+{"ts":"2011-04-06T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1355.843374,"partial_null_column":"value"}
+{"ts":"2011-04-06T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":897.393445,"partial_null_column":"value"}
+{"ts":"2011-04-07T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":117.508062}
+{"ts":"2011-04-07T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":115.418054}
+{"ts":"2011-04-07T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":141.565031}
+{"ts":"2011-04-07T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":95.562446}
+{"ts":"2011-04-07T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":102.933171}
+{"ts":"2011-04-07T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":122.696621}
+{"ts":"2011-04-07T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":119.763135}
+{"ts":"2011-04-07T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":84.357701}
+{"ts":"2011-04-07T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":117.43276}
+{"ts":"2011-04-07T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1190.896088}
+{"ts":"2011-04-07T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1009.363132}
+{"ts":"2011-04-07T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1260.143027,"partial_null_column":"value"}
+{"ts":"2011-04-07T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":762.862488,"partial_null_column":"value"}
+{"ts":"2011-04-08T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":120.97386}
+{"ts":"2011-04-08T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":116.24886}
+{"ts":"2011-04-08T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":146.830618}
+{"ts":"2011-04-08T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":96.226609}
+{"ts":"2011-04-08T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":95.447888}
+{"ts":"2011-04-08T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":120.709912}
+{"ts":"2011-04-08T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":120.309688}
+{"ts":"2011-04-08T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":94.631354}
+{"ts":"2011-04-08T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":122.743898}
+{"ts":"2011-04-08T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1006.913816}
+{"ts":"2011-04-08T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1032.599837}
+{"ts":"2011-04-08T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":935.168026,"partial_null_column":"value"}
+{"ts":"2011-04-08T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":782.107861,"partial_null_column":"value"}
+{"ts":"2011-04-09T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":116.080323}
+{"ts":"2011-04-09T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":116.060759}
+{"ts":"2011-04-09T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":158.682525}
+{"ts":"2011-04-09T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":95.509796}
+{"ts":"2011-04-09T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":110.007248}
+{"ts":"2011-04-09T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":121.905685}
+{"ts":"2011-04-09T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":126.369367}
+{"ts":"2011-04-09T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":92.90507}
+{"ts":"2011-04-09T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":123.79132}
+{"ts":"2011-04-09T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1137.385764}
+{"ts":"2011-04-09T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1030.075553}
+{"ts":"2011-04-09T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":996.205369,"partial_null_column":"value"}
+{"ts":"2011-04-09T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":767.692135,"partial_null_column":"value"}
+{"ts":"2011-04-10T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":113.221448}
+{"ts":"2011-04-10T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":95.570457}
+{"ts":"2011-04-10T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":131.766616}
+{"ts":"2011-04-10T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":99.950855}
+{"ts":"2011-04-10T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":91.470524}
+{"ts":"2011-04-10T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":99.393076}
+{"ts":"2011-04-10T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":123.207579}
+{"ts":"2011-04-10T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":84.898691}
+{"ts":"2011-04-10T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":114.353962}
+{"ts":"2011-04-10T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1005.253077}
+{"ts":"2011-04-10T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1030.094757}
+{"ts":"2011-04-10T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1031.741509,"partial_null_column":"value"}
+{"ts":"2011-04-10T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":775.965555,"partial_null_column":"value"}
+{"ts":"2011-04-11T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":130.165796}
+{"ts":"2011-04-11T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":107.765101}
+{"ts":"2011-04-11T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":142.751726}
+{"ts":"2011-04-11T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":104.847285}
+{"ts":"2011-04-11T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":95.272956}
+{"ts":"2011-04-11T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":106.229286}
+{"ts":"2011-04-11T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":126.823859}
+{"ts":"2011-04-11T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":89.250155}
+{"ts":"2011-04-11T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":122.049678}
+{"ts":"2011-04-11T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1112.794811}
+{"ts":"2011-04-11T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1113.35753}
+{"ts":"2011-04-11T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1374.968412,"partial_null_column":"value"}
+{"ts":"2011-04-11T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":853.163039,"partial_null_column":"value"}
+{"ts":"2011-04-12T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":122.386348}
+{"ts":"2011-04-12T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":106.380995}
+{"ts":"2011-04-12T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":141.9323}
+{"ts":"2011-04-12T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":103.142372}
+{"ts":"2011-04-12T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":97.340631}
+{"ts":"2011-04-12T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":105.381244}
+{"ts":"2011-04-12T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":125.189098}
+{"ts":"2011-04-12T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":90.533391}
+{"ts":"2011-04-12T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":122.128172}
+{"ts":"2011-04-12T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1153.974725}
+{"ts":"2011-04-12T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1069.64088}
+{"ts":"2011-04-12T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1456.61183,"partial_null_column":"value"}
+{"ts":"2011-04-12T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":811.92524,"partial_null_column":"value"}
+{"ts":"2011-04-13T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":122.68834}
+{"ts":"2011-04-13T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":105.739623}
+{"ts":"2011-04-13T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":136.983407}
+{"ts":"2011-04-13T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":100.860813}
+{"ts":"2011-04-13T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":94.839191}
+{"ts":"2011-04-13T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":105.261296}
+{"ts":"2011-04-13T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":119.836611}
+{"ts":"2011-04-13T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":91.972558}
+{"ts":"2011-04-13T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":120.145572}
+{"ts":"2011-04-13T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1016.137449}
+{"ts":"2011-04-13T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":994.902292}
+{"ts":"2011-04-13T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":989.032799,"partial_null_column":"value"}
+{"ts":"2011-04-13T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":744.744657,"partial_null_column":"value"}
+{"ts":"2011-04-14T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":111.179339}
+{"ts":"2011-04-14T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":101.984377}
+{"ts":"2011-04-14T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":133.60643}
+{"ts":"2011-04-14T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":99.738319}
+{"ts":"2011-04-14T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":91.270553}
+{"ts":"2011-04-14T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":101.251756}
+{"ts":"2011-04-14T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":118.285128}
+{"ts":"2011-04-14T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":84.9513}
+{"ts":"2011-04-14T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":119.768525}
+{"ts":"2011-04-14T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1032.154263}
+{"ts":"2011-04-14T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":999.58645}
+{"ts":"2011-04-14T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1166.401205,"partial_null_column":"value"}
+{"ts":"2011-04-14T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":753.104985,"partial_null_column":"value"}
+{"ts":"2011-04-15T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":106.7937}
+{"ts":"2011-04-15T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":94.469747}
+{"ts":"2011-04-15T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":135.109191}
+{"ts":"2011-04-15T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":99.596909}
+{"ts":"2011-04-15T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":92.78276}
+{"ts":"2011-04-15T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":97.859766}
+{"ts":"2011-04-15T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":120.50816}
+{"ts":"2011-04-15T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":89.646236}
+{"ts":"2011-04-15T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":120.290348}
+{"ts":"2011-04-15T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":994.752744}
+{"ts":"2011-04-15T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1029.056992}
+{"ts":"2011-04-15T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":962.731172,"partial_null_column":"value"}
+{"ts":"2011-04-15T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":780.271977,"partial_null_column":"value"}
\ No newline at end of file
diff --git a/processing/src/test/resources/druid.sample.numeric.json b/processing/src/test/resources/druid.sample.numeric.json
new file mode 100644
index 000000000000..f8be66828b00
--- /dev/null
+++ b/processing/src/test/resources/druid.sample.numeric.json
@@ -0,0 +1,1209 @@
+{"ts":"2011-01-12T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":100}
+{"ts":"2011-01-12T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":100}
+{"ts":"2011-01-12T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":100}
+{"ts":"2011-01-12T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":100}
+{"ts":"2011-01-12T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":100}
+{"ts":"2011-01-12T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":100}
+{"ts":"2011-01-12T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":100}
+{"ts":"2011-01-12T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":100}
+{"ts":"2011-01-12T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":100}
+{"ts":"2011-01-12T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1000}
+{"ts":"2011-01-12T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1000}
+{"ts":"2011-01-12T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":800,"partial_null_column":"value"}
+{"ts":"2011-01-12T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":800,"partial_null_column":"value"}
+{"ts":"2011-01-13T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":94.874713}
+{"ts":"2011-01-13T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":103.629399}
+{"ts":"2011-01-13T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":110.087299}
+{"ts":"2011-01-13T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":114.947403}
+{"ts":"2011-01-13T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":104.465767}
+{"ts":"2011-01-13T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":102.851683}
+{"ts":"2011-01-13T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":108.863011}
+{"ts":"2011-01-13T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":111.356672}
+{"ts":"2011-01-13T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":106.236928}
+{"ts":"2011-01-13T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1040.945505}
+{"ts":"2011-01-13T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1689.012875}
+{"ts":"2011-01-13T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":826.060182,"partial_null_column":"value"}
+{"ts":"2011-01-13T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1564.617729,"partial_null_column":"value"}
+{"ts":"2011-01-14T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":86.450372}
+{"ts":"2011-01-14T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":102.670409}
+{"ts":"2011-01-14T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":109.573474}
+{"ts":"2011-01-14T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":94.000432}
+{"ts":"2011-01-14T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":97.903068}
+{"ts":"2011-01-14T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":101.38076}
+{"ts":"2011-01-14T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":104.611784}
+{"ts":"2011-01-14T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":114.974216}
+{"ts":"2011-01-14T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":112.259958}
+{"ts":"2011-01-14T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1049.141912}
+{"ts":"2011-01-14T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1073.476545}
+{"ts":"2011-01-14T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1006.402111,"partial_null_column":"value"}
+{"ts":"2011-01-14T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":869.643722,"partial_null_column":"value"}
+{"ts":"2011-01-15T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":82.840417}
+{"ts":"2011-01-15T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":99.781645}
+{"ts":"2011-01-15T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":100.551072}
+{"ts":"2011-01-15T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":87.954346}
+{"ts":"2011-01-15T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":100.582654}
+{"ts":"2011-01-15T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":99.383407}
+{"ts":"2011-01-15T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":102.366798}
+{"ts":"2011-01-15T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":111.680229}
+{"ts":"2011-01-15T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":120.48142}
+{"ts":"2011-01-15T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1007.36551}
+{"ts":"2011-01-15T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1545.708865}
+{"ts":"2011-01-15T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":809.041763,"partial_null_column":"value"}
+{"ts":"2011-01-15T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1458.402661,"partial_null_column":"value"}
+{"ts":"2011-01-16T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":71.315931}
+{"ts":"2011-01-16T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":100.591602}
+{"ts":"2011-01-16T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":99.007588}
+{"ts":"2011-01-16T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":93.085943}
+{"ts":"2011-01-16T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":99.863171}
+{"ts":"2011-01-16T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":100.192013}
+{"ts":"2011-01-16T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":103.348007}
+{"ts":"2011-01-16T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":87.280816}
+{"ts":"2011-01-16T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":116.77961}
+{"ts":"2011-01-16T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1016.965229}
+{"ts":"2011-01-16T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1077.612663}
+{"ts":"2011-01-16T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":852.437477,"partial_null_column":"value"}
+{"ts":"2011-01-16T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":879.988099,"partial_null_column":"value"}
+{"ts":"2011-01-17T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":105.442374}
+{"ts":"2011-01-17T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":105.914315}
+{"ts":"2011-01-17T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":99.189052}
+{"ts":"2011-01-17T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":110.157325}
+{"ts":"2011-01-17T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":103.692852}
+{"ts":"2011-01-17T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":103.615039}
+{"ts":"2011-01-17T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":106.696362}
+{"ts":"2011-01-17T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":89.901887}
+{"ts":"2011-01-17T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":134.415281}
+{"ts":"2011-01-17T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1075.089574}
+{"ts":"2011-01-17T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":953.995422}
+{"ts":"2011-01-17T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":950.14677,"partial_null_column":"value"}
+{"ts":"2011-01-17T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":712.774595,"partial_null_column":"value"}
+{"ts":"2011-01-18T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":87.195139}
+{"ts":"2011-01-18T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":107.244699}
+{"ts":"2011-01-18T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":94.452739}
+{"ts":"2011-01-18T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":103.018934}
+{"ts":"2011-01-18T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":101.087367}
+{"ts":"2011-01-18T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":104.724154}
+{"ts":"2011-01-18T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":108.979936}
+{"ts":"2011-01-18T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":88.764512}
+{"ts":"2011-01-18T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":113.680094}
+{"ts":"2011-01-18T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1022.78333}
+{"ts":"2011-01-18T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":937.061939}
+{"ts":"2011-01-18T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":846.267516,"partial_null_column":"value"}
+{"ts":"2011-01-18T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":682.885525,"partial_null_column":"value"}
+{"ts":"2011-01-19T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":85.681683}
+{"ts":"2011-01-19T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":106.70055}
+{"ts":"2011-01-19T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":92.314034}
+{"ts":"2011-01-19T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":97.620315}
+{"ts":"2011-01-19T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":105.087466}
+{"ts":"2011-01-19T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":106.12783}
+{"ts":"2011-01-19T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":104.568464}
+{"ts":"2011-01-19T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":77.316731}
+{"ts":"2011-01-19T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":109.772202}
+{"ts":"2011-01-19T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1156.744712}
+{"ts":"2011-01-19T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":849.877513}
+{"ts":"2011-01-19T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1109.87495,"partial_null_column":"value"}
+{"ts":"2011-01-19T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":594.381703,"partial_null_column":"value"}
+{"ts":"2011-01-20T01:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":93.396274}
+{"ts":"2011-01-20T01:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":106.367723}
+{"ts":"2011-01-20T01:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":90.43902}
+{"ts":"2011-01-20T01:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":96.112901}
+{"ts":"2011-01-20T01:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":105.669498}
+{"ts":"2011-01-20T01:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":105.225158}
+{"ts":"2011-01-20T01:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":101.305541}
+{"ts":"2011-01-20T01:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":77.759854}
+{"ts":"2011-01-20T01:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":140.179069}
+{"ts":"2011-01-20T01:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1066.208012}
+{"ts":"2011-01-20T01:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":904.340636}
+{"ts":"2011-01-20T01:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":870.115926,"partial_null_column":"value"}
+{"ts":"2011-01-20T01:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":677.510973,"partial_null_column":"value"}
+{"ts":"2011-01-22T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":95.235266}
+{"ts":"2011-01-22T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":105.282866}
+{"ts":"2011-01-22T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":93.681096}
+{"ts":"2011-01-22T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":103.527592}
+{"ts":"2011-01-22T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":104.184494}
+{"ts":"2011-01-22T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":103.399677}
+{"ts":"2011-01-22T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":99.284525}
+{"ts":"2011-01-22T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":107.627793}
+{"ts":"2011-01-22T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":137.109783}
+{"ts":"2011-01-22T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1240.525484}
+{"ts":"2011-01-22T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1343.232494}
+{"ts":"2011-01-22T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1410.278128,"partial_null_column":"value"}
+{"ts":"2011-01-22T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1219.43217,"partial_null_column":"value"}
+{"ts":"2011-01-23T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":100.43271}
+{"ts":"2011-01-23T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":107.348157}
+{"ts":"2011-01-23T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":92.789692}
+{"ts":"2011-01-23T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":96.826443}
+{"ts":"2011-01-23T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":103.73073}
+{"ts":"2011-01-23T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":106.418686}
+{"ts":"2011-01-23T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":101.573522}
+{"ts":"2011-01-23T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":110.467875}
+{"ts":"2011-01-23T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":128.699746}
+{"ts":"2011-01-23T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1088.943083}
+{"ts":"2011-01-23T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1349.254415}
+{"ts":"2011-01-23T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":979.306038,"partial_null_column":"value"}
+{"ts":"2011-01-23T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1224.501568,"partial_null_column":"value"}
+{"ts":"2011-01-24T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":96.671647}
+{"ts":"2011-01-24T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":104.48576}
+{"ts":"2011-01-24T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":88.74846}
+{"ts":"2011-01-24T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":189.385952}
+{"ts":"2011-01-24T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":97.906256}
+{"ts":"2011-01-24T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":104.167373}
+{"ts":"2011-01-24T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":101.581339}
+{"ts":"2011-01-24T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":105.345921}
+{"ts":"2011-01-24T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":131.695956}
+{"ts":"2011-01-24T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1102.866656}
+{"ts":"2011-01-24T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":939.244103}
+{"ts":"2011-01-24T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1215.589859,"partial_null_column":"value"}
+{"ts":"2011-01-24T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":716.609179,"partial_null_column":"value"}
+{"ts":"2011-01-25T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":90.111413}
+{"ts":"2011-01-25T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":101.624789}
+{"ts":"2011-01-25T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":85.974579}
+{"ts":"2011-01-25T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":180.575246}
+{"ts":"2011-01-25T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":96.594588}
+{"ts":"2011-01-25T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":102.907866}
+{"ts":"2011-01-25T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":102.512878}
+{"ts":"2011-01-25T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":102.044542}
+{"ts":"2011-01-25T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":122.077247}
+{"ts":"2011-01-25T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1109.875413}
+{"ts":"2011-01-25T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":997.994544}
+{"ts":"2011-01-25T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1301.023342,"partial_null_column":"value"}
+{"ts":"2011-01-25T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":786.363298,"partial_null_column":"value"}
+{"ts":"2011-01-26T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":84.906466}
+{"ts":"2011-01-26T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":105.873942}
+{"ts":"2011-01-26T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":84.710523}
+{"ts":"2011-01-26T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":159.988606}
+{"ts":"2011-01-26T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":96.046584}
+{"ts":"2011-01-26T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":105.266058}
+{"ts":"2011-01-26T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":101.088903}
+{"ts":"2011-01-26T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":105.617702}
+{"ts":"2011-01-26T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":122.160681}
+{"ts":"2011-01-26T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1037.449471}
+{"ts":"2011-01-26T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1686.419659}
+{"ts":"2011-01-26T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":989.931541,"partial_null_column":"value"}
+{"ts":"2011-01-26T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1609.096706,"partial_null_column":"value"}
+{"ts":"2011-01-27T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":134.127106}
+{"ts":"2011-01-27T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":104.882908}
+{"ts":"2011-01-27T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":90.806201}
+{"ts":"2011-01-27T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":170.735853}
+{"ts":"2011-01-27T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":100.643435}
+{"ts":"2011-01-27T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":104.609483}
+{"ts":"2011-01-27T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":102.612747}
+{"ts":"2011-01-27T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":116.979005}
+{"ts":"2011-01-27T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":149.125271}
+{"ts":"2011-01-27T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1074.006938}
+{"ts":"2011-01-27T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1486.201299}
+{"ts":"2011-01-27T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1023.295213,"partial_null_column":"value"}
+{"ts":"2011-01-27T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1367.638074,"partial_null_column":"value"}
+{"ts":"2011-01-28T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":123.006128}
+{"ts":"2011-01-28T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":111.641077}
+{"ts":"2011-01-28T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":99.681629}
+{"ts":"2011-01-28T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":107.788998}
+{"ts":"2011-01-28T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":106.075672}
+{"ts":"2011-01-28T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":108.106449}
+{"ts":"2011-01-28T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":103.822842}
+{"ts":"2011-01-28T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":93.869236}
+{"ts":"2011-01-28T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":158.739359}
+{"ts":"2011-01-28T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1300.30226}
+{"ts":"2011-01-28T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1021.334487}
+{"ts":"2011-01-28T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1627.598064,"partial_null_column":"value"}
+{"ts":"2011-01-28T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":810.889422,"partial_null_column":"value"}
+{"ts":"2011-01-29T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":127.450345}
+{"ts":"2011-01-29T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":100.992147}
+{"ts":"2011-01-29T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":103.345166}
+{"ts":"2011-01-29T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":114.905745}
+{"ts":"2011-01-29T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":106.663538}
+{"ts":"2011-01-29T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":101.998823}
+{"ts":"2011-01-29T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":104.311418}
+{"ts":"2011-01-29T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":109.549035}
+{"ts":"2011-01-29T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":138.865014}
+{"ts":"2011-01-29T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1314.619452}
+{"ts":"2011-01-29T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":792.326066}
+{"ts":"2011-01-29T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1685.500085,"partial_null_column":"value"}
+{"ts":"2011-01-29T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":545.990623,"partial_null_column":"value"}
+{"ts":"2011-01-30T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":124.943293}
+{"ts":"2011-01-30T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":106.064111}
+{"ts":"2011-01-30T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":108.415967}
+{"ts":"2011-01-30T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":137.198397}
+{"ts":"2011-01-30T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":97.023907}
+{"ts":"2011-01-30T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":106.009926}
+{"ts":"2011-01-30T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":104.29849}
+{"ts":"2011-01-30T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":110.528451}
+{"ts":"2011-01-30T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":137.932693}
+{"ts":"2011-01-30T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1233.448863}
+{"ts":"2011-01-30T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":805.930143}
+{"ts":"2011-01-30T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1870.061029,"partial_null_column":"value"}
+{"ts":"2011-01-30T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":555.476028,"partial_null_column":"value"}
+{"ts":"2011-01-31T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":133.740047}
+{"ts":"2011-01-31T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":103.492964}
+{"ts":"2011-01-31T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":104.548387}
+{"ts":"2011-01-31T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":124.171944}
+{"ts":"2011-01-31T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":97.017604}
+{"ts":"2011-01-31T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":103.83204}
+{"ts":"2011-01-31T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":103.021032}
+{"ts":"2011-01-31T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":85.125795}
+{"ts":"2011-01-31T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":155.744951}
+{"ts":"2011-01-31T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1184.920651}
+{"ts":"2011-01-31T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1127.231}
+{"ts":"2011-01-31T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1643.340851,"partial_null_column":"value"}
+{"ts":"2011-01-31T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":943.497198,"partial_null_column":"value"}
+{"ts":"2011-02-01T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":132.123776}
+{"ts":"2011-02-01T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":103.890175}
+{"ts":"2011-02-01T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":103.652865}
+{"ts":"2011-02-01T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":113.896016}
+{"ts":"2011-02-01T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":98.909356}
+{"ts":"2011-02-01T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":104.383662}
+{"ts":"2011-02-01T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":102.480377}
+{"ts":"2011-02-01T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":83.931272}
+{"ts":"2011-02-01T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":134.014606}
+{"ts":"2011-02-01T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1203.465595}
+{"ts":"2011-02-01T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1100.904846}
+{"ts":"2011-02-01T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1667.497773,"partial_null_column":"value"}
+{"ts":"2011-02-01T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":913.561076,"partial_null_column":"value"}
+{"ts":"2011-02-02T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":113.492245}
+{"ts":"2011-02-02T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":104.963233}
+{"ts":"2011-02-02T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":112.042996}
+{"ts":"2011-02-02T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":102.281859}
+{"ts":"2011-02-02T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":97.711139}
+{"ts":"2011-02-02T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":105.578807}
+{"ts":"2011-02-02T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":102.152053}
+{"ts":"2011-02-02T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":96.706279}
+{"ts":"2011-02-02T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":123.170962}
+{"ts":"2011-02-02T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1097.211164}
+{"ts":"2011-02-02T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1410.792943}
+{"ts":"2011-02-02T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1218.561908,"partial_null_column":"value"}
+{"ts":"2011-02-02T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1273.707453,"partial_null_column":"value"}
+{"ts":"2011-02-03T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":85.770241}
+{"ts":"2011-02-03T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":98.877952}
+{"ts":"2011-02-03T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":106.42578}
+{"ts":"2011-02-03T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":85.069784}
+{"ts":"2011-02-03T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":100.559287}
+{"ts":"2011-02-03T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":100.976362}
+{"ts":"2011-02-03T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":102.349315}
+{"ts":"2011-02-03T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":92.326431}
+{"ts":"2011-02-03T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":134.140377}
+{"ts":"2011-02-03T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1033.401241}
+{"ts":"2011-02-03T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1283.166055}
+{"ts":"2011-02-03T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":888.70528,"partial_null_column":"value"}
+{"ts":"2011-02-03T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1113.114125,"partial_null_column":"value"}
+{"ts":"2011-02-04T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":89.182906}
+{"ts":"2011-02-04T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":106.888769}
+{"ts":"2011-02-04T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":112.471918}
+{"ts":"2011-02-04T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":99.837572}
+{"ts":"2011-02-04T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":100.918373}
+{"ts":"2011-02-04T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":106.050728}
+{"ts":"2011-02-04T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":103.103922}
+{"ts":"2011-02-04T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":93.973465}
+{"ts":"2011-02-04T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":113.716758}
+{"ts":"2011-02-04T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1025.63334}
+{"ts":"2011-02-04T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1331.860983}
+{"ts":"2011-02-04T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":864.568891,"partial_null_column":"value"}
+{"ts":"2011-02-04T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1308.582051,"partial_null_column":"value"}
+{"ts":"2011-02-05T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":93.001571}
+{"ts":"2011-02-05T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":111.394244}
+{"ts":"2011-02-05T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":117.030289}
+{"ts":"2011-02-05T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":94.31296}
+{"ts":"2011-02-05T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":105.660538}
+{"ts":"2011-02-05T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":107.929804}
+{"ts":"2011-02-05T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":100.646747}
+{"ts":"2011-02-05T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":90.732978}
+{"ts":"2011-02-05T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":114.723682}
+{"ts":"2011-02-05T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1039.500513}
+{"ts":"2011-02-05T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1332.468373}
+{"ts":"2011-02-05T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":785.078869,"partial_null_column":"value"}
+{"ts":"2011-02-05T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1363.614929,"partial_null_column":"value"}
+{"ts":"2011-02-06T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":134.462521}
+{"ts":"2011-02-06T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":110.897359}
+{"ts":"2011-02-06T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":119.60831}
+{"ts":"2011-02-06T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":93.585758}
+{"ts":"2011-02-06T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":101.847544}
+{"ts":"2011-02-06T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":110.053071}
+{"ts":"2011-02-06T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":102.770913}
+{"ts":"2011-02-06T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":93.620739}
+{"ts":"2011-02-06T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":121.270562}
+{"ts":"2011-02-06T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1011.20547}
+{"ts":"2011-02-06T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1029.995236}
+{"ts":"2011-02-06T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":787.12533,"partial_null_column":"value"}
+{"ts":"2011-02-06T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":826.039207,"partial_null_column":"value"}
+{"ts":"2011-02-07T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":130.194219}
+{"ts":"2011-02-07T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":98.815847}
+{"ts":"2011-02-07T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":112.924874}
+{"ts":"2011-02-07T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":97.480779}
+{"ts":"2011-02-07T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":97.434318}
+{"ts":"2011-02-07T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":100.706057}
+{"ts":"2011-02-07T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":102.705243}
+{"ts":"2011-02-07T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":83.902353}
+{"ts":"2011-02-07T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":115.246714}
+{"ts":"2011-02-07T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1047.212887}
+{"ts":"2011-02-07T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1057.079944}
+{"ts":"2011-02-07T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1107.243787,"partial_null_column":"value"}
+{"ts":"2011-02-07T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":872.625669,"partial_null_column":"value"}
+{"ts":"2011-02-08T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":126.243536}
+{"ts":"2011-02-08T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":93.190129}
+{"ts":"2011-02-08T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":106.969799}
+{"ts":"2011-02-08T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":97.432302}
+{"ts":"2011-02-08T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":96.790543}
+{"ts":"2011-02-08T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":97.085047}
+{"ts":"2011-02-08T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":103.308255}
+{"ts":"2011-02-08T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":75.735586}
+{"ts":"2011-02-08T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":111.04015}
+{"ts":"2011-02-08T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1064.972638}
+{"ts":"2011-02-08T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1082.72764}
+{"ts":"2011-02-08T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1188.369265,"partial_null_column":"value"}
+{"ts":"2011-02-08T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":911.95679,"partial_null_column":"value"}
+{"ts":"2011-02-09T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":129.221792}
+{"ts":"2011-02-09T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":115.548444}
+{"ts":"2011-02-09T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":111.72936}
+{"ts":"2011-02-09T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":97.071703}
+{"ts":"2011-02-09T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":96.478571}
+{"ts":"2011-02-09T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":113.554588}
+{"ts":"2011-02-09T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":105.498315}
+{"ts":"2011-02-09T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":83.742151}
+{"ts":"2011-02-09T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":112.646238}
+{"ts":"2011-02-09T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":971.050764}
+{"ts":"2011-02-09T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1320.638308}
+{"ts":"2011-02-09T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":794.098825,"partial_null_column":"value"}
+{"ts":"2011-02-09T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1299.093262,"partial_null_column":"value"}
+{"ts":"2011-02-10T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":115.461691}
+{"ts":"2011-02-10T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":118.062165}
+{"ts":"2011-02-10T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":117.629065}
+{"ts":"2011-02-10T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":97.235999}
+{"ts":"2011-02-10T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":95.698374}
+{"ts":"2011-02-10T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":115.824976}
+{"ts":"2011-02-10T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":105.708103}
+{"ts":"2011-02-10T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":91.750911}
+{"ts":"2011-02-10T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":105.557241}
+{"ts":"2011-02-10T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1070.165582}
+{"ts":"2011-02-10T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1089.647884}
+{"ts":"2011-02-10T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1212.928303,"partial_null_column":"value"}
+{"ts":"2011-02-10T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":901.327272,"partial_null_column":"value"}
+{"ts":"2011-02-11T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":129.187009}
+{"ts":"2011-02-11T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":114.637486}
+{"ts":"2011-02-11T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":114.960877}
+{"ts":"2011-02-11T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":96.617339}
+{"ts":"2011-02-11T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":100.111873}
+{"ts":"2011-02-11T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":112.571724}
+{"ts":"2011-02-11T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":105.672256}
+{"ts":"2011-02-11T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":87.904114}
+{"ts":"2011-02-11T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":102.864842}
+{"ts":"2011-02-11T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":980.386611}
+{"ts":"2011-02-11T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1179.695901}
+{"ts":"2011-02-11T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":723.514254,"partial_null_column":"value"}
+{"ts":"2011-02-11T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1061.97333,"partial_null_column":"value"}
+{"ts":"2011-02-12T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":130.104979}
+{"ts":"2011-02-12T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":115.758445}
+{"ts":"2011-02-12T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":115.225386}
+{"ts":"2011-02-12T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":96.457082}
+{"ts":"2011-02-12T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":101.515571}
+{"ts":"2011-02-12T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":114.877503}
+{"ts":"2011-02-12T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":108.637522}
+{"ts":"2011-02-12T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":88.142774}
+{"ts":"2011-02-12T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":102.850696}
+{"ts":"2011-02-12T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":959.236186}
+{"ts":"2011-02-12T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1092.416967}
+{"ts":"2011-02-12T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":602.979544,"partial_null_column":"value"}
+{"ts":"2011-02-12T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":879.406101,"partial_null_column":"value"}
+{"ts":"2011-02-13T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":119.490316}
+{"ts":"2011-02-13T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":118.841176}
+{"ts":"2011-02-13T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":119.907266}
+{"ts":"2011-02-13T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":98.60749}
+{"ts":"2011-02-13T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":100.905238}
+{"ts":"2011-02-13T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":117.965974}
+{"ts":"2011-02-13T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":112.514409}
+{"ts":"2011-02-13T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":87.820236}
+{"ts":"2011-02-13T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":106.033416}
+{"ts":"2011-02-13T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":987.067381}
+{"ts":"2011-02-13T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1103.458199}
+{"ts":"2011-02-13T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":724.262526,"partial_null_column":"value"}
+{"ts":"2011-02-13T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":862.931321,"partial_null_column":"value"}
+{"ts":"2011-02-14T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":119.323168}
+{"ts":"2011-02-14T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":115.628202}
+{"ts":"2011-02-14T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":123.098262}
+{"ts":"2011-02-14T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":103.00865}
+{"ts":"2011-02-14T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":101.645725}
+{"ts":"2011-02-14T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":117.110451}
+{"ts":"2011-02-14T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":121.060464}
+{"ts":"2011-02-14T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":73.717033}
+{"ts":"2011-02-14T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":107.663239}
+{"ts":"2011-02-14T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1091.223197}
+{"ts":"2011-02-14T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1199.607472}
+{"ts":"2011-02-14T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1133.135123,"partial_null_column":"value"}
+{"ts":"2011-02-14T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":948.657939,"partial_null_column":"value"}
+{"ts":"2011-02-15T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":123.485071}
+{"ts":"2011-02-15T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":115.527003}
+{"ts":"2011-02-15T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":121.563912}
+{"ts":"2011-02-15T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":103.519393}
+{"ts":"2011-02-15T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":105.269599}
+{"ts":"2011-02-15T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":117.138956}
+{"ts":"2011-02-15T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":121.411398}
+{"ts":"2011-02-15T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":79.700998}
+{"ts":"2011-02-15T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":108.428302}
+{"ts":"2011-02-15T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1044.3843}
+{"ts":"2011-02-15T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1183.240825}
+{"ts":"2011-02-15T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":807.601674,"partial_null_column":"value"}
+{"ts":"2011-02-15T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":914.525048,"partial_null_column":"value"}
+{"ts":"2011-02-16T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":133.726576}
+{"ts":"2011-02-16T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":116.432276}
+{"ts":"2011-02-16T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":130.717934}
+{"ts":"2011-02-16T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":105.762627}
+{"ts":"2011-02-16T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":108.338531}
+{"ts":"2011-02-16T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":117.334381}
+{"ts":"2011-02-16T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":123.270869}
+{"ts":"2011-02-16T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":98.918664}
+{"ts":"2011-02-16T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":113.643571}
+{"ts":"2011-02-16T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1289.097304}
+{"ts":"2011-02-16T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1360.032423}
+{"ts":"2011-02-16T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1553.348548,"partial_null_column":"value"}
+{"ts":"2011-02-16T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1208.456692,"partial_null_column":"value"}
+{"ts":"2011-02-17T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":147.942017}
+{"ts":"2011-02-17T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":125.032692}
+{"ts":"2011-02-17T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":126.982673}
+{"ts":"2011-02-17T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":101.092779}
+{"ts":"2011-02-17T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":103.940963}
+{"ts":"2011-02-17T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":121.872569}
+{"ts":"2011-02-17T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":120.050545}
+{"ts":"2011-02-17T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":91.969195}
+{"ts":"2011-02-17T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":112.150745}
+{"ts":"2011-02-17T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":993.591221}
+{"ts":"2011-02-17T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1021.071173}
+{"ts":"2011-02-17T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":679.619354,"partial_null_column":"value"}
+{"ts":"2011-02-17T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":645.177645,"partial_null_column":"value"}
+{"ts":"2011-02-18T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":151.053296}
+{"ts":"2011-02-18T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":127.611947}
+{"ts":"2011-02-18T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":128.063524}
+{"ts":"2011-02-18T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":100.849247}
+{"ts":"2011-02-18T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":101.960196}
+{"ts":"2011-02-18T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":124.513018}
+{"ts":"2011-02-18T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":122.546253}
+{"ts":"2011-02-18T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":92.174432}
+{"ts":"2011-02-18T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":120.151389}
+{"ts":"2011-02-18T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1105.383465}
+{"ts":"2011-02-18T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1601.829436}
+{"ts":"2011-02-18T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1120.088751,"partial_null_column":"value"}
+{"ts":"2011-02-18T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1649.533329,"partial_null_column":"value"}
+{"ts":"2011-02-19T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":163.35169}
+{"ts":"2011-02-19T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":123.447481}
+{"ts":"2011-02-19T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":133.726878}
+{"ts":"2011-02-19T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":108.822138}
+{"ts":"2011-02-19T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":102.919452}
+{"ts":"2011-02-19T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":119.371511}
+{"ts":"2011-02-19T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":125.052129}
+{"ts":"2011-02-19T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":91.547944}
+{"ts":"2011-02-19T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":121.7334}
+{"ts":"2011-02-19T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1200.527201}
+{"ts":"2011-02-19T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1600.723226}
+{"ts":"2011-02-19T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1433.398801,"partial_null_column":"value"}
+{"ts":"2011-02-19T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1598.179271,"partial_null_column":"value"}
+{"ts":"2011-02-20T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":157.483005}
+{"ts":"2011-02-20T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":129.409606}
+{"ts":"2011-02-20T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":176.323916}
+{"ts":"2011-02-20T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":109.790712}
+{"ts":"2011-02-20T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":127.819268}
+{"ts":"2011-02-20T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":122.082375}
+{"ts":"2011-02-20T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":132.719065}
+{"ts":"2011-02-20T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":105.985049}
+{"ts":"2011-02-20T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":124.637709}
+{"ts":"2011-02-20T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1317.458323}
+{"ts":"2011-02-20T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1304.326111}
+{"ts":"2011-02-20T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1192.563067,"partial_null_column":"value"}
+{"ts":"2011-02-20T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1022.854576,"partial_null_column":"value"}
+{"ts":"2011-02-21T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":155.632898}
+{"ts":"2011-02-21T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":132.231346}
+{"ts":"2011-02-21T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":193.787574}
+{"ts":"2011-02-21T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":111.386745}
+{"ts":"2011-02-21T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":154.627912}
+{"ts":"2011-02-21T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":126.995117}
+{"ts":"2011-02-21T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":138.092468}
+{"ts":"2011-02-21T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":119.85015}
+{"ts":"2011-02-21T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":119.739112}
+{"ts":"2011-02-21T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1544.108134}
+{"ts":"2011-02-21T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1488.737765}
+{"ts":"2011-02-21T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1228.502469,"partial_null_column":"value"}
+{"ts":"2011-02-21T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1298.415763,"partial_null_column":"value"}
+{"ts":"2011-02-22T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":149.171056}
+{"ts":"2011-02-22T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":124.524992}
+{"ts":"2011-02-22T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":139.557139}
+{"ts":"2011-02-22T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":108.370907}
+{"ts":"2011-02-22T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":111.394542}
+{"ts":"2011-02-22T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":122.51064}
+{"ts":"2011-02-22T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":126.596847}
+{"ts":"2011-02-22T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":86.333235}
+{"ts":"2011-02-22T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":115.915849}
+{"ts":"2011-02-22T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1224.827108}
+{"ts":"2011-02-22T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1421.648704}
+{"ts":"2011-02-22T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1345.964309,"partial_null_column":"value"}
+{"ts":"2011-02-22T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1291.897942,"partial_null_column":"value"}
+{"ts":"2011-02-23T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":165.273009}
+{"ts":"2011-02-23T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":127.199815}
+{"ts":"2011-02-23T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":145.588115}
+{"ts":"2011-02-23T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":107.896489}
+{"ts":"2011-02-23T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":113.141185}
+{"ts":"2011-02-23T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":122.404192}
+{"ts":"2011-02-23T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":124.305608}
+{"ts":"2011-02-23T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":91.191071}
+{"ts":"2011-02-23T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":123.961542}
+{"ts":"2011-02-23T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1251.906228}
+{"ts":"2011-02-23T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1414.619004}
+{"ts":"2011-02-23T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1306.495696,"partial_null_column":"value"}
+{"ts":"2011-02-23T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1287.766687,"partial_null_column":"value"}
+{"ts":"2011-02-24T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":168.988478}
+{"ts":"2011-02-24T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":123.553981}
+{"ts":"2011-02-24T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":139.978575}
+{"ts":"2011-02-24T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":104.951315}
+{"ts":"2011-02-24T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":113.621184}
+{"ts":"2011-02-24T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":118.862342}
+{"ts":"2011-02-24T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":119.772575}
+{"ts":"2011-02-24T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":91.962584}
+{"ts":"2011-02-24T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":118.270052}
+{"ts":"2011-02-24T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1350.175381}
+{"ts":"2011-02-24T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":970.728273}
+{"ts":"2011-02-24T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1631.584352,"partial_null_column":"value"}
+{"ts":"2011-02-24T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":578.795979,"partial_null_column":"value"}
+{"ts":"2011-02-25T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":172.33554}
+{"ts":"2011-02-25T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":107.539869}
+{"ts":"2011-02-25T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":140.941317}
+{"ts":"2011-02-25T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":99.698015}
+{"ts":"2011-02-25T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":99.460461}
+{"ts":"2011-02-25T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":106.82763}
+{"ts":"2011-02-25T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":115.932803}
+{"ts":"2011-02-25T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":82.350556}
+{"ts":"2011-02-25T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":120.124862}
+{"ts":"2011-02-25T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1057.427269}
+{"ts":"2011-02-25T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1073.967314}
+{"ts":"2011-02-25T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1017.573185,"partial_null_column":"value"}
+{"ts":"2011-02-25T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":782.013486,"partial_null_column":"value"}
+{"ts":"2011-02-26T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":225.243186}
+{"ts":"2011-02-26T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":103.643952}
+{"ts":"2011-02-26T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":138.924835}
+{"ts":"2011-02-26T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":103.667031}
+{"ts":"2011-02-26T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":98.314744}
+{"ts":"2011-02-26T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":105.352891}
+{"ts":"2011-02-26T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":118.896845}
+{"ts":"2011-02-26T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":83.099365}
+{"ts":"2011-02-26T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":131.310541}
+{"ts":"2011-02-26T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":996.433708}
+{"ts":"2011-02-26T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1743.92175}
+{"ts":"2011-02-26T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":829.916235,"partial_null_column":"value"}
+{"ts":"2011-02-26T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1862.737933,"partial_null_column":"value"}
+{"ts":"2011-02-27T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":277.273533}
+{"ts":"2011-02-27T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":96.864384}
+{"ts":"2011-02-27T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":136.394846}
+{"ts":"2011-02-27T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":114.634278}
+{"ts":"2011-02-27T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":103.226967}
+{"ts":"2011-02-27T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":99.158839}
+{"ts":"2011-02-27T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":121.929932}
+{"ts":"2011-02-27T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":78.72795}
+{"ts":"2011-02-27T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":136.163414}
+{"ts":"2011-02-27T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1044.562903}
+{"ts":"2011-02-27T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1474.591017}
+{"ts":"2011-02-27T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":873.306547,"partial_null_column":"value"}
+{"ts":"2011-02-27T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1427.016724,"partial_null_column":"value"}
+{"ts":"2011-02-28T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":122.258195}
+{"ts":"2011-02-28T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":97.218943}
+{"ts":"2011-02-28T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":141.261324}
+{"ts":"2011-02-28T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":112.528286}
+{"ts":"2011-02-28T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":102.185098}
+{"ts":"2011-02-28T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":99.505465}
+{"ts":"2011-02-28T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":121.786785}
+{"ts":"2011-02-28T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":72.163651}
+{"ts":"2011-02-28T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":114.284569}
+{"ts":"2011-02-28T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1159.278766}
+{"ts":"2011-02-28T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1292.542896}
+{"ts":"2011-02-28T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1430.257348,"partial_null_column":"value"}
+{"ts":"2011-02-28T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1101.91827,"partial_null_column":"value"}
+{"ts":"2011-03-01T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":153.059937}
+{"ts":"2011-03-01T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":99.070796}
+{"ts":"2011-03-01T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":143.424672}
+{"ts":"2011-03-01T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":114.700932}
+{"ts":"2011-03-01T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":105.453024}
+{"ts":"2011-03-01T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":99.772347}
+{"ts":"2011-03-01T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":123.251814}
+{"ts":"2011-03-01T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":72.79297}
+{"ts":"2011-03-01T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":116.975408}
+{"ts":"2011-03-01T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1124.201419}
+{"ts":"2011-03-01T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1243.35401}
+{"ts":"2011-03-01T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1166.141121,"partial_null_column":"value"}
+{"ts":"2011-03-01T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1004.940887,"partial_null_column":"value"}
+{"ts":"2011-03-02T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":174.89052}
+{"ts":"2011-03-02T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":98.432014}
+{"ts":"2011-03-02T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":147.117434}
+{"ts":"2011-03-02T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":112.968782}
+{"ts":"2011-03-02T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":109.239196}
+{"ts":"2011-03-02T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":100.600391}
+{"ts":"2011-03-02T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":120.212473}
+{"ts":"2011-03-02T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":82.823988}
+{"ts":"2011-03-02T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":116.460744}
+{"ts":"2011-03-02T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1051.80894}
+{"ts":"2011-03-02T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1143.078414}
+{"ts":"2011-03-02T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":740.18372,"partial_null_column":"value"}
+{"ts":"2011-03-02T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":865.7779,"partial_null_column":"value"}
+{"ts":"2011-03-03T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":127.994476}
+{"ts":"2011-03-03T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":92.537499}
+{"ts":"2011-03-03T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":140.215411}
+{"ts":"2011-03-03T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":108.914095}
+{"ts":"2011-03-03T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":108.784646}
+{"ts":"2011-03-03T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":96.031371}
+{"ts":"2011-03-03T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":115.393493}
+{"ts":"2011-03-03T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":75.977564}
+{"ts":"2011-03-03T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":114.18831}
+{"ts":"2011-03-03T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1097.490771}
+{"ts":"2011-03-03T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1010.370296}
+{"ts":"2011-03-03T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":901.307577,"partial_null_column":"value"}
+{"ts":"2011-03-03T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":691.95892,"partial_null_column":"value"}
+{"ts":"2011-03-04T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":119.851231}
+{"ts":"2011-03-04T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":93.634505}
+{"ts":"2011-03-04T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":132.832331}
+{"ts":"2011-03-04T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":110.018472}
+{"ts":"2011-03-04T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":107.285615}
+{"ts":"2011-03-04T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":97.535226}
+{"ts":"2011-03-04T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":113.883056}
+{"ts":"2011-03-04T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":81.131208}
+{"ts":"2011-03-04T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":109.607245}
+{"ts":"2011-03-04T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1326.829155}
+{"ts":"2011-03-04T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1179.803776}
+{"ts":"2011-03-04T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1674.331703,"partial_null_column":"value"}
+{"ts":"2011-03-04T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":975.577927,"partial_null_column":"value"}
+{"ts":"2011-03-05T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":136.94177}
+{"ts":"2011-03-05T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":97.942645}
+{"ts":"2011-03-05T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":145.393016}
+{"ts":"2011-03-05T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":108.394611}
+{"ts":"2011-03-05T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":112.522435}
+{"ts":"2011-03-05T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":102.486832}
+{"ts":"2011-03-05T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":114.691277}
+{"ts":"2011-03-05T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":81.10511}
+{"ts":"2011-03-05T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":117.904527}
+{"ts":"2011-03-05T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1281.601175}
+{"ts":"2011-03-05T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":994.731237}
+{"ts":"2011-03-05T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1360.694785,"partial_null_column":"value"}
+{"ts":"2011-03-05T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":755.899363,"partial_null_column":"value"}
+{"ts":"2011-03-06T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":129.531062}
+{"ts":"2011-03-06T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":99.508679}
+{"ts":"2011-03-06T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":144.925734}
+{"ts":"2011-03-06T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":113.069662}
+{"ts":"2011-03-06T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":113.035167}
+{"ts":"2011-03-06T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":102.536839}
+{"ts":"2011-03-06T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":115.956859}
+{"ts":"2011-03-06T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":81.612269}
+{"ts":"2011-03-06T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":120.953163}
+{"ts":"2011-03-06T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1081.650406}
+{"ts":"2011-03-06T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1103.239788}
+{"ts":"2011-03-06T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":771.34846,"partial_null_column":"value"}
+{"ts":"2011-03-06T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":869.30836,"partial_null_column":"value"}
+{"ts":"2011-03-07T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":111.909348}
+{"ts":"2011-03-07T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":105.575929}
+{"ts":"2011-03-07T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":150.452695}
+{"ts":"2011-03-07T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":118.024245}
+{"ts":"2011-03-07T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":111.106693}
+{"ts":"2011-03-07T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":107.220218}
+{"ts":"2011-03-07T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":121.582721}
+{"ts":"2011-03-07T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":68.699125}
+{"ts":"2011-03-07T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":106.884238}
+{"ts":"2011-03-07T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1177.858403}
+{"ts":"2011-03-07T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1152.547767}
+{"ts":"2011-03-07T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1095.63752,"partial_null_column":"value"}
+{"ts":"2011-03-07T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":906.373797,"partial_null_column":"value"}
+{"ts":"2011-03-08T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":109.764955}
+{"ts":"2011-03-08T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":98.972716}
+{"ts":"2011-03-08T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":143.214331}
+{"ts":"2011-03-08T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":119.777621}
+{"ts":"2011-03-08T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":107.465492}
+{"ts":"2011-03-08T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":101.652185}
+{"ts":"2011-03-08T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":122.692722}
+{"ts":"2011-03-08T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":70.866726}
+{"ts":"2011-03-08T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":111.704071}
+{"ts":"2011-03-08T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1117.953961}
+{"ts":"2011-03-08T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1084.332554}
+{"ts":"2011-03-08T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":988.893782,"partial_null_column":"value"}
+{"ts":"2011-03-08T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":835.762631,"partial_null_column":"value"}
+{"ts":"2011-03-09T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":139.26095}
+{"ts":"2011-03-09T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":110.873407}
+{"ts":"2011-03-09T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":138.466933}
+{"ts":"2011-03-09T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":115.013313}
+{"ts":"2011-03-09T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":105.613469}
+{"ts":"2011-03-09T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":112.407868}
+{"ts":"2011-03-09T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":121.220772}
+{"ts":"2011-03-09T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":82.426362}
+{"ts":"2011-03-09T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":107.998334}
+{"ts":"2011-03-09T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1029.8025}
+{"ts":"2011-03-09T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1121.385333}
+{"ts":"2011-03-09T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":776.70294,"partial_null_column":"value"}
+{"ts":"2011-03-09T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":875.683406,"partial_null_column":"value"}
+{"ts":"2011-03-10T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":148.80915}
+{"ts":"2011-03-10T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":105.214709}
+{"ts":"2011-03-10T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":134.212714}
+{"ts":"2011-03-10T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":114.717338}
+{"ts":"2011-03-10T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":119.613508}
+{"ts":"2011-03-10T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":107.127962}
+{"ts":"2011-03-10T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":118.864028}
+{"ts":"2011-03-10T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":79.793836}
+{"ts":"2011-03-10T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":107.706257}
+{"ts":"2011-03-10T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1244.849915}
+{"ts":"2011-03-10T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1077.279402}
+{"ts":"2011-03-10T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1070.836247,"partial_null_column":"value"}
+{"ts":"2011-03-10T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":835.461226,"partial_null_column":"value"}
+{"ts":"2011-03-11T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":135.820968}
+{"ts":"2011-03-11T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":106.898536}
+{"ts":"2011-03-11T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":135.038992}
+{"ts":"2011-03-11T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":112.85623}
+{"ts":"2011-03-11T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":120.497687}
+{"ts":"2011-03-11T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":108.135811}
+{"ts":"2011-03-11T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":118.29835}
+{"ts":"2011-03-11T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":67.73117}
+{"ts":"2011-03-11T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":108.186877}
+{"ts":"2011-03-11T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1098.54317}
+{"ts":"2011-03-11T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":998.650727}
+{"ts":"2011-03-11T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":715.516125,"partial_null_column":"value"}
+{"ts":"2011-03-11T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":755.646538,"partial_null_column":"value"}
+{"ts":"2011-03-12T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":155.728048}
+{"ts":"2011-03-12T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":113.49346}
+{"ts":"2011-03-12T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":132.687079}
+{"ts":"2011-03-12T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":112.554597}
+{"ts":"2011-03-12T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":114.681603}
+{"ts":"2011-03-12T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":115.57294}
+{"ts":"2011-03-12T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":118.574721}
+{"ts":"2011-03-12T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":74.394926}
+{"ts":"2011-03-12T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":109.384493}
+{"ts":"2011-03-12T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1088.807596}
+{"ts":"2011-03-12T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1008.745525}
+{"ts":"2011-03-12T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":771.100508,"partial_null_column":"value"}
+{"ts":"2011-03-12T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":764.50807,"partial_null_column":"value"}
+{"ts":"2011-03-13T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":149.637715}
+{"ts":"2011-03-13T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":113.760384}
+{"ts":"2011-03-13T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":120.113921}
+{"ts":"2011-03-13T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":120.76013}
+{"ts":"2011-03-13T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":103.227522}
+{"ts":"2011-03-13T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":114.81407}
+{"ts":"2011-03-13T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":120.620862}
+{"ts":"2011-03-13T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":70.126017}
+{"ts":"2011-03-13T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":108.579283}
+{"ts":"2011-03-13T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":998.753955}
+{"ts":"2011-03-13T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1129.723252}
+{"ts":"2011-03-13T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":736.409261,"partial_null_column":"value"}
+{"ts":"2011-03-13T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":884.837267,"partial_null_column":"value"}
+{"ts":"2011-03-14T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":153.191744}
+{"ts":"2011-03-14T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":109.461442}
+{"ts":"2011-03-14T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":123.248581}
+{"ts":"2011-03-14T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":120.487244}
+{"ts":"2011-03-14T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":104.716583}
+{"ts":"2011-03-14T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":111.688901}
+{"ts":"2011-03-14T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":122.275869}
+{"ts":"2011-03-14T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":59.021022}
+{"ts":"2011-03-14T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":104.724023}
+{"ts":"2011-03-14T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1075.243024}
+{"ts":"2011-03-14T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1141.5884}
+{"ts":"2011-03-14T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":918.72284,"partial_null_column":"value"}
+{"ts":"2011-03-14T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":893.985017,"partial_null_column":"value"}
+{"ts":"2011-03-15T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":145.963558}
+{"ts":"2011-03-15T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":109.382273}
+{"ts":"2011-03-15T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":121.386341}
+{"ts":"2011-03-15T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":119.250945}
+{"ts":"2011-03-15T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":103.583295}
+{"ts":"2011-03-15T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":112.354294}
+{"ts":"2011-03-15T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":122.038585}
+{"ts":"2011-03-15T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":59.266595}
+{"ts":"2011-03-15T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":103.134338}
+{"ts":"2011-03-15T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1037.381049}
+{"ts":"2011-03-15T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1099.197263}
+{"ts":"2011-03-15T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":832.874861,"partial_null_column":"value"}
+{"ts":"2011-03-15T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":850.995007,"partial_null_column":"value"}
+{"ts":"2011-03-16T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":147.471464}
+{"ts":"2011-03-16T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":110.565004}
+{"ts":"2011-03-16T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":110.070846}
+{"ts":"2011-03-16T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":115.750963}
+{"ts":"2011-03-16T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":99.13798}
+{"ts":"2011-03-16T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":112.577264}
+{"ts":"2011-03-16T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":120.455865}
+{"ts":"2011-03-16T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":69.329723}
+{"ts":"2011-03-16T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":107.903885}
+{"ts":"2011-03-16T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":981.577244}
+{"ts":"2011-03-16T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1092.942008}
+{"ts":"2011-03-16T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":767.973326,"partial_null_column":"value"}
+{"ts":"2011-03-16T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":848.339888,"partial_null_column":"value"}
+{"ts":"2011-03-17T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":148.90541}
+{"ts":"2011-03-17T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":113.501786}
+{"ts":"2011-03-17T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":109.666402}
+{"ts":"2011-03-17T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":114.540037}
+{"ts":"2011-03-17T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":105.996125}
+{"ts":"2011-03-17T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":116.816958}
+{"ts":"2011-03-17T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":122.740143}
+{"ts":"2011-03-17T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":69.258523}
+{"ts":"2011-03-17T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":110.797348}
+{"ts":"2011-03-17T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1072.23932}
+{"ts":"2011-03-17T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1154.415689}
+{"ts":"2011-03-17T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":878.683776,"partial_null_column":"value"}
+{"ts":"2011-03-17T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":906.101957,"partial_null_column":"value"}
+{"ts":"2011-03-18T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":180.343171}
+{"ts":"2011-03-18T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":110.037579}
+{"ts":"2011-03-18T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":130.260926}
+{"ts":"2011-03-18T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":113.490115}
+{"ts":"2011-03-18T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":111.540639}
+{"ts":"2011-03-18T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":113.238556}
+{"ts":"2011-03-18T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":119.629977}
+{"ts":"2011-03-18T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":68.573162}
+{"ts":"2011-03-18T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":114.564808}
+{"ts":"2011-03-18T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1311.178603}
+{"ts":"2011-03-18T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1176.605164}
+{"ts":"2011-03-18T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1403.830217,"partial_null_column":"value"}
+{"ts":"2011-03-18T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":936.429632,"partial_null_column":"value"}
+{"ts":"2011-03-19T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":177.51427}
+{"ts":"2011-03-19T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":109.788875}
+{"ts":"2011-03-19T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":134.147573}
+{"ts":"2011-03-19T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":117.197085}
+{"ts":"2011-03-19T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":112.999693}
+{"ts":"2011-03-19T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":112.236468}
+{"ts":"2011-03-19T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":120.638001}
+{"ts":"2011-03-19T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":72.369471}
+{"ts":"2011-03-19T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":115.384807}
+{"ts":"2011-03-19T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1107.220174}
+{"ts":"2011-03-19T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1102.698977}
+{"ts":"2011-03-19T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":846.288386,"partial_null_column":"value"}
+{"ts":"2011-03-19T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":856.490089,"partial_null_column":"value"}
+{"ts":"2011-03-20T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":178.454262}
+{"ts":"2011-03-20T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":123.507497}
+{"ts":"2011-03-20T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":157.74933}
+{"ts":"2011-03-20T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":117.851058}
+{"ts":"2011-03-20T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":128.274705}
+{"ts":"2011-03-20T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":125.496367}
+{"ts":"2011-03-20T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":129.519442}
+{"ts":"2011-03-20T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":85.013155}
+{"ts":"2011-03-20T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":128.705337}
+{"ts":"2011-03-20T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1285.090048}
+{"ts":"2011-03-20T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1217.547439}
+{"ts":"2011-03-20T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1032.257527,"partial_null_column":"value"}
+{"ts":"2011-03-20T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":954.754185,"partial_null_column":"value"}
+{"ts":"2011-03-21T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":182.035296}
+{"ts":"2011-03-21T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":124.411632}
+{"ts":"2011-03-21T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":157.15373}
+{"ts":"2011-03-21T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":122.462424}
+{"ts":"2011-03-21T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":128.149976}
+{"ts":"2011-03-21T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":125.243882}
+{"ts":"2011-03-21T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":131.807919}
+{"ts":"2011-03-21T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":75.93664}
+{"ts":"2011-03-21T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":123.653645}
+{"ts":"2011-03-21T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1283.957016}
+{"ts":"2011-03-21T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1178.830164}
+{"ts":"2011-03-21T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1031.990042,"partial_null_column":"value"}
+{"ts":"2011-03-21T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":907.021565,"partial_null_column":"value"}
+{"ts":"2011-03-22T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":177.460613}
+{"ts":"2011-03-22T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":121.270611}
+{"ts":"2011-03-22T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":151.407583}
+{"ts":"2011-03-22T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":124.40078}
+{"ts":"2011-03-22T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":126.415884}
+{"ts":"2011-03-22T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":124.970533}
+{"ts":"2011-03-22T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":133.124963}
+{"ts":"2011-03-22T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":79.948248}
+{"ts":"2011-03-22T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":122.357549}
+{"ts":"2011-03-22T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1301.778098}
+{"ts":"2011-03-22T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1119.247202}
+{"ts":"2011-03-22T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1110.788895,"partial_null_column":"value"}
+{"ts":"2011-03-22T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":843.952139,"partial_null_column":"value"}
+{"ts":"2011-03-23T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":154.019632}
+{"ts":"2011-03-23T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":126.764513}
+{"ts":"2011-03-23T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":158.592715}
+{"ts":"2011-03-23T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":118.97231}
+{"ts":"2011-03-23T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":126.672392}
+{"ts":"2011-03-23T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":129.864384}
+{"ts":"2011-03-23T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":131.786598}
+{"ts":"2011-03-23T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":102.603152}
+{"ts":"2011-03-23T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":123.75424}
+{"ts":"2011-03-23T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1403.338838}
+{"ts":"2011-03-23T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1156.601892}
+{"ts":"2011-03-23T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1362.650586,"partial_null_column":"value"}
+{"ts":"2011-03-23T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":884.801502,"partial_null_column":"value"}
+{"ts":"2011-03-24T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":135.569784}
+{"ts":"2011-03-24T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":123.895027}
+{"ts":"2011-03-24T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":156.650862}
+{"ts":"2011-03-24T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":119.777998}
+{"ts":"2011-03-24T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":115.945757}
+{"ts":"2011-03-24T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":125.044877}
+{"ts":"2011-03-24T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":129.023978}
+{"ts":"2011-03-24T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":88.521042}
+{"ts":"2011-03-24T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":124.062061}
+{"ts":"2011-03-24T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1429.580257}
+{"ts":"2011-03-24T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1137.842315}
+{"ts":"2011-03-24T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1684.268799,"partial_null_column":"value"}
+{"ts":"2011-03-24T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":873.65203,"partial_null_column":"value"}
+{"ts":"2011-03-25T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":140.577121}
+{"ts":"2011-03-25T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":125.766952}
+{"ts":"2011-03-25T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":157.432108}
+{"ts":"2011-03-25T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":119.400783}
+{"ts":"2011-03-25T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":114.70696}
+{"ts":"2011-03-25T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":126.05796}
+{"ts":"2011-03-25T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":128.943094}
+{"ts":"2011-03-25T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":89.408906}
+{"ts":"2011-03-25T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":136.136598}
+{"ts":"2011-03-25T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1124.935193}
+{"ts":"2011-03-25T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1256.499779}
+{"ts":"2011-03-25T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":855.717712,"partial_null_column":"value"}
+{"ts":"2011-03-25T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":996.564152,"partial_null_column":"value"}
+{"ts":"2011-03-26T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":148.957194}
+{"ts":"2011-03-26T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":130.824022}
+{"ts":"2011-03-26T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":162.81545}
+{"ts":"2011-03-26T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":118.463523}
+{"ts":"2011-03-26T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":117.449116}
+{"ts":"2011-03-26T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":142.972964}
+{"ts":"2011-03-26T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":139.214665}
+{"ts":"2011-03-26T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":101.686196}
+{"ts":"2011-03-26T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":138.663182}
+{"ts":"2011-03-26T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1217.877395}
+{"ts":"2011-03-26T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1247.890809}
+{"ts":"2011-03-26T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1061.678577,"partial_null_column":"value"}
+{"ts":"2011-03-26T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":962.235801,"partial_null_column":"value"}
+{"ts":"2011-03-27T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":144.056669}
+{"ts":"2011-03-27T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":135.183271}
+{"ts":"2011-03-27T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":163.161361}
+{"ts":"2011-03-27T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":130.599006}
+{"ts":"2011-03-27T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":114.952545}
+{"ts":"2011-03-27T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":139.294248}
+{"ts":"2011-03-27T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":142.430177}
+{"ts":"2011-03-27T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":108.489598}
+{"ts":"2011-03-27T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":141.820068}
+{"ts":"2011-03-27T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1185.709973}
+{"ts":"2011-03-27T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1345.781728}
+{"ts":"2011-03-27T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1019.898509,"partial_null_column":"value"}
+{"ts":"2011-03-27T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1056.419292,"partial_null_column":"value"}
+{"ts":"2011-03-28T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":156.155294}
+{"ts":"2011-03-28T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":124.336139}
+{"ts":"2011-03-28T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":163.100154}
+{"ts":"2011-03-28T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":131.191818}
+{"ts":"2011-03-28T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":115.709767}
+{"ts":"2011-03-28T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":127.403089}
+{"ts":"2011-03-28T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":140.941296}
+{"ts":"2011-03-28T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":103.578536}
+{"ts":"2011-03-28T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":130.880788}
+{"ts":"2011-03-28T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1250.166788}
+{"ts":"2011-03-28T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1390.75405}
+{"ts":"2011-03-28T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1198.723103,"partial_null_column":"value"}
+{"ts":"2011-03-28T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1108.136072,"partial_null_column":"value"}
+{"ts":"2011-03-29T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":134.084672}
+{"ts":"2011-03-29T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":117.626804}
+{"ts":"2011-03-29T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":158.073319}
+{"ts":"2011-03-29T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":128.074393}
+{"ts":"2011-03-29T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":109.678515}
+{"ts":"2011-03-29T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":122.620188}
+{"ts":"2011-03-29T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":144.446039}
+{"ts":"2011-03-29T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":91.604463}
+{"ts":"2011-03-29T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":132.477651}
+{"ts":"2011-03-29T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1224.116225}
+{"ts":"2011-03-29T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1361.080245}
+{"ts":"2011-03-29T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1289.009485,"partial_null_column":"value"}
+{"ts":"2011-03-29T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1069.431801,"partial_null_column":"value"}
+{"ts":"2011-03-30T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":135.94282}
+{"ts":"2011-03-30T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":120.283054}
+{"ts":"2011-03-30T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":167.96062}
+{"ts":"2011-03-30T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":121.215839}
+{"ts":"2011-03-30T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":116.587746}
+{"ts":"2011-03-30T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":122.612114}
+{"ts":"2011-03-30T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":138.827311}
+{"ts":"2011-03-30T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":93.331887}
+{"ts":"2011-03-30T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":128.645571}
+{"ts":"2011-03-30T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1190.933753}
+{"ts":"2011-03-30T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1310.79707}
+{"ts":"2011-03-30T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1001.134025,"partial_null_column":"value"}
+{"ts":"2011-03-30T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1030.499562,"partial_null_column":"value"}
+{"ts":"2011-03-31T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":151.752485}
+{"ts":"2011-03-31T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":124.414321}
+{"ts":"2011-03-31T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":175.778647}
+{"ts":"2011-03-31T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":120.607382}
+{"ts":"2011-03-31T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":117.060598}
+{"ts":"2011-03-31T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":125.243245}
+{"ts":"2011-03-31T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":150.247713}
+{"ts":"2011-03-31T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":93.390841}
+{"ts":"2011-03-31T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":125.839686}
+{"ts":"2011-03-31T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1466.209327}
+{"ts":"2011-03-31T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1366.447617}
+{"ts":"2011-03-31T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1734.274909,"partial_null_column":"value"}
+{"ts":"2011-03-31T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1063.201156,"partial_null_column":"value"}
+{"ts":"2011-04-01T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":135.885094}
+{"ts":"2011-04-01T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":118.57034}
+{"ts":"2011-04-01T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":158.747224}
+{"ts":"2011-04-01T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":120.134704}
+{"ts":"2011-04-01T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":109.705815}
+{"ts":"2011-04-01T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":121.583581}
+{"ts":"2011-04-01T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":144.507368}
+{"ts":"2011-04-01T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":78.622547}
+{"ts":"2011-04-01T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":119.922742}
+{"ts":"2011-04-01T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1314.839715}
+{"ts":"2011-04-01T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1522.043733}
+{"ts":"2011-04-01T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1447.34116,"partial_null_column":"value"}
+{"ts":"2011-04-01T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1234.247546,"partial_null_column":"value"}
+{"ts":"2011-04-02T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":147.425935}
+{"ts":"2011-04-02T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":112.987027}
+{"ts":"2011-04-02T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":166.016049}
+{"ts":"2011-04-02T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":113.446008}
+{"ts":"2011-04-02T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":110.931934}
+{"ts":"2011-04-02T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":114.290141}
+{"ts":"2011-04-02T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":135.301506}
+{"ts":"2011-04-02T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":97.387433}
+{"ts":"2011-04-02T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":126.411364}
+{"ts":"2011-04-02T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1193.556278}
+{"ts":"2011-04-02T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1321.375057}
+{"ts":"2011-04-02T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1144.342401,"partial_null_column":"value"}
+{"ts":"2011-04-02T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1049.738585,"partial_null_column":"value"}
+{"ts":"2011-04-03T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":122.971856}
+{"ts":"2011-04-03T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":105.735462}
+{"ts":"2011-04-03T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":153.927965}
+{"ts":"2011-04-03T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":103.532351}
+{"ts":"2011-04-03T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":107.047773}
+{"ts":"2011-04-03T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":107.919674}
+{"ts":"2011-04-03T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":122.141707}
+{"ts":"2011-04-03T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":80.861743}
+{"ts":"2011-04-03T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":117.24707}
+{"ts":"2011-04-03T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1055.783661}
+{"ts":"2011-04-03T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1021.638673}
+{"ts":"2011-04-03T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":811.991286,"partial_null_column":"value"}
+{"ts":"2011-04-03T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":768.423077,"partial_null_column":"value"}
+{"ts":"2011-04-04T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":110.919829}
+{"ts":"2011-04-04T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":107.613577}
+{"ts":"2011-04-04T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":146.729242}
+{"ts":"2011-04-04T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":105.375351}
+{"ts":"2011-04-04T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":110.57367}
+{"ts":"2011-04-04T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":114.382255}
+{"ts":"2011-04-04T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":125.285894}
+{"ts":"2011-04-04T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":72.66843}
+{"ts":"2011-04-04T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":117.703023}
+{"ts":"2011-04-04T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1197.008423}
+{"ts":"2011-04-04T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1131.531986}
+{"ts":"2011-04-04T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1151.069173,"partial_null_column":"value"}
+{"ts":"2011-04-04T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":877.079396,"partial_null_column":"value"}
+{"ts":"2011-04-05T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":113.318712}
+{"ts":"2011-04-05T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":105.615563}
+{"ts":"2011-04-05T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":141.713507}
+{"ts":"2011-04-05T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":106.207931}
+{"ts":"2011-04-05T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":109.890586}
+{"ts":"2011-04-05T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":110.012987}
+{"ts":"2011-04-05T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":124.478408}
+{"ts":"2011-04-05T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":86.683603}
+{"ts":"2011-04-05T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":117.051694}
+{"ts":"2011-04-05T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1192.144303}
+{"ts":"2011-04-05T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1154.289559}
+{"ts":"2011-04-05T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1146.423036,"partial_null_column":"value"}
+{"ts":"2011-04-05T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":902.615706,"partial_null_column":"value"}
+{"ts":"2011-04-06T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":115.334018}
+{"ts":"2011-04-06T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":109.700256}
+{"ts":"2011-04-06T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":147.553562}
+{"ts":"2011-04-06T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":100.775597}
+{"ts":"2011-04-06T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":108.659345}
+{"ts":"2011-04-06T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":113.408308}
+{"ts":"2011-04-06T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":121.079585}
+{"ts":"2011-04-06T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":92.336403}
+{"ts":"2011-04-06T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":112.921482}
+{"ts":"2011-04-06T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1272.677122}
+{"ts":"2011-04-06T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1141.514652}
+{"ts":"2011-04-06T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1355.843374,"partial_null_column":"value"}
+{"ts":"2011-04-06T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":897.393445,"partial_null_column":"value"}
+{"ts":"2011-04-07T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":117.508062}
+{"ts":"2011-04-07T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":115.418054}
+{"ts":"2011-04-07T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":141.565031}
+{"ts":"2011-04-07T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":95.562446}
+{"ts":"2011-04-07T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":102.933171}
+{"ts":"2011-04-07T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":122.696621}
+{"ts":"2011-04-07T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":119.763135}
+{"ts":"2011-04-07T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":84.357701}
+{"ts":"2011-04-07T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":117.43276}
+{"ts":"2011-04-07T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1190.896088}
+{"ts":"2011-04-07T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1009.363132}
+{"ts":"2011-04-07T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1260.143027,"partial_null_column":"value"}
+{"ts":"2011-04-07T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":762.862488,"partial_null_column":"value"}
+{"ts":"2011-04-08T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":120.97386}
+{"ts":"2011-04-08T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":116.24886}
+{"ts":"2011-04-08T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":146.830618}
+{"ts":"2011-04-08T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":96.226609}
+{"ts":"2011-04-08T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":95.447888}
+{"ts":"2011-04-08T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":120.709912}
+{"ts":"2011-04-08T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":120.309688}
+{"ts":"2011-04-08T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":94.631354}
+{"ts":"2011-04-08T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":122.743898}
+{"ts":"2011-04-08T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1006.913816}
+{"ts":"2011-04-08T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1032.599837}
+{"ts":"2011-04-08T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":935.168026,"partial_null_column":"value"}
+{"ts":"2011-04-08T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":782.107861,"partial_null_column":"value"}
+{"ts":"2011-04-09T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":116.080323}
+{"ts":"2011-04-09T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":116.060759}
+{"ts":"2011-04-09T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":158.682525}
+{"ts":"2011-04-09T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":95.509796}
+{"ts":"2011-04-09T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":110.007248}
+{"ts":"2011-04-09T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":121.905685}
+{"ts":"2011-04-09T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":126.369367}
+{"ts":"2011-04-09T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":92.90507}
+{"ts":"2011-04-09T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":123.79132}
+{"ts":"2011-04-09T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1137.385764}
+{"ts":"2011-04-09T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1030.075553}
+{"ts":"2011-04-09T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":996.205369,"partial_null_column":"value"}
+{"ts":"2011-04-09T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":767.692135,"partial_null_column":"value"}
+{"ts":"2011-04-10T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":113.221448}
+{"ts":"2011-04-10T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":95.570457}
+{"ts":"2011-04-10T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":131.766616}
+{"ts":"2011-04-10T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":99.950855}
+{"ts":"2011-04-10T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":91.470524}
+{"ts":"2011-04-10T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":99.393076}
+{"ts":"2011-04-10T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":123.207579}
+{"ts":"2011-04-10T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":84.898691}
+{"ts":"2011-04-10T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":114.353962}
+{"ts":"2011-04-10T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1005.253077}
+{"ts":"2011-04-10T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1030.094757}
+{"ts":"2011-04-10T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1031.741509,"partial_null_column":"value"}
+{"ts":"2011-04-10T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":775.965555,"partial_null_column":"value"}
+{"ts":"2011-04-11T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":130.165796}
+{"ts":"2011-04-11T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":107.765101}
+{"ts":"2011-04-11T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":142.751726}
+{"ts":"2011-04-11T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":104.847285}
+{"ts":"2011-04-11T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":95.272956}
+{"ts":"2011-04-11T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":106.229286}
+{"ts":"2011-04-11T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":126.823859}
+{"ts":"2011-04-11T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":89.250155}
+{"ts":"2011-04-11T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":122.049678}
+{"ts":"2011-04-11T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1112.794811}
+{"ts":"2011-04-11T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1113.35753}
+{"ts":"2011-04-11T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1374.968412,"partial_null_column":"value"}
+{"ts":"2011-04-11T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":853.163039,"partial_null_column":"value"}
+{"ts":"2011-04-12T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":122.386348}
+{"ts":"2011-04-12T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":106.380995}
+{"ts":"2011-04-12T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":141.9323}
+{"ts":"2011-04-12T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":103.142372}
+{"ts":"2011-04-12T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":97.340631}
+{"ts":"2011-04-12T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":105.381244}
+{"ts":"2011-04-12T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":125.189098}
+{"ts":"2011-04-12T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":90.533391}
+{"ts":"2011-04-12T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":122.128172}
+{"ts":"2011-04-12T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1153.974725}
+{"ts":"2011-04-12T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1069.64088}
+{"ts":"2011-04-12T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1456.61183,"partial_null_column":"value"}
+{"ts":"2011-04-12T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":811.92524,"partial_null_column":"value"}
+{"ts":"2011-04-13T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":122.68834}
+{"ts":"2011-04-13T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":105.739623}
+{"ts":"2011-04-13T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":136.983407}
+{"ts":"2011-04-13T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":100.860813}
+{"ts":"2011-04-13T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":94.839191}
+{"ts":"2011-04-13T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":105.261296}
+{"ts":"2011-04-13T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":119.836611}
+{"ts":"2011-04-13T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":91.972558}
+{"ts":"2011-04-13T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":120.145572}
+{"ts":"2011-04-13T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1016.137449}
+{"ts":"2011-04-13T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":994.902292}
+{"ts":"2011-04-13T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":989.032799,"partial_null_column":"value"}
+{"ts":"2011-04-13T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":744.744657,"partial_null_column":"value"}
+{"ts":"2011-04-14T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":111.179339}
+{"ts":"2011-04-14T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":101.984377}
+{"ts":"2011-04-14T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":133.60643}
+{"ts":"2011-04-14T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":99.738319}
+{"ts":"2011-04-14T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":91.270553}
+{"ts":"2011-04-14T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":101.251756}
+{"ts":"2011-04-14T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":118.285128}
+{"ts":"2011-04-14T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":84.9513}
+{"ts":"2011-04-14T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":119.768525}
+{"ts":"2011-04-14T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1032.154263}
+{"ts":"2011-04-14T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":999.58645}
+{"ts":"2011-04-14T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1166.401205,"partial_null_column":"value"}
+{"ts":"2011-04-14T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":753.104985,"partial_null_column":"value"}
+{"ts":"2011-04-15T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":106.7937}
+{"ts":"2011-04-15T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":94.469747}
+{"ts":"2011-04-15T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":135.109191}
+{"ts":"2011-04-15T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":99.596909}
+{"ts":"2011-04-15T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":92.78276}
+{"ts":"2011-04-15T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":97.859766}
+{"ts":"2011-04-15T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":120.50816}
+{"ts":"2011-04-15T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":89.646236}
+{"ts":"2011-04-15T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":120.290348}
+{"ts":"2011-04-15T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":994.752744}
+{"ts":"2011-04-15T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1029.056992}
+{"ts":"2011-04-15T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":962.731172,"partial_null_column":"value"}
+{"ts":"2011-04-15T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":780.271977,"partial_null_column":"value"}
\ No newline at end of file
diff --git a/processing/src/test/resources/druid.sample.numeric.top.json b/processing/src/test/resources/druid.sample.numeric.top.json
new file mode 100644
index 000000000000..0a0d315b7303
--- /dev/null
+++ b/processing/src/test/resources/druid.sample.numeric.top.json
@@ -0,0 +1,477 @@
+{"ts":"2011-01-12T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":100}
+{"ts":"2011-01-12T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":100}
+{"ts":"2011-01-12T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":100}
+{"ts":"2011-01-12T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":100}
+{"ts":"2011-01-12T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":100}
+{"ts":"2011-01-12T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1000}
+{"ts":"2011-01-12T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":800,"partial_null_column":"value"}
+{"ts":"2011-01-13T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":103.629399}
+{"ts":"2011-01-13T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":114.947403}
+{"ts":"2011-01-13T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":102.851683}
+{"ts":"2011-01-13T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":111.356672}
+{"ts":"2011-01-13T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1040.945505}
+{"ts":"2011-01-13T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":826.060182,"partial_null_column":"value"}
+{"ts":"2011-01-14T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":86.450372}
+{"ts":"2011-01-14T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":109.573474}
+{"ts":"2011-01-14T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":97.903068}
+{"ts":"2011-01-14T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":104.611784}
+{"ts":"2011-01-14T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":112.259958}
+{"ts":"2011-01-14T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1073.476545}
+{"ts":"2011-01-14T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":869.643722,"partial_null_column":"value"}
+{"ts":"2011-01-15T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":99.781645}
+{"ts":"2011-01-15T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":87.954346}
+{"ts":"2011-01-15T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":99.383407}
+{"ts":"2011-01-15T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":111.680229}
+{"ts":"2011-01-15T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1007.36551}
+{"ts":"2011-01-15T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":809.041763,"partial_null_column":"value"}
+{"ts":"2011-01-16T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":71.315931}
+{"ts":"2011-01-16T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":99.007588}
+{"ts":"2011-01-16T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":99.863171}
+{"ts":"2011-01-16T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":103.348007}
+{"ts":"2011-01-16T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":116.77961}
+{"ts":"2011-01-16T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1077.612663}
+{"ts":"2011-01-16T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":879.988099,"partial_null_column":"value"}
+{"ts":"2011-01-17T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":105.914315}
+{"ts":"2011-01-17T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":110.157325}
+{"ts":"2011-01-17T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":103.615039}
+{"ts":"2011-01-17T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":89.901887}
+{"ts":"2011-01-17T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1075.089574}
+{"ts":"2011-01-17T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":950.14677,"partial_null_column":"value"}
+{"ts":"2011-01-18T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":87.195139}
+{"ts":"2011-01-18T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":94.452739}
+{"ts":"2011-01-18T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":101.087367}
+{"ts":"2011-01-18T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":108.979936}
+{"ts":"2011-01-18T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":113.680094}
+{"ts":"2011-01-18T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":937.061939}
+{"ts":"2011-01-18T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":682.885525,"partial_null_column":"value"}
+{"ts":"2011-01-19T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":106.70055}
+{"ts":"2011-01-19T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":97.620315}
+{"ts":"2011-01-19T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":106.12783}
+{"ts":"2011-01-19T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":77.316731}
+{"ts":"2011-01-19T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1156.744712}
+{"ts":"2011-01-19T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1109.87495,"partial_null_column":"value"}
+{"ts":"2011-01-20T01:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":93.396274}
+{"ts":"2011-01-20T01:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":90.43902}
+{"ts":"2011-01-20T01:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":105.669498}
+{"ts":"2011-01-20T01:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":101.305541}
+{"ts":"2011-01-20T01:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":140.179069}
+{"ts":"2011-01-20T01:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":904.340636}
+{"ts":"2011-01-20T01:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":677.510973,"partial_null_column":"value"}
+{"ts":"2011-01-22T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":95.235266}
+{"ts":"2011-01-22T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":93.681096}
+{"ts":"2011-01-22T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":104.184494}
+{"ts":"2011-01-22T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":99.284525}
+{"ts":"2011-01-22T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":137.109783}
+{"ts":"2011-01-22T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1343.232494}
+{"ts":"2011-01-22T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1219.43217,"partial_null_column":"value"}
+{"ts":"2011-01-23T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":107.348157}
+{"ts":"2011-01-23T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":96.826443}
+{"ts":"2011-01-23T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":106.418686}
+{"ts":"2011-01-23T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":110.467875}
+{"ts":"2011-01-23T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1088.943083}
+{"ts":"2011-01-23T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":979.306038,"partial_null_column":"value"}
+{"ts":"2011-01-24T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":96.671647}
+{"ts":"2011-01-24T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":88.74846}
+{"ts":"2011-01-24T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":97.906256}
+{"ts":"2011-01-24T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":101.581339}
+{"ts":"2011-01-24T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":131.695956}
+{"ts":"2011-01-24T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":939.244103}
+{"ts":"2011-01-24T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":716.609179,"partial_null_column":"value"}
+{"ts":"2011-01-25T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":101.624789}
+{"ts":"2011-01-25T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":180.575246}
+{"ts":"2011-01-25T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":102.907866}
+{"ts":"2011-01-25T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":102.044542}
+{"ts":"2011-01-25T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1109.875413}
+{"ts":"2011-01-25T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1301.023342,"partial_null_column":"value"}
+{"ts":"2011-01-26T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":84.906466}
+{"ts":"2011-01-26T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":84.710523}
+{"ts":"2011-01-26T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":96.046584}
+{"ts":"2011-01-26T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":101.088903}
+{"ts":"2011-01-26T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":122.160681}
+{"ts":"2011-01-26T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1686.419659}
+{"ts":"2011-01-26T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1609.096706,"partial_null_column":"value"}
+{"ts":"2011-01-27T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":104.882908}
+{"ts":"2011-01-27T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":170.735853}
+{"ts":"2011-01-27T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":104.609483}
+{"ts":"2011-01-27T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":116.979005}
+{"ts":"2011-01-27T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1074.006938}
+{"ts":"2011-01-27T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1023.295213,"partial_null_column":"value"}
+{"ts":"2011-01-28T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":123.006128}
+{"ts":"2011-01-28T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":99.681629}
+{"ts":"2011-01-28T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":106.075672}
+{"ts":"2011-01-28T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":103.822842}
+{"ts":"2011-01-28T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":158.739359}
+{"ts":"2011-01-28T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1021.334487}
+{"ts":"2011-01-28T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":810.889422,"partial_null_column":"value"}
+{"ts":"2011-01-29T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":100.992147}
+{"ts":"2011-01-29T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":114.905745}
+{"ts":"2011-01-29T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":101.998823}
+{"ts":"2011-01-29T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":109.549035}
+{"ts":"2011-01-29T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1314.619452}
+{"ts":"2011-01-29T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1685.500085,"partial_null_column":"value"}
+{"ts":"2011-01-30T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":124.943293}
+{"ts":"2011-01-30T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":108.415967}
+{"ts":"2011-01-30T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":97.023907}
+{"ts":"2011-01-30T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":104.29849}
+{"ts":"2011-01-30T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":137.932693}
+{"ts":"2011-01-30T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":805.930143}
+{"ts":"2011-01-30T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":555.476028,"partial_null_column":"value"}
+{"ts":"2011-01-31T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":103.492964}
+{"ts":"2011-01-31T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":124.171944}
+{"ts":"2011-01-31T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":103.83204}
+{"ts":"2011-01-31T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":85.125795}
+{"ts":"2011-01-31T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1184.920651}
+{"ts":"2011-01-31T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1643.340851,"partial_null_column":"value"}
+{"ts":"2011-02-01T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":132.123776}
+{"ts":"2011-02-01T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":103.652865}
+{"ts":"2011-02-01T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":98.909356}
+{"ts":"2011-02-01T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":102.480377}
+{"ts":"2011-02-01T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":134.014606}
+{"ts":"2011-02-01T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1100.904846}
+{"ts":"2011-02-01T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":913.561076,"partial_null_column":"value"}
+{"ts":"2011-02-02T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":104.963233}
+{"ts":"2011-02-02T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":102.281859}
+{"ts":"2011-02-02T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":105.578807}
+{"ts":"2011-02-02T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":96.706279}
+{"ts":"2011-02-02T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1097.211164}
+{"ts":"2011-02-02T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1218.561908,"partial_null_column":"value"}
+{"ts":"2011-02-03T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":85.770241}
+{"ts":"2011-02-03T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":106.42578}
+{"ts":"2011-02-03T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":100.559287}
+{"ts":"2011-02-03T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":102.349315}
+{"ts":"2011-02-03T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":134.140377}
+{"ts":"2011-02-03T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1283.166055}
+{"ts":"2011-02-03T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1113.114125,"partial_null_column":"value"}
+{"ts":"2011-02-04T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":106.888769}
+{"ts":"2011-02-04T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":99.837572}
+{"ts":"2011-02-04T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":106.050728}
+{"ts":"2011-02-04T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":93.973465}
+{"ts":"2011-02-04T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1025.63334}
+{"ts":"2011-02-04T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":864.568891,"partial_null_column":"value"}
+{"ts":"2011-02-05T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":93.001571}
+{"ts":"2011-02-05T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":117.030289}
+{"ts":"2011-02-05T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":105.660538}
+{"ts":"2011-02-05T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":100.646747}
+{"ts":"2011-02-05T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":114.723682}
+{"ts":"2011-02-05T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1332.468373}
+{"ts":"2011-02-05T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1363.614929,"partial_null_column":"value"}
+{"ts":"2011-02-06T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":110.897359}
+{"ts":"2011-02-06T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":93.585758}
+{"ts":"2011-02-06T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":110.053071}
+{"ts":"2011-02-06T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":93.620739}
+{"ts":"2011-02-06T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1011.20547}
+{"ts":"2011-02-06T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":787.12533,"partial_null_column":"value"}
+{"ts":"2011-02-07T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":130.194219}
+{"ts":"2011-02-07T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":112.924874}
+{"ts":"2011-02-07T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":97.434318}
+{"ts":"2011-02-07T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":102.705243}
+{"ts":"2011-02-07T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":115.246714}
+{"ts":"2011-02-07T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1057.079944}
+{"ts":"2011-02-07T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":872.625669,"partial_null_column":"value"}
+{"ts":"2011-02-08T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":93.190129}
+{"ts":"2011-02-08T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":97.432302}
+{"ts":"2011-02-08T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":97.085047}
+{"ts":"2011-02-08T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":75.735586}
+{"ts":"2011-02-08T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1064.972638}
+{"ts":"2011-02-08T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1188.369265,"partial_null_column":"value"}
+{"ts":"2011-02-09T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":129.221792}
+{"ts":"2011-02-09T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":111.72936}
+{"ts":"2011-02-09T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":96.478571}
+{"ts":"2011-02-09T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":105.498315}
+{"ts":"2011-02-09T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":112.646238}
+{"ts":"2011-02-09T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1320.638308}
+{"ts":"2011-02-09T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1299.093262,"partial_null_column":"value"}
+{"ts":"2011-02-10T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":118.062165}
+{"ts":"2011-02-10T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":97.235999}
+{"ts":"2011-02-10T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":115.824976}
+{"ts":"2011-02-10T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":91.750911}
+{"ts":"2011-02-10T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1070.165582}
+{"ts":"2011-02-10T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1212.928303,"partial_null_column":"value"}
+{"ts":"2011-02-11T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":129.187009}
+{"ts":"2011-02-11T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":114.960877}
+{"ts":"2011-02-11T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":100.111873}
+{"ts":"2011-02-11T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":105.672256}
+{"ts":"2011-02-11T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":102.864842}
+{"ts":"2011-02-11T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1179.695901}
+{"ts":"2011-02-11T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1061.97333,"partial_null_column":"value"}
+{"ts":"2011-02-12T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":115.758445}
+{"ts":"2011-02-12T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":96.457082}
+{"ts":"2011-02-12T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":114.877503}
+{"ts":"2011-02-12T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":88.142774}
+{"ts":"2011-02-12T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":959.236186}
+{"ts":"2011-02-12T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":602.979544,"partial_null_column":"value"}
+{"ts":"2011-02-13T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":119.490316}
+{"ts":"2011-02-13T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":119.907266}
+{"ts":"2011-02-13T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":100.905238}
+{"ts":"2011-02-13T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":112.514409}
+{"ts":"2011-02-13T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":106.033416}
+{"ts":"2011-02-13T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1103.458199}
+{"ts":"2011-02-13T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":862.931321,"partial_null_column":"value"}
+{"ts":"2011-02-14T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":115.628202}
+{"ts":"2011-02-14T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":103.00865}
+{"ts":"2011-02-14T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":117.110451}
+{"ts":"2011-02-14T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":73.717033}
+{"ts":"2011-02-14T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1091.223197}
+{"ts":"2011-02-14T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1133.135123,"partial_null_column":"value"}
+{"ts":"2011-02-15T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":123.485071}
+{"ts":"2011-02-15T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":121.563912}
+{"ts":"2011-02-15T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":105.269599}
+{"ts":"2011-02-15T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":121.411398}
+{"ts":"2011-02-15T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":108.428302}
+{"ts":"2011-02-15T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1183.240825}
+{"ts":"2011-02-15T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":914.525048,"partial_null_column":"value"}
+{"ts":"2011-02-16T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":116.432276}
+{"ts":"2011-02-16T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":105.762627}
+{"ts":"2011-02-16T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":117.334381}
+{"ts":"2011-02-16T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":98.918664}
+{"ts":"2011-02-16T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1289.097304}
+{"ts":"2011-02-16T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1553.348548,"partial_null_column":"value"}
+{"ts":"2011-02-17T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":147.942017}
+{"ts":"2011-02-17T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":126.982673}
+{"ts":"2011-02-17T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":103.940963}
+{"ts":"2011-02-17T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":120.050545}
+{"ts":"2011-02-17T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":112.150745}
+{"ts":"2011-02-17T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1021.071173}
+{"ts":"2011-02-17T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":645.177645,"partial_null_column":"value"}
+{"ts":"2011-02-18T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":127.611947}
+{"ts":"2011-02-18T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":100.849247}
+{"ts":"2011-02-18T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":124.513018}
+{"ts":"2011-02-18T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":92.174432}
+{"ts":"2011-02-18T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1105.383465}
+{"ts":"2011-02-18T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1120.088751,"partial_null_column":"value"}
+{"ts":"2011-02-19T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":163.35169}
+{"ts":"2011-02-19T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":133.726878}
+{"ts":"2011-02-19T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":102.919452}
+{"ts":"2011-02-19T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":125.052129}
+{"ts":"2011-02-19T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":121.7334}
+{"ts":"2011-02-19T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1600.723226}
+{"ts":"2011-02-19T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1598.179271,"partial_null_column":"value"}
+{"ts":"2011-02-20T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":129.409606}
+{"ts":"2011-02-20T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":109.790712}
+{"ts":"2011-02-20T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":122.082375}
+{"ts":"2011-02-20T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":105.985049}
+{"ts":"2011-02-20T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1317.458323}
+{"ts":"2011-02-20T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1192.563067,"partial_null_column":"value"}
+{"ts":"2011-02-21T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":155.632898}
+{"ts":"2011-02-21T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":193.787574}
+{"ts":"2011-02-21T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":154.627912}
+{"ts":"2011-02-21T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":138.092468}
+{"ts":"2011-02-21T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":119.739112}
+{"ts":"2011-02-21T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1488.737765}
+{"ts":"2011-02-21T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1298.415763,"partial_null_column":"value"}
+{"ts":"2011-02-22T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":124.524992}
+{"ts":"2011-02-22T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":108.370907}
+{"ts":"2011-02-22T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":122.51064}
+{"ts":"2011-02-22T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":86.333235}
+{"ts":"2011-02-22T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1224.827108}
+{"ts":"2011-02-22T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1345.964309,"partial_null_column":"value"}
+{"ts":"2011-02-23T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":165.273009}
+{"ts":"2011-02-23T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":145.588115}
+{"ts":"2011-02-23T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":113.141185}
+{"ts":"2011-02-23T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":124.305608}
+{"ts":"2011-02-23T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":123.961542}
+{"ts":"2011-02-23T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1414.619004}
+{"ts":"2011-02-23T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1287.766687,"partial_null_column":"value"}
+{"ts":"2011-02-24T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":123.553981}
+{"ts":"2011-02-24T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":104.951315}
+{"ts":"2011-02-24T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":118.862342}
+{"ts":"2011-02-24T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":91.962584}
+{"ts":"2011-02-24T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1350.175381}
+{"ts":"2011-02-24T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1631.584352,"partial_null_column":"value"}
+{"ts":"2011-02-25T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":172.33554}
+{"ts":"2011-02-25T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":140.941317}
+{"ts":"2011-02-25T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":99.460461}
+{"ts":"2011-02-25T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":115.932803}
+{"ts":"2011-02-25T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":120.124862}
+{"ts":"2011-02-25T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1073.967314}
+{"ts":"2011-02-25T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":782.013486,"partial_null_column":"value"}
+{"ts":"2011-02-26T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":103.643952}
+{"ts":"2011-02-26T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":103.667031}
+{"ts":"2011-02-26T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":105.352891}
+{"ts":"2011-02-26T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":83.099365}
+{"ts":"2011-02-26T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":996.433708}
+{"ts":"2011-02-26T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":829.916235,"partial_null_column":"value"}
+{"ts":"2011-02-27T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":277.273533}
+{"ts":"2011-02-27T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":136.394846}
+{"ts":"2011-02-27T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":103.226967}
+{"ts":"2011-02-27T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":121.929932}
+{"ts":"2011-02-27T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":136.163414}
+{"ts":"2011-02-27T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1474.591017}
+{"ts":"2011-02-27T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1427.016724,"partial_null_column":"value"}
+{"ts":"2011-02-28T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":97.218943}
+{"ts":"2011-02-28T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":112.528286}
+{"ts":"2011-02-28T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":99.505465}
+{"ts":"2011-02-28T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":72.163651}
+{"ts":"2011-02-28T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1159.278766}
+{"ts":"2011-02-28T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1430.257348,"partial_null_column":"value"}
+{"ts":"2011-03-01T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":153.059937}
+{"ts":"2011-03-01T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":143.424672}
+{"ts":"2011-03-01T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":105.453024}
+{"ts":"2011-03-01T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":123.251814}
+{"ts":"2011-03-01T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":116.975408}
+{"ts":"2011-03-01T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1243.35401}
+{"ts":"2011-03-01T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1004.940887,"partial_null_column":"value"}
+{"ts":"2011-03-02T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":98.432014}
+{"ts":"2011-03-02T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":112.968782}
+{"ts":"2011-03-02T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":100.600391}
+{"ts":"2011-03-02T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":82.823988}
+{"ts":"2011-03-02T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1051.80894}
+{"ts":"2011-03-02T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":740.18372,"partial_null_column":"value"}
+{"ts":"2011-03-03T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":127.994476}
+{"ts":"2011-03-03T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":140.215411}
+{"ts":"2011-03-03T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":108.784646}
+{"ts":"2011-03-03T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":115.393493}
+{"ts":"2011-03-03T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":114.18831}
+{"ts":"2011-03-03T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1010.370296}
+{"ts":"2011-03-03T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":691.95892,"partial_null_column":"value"}
+{"ts":"2011-03-04T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":93.634505}
+{"ts":"2011-03-04T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":110.018472}
+{"ts":"2011-03-04T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":97.535226}
+{"ts":"2011-03-04T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":81.131208}
+{"ts":"2011-03-04T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1326.829155}
+{"ts":"2011-03-04T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1674.331703,"partial_null_column":"value"}
+{"ts":"2011-03-05T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":136.94177}
+{"ts":"2011-03-05T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":145.393016}
+{"ts":"2011-03-05T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":112.522435}
+{"ts":"2011-03-05T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":114.691277}
+{"ts":"2011-03-05T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":117.904527}
+{"ts":"2011-03-05T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":994.731237}
+{"ts":"2011-03-05T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":755.899363,"partial_null_column":"value"}
+{"ts":"2011-03-06T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":99.508679}
+{"ts":"2011-03-06T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":113.069662}
+{"ts":"2011-03-06T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":102.536839}
+{"ts":"2011-03-06T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":81.612269}
+{"ts":"2011-03-06T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1081.650406}
+{"ts":"2011-03-06T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":771.34846,"partial_null_column":"value"}
+{"ts":"2011-03-07T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":111.909348}
+{"ts":"2011-03-07T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":150.452695}
+{"ts":"2011-03-07T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":111.106693}
+{"ts":"2011-03-07T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":121.582721}
+{"ts":"2011-03-07T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":106.884238}
+{"ts":"2011-03-07T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1152.547767}
+{"ts":"2011-03-07T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":906.373797,"partial_null_column":"value"}
+{"ts":"2011-03-08T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":98.972716}
+{"ts":"2011-03-08T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":119.777621}
+{"ts":"2011-03-08T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":101.652185}
+{"ts":"2011-03-08T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":70.866726}
+{"ts":"2011-03-08T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1117.953961}
+{"ts":"2011-03-08T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":988.893782,"partial_null_column":"value"}
+{"ts":"2011-03-09T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":139.26095}
+{"ts":"2011-03-09T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":138.466933}
+{"ts":"2011-03-09T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":105.613469}
+{"ts":"2011-03-09T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":121.220772}
+{"ts":"2011-03-09T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":107.998334}
+{"ts":"2011-03-09T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1121.385333}
+{"ts":"2011-03-09T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":875.683406,"partial_null_column":"value"}
+{"ts":"2011-03-10T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":105.214709}
+{"ts":"2011-03-10T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":114.717338}
+{"ts":"2011-03-10T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":107.127962}
+{"ts":"2011-03-10T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":79.793836}
+{"ts":"2011-03-10T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1244.849915}
+{"ts":"2011-03-10T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1070.836247,"partial_null_column":"value"}
+{"ts":"2011-03-11T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":135.820968}
+{"ts":"2011-03-11T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":135.038992}
+{"ts":"2011-03-11T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":120.497687}
+{"ts":"2011-03-11T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":118.29835}
+{"ts":"2011-03-11T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":108.186877}
+{"ts":"2011-03-11T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":998.650727}
+{"ts":"2011-03-11T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":755.646538,"partial_null_column":"value"}
+{"ts":"2011-03-12T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":113.49346}
+{"ts":"2011-03-12T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":112.554597}
+{"ts":"2011-03-12T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":115.57294}
+{"ts":"2011-03-12T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":74.394926}
+{"ts":"2011-03-12T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1088.807596}
+{"ts":"2011-03-12T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":771.100508,"partial_null_column":"value"}
+{"ts":"2011-03-13T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":149.637715}
+{"ts":"2011-03-13T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":120.113921}
+{"ts":"2011-03-13T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":103.227522}
+{"ts":"2011-03-13T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":120.620862}
+{"ts":"2011-03-13T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":108.579283}
+{"ts":"2011-03-13T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1129.723252}
+{"ts":"2011-03-13T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":884.837267,"partial_null_column":"value"}
+{"ts":"2011-03-14T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":109.461442}
+{"ts":"2011-03-14T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":120.487244}
+{"ts":"2011-03-14T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":111.688901}
+{"ts":"2011-03-14T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":59.021022}
+{"ts":"2011-03-14T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1075.243024}
+{"ts":"2011-03-14T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":918.72284,"partial_null_column":"value"}
+{"ts":"2011-03-15T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":145.963558}
+{"ts":"2011-03-15T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":121.386341}
+{"ts":"2011-03-15T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":103.583295}
+{"ts":"2011-03-15T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":122.038585}
+{"ts":"2011-03-15T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":103.134338}
+{"ts":"2011-03-15T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1099.197263}
+{"ts":"2011-03-15T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":850.995007,"partial_null_column":"value"}
+{"ts":"2011-03-16T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":110.565004}
+{"ts":"2011-03-16T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":115.750963}
+{"ts":"2011-03-16T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":112.577264}
+{"ts":"2011-03-16T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":69.329723}
+{"ts":"2011-03-16T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":981.577244}
+{"ts":"2011-03-16T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":767.973326,"partial_null_column":"value"}
+{"ts":"2011-03-17T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":148.90541}
+{"ts":"2011-03-17T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":109.666402}
+{"ts":"2011-03-17T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":105.996125}
+{"ts":"2011-03-17T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":122.740143}
+{"ts":"2011-03-17T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":110.797348}
+{"ts":"2011-03-17T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1154.415689}
+{"ts":"2011-03-17T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":906.101957,"partial_null_column":"value"}
+{"ts":"2011-03-18T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":110.037579}
+{"ts":"2011-03-18T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":113.490115}
+{"ts":"2011-03-18T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":113.238556}
+{"ts":"2011-03-18T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":68.573162}
+{"ts":"2011-03-18T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1311.178603}
+{"ts":"2011-03-18T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1403.830217,"partial_null_column":"value"}
+{"ts":"2011-03-19T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":177.51427}
+{"ts":"2011-03-19T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":134.147573}
+{"ts":"2011-03-19T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":112.999693}
+{"ts":"2011-03-19T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":120.638001}
+{"ts":"2011-03-19T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":115.384807}
+{"ts":"2011-03-19T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1102.698977}
+{"ts":"2011-03-19T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":856.490089,"partial_null_column":"value"}
+{"ts":"2011-03-20T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":123.507497}
+{"ts":"2011-03-20T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":117.851058}
+{"ts":"2011-03-20T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":125.496367}
+{"ts":"2011-03-20T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":85.013155}
+{"ts":"2011-03-20T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1285.090048}
+{"ts":"2011-03-20T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1032.257527,"partial_null_column":"value"}
+{"ts":"2011-03-21T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":182.035296}
+{"ts":"2011-03-21T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":157.15373}
+{"ts":"2011-03-21T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":128.149976}
+{"ts":"2011-03-21T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":131.807919}
+{"ts":"2011-03-21T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":123.653645}
+{"ts":"2011-03-21T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1178.830164}
+{"ts":"2011-03-21T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":907.021565,"partial_null_column":"value"}
+{"ts":"2011-03-22T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":121.270611}
+{"ts":"2011-03-22T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":124.40078}
+{"ts":"2011-03-22T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":124.970533}
+{"ts":"2011-03-22T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":79.948248}
+{"ts":"2011-03-22T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1301.778098}
+{"ts":"2011-03-22T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1110.788895,"partial_null_column":"value"}
+{"ts":"2011-03-23T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":154.019632}
+{"ts":"2011-03-23T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":158.592715}
+{"ts":"2011-03-23T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":126.672392}
+{"ts":"2011-03-23T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":131.786598}
+{"ts":"2011-03-23T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":123.75424}
+{"ts":"2011-03-23T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1156.601892}
+{"ts":"2011-03-23T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":884.801502,"partial_null_column":"value"}
+{"ts":"2011-03-24T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":123.895027}
+{"ts":"2011-03-24T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":119.777998}
+{"ts":"2011-03-24T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":125.044877}
+{"ts":"2011-03-24T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":88.521042}
+{"ts":"2011-03-24T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1429.580257}
+{"ts":"2011-03-24T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1684.268799,"partial_null_column":"value"}
+{"ts":"2011-03-25T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":140.577121}
+{"ts":"2011-03-25T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":157.432108}
+{"ts":"2011-03-25T00:00:00.000Z","market":"spot","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":114.70696}
+{"ts":"2011-03-25T00:00:00.000Z","market":"spot","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":128.943094}
+{"ts":"2011-03-25T00:00:00.000Z","market":"spot","quality":"travel","qualityLong":1800,"qualityFloat":18000,"qualityDouble":18000,"qualityNumericString":180000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["t","preferred"],"index":136.136598}
+{"ts":"2011-03-25T00:00:00.000Z","market":"total_market","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":1256.499779}
+{"ts":"2011-03-25T00:00:00.000Z","market":"upfront","quality":"premium","qualityLong":1600,"qualityFloat":16000,"qualityDouble":16000,"qualityNumericString":160000,"longNumericNull":70,"floatNumericNull":70,"doubleNumericNull":70,"placement":"preferred","placementish":["p","preferred"],"index":996.564152,"partial_null_column":"value"}
+{"ts":"2011-03-26T00:00:00.000Z","market":"spot","quality":"business","qualityLong":1100,"qualityFloat":11000,"qualityDouble":11000,"qualityNumericString":110000,"longNumericNull":20,"floatNumericNull":20,"doubleNumericNull":20,"placement":"preferred","placementish":["b","preferred"],"index":130.824022}
+{"ts":"2011-03-26T00:00:00.000Z","market":"spot","quality":"health","qualityLong":1300,"qualityFloat":13000,"qualityDouble":13000,"qualityNumericString":130000,"longNumericNull":40,"floatNumericNull":40,"doubleNumericNull":40,"placement":"preferred","placementish":["h","preferred"],"index":118.463523}
+{"ts":"2011-03-26T00:00:00.000Z","market":"spot","quality":"news","qualityLong":1500,"qualityFloat":15000,"qualityDouble":15000,"qualityNumericString":150000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["n","preferred"],"index":142.972964}
+{"ts":"2011-03-26T00:00:00.000Z","market":"spot","quality":"technology","qualityLong":1700,"qualityFloat":17000,"qualityDouble":17000,"qualityNumericString":170000,"longNumericNull":80,"floatNumericNull":80,"doubleNumericNull":80,"placement":"preferred","placementish":["t","preferred"],"index":101.686196}
+{"ts":"2011-03-26T00:00:00.000Z","market":"total_market","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1217.877395}
+{"ts":"2011-03-26T00:00:00.000Z","market":"upfront","quality":"mezzanine","qualityLong":1400,"qualityFloat":14000,"qualityDouble":14000,"qualityNumericString":140000,"longNumericNull":50,"floatNumericNull":50,"doubleNumericNull":50,"placement":"preferred","placementish":["m","preferred"],"index":1061.678577,"partial_null_column":"value"}
+{"ts":"2011-03-27T00:00:00.000Z","market":"spot","quality":"automotive","qualityLong":1000,"qualityFloat":10000,"qualityDouble":10000,"qualityNumericString":100000,"longNumericNull":10,"floatNumericNull":10,"doubleNumericNull":10,"placement":"preferred","placementish":["a","preferred"],"index":144.056669}
+{"ts":"2011-03-27T00:00:00.000Z","market":"spot","quality":"entertainment","qualityLong":1200,"qualityFloat":12000,"qualityDouble":12000,"qualityNumericString":120000,"longNumericNull":null,"floatNumericNull":null,"doubleNumericNull":null,"placement":"preferred","placementish":["e","preferred"],"index":163.161361}
\ No newline at end of file
diff --git a/quidem-ut/src/main/java/org/apache/druid/quidem/KttmNestedComponentSupplier.java b/quidem-ut/src/main/java/org/apache/druid/quidem/KttmNestedComponentSupplier.java
index 5939f6b5f6a2..ab2683f7027e 100644
--- a/quidem-ut/src/main/java/org/apache/druid/quidem/KttmNestedComponentSupplier.java
+++ b/quidem-ut/src/main/java/org/apache/druid/quidem/KttmNestedComponentSupplier.java
@@ -30,7 +30,6 @@
 import org.apache.druid.java.util.common.FileUtils;
 import org.apache.druid.java.util.common.Intervals;
 import org.apache.druid.java.util.common.StringUtils;
-import org.apache.druid.query.NestedDataTestUtils;
 import org.apache.druid.query.QueryRunnerFactoryConglomerate;
 import org.apache.druid.segment.AutoTypeColumnSchema;
 import org.apache.druid.segment.IndexBuilder;
@@ -138,7 +137,7 @@ public IncrementalIndex makeKttmNestedIndex()
             .inputSource(
                 inputSource
             )
-            .inputFormat(NestedDataTestUtils.DEFAULT_JSON_INPUT_FORMAT)
+            .inputFormat(TestIndex.DEFAULT_JSON_INPUT_FORMAT)
             .inputTmpDir(new File(tmpDir, "tmpKttm"))
             .buildIncrementalIndex();
       }
diff --git a/server/src/test/java/org/apache/druid/server/SegmentManagerBroadcastJoinIndexedTableTest.java b/server/src/test/java/org/apache/druid/server/SegmentManagerBroadcastJoinIndexedTableTest.java
index c5a346e8d5c5..d6546b2bbb58 100644
--- a/server/src/test/java/org/apache/druid/server/SegmentManagerBroadcastJoinIndexedTableTest.java
+++ b/server/src/test/java/org/apache/druid/server/SegmentManagerBroadcastJoinIndexedTableTest.java
@@ -170,7 +170,7 @@ public void testLoadIndexedTable() throws IOException, SegmentLoadingException
     Assert.assertFalse(joinableFactory.isDirectlyJoinable(dataSource));
 
     final String version = DateTimes.nowUtc().toString();
-    IncrementalIndex data = TestIndex.makeRealtimeIndex("druid.sample.numeric.tsv");
+    IncrementalIndex data = TestIndex.makeSampleNumericIncrementalIndex();
     final String interval = "2011-01-12T00:00:00.000Z/2011-05-01T00:00:00.000Z";
     DataSegment segment = createSegment(data, interval, version);
     segmentManager.loadSegment(segment);
@@ -218,8 +218,8 @@ public void testLoadMultipleIndexedTableOverwrite() throws IOException, SegmentL
     final String version2 = DateTimes.nowUtc().plus(1000L).toString();
     final String interval = "2011-01-12T00:00:00.000Z/2011-03-28T00:00:00.000Z";
     final String interval2 = "2011-01-12T00:00:00.000Z/2011-05-01T00:00:00.000Z";
-    IncrementalIndex data = TestIndex.makeRealtimeIndex("druid.sample.numeric.tsv.top");
-    IncrementalIndex data2 = TestIndex.makeRealtimeIndex("druid.sample.numeric.tsv.bottom");
+    IncrementalIndex data = TestIndex.makeSampleNumericTopIncrementalIndex();
+    IncrementalIndex data2 = TestIndex.makeSampleNumericBottomIncrementalIndex();
     DataSegment segment1 = createSegment(data, interval, version);
     DataSegment segment2 = createSegment(data2, interval2, version2);
     segmentManager.loadSegment(segment1);
@@ -283,8 +283,8 @@ public void testLoadMultipleIndexedTable() throws IOException, SegmentLoadingExc
     final String version2 = DateTimes.nowUtc().plus(1000L).toString();
     final String interval = "2011-01-12T00:00:00.000Z/2011-05-01T00:00:00.000Z";
     final String interval2 = "2011-01-12T00:00:00.000Z/2011-03-28T00:00:00.000Z";
-    IncrementalIndex data = TestIndex.makeRealtimeIndex("druid.sample.numeric.tsv.bottom");
-    IncrementalIndex data2 = TestIndex.makeRealtimeIndex("druid.sample.numeric.tsv.top");
+    IncrementalIndex data = TestIndex.makeSampleNumericBottomIncrementalIndex();
+    IncrementalIndex data2 = TestIndex.makeSampleNumericTopIncrementalIndex();
     segmentManager.loadSegment(createSegment(data, interval, version));
     Assert.assertTrue(joinableFactory.isDirectlyJoinable(dataSource));
 
diff --git a/services/src/test/java/org/apache/druid/cli/DumpSegmentTest.java b/services/src/test/java/org/apache/druid/cli/DumpSegmentTest.java
index fc7e9d333238..b8fc3f72732f 100644
--- a/services/src/test/java/org/apache/druid/cli/DumpSegmentTest.java
+++ b/services/src/test/java/org/apache/druid/cli/DumpSegmentTest.java
@@ -56,6 +56,7 @@
 import org.apache.druid.segment.QueryableIndex;
 import org.apache.druid.segment.Segment;
 import org.apache.druid.segment.TestHelper;
+import org.apache.druid.segment.TestIndex;
 import org.apache.druid.segment.column.ColumnConfig;
 import org.apache.druid.segment.column.ColumnHolder;
 import org.apache.druid.segment.column.ColumnIndexSupplier;
@@ -297,7 +298,7 @@ public static List<Segment> createSegments(
         tempFolder,
         closer,
         "nested-test-data.json",
-        NestedDataTestUtils.DEFAULT_JSON_INPUT_FORMAT,
+        TestIndex.DEFAULT_JSON_INPUT_FORMAT,
         new TimestampSpec("timestamp", null, null),
         DimensionsSpec.builder().useSchemaDiscovery(true).build(),
         null,

From 7705694481aa479cddde8a13f555ced913339a16 Mon Sep 17 00:00:00 2001
From: Akshat Jain <akjn11@gmail.com>
Date: Tue, 10 Dec 2024 09:24:58 +0530
Subject: [PATCH 21/56] Increase heap size for integration-tests (#17551)

---
 integration-tests/docker/docker-compose.high-availability.yml   | 2 +-
 .../docker/environment-configs/router-custom-check-tls          | 2 +-
 .../docker/environment-configs/router-no-client-auth-tls        | 2 +-
 .../docker/environment-configs/router-permissive-tls            | 2 +-
 integration-tests/pom.xml                                       | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/integration-tests/docker/docker-compose.high-availability.yml b/integration-tests/docker/docker-compose.high-availability.yml
index 68049452d97c..0b38b90efaf0 100644
--- a/integration-tests/docker/docker-compose.high-availability.yml
+++ b/integration-tests/docker/docker-compose.high-availability.yml
@@ -132,7 +132,7 @@ services:
       - DRUID_INTEGRATION_TEST_GROUP=${DRUID_INTEGRATION_TEST_GROUP}
       - DRUID_SERVICE=custom-node-role
       - DRUID_LOG_PATH=/shared/logs/custom-node-role.log
-      - SERVICE_DRUID_JAVA_OPTS=-server -Xmx64m -Xms64m -XX:+UseG1GC -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5011
+      - SERVICE_DRUID_JAVA_OPTS=-server -Xmx128m -Xms128m -XX:+UseG1GC -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5011
       - druid_host=druid-custom-node-role
       - druid_auth_basic_common_cacheDirectory=/tmp/authCache/custom_node_role
       - druid_server_https_crlPath=/tls/revocations.crl
diff --git a/integration-tests/docker/environment-configs/router-custom-check-tls b/integration-tests/docker/environment-configs/router-custom-check-tls
index 0414b16b65c9..83ba28fad7a2 100644
--- a/integration-tests/docker/environment-configs/router-custom-check-tls
+++ b/integration-tests/docker/environment-configs/router-custom-check-tls
@@ -21,7 +21,7 @@ DRUID_SERVICE=router
 DRUID_LOG_PATH=/shared/logs/router-custom-check-tls.log
 
 # JAVA OPTS
-SERVICE_DRUID_JAVA_OPTS=-server -Xmx64m -Xms64m -XX:+UseG1GC -XX:+PrintGCDetails -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5003
+SERVICE_DRUID_JAVA_OPTS=-server -Xmx128m -Xms128m -XX:+UseG1GC -XX:+PrintGCDetails -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5003
 
 # Druid configs
 druid_plaintextPort=8891
diff --git a/integration-tests/docker/environment-configs/router-no-client-auth-tls b/integration-tests/docker/environment-configs/router-no-client-auth-tls
index 9396b3b17424..f22226cd423e 100644
--- a/integration-tests/docker/environment-configs/router-no-client-auth-tls
+++ b/integration-tests/docker/environment-configs/router-no-client-auth-tls
@@ -21,7 +21,7 @@ DRUID_SERVICE=router
 DRUID_LOG_PATH=/shared/logs/router-no-client-auth-tls.log
 
 # JAVA OPTS
-SERVICE_DRUID_JAVA_OPTS=-server -Xmx64m -Xms64m -XX:+UseG1GC -XX:+PrintGCDetails -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5002
+SERVICE_DRUID_JAVA_OPTS=-server -Xmx128m -Xms128m -XX:+UseG1GC -XX:+PrintGCDetails -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5002
 
 # Druid configs
 druid_plaintextPort=8890
diff --git a/integration-tests/docker/environment-configs/router-permissive-tls b/integration-tests/docker/environment-configs/router-permissive-tls
index d827dae555bc..9cd87fb3660e 100644
--- a/integration-tests/docker/environment-configs/router-permissive-tls
+++ b/integration-tests/docker/environment-configs/router-permissive-tls
@@ -21,7 +21,7 @@ DRUID_SERVICE=router
 DRUID_LOG_PATH=/shared/logs/router-permissive-tls.log
 
 # JAVA OPTS
-SERVICE_DRUID_JAVA_OPTS=-server -Xmx64m -Xms64m -XX:+UseG1GC -XX:+PrintGCDetails -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5001
+SERVICE_DRUID_JAVA_OPTS=-server -Xmx128m -Xms128m -XX:+UseG1GC -XX:+PrintGCDetails -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5001
 
 # Druid configs
 druid_plaintextPort=8889
diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml
index 7bea258c6472..be57e12bf3dc 100644
--- a/integration-tests/pom.xml
+++ b/integration-tests/pom.xml
@@ -666,7 +666,7 @@
                             </properties>
                             <argLine>
                                 ${jdk.strong.encapsulation.argLine}
-                                -Xmx128m
+                                -Xmx256m
                                 -Duser.timezone=UTC
                                 -Dfile.encoding=UTF-8
                                 -Ddruid.test.config.dockerIp=${env.DOCKER_IP}

From 61d986a1794d72507e19765352f656d8cb38d57a Mon Sep 17 00:00:00 2001
From: Jill Osborne <jill.osborne@imply.io>
Date: Tue, 10 Dec 2024 17:34:43 +0000
Subject: [PATCH 22/56] Filters doc fix (#17553)

---
 docs/querying/filters.md | 154 ++++++++++++++++++---------------------
 1 file changed, 72 insertions(+), 82 deletions(-)

diff --git a/docs/querying/filters.md b/docs/querying/filters.md
index 20b270903151..ae84ecbfbafb 100644
--- a/docs/querying/filters.md
+++ b/docs/querying/filters.md
@@ -23,6 +23,11 @@ sidebar_label: "Filters"
   ~ under the License.
   -->
 
+A filter is a JSON object indicating which rows of data should be included in the computation for a query. It’s essentially the equivalent of the WHERE clause in SQL.
+Filters are commonly applied on dimensions, but can be applied on aggregated metrics, for example, see [Filtered aggregator](./aggregations.md#filtered-aggregator) and [Having filters](./having.md).
+
+By default, Druid uses SQL compatible three-value logic when filtering. See [Boolean logic](./sql-data-types.md#boolean-logic) for more details.
+
 :::info
  Apache Druid supports two query languages: [Druid SQL](sql.md) and [native queries](querying.md).
  This document describes the native
@@ -30,12 +35,7 @@ sidebar_label: "Filters"
  [SQL documentation](sql-scalar.md).
 :::
 
-A filter is a JSON object indicating which rows of data should be included in the computation for a query. It’s essentially the equivalent of the WHERE clause in SQL.
-Filters are commonly applied on dimensions, but can be applied on aggregated metrics, for example, see [Filtered aggregator](./aggregations.md#filtered-aggregator) and [Having filters](./having.md).
-
-By default, Druid uses SQL compatible three-value logic when filtering. See [Boolean logic](./sql-data-types.md#boolean-logic) for more details.
-
-Apache Druid supports the following types of filters.
+This topic describes the filter types supported in Apache Druid.
 
 ## Selector filter
 
@@ -43,7 +43,7 @@ The simplest filter is a selector filter. The selector filter matches a specific
 
 | Property | Description | Required |
 | -------- | ----------- | -------- |
-| `type` | Must be "selector".| Yes |
+| `type` | Must be `selector`.| Yes |
 | `dimension` | Input column or virtual column name to filter on. | Yes |
 | `value` | String value to match. | No. If not specified the filter matches NULL values. |
 | `extractionFn` | [Extraction function](./dimensionspecs.md#extraction-functions) to apply to `dimension` prior to value matching. See [filtering with extraction functions](#filtering-with-extraction-functions) for details. | No |
@@ -52,21 +52,19 @@ The selector filter can only match against `STRING` (single and multi-valued), `
 
 When the selector filter matches against numeric inputs, the string `value` will be best-effort coerced into a numeric value.
 
-### Example: equivalent of `WHERE someColumn = 'hello'`
+**Example**: equivalent of `WHERE someColumn = 'hello'`
 
 ``` json
 { "type": "selector", "dimension": "someColumn", "value": "hello" }
 ```
 
-
-### Example: equivalent of `WHERE someColumn IS NULL`
+**Example**: equivalent of `WHERE someColumn IS NULL`
 
 ``` json
 { "type": "selector", "dimension": "someColumn", "value": null }
 ```
 
-
-## Equality Filter
+## Equality filter
 
 The equality filter is a replacement for the selector filter with the ability to match against any type of column. The equality filter is designed to have more SQL compatible behavior than the selector filter and so can not match null values. To match null values use the null filter.
 
@@ -74,31 +72,30 @@ Druid's SQL planner uses the equality filter by default instead of selector filt
 
 | Property | Description | Required |
 | -------- | ----------- | -------- |
-| `type` | Must be "equality".| Yes |
+| `type` | Must be `equals`.| Yes |
 | `column` | Input column or virtual column name to filter on. | Yes |
 | `matchValueType` | String specifying the type of value to match. For example `STRING`, `LONG`, `DOUBLE`, `FLOAT`, `ARRAY<STRING>`, `ARRAY<LONG>`, or any other Druid type. The `matchValueType` determines how Druid interprets the `matchValue` to assist in converting to the type of the matched `column`. | Yes |
 | `matchValue` | Value to match, must not be null. | Yes |
 
-### Example: equivalent of `WHERE someColumn = 'hello'`
+**Example**: equivalent of `WHERE someColumn = 'hello'`
 
 ```json
 { "type": "equals", "column": "someColumn", "matchValueType": "STRING", "matchValue": "hello" }
 ```
 
-### Example: equivalent of `WHERE someNumericColumn = 1.23`
+**Example**: equivalent of `WHERE someNumericColumn = 1.23`
 
 ```json
 { "type": "equals", "column": "someNumericColumn", "matchValueType": "DOUBLE", "matchValue": 1.23 }
 ```
 
-### Example: equivalent of `WHERE someArrayColumn = ARRAY[1, 2, 3]`
+**Example**: equivalent of `WHERE someArrayColumn = ARRAY[1, 2, 3]`
 
 ```json
 { "type": "equals", "column": "someArrayColumn", "matchValueType": "ARRAY<LONG>", "matchValue": [1, 2, 3] }
 ```
 
-
-## Null Filter
+## Null filter
 
 The null filter is a partial replacement for the selector filter. It is dedicated to matching NULL values.
 
@@ -106,30 +103,29 @@ Druid's SQL planner uses the null filter by default instead of selector filter w
 
 | Property | Description | Required |
 | -------- | ----------- | -------- |
-| `type` | Must be "null".| Yes |
+| `type` | Must be `null`.| Yes |
 | `column` | Input column or virtual column name to filter on. | Yes |
 
-### Example: equivalent of `WHERE someColumn IS NULL`
+**Example**: equivalent of `WHERE someColumn IS NULL`
 
 ```json
 { "type": "null", "column": "someColumn" }
 ```
 
-
 ## Column comparison filter
 
 The column comparison filter is similar to the selector filter, but compares dimensions to each other. For example:
 
 | Property | Description | Required |
 | -------- | ----------- | -------- |
-| `type` | Must be "selector".| Yes |
+| `type` | Must be `selector`.| Yes |
 | `dimensions` | List of [`DimensionSpec`](./dimensionspecs.md) to compare. | Yes |
 
 `dimensions` is list of [DimensionSpecs](./dimensionspecs.md), making it possible to apply an extraction function if needed.
 
 Note that the column comparison filter converts all values to strings prior to comparison. This allows differently-typed input columns to match without a cast operation.
 
-### Example: equivalent of `WHERE someColumn = someLongColumn`
+**Example**: equivalent of `WHERE someColumn = someLongColumn`
 
 ``` json
 {
@@ -145,18 +141,17 @@ Note that the column comparison filter converts all values to strings prior to c
 }
 ```
 
-
 ## Logical expression filters
 
 ### AND
 
 | Property | Description | Required |
 | -------- | ----------- | -------- |
-| `type` | Must be "and".| Yes |
+| `type` | Must be `and`.| Yes |
 | `fields` | List of filter JSON objects, such as any other filter defined on this page or provided by extensions. | Yes |
 
 
-#### Example: equivalent of `WHERE someColumn = 'a' AND otherColumn = 1234 AND anotherColumn IS NULL`
+**Example**: equivalent of `WHERE someColumn = 'a' AND otherColumn = 1234 AND anotherColumn IS NULL`
 
 ``` json
 {
@@ -173,10 +168,10 @@ Note that the column comparison filter converts all values to strings prior to c
 
 | Property | Description | Required |
 | -------- | ----------- | -------- |
-| `type` | Must be "or".| Yes |
+| `type` | Must be `or`.| Yes |
 | `fields` | List of filter JSON objects, such as any other filter defined on this page or provided by extensions. | Yes |
 
-#### Example: equivalent of `WHERE someColumn = 'a' OR otherColumn = 1234 OR anotherColumn IS NULL`
+**Example**: equivalent of `WHERE someColumn = 'a' OR otherColumn = 1234 OR anotherColumn IS NULL`
 
 ``` json
 {
@@ -193,22 +188,21 @@ Note that the column comparison filter converts all values to strings prior to c
 
 | Property | Description | Required |
 | -------- | ----------- | -------- |
-| `type` | Must be "not".| Yes |
+| `type` | Must be `not`.| Yes |
 | `field` | Filter JSON objects, such as any other filter defined on this page or provided by extensions. | Yes |
 
-#### Example: equivalent of `WHERE someColumn IS NOT NULL`
+**Example**: equivalent of `WHERE someColumn IS NOT NULL`
 
 ```json
 { "type": "not", "field": { "type": "null", "column": "someColumn" }}
 ```
 
-
 ## In filter
 The in filter can match input rows against a set of values, where a match occurs if the value is contained in the set.
 
 | Property | Description | Required |
 | -------- | ----------- | -------- |
-| `type` | Must be "in".| Yes |
+| `type` | Must be `in`.| Yes |
 | `dimension` | Input column or virtual column name to filter on. | Yes |
 | `values` | List of string value to match. | Yes |
 | `extractionFn` | [Extraction function](./dimensionspecs.md#extraction-functions) to apply to `dimension` prior to value matching. See [filtering with extraction functions](#filtering-with-extraction-functions) for details. | No |
@@ -219,7 +213,7 @@ If an empty `values` array is passed to the "in" filter, it will simply return a
 If the `values` array contains `null`, the "in" filter matches null values. This differs from the SQL IN filter, which
 does not match NULL values.
 
-### Example: equivalent of `WHERE `outlaw` IN ('Good', 'Bad', 'Ugly')`
+**Example**: equivalent of `WHERE `outlaw` IN ('Good', 'Bad', 'Ugly')`
 
 ```json
 {
@@ -229,7 +223,6 @@ does not match NULL values.
 }
 ```
 
-
 ## Bound filter
 
 Bound filters can be used to filter on ranges of dimension values. It can be used for comparison filtering like
@@ -238,7 +231,7 @@ greater than, less than, greater than or equal to, less than or equal to, and "b
 
 | Property | Description | Required |
 | -------- | ----------- | -------- |
-| `type` | Must be "bound". | Yes |
+| `type` | Must be `bound`. | Yes |
 | `dimension` | Input column or virtual column name to filter on. | Yes |
 | `lower` | The lower bound string match value for the filter. | No |
 | `upper`| The upper bound string match value for the filter. | No |
@@ -253,7 +246,7 @@ The bound filter can only match against `STRING` (single and multi-valued), `LON
 
 Note that the bound filter matches null values if you don't specify a lower bound. Use the range filter if SQL-compatible behavior.
 
-### Example: equivalent to `WHERE 21 <= age <= 31`
+**Example**: equivalent to `WHERE 21 <= age <= 31`
 
 ```json
 {
@@ -265,7 +258,7 @@ Note that the bound filter matches null values if you don't specify a lower boun
 }
 ```
 
-### Example: equivalent to `WHERE 'foo' <= name <= 'hoo'`, using the default lexicographic sorting order
+**Example**: equivalent to `WHERE 'foo' <= name <= 'hoo'`, using the default lexicographic sorting order
 
 ```json
 {
@@ -276,7 +269,7 @@ Note that the bound filter matches null values if you don't specify a lower boun
 }
 ```
 
-### Example: equivalent to `WHERE 21 < age < 31`
+**Example**: equivalent to `WHERE 21 < age < 31`
 
 ```json
 {
@@ -290,7 +283,7 @@ Note that the bound filter matches null values if you don't specify a lower boun
 }
 ```
 
-### Example: equivalent to `WHERE age < 31`
+**Example**: equivalent to `WHERE age < 31`
 
 ```json
 {
@@ -302,7 +295,7 @@ Note that the bound filter matches null values if you don't specify a lower boun
 }
 ```
 
-### Example: equivalent to `WHERE age >= 18`
+**Example**: equivalent to `WHERE age >= 18`
 
 ```json
 {
@@ -313,7 +306,6 @@ Note that the bound filter matches null values if you don't specify a lower boun
 }
 ```
 
-
 ## Range filter
 
 The range filter is a replacement for the bound filter. It compares against any type of column and is designed to have has more SQL compliant behavior than the bound filter. It won't match null values, even if you don't specify a lower bound.
@@ -322,7 +314,7 @@ Druid's SQL planner uses the range filter by default instead of bound filter whe
 
 | Property | Description | Required |
 | -------- | ----------- | -------- |
-| `type` | Must be "range".| Yes |
+| `type` | Must be `range`.| Yes |
 | `column` | Input column or virtual column name to filter on. | Yes |
 | `matchValueType` | String specifying the type of bounds to match. For example `STRING`, `LONG`, `DOUBLE`, `FLOAT`, `ARRAY<STRING>`, `ARRAY<LONG>`, or any other Druid type. The `matchValueType` determines how Druid interprets the `matchValue` to assist in converting to the type of the matched `column` and also defines the type of comparison used when matching values. | Yes |
 | `lower` | Lower bound value to match. | No. At least one of `lower` or `upper` must not be null. |
@@ -330,7 +322,7 @@ Druid's SQL planner uses the range filter by default instead of bound filter whe
 | `lowerOpen` | Boolean indicating if lower bound is open in the interval of values defined by the range (">" instead of ">="). | No |
 | `upperOpen` | Boolean indicating if upper bound is open on the interval of values defined by range ("<" instead of "<="). | No |
 
-### Example: equivalent to `WHERE 21 <= age <= 31`
+**Example**: equivalent to `WHERE 21 <= age <= 31`
 
 ```json
 {
@@ -342,7 +334,7 @@ Druid's SQL planner uses the range filter by default instead of bound filter whe
 }
 ```
 
-### Example: equivalent to `WHERE 'foo' <= name <= 'hoo'`, using STRING comparison
+**Example**: equivalent to `WHERE 'foo' <= name <= 'hoo'`, using STRING comparison
 
 ```json
 {
@@ -354,7 +346,7 @@ Druid's SQL planner uses the range filter by default instead of bound filter whe
 }
 ```
 
-### Example: equivalent to `WHERE 21 < age < 31`
+**Example**: equivalent to `WHERE 21 < age < 31`
 
 ```json
 {
@@ -368,7 +360,7 @@ Druid's SQL planner uses the range filter by default instead of bound filter whe
 }
 ```
 
-### Example: equivalent to `WHERE age < 31`
+**Example**: equivalent to `WHERE age < 31`
 
 ```json
 {
@@ -380,7 +372,7 @@ Druid's SQL planner uses the range filter by default instead of bound filter whe
 }
 ```
 
-### Example: equivalent to `WHERE age >= 18`
+**Example**: equivalent to `WHERE age >= 18`
 
 ```json
 {
@@ -391,7 +383,7 @@ Druid's SQL planner uses the range filter by default instead of bound filter whe
 }
 ```
 
-### Example: equivalent to `WHERE ARRAY['a','b','c'] < arrayColumn < ARRAY['d','e','f']`, using ARRAY comparison
+**Example**: equivalent to `WHERE ARRAY['a','b','c'] < arrayColumn < ARRAY['d','e','f']`, using ARRAY comparison
 
 ```json
 {
@@ -413,7 +405,7 @@ supported are "%" (matches any number of characters) and "\_" (matches any one c
 
 | Property | Description | Required |
 | -------- | ----------- | -------- |
-| `type` | Must be "like".| Yes |
+| `type` | Must be `like`.| Yes |
 | `dimension` | Input column or virtual column name to filter on. | Yes |
 | `pattern` | String LIKE pattern, such as "foo%" or "___bar".| Yes |
 | `escape`| A string escape character that can be used to escape special characters. | No |
@@ -421,7 +413,7 @@ supported are "%" (matches any number of characters) and "\_" (matches any one c
 
 Like filters support the use of extraction functions, see [Filtering with Extraction Functions](#filtering-with-extraction-functions) for details.
 
-### Example: equivalent of `WHERE last_name LIKE "D%"` (last_name starts with "D")
+**Example**: equivalent of `WHERE last_name LIKE "D%"` (last_name starts with "D")
 
 ```json
 {
@@ -437,14 +429,14 @@ The regular expression filter is similar to the selector filter, but using regul
 
 | Property | Description | Required |
 | -------- | ----------- | -------- |
-| `type` | Must be "regex".| Yes |
+| `type` | Must be `regex`.| Yes |
 | `dimension` | Input column or virtual column name to filter on. | Yes |
 | `pattern` | String pattern to match - any standard [Java regular expression](https://docs.oracle.com/en/java/javase/11/docs/api/java.base/java/util/regex/Pattern.html). | Yes |
 | `extractionFn` | [Extraction function](./dimensionspecs.md#extraction-functions) to apply to `dimension` prior to value matching. See [filtering with extraction functions](#filtering-with-extraction-functions) for details. | No |
 
 Note that it is often more optimal to use a like filter instead of a regex for simple matching of prefixes.
 
-### Example: matches values that start with "50."
+**Example**: matches values that start with `50.`
 
 ``` json
 { "type": "regex", "dimension": "someColumn", "pattern": ^50.* }
@@ -456,24 +448,24 @@ The `arrayContainsElement` filter checks if an `ARRAY` contains a specific eleme
 
 | Property | Description | Required |
 | -------- | ----------- | -------- |
-| `type` | Must be "arrayContainsElement".| Yes |
+| `type` | Must be `arrayContainsElement`.| Yes |
 | `column` | Input column or virtual column name to filter on. | Yes |
 | `elementMatchValueType` | String specifying the type of element value to match. For example `STRING`, `LONG`, `DOUBLE`, `FLOAT`, `ARRAY<STRING>`, `ARRAY<LONG>`, or any other Druid type. The `elementMatchValueType` determines how Druid interprets the `elementMatchValue` to assist in converting to the type of elements contained in the matched `column`. | Yes |
 | `elementMatchValue` | Array element value to match. This value can be null. | Yes |
 
-### Example: equivalent of `WHERE ARRAY_CONTAINS(someArrayColumn, 'hello')`
+**Example**: equivalent of `WHERE ARRAY_CONTAINS(someArrayColumn, 'hello')`
 
 ```json
 { "type": "arrayContainsElement", "column": "someArrayColumn", "elementMatchValueType": "STRING", "elementMatchValue": "hello" }
 ```
 
-### Example: equivalent of `WHERE ARRAY_CONTAINS(someNumericArrayColumn, 1.23)`
+**Example**: equivalent of `WHERE ARRAY_CONTAINS(someNumericArrayColumn, 1.23)`
 
 ```json
 { "type": "arrayContainsElement", "column": "someNumericArrayColumn", "elementMatchValueType": "DOUBLE", "elementMatchValue": 1.23 }
 ```
 
-### Example: equivalent of `WHERE ARRAY_CONTAINS(someNumericArrayColumn, ARRAY[1, 2, 3])`
+**Example**: equivalent of `WHERE ARRAY_CONTAINS(someNumericArrayColumn, ARRAY[1, 2, 3])`
 
 ```json
 {
@@ -487,7 +479,7 @@ The `arrayContainsElement` filter checks if an `ARRAY` contains a specific eleme
 
 ```
 
-### Example: equivalent of `WHERE ARRAY_OVERLAPS(someNumericArrayColumn, ARRAY[1, 2, 3])`
+**Example**: equivalent of `WHERE ARRAY_OVERLAPS(someNumericArrayColumn, ARRAY[1, 2, 3])`
 
 ```json
 {
@@ -508,7 +500,7 @@ This filter converts the ISO 8601 intervals to long millisecond start/end ranges
 
 | Property | Description | Required |
 | -------- | ----------- | -------- |
-| `type` | Must be "interval". | Yes |
+| `type` | Must be `interval`. | Yes |
 | `dimension` | Input column or virtual column name to filter on. | Yes |
 | `intervals` | A JSON array containing ISO-8601 interval strings that defines the time ranges to filter on. | Yes |
 | `extractionFn` | [Extraction function](./dimensionspecs.md#extraction-functions) to apply to `dimension` prior to value matching. See [filtering with extraction functions](#filtering-with-extraction-functions) for details. | No |
@@ -558,8 +550,8 @@ The filter above is equivalent to the following OR of Bound filters:
 }
 ```
 
-
 ## True filter
+
 A filter which matches all values. You can use it to temporarily disable other filters without removing them.
 
 ```json
@@ -567,13 +559,13 @@ A filter which matches all values. You can use it to temporarily disable other f
 ```
 
 ## False filter
+
 A filter matches no values. You can use it to force a query to match no values.
 
 ```json
 {"type": "false" }
 ```
 
-
 ## Search filter
 
 You can use search filters to filter on partial string matches.
@@ -593,7 +585,7 @@ You can use search filters to filter on partial string matches.
 
 | Property | Description | Required |
 | -------- | ----------- | -------- |
-| `type` | Must be "search". | Yes |
+| `type` | Must be `search`. | Yes |
 | `dimension` | Input column or virtual column name to filter on. | Yes |
 | `query`| A JSON object for the type of search. See [search query spec](#search-query-spec) for more information. | Yes |
 | `extractionFn` | [Extraction function](./dimensionspecs.md#extraction-functions) to apply to `dimension` prior to value matching. See [filtering with extraction functions](#filtering-with-extraction-functions) for details. | No |
@@ -604,7 +596,7 @@ You can use search filters to filter on partial string matches.
 
 | Property | Description | Required |
 | -------- | ----------- | -------- |
-| `type` | Must be "contains". | Yes |
+| `type` | Must be `contains`. | Yes |
 | `value` | A String value to search. | Yes |
 | `caseSensitive` | Whether the string comparison is case-sensitive or not. | No, default is false (insensitive) |
 
@@ -612,7 +604,7 @@ You can use search filters to filter on partial string matches.
 
 | Property | Description | Required |
 | -------- | ----------- | -------- |
-| `type` | Must be "insensitive_contains". | Yes |
+| `type` | Must be `insensitive_contains`. | Yes |
 | `value` | A String value to search. | Yes |
 
 Note that an "insensitive_contains" search is equivalent to a "contains" search with "caseSensitive": false (or not
@@ -622,22 +614,20 @@ provided).
 
 | Property | Description | Required |
 | -------- | ----------- | -------- |
-| `type` | Must be "fragment". | Yes |
+| `type` | Must be `fragment`. | Yes |
 | `values` | A JSON array of string values to search. | Yes |
 | `caseSensitive` | Whether the string comparison is case-sensitive or not. | No, default is false (insensitive) |
 
-
-
 ## Expression filter
 
 The expression filter allows for the implementation of arbitrary conditions, leveraging the Druid expression system. This filter allows for complete flexibility, but it might be less performant than a combination of the other filters on this page because it can't always use the same optimizations available to other filters.
 
 | Property | Description | Required |
 | -------- | ----------- | -------- |
-| `type` | Must be "expression" | Yes |
+| `type` | Must be `expression`. | Yes |
 | `expression` | Expression string to evaluate into true or false. See the [Druid expression system](math-expr.md) for more details. | Yes |
 
-### Example: expression based matching
+**Example**: expression based matching
 
 ```json
 { 
@@ -646,19 +636,18 @@ The expression filter allows for the implementation of arbitrary conditions, lev
 }
 ```
 
-
 ## JavaScript filter
 
 The JavaScript filter matches a dimension against the specified JavaScript function predicate. The filter matches values for which the function returns true.
 
 | Property | Description | Required |
 | -------- | ----------- | -------- |
-| `type` | Must be "javascript" | Yes |
+| `type` | Must be `javascript`. | Yes |
 | `dimension` | Input column or virtual column name to filter on. | Yes |
 | `function` | JavaScript function which accepts the dimension value as a single argument, and returns either true or false. | Yes |
 | `extractionFn` | [Extraction function](./dimensionspecs.md#extraction-functions) to apply to `dimension` prior to value matching. See [filtering with extraction functions](#filtering-with-extraction-functions) for details. | No |
 
-### Example: matching any dimension values for the dimension `name` between `'bar'` and `'foo'`
+**Example**: matching any dimension values for the dimension `name` between `'bar'` and `'foo'`
 
 ```json
 {
@@ -685,12 +674,12 @@ The following filter matches the values for which the extraction function has a
 
 | Property | Description | Required |
 | -------- | ----------- | -------- |
-| `type` | Must be "extraction" | Yes |
+| `type` | Must be `extraction`. | Yes |
 | `dimension` | Input column or virtual column name to filter on. | Yes |
 | `value` | String value to match. | No. If not specified the filter will match NULL values. |
 | `extractionFn` | [Extraction function](./dimensionspecs.md#extraction-functions) to apply to `dimension` prior to value matching. See [filtering with extraction functions](#filtering-with-extraction-functions) for details. | No |
 
-### Example: matching dimension values in `[product_1, product_3, product_5]` for the column `product`
+**Example**: matching dimension values in `[product_1, product_3, product_5]` for the column `product`
 
 ```json
 {
@@ -723,7 +712,7 @@ If specified, the extraction function will be used to transform input values bef
 The example below shows a selector filter combined with an extraction function. This filter will transform input values
 according to the values defined in the lookup map; transformed values will then be matched with the string "bar_1".
 
-### Example: matches dimension values in `[product_1, product_3, product_5]` for the column `product`
+**Example**: matches dimension values in `[product_1, product_3, product_5]` for the column `product`
 
 ```json
 {
@@ -757,7 +746,8 @@ scan those columns.
 
 All filters return true if any one of the dimension values is satisfies the filter.
 
-#### Example: multi-value match behavior
+**Example**: multi-value match behavior
+
 Given a multi-value STRING row with values `['a', 'b', 'c']`, a filter such as
 
 ```json
@@ -767,7 +757,8 @@ will successfully match the entire row. This can produce sometimes unintuitive b
 
 Additionally, contradictory filters may be defined and perfectly legal in native queries which will not work in SQL.
 
-#### Example: SQL "contradiction"
+**Example**: SQL "contradiction"
+
 This query is impossible to express as is in SQL since it is a contradiction that the SQL planner will optimize to false and match nothing.
 
 Given a multi-value STRING row with values `['a', 'b', 'c']`, and filter such as
@@ -802,7 +793,7 @@ When filtering on numeric columns using string based filters such as the selecto
 converted into a numeric predicate and will be applied to the numeric column values directly. In some cases (such as
 the "regex" filter) the numeric column values will be converted to strings during the scan.
 
-#### Example: filtering on a specific value, `myFloatColumn = 10.1`
+**Example**: filtering on a specific value, `myFloatColumn = 10.1`
 
 ```json
 {
@@ -823,7 +814,7 @@ or with a selector filter:
 }
 ```
 
-#### Example: filtering on a range of values, `10 <= myFloatColumn < 20`
+**Example**: filtering on a range of values, `10 <= myFloatColumn < 20`
 
 ```json
 {
@@ -859,7 +850,7 @@ should be specified as if the timestamp values were strings.
 
 If you want to interpret the timestamp with a specific format, timezone, or locale, the [Time Format Extraction Function](./dimensionspecs.md#time-format-extraction-function) is useful.
 
-#### Example: filtering on a long timestamp value
+**Example**: filtering on a long timestamp value
 
 ```json
 {
@@ -880,7 +871,7 @@ or with a selector filter:
 }
 ```
 
-#### Example: filtering on day of week using an extraction function
+**Example**: filtering on day of week using an extraction function
 
 ```json
 {
@@ -896,7 +887,7 @@ or with a selector filter:
 }
 ```
 
-#### Example: filtering on a set of ISO 8601 intervals
+**Example**: filtering on a set of ISO 8601 intervals
 
 ```json
 {
@@ -908,4 +899,3 @@ or with a selector filter:
     ]
 }
 ```
-

From a51061fa4347ef7dc0eb58f05d4bc308e41b1b50 Mon Sep 17 00:00:00 2001
From: Katya Macedo <38017980+ektravel@users.noreply.github.com>
Date: Tue, 10 Dec 2024 13:43:56 -0600
Subject: [PATCH 23/56] [Docs] Improve Bloom filter topic (#17547)

* [Docs] Improve Bloom filter topic

* Apply suggestions from code review

Co-authored-by: Charles Smith <techdocsmith@gmail.com>

* Update spelling file

---------

Co-authored-by: Charles Smith <techdocsmith@gmail.com>
---
 .../extensions-core/bloom-filter.md           | 113 +++++++++---------
 website/.spelling                             |   1 +
 2 files changed, 56 insertions(+), 58 deletions(-)

diff --git a/docs/development/extensions-core/bloom-filter.md b/docs/development/extensions-core/bloom-filter.md
index 30cebeef6c8c..c0167e446da4 100644
--- a/docs/development/extensions-core/bloom-filter.md
+++ b/docs/development/extensions-core/bloom-filter.md
@@ -23,28 +23,25 @@ title: "Bloom Filter"
   -->
 
 
-To use this Apache Druid extension, [include](../../configuration/extensions.md#loading-extensions) `druid-bloom-filter` in the extensions load list.
+To use the Apache Druid&circledR; Bloom filter extension, include `druid-bloom-filter` in the extensions load list. See [Loading extensions](../../configuration/extensions.md#loading-extensions) for more information.
 
-This extension adds the ability to both construct bloom filters from query results, and filter query results by testing
-against a bloom filter. A Bloom filter is a probabilistic data structure for performing a set membership check. A bloom
-filter is a good candidate to use with Druid for cases where an explicit filter is impossible, e.g. filtering a query
+This extension adds the abilities to construct Bloom filters from query results and to filter query results by testing
+against a Bloom filter. A Bloom filter is a probabilistic data structure to check for set membership. A Bloom
+filter is a good candidate to use when an explicit filter is impossible, such as filtering a query
 against a set of millions of values.
 
 Following are some characteristics of Bloom filters:
 
-- Bloom filters are highly space efficient when compared to using a HashSet.
-- Because of the probabilistic nature of bloom filters, false positive results are possible (element was not actually
-inserted into a bloom filter during construction, but `test()` says true)
-- False negatives are not possible (if element is present then `test()` will never say false).
-- The false positive probability of this implementation is currently fixed at 5%, but increasing the number of entries
-that the filter can hold can decrease this false positive rate in exchange for overall size.
-- Bloom filters are sensitive to number of elements that will be inserted in the bloom filter. During the creation of bloom filter expected number of entries must be specified. If the number of insertions exceed
- the specified initial number of entries then false positive probability will increase accordingly.
+- Bloom filters are significantly more space efficient than HashSets.
+- Because they are probabilistic, false positive results are possible with Bloom filters. For example, the `test()` function might return `true` for an element that is not within the filter.
+- False negatives are not possible. If an element is present, `test()` always returns `true`.
+- The false positive probability of this implementation is fixed at 5%. Increasing the number of entries that the filter can hold can decrease this false positive rate in exchange for overall size.
+- Bloom filters are sensitive to the number of inserted elements. You must specify the expected number of entries at creation time. If the number of insertions exceeds the specified number of entries, the false positive probability increases accordingly.
 
-This extension is currently based on `org.apache.hive.common.util.BloomKFilter` from `hive-storage-api`. Internally,
+This extension is based on `org.apache.hive.common.util.BloomKFilter` from `hive-storage-api`. Internally,
 this implementation uses Murmur3 as the hash algorithm.
 
-To construct a BloomKFilter externally with Java to use as a filter in a Druid query:
+The following Java example shows how to construct a BloomKFilter externally:
 
 ```java
 BloomKFilter bloomFilter = new BloomKFilter(1500);
@@ -56,11 +53,12 @@ BloomKFilter.serialize(byteArrayOutputStream, bloomFilter);
 String base64Serialized = Base64.encodeBase64String(byteArrayOutputStream.toByteArray());
 ```
 
-This string can then be used in the native or SQL Druid query.
+You can then use the Base64 encoded string in JSON-based or SQL-based queries in Druid.
 
-## Filtering queries with a Bloom Filter
+## Filter queries with a Bloom filter
+
+### JSON specification
 
-### JSON Specification of Bloom Filter
 ```json
 {
   "type" : "bloom",
@@ -70,50 +68,46 @@ This string can then be used in the native or SQL Druid query.
 }
 ```
 
-|Property                 |Description                   |required?                           |
-|-------------------------|------------------------------|----------------------------------|
-|`type`                   |Filter Type. Should always be `bloom`|yes|
-|`dimension`              |The dimension to filter over. | yes |
-|`bloomKFilter`           |Base64 encoded Binary representation of `org.apache.hive.common.util.BloomKFilter`| yes |
-|`extractionFn`|[Extraction function](../../querying/dimensionspecs.md#extraction-functions) to apply to the dimension values |no|
-
+|Property|Description|Required|
+|--------|-----------|--------|
+|`type`|Filter type. Set to `bloom`.|Yes|
+|`dimension`|Dimension to filter over.|Yes|
+|`bloomKFilter`|Base64 encoded binary representation of `org.apache.hive.common.util.BloomKFilter`.|Yes|
+|`extractionFn`|[Extraction function](../../querying/dimensionspecs.md#extraction-functions) to apply to the dimension values.|No|
 
-### Serialized Format for BloomKFilter
+### Serialized format for BloomKFilter
 
- Serialized BloomKFilter format:
+Serialized BloomKFilter format:
 
- - 1 byte for the number of hash functions.
- - 1 big endian int(That is how OutputStream works) for the number of longs in the bitset
- - big endian longs in the BloomKFilter bitset
+- 1 byte for the number of hash functions.
+- 1 big-endian integer for the number of longs in the bitset.
+- Big-endian longs in the BloomKFilter bitset.
 
-Note: `org.apache.hive.common.util.BloomKFilter` provides a serialize method which can be used to serialize bloom filters to outputStream.
+`org.apache.hive.common.util.BloomKFilter` provides a method to serialize Bloom filters to `outputStream`.
 
-### Filtering SQL Queries
+### Filter SQL queries
 
-Bloom filters can be used in SQL `WHERE` clauses via the `bloom_filter_test` operator:
+You can use Bloom filters in SQL `WHERE` clauses with the `bloom_filter_test` operator:
 
 ```sql
 SELECT COUNT(*) FROM druid.foo WHERE bloom_filter_test(<expr>, '<serialized_bytes_for_BloomKFilter>')
 ```
 
-### Expression and Virtual Column Support
+### Expression and virtual column support
 
-The bloom filter extension also adds a bloom filter [Druid expression](../../querying/math-expr.md) which shares syntax
+The Bloom filter extension also adds a Bloom filter [Druid expression](../../querying/math-expr.md) which shares syntax
 with the SQL operator.
 
 ```sql
 bloom_filter_test(<expr>, '<serialized_bytes_for_BloomKFilter>')
 ```
 
-## Bloom Filter Query Aggregator
+## Bloom filter query aggregator
 
-Input for a `bloomKFilter` can also be created from a druid query with the `bloom` aggregator. Note that it is very
-important to set a reasonable value for the `maxNumEntries` parameter, which is the maximum number of distinct entries
-that the bloom filter can represent without increasing the false positive rate. It may be worth performing a query using
-one of the unique count sketches to calculate the value for this parameter in order to build a bloom filter appropriate
-for the query.
+You can create an input for a `BloomKFilter` from a Druid query with the `bloom` aggregator. Make sure to set a reasonable value for the `maxNumEntries` parameter to specify the maximum number of distinct entries that the Bloom filter can represent without increasing the false positive rate. Try performing a query using
+one of the unique count sketches to calculate the value for this parameter to build a Bloom filter appropriate for the query.
 
-### JSON Specification of Bloom Filter Aggregator
+### JSON specification
 
 ```json
 {
@@ -124,15 +118,17 @@ for the query.
     }
 ```
 
-|Property                 |Description                   |required?                           |
-|-------------------------|------------------------------|----------------------------------|
-|`type`                   |Aggregator Type. Should always be `bloom`|yes|
-|`name`                   |Output field name |yes|
-|`field`                  |[DimensionSpec](../../querying/dimensionspecs.md) to add to `org.apache.hive.common.util.BloomKFilter` | yes |
-|`maxNumEntries`          |Maximum number of distinct values supported by `org.apache.hive.common.util.BloomKFilter`, default `1500`| no |
+|Property|Description|Required|
+|--------|-----------|--------|
+|`type`|Aggregator type. Set to `bloom`.|Yes|
+|`name`|Output field name.|Yes|
+|`field`|[DimensionSpec](../../querying/dimensionspecs.md) to add to `org.apache.hive.common.util.BloomKFilter`.|Yes|
+|`maxNumEntries`|Maximum number of distinct values supported by `org.apache.hive.common.util.BloomKFilter`. Defaults to `1500`.|No|
 
 ### Example
 
+The following example shows a timeseries query object with a `bloom` aggregator:
+
 ```json
 {
   "queryType": "timeseries",
@@ -154,25 +150,26 @@ for the query.
 }
 ```
 
-response
+Example response:
 
 ```json
-[{"timestamp":"2015-09-12T00:00:00.000Z","result":{"userBloom":"BAAAJhAAAA..."}}]
+[
+  {
+    "timestamp":"2015-09-12T00:00:00.000Z",
+    "result":{"userBloom":"BAAAJhAAAA..."}
+  }
+]
 ```
 
-These values can then be set in the filter specification described above.
-
-Ordering results by a bloom filter aggregator, for example in a TopN query, will perform a comparatively expensive
-linear scan _of the filter itself_ to count the number of set bits as a means of approximating how many items have been
-added to the set. As such, ordering by an alternate aggregation is recommended if possible.
+We recommend ordering by an alternative aggregation method instead of ordering results by a Bloom filter aggregator.
+Ordering results by a Bloom filter aggregator can be resource-intensive because Druid performs an expensive linear scan of the filter to approximate the count of items added to the set by counting the number of set bits. 
 
+### SQL Bloom filter aggregator
 
-### SQL Bloom Filter Aggregator
-Bloom filters can be computed in SQL expressions with the `bloom_filter` aggregator:
+You can compute Bloom filters in SQL expressions with the BLOOM_FILTER aggregator. For example:
 
 ```sql
 SELECT BLOOM_FILTER(<expression>, <max number of entries>) FROM druid.foo WHERE dim2 = 'abc'
 ```
 
-but requires the setting `druid.sql.planner.serializeComplexValues` to be set to `true`. Bloom filter results in a SQL
- response are serialized into a base64 string, which can then be used in subsequent queries as a filter.
+Druid serializes Bloom filter results in a SQL response into a Base64 string. You can use the resulting string in subsequent queries as a filter.
diff --git a/website/.spelling b/website/.spelling
index 9a9b2eb712d0..1711a76fea23 100644
--- a/website/.spelling
+++ b/website/.spelling
@@ -117,6 +117,7 @@ Guice
 HDFS
 HLL
 HashSet
+HashSets
 Homebrew
 html
 HyperLogLog

From f3d7f1aa9681788bc367006af9ad692c9c145fae Mon Sep 17 00:00:00 2001
From: Andy Tsai <61856143+weishiuntsai@users.noreply.github.com>
Date: Wed, 11 Dec 2024 12:57:37 -0800
Subject: [PATCH 24/56] Adding 3 sets of SQL tests in quidem (#17548)

Description

Migrate the initial 3 sets of SQL tests to quidem.  These 3 sets cover numeric, string, and datetime scalar functions.
These tests use the existing kttm dataset.  They aim to exercise SQL queries in a more comprehensive way:

Each scalar function is exercised in 3 different query shapes:
  simple query
  subquery
  group by query
Each query covers all operators in its predicates.
All queries are select count(*) queries.  They are designed to all return the same result for easy maintenance and debugging.

These are the initial sets of tests.  More tests to cover the rest of the scalar and aggregation functions will come later.
---
 .../qaSQL_scalar_datetime.iq                  | 2498 +++++++++
 .../qaSQL_scalar_numeric.iq                   | 4482 ++++++++++++++++
 .../qaSQL_scalar_string.iq                    | 4606 +++++++++++++++++
 3 files changed, 11586 insertions(+)
 create mode 100644 quidem-ut/src/test/quidem/org.apache.druid.quidem.QTest/qaSQL_scalar_datetime.iq
 create mode 100644 quidem-ut/src/test/quidem/org.apache.druid.quidem.QTest/qaSQL_scalar_numeric.iq
 create mode 100644 quidem-ut/src/test/quidem/org.apache.druid.quidem.QTest/qaSQL_scalar_string.iq

diff --git a/quidem-ut/src/test/quidem/org.apache.druid.quidem.QTest/qaSQL_scalar_datetime.iq b/quidem-ut/src/test/quidem/org.apache.druid.quidem.QTest/qaSQL_scalar_datetime.iq
new file mode 100644
index 000000000000..def3a2299c72
--- /dev/null
+++ b/quidem-ut/src/test/quidem/org.apache.druid.quidem.QTest/qaSQL_scalar_datetime.iq
@@ -0,0 +1,2498 @@
+!set useApproximateCountDistinct false
+!use druidtest:///?componentSupplier=KttmNestedComponentSupplier
+!set outputformat mysql
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00';
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+#-------------------------------------------------------------------------
+# TEST_ID: A1: plain_value_datetime
+#-------------------------------------------------------------------------
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND (__time IS NULL
+       OR (__time = __time
+           AND __time IS NOT DISTINCT
+           FROM __time
+           AND __time <> __time - interval '2' YEAR
+           AND (__time IS DISTINCT
+                FROM __time - interval '2' YEAR)
+           AND __time > __time - interval '2' YEAR
+           AND __time >= __time - interval '2' YEAR
+           AND __time < __time + interval '2' YEAR
+           AND __time <= __time + interval '2' YEAR
+           AND (__time <> __time - interval '2' YEAR) IS TRUE
+           AND (__time = __time - interval '2' YEAR) IS NOT TRUE
+           AND (__time = __time - interval '2' YEAR) IS FALSE
+           AND (__time <> __time - interval '2' YEAR) IS NOT FALSE
+           AND __time BETWEEN __time - interval '2' YEAR AND __time + interval '2' YEAR
+           AND __time NOT BETWEEN __time AND __time - interval '2' YEAR
+           AND __time like '%'
+           AND __time not like '__DOES_NOT_EXIST__%'
+           AND __time IN (__time - interval '2' YEAR,
+                          __time,
+                          __time + interval '2' YEAR)
+           AND __time NOT IN (__time - interval '2' YEAR,
+                              __time + interval '2' YEAR))) ;
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND (__time IS NULL
+       OR __time IN
+         (SELECT __time
+          FROM kttm_nested
+          WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+            AND (__time IS NULL
+                 OR (__time = __time
+                     AND __time IS NOT DISTINCT
+                     FROM __time
+                     AND __time <> __time - interval '2' YEAR
+                     AND (__time IS DISTINCT
+                          FROM __time - interval '2' YEAR)
+                     AND __time > __time - interval '2' YEAR
+                     AND __time >= __time - interval '2' YEAR
+                     AND __time < __time + interval '2' YEAR
+                     AND __time <= __time + interval '2' YEAR
+                     AND (__time <> __time - interval '2' YEAR) IS TRUE
+                     AND (__time = __time - interval '2' YEAR) IS NOT TRUE
+                     AND (__time = __time - interval '2' YEAR) IS FALSE
+                     AND (__time <> __time - interval '2' YEAR) IS NOT FALSE
+                     AND __time BETWEEN __time - interval '2' YEAR AND __time + interval '2' YEAR
+                     AND __time NOT BETWEEN __time AND __time - interval '2' YEAR
+                     AND __time like '%'
+                     AND __time not like '__DOES_NOT_EXIST__%'
+                     AND __time IN (__time - interval '2' YEAR,
+                                    __time,
+                                    __time + interval '2' YEAR)
+                     AND __time NOT IN (__time - interval '2' YEAR,
+                                        __time + interval '2' YEAR)))));
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM
+  (SELECT __time, number, client_ip,
+                          __time,
+                          count(*)
+   FROM kttm_nested
+   WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+     AND (__time IS NULL
+          OR (__time = __time
+              AND __time IS NOT DISTINCT
+              FROM __time
+              AND __time <> __time - interval '2' YEAR
+              AND (__time IS DISTINCT
+                   FROM __time - interval '2' YEAR)
+              AND __time > __time - interval '2' YEAR
+              AND __time >= __time - interval '2' YEAR
+              AND __time < __time + interval '2' YEAR
+              AND __time <= __time + interval '2' YEAR
+              AND (__time <> __time - interval '2' YEAR) IS TRUE
+              AND (__time = __time - interval '2' YEAR) IS NOT TRUE
+              AND (__time = __time - interval '2' YEAR) IS FALSE
+              AND (__time <> __time - interval '2' YEAR) IS NOT FALSE
+              AND __time BETWEEN __time - interval '2' YEAR AND __time + interval '2' YEAR
+              AND __time NOT BETWEEN __time AND __time - interval '2' YEAR
+              AND __time like '%'
+              AND __time not like '__DOES_NOT_EXIST__%'
+              AND __time IN (__time - interval '2' YEAR,
+                             __time,
+                             __time + interval '2' YEAR)
+              AND __time NOT IN (__time - interval '2' YEAR,
+                                 __time + interval '2' YEAR)))
+   GROUP BY 1,
+            2,
+            3,
+            4);
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+#-------------------------------------------------------------------------
+# TEST_ID: A2: current_timestamp
+#-------------------------------------------------------------------------
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND (floor(CURRENT_TIMESTAMP TO YEAR) IS NULL
+       OR (floor(CURRENT_TIMESTAMP TO YEAR) = floor(CURRENT_TIMESTAMP TO YEAR)
+           AND floor(CURRENT_TIMESTAMP TO YEAR) IS NOT DISTINCT
+           FROM floor(CURRENT_TIMESTAMP TO YEAR)
+           AND floor(CURRENT_TIMESTAMP TO YEAR) <> floor(time_shift(CURRENT_TIMESTAMP, 'P1Y', -2) TO YEAR)
+           AND (floor(CURRENT_TIMESTAMP TO YEAR) IS DISTINCT
+                FROM floor(time_shift(CURRENT_TIMESTAMP, 'P1Y', -2) TO YEAR))
+           AND floor(CURRENT_TIMESTAMP TO YEAR) > floor(time_shift(CURRENT_TIMESTAMP, 'P1Y', -2) TO YEAR)
+           AND floor(CURRENT_TIMESTAMP TO YEAR) >= floor(time_shift(CURRENT_TIMESTAMP, 'P1Y', -2) TO YEAR)
+           AND floor(CURRENT_TIMESTAMP TO YEAR) < floor(time_shift(CURRENT_TIMESTAMP, 'P1Y', 2) TO YEAR)
+           AND floor(CURRENT_TIMESTAMP TO YEAR) <= floor(time_shift(CURRENT_TIMESTAMP, 'P1Y', 2) TO YEAR)
+           AND (floor(CURRENT_TIMESTAMP TO YEAR) <> floor(time_shift(CURRENT_TIMESTAMP, 'P1Y', -2) TO YEAR)) IS TRUE
+           AND (floor(CURRENT_TIMESTAMP TO YEAR) = floor(time_shift(CURRENT_TIMESTAMP, 'P1Y', -2) TO YEAR)) IS NOT TRUE
+           AND (floor(CURRENT_TIMESTAMP TO YEAR) = floor(time_shift(CURRENT_TIMESTAMP, 'P1Y', -2) TO YEAR)) IS FALSE
+           AND (floor(CURRENT_TIMESTAMP TO YEAR) <> floor(time_shift(CURRENT_TIMESTAMP, 'P1Y', -2) TO YEAR)) IS NOT FALSE
+           AND floor(CURRENT_TIMESTAMP TO YEAR) BETWEEN floor(time_shift(CURRENT_TIMESTAMP, 'P1Y', -2) TO YEAR) AND floor(time_shift(CURRENT_TIMESTAMP, 'P1Y', 2) TO YEAR)
+           AND floor(CURRENT_TIMESTAMP TO YEAR) NOT BETWEEN floor(CURRENT_TIMESTAMP TO YEAR) AND floor(time_shift(CURRENT_TIMESTAMP, 'P1Y', -2) TO YEAR)
+           AND floor(CURRENT_TIMESTAMP TO YEAR) like '%'
+           AND floor(CURRENT_TIMESTAMP TO YEAR) not like '__DOES_NOT_EXIST__%'
+           AND floor(CURRENT_TIMESTAMP TO YEAR) IN (floor(time_shift(CURRENT_TIMESTAMP, 'P1Y', -2) TO YEAR),
+                                                    floor(CURRENT_TIMESTAMP TO YEAR),
+                                                    floor(time_shift(CURRENT_TIMESTAMP, 'P1Y', 2) TO YEAR))
+           AND floor(CURRENT_TIMESTAMP TO YEAR) NOT IN (floor(time_shift(CURRENT_TIMESTAMP, 'P1Y', -2) TO YEAR),
+                                                        floor(time_shift(CURRENT_TIMESTAMP, 'P1Y', 2) TO YEAR)))) ;
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND (floor(CURRENT_TIMESTAMP TO YEAR) IS NULL
+       OR floor(CURRENT_TIMESTAMP TO YEAR) IN
+         (SELECT floor(CURRENT_TIMESTAMP TO YEAR)
+          FROM kttm_nested
+          WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+            AND (floor(CURRENT_TIMESTAMP TO YEAR) IS NULL
+                 OR (floor(CURRENT_TIMESTAMP TO YEAR) = floor(CURRENT_TIMESTAMP TO YEAR)
+                     AND floor(CURRENT_TIMESTAMP TO YEAR) IS NOT DISTINCT
+                     FROM floor(CURRENT_TIMESTAMP TO YEAR)
+                     AND floor(CURRENT_TIMESTAMP TO YEAR) <> floor(time_shift(CURRENT_TIMESTAMP, 'P1Y', -2) TO YEAR)
+                     AND (floor(CURRENT_TIMESTAMP TO YEAR) IS DISTINCT
+                          FROM floor(time_shift(CURRENT_TIMESTAMP, 'P1Y', -2) TO YEAR))
+                     AND floor(CURRENT_TIMESTAMP TO YEAR) > floor(time_shift(CURRENT_TIMESTAMP, 'P1Y', -2) TO YEAR)
+                     AND floor(CURRENT_TIMESTAMP TO YEAR) >= floor(time_shift(CURRENT_TIMESTAMP, 'P1Y', -2) TO YEAR)
+                     AND floor(CURRENT_TIMESTAMP TO YEAR) < floor(time_shift(CURRENT_TIMESTAMP, 'P1Y', 2) TO YEAR)
+                     AND floor(CURRENT_TIMESTAMP TO YEAR) <= floor(time_shift(CURRENT_TIMESTAMP, 'P1Y', 2) TO YEAR)
+                     AND (floor(CURRENT_TIMESTAMP TO YEAR) <> floor(time_shift(CURRENT_TIMESTAMP, 'P1Y', -2) TO YEAR)) IS TRUE
+                     AND (floor(CURRENT_TIMESTAMP TO YEAR) = floor(time_shift(CURRENT_TIMESTAMP, 'P1Y', -2) TO YEAR)) IS NOT TRUE
+                     AND (floor(CURRENT_TIMESTAMP TO YEAR) = floor(time_shift(CURRENT_TIMESTAMP, 'P1Y', -2) TO YEAR)) IS FALSE
+                     AND (floor(CURRENT_TIMESTAMP TO YEAR) <> floor(time_shift(CURRENT_TIMESTAMP, 'P1Y', -2) TO YEAR)) IS NOT FALSE
+                     AND floor(CURRENT_TIMESTAMP TO YEAR) BETWEEN floor(time_shift(CURRENT_TIMESTAMP, 'P1Y', -2) TO YEAR) AND floor(time_shift(CURRENT_TIMESTAMP, 'P1Y', 2) TO YEAR)
+                     AND floor(CURRENT_TIMESTAMP TO YEAR) NOT BETWEEN floor(CURRENT_TIMESTAMP TO YEAR) AND floor(time_shift(CURRENT_TIMESTAMP, 'P1Y', -2) TO YEAR)
+                     AND floor(CURRENT_TIMESTAMP TO YEAR) like '%'
+                     AND floor(CURRENT_TIMESTAMP TO YEAR) not like '__DOES_NOT_EXIST__%'
+                     AND floor(CURRENT_TIMESTAMP TO YEAR) IN (floor(time_shift(CURRENT_TIMESTAMP, 'P1Y', -2) TO YEAR),
+                                                              floor(CURRENT_TIMESTAMP TO YEAR),
+                                                              floor(time_shift(CURRENT_TIMESTAMP, 'P1Y', 2) TO YEAR))
+                     AND floor(CURRENT_TIMESTAMP TO YEAR) NOT IN (floor(time_shift(CURRENT_TIMESTAMP, 'P1Y', -2) TO YEAR),
+                                                                  floor(time_shift(CURRENT_TIMESTAMP, 'P1Y', 2) TO YEAR))))));
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM
+  (SELECT __time, number, client_ip,
+                          floor(CURRENT_TIMESTAMP TO YEAR),
+                          count(*)
+   FROM kttm_nested
+   WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+     AND (floor(CURRENT_TIMESTAMP TO YEAR) IS NULL
+          OR (floor(CURRENT_TIMESTAMP TO YEAR) = floor(CURRENT_TIMESTAMP TO YEAR)
+              AND floor(CURRENT_TIMESTAMP TO YEAR) IS NOT DISTINCT
+              FROM floor(CURRENT_TIMESTAMP TO YEAR)
+              AND floor(CURRENT_TIMESTAMP TO YEAR) <> floor(time_shift(CURRENT_TIMESTAMP, 'P1Y', -2) TO YEAR)
+              AND (floor(CURRENT_TIMESTAMP TO YEAR) IS DISTINCT
+                   FROM floor(time_shift(CURRENT_TIMESTAMP, 'P1Y', -2) TO YEAR))
+              AND floor(CURRENT_TIMESTAMP TO YEAR) > floor(time_shift(CURRENT_TIMESTAMP, 'P1Y', -2) TO YEAR)
+              AND floor(CURRENT_TIMESTAMP TO YEAR) >= floor(time_shift(CURRENT_TIMESTAMP, 'P1Y', -2) TO YEAR)
+              AND floor(CURRENT_TIMESTAMP TO YEAR) < floor(time_shift(CURRENT_TIMESTAMP, 'P1Y', 2) TO YEAR)
+              AND floor(CURRENT_TIMESTAMP TO YEAR) <= floor(time_shift(CURRENT_TIMESTAMP, 'P1Y', 2) TO YEAR)
+              AND (floor(CURRENT_TIMESTAMP TO YEAR) <> floor(time_shift(CURRENT_TIMESTAMP, 'P1Y', -2) TO YEAR)) IS TRUE
+              AND (floor(CURRENT_TIMESTAMP TO YEAR) = floor(time_shift(CURRENT_TIMESTAMP, 'P1Y', -2) TO YEAR)) IS NOT TRUE
+              AND (floor(CURRENT_TIMESTAMP TO YEAR) = floor(time_shift(CURRENT_TIMESTAMP, 'P1Y', -2) TO YEAR)) IS FALSE
+              AND (floor(CURRENT_TIMESTAMP TO YEAR) <> floor(time_shift(CURRENT_TIMESTAMP, 'P1Y', -2) TO YEAR)) IS NOT FALSE
+              AND floor(CURRENT_TIMESTAMP TO YEAR) BETWEEN floor(time_shift(CURRENT_TIMESTAMP, 'P1Y', -2) TO YEAR) AND floor(time_shift(CURRENT_TIMESTAMP, 'P1Y', 2) TO YEAR)
+              AND floor(CURRENT_TIMESTAMP TO YEAR) NOT BETWEEN floor(CURRENT_TIMESTAMP TO YEAR) AND floor(time_shift(CURRENT_TIMESTAMP, 'P1Y', -2) TO YEAR)
+              AND floor(CURRENT_TIMESTAMP TO YEAR) like '%'
+              AND floor(CURRENT_TIMESTAMP TO YEAR) not like '__DOES_NOT_EXIST__%'
+              AND floor(CURRENT_TIMESTAMP TO YEAR) IN (floor(time_shift(CURRENT_TIMESTAMP, 'P1Y', -2) TO YEAR),
+                                                       floor(CURRENT_TIMESTAMP TO YEAR),
+                                                       floor(time_shift(CURRENT_TIMESTAMP, 'P1Y', 2) TO YEAR))
+              AND floor(CURRENT_TIMESTAMP TO YEAR) NOT IN (floor(time_shift(CURRENT_TIMESTAMP, 'P1Y', -2) TO YEAR),
+                                                           floor(time_shift(CURRENT_TIMESTAMP, 'P1Y', 2) TO YEAR))))
+   GROUP BY 1,
+            2,
+            3,
+            4);
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+#-------------------------------------------------------------------------
+# TEST_ID: A3: current_date
+#-------------------------------------------------------------------------
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND (floor(cast(CURRENT_DATE AS timestamp) TO YEAR) IS NULL
+       OR (floor(cast(CURRENT_DATE AS timestamp) TO YEAR) = floor(cast(CURRENT_DATE AS timestamp) TO YEAR)
+           AND floor(cast(CURRENT_DATE AS timestamp) TO YEAR) IS NOT DISTINCT
+           FROM floor(cast(CURRENT_DATE AS timestamp) TO YEAR)
+           AND floor(cast(CURRENT_DATE AS timestamp) TO YEAR) <> floor(time_shift(cast(CURRENT_DATE AS timestamp), 'P1Y', -2) TO YEAR)
+           AND (floor(cast(CURRENT_DATE AS timestamp) TO YEAR) IS DISTINCT
+                FROM floor(time_shift(cast(CURRENT_DATE AS timestamp), 'P1Y', -2) TO YEAR))
+           AND floor(cast(CURRENT_DATE AS timestamp) TO YEAR) > floor(time_shift(cast(CURRENT_DATE AS timestamp), 'P1Y', -2) TO YEAR)
+           AND floor(cast(CURRENT_DATE AS timestamp) TO YEAR) >= floor(time_shift(cast(CURRENT_DATE AS timestamp), 'P1Y', -2) TO YEAR)
+           AND floor(cast(CURRENT_DATE AS timestamp) TO YEAR) < floor(time_shift(cast(CURRENT_DATE AS timestamp), 'P1Y', 2) TO YEAR)
+           AND floor(cast(CURRENT_DATE AS timestamp) TO YEAR) <= floor(time_shift(cast(CURRENT_DATE AS timestamp), 'P1Y', 2) TO YEAR)
+           AND (floor(cast(CURRENT_DATE AS timestamp) TO YEAR) <> floor(time_shift(cast(CURRENT_DATE AS timestamp), 'P1Y', -2) TO YEAR)) IS TRUE
+           AND (floor(cast(CURRENT_DATE AS timestamp) TO YEAR) = floor(time_shift(cast(CURRENT_DATE AS timestamp), 'P1Y', -2) TO YEAR)) IS NOT TRUE
+           AND (floor(cast(CURRENT_DATE AS timestamp) TO YEAR) = floor(time_shift(cast(CURRENT_DATE AS timestamp), 'P1Y', -2) TO YEAR)) IS FALSE
+           AND (floor(cast(CURRENT_DATE AS timestamp) TO YEAR) <> floor(time_shift(cast(CURRENT_DATE AS timestamp), 'P1Y', -2) TO YEAR)) IS NOT FALSE
+           AND floor(cast(CURRENT_DATE AS timestamp) TO YEAR) BETWEEN floor(time_shift(cast(CURRENT_DATE AS timestamp), 'P1Y', -2) TO YEAR) AND floor(time_shift(cast(CURRENT_DATE AS timestamp), 'P1Y', 2) TO YEAR)
+           AND floor(cast(CURRENT_DATE AS timestamp) TO YEAR) NOT BETWEEN floor(cast(CURRENT_DATE AS timestamp) TO YEAR) AND floor(time_shift(cast(CURRENT_DATE AS timestamp), 'P1Y', -2) TO YEAR)
+           AND floor(cast(CURRENT_DATE AS timestamp) TO YEAR) like '%'
+           AND floor(cast(CURRENT_DATE AS timestamp) TO YEAR) not like '__DOES_NOT_EXIST__%'
+           AND floor(cast(CURRENT_DATE AS timestamp) TO YEAR) IN (floor(time_shift(cast(CURRENT_DATE AS timestamp), 'P1Y', -2) TO YEAR),
+                                                                  floor(cast(CURRENT_DATE AS timestamp) TO YEAR),
+                                                                  floor(time_shift(cast(CURRENT_DATE AS timestamp), 'P1Y', 2) TO YEAR))
+           AND floor(cast(CURRENT_DATE AS timestamp) TO YEAR) NOT IN (floor(time_shift(cast(CURRENT_DATE AS timestamp), 'P1Y', -2) TO YEAR),
+                                                                      floor(time_shift(cast(CURRENT_DATE AS timestamp), 'P1Y', 2) TO YEAR)))) ;
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND (floor(cast(CURRENT_DATE AS timestamp) TO YEAR) IS NULL
+       OR floor(cast(CURRENT_DATE AS timestamp) TO YEAR) IN
+         (SELECT floor(cast(CURRENT_DATE AS timestamp) TO YEAR)
+          FROM kttm_nested
+          WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+            AND (floor(cast(CURRENT_DATE AS timestamp) TO YEAR) IS NULL
+                 OR (floor(cast(CURRENT_DATE AS timestamp) TO YEAR) = floor(cast(CURRENT_DATE AS timestamp) TO YEAR)
+                     AND floor(cast(CURRENT_DATE AS timestamp) TO YEAR) IS NOT DISTINCT
+                     FROM floor(cast(CURRENT_DATE AS timestamp) TO YEAR)
+                     AND floor(cast(CURRENT_DATE AS timestamp) TO YEAR) <> floor(time_shift(cast(CURRENT_DATE AS timestamp), 'P1Y', -2) TO YEAR)
+                     AND (floor(cast(CURRENT_DATE AS timestamp) TO YEAR) IS DISTINCT
+                          FROM floor(time_shift(cast(CURRENT_DATE AS timestamp), 'P1Y', -2) TO YEAR))
+                     AND floor(cast(CURRENT_DATE AS timestamp) TO YEAR) > floor(time_shift(cast(CURRENT_DATE AS timestamp), 'P1Y', -2) TO YEAR)
+                     AND floor(cast(CURRENT_DATE AS timestamp) TO YEAR) >= floor(time_shift(cast(CURRENT_DATE AS timestamp), 'P1Y', -2) TO YEAR)
+                     AND floor(cast(CURRENT_DATE AS timestamp) TO YEAR) < floor(time_shift(cast(CURRENT_DATE AS timestamp), 'P1Y', 2) TO YEAR)
+                     AND floor(cast(CURRENT_DATE AS timestamp) TO YEAR) <= floor(time_shift(cast(CURRENT_DATE AS timestamp), 'P1Y', 2) TO YEAR)
+                     AND (floor(cast(CURRENT_DATE AS timestamp) TO YEAR) <> floor(time_shift(cast(CURRENT_DATE AS timestamp), 'P1Y', -2) TO YEAR)) IS TRUE
+                     AND (floor(cast(CURRENT_DATE AS timestamp) TO YEAR) = floor(time_shift(cast(CURRENT_DATE AS timestamp), 'P1Y', -2) TO YEAR)) IS NOT TRUE
+                     AND (floor(cast(CURRENT_DATE AS timestamp) TO YEAR) = floor(time_shift(cast(CURRENT_DATE AS timestamp), 'P1Y', -2) TO YEAR)) IS FALSE
+                     AND (floor(cast(CURRENT_DATE AS timestamp) TO YEAR) <> floor(time_shift(cast(CURRENT_DATE AS timestamp), 'P1Y', -2) TO YEAR)) IS NOT FALSE
+                     AND floor(cast(CURRENT_DATE AS timestamp) TO YEAR) BETWEEN floor(time_shift(cast(CURRENT_DATE AS timestamp), 'P1Y', -2) TO YEAR) AND floor(time_shift(cast(CURRENT_DATE AS timestamp), 'P1Y', 2) TO YEAR)
+                     AND floor(cast(CURRENT_DATE AS timestamp) TO YEAR) NOT BETWEEN floor(cast(CURRENT_DATE AS timestamp) TO YEAR) AND floor(time_shift(cast(CURRENT_DATE AS timestamp), 'P1Y', -2) TO YEAR)
+                     AND floor(cast(CURRENT_DATE AS timestamp) TO YEAR) like '%'
+                     AND floor(cast(CURRENT_DATE AS timestamp) TO YEAR) not like '__DOES_NOT_EXIST__%'
+                     AND floor(cast(CURRENT_DATE AS timestamp) TO YEAR) IN (floor(time_shift(cast(CURRENT_DATE AS timestamp), 'P1Y', -2) TO YEAR),
+                                                                            floor(cast(CURRENT_DATE AS timestamp) TO YEAR),
+                                                                            floor(time_shift(cast(CURRENT_DATE AS timestamp), 'P1Y', 2) TO YEAR))
+                     AND floor(cast(CURRENT_DATE AS timestamp) TO YEAR) NOT IN (floor(time_shift(cast(CURRENT_DATE AS timestamp), 'P1Y', -2) TO YEAR),
+                                                                                floor(time_shift(cast(CURRENT_DATE AS timestamp), 'P1Y', 2) TO YEAR))))));
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM
+  (SELECT __time, number, client_ip,
+                          floor(cast(CURRENT_DATE AS timestamp) TO YEAR),
+                          count(*)
+   FROM kttm_nested
+   WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+     AND (floor(cast(CURRENT_DATE AS timestamp) TO YEAR) IS NULL
+          OR (floor(cast(CURRENT_DATE AS timestamp) TO YEAR) = floor(cast(CURRENT_DATE AS timestamp) TO YEAR)
+              AND floor(cast(CURRENT_DATE AS timestamp) TO YEAR) IS NOT DISTINCT
+              FROM floor(cast(CURRENT_DATE AS timestamp) TO YEAR)
+              AND floor(cast(CURRENT_DATE AS timestamp) TO YEAR) <> floor(time_shift(cast(CURRENT_DATE AS timestamp), 'P1Y', -2) TO YEAR)
+              AND (floor(cast(CURRENT_DATE AS timestamp) TO YEAR) IS DISTINCT
+                   FROM floor(time_shift(cast(CURRENT_DATE AS timestamp), 'P1Y', -2) TO YEAR))
+              AND floor(cast(CURRENT_DATE AS timestamp) TO YEAR) > floor(time_shift(cast(CURRENT_DATE AS timestamp), 'P1Y', -2) TO YEAR)
+              AND floor(cast(CURRENT_DATE AS timestamp) TO YEAR) >= floor(time_shift(cast(CURRENT_DATE AS timestamp), 'P1Y', -2) TO YEAR)
+              AND floor(cast(CURRENT_DATE AS timestamp) TO YEAR) < floor(time_shift(cast(CURRENT_DATE AS timestamp), 'P1Y', 2) TO YEAR)
+              AND floor(cast(CURRENT_DATE AS timestamp) TO YEAR) <= floor(time_shift(cast(CURRENT_DATE AS timestamp), 'P1Y', 2) TO YEAR)
+              AND (floor(cast(CURRENT_DATE AS timestamp) TO YEAR) <> floor(time_shift(cast(CURRENT_DATE AS timestamp), 'P1Y', -2) TO YEAR)) IS TRUE
+              AND (floor(cast(CURRENT_DATE AS timestamp) TO YEAR) = floor(time_shift(cast(CURRENT_DATE AS timestamp), 'P1Y', -2) TO YEAR)) IS NOT TRUE
+              AND (floor(cast(CURRENT_DATE AS timestamp) TO YEAR) = floor(time_shift(cast(CURRENT_DATE AS timestamp), 'P1Y', -2) TO YEAR)) IS FALSE
+              AND (floor(cast(CURRENT_DATE AS timestamp) TO YEAR) <> floor(time_shift(cast(CURRENT_DATE AS timestamp), 'P1Y', -2) TO YEAR)) IS NOT FALSE
+              AND floor(cast(CURRENT_DATE AS timestamp) TO YEAR) BETWEEN floor(time_shift(cast(CURRENT_DATE AS timestamp), 'P1Y', -2) TO YEAR) AND floor(time_shift(cast(CURRENT_DATE AS timestamp), 'P1Y', 2) TO YEAR)
+              AND floor(cast(CURRENT_DATE AS timestamp) TO YEAR) NOT BETWEEN floor(cast(CURRENT_DATE AS timestamp) TO YEAR) AND floor(time_shift(cast(CURRENT_DATE AS timestamp), 'P1Y', -2) TO YEAR)
+              AND floor(cast(CURRENT_DATE AS timestamp) TO YEAR) like '%'
+              AND floor(cast(CURRENT_DATE AS timestamp) TO YEAR) not like '__DOES_NOT_EXIST__%'
+              AND floor(cast(CURRENT_DATE AS timestamp) TO YEAR) IN (floor(time_shift(cast(CURRENT_DATE AS timestamp), 'P1Y', -2) TO YEAR),
+                                                                     floor(cast(CURRENT_DATE AS timestamp) TO YEAR),
+                                                                     floor(time_shift(cast(CURRENT_DATE AS timestamp), 'P1Y', 2) TO YEAR))
+              AND floor(cast(CURRENT_DATE AS timestamp) TO YEAR) NOT IN (floor(time_shift(cast(CURRENT_DATE AS timestamp), 'P1Y', -2) TO YEAR),
+                                                                         floor(time_shift(cast(CURRENT_DATE AS timestamp), 'P1Y', 2) TO YEAR))))
+   GROUP BY 1,
+            2,
+            3,
+            4);
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+#-------------------------------------------------------------------------
+# TEST_ID: A4: date_trunc
+#-------------------------------------------------------------------------
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND (date_trunc('week', __time) IS NULL
+       OR (date_trunc('week', __time) = date_trunc('week', __time)
+           AND date_trunc('week', __time) IS NOT DISTINCT
+           FROM date_trunc('week', __time)
+           AND date_trunc('week', __time) <> time_shift(date_trunc('week', __time), 'P1D', -2)
+           AND (date_trunc('week', __time) IS DISTINCT
+                FROM time_shift(date_trunc('week', __time), 'P1D', -2))
+           AND date_trunc('week', __time) > time_shift(date_trunc('week', __time), 'P1D', -2)
+           AND date_trunc('week', __time) >= time_shift(date_trunc('week', __time), 'P1D', -2)
+           AND date_trunc('week', __time) < time_shift(date_trunc('week', __time), 'P1D', 2)
+           AND date_trunc('week', __time) <= time_shift(date_trunc('week', __time), 'P1D', 2)
+           AND (date_trunc('week', __time) <> time_shift(date_trunc('week', __time), 'P1D', -2)) IS TRUE
+           AND (date_trunc('week', __time) = time_shift(date_trunc('week', __time), 'P1D', -2)) IS NOT TRUE
+           AND (date_trunc('week', __time) = time_shift(date_trunc('week', __time), 'P1D', -2)) IS FALSE
+           AND (date_trunc('week', __time) <> time_shift(date_trunc('week', __time), 'P1D', -2)) IS NOT FALSE
+           AND date_trunc('week', __time) BETWEEN time_shift(date_trunc('week', __time), 'P1D', -2) AND time_shift(date_trunc('week', __time), 'P1D', 2)
+           AND date_trunc('week', __time) NOT BETWEEN date_trunc('week', __time) AND time_shift(date_trunc('week', __time), 'P1D', -2)
+           AND date_trunc('week', __time) like '%'
+           AND date_trunc('week', __time) not like '__DOES_NOT_EXIST__%'
+           AND date_trunc('week', __time) IN (time_shift(date_trunc('week', __time), 'P1D', -2),
+                                              date_trunc('week', __time),
+                                              time_shift(date_trunc('week', __time), 'P1D', 2))
+           AND date_trunc('week', __time) NOT IN (time_shift(date_trunc('week', __time), 'P1D', -2),
+                                                  time_shift(date_trunc('week', __time), 'P1D', 2)))) ;
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND (date_trunc('week', __time) IS NULL
+       OR date_trunc('week', __time) IN
+         (SELECT date_trunc('week', __time)
+          FROM kttm_nested
+          WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+            AND (date_trunc('week', __time) IS NULL
+                 OR (date_trunc('week', __time) = date_trunc('week', __time)
+                     AND date_trunc('week', __time) IS NOT DISTINCT
+                     FROM date_trunc('week', __time)
+                     AND date_trunc('week', __time) <> time_shift(date_trunc('week', __time), 'P1D', -2)
+                     AND (date_trunc('week', __time) IS DISTINCT
+                          FROM time_shift(date_trunc('week', __time), 'P1D', -2))
+                     AND date_trunc('week', __time) > time_shift(date_trunc('week', __time), 'P1D', -2)
+                     AND date_trunc('week', __time) >= time_shift(date_trunc('week', __time), 'P1D', -2)
+                     AND date_trunc('week', __time) < time_shift(date_trunc('week', __time), 'P1D', 2)
+                     AND date_trunc('week', __time) <= time_shift(date_trunc('week', __time), 'P1D', 2)
+                     AND (date_trunc('week', __time) <> time_shift(date_trunc('week', __time), 'P1D', -2)) IS TRUE
+                     AND (date_trunc('week', __time) = time_shift(date_trunc('week', __time), 'P1D', -2)) IS NOT TRUE
+                     AND (date_trunc('week', __time) = time_shift(date_trunc('week', __time), 'P1D', -2)) IS FALSE
+                     AND (date_trunc('week', __time) <> time_shift(date_trunc('week', __time), 'P1D', -2)) IS NOT FALSE
+                     AND date_trunc('week', __time) BETWEEN time_shift(date_trunc('week', __time), 'P1D', -2) AND time_shift(date_trunc('week', __time), 'P1D', 2)
+                     AND date_trunc('week', __time) NOT BETWEEN date_trunc('week', __time) AND time_shift(date_trunc('week', __time), 'P1D', -2)
+                     AND date_trunc('week', __time) like '%'
+                     AND date_trunc('week', __time) not like '__DOES_NOT_EXIST__%'
+                     AND date_trunc('week', __time) IN (time_shift(date_trunc('week', __time), 'P1D', -2),
+                                                        date_trunc('week', __time),
+                                                        time_shift(date_trunc('week', __time), 'P1D', 2))
+                     AND date_trunc('week', __time) NOT IN (time_shift(date_trunc('week', __time), 'P1D', -2),
+                                                            time_shift(date_trunc('week', __time), 'P1D', 2))))));
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM
+  (SELECT __time, number, client_ip,
+                          date_trunc('week', __time),
+                          count(*)
+   FROM kttm_nested
+   WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+     AND (date_trunc('week', __time) IS NULL
+          OR (date_trunc('week', __time) = date_trunc('week', __time)
+              AND date_trunc('week', __time) IS NOT DISTINCT
+              FROM date_trunc('week', __time)
+              AND date_trunc('week', __time) <> time_shift(date_trunc('week', __time), 'P1D', -2)
+              AND (date_trunc('week', __time) IS DISTINCT
+                   FROM time_shift(date_trunc('week', __time), 'P1D', -2))
+              AND date_trunc('week', __time) > time_shift(date_trunc('week', __time), 'P1D', -2)
+              AND date_trunc('week', __time) >= time_shift(date_trunc('week', __time), 'P1D', -2)
+              AND date_trunc('week', __time) < time_shift(date_trunc('week', __time), 'P1D', 2)
+              AND date_trunc('week', __time) <= time_shift(date_trunc('week', __time), 'P1D', 2)
+              AND (date_trunc('week', __time) <> time_shift(date_trunc('week', __time), 'P1D', -2)) IS TRUE
+              AND (date_trunc('week', __time) = time_shift(date_trunc('week', __time), 'P1D', -2)) IS NOT TRUE
+              AND (date_trunc('week', __time) = time_shift(date_trunc('week', __time), 'P1D', -2)) IS FALSE
+              AND (date_trunc('week', __time) <> time_shift(date_trunc('week', __time), 'P1D', -2)) IS NOT FALSE
+              AND date_trunc('week', __time) BETWEEN time_shift(date_trunc('week', __time), 'P1D', -2) AND time_shift(date_trunc('week', __time), 'P1D', 2)
+              AND date_trunc('week', __time) NOT BETWEEN date_trunc('week', __time) AND time_shift(date_trunc('week', __time), 'P1D', -2)
+              AND date_trunc('week', __time) like '%'
+              AND date_trunc('week', __time) not like '__DOES_NOT_EXIST__%'
+              AND date_trunc('week', __time) IN (time_shift(date_trunc('week', __time), 'P1D', -2),
+                                                 date_trunc('week', __time),
+                                                 time_shift(date_trunc('week', __time), 'P1D', 2))
+              AND date_trunc('week', __time) NOT IN (time_shift(date_trunc('week', __time), 'P1D', -2),
+                                                     time_shift(date_trunc('week', __time), 'P1D', 2))))
+   GROUP BY 1,
+            2,
+            3,
+            4);
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+#-------------------------------------------------------------------------
+# TEST_ID: A5: time_ceil
+#-------------------------------------------------------------------------
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND (time_ceil(__time, 'P1D', timestamp '2000-01-01 00:30:00') IS NULL
+       OR (time_ceil(__time, 'P1D', timestamp '2000-01-01 00:30:00') = time_ceil(__time, 'P1D', timestamp '2000-01-01 00:30:00')
+           AND time_ceil(__time, 'P1D', timestamp '2000-01-01 00:30:00') IS NOT DISTINCT
+           FROM time_ceil(__time, 'P1D', timestamp '2000-01-01 00:30:00')
+           AND time_ceil(__time, 'P1D', timestamp '2000-01-01 00:30:00') <> time_shift(time_ceil(__time, 'P1D', timestamp '2000-01-01 00:30:00'), 'P1D', -2)
+           AND (time_ceil(__time, 'P1D', timestamp '2000-01-01 00:30:00') IS DISTINCT
+                FROM time_shift(time_ceil(__time, 'P1D', timestamp '2000-01-01 00:30:00'), 'P1D', -2))
+           AND time_ceil(__time, 'P1D', timestamp '2000-01-01 00:30:00') > time_shift(time_ceil(__time, 'P1D', timestamp '2000-01-01 00:30:00'), 'P1D', -2)
+           AND time_ceil(__time, 'P1D', timestamp '2000-01-01 00:30:00') >= time_shift(time_ceil(__time, 'P1D', timestamp '2000-01-01 00:30:00'), 'P1D', -2)
+           AND time_ceil(__time, 'P1D', timestamp '2000-01-01 00:30:00') < time_shift(time_ceil(__time, 'P1D', timestamp '2000-01-01 00:30:00'), 'P1D', 2)
+           AND time_ceil(__time, 'P1D', timestamp '2000-01-01 00:30:00') <= time_shift(time_ceil(__time, 'P1D', timestamp '2000-01-01 00:30:00'), 'P1D', 2)
+           AND (time_ceil(__time, 'P1D', timestamp '2000-01-01 00:30:00') <> time_shift(time_ceil(__time, 'P1D', timestamp '2000-01-01 00:30:00'), 'P1D', -2)) IS TRUE
+           AND (time_ceil(__time, 'P1D', timestamp '2000-01-01 00:30:00') = time_shift(time_ceil(__time, 'P1D', timestamp '2000-01-01 00:30:00'), 'P1D', -2)) IS NOT TRUE
+           AND (time_ceil(__time, 'P1D', timestamp '2000-01-01 00:30:00') = time_shift(time_ceil(__time, 'P1D', timestamp '2000-01-01 00:30:00'), 'P1D', -2)) IS FALSE
+           AND (time_ceil(__time, 'P1D', timestamp '2000-01-01 00:30:00') <> time_shift(time_ceil(__time, 'P1D', timestamp '2000-01-01 00:30:00'), 'P1D', -2)) IS NOT FALSE
+           AND time_ceil(__time, 'P1D', timestamp '2000-01-01 00:30:00') BETWEEN time_shift(time_ceil(__time, 'P1D', timestamp '2000-01-01 00:30:00'), 'P1D', -2) AND time_shift(time_ceil(__time, 'P1D', timestamp '2000-01-01 00:30:00'), 'P1D', 2)
+           AND time_ceil(__time, 'P1D', timestamp '2000-01-01 00:30:00') NOT BETWEEN time_ceil(__time, 'P1D', timestamp '2000-01-01 00:30:00') AND time_shift(time_ceil(__time, 'P1D', timestamp '2000-01-01 00:30:00'), 'P1D', -2)
+           AND time_ceil(__time, 'P1D', timestamp '2000-01-01 00:30:00') like '%'
+           AND time_ceil(__time, 'P1D', timestamp '2000-01-01 00:30:00') not like '__DOES_NOT_EXIST__%'
+           AND time_ceil(__time, 'P1D', timestamp '2000-01-01 00:30:00') IN (time_shift(time_ceil(__time, 'P1D', timestamp '2000-01-01 00:30:00'), 'P1D', -2),
+                                                                             time_ceil(__time, 'P1D', timestamp '2000-01-01 00:30:00'),
+                                                                             time_shift(time_ceil(__time, 'P1D', timestamp '2000-01-01 00:30:00'), 'P1D', 2))
+           AND time_ceil(__time, 'P1D', timestamp '2000-01-01 00:30:00') NOT IN (time_shift(time_ceil(__time, 'P1D', timestamp '2000-01-01 00:30:00'), 'P1D', -2),
+                                                                                 time_shift(time_ceil(__time, 'P1D', timestamp '2000-01-01 00:30:00'), 'P1D', 2)))) ;
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND (time_ceil(__time, 'P1D', timestamp '2000-01-01 00:30:00') IS NULL
+       OR time_ceil(__time, 'P1D', timestamp '2000-01-01 00:30:00') IN
+         (SELECT time_ceil(__time, 'P1D', timestamp '2000-01-01 00:30:00')
+          FROM kttm_nested
+          WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+            AND (time_ceil(__time, 'P1D', timestamp '2000-01-01 00:30:00') IS NULL
+                 OR (time_ceil(__time, 'P1D', timestamp '2000-01-01 00:30:00') = time_ceil(__time, 'P1D', timestamp '2000-01-01 00:30:00')
+                     AND time_ceil(__time, 'P1D', timestamp '2000-01-01 00:30:00') IS NOT DISTINCT
+                     FROM time_ceil(__time, 'P1D', timestamp '2000-01-01 00:30:00')
+                     AND time_ceil(__time, 'P1D', timestamp '2000-01-01 00:30:00') <> time_shift(time_ceil(__time, 'P1D', timestamp '2000-01-01 00:30:00'), 'P1D', -2)
+                     AND (time_ceil(__time, 'P1D', timestamp '2000-01-01 00:30:00') IS DISTINCT
+                          FROM time_shift(time_ceil(__time, 'P1D', timestamp '2000-01-01 00:30:00'), 'P1D', -2))
+                     AND time_ceil(__time, 'P1D', timestamp '2000-01-01 00:30:00') > time_shift(time_ceil(__time, 'P1D', timestamp '2000-01-01 00:30:00'), 'P1D', -2)
+                     AND time_ceil(__time, 'P1D', timestamp '2000-01-01 00:30:00') >= time_shift(time_ceil(__time, 'P1D', timestamp '2000-01-01 00:30:00'), 'P1D', -2)
+                     AND time_ceil(__time, 'P1D', timestamp '2000-01-01 00:30:00') < time_shift(time_ceil(__time, 'P1D', timestamp '2000-01-01 00:30:00'), 'P1D', 2)
+                     AND time_ceil(__time, 'P1D', timestamp '2000-01-01 00:30:00') <= time_shift(time_ceil(__time, 'P1D', timestamp '2000-01-01 00:30:00'), 'P1D', 2)
+                     AND (time_ceil(__time, 'P1D', timestamp '2000-01-01 00:30:00') <> time_shift(time_ceil(__time, 'P1D', timestamp '2000-01-01 00:30:00'), 'P1D', -2)) IS TRUE
+                     AND (time_ceil(__time, 'P1D', timestamp '2000-01-01 00:30:00') = time_shift(time_ceil(__time, 'P1D', timestamp '2000-01-01 00:30:00'), 'P1D', -2)) IS NOT TRUE
+                     AND (time_ceil(__time, 'P1D', timestamp '2000-01-01 00:30:00') = time_shift(time_ceil(__time, 'P1D', timestamp '2000-01-01 00:30:00'), 'P1D', -2)) IS FALSE
+                     AND (time_ceil(__time, 'P1D', timestamp '2000-01-01 00:30:00') <> time_shift(time_ceil(__time, 'P1D', timestamp '2000-01-01 00:30:00'), 'P1D', -2)) IS NOT FALSE
+                     AND time_ceil(__time, 'P1D', timestamp '2000-01-01 00:30:00') BETWEEN time_shift(time_ceil(__time, 'P1D', timestamp '2000-01-01 00:30:00'), 'P1D', -2) AND time_shift(time_ceil(__time, 'P1D', timestamp '2000-01-01 00:30:00'), 'P1D', 2)
+                     AND time_ceil(__time, 'P1D', timestamp '2000-01-01 00:30:00') NOT BETWEEN time_ceil(__time, 'P1D', timestamp '2000-01-01 00:30:00') AND time_shift(time_ceil(__time, 'P1D', timestamp '2000-01-01 00:30:00'), 'P1D', -2)
+                     AND time_ceil(__time, 'P1D', timestamp '2000-01-01 00:30:00') like '%'
+                     AND time_ceil(__time, 'P1D', timestamp '2000-01-01 00:30:00') not like '__DOES_NOT_EXIST__%'
+                     AND time_ceil(__time, 'P1D', timestamp '2000-01-01 00:30:00') IN (time_shift(time_ceil(__time, 'P1D', timestamp '2000-01-01 00:30:00'), 'P1D', -2),
+                                                                                       time_ceil(__time, 'P1D', timestamp '2000-01-01 00:30:00'),
+                                                                                       time_shift(time_ceil(__time, 'P1D', timestamp '2000-01-01 00:30:00'), 'P1D', 2))
+                     AND time_ceil(__time, 'P1D', timestamp '2000-01-01 00:30:00') NOT IN (time_shift(time_ceil(__time, 'P1D', timestamp '2000-01-01 00:30:00'), 'P1D', -2),
+                                                                                           time_shift(time_ceil(__time, 'P1D', timestamp '2000-01-01 00:30:00'), 'P1D', 2))))));
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM
+  (SELECT __time, number, client_ip,
+                          time_ceil(__time, 'P1D', timestamp '2000-01-01 00:30:00'),
+                          count(*)
+   FROM kttm_nested
+   WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+     AND (time_ceil(__time, 'P1D', timestamp '2000-01-01 00:30:00') IS NULL
+          OR (time_ceil(__time, 'P1D', timestamp '2000-01-01 00:30:00') = time_ceil(__time, 'P1D', timestamp '2000-01-01 00:30:00')
+              AND time_ceil(__time, 'P1D', timestamp '2000-01-01 00:30:00') IS NOT DISTINCT
+              FROM time_ceil(__time, 'P1D', timestamp '2000-01-01 00:30:00')
+              AND time_ceil(__time, 'P1D', timestamp '2000-01-01 00:30:00') <> time_shift(time_ceil(__time, 'P1D', timestamp '2000-01-01 00:30:00'), 'P1D', -2)
+              AND (time_ceil(__time, 'P1D', timestamp '2000-01-01 00:30:00') IS DISTINCT
+                   FROM time_shift(time_ceil(__time, 'P1D', timestamp '2000-01-01 00:30:00'), 'P1D', -2))
+              AND time_ceil(__time, 'P1D', timestamp '2000-01-01 00:30:00') > time_shift(time_ceil(__time, 'P1D', timestamp '2000-01-01 00:30:00'), 'P1D', -2)
+              AND time_ceil(__time, 'P1D', timestamp '2000-01-01 00:30:00') >= time_shift(time_ceil(__time, 'P1D', timestamp '2000-01-01 00:30:00'), 'P1D', -2)
+              AND time_ceil(__time, 'P1D', timestamp '2000-01-01 00:30:00') < time_shift(time_ceil(__time, 'P1D', timestamp '2000-01-01 00:30:00'), 'P1D', 2)
+              AND time_ceil(__time, 'P1D', timestamp '2000-01-01 00:30:00') <= time_shift(time_ceil(__time, 'P1D', timestamp '2000-01-01 00:30:00'), 'P1D', 2)
+              AND (time_ceil(__time, 'P1D', timestamp '2000-01-01 00:30:00') <> time_shift(time_ceil(__time, 'P1D', timestamp '2000-01-01 00:30:00'), 'P1D', -2)) IS TRUE
+              AND (time_ceil(__time, 'P1D', timestamp '2000-01-01 00:30:00') = time_shift(time_ceil(__time, 'P1D', timestamp '2000-01-01 00:30:00'), 'P1D', -2)) IS NOT TRUE
+              AND (time_ceil(__time, 'P1D', timestamp '2000-01-01 00:30:00') = time_shift(time_ceil(__time, 'P1D', timestamp '2000-01-01 00:30:00'), 'P1D', -2)) IS FALSE
+              AND (time_ceil(__time, 'P1D', timestamp '2000-01-01 00:30:00') <> time_shift(time_ceil(__time, 'P1D', timestamp '2000-01-01 00:30:00'), 'P1D', -2)) IS NOT FALSE
+              AND time_ceil(__time, 'P1D', timestamp '2000-01-01 00:30:00') BETWEEN time_shift(time_ceil(__time, 'P1D', timestamp '2000-01-01 00:30:00'), 'P1D', -2) AND time_shift(time_ceil(__time, 'P1D', timestamp '2000-01-01 00:30:00'), 'P1D', 2)
+              AND time_ceil(__time, 'P1D', timestamp '2000-01-01 00:30:00') NOT BETWEEN time_ceil(__time, 'P1D', timestamp '2000-01-01 00:30:00') AND time_shift(time_ceil(__time, 'P1D', timestamp '2000-01-01 00:30:00'), 'P1D', -2)
+              AND time_ceil(__time, 'P1D', timestamp '2000-01-01 00:30:00') like '%'
+              AND time_ceil(__time, 'P1D', timestamp '2000-01-01 00:30:00') not like '__DOES_NOT_EXIST__%'
+              AND time_ceil(__time, 'P1D', timestamp '2000-01-01 00:30:00') IN (time_shift(time_ceil(__time, 'P1D', timestamp '2000-01-01 00:30:00'), 'P1D', -2),
+                                                                                time_ceil(__time, 'P1D', timestamp '2000-01-01 00:30:00'),
+                                                                                time_shift(time_ceil(__time, 'P1D', timestamp '2000-01-01 00:30:00'), 'P1D', 2))
+              AND time_ceil(__time, 'P1D', timestamp '2000-01-01 00:30:00') NOT IN (time_shift(time_ceil(__time, 'P1D', timestamp '2000-01-01 00:30:00'), 'P1D', -2),
+                                                                                    time_shift(time_ceil(__time, 'P1D', timestamp '2000-01-01 00:30:00'), 'P1D', 2))))
+   GROUP BY 1,
+            2,
+            3,
+            4);
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+#-------------------------------------------------------------------------
+# TEST_ID: A6: time_floor
+#-------------------------------------------------------------------------
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND (time_floor(__time, 'P1D', timestamp '2000-01-01 00:30:00') IS NULL
+       OR (time_floor(__time, 'P1D', timestamp '2000-01-01 00:30:00') = time_floor(__time, 'P1D', timestamp '2000-01-01 00:30:00')
+           AND time_floor(__time, 'P1D', timestamp '2000-01-01 00:30:00') IS NOT DISTINCT
+           FROM time_floor(__time, 'P1D', timestamp '2000-01-01 00:30:00')
+           AND time_floor(__time, 'P1D', timestamp '2000-01-01 00:30:00') <> time_shift(time_floor(__time, 'P1D', timestamp '2000-01-01 00:30:00'), 'P1D', -2)
+           AND (time_floor(__time, 'P1D', timestamp '2000-01-01 00:30:00') IS DISTINCT
+                FROM time_shift(time_floor(__time, 'P1D', timestamp '2000-01-01 00:30:00'), 'P1D', -2))
+           AND time_floor(__time, 'P1D', timestamp '2000-01-01 00:30:00') > time_shift(time_floor(__time, 'P1D', timestamp '2000-01-01 00:30:00'), 'P1D', -2)
+           AND time_floor(__time, 'P1D', timestamp '2000-01-01 00:30:00') >= time_shift(time_floor(__time, 'P1D', timestamp '2000-01-01 00:30:00'), 'P1D', -2)
+           AND time_floor(__time, 'P1D', timestamp '2000-01-01 00:30:00') < time_shift(time_floor(__time, 'P1D', timestamp '2000-01-01 00:30:00'), 'P1D', 2)
+           AND time_floor(__time, 'P1D', timestamp '2000-01-01 00:30:00') <= time_shift(time_floor(__time, 'P1D', timestamp '2000-01-01 00:30:00'), 'P1D', 2)
+           AND (time_floor(__time, 'P1D', timestamp '2000-01-01 00:30:00') <> time_shift(time_floor(__time, 'P1D', timestamp '2000-01-01 00:30:00'), 'P1D', -2)) IS TRUE
+           AND (time_floor(__time, 'P1D', timestamp '2000-01-01 00:30:00') = time_shift(time_floor(__time, 'P1D', timestamp '2000-01-01 00:30:00'), 'P1D', -2)) IS NOT TRUE
+           AND (time_floor(__time, 'P1D', timestamp '2000-01-01 00:30:00') = time_shift(time_floor(__time, 'P1D', timestamp '2000-01-01 00:30:00'), 'P1D', -2)) IS FALSE
+           AND (time_floor(__time, 'P1D', timestamp '2000-01-01 00:30:00') <> time_shift(time_floor(__time, 'P1D', timestamp '2000-01-01 00:30:00'), 'P1D', -2)) IS NOT FALSE
+           AND time_floor(__time, 'P1D', timestamp '2000-01-01 00:30:00') BETWEEN time_shift(time_floor(__time, 'P1D', timestamp '2000-01-01 00:30:00'), 'P1D', -2) AND time_shift(time_floor(__time, 'P1D', timestamp '2000-01-01 00:30:00'), 'P1D', 2)
+           AND time_floor(__time, 'P1D', timestamp '2000-01-01 00:30:00') NOT BETWEEN time_floor(__time, 'P1D', timestamp '2000-01-01 00:30:00') AND time_shift(time_floor(__time, 'P1D', timestamp '2000-01-01 00:30:00'), 'P1D', -2)
+           AND time_floor(__time, 'P1D', timestamp '2000-01-01 00:30:00') like '%'
+           AND time_floor(__time, 'P1D', timestamp '2000-01-01 00:30:00') not like '__DOES_NOT_EXIST__%'
+           AND time_floor(__time, 'P1D', timestamp '2000-01-01 00:30:00') IN (time_shift(time_floor(__time, 'P1D', timestamp '2000-01-01 00:30:00'), 'P1D', -2),
+                                                                              time_floor(__time, 'P1D', timestamp '2000-01-01 00:30:00'),
+                                                                              time_shift(time_floor(__time, 'P1D', timestamp '2000-01-01 00:30:00'), 'P1D', 2))
+           AND time_floor(__time, 'P1D', timestamp '2000-01-01 00:30:00') NOT IN (time_shift(time_floor(__time, 'P1D', timestamp '2000-01-01 00:30:00'), 'P1D', -2),
+                                                                                  time_shift(time_floor(__time, 'P1D', timestamp '2000-01-01 00:30:00'), 'P1D', 2)))) ;
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND (time_floor(__time, 'P1D', timestamp '2000-01-01 00:30:00') IS NULL
+       OR time_floor(__time, 'P1D', timestamp '2000-01-01 00:30:00') IN
+         (SELECT time_floor(__time, 'P1D', timestamp '2000-01-01 00:30:00')
+          FROM kttm_nested
+          WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+            AND (time_floor(__time, 'P1D', timestamp '2000-01-01 00:30:00') IS NULL
+                 OR (time_floor(__time, 'P1D', timestamp '2000-01-01 00:30:00') = time_floor(__time, 'P1D', timestamp '2000-01-01 00:30:00')
+                     AND time_floor(__time, 'P1D', timestamp '2000-01-01 00:30:00') IS NOT DISTINCT
+                     FROM time_floor(__time, 'P1D', timestamp '2000-01-01 00:30:00')
+                     AND time_floor(__time, 'P1D', timestamp '2000-01-01 00:30:00') <> time_shift(time_floor(__time, 'P1D', timestamp '2000-01-01 00:30:00'), 'P1D', -2)
+                     AND (time_floor(__time, 'P1D', timestamp '2000-01-01 00:30:00') IS DISTINCT
+                          FROM time_shift(time_floor(__time, 'P1D', timestamp '2000-01-01 00:30:00'), 'P1D', -2))
+                     AND time_floor(__time, 'P1D', timestamp '2000-01-01 00:30:00') > time_shift(time_floor(__time, 'P1D', timestamp '2000-01-01 00:30:00'), 'P1D', -2)
+                     AND time_floor(__time, 'P1D', timestamp '2000-01-01 00:30:00') >= time_shift(time_floor(__time, 'P1D', timestamp '2000-01-01 00:30:00'), 'P1D', -2)
+                     AND time_floor(__time, 'P1D', timestamp '2000-01-01 00:30:00') < time_shift(time_floor(__time, 'P1D', timestamp '2000-01-01 00:30:00'), 'P1D', 2)
+                     AND time_floor(__time, 'P1D', timestamp '2000-01-01 00:30:00') <= time_shift(time_floor(__time, 'P1D', timestamp '2000-01-01 00:30:00'), 'P1D', 2)
+                     AND (time_floor(__time, 'P1D', timestamp '2000-01-01 00:30:00') <> time_shift(time_floor(__time, 'P1D', timestamp '2000-01-01 00:30:00'), 'P1D', -2)) IS TRUE
+                     AND (time_floor(__time, 'P1D', timestamp '2000-01-01 00:30:00') = time_shift(time_floor(__time, 'P1D', timestamp '2000-01-01 00:30:00'), 'P1D', -2)) IS NOT TRUE
+                     AND (time_floor(__time, 'P1D', timestamp '2000-01-01 00:30:00') = time_shift(time_floor(__time, 'P1D', timestamp '2000-01-01 00:30:00'), 'P1D', -2)) IS FALSE
+                     AND (time_floor(__time, 'P1D', timestamp '2000-01-01 00:30:00') <> time_shift(time_floor(__time, 'P1D', timestamp '2000-01-01 00:30:00'), 'P1D', -2)) IS NOT FALSE
+                     AND time_floor(__time, 'P1D', timestamp '2000-01-01 00:30:00') BETWEEN time_shift(time_floor(__time, 'P1D', timestamp '2000-01-01 00:30:00'), 'P1D', -2) AND time_shift(time_floor(__time, 'P1D', timestamp '2000-01-01 00:30:00'), 'P1D', 2)
+                     AND time_floor(__time, 'P1D', timestamp '2000-01-01 00:30:00') NOT BETWEEN time_floor(__time, 'P1D', timestamp '2000-01-01 00:30:00') AND time_shift(time_floor(__time, 'P1D', timestamp '2000-01-01 00:30:00'), 'P1D', -2)
+                     AND time_floor(__time, 'P1D', timestamp '2000-01-01 00:30:00') like '%'
+                     AND time_floor(__time, 'P1D', timestamp '2000-01-01 00:30:00') not like '__DOES_NOT_EXIST__%'
+                     AND time_floor(__time, 'P1D', timestamp '2000-01-01 00:30:00') IN (time_shift(time_floor(__time, 'P1D', timestamp '2000-01-01 00:30:00'), 'P1D', -2),
+                                                                                        time_floor(__time, 'P1D', timestamp '2000-01-01 00:30:00'),
+                                                                                        time_shift(time_floor(__time, 'P1D', timestamp '2000-01-01 00:30:00'), 'P1D', 2))
+                     AND time_floor(__time, 'P1D', timestamp '2000-01-01 00:30:00') NOT IN (time_shift(time_floor(__time, 'P1D', timestamp '2000-01-01 00:30:00'), 'P1D', -2),
+                                                                                            time_shift(time_floor(__time, 'P1D', timestamp '2000-01-01 00:30:00'), 'P1D', 2))))));
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM
+  (SELECT __time, number, client_ip,
+                          time_floor(__time, 'P1D', timestamp '2000-01-01 00:30:00'),
+                          count(*)
+   FROM kttm_nested
+   WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+     AND (time_floor(__time, 'P1D', timestamp '2000-01-01 00:30:00') IS NULL
+          OR (time_floor(__time, 'P1D', timestamp '2000-01-01 00:30:00') = time_floor(__time, 'P1D', timestamp '2000-01-01 00:30:00')
+              AND time_floor(__time, 'P1D', timestamp '2000-01-01 00:30:00') IS NOT DISTINCT
+              FROM time_floor(__time, 'P1D', timestamp '2000-01-01 00:30:00')
+              AND time_floor(__time, 'P1D', timestamp '2000-01-01 00:30:00') <> time_shift(time_floor(__time, 'P1D', timestamp '2000-01-01 00:30:00'), 'P1D', -2)
+              AND (time_floor(__time, 'P1D', timestamp '2000-01-01 00:30:00') IS DISTINCT
+                   FROM time_shift(time_floor(__time, 'P1D', timestamp '2000-01-01 00:30:00'), 'P1D', -2))
+              AND time_floor(__time, 'P1D', timestamp '2000-01-01 00:30:00') > time_shift(time_floor(__time, 'P1D', timestamp '2000-01-01 00:30:00'), 'P1D', -2)
+              AND time_floor(__time, 'P1D', timestamp '2000-01-01 00:30:00') >= time_shift(time_floor(__time, 'P1D', timestamp '2000-01-01 00:30:00'), 'P1D', -2)
+              AND time_floor(__time, 'P1D', timestamp '2000-01-01 00:30:00') < time_shift(time_floor(__time, 'P1D', timestamp '2000-01-01 00:30:00'), 'P1D', 2)
+              AND time_floor(__time, 'P1D', timestamp '2000-01-01 00:30:00') <= time_shift(time_floor(__time, 'P1D', timestamp '2000-01-01 00:30:00'), 'P1D', 2)
+              AND (time_floor(__time, 'P1D', timestamp '2000-01-01 00:30:00') <> time_shift(time_floor(__time, 'P1D', timestamp '2000-01-01 00:30:00'), 'P1D', -2)) IS TRUE
+              AND (time_floor(__time, 'P1D', timestamp '2000-01-01 00:30:00') = time_shift(time_floor(__time, 'P1D', timestamp '2000-01-01 00:30:00'), 'P1D', -2)) IS NOT TRUE
+              AND (time_floor(__time, 'P1D', timestamp '2000-01-01 00:30:00') = time_shift(time_floor(__time, 'P1D', timestamp '2000-01-01 00:30:00'), 'P1D', -2)) IS FALSE
+              AND (time_floor(__time, 'P1D', timestamp '2000-01-01 00:30:00') <> time_shift(time_floor(__time, 'P1D', timestamp '2000-01-01 00:30:00'), 'P1D', -2)) IS NOT FALSE
+              AND time_floor(__time, 'P1D', timestamp '2000-01-01 00:30:00') BETWEEN time_shift(time_floor(__time, 'P1D', timestamp '2000-01-01 00:30:00'), 'P1D', -2) AND time_shift(time_floor(__time, 'P1D', timestamp '2000-01-01 00:30:00'), 'P1D', 2)
+              AND time_floor(__time, 'P1D', timestamp '2000-01-01 00:30:00') NOT BETWEEN time_floor(__time, 'P1D', timestamp '2000-01-01 00:30:00') AND time_shift(time_floor(__time, 'P1D', timestamp '2000-01-01 00:30:00'), 'P1D', -2)
+              AND time_floor(__time, 'P1D', timestamp '2000-01-01 00:30:00') like '%'
+              AND time_floor(__time, 'P1D', timestamp '2000-01-01 00:30:00') not like '__DOES_NOT_EXIST__%'
+              AND time_floor(__time, 'P1D', timestamp '2000-01-01 00:30:00') IN (time_shift(time_floor(__time, 'P1D', timestamp '2000-01-01 00:30:00'), 'P1D', -2),
+                                                                                 time_floor(__time, 'P1D', timestamp '2000-01-01 00:30:00'),
+                                                                                 time_shift(time_floor(__time, 'P1D', timestamp '2000-01-01 00:30:00'), 'P1D', 2))
+              AND time_floor(__time, 'P1D', timestamp '2000-01-01 00:30:00') NOT IN (time_shift(time_floor(__time, 'P1D', timestamp '2000-01-01 00:30:00'), 'P1D', -2),
+                                                                                     time_shift(time_floor(__time, 'P1D', timestamp '2000-01-01 00:30:00'), 'P1D', 2))))
+   GROUP BY 1,
+            2,
+            3,
+            4);
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+#-------------------------------------------------------------------------
+# TEST_ID: A7: time_shift
+#-------------------------------------------------------------------------
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND (time_shift(__time, 'P1D', -1) IS NULL
+       OR (time_shift(__time, 'P1D', -1) = time_shift(__time, 'P1D', -1)
+           AND time_shift(__time, 'P1D', -1) IS NOT DISTINCT
+           FROM time_shift(__time, 'P1D', -1)
+           AND time_shift(__time, 'P1D', -1) <> time_shift(__time, 'P1D', -2)
+           AND (time_shift(__time, 'P1D', -1) IS DISTINCT
+                FROM time_shift(__time, 'P1D', -2))
+           AND time_shift(__time, 'P1D', -1) > time_shift(__time, 'P1D', -2)
+           AND time_shift(__time, 'P1D', -1) >= time_shift(__time, 'P1D', -2)
+           AND time_shift(__time, 'P1D', -1) < time_shift(__time, 'P1D', 2)
+           AND time_shift(__time, 'P1D', -1) <= time_shift(__time, 'P1D', 2)
+           AND (time_shift(__time, 'P1D', -1) <> time_shift(__time, 'P1D', -2)) IS TRUE
+           AND (time_shift(__time, 'P1D', -1) = time_shift(__time, 'P1D', -2)) IS NOT TRUE
+           AND (time_shift(__time, 'P1D', -1) = time_shift(__time, 'P1D', -2)) IS FALSE
+           AND (time_shift(__time, 'P1D', -1) <> time_shift(__time, 'P1D', -2)) IS NOT FALSE
+           AND time_shift(__time, 'P1D', -1) BETWEEN time_shift(__time, 'P1D', -2) AND time_shift(__time, 'P1D', 2)
+           AND time_shift(__time, 'P1D', -1) NOT BETWEEN time_shift(__time, 'P1D', -1) AND time_shift(__time, 'P1D', -2)
+           AND time_shift(__time, 'P1D', -1) like '%'
+           AND time_shift(__time, 'P1D', -1) not like '__DOES_NOT_EXIST__%'
+           AND time_shift(__time, 'P1D', -1) IN (time_shift(__time, 'P1D', -2),
+                                                 time_shift(__time, 'P1D', -1),
+                                                 time_shift(__time, 'P1D', 2))
+           AND time_shift(__time, 'P1D', -1) NOT IN (time_shift(__time, 'P1D', -2),
+                                                     time_shift(__time, 'P1D', 2)))) ;
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND (time_shift(__time, 'P1D', -1) IS NULL
+       OR time_shift(__time, 'P1D', -1) IN
+         (SELECT time_shift(__time, 'P1D', -1)
+          FROM kttm_nested
+          WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+            AND (time_shift(__time, 'P1D', -1) IS NULL
+                 OR (time_shift(__time, 'P1D', -1) = time_shift(__time, 'P1D', -1)
+                     AND time_shift(__time, 'P1D', -1) IS NOT DISTINCT
+                     FROM time_shift(__time, 'P1D', -1)
+                     AND time_shift(__time, 'P1D', -1) <> time_shift(__time, 'P1D', -2)
+                     AND (time_shift(__time, 'P1D', -1) IS DISTINCT
+                          FROM time_shift(__time, 'P1D', -2))
+                     AND time_shift(__time, 'P1D', -1) > time_shift(__time, 'P1D', -2)
+                     AND time_shift(__time, 'P1D', -1) >= time_shift(__time, 'P1D', -2)
+                     AND time_shift(__time, 'P1D', -1) < time_shift(__time, 'P1D', 2)
+                     AND time_shift(__time, 'P1D', -1) <= time_shift(__time, 'P1D', 2)
+                     AND (time_shift(__time, 'P1D', -1) <> time_shift(__time, 'P1D', -2)) IS TRUE
+                     AND (time_shift(__time, 'P1D', -1) = time_shift(__time, 'P1D', -2)) IS NOT TRUE
+                     AND (time_shift(__time, 'P1D', -1) = time_shift(__time, 'P1D', -2)) IS FALSE
+                     AND (time_shift(__time, 'P1D', -1) <> time_shift(__time, 'P1D', -2)) IS NOT FALSE
+                     AND time_shift(__time, 'P1D', -1) BETWEEN time_shift(__time, 'P1D', -2) AND time_shift(__time, 'P1D', 2)
+                     AND time_shift(__time, 'P1D', -1) NOT BETWEEN time_shift(__time, 'P1D', -1) AND time_shift(__time, 'P1D', -2)
+                     AND time_shift(__time, 'P1D', -1) like '%'
+                     AND time_shift(__time, 'P1D', -1) not like '__DOES_NOT_EXIST__%'
+                     AND time_shift(__time, 'P1D', -1) IN (time_shift(__time, 'P1D', -2),
+                                                           time_shift(__time, 'P1D', -1),
+                                                           time_shift(__time, 'P1D', 2))
+                     AND time_shift(__time, 'P1D', -1) NOT IN (time_shift(__time, 'P1D', -2),
+                                                               time_shift(__time, 'P1D', 2))))));
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM
+  (SELECT __time, number, client_ip,
+                          time_shift(__time, 'P1D', -1),
+                          count(*)
+   FROM kttm_nested
+   WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+     AND (time_shift(__time, 'P1D', -1) IS NULL
+          OR (time_shift(__time, 'P1D', -1) = time_shift(__time, 'P1D', -1)
+              AND time_shift(__time, 'P1D', -1) IS NOT DISTINCT
+              FROM time_shift(__time, 'P1D', -1)
+              AND time_shift(__time, 'P1D', -1) <> time_shift(__time, 'P1D', -2)
+              AND (time_shift(__time, 'P1D', -1) IS DISTINCT
+                   FROM time_shift(__time, 'P1D', -2))
+              AND time_shift(__time, 'P1D', -1) > time_shift(__time, 'P1D', -2)
+              AND time_shift(__time, 'P1D', -1) >= time_shift(__time, 'P1D', -2)
+              AND time_shift(__time, 'P1D', -1) < time_shift(__time, 'P1D', 2)
+              AND time_shift(__time, 'P1D', -1) <= time_shift(__time, 'P1D', 2)
+              AND (time_shift(__time, 'P1D', -1) <> time_shift(__time, 'P1D', -2)) IS TRUE
+              AND (time_shift(__time, 'P1D', -1) = time_shift(__time, 'P1D', -2)) IS NOT TRUE
+              AND (time_shift(__time, 'P1D', -1) = time_shift(__time, 'P1D', -2)) IS FALSE
+              AND (time_shift(__time, 'P1D', -1) <> time_shift(__time, 'P1D', -2)) IS NOT FALSE
+              AND time_shift(__time, 'P1D', -1) BETWEEN time_shift(__time, 'P1D', -2) AND time_shift(__time, 'P1D', 2)
+              AND time_shift(__time, 'P1D', -1) NOT BETWEEN time_shift(__time, 'P1D', -1) AND time_shift(__time, 'P1D', -2)
+              AND time_shift(__time, 'P1D', -1) like '%'
+              AND time_shift(__time, 'P1D', -1) not like '__DOES_NOT_EXIST__%'
+              AND time_shift(__time, 'P1D', -1) IN (time_shift(__time, 'P1D', -2),
+                                                    time_shift(__time, 'P1D', -1),
+                                                    time_shift(__time, 'P1D', 2))
+              AND time_shift(__time, 'P1D', -1) NOT IN (time_shift(__time, 'P1D', -2),
+                                                        time_shift(__time, 'P1D', 2))))
+   GROUP BY 1,
+            2,
+            3,
+            4);
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+#-------------------------------------------------------------------------
+# TEST_ID: A8: time_extract
+#-------------------------------------------------------------------------
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND (time_extract(__time, 'DOW') IS NULL
+       OR (time_extract(__time, 'DOW') = time_extract(__time, 'DOW')
+           AND time_extract(__time, 'DOW') IS NOT DISTINCT
+           FROM time_extract(__time, 'DOW')
+           AND time_extract(__time, 'DOW') <> time_extract(__time, 'DOW')-1
+           AND (time_extract(__time, 'DOW') IS DISTINCT
+                FROM time_extract(__time, 'DOW')-1)
+           AND time_extract(__time, 'DOW') > time_extract(__time, 'DOW')-1
+           AND time_extract(__time, 'DOW') >= time_extract(__time, 'DOW')-1
+           AND time_extract(__time, 'DOW') < time_extract(__time, 'DOW')+1
+           AND time_extract(__time, 'DOW') <= time_extract(__time, 'DOW')+1
+           AND (time_extract(__time, 'DOW') <> time_extract(__time, 'DOW')-1) IS TRUE
+           AND (time_extract(__time, 'DOW') = time_extract(__time, 'DOW')-1) IS NOT TRUE
+           AND (time_extract(__time, 'DOW') = time_extract(__time, 'DOW')-1) IS FALSE
+           AND (time_extract(__time, 'DOW') <> time_extract(__time, 'DOW')-1) IS NOT FALSE
+           AND time_extract(__time, 'DOW') BETWEEN time_extract(__time, 'DOW')-1 AND time_extract(__time, 'DOW')+1
+           AND time_extract(__time, 'DOW') NOT BETWEEN time_extract(__time, 'DOW') AND time_extract(__time, 'DOW')-1
+           AND time_extract(__time, 'DOW') like '%'
+           AND time_extract(__time, 'DOW') not like '__DOES_NOT_EXIST__%'
+           AND time_extract(__time, 'DOW') IN (time_extract(__time, 'DOW')-1,
+                                                                          time_extract(__time, 'DOW'),
+                                                                          time_extract(__time, 'DOW')+1)
+           AND time_extract(__time, 'DOW') NOT IN (time_extract(__time, 'DOW')-1,
+                                                                              time_extract(__time, 'DOW')+1))) ;
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND (time_extract(__time, 'DOW') IS NULL
+       OR time_extract(__time, 'DOW') IN
+         (SELECT time_extract(__time, 'DOW')
+          FROM kttm_nested
+          WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+            AND (time_extract(__time, 'DOW') IS NULL
+                 OR (time_extract(__time, 'DOW') = time_extract(__time, 'DOW')
+                     AND time_extract(__time, 'DOW') IS NOT DISTINCT
+                     FROM time_extract(__time, 'DOW')
+                     AND time_extract(__time, 'DOW') <> time_extract(__time, 'DOW')-1
+                     AND (time_extract(__time, 'DOW') IS DISTINCT
+                          FROM time_extract(__time, 'DOW')-1)
+                     AND time_extract(__time, 'DOW') > time_extract(__time, 'DOW')-1
+                     AND time_extract(__time, 'DOW') >= time_extract(__time, 'DOW')-1
+                     AND time_extract(__time, 'DOW') < time_extract(__time, 'DOW')+1
+                     AND time_extract(__time, 'DOW') <= time_extract(__time, 'DOW')+1
+                     AND (time_extract(__time, 'DOW') <> time_extract(__time, 'DOW')-1) IS TRUE
+                     AND (time_extract(__time, 'DOW') = time_extract(__time, 'DOW')-1) IS NOT TRUE
+                     AND (time_extract(__time, 'DOW') = time_extract(__time, 'DOW')-1) IS FALSE
+                     AND (time_extract(__time, 'DOW') <> time_extract(__time, 'DOW')-1) IS NOT FALSE
+                     AND time_extract(__time, 'DOW') BETWEEN time_extract(__time, 'DOW')-1 AND time_extract(__time, 'DOW')+1
+                     AND time_extract(__time, 'DOW') NOT BETWEEN time_extract(__time, 'DOW') AND time_extract(__time, 'DOW')-1
+                     AND time_extract(__time, 'DOW') like '%'
+                     AND time_extract(__time, 'DOW') not like '__DOES_NOT_EXIST__%'
+                     AND time_extract(__time, 'DOW') IN (time_extract(__time, 'DOW')-1,
+                                                                                    time_extract(__time, 'DOW'),
+                                                                                    time_extract(__time, 'DOW')+1)
+                     AND time_extract(__time, 'DOW') NOT IN (time_extract(__time, 'DOW')-1,
+                                                                                        time_extract(__time, 'DOW')+1)))));
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM
+  (SELECT __time, number, client_ip,
+                          time_extract(__time, 'DOW'),
+                          count(*)
+   FROM kttm_nested
+   WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+     AND (time_extract(__time, 'DOW') IS NULL
+          OR (time_extract(__time, 'DOW') = time_extract(__time, 'DOW')
+              AND time_extract(__time, 'DOW') IS NOT DISTINCT
+              FROM time_extract(__time, 'DOW')
+              AND time_extract(__time, 'DOW') <> time_extract(__time, 'DOW')-1
+              AND (time_extract(__time, 'DOW') IS DISTINCT
+                   FROM time_extract(__time, 'DOW')-1)
+              AND time_extract(__time, 'DOW') > time_extract(__time, 'DOW')-1
+              AND time_extract(__time, 'DOW') >= time_extract(__time, 'DOW')-1
+              AND time_extract(__time, 'DOW') < time_extract(__time, 'DOW')+1
+              AND time_extract(__time, 'DOW') <= time_extract(__time, 'DOW')+1
+              AND (time_extract(__time, 'DOW') <> time_extract(__time, 'DOW')-1) IS TRUE
+              AND (time_extract(__time, 'DOW') = time_extract(__time, 'DOW')-1) IS NOT TRUE
+              AND (time_extract(__time, 'DOW') = time_extract(__time, 'DOW')-1) IS FALSE
+              AND (time_extract(__time, 'DOW') <> time_extract(__time, 'DOW')-1) IS NOT FALSE
+              AND time_extract(__time, 'DOW') BETWEEN time_extract(__time, 'DOW')-1 AND time_extract(__time, 'DOW')+1
+              AND time_extract(__time, 'DOW') NOT BETWEEN time_extract(__time, 'DOW') AND time_extract(__time, 'DOW')-1
+              AND time_extract(__time, 'DOW') like '%'
+              AND time_extract(__time, 'DOW') not like '__DOES_NOT_EXIST__%'
+              AND time_extract(__time, 'DOW') IN (time_extract(__time, 'DOW')-1,
+                                                                             time_extract(__time, 'DOW'),
+                                                                             time_extract(__time, 'DOW')+1)
+              AND time_extract(__time, 'DOW') NOT IN (time_extract(__time, 'DOW')-1,
+                                                                                 time_extract(__time, 'DOW')+1)))
+   GROUP BY 1,
+            2,
+            3,
+            4);
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+#-------------------------------------------------------------------------
+# TEST_ID: A9: time_parse
+#-------------------------------------------------------------------------
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND (time_parse(cast(__time AS char)) IS NULL
+       OR (time_parse(cast(__time AS char)) = time_parse(cast(__time AS char))
+           AND time_parse(cast(__time AS char)) IS NOT DISTINCT
+           FROM time_parse(cast(__time AS char))
+           AND time_parse(cast(__time AS char)) <> time_shift(time_parse(cast(__time AS char)), 'P1D', -2)
+           AND (time_parse(cast(__time AS char)) IS DISTINCT
+                FROM time_shift(time_parse(cast(__time AS char)), 'P1D', -2))
+           AND time_parse(cast(__time AS char)) > time_shift(time_parse(cast(__time AS char)), 'P1D', -2)
+           AND time_parse(cast(__time AS char)) >= time_shift(time_parse(cast(__time AS char)), 'P1D', -2)
+           AND time_parse(cast(__time AS char)) < time_shift(time_parse(cast(__time AS char)), 'P1D', 2)
+           AND time_parse(cast(__time AS char)) <= time_shift(time_parse(cast(__time AS char)), 'P1D', 2)
+           AND (time_parse(cast(__time AS char)) <> time_shift(time_parse(cast(__time AS char)), 'P1D', -2)) IS TRUE
+           AND (time_parse(cast(__time AS char)) = time_shift(time_parse(cast(__time AS char)), 'P1D', -2)) IS NOT TRUE
+           AND (time_parse(cast(__time AS char)) = time_shift(time_parse(cast(__time AS char)), 'P1D', -2)) IS FALSE
+           AND (time_parse(cast(__time AS char)) <> time_shift(time_parse(cast(__time AS char)), 'P1D', -2)) IS NOT FALSE
+           AND time_parse(cast(__time AS char)) BETWEEN time_shift(time_parse(cast(__time AS char)), 'P1D', -2) AND time_shift(time_parse(cast(__time AS char)), 'P1D', 2)
+           AND time_parse(cast(__time AS char)) NOT BETWEEN time_parse(cast(__time AS char)) AND time_shift(time_parse(cast(__time AS char)), 'P1D', -2)
+           AND time_parse(cast(__time AS char)) like '%'
+           AND time_parse(cast(__time AS char)) not like '__DOES_NOT_EXIST__%'
+           AND time_parse(cast(__time AS char)) IN (time_shift(time_parse(cast(__time AS char)), 'P1D', -2),
+                                                    time_parse(cast(__time AS char)),
+                                                    time_shift(time_parse(cast(__time AS char)), 'P1D', 2))
+           AND time_parse(cast(__time AS char)) NOT IN (time_shift(time_parse(cast(__time AS char)), 'P1D', -2),
+                                                        time_shift(time_parse(cast(__time AS char)), 'P1D', 2)))) ;
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND (time_parse(cast(__time AS char)) IS NULL
+       OR time_parse(cast(__time AS char)) IN
+         (SELECT time_parse(cast(__time AS char))
+          FROM kttm_nested
+          WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+            AND (time_parse(cast(__time AS char)) IS NULL
+                 OR (time_parse(cast(__time AS char)) = time_parse(cast(__time AS char))
+                     AND time_parse(cast(__time AS char)) IS NOT DISTINCT
+                     FROM time_parse(cast(__time AS char))
+                     AND time_parse(cast(__time AS char)) <> time_shift(time_parse(cast(__time AS char)), 'P1D', -2)
+                     AND (time_parse(cast(__time AS char)) IS DISTINCT
+                          FROM time_shift(time_parse(cast(__time AS char)), 'P1D', -2))
+                     AND time_parse(cast(__time AS char)) > time_shift(time_parse(cast(__time AS char)), 'P1D', -2)
+                     AND time_parse(cast(__time AS char)) >= time_shift(time_parse(cast(__time AS char)), 'P1D', -2)
+                     AND time_parse(cast(__time AS char)) < time_shift(time_parse(cast(__time AS char)), 'P1D', 2)
+                     AND time_parse(cast(__time AS char)) <= time_shift(time_parse(cast(__time AS char)), 'P1D', 2)
+                     AND (time_parse(cast(__time AS char)) <> time_shift(time_parse(cast(__time AS char)), 'P1D', -2)) IS TRUE
+                     AND (time_parse(cast(__time AS char)) = time_shift(time_parse(cast(__time AS char)), 'P1D', -2)) IS NOT TRUE
+                     AND (time_parse(cast(__time AS char)) = time_shift(time_parse(cast(__time AS char)), 'P1D', -2)) IS FALSE
+                     AND (time_parse(cast(__time AS char)) <> time_shift(time_parse(cast(__time AS char)), 'P1D', -2)) IS NOT FALSE
+                     AND time_parse(cast(__time AS char)) BETWEEN time_shift(time_parse(cast(__time AS char)), 'P1D', -2) AND time_shift(time_parse(cast(__time AS char)), 'P1D', 2)
+                     AND time_parse(cast(__time AS char)) NOT BETWEEN time_parse(cast(__time AS char)) AND time_shift(time_parse(cast(__time AS char)), 'P1D', -2)
+                     AND time_parse(cast(__time AS char)) like '%'
+                     AND time_parse(cast(__time AS char)) not like '__DOES_NOT_EXIST__%'
+                     AND time_parse(cast(__time AS char)) IN (time_shift(time_parse(cast(__time AS char)), 'P1D', -2),
+                                                              time_parse(cast(__time AS char)),
+                                                              time_shift(time_parse(cast(__time AS char)), 'P1D', 2))
+                     AND time_parse(cast(__time AS char)) NOT IN (time_shift(time_parse(cast(__time AS char)), 'P1D', -2),
+                                                                  time_shift(time_parse(cast(__time AS char)), 'P1D', 2))))));
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM
+  (SELECT __time, number, client_ip,
+                          time_parse(cast(__time AS char)),
+                          count(*)
+   FROM kttm_nested
+   WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+     AND (time_parse(cast(__time AS char)) IS NULL
+          OR (time_parse(cast(__time AS char)) = time_parse(cast(__time AS char))
+              AND time_parse(cast(__time AS char)) IS NOT DISTINCT
+              FROM time_parse(cast(__time AS char))
+              AND time_parse(cast(__time AS char)) <> time_shift(time_parse(cast(__time AS char)), 'P1D', -2)
+              AND (time_parse(cast(__time AS char)) IS DISTINCT
+                   FROM time_shift(time_parse(cast(__time AS char)), 'P1D', -2))
+              AND time_parse(cast(__time AS char)) > time_shift(time_parse(cast(__time AS char)), 'P1D', -2)
+              AND time_parse(cast(__time AS char)) >= time_shift(time_parse(cast(__time AS char)), 'P1D', -2)
+              AND time_parse(cast(__time AS char)) < time_shift(time_parse(cast(__time AS char)), 'P1D', 2)
+              AND time_parse(cast(__time AS char)) <= time_shift(time_parse(cast(__time AS char)), 'P1D', 2)
+              AND (time_parse(cast(__time AS char)) <> time_shift(time_parse(cast(__time AS char)), 'P1D', -2)) IS TRUE
+              AND (time_parse(cast(__time AS char)) = time_shift(time_parse(cast(__time AS char)), 'P1D', -2)) IS NOT TRUE
+              AND (time_parse(cast(__time AS char)) = time_shift(time_parse(cast(__time AS char)), 'P1D', -2)) IS FALSE
+              AND (time_parse(cast(__time AS char)) <> time_shift(time_parse(cast(__time AS char)), 'P1D', -2)) IS NOT FALSE
+              AND time_parse(cast(__time AS char)) BETWEEN time_shift(time_parse(cast(__time AS char)), 'P1D', -2) AND time_shift(time_parse(cast(__time AS char)), 'P1D', 2)
+              AND time_parse(cast(__time AS char)) NOT BETWEEN time_parse(cast(__time AS char)) AND time_shift(time_parse(cast(__time AS char)), 'P1D', -2)
+              AND time_parse(cast(__time AS char)) like '%'
+              AND time_parse(cast(__time AS char)) not like '__DOES_NOT_EXIST__%'
+              AND time_parse(cast(__time AS char)) IN (time_shift(time_parse(cast(__time AS char)), 'P1D', -2),
+                                                       time_parse(cast(__time AS char)),
+                                                       time_shift(time_parse(cast(__time AS char)), 'P1D', 2))
+              AND time_parse(cast(__time AS char)) NOT IN (time_shift(time_parse(cast(__time AS char)), 'P1D', -2),
+                                                           time_shift(time_parse(cast(__time AS char)), 'P1D', 2))))
+   GROUP BY 1,
+            2,
+            3,
+            4);
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+#-------------------------------------------------------------------------
+# TEST_ID: A10: time_format
+#-------------------------------------------------------------------------
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND ('1'||time_format(__time) IS NULL
+       OR ('1'||time_format(__time) = 1||time_format(__time)
+           AND '1'||time_format(__time) IS NOT DISTINCT
+           FROM 1||time_format(__time)
+           AND '1'||time_format(__time) <> '0'||time_format(__time)
+           AND ('1'||time_format(__time) IS DISTINCT
+                FROM '0'||time_format(__time))
+           AND '1'||time_format(__time) > '0'||time_format(__time)
+           AND '1'||time_format(__time) >= '0'||time_format(__time)
+           AND '1'||time_format(__time) < 2||time_format(__time)
+           AND '1'||time_format(__time) <= 2||time_format(__time)
+           AND ('1'||time_format(__time) <> '0'||time_format(__time)) IS TRUE
+           AND ('1'||time_format(__time) = '0'||time_format(__time)) IS NOT TRUE
+           AND ('1'||time_format(__time) = '0'||time_format(__time)) IS FALSE
+           AND ('1'||time_format(__time) <> '0'||time_format(__time)) IS NOT FALSE
+           AND '1'||time_format(__time) BETWEEN '0'||time_format(__time) AND 2||time_format(__time)
+           AND '1'||time_format(__time) NOT BETWEEN '1'||time_format(__time) AND '0'||time_format(__time)
+           AND '1'||time_format(__time) like '%'
+           AND '1'||time_format(__time) not like '__DOES_NOT_EXIST__%'
+           AND '1'||time_format(__time) IN ('0'||time_format(__time),
+                                            1||time_format(__time),
+                                            2||time_format(__time))
+           AND '1'||time_format(__time) NOT IN ('0'||time_format(__time),
+                                                2||time_format(__time)))) ;
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND ('1'||time_format(__time) IS NULL
+       OR '1'||time_format(__time) IN
+         (SELECT '1'||time_format(__time)
+          FROM kttm_nested
+          WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+            AND ('1'||time_format(__time) IS NULL
+                 OR ('1'||time_format(__time) = 1||time_format(__time)
+                     AND '1'||time_format(__time) IS NOT DISTINCT
+                     FROM 1||time_format(__time)
+                     AND '1'||time_format(__time) <> '0'||time_format(__time)
+                     AND ('1'||time_format(__time) IS DISTINCT
+                          FROM '0'||time_format(__time))
+                     AND '1'||time_format(__time) > '0'||time_format(__time)
+                     AND '1'||time_format(__time) >= '0'||time_format(__time)
+                     AND '1'||time_format(__time) < 2||time_format(__time)
+                     AND '1'||time_format(__time) <= 2||time_format(__time)
+                     AND ('1'||time_format(__time) <> '0'||time_format(__time)) IS TRUE
+                     AND ('1'||time_format(__time) = '0'||time_format(__time)) IS NOT TRUE
+                     AND ('1'||time_format(__time) = '0'||time_format(__time)) IS FALSE
+                     AND ('1'||time_format(__time) <> '0'||time_format(__time)) IS NOT FALSE
+                     AND '1'||time_format(__time) BETWEEN '0'||time_format(__time) AND 2||time_format(__time)
+                     AND '1'||time_format(__time) NOT BETWEEN '1'||time_format(__time) AND '0'||time_format(__time)
+                     AND '1'||time_format(__time) like '%'
+                     AND '1'||time_format(__time) not like '__DOES_NOT_EXIST__%'
+                     AND '1'||time_format(__time) IN ('0'||time_format(__time),
+                                                      1||time_format(__time),
+                                                      2||time_format(__time))
+                     AND '1'||time_format(__time) NOT IN ('0'||time_format(__time),
+                                                          2||time_format(__time))))));
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM
+  (SELECT __time, number, client_ip,
+                          '1'||time_format(__time),
+                          count(*)
+   FROM kttm_nested
+   WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+     AND ('1'||time_format(__time) IS NULL
+          OR ('1'||time_format(__time) = 1||time_format(__time)
+              AND '1'||time_format(__time) IS NOT DISTINCT
+              FROM 1||time_format(__time)
+              AND '1'||time_format(__time) <> '0'||time_format(__time)
+              AND ('1'||time_format(__time) IS DISTINCT
+                   FROM '0'||time_format(__time))
+              AND '1'||time_format(__time) > '0'||time_format(__time)
+              AND '1'||time_format(__time) >= '0'||time_format(__time)
+              AND '1'||time_format(__time) < 2||time_format(__time)
+              AND '1'||time_format(__time) <= 2||time_format(__time)
+              AND ('1'||time_format(__time) <> '0'||time_format(__time)) IS TRUE
+              AND ('1'||time_format(__time) = '0'||time_format(__time)) IS NOT TRUE
+              AND ('1'||time_format(__time) = '0'||time_format(__time)) IS FALSE
+              AND ('1'||time_format(__time) <> '0'||time_format(__time)) IS NOT FALSE
+              AND '1'||time_format(__time) BETWEEN '0'||time_format(__time) AND 2||time_format(__time)
+              AND '1'||time_format(__time) NOT BETWEEN '1'||time_format(__time) AND '0'||time_format(__time)
+              AND '1'||time_format(__time) like '%'
+              AND '1'||time_format(__time) not like '__DOES_NOT_EXIST__%'
+              AND '1'||time_format(__time) IN ('0'||time_format(__time),
+                                               1||time_format(__time),
+                                               2||time_format(__time))
+              AND '1'||time_format(__time) NOT IN ('0'||time_format(__time),
+                                                   2||time_format(__time))))
+   GROUP BY 1,
+            2,
+            3,
+            4);
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+#-------------------------------------------------------------------------
+# TEST_ID: A11: time_in_interval
+#-------------------------------------------------------------------------
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND ('1'||time_in_interval(__time, '2000-01-01/P20Y') IS NULL
+       OR ('1'||time_in_interval(__time, '2000-01-01/P20Y') = 1||time_in_interval(__time, '2000-01-01/P20Y')
+           AND '1'||time_in_interval(__time, '2000-01-01/P20Y') IS NOT DISTINCT
+           FROM 1||time_in_interval(__time, '2000-01-01/P20Y')
+           AND '1'||time_in_interval(__time, '2000-01-01/P20Y') <> '0'||time_in_interval(__time, '2000-01-01/P20Y')
+           AND ('1'||time_in_interval(__time, '2000-01-01/P20Y') IS DISTINCT
+                FROM '0'||time_in_interval(__time, '2000-01-01/P20Y'))
+           AND '1'||time_in_interval(__time, '2000-01-01/P20Y') > '0'||time_in_interval(__time, '2000-01-01/P20Y')
+           AND '1'||time_in_interval(__time, '2000-01-01/P20Y') >= '0'||time_in_interval(__time, '2000-01-01/P20Y')
+           AND '1'||time_in_interval(__time, '2000-01-01/P20Y') < 2||time_in_interval(__time, '2000-01-01/P20Y')
+           AND '1'||time_in_interval(__time, '2000-01-01/P20Y') <= 2||time_in_interval(__time, '2000-01-01/P20Y')
+           AND ('1'||time_in_interval(__time, '2000-01-01/P20Y') <> '0'||time_in_interval(__time, '2000-01-01/P20Y')) IS TRUE
+           AND ('1'||time_in_interval(__time, '2000-01-01/P20Y') = '0'||time_in_interval(__time, '2000-01-01/P20Y')) IS NOT TRUE
+           AND ('1'||time_in_interval(__time, '2000-01-01/P20Y') = '0'||time_in_interval(__time, '2000-01-01/P20Y')) IS FALSE
+           AND ('1'||time_in_interval(__time, '2000-01-01/P20Y') <> '0'||time_in_interval(__time, '2000-01-01/P20Y')) IS NOT FALSE
+           AND '1'||time_in_interval(__time, '2000-01-01/P20Y') BETWEEN '0'||time_in_interval(__time, '2000-01-01/P20Y') AND 2||time_in_interval(__time, '2000-01-01/P20Y')
+           AND '1'||time_in_interval(__time, '2000-01-01/P20Y') NOT BETWEEN '1'||time_in_interval(__time, '2000-01-01/P20Y') AND '0'||time_in_interval(__time, '2000-01-01/P20Y')
+           AND '1'||time_in_interval(__time, '2000-01-01/P20Y') like '%'
+           AND '1'||time_in_interval(__time, '2000-01-01/P20Y') not like '__DOES_NOT_EXIST__%'
+           AND '1'||time_in_interval(__time, '2000-01-01/P20Y') IN ('0'||time_in_interval(__time, '2000-01-01/P20Y'),
+                                                                    1||time_in_interval(__time, '2000-01-01/P20Y'),
+                                                                    2||time_in_interval(__time, '2000-01-01/P20Y'))
+           AND '1'||time_in_interval(__time, '2000-01-01/P20Y') NOT IN ('0'||time_in_interval(__time, '2000-01-01/P20Y'),
+                                                                        2||time_in_interval(__time, '2000-01-01/P20Y')))) ;
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND ('1'||time_in_interval(__time, '2000-01-01/P20Y') IS NULL
+       OR '1'||time_in_interval(__time, '2000-01-01/P20Y') IN
+         (SELECT '1'||time_in_interval(__time, '2000-01-01/P20Y')
+          FROM kttm_nested
+          WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+            AND ('1'||time_in_interval(__time, '2000-01-01/P20Y') IS NULL
+                 OR ('1'||time_in_interval(__time, '2000-01-01/P20Y') = 1||time_in_interval(__time, '2000-01-01/P20Y')
+                     AND '1'||time_in_interval(__time, '2000-01-01/P20Y') IS NOT DISTINCT
+                     FROM 1||time_in_interval(__time, '2000-01-01/P20Y')
+                     AND '1'||time_in_interval(__time, '2000-01-01/P20Y') <> '0'||time_in_interval(__time, '2000-01-01/P20Y')
+                     AND ('1'||time_in_interval(__time, '2000-01-01/P20Y') IS DISTINCT
+                          FROM '0'||time_in_interval(__time, '2000-01-01/P20Y'))
+                     AND '1'||time_in_interval(__time, '2000-01-01/P20Y') > '0'||time_in_interval(__time, '2000-01-01/P20Y')
+                     AND '1'||time_in_interval(__time, '2000-01-01/P20Y') >= '0'||time_in_interval(__time, '2000-01-01/P20Y')
+                     AND '1'||time_in_interval(__time, '2000-01-01/P20Y') < 2||time_in_interval(__time, '2000-01-01/P20Y')
+                     AND '1'||time_in_interval(__time, '2000-01-01/P20Y') <= 2||time_in_interval(__time, '2000-01-01/P20Y')
+                     AND ('1'||time_in_interval(__time, '2000-01-01/P20Y') <> '0'||time_in_interval(__time, '2000-01-01/P20Y')) IS TRUE
+                     AND ('1'||time_in_interval(__time, '2000-01-01/P20Y') = '0'||time_in_interval(__time, '2000-01-01/P20Y')) IS NOT TRUE
+                     AND ('1'||time_in_interval(__time, '2000-01-01/P20Y') = '0'||time_in_interval(__time, '2000-01-01/P20Y')) IS FALSE
+                     AND ('1'||time_in_interval(__time, '2000-01-01/P20Y') <> '0'||time_in_interval(__time, '2000-01-01/P20Y')) IS NOT FALSE
+                     AND '1'||time_in_interval(__time, '2000-01-01/P20Y') BETWEEN '0'||time_in_interval(__time, '2000-01-01/P20Y') AND 2||time_in_interval(__time, '2000-01-01/P20Y')
+                     AND '1'||time_in_interval(__time, '2000-01-01/P20Y') NOT BETWEEN '1'||time_in_interval(__time, '2000-01-01/P20Y') AND '0'||time_in_interval(__time, '2000-01-01/P20Y')
+                     AND '1'||time_in_interval(__time, '2000-01-01/P20Y') like '%'
+                     AND '1'||time_in_interval(__time, '2000-01-01/P20Y') not like '__DOES_NOT_EXIST__%'
+                     AND '1'||time_in_interval(__time, '2000-01-01/P20Y') IN ('0'||time_in_interval(__time, '2000-01-01/P20Y'),
+                                                                              1||time_in_interval(__time, '2000-01-01/P20Y'),
+                                                                              2||time_in_interval(__time, '2000-01-01/P20Y'))
+                     AND '1'||time_in_interval(__time, '2000-01-01/P20Y') NOT IN ('0'||time_in_interval(__time, '2000-01-01/P20Y'),
+                                                                                  2||time_in_interval(__time, '2000-01-01/P20Y'))))));
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM
+  (SELECT __time, number, client_ip,
+                          '1'||time_in_interval(__time, '2000-01-01/P20Y'),
+                          count(*)
+   FROM kttm_nested
+   WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+     AND ('1'||time_in_interval(__time, '2000-01-01/P20Y') IS NULL
+          OR ('1'||time_in_interval(__time, '2000-01-01/P20Y') = 1||time_in_interval(__time, '2000-01-01/P20Y')
+              AND '1'||time_in_interval(__time, '2000-01-01/P20Y') IS NOT DISTINCT
+              FROM 1||time_in_interval(__time, '2000-01-01/P20Y')
+              AND '1'||time_in_interval(__time, '2000-01-01/P20Y') <> '0'||time_in_interval(__time, '2000-01-01/P20Y')
+              AND ('1'||time_in_interval(__time, '2000-01-01/P20Y') IS DISTINCT
+                   FROM '0'||time_in_interval(__time, '2000-01-01/P20Y'))
+              AND '1'||time_in_interval(__time, '2000-01-01/P20Y') > '0'||time_in_interval(__time, '2000-01-01/P20Y')
+              AND '1'||time_in_interval(__time, '2000-01-01/P20Y') >= '0'||time_in_interval(__time, '2000-01-01/P20Y')
+              AND '1'||time_in_interval(__time, '2000-01-01/P20Y') < 2||time_in_interval(__time, '2000-01-01/P20Y')
+              AND '1'||time_in_interval(__time, '2000-01-01/P20Y') <= 2||time_in_interval(__time, '2000-01-01/P20Y')
+              AND ('1'||time_in_interval(__time, '2000-01-01/P20Y') <> '0'||time_in_interval(__time, '2000-01-01/P20Y')) IS TRUE
+              AND ('1'||time_in_interval(__time, '2000-01-01/P20Y') = '0'||time_in_interval(__time, '2000-01-01/P20Y')) IS NOT TRUE
+              AND ('1'||time_in_interval(__time, '2000-01-01/P20Y') = '0'||time_in_interval(__time, '2000-01-01/P20Y')) IS FALSE
+              AND ('1'||time_in_interval(__time, '2000-01-01/P20Y') <> '0'||time_in_interval(__time, '2000-01-01/P20Y')) IS NOT FALSE
+              AND '1'||time_in_interval(__time, '2000-01-01/P20Y') BETWEEN '0'||time_in_interval(__time, '2000-01-01/P20Y') AND 2||time_in_interval(__time, '2000-01-01/P20Y')
+              AND '1'||time_in_interval(__time, '2000-01-01/P20Y') NOT BETWEEN '1'||time_in_interval(__time, '2000-01-01/P20Y') AND '0'||time_in_interval(__time, '2000-01-01/P20Y')
+              AND '1'||time_in_interval(__time, '2000-01-01/P20Y') like '%'
+              AND '1'||time_in_interval(__time, '2000-01-01/P20Y') not like '__DOES_NOT_EXIST__%'
+              AND '1'||time_in_interval(__time, '2000-01-01/P20Y') IN ('0'||time_in_interval(__time, '2000-01-01/P20Y'),
+                                                                       1||time_in_interval(__time, '2000-01-01/P20Y'),
+                                                                       2||time_in_interval(__time, '2000-01-01/P20Y'))
+              AND '1'||time_in_interval(__time, '2000-01-01/P20Y') NOT IN ('0'||time_in_interval(__time, '2000-01-01/P20Y'),
+                                                                           2||time_in_interval(__time, '2000-01-01/P20Y'))))
+   GROUP BY 1,
+            2,
+            3,
+            4);
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+#-------------------------------------------------------------------------
+# TEST_ID: A12: millis_to_timestamp
+#-------------------------------------------------------------------------
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND (millis_to_timestamp(extract(millisecond
+                                   FROM __time)) IS NULL
+       OR (millis_to_timestamp(extract(millisecond
+                                       FROM __time)) = millis_to_timestamp(extract(millisecond
+                                                                                   FROM __time))
+           AND millis_to_timestamp(extract(millisecond
+                                           FROM __time)) IS NOT DISTINCT
+           FROM millis_to_timestamp(extract(millisecond
+                                            FROM __time))
+           AND millis_to_timestamp(extract(millisecond
+                                           FROM __time)) <> millis_to_timestamp(extract(millisecond
+                                                                                        FROM __time)-2)
+           AND (millis_to_timestamp(extract(millisecond
+                                            FROM __time)) IS DISTINCT
+                FROM millis_to_timestamp(extract(millisecond
+                                                 FROM __time)-2))
+           AND millis_to_timestamp(extract(millisecond
+                                           FROM __time)) > millis_to_timestamp(extract(millisecond
+                                                                                       FROM __time)-2)
+           AND millis_to_timestamp(extract(millisecond
+                                           FROM __time)) >= millis_to_timestamp(extract(millisecond
+                                                                                        FROM __time)-2)
+           AND millis_to_timestamp(extract(millisecond
+                                           FROM __time)) < millis_to_timestamp(extract(millisecond
+                                                                                       FROM __time)+2)
+           AND millis_to_timestamp(extract(millisecond
+                                           FROM __time)) <= millis_to_timestamp(extract(millisecond
+                                                                                        FROM __time)+2)
+           AND (millis_to_timestamp(extract(millisecond
+                                            FROM __time)) <> millis_to_timestamp(extract(millisecond
+                                                                                         FROM __time)-2)) IS TRUE
+           AND (millis_to_timestamp(extract(millisecond
+                                            FROM __time)) = millis_to_timestamp(extract(millisecond
+                                                                                        FROM __time)-2)) IS NOT TRUE
+           AND (millis_to_timestamp(extract(millisecond
+                                            FROM __time)) = millis_to_timestamp(extract(millisecond
+                                                                                        FROM __time)-2)) IS FALSE
+           AND (millis_to_timestamp(extract(millisecond
+                                            FROM __time)) <> millis_to_timestamp(extract(millisecond
+                                                                                         FROM __time)-2)) IS NOT FALSE
+           AND millis_to_timestamp(extract(millisecond
+                                           FROM __time)) BETWEEN millis_to_timestamp(extract(millisecond
+                                                                                             FROM __time)-2) AND millis_to_timestamp(extract(millisecond
+                                                                                                                                             FROM __time)+2)
+           AND millis_to_timestamp(extract(millisecond
+                                           FROM __time)) NOT BETWEEN millis_to_timestamp(extract(millisecond
+                                                                                                 FROM __time)) AND millis_to_timestamp(extract(millisecond
+                                                                                                                                               FROM __time)-2)
+           AND millis_to_timestamp(extract(millisecond
+                                           FROM __time)) like '%'
+           AND millis_to_timestamp(extract(millisecond
+                                           FROM __time)) not like '__DOES_NOT_EXIST__%'
+           AND millis_to_timestamp(extract(millisecond
+                                           FROM __time)) IN (millis_to_timestamp(extract(millisecond
+                                                                                         FROM __time)-2),
+                                                             millis_to_timestamp(extract(millisecond
+                                                                                         FROM __time)),
+                                                             millis_to_timestamp(extract(millisecond
+                                                                                         FROM __time)+2))
+           AND millis_to_timestamp(extract(millisecond
+                                           FROM __time)) NOT IN (millis_to_timestamp(extract(millisecond
+                                                                                             FROM __time)-2),
+                                                                 millis_to_timestamp(extract(millisecond
+                                                                                             FROM __time)+2)))) ;
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND (millis_to_timestamp(extract(millisecond
+                                   FROM __time)) IS NULL
+       OR millis_to_timestamp(extract(millisecond
+                                      FROM __time)) IN
+         (SELECT millis_to_timestamp(extract(millisecond
+                                             FROM __time))
+          FROM kttm_nested
+          WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+            AND (millis_to_timestamp(extract(millisecond
+                                             FROM __time)) IS NULL
+                 OR (millis_to_timestamp(extract(millisecond
+                                                 FROM __time)) = millis_to_timestamp(extract(millisecond
+                                                                                             FROM __time))
+                     AND millis_to_timestamp(extract(millisecond
+                                                     FROM __time)) IS NOT DISTINCT
+                     FROM millis_to_timestamp(extract(millisecond
+                                                      FROM __time))
+                     AND millis_to_timestamp(extract(millisecond
+                                                     FROM __time)) <> millis_to_timestamp(extract(millisecond
+                                                                                                  FROM __time)-2)
+                     AND (millis_to_timestamp(extract(millisecond
+                                                      FROM __time)) IS DISTINCT
+                          FROM millis_to_timestamp(extract(millisecond
+                                                           FROM __time)-2))
+                     AND millis_to_timestamp(extract(millisecond
+                                                     FROM __time)) > millis_to_timestamp(extract(millisecond
+                                                                                                 FROM __time)-2)
+                     AND millis_to_timestamp(extract(millisecond
+                                                     FROM __time)) >= millis_to_timestamp(extract(millisecond
+                                                                                                  FROM __time)-2)
+                     AND millis_to_timestamp(extract(millisecond
+                                                     FROM __time)) < millis_to_timestamp(extract(millisecond
+                                                                                                 FROM __time)+2)
+                     AND millis_to_timestamp(extract(millisecond
+                                                     FROM __time)) <= millis_to_timestamp(extract(millisecond
+                                                                                                  FROM __time)+2)
+                     AND (millis_to_timestamp(extract(millisecond
+                                                      FROM __time)) <> millis_to_timestamp(extract(millisecond
+                                                                                                   FROM __time)-2)) IS TRUE
+                     AND (millis_to_timestamp(extract(millisecond
+                                                      FROM __time)) = millis_to_timestamp(extract(millisecond
+                                                                                                  FROM __time)-2)) IS NOT TRUE
+                     AND (millis_to_timestamp(extract(millisecond
+                                                      FROM __time)) = millis_to_timestamp(extract(millisecond
+                                                                                                  FROM __time)-2)) IS FALSE
+                     AND (millis_to_timestamp(extract(millisecond
+                                                      FROM __time)) <> millis_to_timestamp(extract(millisecond
+                                                                                                   FROM __time)-2)) IS NOT FALSE
+                     AND millis_to_timestamp(extract(millisecond
+                                                     FROM __time)) BETWEEN millis_to_timestamp(extract(millisecond
+                                                                                                       FROM __time)-2) AND millis_to_timestamp(extract(millisecond
+                                                                                                                                                       FROM __time)+2)
+                     AND millis_to_timestamp(extract(millisecond
+                                                     FROM __time)) NOT BETWEEN millis_to_timestamp(extract(millisecond
+                                                                                                           FROM __time)) AND millis_to_timestamp(extract(millisecond
+                                                                                                                                                         FROM __time)-2)
+                     AND millis_to_timestamp(extract(millisecond
+                                                     FROM __time)) like '%'
+                     AND millis_to_timestamp(extract(millisecond
+                                                     FROM __time)) not like '__DOES_NOT_EXIST__%'
+                     AND millis_to_timestamp(extract(millisecond
+                                                     FROM __time)) IN (millis_to_timestamp(extract(millisecond
+                                                                                                   FROM __time)-2),
+                                                                       millis_to_timestamp(extract(millisecond
+                                                                                                   FROM __time)),
+                                                                       millis_to_timestamp(extract(millisecond
+                                                                                                   FROM __time)+2))
+                     AND millis_to_timestamp(extract(millisecond
+                                                     FROM __time)) NOT IN (millis_to_timestamp(extract(millisecond
+                                                                                                       FROM __time)-2),
+                                                                           millis_to_timestamp(extract(millisecond
+                                                                                                       FROM __time)+2))))));
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM
+  (SELECT __time, number, client_ip,
+                          millis_to_timestamp(extract(millisecond
+                                                      FROM __time)),
+                          count(*)
+   FROM kttm_nested
+   WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+     AND (millis_to_timestamp(extract(millisecond
+                                      FROM __time)) IS NULL
+          OR (millis_to_timestamp(extract(millisecond
+                                          FROM __time)) = millis_to_timestamp(extract(millisecond
+                                                                                      FROM __time))
+              AND millis_to_timestamp(extract(millisecond
+                                              FROM __time)) IS NOT DISTINCT
+              FROM millis_to_timestamp(extract(millisecond
+                                               FROM __time))
+              AND millis_to_timestamp(extract(millisecond
+                                              FROM __time)) <> millis_to_timestamp(extract(millisecond
+                                                                                           FROM __time)-2)
+              AND (millis_to_timestamp(extract(millisecond
+                                               FROM __time)) IS DISTINCT
+                   FROM millis_to_timestamp(extract(millisecond
+                                                    FROM __time)-2))
+              AND millis_to_timestamp(extract(millisecond
+                                              FROM __time)) > millis_to_timestamp(extract(millisecond
+                                                                                          FROM __time)-2)
+              AND millis_to_timestamp(extract(millisecond
+                                              FROM __time)) >= millis_to_timestamp(extract(millisecond
+                                                                                           FROM __time)-2)
+              AND millis_to_timestamp(extract(millisecond
+                                              FROM __time)) < millis_to_timestamp(extract(millisecond
+                                                                                          FROM __time)+2)
+              AND millis_to_timestamp(extract(millisecond
+                                              FROM __time)) <= millis_to_timestamp(extract(millisecond
+                                                                                           FROM __time)+2)
+              AND (millis_to_timestamp(extract(millisecond
+                                               FROM __time)) <> millis_to_timestamp(extract(millisecond
+                                                                                            FROM __time)-2)) IS TRUE
+              AND (millis_to_timestamp(extract(millisecond
+                                               FROM __time)) = millis_to_timestamp(extract(millisecond
+                                                                                           FROM __time)-2)) IS NOT TRUE
+              AND (millis_to_timestamp(extract(millisecond
+                                               FROM __time)) = millis_to_timestamp(extract(millisecond
+                                                                                           FROM __time)-2)) IS FALSE
+              AND (millis_to_timestamp(extract(millisecond
+                                               FROM __time)) <> millis_to_timestamp(extract(millisecond
+                                                                                            FROM __time)-2)) IS NOT FALSE
+              AND millis_to_timestamp(extract(millisecond
+                                              FROM __time)) BETWEEN millis_to_timestamp(extract(millisecond
+                                                                                                FROM __time)-2) AND millis_to_timestamp(extract(millisecond
+                                                                                                                                                FROM __time)+2)
+              AND millis_to_timestamp(extract(millisecond
+                                              FROM __time)) NOT BETWEEN millis_to_timestamp(extract(millisecond
+                                                                                                    FROM __time)) AND millis_to_timestamp(extract(millisecond
+                                                                                                                                                  FROM __time)-2)
+              AND millis_to_timestamp(extract(millisecond
+                                              FROM __time)) like '%'
+              AND millis_to_timestamp(extract(millisecond
+                                              FROM __time)) not like '__DOES_NOT_EXIST__%'
+              AND millis_to_timestamp(extract(millisecond
+                                              FROM __time)) IN (millis_to_timestamp(extract(millisecond
+                                                                                            FROM __time)-2),
+                                                                millis_to_timestamp(extract(millisecond
+                                                                                            FROM __time)),
+                                                                millis_to_timestamp(extract(millisecond
+                                                                                            FROM __time)+2))
+              AND millis_to_timestamp(extract(millisecond
+                                              FROM __time)) NOT IN (millis_to_timestamp(extract(millisecond
+                                                                                                FROM __time)-2),
+                                                                    millis_to_timestamp(extract(millisecond
+                                                                                                FROM __time)+2))))
+   GROUP BY 1,
+            2,
+            3,
+            4);
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+#-------------------------------------------------------------------------
+# TEST_ID: A13: timestamp_to_millis
+#-------------------------------------------------------------------------
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND (timestamp_to_millis(__time) IS NULL
+       OR (timestamp_to_millis(__time) = timestamp_to_millis(__time)
+           AND timestamp_to_millis(__time) IS NOT DISTINCT
+           FROM timestamp_to_millis(__time)
+           AND timestamp_to_millis(__time) <> timestamp_to_millis(__time)-2
+           AND (timestamp_to_millis(__time) IS DISTINCT
+                FROM timestamp_to_millis(__time)-2)
+           AND timestamp_to_millis(__time) > timestamp_to_millis(__time)-2
+           AND timestamp_to_millis(__time) >= timestamp_to_millis(__time)-2
+           AND timestamp_to_millis(__time) < timestamp_to_millis(__time)+2
+           AND timestamp_to_millis(__time) <= timestamp_to_millis(__time)+2
+           AND (timestamp_to_millis(__time) <> timestamp_to_millis(__time)-2) IS TRUE
+           AND (timestamp_to_millis(__time) = timestamp_to_millis(__time)-2) IS NOT TRUE
+           AND (timestamp_to_millis(__time) = timestamp_to_millis(__time)-2) IS FALSE
+           AND (timestamp_to_millis(__time) <> timestamp_to_millis(__time)-2) IS NOT FALSE
+           AND timestamp_to_millis(__time) BETWEEN timestamp_to_millis(__time)-2 AND timestamp_to_millis(__time)+2
+           AND timestamp_to_millis(__time) NOT BETWEEN timestamp_to_millis(__time) AND timestamp_to_millis(__time)-2
+           AND timestamp_to_millis(__time) like '%'
+           AND timestamp_to_millis(__time) not like '__DOES_NOT_EXIST__%'
+           AND timestamp_to_millis(__time) IN (timestamp_to_millis(__time)-2,
+                                                                          timestamp_to_millis(__time),
+                                                                          timestamp_to_millis(__time)+2)
+           AND timestamp_to_millis(__time) NOT IN (timestamp_to_millis(__time)-2,
+                                                                              timestamp_to_millis(__time)+2))) ;
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND (timestamp_to_millis(__time) IS NULL
+       OR timestamp_to_millis(__time) IN
+         (SELECT timestamp_to_millis(__time)
+          FROM kttm_nested
+          WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+            AND (timestamp_to_millis(__time) IS NULL
+                 OR (timestamp_to_millis(__time) = timestamp_to_millis(__time)
+                     AND timestamp_to_millis(__time) IS NOT DISTINCT
+                     FROM timestamp_to_millis(__time)
+                     AND timestamp_to_millis(__time) <> timestamp_to_millis(__time)-2
+                     AND (timestamp_to_millis(__time) IS DISTINCT
+                          FROM timestamp_to_millis(__time)-2)
+                     AND timestamp_to_millis(__time) > timestamp_to_millis(__time)-2
+                     AND timestamp_to_millis(__time) >= timestamp_to_millis(__time)-2
+                     AND timestamp_to_millis(__time) < timestamp_to_millis(__time)+2
+                     AND timestamp_to_millis(__time) <= timestamp_to_millis(__time)+2
+                     AND (timestamp_to_millis(__time) <> timestamp_to_millis(__time)-2) IS TRUE
+                     AND (timestamp_to_millis(__time) = timestamp_to_millis(__time)-2) IS NOT TRUE
+                     AND (timestamp_to_millis(__time) = timestamp_to_millis(__time)-2) IS FALSE
+                     AND (timestamp_to_millis(__time) <> timestamp_to_millis(__time)-2) IS NOT FALSE
+                     AND timestamp_to_millis(__time) BETWEEN timestamp_to_millis(__time)-2 AND timestamp_to_millis(__time)+2
+                     AND timestamp_to_millis(__time) NOT BETWEEN timestamp_to_millis(__time) AND timestamp_to_millis(__time)-2
+                     AND timestamp_to_millis(__time) like '%'
+                     AND timestamp_to_millis(__time) not like '__DOES_NOT_EXIST__%'
+                     AND timestamp_to_millis(__time) IN (timestamp_to_millis(__time)-2,
+                                                                                    timestamp_to_millis(__time),
+                                                                                    timestamp_to_millis(__time)+2)
+                     AND timestamp_to_millis(__time) NOT IN (timestamp_to_millis(__time)-2,
+                                                                                        timestamp_to_millis(__time)+2)))));
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM
+  (SELECT __time, number, client_ip,
+                          timestamp_to_millis(__time),
+                          count(*)
+   FROM kttm_nested
+   WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+     AND (timestamp_to_millis(__time) IS NULL
+          OR (timestamp_to_millis(__time) = timestamp_to_millis(__time)
+              AND timestamp_to_millis(__time) IS NOT DISTINCT
+              FROM timestamp_to_millis(__time)
+              AND timestamp_to_millis(__time) <> timestamp_to_millis(__time)-2
+              AND (timestamp_to_millis(__time) IS DISTINCT
+                   FROM timestamp_to_millis(__time)-2)
+              AND timestamp_to_millis(__time) > timestamp_to_millis(__time)-2
+              AND timestamp_to_millis(__time) >= timestamp_to_millis(__time)-2
+              AND timestamp_to_millis(__time) < timestamp_to_millis(__time)+2
+              AND timestamp_to_millis(__time) <= timestamp_to_millis(__time)+2
+              AND (timestamp_to_millis(__time) <> timestamp_to_millis(__time)-2) IS TRUE
+              AND (timestamp_to_millis(__time) = timestamp_to_millis(__time)-2) IS NOT TRUE
+              AND (timestamp_to_millis(__time) = timestamp_to_millis(__time)-2) IS FALSE
+              AND (timestamp_to_millis(__time) <> timestamp_to_millis(__time)-2) IS NOT FALSE
+              AND timestamp_to_millis(__time) BETWEEN timestamp_to_millis(__time)-2 AND timestamp_to_millis(__time)+2
+              AND timestamp_to_millis(__time) NOT BETWEEN timestamp_to_millis(__time) AND timestamp_to_millis(__time)-2
+              AND timestamp_to_millis(__time) like '%'
+              AND timestamp_to_millis(__time) not like '__DOES_NOT_EXIST__%'
+              AND timestamp_to_millis(__time) IN (timestamp_to_millis(__time)-2,
+                                                                             timestamp_to_millis(__time),
+                                                                             timestamp_to_millis(__time)+2)
+              AND timestamp_to_millis(__time) NOT IN (timestamp_to_millis(__time)-2,
+                                                                                 timestamp_to_millis(__time)+2)))
+   GROUP BY 1,
+            2,
+            3,
+            4);
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+#-------------------------------------------------------------------------
+# TEST_ID: A14: extract
+#-------------------------------------------------------------------------
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND (extract(HOUR
+               FROM __time) IS NULL
+       OR (extract(HOUR
+                   FROM __time) = extract(HOUR
+                                          FROM __time)
+           AND extract(HOUR
+                       FROM __time) IS NOT DISTINCT
+           FROM extract(HOUR
+                        FROM __time)
+           AND extract(HOUR
+                       FROM __time) <> extract(HOUR
+                                               FROM __time)-2
+           AND (extract(HOUR
+                        FROM __time) IS DISTINCT
+                FROM extract(HOUR
+                             FROM __time)-2)
+           AND extract(HOUR
+                       FROM __time) > extract(HOUR
+                                              FROM __time)-2
+           AND extract(HOUR
+                       FROM __time) >= extract(HOUR
+                                               FROM __time)-2
+           AND extract(HOUR
+                       FROM __time) < extract(HOUR
+                                              FROM __time)+2
+           AND extract(HOUR
+                       FROM __time) <= extract(HOUR
+                                               FROM __time)+2
+           AND (extract(HOUR
+                        FROM __time) <> extract(HOUR
+                                                FROM __time)-2) IS TRUE
+           AND (extract(HOUR
+                        FROM __time) = extract(HOUR
+                                               FROM __time)-2) IS NOT TRUE
+           AND (extract(HOUR
+                        FROM __time) = extract(HOUR
+                                               FROM __time)-2) IS FALSE
+           AND (extract(HOUR
+                        FROM __time) <> extract(HOUR
+                                                FROM __time)-2) IS NOT FALSE
+           AND extract(HOUR
+                       FROM __time) BETWEEN extract(HOUR
+                                                    FROM __time)-2 AND extract(HOUR
+                                                                               FROM __time)+2
+           AND extract(HOUR
+                       FROM __time) NOT BETWEEN extract(HOUR
+                                                        FROM __time) AND extract(HOUR
+                                                                                 FROM __time)-2
+           AND extract(HOUR
+                       FROM __time) like '%'
+           AND extract(HOUR
+                       FROM __time) not like '__DOES_NOT_EXIST__%'
+           AND extract(HOUR
+                       FROM __time) IN (extract(HOUR
+                                                FROM __time)-2,
+                                                            extract(HOUR
+                                                                    FROM __time),
+                                                            extract(HOUR
+                                                                    FROM __time)+2)
+           AND extract(HOUR
+                       FROM __time) NOT IN (extract(HOUR
+                                                    FROM __time)-2,
+                                                                extract(HOUR
+                                                                        FROM __time)+2))) ;
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND (extract(HOUR
+               FROM __time) IS NULL
+       OR extract(HOUR
+                  FROM __time) IN
+         (SELECT extract(HOUR
+                         FROM __time)
+          FROM kttm_nested
+          WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+            AND (extract(HOUR
+                         FROM __time) IS NULL
+                 OR (extract(HOUR
+                             FROM __time) = extract(HOUR
+                                                    FROM __time)
+                     AND extract(HOUR
+                                 FROM __time) IS NOT DISTINCT
+                     FROM extract(HOUR
+                                  FROM __time)
+                     AND extract(HOUR
+                                 FROM __time) <> extract(HOUR
+                                                         FROM __time)-2
+                     AND (extract(HOUR
+                                  FROM __time) IS DISTINCT
+                          FROM extract(HOUR
+                                       FROM __time)-2)
+                     AND extract(HOUR
+                                 FROM __time) > extract(HOUR
+                                                        FROM __time)-2
+                     AND extract(HOUR
+                                 FROM __time) >= extract(HOUR
+                                                         FROM __time)-2
+                     AND extract(HOUR
+                                 FROM __time) < extract(HOUR
+                                                        FROM __time)+2
+                     AND extract(HOUR
+                                 FROM __time) <= extract(HOUR
+                                                         FROM __time)+2
+                     AND (extract(HOUR
+                                  FROM __time) <> extract(HOUR
+                                                          FROM __time)-2) IS TRUE
+                     AND (extract(HOUR
+                                  FROM __time) = extract(HOUR
+                                                         FROM __time)-2) IS NOT TRUE
+                     AND (extract(HOUR
+                                  FROM __time) = extract(HOUR
+                                                         FROM __time)-2) IS FALSE
+                     AND (extract(HOUR
+                                  FROM __time) <> extract(HOUR
+                                                          FROM __time)-2) IS NOT FALSE
+                     AND extract(HOUR
+                                 FROM __time) BETWEEN extract(HOUR
+                                                              FROM __time)-2 AND extract(HOUR
+                                                                                         FROM __time)+2
+                     AND extract(HOUR
+                                 FROM __time) NOT BETWEEN extract(HOUR
+                                                                  FROM __time) AND extract(HOUR
+                                                                                           FROM __time)-2
+                     AND extract(HOUR
+                                 FROM __time) like '%'
+                     AND extract(HOUR
+                                 FROM __time) not like '__DOES_NOT_EXIST__%'
+                     AND extract(HOUR
+                                 FROM __time) IN (extract(HOUR
+                                                          FROM __time)-2,
+                                                                      extract(HOUR
+                                                                              FROM __time),
+                                                                      extract(HOUR
+                                                                              FROM __time)+2)
+                     AND extract(HOUR
+                                 FROM __time) NOT IN (extract(HOUR
+                                                              FROM __time)-2,
+                                                                          extract(HOUR
+                                                                                  FROM __time)+2)))));
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM
+  (SELECT __time, number, client_ip,
+                          extract(HOUR
+                                  FROM __time),
+                          count(*)
+   FROM kttm_nested
+   WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+     AND (extract(HOUR
+                  FROM __time) IS NULL
+          OR (extract(HOUR
+                      FROM __time) = extract(HOUR
+                                             FROM __time)
+              AND extract(HOUR
+                          FROM __time) IS NOT DISTINCT
+              FROM extract(HOUR
+                           FROM __time)
+              AND extract(HOUR
+                          FROM __time) <> extract(HOUR
+                                                  FROM __time)-2
+              AND (extract(HOUR
+                           FROM __time) IS DISTINCT
+                   FROM extract(HOUR
+                                FROM __time)-2)
+              AND extract(HOUR
+                          FROM __time) > extract(HOUR
+                                                 FROM __time)-2
+              AND extract(HOUR
+                          FROM __time) >= extract(HOUR
+                                                  FROM __time)-2
+              AND extract(HOUR
+                          FROM __time) < extract(HOUR
+                                                 FROM __time)+2
+              AND extract(HOUR
+                          FROM __time) <= extract(HOUR
+                                                  FROM __time)+2
+              AND (extract(HOUR
+                           FROM __time) <> extract(HOUR
+                                                   FROM __time)-2) IS TRUE
+              AND (extract(HOUR
+                           FROM __time) = extract(HOUR
+                                                  FROM __time)-2) IS NOT TRUE
+              AND (extract(HOUR
+                           FROM __time) = extract(HOUR
+                                                  FROM __time)-2) IS FALSE
+              AND (extract(HOUR
+                           FROM __time) <> extract(HOUR
+                                                   FROM __time)-2) IS NOT FALSE
+              AND extract(HOUR
+                          FROM __time) BETWEEN extract(HOUR
+                                                       FROM __time)-2 AND extract(HOUR
+                                                                                  FROM __time)+2
+              AND extract(HOUR
+                          FROM __time) NOT BETWEEN extract(HOUR
+                                                           FROM __time) AND extract(HOUR
+                                                                                    FROM __time)-2
+              AND extract(HOUR
+                          FROM __time) like '%'
+              AND extract(HOUR
+                          FROM __time) not like '__DOES_NOT_EXIST__%'
+              AND extract(HOUR
+                          FROM __time) IN (extract(HOUR
+                                                   FROM __time)-2,
+                                                               extract(HOUR
+                                                                       FROM __time),
+                                                               extract(HOUR
+                                                                       FROM __time)+2)
+              AND extract(HOUR
+                          FROM __time) NOT IN (extract(HOUR
+                                                       FROM __time)-2,
+                                                                   extract(HOUR
+                                                                           FROM __time)+2)))
+   GROUP BY 1,
+            2,
+            3,
+            4);
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+#-------------------------------------------------------------------------
+# TEST_ID: A15: floor
+#-------------------------------------------------------------------------
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND (floor(__time TO DAY) IS NULL
+       OR (floor(__time TO DAY) = floor(__time TO DAY)
+           AND floor(__time TO DAY) IS NOT DISTINCT
+           FROM floor(__time TO DAY)
+           AND floor(__time TO DAY) <> floor(time_shift(__time, 'P1D', -2) TO DAY)
+           AND (floor(__time TO DAY) IS DISTINCT
+                FROM floor(time_shift(__time, 'P1D', -2) TO DAY))
+           AND floor(__time TO DAY) > floor(time_shift(__time, 'P1D', -2) TO DAY)
+           AND floor(__time TO DAY) >= floor(time_shift(__time, 'P1D', -2) TO DAY)
+           AND floor(__time TO DAY) < floor(time_shift(__time, 'P1D', 2) TO DAY)
+           AND floor(__time TO DAY) <= floor(time_shift(__time, 'P1D', 2) TO DAY)
+           AND (floor(__time TO DAY) <> floor(time_shift(__time, 'P1D', -2) TO DAY)) IS TRUE
+           AND (floor(__time TO DAY) = floor(time_shift(__time, 'P1D', -2) TO DAY)) IS NOT TRUE
+           AND (floor(__time TO DAY) = floor(time_shift(__time, 'P1D', -2) TO DAY)) IS FALSE
+           AND (floor(__time TO DAY) <> floor(time_shift(__time, 'P1D', -2) TO DAY)) IS NOT FALSE
+           AND floor(__time TO DAY) BETWEEN floor(time_shift(__time, 'P1D', -2) TO DAY) AND floor(time_shift(__time, 'P1D', 2) TO DAY)
+           AND floor(__time TO DAY) NOT BETWEEN floor(__time TO DAY) AND floor(time_shift(__time, 'P1D', -2) TO DAY)
+           AND floor(__time TO DAY) like '%'
+           AND floor(__time TO DAY) not like '__DOES_NOT_EXIST__%'
+           AND floor(__time TO DAY) IN (floor(time_shift(__time, 'P1D', -2) TO DAY),
+                                        floor(__time TO DAY),
+                                        floor(time_shift(__time, 'P1D', 2) TO DAY))
+           AND floor(__time TO DAY) NOT IN (floor(time_shift(__time, 'P1D', -2) TO DAY),
+                                            floor(time_shift(__time, 'P1D', 2) TO DAY)))) ;
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND (floor(__time TO DAY) IS NULL
+       OR floor(__time TO DAY) IN
+         (SELECT floor(__time TO DAY)
+          FROM kttm_nested
+          WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+            AND (floor(__time TO DAY) IS NULL
+                 OR (floor(__time TO DAY) = floor(__time TO DAY)
+                     AND floor(__time TO DAY) IS NOT DISTINCT
+                     FROM floor(__time TO DAY)
+                     AND floor(__time TO DAY) <> floor(time_shift(__time, 'P1D', -2) TO DAY)
+                     AND (floor(__time TO DAY) IS DISTINCT
+                          FROM floor(time_shift(__time, 'P1D', -2) TO DAY))
+                     AND floor(__time TO DAY) > floor(time_shift(__time, 'P1D', -2) TO DAY)
+                     AND floor(__time TO DAY) >= floor(time_shift(__time, 'P1D', -2) TO DAY)
+                     AND floor(__time TO DAY) < floor(time_shift(__time, 'P1D', 2) TO DAY)
+                     AND floor(__time TO DAY) <= floor(time_shift(__time, 'P1D', 2) TO DAY)
+                     AND (floor(__time TO DAY) <> floor(time_shift(__time, 'P1D', -2) TO DAY)) IS TRUE
+                     AND (floor(__time TO DAY) = floor(time_shift(__time, 'P1D', -2) TO DAY)) IS NOT TRUE
+                     AND (floor(__time TO DAY) = floor(time_shift(__time, 'P1D', -2) TO DAY)) IS FALSE
+                     AND (floor(__time TO DAY) <> floor(time_shift(__time, 'P1D', -2) TO DAY)) IS NOT FALSE
+                     AND floor(__time TO DAY) BETWEEN floor(time_shift(__time, 'P1D', -2) TO DAY) AND floor(time_shift(__time, 'P1D', 2) TO DAY)
+                     AND floor(__time TO DAY) NOT BETWEEN floor(__time TO DAY) AND floor(time_shift(__time, 'P1D', -2) TO DAY)
+                     AND floor(__time TO DAY) like '%'
+                     AND floor(__time TO DAY) not like '__DOES_NOT_EXIST__%'
+                     AND floor(__time TO DAY) IN (floor(time_shift(__time, 'P1D', -2) TO DAY),
+                                                  floor(__time TO DAY),
+                                                  floor(time_shift(__time, 'P1D', 2) TO DAY))
+                     AND floor(__time TO DAY) NOT IN (floor(time_shift(__time, 'P1D', -2) TO DAY),
+                                                      floor(time_shift(__time, 'P1D', 2) TO DAY))))));
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM
+  (SELECT __time, number, client_ip,
+                          floor(__time TO DAY),
+                          count(*)
+   FROM kttm_nested
+   WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+     AND (floor(__time TO DAY) IS NULL
+          OR (floor(__time TO DAY) = floor(__time TO DAY)
+              AND floor(__time TO DAY) IS NOT DISTINCT
+              FROM floor(__time TO DAY)
+              AND floor(__time TO DAY) <> floor(time_shift(__time, 'P1D', -2) TO DAY)
+              AND (floor(__time TO DAY) IS DISTINCT
+                   FROM floor(time_shift(__time, 'P1D', -2) TO DAY))
+              AND floor(__time TO DAY) > floor(time_shift(__time, 'P1D', -2) TO DAY)
+              AND floor(__time TO DAY) >= floor(time_shift(__time, 'P1D', -2) TO DAY)
+              AND floor(__time TO DAY) < floor(time_shift(__time, 'P1D', 2) TO DAY)
+              AND floor(__time TO DAY) <= floor(time_shift(__time, 'P1D', 2) TO DAY)
+              AND (floor(__time TO DAY) <> floor(time_shift(__time, 'P1D', -2) TO DAY)) IS TRUE
+              AND (floor(__time TO DAY) = floor(time_shift(__time, 'P1D', -2) TO DAY)) IS NOT TRUE
+              AND (floor(__time TO DAY) = floor(time_shift(__time, 'P1D', -2) TO DAY)) IS FALSE
+              AND (floor(__time TO DAY) <> floor(time_shift(__time, 'P1D', -2) TO DAY)) IS NOT FALSE
+              AND floor(__time TO DAY) BETWEEN floor(time_shift(__time, 'P1D', -2) TO DAY) AND floor(time_shift(__time, 'P1D', 2) TO DAY)
+              AND floor(__time TO DAY) NOT BETWEEN floor(__time TO DAY) AND floor(time_shift(__time, 'P1D', -2) TO DAY)
+              AND floor(__time TO DAY) like '%'
+              AND floor(__time TO DAY) not like '__DOES_NOT_EXIST__%'
+              AND floor(__time TO DAY) IN (floor(time_shift(__time, 'P1D', -2) TO DAY),
+                                           floor(__time TO DAY),
+                                           floor(time_shift(__time, 'P1D', 2) TO DAY))
+              AND floor(__time TO DAY) NOT IN (floor(time_shift(__time, 'P1D', -2) TO DAY),
+                                               floor(time_shift(__time, 'P1D', 2) TO DAY))))
+   GROUP BY 1,
+            2,
+            3,
+            4);
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+#-------------------------------------------------------------------------
+# TEST_ID: A16: ceil
+#-------------------------------------------------------------------------
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND (ceil(__time TO DAY) IS NULL
+       OR (ceil(__time TO DAY) = ceil(__time TO DAY)
+           AND ceil(__time TO DAY) IS NOT DISTINCT
+           FROM ceil(__time TO DAY)
+           AND ceil(__time TO DAY) <> ceil(time_shift(__time, 'P1D', -2) TO DAY)
+           AND (ceil(__time TO DAY) IS DISTINCT
+                FROM ceil(time_shift(__time, 'P1D', -2) TO DAY))
+           AND ceil(__time TO DAY) > ceil(time_shift(__time, 'P1D', -2) TO DAY)
+           AND ceil(__time TO DAY) >= ceil(time_shift(__time, 'P1D', -2) TO DAY)
+           AND ceil(__time TO DAY) < floor(time_shift(__time, 'P1D', 2) TO DAY)
+           AND ceil(__time TO DAY) <= floor(time_shift(__time, 'P1D', 2) TO DAY)
+           AND (ceil(__time TO DAY) <> ceil(time_shift(__time, 'P1D', -2) TO DAY)) IS TRUE
+           AND (ceil(__time TO DAY) = ceil(time_shift(__time, 'P1D', -2) TO DAY)) IS NOT TRUE
+           AND (ceil(__time TO DAY) = ceil(time_shift(__time, 'P1D', -2) TO DAY)) IS FALSE
+           AND (ceil(__time TO DAY) <> ceil(time_shift(__time, 'P1D', -2) TO DAY)) IS NOT FALSE
+           AND ceil(__time TO DAY) BETWEEN ceil(time_shift(__time, 'P1D', -2) TO DAY) AND floor(time_shift(__time, 'P1D', 2) TO DAY)
+           AND ceil(__time TO DAY) NOT BETWEEN ceil(__time TO DAY) AND ceil(time_shift(__time, 'P1D', -2) TO DAY)
+           AND ceil(__time TO DAY) like '%'
+           AND ceil(__time TO DAY) not like '__DOES_NOT_EXIST__%'
+           AND ceil(__time TO DAY) IN (ceil(time_shift(__time, 'P1D', -2) TO DAY),
+                                       ceil(__time TO DAY),
+                                       floor(time_shift(__time, 'P1D', 2) TO DAY))
+           AND ceil(__time TO DAY) NOT IN (ceil(time_shift(__time, 'P1D', -2) TO DAY),
+                                           floor(time_shift(__time, 'P1D', 2) TO DAY)))) ;
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND (ceil(__time TO DAY) IS NULL
+       OR ceil(__time TO DAY) IN
+         (SELECT ceil(__time TO DAY)
+          FROM kttm_nested
+          WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+            AND (ceil(__time TO DAY) IS NULL
+                 OR (ceil(__time TO DAY) = ceil(__time TO DAY)
+                     AND ceil(__time TO DAY) IS NOT DISTINCT
+                     FROM ceil(__time TO DAY)
+                     AND ceil(__time TO DAY) <> ceil(time_shift(__time, 'P1D', -2) TO DAY)
+                     AND (ceil(__time TO DAY) IS DISTINCT
+                          FROM ceil(time_shift(__time, 'P1D', -2) TO DAY))
+                     AND ceil(__time TO DAY) > ceil(time_shift(__time, 'P1D', -2) TO DAY)
+                     AND ceil(__time TO DAY) >= ceil(time_shift(__time, 'P1D', -2) TO DAY)
+                     AND ceil(__time TO DAY) < floor(time_shift(__time, 'P1D', 2) TO DAY)
+                     AND ceil(__time TO DAY) <= floor(time_shift(__time, 'P1D', 2) TO DAY)
+                     AND (ceil(__time TO DAY) <> ceil(time_shift(__time, 'P1D', -2) TO DAY)) IS TRUE
+                     AND (ceil(__time TO DAY) = ceil(time_shift(__time, 'P1D', -2) TO DAY)) IS NOT TRUE
+                     AND (ceil(__time TO DAY) = ceil(time_shift(__time, 'P1D', -2) TO DAY)) IS FALSE
+                     AND (ceil(__time TO DAY) <> ceil(time_shift(__time, 'P1D', -2) TO DAY)) IS NOT FALSE
+                     AND ceil(__time TO DAY) BETWEEN ceil(time_shift(__time, 'P1D', -2) TO DAY) AND floor(time_shift(__time, 'P1D', 2) TO DAY)
+                     AND ceil(__time TO DAY) NOT BETWEEN ceil(__time TO DAY) AND ceil(time_shift(__time, 'P1D', -2) TO DAY)
+                     AND ceil(__time TO DAY) like '%'
+                     AND ceil(__time TO DAY) not like '__DOES_NOT_EXIST__%'
+                     AND ceil(__time TO DAY) IN (ceil(time_shift(__time, 'P1D', -2) TO DAY),
+                                                 ceil(__time TO DAY),
+                                                 floor(time_shift(__time, 'P1D', 2) TO DAY))
+                     AND ceil(__time TO DAY) NOT IN (ceil(time_shift(__time, 'P1D', -2) TO DAY),
+                                                     floor(time_shift(__time, 'P1D', 2) TO DAY))))));
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM
+  (SELECT __time, number, client_ip,
+                          ceil(__time TO DAY),
+                          count(*)
+   FROM kttm_nested
+   WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+     AND (ceil(__time TO DAY) IS NULL
+          OR (ceil(__time TO DAY) = ceil(__time TO DAY)
+              AND ceil(__time TO DAY) IS NOT DISTINCT
+              FROM ceil(__time TO DAY)
+              AND ceil(__time TO DAY) <> ceil(time_shift(__time, 'P1D', -2) TO DAY)
+              AND (ceil(__time TO DAY) IS DISTINCT
+                   FROM ceil(time_shift(__time, 'P1D', -2) TO DAY))
+              AND ceil(__time TO DAY) > ceil(time_shift(__time, 'P1D', -2) TO DAY)
+              AND ceil(__time TO DAY) >= ceil(time_shift(__time, 'P1D', -2) TO DAY)
+              AND ceil(__time TO DAY) < floor(time_shift(__time, 'P1D', 2) TO DAY)
+              AND ceil(__time TO DAY) <= floor(time_shift(__time, 'P1D', 2) TO DAY)
+              AND (ceil(__time TO DAY) <> ceil(time_shift(__time, 'P1D', -2) TO DAY)) IS TRUE
+              AND (ceil(__time TO DAY) = ceil(time_shift(__time, 'P1D', -2) TO DAY)) IS NOT TRUE
+              AND (ceil(__time TO DAY) = ceil(time_shift(__time, 'P1D', -2) TO DAY)) IS FALSE
+              AND (ceil(__time TO DAY) <> ceil(time_shift(__time, 'P1D', -2) TO DAY)) IS NOT FALSE
+              AND ceil(__time TO DAY) BETWEEN ceil(time_shift(__time, 'P1D', -2) TO DAY) AND floor(time_shift(__time, 'P1D', 2) TO DAY)
+              AND ceil(__time TO DAY) NOT BETWEEN ceil(__time TO DAY) AND ceil(time_shift(__time, 'P1D', -2) TO DAY)
+              AND ceil(__time TO DAY) like '%'
+              AND ceil(__time TO DAY) not like '__DOES_NOT_EXIST__%'
+              AND ceil(__time TO DAY) IN (ceil(time_shift(__time, 'P1D', -2) TO DAY),
+                                          ceil(__time TO DAY),
+                                          floor(time_shift(__time, 'P1D', 2) TO DAY))
+              AND ceil(__time TO DAY) NOT IN (ceil(time_shift(__time, 'P1D', -2) TO DAY),
+                                              floor(time_shift(__time, 'P1D', 2) TO DAY))))
+   GROUP BY 1,
+            2,
+            3,
+            4);
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+#-------------------------------------------------------------------------
+# TEST_ID: A17: timestampadd
+#-------------------------------------------------------------------------
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND (timestampadd(DAY, 1, __time) IS NULL
+       OR (timestampadd(DAY, 1, __time) = timestampadd(DAY, 1, __time)
+           AND timestampadd(DAY, 1, __time) IS NOT DISTINCT
+           FROM timestampadd(DAY, 1, __time)
+           AND timestampadd(DAY, 1, __time) <> timestampadd(DAY, -1, __time)
+           AND (timestampadd(DAY, 1, __time) IS DISTINCT
+                FROM timestampadd(DAY, -1, __time))
+           AND timestampadd(DAY, 1, __time) > timestampadd(DAY, -1, __time)
+           AND timestampadd(DAY, 1, __time) >= timestampadd(DAY, -1, __time)
+           AND timestampadd(DAY, 1, __time) < timestampadd(DAY, 2, __time)
+           AND timestampadd(DAY, 1, __time) <= timestampadd(DAY, 2, __time)
+           AND (timestampadd(DAY, 1, __time) <> timestampadd(DAY, -1, __time)) IS TRUE
+           AND (timestampadd(DAY, 1, __time) = timestampadd(DAY, -1, __time)) IS NOT TRUE
+           AND (timestampadd(DAY, 1, __time) = timestampadd(DAY, -1, __time)) IS FALSE
+           AND (timestampadd(DAY, 1, __time) <> timestampadd(DAY, -1, __time)) IS NOT FALSE
+           AND timestampadd(DAY, 1, __time) BETWEEN timestampadd(DAY, -1, __time) AND timestampadd(DAY, 2, __time)
+           AND timestampadd(DAY, 1, __time) NOT BETWEEN timestampadd(DAY, 1, __time) AND timestampadd(DAY, -1, __time)
+           AND timestampadd(DAY, 1, __time) like '%'
+           AND timestampadd(DAY, 1, __time) not like '__DOES_NOT_EXIST__%'
+           AND timestampadd(DAY, 1, __time) IN (timestampadd(DAY, -1, __time),
+                                                timestampadd(DAY, 1, __time),
+                                                timestampadd(DAY, 2, __time))
+           AND timestampadd(DAY, 1, __time) NOT IN (timestampadd(DAY, -1, __time),
+                                                    timestampadd(DAY, 2, __time)))) ;
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND (timestampadd(DAY, 1, __time) IS NULL
+       OR timestampadd(DAY, 1, __time) IN
+         (SELECT timestampadd(DAY, 1, __time)
+          FROM kttm_nested
+          WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+            AND (timestampadd(DAY, 1, __time) IS NULL
+                 OR (timestampadd(DAY, 1, __time) = timestampadd(DAY, 1, __time)
+                     AND timestampadd(DAY, 1, __time) IS NOT DISTINCT
+                     FROM timestampadd(DAY, 1, __time)
+                     AND timestampadd(DAY, 1, __time) <> timestampadd(DAY, -1, __time)
+                     AND (timestampadd(DAY, 1, __time) IS DISTINCT
+                          FROM timestampadd(DAY, -1, __time))
+                     AND timestampadd(DAY, 1, __time) > timestampadd(DAY, -1, __time)
+                     AND timestampadd(DAY, 1, __time) >= timestampadd(DAY, -1, __time)
+                     AND timestampadd(DAY, 1, __time) < timestampadd(DAY, 2, __time)
+                     AND timestampadd(DAY, 1, __time) <= timestampadd(DAY, 2, __time)
+                     AND (timestampadd(DAY, 1, __time) <> timestampadd(DAY, -1, __time)) IS TRUE
+                     AND (timestampadd(DAY, 1, __time) = timestampadd(DAY, -1, __time)) IS NOT TRUE
+                     AND (timestampadd(DAY, 1, __time) = timestampadd(DAY, -1, __time)) IS FALSE
+                     AND (timestampadd(DAY, 1, __time) <> timestampadd(DAY, -1, __time)) IS NOT FALSE
+                     AND timestampadd(DAY, 1, __time) BETWEEN timestampadd(DAY, -1, __time) AND timestampadd(DAY, 2, __time)
+                     AND timestampadd(DAY, 1, __time) NOT BETWEEN timestampadd(DAY, 1, __time) AND timestampadd(DAY, -1, __time)
+                     AND timestampadd(DAY, 1, __time) like '%'
+                     AND timestampadd(DAY, 1, __time) not like '__DOES_NOT_EXIST__%'
+                     AND timestampadd(DAY, 1, __time) IN (timestampadd(DAY, -1, __time),
+                                                          timestampadd(DAY, 1, __time),
+                                                          timestampadd(DAY, 2, __time))
+                     AND timestampadd(DAY, 1, __time) NOT IN (timestampadd(DAY, -1, __time),
+                                                              timestampadd(DAY, 2, __time))))));
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM
+  (SELECT __time, number, client_ip,
+                          timestampadd(DAY, 1, __time),
+                          count(*)
+   FROM kttm_nested
+   WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+     AND (timestampadd(DAY, 1, __time) IS NULL
+          OR (timestampadd(DAY, 1, __time) = timestampadd(DAY, 1, __time)
+              AND timestampadd(DAY, 1, __time) IS NOT DISTINCT
+              FROM timestampadd(DAY, 1, __time)
+              AND timestampadd(DAY, 1, __time) <> timestampadd(DAY, -1, __time)
+              AND (timestampadd(DAY, 1, __time) IS DISTINCT
+                   FROM timestampadd(DAY, -1, __time))
+              AND timestampadd(DAY, 1, __time) > timestampadd(DAY, -1, __time)
+              AND timestampadd(DAY, 1, __time) >= timestampadd(DAY, -1, __time)
+              AND timestampadd(DAY, 1, __time) < timestampadd(DAY, 2, __time)
+              AND timestampadd(DAY, 1, __time) <= timestampadd(DAY, 2, __time)
+              AND (timestampadd(DAY, 1, __time) <> timestampadd(DAY, -1, __time)) IS TRUE
+              AND (timestampadd(DAY, 1, __time) = timestampadd(DAY, -1, __time)) IS NOT TRUE
+              AND (timestampadd(DAY, 1, __time) = timestampadd(DAY, -1, __time)) IS FALSE
+              AND (timestampadd(DAY, 1, __time) <> timestampadd(DAY, -1, __time)) IS NOT FALSE
+              AND timestampadd(DAY, 1, __time) BETWEEN timestampadd(DAY, -1, __time) AND timestampadd(DAY, 2, __time)
+              AND timestampadd(DAY, 1, __time) NOT BETWEEN timestampadd(DAY, 1, __time) AND timestampadd(DAY, -1, __time)
+              AND timestampadd(DAY, 1, __time) like '%'
+              AND timestampadd(DAY, 1, __time) not like '__DOES_NOT_EXIST__%'
+              AND timestampadd(DAY, 1, __time) IN (timestampadd(DAY, -1, __time),
+                                                   timestampadd(DAY, 1, __time),
+                                                   timestampadd(DAY, 2, __time))
+              AND timestampadd(DAY, 1, __time) NOT IN (timestampadd(DAY, -1, __time),
+                                                       timestampadd(DAY, 2, __time))))
+   GROUP BY 1,
+            2,
+            3,
+            4);
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+#-------------------------------------------------------------------------
+# TEST_ID: A18: timestampdiff
+#-------------------------------------------------------------------------
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND (timestampdiff(DAY, __time, timestampadd(DAY, 2, __time)) IS NULL
+       OR (timestampdiff(DAY, __time, timestampadd(DAY, 2, __time)) = timestampdiff(DAY, __time, timestampadd(DAY, 2, __time))
+           AND timestampdiff(DAY, __time, timestampadd(DAY, 2, __time)) IS NOT DISTINCT
+           FROM timestampdiff(DAY, __time, timestampadd(DAY, 2, __time))
+           AND timestampdiff(DAY, __time, timestampadd(DAY, 2, __time)) <> timestampdiff(DAY, __time, timestampadd(DAY, 1, __time))
+           AND (timestampdiff(DAY, __time, timestampadd(DAY, 2, __time)) IS DISTINCT
+                FROM timestampdiff(DAY, __time, timestampadd(DAY, 1, __time)))
+           AND timestampdiff(DAY, __time, timestampadd(DAY, 2, __time)) > timestampdiff(DAY, __time, timestampadd(DAY, 1, __time))
+           AND timestampdiff(DAY, __time, timestampadd(DAY, 2, __time)) >= timestampdiff(DAY, __time, timestampadd(DAY, 1, __time))
+           AND timestampdiff(DAY, __time, timestampadd(DAY, 2, __time)) < timestampdiff(DAY, __time, timestampadd(DAY, 3, __time))
+           AND timestampdiff(DAY, __time, timestampadd(DAY, 2, __time)) <= timestampdiff(DAY, __time, timestampadd(DAY, 3, __time))
+           AND (timestampdiff(DAY, __time, timestampadd(DAY, 2, __time)) <> timestampdiff(DAY, __time, timestampadd(DAY, 1, __time))) IS TRUE
+           AND (timestampdiff(DAY, __time, timestampadd(DAY, 2, __time)) = timestampdiff(DAY, __time, timestampadd(DAY, 1, __time))) IS NOT TRUE
+           AND (timestampdiff(DAY, __time, timestampadd(DAY, 2, __time)) = timestampdiff(DAY, __time, timestampadd(DAY, 1, __time))) IS FALSE
+           AND (timestampdiff(DAY, __time, timestampadd(DAY, 2, __time)) <> timestampdiff(DAY, __time, timestampadd(DAY, 1, __time))) IS NOT FALSE
+           AND timestampdiff(DAY, __time, timestampadd(DAY, 2, __time)) BETWEEN timestampdiff(DAY, __time, timestampadd(DAY, 1, __time)) AND timestampdiff(DAY, __time, timestampadd(DAY, 3, __time))
+           AND timestampdiff(DAY, __time, timestampadd(DAY, 2, __time)) NOT BETWEEN timestampdiff(DAY, __time, timestampadd(DAY, 2, __time)) AND timestampdiff(DAY, __time, timestampadd(DAY, 1, __time))
+           AND timestampdiff(DAY, __time, timestampadd(DAY, 2, __time)) like '%'
+           AND timestampdiff(DAY, __time, timestampadd(DAY, 2, __time)) not like '__DOES_NOT_EXIST__%'
+           AND timestampdiff(DAY, __time, timestampadd(DAY, 2, __time)) IN (timestampdiff(DAY, __time, timestampadd(DAY, 1, __time)),
+                                                                            timestampdiff(DAY, __time, timestampadd(DAY, 2, __time)),
+                                                                            timestampdiff(DAY, __time, timestampadd(DAY, 3, __time)))
+           AND timestampdiff(DAY, __time, timestampadd(DAY, 2, __time)) NOT IN (timestampdiff(DAY, __time, timestampadd(DAY, 1, __time)),
+                                                                                timestampdiff(DAY, __time, timestampadd(DAY, 3, __time))))) ;
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND (timestampdiff(DAY, __time, timestampadd(DAY, 2, __time)) IS NULL
+       OR timestampdiff(DAY, __time, timestampadd(DAY, 2, __time)) IN
+         (SELECT timestampdiff(DAY, __time, timestampadd(DAY, 2, __time))
+          FROM kttm_nested
+          WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+            AND (timestampdiff(DAY, __time, timestampadd(DAY, 2, __time)) IS NULL
+                 OR (timestampdiff(DAY, __time, timestampadd(DAY, 2, __time)) = timestampdiff(DAY, __time, timestampadd(DAY, 2, __time))
+                     AND timestampdiff(DAY, __time, timestampadd(DAY, 2, __time)) IS NOT DISTINCT
+                     FROM timestampdiff(DAY, __time, timestampadd(DAY, 2, __time))
+                     AND timestampdiff(DAY, __time, timestampadd(DAY, 2, __time)) <> timestampdiff(DAY, __time, timestampadd(DAY, 1, __time))
+                     AND (timestampdiff(DAY, __time, timestampadd(DAY, 2, __time)) IS DISTINCT
+                          FROM timestampdiff(DAY, __time, timestampadd(DAY, 1, __time)))
+                     AND timestampdiff(DAY, __time, timestampadd(DAY, 2, __time)) > timestampdiff(DAY, __time, timestampadd(DAY, 1, __time))
+                     AND timestampdiff(DAY, __time, timestampadd(DAY, 2, __time)) >= timestampdiff(DAY, __time, timestampadd(DAY, 1, __time))
+                     AND timestampdiff(DAY, __time, timestampadd(DAY, 2, __time)) < timestampdiff(DAY, __time, timestampadd(DAY, 3, __time))
+                     AND timestampdiff(DAY, __time, timestampadd(DAY, 2, __time)) <= timestampdiff(DAY, __time, timestampadd(DAY, 3, __time))
+                     AND (timestampdiff(DAY, __time, timestampadd(DAY, 2, __time)) <> timestampdiff(DAY, __time, timestampadd(DAY, 1, __time))) IS TRUE
+                     AND (timestampdiff(DAY, __time, timestampadd(DAY, 2, __time)) = timestampdiff(DAY, __time, timestampadd(DAY, 1, __time))) IS NOT TRUE
+                     AND (timestampdiff(DAY, __time, timestampadd(DAY, 2, __time)) = timestampdiff(DAY, __time, timestampadd(DAY, 1, __time))) IS FALSE
+                     AND (timestampdiff(DAY, __time, timestampadd(DAY, 2, __time)) <> timestampdiff(DAY, __time, timestampadd(DAY, 1, __time))) IS NOT FALSE
+                     AND timestampdiff(DAY, __time, timestampadd(DAY, 2, __time)) BETWEEN timestampdiff(DAY, __time, timestampadd(DAY, 1, __time)) AND timestampdiff(DAY, __time, timestampadd(DAY, 3, __time))
+                     AND timestampdiff(DAY, __time, timestampadd(DAY, 2, __time)) NOT BETWEEN timestampdiff(DAY, __time, timestampadd(DAY, 2, __time)) AND timestampdiff(DAY, __time, timestampadd(DAY, 1, __time))
+                     AND timestampdiff(DAY, __time, timestampadd(DAY, 2, __time)) like '%'
+                     AND timestampdiff(DAY, __time, timestampadd(DAY, 2, __time)) not like '__DOES_NOT_EXIST__%'
+                     AND timestampdiff(DAY, __time, timestampadd(DAY, 2, __time)) IN (timestampdiff(DAY, __time, timestampadd(DAY, 1, __time)),
+                                                                                      timestampdiff(DAY, __time, timestampadd(DAY, 2, __time)),
+                                                                                      timestampdiff(DAY, __time, timestampadd(DAY, 3, __time)))
+                     AND timestampdiff(DAY, __time, timestampadd(DAY, 2, __time)) NOT IN (timestampdiff(DAY, __time, timestampadd(DAY, 1, __time)),
+                                                                                          timestampdiff(DAY, __time, timestampadd(DAY, 3, __time)))))));
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM
+  (SELECT __time, number, client_ip,
+                          timestampdiff(DAY, __time, timestampadd(DAY, 2, __time)),
+                          count(*)
+   FROM kttm_nested
+   WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+     AND (timestampdiff(DAY, __time, timestampadd(DAY, 2, __time)) IS NULL
+          OR (timestampdiff(DAY, __time, timestampadd(DAY, 2, __time)) = timestampdiff(DAY, __time, timestampadd(DAY, 2, __time))
+              AND timestampdiff(DAY, __time, timestampadd(DAY, 2, __time)) IS NOT DISTINCT
+              FROM timestampdiff(DAY, __time, timestampadd(DAY, 2, __time))
+              AND timestampdiff(DAY, __time, timestampadd(DAY, 2, __time)) <> timestampdiff(DAY, __time, timestampadd(DAY, 1, __time))
+              AND (timestampdiff(DAY, __time, timestampadd(DAY, 2, __time)) IS DISTINCT
+                   FROM timestampdiff(DAY, __time, timestampadd(DAY, 1, __time)))
+              AND timestampdiff(DAY, __time, timestampadd(DAY, 2, __time)) > timestampdiff(DAY, __time, timestampadd(DAY, 1, __time))
+              AND timestampdiff(DAY, __time, timestampadd(DAY, 2, __time)) >= timestampdiff(DAY, __time, timestampadd(DAY, 1, __time))
+              AND timestampdiff(DAY, __time, timestampadd(DAY, 2, __time)) < timestampdiff(DAY, __time, timestampadd(DAY, 3, __time))
+              AND timestampdiff(DAY, __time, timestampadd(DAY, 2, __time)) <= timestampdiff(DAY, __time, timestampadd(DAY, 3, __time))
+              AND (timestampdiff(DAY, __time, timestampadd(DAY, 2, __time)) <> timestampdiff(DAY, __time, timestampadd(DAY, 1, __time))) IS TRUE
+              AND (timestampdiff(DAY, __time, timestampadd(DAY, 2, __time)) = timestampdiff(DAY, __time, timestampadd(DAY, 1, __time))) IS NOT TRUE
+              AND (timestampdiff(DAY, __time, timestampadd(DAY, 2, __time)) = timestampdiff(DAY, __time, timestampadd(DAY, 1, __time))) IS FALSE
+              AND (timestampdiff(DAY, __time, timestampadd(DAY, 2, __time)) <> timestampdiff(DAY, __time, timestampadd(DAY, 1, __time))) IS NOT FALSE
+              AND timestampdiff(DAY, __time, timestampadd(DAY, 2, __time)) BETWEEN timestampdiff(DAY, __time, timestampadd(DAY, 1, __time)) AND timestampdiff(DAY, __time, timestampadd(DAY, 3, __time))
+              AND timestampdiff(DAY, __time, timestampadd(DAY, 2, __time)) NOT BETWEEN timestampdiff(DAY, __time, timestampadd(DAY, 2, __time)) AND timestampdiff(DAY, __time, timestampadd(DAY, 1, __time))
+              AND timestampdiff(DAY, __time, timestampadd(DAY, 2, __time)) like '%'
+              AND timestampdiff(DAY, __time, timestampadd(DAY, 2, __time)) not like '__DOES_NOT_EXIST__%'
+              AND timestampdiff(DAY, __time, timestampadd(DAY, 2, __time)) IN (timestampdiff(DAY, __time, timestampadd(DAY, 1, __time)),
+                                                                               timestampdiff(DAY, __time, timestampadd(DAY, 2, __time)),
+                                                                               timestampdiff(DAY, __time, timestampadd(DAY, 3, __time)))
+              AND timestampdiff(DAY, __time, timestampadd(DAY, 2, __time)) NOT IN (timestampdiff(DAY, __time, timestampadd(DAY, 1, __time)),
+                                                                                   timestampdiff(DAY, __time, timestampadd(DAY, 3, __time)))))
+   GROUP BY 1,
+            2,
+            3,
+            4);
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+#-------------------------------------------------------------------------
+# Total query count 55
+#-------------------------------------------------------------------------
diff --git a/quidem-ut/src/test/quidem/org.apache.druid.quidem.QTest/qaSQL_scalar_numeric.iq b/quidem-ut/src/test/quidem/org.apache.druid.quidem.QTest/qaSQL_scalar_numeric.iq
new file mode 100644
index 000000000000..03da6f7646c1
--- /dev/null
+++ b/quidem-ut/src/test/quidem/org.apache.druid.quidem.QTest/qaSQL_scalar_numeric.iq
@@ -0,0 +1,4482 @@
+!set useApproximateCountDistinct false
+!use druidtest:///?componentSupplier=KttmNestedComponentSupplier
+!set outputformat mysql
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00';
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+#-------------------------------------------------------------------------
+# TEST_ID: A1: plain_value_numeric
+#-------------------------------------------------------------------------
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND (session_length IS NULL
+       OR (session_length = session_length
+           AND session_length IS NOT DISTINCT
+           FROM session_length
+           AND session_length <> session_length-1
+           AND (session_length IS DISTINCT
+                FROM session_length-1)
+           AND session_length > session_length-1
+           AND session_length >= session_length-1
+           AND session_length < session_length+1
+           AND session_length <= session_length+1
+           AND (session_length <> session_length-1) IS TRUE
+           AND (session_length = session_length-1) IS NOT TRUE
+           AND (session_length = session_length-1) IS FALSE
+           AND (session_length <> session_length-1) IS NOT FALSE
+           AND session_length BETWEEN session_length-1 AND session_length+1
+           AND session_length NOT BETWEEN session_length AND session_length-1
+           AND session_length like '%'
+           AND session_length not like '__DOES_NOT_EXIST__%'
+           AND session_length IN (session_length-1,
+                                                session_length,
+                                                session_length+1)
+           AND session_length NOT IN (session_length-1,
+                                                    session_length+1))) ;
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND (session_length IS NULL
+       OR session_length IN
+         (SELECT session_length
+          FROM kttm_nested
+          WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+            AND (session_length IS NULL
+                 OR (session_length = session_length
+                     AND session_length IS NOT DISTINCT
+                     FROM session_length
+                     AND session_length <> session_length-1
+                     AND (session_length IS DISTINCT
+                          FROM session_length-1)
+                     AND session_length > session_length-1
+                     AND session_length >= session_length-1
+                     AND session_length < session_length+1
+                     AND session_length <= session_length+1
+                     AND (session_length <> session_length-1) IS TRUE
+                     AND (session_length = session_length-1) IS NOT TRUE
+                     AND (session_length = session_length-1) IS FALSE
+                     AND (session_length <> session_length-1) IS NOT FALSE
+                     AND session_length BETWEEN session_length-1 AND session_length+1
+                     AND session_length NOT BETWEEN session_length AND session_length-1
+                     AND session_length like '%'
+                     AND session_length not like '__DOES_NOT_EXIST__%'
+                     AND session_length IN (session_length-1,
+                                                          session_length,
+                                                          session_length+1)
+                     AND session_length NOT IN (session_length-1,
+                                                              session_length+1)))));
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM
+  (SELECT __time, number, client_ip,
+                          session_length,
+                          count(*)
+   FROM kttm_nested
+   WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+     AND (session_length IS NULL
+          OR (session_length = session_length
+              AND session_length IS NOT DISTINCT
+              FROM session_length
+              AND session_length <> session_length-1
+              AND (session_length IS DISTINCT
+                   FROM session_length-1)
+              AND session_length > session_length-1
+              AND session_length >= session_length-1
+              AND session_length < session_length+1
+              AND session_length <= session_length+1
+              AND (session_length <> session_length-1) IS TRUE
+              AND (session_length = session_length-1) IS NOT TRUE
+              AND (session_length = session_length-1) IS FALSE
+              AND (session_length <> session_length-1) IS NOT FALSE
+              AND session_length BETWEEN session_length-1 AND session_length+1
+              AND session_length NOT BETWEEN session_length AND session_length-1
+              AND session_length like '%'
+              AND session_length not like '__DOES_NOT_EXIST__%'
+              AND session_length IN (session_length-1,
+                                                   session_length,
+                                                   session_length+1)
+              AND session_length NOT IN (session_length-1,
+                                                       session_length+1)))
+   GROUP BY 1,
+            2,
+            3,
+            4);
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+#-------------------------------------------------------------------------
+# TEST_ID: A2: pi
+#-------------------------------------------------------------------------
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND (pi IS NULL
+       OR (pi = pi+0
+           AND pi IS NOT DISTINCT
+           FROM pi+0
+           AND pi <> pi-1
+           AND (pi IS DISTINCT
+                FROM pi-1)
+           AND pi > pi-1
+           AND pi >= pi-1
+           AND pi < pi+1
+           AND pi <= pi+1
+           AND (pi <> pi-1) IS TRUE
+           AND (pi = pi-1) IS NOT TRUE
+           AND (pi = pi-1) IS FALSE
+           AND (pi <> pi-1) IS NOT FALSE
+           AND pi BETWEEN pi-1 AND pi+1
+           AND pi NOT BETWEEN pi AND pi-1
+           AND pi like '%'
+           AND pi not like '__DOES_NOT_EXIST__%'
+           AND pi IN (pi-1,
+                        pi+0,
+                        pi+1)
+           AND pi NOT IN (pi-1,
+                            pi+1))) ;
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND (pi IS NULL
+       OR pi IN
+         (SELECT pi
+          FROM kttm_nested
+          WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+            AND (pi IS NULL
+                 OR (pi = pi+0
+                     AND pi IS NOT DISTINCT
+                     FROM pi+0
+                     AND pi <> pi-1
+                     AND (pi IS DISTINCT
+                          FROM pi-1)
+                     AND pi > pi-1
+                     AND pi >= pi-1
+                     AND pi < pi+1
+                     AND pi <= pi+1
+                     AND (pi <> pi-1) IS TRUE
+                     AND (pi = pi-1) IS NOT TRUE
+                     AND (pi = pi-1) IS FALSE
+                     AND (pi <> pi-1) IS NOT FALSE
+                     AND pi BETWEEN pi-1 AND pi+1
+                     AND pi NOT BETWEEN pi AND pi-1
+                     AND pi like '%'
+                     AND pi not like '__DOES_NOT_EXIST__%'
+                     AND pi IN (pi-1,
+                                  pi+0,
+                                  pi+1)
+                     AND pi NOT IN (pi-1,
+                                      pi+1)))));
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM
+  (SELECT __time, number, client_ip,
+                          pi,
+                          count(*)
+   FROM kttm_nested
+   WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+     AND (pi IS NULL
+          OR (pi = pi+0
+              AND pi IS NOT DISTINCT
+              FROM pi+0
+              AND pi <> pi-1
+              AND (pi IS DISTINCT
+                   FROM pi-1)
+              AND pi > pi-1
+              AND pi >= pi-1
+              AND pi < pi+1
+              AND pi <= pi+1
+              AND (pi <> pi-1) IS TRUE
+              AND (pi = pi-1) IS NOT TRUE
+              AND (pi = pi-1) IS FALSE
+              AND (pi <> pi-1) IS NOT FALSE
+              AND pi BETWEEN pi-1 AND pi+1
+              AND pi NOT BETWEEN pi AND pi-1
+              AND pi like '%'
+              AND pi not like '__DOES_NOT_EXIST__%'
+              AND pi IN (pi-1,
+                           pi+0,
+                           pi+1)
+              AND pi NOT IN (pi-1,
+                               pi+1)))
+   GROUP BY 1,
+            2,
+            3,
+            4);
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+#-------------------------------------------------------------------------
+# TEST_ID: A3: abs
+#-------------------------------------------------------------------------
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND (abs(session_length) IS NULL
+       OR (abs(session_length) = abs(session_length)+0
+           AND abs(session_length) IS NOT DISTINCT
+           FROM abs(session_length)+0
+           AND abs(session_length) <> abs(session_length)-1
+           AND (abs(session_length) IS DISTINCT
+                FROM abs(session_length)-1)
+           AND abs(session_length) > abs(session_length)-1
+           AND abs(session_length) >= abs(session_length)-1
+           AND abs(session_length) < abs(session_length)+1
+           AND abs(session_length) <= abs(session_length)+1
+           AND (abs(session_length) <> abs(session_length)-1) IS TRUE
+           AND (abs(session_length) = abs(session_length)-1) IS NOT TRUE
+           AND (abs(session_length) = abs(session_length)-1) IS FALSE
+           AND (abs(session_length) <> abs(session_length)-1) IS NOT FALSE
+           AND abs(session_length) BETWEEN abs(session_length)-1 AND abs(session_length)+1
+           AND abs(session_length) NOT BETWEEN abs(session_length) AND abs(session_length)-1
+           AND abs(session_length) like '%'
+           AND abs(session_length) not like '__DOES_NOT_EXIST__%'
+           AND abs(session_length) IN (abs(session_length)-1,
+                                                          abs(session_length)+0,
+                                                          abs(session_length)+1)
+           AND abs(session_length) NOT IN (abs(session_length)-1,
+                                                              abs(session_length)+1))) ;
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND (abs(session_length) IS NULL
+       OR abs(session_length) IN
+         (SELECT abs(session_length)
+          FROM kttm_nested
+          WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+            AND (abs(session_length) IS NULL
+                 OR (abs(session_length) = abs(session_length)+0
+                     AND abs(session_length) IS NOT DISTINCT
+                     FROM abs(session_length)+0
+                     AND abs(session_length) <> abs(session_length)-1
+                     AND (abs(session_length) IS DISTINCT
+                          FROM abs(session_length)-1)
+                     AND abs(session_length) > abs(session_length)-1
+                     AND abs(session_length) >= abs(session_length)-1
+                     AND abs(session_length) < abs(session_length)+1
+                     AND abs(session_length) <= abs(session_length)+1
+                     AND (abs(session_length) <> abs(session_length)-1) IS TRUE
+                     AND (abs(session_length) = abs(session_length)-1) IS NOT TRUE
+                     AND (abs(session_length) = abs(session_length)-1) IS FALSE
+                     AND (abs(session_length) <> abs(session_length)-1) IS NOT FALSE
+                     AND abs(session_length) BETWEEN abs(session_length)-1 AND abs(session_length)+1
+                     AND abs(session_length) NOT BETWEEN abs(session_length) AND abs(session_length)-1
+                     AND abs(session_length) like '%'
+                     AND abs(session_length) not like '__DOES_NOT_EXIST__%'
+                     AND abs(session_length) IN (abs(session_length)-1,
+                                                                    abs(session_length)+0,
+                                                                    abs(session_length)+1)
+                     AND abs(session_length) NOT IN (abs(session_length)-1,
+                                                                        abs(session_length)+1)))));
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM
+  (SELECT __time, number, client_ip,
+                          abs(session_length),
+                          count(*)
+   FROM kttm_nested
+   WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+     AND (abs(session_length) IS NULL
+          OR (abs(session_length) = abs(session_length)+0
+              AND abs(session_length) IS NOT DISTINCT
+              FROM abs(session_length)+0
+              AND abs(session_length) <> abs(session_length)-1
+              AND (abs(session_length) IS DISTINCT
+                   FROM abs(session_length)-1)
+              AND abs(session_length) > abs(session_length)-1
+              AND abs(session_length) >= abs(session_length)-1
+              AND abs(session_length) < abs(session_length)+1
+              AND abs(session_length) <= abs(session_length)+1
+              AND (abs(session_length) <> abs(session_length)-1) IS TRUE
+              AND (abs(session_length) = abs(session_length)-1) IS NOT TRUE
+              AND (abs(session_length) = abs(session_length)-1) IS FALSE
+              AND (abs(session_length) <> abs(session_length)-1) IS NOT FALSE
+              AND abs(session_length) BETWEEN abs(session_length)-1 AND abs(session_length)+1
+              AND abs(session_length) NOT BETWEEN abs(session_length) AND abs(session_length)-1
+              AND abs(session_length) like '%'
+              AND abs(session_length) not like '__DOES_NOT_EXIST__%'
+              AND abs(session_length) IN (abs(session_length)-1,
+                                                             abs(session_length)+0,
+                                                             abs(session_length)+1)
+              AND abs(session_length) NOT IN (abs(session_length)-1,
+                                                                 abs(session_length)+1)))
+   GROUP BY 1,
+            2,
+            3,
+            4);
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+#-------------------------------------------------------------------------
+# TEST_ID: A4: ceil
+#-------------------------------------------------------------------------
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND (ceil(session_length) IS NULL
+       OR (ceil(session_length) = ceil(session_length)+0
+           AND ceil(session_length) IS NOT DISTINCT
+           FROM ceil(session_length)+0
+           AND ceil(session_length) <> ceil(session_length)-1
+           AND (ceil(session_length) IS DISTINCT
+                FROM ceil(session_length)-1)
+           AND ceil(session_length) > ceil(session_length)-1
+           AND ceil(session_length) >= ceil(session_length)-1
+           AND ceil(session_length) < ceil(session_length)+1
+           AND ceil(session_length) <= ceil(session_length)+1
+           AND (ceil(session_length) <> ceil(session_length)-1) IS TRUE
+           AND (ceil(session_length) = ceil(session_length)-1) IS NOT TRUE
+           AND (ceil(session_length) = ceil(session_length)-1) IS FALSE
+           AND (ceil(session_length) <> ceil(session_length)-1) IS NOT FALSE
+           AND ceil(session_length) BETWEEN ceil(session_length)-1 AND ceil(session_length)+1
+           AND ceil(session_length) NOT BETWEEN ceil(session_length) AND ceil(session_length)-1
+           AND ceil(session_length) like '%'
+           AND ceil(session_length) not like '__DOES_NOT_EXIST__%'
+           AND ceil(session_length) IN (ceil(session_length)-1,
+                                                            ceil(session_length)+0,
+                                                            ceil(session_length)+1)
+           AND ceil(session_length) NOT IN (ceil(session_length)-1,
+                                                                ceil(session_length)+1))) ;
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND (ceil(session_length) IS NULL
+       OR ceil(session_length) IN
+         (SELECT ceil(session_length)
+          FROM kttm_nested
+          WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+            AND (ceil(session_length) IS NULL
+                 OR (ceil(session_length) = ceil(session_length)+0
+                     AND ceil(session_length) IS NOT DISTINCT
+                     FROM ceil(session_length)+0
+                     AND ceil(session_length) <> ceil(session_length)-1
+                     AND (ceil(session_length) IS DISTINCT
+                          FROM ceil(session_length)-1)
+                     AND ceil(session_length) > ceil(session_length)-1
+                     AND ceil(session_length) >= ceil(session_length)-1
+                     AND ceil(session_length) < ceil(session_length)+1
+                     AND ceil(session_length) <= ceil(session_length)+1
+                     AND (ceil(session_length) <> ceil(session_length)-1) IS TRUE
+                     AND (ceil(session_length) = ceil(session_length)-1) IS NOT TRUE
+                     AND (ceil(session_length) = ceil(session_length)-1) IS FALSE
+                     AND (ceil(session_length) <> ceil(session_length)-1) IS NOT FALSE
+                     AND ceil(session_length) BETWEEN ceil(session_length)-1 AND ceil(session_length)+1
+                     AND ceil(session_length) NOT BETWEEN ceil(session_length) AND ceil(session_length)-1
+                     AND ceil(session_length) like '%'
+                     AND ceil(session_length) not like '__DOES_NOT_EXIST__%'
+                     AND ceil(session_length) IN (ceil(session_length)-1,
+                                                                      ceil(session_length)+0,
+                                                                      ceil(session_length)+1)
+                     AND ceil(session_length) NOT IN (ceil(session_length)-1,
+                                                                          ceil(session_length)+1)))));
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM
+  (SELECT __time, number, client_ip,
+                          ceil(session_length),
+                          count(*)
+   FROM kttm_nested
+   WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+     AND (ceil(session_length) IS NULL
+          OR (ceil(session_length) = ceil(session_length)+0
+              AND ceil(session_length) IS NOT DISTINCT
+              FROM ceil(session_length)+0
+              AND ceil(session_length) <> ceil(session_length)-1
+              AND (ceil(session_length) IS DISTINCT
+                   FROM ceil(session_length)-1)
+              AND ceil(session_length) > ceil(session_length)-1
+              AND ceil(session_length) >= ceil(session_length)-1
+              AND ceil(session_length) < ceil(session_length)+1
+              AND ceil(session_length) <= ceil(session_length)+1
+              AND (ceil(session_length) <> ceil(session_length)-1) IS TRUE
+              AND (ceil(session_length) = ceil(session_length)-1) IS NOT TRUE
+              AND (ceil(session_length) = ceil(session_length)-1) IS FALSE
+              AND (ceil(session_length) <> ceil(session_length)-1) IS NOT FALSE
+              AND ceil(session_length) BETWEEN ceil(session_length)-1 AND ceil(session_length)+1
+              AND ceil(session_length) NOT BETWEEN ceil(session_length) AND ceil(session_length)-1
+              AND ceil(session_length) like '%'
+              AND ceil(session_length) not like '__DOES_NOT_EXIST__%'
+              AND ceil(session_length) IN (ceil(session_length)-1,
+                                                               ceil(session_length)+0,
+                                                               ceil(session_length)+1)
+              AND ceil(session_length) NOT IN (ceil(session_length)-1,
+                                                                   ceil(session_length)+1)))
+   GROUP BY 1,
+            2,
+            3,
+            4);
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+#-------------------------------------------------------------------------
+# TEST_ID: A5: exp
+#-------------------------------------------------------------------------
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND (floor(exp(least(session_length, 10))) IS NULL
+       OR (floor(exp(least(session_length, 10))) = floor(exp(least(session_length, 10)))+0
+           AND floor(exp(least(session_length, 10))) IS NOT DISTINCT
+           FROM floor(exp(least(session_length, 10)))+0
+           AND floor(exp(least(session_length, 10))) <> floor(exp(least(session_length, 10)))-1
+           AND (floor(exp(least(session_length, 10))) IS DISTINCT
+                FROM floor(exp(least(session_length, 10)))-1)
+           AND floor(exp(least(session_length, 10))) > floor(exp(least(session_length, 10)))-1
+           AND floor(exp(least(session_length, 10))) >= floor(exp(least(session_length, 10)))-1
+           AND floor(exp(least(session_length, 10))) < floor(exp(least(session_length, 10)))+1
+           AND floor(exp(least(session_length, 10))) <= floor(exp(least(session_length, 10)))+1
+           AND (floor(exp(least(session_length, 10))) <> floor(exp(least(session_length, 10)))-1) IS TRUE
+           AND (floor(exp(least(session_length, 10))) = floor(exp(least(session_length, 10)))-1) IS NOT TRUE
+           AND (floor(exp(least(session_length, 10))) = floor(exp(least(session_length, 10)))-1) IS FALSE
+           AND (floor(exp(least(session_length, 10))) <> floor(exp(least(session_length, 10)))-1) IS NOT FALSE
+           AND floor(exp(least(session_length, 10))) BETWEEN floor(exp(least(session_length, 10)))-1 AND floor(exp(least(session_length, 10)))+1
+           AND floor(exp(least(session_length, 10))) NOT BETWEEN floor(exp(least(session_length, 10))) AND floor(exp(least(session_length, 10)))-1
+           AND floor(exp(least(session_length, 10))) like '%'
+           AND floor(exp(least(session_length, 10))) not like '__DOES_NOT_EXIST__%'
+           AND floor(exp(least(session_length, 10))) IN (floor(exp(least(session_length, 10)))-1,
+                                                                                              floor(exp(least(session_length, 10)))+0,
+                                                                                              floor(exp(least(session_length, 10)))+1)
+           AND floor(exp(least(session_length, 10))) NOT IN (floor(exp(least(session_length, 10)))-1,
+                                                                                                  floor(exp(least(session_length, 10)))+1))) ;
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND (floor(exp(least(session_length, 10))) IS NULL
+       OR floor(exp(least(session_length, 10))) IN
+         (SELECT floor(exp(least(session_length, 10)))
+          FROM kttm_nested
+          WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+            AND (floor(exp(least(session_length, 10))) IS NULL
+                 OR (floor(exp(least(session_length, 10))) = floor(exp(least(session_length, 10)))+0
+                     AND floor(exp(least(session_length, 10))) IS NOT DISTINCT
+                     FROM floor(exp(least(session_length, 10)))+0
+                     AND floor(exp(least(session_length, 10))) <> floor(exp(least(session_length, 10)))-1
+                     AND (floor(exp(least(session_length, 10))) IS DISTINCT
+                          FROM floor(exp(least(session_length, 10)))-1)
+                     AND floor(exp(least(session_length, 10))) > floor(exp(least(session_length, 10)))-1
+                     AND floor(exp(least(session_length, 10))) >= floor(exp(least(session_length, 10)))-1
+                     AND floor(exp(least(session_length, 10))) < floor(exp(least(session_length, 10)))+1
+                     AND floor(exp(least(session_length, 10))) <= floor(exp(least(session_length, 10)))+1
+                     AND (floor(exp(least(session_length, 10))) <> floor(exp(least(session_length, 10)))-1) IS TRUE
+                     AND (floor(exp(least(session_length, 10))) = floor(exp(least(session_length, 10)))-1) IS NOT TRUE
+                     AND (floor(exp(least(session_length, 10))) = floor(exp(least(session_length, 10)))-1) IS FALSE
+                     AND (floor(exp(least(session_length, 10))) <> floor(exp(least(session_length, 10)))-1) IS NOT FALSE
+                     AND floor(exp(least(session_length, 10))) BETWEEN floor(exp(least(session_length, 10)))-1 AND floor(exp(least(session_length, 10)))+1
+                     AND floor(exp(least(session_length, 10))) NOT BETWEEN floor(exp(least(session_length, 10))) AND floor(exp(least(session_length, 10)))-1
+                     AND floor(exp(least(session_length, 10))) like '%'
+                     AND floor(exp(least(session_length, 10))) not like '__DOES_NOT_EXIST__%'
+                     AND floor(exp(least(session_length, 10))) IN (floor(exp(least(session_length, 10)))-1,
+                                                                                                        floor(exp(least(session_length, 10)))+0,
+                                                                                                        floor(exp(least(session_length, 10)))+1)
+                     AND floor(exp(least(session_length, 10))) NOT IN (floor(exp(least(session_length, 10)))-1,
+                                                                                                            floor(exp(least(session_length, 10)))+1)))));
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM
+  (SELECT __time, number, client_ip,
+                          floor(exp(least(session_length, 10))),
+                          count(*)
+   FROM kttm_nested
+   WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+     AND (floor(exp(least(session_length, 10))) IS NULL
+          OR (floor(exp(least(session_length, 10))) = floor(exp(least(session_length, 10)))+0
+              AND floor(exp(least(session_length, 10))) IS NOT DISTINCT
+              FROM floor(exp(least(session_length, 10)))+0
+              AND floor(exp(least(session_length, 10))) <> floor(exp(least(session_length, 10)))-1
+              AND (floor(exp(least(session_length, 10))) IS DISTINCT
+                   FROM floor(exp(least(session_length, 10)))-1)
+              AND floor(exp(least(session_length, 10))) > floor(exp(least(session_length, 10)))-1
+              AND floor(exp(least(session_length, 10))) >= floor(exp(least(session_length, 10)))-1
+              AND floor(exp(least(session_length, 10))) < floor(exp(least(session_length, 10)))+1
+              AND floor(exp(least(session_length, 10))) <= floor(exp(least(session_length, 10)))+1
+              AND (floor(exp(least(session_length, 10))) <> floor(exp(least(session_length, 10)))-1) IS TRUE
+              AND (floor(exp(least(session_length, 10))) = floor(exp(least(session_length, 10)))-1) IS NOT TRUE
+              AND (floor(exp(least(session_length, 10))) = floor(exp(least(session_length, 10)))-1) IS FALSE
+              AND (floor(exp(least(session_length, 10))) <> floor(exp(least(session_length, 10)))-1) IS NOT FALSE
+              AND floor(exp(least(session_length, 10))) BETWEEN floor(exp(least(session_length, 10)))-1 AND floor(exp(least(session_length, 10)))+1
+              AND floor(exp(least(session_length, 10))) NOT BETWEEN floor(exp(least(session_length, 10))) AND floor(exp(least(session_length, 10)))-1
+              AND floor(exp(least(session_length, 10))) like '%'
+              AND floor(exp(least(session_length, 10))) not like '__DOES_NOT_EXIST__%'
+              AND floor(exp(least(session_length, 10))) IN (floor(exp(least(session_length, 10)))-1,
+                                                                                                 floor(exp(least(session_length, 10)))+0,
+                                                                                                 floor(exp(least(session_length, 10)))+1)
+              AND floor(exp(least(session_length, 10))) NOT IN (floor(exp(least(session_length, 10)))-1,
+                                                                                                     floor(exp(least(session_length, 10)))+1)))
+   GROUP BY 1,
+            2,
+            3,
+            4);
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+#-------------------------------------------------------------------------
+# TEST_ID: A6: floor
+#-------------------------------------------------------------------------
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND (floor(session_length) IS NULL
+       OR (floor(session_length) = floor(session_length)+0
+           AND floor(session_length) IS NOT DISTINCT
+           FROM floor(session_length)+0
+           AND floor(session_length) <> floor(session_length)-1
+           AND (floor(session_length) IS DISTINCT
+                FROM floor(session_length)-1)
+           AND floor(session_length) > floor(session_length)-1
+           AND floor(session_length) >= floor(session_length)-1
+           AND floor(session_length) < floor(session_length)+1
+           AND floor(session_length) <= floor(session_length)+1
+           AND (floor(session_length) <> floor(session_length)-1) IS TRUE
+           AND (floor(session_length) = floor(session_length)-1) IS NOT TRUE
+           AND (floor(session_length) = floor(session_length)-1) IS FALSE
+           AND (floor(session_length) <> floor(session_length)-1) IS NOT FALSE
+           AND floor(session_length) BETWEEN floor(session_length)-1 AND floor(session_length)+1
+           AND floor(session_length) NOT BETWEEN floor(session_length) AND floor(session_length)-1
+           AND floor(session_length) like '%'
+           AND floor(session_length) not like '__DOES_NOT_EXIST__%'
+           AND floor(session_length) IN (floor(session_length)-1,
+                                                              floor(session_length)+0,
+                                                              floor(session_length)+1)
+           AND floor(session_length) NOT IN (floor(session_length)-1,
+                                                                  floor(session_length)+1))) ;
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND (floor(session_length) IS NULL
+       OR floor(session_length) IN
+         (SELECT floor(session_length)
+          FROM kttm_nested
+          WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+            AND (floor(session_length) IS NULL
+                 OR (floor(session_length) = floor(session_length)+0
+                     AND floor(session_length) IS NOT DISTINCT
+                     FROM floor(session_length)+0
+                     AND floor(session_length) <> floor(session_length)-1
+                     AND (floor(session_length) IS DISTINCT
+                          FROM floor(session_length)-1)
+                     AND floor(session_length) > floor(session_length)-1
+                     AND floor(session_length) >= floor(session_length)-1
+                     AND floor(session_length) < floor(session_length)+1
+                     AND floor(session_length) <= floor(session_length)+1
+                     AND (floor(session_length) <> floor(session_length)-1) IS TRUE
+                     AND (floor(session_length) = floor(session_length)-1) IS NOT TRUE
+                     AND (floor(session_length) = floor(session_length)-1) IS FALSE
+                     AND (floor(session_length) <> floor(session_length)-1) IS NOT FALSE
+                     AND floor(session_length) BETWEEN floor(session_length)-1 AND floor(session_length)+1
+                     AND floor(session_length) NOT BETWEEN floor(session_length) AND floor(session_length)-1
+                     AND floor(session_length) like '%'
+                     AND floor(session_length) not like '__DOES_NOT_EXIST__%'
+                     AND floor(session_length) IN (floor(session_length)-1,
+                                                                        floor(session_length)+0,
+                                                                        floor(session_length)+1)
+                     AND floor(session_length) NOT IN (floor(session_length)-1,
+                                                                            floor(session_length)+1)))));
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM
+  (SELECT __time, number, client_ip,
+                          floor(session_length),
+                          count(*)
+   FROM kttm_nested
+   WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+     AND (floor(session_length) IS NULL
+          OR (floor(session_length) = floor(session_length)+0
+              AND floor(session_length) IS NOT DISTINCT
+              FROM floor(session_length)+0
+              AND floor(session_length) <> floor(session_length)-1
+              AND (floor(session_length) IS DISTINCT
+                   FROM floor(session_length)-1)
+              AND floor(session_length) > floor(session_length)-1
+              AND floor(session_length) >= floor(session_length)-1
+              AND floor(session_length) < floor(session_length)+1
+              AND floor(session_length) <= floor(session_length)+1
+              AND (floor(session_length) <> floor(session_length)-1) IS TRUE
+              AND (floor(session_length) = floor(session_length)-1) IS NOT TRUE
+              AND (floor(session_length) = floor(session_length)-1) IS FALSE
+              AND (floor(session_length) <> floor(session_length)-1) IS NOT FALSE
+              AND floor(session_length) BETWEEN floor(session_length)-1 AND floor(session_length)+1
+              AND floor(session_length) NOT BETWEEN floor(session_length) AND floor(session_length)-1
+              AND floor(session_length) like '%'
+              AND floor(session_length) not like '__DOES_NOT_EXIST__%'
+              AND floor(session_length) IN (floor(session_length)-1,
+                                                                 floor(session_length)+0,
+                                                                 floor(session_length)+1)
+              AND floor(session_length) NOT IN (floor(session_length)-1,
+                                                                     floor(session_length)+1)))
+   GROUP BY 1,
+            2,
+            3,
+            4);
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+#-------------------------------------------------------------------------
+# TEST_ID: A7: ln
+#-------------------------------------------------------------------------
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND (floor(ln(greatest(least(session_length, 100), 1))) IS NULL
+       OR (floor(ln(greatest(least(session_length, 100), 1))) = floor(ln(greatest(least(session_length, 100), 1)))+0
+           AND floor(ln(greatest(least(session_length, 100), 1))) IS NOT DISTINCT
+           FROM floor(ln(greatest(least(session_length, 100), 1)))+0
+           AND floor(ln(greatest(least(session_length, 100), 1))) <> floor(ln(greatest(least(session_length, 100), 1)))-1
+           AND (floor(ln(greatest(least(session_length, 100), 1))) IS DISTINCT
+                FROM floor(ln(greatest(least(session_length, 100), 1)))-1)
+           AND floor(ln(greatest(least(session_length, 100), 1))) > floor(ln(greatest(least(session_length, 100), 1)))-1
+           AND floor(ln(greatest(least(session_length, 100), 1))) >= floor(ln(greatest(least(session_length, 100), 1)))-1
+           AND floor(ln(greatest(least(session_length, 100), 1))) < floor(ln(greatest(least(session_length, 100), 1)))+1
+           AND floor(ln(greatest(least(session_length, 100), 1))) <= floor(ln(greatest(least(session_length, 100), 1)))+1
+           AND (floor(ln(greatest(least(session_length, 100), 1))) <> floor(ln(greatest(least(session_length, 100), 1)))-1) IS TRUE
+           AND (floor(ln(greatest(least(session_length, 100), 1))) = floor(ln(greatest(least(session_length, 100), 1)))-1) IS NOT TRUE
+           AND (floor(ln(greatest(least(session_length, 100), 1))) = floor(ln(greatest(least(session_length, 100), 1)))-1) IS FALSE
+           AND (floor(ln(greatest(least(session_length, 100), 1))) <> floor(ln(greatest(least(session_length, 100), 1)))-1) IS NOT FALSE
+           AND floor(ln(greatest(least(session_length, 100), 1))) BETWEEN floor(ln(greatest(least(session_length, 100), 1)))-1 AND floor(ln(greatest(least(session_length, 100), 1)))+1
+           AND floor(ln(greatest(least(session_length, 100), 1))) NOT BETWEEN floor(ln(greatest(least(session_length, 100), 1))) AND floor(ln(greatest(least(session_length, 100), 1)))-1
+           AND floor(ln(greatest(least(session_length, 100), 1))) like '%'
+           AND floor(ln(greatest(least(session_length, 100), 1))) not like '__DOES_NOT_EXIST__%'
+           AND floor(ln(greatest(least(session_length, 100), 1))) IN (floor(ln(greatest(least(session_length, 100), 1)))-1,
+                                                                                                                        floor(ln(greatest(least(session_length, 100), 1)))+0,
+                                                                                                                        floor(ln(greatest(least(session_length, 100), 1)))+1)
+           AND floor(ln(greatest(least(session_length, 100), 1))) NOT IN (floor(ln(greatest(least(session_length, 100), 1)))-1,
+                                                                                                                            floor(ln(greatest(least(session_length, 100), 1)))+1))) ;
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND (floor(ln(greatest(least(session_length, 100), 1))) IS NULL
+       OR floor(ln(greatest(least(session_length, 100), 1))) IN
+         (SELECT floor(ln(greatest(least(session_length, 100), 1)))
+          FROM kttm_nested
+          WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+            AND (floor(ln(greatest(least(session_length, 100), 1))) IS NULL
+                 OR (floor(ln(greatest(least(session_length, 100), 1))) = floor(ln(greatest(least(session_length, 100), 1)))+0
+                     AND floor(ln(greatest(least(session_length, 100), 1))) IS NOT DISTINCT
+                     FROM floor(ln(greatest(least(session_length, 100), 1)))+0
+                     AND floor(ln(greatest(least(session_length, 100), 1))) <> floor(ln(greatest(least(session_length, 100), 1)))-1
+                     AND (floor(ln(greatest(least(session_length, 100), 1))) IS DISTINCT
+                          FROM floor(ln(greatest(least(session_length, 100), 1)))-1)
+                     AND floor(ln(greatest(least(session_length, 100), 1))) > floor(ln(greatest(least(session_length, 100), 1)))-1
+                     AND floor(ln(greatest(least(session_length, 100), 1))) >= floor(ln(greatest(least(session_length, 100), 1)))-1
+                     AND floor(ln(greatest(least(session_length, 100), 1))) < floor(ln(greatest(least(session_length, 100), 1)))+1
+                     AND floor(ln(greatest(least(session_length, 100), 1))) <= floor(ln(greatest(least(session_length, 100), 1)))+1
+                     AND (floor(ln(greatest(least(session_length, 100), 1))) <> floor(ln(greatest(least(session_length, 100), 1)))-1) IS TRUE
+                     AND (floor(ln(greatest(least(session_length, 100), 1))) = floor(ln(greatest(least(session_length, 100), 1)))-1) IS NOT TRUE
+                     AND (floor(ln(greatest(least(session_length, 100), 1))) = floor(ln(greatest(least(session_length, 100), 1)))-1) IS FALSE
+                     AND (floor(ln(greatest(least(session_length, 100), 1))) <> floor(ln(greatest(least(session_length, 100), 1)))-1) IS NOT FALSE
+                     AND floor(ln(greatest(least(session_length, 100), 1))) BETWEEN floor(ln(greatest(least(session_length, 100), 1)))-1 AND floor(ln(greatest(least(session_length, 100), 1)))+1
+                     AND floor(ln(greatest(least(session_length, 100), 1))) NOT BETWEEN floor(ln(greatest(least(session_length, 100), 1))) AND floor(ln(greatest(least(session_length, 100), 1)))-1
+                     AND floor(ln(greatest(least(session_length, 100), 1))) like '%'
+                     AND floor(ln(greatest(least(session_length, 100), 1))) not like '__DOES_NOT_EXIST__%'
+                     AND floor(ln(greatest(least(session_length, 100), 1))) IN (floor(ln(greatest(least(session_length, 100), 1)))-1,
+                                                                                                                                  floor(ln(greatest(least(session_length, 100), 1)))+0,
+                                                                                                                                  floor(ln(greatest(least(session_length, 100), 1)))+1)
+                     AND floor(ln(greatest(least(session_length, 100), 1))) NOT IN (floor(ln(greatest(least(session_length, 100), 1)))-1,
+                                                                                                                                      floor(ln(greatest(least(session_length, 100), 1)))+1)))));
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM
+  (SELECT __time, number, client_ip,
+                          floor(ln(greatest(least(session_length, 100), 1))),
+                          count(*)
+   FROM kttm_nested
+   WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+     AND (floor(ln(greatest(least(session_length, 100), 1))) IS NULL
+          OR (floor(ln(greatest(least(session_length, 100), 1))) = floor(ln(greatest(least(session_length, 100), 1)))+0
+              AND floor(ln(greatest(least(session_length, 100), 1))) IS NOT DISTINCT
+              FROM floor(ln(greatest(least(session_length, 100), 1)))+0
+              AND floor(ln(greatest(least(session_length, 100), 1))) <> floor(ln(greatest(least(session_length, 100), 1)))-1
+              AND (floor(ln(greatest(least(session_length, 100), 1))) IS DISTINCT
+                   FROM floor(ln(greatest(least(session_length, 100), 1)))-1)
+              AND floor(ln(greatest(least(session_length, 100), 1))) > floor(ln(greatest(least(session_length, 100), 1)))-1
+              AND floor(ln(greatest(least(session_length, 100), 1))) >= floor(ln(greatest(least(session_length, 100), 1)))-1
+              AND floor(ln(greatest(least(session_length, 100), 1))) < floor(ln(greatest(least(session_length, 100), 1)))+1
+              AND floor(ln(greatest(least(session_length, 100), 1))) <= floor(ln(greatest(least(session_length, 100), 1)))+1
+              AND (floor(ln(greatest(least(session_length, 100), 1))) <> floor(ln(greatest(least(session_length, 100), 1)))-1) IS TRUE
+              AND (floor(ln(greatest(least(session_length, 100), 1))) = floor(ln(greatest(least(session_length, 100), 1)))-1) IS NOT TRUE
+              AND (floor(ln(greatest(least(session_length, 100), 1))) = floor(ln(greatest(least(session_length, 100), 1)))-1) IS FALSE
+              AND (floor(ln(greatest(least(session_length, 100), 1))) <> floor(ln(greatest(least(session_length, 100), 1)))-1) IS NOT FALSE
+              AND floor(ln(greatest(least(session_length, 100), 1))) BETWEEN floor(ln(greatest(least(session_length, 100), 1)))-1 AND floor(ln(greatest(least(session_length, 100), 1)))+1
+              AND floor(ln(greatest(least(session_length, 100), 1))) NOT BETWEEN floor(ln(greatest(least(session_length, 100), 1))) AND floor(ln(greatest(least(session_length, 100), 1)))-1
+              AND floor(ln(greatest(least(session_length, 100), 1))) like '%'
+              AND floor(ln(greatest(least(session_length, 100), 1))) not like '__DOES_NOT_EXIST__%'
+              AND floor(ln(greatest(least(session_length, 100), 1))) IN (floor(ln(greatest(least(session_length, 100), 1)))-1,
+                                                                                                                           floor(ln(greatest(least(session_length, 100), 1)))+0,
+                                                                                                                           floor(ln(greatest(least(session_length, 100), 1)))+1)
+              AND floor(ln(greatest(least(session_length, 100), 1))) NOT IN (floor(ln(greatest(least(session_length, 100), 1)))-1,
+                                                                                                                               floor(ln(greatest(least(session_length, 100), 1)))+1)))
+   GROUP BY 1,
+            2,
+            3,
+            4);
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+#-------------------------------------------------------------------------
+# TEST_ID: A8: log10
+#-------------------------------------------------------------------------
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND (floor(log10(greatest(session_length, 1))) IS NULL
+       OR (floor(log10(greatest(session_length, 1))) = floor(log10(greatest(session_length, 1)))+0
+           AND floor(log10(greatest(session_length, 1))) IS NOT DISTINCT
+           FROM floor(log10(greatest(session_length, 1)))+0
+           AND floor(log10(greatest(session_length, 1))) <> floor(log10(greatest(session_length, 1)))-1
+           AND (floor(log10(greatest(session_length, 1))) IS DISTINCT
+                FROM floor(log10(greatest(session_length, 1)))-1)
+           AND floor(log10(greatest(session_length, 1))) > floor(log10(greatest(session_length, 1)))-1
+           AND floor(log10(greatest(session_length, 1))) >= floor(log10(greatest(session_length, 1)))-1
+           AND floor(log10(greatest(session_length, 1))) < floor(log10(greatest(session_length, 1)))+1
+           AND floor(log10(greatest(session_length, 1))) <= floor(log10(greatest(session_length, 1)))+1
+           AND (floor(log10(greatest(session_length, 1))) <> floor(log10(greatest(session_length, 1)))-1) IS TRUE
+           AND (floor(log10(greatest(session_length, 1))) = floor(log10(greatest(session_length, 1)))-1) IS NOT TRUE
+           AND (floor(log10(greatest(session_length, 1))) = floor(log10(greatest(session_length, 1)))-1) IS FALSE
+           AND (floor(log10(greatest(session_length, 1))) <> floor(log10(greatest(session_length, 1)))-1) IS NOT FALSE
+           AND floor(log10(greatest(session_length, 1))) BETWEEN floor(log10(greatest(session_length, 1)))-1 AND floor(log10(greatest(session_length, 1)))+1
+           AND floor(log10(greatest(session_length, 1))) NOT BETWEEN floor(log10(greatest(session_length, 1))) AND floor(log10(greatest(session_length, 1)))-1
+           AND floor(log10(greatest(session_length, 1))) like '%'
+           AND floor(log10(greatest(session_length, 1))) not like '__DOES_NOT_EXIST__%'
+           AND floor(log10(greatest(session_length, 1))) IN (floor(log10(greatest(session_length, 1)))-1,
+                                                                                                      floor(log10(greatest(session_length, 1)))+0,
+                                                                                                      floor(log10(greatest(session_length, 1)))+1)
+           AND floor(log10(greatest(session_length, 1))) NOT IN (floor(log10(greatest(session_length, 1)))-1,
+                                                                                                          floor(log10(greatest(session_length, 1)))+1))) ;
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND (floor(log10(greatest(session_length, 1))) IS NULL
+       OR floor(log10(greatest(session_length, 1))) IN
+         (SELECT floor(log10(greatest(session_length, 1)))
+          FROM kttm_nested
+          WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+            AND (floor(log10(greatest(session_length, 1))) IS NULL
+                 OR (floor(log10(greatest(session_length, 1))) = floor(log10(greatest(session_length, 1)))+0
+                     AND floor(log10(greatest(session_length, 1))) IS NOT DISTINCT
+                     FROM floor(log10(greatest(session_length, 1)))+0
+                     AND floor(log10(greatest(session_length, 1))) <> floor(log10(greatest(session_length, 1)))-1
+                     AND (floor(log10(greatest(session_length, 1))) IS DISTINCT
+                          FROM floor(log10(greatest(session_length, 1)))-1)
+                     AND floor(log10(greatest(session_length, 1))) > floor(log10(greatest(session_length, 1)))-1
+                     AND floor(log10(greatest(session_length, 1))) >= floor(log10(greatest(session_length, 1)))-1
+                     AND floor(log10(greatest(session_length, 1))) < floor(log10(greatest(session_length, 1)))+1
+                     AND floor(log10(greatest(session_length, 1))) <= floor(log10(greatest(session_length, 1)))+1
+                     AND (floor(log10(greatest(session_length, 1))) <> floor(log10(greatest(session_length, 1)))-1) IS TRUE
+                     AND (floor(log10(greatest(session_length, 1))) = floor(log10(greatest(session_length, 1)))-1) IS NOT TRUE
+                     AND (floor(log10(greatest(session_length, 1))) = floor(log10(greatest(session_length, 1)))-1) IS FALSE
+                     AND (floor(log10(greatest(session_length, 1))) <> floor(log10(greatest(session_length, 1)))-1) IS NOT FALSE
+                     AND floor(log10(greatest(session_length, 1))) BETWEEN floor(log10(greatest(session_length, 1)))-1 AND floor(log10(greatest(session_length, 1)))+1
+                     AND floor(log10(greatest(session_length, 1))) NOT BETWEEN floor(log10(greatest(session_length, 1))) AND floor(log10(greatest(session_length, 1)))-1
+                     AND floor(log10(greatest(session_length, 1))) like '%'
+                     AND floor(log10(greatest(session_length, 1))) not like '__DOES_NOT_EXIST__%'
+                     AND floor(log10(greatest(session_length, 1))) IN (floor(log10(greatest(session_length, 1)))-1,
+                                                                                                                floor(log10(greatest(session_length, 1)))+0,
+                                                                                                                floor(log10(greatest(session_length, 1)))+1)
+                     AND floor(log10(greatest(session_length, 1))) NOT IN (floor(log10(greatest(session_length, 1)))-1,
+                                                                                                                    floor(log10(greatest(session_length, 1)))+1)))));
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM
+  (SELECT __time, number, client_ip,
+                          floor(log10(greatest(session_length, 1))),
+                          count(*)
+   FROM kttm_nested
+   WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+     AND (floor(log10(greatest(session_length, 1))) IS NULL
+          OR (floor(log10(greatest(session_length, 1))) = floor(log10(greatest(session_length, 1)))+0
+              AND floor(log10(greatest(session_length, 1))) IS NOT DISTINCT
+              FROM floor(log10(greatest(session_length, 1)))+0
+              AND floor(log10(greatest(session_length, 1))) <> floor(log10(greatest(session_length, 1)))-1
+              AND (floor(log10(greatest(session_length, 1))) IS DISTINCT
+                   FROM floor(log10(greatest(session_length, 1)))-1)
+              AND floor(log10(greatest(session_length, 1))) > floor(log10(greatest(session_length, 1)))-1
+              AND floor(log10(greatest(session_length, 1))) >= floor(log10(greatest(session_length, 1)))-1
+              AND floor(log10(greatest(session_length, 1))) < floor(log10(greatest(session_length, 1)))+1
+              AND floor(log10(greatest(session_length, 1))) <= floor(log10(greatest(session_length, 1)))+1
+              AND (floor(log10(greatest(session_length, 1))) <> floor(log10(greatest(session_length, 1)))-1) IS TRUE
+              AND (floor(log10(greatest(session_length, 1))) = floor(log10(greatest(session_length, 1)))-1) IS NOT TRUE
+              AND (floor(log10(greatest(session_length, 1))) = floor(log10(greatest(session_length, 1)))-1) IS FALSE
+              AND (floor(log10(greatest(session_length, 1))) <> floor(log10(greatest(session_length, 1)))-1) IS NOT FALSE
+              AND floor(log10(greatest(session_length, 1))) BETWEEN floor(log10(greatest(session_length, 1)))-1 AND floor(log10(greatest(session_length, 1)))+1
+              AND floor(log10(greatest(session_length, 1))) NOT BETWEEN floor(log10(greatest(session_length, 1))) AND floor(log10(greatest(session_length, 1)))-1
+              AND floor(log10(greatest(session_length, 1))) like '%'
+              AND floor(log10(greatest(session_length, 1))) not like '__DOES_NOT_EXIST__%'
+              AND floor(log10(greatest(session_length, 1))) IN (floor(log10(greatest(session_length, 1)))-1,
+                                                                                                         floor(log10(greatest(session_length, 1)))+0,
+                                                                                                         floor(log10(greatest(session_length, 1)))+1)
+              AND floor(log10(greatest(session_length, 1))) NOT IN (floor(log10(greatest(session_length, 1)))-1,
+                                                                                                             floor(log10(greatest(session_length, 1)))+1)))
+   GROUP BY 1,
+            2,
+            3,
+            4);
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+#-------------------------------------------------------------------------
+# TEST_ID: A9: power
+#-------------------------------------------------------------------------
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND (power(session_length, 1) IS NULL
+       OR (power(session_length, 1) = power(session_length, 1)+0
+           AND power(session_length, 1) IS NOT DISTINCT
+           FROM power(session_length, 1)+0
+           AND power(session_length, 1) <> power(session_length, 1)-1
+           AND (power(session_length, 1) IS DISTINCT
+                FROM power(session_length, 1)-1)
+           AND power(session_length, 1) > power(session_length, 1)-1
+           AND power(session_length, 1) >= power(session_length, 1)-1
+           AND power(session_length, 1) < power(session_length, 1)+1
+           AND power(session_length, 1) <= power(session_length, 1)+1
+           AND (power(session_length, 1) <> power(session_length, 1)-1) IS TRUE
+           AND (power(session_length, 1) = power(session_length, 1)-1) IS NOT TRUE
+           AND (power(session_length, 1) = power(session_length, 1)-1) IS FALSE
+           AND (power(session_length, 1) <> power(session_length, 1)-1) IS NOT FALSE
+           AND power(session_length, 1) BETWEEN power(session_length, 1)-1 AND power(session_length, 1)+1
+           AND power(session_length, 1) NOT BETWEEN power(session_length, 1) AND power(session_length, 1)-1
+           AND power(session_length, 1) like '%'
+           AND power(session_length, 1) not like '__DOES_NOT_EXIST__%'
+           AND power(session_length, 1) IN (power(session_length, 1)-1,
+                                                                    power(session_length, 1)+0,
+                                                                    power(session_length, 1)+1)
+           AND power(session_length, 1) NOT IN (power(session_length, 1)-1,
+                                                                        power(session_length, 1)+1))) ;
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND (power(session_length, 1) IS NULL
+       OR power(session_length, 1) IN
+         (SELECT power(session_length, 1)
+          FROM kttm_nested
+          WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+            AND (power(session_length, 1) IS NULL
+                 OR (power(session_length, 1) = power(session_length, 1)+0
+                     AND power(session_length, 1) IS NOT DISTINCT
+                     FROM power(session_length, 1)+0
+                     AND power(session_length, 1) <> power(session_length, 1)-1
+                     AND (power(session_length, 1) IS DISTINCT
+                          FROM power(session_length, 1)-1)
+                     AND power(session_length, 1) > power(session_length, 1)-1
+                     AND power(session_length, 1) >= power(session_length, 1)-1
+                     AND power(session_length, 1) < power(session_length, 1)+1
+                     AND power(session_length, 1) <= power(session_length, 1)+1
+                     AND (power(session_length, 1) <> power(session_length, 1)-1) IS TRUE
+                     AND (power(session_length, 1) = power(session_length, 1)-1) IS NOT TRUE
+                     AND (power(session_length, 1) = power(session_length, 1)-1) IS FALSE
+                     AND (power(session_length, 1) <> power(session_length, 1)-1) IS NOT FALSE
+                     AND power(session_length, 1) BETWEEN power(session_length, 1)-1 AND power(session_length, 1)+1
+                     AND power(session_length, 1) NOT BETWEEN power(session_length, 1) AND power(session_length, 1)-1
+                     AND power(session_length, 1) like '%'
+                     AND power(session_length, 1) not like '__DOES_NOT_EXIST__%'
+                     AND power(session_length, 1) IN (power(session_length, 1)-1,
+                                                                              power(session_length, 1)+0,
+                                                                              power(session_length, 1)+1)
+                     AND power(session_length, 1) NOT IN (power(session_length, 1)-1,
+                                                                                  power(session_length, 1)+1)))));
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM
+  (SELECT __time, number, client_ip,
+                          power(session_length, 1),
+                          count(*)
+   FROM kttm_nested
+   WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+     AND (power(session_length, 1) IS NULL
+          OR (power(session_length, 1) = power(session_length, 1)+0
+              AND power(session_length, 1) IS NOT DISTINCT
+              FROM power(session_length, 1)+0
+              AND power(session_length, 1) <> power(session_length, 1)-1
+              AND (power(session_length, 1) IS DISTINCT
+                   FROM power(session_length, 1)-1)
+              AND power(session_length, 1) > power(session_length, 1)-1
+              AND power(session_length, 1) >= power(session_length, 1)-1
+              AND power(session_length, 1) < power(session_length, 1)+1
+              AND power(session_length, 1) <= power(session_length, 1)+1
+              AND (power(session_length, 1) <> power(session_length, 1)-1) IS TRUE
+              AND (power(session_length, 1) = power(session_length, 1)-1) IS NOT TRUE
+              AND (power(session_length, 1) = power(session_length, 1)-1) IS FALSE
+              AND (power(session_length, 1) <> power(session_length, 1)-1) IS NOT FALSE
+              AND power(session_length, 1) BETWEEN power(session_length, 1)-1 AND power(session_length, 1)+1
+              AND power(session_length, 1) NOT BETWEEN power(session_length, 1) AND power(session_length, 1)-1
+              AND power(session_length, 1) like '%'
+              AND power(session_length, 1) not like '__DOES_NOT_EXIST__%'
+              AND power(session_length, 1) IN (power(session_length, 1)-1,
+                                                                       power(session_length, 1)+0,
+                                                                       power(session_length, 1)+1)
+              AND power(session_length, 1) NOT IN (power(session_length, 1)-1,
+                                                                           power(session_length, 1)+1)))
+   GROUP BY 1,
+            2,
+            3,
+            4);
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+#-------------------------------------------------------------------------
+# TEST_ID: A10: sqrt
+#-------------------------------------------------------------------------
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND (floor(sqrt(session_length)) IS NULL
+       OR (floor(sqrt(session_length)) = floor(sqrt(session_length))+0
+           AND floor(sqrt(session_length)) IS NOT DISTINCT
+           FROM floor(sqrt(session_length))+0
+           AND floor(sqrt(session_length)) <> floor(sqrt(session_length))-1
+           AND (floor(sqrt(session_length)) IS DISTINCT
+                FROM floor(sqrt(session_length))-1)
+           AND floor(sqrt(session_length)) > floor(sqrt(session_length))-1
+           AND floor(sqrt(session_length)) >= floor(sqrt(session_length))-1
+           AND floor(sqrt(session_length)) < floor(sqrt(session_length))+1
+           AND floor(sqrt(session_length)) <= floor(sqrt(session_length))+1
+           AND (floor(sqrt(session_length)) <> floor(sqrt(session_length))-1) IS TRUE
+           AND (floor(sqrt(session_length)) = floor(sqrt(session_length))-1) IS NOT TRUE
+           AND (floor(sqrt(session_length)) = floor(sqrt(session_length))-1) IS FALSE
+           AND (floor(sqrt(session_length)) <> floor(sqrt(session_length))-1) IS NOT FALSE
+           AND floor(sqrt(session_length)) BETWEEN floor(sqrt(session_length))-1 AND floor(sqrt(session_length))+1
+           AND floor(sqrt(session_length)) NOT BETWEEN floor(sqrt(session_length)) AND floor(sqrt(session_length))-1
+           AND floor(sqrt(session_length)) like '%'
+           AND floor(sqrt(session_length)) not like '__DOES_NOT_EXIST__%'
+           AND floor(sqrt(session_length)) IN (floor(sqrt(session_length))-1,
+                                                                          floor(sqrt(session_length))+0,
+                                                                          floor(sqrt(session_length))+1)
+           AND floor(sqrt(session_length)) NOT IN (floor(sqrt(session_length))-1,
+                                                                              floor(sqrt(session_length))+1))) ;
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND (floor(sqrt(session_length)) IS NULL
+       OR floor(sqrt(session_length)) IN
+         (SELECT floor(sqrt(session_length))
+          FROM kttm_nested
+          WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+            AND (floor(sqrt(session_length)) IS NULL
+                 OR (floor(sqrt(session_length)) = floor(sqrt(session_length))+0
+                     AND floor(sqrt(session_length)) IS NOT DISTINCT
+                     FROM floor(sqrt(session_length))+0
+                     AND floor(sqrt(session_length)) <> floor(sqrt(session_length))-1
+                     AND (floor(sqrt(session_length)) IS DISTINCT
+                          FROM floor(sqrt(session_length))-1)
+                     AND floor(sqrt(session_length)) > floor(sqrt(session_length))-1
+                     AND floor(sqrt(session_length)) >= floor(sqrt(session_length))-1
+                     AND floor(sqrt(session_length)) < floor(sqrt(session_length))+1
+                     AND floor(sqrt(session_length)) <= floor(sqrt(session_length))+1
+                     AND (floor(sqrt(session_length)) <> floor(sqrt(session_length))-1) IS TRUE
+                     AND (floor(sqrt(session_length)) = floor(sqrt(session_length))-1) IS NOT TRUE
+                     AND (floor(sqrt(session_length)) = floor(sqrt(session_length))-1) IS FALSE
+                     AND (floor(sqrt(session_length)) <> floor(sqrt(session_length))-1) IS NOT FALSE
+                     AND floor(sqrt(session_length)) BETWEEN floor(sqrt(session_length))-1 AND floor(sqrt(session_length))+1
+                     AND floor(sqrt(session_length)) NOT BETWEEN floor(sqrt(session_length)) AND floor(sqrt(session_length))-1
+                     AND floor(sqrt(session_length)) like '%'
+                     AND floor(sqrt(session_length)) not like '__DOES_NOT_EXIST__%'
+                     AND floor(sqrt(session_length)) IN (floor(sqrt(session_length))-1,
+                                                                                    floor(sqrt(session_length))+0,
+                                                                                    floor(sqrt(session_length))+1)
+                     AND floor(sqrt(session_length)) NOT IN (floor(sqrt(session_length))-1,
+                                                                                        floor(sqrt(session_length))+1)))));
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM
+  (SELECT __time, number, client_ip,
+                          floor(sqrt(session_length)),
+                          count(*)
+   FROM kttm_nested
+   WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+     AND (floor(sqrt(session_length)) IS NULL
+          OR (floor(sqrt(session_length)) = floor(sqrt(session_length))+0
+              AND floor(sqrt(session_length)) IS NOT DISTINCT
+              FROM floor(sqrt(session_length))+0
+              AND floor(sqrt(session_length)) <> floor(sqrt(session_length))-1
+              AND (floor(sqrt(session_length)) IS DISTINCT
+                   FROM floor(sqrt(session_length))-1)
+              AND floor(sqrt(session_length)) > floor(sqrt(session_length))-1
+              AND floor(sqrt(session_length)) >= floor(sqrt(session_length))-1
+              AND floor(sqrt(session_length)) < floor(sqrt(session_length))+1
+              AND floor(sqrt(session_length)) <= floor(sqrt(session_length))+1
+              AND (floor(sqrt(session_length)) <> floor(sqrt(session_length))-1) IS TRUE
+              AND (floor(sqrt(session_length)) = floor(sqrt(session_length))-1) IS NOT TRUE
+              AND (floor(sqrt(session_length)) = floor(sqrt(session_length))-1) IS FALSE
+              AND (floor(sqrt(session_length)) <> floor(sqrt(session_length))-1) IS NOT FALSE
+              AND floor(sqrt(session_length)) BETWEEN floor(sqrt(session_length))-1 AND floor(sqrt(session_length))+1
+              AND floor(sqrt(session_length)) NOT BETWEEN floor(sqrt(session_length)) AND floor(sqrt(session_length))-1
+              AND floor(sqrt(session_length)) like '%'
+              AND floor(sqrt(session_length)) not like '__DOES_NOT_EXIST__%'
+              AND floor(sqrt(session_length)) IN (floor(sqrt(session_length))-1,
+                                                                             floor(sqrt(session_length))+0,
+                                                                             floor(sqrt(session_length))+1)
+              AND floor(sqrt(session_length)) NOT IN (floor(sqrt(session_length))-1,
+                                                                                 floor(sqrt(session_length))+1)))
+   GROUP BY 1,
+            2,
+            3,
+            4);
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+#-------------------------------------------------------------------------
+# TEST_ID: A11: truncate
+#-------------------------------------------------------------------------
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND (floor(truncate(session_length, -1)) IS NULL
+       OR (floor(truncate(session_length, -1)) = floor(truncate(session_length, -1))+0
+           AND floor(truncate(session_length, -1)) IS NOT DISTINCT
+           FROM floor(truncate(session_length, -1))+0
+           AND floor(truncate(session_length, -1)) <> floor(truncate(session_length, -1))-1
+           AND (floor(truncate(session_length, -1)) IS DISTINCT
+                FROM floor(truncate(session_length, -1))-1)
+           AND floor(truncate(session_length, -1)) > floor(truncate(session_length, -1))-1
+           AND floor(truncate(session_length, -1)) >= floor(truncate(session_length, -1))-1
+           AND floor(truncate(session_length, -1)) < floor(truncate(session_length, -1))+1
+           AND floor(truncate(session_length, -1)) <= floor(truncate(session_length, -1))+1
+           AND (floor(truncate(session_length, -1)) <> floor(truncate(session_length, -1))-1) IS TRUE
+           AND (floor(truncate(session_length, -1)) = floor(truncate(session_length, -1))-1) IS NOT TRUE
+           AND (floor(truncate(session_length, -1)) = floor(truncate(session_length, -1))-1) IS FALSE
+           AND (floor(truncate(session_length, -1)) <> floor(truncate(session_length, -1))-1) IS NOT FALSE
+           AND floor(truncate(session_length, -1)) BETWEEN floor(truncate(session_length, -1))-1 AND floor(truncate(session_length, -1))+1
+           AND floor(truncate(session_length, -1)) NOT BETWEEN floor(truncate(session_length, -1)) AND floor(truncate(session_length, -1))-1
+           AND floor(truncate(session_length, -1)) like '%'
+           AND floor(truncate(session_length, -1)) not like '__DOES_NOT_EXIST__%'
+           AND floor(truncate(session_length, -1)) IN (floor(truncate(session_length, -1))-1,
+                                                                                          floor(truncate(session_length, -1))+0,
+                                                                                          floor(truncate(session_length, -1))+1)
+           AND floor(truncate(session_length, -1)) NOT IN (floor(truncate(session_length, -1))-1,
+                                                                                              floor(truncate(session_length, -1))+1))) ;
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND (floor(truncate(session_length, -1)) IS NULL
+       OR floor(truncate(session_length, -1)) IN
+         (SELECT floor(truncate(session_length, -1))
+          FROM kttm_nested
+          WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+            AND (floor(truncate(session_length, -1)) IS NULL
+                 OR (floor(truncate(session_length, -1)) = floor(truncate(session_length, -1))+0
+                     AND floor(truncate(session_length, -1)) IS NOT DISTINCT
+                     FROM floor(truncate(session_length, -1))+0
+                     AND floor(truncate(session_length, -1)) <> floor(truncate(session_length, -1))-1
+                     AND (floor(truncate(session_length, -1)) IS DISTINCT
+                          FROM floor(truncate(session_length, -1))-1)
+                     AND floor(truncate(session_length, -1)) > floor(truncate(session_length, -1))-1
+                     AND floor(truncate(session_length, -1)) >= floor(truncate(session_length, -1))-1
+                     AND floor(truncate(session_length, -1)) < floor(truncate(session_length, -1))+1
+                     AND floor(truncate(session_length, -1)) <= floor(truncate(session_length, -1))+1
+                     AND (floor(truncate(session_length, -1)) <> floor(truncate(session_length, -1))-1) IS TRUE
+                     AND (floor(truncate(session_length, -1)) = floor(truncate(session_length, -1))-1) IS NOT TRUE
+                     AND (floor(truncate(session_length, -1)) = floor(truncate(session_length, -1))-1) IS FALSE
+                     AND (floor(truncate(session_length, -1)) <> floor(truncate(session_length, -1))-1) IS NOT FALSE
+                     AND floor(truncate(session_length, -1)) BETWEEN floor(truncate(session_length, -1))-1 AND floor(truncate(session_length, -1))+1
+                     AND floor(truncate(session_length, -1)) NOT BETWEEN floor(truncate(session_length, -1)) AND floor(truncate(session_length, -1))-1
+                     AND floor(truncate(session_length, -1)) like '%'
+                     AND floor(truncate(session_length, -1)) not like '__DOES_NOT_EXIST__%'
+                     AND floor(truncate(session_length, -1)) IN (floor(truncate(session_length, -1))-1,
+                                                                                                    floor(truncate(session_length, -1))+0,
+                                                                                                    floor(truncate(session_length, -1))+1)
+                     AND floor(truncate(session_length, -1)) NOT IN (floor(truncate(session_length, -1))-1,
+                                                                                                        floor(truncate(session_length, -1))+1)))));
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM
+  (SELECT __time, number, client_ip,
+                          floor(truncate(session_length, -1)),
+                          count(*)
+   FROM kttm_nested
+   WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+     AND (floor(truncate(session_length, -1)) IS NULL
+          OR (floor(truncate(session_length, -1)) = floor(truncate(session_length, -1))+0
+              AND floor(truncate(session_length, -1)) IS NOT DISTINCT
+              FROM floor(truncate(session_length, -1))+0
+              AND floor(truncate(session_length, -1)) <> floor(truncate(session_length, -1))-1
+              AND (floor(truncate(session_length, -1)) IS DISTINCT
+                   FROM floor(truncate(session_length, -1))-1)
+              AND floor(truncate(session_length, -1)) > floor(truncate(session_length, -1))-1
+              AND floor(truncate(session_length, -1)) >= floor(truncate(session_length, -1))-1
+              AND floor(truncate(session_length, -1)) < floor(truncate(session_length, -1))+1
+              AND floor(truncate(session_length, -1)) <= floor(truncate(session_length, -1))+1
+              AND (floor(truncate(session_length, -1)) <> floor(truncate(session_length, -1))-1) IS TRUE
+              AND (floor(truncate(session_length, -1)) = floor(truncate(session_length, -1))-1) IS NOT TRUE
+              AND (floor(truncate(session_length, -1)) = floor(truncate(session_length, -1))-1) IS FALSE
+              AND (floor(truncate(session_length, -1)) <> floor(truncate(session_length, -1))-1) IS NOT FALSE
+              AND floor(truncate(session_length, -1)) BETWEEN floor(truncate(session_length, -1))-1 AND floor(truncate(session_length, -1))+1
+              AND floor(truncate(session_length, -1)) NOT BETWEEN floor(truncate(session_length, -1)) AND floor(truncate(session_length, -1))-1
+              AND floor(truncate(session_length, -1)) like '%'
+              AND floor(truncate(session_length, -1)) not like '__DOES_NOT_EXIST__%'
+              AND floor(truncate(session_length, -1)) IN (floor(truncate(session_length, -1))-1,
+                                                                                             floor(truncate(session_length, -1))+0,
+                                                                                             floor(truncate(session_length, -1))+1)
+              AND floor(truncate(session_length, -1)) NOT IN (floor(truncate(session_length, -1))-1,
+                                                                                                 floor(truncate(session_length, -1))+1)))
+   GROUP BY 1,
+            2,
+            3,
+            4);
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+#-------------------------------------------------------------------------
+# TEST_ID: A12: trunc
+#-------------------------------------------------------------------------
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND (floor(trunc(session_length, -1)) IS NULL
+       OR (floor(trunc(session_length, -1)) = floor(trunc(session_length, -1))+0
+           AND floor(trunc(session_length, -1)) IS NOT DISTINCT
+           FROM floor(trunc(session_length, -1))+0
+           AND floor(trunc(session_length, -1)) <> floor(trunc(session_length, -1))-1
+           AND (floor(trunc(session_length, -1)) IS DISTINCT
+                FROM floor(trunc(session_length, -1))-1)
+           AND floor(trunc(session_length, -1)) > floor(trunc(session_length, -1))-1
+           AND floor(trunc(session_length, -1)) >= floor(trunc(session_length, -1))-1
+           AND floor(trunc(session_length, -1)) < floor(trunc(session_length, -1))+1
+           AND floor(trunc(session_length, -1)) <= floor(trunc(session_length, -1))+1
+           AND (floor(trunc(session_length, -1)) <> floor(trunc(session_length, -1))-1) IS TRUE
+           AND (floor(trunc(session_length, -1)) = floor(trunc(session_length, -1))-1) IS NOT TRUE
+           AND (floor(trunc(session_length, -1)) = floor(trunc(session_length, -1))-1) IS FALSE
+           AND (floor(trunc(session_length, -1)) <> floor(trunc(session_length, -1))-1) IS NOT FALSE
+           AND floor(trunc(session_length, -1)) BETWEEN floor(trunc(session_length, -1))-1 AND floor(trunc(session_length, -1))+1
+           AND floor(trunc(session_length, -1)) NOT BETWEEN floor(trunc(session_length, -1)) AND floor(trunc(session_length, -1))-1
+           AND floor(trunc(session_length, -1)) like '%'
+           AND floor(trunc(session_length, -1)) not like '__DOES_NOT_EXIST__%'
+           AND floor(trunc(session_length, -1)) IN (floor(trunc(session_length, -1))-1,
+                                                                                    floor(trunc(session_length, -1))+0,
+                                                                                    floor(trunc(session_length, -1))+1)
+           AND floor(trunc(session_length, -1)) NOT IN (floor(trunc(session_length, -1))-1,
+                                                                                        floor(trunc(session_length, -1))+1))) ;
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND (floor(trunc(session_length, -1)) IS NULL
+       OR floor(trunc(session_length, -1)) IN
+         (SELECT floor(trunc(session_length, -1))
+          FROM kttm_nested
+          WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+            AND (floor(trunc(session_length, -1)) IS NULL
+                 OR (floor(trunc(session_length, -1)) = floor(trunc(session_length, -1))+0
+                     AND floor(trunc(session_length, -1)) IS NOT DISTINCT
+                     FROM floor(trunc(session_length, -1))+0
+                     AND floor(trunc(session_length, -1)) <> floor(trunc(session_length, -1))-1
+                     AND (floor(trunc(session_length, -1)) IS DISTINCT
+                          FROM floor(trunc(session_length, -1))-1)
+                     AND floor(trunc(session_length, -1)) > floor(trunc(session_length, -1))-1
+                     AND floor(trunc(session_length, -1)) >= floor(trunc(session_length, -1))-1
+                     AND floor(trunc(session_length, -1)) < floor(trunc(session_length, -1))+1
+                     AND floor(trunc(session_length, -1)) <= floor(trunc(session_length, -1))+1
+                     AND (floor(trunc(session_length, -1)) <> floor(trunc(session_length, -1))-1) IS TRUE
+                     AND (floor(trunc(session_length, -1)) = floor(trunc(session_length, -1))-1) IS NOT TRUE
+                     AND (floor(trunc(session_length, -1)) = floor(trunc(session_length, -1))-1) IS FALSE
+                     AND (floor(trunc(session_length, -1)) <> floor(trunc(session_length, -1))-1) IS NOT FALSE
+                     AND floor(trunc(session_length, -1)) BETWEEN floor(trunc(session_length, -1))-1 AND floor(trunc(session_length, -1))+1
+                     AND floor(trunc(session_length, -1)) NOT BETWEEN floor(trunc(session_length, -1)) AND floor(trunc(session_length, -1))-1
+                     AND floor(trunc(session_length, -1)) like '%'
+                     AND floor(trunc(session_length, -1)) not like '__DOES_NOT_EXIST__%'
+                     AND floor(trunc(session_length, -1)) IN (floor(trunc(session_length, -1))-1,
+                                                                                              floor(trunc(session_length, -1))+0,
+                                                                                              floor(trunc(session_length, -1))+1)
+                     AND floor(trunc(session_length, -1)) NOT IN (floor(trunc(session_length, -1))-1,
+                                                                                                  floor(trunc(session_length, -1))+1)))));
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM
+  (SELECT __time, number, client_ip,
+                          floor(trunc(session_length, -1)),
+                          count(*)
+   FROM kttm_nested
+   WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+     AND (floor(trunc(session_length, -1)) IS NULL
+          OR (floor(trunc(session_length, -1)) = floor(trunc(session_length, -1))+0
+              AND floor(trunc(session_length, -1)) IS NOT DISTINCT
+              FROM floor(trunc(session_length, -1))+0
+              AND floor(trunc(session_length, -1)) <> floor(trunc(session_length, -1))-1
+              AND (floor(trunc(session_length, -1)) IS DISTINCT
+                   FROM floor(trunc(session_length, -1))-1)
+              AND floor(trunc(session_length, -1)) > floor(trunc(session_length, -1))-1
+              AND floor(trunc(session_length, -1)) >= floor(trunc(session_length, -1))-1
+              AND floor(trunc(session_length, -1)) < floor(trunc(session_length, -1))+1
+              AND floor(trunc(session_length, -1)) <= floor(trunc(session_length, -1))+1
+              AND (floor(trunc(session_length, -1)) <> floor(trunc(session_length, -1))-1) IS TRUE
+              AND (floor(trunc(session_length, -1)) = floor(trunc(session_length, -1))-1) IS NOT TRUE
+              AND (floor(trunc(session_length, -1)) = floor(trunc(session_length, -1))-1) IS FALSE
+              AND (floor(trunc(session_length, -1)) <> floor(trunc(session_length, -1))-1) IS NOT FALSE
+              AND floor(trunc(session_length, -1)) BETWEEN floor(trunc(session_length, -1))-1 AND floor(trunc(session_length, -1))+1
+              AND floor(trunc(session_length, -1)) NOT BETWEEN floor(trunc(session_length, -1)) AND floor(trunc(session_length, -1))-1
+              AND floor(trunc(session_length, -1)) like '%'
+              AND floor(trunc(session_length, -1)) not like '__DOES_NOT_EXIST__%'
+              AND floor(trunc(session_length, -1)) IN (floor(trunc(session_length, -1))-1,
+                                                                                       floor(trunc(session_length, -1))+0,
+                                                                                       floor(trunc(session_length, -1))+1)
+              AND floor(trunc(session_length, -1)) NOT IN (floor(trunc(session_length, -1))-1,
+                                                                                           floor(trunc(session_length, -1))+1)))
+   GROUP BY 1,
+            2,
+            3,
+            4);
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+#-------------------------------------------------------------------------
+# TEST_ID: A13: round
+#-------------------------------------------------------------------------
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND (round(session_length, 2) IS NULL
+       OR (round(session_length, 2) = round(session_length, 2)+0
+           AND round(session_length, 2) IS NOT DISTINCT
+           FROM round(session_length, 2)+0
+           AND round(session_length, 2) <> round(session_length, 2)-1
+           AND (round(session_length, 2) IS DISTINCT
+                FROM round(session_length, 2)-1)
+           AND round(session_length, 2) > round(session_length, 2)-1
+           AND round(session_length, 2) >= round(session_length, 2)-1
+           AND round(session_length, 2) < round(session_length, 2)+1
+           AND round(session_length, 2) <= round(session_length, 2)+1
+           AND (round(session_length, 2) <> round(session_length, 2)-1) IS TRUE
+           AND (round(session_length, 2) = round(session_length, 2)-1) IS NOT TRUE
+           AND (round(session_length, 2) = round(session_length, 2)-1) IS FALSE
+           AND (round(session_length, 2) <> round(session_length, 2)-1) IS NOT FALSE
+           AND round(session_length, 2) BETWEEN round(session_length, 2)-1 AND round(session_length, 2)+1
+           AND round(session_length, 2) NOT BETWEEN round(session_length, 2) AND round(session_length, 2)-1
+           AND round(session_length, 2) like '%'
+           AND round(session_length, 2) not like '__DOES_NOT_EXIST__%'
+           AND round(session_length, 2) IN (round(session_length, 2)-1,
+                                                                    round(session_length, 2)+0,
+                                                                    round(session_length, 2)+1)
+           AND round(session_length, 2) NOT IN (round(session_length, 2)-1,
+                                                                        round(session_length, 2)+1))) ;
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND (round(session_length, 2) IS NULL
+       OR round(session_length, 2) IN
+         (SELECT round(session_length, 2)
+          FROM kttm_nested
+          WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+            AND (round(session_length, 2) IS NULL
+                 OR (round(session_length, 2) = round(session_length, 2)+0
+                     AND round(session_length, 2) IS NOT DISTINCT
+                     FROM round(session_length, 2)+0
+                     AND round(session_length, 2) <> round(session_length, 2)-1
+                     AND (round(session_length, 2) IS DISTINCT
+                          FROM round(session_length, 2)-1)
+                     AND round(session_length, 2) > round(session_length, 2)-1
+                     AND round(session_length, 2) >= round(session_length, 2)-1
+                     AND round(session_length, 2) < round(session_length, 2)+1
+                     AND round(session_length, 2) <= round(session_length, 2)+1
+                     AND (round(session_length, 2) <> round(session_length, 2)-1) IS TRUE
+                     AND (round(session_length, 2) = round(session_length, 2)-1) IS NOT TRUE
+                     AND (round(session_length, 2) = round(session_length, 2)-1) IS FALSE
+                     AND (round(session_length, 2) <> round(session_length, 2)-1) IS NOT FALSE
+                     AND round(session_length, 2) BETWEEN round(session_length, 2)-1 AND round(session_length, 2)+1
+                     AND round(session_length, 2) NOT BETWEEN round(session_length, 2) AND round(session_length, 2)-1
+                     AND round(session_length, 2) like '%'
+                     AND round(session_length, 2) not like '__DOES_NOT_EXIST__%'
+                     AND round(session_length, 2) IN (round(session_length, 2)-1,
+                                                                              round(session_length, 2)+0,
+                                                                              round(session_length, 2)+1)
+                     AND round(session_length, 2) NOT IN (round(session_length, 2)-1,
+                                                                                  round(session_length, 2)+1)))));
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM
+  (SELECT __time, number, client_ip,
+                          round(session_length, 2),
+                          count(*)
+   FROM kttm_nested
+   WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+     AND (round(session_length, 2) IS NULL
+          OR (round(session_length, 2) = round(session_length, 2)+0
+              AND round(session_length, 2) IS NOT DISTINCT
+              FROM round(session_length, 2)+0
+              AND round(session_length, 2) <> round(session_length, 2)-1
+              AND (round(session_length, 2) IS DISTINCT
+                   FROM round(session_length, 2)-1)
+              AND round(session_length, 2) > round(session_length, 2)-1
+              AND round(session_length, 2) >= round(session_length, 2)-1
+              AND round(session_length, 2) < round(session_length, 2)+1
+              AND round(session_length, 2) <= round(session_length, 2)+1
+              AND (round(session_length, 2) <> round(session_length, 2)-1) IS TRUE
+              AND (round(session_length, 2) = round(session_length, 2)-1) IS NOT TRUE
+              AND (round(session_length, 2) = round(session_length, 2)-1) IS FALSE
+              AND (round(session_length, 2) <> round(session_length, 2)-1) IS NOT FALSE
+              AND round(session_length, 2) BETWEEN round(session_length, 2)-1 AND round(session_length, 2)+1
+              AND round(session_length, 2) NOT BETWEEN round(session_length, 2) AND round(session_length, 2)-1
+              AND round(session_length, 2) like '%'
+              AND round(session_length, 2) not like '__DOES_NOT_EXIST__%'
+              AND round(session_length, 2) IN (round(session_length, 2)-1,
+                                                                       round(session_length, 2)+0,
+                                                                       round(session_length, 2)+1)
+              AND round(session_length, 2) NOT IN (round(session_length, 2)-1,
+                                                                           round(session_length, 2)+1)))
+   GROUP BY 1,
+            2,
+            3,
+            4);
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+#-------------------------------------------------------------------------
+# TEST_ID: A14: mod
+#-------------------------------------------------------------------------
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND (mod(session_length, 2) IS NULL
+       OR (mod(session_length, 2) = mod(session_length, 2)+0
+           AND mod(session_length, 2) IS NOT DISTINCT
+           FROM mod(session_length, 2)+0
+           AND mod(session_length, 2) <> mod(session_length, 2)-1
+           AND (mod(session_length, 2) IS DISTINCT
+                FROM mod(session_length, 2)-1)
+           AND mod(session_length, 2) > mod(session_length, 2)-1
+           AND mod(session_length, 2) >= mod(session_length, 2)-1
+           AND mod(session_length, 2) < mod(session_length, 2)+1
+           AND mod(session_length, 2) <= mod(session_length, 2)+1
+           AND (mod(session_length, 2) <> mod(session_length, 2)-1) IS TRUE
+           AND (mod(session_length, 2) = mod(session_length, 2)-1) IS NOT TRUE
+           AND (mod(session_length, 2) = mod(session_length, 2)-1) IS FALSE
+           AND (mod(session_length, 2) <> mod(session_length, 2)-1) IS NOT FALSE
+           AND mod(session_length, 2) BETWEEN mod(session_length, 2)-1 AND mod(session_length, 2)+1
+           AND mod(session_length, 2) NOT BETWEEN mod(session_length, 2) AND mod(session_length, 2)-1
+           AND mod(session_length, 2) like '%'
+           AND mod(session_length, 2) not like '__DOES_NOT_EXIST__%'
+           AND mod(session_length, 2) IN (mod(session_length, 2)-1,
+                                                                mod(session_length, 2)+0,
+                                                                mod(session_length, 2)+1)
+           AND mod(session_length, 2) NOT IN (mod(session_length, 2)-1,
+                                                                    mod(session_length, 2)+1))) ;
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND (mod(session_length, 2) IS NULL
+       OR mod(session_length, 2) IN
+         (SELECT mod(session_length, 2)
+          FROM kttm_nested
+          WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+            AND (mod(session_length, 2) IS NULL
+                 OR (mod(session_length, 2) = mod(session_length, 2)+0
+                     AND mod(session_length, 2) IS NOT DISTINCT
+                     FROM mod(session_length, 2)+0
+                     AND mod(session_length, 2) <> mod(session_length, 2)-1
+                     AND (mod(session_length, 2) IS DISTINCT
+                          FROM mod(session_length, 2)-1)
+                     AND mod(session_length, 2) > mod(session_length, 2)-1
+                     AND mod(session_length, 2) >= mod(session_length, 2)-1
+                     AND mod(session_length, 2) < mod(session_length, 2)+1
+                     AND mod(session_length, 2) <= mod(session_length, 2)+1
+                     AND (mod(session_length, 2) <> mod(session_length, 2)-1) IS TRUE
+                     AND (mod(session_length, 2) = mod(session_length, 2)-1) IS NOT TRUE
+                     AND (mod(session_length, 2) = mod(session_length, 2)-1) IS FALSE
+                     AND (mod(session_length, 2) <> mod(session_length, 2)-1) IS NOT FALSE
+                     AND mod(session_length, 2) BETWEEN mod(session_length, 2)-1 AND mod(session_length, 2)+1
+                     AND mod(session_length, 2) NOT BETWEEN mod(session_length, 2) AND mod(session_length, 2)-1
+                     AND mod(session_length, 2) like '%'
+                     AND mod(session_length, 2) not like '__DOES_NOT_EXIST__%'
+                     AND mod(session_length, 2) IN (mod(session_length, 2)-1,
+                                                                          mod(session_length, 2)+0,
+                                                                          mod(session_length, 2)+1)
+                     AND mod(session_length, 2) NOT IN (mod(session_length, 2)-1,
+                                                                              mod(session_length, 2)+1)))));
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM
+  (SELECT __time, number, client_ip,
+                          mod(session_length, 2),
+                          count(*)
+   FROM kttm_nested
+   WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+     AND (mod(session_length, 2) IS NULL
+          OR (mod(session_length, 2) = mod(session_length, 2)+0
+              AND mod(session_length, 2) IS NOT DISTINCT
+              FROM mod(session_length, 2)+0
+              AND mod(session_length, 2) <> mod(session_length, 2)-1
+              AND (mod(session_length, 2) IS DISTINCT
+                   FROM mod(session_length, 2)-1)
+              AND mod(session_length, 2) > mod(session_length, 2)-1
+              AND mod(session_length, 2) >= mod(session_length, 2)-1
+              AND mod(session_length, 2) < mod(session_length, 2)+1
+              AND mod(session_length, 2) <= mod(session_length, 2)+1
+              AND (mod(session_length, 2) <> mod(session_length, 2)-1) IS TRUE
+              AND (mod(session_length, 2) = mod(session_length, 2)-1) IS NOT TRUE
+              AND (mod(session_length, 2) = mod(session_length, 2)-1) IS FALSE
+              AND (mod(session_length, 2) <> mod(session_length, 2)-1) IS NOT FALSE
+              AND mod(session_length, 2) BETWEEN mod(session_length, 2)-1 AND mod(session_length, 2)+1
+              AND mod(session_length, 2) NOT BETWEEN mod(session_length, 2) AND mod(session_length, 2)-1
+              AND mod(session_length, 2) like '%'
+              AND mod(session_length, 2) not like '__DOES_NOT_EXIST__%'
+              AND mod(session_length, 2) IN (mod(session_length, 2)-1,
+                                                                   mod(session_length, 2)+0,
+                                                                   mod(session_length, 2)+1)
+              AND mod(session_length, 2) NOT IN (mod(session_length, 2)-1,
+                                                                       mod(session_length, 2)+1)))
+   GROUP BY 1,
+            2,
+            3,
+            4);
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+#-------------------------------------------------------------------------
+# TEST_ID: A15: sin
+#-------------------------------------------------------------------------
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND (floor(sin(session_length)) IS NULL
+       OR (floor(sin(session_length)) = floor(sin(session_length))+0
+           AND floor(sin(session_length)) IS NOT DISTINCT
+           FROM floor(sin(session_length))+0
+           AND floor(sin(session_length)) <> floor(sin(session_length))-1
+           AND (floor(sin(session_length)) IS DISTINCT
+                FROM floor(sin(session_length))-1)
+           AND floor(sin(session_length)) > floor(sin(session_length))-1
+           AND floor(sin(session_length)) >= floor(sin(session_length))-1
+           AND floor(sin(session_length)) < floor(sin(session_length))+1
+           AND floor(sin(session_length)) <= floor(sin(session_length))+1
+           AND (floor(sin(session_length)) <> floor(sin(session_length))-1) IS TRUE
+           AND (floor(sin(session_length)) = floor(sin(session_length))-1) IS NOT TRUE
+           AND (floor(sin(session_length)) = floor(sin(session_length))-1) IS FALSE
+           AND (floor(sin(session_length)) <> floor(sin(session_length))-1) IS NOT FALSE
+           AND floor(sin(session_length)) BETWEEN floor(sin(session_length))-1 AND floor(sin(session_length))+1
+           AND floor(sin(session_length)) NOT BETWEEN floor(sin(session_length)) AND floor(sin(session_length))-1
+           AND floor(sin(session_length)) like '%'
+           AND floor(sin(session_length)) not like '__DOES_NOT_EXIST__%'
+           AND floor(sin(session_length)) IN (floor(sin(session_length))-1,
+                                                                        floor(sin(session_length))+0,
+                                                                        floor(sin(session_length))+1)
+           AND floor(sin(session_length)) NOT IN (floor(sin(session_length))-1,
+                                                                            floor(sin(session_length))+1))) ;
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND (floor(sin(session_length)) IS NULL
+       OR floor(sin(session_length)) IN
+         (SELECT floor(sin(session_length))
+          FROM kttm_nested
+          WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+            AND (floor(sin(session_length)) IS NULL
+                 OR (floor(sin(session_length)) = floor(sin(session_length))+0
+                     AND floor(sin(session_length)) IS NOT DISTINCT
+                     FROM floor(sin(session_length))+0
+                     AND floor(sin(session_length)) <> floor(sin(session_length))-1
+                     AND (floor(sin(session_length)) IS DISTINCT
+                          FROM floor(sin(session_length))-1)
+                     AND floor(sin(session_length)) > floor(sin(session_length))-1
+                     AND floor(sin(session_length)) >= floor(sin(session_length))-1
+                     AND floor(sin(session_length)) < floor(sin(session_length))+1
+                     AND floor(sin(session_length)) <= floor(sin(session_length))+1
+                     AND (floor(sin(session_length)) <> floor(sin(session_length))-1) IS TRUE
+                     AND (floor(sin(session_length)) = floor(sin(session_length))-1) IS NOT TRUE
+                     AND (floor(sin(session_length)) = floor(sin(session_length))-1) IS FALSE
+                     AND (floor(sin(session_length)) <> floor(sin(session_length))-1) IS NOT FALSE
+                     AND floor(sin(session_length)) BETWEEN floor(sin(session_length))-1 AND floor(sin(session_length))+1
+                     AND floor(sin(session_length)) NOT BETWEEN floor(sin(session_length)) AND floor(sin(session_length))-1
+                     AND floor(sin(session_length)) like '%'
+                     AND floor(sin(session_length)) not like '__DOES_NOT_EXIST__%'
+                     AND floor(sin(session_length)) IN (floor(sin(session_length))-1,
+                                                                                  floor(sin(session_length))+0,
+                                                                                  floor(sin(session_length))+1)
+                     AND floor(sin(session_length)) NOT IN (floor(sin(session_length))-1,
+                                                                                      floor(sin(session_length))+1)))));
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM
+  (SELECT __time, number, client_ip,
+                          floor(sin(session_length)),
+                          count(*)
+   FROM kttm_nested
+   WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+     AND (floor(sin(session_length)) IS NULL
+          OR (floor(sin(session_length)) = floor(sin(session_length))+0
+              AND floor(sin(session_length)) IS NOT DISTINCT
+              FROM floor(sin(session_length))+0
+              AND floor(sin(session_length)) <> floor(sin(session_length))-1
+              AND (floor(sin(session_length)) IS DISTINCT
+                   FROM floor(sin(session_length))-1)
+              AND floor(sin(session_length)) > floor(sin(session_length))-1
+              AND floor(sin(session_length)) >= floor(sin(session_length))-1
+              AND floor(sin(session_length)) < floor(sin(session_length))+1
+              AND floor(sin(session_length)) <= floor(sin(session_length))+1
+              AND (floor(sin(session_length)) <> floor(sin(session_length))-1) IS TRUE
+              AND (floor(sin(session_length)) = floor(sin(session_length))-1) IS NOT TRUE
+              AND (floor(sin(session_length)) = floor(sin(session_length))-1) IS FALSE
+              AND (floor(sin(session_length)) <> floor(sin(session_length))-1) IS NOT FALSE
+              AND floor(sin(session_length)) BETWEEN floor(sin(session_length))-1 AND floor(sin(session_length))+1
+              AND floor(sin(session_length)) NOT BETWEEN floor(sin(session_length)) AND floor(sin(session_length))-1
+              AND floor(sin(session_length)) like '%'
+              AND floor(sin(session_length)) not like '__DOES_NOT_EXIST__%'
+              AND floor(sin(session_length)) IN (floor(sin(session_length))-1,
+                                                                           floor(sin(session_length))+0,
+                                                                           floor(sin(session_length))+1)
+              AND floor(sin(session_length)) NOT IN (floor(sin(session_length))-1,
+                                                                               floor(sin(session_length))+1)))
+   GROUP BY 1,
+            2,
+            3,
+            4);
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+#-------------------------------------------------------------------------
+# TEST_ID: A16: cos
+#-------------------------------------------------------------------------
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND (floor(cos(session_length)) IS NULL
+       OR (floor(cos(session_length)) = floor(cos(session_length))+0
+           AND floor(cos(session_length)) IS NOT DISTINCT
+           FROM floor(cos(session_length))+0
+           AND floor(cos(session_length)) <> floor(cos(session_length))-1
+           AND (floor(cos(session_length)) IS DISTINCT
+                FROM floor(cos(session_length))-1)
+           AND floor(cos(session_length)) > floor(cos(session_length))-1
+           AND floor(cos(session_length)) >= floor(cos(session_length))-1
+           AND floor(cos(session_length)) < floor(cos(session_length))+1
+           AND floor(cos(session_length)) <= floor(cos(session_length))+1
+           AND (floor(cos(session_length)) <> floor(cos(session_length))-1) IS TRUE
+           AND (floor(cos(session_length)) = floor(cos(session_length))-1) IS NOT TRUE
+           AND (floor(cos(session_length)) = floor(cos(session_length))-1) IS FALSE
+           AND (floor(cos(session_length)) <> floor(cos(session_length))-1) IS NOT FALSE
+           AND floor(cos(session_length)) BETWEEN floor(cos(session_length))-1 AND floor(cos(session_length))+1
+           AND floor(cos(session_length)) NOT BETWEEN floor(cos(session_length)) AND floor(cos(session_length))-1
+           AND floor(cos(session_length)) like '%'
+           AND floor(cos(session_length)) not like '__DOES_NOT_EXIST__%'
+           AND floor(cos(session_length)) IN (floor(cos(session_length))-1,
+                                                                        floor(cos(session_length))+0,
+                                                                        floor(cos(session_length))+1)
+           AND floor(cos(session_length)) NOT IN (floor(cos(session_length))-1,
+                                                                            floor(cos(session_length))+1))) ;
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND (floor(cos(session_length)) IS NULL
+       OR floor(cos(session_length)) IN
+         (SELECT floor(cos(session_length))
+          FROM kttm_nested
+          WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+            AND (floor(cos(session_length)) IS NULL
+                 OR (floor(cos(session_length)) = floor(cos(session_length))+0
+                     AND floor(cos(session_length)) IS NOT DISTINCT
+                     FROM floor(cos(session_length))+0
+                     AND floor(cos(session_length)) <> floor(cos(session_length))-1
+                     AND (floor(cos(session_length)) IS DISTINCT
+                          FROM floor(cos(session_length))-1)
+                     AND floor(cos(session_length)) > floor(cos(session_length))-1
+                     AND floor(cos(session_length)) >= floor(cos(session_length))-1
+                     AND floor(cos(session_length)) < floor(cos(session_length))+1
+                     AND floor(cos(session_length)) <= floor(cos(session_length))+1
+                     AND (floor(cos(session_length)) <> floor(cos(session_length))-1) IS TRUE
+                     AND (floor(cos(session_length)) = floor(cos(session_length))-1) IS NOT TRUE
+                     AND (floor(cos(session_length)) = floor(cos(session_length))-1) IS FALSE
+                     AND (floor(cos(session_length)) <> floor(cos(session_length))-1) IS NOT FALSE
+                     AND floor(cos(session_length)) BETWEEN floor(cos(session_length))-1 AND floor(cos(session_length))+1
+                     AND floor(cos(session_length)) NOT BETWEEN floor(cos(session_length)) AND floor(cos(session_length))-1
+                     AND floor(cos(session_length)) like '%'
+                     AND floor(cos(session_length)) not like '__DOES_NOT_EXIST__%'
+                     AND floor(cos(session_length)) IN (floor(cos(session_length))-1,
+                                                                                  floor(cos(session_length))+0,
+                                                                                  floor(cos(session_length))+1)
+                     AND floor(cos(session_length)) NOT IN (floor(cos(session_length))-1,
+                                                                                      floor(cos(session_length))+1)))));
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM
+  (SELECT __time, number, client_ip,
+                          floor(cos(session_length)),
+                          count(*)
+   FROM kttm_nested
+   WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+     AND (floor(cos(session_length)) IS NULL
+          OR (floor(cos(session_length)) = floor(cos(session_length))+0
+              AND floor(cos(session_length)) IS NOT DISTINCT
+              FROM floor(cos(session_length))+0
+              AND floor(cos(session_length)) <> floor(cos(session_length))-1
+              AND (floor(cos(session_length)) IS DISTINCT
+                   FROM floor(cos(session_length))-1)
+              AND floor(cos(session_length)) > floor(cos(session_length))-1
+              AND floor(cos(session_length)) >= floor(cos(session_length))-1
+              AND floor(cos(session_length)) < floor(cos(session_length))+1
+              AND floor(cos(session_length)) <= floor(cos(session_length))+1
+              AND (floor(cos(session_length)) <> floor(cos(session_length))-1) IS TRUE
+              AND (floor(cos(session_length)) = floor(cos(session_length))-1) IS NOT TRUE
+              AND (floor(cos(session_length)) = floor(cos(session_length))-1) IS FALSE
+              AND (floor(cos(session_length)) <> floor(cos(session_length))-1) IS NOT FALSE
+              AND floor(cos(session_length)) BETWEEN floor(cos(session_length))-1 AND floor(cos(session_length))+1
+              AND floor(cos(session_length)) NOT BETWEEN floor(cos(session_length)) AND floor(cos(session_length))-1
+              AND floor(cos(session_length)) like '%'
+              AND floor(cos(session_length)) not like '__DOES_NOT_EXIST__%'
+              AND floor(cos(session_length)) IN (floor(cos(session_length))-1,
+                                                                           floor(cos(session_length))+0,
+                                                                           floor(cos(session_length))+1)
+              AND floor(cos(session_length)) NOT IN (floor(cos(session_length))-1,
+                                                                               floor(cos(session_length))+1)))
+   GROUP BY 1,
+            2,
+            3,
+            4);
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+#-------------------------------------------------------------------------
+# TEST_ID: A17: tan
+#-------------------------------------------------------------------------
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND (floor(tan(session_length)) IS NULL
+       OR (floor(tan(session_length)) = floor(tan(session_length))+0
+           AND floor(tan(session_length)) IS NOT DISTINCT
+           FROM floor(tan(session_length))+0
+           AND floor(tan(session_length)) <> floor(tan(session_length))-1
+           AND (floor(tan(session_length)) IS DISTINCT
+                FROM floor(tan(session_length))-1)
+           AND floor(tan(session_length)) > floor(tan(session_length))-1
+           AND floor(tan(session_length)) >= floor(tan(session_length))-1
+           AND floor(tan(session_length)) < floor(tan(session_length))+1
+           AND floor(tan(session_length)) <= floor(tan(session_length))+1
+           AND (floor(tan(session_length)) <> floor(tan(session_length))-1) IS TRUE
+           AND (floor(tan(session_length)) = floor(tan(session_length))-1) IS NOT TRUE
+           AND (floor(tan(session_length)) = floor(tan(session_length))-1) IS FALSE
+           AND (floor(tan(session_length)) <> floor(tan(session_length))-1) IS NOT FALSE
+           AND floor(tan(session_length)) BETWEEN floor(tan(session_length))-1 AND floor(tan(session_length))+1
+           AND floor(tan(session_length)) NOT BETWEEN floor(tan(session_length)) AND floor(tan(session_length))-1
+           AND floor(tan(session_length)) like '%'
+           AND floor(tan(session_length)) not like '__DOES_NOT_EXIST__%'
+           AND floor(tan(session_length)) IN (floor(tan(session_length))-1,
+                                                                        floor(tan(session_length))+0,
+                                                                        floor(tan(session_length))+1)
+           AND floor(tan(session_length)) NOT IN (floor(tan(session_length))-1,
+                                                                            floor(tan(session_length))+1))) ;
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND (floor(tan(session_length)) IS NULL
+       OR floor(tan(session_length)) IN
+         (SELECT floor(tan(session_length))
+          FROM kttm_nested
+          WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+            AND (floor(tan(session_length)) IS NULL
+                 OR (floor(tan(session_length)) = floor(tan(session_length))+0
+                     AND floor(tan(session_length)) IS NOT DISTINCT
+                     FROM floor(tan(session_length))+0
+                     AND floor(tan(session_length)) <> floor(tan(session_length))-1
+                     AND (floor(tan(session_length)) IS DISTINCT
+                          FROM floor(tan(session_length))-1)
+                     AND floor(tan(session_length)) > floor(tan(session_length))-1
+                     AND floor(tan(session_length)) >= floor(tan(session_length))-1
+                     AND floor(tan(session_length)) < floor(tan(session_length))+1
+                     AND floor(tan(session_length)) <= floor(tan(session_length))+1
+                     AND (floor(tan(session_length)) <> floor(tan(session_length))-1) IS TRUE
+                     AND (floor(tan(session_length)) = floor(tan(session_length))-1) IS NOT TRUE
+                     AND (floor(tan(session_length)) = floor(tan(session_length))-1) IS FALSE
+                     AND (floor(tan(session_length)) <> floor(tan(session_length))-1) IS NOT FALSE
+                     AND floor(tan(session_length)) BETWEEN floor(tan(session_length))-1 AND floor(tan(session_length))+1
+                     AND floor(tan(session_length)) NOT BETWEEN floor(tan(session_length)) AND floor(tan(session_length))-1
+                     AND floor(tan(session_length)) like '%'
+                     AND floor(tan(session_length)) not like '__DOES_NOT_EXIST__%'
+                     AND floor(tan(session_length)) IN (floor(tan(session_length))-1,
+                                                                                  floor(tan(session_length))+0,
+                                                                                  floor(tan(session_length))+1)
+                     AND floor(tan(session_length)) NOT IN (floor(tan(session_length))-1,
+                                                                                      floor(tan(session_length))+1)))));
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM
+  (SELECT __time, number, client_ip,
+                          floor(tan(session_length)),
+                          count(*)
+   FROM kttm_nested
+   WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+     AND (floor(tan(session_length)) IS NULL
+          OR (floor(tan(session_length)) = floor(tan(session_length))+0
+              AND floor(tan(session_length)) IS NOT DISTINCT
+              FROM floor(tan(session_length))+0
+              AND floor(tan(session_length)) <> floor(tan(session_length))-1
+              AND (floor(tan(session_length)) IS DISTINCT
+                   FROM floor(tan(session_length))-1)
+              AND floor(tan(session_length)) > floor(tan(session_length))-1
+              AND floor(tan(session_length)) >= floor(tan(session_length))-1
+              AND floor(tan(session_length)) < floor(tan(session_length))+1
+              AND floor(tan(session_length)) <= floor(tan(session_length))+1
+              AND (floor(tan(session_length)) <> floor(tan(session_length))-1) IS TRUE
+              AND (floor(tan(session_length)) = floor(tan(session_length))-1) IS NOT TRUE
+              AND (floor(tan(session_length)) = floor(tan(session_length))-1) IS FALSE
+              AND (floor(tan(session_length)) <> floor(tan(session_length))-1) IS NOT FALSE
+              AND floor(tan(session_length)) BETWEEN floor(tan(session_length))-1 AND floor(tan(session_length))+1
+              AND floor(tan(session_length)) NOT BETWEEN floor(tan(session_length)) AND floor(tan(session_length))-1
+              AND floor(tan(session_length)) like '%'
+              AND floor(tan(session_length)) not like '__DOES_NOT_EXIST__%'
+              AND floor(tan(session_length)) IN (floor(tan(session_length))-1,
+                                                                           floor(tan(session_length))+0,
+                                                                           floor(tan(session_length))+1)
+              AND floor(tan(session_length)) NOT IN (floor(tan(session_length))-1,
+                                                                               floor(tan(session_length))+1)))
+   GROUP BY 1,
+            2,
+            3,
+            4);
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+#-------------------------------------------------------------------------
+# TEST_ID: A18: cot
+#-------------------------------------------------------------------------
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND (floor(cot(greatest(session_length, 1))) IS NULL
+       OR (floor(cot(greatest(session_length, 1))) = floor(cot(greatest(session_length, 1)))+0
+           AND floor(cot(greatest(session_length, 1))) IS NOT DISTINCT
+           FROM floor(cot(greatest(session_length, 1)))+0
+           AND floor(cot(greatest(session_length, 1))) <> floor(cot(greatest(session_length, 1)))-1
+           AND (floor(cot(greatest(session_length, 1))) IS DISTINCT
+                FROM floor(cot(greatest(session_length, 1)))-1)
+           AND floor(cot(greatest(session_length, 1))) > floor(cot(greatest(session_length, 1)))-1
+           AND floor(cot(greatest(session_length, 1))) >= floor(cot(greatest(session_length, 1)))-1
+           AND floor(cot(greatest(session_length, 1))) < floor(cot(greatest(session_length, 1)))+1
+           AND floor(cot(greatest(session_length, 1))) <= floor(cot(greatest(session_length, 1)))+1
+           AND (floor(cot(greatest(session_length, 1))) <> floor(cot(greatest(session_length, 1)))-1) IS TRUE
+           AND (floor(cot(greatest(session_length, 1))) = floor(cot(greatest(session_length, 1)))-1) IS NOT TRUE
+           AND (floor(cot(greatest(session_length, 1))) = floor(cot(greatest(session_length, 1)))-1) IS FALSE
+           AND (floor(cot(greatest(session_length, 1))) <> floor(cot(greatest(session_length, 1)))-1) IS NOT FALSE
+           AND floor(cot(greatest(session_length, 1))) BETWEEN floor(cot(greatest(session_length, 1)))-1 AND floor(cot(greatest(session_length, 1)))+1
+           AND floor(cot(greatest(session_length, 1))) NOT BETWEEN floor(cot(greatest(session_length, 1))) AND floor(cot(greatest(session_length, 1)))-1
+           AND floor(cot(greatest(session_length, 1))) like '%'
+           AND floor(cot(greatest(session_length, 1))) not like '__DOES_NOT_EXIST__%'
+           AND floor(cot(greatest(session_length, 1))) IN (floor(cot(greatest(session_length, 1)))-1,
+                                                                                                  floor(cot(greatest(session_length, 1)))+0,
+                                                                                                  floor(cot(greatest(session_length, 1)))+1)
+           AND floor(cot(greatest(session_length, 1))) NOT IN (floor(cot(greatest(session_length, 1)))-1,
+                                                                                                      floor(cot(greatest(session_length, 1)))+1))) ;
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND (floor(cot(greatest(session_length, 1))) IS NULL
+       OR floor(cot(greatest(session_length, 1))) IN
+         (SELECT floor(cot(greatest(session_length, 1)))
+          FROM kttm_nested
+          WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+            AND (floor(cot(greatest(session_length, 1))) IS NULL
+                 OR (floor(cot(greatest(session_length, 1))) = floor(cot(greatest(session_length, 1)))+0
+                     AND floor(cot(greatest(session_length, 1))) IS NOT DISTINCT
+                     FROM floor(cot(greatest(session_length, 1)))+0
+                     AND floor(cot(greatest(session_length, 1))) <> floor(cot(greatest(session_length, 1)))-1
+                     AND (floor(cot(greatest(session_length, 1))) IS DISTINCT
+                          FROM floor(cot(greatest(session_length, 1)))-1)
+                     AND floor(cot(greatest(session_length, 1))) > floor(cot(greatest(session_length, 1)))-1
+                     AND floor(cot(greatest(session_length, 1))) >= floor(cot(greatest(session_length, 1)))-1
+                     AND floor(cot(greatest(session_length, 1))) < floor(cot(greatest(session_length, 1)))+1
+                     AND floor(cot(greatest(session_length, 1))) <= floor(cot(greatest(session_length, 1)))+1
+                     AND (floor(cot(greatest(session_length, 1))) <> floor(cot(greatest(session_length, 1)))-1) IS TRUE
+                     AND (floor(cot(greatest(session_length, 1))) = floor(cot(greatest(session_length, 1)))-1) IS NOT TRUE
+                     AND (floor(cot(greatest(session_length, 1))) = floor(cot(greatest(session_length, 1)))-1) IS FALSE
+                     AND (floor(cot(greatest(session_length, 1))) <> floor(cot(greatest(session_length, 1)))-1) IS NOT FALSE
+                     AND floor(cot(greatest(session_length, 1))) BETWEEN floor(cot(greatest(session_length, 1)))-1 AND floor(cot(greatest(session_length, 1)))+1
+                     AND floor(cot(greatest(session_length, 1))) NOT BETWEEN floor(cot(greatest(session_length, 1))) AND floor(cot(greatest(session_length, 1)))-1
+                     AND floor(cot(greatest(session_length, 1))) like '%'
+                     AND floor(cot(greatest(session_length, 1))) not like '__DOES_NOT_EXIST__%'
+                     AND floor(cot(greatest(session_length, 1))) IN (floor(cot(greatest(session_length, 1)))-1,
+                                                                                                            floor(cot(greatest(session_length, 1)))+0,
+                                                                                                            floor(cot(greatest(session_length, 1)))+1)
+                     AND floor(cot(greatest(session_length, 1))) NOT IN (floor(cot(greatest(session_length, 1)))-1,
+                                                                                                                floor(cot(greatest(session_length, 1)))+1)))));
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM
+  (SELECT __time, number, client_ip,
+                          floor(cot(greatest(session_length, 1))),
+                          count(*)
+   FROM kttm_nested
+   WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+     AND (floor(cot(greatest(session_length, 1))) IS NULL
+          OR (floor(cot(greatest(session_length, 1))) = floor(cot(greatest(session_length, 1)))+0
+              AND floor(cot(greatest(session_length, 1))) IS NOT DISTINCT
+              FROM floor(cot(greatest(session_length, 1)))+0
+              AND floor(cot(greatest(session_length, 1))) <> floor(cot(greatest(session_length, 1)))-1
+              AND (floor(cot(greatest(session_length, 1))) IS DISTINCT
+                   FROM floor(cot(greatest(session_length, 1)))-1)
+              AND floor(cot(greatest(session_length, 1))) > floor(cot(greatest(session_length, 1)))-1
+              AND floor(cot(greatest(session_length, 1))) >= floor(cot(greatest(session_length, 1)))-1
+              AND floor(cot(greatest(session_length, 1))) < floor(cot(greatest(session_length, 1)))+1
+              AND floor(cot(greatest(session_length, 1))) <= floor(cot(greatest(session_length, 1)))+1
+              AND (floor(cot(greatest(session_length, 1))) <> floor(cot(greatest(session_length, 1)))-1) IS TRUE
+              AND (floor(cot(greatest(session_length, 1))) = floor(cot(greatest(session_length, 1)))-1) IS NOT TRUE
+              AND (floor(cot(greatest(session_length, 1))) = floor(cot(greatest(session_length, 1)))-1) IS FALSE
+              AND (floor(cot(greatest(session_length, 1))) <> floor(cot(greatest(session_length, 1)))-1) IS NOT FALSE
+              AND floor(cot(greatest(session_length, 1))) BETWEEN floor(cot(greatest(session_length, 1)))-1 AND floor(cot(greatest(session_length, 1)))+1
+              AND floor(cot(greatest(session_length, 1))) NOT BETWEEN floor(cot(greatest(session_length, 1))) AND floor(cot(greatest(session_length, 1)))-1
+              AND floor(cot(greatest(session_length, 1))) like '%'
+              AND floor(cot(greatest(session_length, 1))) not like '__DOES_NOT_EXIST__%'
+              AND floor(cot(greatest(session_length, 1))) IN (floor(cot(greatest(session_length, 1)))-1,
+                                                                                                     floor(cot(greatest(session_length, 1)))+0,
+                                                                                                     floor(cot(greatest(session_length, 1)))+1)
+              AND floor(cot(greatest(session_length, 1))) NOT IN (floor(cot(greatest(session_length, 1)))-1,
+                                                                                                         floor(cot(greatest(session_length, 1)))+1)))
+   GROUP BY 1,
+            2,
+            3,
+            4);
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+#-------------------------------------------------------------------------
+# TEST_ID: A19: asin
+#-------------------------------------------------------------------------
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND (floor(asin(least(session_length, 1))) IS NULL
+       OR (floor(asin(least(session_length, 1))) = floor(asin(least(session_length, 1)))+0
+           AND floor(asin(least(session_length, 1))) IS NOT DISTINCT
+           FROM floor(asin(least(session_length, 1)))+0
+           AND floor(asin(least(session_length, 1))) <> floor(asin(least(session_length, 1)))-1
+           AND (floor(asin(least(session_length, 1))) IS DISTINCT
+                FROM floor(asin(least(session_length, 1)))-1)
+           AND floor(asin(least(session_length, 1))) > floor(asin(least(session_length, 1)))-1
+           AND floor(asin(least(session_length, 1))) >= floor(asin(least(session_length, 1)))-1
+           AND floor(asin(least(session_length, 1))) < floor(asin(least(session_length, 1)))+1
+           AND floor(asin(least(session_length, 1))) <= floor(asin(least(session_length, 1)))+1
+           AND (floor(asin(least(session_length, 1))) <> floor(asin(least(session_length, 1)))-1) IS TRUE
+           AND (floor(asin(least(session_length, 1))) = floor(asin(least(session_length, 1)))-1) IS NOT TRUE
+           AND (floor(asin(least(session_length, 1))) = floor(asin(least(session_length, 1)))-1) IS FALSE
+           AND (floor(asin(least(session_length, 1))) <> floor(asin(least(session_length, 1)))-1) IS NOT FALSE
+           AND floor(asin(least(session_length, 1))) BETWEEN floor(asin(least(session_length, 1)))-1 AND floor(asin(least(session_length, 1)))+1
+           AND floor(asin(least(session_length, 1))) NOT BETWEEN floor(asin(least(session_length, 1))) AND floor(asin(least(session_length, 1)))-1
+           AND floor(asin(least(session_length, 1))) like '%'
+           AND floor(asin(least(session_length, 1))) not like '__DOES_NOT_EXIST__%'
+           AND floor(asin(least(session_length, 1))) IN (floor(asin(least(session_length, 1)))-1,
+                                                                                              floor(asin(least(session_length, 1)))+0,
+                                                                                              floor(asin(least(session_length, 1)))+1)
+           AND floor(asin(least(session_length, 1))) NOT IN (floor(asin(least(session_length, 1)))-1,
+                                                                                                  floor(asin(least(session_length, 1)))+1))) ;
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND (floor(asin(least(session_length, 1))) IS NULL
+       OR floor(asin(least(session_length, 1))) IN
+         (SELECT floor(asin(least(session_length, 1)))
+          FROM kttm_nested
+          WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+            AND (floor(asin(least(session_length, 1))) IS NULL
+                 OR (floor(asin(least(session_length, 1))) = floor(asin(least(session_length, 1)))+0
+                     AND floor(asin(least(session_length, 1))) IS NOT DISTINCT
+                     FROM floor(asin(least(session_length, 1)))+0
+                     AND floor(asin(least(session_length, 1))) <> floor(asin(least(session_length, 1)))-1
+                     AND (floor(asin(least(session_length, 1))) IS DISTINCT
+                          FROM floor(asin(least(session_length, 1)))-1)
+                     AND floor(asin(least(session_length, 1))) > floor(asin(least(session_length, 1)))-1
+                     AND floor(asin(least(session_length, 1))) >= floor(asin(least(session_length, 1)))-1
+                     AND floor(asin(least(session_length, 1))) < floor(asin(least(session_length, 1)))+1
+                     AND floor(asin(least(session_length, 1))) <= floor(asin(least(session_length, 1)))+1
+                     AND (floor(asin(least(session_length, 1))) <> floor(asin(least(session_length, 1)))-1) IS TRUE
+                     AND (floor(asin(least(session_length, 1))) = floor(asin(least(session_length, 1)))-1) IS NOT TRUE
+                     AND (floor(asin(least(session_length, 1))) = floor(asin(least(session_length, 1)))-1) IS FALSE
+                     AND (floor(asin(least(session_length, 1))) <> floor(asin(least(session_length, 1)))-1) IS NOT FALSE
+                     AND floor(asin(least(session_length, 1))) BETWEEN floor(asin(least(session_length, 1)))-1 AND floor(asin(least(session_length, 1)))+1
+                     AND floor(asin(least(session_length, 1))) NOT BETWEEN floor(asin(least(session_length, 1))) AND floor(asin(least(session_length, 1)))-1
+                     AND floor(asin(least(session_length, 1))) like '%'
+                     AND floor(asin(least(session_length, 1))) not like '__DOES_NOT_EXIST__%'
+                     AND floor(asin(least(session_length, 1))) IN (floor(asin(least(session_length, 1)))-1,
+                                                                                                        floor(asin(least(session_length, 1)))+0,
+                                                                                                        floor(asin(least(session_length, 1)))+1)
+                     AND floor(asin(least(session_length, 1))) NOT IN (floor(asin(least(session_length, 1)))-1,
+                                                                                                            floor(asin(least(session_length, 1)))+1)))));
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM
+  (SELECT __time, number, client_ip,
+                          floor(asin(least(session_length, 1))),
+                          count(*)
+   FROM kttm_nested
+   WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+     AND (floor(asin(least(session_length, 1))) IS NULL
+          OR (floor(asin(least(session_length, 1))) = floor(asin(least(session_length, 1)))+0
+              AND floor(asin(least(session_length, 1))) IS NOT DISTINCT
+              FROM floor(asin(least(session_length, 1)))+0
+              AND floor(asin(least(session_length, 1))) <> floor(asin(least(session_length, 1)))-1
+              AND (floor(asin(least(session_length, 1))) IS DISTINCT
+                   FROM floor(asin(least(session_length, 1)))-1)
+              AND floor(asin(least(session_length, 1))) > floor(asin(least(session_length, 1)))-1
+              AND floor(asin(least(session_length, 1))) >= floor(asin(least(session_length, 1)))-1
+              AND floor(asin(least(session_length, 1))) < floor(asin(least(session_length, 1)))+1
+              AND floor(asin(least(session_length, 1))) <= floor(asin(least(session_length, 1)))+1
+              AND (floor(asin(least(session_length, 1))) <> floor(asin(least(session_length, 1)))-1) IS TRUE
+              AND (floor(asin(least(session_length, 1))) = floor(asin(least(session_length, 1)))-1) IS NOT TRUE
+              AND (floor(asin(least(session_length, 1))) = floor(asin(least(session_length, 1)))-1) IS FALSE
+              AND (floor(asin(least(session_length, 1))) <> floor(asin(least(session_length, 1)))-1) IS NOT FALSE
+              AND floor(asin(least(session_length, 1))) BETWEEN floor(asin(least(session_length, 1)))-1 AND floor(asin(least(session_length, 1)))+1
+              AND floor(asin(least(session_length, 1))) NOT BETWEEN floor(asin(least(session_length, 1))) AND floor(asin(least(session_length, 1)))-1
+              AND floor(asin(least(session_length, 1))) like '%'
+              AND floor(asin(least(session_length, 1))) not like '__DOES_NOT_EXIST__%'
+              AND floor(asin(least(session_length, 1))) IN (floor(asin(least(session_length, 1)))-1,
+                                                                                                 floor(asin(least(session_length, 1)))+0,
+                                                                                                 floor(asin(least(session_length, 1)))+1)
+              AND floor(asin(least(session_length, 1))) NOT IN (floor(asin(least(session_length, 1)))-1,
+                                                                                                     floor(asin(least(session_length, 1)))+1)))
+   GROUP BY 1,
+            2,
+            3,
+            4);
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+#-------------------------------------------------------------------------
+# TEST_ID: A20: acos
+#-------------------------------------------------------------------------
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND (floor(acos(least(session_length, 1))) IS NULL
+       OR (floor(acos(least(session_length, 1))) = floor(acos(least(session_length, 1)))+0
+           AND floor(acos(least(session_length, 1))) IS NOT DISTINCT
+           FROM floor(acos(least(session_length, 1)))+0
+           AND floor(acos(least(session_length, 1))) <> floor(acos(least(session_length, 1)))-1
+           AND (floor(acos(least(session_length, 1))) IS DISTINCT
+                FROM floor(acos(least(session_length, 1)))-1)
+           AND floor(acos(least(session_length, 1))) > floor(acos(least(session_length, 1)))-1
+           AND floor(acos(least(session_length, 1))) >= floor(acos(least(session_length, 1)))-1
+           AND floor(acos(least(session_length, 1))) < floor(acos(least(session_length, 1)))+1
+           AND floor(acos(least(session_length, 1))) <= floor(acos(least(session_length, 1)))+1
+           AND (floor(acos(least(session_length, 1))) <> floor(acos(least(session_length, 1)))-1) IS TRUE
+           AND (floor(acos(least(session_length, 1))) = floor(acos(least(session_length, 1)))-1) IS NOT TRUE
+           AND (floor(acos(least(session_length, 1))) = floor(acos(least(session_length, 1)))-1) IS FALSE
+           AND (floor(acos(least(session_length, 1))) <> floor(acos(least(session_length, 1)))-1) IS NOT FALSE
+           AND floor(acos(least(session_length, 1))) BETWEEN floor(acos(least(session_length, 1)))-1 AND floor(acos(least(session_length, 1)))+1
+           AND floor(acos(least(session_length, 1))) NOT BETWEEN floor(acos(least(session_length, 1))) AND floor(acos(least(session_length, 1)))-1
+           AND floor(acos(least(session_length, 1))) like '%'
+           AND floor(acos(least(session_length, 1))) not like '__DOES_NOT_EXIST__%'
+           AND floor(acos(least(session_length, 1))) IN (floor(acos(least(session_length, 1)))-1,
+                                                                                              floor(acos(least(session_length, 1)))+0,
+                                                                                              floor(acos(least(session_length, 1)))+1)
+           AND floor(acos(least(session_length, 1))) NOT IN (floor(acos(least(session_length, 1)))-1,
+                                                                                                  floor(acos(least(session_length, 1)))+1))) ;
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND (floor(acos(least(session_length, 1))) IS NULL
+       OR floor(acos(least(session_length, 1))) IN
+         (SELECT floor(acos(least(session_length, 1)))
+          FROM kttm_nested
+          WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+            AND (floor(acos(least(session_length, 1))) IS NULL
+                 OR (floor(acos(least(session_length, 1))) = floor(acos(least(session_length, 1)))+0
+                     AND floor(acos(least(session_length, 1))) IS NOT DISTINCT
+                     FROM floor(acos(least(session_length, 1)))+0
+                     AND floor(acos(least(session_length, 1))) <> floor(acos(least(session_length, 1)))-1
+                     AND (floor(acos(least(session_length, 1))) IS DISTINCT
+                          FROM floor(acos(least(session_length, 1)))-1)
+                     AND floor(acos(least(session_length, 1))) > floor(acos(least(session_length, 1)))-1
+                     AND floor(acos(least(session_length, 1))) >= floor(acos(least(session_length, 1)))-1
+                     AND floor(acos(least(session_length, 1))) < floor(acos(least(session_length, 1)))+1
+                     AND floor(acos(least(session_length, 1))) <= floor(acos(least(session_length, 1)))+1
+                     AND (floor(acos(least(session_length, 1))) <> floor(acos(least(session_length, 1)))-1) IS TRUE
+                     AND (floor(acos(least(session_length, 1))) = floor(acos(least(session_length, 1)))-1) IS NOT TRUE
+                     AND (floor(acos(least(session_length, 1))) = floor(acos(least(session_length, 1)))-1) IS FALSE
+                     AND (floor(acos(least(session_length, 1))) <> floor(acos(least(session_length, 1)))-1) IS NOT FALSE
+                     AND floor(acos(least(session_length, 1))) BETWEEN floor(acos(least(session_length, 1)))-1 AND floor(acos(least(session_length, 1)))+1
+                     AND floor(acos(least(session_length, 1))) NOT BETWEEN floor(acos(least(session_length, 1))) AND floor(acos(least(session_length, 1)))-1
+                     AND floor(acos(least(session_length, 1))) like '%'
+                     AND floor(acos(least(session_length, 1))) not like '__DOES_NOT_EXIST__%'
+                     AND floor(acos(least(session_length, 1))) IN (floor(acos(least(session_length, 1)))-1,
+                                                                                                        floor(acos(least(session_length, 1)))+0,
+                                                                                                        floor(acos(least(session_length, 1)))+1)
+                     AND floor(acos(least(session_length, 1))) NOT IN (floor(acos(least(session_length, 1)))-1,
+                                                                                                            floor(acos(least(session_length, 1)))+1)))));
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM
+  (SELECT __time, number, client_ip,
+                          floor(acos(least(session_length, 1))),
+                          count(*)
+   FROM kttm_nested
+   WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+     AND (floor(acos(least(session_length, 1))) IS NULL
+          OR (floor(acos(least(session_length, 1))) = floor(acos(least(session_length, 1)))+0
+              AND floor(acos(least(session_length, 1))) IS NOT DISTINCT
+              FROM floor(acos(least(session_length, 1)))+0
+              AND floor(acos(least(session_length, 1))) <> floor(acos(least(session_length, 1)))-1
+              AND (floor(acos(least(session_length, 1))) IS DISTINCT
+                   FROM floor(acos(least(session_length, 1)))-1)
+              AND floor(acos(least(session_length, 1))) > floor(acos(least(session_length, 1)))-1
+              AND floor(acos(least(session_length, 1))) >= floor(acos(least(session_length, 1)))-1
+              AND floor(acos(least(session_length, 1))) < floor(acos(least(session_length, 1)))+1
+              AND floor(acos(least(session_length, 1))) <= floor(acos(least(session_length, 1)))+1
+              AND (floor(acos(least(session_length, 1))) <> floor(acos(least(session_length, 1)))-1) IS TRUE
+              AND (floor(acos(least(session_length, 1))) = floor(acos(least(session_length, 1)))-1) IS NOT TRUE
+              AND (floor(acos(least(session_length, 1))) = floor(acos(least(session_length, 1)))-1) IS FALSE
+              AND (floor(acos(least(session_length, 1))) <> floor(acos(least(session_length, 1)))-1) IS NOT FALSE
+              AND floor(acos(least(session_length, 1))) BETWEEN floor(acos(least(session_length, 1)))-1 AND floor(acos(least(session_length, 1)))+1
+              AND floor(acos(least(session_length, 1))) NOT BETWEEN floor(acos(least(session_length, 1))) AND floor(acos(least(session_length, 1)))-1
+              AND floor(acos(least(session_length, 1))) like '%'
+              AND floor(acos(least(session_length, 1))) not like '__DOES_NOT_EXIST__%'
+              AND floor(acos(least(session_length, 1))) IN (floor(acos(least(session_length, 1)))-1,
+                                                                                                 floor(acos(least(session_length, 1)))+0,
+                                                                                                 floor(acos(least(session_length, 1)))+1)
+              AND floor(acos(least(session_length, 1))) NOT IN (floor(acos(least(session_length, 1)))-1,
+                                                                                                     floor(acos(least(session_length, 1)))+1)))
+   GROUP BY 1,
+            2,
+            3,
+            4);
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+#-------------------------------------------------------------------------
+# TEST_ID: A21: atan
+#-------------------------------------------------------------------------
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND (floor(atan(session_length)) IS NULL
+       OR (floor(atan(session_length)) = floor(atan(session_length))+0
+           AND floor(atan(session_length)) IS NOT DISTINCT
+           FROM floor(atan(session_length))+0
+           AND floor(atan(session_length)) <> floor(atan(session_length))-1
+           AND (floor(atan(session_length)) IS DISTINCT
+                FROM floor(atan(session_length))-1)
+           AND floor(atan(session_length)) > floor(atan(session_length))-1
+           AND floor(atan(session_length)) >= floor(atan(session_length))-1
+           AND floor(atan(session_length)) < floor(atan(session_length))+1
+           AND floor(atan(session_length)) <= floor(atan(session_length))+1
+           AND (floor(atan(session_length)) <> floor(atan(session_length))-1) IS TRUE
+           AND (floor(atan(session_length)) = floor(atan(session_length))-1) IS NOT TRUE
+           AND (floor(atan(session_length)) = floor(atan(session_length))-1) IS FALSE
+           AND (floor(atan(session_length)) <> floor(atan(session_length))-1) IS NOT FALSE
+           AND floor(atan(session_length)) BETWEEN floor(atan(session_length))-1 AND floor(atan(session_length))+1
+           AND floor(atan(session_length)) NOT BETWEEN floor(atan(session_length)) AND floor(atan(session_length))-1
+           AND floor(atan(session_length)) like '%'
+           AND floor(atan(session_length)) not like '__DOES_NOT_EXIST__%'
+           AND floor(atan(session_length)) IN (floor(atan(session_length))-1,
+                                                                          floor(atan(session_length))+0,
+                                                                          floor(atan(session_length))+1)
+           AND floor(atan(session_length)) NOT IN (floor(atan(session_length))-1,
+                                                                              floor(atan(session_length))+1))) ;
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND (floor(atan(session_length)) IS NULL
+       OR floor(atan(session_length)) IN
+         (SELECT floor(atan(session_length))
+          FROM kttm_nested
+          WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+            AND (floor(atan(session_length)) IS NULL
+                 OR (floor(atan(session_length)) = floor(atan(session_length))+0
+                     AND floor(atan(session_length)) IS NOT DISTINCT
+                     FROM floor(atan(session_length))+0
+                     AND floor(atan(session_length)) <> floor(atan(session_length))-1
+                     AND (floor(atan(session_length)) IS DISTINCT
+                          FROM floor(atan(session_length))-1)
+                     AND floor(atan(session_length)) > floor(atan(session_length))-1
+                     AND floor(atan(session_length)) >= floor(atan(session_length))-1
+                     AND floor(atan(session_length)) < floor(atan(session_length))+1
+                     AND floor(atan(session_length)) <= floor(atan(session_length))+1
+                     AND (floor(atan(session_length)) <> floor(atan(session_length))-1) IS TRUE
+                     AND (floor(atan(session_length)) = floor(atan(session_length))-1) IS NOT TRUE
+                     AND (floor(atan(session_length)) = floor(atan(session_length))-1) IS FALSE
+                     AND (floor(atan(session_length)) <> floor(atan(session_length))-1) IS NOT FALSE
+                     AND floor(atan(session_length)) BETWEEN floor(atan(session_length))-1 AND floor(atan(session_length))+1
+                     AND floor(atan(session_length)) NOT BETWEEN floor(atan(session_length)) AND floor(atan(session_length))-1
+                     AND floor(atan(session_length)) like '%'
+                     AND floor(atan(session_length)) not like '__DOES_NOT_EXIST__%'
+                     AND floor(atan(session_length)) IN (floor(atan(session_length))-1,
+                                                                                    floor(atan(session_length))+0,
+                                                                                    floor(atan(session_length))+1)
+                     AND floor(atan(session_length)) NOT IN (floor(atan(session_length))-1,
+                                                                                        floor(atan(session_length))+1)))));
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM
+  (SELECT __time, number, client_ip,
+                          floor(atan(session_length)),
+                          count(*)
+   FROM kttm_nested
+   WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+     AND (floor(atan(session_length)) IS NULL
+          OR (floor(atan(session_length)) = floor(atan(session_length))+0
+              AND floor(atan(session_length)) IS NOT DISTINCT
+              FROM floor(atan(session_length))+0
+              AND floor(atan(session_length)) <> floor(atan(session_length))-1
+              AND (floor(atan(session_length)) IS DISTINCT
+                   FROM floor(atan(session_length))-1)
+              AND floor(atan(session_length)) > floor(atan(session_length))-1
+              AND floor(atan(session_length)) >= floor(atan(session_length))-1
+              AND floor(atan(session_length)) < floor(atan(session_length))+1
+              AND floor(atan(session_length)) <= floor(atan(session_length))+1
+              AND (floor(atan(session_length)) <> floor(atan(session_length))-1) IS TRUE
+              AND (floor(atan(session_length)) = floor(atan(session_length))-1) IS NOT TRUE
+              AND (floor(atan(session_length)) = floor(atan(session_length))-1) IS FALSE
+              AND (floor(atan(session_length)) <> floor(atan(session_length))-1) IS NOT FALSE
+              AND floor(atan(session_length)) BETWEEN floor(atan(session_length))-1 AND floor(atan(session_length))+1
+              AND floor(atan(session_length)) NOT BETWEEN floor(atan(session_length)) AND floor(atan(session_length))-1
+              AND floor(atan(session_length)) like '%'
+              AND floor(atan(session_length)) not like '__DOES_NOT_EXIST__%'
+              AND floor(atan(session_length)) IN (floor(atan(session_length))-1,
+                                                                             floor(atan(session_length))+0,
+                                                                             floor(atan(session_length))+1)
+              AND floor(atan(session_length)) NOT IN (floor(atan(session_length))-1,
+                                                                                 floor(atan(session_length))+1)))
+   GROUP BY 1,
+            2,
+            3,
+            4);
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+#-------------------------------------------------------------------------
+# TEST_ID: A22: atan2
+#-------------------------------------------------------------------------
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND (floor(atan2(session_length, 1)) IS NULL
+       OR (floor(atan2(session_length, 1)) = floor(atan2(session_length, 1))+0
+           AND floor(atan2(session_length, 1)) IS NOT DISTINCT
+           FROM floor(atan2(session_length, 1))+0
+           AND floor(atan2(session_length, 1)) <> floor(atan2(session_length, 1))-1
+           AND (floor(atan2(session_length, 1)) IS DISTINCT
+                FROM floor(atan2(session_length, 1))-1)
+           AND floor(atan2(session_length, 1)) > floor(atan2(session_length, 1))-1
+           AND floor(atan2(session_length, 1)) >= floor(atan2(session_length, 1))-1
+           AND floor(atan2(session_length, 1)) < floor(atan2(session_length, 1))+1
+           AND floor(atan2(session_length, 1)) <= floor(atan2(session_length, 1))+1
+           AND (floor(atan2(session_length, 1)) <> floor(atan2(session_length, 1))-1) IS TRUE
+           AND (floor(atan2(session_length, 1)) = floor(atan2(session_length, 1))-1) IS NOT TRUE
+           AND (floor(atan2(session_length, 1)) = floor(atan2(session_length, 1))-1) IS FALSE
+           AND (floor(atan2(session_length, 1)) <> floor(atan2(session_length, 1))-1) IS NOT FALSE
+           AND floor(atan2(session_length, 1)) BETWEEN floor(atan2(session_length, 1))-1 AND floor(atan2(session_length, 1))+1
+           AND floor(atan2(session_length, 1)) NOT BETWEEN floor(atan2(session_length, 1)) AND floor(atan2(session_length, 1))-1
+           AND floor(atan2(session_length, 1)) like '%'
+           AND floor(atan2(session_length, 1)) not like '__DOES_NOT_EXIST__%'
+           AND floor(atan2(session_length, 1)) IN (floor(atan2(session_length, 1))-1,
+                                                                                  floor(atan2(session_length, 1))+0,
+                                                                                  floor(atan2(session_length, 1))+1)
+           AND floor(atan2(session_length, 1)) NOT IN (floor(atan2(session_length, 1))-1,
+                                                                                      floor(atan2(session_length, 1))+1))) ;
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND (floor(atan2(session_length, 1)) IS NULL
+       OR floor(atan2(session_length, 1)) IN
+         (SELECT floor(atan2(session_length, 1))
+          FROM kttm_nested
+          WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+            AND (floor(atan2(session_length, 1)) IS NULL
+                 OR (floor(atan2(session_length, 1)) = floor(atan2(session_length, 1))+0
+                     AND floor(atan2(session_length, 1)) IS NOT DISTINCT
+                     FROM floor(atan2(session_length, 1))+0
+                     AND floor(atan2(session_length, 1)) <> floor(atan2(session_length, 1))-1
+                     AND (floor(atan2(session_length, 1)) IS DISTINCT
+                          FROM floor(atan2(session_length, 1))-1)
+                     AND floor(atan2(session_length, 1)) > floor(atan2(session_length, 1))-1
+                     AND floor(atan2(session_length, 1)) >= floor(atan2(session_length, 1))-1
+                     AND floor(atan2(session_length, 1)) < floor(atan2(session_length, 1))+1
+                     AND floor(atan2(session_length, 1)) <= floor(atan2(session_length, 1))+1
+                     AND (floor(atan2(session_length, 1)) <> floor(atan2(session_length, 1))-1) IS TRUE
+                     AND (floor(atan2(session_length, 1)) = floor(atan2(session_length, 1))-1) IS NOT TRUE
+                     AND (floor(atan2(session_length, 1)) = floor(atan2(session_length, 1))-1) IS FALSE
+                     AND (floor(atan2(session_length, 1)) <> floor(atan2(session_length, 1))-1) IS NOT FALSE
+                     AND floor(atan2(session_length, 1)) BETWEEN floor(atan2(session_length, 1))-1 AND floor(atan2(session_length, 1))+1
+                     AND floor(atan2(session_length, 1)) NOT BETWEEN floor(atan2(session_length, 1)) AND floor(atan2(session_length, 1))-1
+                     AND floor(atan2(session_length, 1)) like '%'
+                     AND floor(atan2(session_length, 1)) not like '__DOES_NOT_EXIST__%'
+                     AND floor(atan2(session_length, 1)) IN (floor(atan2(session_length, 1))-1,
+                                                                                            floor(atan2(session_length, 1))+0,
+                                                                                            floor(atan2(session_length, 1))+1)
+                     AND floor(atan2(session_length, 1)) NOT IN (floor(atan2(session_length, 1))-1,
+                                                                                                floor(atan2(session_length, 1))+1)))));
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM
+  (SELECT __time, number, client_ip,
+                          floor(atan2(session_length, 1)),
+                          count(*)
+   FROM kttm_nested
+   WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+     AND (floor(atan2(session_length, 1)) IS NULL
+          OR (floor(atan2(session_length, 1)) = floor(atan2(session_length, 1))+0
+              AND floor(atan2(session_length, 1)) IS NOT DISTINCT
+              FROM floor(atan2(session_length, 1))+0
+              AND floor(atan2(session_length, 1)) <> floor(atan2(session_length, 1))-1
+              AND (floor(atan2(session_length, 1)) IS DISTINCT
+                   FROM floor(atan2(session_length, 1))-1)
+              AND floor(atan2(session_length, 1)) > floor(atan2(session_length, 1))-1
+              AND floor(atan2(session_length, 1)) >= floor(atan2(session_length, 1))-1
+              AND floor(atan2(session_length, 1)) < floor(atan2(session_length, 1))+1
+              AND floor(atan2(session_length, 1)) <= floor(atan2(session_length, 1))+1
+              AND (floor(atan2(session_length, 1)) <> floor(atan2(session_length, 1))-1) IS TRUE
+              AND (floor(atan2(session_length, 1)) = floor(atan2(session_length, 1))-1) IS NOT TRUE
+              AND (floor(atan2(session_length, 1)) = floor(atan2(session_length, 1))-1) IS FALSE
+              AND (floor(atan2(session_length, 1)) <> floor(atan2(session_length, 1))-1) IS NOT FALSE
+              AND floor(atan2(session_length, 1)) BETWEEN floor(atan2(session_length, 1))-1 AND floor(atan2(session_length, 1))+1
+              AND floor(atan2(session_length, 1)) NOT BETWEEN floor(atan2(session_length, 1)) AND floor(atan2(session_length, 1))-1
+              AND floor(atan2(session_length, 1)) like '%'
+              AND floor(atan2(session_length, 1)) not like '__DOES_NOT_EXIST__%'
+              AND floor(atan2(session_length, 1)) IN (floor(atan2(session_length, 1))-1,
+                                                                                     floor(atan2(session_length, 1))+0,
+                                                                                     floor(atan2(session_length, 1))+1)
+              AND floor(atan2(session_length, 1)) NOT IN (floor(atan2(session_length, 1))-1,
+                                                                                         floor(atan2(session_length, 1))+1)))
+   GROUP BY 1,
+            2,
+            3,
+            4);
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+#-------------------------------------------------------------------------
+# TEST_ID: A23: degrees
+#-------------------------------------------------------------------------
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND (floor(degrees(session_length)) IS NULL
+       OR (floor(degrees(session_length)) = floor(degrees(session_length))+0
+           AND floor(degrees(session_length)) IS NOT DISTINCT
+           FROM floor(degrees(session_length))+0
+           AND floor(degrees(session_length)) <> floor(degrees(session_length))-1
+           AND (floor(degrees(session_length)) IS DISTINCT
+                FROM floor(degrees(session_length))-1)
+           AND floor(degrees(session_length)) > floor(degrees(session_length))-1
+           AND floor(degrees(session_length)) >= floor(degrees(session_length))-1
+           AND floor(degrees(session_length)) < floor(degrees(session_length))+1
+           AND floor(degrees(session_length)) <= floor(degrees(session_length))+1
+           AND (floor(degrees(session_length)) <> floor(degrees(session_length))-1) IS TRUE
+           AND (floor(degrees(session_length)) = floor(degrees(session_length))-1) IS NOT TRUE
+           AND (floor(degrees(session_length)) = floor(degrees(session_length))-1) IS FALSE
+           AND (floor(degrees(session_length)) <> floor(degrees(session_length))-1) IS NOT FALSE
+           AND floor(degrees(session_length)) BETWEEN floor(degrees(session_length))-1 AND floor(degrees(session_length))+1
+           AND floor(degrees(session_length)) NOT BETWEEN floor(degrees(session_length)) AND floor(degrees(session_length))-1
+           AND floor(degrees(session_length)) like '%'
+           AND floor(degrees(session_length)) not like '__DOES_NOT_EXIST__%'
+           AND floor(degrees(session_length)) IN (floor(degrees(session_length))-1,
+                                                                                floor(degrees(session_length))+0,
+                                                                                floor(degrees(session_length))+1)
+           AND floor(degrees(session_length)) NOT IN (floor(degrees(session_length))-1,
+                                                                                    floor(degrees(session_length))+1))) ;
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND (floor(degrees(session_length)) IS NULL
+       OR floor(degrees(session_length)) IN
+         (SELECT floor(degrees(session_length))
+          FROM kttm_nested
+          WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+            AND (floor(degrees(session_length)) IS NULL
+                 OR (floor(degrees(session_length)) = floor(degrees(session_length))+0
+                     AND floor(degrees(session_length)) IS NOT DISTINCT
+                     FROM floor(degrees(session_length))+0
+                     AND floor(degrees(session_length)) <> floor(degrees(session_length))-1
+                     AND (floor(degrees(session_length)) IS DISTINCT
+                          FROM floor(degrees(session_length))-1)
+                     AND floor(degrees(session_length)) > floor(degrees(session_length))-1
+                     AND floor(degrees(session_length)) >= floor(degrees(session_length))-1
+                     AND floor(degrees(session_length)) < floor(degrees(session_length))+1
+                     AND floor(degrees(session_length)) <= floor(degrees(session_length))+1
+                     AND (floor(degrees(session_length)) <> floor(degrees(session_length))-1) IS TRUE
+                     AND (floor(degrees(session_length)) = floor(degrees(session_length))-1) IS NOT TRUE
+                     AND (floor(degrees(session_length)) = floor(degrees(session_length))-1) IS FALSE
+                     AND (floor(degrees(session_length)) <> floor(degrees(session_length))-1) IS NOT FALSE
+                     AND floor(degrees(session_length)) BETWEEN floor(degrees(session_length))-1 AND floor(degrees(session_length))+1
+                     AND floor(degrees(session_length)) NOT BETWEEN floor(degrees(session_length)) AND floor(degrees(session_length))-1
+                     AND floor(degrees(session_length)) like '%'
+                     AND floor(degrees(session_length)) not like '__DOES_NOT_EXIST__%'
+                     AND floor(degrees(session_length)) IN (floor(degrees(session_length))-1,
+                                                                                          floor(degrees(session_length))+0,
+                                                                                          floor(degrees(session_length))+1)
+                     AND floor(degrees(session_length)) NOT IN (floor(degrees(session_length))-1,
+                                                                                              floor(degrees(session_length))+1)))));
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM
+  (SELECT __time, number, client_ip,
+                          floor(degrees(session_length)),
+                          count(*)
+   FROM kttm_nested
+   WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+     AND (floor(degrees(session_length)) IS NULL
+          OR (floor(degrees(session_length)) = floor(degrees(session_length))+0
+              AND floor(degrees(session_length)) IS NOT DISTINCT
+              FROM floor(degrees(session_length))+0
+              AND floor(degrees(session_length)) <> floor(degrees(session_length))-1
+              AND (floor(degrees(session_length)) IS DISTINCT
+                   FROM floor(degrees(session_length))-1)
+              AND floor(degrees(session_length)) > floor(degrees(session_length))-1
+              AND floor(degrees(session_length)) >= floor(degrees(session_length))-1
+              AND floor(degrees(session_length)) < floor(degrees(session_length))+1
+              AND floor(degrees(session_length)) <= floor(degrees(session_length))+1
+              AND (floor(degrees(session_length)) <> floor(degrees(session_length))-1) IS TRUE
+              AND (floor(degrees(session_length)) = floor(degrees(session_length))-1) IS NOT TRUE
+              AND (floor(degrees(session_length)) = floor(degrees(session_length))-1) IS FALSE
+              AND (floor(degrees(session_length)) <> floor(degrees(session_length))-1) IS NOT FALSE
+              AND floor(degrees(session_length)) BETWEEN floor(degrees(session_length))-1 AND floor(degrees(session_length))+1
+              AND floor(degrees(session_length)) NOT BETWEEN floor(degrees(session_length)) AND floor(degrees(session_length))-1
+              AND floor(degrees(session_length)) like '%'
+              AND floor(degrees(session_length)) not like '__DOES_NOT_EXIST__%'
+              AND floor(degrees(session_length)) IN (floor(degrees(session_length))-1,
+                                                                                   floor(degrees(session_length))+0,
+                                                                                   floor(degrees(session_length))+1)
+              AND floor(degrees(session_length)) NOT IN (floor(degrees(session_length))-1,
+                                                                                       floor(degrees(session_length))+1)))
+   GROUP BY 1,
+            2,
+            3,
+            4);
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+#-------------------------------------------------------------------------
+# TEST_ID: A24: radians
+#-------------------------------------------------------------------------
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND (floor(radians(session_length)) IS NULL
+       OR (floor(radians(session_length)) = floor(radians(session_length))+0
+           AND floor(radians(session_length)) IS NOT DISTINCT
+           FROM floor(radians(session_length))+0
+           AND floor(radians(session_length)) <> floor(radians(session_length))-1
+           AND (floor(radians(session_length)) IS DISTINCT
+                FROM floor(radians(session_length))-1)
+           AND floor(radians(session_length)) > floor(radians(session_length))-1
+           AND floor(radians(session_length)) >= floor(radians(session_length))-1
+           AND floor(radians(session_length)) < floor(radians(session_length))+1
+           AND floor(radians(session_length)) <= floor(radians(session_length))+1
+           AND (floor(radians(session_length)) <> floor(radians(session_length))-1) IS TRUE
+           AND (floor(radians(session_length)) = floor(radians(session_length))-1) IS NOT TRUE
+           AND (floor(radians(session_length)) = floor(radians(session_length))-1) IS FALSE
+           AND (floor(radians(session_length)) <> floor(radians(session_length))-1) IS NOT FALSE
+           AND floor(radians(session_length)) BETWEEN floor(radians(session_length))-1 AND floor(radians(session_length))+1
+           AND floor(radians(session_length)) NOT BETWEEN floor(radians(session_length)) AND floor(radians(session_length))-1
+           AND floor(radians(session_length)) like '%'
+           AND floor(radians(session_length)) not like '__DOES_NOT_EXIST__%'
+           AND floor(radians(session_length)) IN (floor(radians(session_length))-1,
+                                                                                floor(radians(session_length))+0,
+                                                                                floor(radians(session_length))+1)
+           AND floor(radians(session_length)) NOT IN (floor(radians(session_length))-1,
+                                                                                    floor(radians(session_length))+1))) ;
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND (floor(radians(session_length)) IS NULL
+       OR floor(radians(session_length)) IN
+         (SELECT floor(radians(session_length))
+          FROM kttm_nested
+          WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+            AND (floor(radians(session_length)) IS NULL
+                 OR (floor(radians(session_length)) = floor(radians(session_length))+0
+                     AND floor(radians(session_length)) IS NOT DISTINCT
+                     FROM floor(radians(session_length))+0
+                     AND floor(radians(session_length)) <> floor(radians(session_length))-1
+                     AND (floor(radians(session_length)) IS DISTINCT
+                          FROM floor(radians(session_length))-1)
+                     AND floor(radians(session_length)) > floor(radians(session_length))-1
+                     AND floor(radians(session_length)) >= floor(radians(session_length))-1
+                     AND floor(radians(session_length)) < floor(radians(session_length))+1
+                     AND floor(radians(session_length)) <= floor(radians(session_length))+1
+                     AND (floor(radians(session_length)) <> floor(radians(session_length))-1) IS TRUE
+                     AND (floor(radians(session_length)) = floor(radians(session_length))-1) IS NOT TRUE
+                     AND (floor(radians(session_length)) = floor(radians(session_length))-1) IS FALSE
+                     AND (floor(radians(session_length)) <> floor(radians(session_length))-1) IS NOT FALSE
+                     AND floor(radians(session_length)) BETWEEN floor(radians(session_length))-1 AND floor(radians(session_length))+1
+                     AND floor(radians(session_length)) NOT BETWEEN floor(radians(session_length)) AND floor(radians(session_length))-1
+                     AND floor(radians(session_length)) like '%'
+                     AND floor(radians(session_length)) not like '__DOES_NOT_EXIST__%'
+                     AND floor(radians(session_length)) IN (floor(radians(session_length))-1,
+                                                                                          floor(radians(session_length))+0,
+                                                                                          floor(radians(session_length))+1)
+                     AND floor(radians(session_length)) NOT IN (floor(radians(session_length))-1,
+                                                                                              floor(radians(session_length))+1)))));
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM
+  (SELECT __time, number, client_ip,
+                          floor(radians(session_length)),
+                          count(*)
+   FROM kttm_nested
+   WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+     AND (floor(radians(session_length)) IS NULL
+          OR (floor(radians(session_length)) = floor(radians(session_length))+0
+              AND floor(radians(session_length)) IS NOT DISTINCT
+              FROM floor(radians(session_length))+0
+              AND floor(radians(session_length)) <> floor(radians(session_length))-1
+              AND (floor(radians(session_length)) IS DISTINCT
+                   FROM floor(radians(session_length))-1)
+              AND floor(radians(session_length)) > floor(radians(session_length))-1
+              AND floor(radians(session_length)) >= floor(radians(session_length))-1
+              AND floor(radians(session_length)) < floor(radians(session_length))+1
+              AND floor(radians(session_length)) <= floor(radians(session_length))+1
+              AND (floor(radians(session_length)) <> floor(radians(session_length))-1) IS TRUE
+              AND (floor(radians(session_length)) = floor(radians(session_length))-1) IS NOT TRUE
+              AND (floor(radians(session_length)) = floor(radians(session_length))-1) IS FALSE
+              AND (floor(radians(session_length)) <> floor(radians(session_length))-1) IS NOT FALSE
+              AND floor(radians(session_length)) BETWEEN floor(radians(session_length))-1 AND floor(radians(session_length))+1
+              AND floor(radians(session_length)) NOT BETWEEN floor(radians(session_length)) AND floor(radians(session_length))-1
+              AND floor(radians(session_length)) like '%'
+              AND floor(radians(session_length)) not like '__DOES_NOT_EXIST__%'
+              AND floor(radians(session_length)) IN (floor(radians(session_length))-1,
+                                                                                   floor(radians(session_length))+0,
+                                                                                   floor(radians(session_length))+1)
+              AND floor(radians(session_length)) NOT IN (floor(radians(session_length))-1,
+                                                                                       floor(radians(session_length))+1)))
+   GROUP BY 1,
+            2,
+            3,
+            4);
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+#-------------------------------------------------------------------------
+# TEST_ID: A25: bitwise_and
+#-------------------------------------------------------------------------
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND (bitwise_and(session_length, session_length) IS NULL
+       OR (bitwise_and(session_length, session_length) = bitwise_and(session_length, session_length)+0
+           AND bitwise_and(session_length, session_length) IS NOT DISTINCT
+           FROM bitwise_and(session_length, session_length)+0
+           AND bitwise_and(session_length, session_length) <> bitwise_and(session_length, session_length)-1
+           AND (bitwise_and(session_length, session_length) IS DISTINCT
+                FROM bitwise_and(session_length, session_length)-1)
+           AND bitwise_and(session_length, session_length) > bitwise_and(session_length, session_length)-1
+           AND bitwise_and(session_length, session_length) >= bitwise_and(session_length, session_length)-1
+           AND bitwise_and(session_length, session_length) < bitwise_and(session_length, session_length)+1
+           AND bitwise_and(session_length, session_length) <= bitwise_and(session_length, session_length)+1
+           AND (bitwise_and(session_length, session_length) <> bitwise_and(session_length, session_length)-1) IS TRUE
+           AND (bitwise_and(session_length, session_length) = bitwise_and(session_length, session_length)-1) IS NOT TRUE
+           AND (bitwise_and(session_length, session_length) = bitwise_and(session_length, session_length)-1) IS FALSE
+           AND (bitwise_and(session_length, session_length) <> bitwise_and(session_length, session_length)-1) IS NOT FALSE
+           AND bitwise_and(session_length, session_length) BETWEEN bitwise_and(session_length, session_length)-1 AND bitwise_and(session_length, session_length)+1
+           AND bitwise_and(session_length, session_length) NOT BETWEEN bitwise_and(session_length, session_length) AND bitwise_and(session_length, session_length)-1
+           AND bitwise_and(session_length, session_length) like '%'
+           AND bitwise_and(session_length, session_length) not like '__DOES_NOT_EXIST__%'
+           AND bitwise_and(session_length, session_length) IN (bitwise_and(session_length, session_length)-1,
+                                                                                                          bitwise_and(session_length, session_length)+0,
+                                                                                                          bitwise_and(session_length, session_length)+1)
+           AND bitwise_and(session_length, session_length) NOT IN (bitwise_and(session_length, session_length)-1,
+                                                                                                              bitwise_and(session_length, session_length)+1))) ;
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND (bitwise_and(session_length, session_length) IS NULL
+       OR bitwise_and(session_length, session_length) IN
+         (SELECT bitwise_and(session_length, session_length)
+          FROM kttm_nested
+          WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+            AND (bitwise_and(session_length, session_length) IS NULL
+                 OR (bitwise_and(session_length, session_length) = bitwise_and(session_length, session_length)+0
+                     AND bitwise_and(session_length, session_length) IS NOT DISTINCT
+                     FROM bitwise_and(session_length, session_length)+0
+                     AND bitwise_and(session_length, session_length) <> bitwise_and(session_length, session_length)-1
+                     AND (bitwise_and(session_length, session_length) IS DISTINCT
+                          FROM bitwise_and(session_length, session_length)-1)
+                     AND bitwise_and(session_length, session_length) > bitwise_and(session_length, session_length)-1
+                     AND bitwise_and(session_length, session_length) >= bitwise_and(session_length, session_length)-1
+                     AND bitwise_and(session_length, session_length) < bitwise_and(session_length, session_length)+1
+                     AND bitwise_and(session_length, session_length) <= bitwise_and(session_length, session_length)+1
+                     AND (bitwise_and(session_length, session_length) <> bitwise_and(session_length, session_length)-1) IS TRUE
+                     AND (bitwise_and(session_length, session_length) = bitwise_and(session_length, session_length)-1) IS NOT TRUE
+                     AND (bitwise_and(session_length, session_length) = bitwise_and(session_length, session_length)-1) IS FALSE
+                     AND (bitwise_and(session_length, session_length) <> bitwise_and(session_length, session_length)-1) IS NOT FALSE
+                     AND bitwise_and(session_length, session_length) BETWEEN bitwise_and(session_length, session_length)-1 AND bitwise_and(session_length, session_length)+1
+                     AND bitwise_and(session_length, session_length) NOT BETWEEN bitwise_and(session_length, session_length) AND bitwise_and(session_length, session_length)-1
+                     AND bitwise_and(session_length, session_length) like '%'
+                     AND bitwise_and(session_length, session_length) not like '__DOES_NOT_EXIST__%'
+                     AND bitwise_and(session_length, session_length) IN (bitwise_and(session_length, session_length)-1,
+                                                                                                                    bitwise_and(session_length, session_length)+0,
+                                                                                                                    bitwise_and(session_length, session_length)+1)
+                     AND bitwise_and(session_length, session_length) NOT IN (bitwise_and(session_length, session_length)-1,
+                                                                                                                        bitwise_and(session_length, session_length)+1)))));
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM
+  (SELECT __time, number, client_ip,
+                          bitwise_and(session_length, session_length),
+                          count(*)
+   FROM kttm_nested
+   WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+     AND (bitwise_and(session_length, session_length) IS NULL
+          OR (bitwise_and(session_length, session_length) = bitwise_and(session_length, session_length)+0
+              AND bitwise_and(session_length, session_length) IS NOT DISTINCT
+              FROM bitwise_and(session_length, session_length)+0
+              AND bitwise_and(session_length, session_length) <> bitwise_and(session_length, session_length)-1
+              AND (bitwise_and(session_length, session_length) IS DISTINCT
+                   FROM bitwise_and(session_length, session_length)-1)
+              AND bitwise_and(session_length, session_length) > bitwise_and(session_length, session_length)-1
+              AND bitwise_and(session_length, session_length) >= bitwise_and(session_length, session_length)-1
+              AND bitwise_and(session_length, session_length) < bitwise_and(session_length, session_length)+1
+              AND bitwise_and(session_length, session_length) <= bitwise_and(session_length, session_length)+1
+              AND (bitwise_and(session_length, session_length) <> bitwise_and(session_length, session_length)-1) IS TRUE
+              AND (bitwise_and(session_length, session_length) = bitwise_and(session_length, session_length)-1) IS NOT TRUE
+              AND (bitwise_and(session_length, session_length) = bitwise_and(session_length, session_length)-1) IS FALSE
+              AND (bitwise_and(session_length, session_length) <> bitwise_and(session_length, session_length)-1) IS NOT FALSE
+              AND bitwise_and(session_length, session_length) BETWEEN bitwise_and(session_length, session_length)-1 AND bitwise_and(session_length, session_length)+1
+              AND bitwise_and(session_length, session_length) NOT BETWEEN bitwise_and(session_length, session_length) AND bitwise_and(session_length, session_length)-1
+              AND bitwise_and(session_length, session_length) like '%'
+              AND bitwise_and(session_length, session_length) not like '__DOES_NOT_EXIST__%'
+              AND bitwise_and(session_length, session_length) IN (bitwise_and(session_length, session_length)-1,
+                                                                                                             bitwise_and(session_length, session_length)+0,
+                                                                                                             bitwise_and(session_length, session_length)+1)
+              AND bitwise_and(session_length, session_length) NOT IN (bitwise_and(session_length, session_length)-1,
+                                                                                                                 bitwise_and(session_length, session_length)+1)))
+   GROUP BY 1,
+            2,
+            3,
+            4);
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+#-------------------------------------------------------------------------
+# TEST_ID: A26: bitwise_complement
+#-------------------------------------------------------------------------
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND (bitwise_complement(session_length) IS NULL
+       OR (bitwise_complement(session_length) = bitwise_complement(session_length)+0
+           AND bitwise_complement(session_length) IS NOT DISTINCT
+           FROM bitwise_complement(session_length)+0
+           AND bitwise_complement(session_length) <> bitwise_complement(session_length)-1
+           AND (bitwise_complement(session_length) IS DISTINCT
+                FROM bitwise_complement(session_length)-1)
+           AND bitwise_complement(session_length) > bitwise_complement(session_length)-1
+           AND bitwise_complement(session_length) >= bitwise_complement(session_length)-1
+           AND bitwise_complement(session_length) < bitwise_complement(session_length)+1
+           AND bitwise_complement(session_length) <= bitwise_complement(session_length)+1
+           AND (bitwise_complement(session_length) <> bitwise_complement(session_length)-1) IS TRUE
+           AND (bitwise_complement(session_length) = bitwise_complement(session_length)-1) IS NOT TRUE
+           AND (bitwise_complement(session_length) = bitwise_complement(session_length)-1) IS FALSE
+           AND (bitwise_complement(session_length) <> bitwise_complement(session_length)-1) IS NOT FALSE
+           AND bitwise_complement(session_length) BETWEEN bitwise_complement(session_length)-1 AND bitwise_complement(session_length)+1
+           AND bitwise_complement(session_length) NOT BETWEEN bitwise_complement(session_length) AND bitwise_complement(session_length)-1
+           AND bitwise_complement(session_length) like '%'
+           AND bitwise_complement(session_length) not like '__DOES_NOT_EXIST__%'
+           AND bitwise_complement(session_length) IN (bitwise_complement(session_length)-1,
+                                                                                        bitwise_complement(session_length)+0,
+                                                                                        bitwise_complement(session_length)+1)
+           AND bitwise_complement(session_length) NOT IN (bitwise_complement(session_length)-1,
+                                                                                            bitwise_complement(session_length)+1))) ;
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND (bitwise_complement(session_length) IS NULL
+       OR bitwise_complement(session_length) IN
+         (SELECT bitwise_complement(session_length)
+          FROM kttm_nested
+          WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+            AND (bitwise_complement(session_length) IS NULL
+                 OR (bitwise_complement(session_length) = bitwise_complement(session_length)+0
+                     AND bitwise_complement(session_length) IS NOT DISTINCT
+                     FROM bitwise_complement(session_length)+0
+                     AND bitwise_complement(session_length) <> bitwise_complement(session_length)-1
+                     AND (bitwise_complement(session_length) IS DISTINCT
+                          FROM bitwise_complement(session_length)-1)
+                     AND bitwise_complement(session_length) > bitwise_complement(session_length)-1
+                     AND bitwise_complement(session_length) >= bitwise_complement(session_length)-1
+                     AND bitwise_complement(session_length) < bitwise_complement(session_length)+1
+                     AND bitwise_complement(session_length) <= bitwise_complement(session_length)+1
+                     AND (bitwise_complement(session_length) <> bitwise_complement(session_length)-1) IS TRUE
+                     AND (bitwise_complement(session_length) = bitwise_complement(session_length)-1) IS NOT TRUE
+                     AND (bitwise_complement(session_length) = bitwise_complement(session_length)-1) IS FALSE
+                     AND (bitwise_complement(session_length) <> bitwise_complement(session_length)-1) IS NOT FALSE
+                     AND bitwise_complement(session_length) BETWEEN bitwise_complement(session_length)-1 AND bitwise_complement(session_length)+1
+                     AND bitwise_complement(session_length) NOT BETWEEN bitwise_complement(session_length) AND bitwise_complement(session_length)-1
+                     AND bitwise_complement(session_length) like '%'
+                     AND bitwise_complement(session_length) not like '__DOES_NOT_EXIST__%'
+                     AND bitwise_complement(session_length) IN (bitwise_complement(session_length)-1,
+                                                                                                  bitwise_complement(session_length)+0,
+                                                                                                  bitwise_complement(session_length)+1)
+                     AND bitwise_complement(session_length) NOT IN (bitwise_complement(session_length)-1,
+                                                                                                      bitwise_complement(session_length)+1)))));
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM
+  (SELECT __time, number, client_ip,
+                          bitwise_complement(session_length),
+                          count(*)
+   FROM kttm_nested
+   WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+     AND (bitwise_complement(session_length) IS NULL
+          OR (bitwise_complement(session_length) = bitwise_complement(session_length)+0
+              AND bitwise_complement(session_length) IS NOT DISTINCT
+              FROM bitwise_complement(session_length)+0
+              AND bitwise_complement(session_length) <> bitwise_complement(session_length)-1
+              AND (bitwise_complement(session_length) IS DISTINCT
+                   FROM bitwise_complement(session_length)-1)
+              AND bitwise_complement(session_length) > bitwise_complement(session_length)-1
+              AND bitwise_complement(session_length) >= bitwise_complement(session_length)-1
+              AND bitwise_complement(session_length) < bitwise_complement(session_length)+1
+              AND bitwise_complement(session_length) <= bitwise_complement(session_length)+1
+              AND (bitwise_complement(session_length) <> bitwise_complement(session_length)-1) IS TRUE
+              AND (bitwise_complement(session_length) = bitwise_complement(session_length)-1) IS NOT TRUE
+              AND (bitwise_complement(session_length) = bitwise_complement(session_length)-1) IS FALSE
+              AND (bitwise_complement(session_length) <> bitwise_complement(session_length)-1) IS NOT FALSE
+              AND bitwise_complement(session_length) BETWEEN bitwise_complement(session_length)-1 AND bitwise_complement(session_length)+1
+              AND bitwise_complement(session_length) NOT BETWEEN bitwise_complement(session_length) AND bitwise_complement(session_length)-1
+              AND bitwise_complement(session_length) like '%'
+              AND bitwise_complement(session_length) not like '__DOES_NOT_EXIST__%'
+              AND bitwise_complement(session_length) IN (bitwise_complement(session_length)-1,
+                                                                                           bitwise_complement(session_length)+0,
+                                                                                           bitwise_complement(session_length)+1)
+              AND bitwise_complement(session_length) NOT IN (bitwise_complement(session_length)-1,
+                                                                                               bitwise_complement(session_length)+1)))
+   GROUP BY 1,
+            2,
+            3,
+            4);
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+#-------------------------------------------------------------------------
+# TEST_ID: A27: bitwise_convert_double_to_long_bits
+#-------------------------------------------------------------------------
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND (bitwise_convert_double_to_long_bits(session_length) IS NULL
+       OR (bitwise_convert_double_to_long_bits(session_length) = bitwise_convert_double_to_long_bits(session_length)+0
+           AND bitwise_convert_double_to_long_bits(session_length) IS NOT DISTINCT
+           FROM bitwise_convert_double_to_long_bits(session_length)+0
+           AND bitwise_convert_double_to_long_bits(session_length) <> bitwise_convert_double_to_long_bits(session_length)-1
+           AND (bitwise_convert_double_to_long_bits(session_length) IS DISTINCT
+                FROM bitwise_convert_double_to_long_bits(session_length)-1)
+           AND bitwise_convert_double_to_long_bits(session_length) > bitwise_convert_double_to_long_bits(session_length)-1
+           AND bitwise_convert_double_to_long_bits(session_length) >= bitwise_convert_double_to_long_bits(session_length)-1
+           AND bitwise_convert_double_to_long_bits(session_length) < bitwise_convert_double_to_long_bits(session_length)+1
+           AND bitwise_convert_double_to_long_bits(session_length) <= bitwise_convert_double_to_long_bits(session_length)+1
+           AND (bitwise_convert_double_to_long_bits(session_length) <> bitwise_convert_double_to_long_bits(session_length)-1) IS TRUE
+           AND (bitwise_convert_double_to_long_bits(session_length) = bitwise_convert_double_to_long_bits(session_length)-1) IS NOT TRUE
+           AND (bitwise_convert_double_to_long_bits(session_length) = bitwise_convert_double_to_long_bits(session_length)-1) IS FALSE
+           AND (bitwise_convert_double_to_long_bits(session_length) <> bitwise_convert_double_to_long_bits(session_length)-1) IS NOT FALSE
+           AND bitwise_convert_double_to_long_bits(session_length) BETWEEN bitwise_convert_double_to_long_bits(session_length)-1 AND bitwise_convert_double_to_long_bits(session_length)+1
+           AND bitwise_convert_double_to_long_bits(session_length) NOT BETWEEN bitwise_convert_double_to_long_bits(session_length) AND bitwise_convert_double_to_long_bits(session_length)-1
+           AND bitwise_convert_double_to_long_bits(session_length) like '%'
+           AND bitwise_convert_double_to_long_bits(session_length) not like '__DOES_NOT_EXIST__%'
+           AND bitwise_convert_double_to_long_bits(session_length) IN (bitwise_convert_double_to_long_bits(session_length)-1,
+                                                                                                                          bitwise_convert_double_to_long_bits(session_length)+0,
+                                                                                                                          bitwise_convert_double_to_long_bits(session_length)+1)
+           AND bitwise_convert_double_to_long_bits(session_length) NOT IN (bitwise_convert_double_to_long_bits(session_length)-1,
+                                                                                                                              bitwise_convert_double_to_long_bits(session_length)+1))) ;
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND (bitwise_convert_double_to_long_bits(session_length) IS NULL
+       OR bitwise_convert_double_to_long_bits(session_length) IN
+         (SELECT bitwise_convert_double_to_long_bits(session_length)
+          FROM kttm_nested
+          WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+            AND (bitwise_convert_double_to_long_bits(session_length) IS NULL
+                 OR (bitwise_convert_double_to_long_bits(session_length) = bitwise_convert_double_to_long_bits(session_length)+0
+                     AND bitwise_convert_double_to_long_bits(session_length) IS NOT DISTINCT
+                     FROM bitwise_convert_double_to_long_bits(session_length)+0
+                     AND bitwise_convert_double_to_long_bits(session_length) <> bitwise_convert_double_to_long_bits(session_length)-1
+                     AND (bitwise_convert_double_to_long_bits(session_length) IS DISTINCT
+                          FROM bitwise_convert_double_to_long_bits(session_length)-1)
+                     AND bitwise_convert_double_to_long_bits(session_length) > bitwise_convert_double_to_long_bits(session_length)-1
+                     AND bitwise_convert_double_to_long_bits(session_length) >= bitwise_convert_double_to_long_bits(session_length)-1
+                     AND bitwise_convert_double_to_long_bits(session_length) < bitwise_convert_double_to_long_bits(session_length)+1
+                     AND bitwise_convert_double_to_long_bits(session_length) <= bitwise_convert_double_to_long_bits(session_length)+1
+                     AND (bitwise_convert_double_to_long_bits(session_length) <> bitwise_convert_double_to_long_bits(session_length)-1) IS TRUE
+                     AND (bitwise_convert_double_to_long_bits(session_length) = bitwise_convert_double_to_long_bits(session_length)-1) IS NOT TRUE
+                     AND (bitwise_convert_double_to_long_bits(session_length) = bitwise_convert_double_to_long_bits(session_length)-1) IS FALSE
+                     AND (bitwise_convert_double_to_long_bits(session_length) <> bitwise_convert_double_to_long_bits(session_length)-1) IS NOT FALSE
+                     AND bitwise_convert_double_to_long_bits(session_length) BETWEEN bitwise_convert_double_to_long_bits(session_length)-1 AND bitwise_convert_double_to_long_bits(session_length)+1
+                     AND bitwise_convert_double_to_long_bits(session_length) NOT BETWEEN bitwise_convert_double_to_long_bits(session_length) AND bitwise_convert_double_to_long_bits(session_length)-1
+                     AND bitwise_convert_double_to_long_bits(session_length) like '%'
+                     AND bitwise_convert_double_to_long_bits(session_length) not like '__DOES_NOT_EXIST__%'
+                     AND bitwise_convert_double_to_long_bits(session_length) IN (bitwise_convert_double_to_long_bits(session_length)-1,
+                                                                                                                                    bitwise_convert_double_to_long_bits(session_length)+0,
+                                                                                                                                    bitwise_convert_double_to_long_bits(session_length)+1)
+                     AND bitwise_convert_double_to_long_bits(session_length) NOT IN (bitwise_convert_double_to_long_bits(session_length)-1,
+                                                                                                                                        bitwise_convert_double_to_long_bits(session_length)+1)))));
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM
+  (SELECT __time, number, client_ip,
+                          bitwise_convert_double_to_long_bits(session_length),
+                          count(*)
+   FROM kttm_nested
+   WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+     AND (bitwise_convert_double_to_long_bits(session_length) IS NULL
+          OR (bitwise_convert_double_to_long_bits(session_length) = bitwise_convert_double_to_long_bits(session_length)+0
+              AND bitwise_convert_double_to_long_bits(session_length) IS NOT DISTINCT
+              FROM bitwise_convert_double_to_long_bits(session_length)+0
+              AND bitwise_convert_double_to_long_bits(session_length) <> bitwise_convert_double_to_long_bits(session_length)-1
+              AND (bitwise_convert_double_to_long_bits(session_length) IS DISTINCT
+                   FROM bitwise_convert_double_to_long_bits(session_length)-1)
+              AND bitwise_convert_double_to_long_bits(session_length) > bitwise_convert_double_to_long_bits(session_length)-1
+              AND bitwise_convert_double_to_long_bits(session_length) >= bitwise_convert_double_to_long_bits(session_length)-1
+              AND bitwise_convert_double_to_long_bits(session_length) < bitwise_convert_double_to_long_bits(session_length)+1
+              AND bitwise_convert_double_to_long_bits(session_length) <= bitwise_convert_double_to_long_bits(session_length)+1
+              AND (bitwise_convert_double_to_long_bits(session_length) <> bitwise_convert_double_to_long_bits(session_length)-1) IS TRUE
+              AND (bitwise_convert_double_to_long_bits(session_length) = bitwise_convert_double_to_long_bits(session_length)-1) IS NOT TRUE
+              AND (bitwise_convert_double_to_long_bits(session_length) = bitwise_convert_double_to_long_bits(session_length)-1) IS FALSE
+              AND (bitwise_convert_double_to_long_bits(session_length) <> bitwise_convert_double_to_long_bits(session_length)-1) IS NOT FALSE
+              AND bitwise_convert_double_to_long_bits(session_length) BETWEEN bitwise_convert_double_to_long_bits(session_length)-1 AND bitwise_convert_double_to_long_bits(session_length)+1
+              AND bitwise_convert_double_to_long_bits(session_length) NOT BETWEEN bitwise_convert_double_to_long_bits(session_length) AND bitwise_convert_double_to_long_bits(session_length)-1
+              AND bitwise_convert_double_to_long_bits(session_length) like '%'
+              AND bitwise_convert_double_to_long_bits(session_length) not like '__DOES_NOT_EXIST__%'
+              AND bitwise_convert_double_to_long_bits(session_length) IN (bitwise_convert_double_to_long_bits(session_length)-1,
+                                                                                                                             bitwise_convert_double_to_long_bits(session_length)+0,
+                                                                                                                             bitwise_convert_double_to_long_bits(session_length)+1)
+              AND bitwise_convert_double_to_long_bits(session_length) NOT IN (bitwise_convert_double_to_long_bits(session_length)-1,
+                                                                                                                                 bitwise_convert_double_to_long_bits(session_length)+1)))
+   GROUP BY 1,
+            2,
+            3,
+            4);
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+#-------------------------------------------------------------------------
+# TEST_ID: A28: bitwise_convert_long_bits_to_double
+#-------------------------------------------------------------------------
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND (bitwise_convert_long_bits_to_double(session_length) IS NULL
+       OR (bitwise_convert_long_bits_to_double(session_length) = bitwise_convert_long_bits_to_double(session_length)+0
+           AND bitwise_convert_long_bits_to_double(session_length) IS NOT DISTINCT
+           FROM bitwise_convert_long_bits_to_double(session_length)+0
+           AND bitwise_convert_long_bits_to_double(session_length) <> bitwise_convert_long_bits_to_double(session_length)-1
+           AND (bitwise_convert_long_bits_to_double(session_length) IS DISTINCT
+                FROM bitwise_convert_long_bits_to_double(session_length)-1)
+           AND bitwise_convert_long_bits_to_double(session_length) > bitwise_convert_long_bits_to_double(session_length)-1
+           AND bitwise_convert_long_bits_to_double(session_length) >= bitwise_convert_long_bits_to_double(session_length)-1
+           AND bitwise_convert_long_bits_to_double(session_length) < bitwise_convert_long_bits_to_double(session_length)+1
+           AND bitwise_convert_long_bits_to_double(session_length) <= bitwise_convert_long_bits_to_double(session_length)+1
+           AND (bitwise_convert_long_bits_to_double(session_length) <> bitwise_convert_long_bits_to_double(session_length)-1) IS TRUE
+           AND (bitwise_convert_long_bits_to_double(session_length) = bitwise_convert_long_bits_to_double(session_length)-1) IS NOT TRUE
+           AND (bitwise_convert_long_bits_to_double(session_length) = bitwise_convert_long_bits_to_double(session_length)-1) IS FALSE
+           AND (bitwise_convert_long_bits_to_double(session_length) <> bitwise_convert_long_bits_to_double(session_length)-1) IS NOT FALSE
+           AND bitwise_convert_long_bits_to_double(session_length) BETWEEN bitwise_convert_long_bits_to_double(session_length)-1 AND bitwise_convert_long_bits_to_double(session_length)+1
+           AND bitwise_convert_long_bits_to_double(session_length) NOT BETWEEN bitwise_convert_long_bits_to_double(session_length) AND bitwise_convert_long_bits_to_double(session_length)-1
+           AND bitwise_convert_long_bits_to_double(session_length) like '%'
+           AND bitwise_convert_long_bits_to_double(session_length) not like '__DOES_NOT_EXIST__%'
+           AND bitwise_convert_long_bits_to_double(session_length) IN (bitwise_convert_long_bits_to_double(session_length)-1,
+                                                                                                                          bitwise_convert_long_bits_to_double(session_length)+0,
+                                                                                                                          bitwise_convert_long_bits_to_double(session_length)+1)
+           AND bitwise_convert_long_bits_to_double(session_length) NOT IN (bitwise_convert_long_bits_to_double(session_length)-1,
+                                                                                                                              bitwise_convert_long_bits_to_double(session_length)+1))) ;
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND (bitwise_convert_long_bits_to_double(session_length) IS NULL
+       OR bitwise_convert_long_bits_to_double(session_length) IN
+         (SELECT bitwise_convert_long_bits_to_double(session_length)
+          FROM kttm_nested
+          WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+            AND (bitwise_convert_long_bits_to_double(session_length) IS NULL
+                 OR (bitwise_convert_long_bits_to_double(session_length) = bitwise_convert_long_bits_to_double(session_length)+0
+                     AND bitwise_convert_long_bits_to_double(session_length) IS NOT DISTINCT
+                     FROM bitwise_convert_long_bits_to_double(session_length)+0
+                     AND bitwise_convert_long_bits_to_double(session_length) <> bitwise_convert_long_bits_to_double(session_length)-1
+                     AND (bitwise_convert_long_bits_to_double(session_length) IS DISTINCT
+                          FROM bitwise_convert_long_bits_to_double(session_length)-1)
+                     AND bitwise_convert_long_bits_to_double(session_length) > bitwise_convert_long_bits_to_double(session_length)-1
+                     AND bitwise_convert_long_bits_to_double(session_length) >= bitwise_convert_long_bits_to_double(session_length)-1
+                     AND bitwise_convert_long_bits_to_double(session_length) < bitwise_convert_long_bits_to_double(session_length)+1
+                     AND bitwise_convert_long_bits_to_double(session_length) <= bitwise_convert_long_bits_to_double(session_length)+1
+                     AND (bitwise_convert_long_bits_to_double(session_length) <> bitwise_convert_long_bits_to_double(session_length)-1) IS TRUE
+                     AND (bitwise_convert_long_bits_to_double(session_length) = bitwise_convert_long_bits_to_double(session_length)-1) IS NOT TRUE
+                     AND (bitwise_convert_long_bits_to_double(session_length) = bitwise_convert_long_bits_to_double(session_length)-1) IS FALSE
+                     AND (bitwise_convert_long_bits_to_double(session_length) <> bitwise_convert_long_bits_to_double(session_length)-1) IS NOT FALSE
+                     AND bitwise_convert_long_bits_to_double(session_length) BETWEEN bitwise_convert_long_bits_to_double(session_length)-1 AND bitwise_convert_long_bits_to_double(session_length)+1
+                     AND bitwise_convert_long_bits_to_double(session_length) NOT BETWEEN bitwise_convert_long_bits_to_double(session_length) AND bitwise_convert_long_bits_to_double(session_length)-1
+                     AND bitwise_convert_long_bits_to_double(session_length) like '%'
+                     AND bitwise_convert_long_bits_to_double(session_length) not like '__DOES_NOT_EXIST__%'
+                     AND bitwise_convert_long_bits_to_double(session_length) IN (bitwise_convert_long_bits_to_double(session_length)-1,
+                                                                                                                                    bitwise_convert_long_bits_to_double(session_length)+0,
+                                                                                                                                    bitwise_convert_long_bits_to_double(session_length)+1)
+                     AND bitwise_convert_long_bits_to_double(session_length) NOT IN (bitwise_convert_long_bits_to_double(session_length)-1,
+                                                                                                                                        bitwise_convert_long_bits_to_double(session_length)+1)))));
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM
+  (SELECT __time, number, client_ip,
+                          bitwise_convert_long_bits_to_double(session_length),
+                          count(*)
+   FROM kttm_nested
+   WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+     AND (bitwise_convert_long_bits_to_double(session_length) IS NULL
+          OR (bitwise_convert_long_bits_to_double(session_length) = bitwise_convert_long_bits_to_double(session_length)+0
+              AND bitwise_convert_long_bits_to_double(session_length) IS NOT DISTINCT
+              FROM bitwise_convert_long_bits_to_double(session_length)+0
+              AND bitwise_convert_long_bits_to_double(session_length) <> bitwise_convert_long_bits_to_double(session_length)-1
+              AND (bitwise_convert_long_bits_to_double(session_length) IS DISTINCT
+                   FROM bitwise_convert_long_bits_to_double(session_length)-1)
+              AND bitwise_convert_long_bits_to_double(session_length) > bitwise_convert_long_bits_to_double(session_length)-1
+              AND bitwise_convert_long_bits_to_double(session_length) >= bitwise_convert_long_bits_to_double(session_length)-1
+              AND bitwise_convert_long_bits_to_double(session_length) < bitwise_convert_long_bits_to_double(session_length)+1
+              AND bitwise_convert_long_bits_to_double(session_length) <= bitwise_convert_long_bits_to_double(session_length)+1
+              AND (bitwise_convert_long_bits_to_double(session_length) <> bitwise_convert_long_bits_to_double(session_length)-1) IS TRUE
+              AND (bitwise_convert_long_bits_to_double(session_length) = bitwise_convert_long_bits_to_double(session_length)-1) IS NOT TRUE
+              AND (bitwise_convert_long_bits_to_double(session_length) = bitwise_convert_long_bits_to_double(session_length)-1) IS FALSE
+              AND (bitwise_convert_long_bits_to_double(session_length) <> bitwise_convert_long_bits_to_double(session_length)-1) IS NOT FALSE
+              AND bitwise_convert_long_bits_to_double(session_length) BETWEEN bitwise_convert_long_bits_to_double(session_length)-1 AND bitwise_convert_long_bits_to_double(session_length)+1
+              AND bitwise_convert_long_bits_to_double(session_length) NOT BETWEEN bitwise_convert_long_bits_to_double(session_length) AND bitwise_convert_long_bits_to_double(session_length)-1
+              AND bitwise_convert_long_bits_to_double(session_length) like '%'
+              AND bitwise_convert_long_bits_to_double(session_length) not like '__DOES_NOT_EXIST__%'
+              AND bitwise_convert_long_bits_to_double(session_length) IN (bitwise_convert_long_bits_to_double(session_length)-1,
+                                                                                                                             bitwise_convert_long_bits_to_double(session_length)+0,
+                                                                                                                             bitwise_convert_long_bits_to_double(session_length)+1)
+              AND bitwise_convert_long_bits_to_double(session_length) NOT IN (bitwise_convert_long_bits_to_double(session_length)-1,
+                                                                                                                                 bitwise_convert_long_bits_to_double(session_length)+1)))
+   GROUP BY 1,
+            2,
+            3,
+            4);
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+#-------------------------------------------------------------------------
+# TEST_ID: A29: bitwise_or
+#-------------------------------------------------------------------------
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND (bitwise_or(session_length, session_length) IS NULL
+       OR (bitwise_or(session_length, session_length) = bitwise_or(session_length, session_length)+0
+           AND bitwise_or(session_length, session_length) IS NOT DISTINCT
+           FROM bitwise_or(session_length, session_length)+0
+           AND bitwise_or(session_length, session_length) <> bitwise_or(session_length, session_length)-1
+           AND (bitwise_or(session_length, session_length) IS DISTINCT
+                FROM bitwise_or(session_length, session_length)-1)
+           AND bitwise_or(session_length, session_length) > bitwise_or(session_length, session_length)-1
+           AND bitwise_or(session_length, session_length) >= bitwise_or(session_length, session_length)-1
+           AND bitwise_or(session_length, session_length) < bitwise_or(session_length, session_length)+1
+           AND bitwise_or(session_length, session_length) <= bitwise_or(session_length, session_length)+1
+           AND (bitwise_or(session_length, session_length) <> bitwise_or(session_length, session_length)-1) IS TRUE
+           AND (bitwise_or(session_length, session_length) = bitwise_or(session_length, session_length)-1) IS NOT TRUE
+           AND (bitwise_or(session_length, session_length) = bitwise_or(session_length, session_length)-1) IS FALSE
+           AND (bitwise_or(session_length, session_length) <> bitwise_or(session_length, session_length)-1) IS NOT FALSE
+           AND bitwise_or(session_length, session_length) BETWEEN bitwise_or(session_length, session_length)-1 AND bitwise_or(session_length, session_length)+1
+           AND bitwise_or(session_length, session_length) NOT BETWEEN bitwise_or(session_length, session_length) AND bitwise_or(session_length, session_length)-1
+           AND bitwise_or(session_length, session_length) like '%'
+           AND bitwise_or(session_length, session_length) not like '__DOES_NOT_EXIST__%'
+           AND bitwise_or(session_length, session_length) IN (bitwise_or(session_length, session_length)-1,
+                                                                                                        bitwise_or(session_length, session_length)+0,
+                                                                                                        bitwise_or(session_length, session_length)+1)
+           AND bitwise_or(session_length, session_length) NOT IN (bitwise_or(session_length, session_length)-1,
+                                                                                                            bitwise_or(session_length, session_length)+1))) ;
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND (bitwise_or(session_length, session_length) IS NULL
+       OR bitwise_or(session_length, session_length) IN
+         (SELECT bitwise_or(session_length, session_length)
+          FROM kttm_nested
+          WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+            AND (bitwise_or(session_length, session_length) IS NULL
+                 OR (bitwise_or(session_length, session_length) = bitwise_or(session_length, session_length)+0
+                     AND bitwise_or(session_length, session_length) IS NOT DISTINCT
+                     FROM bitwise_or(session_length, session_length)+0
+                     AND bitwise_or(session_length, session_length) <> bitwise_or(session_length, session_length)-1
+                     AND (bitwise_or(session_length, session_length) IS DISTINCT
+                          FROM bitwise_or(session_length, session_length)-1)
+                     AND bitwise_or(session_length, session_length) > bitwise_or(session_length, session_length)-1
+                     AND bitwise_or(session_length, session_length) >= bitwise_or(session_length, session_length)-1
+                     AND bitwise_or(session_length, session_length) < bitwise_or(session_length, session_length)+1
+                     AND bitwise_or(session_length, session_length) <= bitwise_or(session_length, session_length)+1
+                     AND (bitwise_or(session_length, session_length) <> bitwise_or(session_length, session_length)-1) IS TRUE
+                     AND (bitwise_or(session_length, session_length) = bitwise_or(session_length, session_length)-1) IS NOT TRUE
+                     AND (bitwise_or(session_length, session_length) = bitwise_or(session_length, session_length)-1) IS FALSE
+                     AND (bitwise_or(session_length, session_length) <> bitwise_or(session_length, session_length)-1) IS NOT FALSE
+                     AND bitwise_or(session_length, session_length) BETWEEN bitwise_or(session_length, session_length)-1 AND bitwise_or(session_length, session_length)+1
+                     AND bitwise_or(session_length, session_length) NOT BETWEEN bitwise_or(session_length, session_length) AND bitwise_or(session_length, session_length)-1
+                     AND bitwise_or(session_length, session_length) like '%'
+                     AND bitwise_or(session_length, session_length) not like '__DOES_NOT_EXIST__%'
+                     AND bitwise_or(session_length, session_length) IN (bitwise_or(session_length, session_length)-1,
+                                                                                                                  bitwise_or(session_length, session_length)+0,
+                                                                                                                  bitwise_or(session_length, session_length)+1)
+                     AND bitwise_or(session_length, session_length) NOT IN (bitwise_or(session_length, session_length)-1,
+                                                                                                                      bitwise_or(session_length, session_length)+1)))));
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM
+  (SELECT __time, number, client_ip,
+                          bitwise_or(session_length, session_length),
+                          count(*)
+   FROM kttm_nested
+   WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+     AND (bitwise_or(session_length, session_length) IS NULL
+          OR (bitwise_or(session_length, session_length) = bitwise_or(session_length, session_length)+0
+              AND bitwise_or(session_length, session_length) IS NOT DISTINCT
+              FROM bitwise_or(session_length, session_length)+0
+              AND bitwise_or(session_length, session_length) <> bitwise_or(session_length, session_length)-1
+              AND (bitwise_or(session_length, session_length) IS DISTINCT
+                   FROM bitwise_or(session_length, session_length)-1)
+              AND bitwise_or(session_length, session_length) > bitwise_or(session_length, session_length)-1
+              AND bitwise_or(session_length, session_length) >= bitwise_or(session_length, session_length)-1
+              AND bitwise_or(session_length, session_length) < bitwise_or(session_length, session_length)+1
+              AND bitwise_or(session_length, session_length) <= bitwise_or(session_length, session_length)+1
+              AND (bitwise_or(session_length, session_length) <> bitwise_or(session_length, session_length)-1) IS TRUE
+              AND (bitwise_or(session_length, session_length) = bitwise_or(session_length, session_length)-1) IS NOT TRUE
+              AND (bitwise_or(session_length, session_length) = bitwise_or(session_length, session_length)-1) IS FALSE
+              AND (bitwise_or(session_length, session_length) <> bitwise_or(session_length, session_length)-1) IS NOT FALSE
+              AND bitwise_or(session_length, session_length) BETWEEN bitwise_or(session_length, session_length)-1 AND bitwise_or(session_length, session_length)+1
+              AND bitwise_or(session_length, session_length) NOT BETWEEN bitwise_or(session_length, session_length) AND bitwise_or(session_length, session_length)-1
+              AND bitwise_or(session_length, session_length) like '%'
+              AND bitwise_or(session_length, session_length) not like '__DOES_NOT_EXIST__%'
+              AND bitwise_or(session_length, session_length) IN (bitwise_or(session_length, session_length)-1,
+                                                                                                           bitwise_or(session_length, session_length)+0,
+                                                                                                           bitwise_or(session_length, session_length)+1)
+              AND bitwise_or(session_length, session_length) NOT IN (bitwise_or(session_length, session_length)-1,
+                                                                                                               bitwise_or(session_length, session_length)+1)))
+   GROUP BY 1,
+            2,
+            3,
+            4);
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+#-------------------------------------------------------------------------
+# TEST_ID: A30: bitwise_shift_left
+#-------------------------------------------------------------------------
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND (bitwise_shift_left(session_length, 2) IS NULL
+       OR (bitwise_shift_left(session_length, 2) = bitwise_shift_left(session_length, 2)+0
+           AND bitwise_shift_left(session_length, 2) IS NOT DISTINCT
+           FROM bitwise_shift_left(session_length, 2)+0
+           AND bitwise_shift_left(session_length, 2) <> bitwise_shift_left(session_length, 2)-1
+           AND (bitwise_shift_left(session_length, 2) IS DISTINCT
+                FROM bitwise_shift_left(session_length, 2)-1)
+           AND bitwise_shift_left(session_length, 2) > bitwise_shift_left(session_length, 2)-1
+           AND bitwise_shift_left(session_length, 2) >= bitwise_shift_left(session_length, 2)-1
+           AND bitwise_shift_left(session_length, 2) < bitwise_shift_left(session_length, 2)+1
+           AND bitwise_shift_left(session_length, 2) <= bitwise_shift_left(session_length, 2)+1
+           AND (bitwise_shift_left(session_length, 2) <> bitwise_shift_left(session_length, 2)-1) IS TRUE
+           AND (bitwise_shift_left(session_length, 2) = bitwise_shift_left(session_length, 2)-1) IS NOT TRUE
+           AND (bitwise_shift_left(session_length, 2) = bitwise_shift_left(session_length, 2)-1) IS FALSE
+           AND (bitwise_shift_left(session_length, 2) <> bitwise_shift_left(session_length, 2)-1) IS NOT FALSE
+           AND bitwise_shift_left(session_length, 2) BETWEEN bitwise_shift_left(session_length, 2)-1 AND bitwise_shift_left(session_length, 2)+1
+           AND bitwise_shift_left(session_length, 2) NOT BETWEEN bitwise_shift_left(session_length, 2) AND bitwise_shift_left(session_length, 2)-1
+           AND bitwise_shift_left(session_length, 2) like '%'
+           AND bitwise_shift_left(session_length, 2) not like '__DOES_NOT_EXIST__%'
+           AND bitwise_shift_left(session_length, 2) IN (bitwise_shift_left(session_length, 2)-1,
+                                                                                              bitwise_shift_left(session_length, 2)+0,
+                                                                                              bitwise_shift_left(session_length, 2)+1)
+           AND bitwise_shift_left(session_length, 2) NOT IN (bitwise_shift_left(session_length, 2)-1,
+                                                                                                  bitwise_shift_left(session_length, 2)+1))) ;
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND (bitwise_shift_left(session_length, 2) IS NULL
+       OR bitwise_shift_left(session_length, 2) IN
+         (SELECT bitwise_shift_left(session_length, 2)
+          FROM kttm_nested
+          WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+            AND (bitwise_shift_left(session_length, 2) IS NULL
+                 OR (bitwise_shift_left(session_length, 2) = bitwise_shift_left(session_length, 2)+0
+                     AND bitwise_shift_left(session_length, 2) IS NOT DISTINCT
+                     FROM bitwise_shift_left(session_length, 2)+0
+                     AND bitwise_shift_left(session_length, 2) <> bitwise_shift_left(session_length, 2)-1
+                     AND (bitwise_shift_left(session_length, 2) IS DISTINCT
+                          FROM bitwise_shift_left(session_length, 2)-1)
+                     AND bitwise_shift_left(session_length, 2) > bitwise_shift_left(session_length, 2)-1
+                     AND bitwise_shift_left(session_length, 2) >= bitwise_shift_left(session_length, 2)-1
+                     AND bitwise_shift_left(session_length, 2) < bitwise_shift_left(session_length, 2)+1
+                     AND bitwise_shift_left(session_length, 2) <= bitwise_shift_left(session_length, 2)+1
+                     AND (bitwise_shift_left(session_length, 2) <> bitwise_shift_left(session_length, 2)-1) IS TRUE
+                     AND (bitwise_shift_left(session_length, 2) = bitwise_shift_left(session_length, 2)-1) IS NOT TRUE
+                     AND (bitwise_shift_left(session_length, 2) = bitwise_shift_left(session_length, 2)-1) IS FALSE
+                     AND (bitwise_shift_left(session_length, 2) <> bitwise_shift_left(session_length, 2)-1) IS NOT FALSE
+                     AND bitwise_shift_left(session_length, 2) BETWEEN bitwise_shift_left(session_length, 2)-1 AND bitwise_shift_left(session_length, 2)+1
+                     AND bitwise_shift_left(session_length, 2) NOT BETWEEN bitwise_shift_left(session_length, 2) AND bitwise_shift_left(session_length, 2)-1
+                     AND bitwise_shift_left(session_length, 2) like '%'
+                     AND bitwise_shift_left(session_length, 2) not like '__DOES_NOT_EXIST__%'
+                     AND bitwise_shift_left(session_length, 2) IN (bitwise_shift_left(session_length, 2)-1,
+                                                                                                        bitwise_shift_left(session_length, 2)+0,
+                                                                                                        bitwise_shift_left(session_length, 2)+1)
+                     AND bitwise_shift_left(session_length, 2) NOT IN (bitwise_shift_left(session_length, 2)-1,
+                                                                                                            bitwise_shift_left(session_length, 2)+1)))));
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM
+  (SELECT __time, number, client_ip,
+                          bitwise_shift_left(session_length, 2),
+                          count(*)
+   FROM kttm_nested
+   WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+     AND (bitwise_shift_left(session_length, 2) IS NULL
+          OR (bitwise_shift_left(session_length, 2) = bitwise_shift_left(session_length, 2)+0
+              AND bitwise_shift_left(session_length, 2) IS NOT DISTINCT
+              FROM bitwise_shift_left(session_length, 2)+0
+              AND bitwise_shift_left(session_length, 2) <> bitwise_shift_left(session_length, 2)-1
+              AND (bitwise_shift_left(session_length, 2) IS DISTINCT
+                   FROM bitwise_shift_left(session_length, 2)-1)
+              AND bitwise_shift_left(session_length, 2) > bitwise_shift_left(session_length, 2)-1
+              AND bitwise_shift_left(session_length, 2) >= bitwise_shift_left(session_length, 2)-1
+              AND bitwise_shift_left(session_length, 2) < bitwise_shift_left(session_length, 2)+1
+              AND bitwise_shift_left(session_length, 2) <= bitwise_shift_left(session_length, 2)+1
+              AND (bitwise_shift_left(session_length, 2) <> bitwise_shift_left(session_length, 2)-1) IS TRUE
+              AND (bitwise_shift_left(session_length, 2) = bitwise_shift_left(session_length, 2)-1) IS NOT TRUE
+              AND (bitwise_shift_left(session_length, 2) = bitwise_shift_left(session_length, 2)-1) IS FALSE
+              AND (bitwise_shift_left(session_length, 2) <> bitwise_shift_left(session_length, 2)-1) IS NOT FALSE
+              AND bitwise_shift_left(session_length, 2) BETWEEN bitwise_shift_left(session_length, 2)-1 AND bitwise_shift_left(session_length, 2)+1
+              AND bitwise_shift_left(session_length, 2) NOT BETWEEN bitwise_shift_left(session_length, 2) AND bitwise_shift_left(session_length, 2)-1
+              AND bitwise_shift_left(session_length, 2) like '%'
+              AND bitwise_shift_left(session_length, 2) not like '__DOES_NOT_EXIST__%'
+              AND bitwise_shift_left(session_length, 2) IN (bitwise_shift_left(session_length, 2)-1,
+                                                                                                 bitwise_shift_left(session_length, 2)+0,
+                                                                                                 bitwise_shift_left(session_length, 2)+1)
+              AND bitwise_shift_left(session_length, 2) NOT IN (bitwise_shift_left(session_length, 2)-1,
+                                                                                                     bitwise_shift_left(session_length, 2)+1)))
+   GROUP BY 1,
+            2,
+            3,
+            4);
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+#-------------------------------------------------------------------------
+# TEST_ID: A31: bitwise_shift_right
+#-------------------------------------------------------------------------
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND (bitwise_shift_right(session_length, 2) IS NULL
+       OR (bitwise_shift_right(session_length, 2) = bitwise_shift_right(session_length, 2)+0
+           AND bitwise_shift_right(session_length, 2) IS NOT DISTINCT
+           FROM bitwise_shift_right(session_length, 2)+0
+           AND bitwise_shift_right(session_length, 2) <> bitwise_shift_right(session_length, 2)-1
+           AND (bitwise_shift_right(session_length, 2) IS DISTINCT
+                FROM bitwise_shift_right(session_length, 2)-1)
+           AND bitwise_shift_right(session_length, 2) > bitwise_shift_right(session_length, 2)-1
+           AND bitwise_shift_right(session_length, 2) >= bitwise_shift_right(session_length, 2)-1
+           AND bitwise_shift_right(session_length, 2) < bitwise_shift_right(session_length, 2)+1
+           AND bitwise_shift_right(session_length, 2) <= bitwise_shift_right(session_length, 2)+1
+           AND (bitwise_shift_right(session_length, 2) <> bitwise_shift_right(session_length, 2)-1) IS TRUE
+           AND (bitwise_shift_right(session_length, 2) = bitwise_shift_right(session_length, 2)-1) IS NOT TRUE
+           AND (bitwise_shift_right(session_length, 2) = bitwise_shift_right(session_length, 2)-1) IS FALSE
+           AND (bitwise_shift_right(session_length, 2) <> bitwise_shift_right(session_length, 2)-1) IS NOT FALSE
+           AND bitwise_shift_right(session_length, 2) BETWEEN bitwise_shift_right(session_length, 2)-1 AND bitwise_shift_right(session_length, 2)+1
+           AND bitwise_shift_right(session_length, 2) NOT BETWEEN bitwise_shift_right(session_length, 2) AND bitwise_shift_right(session_length, 2)-1
+           AND bitwise_shift_right(session_length, 2) like '%'
+           AND bitwise_shift_right(session_length, 2) not like '__DOES_NOT_EXIST__%'
+           AND bitwise_shift_right(session_length, 2) IN (bitwise_shift_right(session_length, 2)-1,
+                                                                                                bitwise_shift_right(session_length, 2)+0,
+                                                                                                bitwise_shift_right(session_length, 2)+1)
+           AND bitwise_shift_right(session_length, 2) NOT IN (bitwise_shift_right(session_length, 2)-1,
+                                                                                                    bitwise_shift_right(session_length, 2)+1))) ;
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND (bitwise_shift_right(session_length, 2) IS NULL
+       OR bitwise_shift_right(session_length, 2) IN
+         (SELECT bitwise_shift_right(session_length, 2)
+          FROM kttm_nested
+          WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+            AND (bitwise_shift_right(session_length, 2) IS NULL
+                 OR (bitwise_shift_right(session_length, 2) = bitwise_shift_right(session_length, 2)+0
+                     AND bitwise_shift_right(session_length, 2) IS NOT DISTINCT
+                     FROM bitwise_shift_right(session_length, 2)+0
+                     AND bitwise_shift_right(session_length, 2) <> bitwise_shift_right(session_length, 2)-1
+                     AND (bitwise_shift_right(session_length, 2) IS DISTINCT
+                          FROM bitwise_shift_right(session_length, 2)-1)
+                     AND bitwise_shift_right(session_length, 2) > bitwise_shift_right(session_length, 2)-1
+                     AND bitwise_shift_right(session_length, 2) >= bitwise_shift_right(session_length, 2)-1
+                     AND bitwise_shift_right(session_length, 2) < bitwise_shift_right(session_length, 2)+1
+                     AND bitwise_shift_right(session_length, 2) <= bitwise_shift_right(session_length, 2)+1
+                     AND (bitwise_shift_right(session_length, 2) <> bitwise_shift_right(session_length, 2)-1) IS TRUE
+                     AND (bitwise_shift_right(session_length, 2) = bitwise_shift_right(session_length, 2)-1) IS NOT TRUE
+                     AND (bitwise_shift_right(session_length, 2) = bitwise_shift_right(session_length, 2)-1) IS FALSE
+                     AND (bitwise_shift_right(session_length, 2) <> bitwise_shift_right(session_length, 2)-1) IS NOT FALSE
+                     AND bitwise_shift_right(session_length, 2) BETWEEN bitwise_shift_right(session_length, 2)-1 AND bitwise_shift_right(session_length, 2)+1
+                     AND bitwise_shift_right(session_length, 2) NOT BETWEEN bitwise_shift_right(session_length, 2) AND bitwise_shift_right(session_length, 2)-1
+                     AND bitwise_shift_right(session_length, 2) like '%'
+                     AND bitwise_shift_right(session_length, 2) not like '__DOES_NOT_EXIST__%'
+                     AND bitwise_shift_right(session_length, 2) IN (bitwise_shift_right(session_length, 2)-1,
+                                                                                                          bitwise_shift_right(session_length, 2)+0,
+                                                                                                          bitwise_shift_right(session_length, 2)+1)
+                     AND bitwise_shift_right(session_length, 2) NOT IN (bitwise_shift_right(session_length, 2)-1,
+                                                                                                              bitwise_shift_right(session_length, 2)+1)))));
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM
+  (SELECT __time, number, client_ip,
+                          bitwise_shift_right(session_length, 2),
+                          count(*)
+   FROM kttm_nested
+   WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+     AND (bitwise_shift_right(session_length, 2) IS NULL
+          OR (bitwise_shift_right(session_length, 2) = bitwise_shift_right(session_length, 2)+0
+              AND bitwise_shift_right(session_length, 2) IS NOT DISTINCT
+              FROM bitwise_shift_right(session_length, 2)+0
+              AND bitwise_shift_right(session_length, 2) <> bitwise_shift_right(session_length, 2)-1
+              AND (bitwise_shift_right(session_length, 2) IS DISTINCT
+                   FROM bitwise_shift_right(session_length, 2)-1)
+              AND bitwise_shift_right(session_length, 2) > bitwise_shift_right(session_length, 2)-1
+              AND bitwise_shift_right(session_length, 2) >= bitwise_shift_right(session_length, 2)-1
+              AND bitwise_shift_right(session_length, 2) < bitwise_shift_right(session_length, 2)+1
+              AND bitwise_shift_right(session_length, 2) <= bitwise_shift_right(session_length, 2)+1
+              AND (bitwise_shift_right(session_length, 2) <> bitwise_shift_right(session_length, 2)-1) IS TRUE
+              AND (bitwise_shift_right(session_length, 2) = bitwise_shift_right(session_length, 2)-1) IS NOT TRUE
+              AND (bitwise_shift_right(session_length, 2) = bitwise_shift_right(session_length, 2)-1) IS FALSE
+              AND (bitwise_shift_right(session_length, 2) <> bitwise_shift_right(session_length, 2)-1) IS NOT FALSE
+              AND bitwise_shift_right(session_length, 2) BETWEEN bitwise_shift_right(session_length, 2)-1 AND bitwise_shift_right(session_length, 2)+1
+              AND bitwise_shift_right(session_length, 2) NOT BETWEEN bitwise_shift_right(session_length, 2) AND bitwise_shift_right(session_length, 2)-1
+              AND bitwise_shift_right(session_length, 2) like '%'
+              AND bitwise_shift_right(session_length, 2) not like '__DOES_NOT_EXIST__%'
+              AND bitwise_shift_right(session_length, 2) IN (bitwise_shift_right(session_length, 2)-1,
+                                                                                                   bitwise_shift_right(session_length, 2)+0,
+                                                                                                   bitwise_shift_right(session_length, 2)+1)
+              AND bitwise_shift_right(session_length, 2) NOT IN (bitwise_shift_right(session_length, 2)-1,
+                                                                                                       bitwise_shift_right(session_length, 2)+1)))
+   GROUP BY 1,
+            2,
+            3,
+            4);
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+#-------------------------------------------------------------------------
+# TEST_ID: A32: bitwise_xor
+#-------------------------------------------------------------------------
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND (bitwise_xor(session_length, session_length) IS NULL
+       OR (bitwise_xor(session_length, session_length) = bitwise_xor(session_length, session_length)+0
+           AND bitwise_xor(session_length, session_length) IS NOT DISTINCT
+           FROM bitwise_xor(session_length, session_length)+0
+           AND bitwise_xor(session_length, session_length) <> bitwise_xor(session_length, session_length)-1
+           AND (bitwise_xor(session_length, session_length) IS DISTINCT
+                FROM bitwise_xor(session_length, session_length)-1)
+           AND bitwise_xor(session_length, session_length) > bitwise_xor(session_length, session_length)-1
+           AND bitwise_xor(session_length, session_length) >= bitwise_xor(session_length, session_length)-1
+           AND bitwise_xor(session_length, session_length) < bitwise_xor(session_length, session_length)+1
+           AND bitwise_xor(session_length, session_length) <= bitwise_xor(session_length, session_length)+1
+           AND (bitwise_xor(session_length, session_length) <> bitwise_xor(session_length, session_length)-1) IS TRUE
+           AND (bitwise_xor(session_length, session_length) = bitwise_xor(session_length, session_length)-1) IS NOT TRUE
+           AND (bitwise_xor(session_length, session_length) = bitwise_xor(session_length, session_length)-1) IS FALSE
+           AND (bitwise_xor(session_length, session_length) <> bitwise_xor(session_length, session_length)-1) IS NOT FALSE
+           AND bitwise_xor(session_length, session_length) BETWEEN bitwise_xor(session_length, session_length)-1 AND bitwise_xor(session_length, session_length)+1
+           AND bitwise_xor(session_length, session_length) NOT BETWEEN bitwise_xor(session_length, session_length) AND bitwise_xor(session_length, session_length)-1
+           AND bitwise_xor(session_length, session_length) like '%'
+           AND bitwise_xor(session_length, session_length) not like '__DOES_NOT_EXIST__%'
+           AND bitwise_xor(session_length, session_length) IN (bitwise_xor(session_length, session_length)-1,
+                                                                                                          bitwise_xor(session_length, session_length)+0,
+                                                                                                          bitwise_xor(session_length, session_length)+1)
+           AND bitwise_xor(session_length, session_length) NOT IN (bitwise_xor(session_length, session_length)-1,
+                                                                                                              bitwise_xor(session_length, session_length)+1))) ;
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND (bitwise_xor(session_length, session_length) IS NULL
+       OR bitwise_xor(session_length, session_length) IN
+         (SELECT bitwise_xor(session_length, session_length)
+          FROM kttm_nested
+          WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+            AND (bitwise_xor(session_length, session_length) IS NULL
+                 OR (bitwise_xor(session_length, session_length) = bitwise_xor(session_length, session_length)+0
+                     AND bitwise_xor(session_length, session_length) IS NOT DISTINCT
+                     FROM bitwise_xor(session_length, session_length)+0
+                     AND bitwise_xor(session_length, session_length) <> bitwise_xor(session_length, session_length)-1
+                     AND (bitwise_xor(session_length, session_length) IS DISTINCT
+                          FROM bitwise_xor(session_length, session_length)-1)
+                     AND bitwise_xor(session_length, session_length) > bitwise_xor(session_length, session_length)-1
+                     AND bitwise_xor(session_length, session_length) >= bitwise_xor(session_length, session_length)-1
+                     AND bitwise_xor(session_length, session_length) < bitwise_xor(session_length, session_length)+1
+                     AND bitwise_xor(session_length, session_length) <= bitwise_xor(session_length, session_length)+1
+                     AND (bitwise_xor(session_length, session_length) <> bitwise_xor(session_length, session_length)-1) IS TRUE
+                     AND (bitwise_xor(session_length, session_length) = bitwise_xor(session_length, session_length)-1) IS NOT TRUE
+                     AND (bitwise_xor(session_length, session_length) = bitwise_xor(session_length, session_length)-1) IS FALSE
+                     AND (bitwise_xor(session_length, session_length) <> bitwise_xor(session_length, session_length)-1) IS NOT FALSE
+                     AND bitwise_xor(session_length, session_length) BETWEEN bitwise_xor(session_length, session_length)-1 AND bitwise_xor(session_length, session_length)+1
+                     AND bitwise_xor(session_length, session_length) NOT BETWEEN bitwise_xor(session_length, session_length) AND bitwise_xor(session_length, session_length)-1
+                     AND bitwise_xor(session_length, session_length) like '%'
+                     AND bitwise_xor(session_length, session_length) not like '__DOES_NOT_EXIST__%'
+                     AND bitwise_xor(session_length, session_length) IN (bitwise_xor(session_length, session_length)-1,
+                                                                                                                    bitwise_xor(session_length, session_length)+0,
+                                                                                                                    bitwise_xor(session_length, session_length)+1)
+                     AND bitwise_xor(session_length, session_length) NOT IN (bitwise_xor(session_length, session_length)-1,
+                                                                                                                        bitwise_xor(session_length, session_length)+1)))));
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM
+  (SELECT __time, number, client_ip,
+                          bitwise_xor(session_length, session_length),
+                          count(*)
+   FROM kttm_nested
+   WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+     AND (bitwise_xor(session_length, session_length) IS NULL
+          OR (bitwise_xor(session_length, session_length) = bitwise_xor(session_length, session_length)+0
+              AND bitwise_xor(session_length, session_length) IS NOT DISTINCT
+              FROM bitwise_xor(session_length, session_length)+0
+              AND bitwise_xor(session_length, session_length) <> bitwise_xor(session_length, session_length)-1
+              AND (bitwise_xor(session_length, session_length) IS DISTINCT
+                   FROM bitwise_xor(session_length, session_length)-1)
+              AND bitwise_xor(session_length, session_length) > bitwise_xor(session_length, session_length)-1
+              AND bitwise_xor(session_length, session_length) >= bitwise_xor(session_length, session_length)-1
+              AND bitwise_xor(session_length, session_length) < bitwise_xor(session_length, session_length)+1
+              AND bitwise_xor(session_length, session_length) <= bitwise_xor(session_length, session_length)+1
+              AND (bitwise_xor(session_length, session_length) <> bitwise_xor(session_length, session_length)-1) IS TRUE
+              AND (bitwise_xor(session_length, session_length) = bitwise_xor(session_length, session_length)-1) IS NOT TRUE
+              AND (bitwise_xor(session_length, session_length) = bitwise_xor(session_length, session_length)-1) IS FALSE
+              AND (bitwise_xor(session_length, session_length) <> bitwise_xor(session_length, session_length)-1) IS NOT FALSE
+              AND bitwise_xor(session_length, session_length) BETWEEN bitwise_xor(session_length, session_length)-1 AND bitwise_xor(session_length, session_length)+1
+              AND bitwise_xor(session_length, session_length) NOT BETWEEN bitwise_xor(session_length, session_length) AND bitwise_xor(session_length, session_length)-1
+              AND bitwise_xor(session_length, session_length) like '%'
+              AND bitwise_xor(session_length, session_length) not like '__DOES_NOT_EXIST__%'
+              AND bitwise_xor(session_length, session_length) IN (bitwise_xor(session_length, session_length)-1,
+                                                                                                             bitwise_xor(session_length, session_length)+0,
+                                                                                                             bitwise_xor(session_length, session_length)+1)
+              AND bitwise_xor(session_length, session_length) NOT IN (bitwise_xor(session_length, session_length)-1,
+                                                                                                                 bitwise_xor(session_length, session_length)+1)))
+   GROUP BY 1,
+            2,
+            3,
+            4);
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+#-------------------------------------------------------------------------
+# TEST_ID: A33: human_readable_binary_byte_format
+#-------------------------------------------------------------------------
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND ('1'||human_readable_binary_byte_format(session_length, 1) IS NULL
+       OR ('1'||human_readable_binary_byte_format(session_length, 1) = 1||human_readable_binary_byte_format(session_length, 1)
+           AND '1'||human_readable_binary_byte_format(session_length, 1) IS NOT DISTINCT
+           FROM 1||human_readable_binary_byte_format(session_length, 1)
+           AND '1'||human_readable_binary_byte_format(session_length, 1) <> '0'||human_readable_binary_byte_format(session_length, 1)
+           AND ('1'||human_readable_binary_byte_format(session_length, 1) IS DISTINCT
+                FROM '0'||human_readable_binary_byte_format(session_length, 1))
+           AND '1'||human_readable_binary_byte_format(session_length, 1) > '0'||human_readable_binary_byte_format(session_length, 1)
+           AND '1'||human_readable_binary_byte_format(session_length, 1) >= '0'||human_readable_binary_byte_format(session_length, 1)
+           AND '1'||human_readable_binary_byte_format(session_length, 1) < 2||human_readable_binary_byte_format(session_length, 1)
+           AND '1'||human_readable_binary_byte_format(session_length, 1) <= 2||human_readable_binary_byte_format(session_length, 1)
+           AND ('1'||human_readable_binary_byte_format(session_length, 1) <> '0'||human_readable_binary_byte_format(session_length, 1)) IS TRUE
+           AND ('1'||human_readable_binary_byte_format(session_length, 1) = '0'||human_readable_binary_byte_format(session_length, 1)) IS NOT TRUE
+           AND ('1'||human_readable_binary_byte_format(session_length, 1) = '0'||human_readable_binary_byte_format(session_length, 1)) IS FALSE
+           AND ('1'||human_readable_binary_byte_format(session_length, 1) <> '0'||human_readable_binary_byte_format(session_length, 1)) IS NOT FALSE
+           AND '1'||human_readable_binary_byte_format(session_length, 1) BETWEEN '0'||human_readable_binary_byte_format(session_length, 1) AND 2||human_readable_binary_byte_format(session_length, 1)
+           AND '1'||human_readable_binary_byte_format(session_length, 1) NOT BETWEEN '1'||human_readable_binary_byte_format(session_length, 1) AND '0'||human_readable_binary_byte_format(session_length, 1)
+           AND '1'||human_readable_binary_byte_format(session_length, 1) like '%'
+           AND '1'||human_readable_binary_byte_format(session_length, 1) not like '__DOES_NOT_EXIST__%'
+           AND '1'||human_readable_binary_byte_format(session_length, 1) IN ('0'||human_readable_binary_byte_format(session_length, 1),
+                                                                             1||human_readable_binary_byte_format(session_length, 1),
+                                                                             2||human_readable_binary_byte_format(session_length, 1))
+           AND '1'||human_readable_binary_byte_format(session_length, 1) NOT IN ('0'||human_readable_binary_byte_format(session_length, 1),
+                                                                                 2||human_readable_binary_byte_format(session_length, 1)))) ;
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND ('1'||human_readable_binary_byte_format(session_length, 1) IS NULL
+       OR '1'||human_readable_binary_byte_format(session_length, 1) IN
+         (SELECT '1'||human_readable_binary_byte_format(session_length, 1)
+          FROM kttm_nested
+          WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+            AND ('1'||human_readable_binary_byte_format(session_length, 1) IS NULL
+                 OR ('1'||human_readable_binary_byte_format(session_length, 1) = 1||human_readable_binary_byte_format(session_length, 1)
+                     AND '1'||human_readable_binary_byte_format(session_length, 1) IS NOT DISTINCT
+                     FROM 1||human_readable_binary_byte_format(session_length, 1)
+                     AND '1'||human_readable_binary_byte_format(session_length, 1) <> '0'||human_readable_binary_byte_format(session_length, 1)
+                     AND ('1'||human_readable_binary_byte_format(session_length, 1) IS DISTINCT
+                          FROM '0'||human_readable_binary_byte_format(session_length, 1))
+                     AND '1'||human_readable_binary_byte_format(session_length, 1) > '0'||human_readable_binary_byte_format(session_length, 1)
+                     AND '1'||human_readable_binary_byte_format(session_length, 1) >= '0'||human_readable_binary_byte_format(session_length, 1)
+                     AND '1'||human_readable_binary_byte_format(session_length, 1) < 2||human_readable_binary_byte_format(session_length, 1)
+                     AND '1'||human_readable_binary_byte_format(session_length, 1) <= 2||human_readable_binary_byte_format(session_length, 1)
+                     AND ('1'||human_readable_binary_byte_format(session_length, 1) <> '0'||human_readable_binary_byte_format(session_length, 1)) IS TRUE
+                     AND ('1'||human_readable_binary_byte_format(session_length, 1) = '0'||human_readable_binary_byte_format(session_length, 1)) IS NOT TRUE
+                     AND ('1'||human_readable_binary_byte_format(session_length, 1) = '0'||human_readable_binary_byte_format(session_length, 1)) IS FALSE
+                     AND ('1'||human_readable_binary_byte_format(session_length, 1) <> '0'||human_readable_binary_byte_format(session_length, 1)) IS NOT FALSE
+                     AND '1'||human_readable_binary_byte_format(session_length, 1) BETWEEN '0'||human_readable_binary_byte_format(session_length, 1) AND 2||human_readable_binary_byte_format(session_length, 1)
+                     AND '1'||human_readable_binary_byte_format(session_length, 1) NOT BETWEEN '1'||human_readable_binary_byte_format(session_length, 1) AND '0'||human_readable_binary_byte_format(session_length, 1)
+                     AND '1'||human_readable_binary_byte_format(session_length, 1) like '%'
+                     AND '1'||human_readable_binary_byte_format(session_length, 1) not like '__DOES_NOT_EXIST__%'
+                     AND '1'||human_readable_binary_byte_format(session_length, 1) IN ('0'||human_readable_binary_byte_format(session_length, 1),
+                                                                                       1||human_readable_binary_byte_format(session_length, 1),
+                                                                                       2||human_readable_binary_byte_format(session_length, 1))
+                     AND '1'||human_readable_binary_byte_format(session_length, 1) NOT IN ('0'||human_readable_binary_byte_format(session_length, 1),
+                                                                                           2||human_readable_binary_byte_format(session_length, 1))))));
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM
+  (SELECT __time, number, client_ip,
+                          '1'||human_readable_binary_byte_format(session_length, 1),
+                          count(*)
+   FROM kttm_nested
+   WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+     AND ('1'||human_readable_binary_byte_format(session_length, 1) IS NULL
+          OR ('1'||human_readable_binary_byte_format(session_length, 1) = 1||human_readable_binary_byte_format(session_length, 1)
+              AND '1'||human_readable_binary_byte_format(session_length, 1) IS NOT DISTINCT
+              FROM 1||human_readable_binary_byte_format(session_length, 1)
+              AND '1'||human_readable_binary_byte_format(session_length, 1) <> '0'||human_readable_binary_byte_format(session_length, 1)
+              AND ('1'||human_readable_binary_byte_format(session_length, 1) IS DISTINCT
+                   FROM '0'||human_readable_binary_byte_format(session_length, 1))
+              AND '1'||human_readable_binary_byte_format(session_length, 1) > '0'||human_readable_binary_byte_format(session_length, 1)
+              AND '1'||human_readable_binary_byte_format(session_length, 1) >= '0'||human_readable_binary_byte_format(session_length, 1)
+              AND '1'||human_readable_binary_byte_format(session_length, 1) < 2||human_readable_binary_byte_format(session_length, 1)
+              AND '1'||human_readable_binary_byte_format(session_length, 1) <= 2||human_readable_binary_byte_format(session_length, 1)
+              AND ('1'||human_readable_binary_byte_format(session_length, 1) <> '0'||human_readable_binary_byte_format(session_length, 1)) IS TRUE
+              AND ('1'||human_readable_binary_byte_format(session_length, 1) = '0'||human_readable_binary_byte_format(session_length, 1)) IS NOT TRUE
+              AND ('1'||human_readable_binary_byte_format(session_length, 1) = '0'||human_readable_binary_byte_format(session_length, 1)) IS FALSE
+              AND ('1'||human_readable_binary_byte_format(session_length, 1) <> '0'||human_readable_binary_byte_format(session_length, 1)) IS NOT FALSE
+              AND '1'||human_readable_binary_byte_format(session_length, 1) BETWEEN '0'||human_readable_binary_byte_format(session_length, 1) AND 2||human_readable_binary_byte_format(session_length, 1)
+              AND '1'||human_readable_binary_byte_format(session_length, 1) NOT BETWEEN '1'||human_readable_binary_byte_format(session_length, 1) AND '0'||human_readable_binary_byte_format(session_length, 1)
+              AND '1'||human_readable_binary_byte_format(session_length, 1) like '%'
+              AND '1'||human_readable_binary_byte_format(session_length, 1) not like '__DOES_NOT_EXIST__%'
+              AND '1'||human_readable_binary_byte_format(session_length, 1) IN ('0'||human_readable_binary_byte_format(session_length, 1),
+                                                                                1||human_readable_binary_byte_format(session_length, 1),
+                                                                                2||human_readable_binary_byte_format(session_length, 1))
+              AND '1'||human_readable_binary_byte_format(session_length, 1) NOT IN ('0'||human_readable_binary_byte_format(session_length, 1),
+                                                                                    2||human_readable_binary_byte_format(session_length, 1))))
+   GROUP BY 1,
+            2,
+            3,
+            4);
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+#-------------------------------------------------------------------------
+# TEST_ID: A34: human_readable_decimal_byte_format
+#-------------------------------------------------------------------------
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND ('1'||human_readable_decimal_byte_format(session_length, 1) IS NULL
+       OR ('1'||human_readable_decimal_byte_format(session_length, 1) = 1||human_readable_decimal_byte_format(session_length, 1)
+           AND '1'||human_readable_decimal_byte_format(session_length, 1) IS NOT DISTINCT
+           FROM 1||human_readable_decimal_byte_format(session_length, 1)
+           AND '1'||human_readable_decimal_byte_format(session_length, 1) <> '0'||human_readable_decimal_byte_format(session_length, 1)
+           AND ('1'||human_readable_decimal_byte_format(session_length, 1) IS DISTINCT
+                FROM '0'||human_readable_decimal_byte_format(session_length, 1))
+           AND '1'||human_readable_decimal_byte_format(session_length, 1) > '0'||human_readable_decimal_byte_format(session_length, 1)
+           AND '1'||human_readable_decimal_byte_format(session_length, 1) >= '0'||human_readable_decimal_byte_format(session_length, 1)
+           AND '1'||human_readable_decimal_byte_format(session_length, 1) < 2||human_readable_decimal_byte_format(session_length, 1)
+           AND '1'||human_readable_decimal_byte_format(session_length, 1) <= 2||human_readable_decimal_byte_format(session_length, 1)
+           AND ('1'||human_readable_decimal_byte_format(session_length, 1) <> '0'||human_readable_decimal_byte_format(session_length, 1)) IS TRUE
+           AND ('1'||human_readable_decimal_byte_format(session_length, 1) = '0'||human_readable_decimal_byte_format(session_length, 1)) IS NOT TRUE
+           AND ('1'||human_readable_decimal_byte_format(session_length, 1) = '0'||human_readable_decimal_byte_format(session_length, 1)) IS FALSE
+           AND ('1'||human_readable_decimal_byte_format(session_length, 1) <> '0'||human_readable_decimal_byte_format(session_length, 1)) IS NOT FALSE
+           AND '1'||human_readable_decimal_byte_format(session_length, 1) BETWEEN '0'||human_readable_decimal_byte_format(session_length, 1) AND 2||human_readable_decimal_byte_format(session_length, 1)
+           AND '1'||human_readable_decimal_byte_format(session_length, 1) NOT BETWEEN '1'||human_readable_decimal_byte_format(session_length, 1) AND '0'||human_readable_decimal_byte_format(session_length, 1)
+           AND '1'||human_readable_decimal_byte_format(session_length, 1) like '%'
+           AND '1'||human_readable_decimal_byte_format(session_length, 1) not like '__DOES_NOT_EXIST__%'
+           AND '1'||human_readable_decimal_byte_format(session_length, 1) IN ('0'||human_readable_decimal_byte_format(session_length, 1),
+                                                                              1||human_readable_decimal_byte_format(session_length, 1),
+                                                                              2||human_readable_decimal_byte_format(session_length, 1))
+           AND '1'||human_readable_decimal_byte_format(session_length, 1) NOT IN ('0'||human_readable_decimal_byte_format(session_length, 1),
+                                                                                  2||human_readable_decimal_byte_format(session_length, 1)))) ;
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND ('1'||human_readable_decimal_byte_format(session_length, 1) IS NULL
+       OR '1'||human_readable_decimal_byte_format(session_length, 1) IN
+         (SELECT '1'||human_readable_decimal_byte_format(session_length, 1)
+          FROM kttm_nested
+          WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+            AND ('1'||human_readable_decimal_byte_format(session_length, 1) IS NULL
+                 OR ('1'||human_readable_decimal_byte_format(session_length, 1) = 1||human_readable_decimal_byte_format(session_length, 1)
+                     AND '1'||human_readable_decimal_byte_format(session_length, 1) IS NOT DISTINCT
+                     FROM 1||human_readable_decimal_byte_format(session_length, 1)
+                     AND '1'||human_readable_decimal_byte_format(session_length, 1) <> '0'||human_readable_decimal_byte_format(session_length, 1)
+                     AND ('1'||human_readable_decimal_byte_format(session_length, 1) IS DISTINCT
+                          FROM '0'||human_readable_decimal_byte_format(session_length, 1))
+                     AND '1'||human_readable_decimal_byte_format(session_length, 1) > '0'||human_readable_decimal_byte_format(session_length, 1)
+                     AND '1'||human_readable_decimal_byte_format(session_length, 1) >= '0'||human_readable_decimal_byte_format(session_length, 1)
+                     AND '1'||human_readable_decimal_byte_format(session_length, 1) < 2||human_readable_decimal_byte_format(session_length, 1)
+                     AND '1'||human_readable_decimal_byte_format(session_length, 1) <= 2||human_readable_decimal_byte_format(session_length, 1)
+                     AND ('1'||human_readable_decimal_byte_format(session_length, 1) <> '0'||human_readable_decimal_byte_format(session_length, 1)) IS TRUE
+                     AND ('1'||human_readable_decimal_byte_format(session_length, 1) = '0'||human_readable_decimal_byte_format(session_length, 1)) IS NOT TRUE
+                     AND ('1'||human_readable_decimal_byte_format(session_length, 1) = '0'||human_readable_decimal_byte_format(session_length, 1)) IS FALSE
+                     AND ('1'||human_readable_decimal_byte_format(session_length, 1) <> '0'||human_readable_decimal_byte_format(session_length, 1)) IS NOT FALSE
+                     AND '1'||human_readable_decimal_byte_format(session_length, 1) BETWEEN '0'||human_readable_decimal_byte_format(session_length, 1) AND 2||human_readable_decimal_byte_format(session_length, 1)
+                     AND '1'||human_readable_decimal_byte_format(session_length, 1) NOT BETWEEN '1'||human_readable_decimal_byte_format(session_length, 1) AND '0'||human_readable_decimal_byte_format(session_length, 1)
+                     AND '1'||human_readable_decimal_byte_format(session_length, 1) like '%'
+                     AND '1'||human_readable_decimal_byte_format(session_length, 1) not like '__DOES_NOT_EXIST__%'
+                     AND '1'||human_readable_decimal_byte_format(session_length, 1) IN ('0'||human_readable_decimal_byte_format(session_length, 1),
+                                                                                        1||human_readable_decimal_byte_format(session_length, 1),
+                                                                                        2||human_readable_decimal_byte_format(session_length, 1))
+                     AND '1'||human_readable_decimal_byte_format(session_length, 1) NOT IN ('0'||human_readable_decimal_byte_format(session_length, 1),
+                                                                                            2||human_readable_decimal_byte_format(session_length, 1))))));
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM
+  (SELECT __time, number, client_ip,
+                          '1'||human_readable_decimal_byte_format(session_length, 1),
+                          count(*)
+   FROM kttm_nested
+   WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+     AND ('1'||human_readable_decimal_byte_format(session_length, 1) IS NULL
+          OR ('1'||human_readable_decimal_byte_format(session_length, 1) = 1||human_readable_decimal_byte_format(session_length, 1)
+              AND '1'||human_readable_decimal_byte_format(session_length, 1) IS NOT DISTINCT
+              FROM 1||human_readable_decimal_byte_format(session_length, 1)
+              AND '1'||human_readable_decimal_byte_format(session_length, 1) <> '0'||human_readable_decimal_byte_format(session_length, 1)
+              AND ('1'||human_readable_decimal_byte_format(session_length, 1) IS DISTINCT
+                   FROM '0'||human_readable_decimal_byte_format(session_length, 1))
+              AND '1'||human_readable_decimal_byte_format(session_length, 1) > '0'||human_readable_decimal_byte_format(session_length, 1)
+              AND '1'||human_readable_decimal_byte_format(session_length, 1) >= '0'||human_readable_decimal_byte_format(session_length, 1)
+              AND '1'||human_readable_decimal_byte_format(session_length, 1) < 2||human_readable_decimal_byte_format(session_length, 1)
+              AND '1'||human_readable_decimal_byte_format(session_length, 1) <= 2||human_readable_decimal_byte_format(session_length, 1)
+              AND ('1'||human_readable_decimal_byte_format(session_length, 1) <> '0'||human_readable_decimal_byte_format(session_length, 1)) IS TRUE
+              AND ('1'||human_readable_decimal_byte_format(session_length, 1) = '0'||human_readable_decimal_byte_format(session_length, 1)) IS NOT TRUE
+              AND ('1'||human_readable_decimal_byte_format(session_length, 1) = '0'||human_readable_decimal_byte_format(session_length, 1)) IS FALSE
+              AND ('1'||human_readable_decimal_byte_format(session_length, 1) <> '0'||human_readable_decimal_byte_format(session_length, 1)) IS NOT FALSE
+              AND '1'||human_readable_decimal_byte_format(session_length, 1) BETWEEN '0'||human_readable_decimal_byte_format(session_length, 1) AND 2||human_readable_decimal_byte_format(session_length, 1)
+              AND '1'||human_readable_decimal_byte_format(session_length, 1) NOT BETWEEN '1'||human_readable_decimal_byte_format(session_length, 1) AND '0'||human_readable_decimal_byte_format(session_length, 1)
+              AND '1'||human_readable_decimal_byte_format(session_length, 1) like '%'
+              AND '1'||human_readable_decimal_byte_format(session_length, 1) not like '__DOES_NOT_EXIST__%'
+              AND '1'||human_readable_decimal_byte_format(session_length, 1) IN ('0'||human_readable_decimal_byte_format(session_length, 1),
+                                                                                 1||human_readable_decimal_byte_format(session_length, 1),
+                                                                                 2||human_readable_decimal_byte_format(session_length, 1))
+              AND '1'||human_readable_decimal_byte_format(session_length, 1) NOT IN ('0'||human_readable_decimal_byte_format(session_length, 1),
+                                                                                     2||human_readable_decimal_byte_format(session_length, 1))))
+   GROUP BY 1,
+            2,
+            3,
+            4);
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+#-------------------------------------------------------------------------
+# TEST_ID: A35: human_readable_decimal_format
+#-------------------------------------------------------------------------
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND ('1'||human_readable_decimal_format(session_length, 1) IS NULL
+       OR ('1'||human_readable_decimal_format(session_length, 1) = 1||human_readable_decimal_format(session_length, 1)
+           AND '1'||human_readable_decimal_format(session_length, 1) IS NOT DISTINCT
+           FROM 1||human_readable_decimal_format(session_length, 1)
+           AND '1'||human_readable_decimal_format(session_length, 1) <> '0'||human_readable_decimal_format(session_length, 1)
+           AND ('1'||human_readable_decimal_format(session_length, 1) IS DISTINCT
+                FROM '0'||human_readable_decimal_format(session_length, 1))
+           AND '1'||human_readable_decimal_format(session_length, 1) > '0'||human_readable_decimal_format(session_length, 1)
+           AND '1'||human_readable_decimal_format(session_length, 1) >= '0'||human_readable_decimal_format(session_length, 1)
+           AND '1'||human_readable_decimal_format(session_length, 1) < 2||human_readable_decimal_format(session_length, 1)
+           AND '1'||human_readable_decimal_format(session_length, 1) <= 2||human_readable_decimal_format(session_length, 1)
+           AND ('1'||human_readable_decimal_format(session_length, 1) <> '0'||human_readable_decimal_format(session_length, 1)) IS TRUE
+           AND ('1'||human_readable_decimal_format(session_length, 1) = '0'||human_readable_decimal_format(session_length, 1)) IS NOT TRUE
+           AND ('1'||human_readable_decimal_format(session_length, 1) = '0'||human_readable_decimal_format(session_length, 1)) IS FALSE
+           AND ('1'||human_readable_decimal_format(session_length, 1) <> '0'||human_readable_decimal_format(session_length, 1)) IS NOT FALSE
+           AND '1'||human_readable_decimal_format(session_length, 1) BETWEEN '0'||human_readable_decimal_format(session_length, 1) AND 2||human_readable_decimal_format(session_length, 1)
+           AND '1'||human_readable_decimal_format(session_length, 1) NOT BETWEEN '1'||human_readable_decimal_format(session_length, 1) AND '0'||human_readable_decimal_format(session_length, 1)
+           AND '1'||human_readable_decimal_format(session_length, 1) like '%'
+           AND '1'||human_readable_decimal_format(session_length, 1) not like '__DOES_NOT_EXIST__%'
+           AND '1'||human_readable_decimal_format(session_length, 1) IN ('0'||human_readable_decimal_format(session_length, 1),
+                                                                         1||human_readable_decimal_format(session_length, 1),
+                                                                         2||human_readable_decimal_format(session_length, 1))
+           AND '1'||human_readable_decimal_format(session_length, 1) NOT IN ('0'||human_readable_decimal_format(session_length, 1),
+                                                                             2||human_readable_decimal_format(session_length, 1)))) ;
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND ('1'||human_readable_decimal_format(session_length, 1) IS NULL
+       OR '1'||human_readable_decimal_format(session_length, 1) IN
+         (SELECT '1'||human_readable_decimal_format(session_length, 1)
+          FROM kttm_nested
+          WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+            AND ('1'||human_readable_decimal_format(session_length, 1) IS NULL
+                 OR ('1'||human_readable_decimal_format(session_length, 1) = 1||human_readable_decimal_format(session_length, 1)
+                     AND '1'||human_readable_decimal_format(session_length, 1) IS NOT DISTINCT
+                     FROM 1||human_readable_decimal_format(session_length, 1)
+                     AND '1'||human_readable_decimal_format(session_length, 1) <> '0'||human_readable_decimal_format(session_length, 1)
+                     AND ('1'||human_readable_decimal_format(session_length, 1) IS DISTINCT
+                          FROM '0'||human_readable_decimal_format(session_length, 1))
+                     AND '1'||human_readable_decimal_format(session_length, 1) > '0'||human_readable_decimal_format(session_length, 1)
+                     AND '1'||human_readable_decimal_format(session_length, 1) >= '0'||human_readable_decimal_format(session_length, 1)
+                     AND '1'||human_readable_decimal_format(session_length, 1) < 2||human_readable_decimal_format(session_length, 1)
+                     AND '1'||human_readable_decimal_format(session_length, 1) <= 2||human_readable_decimal_format(session_length, 1)
+                     AND ('1'||human_readable_decimal_format(session_length, 1) <> '0'||human_readable_decimal_format(session_length, 1)) IS TRUE
+                     AND ('1'||human_readable_decimal_format(session_length, 1) = '0'||human_readable_decimal_format(session_length, 1)) IS NOT TRUE
+                     AND ('1'||human_readable_decimal_format(session_length, 1) = '0'||human_readable_decimal_format(session_length, 1)) IS FALSE
+                     AND ('1'||human_readable_decimal_format(session_length, 1) <> '0'||human_readable_decimal_format(session_length, 1)) IS NOT FALSE
+                     AND '1'||human_readable_decimal_format(session_length, 1) BETWEEN '0'||human_readable_decimal_format(session_length, 1) AND 2||human_readable_decimal_format(session_length, 1)
+                     AND '1'||human_readable_decimal_format(session_length, 1) NOT BETWEEN '1'||human_readable_decimal_format(session_length, 1) AND '0'||human_readable_decimal_format(session_length, 1)
+                     AND '1'||human_readable_decimal_format(session_length, 1) like '%'
+                     AND '1'||human_readable_decimal_format(session_length, 1) not like '__DOES_NOT_EXIST__%'
+                     AND '1'||human_readable_decimal_format(session_length, 1) IN ('0'||human_readable_decimal_format(session_length, 1),
+                                                                                   1||human_readable_decimal_format(session_length, 1),
+                                                                                   2||human_readable_decimal_format(session_length, 1))
+                     AND '1'||human_readable_decimal_format(session_length, 1) NOT IN ('0'||human_readable_decimal_format(session_length, 1),
+                                                                                       2||human_readable_decimal_format(session_length, 1))))));
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM
+  (SELECT __time, number, client_ip,
+                          '1'||human_readable_decimal_format(session_length, 1),
+                          count(*)
+   FROM kttm_nested
+   WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+     AND ('1'||human_readable_decimal_format(session_length, 1) IS NULL
+          OR ('1'||human_readable_decimal_format(session_length, 1) = 1||human_readable_decimal_format(session_length, 1)
+              AND '1'||human_readable_decimal_format(session_length, 1) IS NOT DISTINCT
+              FROM 1||human_readable_decimal_format(session_length, 1)
+              AND '1'||human_readable_decimal_format(session_length, 1) <> '0'||human_readable_decimal_format(session_length, 1)
+              AND ('1'||human_readable_decimal_format(session_length, 1) IS DISTINCT
+                   FROM '0'||human_readable_decimal_format(session_length, 1))
+              AND '1'||human_readable_decimal_format(session_length, 1) > '0'||human_readable_decimal_format(session_length, 1)
+              AND '1'||human_readable_decimal_format(session_length, 1) >= '0'||human_readable_decimal_format(session_length, 1)
+              AND '1'||human_readable_decimal_format(session_length, 1) < 2||human_readable_decimal_format(session_length, 1)
+              AND '1'||human_readable_decimal_format(session_length, 1) <= 2||human_readable_decimal_format(session_length, 1)
+              AND ('1'||human_readable_decimal_format(session_length, 1) <> '0'||human_readable_decimal_format(session_length, 1)) IS TRUE
+              AND ('1'||human_readable_decimal_format(session_length, 1) = '0'||human_readable_decimal_format(session_length, 1)) IS NOT TRUE
+              AND ('1'||human_readable_decimal_format(session_length, 1) = '0'||human_readable_decimal_format(session_length, 1)) IS FALSE
+              AND ('1'||human_readable_decimal_format(session_length, 1) <> '0'||human_readable_decimal_format(session_length, 1)) IS NOT FALSE
+              AND '1'||human_readable_decimal_format(session_length, 1) BETWEEN '0'||human_readable_decimal_format(session_length, 1) AND 2||human_readable_decimal_format(session_length, 1)
+              AND '1'||human_readable_decimal_format(session_length, 1) NOT BETWEEN '1'||human_readable_decimal_format(session_length, 1) AND '0'||human_readable_decimal_format(session_length, 1)
+              AND '1'||human_readable_decimal_format(session_length, 1) like '%'
+              AND '1'||human_readable_decimal_format(session_length, 1) not like '__DOES_NOT_EXIST__%'
+              AND '1'||human_readable_decimal_format(session_length, 1) IN ('0'||human_readable_decimal_format(session_length, 1),
+                                                                            1||human_readable_decimal_format(session_length, 1),
+                                                                            2||human_readable_decimal_format(session_length, 1))
+              AND '1'||human_readable_decimal_format(session_length, 1) NOT IN ('0'||human_readable_decimal_format(session_length, 1),
+                                                                                2||human_readable_decimal_format(session_length, 1))))
+   GROUP BY 1,
+            2,
+            3,
+            4);
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+#-------------------------------------------------------------------------
+# TEST_ID: A36: safe_divide
+#-------------------------------------------------------------------------
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND (floor(safe_divide(session_length, session_length)) IS NULL
+       OR (floor(safe_divide(session_length, session_length)) = floor(safe_divide(session_length, session_length))+0
+           AND floor(safe_divide(session_length, session_length)) IS NOT DISTINCT
+           FROM floor(safe_divide(session_length, session_length))+0
+           AND floor(safe_divide(session_length, session_length)) <> floor(safe_divide(session_length, session_length))-1
+           AND (floor(safe_divide(session_length, session_length)) IS DISTINCT
+                FROM floor(safe_divide(session_length, session_length))-1)
+           AND floor(safe_divide(session_length, session_length)) > floor(safe_divide(session_length, session_length))-1
+           AND floor(safe_divide(session_length, session_length)) >= floor(safe_divide(session_length, session_length))-1
+           AND floor(safe_divide(session_length, session_length)) < floor(safe_divide(session_length, session_length))+1
+           AND floor(safe_divide(session_length, session_length)) <= floor(safe_divide(session_length, session_length))+1
+           AND (floor(safe_divide(session_length, session_length)) <> floor(safe_divide(session_length, session_length))-1) IS TRUE
+           AND (floor(safe_divide(session_length, session_length)) = floor(safe_divide(session_length, session_length))-1) IS NOT TRUE
+           AND (floor(safe_divide(session_length, session_length)) = floor(safe_divide(session_length, session_length))-1) IS FALSE
+           AND (floor(safe_divide(session_length, session_length)) <> floor(safe_divide(session_length, session_length))-1) IS NOT FALSE
+           AND floor(safe_divide(session_length, session_length)) BETWEEN floor(safe_divide(session_length, session_length))-1 AND floor(safe_divide(session_length, session_length))+1
+           AND floor(safe_divide(session_length, session_length)) NOT BETWEEN floor(safe_divide(session_length, session_length)) AND floor(safe_divide(session_length, session_length))-1
+           AND floor(safe_divide(session_length, session_length)) like '%'
+           AND floor(safe_divide(session_length, session_length)) not like '__DOES_NOT_EXIST__%'
+           AND floor(safe_divide(session_length, session_length)) IN (floor(safe_divide(session_length, session_length))-1,
+                                                                                                                        floor(safe_divide(session_length, session_length))+0,
+                                                                                                                        floor(safe_divide(session_length, session_length))+1)
+           AND floor(safe_divide(session_length, session_length)) NOT IN (floor(safe_divide(session_length, session_length))-1,
+                                                                                                                            floor(safe_divide(session_length, session_length))+1))) ;
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND (floor(safe_divide(session_length, session_length)) IS NULL
+       OR floor(safe_divide(session_length, session_length)) IN
+         (SELECT floor(safe_divide(session_length, session_length))
+          FROM kttm_nested
+          WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+            AND (floor(safe_divide(session_length, session_length)) IS NULL
+                 OR (floor(safe_divide(session_length, session_length)) = floor(safe_divide(session_length, session_length))+0
+                     AND floor(safe_divide(session_length, session_length)) IS NOT DISTINCT
+                     FROM floor(safe_divide(session_length, session_length))+0
+                     AND floor(safe_divide(session_length, session_length)) <> floor(safe_divide(session_length, session_length))-1
+                     AND (floor(safe_divide(session_length, session_length)) IS DISTINCT
+                          FROM floor(safe_divide(session_length, session_length))-1)
+                     AND floor(safe_divide(session_length, session_length)) > floor(safe_divide(session_length, session_length))-1
+                     AND floor(safe_divide(session_length, session_length)) >= floor(safe_divide(session_length, session_length))-1
+                     AND floor(safe_divide(session_length, session_length)) < floor(safe_divide(session_length, session_length))+1
+                     AND floor(safe_divide(session_length, session_length)) <= floor(safe_divide(session_length, session_length))+1
+                     AND (floor(safe_divide(session_length, session_length)) <> floor(safe_divide(session_length, session_length))-1) IS TRUE
+                     AND (floor(safe_divide(session_length, session_length)) = floor(safe_divide(session_length, session_length))-1) IS NOT TRUE
+                     AND (floor(safe_divide(session_length, session_length)) = floor(safe_divide(session_length, session_length))-1) IS FALSE
+                     AND (floor(safe_divide(session_length, session_length)) <> floor(safe_divide(session_length, session_length))-1) IS NOT FALSE
+                     AND floor(safe_divide(session_length, session_length)) BETWEEN floor(safe_divide(session_length, session_length))-1 AND floor(safe_divide(session_length, session_length))+1
+                     AND floor(safe_divide(session_length, session_length)) NOT BETWEEN floor(safe_divide(session_length, session_length)) AND floor(safe_divide(session_length, session_length))-1
+                     AND floor(safe_divide(session_length, session_length)) like '%'
+                     AND floor(safe_divide(session_length, session_length)) not like '__DOES_NOT_EXIST__%'
+                     AND floor(safe_divide(session_length, session_length)) IN (floor(safe_divide(session_length, session_length))-1,
+                                                                                                                                  floor(safe_divide(session_length, session_length))+0,
+                                                                                                                                  floor(safe_divide(session_length, session_length))+1)
+                     AND floor(safe_divide(session_length, session_length)) NOT IN (floor(safe_divide(session_length, session_length))-1,
+                                                                                                                                      floor(safe_divide(session_length, session_length))+1)))));
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM
+  (SELECT __time, number, client_ip,
+                          floor(safe_divide(session_length, session_length)),
+                          count(*)
+   FROM kttm_nested
+   WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+     AND (floor(safe_divide(session_length, session_length)) IS NULL
+          OR (floor(safe_divide(session_length, session_length)) = floor(safe_divide(session_length, session_length))+0
+              AND floor(safe_divide(session_length, session_length)) IS NOT DISTINCT
+              FROM floor(safe_divide(session_length, session_length))+0
+              AND floor(safe_divide(session_length, session_length)) <> floor(safe_divide(session_length, session_length))-1
+              AND (floor(safe_divide(session_length, session_length)) IS DISTINCT
+                   FROM floor(safe_divide(session_length, session_length))-1)
+              AND floor(safe_divide(session_length, session_length)) > floor(safe_divide(session_length, session_length))-1
+              AND floor(safe_divide(session_length, session_length)) >= floor(safe_divide(session_length, session_length))-1
+              AND floor(safe_divide(session_length, session_length)) < floor(safe_divide(session_length, session_length))+1
+              AND floor(safe_divide(session_length, session_length)) <= floor(safe_divide(session_length, session_length))+1
+              AND (floor(safe_divide(session_length, session_length)) <> floor(safe_divide(session_length, session_length))-1) IS TRUE
+              AND (floor(safe_divide(session_length, session_length)) = floor(safe_divide(session_length, session_length))-1) IS NOT TRUE
+              AND (floor(safe_divide(session_length, session_length)) = floor(safe_divide(session_length, session_length))-1) IS FALSE
+              AND (floor(safe_divide(session_length, session_length)) <> floor(safe_divide(session_length, session_length))-1) IS NOT FALSE
+              AND floor(safe_divide(session_length, session_length)) BETWEEN floor(safe_divide(session_length, session_length))-1 AND floor(safe_divide(session_length, session_length))+1
+              AND floor(safe_divide(session_length, session_length)) NOT BETWEEN floor(safe_divide(session_length, session_length)) AND floor(safe_divide(session_length, session_length))-1
+              AND floor(safe_divide(session_length, session_length)) like '%'
+              AND floor(safe_divide(session_length, session_length)) not like '__DOES_NOT_EXIST__%'
+              AND floor(safe_divide(session_length, session_length)) IN (floor(safe_divide(session_length, session_length))-1,
+                                                                                                                           floor(safe_divide(session_length, session_length))+0,
+                                                                                                                           floor(safe_divide(session_length, session_length))+1)
+              AND floor(safe_divide(session_length, session_length)) NOT IN (floor(safe_divide(session_length, session_length))-1,
+                                                                                                                               floor(safe_divide(session_length, session_length))+1)))
+   GROUP BY 1,
+            2,
+            3,
+            4);
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+#-------------------------------------------------------------------------
+# Total query count 109
+#-------------------------------------------------------------------------
diff --git a/quidem-ut/src/test/quidem/org.apache.druid.quidem.QTest/qaSQL_scalar_string.iq b/quidem-ut/src/test/quidem/org.apache.druid.quidem.QTest/qaSQL_scalar_string.iq
new file mode 100644
index 000000000000..153c50c79ca8
--- /dev/null
+++ b/quidem-ut/src/test/quidem/org.apache.druid.quidem.QTest/qaSQL_scalar_string.iq
@@ -0,0 +1,4606 @@
+!set useApproximateCountDistinct false
+!use druidtest:///?componentSupplier=KttmNestedComponentSupplier
+!set outputformat mysql
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00';
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+#-------------------------------------------------------------------------
+# TEST_ID: A1: plain_value_string
+#-------------------------------------------------------------------------
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND ('1'||loaded_image IS NULL
+       OR ('1'||loaded_image = 1||loaded_image
+           AND '1'||loaded_image IS NOT DISTINCT
+           FROM 1||loaded_image
+           AND '1'||loaded_image <> '0'||loaded_image
+           AND ('1'||loaded_image IS DISTINCT
+                FROM '0'||loaded_image)
+           AND '1'||loaded_image > '0'||loaded_image
+           AND '1'||loaded_image >= '0'||loaded_image
+           AND '1'||loaded_image < 2||loaded_image
+           AND '1'||loaded_image <= 2||loaded_image
+           AND ('1'||loaded_image <> '0'||loaded_image) IS TRUE
+           AND ('1'||loaded_image = '0'||loaded_image) IS NOT TRUE
+           AND ('1'||loaded_image = '0'||loaded_image) IS FALSE
+           AND ('1'||loaded_image <> '0'||loaded_image) IS NOT FALSE
+           AND '1'||loaded_image BETWEEN '0'||loaded_image AND 2||loaded_image
+           AND '1'||loaded_image NOT BETWEEN '1'||loaded_image AND '0'||loaded_image
+           AND '1'||loaded_image like '%'
+           AND '1'||loaded_image not like '__DOES_NOT_EXIST__%'
+           AND '1'||loaded_image IN ('0'||loaded_image,
+                                     1||loaded_image,
+                                     2||loaded_image)
+           AND '1'||loaded_image NOT IN ('0'||loaded_image,
+                                         2||loaded_image))) ;
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND ('1'||loaded_image IS NULL
+       OR '1'||loaded_image IN
+         (SELECT '1'||loaded_image
+          FROM kttm_nested
+          WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+            AND ('1'||loaded_image IS NULL
+                 OR ('1'||loaded_image = 1||loaded_image
+                     AND '1'||loaded_image IS NOT DISTINCT
+                     FROM 1||loaded_image
+                     AND '1'||loaded_image <> '0'||loaded_image
+                     AND ('1'||loaded_image IS DISTINCT
+                          FROM '0'||loaded_image)
+                     AND '1'||loaded_image > '0'||loaded_image
+                     AND '1'||loaded_image >= '0'||loaded_image
+                     AND '1'||loaded_image < 2||loaded_image
+                     AND '1'||loaded_image <= 2||loaded_image
+                     AND ('1'||loaded_image <> '0'||loaded_image) IS TRUE
+                     AND ('1'||loaded_image = '0'||loaded_image) IS NOT TRUE
+                     AND ('1'||loaded_image = '0'||loaded_image) IS FALSE
+                     AND ('1'||loaded_image <> '0'||loaded_image) IS NOT FALSE
+                     AND '1'||loaded_image BETWEEN '0'||loaded_image AND 2||loaded_image
+                     AND '1'||loaded_image NOT BETWEEN '1'||loaded_image AND '0'||loaded_image
+                     AND '1'||loaded_image like '%'
+                     AND '1'||loaded_image not like '__DOES_NOT_EXIST__%'
+                     AND '1'||loaded_image IN ('0'||loaded_image,
+                                               1||loaded_image,
+                                               2||loaded_image)
+                     AND '1'||loaded_image NOT IN ('0'||loaded_image,
+                                                   2||loaded_image)))));
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM
+  (SELECT __time, number, client_ip,
+                          '1'||loaded_image,
+                          count(*)
+   FROM kttm_nested
+   WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+     AND ('1'||loaded_image IS NULL
+          OR ('1'||loaded_image = 1||loaded_image
+              AND '1'||loaded_image IS NOT DISTINCT
+              FROM 1||loaded_image
+              AND '1'||loaded_image <> '0'||loaded_image
+              AND ('1'||loaded_image IS DISTINCT
+                   FROM '0'||loaded_image)
+              AND '1'||loaded_image > '0'||loaded_image
+              AND '1'||loaded_image >= '0'||loaded_image
+              AND '1'||loaded_image < 2||loaded_image
+              AND '1'||loaded_image <= 2||loaded_image
+              AND ('1'||loaded_image <> '0'||loaded_image) IS TRUE
+              AND ('1'||loaded_image = '0'||loaded_image) IS NOT TRUE
+              AND ('1'||loaded_image = '0'||loaded_image) IS FALSE
+              AND ('1'||loaded_image <> '0'||loaded_image) IS NOT FALSE
+              AND '1'||loaded_image BETWEEN '0'||loaded_image AND 2||loaded_image
+              AND '1'||loaded_image NOT BETWEEN '1'||loaded_image AND '0'||loaded_image
+              AND '1'||loaded_image like '%'
+              AND '1'||loaded_image not like '__DOES_NOT_EXIST__%'
+              AND '1'||loaded_image IN ('0'||loaded_image,
+                                        1||loaded_image,
+                                        2||loaded_image)
+              AND '1'||loaded_image NOT IN ('0'||loaded_image,
+                                            2||loaded_image)))
+   GROUP BY 1,
+            2,
+            3,
+            4);
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+#-------------------------------------------------------------------------
+# TEST_ID: A2: ||
+#-------------------------------------------------------------------------
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND ('1'||loaded_image||loaded_image IS NULL
+       OR ('1'||loaded_image||loaded_image = 1||loaded_image||loaded_image
+           AND '1'||loaded_image||loaded_image IS NOT DISTINCT
+           FROM 1||loaded_image||loaded_image
+           AND '1'||loaded_image||loaded_image <> '0'||loaded_image||loaded_image
+           AND ('1'||loaded_image||loaded_image IS DISTINCT
+                FROM '0'||loaded_image||loaded_image)
+           AND '1'||loaded_image||loaded_image > '0'||loaded_image||loaded_image
+           AND '1'||loaded_image||loaded_image >= '0'||loaded_image||loaded_image
+           AND '1'||loaded_image||loaded_image < 2||loaded_image||loaded_image
+           AND '1'||loaded_image||loaded_image <= 2||loaded_image||loaded_image
+           AND ('1'||loaded_image||loaded_image <> '0'||loaded_image||loaded_image) IS TRUE
+           AND ('1'||loaded_image||loaded_image = '0'||loaded_image||loaded_image) IS NOT TRUE
+           AND ('1'||loaded_image||loaded_image = '0'||loaded_image||loaded_image) IS FALSE
+           AND ('1'||loaded_image||loaded_image <> '0'||loaded_image||loaded_image) IS NOT FALSE
+           AND '1'||loaded_image||loaded_image BETWEEN '0'||loaded_image||loaded_image AND 2||loaded_image||loaded_image
+           AND '1'||loaded_image||loaded_image NOT BETWEEN '1'||loaded_image||loaded_image AND '0'||loaded_image||loaded_image
+           AND '1'||loaded_image||loaded_image like '%'
+           AND '1'||loaded_image||loaded_image not like '__DOES_NOT_EXIST__%'
+           AND '1'||loaded_image||loaded_image IN ('0'||loaded_image||loaded_image,
+                                                   1||loaded_image||loaded_image,
+                                                   2||loaded_image||loaded_image)
+           AND '1'||loaded_image||loaded_image NOT IN ('0'||loaded_image||loaded_image,
+                                                       2||loaded_image||loaded_image))) ;
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND ('1'||loaded_image||loaded_image IS NULL
+       OR '1'||loaded_image||loaded_image IN
+         (SELECT '1'||loaded_image||loaded_image
+          FROM kttm_nested
+          WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+            AND ('1'||loaded_image||loaded_image IS NULL
+                 OR ('1'||loaded_image||loaded_image = 1||loaded_image||loaded_image
+                     AND '1'||loaded_image||loaded_image IS NOT DISTINCT
+                     FROM 1||loaded_image||loaded_image
+                     AND '1'||loaded_image||loaded_image <> '0'||loaded_image||loaded_image
+                     AND ('1'||loaded_image||loaded_image IS DISTINCT
+                          FROM '0'||loaded_image||loaded_image)
+                     AND '1'||loaded_image||loaded_image > '0'||loaded_image||loaded_image
+                     AND '1'||loaded_image||loaded_image >= '0'||loaded_image||loaded_image
+                     AND '1'||loaded_image||loaded_image < 2||loaded_image||loaded_image
+                     AND '1'||loaded_image||loaded_image <= 2||loaded_image||loaded_image
+                     AND ('1'||loaded_image||loaded_image <> '0'||loaded_image||loaded_image) IS TRUE
+                     AND ('1'||loaded_image||loaded_image = '0'||loaded_image||loaded_image) IS NOT TRUE
+                     AND ('1'||loaded_image||loaded_image = '0'||loaded_image||loaded_image) IS FALSE
+                     AND ('1'||loaded_image||loaded_image <> '0'||loaded_image||loaded_image) IS NOT FALSE
+                     AND '1'||loaded_image||loaded_image BETWEEN '0'||loaded_image||loaded_image AND 2||loaded_image||loaded_image
+                     AND '1'||loaded_image||loaded_image NOT BETWEEN '1'||loaded_image||loaded_image AND '0'||loaded_image||loaded_image
+                     AND '1'||loaded_image||loaded_image like '%'
+                     AND '1'||loaded_image||loaded_image not like '__DOES_NOT_EXIST__%'
+                     AND '1'||loaded_image||loaded_image IN ('0'||loaded_image||loaded_image,
+                                                             1||loaded_image||loaded_image,
+                                                             2||loaded_image||loaded_image)
+                     AND '1'||loaded_image||loaded_image NOT IN ('0'||loaded_image||loaded_image,
+                                                                 2||loaded_image||loaded_image)))));
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM
+  (SELECT __time, number, client_ip,
+                          '1'||loaded_image||loaded_image,
+                          count(*)
+   FROM kttm_nested
+   WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+     AND ('1'||loaded_image||loaded_image IS NULL
+          OR ('1'||loaded_image||loaded_image = 1||loaded_image||loaded_image
+              AND '1'||loaded_image||loaded_image IS NOT DISTINCT
+              FROM 1||loaded_image||loaded_image
+              AND '1'||loaded_image||loaded_image <> '0'||loaded_image||loaded_image
+              AND ('1'||loaded_image||loaded_image IS DISTINCT
+                   FROM '0'||loaded_image||loaded_image)
+              AND '1'||loaded_image||loaded_image > '0'||loaded_image||loaded_image
+              AND '1'||loaded_image||loaded_image >= '0'||loaded_image||loaded_image
+              AND '1'||loaded_image||loaded_image < 2||loaded_image||loaded_image
+              AND '1'||loaded_image||loaded_image <= 2||loaded_image||loaded_image
+              AND ('1'||loaded_image||loaded_image <> '0'||loaded_image||loaded_image) IS TRUE
+              AND ('1'||loaded_image||loaded_image = '0'||loaded_image||loaded_image) IS NOT TRUE
+              AND ('1'||loaded_image||loaded_image = '0'||loaded_image||loaded_image) IS FALSE
+              AND ('1'||loaded_image||loaded_image <> '0'||loaded_image||loaded_image) IS NOT FALSE
+              AND '1'||loaded_image||loaded_image BETWEEN '0'||loaded_image||loaded_image AND 2||loaded_image||loaded_image
+              AND '1'||loaded_image||loaded_image NOT BETWEEN '1'||loaded_image||loaded_image AND '0'||loaded_image||loaded_image
+              AND '1'||loaded_image||loaded_image like '%'
+              AND '1'||loaded_image||loaded_image not like '__DOES_NOT_EXIST__%'
+              AND '1'||loaded_image||loaded_image IN ('0'||loaded_image||loaded_image,
+                                                      1||loaded_image||loaded_image,
+                                                      2||loaded_image||loaded_image)
+              AND '1'||loaded_image||loaded_image NOT IN ('0'||loaded_image||loaded_image,
+                                                          2||loaded_image||loaded_image)))
+   GROUP BY 1,
+            2,
+            3,
+            4);
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+#-------------------------------------------------------------------------
+# TEST_ID: A3: concat
+#-------------------------------------------------------------------------
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND (concat('1', loaded_image, loaded_image) IS NULL
+       OR (concat('1', loaded_image, loaded_image) = concat('1', loaded_image, loaded_image)
+           AND concat('1', loaded_image, loaded_image) IS NOT DISTINCT
+           FROM concat('1', loaded_image, loaded_image)
+           AND concat('1', loaded_image, loaded_image) <> concat('0', loaded_image, loaded_image)
+           AND (concat('1', loaded_image, loaded_image) IS DISTINCT
+                FROM concat('0', loaded_image, loaded_image))
+           AND concat('1', loaded_image, loaded_image) > concat('0', loaded_image, loaded_image)
+           AND concat('1', loaded_image, loaded_image) >= concat('0', loaded_image, loaded_image)
+           AND concat('1', loaded_image, loaded_image) < concat('2', loaded_image, loaded_image)
+           AND concat('1', loaded_image, loaded_image) <= concat('2', loaded_image, loaded_image)
+           AND (concat('1', loaded_image, loaded_image) <> concat('0', loaded_image, loaded_image)) IS TRUE
+           AND (concat('1', loaded_image, loaded_image) = concat('0', loaded_image, loaded_image)) IS NOT TRUE
+           AND (concat('1', loaded_image, loaded_image) = concat('0', loaded_image, loaded_image)) IS FALSE
+           AND (concat('1', loaded_image, loaded_image) <> concat('0', loaded_image, loaded_image)) IS NOT FALSE
+           AND concat('1', loaded_image, loaded_image) BETWEEN concat('0', loaded_image, loaded_image) AND concat('2', loaded_image, loaded_image)
+           AND concat('1', loaded_image, loaded_image) NOT BETWEEN concat('1', loaded_image, loaded_image) AND concat('0', loaded_image, loaded_image)
+           AND concat('1', loaded_image, loaded_image) like '%'
+           AND concat('1', loaded_image, loaded_image) not like '__DOES_NOT_EXIST__%'
+           AND concat('1', loaded_image, loaded_image) IN (concat('0', loaded_image, loaded_image),
+                                                           concat('1', loaded_image, loaded_image),
+                                                           concat('2', loaded_image, loaded_image))
+           AND concat('1', loaded_image, loaded_image) NOT IN (concat('0', loaded_image, loaded_image),
+                                                               concat('2', loaded_image, loaded_image)))) ;
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND (concat('1', loaded_image, loaded_image) IS NULL
+       OR concat('1', loaded_image, loaded_image) IN
+         (SELECT concat('1', loaded_image, loaded_image)
+          FROM kttm_nested
+          WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+            AND (concat('1', loaded_image, loaded_image) IS NULL
+                 OR (concat('1', loaded_image, loaded_image) = concat('1', loaded_image, loaded_image)
+                     AND concat('1', loaded_image, loaded_image) IS NOT DISTINCT
+                     FROM concat('1', loaded_image, loaded_image)
+                     AND concat('1', loaded_image, loaded_image) <> concat('0', loaded_image, loaded_image)
+                     AND (concat('1', loaded_image, loaded_image) IS DISTINCT
+                          FROM concat('0', loaded_image, loaded_image))
+                     AND concat('1', loaded_image, loaded_image) > concat('0', loaded_image, loaded_image)
+                     AND concat('1', loaded_image, loaded_image) >= concat('0', loaded_image, loaded_image)
+                     AND concat('1', loaded_image, loaded_image) < concat('2', loaded_image, loaded_image)
+                     AND concat('1', loaded_image, loaded_image) <= concat('2', loaded_image, loaded_image)
+                     AND (concat('1', loaded_image, loaded_image) <> concat('0', loaded_image, loaded_image)) IS TRUE
+                     AND (concat('1', loaded_image, loaded_image) = concat('0', loaded_image, loaded_image)) IS NOT TRUE
+                     AND (concat('1', loaded_image, loaded_image) = concat('0', loaded_image, loaded_image)) IS FALSE
+                     AND (concat('1', loaded_image, loaded_image) <> concat('0', loaded_image, loaded_image)) IS NOT FALSE
+                     AND concat('1', loaded_image, loaded_image) BETWEEN concat('0', loaded_image, loaded_image) AND concat('2', loaded_image, loaded_image)
+                     AND concat('1', loaded_image, loaded_image) NOT BETWEEN concat('1', loaded_image, loaded_image) AND concat('0', loaded_image, loaded_image)
+                     AND concat('1', loaded_image, loaded_image) like '%'
+                     AND concat('1', loaded_image, loaded_image) not like '__DOES_NOT_EXIST__%'
+                     AND concat('1', loaded_image, loaded_image) IN (concat('0', loaded_image, loaded_image),
+                                                                     concat('1', loaded_image, loaded_image),
+                                                                     concat('2', loaded_image, loaded_image))
+                     AND concat('1', loaded_image, loaded_image) NOT IN (concat('0', loaded_image, loaded_image),
+                                                                         concat('2', loaded_image, loaded_image))))));
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM
+  (SELECT __time, number, client_ip,
+                          concat('1', loaded_image, loaded_image),
+                          count(*)
+   FROM kttm_nested
+   WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+     AND (concat('1', loaded_image, loaded_image) IS NULL
+          OR (concat('1', loaded_image, loaded_image) = concat('1', loaded_image, loaded_image)
+              AND concat('1', loaded_image, loaded_image) IS NOT DISTINCT
+              FROM concat('1', loaded_image, loaded_image)
+              AND concat('1', loaded_image, loaded_image) <> concat('0', loaded_image, loaded_image)
+              AND (concat('1', loaded_image, loaded_image) IS DISTINCT
+                   FROM concat('0', loaded_image, loaded_image))
+              AND concat('1', loaded_image, loaded_image) > concat('0', loaded_image, loaded_image)
+              AND concat('1', loaded_image, loaded_image) >= concat('0', loaded_image, loaded_image)
+              AND concat('1', loaded_image, loaded_image) < concat('2', loaded_image, loaded_image)
+              AND concat('1', loaded_image, loaded_image) <= concat('2', loaded_image, loaded_image)
+              AND (concat('1', loaded_image, loaded_image) <> concat('0', loaded_image, loaded_image)) IS TRUE
+              AND (concat('1', loaded_image, loaded_image) = concat('0', loaded_image, loaded_image)) IS NOT TRUE
+              AND (concat('1', loaded_image, loaded_image) = concat('0', loaded_image, loaded_image)) IS FALSE
+              AND (concat('1', loaded_image, loaded_image) <> concat('0', loaded_image, loaded_image)) IS NOT FALSE
+              AND concat('1', loaded_image, loaded_image) BETWEEN concat('0', loaded_image, loaded_image) AND concat('2', loaded_image, loaded_image)
+              AND concat('1', loaded_image, loaded_image) NOT BETWEEN concat('1', loaded_image, loaded_image) AND concat('0', loaded_image, loaded_image)
+              AND concat('1', loaded_image, loaded_image) like '%'
+              AND concat('1', loaded_image, loaded_image) not like '__DOES_NOT_EXIST__%'
+              AND concat('1', loaded_image, loaded_image) IN (concat('0', loaded_image, loaded_image),
+                                                              concat('1', loaded_image, loaded_image),
+                                                              concat('2', loaded_image, loaded_image))
+              AND concat('1', loaded_image, loaded_image) NOT IN (concat('0', loaded_image, loaded_image),
+                                                                  concat('2', loaded_image, loaded_image))))
+   GROUP BY 1,
+            2,
+            3,
+            4);
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+#-------------------------------------------------------------------------
+# TEST_ID: A4: textcat
+#-------------------------------------------------------------------------
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND (textcat('1', loaded_image) IS NULL
+       OR (textcat('1', loaded_image) = textcat('1', loaded_image)
+           AND textcat('1', loaded_image) IS NOT DISTINCT
+           FROM textcat('1', loaded_image)
+           AND textcat('1', loaded_image) <> textcat('0', loaded_image)
+           AND (textcat('1', loaded_image) IS DISTINCT
+                FROM textcat('0', loaded_image))
+           AND textcat('1', loaded_image) > textcat('0', loaded_image)
+           AND textcat('1', loaded_image) >= textcat('0', loaded_image)
+           AND textcat('1', loaded_image) < textcat('2', loaded_image)
+           AND textcat('1', loaded_image) <= textcat('2', loaded_image)
+           AND (textcat('1', loaded_image) <> textcat('0', loaded_image)) IS TRUE
+           AND (textcat('1', loaded_image) = textcat('0', loaded_image)) IS NOT TRUE
+           AND (textcat('1', loaded_image) = textcat('0', loaded_image)) IS FALSE
+           AND (textcat('1', loaded_image) <> textcat('0', loaded_image)) IS NOT FALSE
+           AND textcat('1', loaded_image) BETWEEN textcat('0', loaded_image) AND textcat('2', loaded_image)
+           AND textcat('1', loaded_image) NOT BETWEEN textcat('1', loaded_image) AND textcat('0', loaded_image)
+           AND textcat('1', loaded_image) like '%'
+           AND textcat('1', loaded_image) not like '__DOES_NOT_EXIST__%'
+           AND textcat('1', loaded_image) IN (textcat('0', loaded_image),
+                                              textcat('1', loaded_image),
+                                              textcat('2', loaded_image))
+           AND textcat('1', loaded_image) NOT IN (textcat('0', loaded_image),
+                                                  textcat('2', loaded_image)))) ;
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND (textcat('1', loaded_image) IS NULL
+       OR textcat('1', loaded_image) IN
+         (SELECT textcat('1', loaded_image)
+          FROM kttm_nested
+          WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+            AND (textcat('1', loaded_image) IS NULL
+                 OR (textcat('1', loaded_image) = textcat('1', loaded_image)
+                     AND textcat('1', loaded_image) IS NOT DISTINCT
+                     FROM textcat('1', loaded_image)
+                     AND textcat('1', loaded_image) <> textcat('0', loaded_image)
+                     AND (textcat('1', loaded_image) IS DISTINCT
+                          FROM textcat('0', loaded_image))
+                     AND textcat('1', loaded_image) > textcat('0', loaded_image)
+                     AND textcat('1', loaded_image) >= textcat('0', loaded_image)
+                     AND textcat('1', loaded_image) < textcat('2', loaded_image)
+                     AND textcat('1', loaded_image) <= textcat('2', loaded_image)
+                     AND (textcat('1', loaded_image) <> textcat('0', loaded_image)) IS TRUE
+                     AND (textcat('1', loaded_image) = textcat('0', loaded_image)) IS NOT TRUE
+                     AND (textcat('1', loaded_image) = textcat('0', loaded_image)) IS FALSE
+                     AND (textcat('1', loaded_image) <> textcat('0', loaded_image)) IS NOT FALSE
+                     AND textcat('1', loaded_image) BETWEEN textcat('0', loaded_image) AND textcat('2', loaded_image)
+                     AND textcat('1', loaded_image) NOT BETWEEN textcat('1', loaded_image) AND textcat('0', loaded_image)
+                     AND textcat('1', loaded_image) like '%'
+                     AND textcat('1', loaded_image) not like '__DOES_NOT_EXIST__%'
+                     AND textcat('1', loaded_image) IN (textcat('0', loaded_image),
+                                                        textcat('1', loaded_image),
+                                                        textcat('2', loaded_image))
+                     AND textcat('1', loaded_image) NOT IN (textcat('0', loaded_image),
+                                                            textcat('2', loaded_image))))));
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM
+  (SELECT __time, number, client_ip,
+                          textcat('1', loaded_image),
+                          count(*)
+   FROM kttm_nested
+   WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+     AND (textcat('1', loaded_image) IS NULL
+          OR (textcat('1', loaded_image) = textcat('1', loaded_image)
+              AND textcat('1', loaded_image) IS NOT DISTINCT
+              FROM textcat('1', loaded_image)
+              AND textcat('1', loaded_image) <> textcat('0', loaded_image)
+              AND (textcat('1', loaded_image) IS DISTINCT
+                   FROM textcat('0', loaded_image))
+              AND textcat('1', loaded_image) > textcat('0', loaded_image)
+              AND textcat('1', loaded_image) >= textcat('0', loaded_image)
+              AND textcat('1', loaded_image) < textcat('2', loaded_image)
+              AND textcat('1', loaded_image) <= textcat('2', loaded_image)
+              AND (textcat('1', loaded_image) <> textcat('0', loaded_image)) IS TRUE
+              AND (textcat('1', loaded_image) = textcat('0', loaded_image)) IS NOT TRUE
+              AND (textcat('1', loaded_image) = textcat('0', loaded_image)) IS FALSE
+              AND (textcat('1', loaded_image) <> textcat('0', loaded_image)) IS NOT FALSE
+              AND textcat('1', loaded_image) BETWEEN textcat('0', loaded_image) AND textcat('2', loaded_image)
+              AND textcat('1', loaded_image) NOT BETWEEN textcat('1', loaded_image) AND textcat('0', loaded_image)
+              AND textcat('1', loaded_image) like '%'
+              AND textcat('1', loaded_image) not like '__DOES_NOT_EXIST__%'
+              AND textcat('1', loaded_image) IN (textcat('0', loaded_image),
+                                                 textcat('1', loaded_image),
+                                                 textcat('2', loaded_image))
+              AND textcat('1', loaded_image) NOT IN (textcat('0', loaded_image),
+                                                     textcat('2', loaded_image))))
+   GROUP BY 1,
+            2,
+            3,
+            4);
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+#-------------------------------------------------------------------------
+# TEST_ID: A5: string_format
+#-------------------------------------------------------------------------
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND (string_format('1 %s', loaded_image) IS NULL
+       OR (string_format('1 %s', loaded_image) = string_format('1 %s', loaded_image)
+           AND string_format('1 %s', loaded_image) IS NOT DISTINCT
+           FROM string_format('1 %s', loaded_image)
+           AND string_format('1 %s', loaded_image) <> string_format('0 %s', loaded_image)
+           AND (string_format('1 %s', loaded_image) IS DISTINCT
+                FROM string_format('0 %s', loaded_image))
+           AND string_format('1 %s', loaded_image) > string_format('0 %s', loaded_image)
+           AND string_format('1 %s', loaded_image) >= string_format('0 %s', loaded_image)
+           AND string_format('1 %s', loaded_image) < string_format('2 %s', loaded_image)
+           AND string_format('1 %s', loaded_image) <= string_format('2 %s', loaded_image)
+           AND (string_format('1 %s', loaded_image) <> string_format('0 %s', loaded_image)) IS TRUE
+           AND (string_format('1 %s', loaded_image) = string_format('0 %s', loaded_image)) IS NOT TRUE
+           AND (string_format('1 %s', loaded_image) = string_format('0 %s', loaded_image)) IS FALSE
+           AND (string_format('1 %s', loaded_image) <> string_format('0 %s', loaded_image)) IS NOT FALSE
+           AND string_format('1 %s', loaded_image) BETWEEN string_format('0 %s', loaded_image) AND string_format('2 %s', loaded_image)
+           AND string_format('1 %s', loaded_image) NOT BETWEEN string_format('1 %s', loaded_image) AND string_format('0 %s', loaded_image)
+           AND string_format('1 %s', loaded_image) like '%'
+           AND string_format('1 %s', loaded_image) not like '__DOES_NOT_EXIST__%'
+           AND string_format('1 %s', loaded_image) IN (string_format('0 %s', loaded_image),
+                                                       string_format('1 %s', loaded_image),
+                                                       string_format('2 %s', loaded_image))
+           AND string_format('1 %s', loaded_image) NOT IN (string_format('0 %s', loaded_image),
+                                                           string_format('2 %s', loaded_image)))) ;
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND (string_format('1 %s', loaded_image) IS NULL
+       OR string_format('1 %s', loaded_image) IN
+         (SELECT string_format('1 %s', loaded_image)
+          FROM kttm_nested
+          WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+            AND (string_format('1 %s', loaded_image) IS NULL
+                 OR (string_format('1 %s', loaded_image) = string_format('1 %s', loaded_image)
+                     AND string_format('1 %s', loaded_image) IS NOT DISTINCT
+                     FROM string_format('1 %s', loaded_image)
+                     AND string_format('1 %s', loaded_image) <> string_format('0 %s', loaded_image)
+                     AND (string_format('1 %s', loaded_image) IS DISTINCT
+                          FROM string_format('0 %s', loaded_image))
+                     AND string_format('1 %s', loaded_image) > string_format('0 %s', loaded_image)
+                     AND string_format('1 %s', loaded_image) >= string_format('0 %s', loaded_image)
+                     AND string_format('1 %s', loaded_image) < string_format('2 %s', loaded_image)
+                     AND string_format('1 %s', loaded_image) <= string_format('2 %s', loaded_image)
+                     AND (string_format('1 %s', loaded_image) <> string_format('0 %s', loaded_image)) IS TRUE
+                     AND (string_format('1 %s', loaded_image) = string_format('0 %s', loaded_image)) IS NOT TRUE
+                     AND (string_format('1 %s', loaded_image) = string_format('0 %s', loaded_image)) IS FALSE
+                     AND (string_format('1 %s', loaded_image) <> string_format('0 %s', loaded_image)) IS NOT FALSE
+                     AND string_format('1 %s', loaded_image) BETWEEN string_format('0 %s', loaded_image) AND string_format('2 %s', loaded_image)
+                     AND string_format('1 %s', loaded_image) NOT BETWEEN string_format('1 %s', loaded_image) AND string_format('0 %s', loaded_image)
+                     AND string_format('1 %s', loaded_image) like '%'
+                     AND string_format('1 %s', loaded_image) not like '__DOES_NOT_EXIST__%'
+                     AND string_format('1 %s', loaded_image) IN (string_format('0 %s', loaded_image),
+                                                                 string_format('1 %s', loaded_image),
+                                                                 string_format('2 %s', loaded_image))
+                     AND string_format('1 %s', loaded_image) NOT IN (string_format('0 %s', loaded_image),
+                                                                     string_format('2 %s', loaded_image))))));
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM
+  (SELECT __time, number, client_ip,
+                          string_format('1 %s', loaded_image),
+                          count(*)
+   FROM kttm_nested
+   WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+     AND (string_format('1 %s', loaded_image) IS NULL
+          OR (string_format('1 %s', loaded_image) = string_format('1 %s', loaded_image)
+              AND string_format('1 %s', loaded_image) IS NOT DISTINCT
+              FROM string_format('1 %s', loaded_image)
+              AND string_format('1 %s', loaded_image) <> string_format('0 %s', loaded_image)
+              AND (string_format('1 %s', loaded_image) IS DISTINCT
+                   FROM string_format('0 %s', loaded_image))
+              AND string_format('1 %s', loaded_image) > string_format('0 %s', loaded_image)
+              AND string_format('1 %s', loaded_image) >= string_format('0 %s', loaded_image)
+              AND string_format('1 %s', loaded_image) < string_format('2 %s', loaded_image)
+              AND string_format('1 %s', loaded_image) <= string_format('2 %s', loaded_image)
+              AND (string_format('1 %s', loaded_image) <> string_format('0 %s', loaded_image)) IS TRUE
+              AND (string_format('1 %s', loaded_image) = string_format('0 %s', loaded_image)) IS NOT TRUE
+              AND (string_format('1 %s', loaded_image) = string_format('0 %s', loaded_image)) IS FALSE
+              AND (string_format('1 %s', loaded_image) <> string_format('0 %s', loaded_image)) IS NOT FALSE
+              AND string_format('1 %s', loaded_image) BETWEEN string_format('0 %s', loaded_image) AND string_format('2 %s', loaded_image)
+              AND string_format('1 %s', loaded_image) NOT BETWEEN string_format('1 %s', loaded_image) AND string_format('0 %s', loaded_image)
+              AND string_format('1 %s', loaded_image) like '%'
+              AND string_format('1 %s', loaded_image) not like '__DOES_NOT_EXIST__%'
+              AND string_format('1 %s', loaded_image) IN (string_format('0 %s', loaded_image),
+                                                          string_format('1 %s', loaded_image),
+                                                          string_format('2 %s', loaded_image))
+              AND string_format('1 %s', loaded_image) NOT IN (string_format('0 %s', loaded_image),
+                                                              string_format('2 %s', loaded_image))))
+   GROUP BY 1,
+            2,
+            3,
+            4);
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+#-------------------------------------------------------------------------
+# TEST_ID: A6: length
+#-------------------------------------------------------------------------
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND ('1'||length(loaded_image) IS NULL
+       OR ('1'||length(loaded_image) = 1||length(loaded_image)
+           AND '1'||length(loaded_image) IS NOT DISTINCT
+           FROM 1||length(loaded_image)
+           AND '1'||length(loaded_image) <> '0'||length(loaded_image)
+           AND ('1'||length(loaded_image) IS DISTINCT
+                FROM '0'||length(loaded_image))
+           AND '1'||length(loaded_image) > '0'||length(loaded_image)
+           AND '1'||length(loaded_image) >= '0'||length(loaded_image)
+           AND '1'||length(loaded_image) < 2||length(loaded_image)
+           AND '1'||length(loaded_image) <= 2||length(loaded_image)
+           AND ('1'||length(loaded_image) <> '0'||length(loaded_image)) IS TRUE
+           AND ('1'||length(loaded_image) = '0'||length(loaded_image)) IS NOT TRUE
+           AND ('1'||length(loaded_image) = '0'||length(loaded_image)) IS FALSE
+           AND ('1'||length(loaded_image) <> '0'||length(loaded_image)) IS NOT FALSE
+           AND '1'||length(loaded_image) BETWEEN '0'||length(loaded_image) AND 2||length(loaded_image)
+           AND '1'||length(loaded_image) NOT BETWEEN '1'||length(loaded_image) AND '0'||length(loaded_image)
+           AND '1'||length(loaded_image) like '%'
+           AND '1'||length(loaded_image) not like '__DOES_NOT_EXIST__%'
+           AND '1'||length(loaded_image) IN ('0'||length(loaded_image),
+                                             1||length(loaded_image),
+                                             2||length(loaded_image))
+           AND '1'||length(loaded_image) NOT IN ('0'||length(loaded_image),
+                                                 2||length(loaded_image)))) ;
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND ('1'||length(loaded_image) IS NULL
+       OR '1'||length(loaded_image) IN
+         (SELECT '1'||length(loaded_image)
+          FROM kttm_nested
+          WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+            AND ('1'||length(loaded_image) IS NULL
+                 OR ('1'||length(loaded_image) = 1||length(loaded_image)
+                     AND '1'||length(loaded_image) IS NOT DISTINCT
+                     FROM 1||length(loaded_image)
+                     AND '1'||length(loaded_image) <> '0'||length(loaded_image)
+                     AND ('1'||length(loaded_image) IS DISTINCT
+                          FROM '0'||length(loaded_image))
+                     AND '1'||length(loaded_image) > '0'||length(loaded_image)
+                     AND '1'||length(loaded_image) >= '0'||length(loaded_image)
+                     AND '1'||length(loaded_image) < 2||length(loaded_image)
+                     AND '1'||length(loaded_image) <= 2||length(loaded_image)
+                     AND ('1'||length(loaded_image) <> '0'||length(loaded_image)) IS TRUE
+                     AND ('1'||length(loaded_image) = '0'||length(loaded_image)) IS NOT TRUE
+                     AND ('1'||length(loaded_image) = '0'||length(loaded_image)) IS FALSE
+                     AND ('1'||length(loaded_image) <> '0'||length(loaded_image)) IS NOT FALSE
+                     AND '1'||length(loaded_image) BETWEEN '0'||length(loaded_image) AND 2||length(loaded_image)
+                     AND '1'||length(loaded_image) NOT BETWEEN '1'||length(loaded_image) AND '0'||length(loaded_image)
+                     AND '1'||length(loaded_image) like '%'
+                     AND '1'||length(loaded_image) not like '__DOES_NOT_EXIST__%'
+                     AND '1'||length(loaded_image) IN ('0'||length(loaded_image),
+                                                       1||length(loaded_image),
+                                                       2||length(loaded_image))
+                     AND '1'||length(loaded_image) NOT IN ('0'||length(loaded_image),
+                                                           2||length(loaded_image))))));
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM
+  (SELECT __time, number, client_ip,
+                          '1'||length(loaded_image),
+                          count(*)
+   FROM kttm_nested
+   WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+     AND ('1'||length(loaded_image) IS NULL
+          OR ('1'||length(loaded_image) = 1||length(loaded_image)
+              AND '1'||length(loaded_image) IS NOT DISTINCT
+              FROM 1||length(loaded_image)
+              AND '1'||length(loaded_image) <> '0'||length(loaded_image)
+              AND ('1'||length(loaded_image) IS DISTINCT
+                   FROM '0'||length(loaded_image))
+              AND '1'||length(loaded_image) > '0'||length(loaded_image)
+              AND '1'||length(loaded_image) >= '0'||length(loaded_image)
+              AND '1'||length(loaded_image) < 2||length(loaded_image)
+              AND '1'||length(loaded_image) <= 2||length(loaded_image)
+              AND ('1'||length(loaded_image) <> '0'||length(loaded_image)) IS TRUE
+              AND ('1'||length(loaded_image) = '0'||length(loaded_image)) IS NOT TRUE
+              AND ('1'||length(loaded_image) = '0'||length(loaded_image)) IS FALSE
+              AND ('1'||length(loaded_image) <> '0'||length(loaded_image)) IS NOT FALSE
+              AND '1'||length(loaded_image) BETWEEN '0'||length(loaded_image) AND 2||length(loaded_image)
+              AND '1'||length(loaded_image) NOT BETWEEN '1'||length(loaded_image) AND '0'||length(loaded_image)
+              AND '1'||length(loaded_image) like '%'
+              AND '1'||length(loaded_image) not like '__DOES_NOT_EXIST__%'
+              AND '1'||length(loaded_image) IN ('0'||length(loaded_image),
+                                                1||length(loaded_image),
+                                                2||length(loaded_image))
+              AND '1'||length(loaded_image) NOT IN ('0'||length(loaded_image),
+                                                    2||length(loaded_image))))
+   GROUP BY 1,
+            2,
+            3,
+            4);
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+#-------------------------------------------------------------------------
+# TEST_ID: A7: char_length
+#-------------------------------------------------------------------------
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND ('1'||char_length(loaded_image) IS NULL
+       OR ('1'||char_length(loaded_image) = 1||char_length(loaded_image)
+           AND '1'||char_length(loaded_image) IS NOT DISTINCT
+           FROM 1||char_length(loaded_image)
+           AND '1'||char_length(loaded_image) <> '0'||char_length(loaded_image)
+           AND ('1'||char_length(loaded_image) IS DISTINCT
+                FROM '0'||char_length(loaded_image))
+           AND '1'||char_length(loaded_image) > '0'||char_length(loaded_image)
+           AND '1'||char_length(loaded_image) >= '0'||char_length(loaded_image)
+           AND '1'||char_length(loaded_image) < 2||char_length(loaded_image)
+           AND '1'||char_length(loaded_image) <= 2||char_length(loaded_image)
+           AND ('1'||char_length(loaded_image) <> '0'||char_length(loaded_image)) IS TRUE
+           AND ('1'||char_length(loaded_image) = '0'||char_length(loaded_image)) IS NOT TRUE
+           AND ('1'||char_length(loaded_image) = '0'||char_length(loaded_image)) IS FALSE
+           AND ('1'||char_length(loaded_image) <> '0'||char_length(loaded_image)) IS NOT FALSE
+           AND '1'||char_length(loaded_image) BETWEEN '0'||char_length(loaded_image) AND 2||char_length(loaded_image)
+           AND '1'||char_length(loaded_image) NOT BETWEEN '1'||char_length(loaded_image) AND '0'||char_length(loaded_image)
+           AND '1'||char_length(loaded_image) like '%'
+           AND '1'||char_length(loaded_image) not like '__DOES_NOT_EXIST__%'
+           AND '1'||char_length(loaded_image) IN ('0'||char_length(loaded_image),
+                                                  1||char_length(loaded_image),
+                                                  2||char_length(loaded_image))
+           AND '1'||char_length(loaded_image) NOT IN ('0'||char_length(loaded_image),
+                                                      2||char_length(loaded_image)))) ;
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND ('1'||char_length(loaded_image) IS NULL
+       OR '1'||char_length(loaded_image) IN
+         (SELECT '1'||char_length(loaded_image)
+          FROM kttm_nested
+          WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+            AND ('1'||char_length(loaded_image) IS NULL
+                 OR ('1'||char_length(loaded_image) = 1||char_length(loaded_image)
+                     AND '1'||char_length(loaded_image) IS NOT DISTINCT
+                     FROM 1||char_length(loaded_image)
+                     AND '1'||char_length(loaded_image) <> '0'||char_length(loaded_image)
+                     AND ('1'||char_length(loaded_image) IS DISTINCT
+                          FROM '0'||char_length(loaded_image))
+                     AND '1'||char_length(loaded_image) > '0'||char_length(loaded_image)
+                     AND '1'||char_length(loaded_image) >= '0'||char_length(loaded_image)
+                     AND '1'||char_length(loaded_image) < 2||char_length(loaded_image)
+                     AND '1'||char_length(loaded_image) <= 2||char_length(loaded_image)
+                     AND ('1'||char_length(loaded_image) <> '0'||char_length(loaded_image)) IS TRUE
+                     AND ('1'||char_length(loaded_image) = '0'||char_length(loaded_image)) IS NOT TRUE
+                     AND ('1'||char_length(loaded_image) = '0'||char_length(loaded_image)) IS FALSE
+                     AND ('1'||char_length(loaded_image) <> '0'||char_length(loaded_image)) IS NOT FALSE
+                     AND '1'||char_length(loaded_image) BETWEEN '0'||char_length(loaded_image) AND 2||char_length(loaded_image)
+                     AND '1'||char_length(loaded_image) NOT BETWEEN '1'||char_length(loaded_image) AND '0'||char_length(loaded_image)
+                     AND '1'||char_length(loaded_image) like '%'
+                     AND '1'||char_length(loaded_image) not like '__DOES_NOT_EXIST__%'
+                     AND '1'||char_length(loaded_image) IN ('0'||char_length(loaded_image),
+                                                            1||char_length(loaded_image),
+                                                            2||char_length(loaded_image))
+                     AND '1'||char_length(loaded_image) NOT IN ('0'||char_length(loaded_image),
+                                                                2||char_length(loaded_image))))));
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM
+  (SELECT __time, number, client_ip,
+                          '1'||char_length(loaded_image),
+                          count(*)
+   FROM kttm_nested
+   WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+     AND ('1'||char_length(loaded_image) IS NULL
+          OR ('1'||char_length(loaded_image) = 1||char_length(loaded_image)
+              AND '1'||char_length(loaded_image) IS NOT DISTINCT
+              FROM 1||char_length(loaded_image)
+              AND '1'||char_length(loaded_image) <> '0'||char_length(loaded_image)
+              AND ('1'||char_length(loaded_image) IS DISTINCT
+                   FROM '0'||char_length(loaded_image))
+              AND '1'||char_length(loaded_image) > '0'||char_length(loaded_image)
+              AND '1'||char_length(loaded_image) >= '0'||char_length(loaded_image)
+              AND '1'||char_length(loaded_image) < 2||char_length(loaded_image)
+              AND '1'||char_length(loaded_image) <= 2||char_length(loaded_image)
+              AND ('1'||char_length(loaded_image) <> '0'||char_length(loaded_image)) IS TRUE
+              AND ('1'||char_length(loaded_image) = '0'||char_length(loaded_image)) IS NOT TRUE
+              AND ('1'||char_length(loaded_image) = '0'||char_length(loaded_image)) IS FALSE
+              AND ('1'||char_length(loaded_image) <> '0'||char_length(loaded_image)) IS NOT FALSE
+              AND '1'||char_length(loaded_image) BETWEEN '0'||char_length(loaded_image) AND 2||char_length(loaded_image)
+              AND '1'||char_length(loaded_image) NOT BETWEEN '1'||char_length(loaded_image) AND '0'||char_length(loaded_image)
+              AND '1'||char_length(loaded_image) like '%'
+              AND '1'||char_length(loaded_image) not like '__DOES_NOT_EXIST__%'
+              AND '1'||char_length(loaded_image) IN ('0'||char_length(loaded_image),
+                                                     1||char_length(loaded_image),
+                                                     2||char_length(loaded_image))
+              AND '1'||char_length(loaded_image) NOT IN ('0'||char_length(loaded_image),
+                                                         2||char_length(loaded_image))))
+   GROUP BY 1,
+            2,
+            3,
+            4);
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+#-------------------------------------------------------------------------
+# TEST_ID: A8: character_length
+#-------------------------------------------------------------------------
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND ('1'||character_length(loaded_image) IS NULL
+       OR ('1'||character_length(loaded_image) = 1||character_length(loaded_image)
+           AND '1'||character_length(loaded_image) IS NOT DISTINCT
+           FROM 1||character_length(loaded_image)
+           AND '1'||character_length(loaded_image) <> '0'||character_length(loaded_image)
+           AND ('1'||character_length(loaded_image) IS DISTINCT
+                FROM '0'||character_length(loaded_image))
+           AND '1'||character_length(loaded_image) > '0'||character_length(loaded_image)
+           AND '1'||character_length(loaded_image) >= '0'||character_length(loaded_image)
+           AND '1'||character_length(loaded_image) < 2||character_length(loaded_image)
+           AND '1'||character_length(loaded_image) <= 2||character_length(loaded_image)
+           AND ('1'||character_length(loaded_image) <> '0'||character_length(loaded_image)) IS TRUE
+           AND ('1'||character_length(loaded_image) = '0'||character_length(loaded_image)) IS NOT TRUE
+           AND ('1'||character_length(loaded_image) = '0'||character_length(loaded_image)) IS FALSE
+           AND ('1'||character_length(loaded_image) <> '0'||character_length(loaded_image)) IS NOT FALSE
+           AND '1'||character_length(loaded_image) BETWEEN '0'||character_length(loaded_image) AND 2||character_length(loaded_image)
+           AND '1'||character_length(loaded_image) NOT BETWEEN '1'||character_length(loaded_image) AND '0'||character_length(loaded_image)
+           AND '1'||character_length(loaded_image) like '%'
+           AND '1'||character_length(loaded_image) not like '__DOES_NOT_EXIST__%'
+           AND '1'||character_length(loaded_image) IN ('0'||character_length(loaded_image),
+                                                       1||character_length(loaded_image),
+                                                       2||character_length(loaded_image))
+           AND '1'||character_length(loaded_image) NOT IN ('0'||character_length(loaded_image),
+                                                           2||character_length(loaded_image)))) ;
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND ('1'||character_length(loaded_image) IS NULL
+       OR '1'||character_length(loaded_image) IN
+         (SELECT '1'||character_length(loaded_image)
+          FROM kttm_nested
+          WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+            AND ('1'||character_length(loaded_image) IS NULL
+                 OR ('1'||character_length(loaded_image) = 1||character_length(loaded_image)
+                     AND '1'||character_length(loaded_image) IS NOT DISTINCT
+                     FROM 1||character_length(loaded_image)
+                     AND '1'||character_length(loaded_image) <> '0'||character_length(loaded_image)
+                     AND ('1'||character_length(loaded_image) IS DISTINCT
+                          FROM '0'||character_length(loaded_image))
+                     AND '1'||character_length(loaded_image) > '0'||character_length(loaded_image)
+                     AND '1'||character_length(loaded_image) >= '0'||character_length(loaded_image)
+                     AND '1'||character_length(loaded_image) < 2||character_length(loaded_image)
+                     AND '1'||character_length(loaded_image) <= 2||character_length(loaded_image)
+                     AND ('1'||character_length(loaded_image) <> '0'||character_length(loaded_image)) IS TRUE
+                     AND ('1'||character_length(loaded_image) = '0'||character_length(loaded_image)) IS NOT TRUE
+                     AND ('1'||character_length(loaded_image) = '0'||character_length(loaded_image)) IS FALSE
+                     AND ('1'||character_length(loaded_image) <> '0'||character_length(loaded_image)) IS NOT FALSE
+                     AND '1'||character_length(loaded_image) BETWEEN '0'||character_length(loaded_image) AND 2||character_length(loaded_image)
+                     AND '1'||character_length(loaded_image) NOT BETWEEN '1'||character_length(loaded_image) AND '0'||character_length(loaded_image)
+                     AND '1'||character_length(loaded_image) like '%'
+                     AND '1'||character_length(loaded_image) not like '__DOES_NOT_EXIST__%'
+                     AND '1'||character_length(loaded_image) IN ('0'||character_length(loaded_image),
+                                                                 1||character_length(loaded_image),
+                                                                 2||character_length(loaded_image))
+                     AND '1'||character_length(loaded_image) NOT IN ('0'||character_length(loaded_image),
+                                                                     2||character_length(loaded_image))))));
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM
+  (SELECT __time, number, client_ip,
+                          '1'||character_length(loaded_image),
+                          count(*)
+   FROM kttm_nested
+   WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+     AND ('1'||character_length(loaded_image) IS NULL
+          OR ('1'||character_length(loaded_image) = 1||character_length(loaded_image)
+              AND '1'||character_length(loaded_image) IS NOT DISTINCT
+              FROM 1||character_length(loaded_image)
+              AND '1'||character_length(loaded_image) <> '0'||character_length(loaded_image)
+              AND ('1'||character_length(loaded_image) IS DISTINCT
+                   FROM '0'||character_length(loaded_image))
+              AND '1'||character_length(loaded_image) > '0'||character_length(loaded_image)
+              AND '1'||character_length(loaded_image) >= '0'||character_length(loaded_image)
+              AND '1'||character_length(loaded_image) < 2||character_length(loaded_image)
+              AND '1'||character_length(loaded_image) <= 2||character_length(loaded_image)
+              AND ('1'||character_length(loaded_image) <> '0'||character_length(loaded_image)) IS TRUE
+              AND ('1'||character_length(loaded_image) = '0'||character_length(loaded_image)) IS NOT TRUE
+              AND ('1'||character_length(loaded_image) = '0'||character_length(loaded_image)) IS FALSE
+              AND ('1'||character_length(loaded_image) <> '0'||character_length(loaded_image)) IS NOT FALSE
+              AND '1'||character_length(loaded_image) BETWEEN '0'||character_length(loaded_image) AND 2||character_length(loaded_image)
+              AND '1'||character_length(loaded_image) NOT BETWEEN '1'||character_length(loaded_image) AND '0'||character_length(loaded_image)
+              AND '1'||character_length(loaded_image) like '%'
+              AND '1'||character_length(loaded_image) not like '__DOES_NOT_EXIST__%'
+              AND '1'||character_length(loaded_image) IN ('0'||character_length(loaded_image),
+                                                          1||character_length(loaded_image),
+                                                          2||character_length(loaded_image))
+              AND '1'||character_length(loaded_image) NOT IN ('0'||character_length(loaded_image),
+                                                              2||character_length(loaded_image))))
+   GROUP BY 1,
+            2,
+            3,
+            4);
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+#-------------------------------------------------------------------------
+# TEST_ID: A9: strlen
+#-------------------------------------------------------------------------
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND ('1'||strlen(loaded_image) IS NULL
+       OR ('1'||strlen(loaded_image) = 1||strlen(loaded_image)
+           AND '1'||strlen(loaded_image) IS NOT DISTINCT
+           FROM 1||strlen(loaded_image)
+           AND '1'||strlen(loaded_image) <> '0'||strlen(loaded_image)
+           AND ('1'||strlen(loaded_image) IS DISTINCT
+                FROM '0'||strlen(loaded_image))
+           AND '1'||strlen(loaded_image) > '0'||strlen(loaded_image)
+           AND '1'||strlen(loaded_image) >= '0'||strlen(loaded_image)
+           AND '1'||strlen(loaded_image) < 2||strlen(loaded_image)
+           AND '1'||strlen(loaded_image) <= 2||strlen(loaded_image)
+           AND ('1'||strlen(loaded_image) <> '0'||strlen(loaded_image)) IS TRUE
+           AND ('1'||strlen(loaded_image) = '0'||strlen(loaded_image)) IS NOT TRUE
+           AND ('1'||strlen(loaded_image) = '0'||strlen(loaded_image)) IS FALSE
+           AND ('1'||strlen(loaded_image) <> '0'||strlen(loaded_image)) IS NOT FALSE
+           AND '1'||strlen(loaded_image) BETWEEN '0'||strlen(loaded_image) AND 2||strlen(loaded_image)
+           AND '1'||strlen(loaded_image) NOT BETWEEN '1'||strlen(loaded_image) AND '0'||strlen(loaded_image)
+           AND '1'||strlen(loaded_image) like '%'
+           AND '1'||strlen(loaded_image) not like '__DOES_NOT_EXIST__%'
+           AND '1'||strlen(loaded_image) IN ('0'||strlen(loaded_image),
+                                             1||strlen(loaded_image),
+                                             2||strlen(loaded_image))
+           AND '1'||strlen(loaded_image) NOT IN ('0'||strlen(loaded_image),
+                                                 2||strlen(loaded_image)))) ;
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND ('1'||strlen(loaded_image) IS NULL
+       OR '1'||strlen(loaded_image) IN
+         (SELECT '1'||strlen(loaded_image)
+          FROM kttm_nested
+          WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+            AND ('1'||strlen(loaded_image) IS NULL
+                 OR ('1'||strlen(loaded_image) = 1||strlen(loaded_image)
+                     AND '1'||strlen(loaded_image) IS NOT DISTINCT
+                     FROM 1||strlen(loaded_image)
+                     AND '1'||strlen(loaded_image) <> '0'||strlen(loaded_image)
+                     AND ('1'||strlen(loaded_image) IS DISTINCT
+                          FROM '0'||strlen(loaded_image))
+                     AND '1'||strlen(loaded_image) > '0'||strlen(loaded_image)
+                     AND '1'||strlen(loaded_image) >= '0'||strlen(loaded_image)
+                     AND '1'||strlen(loaded_image) < 2||strlen(loaded_image)
+                     AND '1'||strlen(loaded_image) <= 2||strlen(loaded_image)
+                     AND ('1'||strlen(loaded_image) <> '0'||strlen(loaded_image)) IS TRUE
+                     AND ('1'||strlen(loaded_image) = '0'||strlen(loaded_image)) IS NOT TRUE
+                     AND ('1'||strlen(loaded_image) = '0'||strlen(loaded_image)) IS FALSE
+                     AND ('1'||strlen(loaded_image) <> '0'||strlen(loaded_image)) IS NOT FALSE
+                     AND '1'||strlen(loaded_image) BETWEEN '0'||strlen(loaded_image) AND 2||strlen(loaded_image)
+                     AND '1'||strlen(loaded_image) NOT BETWEEN '1'||strlen(loaded_image) AND '0'||strlen(loaded_image)
+                     AND '1'||strlen(loaded_image) like '%'
+                     AND '1'||strlen(loaded_image) not like '__DOES_NOT_EXIST__%'
+                     AND '1'||strlen(loaded_image) IN ('0'||strlen(loaded_image),
+                                                       1||strlen(loaded_image),
+                                                       2||strlen(loaded_image))
+                     AND '1'||strlen(loaded_image) NOT IN ('0'||strlen(loaded_image),
+                                                           2||strlen(loaded_image))))));
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM
+  (SELECT __time, number, client_ip,
+                          '1'||strlen(loaded_image),
+                          count(*)
+   FROM kttm_nested
+   WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+     AND ('1'||strlen(loaded_image) IS NULL
+          OR ('1'||strlen(loaded_image) = 1||strlen(loaded_image)
+              AND '1'||strlen(loaded_image) IS NOT DISTINCT
+              FROM 1||strlen(loaded_image)
+              AND '1'||strlen(loaded_image) <> '0'||strlen(loaded_image)
+              AND ('1'||strlen(loaded_image) IS DISTINCT
+                   FROM '0'||strlen(loaded_image))
+              AND '1'||strlen(loaded_image) > '0'||strlen(loaded_image)
+              AND '1'||strlen(loaded_image) >= '0'||strlen(loaded_image)
+              AND '1'||strlen(loaded_image) < 2||strlen(loaded_image)
+              AND '1'||strlen(loaded_image) <= 2||strlen(loaded_image)
+              AND ('1'||strlen(loaded_image) <> '0'||strlen(loaded_image)) IS TRUE
+              AND ('1'||strlen(loaded_image) = '0'||strlen(loaded_image)) IS NOT TRUE
+              AND ('1'||strlen(loaded_image) = '0'||strlen(loaded_image)) IS FALSE
+              AND ('1'||strlen(loaded_image) <> '0'||strlen(loaded_image)) IS NOT FALSE
+              AND '1'||strlen(loaded_image) BETWEEN '0'||strlen(loaded_image) AND 2||strlen(loaded_image)
+              AND '1'||strlen(loaded_image) NOT BETWEEN '1'||strlen(loaded_image) AND '0'||strlen(loaded_image)
+              AND '1'||strlen(loaded_image) like '%'
+              AND '1'||strlen(loaded_image) not like '__DOES_NOT_EXIST__%'
+              AND '1'||strlen(loaded_image) IN ('0'||strlen(loaded_image),
+                                                1||strlen(loaded_image),
+                                                2||strlen(loaded_image))
+              AND '1'||strlen(loaded_image) NOT IN ('0'||strlen(loaded_image),
+                                                    2||strlen(loaded_image))))
+   GROUP BY 1,
+            2,
+            3,
+            4);
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+#-------------------------------------------------------------------------
+# TEST_ID: A10: lower
+#-------------------------------------------------------------------------
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND ('1'||lower(loaded_image) IS NULL
+       OR ('1'||lower(loaded_image) = 1||lower(loaded_image)
+           AND '1'||lower(loaded_image) IS NOT DISTINCT
+           FROM 1||lower(loaded_image)
+           AND '1'||lower(loaded_image) <> '0'||lower(loaded_image)
+           AND ('1'||lower(loaded_image) IS DISTINCT
+                FROM '0'||lower(loaded_image))
+           AND '1'||lower(loaded_image) > '0'||lower(loaded_image)
+           AND '1'||lower(loaded_image) >= '0'||lower(loaded_image)
+           AND '1'||lower(loaded_image) < 2||lower(loaded_image)
+           AND '1'||lower(loaded_image) <= 2||lower(loaded_image)
+           AND ('1'||lower(loaded_image) <> '0'||lower(loaded_image)) IS TRUE
+           AND ('1'||lower(loaded_image) = '0'||lower(loaded_image)) IS NOT TRUE
+           AND ('1'||lower(loaded_image) = '0'||lower(loaded_image)) IS FALSE
+           AND ('1'||lower(loaded_image) <> '0'||lower(loaded_image)) IS NOT FALSE
+           AND '1'||lower(loaded_image) BETWEEN '0'||lower(loaded_image) AND 2||lower(loaded_image)
+           AND '1'||lower(loaded_image) NOT BETWEEN '1'||lower(loaded_image) AND '0'||lower(loaded_image)
+           AND '1'||lower(loaded_image) like '%'
+           AND '1'||lower(loaded_image) not like '__DOES_NOT_EXIST__%'
+           AND '1'||lower(loaded_image) IN ('0'||lower(loaded_image),
+                                            1||lower(loaded_image),
+                                            2||lower(loaded_image))
+           AND '1'||lower(loaded_image) NOT IN ('0'||lower(loaded_image),
+                                                2||lower(loaded_image)))) ;
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND ('1'||lower(loaded_image) IS NULL
+       OR '1'||lower(loaded_image) IN
+         (SELECT '1'||lower(loaded_image)
+          FROM kttm_nested
+          WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+            AND ('1'||lower(loaded_image) IS NULL
+                 OR ('1'||lower(loaded_image) = 1||lower(loaded_image)
+                     AND '1'||lower(loaded_image) IS NOT DISTINCT
+                     FROM 1||lower(loaded_image)
+                     AND '1'||lower(loaded_image) <> '0'||lower(loaded_image)
+                     AND ('1'||lower(loaded_image) IS DISTINCT
+                          FROM '0'||lower(loaded_image))
+                     AND '1'||lower(loaded_image) > '0'||lower(loaded_image)
+                     AND '1'||lower(loaded_image) >= '0'||lower(loaded_image)
+                     AND '1'||lower(loaded_image) < 2||lower(loaded_image)
+                     AND '1'||lower(loaded_image) <= 2||lower(loaded_image)
+                     AND ('1'||lower(loaded_image) <> '0'||lower(loaded_image)) IS TRUE
+                     AND ('1'||lower(loaded_image) = '0'||lower(loaded_image)) IS NOT TRUE
+                     AND ('1'||lower(loaded_image) = '0'||lower(loaded_image)) IS FALSE
+                     AND ('1'||lower(loaded_image) <> '0'||lower(loaded_image)) IS NOT FALSE
+                     AND '1'||lower(loaded_image) BETWEEN '0'||lower(loaded_image) AND 2||lower(loaded_image)
+                     AND '1'||lower(loaded_image) NOT BETWEEN '1'||lower(loaded_image) AND '0'||lower(loaded_image)
+                     AND '1'||lower(loaded_image) like '%'
+                     AND '1'||lower(loaded_image) not like '__DOES_NOT_EXIST__%'
+                     AND '1'||lower(loaded_image) IN ('0'||lower(loaded_image),
+                                                      1||lower(loaded_image),
+                                                      2||lower(loaded_image))
+                     AND '1'||lower(loaded_image) NOT IN ('0'||lower(loaded_image),
+                                                          2||lower(loaded_image))))));
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM
+  (SELECT __time, number, client_ip,
+                          '1'||lower(loaded_image),
+                          count(*)
+   FROM kttm_nested
+   WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+     AND ('1'||lower(loaded_image) IS NULL
+          OR ('1'||lower(loaded_image) = 1||lower(loaded_image)
+              AND '1'||lower(loaded_image) IS NOT DISTINCT
+              FROM 1||lower(loaded_image)
+              AND '1'||lower(loaded_image) <> '0'||lower(loaded_image)
+              AND ('1'||lower(loaded_image) IS DISTINCT
+                   FROM '0'||lower(loaded_image))
+              AND '1'||lower(loaded_image) > '0'||lower(loaded_image)
+              AND '1'||lower(loaded_image) >= '0'||lower(loaded_image)
+              AND '1'||lower(loaded_image) < 2||lower(loaded_image)
+              AND '1'||lower(loaded_image) <= 2||lower(loaded_image)
+              AND ('1'||lower(loaded_image) <> '0'||lower(loaded_image)) IS TRUE
+              AND ('1'||lower(loaded_image) = '0'||lower(loaded_image)) IS NOT TRUE
+              AND ('1'||lower(loaded_image) = '0'||lower(loaded_image)) IS FALSE
+              AND ('1'||lower(loaded_image) <> '0'||lower(loaded_image)) IS NOT FALSE
+              AND '1'||lower(loaded_image) BETWEEN '0'||lower(loaded_image) AND 2||lower(loaded_image)
+              AND '1'||lower(loaded_image) NOT BETWEEN '1'||lower(loaded_image) AND '0'||lower(loaded_image)
+              AND '1'||lower(loaded_image) like '%'
+              AND '1'||lower(loaded_image) not like '__DOES_NOT_EXIST__%'
+              AND '1'||lower(loaded_image) IN ('0'||lower(loaded_image),
+                                               1||lower(loaded_image),
+                                               2||lower(loaded_image))
+              AND '1'||lower(loaded_image) NOT IN ('0'||lower(loaded_image),
+                                                   2||lower(loaded_image))))
+   GROUP BY 1,
+            2,
+            3,
+            4);
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+#-------------------------------------------------------------------------
+# TEST_ID: A11: upper
+#-------------------------------------------------------------------------
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND ('1'||upper(loaded_image) IS NULL
+       OR ('1'||upper(loaded_image) = 1||upper(loaded_image)
+           AND '1'||upper(loaded_image) IS NOT DISTINCT
+           FROM 1||upper(loaded_image)
+           AND '1'||upper(loaded_image) <> '0'||upper(loaded_image)
+           AND ('1'||upper(loaded_image) IS DISTINCT
+                FROM '0'||upper(loaded_image))
+           AND '1'||upper(loaded_image) > '0'||upper(loaded_image)
+           AND '1'||upper(loaded_image) >= '0'||upper(loaded_image)
+           AND '1'||upper(loaded_image) < 2||upper(loaded_image)
+           AND '1'||upper(loaded_image) <= 2||upper(loaded_image)
+           AND ('1'||upper(loaded_image) <> '0'||upper(loaded_image)) IS TRUE
+           AND ('1'||upper(loaded_image) = '0'||upper(loaded_image)) IS NOT TRUE
+           AND ('1'||upper(loaded_image) = '0'||upper(loaded_image)) IS FALSE
+           AND ('1'||upper(loaded_image) <> '0'||upper(loaded_image)) IS NOT FALSE
+           AND '1'||upper(loaded_image) BETWEEN '0'||upper(loaded_image) AND 2||upper(loaded_image)
+           AND '1'||upper(loaded_image) NOT BETWEEN '1'||upper(loaded_image) AND '0'||upper(loaded_image)
+           AND '1'||upper(loaded_image) like '%'
+           AND '1'||upper(loaded_image) not like '__DOES_NOT_EXIST__%'
+           AND '1'||upper(loaded_image) IN ('0'||upper(loaded_image),
+                                            1||upper(loaded_image),
+                                            2||upper(loaded_image))
+           AND '1'||upper(loaded_image) NOT IN ('0'||upper(loaded_image),
+                                                2||upper(loaded_image)))) ;
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND ('1'||upper(loaded_image) IS NULL
+       OR '1'||upper(loaded_image) IN
+         (SELECT '1'||upper(loaded_image)
+          FROM kttm_nested
+          WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+            AND ('1'||upper(loaded_image) IS NULL
+                 OR ('1'||upper(loaded_image) = 1||upper(loaded_image)
+                     AND '1'||upper(loaded_image) IS NOT DISTINCT
+                     FROM 1||upper(loaded_image)
+                     AND '1'||upper(loaded_image) <> '0'||upper(loaded_image)
+                     AND ('1'||upper(loaded_image) IS DISTINCT
+                          FROM '0'||upper(loaded_image))
+                     AND '1'||upper(loaded_image) > '0'||upper(loaded_image)
+                     AND '1'||upper(loaded_image) >= '0'||upper(loaded_image)
+                     AND '1'||upper(loaded_image) < 2||upper(loaded_image)
+                     AND '1'||upper(loaded_image) <= 2||upper(loaded_image)
+                     AND ('1'||upper(loaded_image) <> '0'||upper(loaded_image)) IS TRUE
+                     AND ('1'||upper(loaded_image) = '0'||upper(loaded_image)) IS NOT TRUE
+                     AND ('1'||upper(loaded_image) = '0'||upper(loaded_image)) IS FALSE
+                     AND ('1'||upper(loaded_image) <> '0'||upper(loaded_image)) IS NOT FALSE
+                     AND '1'||upper(loaded_image) BETWEEN '0'||upper(loaded_image) AND 2||upper(loaded_image)
+                     AND '1'||upper(loaded_image) NOT BETWEEN '1'||upper(loaded_image) AND '0'||upper(loaded_image)
+                     AND '1'||upper(loaded_image) like '%'
+                     AND '1'||upper(loaded_image) not like '__DOES_NOT_EXIST__%'
+                     AND '1'||upper(loaded_image) IN ('0'||upper(loaded_image),
+                                                      1||upper(loaded_image),
+                                                      2||upper(loaded_image))
+                     AND '1'||upper(loaded_image) NOT IN ('0'||upper(loaded_image),
+                                                          2||upper(loaded_image))))));
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM
+  (SELECT __time, number, client_ip,
+                          '1'||upper(loaded_image),
+                          count(*)
+   FROM kttm_nested
+   WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+     AND ('1'||upper(loaded_image) IS NULL
+          OR ('1'||upper(loaded_image) = 1||upper(loaded_image)
+              AND '1'||upper(loaded_image) IS NOT DISTINCT
+              FROM 1||upper(loaded_image)
+              AND '1'||upper(loaded_image) <> '0'||upper(loaded_image)
+              AND ('1'||upper(loaded_image) IS DISTINCT
+                   FROM '0'||upper(loaded_image))
+              AND '1'||upper(loaded_image) > '0'||upper(loaded_image)
+              AND '1'||upper(loaded_image) >= '0'||upper(loaded_image)
+              AND '1'||upper(loaded_image) < 2||upper(loaded_image)
+              AND '1'||upper(loaded_image) <= 2||upper(loaded_image)
+              AND ('1'||upper(loaded_image) <> '0'||upper(loaded_image)) IS TRUE
+              AND ('1'||upper(loaded_image) = '0'||upper(loaded_image)) IS NOT TRUE
+              AND ('1'||upper(loaded_image) = '0'||upper(loaded_image)) IS FALSE
+              AND ('1'||upper(loaded_image) <> '0'||upper(loaded_image)) IS NOT FALSE
+              AND '1'||upper(loaded_image) BETWEEN '0'||upper(loaded_image) AND 2||upper(loaded_image)
+              AND '1'||upper(loaded_image) NOT BETWEEN '1'||upper(loaded_image) AND '0'||upper(loaded_image)
+              AND '1'||upper(loaded_image) like '%'
+              AND '1'||upper(loaded_image) not like '__DOES_NOT_EXIST__%'
+              AND '1'||upper(loaded_image) IN ('0'||upper(loaded_image),
+                                               1||upper(loaded_image),
+                                               2||upper(loaded_image))
+              AND '1'||upper(loaded_image) NOT IN ('0'||upper(loaded_image),
+                                                   2||upper(loaded_image))))
+   GROUP BY 1,
+            2,
+            3,
+            4);
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+#-------------------------------------------------------------------------
+# TEST_ID: A12: parse_long
+#-------------------------------------------------------------------------
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND (parse_long(number, 10)+1 IS NULL
+       OR (parse_long(number, 10)+1 = parse_long(number, 10)+1
+           AND parse_long(number, 10)+1 IS NOT DISTINCT
+           FROM parse_long(number, 10)+1
+           AND parse_long(number, 10)+1 <> parse_long(number, 10)
+           AND (parse_long(number, 10)+1 IS DISTINCT
+                FROM parse_long(number, 10))
+           AND parse_long(number, 10)+1 > parse_long(number, 10)
+           AND parse_long(number, 10)+1 >= parse_long(number, 10)
+           AND parse_long(number, 10)+1 < parse_long(number, 10)+2
+           AND parse_long(number, 10)+1 <= parse_long(number, 10)+2
+           AND (parse_long(number, 10)+1 <> parse_long(number, 10)) IS TRUE
+           AND (parse_long(number, 10)+1 = parse_long(number, 10)) IS NOT TRUE
+           AND (parse_long(number, 10)+1 = parse_long(number, 10)) IS FALSE
+           AND (parse_long(number, 10)+1 <> parse_long(number, 10)) IS NOT FALSE
+           AND parse_long(number, 10)+1 BETWEEN parse_long(number, 10) AND parse_long(number, 10)+2
+           AND parse_long(number, 10)+1 NOT BETWEEN parse_long(number, 10)+1 AND parse_long(number, 10)
+           AND parse_long(number, 10)+1 like '%'
+           AND parse_long(number, 10)+1 not like '__DOES_NOT_EXIST__%'
+           AND parse_long(number, 10)+1 IN (parse_long(number, 10),
+                                            parse_long(number, 10)+1,
+                                            parse_long(number, 10)+2)
+           AND parse_long(number, 10)+1 NOT IN (parse_long(number, 10),
+                                                parse_long(number, 10)+2))) ;
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND (parse_long(number, 10)+1 IS NULL
+       OR parse_long(number, 10)+1 IN
+         (SELECT parse_long(number, 10)+1
+          FROM kttm_nested
+          WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+            AND (parse_long(number, 10)+1 IS NULL
+                 OR (parse_long(number, 10)+1 = parse_long(number, 10)+1
+                     AND parse_long(number, 10)+1 IS NOT DISTINCT
+                     FROM parse_long(number, 10)+1
+                     AND parse_long(number, 10)+1 <> parse_long(number, 10)
+                     AND (parse_long(number, 10)+1 IS DISTINCT
+                          FROM parse_long(number, 10))
+                     AND parse_long(number, 10)+1 > parse_long(number, 10)
+                     AND parse_long(number, 10)+1 >= parse_long(number, 10)
+                     AND parse_long(number, 10)+1 < parse_long(number, 10)+2
+                     AND parse_long(number, 10)+1 <= parse_long(number, 10)+2
+                     AND (parse_long(number, 10)+1 <> parse_long(number, 10)) IS TRUE
+                     AND (parse_long(number, 10)+1 = parse_long(number, 10)) IS NOT TRUE
+                     AND (parse_long(number, 10)+1 = parse_long(number, 10)) IS FALSE
+                     AND (parse_long(number, 10)+1 <> parse_long(number, 10)) IS NOT FALSE
+                     AND parse_long(number, 10)+1 BETWEEN parse_long(number, 10) AND parse_long(number, 10)+2
+                     AND parse_long(number, 10)+1 NOT BETWEEN parse_long(number, 10)+1 AND parse_long(number, 10)
+                     AND parse_long(number, 10)+1 like '%'
+                     AND parse_long(number, 10)+1 not like '__DOES_NOT_EXIST__%'
+                     AND parse_long(number, 10)+1 IN (parse_long(number, 10),
+                                                      parse_long(number, 10)+1,
+                                                      parse_long(number, 10)+2)
+                     AND parse_long(number, 10)+1 NOT IN (parse_long(number, 10),
+                                                          parse_long(number, 10)+2)))));
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM
+  (SELECT __time, number, client_ip,
+                          parse_long(number, 10)+1,
+                          count(*)
+   FROM kttm_nested
+   WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+     AND (parse_long(number, 10)+1 IS NULL
+          OR (parse_long(number, 10)+1 = parse_long(number, 10)+1
+              AND parse_long(number, 10)+1 IS NOT DISTINCT
+              FROM parse_long(number, 10)+1
+              AND parse_long(number, 10)+1 <> parse_long(number, 10)
+              AND (parse_long(number, 10)+1 IS DISTINCT
+                   FROM parse_long(number, 10))
+              AND parse_long(number, 10)+1 > parse_long(number, 10)
+              AND parse_long(number, 10)+1 >= parse_long(number, 10)
+              AND parse_long(number, 10)+1 < parse_long(number, 10)+2
+              AND parse_long(number, 10)+1 <= parse_long(number, 10)+2
+              AND (parse_long(number, 10)+1 <> parse_long(number, 10)) IS TRUE
+              AND (parse_long(number, 10)+1 = parse_long(number, 10)) IS NOT TRUE
+              AND (parse_long(number, 10)+1 = parse_long(number, 10)) IS FALSE
+              AND (parse_long(number, 10)+1 <> parse_long(number, 10)) IS NOT FALSE
+              AND parse_long(number, 10)+1 BETWEEN parse_long(number, 10) AND parse_long(number, 10)+2
+              AND parse_long(number, 10)+1 NOT BETWEEN parse_long(number, 10)+1 AND parse_long(number, 10)
+              AND parse_long(number, 10)+1 like '%'
+              AND parse_long(number, 10)+1 not like '__DOES_NOT_EXIST__%'
+              AND parse_long(number, 10)+1 IN (parse_long(number, 10),
+                                               parse_long(number, 10)+1,
+                                               parse_long(number, 10)+2)
+              AND parse_long(number, 10)+1 NOT IN (parse_long(number, 10),
+                                                   parse_long(number, 10)+2)))
+   GROUP BY 1,
+            2,
+            3,
+            4);
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+#-------------------------------------------------------------------------
+# TEST_ID: A13: position
+#-------------------------------------------------------------------------
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND (position('a' IN loaded_image
+                FROM 3)+1 IS NULL
+       OR (position('a' IN loaded_image
+                    FROM 3)+1 = position('a' IN loaded_image
+                                         FROM 3)+1
+           AND position('a' IN loaded_image
+                        FROM 3)+1 IS NOT DISTINCT
+           FROM position('a' IN loaded_image
+                         FROM 3)+1
+           AND position('a' IN loaded_image
+                        FROM 3)+1 <> position('a' IN loaded_image
+                                              FROM 3)
+           AND (position('a' IN loaded_image
+                         FROM 3)+1 IS DISTINCT
+                FROM position('a' IN loaded_image
+                              FROM 3))
+           AND position('a' IN loaded_image
+                        FROM 3)+1 > position('a' IN loaded_image
+                                             FROM 3)
+           AND position('a' IN loaded_image
+                        FROM 3)+1 >= position('a' IN loaded_image
+                                              FROM 3)
+           AND position('a' IN loaded_image
+                        FROM 3)+1 < position('a' IN loaded_image
+                                             FROM 3)+2
+           AND position('a' IN loaded_image
+                        FROM 3)+1 <= position('a' IN loaded_image
+                                              FROM 3)+2
+           AND (position('a' IN loaded_image
+                         FROM 3)+1 <> position('a' IN loaded_image
+                                               FROM 3)) IS TRUE
+           AND (position('a' IN loaded_image
+                         FROM 3)+1 = position('a' IN loaded_image
+                                              FROM 3)) IS NOT TRUE
+           AND (position('a' IN loaded_image
+                         FROM 3)+1 = position('a' IN loaded_image
+                                              FROM 3)) IS FALSE
+           AND (position('a' IN loaded_image
+                         FROM 3)+1 <> position('a' IN loaded_image
+                                               FROM 3)) IS NOT FALSE
+           AND position('a' IN loaded_image
+                        FROM 3)+1 BETWEEN position('a' IN loaded_image
+                                                   FROM 3) AND position('a' IN loaded_image
+                                                                        FROM 3)+2
+           AND position('a' IN loaded_image
+                        FROM 3)+1 NOT BETWEEN position('a' IN loaded_image
+                                                       FROM 3)+1 AND position('a' IN loaded_image
+                                                                              FROM 3)
+           AND position('a' IN loaded_image
+                        FROM 3)+1 like '%'
+           AND position('a' IN loaded_image
+                        FROM 3)+1 not like '__DOES_NOT_EXIST__%'
+           AND position('a' IN loaded_image
+                        FROM 3)+1 IN (position('a' IN loaded_image
+                                               FROM 3),
+                                      position('a' IN loaded_image
+                                               FROM 3)+1,
+                                      position('a' IN loaded_image
+                                               FROM 3)+2)
+           AND position('a' IN loaded_image
+                        FROM 3)+1 NOT IN (position('a' IN loaded_image
+                                                   FROM 3),
+                                          position('a' IN loaded_image
+                                                   FROM 3)+2))) ;
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND (position('a' IN loaded_image
+                FROM 3)+1 IS NULL
+       OR position('a' IN loaded_image
+                   FROM 3)+1 IN
+         (SELECT position('a' IN loaded_image
+                          FROM 3)+1
+          FROM kttm_nested
+          WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+            AND (position('a' IN loaded_image
+                          FROM 3)+1 IS NULL
+                 OR (position('a' IN loaded_image
+                              FROM 3)+1 = position('a' IN loaded_image
+                                                   FROM 3)+1
+                     AND position('a' IN loaded_image
+                                  FROM 3)+1 IS NOT DISTINCT
+                     FROM position('a' IN loaded_image
+                                   FROM 3)+1
+                     AND position('a' IN loaded_image
+                                  FROM 3)+1 <> position('a' IN loaded_image
+                                                        FROM 3)
+                     AND (position('a' IN loaded_image
+                                   FROM 3)+1 IS DISTINCT
+                          FROM position('a' IN loaded_image
+                                        FROM 3))
+                     AND position('a' IN loaded_image
+                                  FROM 3)+1 > position('a' IN loaded_image
+                                                       FROM 3)
+                     AND position('a' IN loaded_image
+                                  FROM 3)+1 >= position('a' IN loaded_image
+                                                        FROM 3)
+                     AND position('a' IN loaded_image
+                                  FROM 3)+1 < position('a' IN loaded_image
+                                                       FROM 3)+2
+                     AND position('a' IN loaded_image
+                                  FROM 3)+1 <= position('a' IN loaded_image
+                                                        FROM 3)+2
+                     AND (position('a' IN loaded_image
+                                   FROM 3)+1 <> position('a' IN loaded_image
+                                                         FROM 3)) IS TRUE
+                     AND (position('a' IN loaded_image
+                                   FROM 3)+1 = position('a' IN loaded_image
+                                                        FROM 3)) IS NOT TRUE
+                     AND (position('a' IN loaded_image
+                                   FROM 3)+1 = position('a' IN loaded_image
+                                                        FROM 3)) IS FALSE
+                     AND (position('a' IN loaded_image
+                                   FROM 3)+1 <> position('a' IN loaded_image
+                                                         FROM 3)) IS NOT FALSE
+                     AND position('a' IN loaded_image
+                                  FROM 3)+1 BETWEEN position('a' IN loaded_image
+                                                             FROM 3) AND position('a' IN loaded_image
+                                                                                  FROM 3)+2
+                     AND position('a' IN loaded_image
+                                  FROM 3)+1 NOT BETWEEN position('a' IN loaded_image
+                                                                 FROM 3)+1 AND position('a' IN loaded_image
+                                                                                        FROM 3)
+                     AND position('a' IN loaded_image
+                                  FROM 3)+1 like '%'
+                     AND position('a' IN loaded_image
+                                  FROM 3)+1 not like '__DOES_NOT_EXIST__%'
+                     AND position('a' IN loaded_image
+                                  FROM 3)+1 IN (position('a' IN loaded_image
+                                                         FROM 3),
+                                                position('a' IN loaded_image
+                                                         FROM 3)+1,
+                                                position('a' IN loaded_image
+                                                         FROM 3)+2)
+                     AND position('a' IN loaded_image
+                                  FROM 3)+1 NOT IN (position('a' IN loaded_image
+                                                             FROM 3),
+                                                    position('a' IN loaded_image
+                                                             FROM 3)+2)))));
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM
+  (SELECT __time, number, client_ip,
+                          position('a' IN loaded_image
+                                   FROM 3)+1,
+                          count(*)
+   FROM kttm_nested
+   WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+     AND (position('a' IN loaded_image
+                   FROM 3)+1 IS NULL
+          OR (position('a' IN loaded_image
+                       FROM 3)+1 = position('a' IN loaded_image
+                                            FROM 3)+1
+              AND position('a' IN loaded_image
+                           FROM 3)+1 IS NOT DISTINCT
+              FROM position('a' IN loaded_image
+                            FROM 3)+1
+              AND position('a' IN loaded_image
+                           FROM 3)+1 <> position('a' IN loaded_image
+                                                 FROM 3)
+              AND (position('a' IN loaded_image
+                            FROM 3)+1 IS DISTINCT
+                   FROM position('a' IN loaded_image
+                                 FROM 3))
+              AND position('a' IN loaded_image
+                           FROM 3)+1 > position('a' IN loaded_image
+                                                FROM 3)
+              AND position('a' IN loaded_image
+                           FROM 3)+1 >= position('a' IN loaded_image
+                                                 FROM 3)
+              AND position('a' IN loaded_image
+                           FROM 3)+1 < position('a' IN loaded_image
+                                                FROM 3)+2
+              AND position('a' IN loaded_image
+                           FROM 3)+1 <= position('a' IN loaded_image
+                                                 FROM 3)+2
+              AND (position('a' IN loaded_image
+                            FROM 3)+1 <> position('a' IN loaded_image
+                                                  FROM 3)) IS TRUE
+              AND (position('a' IN loaded_image
+                            FROM 3)+1 = position('a' IN loaded_image
+                                                 FROM 3)) IS NOT TRUE
+              AND (position('a' IN loaded_image
+                            FROM 3)+1 = position('a' IN loaded_image
+                                                 FROM 3)) IS FALSE
+              AND (position('a' IN loaded_image
+                            FROM 3)+1 <> position('a' IN loaded_image
+                                                  FROM 3)) IS NOT FALSE
+              AND position('a' IN loaded_image
+                           FROM 3)+1 BETWEEN position('a' IN loaded_image
+                                                      FROM 3) AND position('a' IN loaded_image
+                                                                           FROM 3)+2
+              AND position('a' IN loaded_image
+                           FROM 3)+1 NOT BETWEEN position('a' IN loaded_image
+                                                          FROM 3)+1 AND position('a' IN loaded_image
+                                                                                 FROM 3)
+              AND position('a' IN loaded_image
+                           FROM 3)+1 like '%'
+              AND position('a' IN loaded_image
+                           FROM 3)+1 not like '__DOES_NOT_EXIST__%'
+              AND position('a' IN loaded_image
+                           FROM 3)+1 IN (position('a' IN loaded_image
+                                                  FROM 3),
+                                         position('a' IN loaded_image
+                                                  FROM 3)+1,
+                                         position('a' IN loaded_image
+                                                  FROM 3)+2)
+              AND position('a' IN loaded_image
+                           FROM 3)+1 NOT IN (position('a' IN loaded_image
+                                                      FROM 3),
+                                             position('a' IN loaded_image
+                                                      FROM 3)+2)))
+   GROUP BY 1,
+            2,
+            3,
+            4);
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+#-------------------------------------------------------------------------
+# TEST_ID: A14: regexp_extract
+#-------------------------------------------------------------------------
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND ('1'||regexp_extract(loaded_image, '.*') IS NULL
+       OR ('1'||regexp_extract(loaded_image, '.*') = 1||regexp_extract(loaded_image, '.*')
+           AND '1'||regexp_extract(loaded_image, '.*') IS NOT DISTINCT
+           FROM 1||regexp_extract(loaded_image, '.*')
+           AND '1'||regexp_extract(loaded_image, '.*') <> '0'||regexp_extract(loaded_image, '.*')
+           AND ('1'||regexp_extract(loaded_image, '.*') IS DISTINCT
+                FROM '0'||regexp_extract(loaded_image, '.*'))
+           AND '1'||regexp_extract(loaded_image, '.*') > '0'||regexp_extract(loaded_image, '.*')
+           AND '1'||regexp_extract(loaded_image, '.*') >= '0'||regexp_extract(loaded_image, '.*')
+           AND '1'||regexp_extract(loaded_image, '.*') < 2||regexp_extract(loaded_image, '.*')
+           AND '1'||regexp_extract(loaded_image, '.*') <= 2||regexp_extract(loaded_image, '.*')
+           AND ('1'||regexp_extract(loaded_image, '.*') <> '0'||regexp_extract(loaded_image, '.*')) IS TRUE
+           AND ('1'||regexp_extract(loaded_image, '.*') = '0'||regexp_extract(loaded_image, '.*')) IS NOT TRUE
+           AND ('1'||regexp_extract(loaded_image, '.*') = '0'||regexp_extract(loaded_image, '.*')) IS FALSE
+           AND ('1'||regexp_extract(loaded_image, '.*') <> '0'||regexp_extract(loaded_image, '.*')) IS NOT FALSE
+           AND '1'||regexp_extract(loaded_image, '.*') BETWEEN '0'||regexp_extract(loaded_image, '.*') AND 2||regexp_extract(loaded_image, '.*')
+           AND '1'||regexp_extract(loaded_image, '.*') NOT BETWEEN '1'||regexp_extract(loaded_image, '.*') AND '0'||regexp_extract(loaded_image, '.*')
+           AND '1'||regexp_extract(loaded_image, '.*') like '%'
+           AND '1'||regexp_extract(loaded_image, '.*') not like '__DOES_NOT_EXIST__%'
+           AND '1'||regexp_extract(loaded_image, '.*') IN ('0'||regexp_extract(loaded_image, '.*'),
+                                                           1||regexp_extract(loaded_image, '.*'),
+                                                           2||regexp_extract(loaded_image, '.*'))
+           AND '1'||regexp_extract(loaded_image, '.*') NOT IN ('0'||regexp_extract(loaded_image, '.*'),
+                                                               2||regexp_extract(loaded_image, '.*')))) ;
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND ('1'||regexp_extract(loaded_image, '.*') IS NULL
+       OR '1'||regexp_extract(loaded_image, '.*') IN
+         (SELECT '1'||regexp_extract(loaded_image, '.*')
+          FROM kttm_nested
+          WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+            AND ('1'||regexp_extract(loaded_image, '.*') IS NULL
+                 OR ('1'||regexp_extract(loaded_image, '.*') = 1||regexp_extract(loaded_image, '.*')
+                     AND '1'||regexp_extract(loaded_image, '.*') IS NOT DISTINCT
+                     FROM 1||regexp_extract(loaded_image, '.*')
+                     AND '1'||regexp_extract(loaded_image, '.*') <> '0'||regexp_extract(loaded_image, '.*')
+                     AND ('1'||regexp_extract(loaded_image, '.*') IS DISTINCT
+                          FROM '0'||regexp_extract(loaded_image, '.*'))
+                     AND '1'||regexp_extract(loaded_image, '.*') > '0'||regexp_extract(loaded_image, '.*')
+                     AND '1'||regexp_extract(loaded_image, '.*') >= '0'||regexp_extract(loaded_image, '.*')
+                     AND '1'||regexp_extract(loaded_image, '.*') < 2||regexp_extract(loaded_image, '.*')
+                     AND '1'||regexp_extract(loaded_image, '.*') <= 2||regexp_extract(loaded_image, '.*')
+                     AND ('1'||regexp_extract(loaded_image, '.*') <> '0'||regexp_extract(loaded_image, '.*')) IS TRUE
+                     AND ('1'||regexp_extract(loaded_image, '.*') = '0'||regexp_extract(loaded_image, '.*')) IS NOT TRUE
+                     AND ('1'||regexp_extract(loaded_image, '.*') = '0'||regexp_extract(loaded_image, '.*')) IS FALSE
+                     AND ('1'||regexp_extract(loaded_image, '.*') <> '0'||regexp_extract(loaded_image, '.*')) IS NOT FALSE
+                     AND '1'||regexp_extract(loaded_image, '.*') BETWEEN '0'||regexp_extract(loaded_image, '.*') AND 2||regexp_extract(loaded_image, '.*')
+                     AND '1'||regexp_extract(loaded_image, '.*') NOT BETWEEN '1'||regexp_extract(loaded_image, '.*') AND '0'||regexp_extract(loaded_image, '.*')
+                     AND '1'||regexp_extract(loaded_image, '.*') like '%'
+                     AND '1'||regexp_extract(loaded_image, '.*') not like '__DOES_NOT_EXIST__%'
+                     AND '1'||regexp_extract(loaded_image, '.*') IN ('0'||regexp_extract(loaded_image, '.*'),
+                                                                     1||regexp_extract(loaded_image, '.*'),
+                                                                     2||regexp_extract(loaded_image, '.*'))
+                     AND '1'||regexp_extract(loaded_image, '.*') NOT IN ('0'||regexp_extract(loaded_image, '.*'),
+                                                                         2||regexp_extract(loaded_image, '.*'))))));
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM
+  (SELECT __time, number, client_ip,
+                          '1'||regexp_extract(loaded_image, '.*'),
+                          count(*)
+   FROM kttm_nested
+   WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+     AND ('1'||regexp_extract(loaded_image, '.*') IS NULL
+          OR ('1'||regexp_extract(loaded_image, '.*') = 1||regexp_extract(loaded_image, '.*')
+              AND '1'||regexp_extract(loaded_image, '.*') IS NOT DISTINCT
+              FROM 1||regexp_extract(loaded_image, '.*')
+              AND '1'||regexp_extract(loaded_image, '.*') <> '0'||regexp_extract(loaded_image, '.*')
+              AND ('1'||regexp_extract(loaded_image, '.*') IS DISTINCT
+                   FROM '0'||regexp_extract(loaded_image, '.*'))
+              AND '1'||regexp_extract(loaded_image, '.*') > '0'||regexp_extract(loaded_image, '.*')
+              AND '1'||regexp_extract(loaded_image, '.*') >= '0'||regexp_extract(loaded_image, '.*')
+              AND '1'||regexp_extract(loaded_image, '.*') < 2||regexp_extract(loaded_image, '.*')
+              AND '1'||regexp_extract(loaded_image, '.*') <= 2||regexp_extract(loaded_image, '.*')
+              AND ('1'||regexp_extract(loaded_image, '.*') <> '0'||regexp_extract(loaded_image, '.*')) IS TRUE
+              AND ('1'||regexp_extract(loaded_image, '.*') = '0'||regexp_extract(loaded_image, '.*')) IS NOT TRUE
+              AND ('1'||regexp_extract(loaded_image, '.*') = '0'||regexp_extract(loaded_image, '.*')) IS FALSE
+              AND ('1'||regexp_extract(loaded_image, '.*') <> '0'||regexp_extract(loaded_image, '.*')) IS NOT FALSE
+              AND '1'||regexp_extract(loaded_image, '.*') BETWEEN '0'||regexp_extract(loaded_image, '.*') AND 2||regexp_extract(loaded_image, '.*')
+              AND '1'||regexp_extract(loaded_image, '.*') NOT BETWEEN '1'||regexp_extract(loaded_image, '.*') AND '0'||regexp_extract(loaded_image, '.*')
+              AND '1'||regexp_extract(loaded_image, '.*') like '%'
+              AND '1'||regexp_extract(loaded_image, '.*') not like '__DOES_NOT_EXIST__%'
+              AND '1'||regexp_extract(loaded_image, '.*') IN ('0'||regexp_extract(loaded_image, '.*'),
+                                                              1||regexp_extract(loaded_image, '.*'),
+                                                              2||regexp_extract(loaded_image, '.*'))
+              AND '1'||regexp_extract(loaded_image, '.*') NOT IN ('0'||regexp_extract(loaded_image, '.*'),
+                                                                  2||regexp_extract(loaded_image, '.*'))))
+   GROUP BY 1,
+            2,
+            3,
+            4);
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+#-------------------------------------------------------------------------
+# TEST_ID: A15: regexp_like
+#-------------------------------------------------------------------------
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND (CASE
+           WHEN regexp_like(loaded_image, '.*') THEN 1
+           ELSE 101
+       END IS NULL
+       OR (CASE
+               WHEN regexp_like(loaded_image, '.*') THEN 1
+               ELSE 101
+           END = CASE
+                     WHEN regexp_like(loaded_image, '.*') THEN 1
+                     ELSE 101
+                 END
+           AND CASE
+                   WHEN regexp_like(loaded_image, '.*') THEN 1
+                   ELSE 101
+               END IS NOT DISTINCT
+           FROM CASE
+                    WHEN regexp_like(loaded_image, '.*') THEN 1
+                    ELSE 101
+                END
+           AND CASE
+                   WHEN regexp_like(loaded_image, '.*') THEN 1
+                   ELSE 101
+               END <> CASE
+                          WHEN regexp_like(loaded_image, '.*') THEN 0
+                          ELSE 100
+                      END
+           AND (CASE
+                    WHEN regexp_like(loaded_image, '.*') THEN 1
+                    ELSE 101
+                END IS DISTINCT
+                FROM CASE
+                         WHEN regexp_like(loaded_image, '.*') THEN 0
+                         ELSE 100
+                     END)
+           AND CASE
+                   WHEN regexp_like(loaded_image, '.*') THEN 1
+                   ELSE 101
+               END > CASE
+                         WHEN regexp_like(loaded_image, '.*') THEN 0
+                         ELSE 100
+                     END
+           AND CASE
+                   WHEN regexp_like(loaded_image, '.*') THEN 1
+                   ELSE 101
+               END >= CASE
+                          WHEN regexp_like(loaded_image, '.*') THEN 0
+                          ELSE 100
+                      END
+           AND CASE
+                   WHEN regexp_like(loaded_image, '.*') THEN 1
+                   ELSE 101
+               END < CASE
+                         WHEN regexp_like(loaded_image, '.*') THEN 2
+                         ELSE 102
+                     END
+           AND CASE
+                   WHEN regexp_like(loaded_image, '.*') THEN 1
+                   ELSE 101
+               END <= CASE
+                          WHEN regexp_like(loaded_image, '.*') THEN 2
+                          ELSE 102
+                      END
+           AND (CASE
+                    WHEN regexp_like(loaded_image, '.*') THEN 1
+                    ELSE 101
+                END <> CASE
+                           WHEN regexp_like(loaded_image, '.*') THEN 0
+                           ELSE 100
+                       END) IS TRUE
+           AND (CASE
+                    WHEN regexp_like(loaded_image, '.*') THEN 1
+                    ELSE 101
+                END = CASE
+                          WHEN regexp_like(loaded_image, '.*') THEN 0
+                          ELSE 100
+                      END) IS NOT TRUE
+           AND (CASE
+                    WHEN regexp_like(loaded_image, '.*') THEN 1
+                    ELSE 101
+                END = CASE
+                          WHEN regexp_like(loaded_image, '.*') THEN 0
+                          ELSE 100
+                      END) IS FALSE
+           AND (CASE
+                    WHEN regexp_like(loaded_image, '.*') THEN 1
+                    ELSE 101
+                END <> CASE
+                           WHEN regexp_like(loaded_image, '.*') THEN 0
+                           ELSE 100
+                       END) IS NOT FALSE
+           AND CASE
+                   WHEN regexp_like(loaded_image, '.*') THEN 1
+                   ELSE 101
+               END BETWEEN CASE
+                               WHEN regexp_like(loaded_image, '.*') THEN 0
+                               ELSE 100
+                           END AND CASE
+                                       WHEN regexp_like(loaded_image, '.*') THEN 2
+                                       ELSE 102
+                                   END
+           AND CASE
+                   WHEN regexp_like(loaded_image, '.*') THEN 1
+                   ELSE 101
+               END NOT BETWEEN CASE
+                                   WHEN regexp_like(loaded_image, '.*') THEN 1
+                                   ELSE 101
+                               END AND CASE
+                                           WHEN regexp_like(loaded_image, '.*') THEN 0
+                                           ELSE 100
+                                       END
+           AND CASE
+                   WHEN regexp_like(loaded_image, '.*') THEN 1
+                   ELSE 101
+               END like '%'
+           AND CASE
+                   WHEN regexp_like(loaded_image, '.*') THEN 1
+                   ELSE 101
+               END not like '__DOES_NOT_EXIST__%'
+           AND CASE
+                   WHEN regexp_like(loaded_image, '.*') THEN 1
+                   ELSE 101
+               END IN (CASE
+                           WHEN regexp_like(loaded_image, '.*') THEN 0
+                           ELSE 100
+                       END,
+                       CASE
+                           WHEN regexp_like(loaded_image, '.*') THEN 1
+                           ELSE 101
+                       END,
+                       CASE
+                           WHEN regexp_like(loaded_image, '.*') THEN 2
+                           ELSE 102
+                       END)
+           AND CASE
+                   WHEN regexp_like(loaded_image, '.*') THEN 1
+                   ELSE 101
+               END NOT IN (CASE
+                               WHEN regexp_like(loaded_image, '.*') THEN 0
+                               ELSE 100
+                           END,
+                           CASE
+                               WHEN regexp_like(loaded_image, '.*') THEN 2
+                               ELSE 102
+                           END))) ;
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND (CASE
+           WHEN regexp_like(loaded_image, '.*') THEN 1
+           ELSE 101
+       END IS NULL
+       OR CASE
+              WHEN regexp_like(loaded_image, '.*') THEN 1
+              ELSE 101
+          END IN
+         (SELECT CASE
+                     WHEN regexp_like(loaded_image, '.*') THEN 1
+                     ELSE 101
+                 END
+          FROM kttm_nested
+          WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+            AND (CASE
+                     WHEN regexp_like(loaded_image, '.*') THEN 1
+                     ELSE 101
+                 END IS NULL
+                 OR (CASE
+                         WHEN regexp_like(loaded_image, '.*') THEN 1
+                         ELSE 101
+                     END = CASE
+                               WHEN regexp_like(loaded_image, '.*') THEN 1
+                               ELSE 101
+                           END
+                     AND CASE
+                             WHEN regexp_like(loaded_image, '.*') THEN 1
+                             ELSE 101
+                         END IS NOT DISTINCT
+                     FROM CASE
+                              WHEN regexp_like(loaded_image, '.*') THEN 1
+                              ELSE 101
+                          END
+                     AND CASE
+                             WHEN regexp_like(loaded_image, '.*') THEN 1
+                             ELSE 101
+                         END <> CASE
+                                    WHEN regexp_like(loaded_image, '.*') THEN 0
+                                    ELSE 100
+                                END
+                     AND (CASE
+                              WHEN regexp_like(loaded_image, '.*') THEN 1
+                              ELSE 101
+                          END IS DISTINCT
+                          FROM CASE
+                                   WHEN regexp_like(loaded_image, '.*') THEN 0
+                                   ELSE 100
+                               END)
+                     AND CASE
+                             WHEN regexp_like(loaded_image, '.*') THEN 1
+                             ELSE 101
+                         END > CASE
+                                   WHEN regexp_like(loaded_image, '.*') THEN 0
+                                   ELSE 100
+                               END
+                     AND CASE
+                             WHEN regexp_like(loaded_image, '.*') THEN 1
+                             ELSE 101
+                         END >= CASE
+                                    WHEN regexp_like(loaded_image, '.*') THEN 0
+                                    ELSE 100
+                                END
+                     AND CASE
+                             WHEN regexp_like(loaded_image, '.*') THEN 1
+                             ELSE 101
+                         END < CASE
+                                   WHEN regexp_like(loaded_image, '.*') THEN 2
+                                   ELSE 102
+                               END
+                     AND CASE
+                             WHEN regexp_like(loaded_image, '.*') THEN 1
+                             ELSE 101
+                         END <= CASE
+                                    WHEN regexp_like(loaded_image, '.*') THEN 2
+                                    ELSE 102
+                                END
+                     AND (CASE
+                              WHEN regexp_like(loaded_image, '.*') THEN 1
+                              ELSE 101
+                          END <> CASE
+                                     WHEN regexp_like(loaded_image, '.*') THEN 0
+                                     ELSE 100
+                                 END) IS TRUE
+                     AND (CASE
+                              WHEN regexp_like(loaded_image, '.*') THEN 1
+                              ELSE 101
+                          END = CASE
+                                    WHEN regexp_like(loaded_image, '.*') THEN 0
+                                    ELSE 100
+                                END) IS NOT TRUE
+                     AND (CASE
+                              WHEN regexp_like(loaded_image, '.*') THEN 1
+                              ELSE 101
+                          END = CASE
+                                    WHEN regexp_like(loaded_image, '.*') THEN 0
+                                    ELSE 100
+                                END) IS FALSE
+                     AND (CASE
+                              WHEN regexp_like(loaded_image, '.*') THEN 1
+                              ELSE 101
+                          END <> CASE
+                                     WHEN regexp_like(loaded_image, '.*') THEN 0
+                                     ELSE 100
+                                 END) IS NOT FALSE
+                     AND CASE
+                             WHEN regexp_like(loaded_image, '.*') THEN 1
+                             ELSE 101
+                         END BETWEEN CASE
+                                         WHEN regexp_like(loaded_image, '.*') THEN 0
+                                         ELSE 100
+                                     END AND CASE
+                                                 WHEN regexp_like(loaded_image, '.*') THEN 2
+                                                 ELSE 102
+                                             END
+                     AND CASE
+                             WHEN regexp_like(loaded_image, '.*') THEN 1
+                             ELSE 101
+                         END NOT BETWEEN CASE
+                                             WHEN regexp_like(loaded_image, '.*') THEN 1
+                                             ELSE 101
+                                         END AND CASE
+                                                     WHEN regexp_like(loaded_image, '.*') THEN 0
+                                                     ELSE 100
+                                                 END
+                     AND CASE
+                             WHEN regexp_like(loaded_image, '.*') THEN 1
+                             ELSE 101
+                         END like '%'
+                     AND CASE
+                             WHEN regexp_like(loaded_image, '.*') THEN 1
+                             ELSE 101
+                         END not like '__DOES_NOT_EXIST__%'
+                     AND CASE
+                             WHEN regexp_like(loaded_image, '.*') THEN 1
+                             ELSE 101
+                         END IN (CASE
+                                     WHEN regexp_like(loaded_image, '.*') THEN 0
+                                     ELSE 100
+                                 END,
+                                 CASE
+                                     WHEN regexp_like(loaded_image, '.*') THEN 1
+                                     ELSE 101
+                                 END,
+                                 CASE
+                                     WHEN regexp_like(loaded_image, '.*') THEN 2
+                                     ELSE 102
+                                 END)
+                     AND CASE
+                             WHEN regexp_like(loaded_image, '.*') THEN 1
+                             ELSE 101
+                         END NOT IN (CASE
+                                         WHEN regexp_like(loaded_image, '.*') THEN 0
+                                         ELSE 100
+                                     END,
+                                     CASE
+                                         WHEN regexp_like(loaded_image, '.*') THEN 2
+                                         ELSE 102
+                                     END)))));
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM
+  (SELECT __time, number, client_ip,
+                          CASE
+                              WHEN regexp_like(loaded_image, '.*') THEN 1
+                              ELSE 101
+                          END,
+                          count(*)
+   FROM kttm_nested
+   WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+     AND (CASE
+              WHEN regexp_like(loaded_image, '.*') THEN 1
+              ELSE 101
+          END IS NULL
+          OR (CASE
+                  WHEN regexp_like(loaded_image, '.*') THEN 1
+                  ELSE 101
+              END = CASE
+                        WHEN regexp_like(loaded_image, '.*') THEN 1
+                        ELSE 101
+                    END
+              AND CASE
+                      WHEN regexp_like(loaded_image, '.*') THEN 1
+                      ELSE 101
+                  END IS NOT DISTINCT
+              FROM CASE
+                       WHEN regexp_like(loaded_image, '.*') THEN 1
+                       ELSE 101
+                   END
+              AND CASE
+                      WHEN regexp_like(loaded_image, '.*') THEN 1
+                      ELSE 101
+                  END <> CASE
+                             WHEN regexp_like(loaded_image, '.*') THEN 0
+                             ELSE 100
+                         END
+              AND (CASE
+                       WHEN regexp_like(loaded_image, '.*') THEN 1
+                       ELSE 101
+                   END IS DISTINCT
+                   FROM CASE
+                            WHEN regexp_like(loaded_image, '.*') THEN 0
+                            ELSE 100
+                        END)
+              AND CASE
+                      WHEN regexp_like(loaded_image, '.*') THEN 1
+                      ELSE 101
+                  END > CASE
+                            WHEN regexp_like(loaded_image, '.*') THEN 0
+                            ELSE 100
+                        END
+              AND CASE
+                      WHEN regexp_like(loaded_image, '.*') THEN 1
+                      ELSE 101
+                  END >= CASE
+                             WHEN regexp_like(loaded_image, '.*') THEN 0
+                             ELSE 100
+                         END
+              AND CASE
+                      WHEN regexp_like(loaded_image, '.*') THEN 1
+                      ELSE 101
+                  END < CASE
+                            WHEN regexp_like(loaded_image, '.*') THEN 2
+                            ELSE 102
+                        END
+              AND CASE
+                      WHEN regexp_like(loaded_image, '.*') THEN 1
+                      ELSE 101
+                  END <= CASE
+                             WHEN regexp_like(loaded_image, '.*') THEN 2
+                             ELSE 102
+                         END
+              AND (CASE
+                       WHEN regexp_like(loaded_image, '.*') THEN 1
+                       ELSE 101
+                   END <> CASE
+                              WHEN regexp_like(loaded_image, '.*') THEN 0
+                              ELSE 100
+                          END) IS TRUE
+              AND (CASE
+                       WHEN regexp_like(loaded_image, '.*') THEN 1
+                       ELSE 101
+                   END = CASE
+                             WHEN regexp_like(loaded_image, '.*') THEN 0
+                             ELSE 100
+                         END) IS NOT TRUE
+              AND (CASE
+                       WHEN regexp_like(loaded_image, '.*') THEN 1
+                       ELSE 101
+                   END = CASE
+                             WHEN regexp_like(loaded_image, '.*') THEN 0
+                             ELSE 100
+                         END) IS FALSE
+              AND (CASE
+                       WHEN regexp_like(loaded_image, '.*') THEN 1
+                       ELSE 101
+                   END <> CASE
+                              WHEN regexp_like(loaded_image, '.*') THEN 0
+                              ELSE 100
+                          END) IS NOT FALSE
+              AND CASE
+                      WHEN regexp_like(loaded_image, '.*') THEN 1
+                      ELSE 101
+                  END BETWEEN CASE
+                                  WHEN regexp_like(loaded_image, '.*') THEN 0
+                                  ELSE 100
+                              END AND CASE
+                                          WHEN regexp_like(loaded_image, '.*') THEN 2
+                                          ELSE 102
+                                      END
+              AND CASE
+                      WHEN regexp_like(loaded_image, '.*') THEN 1
+                      ELSE 101
+                  END NOT BETWEEN CASE
+                                      WHEN regexp_like(loaded_image, '.*') THEN 1
+                                      ELSE 101
+                                  END AND CASE
+                                              WHEN regexp_like(loaded_image, '.*') THEN 0
+                                              ELSE 100
+                                          END
+              AND CASE
+                      WHEN regexp_like(loaded_image, '.*') THEN 1
+                      ELSE 101
+                  END like '%'
+              AND CASE
+                      WHEN regexp_like(loaded_image, '.*') THEN 1
+                      ELSE 101
+                  END not like '__DOES_NOT_EXIST__%'
+              AND CASE
+                      WHEN regexp_like(loaded_image, '.*') THEN 1
+                      ELSE 101
+                  END IN (CASE
+                              WHEN regexp_like(loaded_image, '.*') THEN 0
+                              ELSE 100
+                          END,
+                          CASE
+                              WHEN regexp_like(loaded_image, '.*') THEN 1
+                              ELSE 101
+                          END,
+                          CASE
+                              WHEN regexp_like(loaded_image, '.*') THEN 2
+                              ELSE 102
+                          END)
+              AND CASE
+                      WHEN regexp_like(loaded_image, '.*') THEN 1
+                      ELSE 101
+                  END NOT IN (CASE
+                                  WHEN regexp_like(loaded_image, '.*') THEN 0
+                                  ELSE 100
+                              END,
+                              CASE
+                                  WHEN regexp_like(loaded_image, '.*') THEN 2
+                                  ELSE 102
+                              END)))
+   GROUP BY 1,
+            2,
+            3,
+            4);
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+#-------------------------------------------------------------------------
+# TEST_ID: A16: regexp_replace
+#-------------------------------------------------------------------------
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND (regexp_replace(loaded_image, '.', '1') IS NULL
+       OR (regexp_replace(loaded_image, '.', '1') = regexp_replace(loaded_image, '.', '1')
+           AND regexp_replace(loaded_image, '.', '1') IS NOT DISTINCT
+           FROM regexp_replace(loaded_image, '.', '1')
+           AND regexp_replace(loaded_image, '.', '1') <> regexp_replace(loaded_image, '.', '0')
+           AND (regexp_replace(loaded_image, '.', '1') IS DISTINCT
+                FROM regexp_replace(loaded_image, '.', '0'))
+           AND regexp_replace(loaded_image, '.', '1') > regexp_replace(loaded_image, '.', '0')
+           AND regexp_replace(loaded_image, '.', '1') >= regexp_replace(loaded_image, '.', '0')
+           AND regexp_replace(loaded_image, '.', '1') < regexp_replace(loaded_image, '.', '2')
+           AND regexp_replace(loaded_image, '.', '1') <= regexp_replace(loaded_image, '.', '2')
+           AND (regexp_replace(loaded_image, '.', '1') <> regexp_replace(loaded_image, '.', '0')) IS TRUE
+           AND (regexp_replace(loaded_image, '.', '1') = regexp_replace(loaded_image, '.', '0')) IS NOT TRUE
+           AND (regexp_replace(loaded_image, '.', '1') = regexp_replace(loaded_image, '.', '0')) IS FALSE
+           AND (regexp_replace(loaded_image, '.', '1') <> regexp_replace(loaded_image, '.', '0')) IS NOT FALSE
+           AND regexp_replace(loaded_image, '.', '1') BETWEEN regexp_replace(loaded_image, '.', '0') AND regexp_replace(loaded_image, '.', '2')
+           AND regexp_replace(loaded_image, '.', '1') NOT BETWEEN regexp_replace(loaded_image, '.', '1') AND regexp_replace(loaded_image, '.', '0')
+           AND regexp_replace(loaded_image, '.', '1') like '%'
+           AND regexp_replace(loaded_image, '.', '1') not like '__DOES_NOT_EXIST__%'
+           AND regexp_replace(loaded_image, '.', '1') IN (regexp_replace(loaded_image, '.', '0'),
+                                                          regexp_replace(loaded_image, '.', '1'),
+                                                          regexp_replace(loaded_image, '.', '2'))
+           AND regexp_replace(loaded_image, '.', '1') NOT IN (regexp_replace(loaded_image, '.', '0'),
+                                                              regexp_replace(loaded_image, '.', '2')))) ;
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND (regexp_replace(loaded_image, '.', '1') IS NULL
+       OR regexp_replace(loaded_image, '.', '1') IN
+         (SELECT regexp_replace(loaded_image, '.', '1')
+          FROM kttm_nested
+          WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+            AND (regexp_replace(loaded_image, '.', '1') IS NULL
+                 OR (regexp_replace(loaded_image, '.', '1') = regexp_replace(loaded_image, '.', '1')
+                     AND regexp_replace(loaded_image, '.', '1') IS NOT DISTINCT
+                     FROM regexp_replace(loaded_image, '.', '1')
+                     AND regexp_replace(loaded_image, '.', '1') <> regexp_replace(loaded_image, '.', '0')
+                     AND (regexp_replace(loaded_image, '.', '1') IS DISTINCT
+                          FROM regexp_replace(loaded_image, '.', '0'))
+                     AND regexp_replace(loaded_image, '.', '1') > regexp_replace(loaded_image, '.', '0')
+                     AND regexp_replace(loaded_image, '.', '1') >= regexp_replace(loaded_image, '.', '0')
+                     AND regexp_replace(loaded_image, '.', '1') < regexp_replace(loaded_image, '.', '2')
+                     AND regexp_replace(loaded_image, '.', '1') <= regexp_replace(loaded_image, '.', '2')
+                     AND (regexp_replace(loaded_image, '.', '1') <> regexp_replace(loaded_image, '.', '0')) IS TRUE
+                     AND (regexp_replace(loaded_image, '.', '1') = regexp_replace(loaded_image, '.', '0')) IS NOT TRUE
+                     AND (regexp_replace(loaded_image, '.', '1') = regexp_replace(loaded_image, '.', '0')) IS FALSE
+                     AND (regexp_replace(loaded_image, '.', '1') <> regexp_replace(loaded_image, '.', '0')) IS NOT FALSE
+                     AND regexp_replace(loaded_image, '.', '1') BETWEEN regexp_replace(loaded_image, '.', '0') AND regexp_replace(loaded_image, '.', '2')
+                     AND regexp_replace(loaded_image, '.', '1') NOT BETWEEN regexp_replace(loaded_image, '.', '1') AND regexp_replace(loaded_image, '.', '0')
+                     AND regexp_replace(loaded_image, '.', '1') like '%'
+                     AND regexp_replace(loaded_image, '.', '1') not like '__DOES_NOT_EXIST__%'
+                     AND regexp_replace(loaded_image, '.', '1') IN (regexp_replace(loaded_image, '.', '0'),
+                                                                    regexp_replace(loaded_image, '.', '1'),
+                                                                    regexp_replace(loaded_image, '.', '2'))
+                     AND regexp_replace(loaded_image, '.', '1') NOT IN (regexp_replace(loaded_image, '.', '0'),
+                                                                        regexp_replace(loaded_image, '.', '2'))))));
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM
+  (SELECT __time, number, client_ip,
+                          regexp_replace(loaded_image, '.', '1'),
+                          count(*)
+   FROM kttm_nested
+   WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+     AND (regexp_replace(loaded_image, '.', '1') IS NULL
+          OR (regexp_replace(loaded_image, '.', '1') = regexp_replace(loaded_image, '.', '1')
+              AND regexp_replace(loaded_image, '.', '1') IS NOT DISTINCT
+              FROM regexp_replace(loaded_image, '.', '1')
+              AND regexp_replace(loaded_image, '.', '1') <> regexp_replace(loaded_image, '.', '0')
+              AND (regexp_replace(loaded_image, '.', '1') IS DISTINCT
+                   FROM regexp_replace(loaded_image, '.', '0'))
+              AND regexp_replace(loaded_image, '.', '1') > regexp_replace(loaded_image, '.', '0')
+              AND regexp_replace(loaded_image, '.', '1') >= regexp_replace(loaded_image, '.', '0')
+              AND regexp_replace(loaded_image, '.', '1') < regexp_replace(loaded_image, '.', '2')
+              AND regexp_replace(loaded_image, '.', '1') <= regexp_replace(loaded_image, '.', '2')
+              AND (regexp_replace(loaded_image, '.', '1') <> regexp_replace(loaded_image, '.', '0')) IS TRUE
+              AND (regexp_replace(loaded_image, '.', '1') = regexp_replace(loaded_image, '.', '0')) IS NOT TRUE
+              AND (regexp_replace(loaded_image, '.', '1') = regexp_replace(loaded_image, '.', '0')) IS FALSE
+              AND (regexp_replace(loaded_image, '.', '1') <> regexp_replace(loaded_image, '.', '0')) IS NOT FALSE
+              AND regexp_replace(loaded_image, '.', '1') BETWEEN regexp_replace(loaded_image, '.', '0') AND regexp_replace(loaded_image, '.', '2')
+              AND regexp_replace(loaded_image, '.', '1') NOT BETWEEN regexp_replace(loaded_image, '.', '1') AND regexp_replace(loaded_image, '.', '0')
+              AND regexp_replace(loaded_image, '.', '1') like '%'
+              AND regexp_replace(loaded_image, '.', '1') not like '__DOES_NOT_EXIST__%'
+              AND regexp_replace(loaded_image, '.', '1') IN (regexp_replace(loaded_image, '.', '0'),
+                                                             regexp_replace(loaded_image, '.', '1'),
+                                                             regexp_replace(loaded_image, '.', '2'))
+              AND regexp_replace(loaded_image, '.', '1') NOT IN (regexp_replace(loaded_image, '.', '0'),
+                                                                 regexp_replace(loaded_image, '.', '2'))))
+   GROUP BY 1,
+            2,
+            3,
+            4);
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+#-------------------------------------------------------------------------
+# TEST_ID: A17: contains_string
+#-------------------------------------------------------------------------
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND ('1'||contains_string(loaded_image, 'a') IS NULL
+       OR ('1'||contains_string(loaded_image, 'a') = 1||contains_string(loaded_image, 'a')
+           AND '1'||contains_string(loaded_image, 'a') IS NOT DISTINCT
+           FROM 1||contains_string(loaded_image, 'a')
+           AND '1'||contains_string(loaded_image, 'a') <> '0'||contains_string(loaded_image, 'a')
+           AND ('1'||contains_string(loaded_image, 'a') IS DISTINCT
+                FROM '0'||contains_string(loaded_image, 'a'))
+           AND '1'||contains_string(loaded_image, 'a') > '0'||contains_string(loaded_image, 'a')
+           AND '1'||contains_string(loaded_image, 'a') >= '0'||contains_string(loaded_image, 'a')
+           AND '1'||contains_string(loaded_image, 'a') < 2||contains_string(loaded_image, 'a')
+           AND '1'||contains_string(loaded_image, 'a') <= 2||contains_string(loaded_image, 'a')
+           AND ('1'||contains_string(loaded_image, 'a') <> '0'||contains_string(loaded_image, 'a')) IS TRUE
+           AND ('1'||contains_string(loaded_image, 'a') = '0'||contains_string(loaded_image, 'a')) IS NOT TRUE
+           AND ('1'||contains_string(loaded_image, 'a') = '0'||contains_string(loaded_image, 'a')) IS FALSE
+           AND ('1'||contains_string(loaded_image, 'a') <> '0'||contains_string(loaded_image, 'a')) IS NOT FALSE
+           AND '1'||contains_string(loaded_image, 'a') BETWEEN '0'||contains_string(loaded_image, 'a') AND 2||contains_string(loaded_image, 'a')
+           AND '1'||contains_string(loaded_image, 'a') NOT BETWEEN '1'||contains_string(loaded_image, 'a') AND '0'||contains_string(loaded_image, 'a')
+           AND '1'||contains_string(loaded_image, 'a') like '%'
+           AND '1'||contains_string(loaded_image, 'a') not like '__DOES_NOT_EXIST__%'
+           AND '1'||contains_string(loaded_image, 'a') IN ('0'||contains_string(loaded_image, 'a'),
+                                                           1||contains_string(loaded_image, 'a'),
+                                                           2||contains_string(loaded_image, 'a'))
+           AND '1'||contains_string(loaded_image, 'a') NOT IN ('0'||contains_string(loaded_image, 'a'),
+                                                               2||contains_string(loaded_image, 'a')))) ;
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND ('1'||contains_string(loaded_image, 'a') IS NULL
+       OR '1'||contains_string(loaded_image, 'a') IN
+         (SELECT '1'||contains_string(loaded_image, 'a')
+          FROM kttm_nested
+          WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+            AND ('1'||contains_string(loaded_image, 'a') IS NULL
+                 OR ('1'||contains_string(loaded_image, 'a') = 1||contains_string(loaded_image, 'a')
+                     AND '1'||contains_string(loaded_image, 'a') IS NOT DISTINCT
+                     FROM 1||contains_string(loaded_image, 'a')
+                     AND '1'||contains_string(loaded_image, 'a') <> '0'||contains_string(loaded_image, 'a')
+                     AND ('1'||contains_string(loaded_image, 'a') IS DISTINCT
+                          FROM '0'||contains_string(loaded_image, 'a'))
+                     AND '1'||contains_string(loaded_image, 'a') > '0'||contains_string(loaded_image, 'a')
+                     AND '1'||contains_string(loaded_image, 'a') >= '0'||contains_string(loaded_image, 'a')
+                     AND '1'||contains_string(loaded_image, 'a') < 2||contains_string(loaded_image, 'a')
+                     AND '1'||contains_string(loaded_image, 'a') <= 2||contains_string(loaded_image, 'a')
+                     AND ('1'||contains_string(loaded_image, 'a') <> '0'||contains_string(loaded_image, 'a')) IS TRUE
+                     AND ('1'||contains_string(loaded_image, 'a') = '0'||contains_string(loaded_image, 'a')) IS NOT TRUE
+                     AND ('1'||contains_string(loaded_image, 'a') = '0'||contains_string(loaded_image, 'a')) IS FALSE
+                     AND ('1'||contains_string(loaded_image, 'a') <> '0'||contains_string(loaded_image, 'a')) IS NOT FALSE
+                     AND '1'||contains_string(loaded_image, 'a') BETWEEN '0'||contains_string(loaded_image, 'a') AND 2||contains_string(loaded_image, 'a')
+                     AND '1'||contains_string(loaded_image, 'a') NOT BETWEEN '1'||contains_string(loaded_image, 'a') AND '0'||contains_string(loaded_image, 'a')
+                     AND '1'||contains_string(loaded_image, 'a') like '%'
+                     AND '1'||contains_string(loaded_image, 'a') not like '__DOES_NOT_EXIST__%'
+                     AND '1'||contains_string(loaded_image, 'a') IN ('0'||contains_string(loaded_image, 'a'),
+                                                                     1||contains_string(loaded_image, 'a'),
+                                                                     2||contains_string(loaded_image, 'a'))
+                     AND '1'||contains_string(loaded_image, 'a') NOT IN ('0'||contains_string(loaded_image, 'a'),
+                                                                         2||contains_string(loaded_image, 'a'))))));
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM
+  (SELECT __time, number, client_ip,
+                          '1'||contains_string(loaded_image, 'a'),
+                          count(*)
+   FROM kttm_nested
+   WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+     AND ('1'||contains_string(loaded_image, 'a') IS NULL
+          OR ('1'||contains_string(loaded_image, 'a') = 1||contains_string(loaded_image, 'a')
+              AND '1'||contains_string(loaded_image, 'a') IS NOT DISTINCT
+              FROM 1||contains_string(loaded_image, 'a')
+              AND '1'||contains_string(loaded_image, 'a') <> '0'||contains_string(loaded_image, 'a')
+              AND ('1'||contains_string(loaded_image, 'a') IS DISTINCT
+                   FROM '0'||contains_string(loaded_image, 'a'))
+              AND '1'||contains_string(loaded_image, 'a') > '0'||contains_string(loaded_image, 'a')
+              AND '1'||contains_string(loaded_image, 'a') >= '0'||contains_string(loaded_image, 'a')
+              AND '1'||contains_string(loaded_image, 'a') < 2||contains_string(loaded_image, 'a')
+              AND '1'||contains_string(loaded_image, 'a') <= 2||contains_string(loaded_image, 'a')
+              AND ('1'||contains_string(loaded_image, 'a') <> '0'||contains_string(loaded_image, 'a')) IS TRUE
+              AND ('1'||contains_string(loaded_image, 'a') = '0'||contains_string(loaded_image, 'a')) IS NOT TRUE
+              AND ('1'||contains_string(loaded_image, 'a') = '0'||contains_string(loaded_image, 'a')) IS FALSE
+              AND ('1'||contains_string(loaded_image, 'a') <> '0'||contains_string(loaded_image, 'a')) IS NOT FALSE
+              AND '1'||contains_string(loaded_image, 'a') BETWEEN '0'||contains_string(loaded_image, 'a') AND 2||contains_string(loaded_image, 'a')
+              AND '1'||contains_string(loaded_image, 'a') NOT BETWEEN '1'||contains_string(loaded_image, 'a') AND '0'||contains_string(loaded_image, 'a')
+              AND '1'||contains_string(loaded_image, 'a') like '%'
+              AND '1'||contains_string(loaded_image, 'a') not like '__DOES_NOT_EXIST__%'
+              AND '1'||contains_string(loaded_image, 'a') IN ('0'||contains_string(loaded_image, 'a'),
+                                                              1||contains_string(loaded_image, 'a'),
+                                                              2||contains_string(loaded_image, 'a'))
+              AND '1'||contains_string(loaded_image, 'a') NOT IN ('0'||contains_string(loaded_image, 'a'),
+                                                                  2||contains_string(loaded_image, 'a'))))
+   GROUP BY 1,
+            2,
+            3,
+            4);
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+#-------------------------------------------------------------------------
+# TEST_ID: A18: icontains_string
+#-------------------------------------------------------------------------
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND ('1'||icontains_string(loaded_image, 'a') IS NULL
+       OR ('1'||icontains_string(loaded_image, 'a') = 1||icontains_string(loaded_image, 'a')
+           AND '1'||icontains_string(loaded_image, 'a') IS NOT DISTINCT
+           FROM 1||icontains_string(loaded_image, 'a')
+           AND '1'||icontains_string(loaded_image, 'a') <> '0'||icontains_string(loaded_image, 'a')
+           AND ('1'||icontains_string(loaded_image, 'a') IS DISTINCT
+                FROM '0'||icontains_string(loaded_image, 'a'))
+           AND '1'||icontains_string(loaded_image, 'a') > '0'||icontains_string(loaded_image, 'a')
+           AND '1'||icontains_string(loaded_image, 'a') >= '0'||icontains_string(loaded_image, 'a')
+           AND '1'||icontains_string(loaded_image, 'a') < 2||icontains_string(loaded_image, 'a')
+           AND '1'||icontains_string(loaded_image, 'a') <= 2||icontains_string(loaded_image, 'a')
+           AND ('1'||icontains_string(loaded_image, 'a') <> '0'||icontains_string(loaded_image, 'a')) IS TRUE
+           AND ('1'||icontains_string(loaded_image, 'a') = '0'||icontains_string(loaded_image, 'a')) IS NOT TRUE
+           AND ('1'||icontains_string(loaded_image, 'a') = '0'||icontains_string(loaded_image, 'a')) IS FALSE
+           AND ('1'||icontains_string(loaded_image, 'a') <> '0'||icontains_string(loaded_image, 'a')) IS NOT FALSE
+           AND '1'||icontains_string(loaded_image, 'a') BETWEEN '0'||icontains_string(loaded_image, 'a') AND 2||icontains_string(loaded_image, 'a')
+           AND '1'||icontains_string(loaded_image, 'a') NOT BETWEEN '1'||icontains_string(loaded_image, 'a') AND '0'||icontains_string(loaded_image, 'a')
+           AND '1'||icontains_string(loaded_image, 'a') like '%'
+           AND '1'||icontains_string(loaded_image, 'a') not like '__DOES_NOT_EXIST__%'
+           AND '1'||icontains_string(loaded_image, 'a') IN ('0'||icontains_string(loaded_image, 'a'),
+                                                            1||icontains_string(loaded_image, 'a'),
+                                                            2||icontains_string(loaded_image, 'a'))
+           AND '1'||icontains_string(loaded_image, 'a') NOT IN ('0'||icontains_string(loaded_image, 'a'),
+                                                                2||icontains_string(loaded_image, 'a')))) ;
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND ('1'||icontains_string(loaded_image, 'a') IS NULL
+       OR '1'||icontains_string(loaded_image, 'a') IN
+         (SELECT '1'||icontains_string(loaded_image, 'a')
+          FROM kttm_nested
+          WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+            AND ('1'||icontains_string(loaded_image, 'a') IS NULL
+                 OR ('1'||icontains_string(loaded_image, 'a') = 1||icontains_string(loaded_image, 'a')
+                     AND '1'||icontains_string(loaded_image, 'a') IS NOT DISTINCT
+                     FROM 1||icontains_string(loaded_image, 'a')
+                     AND '1'||icontains_string(loaded_image, 'a') <> '0'||icontains_string(loaded_image, 'a')
+                     AND ('1'||icontains_string(loaded_image, 'a') IS DISTINCT
+                          FROM '0'||icontains_string(loaded_image, 'a'))
+                     AND '1'||icontains_string(loaded_image, 'a') > '0'||icontains_string(loaded_image, 'a')
+                     AND '1'||icontains_string(loaded_image, 'a') >= '0'||icontains_string(loaded_image, 'a')
+                     AND '1'||icontains_string(loaded_image, 'a') < 2||icontains_string(loaded_image, 'a')
+                     AND '1'||icontains_string(loaded_image, 'a') <= 2||icontains_string(loaded_image, 'a')
+                     AND ('1'||icontains_string(loaded_image, 'a') <> '0'||icontains_string(loaded_image, 'a')) IS TRUE
+                     AND ('1'||icontains_string(loaded_image, 'a') = '0'||icontains_string(loaded_image, 'a')) IS NOT TRUE
+                     AND ('1'||icontains_string(loaded_image, 'a') = '0'||icontains_string(loaded_image, 'a')) IS FALSE
+                     AND ('1'||icontains_string(loaded_image, 'a') <> '0'||icontains_string(loaded_image, 'a')) IS NOT FALSE
+                     AND '1'||icontains_string(loaded_image, 'a') BETWEEN '0'||icontains_string(loaded_image, 'a') AND 2||icontains_string(loaded_image, 'a')
+                     AND '1'||icontains_string(loaded_image, 'a') NOT BETWEEN '1'||icontains_string(loaded_image, 'a') AND '0'||icontains_string(loaded_image, 'a')
+                     AND '1'||icontains_string(loaded_image, 'a') like '%'
+                     AND '1'||icontains_string(loaded_image, 'a') not like '__DOES_NOT_EXIST__%'
+                     AND '1'||icontains_string(loaded_image, 'a') IN ('0'||icontains_string(loaded_image, 'a'),
+                                                                      1||icontains_string(loaded_image, 'a'),
+                                                                      2||icontains_string(loaded_image, 'a'))
+                     AND '1'||icontains_string(loaded_image, 'a') NOT IN ('0'||icontains_string(loaded_image, 'a'),
+                                                                          2||icontains_string(loaded_image, 'a'))))));
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM
+  (SELECT __time, number, client_ip,
+                          '1'||icontains_string(loaded_image, 'a'),
+                          count(*)
+   FROM kttm_nested
+   WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+     AND ('1'||icontains_string(loaded_image, 'a') IS NULL
+          OR ('1'||icontains_string(loaded_image, 'a') = 1||icontains_string(loaded_image, 'a')
+              AND '1'||icontains_string(loaded_image, 'a') IS NOT DISTINCT
+              FROM 1||icontains_string(loaded_image, 'a')
+              AND '1'||icontains_string(loaded_image, 'a') <> '0'||icontains_string(loaded_image, 'a')
+              AND ('1'||icontains_string(loaded_image, 'a') IS DISTINCT
+                   FROM '0'||icontains_string(loaded_image, 'a'))
+              AND '1'||icontains_string(loaded_image, 'a') > '0'||icontains_string(loaded_image, 'a')
+              AND '1'||icontains_string(loaded_image, 'a') >= '0'||icontains_string(loaded_image, 'a')
+              AND '1'||icontains_string(loaded_image, 'a') < 2||icontains_string(loaded_image, 'a')
+              AND '1'||icontains_string(loaded_image, 'a') <= 2||icontains_string(loaded_image, 'a')
+              AND ('1'||icontains_string(loaded_image, 'a') <> '0'||icontains_string(loaded_image, 'a')) IS TRUE
+              AND ('1'||icontains_string(loaded_image, 'a') = '0'||icontains_string(loaded_image, 'a')) IS NOT TRUE
+              AND ('1'||icontains_string(loaded_image, 'a') = '0'||icontains_string(loaded_image, 'a')) IS FALSE
+              AND ('1'||icontains_string(loaded_image, 'a') <> '0'||icontains_string(loaded_image, 'a')) IS NOT FALSE
+              AND '1'||icontains_string(loaded_image, 'a') BETWEEN '0'||icontains_string(loaded_image, 'a') AND 2||icontains_string(loaded_image, 'a')
+              AND '1'||icontains_string(loaded_image, 'a') NOT BETWEEN '1'||icontains_string(loaded_image, 'a') AND '0'||icontains_string(loaded_image, 'a')
+              AND '1'||icontains_string(loaded_image, 'a') like '%'
+              AND '1'||icontains_string(loaded_image, 'a') not like '__DOES_NOT_EXIST__%'
+              AND '1'||icontains_string(loaded_image, 'a') IN ('0'||icontains_string(loaded_image, 'a'),
+                                                               1||icontains_string(loaded_image, 'a'),
+                                                               2||icontains_string(loaded_image, 'a'))
+              AND '1'||icontains_string(loaded_image, 'a') NOT IN ('0'||icontains_string(loaded_image, 'a'),
+                                                                   2||icontains_string(loaded_image, 'a'))))
+   GROUP BY 1,
+            2,
+            3,
+            4);
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+#-------------------------------------------------------------------------
+# TEST_ID: A19: replace
+#-------------------------------------------------------------------------
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND ('1'||replace(loaded_image, 'a', 'z') IS NULL
+       OR ('1'||replace(loaded_image, 'a', 'z') = 1||replace(loaded_image, 'a', 'z')
+           AND '1'||replace(loaded_image, 'a', 'z') IS NOT DISTINCT
+           FROM 1||replace(loaded_image, 'a', 'z')
+           AND '1'||replace(loaded_image, 'a', 'z') <> '0'||replace(loaded_image, 'a', 'z')
+           AND ('1'||replace(loaded_image, 'a', 'z') IS DISTINCT
+                FROM '0'||replace(loaded_image, 'a', 'z'))
+           AND '1'||replace(loaded_image, 'a', 'z') > '0'||replace(loaded_image, 'a', 'z')
+           AND '1'||replace(loaded_image, 'a', 'z') >= '0'||replace(loaded_image, 'a', 'z')
+           AND '1'||replace(loaded_image, 'a', 'z') < 2||replace(loaded_image, 'a', 'z')
+           AND '1'||replace(loaded_image, 'a', 'z') <= 2||replace(loaded_image, 'a', 'z')
+           AND ('1'||replace(loaded_image, 'a', 'z') <> '0'||replace(loaded_image, 'a', 'z')) IS TRUE
+           AND ('1'||replace(loaded_image, 'a', 'z') = '0'||replace(loaded_image, 'a', 'z')) IS NOT TRUE
+           AND ('1'||replace(loaded_image, 'a', 'z') = '0'||replace(loaded_image, 'a', 'z')) IS FALSE
+           AND ('1'||replace(loaded_image, 'a', 'z') <> '0'||replace(loaded_image, 'a', 'z')) IS NOT FALSE
+           AND '1'||replace(loaded_image, 'a', 'z') BETWEEN '0'||replace(loaded_image, 'a', 'z') AND 2||replace(loaded_image, 'a', 'z')
+           AND '1'||replace(loaded_image, 'a', 'z') NOT BETWEEN '1'||replace(loaded_image, 'a', 'z') AND '0'||replace(loaded_image, 'a', 'z')
+           AND '1'||replace(loaded_image, 'a', 'z') like '%'
+           AND '1'||replace(loaded_image, 'a', 'z') not like '__DOES_NOT_EXIST__%'
+           AND '1'||replace(loaded_image, 'a', 'z') IN ('0'||replace(loaded_image, 'a', 'z'),
+                                                        1||replace(loaded_image, 'a', 'z'),
+                                                        2||replace(loaded_image, 'a', 'z'))
+           AND '1'||replace(loaded_image, 'a', 'z') NOT IN ('0'||replace(loaded_image, 'a', 'z'),
+                                                            2||replace(loaded_image, 'a', 'z')))) ;
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND ('1'||replace(loaded_image, 'a', 'z') IS NULL
+       OR '1'||replace(loaded_image, 'a', 'z') IN
+         (SELECT '1'||replace(loaded_image, 'a', 'z')
+          FROM kttm_nested
+          WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+            AND ('1'||replace(loaded_image, 'a', 'z') IS NULL
+                 OR ('1'||replace(loaded_image, 'a', 'z') = 1||replace(loaded_image, 'a', 'z')
+                     AND '1'||replace(loaded_image, 'a', 'z') IS NOT DISTINCT
+                     FROM 1||replace(loaded_image, 'a', 'z')
+                     AND '1'||replace(loaded_image, 'a', 'z') <> '0'||replace(loaded_image, 'a', 'z')
+                     AND ('1'||replace(loaded_image, 'a', 'z') IS DISTINCT
+                          FROM '0'||replace(loaded_image, 'a', 'z'))
+                     AND '1'||replace(loaded_image, 'a', 'z') > '0'||replace(loaded_image, 'a', 'z')
+                     AND '1'||replace(loaded_image, 'a', 'z') >= '0'||replace(loaded_image, 'a', 'z')
+                     AND '1'||replace(loaded_image, 'a', 'z') < 2||replace(loaded_image, 'a', 'z')
+                     AND '1'||replace(loaded_image, 'a', 'z') <= 2||replace(loaded_image, 'a', 'z')
+                     AND ('1'||replace(loaded_image, 'a', 'z') <> '0'||replace(loaded_image, 'a', 'z')) IS TRUE
+                     AND ('1'||replace(loaded_image, 'a', 'z') = '0'||replace(loaded_image, 'a', 'z')) IS NOT TRUE
+                     AND ('1'||replace(loaded_image, 'a', 'z') = '0'||replace(loaded_image, 'a', 'z')) IS FALSE
+                     AND ('1'||replace(loaded_image, 'a', 'z') <> '0'||replace(loaded_image, 'a', 'z')) IS NOT FALSE
+                     AND '1'||replace(loaded_image, 'a', 'z') BETWEEN '0'||replace(loaded_image, 'a', 'z') AND 2||replace(loaded_image, 'a', 'z')
+                     AND '1'||replace(loaded_image, 'a', 'z') NOT BETWEEN '1'||replace(loaded_image, 'a', 'z') AND '0'||replace(loaded_image, 'a', 'z')
+                     AND '1'||replace(loaded_image, 'a', 'z') like '%'
+                     AND '1'||replace(loaded_image, 'a', 'z') not like '__DOES_NOT_EXIST__%'
+                     AND '1'||replace(loaded_image, 'a', 'z') IN ('0'||replace(loaded_image, 'a', 'z'),
+                                                                  1||replace(loaded_image, 'a', 'z'),
+                                                                  2||replace(loaded_image, 'a', 'z'))
+                     AND '1'||replace(loaded_image, 'a', 'z') NOT IN ('0'||replace(loaded_image, 'a', 'z'),
+                                                                      2||replace(loaded_image, 'a', 'z'))))));
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM
+  (SELECT __time, number, client_ip,
+                          '1'||replace(loaded_image, 'a', 'z'),
+                          count(*)
+   FROM kttm_nested
+   WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+     AND ('1'||replace(loaded_image, 'a', 'z') IS NULL
+          OR ('1'||replace(loaded_image, 'a', 'z') = 1||replace(loaded_image, 'a', 'z')
+              AND '1'||replace(loaded_image, 'a', 'z') IS NOT DISTINCT
+              FROM 1||replace(loaded_image, 'a', 'z')
+              AND '1'||replace(loaded_image, 'a', 'z') <> '0'||replace(loaded_image, 'a', 'z')
+              AND ('1'||replace(loaded_image, 'a', 'z') IS DISTINCT
+                   FROM '0'||replace(loaded_image, 'a', 'z'))
+              AND '1'||replace(loaded_image, 'a', 'z') > '0'||replace(loaded_image, 'a', 'z')
+              AND '1'||replace(loaded_image, 'a', 'z') >= '0'||replace(loaded_image, 'a', 'z')
+              AND '1'||replace(loaded_image, 'a', 'z') < 2||replace(loaded_image, 'a', 'z')
+              AND '1'||replace(loaded_image, 'a', 'z') <= 2||replace(loaded_image, 'a', 'z')
+              AND ('1'||replace(loaded_image, 'a', 'z') <> '0'||replace(loaded_image, 'a', 'z')) IS TRUE
+              AND ('1'||replace(loaded_image, 'a', 'z') = '0'||replace(loaded_image, 'a', 'z')) IS NOT TRUE
+              AND ('1'||replace(loaded_image, 'a', 'z') = '0'||replace(loaded_image, 'a', 'z')) IS FALSE
+              AND ('1'||replace(loaded_image, 'a', 'z') <> '0'||replace(loaded_image, 'a', 'z')) IS NOT FALSE
+              AND '1'||replace(loaded_image, 'a', 'z') BETWEEN '0'||replace(loaded_image, 'a', 'z') AND 2||replace(loaded_image, 'a', 'z')
+              AND '1'||replace(loaded_image, 'a', 'z') NOT BETWEEN '1'||replace(loaded_image, 'a', 'z') AND '0'||replace(loaded_image, 'a', 'z')
+              AND '1'||replace(loaded_image, 'a', 'z') like '%'
+              AND '1'||replace(loaded_image, 'a', 'z') not like '__DOES_NOT_EXIST__%'
+              AND '1'||replace(loaded_image, 'a', 'z') IN ('0'||replace(loaded_image, 'a', 'z'),
+                                                           1||replace(loaded_image, 'a', 'z'),
+                                                           2||replace(loaded_image, 'a', 'z'))
+              AND '1'||replace(loaded_image, 'a', 'z') NOT IN ('0'||replace(loaded_image, 'a', 'z'),
+                                                               2||replace(loaded_image, 'a', 'z'))))
+   GROUP BY 1,
+            2,
+            3,
+            4);
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+#-------------------------------------------------------------------------
+# TEST_ID: A20: strpos
+#-------------------------------------------------------------------------
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND (strpos(loaded_image, 'a')+1 IS NULL
+       OR (strpos(loaded_image, 'a')+1 = strpos(loaded_image, 'a')+1
+           AND strpos(loaded_image, 'a')+1 IS NOT DISTINCT
+           FROM strpos(loaded_image, 'a')+1
+           AND strpos(loaded_image, 'a')+1 <> strpos(loaded_image, 'a')
+           AND (strpos(loaded_image, 'a')+1 IS DISTINCT
+                FROM strpos(loaded_image, 'a'))
+           AND strpos(loaded_image, 'a')+1 > strpos(loaded_image, 'a')
+           AND strpos(loaded_image, 'a')+1 >= strpos(loaded_image, 'a')
+           AND strpos(loaded_image, 'a')+1 < strpos(loaded_image, 'a')+2
+           AND strpos(loaded_image, 'a')+1 <= strpos(loaded_image, 'a')+2
+           AND (strpos(loaded_image, 'a')+1 <> strpos(loaded_image, 'a')) IS TRUE
+           AND (strpos(loaded_image, 'a')+1 = strpos(loaded_image, 'a')) IS NOT TRUE
+           AND (strpos(loaded_image, 'a')+1 = strpos(loaded_image, 'a')) IS FALSE
+           AND (strpos(loaded_image, 'a')+1 <> strpos(loaded_image, 'a')) IS NOT FALSE
+           AND strpos(loaded_image, 'a')+1 BETWEEN strpos(loaded_image, 'a') AND strpos(loaded_image, 'a')+2
+           AND strpos(loaded_image, 'a')+1 NOT BETWEEN strpos(loaded_image, 'a')+1 AND strpos(loaded_image, 'a')
+           AND strpos(loaded_image, 'a')+1 like '%'
+           AND strpos(loaded_image, 'a')+1 not like '__DOES_NOT_EXIST__%'
+           AND strpos(loaded_image, 'a')+1 IN (strpos(loaded_image, 'a'),
+                                               strpos(loaded_image, 'a')+1,
+                                               strpos(loaded_image, 'a')+2)
+           AND strpos(loaded_image, 'a')+1 NOT IN (strpos(loaded_image, 'a'),
+                                                   strpos(loaded_image, 'a')+2))) ;
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND (strpos(loaded_image, 'a')+1 IS NULL
+       OR strpos(loaded_image, 'a')+1 IN
+         (SELECT strpos(loaded_image, 'a')+1
+          FROM kttm_nested
+          WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+            AND (strpos(loaded_image, 'a')+1 IS NULL
+                 OR (strpos(loaded_image, 'a')+1 = strpos(loaded_image, 'a')+1
+                     AND strpos(loaded_image, 'a')+1 IS NOT DISTINCT
+                     FROM strpos(loaded_image, 'a')+1
+                     AND strpos(loaded_image, 'a')+1 <> strpos(loaded_image, 'a')
+                     AND (strpos(loaded_image, 'a')+1 IS DISTINCT
+                          FROM strpos(loaded_image, 'a'))
+                     AND strpos(loaded_image, 'a')+1 > strpos(loaded_image, 'a')
+                     AND strpos(loaded_image, 'a')+1 >= strpos(loaded_image, 'a')
+                     AND strpos(loaded_image, 'a')+1 < strpos(loaded_image, 'a')+2
+                     AND strpos(loaded_image, 'a')+1 <= strpos(loaded_image, 'a')+2
+                     AND (strpos(loaded_image, 'a')+1 <> strpos(loaded_image, 'a')) IS TRUE
+                     AND (strpos(loaded_image, 'a')+1 = strpos(loaded_image, 'a')) IS NOT TRUE
+                     AND (strpos(loaded_image, 'a')+1 = strpos(loaded_image, 'a')) IS FALSE
+                     AND (strpos(loaded_image, 'a')+1 <> strpos(loaded_image, 'a')) IS NOT FALSE
+                     AND strpos(loaded_image, 'a')+1 BETWEEN strpos(loaded_image, 'a') AND strpos(loaded_image, 'a')+2
+                     AND strpos(loaded_image, 'a')+1 NOT BETWEEN strpos(loaded_image, 'a')+1 AND strpos(loaded_image, 'a')
+                     AND strpos(loaded_image, 'a')+1 like '%'
+                     AND strpos(loaded_image, 'a')+1 not like '__DOES_NOT_EXIST__%'
+                     AND strpos(loaded_image, 'a')+1 IN (strpos(loaded_image, 'a'),
+                                                         strpos(loaded_image, 'a')+1,
+                                                         strpos(loaded_image, 'a')+2)
+                     AND strpos(loaded_image, 'a')+1 NOT IN (strpos(loaded_image, 'a'),
+                                                             strpos(loaded_image, 'a')+2)))));
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM
+  (SELECT __time, number, client_ip,
+                          strpos(loaded_image, 'a')+1,
+                          count(*)
+   FROM kttm_nested
+   WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+     AND (strpos(loaded_image, 'a')+1 IS NULL
+          OR (strpos(loaded_image, 'a')+1 = strpos(loaded_image, 'a')+1
+              AND strpos(loaded_image, 'a')+1 IS NOT DISTINCT
+              FROM strpos(loaded_image, 'a')+1
+              AND strpos(loaded_image, 'a')+1 <> strpos(loaded_image, 'a')
+              AND (strpos(loaded_image, 'a')+1 IS DISTINCT
+                   FROM strpos(loaded_image, 'a'))
+              AND strpos(loaded_image, 'a')+1 > strpos(loaded_image, 'a')
+              AND strpos(loaded_image, 'a')+1 >= strpos(loaded_image, 'a')
+              AND strpos(loaded_image, 'a')+1 < strpos(loaded_image, 'a')+2
+              AND strpos(loaded_image, 'a')+1 <= strpos(loaded_image, 'a')+2
+              AND (strpos(loaded_image, 'a')+1 <> strpos(loaded_image, 'a')) IS TRUE
+              AND (strpos(loaded_image, 'a')+1 = strpos(loaded_image, 'a')) IS NOT TRUE
+              AND (strpos(loaded_image, 'a')+1 = strpos(loaded_image, 'a')) IS FALSE
+              AND (strpos(loaded_image, 'a')+1 <> strpos(loaded_image, 'a')) IS NOT FALSE
+              AND strpos(loaded_image, 'a')+1 BETWEEN strpos(loaded_image, 'a') AND strpos(loaded_image, 'a')+2
+              AND strpos(loaded_image, 'a')+1 NOT BETWEEN strpos(loaded_image, 'a')+1 AND strpos(loaded_image, 'a')
+              AND strpos(loaded_image, 'a')+1 like '%'
+              AND strpos(loaded_image, 'a')+1 not like '__DOES_NOT_EXIST__%'
+              AND strpos(loaded_image, 'a')+1 IN (strpos(loaded_image, 'a'),
+                                                  strpos(loaded_image, 'a')+1,
+                                                  strpos(loaded_image, 'a')+2)
+              AND strpos(loaded_image, 'a')+1 NOT IN (strpos(loaded_image, 'a'),
+                                                      strpos(loaded_image, 'a')+2)))
+   GROUP BY 1,
+            2,
+            3,
+            4);
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+#-------------------------------------------------------------------------
+# TEST_ID: A21: substring
+#-------------------------------------------------------------------------
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND ('1'||substring(loaded_image, 1, length(loaded_image)) IS NULL
+       OR ('1'||substring(loaded_image, 1, length(loaded_image)) = 1||substring(loaded_image, 1, length(loaded_image))
+           AND '1'||substring(loaded_image, 1, length(loaded_image)) IS NOT DISTINCT
+           FROM 1||substring(loaded_image, 1, length(loaded_image))
+           AND '1'||substring(loaded_image, 1, length(loaded_image)) <> '0'||substring(loaded_image, 1, length(loaded_image))
+           AND ('1'||substring(loaded_image, 1, length(loaded_image)) IS DISTINCT
+                FROM '0'||substring(loaded_image, 1, length(loaded_image)))
+           AND '1'||substring(loaded_image, 1, length(loaded_image)) > '0'||substring(loaded_image, 1, length(loaded_image))
+           AND '1'||substring(loaded_image, 1, length(loaded_image)) >= '0'||substring(loaded_image, 1, length(loaded_image))
+           AND '1'||substring(loaded_image, 1, length(loaded_image)) < 2||substring(loaded_image, 1, length(loaded_image))
+           AND '1'||substring(loaded_image, 1, length(loaded_image)) <= 2||substring(loaded_image, 1, length(loaded_image))
+           AND ('1'||substring(loaded_image, 1, length(loaded_image)) <> '0'||substring(loaded_image, 1, length(loaded_image))) IS TRUE
+           AND ('1'||substring(loaded_image, 1, length(loaded_image)) = '0'||substring(loaded_image, 1, length(loaded_image))) IS NOT TRUE
+           AND ('1'||substring(loaded_image, 1, length(loaded_image)) = '0'||substring(loaded_image, 1, length(loaded_image))) IS FALSE
+           AND ('1'||substring(loaded_image, 1, length(loaded_image)) <> '0'||substring(loaded_image, 1, length(loaded_image))) IS NOT FALSE
+           AND '1'||substring(loaded_image, 1, length(loaded_image)) BETWEEN '0'||substring(loaded_image, 1, length(loaded_image)) AND 2||substring(loaded_image, 1, length(loaded_image))
+           AND '1'||substring(loaded_image, 1, length(loaded_image)) NOT BETWEEN '1'||substring(loaded_image, 1, length(loaded_image)) AND '0'||substring(loaded_image, 1, length(loaded_image))
+           AND '1'||substring(loaded_image, 1, length(loaded_image)) like '%'
+           AND '1'||substring(loaded_image, 1, length(loaded_image)) not like '__DOES_NOT_EXIST__%'
+           AND '1'||substring(loaded_image, 1, length(loaded_image)) IN ('0'||substring(loaded_image, 1, length(loaded_image)),
+                                                                         1||substring(loaded_image, 1, length(loaded_image)),
+                                                                         2||substring(loaded_image, 1, length(loaded_image)))
+           AND '1'||substring(loaded_image, 1, length(loaded_image)) NOT IN ('0'||substring(loaded_image, 1, length(loaded_image)),
+                                                                             2||substring(loaded_image, 1, length(loaded_image))))) ;
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND ('1'||substring(loaded_image, 1, length(loaded_image)) IS NULL
+       OR '1'||substring(loaded_image, 1, length(loaded_image)) IN
+         (SELECT '1'||substring(loaded_image, 1, length(loaded_image))
+          FROM kttm_nested
+          WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+            AND ('1'||substring(loaded_image, 1, length(loaded_image)) IS NULL
+                 OR ('1'||substring(loaded_image, 1, length(loaded_image)) = 1||substring(loaded_image, 1, length(loaded_image))
+                     AND '1'||substring(loaded_image, 1, length(loaded_image)) IS NOT DISTINCT
+                     FROM 1||substring(loaded_image, 1, length(loaded_image))
+                     AND '1'||substring(loaded_image, 1, length(loaded_image)) <> '0'||substring(loaded_image, 1, length(loaded_image))
+                     AND ('1'||substring(loaded_image, 1, length(loaded_image)) IS DISTINCT
+                          FROM '0'||substring(loaded_image, 1, length(loaded_image)))
+                     AND '1'||substring(loaded_image, 1, length(loaded_image)) > '0'||substring(loaded_image, 1, length(loaded_image))
+                     AND '1'||substring(loaded_image, 1, length(loaded_image)) >= '0'||substring(loaded_image, 1, length(loaded_image))
+                     AND '1'||substring(loaded_image, 1, length(loaded_image)) < 2||substring(loaded_image, 1, length(loaded_image))
+                     AND '1'||substring(loaded_image, 1, length(loaded_image)) <= 2||substring(loaded_image, 1, length(loaded_image))
+                     AND ('1'||substring(loaded_image, 1, length(loaded_image)) <> '0'||substring(loaded_image, 1, length(loaded_image))) IS TRUE
+                     AND ('1'||substring(loaded_image, 1, length(loaded_image)) = '0'||substring(loaded_image, 1, length(loaded_image))) IS NOT TRUE
+                     AND ('1'||substring(loaded_image, 1, length(loaded_image)) = '0'||substring(loaded_image, 1, length(loaded_image))) IS FALSE
+                     AND ('1'||substring(loaded_image, 1, length(loaded_image)) <> '0'||substring(loaded_image, 1, length(loaded_image))) IS NOT FALSE
+                     AND '1'||substring(loaded_image, 1, length(loaded_image)) BETWEEN '0'||substring(loaded_image, 1, length(loaded_image)) AND 2||substring(loaded_image, 1, length(loaded_image))
+                     AND '1'||substring(loaded_image, 1, length(loaded_image)) NOT BETWEEN '1'||substring(loaded_image, 1, length(loaded_image)) AND '0'||substring(loaded_image, 1, length(loaded_image))
+                     AND '1'||substring(loaded_image, 1, length(loaded_image)) like '%'
+                     AND '1'||substring(loaded_image, 1, length(loaded_image)) not like '__DOES_NOT_EXIST__%'
+                     AND '1'||substring(loaded_image, 1, length(loaded_image)) IN ('0'||substring(loaded_image, 1, length(loaded_image)),
+                                                                                   1||substring(loaded_image, 1, length(loaded_image)),
+                                                                                   2||substring(loaded_image, 1, length(loaded_image)))
+                     AND '1'||substring(loaded_image, 1, length(loaded_image)) NOT IN ('0'||substring(loaded_image, 1, length(loaded_image)),
+                                                                                       2||substring(loaded_image, 1, length(loaded_image)))))));
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM
+  (SELECT __time, number, client_ip,
+                          '1'||substring(loaded_image, 1, length(loaded_image)),
+                          count(*)
+   FROM kttm_nested
+   WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+     AND ('1'||substring(loaded_image, 1, length(loaded_image)) IS NULL
+          OR ('1'||substring(loaded_image, 1, length(loaded_image)) = 1||substring(loaded_image, 1, length(loaded_image))
+              AND '1'||substring(loaded_image, 1, length(loaded_image)) IS NOT DISTINCT
+              FROM 1||substring(loaded_image, 1, length(loaded_image))
+              AND '1'||substring(loaded_image, 1, length(loaded_image)) <> '0'||substring(loaded_image, 1, length(loaded_image))
+              AND ('1'||substring(loaded_image, 1, length(loaded_image)) IS DISTINCT
+                   FROM '0'||substring(loaded_image, 1, length(loaded_image)))
+              AND '1'||substring(loaded_image, 1, length(loaded_image)) > '0'||substring(loaded_image, 1, length(loaded_image))
+              AND '1'||substring(loaded_image, 1, length(loaded_image)) >= '0'||substring(loaded_image, 1, length(loaded_image))
+              AND '1'||substring(loaded_image, 1, length(loaded_image)) < 2||substring(loaded_image, 1, length(loaded_image))
+              AND '1'||substring(loaded_image, 1, length(loaded_image)) <= 2||substring(loaded_image, 1, length(loaded_image))
+              AND ('1'||substring(loaded_image, 1, length(loaded_image)) <> '0'||substring(loaded_image, 1, length(loaded_image))) IS TRUE
+              AND ('1'||substring(loaded_image, 1, length(loaded_image)) = '0'||substring(loaded_image, 1, length(loaded_image))) IS NOT TRUE
+              AND ('1'||substring(loaded_image, 1, length(loaded_image)) = '0'||substring(loaded_image, 1, length(loaded_image))) IS FALSE
+              AND ('1'||substring(loaded_image, 1, length(loaded_image)) <> '0'||substring(loaded_image, 1, length(loaded_image))) IS NOT FALSE
+              AND '1'||substring(loaded_image, 1, length(loaded_image)) BETWEEN '0'||substring(loaded_image, 1, length(loaded_image)) AND 2||substring(loaded_image, 1, length(loaded_image))
+              AND '1'||substring(loaded_image, 1, length(loaded_image)) NOT BETWEEN '1'||substring(loaded_image, 1, length(loaded_image)) AND '0'||substring(loaded_image, 1, length(loaded_image))
+              AND '1'||substring(loaded_image, 1, length(loaded_image)) like '%'
+              AND '1'||substring(loaded_image, 1, length(loaded_image)) not like '__DOES_NOT_EXIST__%'
+              AND '1'||substring(loaded_image, 1, length(loaded_image)) IN ('0'||substring(loaded_image, 1, length(loaded_image)),
+                                                                            1||substring(loaded_image, 1, length(loaded_image)),
+                                                                            2||substring(loaded_image, 1, length(loaded_image)))
+              AND '1'||substring(loaded_image, 1, length(loaded_image)) NOT IN ('0'||substring(loaded_image, 1, length(loaded_image)),
+                                                                                2||substring(loaded_image, 1, length(loaded_image)))))
+   GROUP BY 1,
+            2,
+            3,
+            4);
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+#-------------------------------------------------------------------------
+# TEST_ID: A22: right
+#-------------------------------------------------------------------------
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND ('1'||right(loaded_image, 2) IS NULL
+       OR ('1'||right(loaded_image, 2) = 1||right(loaded_image, 2)
+           AND '1'||right(loaded_image, 2) IS NOT DISTINCT
+           FROM 1||right(loaded_image, 2)
+           AND '1'||right(loaded_image, 2) <> '0'||right(loaded_image, 2)
+           AND ('1'||right(loaded_image, 2) IS DISTINCT
+                FROM '0'||right(loaded_image, 2))
+           AND '1'||right(loaded_image, 2) > '0'||right(loaded_image, 2)
+           AND '1'||right(loaded_image, 2) >= '0'||right(loaded_image, 2)
+           AND '1'||right(loaded_image, 2) < 2||right(loaded_image, 2)
+           AND '1'||right(loaded_image, 2) <= 2||right(loaded_image, 2)
+           AND ('1'||right(loaded_image, 2) <> '0'||right(loaded_image, 2)) IS TRUE
+           AND ('1'||right(loaded_image, 2) = '0'||right(loaded_image, 2)) IS NOT TRUE
+           AND ('1'||right(loaded_image, 2) = '0'||right(loaded_image, 2)) IS FALSE
+           AND ('1'||right(loaded_image, 2) <> '0'||right(loaded_image, 2)) IS NOT FALSE
+           AND '1'||right(loaded_image, 2) BETWEEN '0'||right(loaded_image, 2) AND 2||right(loaded_image, 2)
+           AND '1'||right(loaded_image, 2) NOT BETWEEN '1'||right(loaded_image, 2) AND '0'||right(loaded_image, 2)
+           AND '1'||right(loaded_image, 2) like '%'
+           AND '1'||right(loaded_image, 2) not like '__DOES_NOT_EXIST__%'
+           AND '1'||right(loaded_image, 2) IN ('0'||right(loaded_image, 2),
+                                               1||right(loaded_image, 2),
+                                               2||right(loaded_image, 2))
+           AND '1'||right(loaded_image, 2) NOT IN ('0'||right(loaded_image, 2),
+                                                   2||right(loaded_image, 2)))) ;
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND ('1'||right(loaded_image, 2) IS NULL
+       OR '1'||right(loaded_image, 2) IN
+         (SELECT '1'||right(loaded_image, 2)
+          FROM kttm_nested
+          WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+            AND ('1'||right(loaded_image, 2) IS NULL
+                 OR ('1'||right(loaded_image, 2) = 1||right(loaded_image, 2)
+                     AND '1'||right(loaded_image, 2) IS NOT DISTINCT
+                     FROM 1||right(loaded_image, 2)
+                     AND '1'||right(loaded_image, 2) <> '0'||right(loaded_image, 2)
+                     AND ('1'||right(loaded_image, 2) IS DISTINCT
+                          FROM '0'||right(loaded_image, 2))
+                     AND '1'||right(loaded_image, 2) > '0'||right(loaded_image, 2)
+                     AND '1'||right(loaded_image, 2) >= '0'||right(loaded_image, 2)
+                     AND '1'||right(loaded_image, 2) < 2||right(loaded_image, 2)
+                     AND '1'||right(loaded_image, 2) <= 2||right(loaded_image, 2)
+                     AND ('1'||right(loaded_image, 2) <> '0'||right(loaded_image, 2)) IS TRUE
+                     AND ('1'||right(loaded_image, 2) = '0'||right(loaded_image, 2)) IS NOT TRUE
+                     AND ('1'||right(loaded_image, 2) = '0'||right(loaded_image, 2)) IS FALSE
+                     AND ('1'||right(loaded_image, 2) <> '0'||right(loaded_image, 2)) IS NOT FALSE
+                     AND '1'||right(loaded_image, 2) BETWEEN '0'||right(loaded_image, 2) AND 2||right(loaded_image, 2)
+                     AND '1'||right(loaded_image, 2) NOT BETWEEN '1'||right(loaded_image, 2) AND '0'||right(loaded_image, 2)
+                     AND '1'||right(loaded_image, 2) like '%'
+                     AND '1'||right(loaded_image, 2) not like '__DOES_NOT_EXIST__%'
+                     AND '1'||right(loaded_image, 2) IN ('0'||right(loaded_image, 2),
+                                                         1||right(loaded_image, 2),
+                                                         2||right(loaded_image, 2))
+                     AND '1'||right(loaded_image, 2) NOT IN ('0'||right(loaded_image, 2),
+                                                             2||right(loaded_image, 2))))));
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM
+  (SELECT __time, number, client_ip,
+                          '1'||right(loaded_image, 2),
+                          count(*)
+   FROM kttm_nested
+   WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+     AND ('1'||right(loaded_image, 2) IS NULL
+          OR ('1'||right(loaded_image, 2) = 1||right(loaded_image, 2)
+              AND '1'||right(loaded_image, 2) IS NOT DISTINCT
+              FROM 1||right(loaded_image, 2)
+              AND '1'||right(loaded_image, 2) <> '0'||right(loaded_image, 2)
+              AND ('1'||right(loaded_image, 2) IS DISTINCT
+                   FROM '0'||right(loaded_image, 2))
+              AND '1'||right(loaded_image, 2) > '0'||right(loaded_image, 2)
+              AND '1'||right(loaded_image, 2) >= '0'||right(loaded_image, 2)
+              AND '1'||right(loaded_image, 2) < 2||right(loaded_image, 2)
+              AND '1'||right(loaded_image, 2) <= 2||right(loaded_image, 2)
+              AND ('1'||right(loaded_image, 2) <> '0'||right(loaded_image, 2)) IS TRUE
+              AND ('1'||right(loaded_image, 2) = '0'||right(loaded_image, 2)) IS NOT TRUE
+              AND ('1'||right(loaded_image, 2) = '0'||right(loaded_image, 2)) IS FALSE
+              AND ('1'||right(loaded_image, 2) <> '0'||right(loaded_image, 2)) IS NOT FALSE
+              AND '1'||right(loaded_image, 2) BETWEEN '0'||right(loaded_image, 2) AND 2||right(loaded_image, 2)
+              AND '1'||right(loaded_image, 2) NOT BETWEEN '1'||right(loaded_image, 2) AND '0'||right(loaded_image, 2)
+              AND '1'||right(loaded_image, 2) like '%'
+              AND '1'||right(loaded_image, 2) not like '__DOES_NOT_EXIST__%'
+              AND '1'||right(loaded_image, 2) IN ('0'||right(loaded_image, 2),
+                                                  1||right(loaded_image, 2),
+                                                  2||right(loaded_image, 2))
+              AND '1'||right(loaded_image, 2) NOT IN ('0'||right(loaded_image, 2),
+                                                      2||right(loaded_image, 2))))
+   GROUP BY 1,
+            2,
+            3,
+            4);
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+#-------------------------------------------------------------------------
+# TEST_ID: A23: left
+#-------------------------------------------------------------------------
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND ('1'||left(loaded_image, 2) IS NULL
+       OR ('1'||left(loaded_image, 2) = 1||left(loaded_image, 2)
+           AND '1'||left(loaded_image, 2) IS NOT DISTINCT
+           FROM 1||left(loaded_image, 2)
+           AND '1'||left(loaded_image, 2) <> '0'||left(loaded_image, 2)
+           AND ('1'||left(loaded_image, 2) IS DISTINCT
+                FROM '0'||left(loaded_image, 2))
+           AND '1'||left(loaded_image, 2) > '0'||left(loaded_image, 2)
+           AND '1'||left(loaded_image, 2) >= '0'||left(loaded_image, 2)
+           AND '1'||left(loaded_image, 2) < 2||left(loaded_image, 2)
+           AND '1'||left(loaded_image, 2) <= 2||left(loaded_image, 2)
+           AND ('1'||left(loaded_image, 2) <> '0'||left(loaded_image, 2)) IS TRUE
+           AND ('1'||left(loaded_image, 2) = '0'||left(loaded_image, 2)) IS NOT TRUE
+           AND ('1'||left(loaded_image, 2) = '0'||left(loaded_image, 2)) IS FALSE
+           AND ('1'||left(loaded_image, 2) <> '0'||left(loaded_image, 2)) IS NOT FALSE
+           AND '1'||left(loaded_image, 2) BETWEEN '0'||left(loaded_image, 2) AND 2||left(loaded_image, 2)
+           AND '1'||left(loaded_image, 2) NOT BETWEEN '1'||left(loaded_image, 2) AND '0'||left(loaded_image, 2)
+           AND '1'||left(loaded_image, 2) like '%'
+           AND '1'||left(loaded_image, 2) not like '__DOES_NOT_EXIST__%'
+           AND '1'||left(loaded_image, 2) IN ('0'||left(loaded_image, 2),
+                                              1||left(loaded_image, 2),
+                                              2||left(loaded_image, 2))
+           AND '1'||left(loaded_image, 2) NOT IN ('0'||left(loaded_image, 2),
+                                                  2||left(loaded_image, 2)))) ;
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND ('1'||left(loaded_image, 2) IS NULL
+       OR '1'||left(loaded_image, 2) IN
+         (SELECT '1'||left(loaded_image, 2)
+          FROM kttm_nested
+          WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+            AND ('1'||left(loaded_image, 2) IS NULL
+                 OR ('1'||left(loaded_image, 2) = 1||left(loaded_image, 2)
+                     AND '1'||left(loaded_image, 2) IS NOT DISTINCT
+                     FROM 1||left(loaded_image, 2)
+                     AND '1'||left(loaded_image, 2) <> '0'||left(loaded_image, 2)
+                     AND ('1'||left(loaded_image, 2) IS DISTINCT
+                          FROM '0'||left(loaded_image, 2))
+                     AND '1'||left(loaded_image, 2) > '0'||left(loaded_image, 2)
+                     AND '1'||left(loaded_image, 2) >= '0'||left(loaded_image, 2)
+                     AND '1'||left(loaded_image, 2) < 2||left(loaded_image, 2)
+                     AND '1'||left(loaded_image, 2) <= 2||left(loaded_image, 2)
+                     AND ('1'||left(loaded_image, 2) <> '0'||left(loaded_image, 2)) IS TRUE
+                     AND ('1'||left(loaded_image, 2) = '0'||left(loaded_image, 2)) IS NOT TRUE
+                     AND ('1'||left(loaded_image, 2) = '0'||left(loaded_image, 2)) IS FALSE
+                     AND ('1'||left(loaded_image, 2) <> '0'||left(loaded_image, 2)) IS NOT FALSE
+                     AND '1'||left(loaded_image, 2) BETWEEN '0'||left(loaded_image, 2) AND 2||left(loaded_image, 2)
+                     AND '1'||left(loaded_image, 2) NOT BETWEEN '1'||left(loaded_image, 2) AND '0'||left(loaded_image, 2)
+                     AND '1'||left(loaded_image, 2) like '%'
+                     AND '1'||left(loaded_image, 2) not like '__DOES_NOT_EXIST__%'
+                     AND '1'||left(loaded_image, 2) IN ('0'||left(loaded_image, 2),
+                                                        1||left(loaded_image, 2),
+                                                        2||left(loaded_image, 2))
+                     AND '1'||left(loaded_image, 2) NOT IN ('0'||left(loaded_image, 2),
+                                                            2||left(loaded_image, 2))))));
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM
+  (SELECT __time, number, client_ip,
+                          '1'||left(loaded_image, 2),
+                          count(*)
+   FROM kttm_nested
+   WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+     AND ('1'||left(loaded_image, 2) IS NULL
+          OR ('1'||left(loaded_image, 2) = 1||left(loaded_image, 2)
+              AND '1'||left(loaded_image, 2) IS NOT DISTINCT
+              FROM 1||left(loaded_image, 2)
+              AND '1'||left(loaded_image, 2) <> '0'||left(loaded_image, 2)
+              AND ('1'||left(loaded_image, 2) IS DISTINCT
+                   FROM '0'||left(loaded_image, 2))
+              AND '1'||left(loaded_image, 2) > '0'||left(loaded_image, 2)
+              AND '1'||left(loaded_image, 2) >= '0'||left(loaded_image, 2)
+              AND '1'||left(loaded_image, 2) < 2||left(loaded_image, 2)
+              AND '1'||left(loaded_image, 2) <= 2||left(loaded_image, 2)
+              AND ('1'||left(loaded_image, 2) <> '0'||left(loaded_image, 2)) IS TRUE
+              AND ('1'||left(loaded_image, 2) = '0'||left(loaded_image, 2)) IS NOT TRUE
+              AND ('1'||left(loaded_image, 2) = '0'||left(loaded_image, 2)) IS FALSE
+              AND ('1'||left(loaded_image, 2) <> '0'||left(loaded_image, 2)) IS NOT FALSE
+              AND '1'||left(loaded_image, 2) BETWEEN '0'||left(loaded_image, 2) AND 2||left(loaded_image, 2)
+              AND '1'||left(loaded_image, 2) NOT BETWEEN '1'||left(loaded_image, 2) AND '0'||left(loaded_image, 2)
+              AND '1'||left(loaded_image, 2) like '%'
+              AND '1'||left(loaded_image, 2) not like '__DOES_NOT_EXIST__%'
+              AND '1'||left(loaded_image, 2) IN ('0'||left(loaded_image, 2),
+                                                 1||left(loaded_image, 2),
+                                                 2||left(loaded_image, 2))
+              AND '1'||left(loaded_image, 2) NOT IN ('0'||left(loaded_image, 2),
+                                                     2||left(loaded_image, 2))))
+   GROUP BY 1,
+            2,
+            3,
+            4);
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+#-------------------------------------------------------------------------
+# TEST_ID: A24: substr
+#-------------------------------------------------------------------------
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND ('1'||substr(loaded_image, 1, length(loaded_image)) IS NULL
+       OR ('1'||substr(loaded_image, 1, length(loaded_image)) = 1||substr(loaded_image, 1, length(loaded_image))
+           AND '1'||substr(loaded_image, 1, length(loaded_image)) IS NOT DISTINCT
+           FROM 1||substr(loaded_image, 1, length(loaded_image))
+           AND '1'||substr(loaded_image, 1, length(loaded_image)) <> '0'||substr(loaded_image, 1, length(loaded_image))
+           AND ('1'||substr(loaded_image, 1, length(loaded_image)) IS DISTINCT
+                FROM '0'||substr(loaded_image, 1, length(loaded_image)))
+           AND '1'||substr(loaded_image, 1, length(loaded_image)) > '0'||substr(loaded_image, 1, length(loaded_image))
+           AND '1'||substr(loaded_image, 1, length(loaded_image)) >= '0'||substr(loaded_image, 1, length(loaded_image))
+           AND '1'||substr(loaded_image, 1, length(loaded_image)) < 2||substr(loaded_image, 1, length(loaded_image))
+           AND '1'||substr(loaded_image, 1, length(loaded_image)) <= 2||substr(loaded_image, 1, length(loaded_image))
+           AND ('1'||substr(loaded_image, 1, length(loaded_image)) <> '0'||substr(loaded_image, 1, length(loaded_image))) IS TRUE
+           AND ('1'||substr(loaded_image, 1, length(loaded_image)) = '0'||substr(loaded_image, 1, length(loaded_image))) IS NOT TRUE
+           AND ('1'||substr(loaded_image, 1, length(loaded_image)) = '0'||substr(loaded_image, 1, length(loaded_image))) IS FALSE
+           AND ('1'||substr(loaded_image, 1, length(loaded_image)) <> '0'||substr(loaded_image, 1, length(loaded_image))) IS NOT FALSE
+           AND '1'||substr(loaded_image, 1, length(loaded_image)) BETWEEN '0'||substr(loaded_image, 1, length(loaded_image)) AND 2||substr(loaded_image, 1, length(loaded_image))
+           AND '1'||substr(loaded_image, 1, length(loaded_image)) NOT BETWEEN '1'||substr(loaded_image, 1, length(loaded_image)) AND '0'||substr(loaded_image, 1, length(loaded_image))
+           AND '1'||substr(loaded_image, 1, length(loaded_image)) like '%'
+           AND '1'||substr(loaded_image, 1, length(loaded_image)) not like '__DOES_NOT_EXIST__%'
+           AND '1'||substr(loaded_image, 1, length(loaded_image)) IN ('0'||substr(loaded_image, 1, length(loaded_image)),
+                                                                      1||substr(loaded_image, 1, length(loaded_image)),
+                                                                      2||substr(loaded_image, 1, length(loaded_image)))
+           AND '1'||substr(loaded_image, 1, length(loaded_image)) NOT IN ('0'||substr(loaded_image, 1, length(loaded_image)),
+                                                                          2||substr(loaded_image, 1, length(loaded_image))))) ;
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND ('1'||substr(loaded_image, 1, length(loaded_image)) IS NULL
+       OR '1'||substr(loaded_image, 1, length(loaded_image)) IN
+         (SELECT '1'||substr(loaded_image, 1, length(loaded_image))
+          FROM kttm_nested
+          WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+            AND ('1'||substr(loaded_image, 1, length(loaded_image)) IS NULL
+                 OR ('1'||substr(loaded_image, 1, length(loaded_image)) = 1||substr(loaded_image, 1, length(loaded_image))
+                     AND '1'||substr(loaded_image, 1, length(loaded_image)) IS NOT DISTINCT
+                     FROM 1||substr(loaded_image, 1, length(loaded_image))
+                     AND '1'||substr(loaded_image, 1, length(loaded_image)) <> '0'||substr(loaded_image, 1, length(loaded_image))
+                     AND ('1'||substr(loaded_image, 1, length(loaded_image)) IS DISTINCT
+                          FROM '0'||substr(loaded_image, 1, length(loaded_image)))
+                     AND '1'||substr(loaded_image, 1, length(loaded_image)) > '0'||substr(loaded_image, 1, length(loaded_image))
+                     AND '1'||substr(loaded_image, 1, length(loaded_image)) >= '0'||substr(loaded_image, 1, length(loaded_image))
+                     AND '1'||substr(loaded_image, 1, length(loaded_image)) < 2||substr(loaded_image, 1, length(loaded_image))
+                     AND '1'||substr(loaded_image, 1, length(loaded_image)) <= 2||substr(loaded_image, 1, length(loaded_image))
+                     AND ('1'||substr(loaded_image, 1, length(loaded_image)) <> '0'||substr(loaded_image, 1, length(loaded_image))) IS TRUE
+                     AND ('1'||substr(loaded_image, 1, length(loaded_image)) = '0'||substr(loaded_image, 1, length(loaded_image))) IS NOT TRUE
+                     AND ('1'||substr(loaded_image, 1, length(loaded_image)) = '0'||substr(loaded_image, 1, length(loaded_image))) IS FALSE
+                     AND ('1'||substr(loaded_image, 1, length(loaded_image)) <> '0'||substr(loaded_image, 1, length(loaded_image))) IS NOT FALSE
+                     AND '1'||substr(loaded_image, 1, length(loaded_image)) BETWEEN '0'||substr(loaded_image, 1, length(loaded_image)) AND 2||substr(loaded_image, 1, length(loaded_image))
+                     AND '1'||substr(loaded_image, 1, length(loaded_image)) NOT BETWEEN '1'||substr(loaded_image, 1, length(loaded_image)) AND '0'||substr(loaded_image, 1, length(loaded_image))
+                     AND '1'||substr(loaded_image, 1, length(loaded_image)) like '%'
+                     AND '1'||substr(loaded_image, 1, length(loaded_image)) not like '__DOES_NOT_EXIST__%'
+                     AND '1'||substr(loaded_image, 1, length(loaded_image)) IN ('0'||substr(loaded_image, 1, length(loaded_image)),
+                                                                                1||substr(loaded_image, 1, length(loaded_image)),
+                                                                                2||substr(loaded_image, 1, length(loaded_image)))
+                     AND '1'||substr(loaded_image, 1, length(loaded_image)) NOT IN ('0'||substr(loaded_image, 1, length(loaded_image)),
+                                                                                    2||substr(loaded_image, 1, length(loaded_image)))))));
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM
+  (SELECT __time, number, client_ip,
+                          '1'||substr(loaded_image, 1, length(loaded_image)),
+                          count(*)
+   FROM kttm_nested
+   WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+     AND ('1'||substr(loaded_image, 1, length(loaded_image)) IS NULL
+          OR ('1'||substr(loaded_image, 1, length(loaded_image)) = 1||substr(loaded_image, 1, length(loaded_image))
+              AND '1'||substr(loaded_image, 1, length(loaded_image)) IS NOT DISTINCT
+              FROM 1||substr(loaded_image, 1, length(loaded_image))
+              AND '1'||substr(loaded_image, 1, length(loaded_image)) <> '0'||substr(loaded_image, 1, length(loaded_image))
+              AND ('1'||substr(loaded_image, 1, length(loaded_image)) IS DISTINCT
+                   FROM '0'||substr(loaded_image, 1, length(loaded_image)))
+              AND '1'||substr(loaded_image, 1, length(loaded_image)) > '0'||substr(loaded_image, 1, length(loaded_image))
+              AND '1'||substr(loaded_image, 1, length(loaded_image)) >= '0'||substr(loaded_image, 1, length(loaded_image))
+              AND '1'||substr(loaded_image, 1, length(loaded_image)) < 2||substr(loaded_image, 1, length(loaded_image))
+              AND '1'||substr(loaded_image, 1, length(loaded_image)) <= 2||substr(loaded_image, 1, length(loaded_image))
+              AND ('1'||substr(loaded_image, 1, length(loaded_image)) <> '0'||substr(loaded_image, 1, length(loaded_image))) IS TRUE
+              AND ('1'||substr(loaded_image, 1, length(loaded_image)) = '0'||substr(loaded_image, 1, length(loaded_image))) IS NOT TRUE
+              AND ('1'||substr(loaded_image, 1, length(loaded_image)) = '0'||substr(loaded_image, 1, length(loaded_image))) IS FALSE
+              AND ('1'||substr(loaded_image, 1, length(loaded_image)) <> '0'||substr(loaded_image, 1, length(loaded_image))) IS NOT FALSE
+              AND '1'||substr(loaded_image, 1, length(loaded_image)) BETWEEN '0'||substr(loaded_image, 1, length(loaded_image)) AND 2||substr(loaded_image, 1, length(loaded_image))
+              AND '1'||substr(loaded_image, 1, length(loaded_image)) NOT BETWEEN '1'||substr(loaded_image, 1, length(loaded_image)) AND '0'||substr(loaded_image, 1, length(loaded_image))
+              AND '1'||substr(loaded_image, 1, length(loaded_image)) like '%'
+              AND '1'||substr(loaded_image, 1, length(loaded_image)) not like '__DOES_NOT_EXIST__%'
+              AND '1'||substr(loaded_image, 1, length(loaded_image)) IN ('0'||substr(loaded_image, 1, length(loaded_image)),
+                                                                         1||substr(loaded_image, 1, length(loaded_image)),
+                                                                         2||substr(loaded_image, 1, length(loaded_image)))
+              AND '1'||substr(loaded_image, 1, length(loaded_image)) NOT IN ('0'||substr(loaded_image, 1, length(loaded_image)),
+                                                                             2||substr(loaded_image, 1, length(loaded_image)))))
+   GROUP BY 1,
+            2,
+            3,
+            4);
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+#-------------------------------------------------------------------------
+# TEST_ID: A25: trim
+#-------------------------------------------------------------------------
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND ('1'||trim(BOTH 'A'
+                 FROM loaded_image) IS NULL
+       OR ('1'||trim(BOTH 'A'
+                     FROM loaded_image) = 1||trim(BOTH 'A'
+                                                  FROM loaded_image)
+           AND '1'||trim(BOTH 'A'
+                         FROM loaded_image) IS NOT DISTINCT
+           FROM 1||trim(BOTH 'A'
+                        FROM loaded_image)
+           AND '1'||trim(BOTH 'A'
+                         FROM loaded_image) <> '0'||trim(BOTH 'A'
+                                                         FROM loaded_image)
+           AND ('1'||trim(BOTH 'A'
+                          FROM loaded_image) IS DISTINCT
+                FROM '0'||trim(BOTH 'A'
+                               FROM loaded_image))
+           AND '1'||trim(BOTH 'A'
+                         FROM loaded_image) > '0'||trim(BOTH 'A'
+                                                        FROM loaded_image)
+           AND '1'||trim(BOTH 'A'
+                         FROM loaded_image) >= '0'||trim(BOTH 'A'
+                                                         FROM loaded_image)
+           AND '1'||trim(BOTH 'A'
+                         FROM loaded_image) < 2||trim(BOTH 'A'
+                                                      FROM loaded_image)
+           AND '1'||trim(BOTH 'A'
+                         FROM loaded_image) <= 2||trim(BOTH 'A'
+                                                       FROM loaded_image)
+           AND ('1'||trim(BOTH 'A'
+                          FROM loaded_image) <> '0'||trim(BOTH 'A'
+                                                          FROM loaded_image)) IS TRUE
+           AND ('1'||trim(BOTH 'A'
+                          FROM loaded_image) = '0'||trim(BOTH 'A'
+                                                         FROM loaded_image)) IS NOT TRUE
+           AND ('1'||trim(BOTH 'A'
+                          FROM loaded_image) = '0'||trim(BOTH 'A'
+                                                         FROM loaded_image)) IS FALSE
+           AND ('1'||trim(BOTH 'A'
+                          FROM loaded_image) <> '0'||trim(BOTH 'A'
+                                                          FROM loaded_image)) IS NOT FALSE
+           AND '1'||trim(BOTH 'A'
+                         FROM loaded_image) BETWEEN '0'||trim(BOTH 'A'
+                                                              FROM loaded_image) AND 2||trim(BOTH 'A'
+                                                                                             FROM loaded_image)
+           AND '1'||trim(BOTH 'A'
+                         FROM loaded_image) NOT BETWEEN '1'||trim(BOTH 'A'
+                                                                  FROM loaded_image) AND '0'||trim(BOTH 'A'
+                                                                                                   FROM loaded_image)
+           AND '1'||trim(BOTH 'A'
+                         FROM loaded_image) like '%'
+           AND '1'||trim(BOTH 'A'
+                         FROM loaded_image) not like '__DOES_NOT_EXIST__%'
+           AND '1'||trim(BOTH 'A'
+                         FROM loaded_image) IN ('0'||trim(BOTH 'A'
+                                                          FROM loaded_image),
+                                                1||trim(BOTH 'A'
+                                                        FROM loaded_image),
+                                                2||trim(BOTH 'A'
+                                                        FROM loaded_image))
+           AND '1'||trim(BOTH 'A'
+                         FROM loaded_image) NOT IN ('0'||trim(BOTH 'A'
+                                                              FROM loaded_image),
+                                                    2||trim(BOTH 'A'
+                                                            FROM loaded_image)))) ;
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND ('1'||trim(BOTH 'A'
+                 FROM loaded_image) IS NULL
+       OR '1'||trim(BOTH 'A'
+                    FROM loaded_image) IN
+         (SELECT '1'||trim(BOTH 'A'
+                           FROM loaded_image)
+          FROM kttm_nested
+          WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+            AND ('1'||trim(BOTH 'A'
+                           FROM loaded_image) IS NULL
+                 OR ('1'||trim(BOTH 'A'
+                               FROM loaded_image) = 1||trim(BOTH 'A'
+                                                            FROM loaded_image)
+                     AND '1'||trim(BOTH 'A'
+                                   FROM loaded_image) IS NOT DISTINCT
+                     FROM 1||trim(BOTH 'A'
+                                  FROM loaded_image)
+                     AND '1'||trim(BOTH 'A'
+                                   FROM loaded_image) <> '0'||trim(BOTH 'A'
+                                                                   FROM loaded_image)
+                     AND ('1'||trim(BOTH 'A'
+                                    FROM loaded_image) IS DISTINCT
+                          FROM '0'||trim(BOTH 'A'
+                                         FROM loaded_image))
+                     AND '1'||trim(BOTH 'A'
+                                   FROM loaded_image) > '0'||trim(BOTH 'A'
+                                                                  FROM loaded_image)
+                     AND '1'||trim(BOTH 'A'
+                                   FROM loaded_image) >= '0'||trim(BOTH 'A'
+                                                                   FROM loaded_image)
+                     AND '1'||trim(BOTH 'A'
+                                   FROM loaded_image) < 2||trim(BOTH 'A'
+                                                                FROM loaded_image)
+                     AND '1'||trim(BOTH 'A'
+                                   FROM loaded_image) <= 2||trim(BOTH 'A'
+                                                                 FROM loaded_image)
+                     AND ('1'||trim(BOTH 'A'
+                                    FROM loaded_image) <> '0'||trim(BOTH 'A'
+                                                                    FROM loaded_image)) IS TRUE
+                     AND ('1'||trim(BOTH 'A'
+                                    FROM loaded_image) = '0'||trim(BOTH 'A'
+                                                                   FROM loaded_image)) IS NOT TRUE
+                     AND ('1'||trim(BOTH 'A'
+                                    FROM loaded_image) = '0'||trim(BOTH 'A'
+                                                                   FROM loaded_image)) IS FALSE
+                     AND ('1'||trim(BOTH 'A'
+                                    FROM loaded_image) <> '0'||trim(BOTH 'A'
+                                                                    FROM loaded_image)) IS NOT FALSE
+                     AND '1'||trim(BOTH 'A'
+                                   FROM loaded_image) BETWEEN '0'||trim(BOTH 'A'
+                                                                        FROM loaded_image) AND 2||trim(BOTH 'A'
+                                                                                                       FROM loaded_image)
+                     AND '1'||trim(BOTH 'A'
+                                   FROM loaded_image) NOT BETWEEN '1'||trim(BOTH 'A'
+                                                                            FROM loaded_image) AND '0'||trim(BOTH 'A'
+                                                                                                             FROM loaded_image)
+                     AND '1'||trim(BOTH 'A'
+                                   FROM loaded_image) like '%'
+                     AND '1'||trim(BOTH 'A'
+                                   FROM loaded_image) not like '__DOES_NOT_EXIST__%'
+                     AND '1'||trim(BOTH 'A'
+                                   FROM loaded_image) IN ('0'||trim(BOTH 'A'
+                                                                    FROM loaded_image),
+                                                          1||trim(BOTH 'A'
+                                                                  FROM loaded_image),
+                                                          2||trim(BOTH 'A'
+                                                                  FROM loaded_image))
+                     AND '1'||trim(BOTH 'A'
+                                   FROM loaded_image) NOT IN ('0'||trim(BOTH 'A'
+                                                                        FROM loaded_image),
+                                                              2||trim(BOTH 'A'
+                                                                      FROM loaded_image))))));
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM
+  (SELECT __time, number, client_ip,
+                          '1'||trim(BOTH 'A'
+                                    FROM loaded_image),
+                          count(*)
+   FROM kttm_nested
+   WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+     AND ('1'||trim(BOTH 'A'
+                    FROM loaded_image) IS NULL
+          OR ('1'||trim(BOTH 'A'
+                        FROM loaded_image) = 1||trim(BOTH 'A'
+                                                     FROM loaded_image)
+              AND '1'||trim(BOTH 'A'
+                            FROM loaded_image) IS NOT DISTINCT
+              FROM 1||trim(BOTH 'A'
+                           FROM loaded_image)
+              AND '1'||trim(BOTH 'A'
+                            FROM loaded_image) <> '0'||trim(BOTH 'A'
+                                                            FROM loaded_image)
+              AND ('1'||trim(BOTH 'A'
+                             FROM loaded_image) IS DISTINCT
+                   FROM '0'||trim(BOTH 'A'
+                                  FROM loaded_image))
+              AND '1'||trim(BOTH 'A'
+                            FROM loaded_image) > '0'||trim(BOTH 'A'
+                                                           FROM loaded_image)
+              AND '1'||trim(BOTH 'A'
+                            FROM loaded_image) >= '0'||trim(BOTH 'A'
+                                                            FROM loaded_image)
+              AND '1'||trim(BOTH 'A'
+                            FROM loaded_image) < 2||trim(BOTH 'A'
+                                                         FROM loaded_image)
+              AND '1'||trim(BOTH 'A'
+                            FROM loaded_image) <= 2||trim(BOTH 'A'
+                                                          FROM loaded_image)
+              AND ('1'||trim(BOTH 'A'
+                             FROM loaded_image) <> '0'||trim(BOTH 'A'
+                                                             FROM loaded_image)) IS TRUE
+              AND ('1'||trim(BOTH 'A'
+                             FROM loaded_image) = '0'||trim(BOTH 'A'
+                                                            FROM loaded_image)) IS NOT TRUE
+              AND ('1'||trim(BOTH 'A'
+                             FROM loaded_image) = '0'||trim(BOTH 'A'
+                                                            FROM loaded_image)) IS FALSE
+              AND ('1'||trim(BOTH 'A'
+                             FROM loaded_image) <> '0'||trim(BOTH 'A'
+                                                             FROM loaded_image)) IS NOT FALSE
+              AND '1'||trim(BOTH 'A'
+                            FROM loaded_image) BETWEEN '0'||trim(BOTH 'A'
+                                                                 FROM loaded_image) AND 2||trim(BOTH 'A'
+                                                                                                FROM loaded_image)
+              AND '1'||trim(BOTH 'A'
+                            FROM loaded_image) NOT BETWEEN '1'||trim(BOTH 'A'
+                                                                     FROM loaded_image) AND '0'||trim(BOTH 'A'
+                                                                                                      FROM loaded_image)
+              AND '1'||trim(BOTH 'A'
+                            FROM loaded_image) like '%'
+              AND '1'||trim(BOTH 'A'
+                            FROM loaded_image) not like '__DOES_NOT_EXIST__%'
+              AND '1'||trim(BOTH 'A'
+                            FROM loaded_image) IN ('0'||trim(BOTH 'A'
+                                                             FROM loaded_image),
+                                                   1||trim(BOTH 'A'
+                                                           FROM loaded_image),
+                                                   2||trim(BOTH 'A'
+                                                           FROM loaded_image))
+              AND '1'||trim(BOTH 'A'
+                            FROM loaded_image) NOT IN ('0'||trim(BOTH 'A'
+                                                                 FROM loaded_image),
+                                                       2||trim(BOTH 'A'
+                                                               FROM loaded_image))))
+   GROUP BY 1,
+            2,
+            3,
+            4);
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+#-------------------------------------------------------------------------
+# TEST_ID: A26: btrim
+#-------------------------------------------------------------------------
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND ('1'||btrim(loaded_image, 'A') IS NULL
+       OR ('1'||btrim(loaded_image, 'A') = 1||btrim(loaded_image, 'A')
+           AND '1'||btrim(loaded_image, 'A') IS NOT DISTINCT
+           FROM 1||btrim(loaded_image, 'A')
+           AND '1'||btrim(loaded_image, 'A') <> '0'||btrim(loaded_image, 'A')
+           AND ('1'||btrim(loaded_image, 'A') IS DISTINCT
+                FROM '0'||btrim(loaded_image, 'A'))
+           AND '1'||btrim(loaded_image, 'A') > '0'||btrim(loaded_image, 'A')
+           AND '1'||btrim(loaded_image, 'A') >= '0'||btrim(loaded_image, 'A')
+           AND '1'||btrim(loaded_image, 'A') < 2||btrim(loaded_image, 'A')
+           AND '1'||btrim(loaded_image, 'A') <= 2||btrim(loaded_image, 'A')
+           AND ('1'||btrim(loaded_image, 'A') <> '0'||btrim(loaded_image, 'A')) IS TRUE
+           AND ('1'||btrim(loaded_image, 'A') = '0'||btrim(loaded_image, 'A')) IS NOT TRUE
+           AND ('1'||btrim(loaded_image, 'A') = '0'||btrim(loaded_image, 'A')) IS FALSE
+           AND ('1'||btrim(loaded_image, 'A') <> '0'||btrim(loaded_image, 'A')) IS NOT FALSE
+           AND '1'||btrim(loaded_image, 'A') BETWEEN '0'||btrim(loaded_image, 'A') AND 2||btrim(loaded_image, 'A')
+           AND '1'||btrim(loaded_image, 'A') NOT BETWEEN '1'||btrim(loaded_image, 'A') AND '0'||btrim(loaded_image, 'A')
+           AND '1'||btrim(loaded_image, 'A') like '%'
+           AND '1'||btrim(loaded_image, 'A') not like '__DOES_NOT_EXIST__%'
+           AND '1'||btrim(loaded_image, 'A') IN ('0'||btrim(loaded_image, 'A'),
+                                                 1||btrim(loaded_image, 'A'),
+                                                 2||btrim(loaded_image, 'A'))
+           AND '1'||btrim(loaded_image, 'A') NOT IN ('0'||btrim(loaded_image, 'A'),
+                                                     2||btrim(loaded_image, 'A')))) ;
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND ('1'||btrim(loaded_image, 'A') IS NULL
+       OR '1'||btrim(loaded_image, 'A') IN
+         (SELECT '1'||btrim(loaded_image, 'A')
+          FROM kttm_nested
+          WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+            AND ('1'||btrim(loaded_image, 'A') IS NULL
+                 OR ('1'||btrim(loaded_image, 'A') = 1||btrim(loaded_image, 'A')
+                     AND '1'||btrim(loaded_image, 'A') IS NOT DISTINCT
+                     FROM 1||btrim(loaded_image, 'A')
+                     AND '1'||btrim(loaded_image, 'A') <> '0'||btrim(loaded_image, 'A')
+                     AND ('1'||btrim(loaded_image, 'A') IS DISTINCT
+                          FROM '0'||btrim(loaded_image, 'A'))
+                     AND '1'||btrim(loaded_image, 'A') > '0'||btrim(loaded_image, 'A')
+                     AND '1'||btrim(loaded_image, 'A') >= '0'||btrim(loaded_image, 'A')
+                     AND '1'||btrim(loaded_image, 'A') < 2||btrim(loaded_image, 'A')
+                     AND '1'||btrim(loaded_image, 'A') <= 2||btrim(loaded_image, 'A')
+                     AND ('1'||btrim(loaded_image, 'A') <> '0'||btrim(loaded_image, 'A')) IS TRUE
+                     AND ('1'||btrim(loaded_image, 'A') = '0'||btrim(loaded_image, 'A')) IS NOT TRUE
+                     AND ('1'||btrim(loaded_image, 'A') = '0'||btrim(loaded_image, 'A')) IS FALSE
+                     AND ('1'||btrim(loaded_image, 'A') <> '0'||btrim(loaded_image, 'A')) IS NOT FALSE
+                     AND '1'||btrim(loaded_image, 'A') BETWEEN '0'||btrim(loaded_image, 'A') AND 2||btrim(loaded_image, 'A')
+                     AND '1'||btrim(loaded_image, 'A') NOT BETWEEN '1'||btrim(loaded_image, 'A') AND '0'||btrim(loaded_image, 'A')
+                     AND '1'||btrim(loaded_image, 'A') like '%'
+                     AND '1'||btrim(loaded_image, 'A') not like '__DOES_NOT_EXIST__%'
+                     AND '1'||btrim(loaded_image, 'A') IN ('0'||btrim(loaded_image, 'A'),
+                                                           1||btrim(loaded_image, 'A'),
+                                                           2||btrim(loaded_image, 'A'))
+                     AND '1'||btrim(loaded_image, 'A') NOT IN ('0'||btrim(loaded_image, 'A'),
+                                                               2||btrim(loaded_image, 'A'))))));
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM
+  (SELECT __time, number, client_ip,
+                          '1'||btrim(loaded_image, 'A'),
+                          count(*)
+   FROM kttm_nested
+   WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+     AND ('1'||btrim(loaded_image, 'A') IS NULL
+          OR ('1'||btrim(loaded_image, 'A') = 1||btrim(loaded_image, 'A')
+              AND '1'||btrim(loaded_image, 'A') IS NOT DISTINCT
+              FROM 1||btrim(loaded_image, 'A')
+              AND '1'||btrim(loaded_image, 'A') <> '0'||btrim(loaded_image, 'A')
+              AND ('1'||btrim(loaded_image, 'A') IS DISTINCT
+                   FROM '0'||btrim(loaded_image, 'A'))
+              AND '1'||btrim(loaded_image, 'A') > '0'||btrim(loaded_image, 'A')
+              AND '1'||btrim(loaded_image, 'A') >= '0'||btrim(loaded_image, 'A')
+              AND '1'||btrim(loaded_image, 'A') < 2||btrim(loaded_image, 'A')
+              AND '1'||btrim(loaded_image, 'A') <= 2||btrim(loaded_image, 'A')
+              AND ('1'||btrim(loaded_image, 'A') <> '0'||btrim(loaded_image, 'A')) IS TRUE
+              AND ('1'||btrim(loaded_image, 'A') = '0'||btrim(loaded_image, 'A')) IS NOT TRUE
+              AND ('1'||btrim(loaded_image, 'A') = '0'||btrim(loaded_image, 'A')) IS FALSE
+              AND ('1'||btrim(loaded_image, 'A') <> '0'||btrim(loaded_image, 'A')) IS NOT FALSE
+              AND '1'||btrim(loaded_image, 'A') BETWEEN '0'||btrim(loaded_image, 'A') AND 2||btrim(loaded_image, 'A')
+              AND '1'||btrim(loaded_image, 'A') NOT BETWEEN '1'||btrim(loaded_image, 'A') AND '0'||btrim(loaded_image, 'A')
+              AND '1'||btrim(loaded_image, 'A') like '%'
+              AND '1'||btrim(loaded_image, 'A') not like '__DOES_NOT_EXIST__%'
+              AND '1'||btrim(loaded_image, 'A') IN ('0'||btrim(loaded_image, 'A'),
+                                                    1||btrim(loaded_image, 'A'),
+                                                    2||btrim(loaded_image, 'A'))
+              AND '1'||btrim(loaded_image, 'A') NOT IN ('0'||btrim(loaded_image, 'A'),
+                                                        2||btrim(loaded_image, 'A'))))
+   GROUP BY 1,
+            2,
+            3,
+            4);
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+#-------------------------------------------------------------------------
+# TEST_ID: A27: ltrim
+#-------------------------------------------------------------------------
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND ('1'||ltrim(loaded_image, 'A') IS NULL
+       OR ('1'||ltrim(loaded_image, 'A') = 1||ltrim(loaded_image, 'A')
+           AND '1'||ltrim(loaded_image, 'A') IS NOT DISTINCT
+           FROM 1||ltrim(loaded_image, 'A')
+           AND '1'||ltrim(loaded_image, 'A') <> '0'||ltrim(loaded_image, 'A')
+           AND ('1'||ltrim(loaded_image, 'A') IS DISTINCT
+                FROM '0'||ltrim(loaded_image, 'A'))
+           AND '1'||ltrim(loaded_image, 'A') > '0'||ltrim(loaded_image, 'A')
+           AND '1'||ltrim(loaded_image, 'A') >= '0'||ltrim(loaded_image, 'A')
+           AND '1'||ltrim(loaded_image, 'A') < 2||ltrim(loaded_image, 'A')
+           AND '1'||ltrim(loaded_image, 'A') <= 2||ltrim(loaded_image, 'A')
+           AND ('1'||ltrim(loaded_image, 'A') <> '0'||ltrim(loaded_image, 'A')) IS TRUE
+           AND ('1'||ltrim(loaded_image, 'A') = '0'||ltrim(loaded_image, 'A')) IS NOT TRUE
+           AND ('1'||ltrim(loaded_image, 'A') = '0'||ltrim(loaded_image, 'A')) IS FALSE
+           AND ('1'||ltrim(loaded_image, 'A') <> '0'||ltrim(loaded_image, 'A')) IS NOT FALSE
+           AND '1'||ltrim(loaded_image, 'A') BETWEEN '0'||ltrim(loaded_image, 'A') AND 2||ltrim(loaded_image, 'A')
+           AND '1'||ltrim(loaded_image, 'A') NOT BETWEEN '1'||ltrim(loaded_image, 'A') AND '0'||ltrim(loaded_image, 'A')
+           AND '1'||ltrim(loaded_image, 'A') like '%'
+           AND '1'||ltrim(loaded_image, 'A') not like '__DOES_NOT_EXIST__%'
+           AND '1'||ltrim(loaded_image, 'A') IN ('0'||ltrim(loaded_image, 'A'),
+                                                 1||ltrim(loaded_image, 'A'),
+                                                 2||ltrim(loaded_image, 'A'))
+           AND '1'||ltrim(loaded_image, 'A') NOT IN ('0'||ltrim(loaded_image, 'A'),
+                                                     2||ltrim(loaded_image, 'A')))) ;
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND ('1'||ltrim(loaded_image, 'A') IS NULL
+       OR '1'||ltrim(loaded_image, 'A') IN
+         (SELECT '1'||ltrim(loaded_image, 'A')
+          FROM kttm_nested
+          WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+            AND ('1'||ltrim(loaded_image, 'A') IS NULL
+                 OR ('1'||ltrim(loaded_image, 'A') = 1||ltrim(loaded_image, 'A')
+                     AND '1'||ltrim(loaded_image, 'A') IS NOT DISTINCT
+                     FROM 1||ltrim(loaded_image, 'A')
+                     AND '1'||ltrim(loaded_image, 'A') <> '0'||ltrim(loaded_image, 'A')
+                     AND ('1'||ltrim(loaded_image, 'A') IS DISTINCT
+                          FROM '0'||ltrim(loaded_image, 'A'))
+                     AND '1'||ltrim(loaded_image, 'A') > '0'||ltrim(loaded_image, 'A')
+                     AND '1'||ltrim(loaded_image, 'A') >= '0'||ltrim(loaded_image, 'A')
+                     AND '1'||ltrim(loaded_image, 'A') < 2||ltrim(loaded_image, 'A')
+                     AND '1'||ltrim(loaded_image, 'A') <= 2||ltrim(loaded_image, 'A')
+                     AND ('1'||ltrim(loaded_image, 'A') <> '0'||ltrim(loaded_image, 'A')) IS TRUE
+                     AND ('1'||ltrim(loaded_image, 'A') = '0'||ltrim(loaded_image, 'A')) IS NOT TRUE
+                     AND ('1'||ltrim(loaded_image, 'A') = '0'||ltrim(loaded_image, 'A')) IS FALSE
+                     AND ('1'||ltrim(loaded_image, 'A') <> '0'||ltrim(loaded_image, 'A')) IS NOT FALSE
+                     AND '1'||ltrim(loaded_image, 'A') BETWEEN '0'||ltrim(loaded_image, 'A') AND 2||ltrim(loaded_image, 'A')
+                     AND '1'||ltrim(loaded_image, 'A') NOT BETWEEN '1'||ltrim(loaded_image, 'A') AND '0'||ltrim(loaded_image, 'A')
+                     AND '1'||ltrim(loaded_image, 'A') like '%'
+                     AND '1'||ltrim(loaded_image, 'A') not like '__DOES_NOT_EXIST__%'
+                     AND '1'||ltrim(loaded_image, 'A') IN ('0'||ltrim(loaded_image, 'A'),
+                                                           1||ltrim(loaded_image, 'A'),
+                                                           2||ltrim(loaded_image, 'A'))
+                     AND '1'||ltrim(loaded_image, 'A') NOT IN ('0'||ltrim(loaded_image, 'A'),
+                                                               2||ltrim(loaded_image, 'A'))))));
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM
+  (SELECT __time, number, client_ip,
+                          '1'||ltrim(loaded_image, 'A'),
+                          count(*)
+   FROM kttm_nested
+   WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+     AND ('1'||ltrim(loaded_image, 'A') IS NULL
+          OR ('1'||ltrim(loaded_image, 'A') = 1||ltrim(loaded_image, 'A')
+              AND '1'||ltrim(loaded_image, 'A') IS NOT DISTINCT
+              FROM 1||ltrim(loaded_image, 'A')
+              AND '1'||ltrim(loaded_image, 'A') <> '0'||ltrim(loaded_image, 'A')
+              AND ('1'||ltrim(loaded_image, 'A') IS DISTINCT
+                   FROM '0'||ltrim(loaded_image, 'A'))
+              AND '1'||ltrim(loaded_image, 'A') > '0'||ltrim(loaded_image, 'A')
+              AND '1'||ltrim(loaded_image, 'A') >= '0'||ltrim(loaded_image, 'A')
+              AND '1'||ltrim(loaded_image, 'A') < 2||ltrim(loaded_image, 'A')
+              AND '1'||ltrim(loaded_image, 'A') <= 2||ltrim(loaded_image, 'A')
+              AND ('1'||ltrim(loaded_image, 'A') <> '0'||ltrim(loaded_image, 'A')) IS TRUE
+              AND ('1'||ltrim(loaded_image, 'A') = '0'||ltrim(loaded_image, 'A')) IS NOT TRUE
+              AND ('1'||ltrim(loaded_image, 'A') = '0'||ltrim(loaded_image, 'A')) IS FALSE
+              AND ('1'||ltrim(loaded_image, 'A') <> '0'||ltrim(loaded_image, 'A')) IS NOT FALSE
+              AND '1'||ltrim(loaded_image, 'A') BETWEEN '0'||ltrim(loaded_image, 'A') AND 2||ltrim(loaded_image, 'A')
+              AND '1'||ltrim(loaded_image, 'A') NOT BETWEEN '1'||ltrim(loaded_image, 'A') AND '0'||ltrim(loaded_image, 'A')
+              AND '1'||ltrim(loaded_image, 'A') like '%'
+              AND '1'||ltrim(loaded_image, 'A') not like '__DOES_NOT_EXIST__%'
+              AND '1'||ltrim(loaded_image, 'A') IN ('0'||ltrim(loaded_image, 'A'),
+                                                    1||ltrim(loaded_image, 'A'),
+                                                    2||ltrim(loaded_image, 'A'))
+              AND '1'||ltrim(loaded_image, 'A') NOT IN ('0'||ltrim(loaded_image, 'A'),
+                                                        2||ltrim(loaded_image, 'A'))))
+   GROUP BY 1,
+            2,
+            3,
+            4);
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+#-------------------------------------------------------------------------
+# TEST_ID: A28: rtrim
+#-------------------------------------------------------------------------
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND ('1'||rtrim(loaded_image, 'A') IS NULL
+       OR ('1'||rtrim(loaded_image, 'A') = 1||rtrim(loaded_image, 'A')
+           AND '1'||rtrim(loaded_image, 'A') IS NOT DISTINCT
+           FROM 1||rtrim(loaded_image, 'A')
+           AND '1'||rtrim(loaded_image, 'A') <> '0'||rtrim(loaded_image, 'A')
+           AND ('1'||rtrim(loaded_image, 'A') IS DISTINCT
+                FROM '0'||rtrim(loaded_image, 'A'))
+           AND '1'||rtrim(loaded_image, 'A') > '0'||rtrim(loaded_image, 'A')
+           AND '1'||rtrim(loaded_image, 'A') >= '0'||rtrim(loaded_image, 'A')
+           AND '1'||rtrim(loaded_image, 'A') < 2||rtrim(loaded_image, 'A')
+           AND '1'||rtrim(loaded_image, 'A') <= 2||rtrim(loaded_image, 'A')
+           AND ('1'||rtrim(loaded_image, 'A') <> '0'||rtrim(loaded_image, 'A')) IS TRUE
+           AND ('1'||rtrim(loaded_image, 'A') = '0'||rtrim(loaded_image, 'A')) IS NOT TRUE
+           AND ('1'||rtrim(loaded_image, 'A') = '0'||rtrim(loaded_image, 'A')) IS FALSE
+           AND ('1'||rtrim(loaded_image, 'A') <> '0'||rtrim(loaded_image, 'A')) IS NOT FALSE
+           AND '1'||rtrim(loaded_image, 'A') BETWEEN '0'||rtrim(loaded_image, 'A') AND 2||rtrim(loaded_image, 'A')
+           AND '1'||rtrim(loaded_image, 'A') NOT BETWEEN '1'||rtrim(loaded_image, 'A') AND '0'||rtrim(loaded_image, 'A')
+           AND '1'||rtrim(loaded_image, 'A') like '%'
+           AND '1'||rtrim(loaded_image, 'A') not like '__DOES_NOT_EXIST__%'
+           AND '1'||rtrim(loaded_image, 'A') IN ('0'||rtrim(loaded_image, 'A'),
+                                                 1||rtrim(loaded_image, 'A'),
+                                                 2||rtrim(loaded_image, 'A'))
+           AND '1'||rtrim(loaded_image, 'A') NOT IN ('0'||rtrim(loaded_image, 'A'),
+                                                     2||rtrim(loaded_image, 'A')))) ;
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND ('1'||rtrim(loaded_image, 'A') IS NULL
+       OR '1'||rtrim(loaded_image, 'A') IN
+         (SELECT '1'||rtrim(loaded_image, 'A')
+          FROM kttm_nested
+          WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+            AND ('1'||rtrim(loaded_image, 'A') IS NULL
+                 OR ('1'||rtrim(loaded_image, 'A') = 1||rtrim(loaded_image, 'A')
+                     AND '1'||rtrim(loaded_image, 'A') IS NOT DISTINCT
+                     FROM 1||rtrim(loaded_image, 'A')
+                     AND '1'||rtrim(loaded_image, 'A') <> '0'||rtrim(loaded_image, 'A')
+                     AND ('1'||rtrim(loaded_image, 'A') IS DISTINCT
+                          FROM '0'||rtrim(loaded_image, 'A'))
+                     AND '1'||rtrim(loaded_image, 'A') > '0'||rtrim(loaded_image, 'A')
+                     AND '1'||rtrim(loaded_image, 'A') >= '0'||rtrim(loaded_image, 'A')
+                     AND '1'||rtrim(loaded_image, 'A') < 2||rtrim(loaded_image, 'A')
+                     AND '1'||rtrim(loaded_image, 'A') <= 2||rtrim(loaded_image, 'A')
+                     AND ('1'||rtrim(loaded_image, 'A') <> '0'||rtrim(loaded_image, 'A')) IS TRUE
+                     AND ('1'||rtrim(loaded_image, 'A') = '0'||rtrim(loaded_image, 'A')) IS NOT TRUE
+                     AND ('1'||rtrim(loaded_image, 'A') = '0'||rtrim(loaded_image, 'A')) IS FALSE
+                     AND ('1'||rtrim(loaded_image, 'A') <> '0'||rtrim(loaded_image, 'A')) IS NOT FALSE
+                     AND '1'||rtrim(loaded_image, 'A') BETWEEN '0'||rtrim(loaded_image, 'A') AND 2||rtrim(loaded_image, 'A')
+                     AND '1'||rtrim(loaded_image, 'A') NOT BETWEEN '1'||rtrim(loaded_image, 'A') AND '0'||rtrim(loaded_image, 'A')
+                     AND '1'||rtrim(loaded_image, 'A') like '%'
+                     AND '1'||rtrim(loaded_image, 'A') not like '__DOES_NOT_EXIST__%'
+                     AND '1'||rtrim(loaded_image, 'A') IN ('0'||rtrim(loaded_image, 'A'),
+                                                           1||rtrim(loaded_image, 'A'),
+                                                           2||rtrim(loaded_image, 'A'))
+                     AND '1'||rtrim(loaded_image, 'A') NOT IN ('0'||rtrim(loaded_image, 'A'),
+                                                               2||rtrim(loaded_image, 'A'))))));
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM
+  (SELECT __time, number, client_ip,
+                          '1'||rtrim(loaded_image, 'A'),
+                          count(*)
+   FROM kttm_nested
+   WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+     AND ('1'||rtrim(loaded_image, 'A') IS NULL
+          OR ('1'||rtrim(loaded_image, 'A') = 1||rtrim(loaded_image, 'A')
+              AND '1'||rtrim(loaded_image, 'A') IS NOT DISTINCT
+              FROM 1||rtrim(loaded_image, 'A')
+              AND '1'||rtrim(loaded_image, 'A') <> '0'||rtrim(loaded_image, 'A')
+              AND ('1'||rtrim(loaded_image, 'A') IS DISTINCT
+                   FROM '0'||rtrim(loaded_image, 'A'))
+              AND '1'||rtrim(loaded_image, 'A') > '0'||rtrim(loaded_image, 'A')
+              AND '1'||rtrim(loaded_image, 'A') >= '0'||rtrim(loaded_image, 'A')
+              AND '1'||rtrim(loaded_image, 'A') < 2||rtrim(loaded_image, 'A')
+              AND '1'||rtrim(loaded_image, 'A') <= 2||rtrim(loaded_image, 'A')
+              AND ('1'||rtrim(loaded_image, 'A') <> '0'||rtrim(loaded_image, 'A')) IS TRUE
+              AND ('1'||rtrim(loaded_image, 'A') = '0'||rtrim(loaded_image, 'A')) IS NOT TRUE
+              AND ('1'||rtrim(loaded_image, 'A') = '0'||rtrim(loaded_image, 'A')) IS FALSE
+              AND ('1'||rtrim(loaded_image, 'A') <> '0'||rtrim(loaded_image, 'A')) IS NOT FALSE
+              AND '1'||rtrim(loaded_image, 'A') BETWEEN '0'||rtrim(loaded_image, 'A') AND 2||rtrim(loaded_image, 'A')
+              AND '1'||rtrim(loaded_image, 'A') NOT BETWEEN '1'||rtrim(loaded_image, 'A') AND '0'||rtrim(loaded_image, 'A')
+              AND '1'||rtrim(loaded_image, 'A') like '%'
+              AND '1'||rtrim(loaded_image, 'A') not like '__DOES_NOT_EXIST__%'
+              AND '1'||rtrim(loaded_image, 'A') IN ('0'||rtrim(loaded_image, 'A'),
+                                                    1||rtrim(loaded_image, 'A'),
+                                                    2||rtrim(loaded_image, 'A'))
+              AND '1'||rtrim(loaded_image, 'A') NOT IN ('0'||rtrim(loaded_image, 'A'),
+                                                        2||rtrim(loaded_image, 'A'))))
+   GROUP BY 1,
+            2,
+            3,
+            4);
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+#-------------------------------------------------------------------------
+# TEST_ID: A29: reverse
+#-------------------------------------------------------------------------
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND ('1'||reverse(loaded_image) IS NULL
+       OR ('1'||reverse(loaded_image) = 1||reverse(loaded_image)
+           AND '1'||reverse(loaded_image) IS NOT DISTINCT
+           FROM 1||reverse(loaded_image)
+           AND '1'||reverse(loaded_image) <> '0'||reverse(loaded_image)
+           AND ('1'||reverse(loaded_image) IS DISTINCT
+                FROM '0'||reverse(loaded_image))
+           AND '1'||reverse(loaded_image) > '0'||reverse(loaded_image)
+           AND '1'||reverse(loaded_image) >= '0'||reverse(loaded_image)
+           AND '1'||reverse(loaded_image) < 2||reverse(loaded_image)
+           AND '1'||reverse(loaded_image) <= 2||reverse(loaded_image)
+           AND ('1'||reverse(loaded_image) <> '0'||reverse(loaded_image)) IS TRUE
+           AND ('1'||reverse(loaded_image) = '0'||reverse(loaded_image)) IS NOT TRUE
+           AND ('1'||reverse(loaded_image) = '0'||reverse(loaded_image)) IS FALSE
+           AND ('1'||reverse(loaded_image) <> '0'||reverse(loaded_image)) IS NOT FALSE
+           AND '1'||reverse(loaded_image) BETWEEN '0'||reverse(loaded_image) AND 2||reverse(loaded_image)
+           AND '1'||reverse(loaded_image) NOT BETWEEN '1'||reverse(loaded_image) AND '0'||reverse(loaded_image)
+           AND '1'||reverse(loaded_image) like '%'
+           AND '1'||reverse(loaded_image) not like '__DOES_NOT_EXIST__%'
+           AND '1'||reverse(loaded_image) IN ('0'||reverse(loaded_image),
+                                              1||reverse(loaded_image),
+                                              2||reverse(loaded_image))
+           AND '1'||reverse(loaded_image) NOT IN ('0'||reverse(loaded_image),
+                                                  2||reverse(loaded_image)))) ;
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND ('1'||reverse(loaded_image) IS NULL
+       OR '1'||reverse(loaded_image) IN
+         (SELECT '1'||reverse(loaded_image)
+          FROM kttm_nested
+          WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+            AND ('1'||reverse(loaded_image) IS NULL
+                 OR ('1'||reverse(loaded_image) = 1||reverse(loaded_image)
+                     AND '1'||reverse(loaded_image) IS NOT DISTINCT
+                     FROM 1||reverse(loaded_image)
+                     AND '1'||reverse(loaded_image) <> '0'||reverse(loaded_image)
+                     AND ('1'||reverse(loaded_image) IS DISTINCT
+                          FROM '0'||reverse(loaded_image))
+                     AND '1'||reverse(loaded_image) > '0'||reverse(loaded_image)
+                     AND '1'||reverse(loaded_image) >= '0'||reverse(loaded_image)
+                     AND '1'||reverse(loaded_image) < 2||reverse(loaded_image)
+                     AND '1'||reverse(loaded_image) <= 2||reverse(loaded_image)
+                     AND ('1'||reverse(loaded_image) <> '0'||reverse(loaded_image)) IS TRUE
+                     AND ('1'||reverse(loaded_image) = '0'||reverse(loaded_image)) IS NOT TRUE
+                     AND ('1'||reverse(loaded_image) = '0'||reverse(loaded_image)) IS FALSE
+                     AND ('1'||reverse(loaded_image) <> '0'||reverse(loaded_image)) IS NOT FALSE
+                     AND '1'||reverse(loaded_image) BETWEEN '0'||reverse(loaded_image) AND 2||reverse(loaded_image)
+                     AND '1'||reverse(loaded_image) NOT BETWEEN '1'||reverse(loaded_image) AND '0'||reverse(loaded_image)
+                     AND '1'||reverse(loaded_image) like '%'
+                     AND '1'||reverse(loaded_image) not like '__DOES_NOT_EXIST__%'
+                     AND '1'||reverse(loaded_image) IN ('0'||reverse(loaded_image),
+                                                        1||reverse(loaded_image),
+                                                        2||reverse(loaded_image))
+                     AND '1'||reverse(loaded_image) NOT IN ('0'||reverse(loaded_image),
+                                                            2||reverse(loaded_image))))));
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM
+  (SELECT __time, number, client_ip,
+                          '1'||reverse(loaded_image),
+                          count(*)
+   FROM kttm_nested
+   WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+     AND ('1'||reverse(loaded_image) IS NULL
+          OR ('1'||reverse(loaded_image) = 1||reverse(loaded_image)
+              AND '1'||reverse(loaded_image) IS NOT DISTINCT
+              FROM 1||reverse(loaded_image)
+              AND '1'||reverse(loaded_image) <> '0'||reverse(loaded_image)
+              AND ('1'||reverse(loaded_image) IS DISTINCT
+                   FROM '0'||reverse(loaded_image))
+              AND '1'||reverse(loaded_image) > '0'||reverse(loaded_image)
+              AND '1'||reverse(loaded_image) >= '0'||reverse(loaded_image)
+              AND '1'||reverse(loaded_image) < 2||reverse(loaded_image)
+              AND '1'||reverse(loaded_image) <= 2||reverse(loaded_image)
+              AND ('1'||reverse(loaded_image) <> '0'||reverse(loaded_image)) IS TRUE
+              AND ('1'||reverse(loaded_image) = '0'||reverse(loaded_image)) IS NOT TRUE
+              AND ('1'||reverse(loaded_image) = '0'||reverse(loaded_image)) IS FALSE
+              AND ('1'||reverse(loaded_image) <> '0'||reverse(loaded_image)) IS NOT FALSE
+              AND '1'||reverse(loaded_image) BETWEEN '0'||reverse(loaded_image) AND 2||reverse(loaded_image)
+              AND '1'||reverse(loaded_image) NOT BETWEEN '1'||reverse(loaded_image) AND '0'||reverse(loaded_image)
+              AND '1'||reverse(loaded_image) like '%'
+              AND '1'||reverse(loaded_image) not like '__DOES_NOT_EXIST__%'
+              AND '1'||reverse(loaded_image) IN ('0'||reverse(loaded_image),
+                                                 1||reverse(loaded_image),
+                                                 2||reverse(loaded_image))
+              AND '1'||reverse(loaded_image) NOT IN ('0'||reverse(loaded_image),
+                                                     2||reverse(loaded_image))))
+   GROUP BY 1,
+            2,
+            3,
+            4);
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+#-------------------------------------------------------------------------
+# TEST_ID: A30: repeat
+#-------------------------------------------------------------------------
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND ('1'||repeat(loaded_image, 2) IS NULL
+       OR ('1'||repeat(loaded_image, 2) = 1||repeat(loaded_image, 2)
+           AND '1'||repeat(loaded_image, 2) IS NOT DISTINCT
+           FROM 1||repeat(loaded_image, 2)
+           AND '1'||repeat(loaded_image, 2) <> '0'||repeat(loaded_image, 2)
+           AND ('1'||repeat(loaded_image, 2) IS DISTINCT
+                FROM '0'||repeat(loaded_image, 2))
+           AND '1'||repeat(loaded_image, 2) > '0'||repeat(loaded_image, 2)
+           AND '1'||repeat(loaded_image, 2) >= '0'||repeat(loaded_image, 2)
+           AND '1'||repeat(loaded_image, 2) < 2||repeat(loaded_image, 2)
+           AND '1'||repeat(loaded_image, 2) <= 2||repeat(loaded_image, 2)
+           AND ('1'||repeat(loaded_image, 2) <> '0'||repeat(loaded_image, 2)) IS TRUE
+           AND ('1'||repeat(loaded_image, 2) = '0'||repeat(loaded_image, 2)) IS NOT TRUE
+           AND ('1'||repeat(loaded_image, 2) = '0'||repeat(loaded_image, 2)) IS FALSE
+           AND ('1'||repeat(loaded_image, 2) <> '0'||repeat(loaded_image, 2)) IS NOT FALSE
+           AND '1'||repeat(loaded_image, 2) BETWEEN '0'||repeat(loaded_image, 2) AND 2||repeat(loaded_image, 2)
+           AND '1'||repeat(loaded_image, 2) NOT BETWEEN '1'||repeat(loaded_image, 2) AND '0'||repeat(loaded_image, 2)
+           AND '1'||repeat(loaded_image, 2) like '%'
+           AND '1'||repeat(loaded_image, 2) not like '__DOES_NOT_EXIST__%'
+           AND '1'||repeat(loaded_image, 2) IN ('0'||repeat(loaded_image, 2),
+                                                1||repeat(loaded_image, 2),
+                                                2||repeat(loaded_image, 2))
+           AND '1'||repeat(loaded_image, 2) NOT IN ('0'||repeat(loaded_image, 2),
+                                                    2||repeat(loaded_image, 2)))) ;
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND ('1'||repeat(loaded_image, 2) IS NULL
+       OR '1'||repeat(loaded_image, 2) IN
+         (SELECT '1'||repeat(loaded_image, 2)
+          FROM kttm_nested
+          WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+            AND ('1'||repeat(loaded_image, 2) IS NULL
+                 OR ('1'||repeat(loaded_image, 2) = 1||repeat(loaded_image, 2)
+                     AND '1'||repeat(loaded_image, 2) IS NOT DISTINCT
+                     FROM 1||repeat(loaded_image, 2)
+                     AND '1'||repeat(loaded_image, 2) <> '0'||repeat(loaded_image, 2)
+                     AND ('1'||repeat(loaded_image, 2) IS DISTINCT
+                          FROM '0'||repeat(loaded_image, 2))
+                     AND '1'||repeat(loaded_image, 2) > '0'||repeat(loaded_image, 2)
+                     AND '1'||repeat(loaded_image, 2) >= '0'||repeat(loaded_image, 2)
+                     AND '1'||repeat(loaded_image, 2) < 2||repeat(loaded_image, 2)
+                     AND '1'||repeat(loaded_image, 2) <= 2||repeat(loaded_image, 2)
+                     AND ('1'||repeat(loaded_image, 2) <> '0'||repeat(loaded_image, 2)) IS TRUE
+                     AND ('1'||repeat(loaded_image, 2) = '0'||repeat(loaded_image, 2)) IS NOT TRUE
+                     AND ('1'||repeat(loaded_image, 2) = '0'||repeat(loaded_image, 2)) IS FALSE
+                     AND ('1'||repeat(loaded_image, 2) <> '0'||repeat(loaded_image, 2)) IS NOT FALSE
+                     AND '1'||repeat(loaded_image, 2) BETWEEN '0'||repeat(loaded_image, 2) AND 2||repeat(loaded_image, 2)
+                     AND '1'||repeat(loaded_image, 2) NOT BETWEEN '1'||repeat(loaded_image, 2) AND '0'||repeat(loaded_image, 2)
+                     AND '1'||repeat(loaded_image, 2) like '%'
+                     AND '1'||repeat(loaded_image, 2) not like '__DOES_NOT_EXIST__%'
+                     AND '1'||repeat(loaded_image, 2) IN ('0'||repeat(loaded_image, 2),
+                                                          1||repeat(loaded_image, 2),
+                                                          2||repeat(loaded_image, 2))
+                     AND '1'||repeat(loaded_image, 2) NOT IN ('0'||repeat(loaded_image, 2),
+                                                              2||repeat(loaded_image, 2))))));
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM
+  (SELECT __time, number, client_ip,
+                          '1'||repeat(loaded_image, 2),
+                          count(*)
+   FROM kttm_nested
+   WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+     AND ('1'||repeat(loaded_image, 2) IS NULL
+          OR ('1'||repeat(loaded_image, 2) = 1||repeat(loaded_image, 2)
+              AND '1'||repeat(loaded_image, 2) IS NOT DISTINCT
+              FROM 1||repeat(loaded_image, 2)
+              AND '1'||repeat(loaded_image, 2) <> '0'||repeat(loaded_image, 2)
+              AND ('1'||repeat(loaded_image, 2) IS DISTINCT
+                   FROM '0'||repeat(loaded_image, 2))
+              AND '1'||repeat(loaded_image, 2) > '0'||repeat(loaded_image, 2)
+              AND '1'||repeat(loaded_image, 2) >= '0'||repeat(loaded_image, 2)
+              AND '1'||repeat(loaded_image, 2) < 2||repeat(loaded_image, 2)
+              AND '1'||repeat(loaded_image, 2) <= 2||repeat(loaded_image, 2)
+              AND ('1'||repeat(loaded_image, 2) <> '0'||repeat(loaded_image, 2)) IS TRUE
+              AND ('1'||repeat(loaded_image, 2) = '0'||repeat(loaded_image, 2)) IS NOT TRUE
+              AND ('1'||repeat(loaded_image, 2) = '0'||repeat(loaded_image, 2)) IS FALSE
+              AND ('1'||repeat(loaded_image, 2) <> '0'||repeat(loaded_image, 2)) IS NOT FALSE
+              AND '1'||repeat(loaded_image, 2) BETWEEN '0'||repeat(loaded_image, 2) AND 2||repeat(loaded_image, 2)
+              AND '1'||repeat(loaded_image, 2) NOT BETWEEN '1'||repeat(loaded_image, 2) AND '0'||repeat(loaded_image, 2)
+              AND '1'||repeat(loaded_image, 2) like '%'
+              AND '1'||repeat(loaded_image, 2) not like '__DOES_NOT_EXIST__%'
+              AND '1'||repeat(loaded_image, 2) IN ('0'||repeat(loaded_image, 2),
+                                                   1||repeat(loaded_image, 2),
+                                                   2||repeat(loaded_image, 2))
+              AND '1'||repeat(loaded_image, 2) NOT IN ('0'||repeat(loaded_image, 2),
+                                                       2||repeat(loaded_image, 2))))
+   GROUP BY 1,
+            2,
+            3,
+            4);
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+#-------------------------------------------------------------------------
+# TEST_ID: A31: lpad
+#-------------------------------------------------------------------------
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND ('1'||lpad(loaded_image, 10, 'z') IS NULL
+       OR ('1'||lpad(loaded_image, 10, 'z') = 1||lpad(loaded_image, 10, 'z')
+           AND '1'||lpad(loaded_image, 10, 'z') IS NOT DISTINCT
+           FROM 1||lpad(loaded_image, 10, 'z')
+           AND '1'||lpad(loaded_image, 10, 'z') <> '0'||lpad(loaded_image, 10, 'z')
+           AND ('1'||lpad(loaded_image, 10, 'z') IS DISTINCT
+                FROM '0'||lpad(loaded_image, 10, 'z'))
+           AND '1'||lpad(loaded_image, 10, 'z') > '0'||lpad(loaded_image, 10, 'z')
+           AND '1'||lpad(loaded_image, 10, 'z') >= '0'||lpad(loaded_image, 10, 'z')
+           AND '1'||lpad(loaded_image, 10, 'z') < 2||lpad(loaded_image, 10, 'z')
+           AND '1'||lpad(loaded_image, 10, 'z') <= 2||lpad(loaded_image, 10, 'z')
+           AND ('1'||lpad(loaded_image, 10, 'z') <> '0'||lpad(loaded_image, 10, 'z')) IS TRUE
+           AND ('1'||lpad(loaded_image, 10, 'z') = '0'||lpad(loaded_image, 10, 'z')) IS NOT TRUE
+           AND ('1'||lpad(loaded_image, 10, 'z') = '0'||lpad(loaded_image, 10, 'z')) IS FALSE
+           AND ('1'||lpad(loaded_image, 10, 'z') <> '0'||lpad(loaded_image, 10, 'z')) IS NOT FALSE
+           AND '1'||lpad(loaded_image, 10, 'z') BETWEEN '0'||lpad(loaded_image, 10, 'z') AND 2||lpad(loaded_image, 10, 'z')
+           AND '1'||lpad(loaded_image, 10, 'z') NOT BETWEEN '1'||lpad(loaded_image, 10, 'z') AND '0'||lpad(loaded_image, 10, 'z')
+           AND '1'||lpad(loaded_image, 10, 'z') like '%'
+           AND '1'||lpad(loaded_image, 10, 'z') not like '__DOES_NOT_EXIST__%'
+           AND '1'||lpad(loaded_image, 10, 'z') IN ('0'||lpad(loaded_image, 10, 'z'),
+                                                    1||lpad(loaded_image, 10, 'z'),
+                                                    2||lpad(loaded_image, 10, 'z'))
+           AND '1'||lpad(loaded_image, 10, 'z') NOT IN ('0'||lpad(loaded_image, 10, 'z'),
+                                                        2||lpad(loaded_image, 10, 'z')))) ;
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND ('1'||lpad(loaded_image, 10, 'z') IS NULL
+       OR '1'||lpad(loaded_image, 10, 'z') IN
+         (SELECT '1'||lpad(loaded_image, 10, 'z')
+          FROM kttm_nested
+          WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+            AND ('1'||lpad(loaded_image, 10, 'z') IS NULL
+                 OR ('1'||lpad(loaded_image, 10, 'z') = 1||lpad(loaded_image, 10, 'z')
+                     AND '1'||lpad(loaded_image, 10, 'z') IS NOT DISTINCT
+                     FROM 1||lpad(loaded_image, 10, 'z')
+                     AND '1'||lpad(loaded_image, 10, 'z') <> '0'||lpad(loaded_image, 10, 'z')
+                     AND ('1'||lpad(loaded_image, 10, 'z') IS DISTINCT
+                          FROM '0'||lpad(loaded_image, 10, 'z'))
+                     AND '1'||lpad(loaded_image, 10, 'z') > '0'||lpad(loaded_image, 10, 'z')
+                     AND '1'||lpad(loaded_image, 10, 'z') >= '0'||lpad(loaded_image, 10, 'z')
+                     AND '1'||lpad(loaded_image, 10, 'z') < 2||lpad(loaded_image, 10, 'z')
+                     AND '1'||lpad(loaded_image, 10, 'z') <= 2||lpad(loaded_image, 10, 'z')
+                     AND ('1'||lpad(loaded_image, 10, 'z') <> '0'||lpad(loaded_image, 10, 'z')) IS TRUE
+                     AND ('1'||lpad(loaded_image, 10, 'z') = '0'||lpad(loaded_image, 10, 'z')) IS NOT TRUE
+                     AND ('1'||lpad(loaded_image, 10, 'z') = '0'||lpad(loaded_image, 10, 'z')) IS FALSE
+                     AND ('1'||lpad(loaded_image, 10, 'z') <> '0'||lpad(loaded_image, 10, 'z')) IS NOT FALSE
+                     AND '1'||lpad(loaded_image, 10, 'z') BETWEEN '0'||lpad(loaded_image, 10, 'z') AND 2||lpad(loaded_image, 10, 'z')
+                     AND '1'||lpad(loaded_image, 10, 'z') NOT BETWEEN '1'||lpad(loaded_image, 10, 'z') AND '0'||lpad(loaded_image, 10, 'z')
+                     AND '1'||lpad(loaded_image, 10, 'z') like '%'
+                     AND '1'||lpad(loaded_image, 10, 'z') not like '__DOES_NOT_EXIST__%'
+                     AND '1'||lpad(loaded_image, 10, 'z') IN ('0'||lpad(loaded_image, 10, 'z'),
+                                                              1||lpad(loaded_image, 10, 'z'),
+                                                              2||lpad(loaded_image, 10, 'z'))
+                     AND '1'||lpad(loaded_image, 10, 'z') NOT IN ('0'||lpad(loaded_image, 10, 'z'),
+                                                                  2||lpad(loaded_image, 10, 'z'))))));
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM
+  (SELECT __time, number, client_ip,
+                          '1'||lpad(loaded_image, 10, 'z'),
+                          count(*)
+   FROM kttm_nested
+   WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+     AND ('1'||lpad(loaded_image, 10, 'z') IS NULL
+          OR ('1'||lpad(loaded_image, 10, 'z') = 1||lpad(loaded_image, 10, 'z')
+              AND '1'||lpad(loaded_image, 10, 'z') IS NOT DISTINCT
+              FROM 1||lpad(loaded_image, 10, 'z')
+              AND '1'||lpad(loaded_image, 10, 'z') <> '0'||lpad(loaded_image, 10, 'z')
+              AND ('1'||lpad(loaded_image, 10, 'z') IS DISTINCT
+                   FROM '0'||lpad(loaded_image, 10, 'z'))
+              AND '1'||lpad(loaded_image, 10, 'z') > '0'||lpad(loaded_image, 10, 'z')
+              AND '1'||lpad(loaded_image, 10, 'z') >= '0'||lpad(loaded_image, 10, 'z')
+              AND '1'||lpad(loaded_image, 10, 'z') < 2||lpad(loaded_image, 10, 'z')
+              AND '1'||lpad(loaded_image, 10, 'z') <= 2||lpad(loaded_image, 10, 'z')
+              AND ('1'||lpad(loaded_image, 10, 'z') <> '0'||lpad(loaded_image, 10, 'z')) IS TRUE
+              AND ('1'||lpad(loaded_image, 10, 'z') = '0'||lpad(loaded_image, 10, 'z')) IS NOT TRUE
+              AND ('1'||lpad(loaded_image, 10, 'z') = '0'||lpad(loaded_image, 10, 'z')) IS FALSE
+              AND ('1'||lpad(loaded_image, 10, 'z') <> '0'||lpad(loaded_image, 10, 'z')) IS NOT FALSE
+              AND '1'||lpad(loaded_image, 10, 'z') BETWEEN '0'||lpad(loaded_image, 10, 'z') AND 2||lpad(loaded_image, 10, 'z')
+              AND '1'||lpad(loaded_image, 10, 'z') NOT BETWEEN '1'||lpad(loaded_image, 10, 'z') AND '0'||lpad(loaded_image, 10, 'z')
+              AND '1'||lpad(loaded_image, 10, 'z') like '%'
+              AND '1'||lpad(loaded_image, 10, 'z') not like '__DOES_NOT_EXIST__%'
+              AND '1'||lpad(loaded_image, 10, 'z') IN ('0'||lpad(loaded_image, 10, 'z'),
+                                                       1||lpad(loaded_image, 10, 'z'),
+                                                       2||lpad(loaded_image, 10, 'z'))
+              AND '1'||lpad(loaded_image, 10, 'z') NOT IN ('0'||lpad(loaded_image, 10, 'z'),
+                                                           2||lpad(loaded_image, 10, 'z'))))
+   GROUP BY 1,
+            2,
+            3,
+            4);
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+#-------------------------------------------------------------------------
+# TEST_ID: A32: rpad
+#-------------------------------------------------------------------------
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND ('1'||rpad(loaded_image, 10, 'z') IS NULL
+       OR ('1'||rpad(loaded_image, 10, 'z') = 1||rpad(loaded_image, 10, 'z')
+           AND '1'||rpad(loaded_image, 10, 'z') IS NOT DISTINCT
+           FROM 1||rpad(loaded_image, 10, 'z')
+           AND '1'||rpad(loaded_image, 10, 'z') <> '0'||rpad(loaded_image, 10, 'z')
+           AND ('1'||rpad(loaded_image, 10, 'z') IS DISTINCT
+                FROM '0'||rpad(loaded_image, 10, 'z'))
+           AND '1'||rpad(loaded_image, 10, 'z') > '0'||rpad(loaded_image, 10, 'z')
+           AND '1'||rpad(loaded_image, 10, 'z') >= '0'||rpad(loaded_image, 10, 'z')
+           AND '1'||rpad(loaded_image, 10, 'z') < 2||rpad(loaded_image, 10, 'z')
+           AND '1'||rpad(loaded_image, 10, 'z') <= 2||rpad(loaded_image, 10, 'z')
+           AND ('1'||rpad(loaded_image, 10, 'z') <> '0'||rpad(loaded_image, 10, 'z')) IS TRUE
+           AND ('1'||rpad(loaded_image, 10, 'z') = '0'||rpad(loaded_image, 10, 'z')) IS NOT TRUE
+           AND ('1'||rpad(loaded_image, 10, 'z') = '0'||rpad(loaded_image, 10, 'z')) IS FALSE
+           AND ('1'||rpad(loaded_image, 10, 'z') <> '0'||rpad(loaded_image, 10, 'z')) IS NOT FALSE
+           AND '1'||rpad(loaded_image, 10, 'z') BETWEEN '0'||rpad(loaded_image, 10, 'z') AND 2||rpad(loaded_image, 10, 'z')
+           AND '1'||rpad(loaded_image, 10, 'z') NOT BETWEEN '1'||rpad(loaded_image, 10, 'z') AND '0'||rpad(loaded_image, 10, 'z')
+           AND '1'||rpad(loaded_image, 10, 'z') like '%'
+           AND '1'||rpad(loaded_image, 10, 'z') not like '__DOES_NOT_EXIST__%'
+           AND '1'||rpad(loaded_image, 10, 'z') IN ('0'||rpad(loaded_image, 10, 'z'),
+                                                    1||rpad(loaded_image, 10, 'z'),
+                                                    2||rpad(loaded_image, 10, 'z'))
+           AND '1'||rpad(loaded_image, 10, 'z') NOT IN ('0'||rpad(loaded_image, 10, 'z'),
+                                                        2||rpad(loaded_image, 10, 'z')))) ;
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND ('1'||rpad(loaded_image, 10, 'z') IS NULL
+       OR '1'||rpad(loaded_image, 10, 'z') IN
+         (SELECT '1'||rpad(loaded_image, 10, 'z')
+          FROM kttm_nested
+          WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+            AND ('1'||rpad(loaded_image, 10, 'z') IS NULL
+                 OR ('1'||rpad(loaded_image, 10, 'z') = 1||rpad(loaded_image, 10, 'z')
+                     AND '1'||rpad(loaded_image, 10, 'z') IS NOT DISTINCT
+                     FROM 1||rpad(loaded_image, 10, 'z')
+                     AND '1'||rpad(loaded_image, 10, 'z') <> '0'||rpad(loaded_image, 10, 'z')
+                     AND ('1'||rpad(loaded_image, 10, 'z') IS DISTINCT
+                          FROM '0'||rpad(loaded_image, 10, 'z'))
+                     AND '1'||rpad(loaded_image, 10, 'z') > '0'||rpad(loaded_image, 10, 'z')
+                     AND '1'||rpad(loaded_image, 10, 'z') >= '0'||rpad(loaded_image, 10, 'z')
+                     AND '1'||rpad(loaded_image, 10, 'z') < 2||rpad(loaded_image, 10, 'z')
+                     AND '1'||rpad(loaded_image, 10, 'z') <= 2||rpad(loaded_image, 10, 'z')
+                     AND ('1'||rpad(loaded_image, 10, 'z') <> '0'||rpad(loaded_image, 10, 'z')) IS TRUE
+                     AND ('1'||rpad(loaded_image, 10, 'z') = '0'||rpad(loaded_image, 10, 'z')) IS NOT TRUE
+                     AND ('1'||rpad(loaded_image, 10, 'z') = '0'||rpad(loaded_image, 10, 'z')) IS FALSE
+                     AND ('1'||rpad(loaded_image, 10, 'z') <> '0'||rpad(loaded_image, 10, 'z')) IS NOT FALSE
+                     AND '1'||rpad(loaded_image, 10, 'z') BETWEEN '0'||rpad(loaded_image, 10, 'z') AND 2||rpad(loaded_image, 10, 'z')
+                     AND '1'||rpad(loaded_image, 10, 'z') NOT BETWEEN '1'||rpad(loaded_image, 10, 'z') AND '0'||rpad(loaded_image, 10, 'z')
+                     AND '1'||rpad(loaded_image, 10, 'z') like '%'
+                     AND '1'||rpad(loaded_image, 10, 'z') not like '__DOES_NOT_EXIST__%'
+                     AND '1'||rpad(loaded_image, 10, 'z') IN ('0'||rpad(loaded_image, 10, 'z'),
+                                                              1||rpad(loaded_image, 10, 'z'),
+                                                              2||rpad(loaded_image, 10, 'z'))
+                     AND '1'||rpad(loaded_image, 10, 'z') NOT IN ('0'||rpad(loaded_image, 10, 'z'),
+                                                                  2||rpad(loaded_image, 10, 'z'))))));
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM
+  (SELECT __time, number, client_ip,
+                          '1'||rpad(loaded_image, 10, 'z'),
+                          count(*)
+   FROM kttm_nested
+   WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+     AND ('1'||rpad(loaded_image, 10, 'z') IS NULL
+          OR ('1'||rpad(loaded_image, 10, 'z') = 1||rpad(loaded_image, 10, 'z')
+              AND '1'||rpad(loaded_image, 10, 'z') IS NOT DISTINCT
+              FROM 1||rpad(loaded_image, 10, 'z')
+              AND '1'||rpad(loaded_image, 10, 'z') <> '0'||rpad(loaded_image, 10, 'z')
+              AND ('1'||rpad(loaded_image, 10, 'z') IS DISTINCT
+                   FROM '0'||rpad(loaded_image, 10, 'z'))
+              AND '1'||rpad(loaded_image, 10, 'z') > '0'||rpad(loaded_image, 10, 'z')
+              AND '1'||rpad(loaded_image, 10, 'z') >= '0'||rpad(loaded_image, 10, 'z')
+              AND '1'||rpad(loaded_image, 10, 'z') < 2||rpad(loaded_image, 10, 'z')
+              AND '1'||rpad(loaded_image, 10, 'z') <= 2||rpad(loaded_image, 10, 'z')
+              AND ('1'||rpad(loaded_image, 10, 'z') <> '0'||rpad(loaded_image, 10, 'z')) IS TRUE
+              AND ('1'||rpad(loaded_image, 10, 'z') = '0'||rpad(loaded_image, 10, 'z')) IS NOT TRUE
+              AND ('1'||rpad(loaded_image, 10, 'z') = '0'||rpad(loaded_image, 10, 'z')) IS FALSE
+              AND ('1'||rpad(loaded_image, 10, 'z') <> '0'||rpad(loaded_image, 10, 'z')) IS NOT FALSE
+              AND '1'||rpad(loaded_image, 10, 'z') BETWEEN '0'||rpad(loaded_image, 10, 'z') AND 2||rpad(loaded_image, 10, 'z')
+              AND '1'||rpad(loaded_image, 10, 'z') NOT BETWEEN '1'||rpad(loaded_image, 10, 'z') AND '0'||rpad(loaded_image, 10, 'z')
+              AND '1'||rpad(loaded_image, 10, 'z') like '%'
+              AND '1'||rpad(loaded_image, 10, 'z') not like '__DOES_NOT_EXIST__%'
+              AND '1'||rpad(loaded_image, 10, 'z') IN ('0'||rpad(loaded_image, 10, 'z'),
+                                                       1||rpad(loaded_image, 10, 'z'),
+                                                       2||rpad(loaded_image, 10, 'z'))
+              AND '1'||rpad(loaded_image, 10, 'z') NOT IN ('0'||rpad(loaded_image, 10, 'z'),
+                                                           2||rpad(loaded_image, 10, 'z'))))
+   GROUP BY 1,
+            2,
+            3,
+            4);
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+#-------------------------------------------------------------------------
+# Total query count 97
+#-------------------------------------------------------------------------

From 3c1b488cb7b3ab18b662f787e36530c31e3b641e Mon Sep 17 00:00:00 2001
From: Clint Wylie <cwylie@apache.org>
Date: Wed, 11 Dec 2024 13:07:56 -0800
Subject: [PATCH 25/56] remove druid.sql.planner.serializeComplexValues config
 in favor of always serializing complex values (#17549)

---
 .../test/resources/indexer/export_task.json   |  1 -
 .../sql/calcite/planner/PlannerConfig.java    | 19 -------
 .../druid/sql/calcite/run/SqlResults.java     | 23 ++------
 .../apache/druid/sql/SqlStatementTest.java    |  2 +-
 .../sql/calcite/BaseCalciteQueryTest.java     |  4 --
 .../sql/calcite/CalciteSelectQueryTest.java   | 54 +++++++++----------
 .../druid/sql/calcite/run/SqlResultsTest.java |  9 +++-
 .../druid/sql/http/SqlResourceTest.java       | 43 ++++++++-------
 .../execution-ingest-complete.mock.ts         |  1 -
 .../execution/execution-ingest-error.mock.ts  |  1 -
 .../druid-models/execution/execution.spec.ts  |  1 -
 .../execution-details-pane.spec.tsx.snap      |  3 --
 12 files changed, 60 insertions(+), 101 deletions(-)

diff --git a/integration-tests-ex/cases/src/test/resources/indexer/export_task.json b/integration-tests-ex/cases/src/test/resources/indexer/export_task.json
index 45e59704a85e..9cb87df9a4f3 100644
--- a/integration-tests-ex/cases/src/test/resources/indexer/export_task.json
+++ b/integration-tests-ex/cases/src/test/resources/indexer/export_task.json
@@ -198,7 +198,6 @@
   },
   "sqlResultsContext": {
     "timeZone": "UTC",
-    "serializeComplexValues": true,
     "stringifyArrays": false
   },
   "sqlTypeNames": [
diff --git a/sql/src/main/java/org/apache/druid/sql/calcite/planner/PlannerConfig.java b/sql/src/main/java/org/apache/druid/sql/calcite/planner/PlannerConfig.java
index 7fb10041734d..589d68d43055 100644
--- a/sql/src/main/java/org/apache/druid/sql/calcite/planner/PlannerConfig.java
+++ b/sql/src/main/java/org/apache/druid/sql/calcite/planner/PlannerConfig.java
@@ -75,8 +75,6 @@ public class PlannerConfig
   @JsonProperty
   private String nativeQuerySqlPlanningMode = QueryContexts.NATIVE_QUERY_SQL_PLANNING_MODE_COUPLED; // can be COUPLED or DECOUPLED
 
-  private boolean serializeComplexValues = true;
-
   public int getMaxNumericInFilters()
   {
     return maxNumericInFilters;
@@ -112,11 +110,6 @@ public DateTimeZone getSqlTimeZone()
     return sqlTimeZone;
   }
 
-  public boolean shouldSerializeComplexValues()
-  {
-    return serializeComplexValues;
-  }
-
   public boolean isComputeInnerJoinCostAsFilter()
   {
     return computeInnerJoinCostAsFilter;
@@ -170,7 +163,6 @@ public boolean equals(final Object o)
            useApproximateCountDistinct == that.useApproximateCountDistinct &&
            useApproximateTopN == that.useApproximateTopN &&
            requireTimeCondition == that.requireTimeCondition &&
-           serializeComplexValues == that.serializeComplexValues &&
            Objects.equals(sqlTimeZone, that.sqlTimeZone) &&
            useNativeQueryExplain == that.useNativeQueryExplain &&
            forceExpressionVirtualColumns == that.forceExpressionVirtualColumns &&
@@ -191,7 +183,6 @@ public int hashCode()
         useApproximateTopN,
         requireTimeCondition,
         sqlTimeZone,
-        serializeComplexValues,
         useNativeQueryExplain,
         forceExpressionVirtualColumns,
         nativeQuerySqlPlanningMode
@@ -207,7 +198,6 @@ public String toString()
            ", useApproximateTopN=" + useApproximateTopN +
            ", requireTimeCondition=" + requireTimeCondition +
            ", sqlTimeZone=" + sqlTimeZone +
-           ", serializeComplexValues=" + serializeComplexValues +
            ", useNativeQueryExplain=" + useNativeQueryExplain +
            ", nativeQuerySqlPlanningMode=" + nativeQuerySqlPlanningMode +
            '}';
@@ -242,7 +232,6 @@ public static class Builder
     private boolean useNativeQueryExplain;
     private boolean forceExpressionVirtualColumns;
     private int maxNumericInFilters;
-    private boolean serializeComplexValues;
     private String nativeQuerySqlPlanningMode;
 
     public Builder(PlannerConfig base)
@@ -261,7 +250,6 @@ public Builder(PlannerConfig base)
       useNativeQueryExplain = base.isUseNativeQueryExplain();
       forceExpressionVirtualColumns = base.isForceExpressionVirtualColumns();
       maxNumericInFilters = base.getMaxNumericInFilters();
-      serializeComplexValues = base.shouldSerializeComplexValues();
       nativeQuerySqlPlanningMode = base.getNativeQuerySqlPlanningMode();
     }
 
@@ -319,12 +307,6 @@ public Builder authorizeSystemTablesDirectly(boolean option)
       return this;
     }
 
-    public Builder serializeComplexValues(boolean option)
-    {
-      this.serializeComplexValues = option;
-      return this;
-    }
-
     public Builder useNativeQueryExplain(boolean option)
     {
       this.useNativeQueryExplain = option;
@@ -421,7 +403,6 @@ public PlannerConfig build()
       config.useNativeQueryExplain = useNativeQueryExplain;
       config.maxNumericInFilters = maxNumericInFilters;
       config.forceExpressionVirtualColumns = forceExpressionVirtualColumns;
-      config.serializeComplexValues = serializeComplexValues;
       config.nativeQuerySqlPlanningMode = nativeQuerySqlPlanningMode;
       return config;
     }
diff --git a/sql/src/main/java/org/apache/druid/sql/calcite/run/SqlResults.java b/sql/src/main/java/org/apache/druid/sql/calcite/run/SqlResults.java
index 38b3ab1fd890..0f4a07d33357 100644
--- a/sql/src/main/java/org/apache/druid/sql/calcite/run/SqlResults.java
+++ b/sql/src/main/java/org/apache/druid/sql/calcite/run/SqlResults.java
@@ -134,12 +134,7 @@ public static Object coerce(
         throw cannotCoerce(value, sqlTypeName, fieldName);
       }
     } else if (sqlTypeName == SqlTypeName.OTHER) {
-      // Complex type, try to serialize if we should, else print class name
-      if (context.isSerializeComplexValues()) {
-        coercedValue = coerceUsingObjectMapper(jsonMapper, value, sqlTypeName, fieldName);
-      } else {
-        coercedValue = value.getClass().getName();
-      }
+      coercedValue = coerceUsingObjectMapper(jsonMapper, value, sqlTypeName, fieldName);
     } else if (sqlTypeName == SqlTypeName.ARRAY) {
       if (context.isStringifyArrays()) {
         if (value instanceof String) {
@@ -271,18 +266,15 @@ private static DruidException cannotCoerce(final Object value, final SqlTypeName
   public static class Context
   {
     private final DateTimeZone timeZone;
-    private final boolean serializeComplexValues;
     private final boolean stringifyArrays;
 
     @JsonCreator
     public Context(
         @JsonProperty("timeZone") final DateTimeZone timeZone,
-        @JsonProperty("serializeComplexValues") final boolean serializeComplexValues,
         @JsonProperty("stringifyArrays") final boolean stringifyArrays
     )
     {
       this.timeZone = timeZone;
-      this.serializeComplexValues = serializeComplexValues;
       this.stringifyArrays = stringifyArrays;
     }
 
@@ -290,7 +282,6 @@ public static Context fromPlannerContext(final PlannerContext plannerContext)
     {
       return new Context(
           plannerContext.getTimeZone(),
-          plannerContext.getPlannerConfig().shouldSerializeComplexValues(),
           plannerContext.isStringifyArrays()
       );
     }
@@ -301,12 +292,6 @@ public DateTimeZone getTimeZone()
       return timeZone;
     }
 
-    @JsonProperty
-    public boolean isSerializeComplexValues()
-    {
-      return serializeComplexValues;
-    }
-
     @JsonProperty
     public boolean isStringifyArrays()
     {
@@ -323,15 +308,14 @@ public boolean equals(Object o)
         return false;
       }
       Context context = (Context) o;
-      return serializeComplexValues == context.serializeComplexValues
-             && stringifyArrays == context.stringifyArrays
+      return stringifyArrays == context.stringifyArrays
              && Objects.equals(timeZone, context.timeZone);
     }
 
     @Override
     public int hashCode()
     {
-      return Objects.hash(timeZone, serializeComplexValues, stringifyArrays);
+      return Objects.hash(timeZone, stringifyArrays);
     }
 
     @Override
@@ -339,7 +323,6 @@ public String toString()
     {
       return "Context{" +
              "timeZone=" + timeZone +
-             ", serializeComplexValues=" + serializeComplexValues +
              ", stringifyArrays=" + stringifyArrays +
              '}';
     }
diff --git a/sql/src/test/java/org/apache/druid/sql/SqlStatementTest.java b/sql/src/test/java/org/apache/druid/sql/SqlStatementTest.java
index 1a7b6e3a7c51..32c873c0fe10 100644
--- a/sql/src/test/java/org/apache/druid/sql/SqlStatementTest.java
+++ b/sql/src/test/java/org/apache/druid/sql/SqlStatementTest.java
@@ -135,7 +135,7 @@ public void setUp()
   {
     executorService = MoreExecutors.listeningDecorator(Execs.multiThreaded(8, "test_sql_resource_%s"));
 
-    final PlannerConfig plannerConfig = PlannerConfig.builder().serializeComplexValues(false).build();
+    final PlannerConfig plannerConfig = PlannerConfig.builder().build();
     final DruidSchemaCatalog rootSchema = CalciteTests.createMockRootSchema(
         conglomerate,
         walker,
diff --git a/sql/src/test/java/org/apache/druid/sql/calcite/BaseCalciteQueryTest.java b/sql/src/test/java/org/apache/druid/sql/calcite/BaseCalciteQueryTest.java
index 95d3d5228938..de621ba3ee33 100644
--- a/sql/src/test/java/org/apache/druid/sql/calcite/BaseCalciteQueryTest.java
+++ b/sql/src/test/java/org/apache/druid/sql/calcite/BaseCalciteQueryTest.java
@@ -33,7 +33,6 @@
 import org.apache.druid.error.DruidException.Category;
 import org.apache.druid.error.DruidException.Persona;
 import org.apache.druid.error.DruidExceptionMatcher;
-import org.apache.druid.hll.VersionOneHyperLogLogCollector;
 import org.apache.druid.java.util.common.DateTimes;
 import org.apache.druid.java.util.common.ISE;
 import org.apache.druid.java.util.common.Intervals;
@@ -145,7 +144,6 @@ public class BaseCalciteQueryTest extends CalciteTestBase
   public static String NULL_STRING;
   public static Float NULL_FLOAT;
   public static Long NULL_LONG;
-  public static final String HLLC_STRING = VersionOneHyperLogLogCollector.class.getName();
 
   @BeforeAll
   public static void setupNullValues()
@@ -158,8 +156,6 @@ public static void setupNullValues()
   public static final Logger log = new Logger(BaseCalciteQueryTest.class);
 
   public static final PlannerConfig PLANNER_CONFIG_DEFAULT = new PlannerConfig();
-  public static final PlannerConfig PLANNER_CONFIG_DEFAULT_NO_COMPLEX_SERDE =
-      PlannerConfig.builder().serializeComplexValues(false).build();
 
   public static final PlannerConfig PLANNER_CONFIG_REQUIRE_TIME_CONDITION =
       PlannerConfig.builder().requireTimeCondition(true).build();
diff --git a/sql/src/test/java/org/apache/druid/sql/calcite/CalciteSelectQueryTest.java b/sql/src/test/java/org/apache/druid/sql/calcite/CalciteSelectQueryTest.java
index cbec9815f4b8..7f11e07dcbda 100644
--- a/sql/src/test/java/org/apache/druid/sql/calcite/CalciteSelectQueryTest.java
+++ b/sql/src/test/java/org/apache/druid/sql/calcite/CalciteSelectQueryTest.java
@@ -631,7 +631,7 @@ public void testExplainSelectConstantExpression()
   public void testSelectStarWithDimFilter()
   {
     testQuery(
-        PLANNER_CONFIG_DEFAULT_NO_COMPLEX_SERDE,
+        PLANNER_CONFIG_DEFAULT,
         QUERY_CONTEXT_DEFAULT,
         "SELECT * FROM druid.foo WHERE dim1 > 'd' OR dim2 = 'a'",
         CalciteTests.REGULAR_USER_AUTH_RESULT,
@@ -652,9 +652,9 @@ public void testSelectStarWithDimFilter()
                 .build()
         ),
         ImmutableList.of(
-            new Object[]{timestamp("2000-01-01"), "", "a", "[\"a\",\"b\"]", 1L, 1.0f, 1.0d, HLLC_STRING},
-            new Object[]{timestamp("2001-01-01"), "1", "a", "", 1L, 4.0f, 4.0d, HLLC_STRING},
-            new Object[]{timestamp("2001-01-02"), "def", "abc", NULL_STRING, 1L, 5.0f, 5.0d, HLLC_STRING}
+            new Object[]{timestamp("2000-01-01"), "", "a", "[\"a\",\"b\"]", 1L, 1.0f, 1.0d, "\"AQAAAEAAAA==\""},
+            new Object[]{timestamp("2001-01-01"), "1", "a", "", 1L, 4.0f, 4.0d, "\"AQAAAQAAAAFREA==\""},
+            new Object[]{timestamp("2001-01-02"), "def", "abc", NULL_STRING, 1L, 5.0f, 5.0d, "\"AQAAAQAAAACyEA==\""}
         )
     );
   }
@@ -1140,7 +1140,7 @@ public void testSelectStarFromLookup()
   public void testSelectStar()
   {
     testQuery(
-        PLANNER_CONFIG_DEFAULT_NO_COMPLEX_SERDE,
+        PLANNER_CONFIG_DEFAULT,
         QUERY_CONTEXT_DEFAULT,
         "SELECT * FROM druid.foo",
         CalciteTests.REGULAR_USER_AUTH_RESULT,
@@ -1155,12 +1155,12 @@ public void testSelectStar()
                 .build()
         ),
         ImmutableList.of(
-            new Object[]{timestamp("2000-01-01"), "", "a", "[\"a\",\"b\"]", 1L, 1f, 1.0, HLLC_STRING},
-            new Object[]{timestamp("2000-01-02"), "10.1", NULL_STRING, "[\"b\",\"c\"]", 1L, 2f, 2.0, HLLC_STRING},
-            new Object[]{timestamp("2000-01-03"), "2", "", "d", 1L, 3f, 3.0, HLLC_STRING},
-            new Object[]{timestamp("2001-01-01"), "1", "a", "", 1L, 4f, 4.0, HLLC_STRING},
-            new Object[]{timestamp("2001-01-02"), "def", "abc", NULL_STRING, 1L, 5f, 5.0, HLLC_STRING},
-            new Object[]{timestamp("2001-01-03"), "abc", NULL_STRING, NULL_STRING, 1L, 6f, 6.0, HLLC_STRING}
+            new Object[]{timestamp("2000-01-01"), "", "a", "[\"a\",\"b\"]", 1L, 1f, 1.0, "\"AQAAAEAAAA==\""},
+            new Object[]{timestamp("2000-01-02"), "10.1", NULL_STRING, "[\"b\",\"c\"]", 1L, 2f, 2.0, "\"AQAAAQAAAAHNBA==\""},
+            new Object[]{timestamp("2000-01-03"), "2", "", "d", 1L, 3f, 3.0, "\"AQAAAQAAAAOzAg==\""},
+            new Object[]{timestamp("2001-01-01"), "1", "a", "", 1L, 4f, 4.0, "\"AQAAAQAAAAFREA==\""},
+            new Object[]{timestamp("2001-01-02"), "def", "abc", NULL_STRING, 1L, 5f, 5.0, "\"AQAAAQAAAACyEA==\""},
+            new Object[]{timestamp("2001-01-03"), "abc", NULL_STRING, NULL_STRING, 1L, 6f, 6.0, "\"AQAAAQAAAAEkAQ==\""}
         )
     );
   }
@@ -1356,7 +1356,7 @@ public void testExplainSelectStar()
   public void testSelectStarWithLimit()
   {
     testQuery(
-        PLANNER_CONFIG_DEFAULT_NO_COMPLEX_SERDE,
+        PLANNER_CONFIG_DEFAULT,
         QUERY_CONTEXT_DEFAULT,
         "SELECT * FROM druid.foo LIMIT 2",
         CalciteTests.REGULAR_USER_AUTH_RESULT,
@@ -1372,8 +1372,8 @@ public void testSelectStarWithLimit()
                 .build()
         ),
         ImmutableList.of(
-            new Object[]{timestamp("2000-01-01"), "", "a", "[\"a\",\"b\"]", 1L, 1.0f, 1.0, HLLC_STRING},
-            new Object[]{timestamp("2000-01-02"), "10.1", NULL_STRING, "[\"b\",\"c\"]", 1L, 2.0f, 2.0, HLLC_STRING}
+            new Object[]{timestamp("2000-01-01"), "", "a", "[\"a\",\"b\"]", 1L, 1.0f, 1.0, "\"AQAAAEAAAA==\""},
+            new Object[]{timestamp("2000-01-02"), "10.1", NULL_STRING, "[\"b\",\"c\"]", 1L, 2.0f, 2.0, "\"AQAAAQAAAAHNBA==\""}
         )
     );
   }
@@ -1382,7 +1382,7 @@ public void testSelectStarWithLimit()
   public void testSelectStarWithLimitAndOffset()
   {
     testQuery(
-        PLANNER_CONFIG_DEFAULT_NO_COMPLEX_SERDE,
+        PLANNER_CONFIG_DEFAULT,
         QUERY_CONTEXT_DEFAULT,
         "SELECT * FROM druid.foo LIMIT 2 OFFSET 1",
         CalciteTests.REGULAR_USER_AUTH_RESULT,
@@ -1399,8 +1399,8 @@ public void testSelectStarWithLimitAndOffset()
                 .build()
         ),
         ImmutableList.of(
-            new Object[]{timestamp("2000-01-02"), "10.1", NULL_STRING, "[\"b\",\"c\"]", 1L, 2.0f, 2.0, HLLC_STRING},
-            new Object[]{timestamp("2000-01-03"), "2", "", "d", 1L, 3f, 3.0, HLLC_STRING}
+            new Object[]{timestamp("2000-01-02"), "10.1", NULL_STRING, "[\"b\",\"c\"]", 1L, 2.0f, 2.0, "\"AQAAAQAAAAHNBA==\""},
+            new Object[]{timestamp("2000-01-03"), "2", "", "d", 1L, 3f, 3.0, "\"AQAAAQAAAAOzAg==\""}
         )
     );
   }
@@ -1464,7 +1464,7 @@ public void testSelectWithExpressionFilter()
   public void testSelectStarWithLimitTimeDescending()
   {
     testQuery(
-        PLANNER_CONFIG_DEFAULT_NO_COMPLEX_SERDE,
+        PLANNER_CONFIG_DEFAULT,
         QUERY_CONTEXT_DEFAULT,
         "SELECT * FROM druid.foo ORDER BY __time DESC LIMIT 2",
         CalciteTests.REGULAR_USER_AUTH_RESULT,
@@ -1481,8 +1481,8 @@ public void testSelectStarWithLimitTimeDescending()
                 .build()
         ),
         ImmutableList.of(
-            new Object[]{timestamp("2001-01-03"), "abc", NULL_STRING, NULL_STRING, 1L, 6f, 6d, HLLC_STRING},
-            new Object[]{timestamp("2001-01-02"), "def", "abc", NULL_STRING, 1L, 5f, 5d, HLLC_STRING}
+            new Object[]{timestamp("2001-01-03"), "abc", NULL_STRING, NULL_STRING, 1L, 6f, 6d, "\"AQAAAQAAAAEkAQ==\""},
+            new Object[]{timestamp("2001-01-02"), "def", "abc", NULL_STRING, 1L, 5f, 5d, "\"AQAAAQAAAACyEA==\""}
         )
     );
   }
@@ -1491,7 +1491,7 @@ public void testSelectStarWithLimitTimeDescending()
   public void testSelectStarWithoutLimitTimeAscending()
   {
     testQuery(
-        PLANNER_CONFIG_DEFAULT_NO_COMPLEX_SERDE,
+        PLANNER_CONFIG_DEFAULT,
         QUERY_CONTEXT_DEFAULT,
         "SELECT * FROM druid.foo ORDER BY __time",
         CalciteTests.REGULAR_USER_AUTH_RESULT,
@@ -1508,12 +1508,12 @@ public void testSelectStarWithoutLimitTimeAscending()
                 .build()
         ),
         ImmutableList.of(
-            new Object[]{timestamp("2000-01-01"), "", "a", "[\"a\",\"b\"]", 1L, 1f, 1.0, HLLC_STRING},
-            new Object[]{timestamp("2000-01-02"), "10.1", NULL_STRING, "[\"b\",\"c\"]", 1L, 2f, 2.0, HLLC_STRING},
-            new Object[]{timestamp("2000-01-03"), "2", "", "d", 1L, 3f, 3.0, HLLC_STRING},
-            new Object[]{timestamp("2001-01-01"), "1", "a", "", 1L, 4f, 4.0, HLLC_STRING},
-            new Object[]{timestamp("2001-01-02"), "def", "abc", NULL_STRING, 1L, 5f, 5.0, HLLC_STRING},
-            new Object[]{timestamp("2001-01-03"), "abc", NULL_STRING, NULL_STRING, 1L, 6f, 6.0, HLLC_STRING}
+            new Object[]{timestamp("2000-01-01"), "", "a", "[\"a\",\"b\"]", 1L, 1f, 1.0, "\"AQAAAEAAAA==\""},
+            new Object[]{timestamp("2000-01-02"), "10.1", NULL_STRING, "[\"b\",\"c\"]", 1L, 2f, 2.0, "\"AQAAAQAAAAHNBA==\""},
+            new Object[]{timestamp("2000-01-03"), "2", "", "d", 1L, 3f, 3.0, "\"AQAAAQAAAAOzAg==\""},
+            new Object[]{timestamp("2001-01-01"), "1", "a", "", 1L, 4f, 4.0, "\"AQAAAQAAAAFREA==\""},
+            new Object[]{timestamp("2001-01-02"), "def", "abc", NULL_STRING, 1L, 5f, 5.0, "\"AQAAAQAAAACyEA==\""},
+            new Object[]{timestamp("2001-01-03"), "abc", NULL_STRING, NULL_STRING, 1L, 6f, 6.0, "\"AQAAAQAAAAEkAQ==\""}
         )
     );
   }
diff --git a/sql/src/test/java/org/apache/druid/sql/calcite/run/SqlResultsTest.java b/sql/src/test/java/org/apache/druid/sql/calcite/run/SqlResultsTest.java
index 7148adf40fe7..f6e390f1d180 100644
--- a/sql/src/test/java/org/apache/druid/sql/calcite/run/SqlResultsTest.java
+++ b/sql/src/test/java/org/apache/druid/sql/calcite/run/SqlResultsTest.java
@@ -22,6 +22,7 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSortedSet;
+import nl.jqno.equalsverifier.EqualsVerifier;
 import org.apache.calcite.sql.type.SqlTypeName;
 import org.apache.druid.common.config.NullHandling;
 import org.apache.druid.error.DruidException;
@@ -42,7 +43,7 @@
 
 public class SqlResultsTest extends InitializedNullHandlingTest
 {
-  private static final SqlResults.Context DEFAULT_CONTEXT = new SqlResults.Context(DateTimeZone.UTC, true, false);
+  private static final SqlResults.Context DEFAULT_CONTEXT = new SqlResults.Context(DateTimeZone.UTC, false);
 
   private ObjectMapper jsonMapper;
 
@@ -246,6 +247,12 @@ public void testMayNotCoerceList()
     Assert.assertEquals("hello", SqlResults.coerceArrayToList("hello", false));
   }
 
+  @Test
+  public void testContextEqualsAndHashcode()
+  {
+    EqualsVerifier.forClass(SqlResults.Context.class).usingGetClass().verify();
+  }
+
   private void assertCoerce(Object expected, Object toCoerce, SqlTypeName typeName)
   {
     Assert.assertEquals(
diff --git a/sql/src/test/java/org/apache/druid/sql/http/SqlResourceTest.java b/sql/src/test/java/org/apache/druid/sql/http/SqlResourceTest.java
index b906fe731781..df1d94e6f206 100644
--- a/sql/src/test/java/org/apache/druid/sql/http/SqlResourceTest.java
+++ b/sql/src/test/java/org/apache/druid/sql/http/SqlResourceTest.java
@@ -235,7 +235,7 @@ public void setUp() throws Exception
 
     executorService = MoreExecutors.listeningDecorator(Execs.multiThreaded(8, "test_sql_resource_%s"));
 
-    final PlannerConfig plannerConfig = PlannerConfig.builder().serializeComplexValues(false).build();
+    final PlannerConfig plannerConfig = PlannerConfig.builder().build();
     final DruidSchemaCatalog rootSchema = CalciteTests.createMockRootSchema(
         conglomerate,
         walker,
@@ -642,7 +642,7 @@ public void testArrayResultFormat() throws Exception
                 1,
                 1.0,
                 1.0,
-                "org.apache.druid.hll.VersionOneHyperLogLogCollector",
+                "\"AQAAAEAAAA==\"",
                 nullStr
             ),
             Arrays.asList(
@@ -653,7 +653,7 @@ public void testArrayResultFormat() throws Exception
                 1,
                 2.0,
                 2.0,
-                "org.apache.druid.hll.VersionOneHyperLogLogCollector",
+                "\"AQAAAQAAAAHNBA==\"",
                 nullStr
             )
         ),
@@ -743,10 +743,9 @@ public void testArrayResultFormatWithHeader() throws Exception
     final String query = "SELECT *, CASE dim2 WHEN '' THEN dim2 END FROM foo LIMIT 2";
     final String nullStr = NullHandling.replaceWithDefault() ? "" : null;
 
-    final String hllStr = "org.apache.druid.hll.VersionOneHyperLogLogCollector";
     List[] expectedQueryResults = new List[]{
-        Arrays.asList("2000-01-01T00:00:00.000Z", "", "a", "[\"a\",\"b\"]", 1, 1.0, 1.0, hllStr, nullStr),
-        Arrays.asList("2000-01-02T00:00:00.000Z", "10.1", nullStr, "[\"b\",\"c\"]", 1, 2.0, 2.0, hllStr, nullStr)
+        Arrays.asList("2000-01-01T00:00:00.000Z", "", "a", "[\"a\",\"b\"]", 1, 1.0, 1.0, "\"AQAAAEAAAA==\"", nullStr),
+        Arrays.asList("2000-01-02T00:00:00.000Z", "10.1", nullStr, "[\"b\",\"c\"]", 1, 2.0, 2.0, "\"AQAAAQAAAAHNBA==\"", nullStr)
     };
 
     MockHttpServletResponse response = postForAsyncResponse(
@@ -879,7 +878,7 @@ public void testArrayLinesResultFormat() throws Exception
             1,
             1.0,
             1.0,
-            "org.apache.druid.hll.VersionOneHyperLogLogCollector",
+            "\"AQAAAEAAAA==\"",
             nullStr
         ),
         JSON_MAPPER.readValue(lines.get(0), List.class)
@@ -893,7 +892,7 @@ public void testArrayLinesResultFormat() throws Exception
             1,
             2.0,
             2.0,
-            "org.apache.druid.hll.VersionOneHyperLogLogCollector",
+            "\"AQAAAQAAAAHNBA==\"",
             nullStr
         ),
         JSON_MAPPER.readValue(lines.get(1), List.class)
@@ -927,7 +926,7 @@ public void testArrayLinesResultFormatWithHeader() throws Exception
             1,
             1.0,
             1.0,
-            "org.apache.druid.hll.VersionOneHyperLogLogCollector",
+            "\"AQAAAEAAAA==\"",
             nullStr
         ),
         JSON_MAPPER.readValue(lines.get(3), List.class)
@@ -941,7 +940,7 @@ public void testArrayLinesResultFormatWithHeader() throws Exception
             1,
             2.0,
             2.0,
-            "org.apache.druid.hll.VersionOneHyperLogLogCollector",
+            "\"AQAAAQAAAAHNBA==\"",
             nullStr
         ),
         JSON_MAPPER.readValue(lines.get(4), List.class)
@@ -999,7 +998,7 @@ public void testObjectResultFormat() throws Exception
                 .put("dim3", "[\"a\",\"b\"]")
                 .put("m1", 1.0)
                 .put("m2", 1.0)
-                .put("unique_dim1", "org.apache.druid.hll.VersionOneHyperLogLogCollector")
+                .put("unique_dim1", "\"AQAAAEAAAA==\"")
                 .put("EXPR$8", "")
                 .build(),
             ImmutableMap
@@ -1011,7 +1010,7 @@ public void testObjectResultFormat() throws Exception
                 .put("dim3", "[\"b\",\"c\"]")
                 .put("m1", 2.0)
                 .put("m2", 2.0)
-                .put("unique_dim1", "org.apache.druid.hll.VersionOneHyperLogLogCollector")
+                .put("unique_dim1", "\"AQAAAQAAAAHNBA==\"")
                 .put("EXPR$8", "")
                 .build()
         ).stream().map(transformer).collect(Collectors.toList()),
@@ -1054,7 +1053,7 @@ public void testObjectLinesResultFormat() throws Exception
                 .put("dim3", "[\"a\",\"b\"]")
                 .put("m1", 1.0)
                 .put("m2", 1.0)
-                .put("unique_dim1", "org.apache.druid.hll.VersionOneHyperLogLogCollector")
+                .put("unique_dim1", "\"AQAAAEAAAA==\"")
                 .put("EXPR$8", "")
                 .build()
         ),
@@ -1071,7 +1070,7 @@ public void testObjectLinesResultFormat() throws Exception
                 .put("dim3", "[\"b\",\"c\"]")
                 .put("m1", 2.0)
                 .put("m2", 2.0)
-                .put("unique_dim1", "org.apache.druid.hll.VersionOneHyperLogLogCollector")
+                .put("unique_dim1", "\"AQAAAQAAAAHNBA==\"")
                 .put("EXPR$8", "")
                 .build()
         ),
@@ -1114,7 +1113,7 @@ public void testObjectLinesResultFormatWithMinimalHeader() throws Exception
                 .put("dim3", "[\"a\",\"b\"]")
                 .put("m1", 1.0)
                 .put("m2", 1.0)
-                .put("unique_dim1", "org.apache.druid.hll.VersionOneHyperLogLogCollector")
+                .put("unique_dim1", "\"AQAAAEAAAA==\"")
                 .put("EXPR$8", "")
                 .build()
         ),
@@ -1131,7 +1130,7 @@ public void testObjectLinesResultFormatWithMinimalHeader() throws Exception
                 .put("dim3", "[\"b\",\"c\"]")
                 .put("m1", 2.0)
                 .put("m2", 2.0)
-                .put("unique_dim1", "org.apache.druid.hll.VersionOneHyperLogLogCollector")
+                .put("unique_dim1", "\"AQAAAQAAAAHNBA==\"")
                 .put("EXPR$8", "")
                 .build()
         ),
@@ -1180,7 +1179,7 @@ public void testObjectLinesResultFormatWithFullHeader() throws Exception
                 .put("dim3", "[\"a\",\"b\"]")
                 .put("m1", 1.0)
                 .put("m2", 1.0)
-                .put("unique_dim1", "org.apache.druid.hll.VersionOneHyperLogLogCollector")
+                .put("unique_dim1", "\"AQAAAEAAAA==\"")
                 .put("EXPR$8", "")
                 .build()
         ),
@@ -1197,7 +1196,7 @@ public void testObjectLinesResultFormatWithFullHeader() throws Exception
                 .put("dim3", "[\"b\",\"c\"]")
                 .put("m1", 2.0)
                 .put("m2", 2.0)
-                .put("unique_dim1", "org.apache.druid.hll.VersionOneHyperLogLogCollector")
+                .put("unique_dim1", "\"AQAAAQAAAAHNBA==\"")
                 .put("EXPR$8", "")
                 .build()
         ),
@@ -1249,8 +1248,8 @@ public void testCsvResultFormat() throws Exception
 
     Assert.assertEquals(
         ImmutableList.of(
-            "2000-01-01T00:00:00.000Z,,a,\"[\"\"a\"\",\"\"b\"\"]\",1,1.0,1.0,org.apache.druid.hll.VersionOneHyperLogLogCollector,",
-            "2000-01-02T00:00:00.000Z,10.1,,\"[\"\"b\"\",\"\"c\"\"]\",1,2.0,2.0,org.apache.druid.hll.VersionOneHyperLogLogCollector,",
+            "2000-01-01T00:00:00.000Z,,a,\"[\"\"a\"\",\"\"b\"\"]\",1,1.0,1.0,\"\"\"AQAAAEAAAA==\"\"\",",
+            "2000-01-02T00:00:00.000Z,10.1,,\"[\"\"b\"\",\"\"c\"\"]\",1,2.0,2.0,\"\"\"AQAAAQAAAAHNBA==\"\"\",",
             "",
             ""
         ),
@@ -1274,8 +1273,8 @@ public void testCsvResultFormatWithHeaders() throws Exception
             String.join(",", EXPECTED_COLUMNS_FOR_RESULT_FORMAT_TESTS),
             String.join(",", EXPECTED_TYPES_FOR_RESULT_FORMAT_TESTS),
             String.join(",", EXPECTED_SQL_TYPES_FOR_RESULT_FORMAT_TESTS),
-            "2000-01-01T00:00:00.000Z,,a,\"[\"\"a\"\",\"\"b\"\"]\",1,1.0,1.0,org.apache.druid.hll.VersionOneHyperLogLogCollector,",
-            "2000-01-02T00:00:00.000Z,10.1,,\"[\"\"b\"\",\"\"c\"\"]\",1,2.0,2.0,org.apache.druid.hll.VersionOneHyperLogLogCollector,",
+            "2000-01-01T00:00:00.000Z,,a,\"[\"\"a\"\",\"\"b\"\"]\",1,1.0,1.0,\"\"\"AQAAAEAAAA==\"\"\",",
+            "2000-01-02T00:00:00.000Z,10.1,,\"[\"\"b\"\",\"\"c\"\"]\",1,2.0,2.0,\"\"\"AQAAAQAAAAHNBA==\"\"\",",
             "",
             ""
         ),
diff --git a/web-console/src/druid-models/execution/execution-ingest-complete.mock.ts b/web-console/src/druid-models/execution/execution-ingest-complete.mock.ts
index ddc406a38efb..24ba4687ac3f 100644
--- a/web-console/src/druid-models/execution/execution-ingest-complete.mock.ts
+++ b/web-console/src/druid-models/execution/execution-ingest-complete.mock.ts
@@ -443,7 +443,6 @@ export const EXECUTION_INGEST_COMPLETE = Execution.fromTaskReport({
       },
       sqlResultsContext: {
         timeZone: 'UTC',
-        serializeComplexValues: true,
         stringifyArrays: true,
       },
       sqlTypeNames: ['TIMESTAMP', 'VARCHAR'],
diff --git a/web-console/src/druid-models/execution/execution-ingest-error.mock.ts b/web-console/src/druid-models/execution/execution-ingest-error.mock.ts
index 86d6d4f6b5dd..0c2c5a93ed04 100644
--- a/web-console/src/druid-models/execution/execution-ingest-error.mock.ts
+++ b/web-console/src/druid-models/execution/execution-ingest-error.mock.ts
@@ -449,7 +449,6 @@ export const EXECUTION_INGEST_ERROR = Execution.fromTaskReport({
     },
     sqlResultsContext: {
       timeZone: 'UTC',
-      serializeComplexValues: true,
       stringifyArrays: true,
     },
     sqlTypeNames: ['TIMESTAMP', 'VARCHAR'],
diff --git a/web-console/src/druid-models/execution/execution.spec.ts b/web-console/src/druid-models/execution/execution.spec.ts
index 2938351a22a8..12e590bbb7da 100644
--- a/web-console/src/druid-models/execution/execution.spec.ts
+++ b/web-console/src/druid-models/execution/execution.spec.ts
@@ -170,7 +170,6 @@ describe('Execution', () => {
                 "waitUntilSegmentsLoad": true,
               },
               "sqlResultsContext": {
-                "serializeComplexValues": true,
                 "stringifyArrays": true,
                 "timeZone": "UTC",
               },
diff --git a/web-console/src/views/workbench-view/execution-details-pane/__snapshots__/execution-details-pane.spec.tsx.snap b/web-console/src/views/workbench-view/execution-details-pane/__snapshots__/execution-details-pane.spec.tsx.snap
index 5ef54969f3fe..996061eaeeec 100644
--- a/web-console/src/views/workbench-view/execution-details-pane/__snapshots__/execution-details-pane.spec.tsx.snap
+++ b/web-console/src/views/workbench-view/execution-details-pane/__snapshots__/execution-details-pane.spec.tsx.snap
@@ -234,7 +234,6 @@ PARTITIONED BY DAY",
                 "waitUntilSegmentsLoad": true,
               },
               "sqlResultsContext": {
-                "serializeComplexValues": true,
                 "stringifyArrays": true,
                 "timeZone": "UTC",
               },
@@ -867,7 +866,6 @@ PARTITIONED BY DAY",
                 "waitUntilSegmentsLoad": true,
               },
               "sqlResultsContext": {
-                "serializeComplexValues": true,
                 "stringifyArrays": true,
                 "timeZone": "UTC",
               },
@@ -1545,7 +1543,6 @@ PARTITIONED BY DAY",
               "waitUntilSegmentsLoad": true,
             },
             "sqlResultsContext": {
-              "serializeComplexValues": true,
               "stringifyArrays": true,
               "timeZone": "UTC",
             },

From ccadfd071d04da763ea9e3c1d01243defca26ecd Mon Sep 17 00:00:00 2001
From: Peter Marshall <peter.marshall@imply.io>
Date: Thu, 12 Dec 2024 03:26:05 +0000
Subject: [PATCH 26/56] Docs: Update partitioning.md to fix a typo (#17555)

Quick fix to point the links to `dimensionsSpec` to the correct section of the ingestion spec doc.
---
 docs/ingestion/partitioning.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/ingestion/partitioning.md b/docs/ingestion/partitioning.md
index d1501f5fe0ff..22fb253314c3 100644
--- a/docs/ingestion/partitioning.md
+++ b/docs/ingestion/partitioning.md
@@ -81,8 +81,8 @@ The following table describes how to configure sorting.
 |Method|Configuration|
 |------|------------|
 |[SQL](../multi-stage-query/index.md)|Uses order of fields in [`CLUSTERED BY`](../multi-stage-query/concepts.md#clustering) or [`segmentSortOrder`](../multi-stage-query/reference.md#context) in the query context|
-|[Kafka](../ingestion/kafka-ingestion.md) or [Kinesis](../ingestion/kinesis-ingestion.md)|Uses order of fields in [`dimensionsSpec`](ingestion-spec.md#granularityspec)|
-|[Native batch](native-batch.md) or [Hadoop](hadoop.md)|Uses order of fields in [`dimensionsSpec`](ingestion-spec.md#granularityspec)|
+|[Kafka](../ingestion/kafka-ingestion.md) or [Kinesis](../ingestion/kinesis-ingestion.md)|Uses order of fields in [`dimensionsSpec`](ingestion-spec.md#dimensionsspec)|
+|[Native batch](native-batch.md) or [Hadoop](hadoop.md)|Uses order of fields in [`dimensionsSpec`](ingestion-spec.md#dimensionsspec)|
 
 :::info
 Druid implicitly sorts rows within a segment by `__time` first before any `dimensions` or `CLUSTERED BY` fields, unless

From 05c3cbce085897507df2c636598f6d1503474350 Mon Sep 17 00:00:00 2001
From: Ashwin Tumma <ashwin.tumma23@gmail.com>
Date: Wed, 11 Dec 2024 19:26:42 -0800
Subject: [PATCH 27/56] Docs: Update SQL metrics documentation to include
 dimension engine (#17554)

Co-authored-by: Ashwin Tumma <ashwin.tumma@salesforce.com>
---
 docs/operations/metrics.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/operations/metrics.md b/docs/operations/metrics.md
index 46ee96df5b8e..7258e965a11c 100644
--- a/docs/operations/metrics.md
+++ b/docs/operations/metrics.md
@@ -177,9 +177,9 @@ If SQL is enabled, the Broker will emit the following metrics for SQL.
 
 |Metric|Description|Dimensions|Normal value|
 |------|-----------|----------|------------|
-|`sqlQuery/time`|Milliseconds taken to complete a SQL.|`id`, `nativeQueryIds`, `dataSource`, `remoteAddress`, `success`|< 1s|
-|`sqlQuery/planningTimeMs`|Milliseconds taken to plan a SQL to native query.|`id`, `nativeQueryIds`, `dataSource`, `remoteAddress`, `success`| |
-|`sqlQuery/bytes`|number of bytes returned in SQL response.|`id`, `nativeQueryIds`, `dataSource`, `remoteAddress`, `success`| |
+|`sqlQuery/time`|Milliseconds taken to complete a SQL.|`id`, `nativeQueryIds`, `dataSource`, `remoteAddress`, `success`, `engine`|< 1s|
+|`sqlQuery/planningTimeMs`|Milliseconds taken to plan a SQL to native query.|`id`, `nativeQueryIds`, `dataSource`, `remoteAddress`, `success`, `engine`| |
+|`sqlQuery/bytes`|number of bytes returned in SQL response.|`id`, `nativeQueryIds`, `dataSource`, `remoteAddress`, `success`, `engine`| |
 
 ## Ingestion metrics
 

From 1a38434d8ddf4532f4e03fa82f6d56df80f80837 Mon Sep 17 00:00:00 2001
From: Zoltan Haindrich <kirk@rxd.hu>
Date: Thu, 12 Dec 2024 10:30:42 +0100
Subject: [PATCH 28/56] Restore usage of filtered SUM (#17378)

---
 .../org/apache/druid/query/QueryContext.java  |   9 +
 .../org/apache/druid/query/QueryContexts.java |  17 +
 .../apache/druid/query/QueryContextTest.java  |  11 +
 .../calcite/planner/CalciteRulesManager.java  |   3 +-
 .../rule/DruidAggregateCaseToFilterRule.java  | 349 ++++++++++++++++++
 .../druid/sql/calcite/CalciteQueryTest.java   | 132 ++++---
 .../filtered_sum.iq                           | 120 ++++++
 7 files changed, 593 insertions(+), 48 deletions(-)
 create mode 100644 sql/src/main/java/org/apache/druid/sql/calcite/rule/DruidAggregateCaseToFilterRule.java
 create mode 100644 sql/src/test/quidem/org.apache.druid.quidem.SqlQuidemTest/filtered_sum.iq

diff --git a/processing/src/main/java/org/apache/druid/query/QueryContext.java b/processing/src/main/java/org/apache/druid/query/QueryContext.java
index 1a79f524d5c2..1aadd5f93b76 100644
--- a/processing/src/main/java/org/apache/druid/query/QueryContext.java
+++ b/processing/src/main/java/org/apache/druid/query/QueryContext.java
@@ -625,6 +625,15 @@ public boolean isCatalogValidationEnabled()
     );
   }
 
+  public boolean isExtendedFilteredSumRewrite()
+  {
+    return getBoolean(
+        QueryContexts.EXTENDED_FILTERED_SUM_REWRITE_ENABLED,
+        QueryContexts.DEFAULT_EXTENDED_FILTERED_SUM_REWRITE_ENABLED
+    );
+  }
+
+
   public QueryResourceId getQueryResourceId()
   {
     return new QueryResourceId(getString(QueryContexts.QUERY_RESOURCE_ID));
diff --git a/processing/src/main/java/org/apache/druid/query/QueryContexts.java b/processing/src/main/java/org/apache/druid/query/QueryContexts.java
index 950dea52e907..74b45023d041 100644
--- a/processing/src/main/java/org/apache/druid/query/QueryContexts.java
+++ b/processing/src/main/java/org/apache/druid/query/QueryContexts.java
@@ -89,6 +89,22 @@ public class QueryContexts
   public static final String UNCOVERED_INTERVALS_LIMIT_KEY = "uncoveredIntervalsLimit";
   public static final String MIN_TOP_N_THRESHOLD = "minTopNThreshold";
   public static final String CATALOG_VALIDATION_ENABLED = "catalogValidationEnabled";
+  /**
+   * Context parameter to enable/disable the extended filtered sum rewrite logic.
+   *
+   * Controls the rewrite of:
+   * <pre>
+   *    SUM(CASE WHEN COND THEN COL1 ELSE 0 END)
+   * to
+   *    SUM(COL1) FILTER (COND)
+   * </pre>
+   * managed by {@link DruidAggregateCaseToFilterRule}. Defaults to true for performance,
+   * but may produce incorrect results when the condition never matches (expected 0).
+   * This is for testing and can be removed once a correct and high-performance rewrite
+   * is implemented.
+   */
+  public static final String EXTENDED_FILTERED_SUM_REWRITE_ENABLED = "extendedFilteredSumRewrite";
+
 
   // projection context keys
   public static final String NO_PROJECTIONS = "noProjections";
@@ -139,6 +155,7 @@ public class QueryContexts
   public static final boolean DEFAULT_ENABLE_TIME_BOUNDARY_PLANNING = false;
   public static final boolean DEFAULT_CATALOG_VALIDATION_ENABLED = true;
   public static final boolean DEFAULT_USE_NESTED_FOR_UNKNOWN_TYPE_IN_SUBQUERY = false;
+  public static final boolean DEFAULT_EXTENDED_FILTERED_SUM_REWRITE_ENABLED = true;
 
 
   @SuppressWarnings("unused") // Used by Jackson serialization
diff --git a/processing/src/test/java/org/apache/druid/query/QueryContextTest.java b/processing/src/test/java/org/apache/druid/query/QueryContextTest.java
index 0b32c391cc8d..b932c6384c6e 100644
--- a/processing/src/test/java/org/apache/druid/query/QueryContextTest.java
+++ b/processing/src/test/java/org/apache/druid/query/QueryContextTest.java
@@ -394,6 +394,17 @@ public void testIsDecoupled()
     );
   }
 
+  @Test
+  public void testExtendedFilteredSumRewrite()
+  {
+    assertTrue(QueryContext.empty().isExtendedFilteredSumRewrite());
+    assertFalse(
+        QueryContext
+            .of(ImmutableMap.of(QueryContexts.EXTENDED_FILTERED_SUM_REWRITE_ENABLED, false))
+            .isExtendedFilteredSumRewrite()
+    );
+  }
+
   // This test is a bit silly. It is retained because another test uses the
   // LegacyContextQuery test.
   @Test
diff --git a/sql/src/main/java/org/apache/druid/sql/calcite/planner/CalciteRulesManager.java b/sql/src/main/java/org/apache/druid/sql/calcite/planner/CalciteRulesManager.java
index d6dd1310e6c5..917f0cc204a9 100644
--- a/sql/src/main/java/org/apache/druid/sql/calcite/planner/CalciteRulesManager.java
+++ b/sql/src/main/java/org/apache/druid/sql/calcite/planner/CalciteRulesManager.java
@@ -54,6 +54,7 @@
 import org.apache.druid.sql.calcite.rule.AggregatePullUpLookupRule;
 import org.apache.druid.sql.calcite.rule.CaseToCoalesceRule;
 import org.apache.druid.sql.calcite.rule.CoalesceLookupRule;
+import org.apache.druid.sql.calcite.rule.DruidAggregateCaseToFilterRule;
 import org.apache.druid.sql.calcite.rule.DruidLogicalValuesRule;
 import org.apache.druid.sql.calcite.rule.DruidRelToDruidRule;
 import org.apache.druid.sql.calcite.rule.DruidRules;
@@ -119,7 +120,6 @@ public class CalciteRulesManager
           CoreRules.FILTER_PROJECT_TRANSPOSE,
           CoreRules.JOIN_PUSH_EXPRESSIONS,
           CoreRules.AGGREGATE_EXPAND_WITHIN_DISTINCT,
-          CoreRules.AGGREGATE_CASE_TO_FILTER,
           CoreRules.FILTER_AGGREGATE_TRANSPOSE,
           CoreRules.PROJECT_WINDOW_TRANSPOSE,
           CoreRules.MATCH,
@@ -495,6 +495,7 @@ public List<RelOptRule> baseRuleSet(final PlannerContext plannerContext)
     rules.addAll(BASE_RULES);
     rules.addAll(ABSTRACT_RULES);
     rules.addAll(ABSTRACT_RELATIONAL_RULES);
+    rules.add(new DruidAggregateCaseToFilterRule(plannerContext.queryContext().isExtendedFilteredSumRewrite()));
     rules.addAll(configurableRuleSet(plannerContext));
 
     if (plannerContext.getJoinAlgorithm().requiresSubquery()) {
diff --git a/sql/src/main/java/org/apache/druid/sql/calcite/rule/DruidAggregateCaseToFilterRule.java b/sql/src/main/java/org/apache/druid/sql/calcite/rule/DruidAggregateCaseToFilterRule.java
new file mode 100644
index 000000000000..7950f62aab3b
--- /dev/null
+++ b/sql/src/main/java/org/apache/druid/sql/calcite/rule/DruidAggregateCaseToFilterRule.java
@@ -0,0 +1,349 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.druid.sql.calcite.rule;
+
+import com.google.common.collect.ImmutableList;
+import org.apache.calcite.plan.RelOptCluster;
+import org.apache.calcite.plan.RelOptRule;
+import org.apache.calcite.plan.RelOptRuleCall;
+import org.apache.calcite.rel.RelCollations;
+import org.apache.calcite.rel.core.Aggregate;
+import org.apache.calcite.rel.core.AggregateCall;
+import org.apache.calcite.rel.core.Project;
+import org.apache.calcite.rel.rules.AggregateCaseToFilterRule;
+import org.apache.calcite.rel.rules.SubstitutionRule;
+import org.apache.calcite.rel.type.RelDataType;
+import org.apache.calcite.rel.type.RelDataTypeFactory;
+import org.apache.calcite.rex.RexBuilder;
+import org.apache.calcite.rex.RexCall;
+import org.apache.calcite.rex.RexLiteral;
+import org.apache.calcite.rex.RexNode;
+import org.apache.calcite.sql.SqlKind;
+import org.apache.calcite.sql.SqlPostfixOperator;
+import org.apache.calcite.sql.fun.SqlStdOperatorTable;
+import org.apache.calcite.sql.type.SqlTypeName;
+import org.apache.calcite.tools.RelBuilder;
+import org.checkerframework.checker.nullness.qual.Nullable;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Druid extension of {@link AggregateCaseToFilterRule}.
+ *
+ * Turning on extendedFilteredSumRewrite enables rewrites of:
+ * <pre>
+ *    SUM(CASE WHEN COND THEN COL1 ELSE 0 END)
+ * </pre>
+ * to:
+ * <pre>
+ *    SUM(COL1) FILTER (WHERE COND)
+ * </pre>
+ * <p>
+ * This rewrite improves performance but introduces a known inconsistency when
+ * the condition never matches, as the expected result (0) is replaced with `null`.
+ * <p>
+ * Example behavior:
+ * <pre>
+ * +-----------------+--------------+----------+------+--------------+
+ * | input row count | cond matches | valueCol | orig | filtered-SUM |
+ * +-----------------+--------------+----------+------+--------------+
+ * | 0               | *            | *        | null | null         |
+ * | >0              | none         | *        | 0    | null         |
+ * | >0              | all          | null     | null | null         |
+ * | >0              | N>0          | 1        | N    | N            |
+ * +-----------------+--------------+----------+------+--------------+
+ * </pre>
+ */
+public class DruidAggregateCaseToFilterRule extends RelOptRule implements SubstitutionRule
+{
+  private boolean extendedFilteredSumRewrite;
+
+  public DruidAggregateCaseToFilterRule(boolean extendedFilteredSumRewrite)
+  {
+    super(operand(Aggregate.class, operand(Project.class, any())));
+    this.extendedFilteredSumRewrite = extendedFilteredSumRewrite;
+  }
+
+  @Override
+  public boolean matches(final RelOptRuleCall call)
+  {
+    final Aggregate aggregate = call.rel(0);
+    final Project project = call.rel(1);
+
+    for (AggregateCall aggregateCall : aggregate.getAggCallList()) {
+      final int singleArg = soleArgument(aggregateCall);
+      if (singleArg >= 0
+          && isThreeArgCase(project.getProjects().get(singleArg))) {
+        return true;
+      }
+    }
+    return false;
+  }
+
+  @Override
+  public void onMatch(RelOptRuleCall call)
+  {
+    final Aggregate aggregate = call.rel(0);
+    final Project project = call.rel(1);
+    final List<AggregateCall> newCalls = new ArrayList<>(aggregate.getAggCallList().size());
+    final List<RexNode> newProjects = new ArrayList<>(project.getProjects());
+
+    for (AggregateCall aggregateCall : aggregate.getAggCallList()) {
+      AggregateCall newCall = transform(aggregateCall, project, newProjects);
+
+      if (newCall == null) {
+        newCalls.add(aggregateCall);
+      } else {
+        newCalls.add(newCall);
+      }
+    }
+
+    if (newCalls.equals(aggregate.getAggCallList())) {
+      return;
+    }
+
+    final RelBuilder relBuilder = call.builder()
+        .push(project.getInput())
+        .project(newProjects);
+
+    final RelBuilder.GroupKey groupKey = relBuilder.groupKey(aggregate.getGroupSet(), aggregate.getGroupSets());
+
+    relBuilder.aggregate(groupKey, newCalls)
+        .convert(aggregate.getRowType(), false);
+
+    call.transformTo(relBuilder.build());
+    call.getPlanner().prune(aggregate);
+  }
+
+  private @Nullable AggregateCall transform(AggregateCall call,
+      Project project, List<RexNode> newProjects)
+  {
+    final int singleArg = soleArgument(call);
+    if (singleArg < 0) {
+      return null;
+    }
+
+    final RexNode rexNode = project.getProjects().get(singleArg);
+    if (!isThreeArgCase(rexNode)) {
+      return null;
+    }
+
+    final RelOptCluster cluster = project.getCluster();
+    final RexBuilder rexBuilder = cluster.getRexBuilder();
+    final RexCall caseCall = (RexCall) rexNode;
+
+    // If one arg is null and the other is not, reverse them and set "flip",
+    // which negates the filter.
+    final boolean flip = RexLiteral.isNullLiteral(caseCall.operands.get(1))
+        && !RexLiteral.isNullLiteral(caseCall.operands.get(2));
+    final RexNode arg1 = caseCall.operands.get(flip ? 2 : 1);
+    final RexNode arg2 = caseCall.operands.get(flip ? 1 : 2);
+
+    // Operand 1: Filter
+    final SqlPostfixOperator op = flip ? SqlStdOperatorTable.IS_NOT_TRUE : SqlStdOperatorTable.IS_TRUE;
+    final RexNode filterFromCase = rexBuilder.makeCall(op, caseCall.operands.get(0));
+
+    // Combine the CASE filter with an honest-to-goodness SQL FILTER, if the
+    // latter is present.
+    final RexNode filter;
+    if (call.filterArg >= 0) {
+      filter = rexBuilder.makeCall(
+          SqlStdOperatorTable.AND,
+          project.getProjects().get(call.filterArg),
+          filterFromCase
+      );
+    } else {
+      filter = filterFromCase;
+    }
+
+    RelDataTypeFactory typeFactory = rexBuilder.getTypeFactory();
+    final SqlKind kind = call.getAggregation().getKind();
+    if (call.isDistinct()) {
+      // Just one style supported:
+      //   COUNT(DISTINCT CASE WHEN x = 'foo' THEN y END)
+      // =>
+      //   COUNT(DISTINCT y) FILTER(WHERE x = 'foo')
+
+      if (kind == SqlKind.COUNT
+          && RexLiteral.isNullLiteral(arg2)) {
+        newProjects.add(arg1);
+        newProjects.add(filter);
+        return AggregateCall.create(
+            SqlStdOperatorTable.COUNT,
+            true,
+            false,
+            false,
+            call.rexList,
+            ImmutableList.of(newProjects.size() - 2),
+            newProjects.size() - 1,
+            null,
+            RelCollations.EMPTY,
+            call.getType(),
+            call.getName()
+        );
+      }
+      return null;
+    }
+
+    // Four styles supported:
+    //
+    // A1: AGG(CASE WHEN x = 'foo' THEN expr END)
+    //   => AGG(expr) FILTER (x = 'foo')
+    // A2: SUM0(CASE WHEN x = 'foo' THEN cnt ELSE 0 END)
+    //   => SUM0(cnt) FILTER (x = 'foo')
+    // B: SUM0(CASE WHEN x = 'foo' THEN 1 ELSE 0 END)
+    //   => COUNT() FILTER (x = 'foo')
+    // C: COUNT(CASE WHEN x = 'foo' THEN 'dummy' END)
+    //   => COUNT() FILTER (x = 'foo')
+
+    if (kind == SqlKind.COUNT // Case C
+        && arg1.isA(SqlKind.LITERAL)
+        && !RexLiteral.isNullLiteral(arg1)
+        && RexLiteral.isNullLiteral(arg2)) {
+      newProjects.add(filter);
+      return AggregateCall.create(
+          SqlStdOperatorTable.COUNT,
+          false,
+          false,
+          false,
+          call.rexList, ImmutableList.of(), newProjects.size() - 1, null,
+          RelCollations.EMPTY, call.getType(),
+          call.getName());
+    } else if (kind == SqlKind.SUM0 // Case B
+        && isIntLiteral(arg1, BigDecimal.ONE)
+        && isIntLiteral(arg2, BigDecimal.ZERO)) {
+
+      newProjects.add(filter);
+      final RelDataType dataType = typeFactory
+          .createTypeWithNullability(typeFactory.createSqlType(SqlTypeName.BIGINT), false);
+      return AggregateCall.create(
+          SqlStdOperatorTable.COUNT,
+          false,
+          false,
+          false,
+          call.rexList,
+          ImmutableList.of(),
+          newProjects.size() - 1,
+          null,
+          RelCollations.EMPTY,
+          dataType,
+          call.getName()
+      );
+    } else if ((RexLiteral.isNullLiteral(arg2) // Case A1
+            && call.getAggregation().allowsFilter())
+        || (kind == SqlKind.SUM0 // Case A2
+            && isIntLiteral(arg2, BigDecimal.ZERO))) {
+      newProjects.add(arg1);
+      newProjects.add(filter);
+      return AggregateCall.create(
+          call.getAggregation(),
+          false,
+          false,
+          false,
+          call.rexList,
+          ImmutableList.of(newProjects.size() - 2),
+          newProjects.size() - 1,
+          null,
+          RelCollations.EMPTY,
+          call.getType(),
+          call.getName()
+      );
+    }
+
+    // Rewrites
+    // D1: SUM(CASE WHEN x = 'foo' THEN cnt ELSE 0 END)
+    //   => SUM0(cnt) FILTER (x = 'foo')
+    // D2: SUM(CASE WHEN x = 'foo' THEN 1 ELSE 0 END)
+    //   => COUNT() FILTER (x = 'foo')
+    //
+    // https://issues.apache.org/jira/browse/CALCITE-5953
+    // have restricted this rewrite as in case there are no rows it may not be equvivalent;
+    // however it may have some performance impact in Druid
+    if (extendedFilteredSumRewrite &&
+        kind == SqlKind.SUM && isIntLiteral(arg2, BigDecimal.ZERO)) {
+      if (isIntLiteral(arg1, BigDecimal.ONE)) { // D2
+        newProjects.add(filter);
+        final RelDataType dataType = typeFactory.createTypeWithNullability(
+            typeFactory.createSqlType(SqlTypeName.BIGINT), false
+        );
+        return AggregateCall.create(
+            SqlStdOperatorTable.COUNT,
+            false,
+            false,
+            false,
+            call.rexList,
+            ImmutableList.of(),
+            newProjects.size() - 1,
+            null,
+            RelCollations.EMPTY,
+            dataType,
+            call.getName()
+        );
+
+      } else { // D1
+        newProjects.add(arg1);
+        newProjects.add(filter);
+
+        RelDataType newType = typeFactory.createTypeWithNullability(call.getType(), true);
+        return AggregateCall.create(
+            call.getAggregation(),
+            false,
+            false,
+            false,
+            call.rexList,
+            ImmutableList.of(newProjects.size() - 2),
+            newProjects.size() - 1,
+            null,
+            RelCollations.EMPTY,
+            newType,
+            call.getName()
+        );
+      }
+    }
+
+    return null;
+  }
+
+  /**
+   * Returns the argument, if an aggregate call has a single argument, otherwise
+   * -1.
+   */
+  private static int soleArgument(AggregateCall aggregateCall)
+  {
+    return aggregateCall.getArgList().size() == 1
+        ? aggregateCall.getArgList().get(0)
+        : -1;
+  }
+
+  private static boolean isThreeArgCase(final RexNode rexNode)
+  {
+    return rexNode.getKind() == SqlKind.CASE
+        && ((RexCall) rexNode).operands.size() == 3;
+  }
+
+  private static boolean isIntLiteral(RexNode rexNode, BigDecimal value)
+  {
+    return rexNode instanceof RexLiteral
+        && SqlTypeName.INT_TYPES.contains(rexNode.getType().getSqlTypeName())
+        && value.equals(((RexLiteral) rexNode).getValueAs(BigDecimal.class));
+  }
+}
diff --git a/sql/src/test/java/org/apache/druid/sql/calcite/CalciteQueryTest.java b/sql/src/test/java/org/apache/druid/sql/calcite/CalciteQueryTest.java
index f2a85b4a4a90..12f17b015c15 100644
--- a/sql/src/test/java/org/apache/druid/sql/calcite/CalciteQueryTest.java
+++ b/sql/src/test/java/org/apache/druid/sql/calcite/CalciteQueryTest.java
@@ -5188,7 +5188,6 @@ public void testGroupByWithSortOnPostAggregationNoTopNContext()
   @Test
   public void testFilteredAggregations()
   {
-    cannotVectorizeUnlessFallback();
     Druids.TimeseriesQueryBuilder builder =
         Druids.newTimeseriesQueryBuilder()
               .dataSource(CalciteTests.DATASOURCE1)
@@ -5196,18 +5195,9 @@ public void testFilteredAggregations()
               .granularity(Granularities.ALL)
               .context(QUERY_CONTEXT_DEFAULT);
     if (NullHandling.sqlCompatible()) {
+      cannotVectorizeUnlessFallback();
       builder = builder.virtualColumns(
-                          expressionVirtualColumn("v0", "substring(\"dim1\", 0, 1)", ColumnType.STRING),
-                          expressionVirtualColumn(
-                              "v1",
-                              "case_searched((\"dim1\" != '1'),1,0)",
-                              ColumnType.LONG
-                          ),
-                          expressionVirtualColumn(
-                              "v2",
-                              "case_searched((\"dim1\" != '1'),\"cnt\",0)",
-                              ColumnType.LONG
-                          )
+                          expressionVirtualColumn("v0", "substring(\"dim1\", 0, 1)", ColumnType.STRING)
                         )
                        .aggregators(
                            aggregators(
@@ -5234,7 +5224,10 @@ public void testFilteredAggregations()
                                    new CountAggregatorFactory("a4"),
                                    not(equality("dim1", "1", ColumnType.STRING))
                                ),
-                               new LongSumAggregatorFactory("a5", "v1"),
+                               new FilteredAggregatorFactory(
+                                   new CountAggregatorFactory("a5"),
+                                   not(equality("dim1", "1", ColumnType.STRING))
+                               ),
                                new FilteredAggregatorFactory(
                                    new LongSumAggregatorFactory("a6", "cnt"),
                                    equality("dim2", "a", ColumnType.STRING)
@@ -5246,7 +5239,10 @@ public void testFilteredAggregations()
                                        not(equality("dim1", "1", ColumnType.STRING))
                                    )
                                ),
-                               new LongSumAggregatorFactory("a8", "v2"),
+                               new FilteredAggregatorFactory(
+                                   new LongSumAggregatorFactory("a8", "cnt"),
+                                   not(equality("dim1", "1", ColumnType.STRING))
+                               ),
                                new FilteredAggregatorFactory(
                                    new LongMaxAggregatorFactory("a9", "cnt"),
                                    not(equality("dim1", "1", ColumnType.STRING))
@@ -5272,16 +5268,7 @@ public void testFilteredAggregations()
                        );
     } else {
       builder = builder.virtualColumns(
-              expressionVirtualColumn(
-              "v0",
-              "case_searched((\"dim1\" != '1'),1,0)",
-              ColumnType.LONG
-          ),
-          expressionVirtualColumn(
-              "v1",
-              "case_searched((\"dim1\" != '1'),\"cnt\",0)",
-              ColumnType.LONG
-          ))
+          )
           .aggregators(
               aggregators(
               new FilteredAggregatorFactory(
@@ -5307,7 +5294,10 @@ public void testFilteredAggregations()
                   new CountAggregatorFactory("a4"),
                   not(equality("dim1", "1", ColumnType.STRING))
               ),
-              new LongSumAggregatorFactory("a5", "v0"),
+              new FilteredAggregatorFactory(
+                  new CountAggregatorFactory("a5"),
+                  not(equality("dim1", "1", ColumnType.STRING))
+              ),
               new FilteredAggregatorFactory(
                   new LongSumAggregatorFactory("a6", "cnt"),
                   equality("dim2", "a", ColumnType.STRING)
@@ -5319,7 +5309,10 @@ public void testFilteredAggregations()
                       not(equality("dim1", "1", ColumnType.STRING))
                   )
               ),
-              new LongSumAggregatorFactory("a8", "v1"),
+              new FilteredAggregatorFactory(
+                  new LongSumAggregatorFactory("a8", "cnt"),
+                  not(equality("dim1", "1", ColumnType.STRING))
+              ),
               new FilteredAggregatorFactory(
                   new LongMaxAggregatorFactory("a9", "cnt"),
                   not(equality("dim1", "1", ColumnType.STRING))
@@ -5373,7 +5366,6 @@ public void testFilteredAggregations()
   @Test
   public void testCaseFilteredAggregationWithGroupBy()
   {
-    cannotVectorizeUnlessFallback();
     testQuery(
         "SELECT\n"
         + "  cnt,\n"
@@ -5386,15 +5378,11 @@ public void testCaseFilteredAggregationWithGroupBy()
                         .setInterval(querySegmentSpec(Filtration.eternity()))
                         .setGranularity(Granularities.ALL)
                         .setDimensions(dimensions(new DefaultDimensionSpec("cnt", "d0", ColumnType.LONG)))
-                        .setVirtualColumns(
-                            expressionVirtualColumn(
-                                "v0",
-                                "case_searched((\"dim1\" != '1'),1,0)",
-                                ColumnType.LONG
-                            )
-                        )
                         .setAggregatorSpecs(aggregators(
-                            new LongSumAggregatorFactory("a0", "v0"),
+                            new FilteredAggregatorFactory(
+                                new CountAggregatorFactory("a0"),
+                                not(equality("dim1", "1", ColumnType.STRING))
+                            ),
                             new LongSumAggregatorFactory("a1", "cnt")
                         ))
                         .setPostAggregatorSpecs(
@@ -5409,6 +5397,52 @@ public void testCaseFilteredAggregationWithGroupBy()
     );
   }
 
+  @Test
+  public void testCaseFilteredAggregationWithGroupRewriteToSum()
+  {
+    testBuilder()
+        .sql(
+            "SELECT\n"
+                + "  cnt,\n"
+                + "  SUM(CASE WHEN dim1 <> '1' THEN 2 ELSE 0 END) + SUM(cnt)\n"
+                + "FROM druid.foo\n"
+                + "GROUP BY cnt"
+        )
+        .expectedQueries(
+            ImmutableList.of(
+                GroupByQuery.builder()
+                    .setDataSource(CalciteTests.DATASOURCE1)
+                    .setInterval(querySegmentSpec(Filtration.eternity()))
+                    .setGranularity(Granularities.ALL)
+                    .setDimensions(dimensions(new DefaultDimensionSpec("cnt", "d0", ColumnType.LONG)))
+                    .setVirtualColumns(
+                        expressionVirtualColumn("v0", "2", ColumnType.LONG)
+                    )
+                    .setAggregatorSpecs(
+                        aggregators(
+                            new FilteredAggregatorFactory(
+                                new LongSumAggregatorFactory("a0", "v0"),
+                                not(equality("dim1", "1", ColumnType.STRING))
+                            ),
+                            new LongSumAggregatorFactory("a1", "cnt")
+                        )
+                    )
+                    .setPostAggregatorSpecs(
+                        expressionPostAgg("p0", "(\"a0\" + \"a1\")", ColumnType.LONG)
+                    )
+                    .setContext(QUERY_CONTEXT_DEFAULT)
+                    .build()
+            )
+        )
+        .expectedResults(
+            ImmutableList.of(
+                new Object[] {1L, 16L}
+            )
+        )
+        .run();
+  }
+
+
   @Test
   public void testFilteredAggregationWithNotIn()
   {
@@ -9479,7 +9513,6 @@ public void testGroupByFloor()
   @Test
   public void testQueryWithSelectProjectAndIdentityProjectDoesNotRename()
   {
-    cannotVectorizeUnlessFallback();
     msqIncompatible();
     testQuery(
         PLANNER_CONFIG_NO_HLL.withOverrides(
@@ -9506,25 +9539,30 @@ public void testQueryWithSelectProjectAndIdentityProjectDoesNotRename()
                                                     "v0",
                                                     "((\"__time\" >= 947005200000) && (\"__time\" < 1641402000000))",
                                                     ColumnType.LONG
-                                                ),
-                                                expressionVirtualColumn(
-                                                    "v1",
-                                                    "case_searched(((\"__time\" >= 947005200000) && (\"__time\" < 1641402000000)),1,0)",
-                                                    ColumnType.LONG
                                                 )
                                             )
                                             .setDimensions(
                                                 dimensions(
-                                                    new DefaultDimensionSpec("dim1", "d0", ColumnType.STRING),
-                                                    new DefaultDimensionSpec("v0", "d1", ColumnType.LONG)
+                                                    new DefaultDimensionSpec("v0", "d0", ColumnType.LONG),
+                                                    new DefaultDimensionSpec("dim1", "d1", ColumnType.STRING)
                                                 )
                                             )
                                             .setAggregatorSpecs(
                                                 aggregators(
-                                                    new LongSumAggregatorFactory("a0", "v1"),
+                                                    new FilteredAggregatorFactory(
+                                                        new CountAggregatorFactory("a0"),
+                                                        range(
+                                                            "__time",
+                                                            ColumnType.LONG,
+                                                            timestamp("2000-01-04T17:00:00"),
+                                                            timestamp("2022-01-05T17:00:00"),
+                                                            false,
+                                                            true
+                                                        )
+                                                    ),
                                                     new GroupingAggregatorFactory(
                                                         "a1",
-                                                        ImmutableList.of("dim1", "v0")
+                                                        ImmutableList.of("v0", "dim1")
                                                     )
                                                 )
                                             )
@@ -9549,9 +9587,9 @@ public void testQueryWithSelectProjectAndIdentityProjectDoesNotRename()
                                 new FilteredAggregatorFactory(
                                     new CountAggregatorFactory("_a1"),
                                     and(
-                                        notNull("d0"),
+                                        notNull("d1"),
                                         equality("a1", 0L, ColumnType.LONG),
-                                        expressionFilter("\"d1\"")
+                                        expressionFilter("\"d0\"")
                                     )
                                 )
                             )
diff --git a/sql/src/test/quidem/org.apache.druid.quidem.SqlQuidemTest/filtered_sum.iq b/sql/src/test/quidem/org.apache.druid.quidem.SqlQuidemTest/filtered_sum.iq
new file mode 100644
index 000000000000..7da2f4ffd9d6
--- /dev/null
+++ b/sql/src/test/quidem/org.apache.druid.quidem.SqlQuidemTest/filtered_sum.iq
@@ -0,0 +1,120 @@
+!use druidtest://?numMergeBuffers=3
+!set outputformat mysql
+
+-- empty input
+SELECT COUNT(1)FILTER(WHERE l1=-1),COUNT(1)FILTER(WHERE l1!=-1),MIN(l2) is null,
+	SUM(CASE WHEN l1 = -1 THEN l2 ELSE 0 END),SUM(l2) FILTER(WHERE l1=-1) FROM numfoo where l1 < -1;
++--------+--------+--------+--------+--------+
+| EXPR$0 | EXPR$1 | EXPR$2 | EXPR$3 | EXPR$4 |
++--------+--------+--------+--------+--------+
+|      0 |      0 | true   |        |        |
++--------+--------+--------+--------+--------+
+(1 row)
+
+!ok
+-- 0=-1,0
+SELECT COUNT(1)FILTER(WHERE l1=-1),COUNT(1)FILTER(WHERE l1!=-1),MIN(l2) is null,
+	SUM(CASE WHEN l1 = -1 THEN l2 ELSE 0 END),SUM(l2) FILTER(WHERE l1=-1) FROM numfoo where l1 < 3;
++--------+--------+--------+--------+--------+
+| EXPR$0 | EXPR$1 | EXPR$2 | EXPR$3 | EXPR$4 |
++--------+--------+--------+--------+--------+
+|      0 |      1 | false  |        |        |
++--------+--------+--------+--------+--------+
+(1 row)
+
+!ok
+
+
+-- 0=0,0
+SELECT COUNT(1)FILTER(WHERE l1=0),COUNT(1)FILTER(WHERE l1!=0),MIN(l2) is null,
+	SUM(CASE WHEN l1 = 0 THEN l2 ELSE 0 END),SUM(l2) FILTER(WHERE l1=0) FROM numfoo where l1 < 3;
++--------+--------+--------+--------+--------+
+| EXPR$0 | EXPR$1 | EXPR$2 | EXPR$3 | EXPR$4 |
++--------+--------+--------+--------+--------+
+|      1 |      0 | false  |      0 |      0 |
++--------+--------+--------+--------+--------+
+(1 row)
+
+!ok
+
+-- 7=7,null
+SELECT COUNT(1)FILTER(WHERE l1=7),COUNT(1)FILTER(WHERE l1!=7),MIN(l2) is null,
+	SUM(CASE WHEN l1 = 7 THEN l2 ELSE 0 END),SUM(l2) FILTER(WHERE l1=7) FROM numfoo where 0 < l1 and l1 < 10;
++--------+--------+--------+--------+--------+
+| EXPR$0 | EXPR$1 | EXPR$2 | EXPR$3 | EXPR$4 |
++--------+--------+--------+--------+--------+
+|      1 |      0 | true   |        |        |
++--------+--------+--------+--------+--------+
+(1 row)
+
+!ok
+
+LogicalProject(EXPR$0=[$0], EXPR$1=[$1], EXPR$2=[IS NULL($2)], EXPR$3=[$3], EXPR$4=[$4])
+  LogicalAggregate(group=[{}], EXPR$0=[COUNT() FILTER $0], EXPR$1=[COUNT() FILTER $1], agg#2=[MIN($2)], EXPR$3=[SUM($3)], EXPR$4=[SUM($2) FILTER $0])
+    LogicalProject($f1=[IS TRUE(=($0, 7))], $f2=[IS TRUE(<>($0, 7))], l2=[$1], $f4=[CASE(=($0, 7), $1, 0:BIGINT)])
+      LogicalFilter(condition=[SEARCH($0, Sarg[(0..10)])])
+        LogicalProject(l1=[$11], l2=[$12])
+          LogicalTableScan(table=[[druid, numfoo]])
+
+!druidPlan
+
+!set extendedFilteredSumRewrite false
+!use druidtest://?numMergeBuffers=3
+
+
+-- empty input
+SELECT COUNT(1)FILTER(WHERE l1=-1),COUNT(1)FILTER(WHERE l1!=-1),MIN(l2) is null,
+	SUM(CASE WHEN l1 = -1 THEN l2 ELSE 0 END),SUM(l2) FILTER(WHERE l1=-1) FROM numfoo where l1 < -1;
++--------+--------+--------+--------+--------+
+| EXPR$0 | EXPR$1 | EXPR$2 | EXPR$3 | EXPR$4 |
++--------+--------+--------+--------+--------+
+|      0 |      0 | true   |        |        |
++--------+--------+--------+--------+--------+
+(1 row)
+
+!ok
+-- 0=-1,0
+SELECT COUNT(1)FILTER(WHERE l1=-1),COUNT(1)FILTER(WHERE l1!=-1),MIN(l2) is null,
+	SUM(CASE WHEN l1 = -1 THEN l2 ELSE 0 END),SUM(l2) FILTER(WHERE l1=-1) FROM numfoo where l1 < 3;
++--------+--------+--------+--------+--------+
+| EXPR$0 | EXPR$1 | EXPR$2 | EXPR$3 | EXPR$4 |
++--------+--------+--------+--------+--------+
+|      0 |      1 | false  |      0 |        |
++--------+--------+--------+--------+--------+
+(1 row)
+
+!ok
+
+
+-- 0=0,0
+SELECT COUNT(1)FILTER(WHERE l1=0),COUNT(1)FILTER(WHERE l1!=0),MIN(l2) is null,
+	SUM(CASE WHEN l1 = 0 THEN l2 ELSE 0 END),SUM(l2) FILTER(WHERE l1=0) FROM numfoo where l1 < 3;
++--------+--------+--------+--------+--------+
+| EXPR$0 | EXPR$1 | EXPR$2 | EXPR$3 | EXPR$4 |
++--------+--------+--------+--------+--------+
+|      1 |      0 | false  |      0 |      0 |
++--------+--------+--------+--------+--------+
+(1 row)
+
+!ok
+
+-- 7=7,null
+SELECT COUNT(1)FILTER(WHERE l1=7),COUNT(1)FILTER(WHERE l1!=7),MIN(l2) is null,
+	SUM(CASE WHEN l1 = 7 THEN l2 ELSE 0 END),SUM(l2) FILTER(WHERE l1=7) FROM numfoo where 0 < l1 and l1 < 10;
++--------+--------+--------+--------+--------+
+| EXPR$0 | EXPR$1 | EXPR$2 | EXPR$3 | EXPR$4 |
++--------+--------+--------+--------+--------+
+|      1 |      0 | true   |        |        |
++--------+--------+--------+--------+--------+
+(1 row)
+
+!ok
+
+LogicalProject(EXPR$0=[$0], EXPR$1=[$1], EXPR$2=[IS NULL($2)], EXPR$3=[$3], EXPR$4=[$4])
+  LogicalAggregate(group=[{}], EXPR$0=[COUNT() FILTER $0], EXPR$1=[COUNT() FILTER $1], agg#2=[MIN($2)], EXPR$3=[SUM($3)], EXPR$4=[SUM($2) FILTER $0])
+    LogicalProject($f1=[IS TRUE(=($0, 7))], $f2=[IS TRUE(<>($0, 7))], l2=[$1], $f4=[CASE(=($0, 7), $1, 0:BIGINT)])
+      LogicalFilter(condition=[SEARCH($0, Sarg[(0..10)])])
+        LogicalProject(l1=[$11], l2=[$12])
+          LogicalTableScan(table=[[druid, numfoo]])
+
+!druidPlan

From aca56d6bb842231853d624e7da07748ba002ac4f Mon Sep 17 00:00:00 2001
From: George Shiqi Wu <george.wu@imply.io>
Date: Thu, 12 Dec 2024 10:37:53 -0500
Subject: [PATCH 29/56] reject publishing actions with a retriable error code
 if a earlier task is still publishing (#17509)

* Working queuing of publishing

* fix style

* Add unit tests

* add tests

* retry within the connector

* fix unit tests

* Update indexing-service/src/main/java/org/apache/druid/indexing/common/actions/LocalTaskActionClient.java

Co-authored-by: Kashif Faraz <kashif.faraz@gmail.com>

* Add comment

* fix style

* Fix unit tests

* style fix

---------

Co-authored-by: Kashif Faraz <kashif.faraz@gmail.com>
---
 .../indexing/common/actions/LocalTaskActionClient.java      | 1 +
 .../actions/SegmentTransactionalInsertActionTest.java       | 4 ++--
 .../metadata/IndexerSQLMetadataStorageCoordinator.java      | 4 +++-
 .../metadata/IndexerSQLMetadataStorageCoordinatorTest.java  | 6 +++---
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/LocalTaskActionClient.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/LocalTaskActionClient.java
index 1d0059335ed1..81ff137ed179 100644
--- a/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/LocalTaskActionClient.java
+++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/LocalTaskActionClient.java
@@ -69,6 +69,7 @@ private <R> R performAction(TaskAction<R> taskAction)
       return result;
     }
     catch (Throwable t) {
+      log.error(t, "Failed to perform action[%s]", taskAction);
       throw new RuntimeException(t);
     }
   }
diff --git a/indexing-service/src/test/java/org/apache/druid/indexing/common/actions/SegmentTransactionalInsertActionTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/common/actions/SegmentTransactionalInsertActionTest.java
index 44ce60b5ceb2..7d5f4488fea0 100644
--- a/indexing-service/src/test/java/org/apache/druid/indexing/common/actions/SegmentTransactionalInsertActionTest.java
+++ b/indexing-service/src/test/java/org/apache/druid/indexing/common/actions/SegmentTransactionalInsertActionTest.java
@@ -22,7 +22,6 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
-import org.apache.druid.error.InvalidInput;
 import org.apache.druid.indexing.common.TaskLockType;
 import org.apache.druid.indexing.common.task.NoopTask;
 import org.apache.druid.indexing.common.task.Task;
@@ -32,6 +31,7 @@
 import org.apache.druid.indexing.overlord.Segments;
 import org.apache.druid.indexing.overlord.TimeChunkLockRequest;
 import org.apache.druid.java.util.common.Intervals;
+import org.apache.druid.metadata.RetryTransactionException;
 import org.apache.druid.timeline.DataSegment;
 import org.apache.druid.timeline.partition.LinearShardSpec;
 import org.assertj.core.api.Assertions;
@@ -151,7 +151,7 @@ public void testFailTransactionalUpdateDataSourceMetadata() throws Exception
 
     Assert.assertEquals(
         SegmentPublishResult.fail(
-            InvalidInput.exception(
+            new RetryTransactionException(
                 "The new start metadata state[ObjectMetadata{theObject=[1]}] is"
                 + " ahead of the last committed end state[null]. Try resetting the supervisor."
             ).toString()
diff --git a/server/src/main/java/org/apache/druid/metadata/IndexerSQLMetadataStorageCoordinator.java b/server/src/main/java/org/apache/druid/metadata/IndexerSQLMetadataStorageCoordinator.java
index 69d86ab80cf8..0717c9b07eea 100644
--- a/server/src/main/java/org/apache/druid/metadata/IndexerSQLMetadataStorageCoordinator.java
+++ b/server/src/main/java/org/apache/druid/metadata/IndexerSQLMetadataStorageCoordinator.java
@@ -2687,7 +2687,9 @@ protected DataStoreMetadataUpdateResult updateDataSourceMetadataWithHandle(
 
     if (startMetadataGreaterThanExisting && !startMetadataMatchesExisting) {
       // Offsets stored in startMetadata is greater than the last commited metadata.
-      return DataStoreMetadataUpdateResult.failure(
+      // This can happen because the previous task is still publishing its segments and can resolve once
+      // the previous task finishes publishing.
+      return DataStoreMetadataUpdateResult.retryableFailure(
           "The new start metadata state[%s] is ahead of the last committed"
           + " end state[%s]. Try resetting the supervisor.",
           startMetadata, oldCommitMetadataFromDb
diff --git a/server/src/test/java/org/apache/druid/metadata/IndexerSQLMetadataStorageCoordinatorTest.java b/server/src/test/java/org/apache/druid/metadata/IndexerSQLMetadataStorageCoordinatorTest.java
index 0377faac5fbf..a000fbec5a3e 100644
--- a/server/src/test/java/org/apache/druid/metadata/IndexerSQLMetadataStorageCoordinatorTest.java
+++ b/server/src/test/java/org/apache/druid/metadata/IndexerSQLMetadataStorageCoordinatorTest.java
@@ -784,15 +784,15 @@ public void testTransactionalAnnounceFailDbNullWantNotNull()
     );
     Assert.assertEquals(
         SegmentPublishResult.fail(
-            InvalidInput.exception(
+            new RetryTransactionException(
                 "The new start metadata state[ObjectMetadata{theObject={foo=bar}}] is ahead of the last committed"
                 + " end state[null]. Try resetting the supervisor."
             ).toString()),
         result1
     );
 
-    // Should only be tried once.
-    Assert.assertEquals(1, metadataUpdateCounter.get());
+    // Should be retried.
+    Assert.assertEquals(2, metadataUpdateCounter.get());
   }
 
   @Test

From b86ea4d5c40af56aff5f90cf9816f38d734696fc Mon Sep 17 00:00:00 2001
From: Katya Macedo <38017980+ektravel@users.noreply.github.com>
Date: Thu, 12 Dec 2024 18:58:38 -0600
Subject: [PATCH 30/56] [Docs] Improve druid.coordinator.kill.on description
 (#17538)

* Docs: improve druid.coordinator.kill.on description

* Update docs/configuration/index.md

Co-authored-by: Charles Smith <techdocsmith@gmail.com>

* Update description for durationToRetain

* Update docs/configuration/index.md

* Update after review

---------

Co-authored-by: Charles Smith <techdocsmith@gmail.com>
---
 docs/configuration/index.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/configuration/index.md b/docs/configuration/index.md
index df14614d95e2..75ffab25a605 100644
--- a/docs/configuration/index.md
+++ b/docs/configuration/index.md
@@ -890,9 +890,9 @@ These Coordinator static configurations can be defined in the `coordinator/runti
 |`druid.coordinator.startDelay`|The operation of the Coordinator works on the assumption that it has an up-to-date view of the state of the world when it runs, the current ZooKeeper interaction code, however, is written in a way that doesn’t allow the Coordinator to know for a fact that it’s done loading the current state of the world. This delay is a hack to give it enough time to believe that it has all the data.|`PT300S`|
 |`druid.coordinator.load.timeout`|The timeout duration for when the Coordinator assigns a segment to a Historical service.|`PT15M`|
 |`druid.coordinator.kill.pendingSegments.on`|Boolean flag for whether or not the Coordinator clean up old entries in the `pendingSegments` table of metadata store. If set to true, Coordinator will check the created time of most recently complete task. If it doesn't exist, it finds the created time of the earliest running/pending/waiting tasks. Once the created time is found, then for all datasources not in the `killPendingSegmentsSkipList` (see [Dynamic configuration](#dynamic-configuration)), Coordinator will ask the Overlord to clean up the entries 1 day or more older than the found created time in the `pendingSegments` table. This will be done periodically based on `druid.coordinator.period.indexingPeriod` specified.|true|
-|`druid.coordinator.kill.on`|Boolean flag for whether or not the Coordinator should submit kill task for unused segments, that is, permanently delete them from metadata store and deep storage. If set to true, then for all whitelisted datasources (or optionally all), Coordinator will submit tasks periodically based on `period` specified. A whitelist can be set via dynamic configuration `killDataSourceWhitelist` described later.<br /><br />When `druid.coordinator.kill.on` is true, segments are eligible for permanent deletion once their data intervals are older than `druid.coordinator.kill.durationToRetain` relative to the current time. If a segment's data interval is older than this threshold at the time it is marked unused, it is eligible for permanent deletion immediately after being marked unused.|false|
+|`druid.coordinator.kill.on`|Boolean flag to enable the Coordinator to submit a kill task for unused segments and delete them permanently from the metadata store and deep storage.|false|
 |`druid.coordinator.kill.period`| The frequency of sending kill tasks to the indexing service. The value must be greater than or equal to `druid.coordinator.period.indexingPeriod`. Only applies if kill is turned on.|Same as `druid.coordinator.period.indexingPeriod`|
-|`druid.coordinator.kill.durationToRetain`|Only applies if you set `druid.coordinator.kill.on` to `true`. This value is ignored if `druid.coordinator.kill.ignoreDurationToRetain` is `true`. Valid configurations must be a ISO8601 period. Druid will not kill unused segments whose interval end date is beyond `now - durationToRetain`. `durationToRetain` can be a negative ISO8601 period, which would result in `now - durationToRetain` to be in the future.<br /><br />Note that the `durationToRetain` parameter applies to the segment interval, not the time that the segment was last marked unused. For example, if `durationToRetain` is set to `P90D`, then a segment for a time chunk 90 days in the past is eligible for permanent deletion immediately after being marked unused.|`P90D`|
+|`druid.coordinator.kill.durationToRetain`|Duration, in ISO 8601 format, relative to the current time that identifies the data interval of segments to retain. When `druid.coordinator.kill.on` is true, any segment with a data interval ending before `now - durationToRetain` is eligible for permanent deletion. For example, if `durationToRetain` is set to `P90D`, unused segments with time intervals ending 90 days in the past are eligible for deletion. If `durationToRetain` is set to a negative ISO 8601 period, segments with future intervals ending before `now - durationToRetain` are also eligible for deletion.|`P90D`|
 |`druid.coordinator.kill.ignoreDurationToRetain`|A way to override `druid.coordinator.kill.durationToRetain` and tell the coordinator that you do not care about the end date of unused segment intervals when it comes to killing them. If true, the coordinator considers all unused segments as eligible to be killed.|false|
 |`druid.coordinator.kill.bufferPeriod`|The amount of time that a segment must be unused before it is able to be permanently removed from metadata and deep storage. This can serve as a buffer period to prevent data loss if data ends up being needed after being marked unused.|`P30D`|
 |`druid.coordinator.kill.maxSegments`|The number of unused segments to kill per kill task. This number must be greater than 0. This only applies when `druid.coordinator.kill.on=true`.|100|
@@ -957,7 +957,7 @@ The following table shows the dynamic configuration properties for the Coordinat
 |`replicantLifetime`|The maximum number of Coordinator runs for which a segment can wait in the load queue of a Historical before Druid raises an alert.|15|
 |`replicationThrottleLimit`|The maximum number of segment replicas that can be assigned to a historical tier in a single Coordinator run. This property prevents Historical services from becoming overwhelmed when loading extra replicas of segments that are already available in the cluster.|500|
 |`balancerComputeThreads`|Thread pool size for computing moving cost of segments during segment balancing. Consider increasing this if you have a lot of segments and moving segments begins to stall.|`num_cores` / 2|
-|`killDataSourceWhitelist`|List of specific data sources for which kill tasks are sent if property `druid.coordinator.kill.on` is true. This can be a list of comma-separated data source names or a JSON array.|none|
+|`killDataSourceWhitelist`|List of specific data sources for which kill tasks can be issued if `druid.coordinator.kill.on` is true. It can be a comma-separated list of data source names or a JSON array. If `killDataSourceWhitelist` is empty, the Coordinator issues kill tasks for all data sources.|none|
 |`killTaskSlotRatio`|Ratio of total available task slots, including autoscaling if applicable that will be allowed for kill tasks. This value must be between 0 and 1. Only applicable for kill tasks that are spawned automatically by the coordinator's auto kill duty, which is enabled when `druid.coordinator.kill.on` is true.|0.1|
 |`maxKillTaskSlots`|Maximum number of tasks that will be allowed for kill tasks. This limit only applies for kill tasks that are spawned automatically by the coordinator's auto kill duty, which is enabled when `druid.coordinator.kill.on` is true.|`Integer.MAX_VALUE` - no limit|
 |`killPendingSegmentsSkipList`|List of data sources for which pendingSegments are _NOT_ cleaned up if property `druid.coordinator.kill.pendingSegments.on` is true. This can be a list of comma-separated data sources or a JSON array.|none|

From 24e5d8a9e81fffd656e9544ae16bea53d7e60808 Mon Sep 17 00:00:00 2001
From: Kashif Faraz <kashif.faraz@gmail.com>
Date: Thu, 12 Dec 2024 18:16:57 -0800
Subject: [PATCH 31/56] Refactor: Minor cleanup of segment allocation flow
 (#17524)

Changes
--------
- Simplify the arguments of IndexerMetadataStorageCoordinator.allocatePendingSegment
- Remove field SegmentCreateRequest.upgradedFromSegmentId as it was always null
- Miscellaneous cleanup
---
 .../druid/indexing/overlord/TaskLockbox.java  |  80 +++---
 .../indexing/overlord/TaskLockboxTest.java    |   4 +-
 ...TestIndexerMetadataStorageCoordinator.java |  11 +-
 .../partition/OverwriteShardSpec.java         |   1 +
 .../timeline/partition/PartitionIds.java      |   1 +
 .../IndexerMetadataStorageCoordinator.java    |  22 +-
 .../overlord/SegmentCreateRequest.java        |  20 +-
 .../IndexerSQLMetadataStorageCoordinator.java | 242 +++++++-----------
 .../overlord/SegmentCreateRequestTest.java    |   1 -
 ...exerSQLMetadataStorageCoordinatorTest.java | 102 +++++---
 10 files changed, 213 insertions(+), 271 deletions(-)

diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/overlord/TaskLockbox.java b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/TaskLockbox.java
index 916f8cab75ca..2c1b78d3adab 100644
--- a/indexing-service/src/main/java/org/apache/druid/indexing/overlord/TaskLockbox.java
+++ b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/TaskLockbox.java
@@ -183,7 +183,7 @@ public int compare(Pair<Task, TaskLock> left, Pair<Task, TaskLock> right)
                                       ? savedTaskLock.withPriority(task.getPriority())
                                       : savedTaskLock;
 
-        final TaskLockPosse taskLockPosse = verifyAndCreateOrFindLockPosse(
+        final TaskLockPosse taskLockPosse = reacquireLockOnStartup(
             task,
             savedTaskLockWithPriority
         );
@@ -192,15 +192,11 @@ public int compare(Pair<Task, TaskLock> left, Pair<Task, TaskLock> right)
 
           if (savedTaskLockWithPriority.getVersion().equals(taskLock.getVersion())) {
             taskLockCount++;
-            log.info(
-                "Reacquired lock[%s] for task: %s",
-                taskLock,
-                task.getId()
-            );
+            log.info("Reacquired lock[%s] for task[%s].", taskLock, task.getId());
           } else {
             taskLockCount++;
             log.info(
-                "Could not reacquire lock on interval[%s] version[%s] (got version[%s] instead) for task: %s",
+                "Could not reacquire lock on interval[%s] version[%s] (got version[%s] instead) for task[%s].",
                 savedTaskLockWithPriority.getInterval(),
                 savedTaskLockWithPriority.getVersion(),
                 taskLock.getVersion(),
@@ -210,7 +206,7 @@ public int compare(Pair<Task, TaskLock> left, Pair<Task, TaskLock> right)
         } else {
           failedToReacquireLockTaskGroups.add(task.getGroupId());
           log.error(
-              "Could not reacquire lock on interval[%s] version[%s] for task: %s from group %s.",
+              "Could not reacquire lock on interval[%s] version[%s] for task[%s], groupId[%s].",
               savedTaskLockWithPriority.getInterval(),
               savedTaskLockWithPriority.getVersion(),
               task.getId(),
@@ -253,38 +249,28 @@ public int compare(Pair<Task, TaskLock> left, Pair<Task, TaskLock> right)
   }
 
   /**
-   * This method is called only in {@link #syncFromStorage()} and verifies the given task and the taskLock have the same
-   * groupId, dataSource, and priority.
+   * Reacquire lock during {@link #syncFromStorage()}.
+   *
+   * @return null if the lock could not be reacquired.
    */
   @VisibleForTesting
   @Nullable
-  protected TaskLockPosse verifyAndCreateOrFindLockPosse(Task task, TaskLock taskLock)
+  protected TaskLockPosse reacquireLockOnStartup(Task task, TaskLock taskLock)
   {
+    if (!taskMatchesLock(task, taskLock)) {
+      log.warn(
+          "Task[datasource: %s, groupId: %s, priority: %s] does not match"
+          + " TaskLock[datasource: %s, groupId: %s, priority: %s].",
+          task.getDataSource(), task.getGroupId(), task.getPriority(),
+          taskLock.getDataSource(), taskLock.getGroupId(), taskLock.getNonNullPriority()
+      );
+      return null;
+    }
+
     giant.lock();
 
     try {
-      Preconditions.checkArgument(
-          task.getGroupId().equals(taskLock.getGroupId()),
-          "lock groupId[%s] is different from task groupId[%s]",
-          taskLock.getGroupId(),
-          task.getGroupId()
-      );
-      Preconditions.checkArgument(
-          task.getDataSource().equals(taskLock.getDataSource()),
-          "lock dataSource[%s] is different from task dataSource[%s]",
-          taskLock.getDataSource(),
-          task.getDataSource()
-      );
       final int taskPriority = task.getPriority();
-      final int lockPriority = taskLock.getNonNullPriority();
-
-      Preconditions.checkArgument(
-          lockPriority == taskPriority,
-          "lock priority[%s] is different from task priority[%s]",
-          lockPriority,
-          taskPriority
-      );
-
       final LockRequest request;
       switch (taskLock.getGranularity()) {
         case SEGMENT:
@@ -313,15 +299,13 @@ protected TaskLockPosse verifyAndCreateOrFindLockPosse(Task task, TaskLock taskL
           );
           break;
         default:
-          throw new ISE("Unknown lockGranularity[%s]", taskLock.getGranularity());
+          throw DruidException.defensive("Unknown lockGranularity[%s]", taskLock.getGranularity());
       }
 
       return createOrFindLockPosse(request, task, false);
     }
     catch (Exception e) {
-      log.error(e,
-                "Could not reacquire lock for task: %s from metadata store", task.getId()
-      );
+      log.error(e, "Could not reacquire lock for task[%s] from metadata store", task.getId());
       return null;
     }
     finally {
@@ -329,6 +313,17 @@ protected TaskLockPosse verifyAndCreateOrFindLockPosse(Task task, TaskLock taskL
     }
   }
 
+  /**
+   * Returns true if the datasource, groupId and priority of the given Task
+   * match that of the TaskLock.
+   */
+  private boolean taskMatchesLock(Task task, TaskLock taskLock)
+  {
+    return task.getGroupId().equals(taskLock.getGroupId())
+        && task.getDataSource().equals(taskLock.getDataSource())
+        && task.getPriority() == taskLock.getNonNullPriority();
+  }
+
   /**
    * Acquires a lock on behalf of a task.  Blocks until the lock is acquired.
    *
@@ -751,13 +746,15 @@ private SegmentIdWithShardSpec allocateSegmentId(LockRequestForNewSegment reques
   {
     return metadataStorageCoordinator.allocatePendingSegment(
         request.getDataSource(),
-        request.getSequenceName(),
-        request.getPreviousSegmentId(),
         request.getInterval(),
-        request.getPartialShardSpec(),
-        version,
         request.isSkipSegmentLineageCheck(),
-        allocatorId
+        new SegmentCreateRequest(
+            request.getSequenceName(),
+            request.getPreviousSegmentId(),
+            version,
+            request.getPartialShardSpec(),
+            allocatorId
+        )
     );
   }
 
@@ -1818,7 +1815,6 @@ SegmentCreateRequest getSegmentRequest()
             action.getPreviousSegmentId(),
             acquiredLock == null ? lockRequest.getVersion() : acquiredLock.getVersion(),
             action.getPartialShardSpec(),
-            null,
             ((PendingSegmentAllocatingTask) task).getTaskAllocatorId()
         );
       }
diff --git a/indexing-service/src/test/java/org/apache/druid/indexing/overlord/TaskLockboxTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/overlord/TaskLockboxTest.java
index a8c4b5117b1b..8f47b78a3bfe 100644
--- a/indexing-service/src/test/java/org/apache/druid/indexing/overlord/TaskLockboxTest.java
+++ b/indexing-service/src/test/java/org/apache/druid/indexing/overlord/TaskLockboxTest.java
@@ -2270,10 +2270,10 @@ public NullLockPosseTaskLockbox(
     }
 
     @Override
-    protected TaskLockPosse verifyAndCreateOrFindLockPosse(Task task, TaskLock taskLock)
+    protected TaskLockPosse reacquireLockOnStartup(Task task, TaskLock taskLock)
     {
       return task.getGroupId()
-                 .contains("FailingLockAcquisition") ? null : super.verifyAndCreateOrFindLockPosse(task, taskLock);
+                 .contains("FailingLockAcquisition") ? null : super.reacquireLockOnStartup(task, taskLock);
     }
   }
 }
diff --git a/indexing-service/src/test/java/org/apache/druid/indexing/test/TestIndexerMetadataStorageCoordinator.java b/indexing-service/src/test/java/org/apache/druid/indexing/test/TestIndexerMetadataStorageCoordinator.java
index 54e323581c47..a95d73ce1bb7 100644
--- a/indexing-service/src/test/java/org/apache/druid/indexing/test/TestIndexerMetadataStorageCoordinator.java
+++ b/indexing-service/src/test/java/org/apache/druid/indexing/test/TestIndexerMetadataStorageCoordinator.java
@@ -36,7 +36,6 @@
 import org.apache.druid.segment.realtime.appenderator.SegmentIdWithShardSpec;
 import org.apache.druid.timeline.DataSegment;
 import org.apache.druid.timeline.SegmentTimeline;
-import org.apache.druid.timeline.partition.PartialShardSpec;
 import org.joda.time.DateTime;
 import org.joda.time.Interval;
 
@@ -242,20 +241,16 @@ public int removeDataSourceMetadataOlderThan(long timestamp, @Nullable Set<Strin
   @Override
   public SegmentIdWithShardSpec allocatePendingSegment(
       String dataSource,
-      String sequenceName,
-      String previousSegmentId,
       Interval interval,
-      PartialShardSpec partialShardSpec,
-      String maxVersion,
       boolean skipSegmentLineageCheck,
-      String taskAllocatorId
+      SegmentCreateRequest createRequest
   )
   {
     return new SegmentIdWithShardSpec(
         dataSource,
         interval,
-        maxVersion,
-        partialShardSpec.complete(objectMapper, 0, 0)
+        createRequest.getVersion(),
+        createRequest.getPartialShardSpec().complete(objectMapper, 0, 0)
     );
   }
 
diff --git a/processing/src/main/java/org/apache/druid/timeline/partition/OverwriteShardSpec.java b/processing/src/main/java/org/apache/druid/timeline/partition/OverwriteShardSpec.java
index ec784c44ffb0..a18f829efdd1 100644
--- a/processing/src/main/java/org/apache/druid/timeline/partition/OverwriteShardSpec.java
+++ b/processing/src/main/java/org/apache/druid/timeline/partition/OverwriteShardSpec.java
@@ -21,6 +21,7 @@
 
 /**
  * ShardSpec for non-first-generation segments.
+ * This shardSpec is created only by overwriting tasks using segment locks.
  * This shardSpec is allocated a partitionId between {@link PartitionIds#NON_ROOT_GEN_START_PARTITION_ID} and
  * {@link PartitionIds#NON_ROOT_GEN_END_PARTITION_ID}.
  *
diff --git a/processing/src/main/java/org/apache/druid/timeline/partition/PartitionIds.java b/processing/src/main/java/org/apache/druid/timeline/partition/PartitionIds.java
index fc5d0e981c45..2bd931252250 100644
--- a/processing/src/main/java/org/apache/druid/timeline/partition/PartitionIds.java
+++ b/processing/src/main/java/org/apache/druid/timeline/partition/PartitionIds.java
@@ -31,6 +31,7 @@ public final class PartitionIds
   public static final int ROOT_GEN_END_PARTITION_ID = 32768; // exclusive
   /**
    * Start partitionId available for non-root generation segments.
+   * Used only with segment locks.
    */
   public static final int NON_ROOT_GEN_START_PARTITION_ID = 32768;
   /**
diff --git a/server/src/main/java/org/apache/druid/indexing/overlord/IndexerMetadataStorageCoordinator.java b/server/src/main/java/org/apache/druid/indexing/overlord/IndexerMetadataStorageCoordinator.java
index da54d7e39986..5e840b07b6d0 100644
--- a/server/src/main/java/org/apache/druid/indexing/overlord/IndexerMetadataStorageCoordinator.java
+++ b/server/src/main/java/org/apache/druid/indexing/overlord/IndexerMetadataStorageCoordinator.java
@@ -26,7 +26,6 @@
 import org.apache.druid.segment.realtime.appenderator.SegmentIdWithShardSpec;
 import org.apache.druid.timeline.DataSegment;
 import org.apache.druid.timeline.SegmentTimeline;
-import org.apache.druid.timeline.partition.PartialShardSpec;
 import org.joda.time.DateTime;
 import org.joda.time.Interval;
 
@@ -215,34 +214,23 @@ SegmentTimeline getSegmentTimelineForAllocation(
    * Note that a segment sequence may include segments with a variety of different intervals and versions.
    *
    * @param dataSource              dataSource for which to allocate a segment
-   * @param sequenceName            name of the group of ingestion tasks producing a segment series
-   * @param previousSegmentId       previous segment in the series; may be null or empty, meaning this is the first
-   *                                segment
    * @param interval                interval for which to allocate a segment
-   * @param partialShardSpec        partialShardSpec containing all necessary information to create a shardSpec for the
-   *                                new segmentId
-   * @param maxVersion              use this version if we have no better version to use. The returned segment
-   *                                identifier may have a version lower than this one, but will not have one higher.
    * @param skipSegmentLineageCheck if true, perform lineage validation using previousSegmentId for this sequence.
    *                                Should be set to false if replica tasks would index events in same order
-   * @param taskAllocatorId         The task allocator id with which the pending segment is associated
    * @return the pending segment identifier, or null if it was impossible to allocate a new segment
    */
+  @Nullable
   SegmentIdWithShardSpec allocatePendingSegment(
       String dataSource,
-      String sequenceName,
-      @Nullable String previousSegmentId,
       Interval interval,
-      PartialShardSpec partialShardSpec,
-      String maxVersion,
       boolean skipSegmentLineageCheck,
-      String taskAllocatorId
+      SegmentCreateRequest createRequest
   );
 
   /**
    * Delete pending segments created in the given interval belonging to the given data source from the pending segments
    * table. The {@code created_date} field of the pending segments table is checked to find segments to be deleted.
-   *
+   * <p>
    * Note that the semantic of the interval (for `created_date`s) is different from the semantic of the interval
    * parameters in some other methods in this class, such as {@link #retrieveUsedSegmentsForInterval} (where the
    * interval is about the time column value in rows belonging to the segment).
@@ -269,7 +257,7 @@ SegmentIdWithShardSpec allocatePendingSegment(
    * <p/>
    * If startMetadata and endMetadata are set, this insertion will be atomic with a compare-and-swap on dataSource
    * commit metadata.
-   *
+   * <p>
    * If segmentsToDrop is not null and not empty, this insertion will be atomic with a insert-and-drop on inserting
    * {@param segments} and dropping {@param segmentsToDrop}.
    *
@@ -426,7 +414,7 @@ List<PendingSegmentRecord> upgradePendingSegmentsOverlappingWith(
    * Similar to {@link #commitSegments}, but meant for streaming ingestion tasks for handling
    * the case where the task ingested no records and created no segments, but still needs to update the metadata
    * with the progress that the task made.
-   *
+   * <p>
    * The metadata should undergo the same validation checks as performed by {@link #commitSegments}.
    *
    *
diff --git a/server/src/main/java/org/apache/druid/indexing/overlord/SegmentCreateRequest.java b/server/src/main/java/org/apache/druid/indexing/overlord/SegmentCreateRequest.java
index 49b31e5e6ff9..bcbf9416fe84 100644
--- a/server/src/main/java/org/apache/druid/indexing/overlord/SegmentCreateRequest.java
+++ b/server/src/main/java/org/apache/druid/indexing/overlord/SegmentCreateRequest.java
@@ -38,7 +38,6 @@ public class SegmentCreateRequest
   private final String sequenceName;
   private final String previousSegmentId;
   private final PartialShardSpec partialShardSpec;
-  private final String upgradedFromSegmentId;
   private final String taskAllocatorId;
 
   public SegmentCreateRequest(
@@ -46,7 +45,6 @@ public SegmentCreateRequest(
       String previousSegmentId,
       String version,
       PartialShardSpec partialShardSpec,
-      String upgradedFromSegmentId,
       String taskAllocatorId
   )
   {
@@ -54,24 +52,31 @@ public SegmentCreateRequest(
     this.previousSegmentId = previousSegmentId == null ? "" : previousSegmentId;
     this.version = version;
     this.partialShardSpec = partialShardSpec;
-    this.upgradedFromSegmentId = upgradedFromSegmentId;
     this.taskAllocatorId = taskAllocatorId;
   }
 
+  /**
+   * Represents group of ingestion tasks that produce a segment series.
+   */
   public String getSequenceName()
   {
     return sequenceName;
   }
 
   /**
-   * Non-null previous segment id. This can be used for persisting to the
-   * pending segments table in the metadata store.
+   * Previous segment id allocated for this sequence.
+   *
+   * @return Empty string if there is no previous segment in the series.
    */
   public String getPreviousSegmentId()
   {
     return previousSegmentId;
   }
 
+  /**
+   * Version of the lock held by the task that has requested the segment allocation.
+   * The allocated segment must have a version less than or equal to this version.
+   */
   public String getVersion()
   {
     return version;
@@ -82,11 +87,6 @@ public PartialShardSpec getPartialShardSpec()
     return partialShardSpec;
   }
 
-  public String getUpgradedFromSegmentId()
-  {
-    return upgradedFromSegmentId;
-  }
-
   public String getTaskAllocatorId()
   {
     return taskAllocatorId;
diff --git a/server/src/main/java/org/apache/druid/metadata/IndexerSQLMetadataStorageCoordinator.java b/server/src/main/java/org/apache/druid/metadata/IndexerSQLMetadataStorageCoordinator.java
index 0717c9b07eea..c85fd1c49608 100644
--- a/server/src/main/java/org/apache/druid/metadata/IndexerSQLMetadataStorageCoordinator.java
+++ b/server/src/main/java/org/apache/druid/metadata/IndexerSQLMetadataStorageCoordinator.java
@@ -80,7 +80,6 @@
 import org.skife.jdbi.v2.TransactionStatus;
 import org.skife.jdbi.v2.Update;
 import org.skife.jdbi.v2.exceptions.CallbackFailedException;
-import org.skife.jdbi.v2.tweak.HandleCallback;
 import org.skife.jdbi.v2.util.ByteArrayMapper;
 
 import javax.annotation.Nullable;
@@ -350,8 +349,7 @@ public int markSegmentsAsUnusedWithinInterval(String dataSource, Interval interv
   /**
    * Fetches all the pending segments, whose interval overlaps with the given search interval, from the metadata store.
    */
-  @VisibleForTesting
-  List<PendingSegmentRecord> getPendingSegmentsForIntervalWithHandle(
+  private List<PendingSegmentRecord> getPendingSegmentsForInterval(
       final Handle handle,
       final String dataSource,
       final Interval interval
@@ -390,7 +388,7 @@ List<PendingSegmentRecord> getPendingSegmentsForIntervalWithHandle(
     return pendingSegments.build();
   }
 
-  List<PendingSegmentRecord> getPendingSegmentsForTaskAllocatorIdWithHandle(
+  private List<PendingSegmentRecord> getPendingSegmentsForTaskAllocatorId(
       final Handle handle,
       final String dataSource,
       final String taskAllocatorId
@@ -580,7 +578,7 @@ public SegmentPublishResult commitReplaceSegments(
                 );
               }
             }
-            SegmentPublishResult result = SegmentPublishResult.ok(
+            return SegmentPublishResult.ok(
                 insertSegments(
                     handle,
                     segmentsToInsert,
@@ -591,7 +589,6 @@ public SegmentPublishResult commitReplaceSegments(
                 ),
                 upgradePendingSegmentsOverlappingWith(segmentsToInsert)
             );
-            return result;
           },
           3,
           getSqlMetadataMaxRetry()
@@ -740,21 +737,16 @@ public Map<SegmentCreateRequest, SegmentIdWithShardSpec> allocatePendingSegments
   }
 
   @Override
+  @Nullable
   public SegmentIdWithShardSpec allocatePendingSegment(
       final String dataSource,
-      final String sequenceName,
-      @Nullable final String previousSegmentId,
       final Interval interval,
-      final PartialShardSpec partialShardSpec,
-      final String maxVersion,
       final boolean skipSegmentLineageCheck,
-      String taskAllocatorId
+      final SegmentCreateRequest createRequest
   )
   {
     Preconditions.checkNotNull(dataSource, "dataSource");
-    Preconditions.checkNotNull(sequenceName, "sequenceName");
     Preconditions.checkNotNull(interval, "interval");
-    Preconditions.checkNotNull(maxVersion, "version");
     final Interval allocateInterval = interval.withChronology(ISOChronology.getInstanceUTC());
 
     return connector.retryWithHandle(
@@ -776,24 +768,17 @@ public SegmentIdWithShardSpec allocatePendingSegment(
             return allocatePendingSegment(
                 handle,
                 dataSource,
-                sequenceName,
                 allocateInterval,
-                partialShardSpec,
-                maxVersion,
-                existingChunks,
-                taskAllocatorId
+                createRequest,
+                existingChunks
             );
           } else {
             return allocatePendingSegmentWithSegmentLineageCheck(
                 handle,
                 dataSource,
-                sequenceName,
-                previousSegmentId,
                 allocateInterval,
-                partialShardSpec,
-                maxVersion,
-                existingChunks,
-                taskAllocatorId
+                createRequest,
+                existingChunks
             );
           }
         }
@@ -854,7 +839,7 @@ private List<PendingSegmentRecord> upgradePendingSegments(
       int currentPartitionNumber = maxSegmentId.getShardSpec().getPartitionNum();
 
       final List<PendingSegmentRecord> overlappingPendingSegments
-          = getPendingSegmentsForIntervalWithHandle(handle, datasource, replaceInterval);
+          = getPendingSegmentsForInterval(handle, datasource, replaceInterval);
 
       for (PendingSegmentRecord overlappingPendingSegment : overlappingPendingSegments) {
         final SegmentIdWithShardSpec pendingSegmentId = overlappingPendingSegment.getId();
@@ -929,17 +914,11 @@ private boolean shouldUpgradePendingSegment(
   private SegmentIdWithShardSpec allocatePendingSegmentWithSegmentLineageCheck(
       final Handle handle,
       final String dataSource,
-      final String sequenceName,
-      @Nullable final String previousSegmentId,
       final Interval interval,
-      final PartialShardSpec partialShardSpec,
-      final String maxVersion,
-      final List<TimelineObjectHolder<String, DataSegment>> existingChunks,
-      final String taskAllocatorId
+      final SegmentCreateRequest createRequest,
+      final List<TimelineObjectHolder<String, DataSegment>> existingChunks
   ) throws IOException
   {
-    final String previousSegmentIdNotNull = previousSegmentId == null ? "" : previousSegmentId;
-
     final String sql = StringUtils.format(
         "SELECT payload FROM %s WHERE "
         + "dataSource = :dataSource AND "
@@ -950,15 +929,15 @@ private SegmentIdWithShardSpec allocatePendingSegmentWithSegmentLineageCheck(
     final Query<Map<String, Object>> query
         = handle.createQuery(sql)
                 .bind("dataSource", dataSource)
-                .bind("sequence_name", sequenceName)
-                .bind("sequence_prev_id", previousSegmentIdNotNull);
+                .bind("sequence_name", createRequest.getSequenceName())
+                .bind("sequence_prev_id", createRequest.getPreviousSegmentId());
 
     final String usedSegmentVersion = existingChunks.isEmpty() ? null : existingChunks.get(0).getVersion();
     final CheckExistingSegmentIdResult result = findExistingPendingSegment(
         query,
         interval,
-        sequenceName,
-        previousSegmentIdNotNull,
+        createRequest.getSequenceName(),
+        createRequest.getPreviousSegmentId(),
         usedSegmentVersion
     );
 
@@ -967,12 +946,12 @@ private SegmentIdWithShardSpec allocatePendingSegmentWithSegmentLineageCheck(
       return result.segmentIdentifier;
     }
 
-    final SegmentIdWithShardSpec newIdentifier = createNewSegment(
+    final SegmentIdWithShardSpec newIdentifier = createNewPendingSegment(
         handle,
         dataSource,
         interval,
-        partialShardSpec,
-        maxVersion,
+        createRequest.getPartialShardSpec(),
+        createRequest.getVersion(),
         existingChunks
     );
     if (newIdentifier == null) {
@@ -989,9 +968,9 @@ private SegmentIdWithShardSpec allocatePendingSegmentWithSegmentLineageCheck(
     final String sequenceNamePrevIdSha1 = BaseEncoding.base16().encode(
         Hashing.sha1()
                .newHasher()
-               .putBytes(StringUtils.toUtf8(sequenceName))
+               .putBytes(StringUtils.toUtf8(createRequest.getSequenceName()))
                .putByte((byte) 0xff)
-               .putBytes(StringUtils.toUtf8(previousSegmentIdNotNull))
+               .putBytes(StringUtils.toUtf8(createRequest.getPreviousSegmentId()))
                .putByte((byte) 0xff)
                .putBytes(StringUtils.toUtf8(newIdentifier.getVersion()))
                .hash()
@@ -1003,10 +982,10 @@ private SegmentIdWithShardSpec allocatePendingSegmentWithSegmentLineageCheck(
         newIdentifier,
         dataSource,
         interval,
-        previousSegmentIdNotNull,
-        sequenceName,
+        createRequest.getPreviousSegmentId(),
+        createRequest.getSequenceName(),
         sequenceNamePrevIdSha1,
-        taskAllocatorId
+        createRequest.getTaskAllocatorId()
     );
     return newIdentifier;
   }
@@ -1108,12 +1087,9 @@ private Map<SegmentCreateRequest, SegmentIdWithShardSpec> allocatePendingSegment
   private SegmentIdWithShardSpec allocatePendingSegment(
       final Handle handle,
       final String dataSource,
-      final String sequenceName,
       final Interval interval,
-      final PartialShardSpec partialShardSpec,
-      final String maxVersion,
-      final List<TimelineObjectHolder<String, DataSegment>> existingChunks,
-      final String taskAllocatorId
+      final SegmentCreateRequest createRequest,
+      final List<TimelineObjectHolder<String, DataSegment>> existingChunks
   ) throws IOException
   {
     final String sql = StringUtils.format(
@@ -1128,14 +1104,14 @@ private SegmentIdWithShardSpec allocatePendingSegment(
     final Query<Map<String, Object>> query
         = handle.createQuery(sql)
                 .bind("dataSource", dataSource)
-                .bind("sequence_name", sequenceName)
+                .bind("sequence_name", createRequest.getSequenceName())
                 .bind("start", interval.getStart().toString())
                 .bind("end", interval.getEnd().toString());
 
     final CheckExistingSegmentIdResult result = findExistingPendingSegment(
         query,
         interval,
-        sequenceName,
+        createRequest.getSequenceName(),
         null,
         existingChunks.isEmpty() ? null : existingChunks.get(0).getVersion()
     );
@@ -1144,12 +1120,12 @@ private SegmentIdWithShardSpec allocatePendingSegment(
       return result.segmentIdentifier;
     }
 
-    final SegmentIdWithShardSpec newIdentifier = createNewSegment(
+    final SegmentIdWithShardSpec newIdentifier = createNewPendingSegment(
         handle,
         dataSource,
         interval,
-        partialShardSpec,
-        maxVersion,
+        createRequest.getPartialShardSpec(),
+        createRequest.getVersion(),
         existingChunks
     );
     if (newIdentifier == null) {
@@ -1166,7 +1142,7 @@ private SegmentIdWithShardSpec allocatePendingSegment(
     final String sequenceNamePrevIdSha1 = BaseEncoding.base16().encode(
         Hashing.sha1()
                .newHasher()
-               .putBytes(StringUtils.toUtf8(sequenceName))
+               .putBytes(StringUtils.toUtf8(createRequest.getSequenceName()))
                .putByte((byte) 0xff)
                .putLong(interval.getStartMillis())
                .putLong(interval.getEndMillis())
@@ -1183,14 +1159,14 @@ private SegmentIdWithShardSpec allocatePendingSegment(
         dataSource,
         interval,
         "",
-        sequenceName,
+        createRequest.getSequenceName(),
         sequenceNamePrevIdSha1,
-        taskAllocatorId
+        createRequest.getTaskAllocatorId()
     );
 
     log.info(
-        "Created new pending segment[%s] for datasource[%s], sequence[%s], interval[%s].",
-        newIdentifier, dataSource, sequenceName, interval
+        "Created new pending segment[%s] for datasource[%s], interval[%s].",
+        newIdentifier, dataSource, interval
     );
 
     return newIdentifier;
@@ -1334,7 +1310,6 @@ private CheckExistingSegmentIdResult findExistingPendingSegment(
   private static class CheckExistingSegmentIdResult
   {
     private final boolean found;
-    @Nullable
     private final SegmentIdWithShardSpec segmentIdentifier;
 
     CheckExistingSegmentIdResult(boolean found, @Nullable SegmentIdWithShardSpec segmentIdentifier)
@@ -1391,21 +1366,6 @@ public int hashCode()
     }
   }
 
-  private static void bindColumnValuesToQueryWithInCondition(
-      final String columnName,
-      final List<String> values,
-      final Update query
-  )
-  {
-    if (values == null) {
-      return;
-    }
-
-    for (int i = 0; i < values.size(); i++) {
-      query.bind(StringUtils.format("%s%d", columnName, i), values.get(i));
-    }
-  }
-
   private int deletePendingSegmentsById(Handle handle, String datasource, List<String> pendingSegmentIds)
   {
     if (pendingSegmentIds.isEmpty()) {
@@ -1419,7 +1379,7 @@ private int deletePendingSegmentsById(Handle handle, String datasource, List<Str
             SqlSegmentsMetadataQuery.getParameterizedInConditionForColumn("id", pendingSegmentIds)
         )
     ).bind("dataSource", datasource);
-    bindColumnValuesToQueryWithInCondition("id", pendingSegmentIds, query);
+    SqlSegmentsMetadataQuery.bindColumnValuesToQueryWithInCondition("id", pendingSegmentIds, query);
 
     return query.execute();
   }
@@ -1442,7 +1402,7 @@ private SegmentPublishResult commitAppendSegmentsAndMetadataInTransaction(
     final String dataSource = appendSegments.iterator().next().getDataSource();
     final List<PendingSegmentRecord> segmentIdsForNewVersions = connector.retryTransaction(
         (handle, transactionStatus)
-            -> getPendingSegmentsForTaskAllocatorIdWithHandle(handle, dataSource, taskAllocatorId),
+            -> getPendingSegmentsForTaskAllocatorId(handle, dataSource, taskAllocatorId),
         0,
         SQLMetadataConnector.DEFAULT_MAX_TRIES
     );
@@ -1668,11 +1628,11 @@ private Map<SegmentCreateRequest, PendingSegmentRecord> createNewSegments(
     // across all shard specs (published + pending).
     // A pending segment having a higher partitionId must also be considered
     // to avoid clashes when inserting the pending segment created here.
-    final Set<SegmentIdWithShardSpec> pendingSegments = new HashSet<>(
-        getPendingSegmentsForIntervalWithHandle(handle, dataSource, interval).stream()
-                                                                             .map(PendingSegmentRecord::getId)
-                                                                             .collect(Collectors.toSet())
-    );
+    final Set<SegmentIdWithShardSpec> pendingSegments =
+        getPendingSegmentsForInterval(handle, dataSource, interval)
+            .stream()
+            .map(PendingSegmentRecord::getId)
+            .collect(Collectors.toSet());
 
     final Map<SegmentCreateRequest, PendingSegmentRecord> createdSegments = new HashMap<>();
     final Map<UniqueAllocateRequest, PendingSegmentRecord> uniqueRequestToSegment = new HashMap<>();
@@ -1686,7 +1646,7 @@ private Map<SegmentCreateRequest, PendingSegmentRecord> createNewSegments(
       if (uniqueRequestToSegment.containsKey(uniqueRequest)) {
         createdSegment = uniqueRequestToSegment.get(uniqueRequest);
       } else {
-        createdSegment = createNewSegment(
+        createdSegment = createNewPendingSegment(
             request,
             dataSource,
             interval,
@@ -1712,7 +1672,8 @@ private Map<SegmentCreateRequest, PendingSegmentRecord> createNewSegments(
     return createdSegments;
   }
 
-  private PendingSegmentRecord createNewSegment(
+  @Nullable
+  private PendingSegmentRecord createNewPendingSegment(
       SegmentCreateRequest request,
       String dataSource,
       Interval interval,
@@ -1775,17 +1736,14 @@ private PendingSegmentRecord createNewSegment(
           pendingSegmentId,
           request.getSequenceName(),
           request.getPreviousSegmentId(),
-          request.getUpgradedFromSegmentId(),
+          null,
           request.getTaskAllocatorId()
       );
 
     } else if (!overallMaxId.getInterval().equals(interval)) {
       log.warn(
           "Cannot allocate new segment for dataSource[%s], interval[%s], existingVersion[%s]: conflicting segment[%s].",
-          dataSource,
-          interval,
-          existingVersion,
-          overallMaxId
+          dataSource, interval, existingVersion, overallMaxId
       );
       return null;
     } else if (committedMaxId != null
@@ -1793,8 +1751,7 @@ private PendingSegmentRecord createNewSegment(
                   == SingleDimensionShardSpec.UNKNOWN_NUM_CORE_PARTITIONS) {
       log.warn(
           "Cannot allocate new segment because of unknown core partition size of segment[%s], shardSpec[%s]",
-          committedMaxId,
-          committedMaxId.getShardSpec()
+          committedMaxId, committedMaxId.getShardSpec()
       );
       return null;
     } else {
@@ -1815,28 +1772,20 @@ private PendingSegmentRecord createNewSegment(
           getTrueAllocatedId(pendingSegmentId),
           request.getSequenceName(),
           request.getPreviousSegmentId(),
-          request.getUpgradedFromSegmentId(),
+          null,
           request.getTaskAllocatorId()
       );
     }
   }
 
   /**
-   * This function creates a new segment for the given datasource/interval/etc. A critical
-   * aspect of the creation is to make sure that the new version & new partition number will make
-   * sense given the existing segments & pending segments also very important is to avoid
-   * clashes with existing pending & used/unused segments.
-   * @param handle Database handle
-   * @param dataSource datasource for the new segment
-   * @param interval interval for the new segment
+   * Creates a new pending segment for the given datasource and interval.
    * @param partialShardSpec Shard spec info minus segment id stuff
    * @param existingVersion Version of segments in interval, used to compute the version of the very first segment in
    *                        interval
-   * @return
-   * @throws IOException
    */
   @Nullable
-  private SegmentIdWithShardSpec createNewSegment(
+  private SegmentIdWithShardSpec createNewPendingSegment(
       final Handle handle,
       final String dataSource,
       final Interval interval,
@@ -1876,11 +1825,12 @@ private SegmentIdWithShardSpec createNewSegment(
     // across all shard specs (published + pending).
     // A pending segment having a higher partitionId must also be considered
     // to avoid clashes when inserting the pending segment created here.
-    final Set<SegmentIdWithShardSpec> pendings = new HashSet<>(
-        getPendingSegmentsForIntervalWithHandle(handle, dataSource, interval).stream()
-                                                                             .map(PendingSegmentRecord::getId)
-                                                                             .collect(Collectors.toSet())
-    );
+    final Set<SegmentIdWithShardSpec> pendings =
+        getPendingSegmentsForInterval(handle, dataSource, interval)
+            .stream()
+            .map(PendingSegmentRecord::getId)
+            .collect(Collectors.toSet());
+
     if (committedMaxId != null) {
       pendings.add(committedMaxId);
     }
@@ -1910,11 +1860,9 @@ private SegmentIdWithShardSpec createNewSegment(
     }
 
     if (overallMaxId == null) {
-      // When appending segments, null overallMaxId means that we are allocating the very initial
-      // segment for this time chunk.
-      // This code is executed when the Overlord coordinates segment allocation, which is either you append segments
-      // or you use segment lock. Since the core partitions set is not determined for appended segments, we set
-      // it 0. When you use segment lock, the core partitions set doesn't work with it. We simply set it 0 so that the
+      // We are allocating the very first segment for this time chunk.
+      // Set numCorePartitions to 0 as core partitions are not determined for append segments
+      // When you use segment lock, the core partitions set doesn't work with it. We simply set it 0 so that the
       // OvershadowableManager handles the atomic segment update.
       final int newPartitionId = partialShardSpec.useNonRootGenerationPartitionSpace()
                                  ? PartitionIds.NON_ROOT_GEN_START_PARTITION_ID
@@ -1929,10 +1877,7 @@ private SegmentIdWithShardSpec createNewSegment(
     } else if (!overallMaxId.getInterval().equals(interval)) {
       log.warn(
           "Cannot allocate new segment for dataSource[%s], interval[%s], existingVersion[%s]: conflicting segment[%s].",
-          dataSource,
-          interval,
-          existingVersion,
-          overallMaxId
+          dataSource, interval, existingVersion, overallMaxId
       );
       return null;
     } else if (committedMaxId != null
@@ -1940,14 +1885,12 @@ private SegmentIdWithShardSpec createNewSegment(
                   == SingleDimensionShardSpec.UNKNOWN_NUM_CORE_PARTITIONS) {
       log.warn(
           "Cannot allocate new segment because of unknown core partition size of segment[%s], shardSpec[%s]",
-          committedMaxId,
-          committedMaxId.getShardSpec()
+          committedMaxId, committedMaxId.getShardSpec()
       );
       return null;
     } else {
-      // The number of core partitions must always be chosen from the set of used segments in the SegmentTimeline.
-      // When the core partitions have been dropped, using pending segments may lead to an incorrect state
-      // where the chunk is believed to have core partitions and queries results are incorrect.
+      // numCorePartitions must always be picked from the committedMaxId and not overallMaxId
+      // as overallMaxId may refer to a pending segment which might have stale info of numCorePartitions
       final SegmentIdWithShardSpec allocatedId = new SegmentIdWithShardSpec(
           dataSource,
           interval,
@@ -1963,7 +1906,7 @@ private SegmentIdWithShardSpec createNewSegment(
   }
 
   /**
-   * Verifies that the allocated id doesn't already exist in the druid segments table.
+   * Verifies that the allocated id doesn't already exist in the druid_segments table.
    * If yes, try to get the max unallocated id considering the unused segments for the datasource, version and interval
    * Otherwise, use the same id.
    * @param allocatedId The segment allcoted on the basis of used and pending segments
@@ -1977,7 +1920,7 @@ private SegmentIdWithShardSpec getTrueAllocatedId(SegmentIdWithShardSpec allocat
     }
 
     // If yes, try to compute allocated partition num using the max unused segment shard spec
-    SegmentId unusedMaxId = getUnusedMaxId(
+    SegmentId unusedMaxId = getMaxIdOfUnusedSegment(
         allocatedId.getDataSource(),
         allocatedId.getInterval(),
         allocatedId.getVersion()
@@ -2002,7 +1945,14 @@ private SegmentIdWithShardSpec getTrueAllocatedId(SegmentIdWithShardSpec allocat
     );
   }
 
-  private SegmentId getUnusedMaxId(String datasource, Interval interval, String version)
+  /**
+   * Determines the highest ID amongst unused segments for the given datasource,
+   * interval and version.
+   *
+   * @return null if no unused segment exists for the given parameters.
+   */
+  @Nullable
+  private SegmentId getMaxIdOfUnusedSegment(String datasource, Interval interval, String version)
   {
     List<String> unusedSegmentIds = retrieveUnusedSegmentIdsForExactIntervalAndVersion(
         datasource,
@@ -2134,7 +2084,7 @@ private Set<DataSegment> announceHistoricalSegmentBatch(
               .bind("created_date", now)
               .bind("start", segment.getInterval().getStart().toString())
               .bind("end", segment.getInterval().getEnd().toString())
-              .bind("partitioned", (segment.getShardSpec() instanceof NoneShardSpec) ? false : true)
+              .bind("partitioned", !(segment.getShardSpec() instanceof NoneShardSpec))
               .bind("version", segment.getVersion())
               .bind("used", usedSegments.contains(segment))
               .bind("payload", jsonMapper.writeValueAsBytes(segment))
@@ -2330,9 +2280,7 @@ private Set<DataSegment> insertSegments(
       Map<String, String> upgradedFromSegmentIdMap
   ) throws IOException
   {
-    boolean shouldPersistSchema = shouldPersistSchema(segmentSchemaMapping);
-
-    if (shouldPersistSchema) {
+    if (shouldPersistSchema(segmentSchemaMapping)) {
       persistSchema(handle, segments, segmentSchemaMapping);
     }
 
@@ -2407,6 +2355,7 @@ private Set<DataSegment> insertSegments(
     return segmentsToInsert;
   }
 
+  @Nullable
   private SegmentMetadata getSegmentMetadataFromSchemaMappingOrUpgradeMetadata(
       final SegmentId segmentId,
       final SegmentSchemaMapping segmentSchemaMapping,
@@ -2786,27 +2735,18 @@ public boolean resetDataSourceMetadata(final String dataSource, final DataSource
         Hashing.sha1().hashBytes(newCommitMetadataBytes).asBytes()
     );
 
+    final String sql = "UPDATE %s SET "
+                       + "commit_metadata_payload = :new_commit_metadata_payload, "
+                       + "commit_metadata_sha1 = :new_commit_metadata_sha1 "
+                       + "WHERE dataSource = :dataSource";
     return connector.retryWithHandle(
-        new HandleCallback<Boolean>()
-        {
-          @Override
-          public Boolean withHandle(Handle handle)
-          {
-            final int numRows = handle.createStatement(
-                StringUtils.format(
-                    "UPDATE %s SET "
-                    + "commit_metadata_payload = :new_commit_metadata_payload, "
-                    + "commit_metadata_sha1 = :new_commit_metadata_sha1 "
-                    + "WHERE dataSource = :dataSource",
-                    dbTables.getDataSourceTable()
-                )
-            )
-                                      .bind("dataSource", dataSource)
-                                      .bind("new_commit_metadata_payload", newCommitMetadataBytes)
-                                      .bind("new_commit_metadata_sha1", newCommitMetadataSha1)
-                                      .execute();
-            return numRows == 1;
-          }
+        handle -> {
+          final int numRows = handle.createStatement(StringUtils.format(sql, dbTables.getDataSourceTable()))
+                                    .bind("dataSource", dataSource)
+                                    .bind("new_commit_metadata_payload", newCommitMetadataBytes)
+                                    .bind("new_commit_metadata_sha1", newCommitMetadataSha1)
+                                    .execute();
+          return numRows == 1;
         }
     );
   }
@@ -3028,7 +2968,7 @@ public int deletePendingSegmentsForTaskAllocatorId(final String datasource, fina
   public List<PendingSegmentRecord> getPendingSegments(String datasource, Interval interval)
   {
     return connector.retryWithHandle(
-        handle -> getPendingSegmentsForIntervalWithHandle(handle, datasource, interval)
+        handle -> getPendingSegmentsForInterval(handle, datasource, interval)
     );
   }
 
@@ -3178,7 +3118,6 @@ public static class DataStoreMetadataUpdateResult
   {
     private final boolean failed;
     private final boolean canRetry;
-    @Nullable
     private final String errorMsg;
 
     public static final DataStoreMetadataUpdateResult SUCCESS = new DataStoreMetadataUpdateResult(false, false, null);
@@ -3198,7 +3137,6 @@ public static DataStoreMetadataUpdateResult retryableFailure(String errorMsgForm
       this.failed = failed;
       this.canRetry = canRetry;
       this.errorMsg = null == errorMsg ? null : StringUtils.format(errorMsg, errorFormatArgs);
-
     }
 
     public boolean isFailed()
diff --git a/server/src/test/java/org/apache/druid/indexing/overlord/SegmentCreateRequestTest.java b/server/src/test/java/org/apache/druid/indexing/overlord/SegmentCreateRequestTest.java
index 57e01d76a446..567867bd97e3 100644
--- a/server/src/test/java/org/apache/druid/indexing/overlord/SegmentCreateRequestTest.java
+++ b/server/src/test/java/org/apache/druid/indexing/overlord/SegmentCreateRequestTest.java
@@ -36,7 +36,6 @@ public void testNullPreviousSegmentId()
         null,
         "version",
         partialShardSpec,
-        null,
         null
     );
     Assert.assertEquals("sequence", request.getSequenceName());
diff --git a/server/src/test/java/org/apache/druid/metadata/IndexerSQLMetadataStorageCoordinatorTest.java b/server/src/test/java/org/apache/druid/metadata/IndexerSQLMetadataStorageCoordinatorTest.java
index a000fbec5a3e..06bbf3b7ecd8 100644
--- a/server/src/test/java/org/apache/druid/metadata/IndexerSQLMetadataStorageCoordinatorTest.java
+++ b/server/src/test/java/org/apache/druid/metadata/IndexerSQLMetadataStorageCoordinatorTest.java
@@ -2280,7 +2280,7 @@ public void testAllocatePendingSegment()
     final PartialShardSpec partialShardSpec = NumberedPartialShardSpec.instance();
     final String dataSource = "ds";
     final Interval interval = Intervals.of("2017-01-01/2017-02-01");
-    final SegmentIdWithShardSpec identifier = coordinator.allocatePendingSegment(
+    final SegmentIdWithShardSpec identifier = allocatePendingSegment(
         dataSource,
         "seq",
         null,
@@ -2293,7 +2293,7 @@ public void testAllocatePendingSegment()
 
     Assert.assertEquals("ds_2017-01-01T00:00:00.000Z_2017-02-01T00:00:00.000Z_version", identifier.toString());
 
-    final SegmentIdWithShardSpec identifier1 = coordinator.allocatePendingSegment(
+    final SegmentIdWithShardSpec identifier1 = allocatePendingSegment(
         dataSource,
         "seq",
         identifier.toString(),
@@ -2306,7 +2306,7 @@ public void testAllocatePendingSegment()
 
     Assert.assertEquals("ds_2017-01-01T00:00:00.000Z_2017-02-01T00:00:00.000Z_version_1", identifier1.toString());
 
-    final SegmentIdWithShardSpec identifier2 = coordinator.allocatePendingSegment(
+    final SegmentIdWithShardSpec identifier2 = allocatePendingSegment(
         dataSource,
         "seq",
         identifier1.toString(),
@@ -2319,7 +2319,7 @@ public void testAllocatePendingSegment()
 
     Assert.assertEquals("ds_2017-01-01T00:00:00.000Z_2017-02-01T00:00:00.000Z_version_2", identifier2.toString());
 
-    final SegmentIdWithShardSpec identifier3 = coordinator.allocatePendingSegment(
+    final SegmentIdWithShardSpec identifier3 = allocatePendingSegment(
         dataSource,
         "seq",
         identifier1.toString(),
@@ -2333,7 +2333,7 @@ public void testAllocatePendingSegment()
     Assert.assertEquals("ds_2017-01-01T00:00:00.000Z_2017-02-01T00:00:00.000Z_version_2", identifier3.toString());
     Assert.assertEquals(identifier2, identifier3);
 
-    final SegmentIdWithShardSpec identifier4 = coordinator.allocatePendingSegment(
+    final SegmentIdWithShardSpec identifier4 = allocatePendingSegment(
         dataSource,
         "seq1",
         null,
@@ -2370,7 +2370,7 @@ public void testAllocatePendingSegmentAfterDroppingExistingSegment()
     final PartialShardSpec partialShardSpec = NumberedPartialShardSpec.instance();
     final String dataSource = "ds";
     final Interval interval = Intervals.of("2017-01-01/2017-02-01");
-    final SegmentIdWithShardSpec identifier = coordinator.allocatePendingSegment(
+    final SegmentIdWithShardSpec identifier = allocatePendingSegment(
         dataSource,
         "seq",
         null,
@@ -2385,7 +2385,7 @@ public void testAllocatePendingSegmentAfterDroppingExistingSegment()
     Assert.assertEquals(0, identifier.getShardSpec().getNumCorePartitions());
 
     // simulate one more load using kafka streaming (as if previous segment was published, note different sequence name)
-    final SegmentIdWithShardSpec identifier1 = coordinator.allocatePendingSegment(
+    final SegmentIdWithShardSpec identifier1 = allocatePendingSegment(
         dataSource,
         "seq2",
         identifier.toString(),
@@ -2400,7 +2400,7 @@ public void testAllocatePendingSegmentAfterDroppingExistingSegment()
     Assert.assertEquals(0, identifier1.getShardSpec().getNumCorePartitions());
 
     // simulate one more load using kafka streaming (as if previous segment was published, note different sequence name)
-    final SegmentIdWithShardSpec identifier2 = coordinator.allocatePendingSegment(
+    final SegmentIdWithShardSpec identifier2 = allocatePendingSegment(
         dataSource,
         "seq3",
         identifier1.toString(),
@@ -2431,7 +2431,7 @@ public void testAllocatePendingSegmentAfterDroppingExistingSegment()
     Assert.assertEquals("ds_2017-01-01T00:00:00.000Z_2017-02-01T00:00:00.000Z_version_new", ids.get(0));
 
     // one more load on same interval:
-    final SegmentIdWithShardSpec identifier3 = coordinator.allocatePendingSegment(
+    final SegmentIdWithShardSpec identifier3 = allocatePendingSegment(
         dataSource,
         "seq4",
         identifier1.toString(),
@@ -2450,7 +2450,7 @@ public void testAllocatePendingSegmentAfterDroppingExistingSegment()
 
     // and final load, this reproduces an issue that could happen with multiple streaming appends,
     // followed by a reindex, followed by a drop, and more streaming data coming in for same interval
-    final SegmentIdWithShardSpec identifier4 = coordinator.allocatePendingSegment(
+    final SegmentIdWithShardSpec identifier4 = allocatePendingSegment(
         dataSource,
         "seq5",
         identifier1.toString(),
@@ -2484,7 +2484,7 @@ public void testAnotherAllocatePendingSegmentAfterRevertingCompaction()
     final PartialShardSpec partialShardSpec = NumberedPartialShardSpec.instance();
     final String dataSource = "ds";
     final Interval interval = Intervals.of("2017-01-01/2017-02-01");
-    final SegmentIdWithShardSpec identifier = coordinator.allocatePendingSegment(
+    final SegmentIdWithShardSpec identifier = allocatePendingSegment(
         dataSource,
         "seq",
         null,
@@ -2513,7 +2513,7 @@ public void testAnotherAllocatePendingSegmentAfterRevertingCompaction()
 
 
     // 1.1) simulate one more append load  (as if previous segment was published, note different sequence name)
-    final SegmentIdWithShardSpec identifier1 = coordinator.allocatePendingSegment(
+    final SegmentIdWithShardSpec identifier1 = allocatePendingSegment(
         dataSource,
         "seq2",
         identifier.toString(),
@@ -2542,7 +2542,7 @@ public void testAnotherAllocatePendingSegmentAfterRevertingCompaction()
 
 
     // 1.2) simulate one more append load  (as if previous segment was published, note different sequence name)
-    final SegmentIdWithShardSpec identifier2 = coordinator.allocatePendingSegment(
+    final SegmentIdWithShardSpec identifier2 = allocatePendingSegment(
         dataSource,
         "seq3",
         identifier1.toString(),
@@ -2597,7 +2597,7 @@ public void testAnotherAllocatePendingSegmentAfterRevertingCompaction()
     // unused segment:
 
     // 4) pending segment of version = B, id = 1 <= appending new data, aborted
-    final SegmentIdWithShardSpec identifier3 = coordinator.allocatePendingSegment(
+    final SegmentIdWithShardSpec identifier3 = allocatePendingSegment(
         dataSource,
         "seq4",
         identifier2.toString(),
@@ -2632,7 +2632,7 @@ public void testAnotherAllocatePendingSegmentAfterRevertingCompaction()
     Assert.assertEquals(1, unused.size());
 
     // Simulate one more append load
-    final SegmentIdWithShardSpec identifier4 = coordinator.allocatePendingSegment(
+    final SegmentIdWithShardSpec identifier4 = allocatePendingSegment(
         dataSource,
         "seq5",
         identifier1.toString(),
@@ -2678,7 +2678,7 @@ public void testAllocatePendingSegmentsSkipSegmentPayloadFetch()
     final Interval interval = Intervals.of("2017-01-01/2017-02-01");
     final String sequenceName = "seq";
 
-    final SegmentCreateRequest request = new SegmentCreateRequest(sequenceName, null, "v1", partialShardSpec, null, null);
+    final SegmentCreateRequest request = new SegmentCreateRequest(sequenceName, null, "v1", partialShardSpec, null);
     final SegmentIdWithShardSpec segmentId0 = coordinator.allocatePendingSegments(
         dataSource,
         interval,
@@ -2690,7 +2690,7 @@ public void testAllocatePendingSegmentsSkipSegmentPayloadFetch()
     Assert.assertEquals("ds_2017-01-01T00:00:00.000Z_2017-02-01T00:00:00.000Z_v1", segmentId0.toString());
 
     final SegmentCreateRequest request1 =
-        new SegmentCreateRequest(sequenceName, segmentId0.toString(), segmentId0.getVersion(), partialShardSpec, null, null);
+        new SegmentCreateRequest(sequenceName, segmentId0.toString(), segmentId0.getVersion(), partialShardSpec, null);
     final SegmentIdWithShardSpec segmentId1 = coordinator.allocatePendingSegments(
         dataSource,
         interval,
@@ -2702,7 +2702,7 @@ public void testAllocatePendingSegmentsSkipSegmentPayloadFetch()
     Assert.assertEquals("ds_2017-01-01T00:00:00.000Z_2017-02-01T00:00:00.000Z_v1_1", segmentId1.toString());
 
     final SegmentCreateRequest request2 =
-        new SegmentCreateRequest(sequenceName, segmentId1.toString(), segmentId1.getVersion(), partialShardSpec, null, null);
+        new SegmentCreateRequest(sequenceName, segmentId1.toString(), segmentId1.getVersion(), partialShardSpec, null);
     final SegmentIdWithShardSpec segmentId2 = coordinator.allocatePendingSegments(
         dataSource,
         interval,
@@ -2714,7 +2714,7 @@ public void testAllocatePendingSegmentsSkipSegmentPayloadFetch()
     Assert.assertEquals("ds_2017-01-01T00:00:00.000Z_2017-02-01T00:00:00.000Z_v1_2", segmentId2.toString());
 
     final SegmentCreateRequest request3 =
-        new SegmentCreateRequest(sequenceName, segmentId1.toString(), segmentId1.getVersion(), partialShardSpec, null, null);
+        new SegmentCreateRequest(sequenceName, segmentId1.toString(), segmentId1.getVersion(), partialShardSpec, null);
     final SegmentIdWithShardSpec segmentId3 = coordinator.allocatePendingSegments(
         dataSource,
         interval,
@@ -2727,7 +2727,7 @@ public void testAllocatePendingSegmentsSkipSegmentPayloadFetch()
     Assert.assertEquals(segmentId2, segmentId3);
 
     final SegmentCreateRequest request4 =
-        new SegmentCreateRequest("seq1", null, "v1", partialShardSpec, null, null);
+        new SegmentCreateRequest("seq1", null, "v1", partialShardSpec, null);
     final SegmentIdWithShardSpec segmentId4 = coordinator.allocatePendingSegments(
         dataSource,
         interval,
@@ -2747,7 +2747,7 @@ public void testAllocatePendingSegments()
     final Interval interval = Intervals.of("2017-01-01/2017-02-01");
     final String sequenceName = "seq";
 
-    final SegmentCreateRequest request = new SegmentCreateRequest(sequenceName, null, "v1", partialShardSpec, null, null);
+    final SegmentCreateRequest request = new SegmentCreateRequest(sequenceName, null, "v1", partialShardSpec, null);
     final SegmentIdWithShardSpec segmentId0 = coordinator.allocatePendingSegments(
         dataSource,
         interval,
@@ -2759,7 +2759,7 @@ public void testAllocatePendingSegments()
     Assert.assertEquals("ds_2017-01-01T00:00:00.000Z_2017-02-01T00:00:00.000Z_v1", segmentId0.toString());
 
     final SegmentCreateRequest request1 =
-        new SegmentCreateRequest(sequenceName, segmentId0.toString(), segmentId0.getVersion(), partialShardSpec, null, null);
+        new SegmentCreateRequest(sequenceName, segmentId0.toString(), segmentId0.getVersion(), partialShardSpec, null);
     final SegmentIdWithShardSpec segmentId1 = coordinator.allocatePendingSegments(
         dataSource,
         interval,
@@ -2771,7 +2771,7 @@ public void testAllocatePendingSegments()
     Assert.assertEquals("ds_2017-01-01T00:00:00.000Z_2017-02-01T00:00:00.000Z_v1_1", segmentId1.toString());
 
     final SegmentCreateRequest request2 =
-        new SegmentCreateRequest(sequenceName, segmentId1.toString(), segmentId1.getVersion(), partialShardSpec, null, null);
+        new SegmentCreateRequest(sequenceName, segmentId1.toString(), segmentId1.getVersion(), partialShardSpec, null);
     final SegmentIdWithShardSpec segmentId2 = coordinator.allocatePendingSegments(
         dataSource,
         interval,
@@ -2783,7 +2783,7 @@ public void testAllocatePendingSegments()
     Assert.assertEquals("ds_2017-01-01T00:00:00.000Z_2017-02-01T00:00:00.000Z_v1_2", segmentId2.toString());
 
     final SegmentCreateRequest request3 =
-        new SegmentCreateRequest(sequenceName, segmentId1.toString(), segmentId1.getVersion(), partialShardSpec, null, null);
+        new SegmentCreateRequest(sequenceName, segmentId1.toString(), segmentId1.getVersion(), partialShardSpec, null);
     final SegmentIdWithShardSpec segmentId3 = coordinator.allocatePendingSegments(
         dataSource,
         interval,
@@ -2796,7 +2796,7 @@ public void testAllocatePendingSegments()
     Assert.assertEquals(segmentId2, segmentId3);
 
     final SegmentCreateRequest request4 =
-        new SegmentCreateRequest("seq1", null, "v1", partialShardSpec, null, null);
+        new SegmentCreateRequest("seq1", null, "v1", partialShardSpec, null);
     final SegmentIdWithShardSpec segmentId4 = coordinator.allocatePendingSegments(
         dataSource,
         interval,
@@ -2833,7 +2833,7 @@ public void testNoPendingSegmentsAndOneUsedSegment()
     final PartialShardSpec partialShardSpec = NumberedPartialShardSpec.instance();
     final String dataSource = "ds";
     final Interval interval = Intervals.of("2017-01-01/2017-02-01");
-    final SegmentIdWithShardSpec identifier = coordinator.allocatePendingSegment(
+    final SegmentIdWithShardSpec identifier = allocatePendingSegment(
         dataSource,
         "seq",
         null,
@@ -2857,7 +2857,7 @@ public void testDeletePendingSegment() throws InterruptedException
     final DateTime begin = DateTimes.nowUtc();
 
     for (int i = 0; i < 10; i++) {
-      final SegmentIdWithShardSpec identifier = coordinator.allocatePendingSegment(
+      final SegmentIdWithShardSpec identifier = allocatePendingSegment(
           dataSource,
           "seq",
           prevSegmentId,
@@ -2873,7 +2873,7 @@ public void testDeletePendingSegment() throws InterruptedException
 
     final DateTime secondBegin = DateTimes.nowUtc();
     for (int i = 0; i < 5; i++) {
-      final SegmentIdWithShardSpec identifier = coordinator.allocatePendingSegment(
+      final SegmentIdWithShardSpec identifier = allocatePendingSegment(
           dataSource,
           "seq",
           prevSegmentId,
@@ -2901,7 +2901,7 @@ public void testAllocatePendingSegmentsWithOvershadowingSegments()
     String prevSegmentId = null;
 
     for (int i = 0; i < 10; i++) {
-      final SegmentIdWithShardSpec identifier = coordinator.allocatePendingSegment(
+      final SegmentIdWithShardSpec identifier = allocatePendingSegment(
           dataSource,
           "seq",
           prevSegmentId,
@@ -2970,7 +2970,7 @@ public void testAllocatePendingSegmentsForHashBasedNumberedShardSpec()
     final String dataSource = "ds";
     final Interval interval = Intervals.of("2017-01-01/2017-02-01");
 
-    SegmentIdWithShardSpec id = coordinator.allocatePendingSegment(
+    SegmentIdWithShardSpec id = allocatePendingSegment(
         dataSource,
         "seq",
         null,
@@ -3003,7 +3003,7 @@ public void testAllocatePendingSegmentsForHashBasedNumberedShardSpec()
         new SegmentSchemaMapping(CentralizedDatasourceSchemaConfig.SCHEMA_VERSION)
     );
 
-    id = coordinator.allocatePendingSegment(
+    id = allocatePendingSegment(
         dataSource,
         "seq2",
         null,
@@ -3036,7 +3036,7 @@ public void testAllocatePendingSegmentsForHashBasedNumberedShardSpec()
         new SegmentSchemaMapping(CentralizedDatasourceSchemaConfig.SCHEMA_VERSION)
     );
 
-    id = coordinator.allocatePendingSegment(
+    id = allocatePendingSegment(
         dataSource,
         "seq3",
         null,
@@ -3084,7 +3084,7 @@ public void testAddNumberedShardSpecAfterMultiDimensionsShardSpecWithUnknownCore
       );
     }
     coordinator.commitSegments(originalSegments, new SegmentSchemaMapping(CentralizedDatasourceSchemaConfig.SCHEMA_VERSION));
-    final SegmentIdWithShardSpec id = coordinator.allocatePendingSegment(
+    final SegmentIdWithShardSpec id = allocatePendingSegment(
         datasource,
         "seq",
         null,
@@ -3130,7 +3130,7 @@ public void testAddNumberedShardSpecAfterSingleDimensionsShardSpecWithUnknownCor
       );
     }
     coordinator.commitSegments(originalSegments, new SegmentSchemaMapping(CentralizedDatasourceSchemaConfig.SCHEMA_VERSION));
-    final SegmentIdWithShardSpec id = coordinator.allocatePendingSegment(
+    final SegmentIdWithShardSpec id = allocatePendingSegment(
         datasource,
         "seq",
         null,
@@ -3377,7 +3377,7 @@ public void testTimelineVisibilityWith0CorePartitionTombstone()
     Assert.assertTrue(coordinator.commitSegments(tombstones, new SegmentSchemaMapping(CentralizedDatasourceSchemaConfig.SCHEMA_VERSION)).containsAll(tombstones));
 
     // Allocate and commit a data segment by appending to the same interval
-    final SegmentIdWithShardSpec identifier = coordinator.allocatePendingSegment(
+    final SegmentIdWithShardSpec identifier = allocatePendingSegment(
         TestDataSource.WIKI,
         "seq",
         tombstoneSegment.getVersion(),
@@ -3432,7 +3432,7 @@ public void testTimelineWith1CorePartitionTombstone()
     Assert.assertTrue(coordinator.commitSegments(tombstones, new SegmentSchemaMapping(CentralizedDatasourceSchemaConfig.SCHEMA_VERSION)).containsAll(tombstones));
 
     // Allocate and commit a data segment by appending to the same interval
-    final SegmentIdWithShardSpec identifier = coordinator.allocatePendingSegment(
+    final SegmentIdWithShardSpec identifier = allocatePendingSegment(
         TestDataSource.WIKI,
         "seq",
         tombstoneSegment.getVersion(),
@@ -3471,7 +3471,7 @@ public void testTimelineWith1CorePartitionTombstone()
   @Test
   public void testSegmentIdShouldNotBeReallocated()
   {
-    final SegmentIdWithShardSpec idWithNullTaskAllocator = coordinator.allocatePendingSegment(
+    final SegmentIdWithShardSpec idWithNullTaskAllocator = allocatePendingSegment(
         TestDataSource.WIKI,
         "seq",
         "0",
@@ -3487,7 +3487,7 @@ public void testSegmentIdShouldNotBeReallocated()
         idWithNullTaskAllocator.getShardSpec()
     );
 
-    final SegmentIdWithShardSpec idWithValidTaskAllocator = coordinator.allocatePendingSegment(
+    final SegmentIdWithShardSpec idWithValidTaskAllocator = allocatePendingSegment(
         TestDataSource.WIKI,
         "seq",
         "1",
@@ -3510,7 +3510,7 @@ public void testSegmentIdShouldNotBeReallocated()
     // Mark all segments as unused
     coordinator.markSegmentsAsUnusedWithinInterval(TestDataSource.WIKI, Intervals.ETERNITY);
 
-    final SegmentIdWithShardSpec theId = coordinator.allocatePendingSegment(
+    final SegmentIdWithShardSpec theId = allocatePendingSegment(
         TestDataSource.WIKI,
         "seq",
         "2",
@@ -3791,6 +3791,30 @@ public void testRetrieveUsedSegmentsForSegmentAllocation()
     );
   }
 
+  private SegmentIdWithShardSpec allocatePendingSegment(
+      String datasource,
+      String sequenceName,
+      String previousSegmentId,
+      Interval interval,
+      PartialShardSpec partialShardSpec,
+      String maxVersion,
+      boolean skipSegmentLineageCheck,
+      String taskAllocatorId
+  )
+  {
+    return coordinator.allocatePendingSegment(
+        datasource,
+        interval,
+        skipSegmentLineageCheck,
+        new SegmentCreateRequest(
+            sequenceName,
+            previousSegmentId,
+            maxVersion,
+            partialShardSpec,
+            taskAllocatorId
+        )
+    );
+  }
 
   private void insertUsedSegments(Set<DataSegment> segments, Map<String, String> upgradedFromSegmentIdMap)
   {

From a26e4c0e06107f290e573f51ef46f374cea8f826 Mon Sep 17 00:00:00 2001
From: Akshat Jain <akjn11@gmail.com>
Date: Fri, 13 Dec 2024 19:54:21 +0530
Subject: [PATCH 32/56] Cleanup unreachable Java 8 code flows (#17559)

---
 .../indexing/common/task/HadoopTask.java      | 11 +--
 .../indexing/overlord/ForkingTaskRunner.java  |  4 +-
 .../indexing/common/task/HadoopTaskTest.java  | 10 +-
 pom.xml                                       |  3 +
 .../java/util/common/ByteBufferUtils.java     | 59 ++---------
 .../druid/java/util/common/Cleaners.java      | 23 +----
 .../java/util/common/DefineClassUtils.java    | 99 +------------------
 .../java/org/apache/druid/utils/JvmUtils.java |  5 -
 .../org/apache/druid/utils/RuntimeInfo.java   |  2 +-
 9 files changed, 18 insertions(+), 198 deletions(-)

diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/common/task/HadoopTask.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/HadoopTask.java
index 201024540e16..a15b77b90d18 100644
--- a/indexing-service/src/main/java/org/apache/druid/indexing/common/task/HadoopTask.java
+++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/HadoopTask.java
@@ -173,16 +173,7 @@ public static ClassLoader buildClassLoader(final List<String> hadoopDependencyCo
       localClassLoaderURLs.addAll(Arrays.asList(hadoopLoader.getURLs()));
     }
 
-    ClassLoader parent = null;
-    if (JvmUtils.isIsJava9Compatible()) {
-      try {
-        // See also https://docs.oracle.com/en/java/javase/11/migrate/index.html#JSMIG-GUID-A868D0B9-026F-4D46-B979-901834343F9E
-        parent = (ClassLoader) ClassLoader.class.getMethod("getPlatformClassLoader").invoke(null);
-      }
-      catch (IllegalAccessException | InvocationTargetException | NoSuchMethodException e) {
-        throw new RuntimeException(e);
-      }
-    }
+    ClassLoader parent = ClassLoader.getPlatformClassLoader();
     final ClassLoader classLoader = new URLClassLoader(
         localClassLoaderURLs.toArray(new URL[0]),
         parent
diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/overlord/ForkingTaskRunner.java b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/ForkingTaskRunner.java
index 7e4dd6c39c22..1a34c76e33fb 100644
--- a/indexing-service/src/main/java/org/apache/druid/indexing/overlord/ForkingTaskRunner.java
+++ b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/ForkingTaskRunner.java
@@ -244,9 +244,7 @@ public TaskStatus call()
 
                         command.add(config.getJavaCommand());
 
-                        if (JvmUtils.majorVersion() >= 11) {
-                          command.addAll(STRONG_ENCAPSULATION_PROPERTIES);
-                        }
+                        command.addAll(STRONG_ENCAPSULATION_PROPERTIES);
 
                         command.add("-cp");
                         command.add(taskClasspath);
diff --git a/indexing-service/src/test/java/org/apache/druid/indexing/common/task/HadoopTaskTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/HadoopTaskTest.java
index 130258e85d4c..741208dd0db4 100644
--- a/indexing-service/src/test/java/org/apache/druid/indexing/common/task/HadoopTaskTest.java
+++ b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/HadoopTaskTest.java
@@ -30,7 +30,6 @@
 import org.apache.druid.java.util.common.StringUtils;
 import org.apache.druid.java.util.common.granularity.Granularity;
 import org.apache.druid.timeline.DataSegment;
-import org.apache.druid.utils.JvmUtils;
 import org.easymock.EasyMock;
 import org.joda.time.Interval;
 import org.junit.Assert;
@@ -131,13 +130,8 @@ public TaskStatus runTask(TaskToolbox toolbox)
 
   public static void assertClassLoaderIsSingular(ClassLoader classLoader)
   {
-    if (JvmUtils.isIsJava9Compatible()) {
-      // See also https://docs.oracle.com/en/java/javase/11/migrate/index.html#JSMIG-GUID-A868D0B9-026F-4D46-B979-901834343F9E
-      Assert.assertEquals("PlatformClassLoader", classLoader.getParent().getClass().getSimpleName());
-    } else {
-      // This is a check against the current HadoopTask which creates a single URLClassLoader with null parent
-      Assert.assertNull(classLoader.getParent());
-    }
+    // See also https://docs.oracle.com/en/java/javase/11/migrate/index.html#JSMIG-GUID-A868D0B9-026F-4D46-B979-901834343F9E
+    Assert.assertEquals("PlatformClassLoader", classLoader.getParent().getClass().getSimpleName());
     Assert.assertFalse(classLoader.getClass().getSimpleName().equals("ApplicationClassLoader"));
     Assert.assertTrue(classLoader instanceof URLClassLoader);
 
diff --git a/pom.xml b/pom.xml
index 3ee7600d5437..3f80196334aa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1666,6 +1666,9 @@
                                 <ignore>sun.misc.Unsafe</ignore>
                                 <!-- ignore java reflection polymorphic api signatures -->
                                 <ignore>java.lang.invoke.MethodHandle</ignore>
+                                <!-- For ignoring java.lang.ClassLoader#getPlatformClassLoader since that's present in java 9+.
+                                Need to be added since animal sniffer is using JDK8 signature currently. -->
+                                <ignore>java.lang.ClassLoader</ignore>
                                 <!--
                                  For the following java.nio.* classes, we get errors like: "Undefined reference: java.nio.ByteBuffer java.nio.ByteBuffer.clear()"
                                  GitHub issue: https://github.com/mojohaus/animal-sniffer/issues/4
diff --git a/processing/src/main/java/org/apache/druid/java/util/common/ByteBufferUtils.java b/processing/src/main/java/org/apache/druid/java/util/common/ByteBufferUtils.java
index fb67c3238347..696f0b629c9c 100644
--- a/processing/src/main/java/org/apache/druid/java/util/common/ByteBufferUtils.java
+++ b/processing/src/main/java/org/apache/druid/java/util/common/ByteBufferUtils.java
@@ -20,17 +20,14 @@
 package org.apache.druid.java.util.common;
 
 import org.apache.druid.collections.ResourceHolder;
-import org.apache.druid.utils.JvmUtils;
 
 import javax.annotation.Nullable;
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
 import java.lang.invoke.MethodType;
-import java.lang.reflect.Method;
 import java.nio.ByteBuffer;
 import java.nio.MappedByteBuffer;
 import java.util.Comparator;
-import java.util.Objects;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 /**
@@ -88,11 +85,12 @@ private static MethodHandle lookupUnmapMethodHandle()
   {
     final MethodHandles.Lookup lookup = MethodHandles.lookup();
     try {
-      if (JvmUtils.isIsJava9Compatible()) {
-        return unmapJava9(lookup);
-      } else {
-        return unmapJava7Or8(lookup);
-      }
+      MethodHandle unmapper = lookup.findVirtual(
+          UnsafeUtils.theUnsafeClass(),
+          "invokeCleaner",
+          MethodType.methodType(void.class, ByteBuffer.class)
+      );
+      return unmapper.bindTo(UnsafeUtils.theUnsafe());
     }
     catch (ReflectiveOperationException | RuntimeException e1) {
       throw new UnsupportedOperationException("Unmapping is not supported on this platform, because internal " +
@@ -100,51 +98,6 @@ private static MethodHandle lookupUnmapMethodHandle()
     }
   }
 
-  /**
-   * NB: while Druid no longer support Java 7, this method would still work with that version as well.
-   */
-  private static MethodHandle unmapJava7Or8(MethodHandles.Lookup lookup) throws ReflectiveOperationException
-  {
-    // "Compile" a MethodHandle that is roughly equivalent to the following lambda:
-    //
-    // (ByteBuffer buffer) -> {
-    //   sun.misc.Cleaner cleaner = ((java.nio.DirectByteBuffer) byteBuffer).cleaner();
-    //   if (nonNull(cleaner))
-    //     cleaner.clean();
-    //   else
-    //     noop(cleaner); // the noop is needed because MethodHandles#guardWithTest always needs both if and else
-    // }
-    //
-    Class<?> directBufferClass = Class.forName("java.nio.DirectByteBuffer");
-    Method m = directBufferClass.getMethod("cleaner");
-    m.setAccessible(true);
-    MethodHandle directBufferCleanerMethod = lookup.unreflect(m);
-    Class<?> cleanerClass = directBufferCleanerMethod.type().returnType();
-    MethodHandle cleanMethod = lookup.findVirtual(cleanerClass, "clean", MethodType.methodType(void.class));
-    MethodHandle nonNullTest = lookup.findStatic(Objects.class, "nonNull",
-                                                 MethodType.methodType(boolean.class, Object.class)
-    ).asType(MethodType.methodType(boolean.class, cleanerClass));
-    MethodHandle noop = MethodHandles.dropArguments(MethodHandles.constant(
-        Void.class,
-        null
-    ).asType(MethodType.methodType(void.class)), 0, cleanerClass);
-    MethodHandle unmapper = MethodHandles.filterReturnValue(
-        directBufferCleanerMethod,
-        MethodHandles.guardWithTest(nonNullTest, cleanMethod, noop)
-    ).asType(MethodType.methodType(void.class, ByteBuffer.class));
-    return unmapper;
-  }
-
-  private static MethodHandle unmapJava9(MethodHandles.Lookup lookup) throws ReflectiveOperationException
-  {
-    MethodHandle unmapper = lookup.findVirtual(
-        UnsafeUtils.theUnsafeClass(),
-        "invokeCleaner",
-        MethodType.methodType(void.class, ByteBuffer.class)
-    );
-    return unmapper.bindTo(UnsafeUtils.theUnsafe());
-  }
-
   /**
    * Same as {@link ByteBuffer#allocateDirect(int)}, but returns a closeable {@link ResourceHolder} that
    * frees the buffer upon close.
diff --git a/processing/src/main/java/org/apache/druid/java/util/common/Cleaners.java b/processing/src/main/java/org/apache/druid/java/util/common/Cleaners.java
index 2de6a3e140db..2fa4ebdfafbb 100644
--- a/processing/src/main/java/org/apache/druid/java/util/common/Cleaners.java
+++ b/processing/src/main/java/org/apache/druid/java/util/common/Cleaners.java
@@ -19,8 +19,6 @@
 
 package org.apache.druid.java.util.common;
 
-import org.apache.druid.utils.JvmUtils;
-
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
 import java.lang.invoke.MethodType;
@@ -62,11 +60,7 @@ private static Cleaner takeMeToTheCleaners()
   {
     final MethodHandles.Lookup lookup = MethodHandles.lookup();
     try {
-      if (JvmUtils.isIsJava9Compatible()) {
-        return lookupCleanerJava9(lookup);
-      } else {
-        return lookupCleanerJava8(lookup);
-      }
+      return lookupCleaner(lookup);
     }
     catch (ReflectiveOperationException | RuntimeException e) {
       throw new UnsupportedOperationException("Cleaning is not support on this platform, because internal " +
@@ -74,7 +68,7 @@ private static Cleaner takeMeToTheCleaners()
     }
   }
 
-  private static Cleaner lookupCleanerJava9(MethodHandles.Lookup lookup) throws ReflectiveOperationException
+  private static Cleaner lookupCleaner(MethodHandles.Lookup lookup) throws ReflectiveOperationException
   {
     Class<?> cleaner = Class.forName("java.lang.ref.Cleaner");
     Class<?> cleanable = Class.forName("java.lang.ref.Cleaner$Cleanable");
@@ -100,19 +94,6 @@ private static Cleaner lookupCleanerJava9(MethodHandles.Lookup lookup) throws Re
     return new CleanerImpl(register, clean);
   }
 
-  private static Cleaner lookupCleanerJava8(MethodHandles.Lookup lookup) throws ReflectiveOperationException
-  {
-    Class<?> cleaner = Class.forName("sun.misc.Cleaner");
-    MethodHandle register = lookup.findStatic(
-        cleaner,
-        "create",
-        MethodType.methodType(cleaner, Object.class, Runnable.class)
-    );
-
-    MethodHandle clean = lookup.findVirtual(cleaner, "clean", MethodType.methodType(void.class));
-    return new CleanerImpl(register, clean);
-  }
-
   public static Cleanable register(Object object, Runnable runnable)
   {
     if (CLEANER == null) {
diff --git a/processing/src/main/java/org/apache/druid/java/util/common/DefineClassUtils.java b/processing/src/main/java/org/apache/druid/java/util/common/DefineClassUtils.java
index d79c517ae3d1..5e3bd6626f7d 100644
--- a/processing/src/main/java/org/apache/druid/java/util/common/DefineClassUtils.java
+++ b/processing/src/main/java/org/apache/druid/java/util/common/DefineClassUtils.java
@@ -19,12 +19,9 @@
 
 package org.apache.druid.java.util.common;
 
-import org.apache.druid.utils.JvmUtils;
-
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
 import java.lang.invoke.MethodType;
-import java.security.ProtectionDomain;
 
 /**
  * This utility class provides a thin runtime abstraction to pick between
@@ -44,11 +41,7 @@ public class DefineClassUtils
     Exception exception = null;
     try {
       MethodHandles.Lookup lookup = MethodHandles.lookup();
-      if (JvmUtils.isIsJava9Compatible()) {
-        defineClass = defineClassJava9(lookup);
-      } else {
-        defineClass = defineClassJava8(lookup);
-      }
+      defineClass = getMethodHandle(lookup);
     }
     catch (ReflectiveOperationException | RuntimeException e) {
       exception = e;
@@ -70,9 +63,8 @@ public class DefineClassUtils
    *    return targetClassLookup.defineClass(byteCode);
    *  }
    */
-  private static MethodHandle defineClassJava9(MethodHandles.Lookup lookup) throws ReflectiveOperationException
+  private static MethodHandle getMethodHandle(MethodHandles.Lookup lookup) throws ReflectiveOperationException
   {
-
     // this is getting meta
     MethodHandle defineClass = lookup.unreflect(MethodHandles.Lookup.class.getMethod("defineClass", byte[].class));
     MethodHandle privateLookupIn = lookup.findStatic(
@@ -94,93 +86,6 @@ private static MethodHandle defineClassJava9(MethodHandles.Lookup lookup) throws
     return defineClass;
   }
 
-  /**
-   * "Compile" a MethodHandle that is equivalent to:
-   *
-   *  Class<?> defineClass(Class targetClass, byte[] byteCode, String className) {
-   *    return Unsafe.defineClass(
-   *        className,
-   *        byteCode,
-   *        0,
-   *        byteCode.length,
-   *        targetClass.getClassLoader(),
-   *        targetClass.getProtectionDomain()
-   *    );
-   *  }
-   */
-  private static MethodHandle defineClassJava8(MethodHandles.Lookup lookup) throws ReflectiveOperationException
-  {
-    MethodHandle defineClass = lookup.findVirtual(
-        UnsafeUtils.theUnsafeClass(),
-        "defineClass",
-        MethodType.methodType(
-            Class.class,
-            String.class,
-            byte[].class,
-            int.class,
-            int.class,
-            ClassLoader.class,
-            ProtectionDomain.class
-        )
-    ).bindTo(UnsafeUtils.theUnsafe());
-
-    MethodHandle getProtectionDomain = lookup.unreflect(Class.class.getMethod("getProtectionDomain"));
-    MethodHandle getClassLoader = lookup.unreflect(Class.class.getMethod("getClassLoader"));
-
-    // apply getProtectionDomain and getClassLoader to the targetClass, modifying the methodHandle as follows:
-    // defineClass = (String className, byte[] byteCode, int offset, int length, Class class1, Class class2) ->
-    //   defineClass(className, byteCode, offset, length, class1.getClassLoader(), class2.getProtectionDomain())
-    defineClass = MethodHandles.filterArguments(defineClass, 5, getProtectionDomain);
-    defineClass = MethodHandles.filterArguments(defineClass, 4, getClassLoader);
-
-    // duplicate the last argument to apply the methods above to the same class, modifying the methodHandle as follows:
-    // defineClass = (String className, byte[] byteCode, int offset, int length, Class targetClass) ->
-    //   defineClass(className, byteCode, offset, length, targetClass, targetClass)
-    defineClass = MethodHandles.permuteArguments(
-        defineClass,
-        MethodType.methodType(Class.class, String.class, byte[].class, int.class, int.class, Class.class),
-        0, 1, 2, 3, 4, 4
-    );
-
-    // set offset argument to 0, modifying the methodHandle as follows:
-    // defineClass = (String className, byte[] byteCode, int length, Class targetClass) ->
-    //   defineClass(className, byteCode, 0, length, targetClass)
-    defineClass = MethodHandles.insertArguments(defineClass, 2, (int) 0);
-
-    // JDK8 does not implement MethodHandles.arrayLength, so we have to roll our own
-    MethodHandle arrayLength = lookup.findStatic(
-        lookup.lookupClass(),
-        "getArrayLength",
-        MethodType.methodType(int.class, byte[].class)
-    );
-
-    // apply arrayLength to the length argument, modifying the methodHandle as follows:
-    // defineClass = (String className, byte[] byteCode1, byte[] byteCode2, Class targetClass) ->
-    //   defineClass(className, byteCode1, byteCode2.length, targetClass)
-    defineClass = MethodHandles.filterArguments(defineClass, 2, arrayLength);
-
-    // duplicate the byteCode argument and reorder to match JDK9 signature, modifying the methodHandle as follows:
-    // defineClass = (Class targetClass, byte[] byteCode, String className) ->
-    //   defineClass(className, byteCode, byteCode, targetClass)
-    defineClass = MethodHandles.permuteArguments(
-        defineClass,
-        MethodType.methodType(Class.class, Class.class, byte[].class, String.class),
-        2, 1, 1, 0
-    );
-
-    return defineClass;
-  }
-
-  /**
-   * This method is referenced in Java 8 using method handle, therefore it is not actually unused, and shouldn't be
-   * removed (till Java 8 is supported)
-   */
-  @SuppressWarnings("unused") // method is referenced and used in defineClassJava8
-  static int getArrayLength(byte[] bytes)
-  {
-    return bytes.length;
-  }
-
   public static Class defineClass(
       Class<?> targetClass,
       byte[] byteCode,
diff --git a/processing/src/main/java/org/apache/druid/utils/JvmUtils.java b/processing/src/main/java/org/apache/druid/utils/JvmUtils.java
index 493ac901420d..696a15aaee28 100644
--- a/processing/src/main/java/org/apache/druid/utils/JvmUtils.java
+++ b/processing/src/main/java/org/apache/druid/utils/JvmUtils.java
@@ -71,11 +71,6 @@ public static int majorVersion()
     return MAJOR_VERSION;
   }
 
-  public static boolean isIsJava9Compatible()
-  {
-    return MAJOR_VERSION >= 9;
-  }
-
   public static RuntimeInfo getRuntimeInfo()
   {
     return RUNTIME_INFO;
diff --git a/processing/src/main/java/org/apache/druid/utils/RuntimeInfo.java b/processing/src/main/java/org/apache/druid/utils/RuntimeInfo.java
index 86571eff9456..115787cfd666 100644
--- a/processing/src/main/java/org/apache/druid/utils/RuntimeInfo.java
+++ b/processing/src/main/java/org/apache/druid/utils/RuntimeInfo.java
@@ -50,7 +50,7 @@ public long getFreeHeapSizeBytes()
   public long getDirectMemorySizeBytes()
   {
     try {
-      Class<?> vmClass = Class.forName(JvmUtils.majorVersion() >= 9 ? "jdk.internal.misc.VM" : "sun.misc.VM");
+      Class<?> vmClass = Class.forName("jdk.internal.misc.VM");
       Object maxDirectMemoryObj = vmClass.getMethod("maxDirectMemory").invoke(null);
 
       if (maxDirectMemoryObj == null || !(maxDirectMemoryObj instanceof Number)) {

From fed36844f186637ebe39be20a292c7fb8f37da32 Mon Sep 17 00:00:00 2001
From: Akshat Jain <akjn11@gmail.com>
Date: Fri, 13 Dec 2024 19:54:40 +0530
Subject: [PATCH 33/56] Re-visit previously disabled spotbugs patterns and
 enable them (#17560)

---
 codestyle/spotbugs-exclude.xml                         |  6 ------
 .../overlord/KubernetesAndWorkerTaskRunnerConfig.java  |  4 ++--
 ...inatorBasicAuthenticatorMetadataStorageUpdater.java |  8 ++++----
 ...ordinatorBasicAuthorizerMetadataStorageUpdater.java |  2 +-
 .../org/apache/druid/security/pac4j/OIDCConfig.java    |  2 +-
 .../aggregation/histogram/ApproximateHistogram.java    |  4 ++--
 .../org/apache/druid/query/aggregation/Histogram.java  | 10 +++++-----
 .../druid/query/extraction/BucketExtractionFn.java     |  2 +-
 .../incremental/SpatialDimensionRowTransformer.java    |  6 +++++-
 .../server/initialization/jetty/JettyServerModule.java |  2 +-
 10 files changed, 22 insertions(+), 24 deletions(-)

diff --git a/codestyle/spotbugs-exclude.xml b/codestyle/spotbugs-exclude.xml
index 9a2ba6ecf1c9..9776e554b8e7 100644
--- a/codestyle/spotbugs-exclude.xml
+++ b/codestyle/spotbugs-exclude.xml
@@ -137,15 +137,9 @@
     <Bug pattern="SWL_SLEEP_WITH_LOCK_HELD"/>
     <Bug pattern="UL_UNRELEASED_LOCK_EXCEPTION_PATH"/>
     <Bug pattern="URF_UNREAD_FIELD"/>
-    <!-- The following patterns have been excluded as part of upgrading to Java 17 as there were 100s of occurrences.
-         We should revisit these later.  -->
     <Bug pattern="CT_CONSTRUCTOR_THROW"/>
     <Bug pattern="SING_SINGLETON_HAS_NONPRIVATE_CONSTRUCTOR"/>
-    <Bug pattern="DCN_NULLPOINTER_EXCEPTION"/>
     <Bug pattern="SING_SINGLETON_INDIRECTLY_IMPLEMENTS_CLONEABLE"/>
     <Bug pattern="MS_EXPOSE_REP"/>
-    <Bug pattern="PA_PUBLIC_PRIMITIVE_ATTRIBUTE"/>
-    <Bug pattern="EI_EXPOSE_STATIC_REP2"/>
-    <Bug pattern="SS_SHOULD_BE_STATIC"/>
     <Bug pattern="SING_SINGLETON_IMPLEMENTS_SERIALIZABLE"/>
 </FindBugsFilter>
diff --git a/extensions-contrib/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/KubernetesAndWorkerTaskRunnerConfig.java b/extensions-contrib/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/KubernetesAndWorkerTaskRunnerConfig.java
index 0ffeb0103afa..3efbfa18dce1 100644
--- a/extensions-contrib/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/KubernetesAndWorkerTaskRunnerConfig.java
+++ b/extensions-contrib/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/KubernetesAndWorkerTaskRunnerConfig.java
@@ -31,8 +31,8 @@
 public class KubernetesAndWorkerTaskRunnerConfig
 {
 
-  private final String RUNNER_STRATEGY_TYPE = "runnerStrategy.type";
-  private final String RUNNER_STRATEGY_WORKER_TYPE = "runnerStrategy.workerType";
+  private static final String RUNNER_STRATEGY_TYPE = "runnerStrategy.type";
+  private static final String RUNNER_STRATEGY_WORKER_TYPE = "runnerStrategy.workerType";
   /**
    * Select which runner type a task would run on, options are k8s or worker.
    */
diff --git a/extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/authentication/db/updater/CoordinatorBasicAuthenticatorMetadataStorageUpdater.java b/extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/authentication/db/updater/CoordinatorBasicAuthenticatorMetadataStorageUpdater.java
index a83c20e422d4..c0761c03ec21 100644
--- a/extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/authentication/db/updater/CoordinatorBasicAuthenticatorMetadataStorageUpdater.java
+++ b/extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/authentication/db/updater/CoordinatorBasicAuthenticatorMetadataStorageUpdater.java
@@ -74,7 +74,7 @@ public class CoordinatorBasicAuthenticatorMetadataStorageUpdater implements Basi
   private final BasicAuthCommonCacheConfig commonCacheConfig;
   private final ObjectMapper objectMapper;
   private final BasicAuthenticatorCacheNotifier cacheNotifier;
-  private final int numRetries = 5;
+  private static final int NUM_RETRIES = 5;
 
   private final Map<String, BasicAuthenticatorUserMapBundle> cachedUserMaps;
   private final Set<String> authenticatorPrefixes;
@@ -294,7 +294,7 @@ private static String getPrefixedKeyColumn(String keyPrefix, String keyName)
   private void createUserInternal(String prefix, String userName)
   {
     int attempts = 0;
-    while (attempts < numRetries) {
+    while (attempts < NUM_RETRIES) {
       if (createUserOnce(prefix, userName)) {
         return;
       } else {
@@ -308,7 +308,7 @@ private void createUserInternal(String prefix, String userName)
   private void deleteUserInternal(String prefix, String userName)
   {
     int attempts = 0;
-    while (attempts < numRetries) {
+    while (attempts < NUM_RETRIES) {
       if (deleteUserOnce(prefix, userName)) {
         return;
       } else {
@@ -349,7 +349,7 @@ private void setUserCredentialsInternal(String prefix, String userName, BasicAut
     }
 
     int attempts = 0;
-    while (attempts < numRetries) {
+    while (attempts < NUM_RETRIES) {
       if (setUserCredentialOnce(prefix, userName, credentials)) {
         return;
       } else {
diff --git a/extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/authorization/db/updater/CoordinatorBasicAuthorizerMetadataStorageUpdater.java b/extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/authorization/db/updater/CoordinatorBasicAuthorizerMetadataStorageUpdater.java
index 2de3ef11cc87..baff948331af 100644
--- a/extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/authorization/db/updater/CoordinatorBasicAuthorizerMetadataStorageUpdater.java
+++ b/extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/authorization/db/updater/CoordinatorBasicAuthorizerMetadataStorageUpdater.java
@@ -91,7 +91,7 @@ public class CoordinatorBasicAuthorizerMetadataStorageUpdater implements BasicAu
   private final BasicAuthorizerCacheNotifier cacheNotifier;
   private final BasicAuthCommonCacheConfig commonCacheConfig;
   private final ObjectMapper objectMapper;
-  private final int numRetries = 5;
+  private static final int numRetries = 5;
 
   private final Map<String, BasicAuthorizerUserMapBundle> cachedUserMaps;
   private final Map<String, BasicAuthorizerGroupMappingMapBundle> cachedGroupMappingMaps;
diff --git a/extensions-core/druid-pac4j/src/main/java/org/apache/druid/security/pac4j/OIDCConfig.java b/extensions-core/druid-pac4j/src/main/java/org/apache/druid/security/pac4j/OIDCConfig.java
index 376181416556..50b04455dbc5 100644
--- a/extensions-core/druid-pac4j/src/main/java/org/apache/druid/security/pac4j/OIDCConfig.java
+++ b/extensions-core/druid-pac4j/src/main/java/org/apache/druid/security/pac4j/OIDCConfig.java
@@ -28,7 +28,7 @@
 
 public class OIDCConfig
 {
-  private final String DEFAULT_SCOPE = "name";
+  private static final String DEFAULT_SCOPE = "name";
   @JsonProperty
   private final String clientID;
 
diff --git a/extensions-core/histogram/src/main/java/org/apache/druid/query/aggregation/histogram/ApproximateHistogram.java b/extensions-core/histogram/src/main/java/org/apache/druid/query/aggregation/histogram/ApproximateHistogram.java
index fa3772518b3e..12f1afa296de 100644
--- a/extensions-core/histogram/src/main/java/org/apache/druid/query/aggregation/histogram/ApproximateHistogram.java
+++ b/extensions-core/histogram/src/main/java/org/apache/druid/query/aggregation/histogram/ApproximateHistogram.java
@@ -41,8 +41,8 @@ public class ApproximateHistogram
   // max size of the histogram (number of bincount/position pairs)
   int size;
 
-  public float[] positions;
-  public long[] bins;
+  protected float[] positions;
+  protected long[] bins;
 
   // used bincount
   int binCount;
diff --git a/processing/src/main/java/org/apache/druid/query/aggregation/Histogram.java b/processing/src/main/java/org/apache/druid/query/aggregation/Histogram.java
index 708ba84e06ea..ee32ff3d9f5e 100644
--- a/processing/src/main/java/org/apache/druid/query/aggregation/Histogram.java
+++ b/processing/src/main/java/org/apache/druid/query/aggregation/Histogram.java
@@ -27,11 +27,11 @@
 
 public class Histogram
 {
-  public float[] breaks;
-  public long[] bins;
-  public transient long count;
-  public float min;
-  public float max;
+  protected float[] breaks;
+  protected long[] bins;
+  protected transient long count;
+  protected float min;
+  protected float max;
 
   public Histogram(float[] breaks)
   {
diff --git a/processing/src/main/java/org/apache/druid/query/extraction/BucketExtractionFn.java b/processing/src/main/java/org/apache/druid/query/extraction/BucketExtractionFn.java
index 970116e62169..68769007a77b 100644
--- a/processing/src/main/java/org/apache/druid/query/extraction/BucketExtractionFn.java
+++ b/processing/src/main/java/org/apache/druid/query/extraction/BucketExtractionFn.java
@@ -81,7 +81,7 @@ public String apply(@Nullable String value)
     try {
       return bucket(Double.parseDouble(value));
     }
-    catch (NumberFormatException | NullPointerException ex) {
+    catch (NumberFormatException ex) {
       return null;
     }
   }
diff --git a/processing/src/main/java/org/apache/druid/segment/incremental/SpatialDimensionRowTransformer.java b/processing/src/main/java/org/apache/druid/segment/incremental/SpatialDimensionRowTransformer.java
index c6b40af11e54..8c4c8d4448be 100644
--- a/processing/src/main/java/org/apache/druid/segment/incremental/SpatialDimensionRowTransformer.java
+++ b/processing/src/main/java/org/apache/druid/segment/incremental/SpatialDimensionRowTransformer.java
@@ -213,10 +213,14 @@ private boolean isJoinedSpatialDimValValid(String dimVal)
   @Nullable
   private static Float tryParseFloat(String val)
   {
+    if (val == null) {
+      return null;
+    }
+
     try {
       return Float.parseFloat(val);
     }
-    catch (NullPointerException | NumberFormatException e) {
+    catch (NumberFormatException e) {
       return null;
     }
   }
diff --git a/server/src/main/java/org/apache/druid/server/initialization/jetty/JettyServerModule.java b/server/src/main/java/org/apache/druid/server/initialization/jetty/JettyServerModule.java
index 1299e11d60c0..8ce48871c155 100644
--- a/server/src/main/java/org/apache/druid/server/initialization/jetty/JettyServerModule.java
+++ b/server/src/main/java/org/apache/druid/server/initialization/jetty/JettyServerModule.java
@@ -597,7 +597,7 @@ public int getActiveConnections()
   }
 
   @VisibleForTesting
-  public static void setJettyServerThreadPool(QueuedThreadPool threadPool)
+  protected static void setJettyServerThreadPool(QueuedThreadPool threadPool)
   {
     jettyServerThreadPool = threadPool;
   }

From 12eed753f7809ce1eee9dc5a71b355b4dfbda8d6 Mon Sep 17 00:00:00 2001
From: Zeyu-Chen-SFDC <zeyu.chen@salesforce.com>
Date: Fri, 13 Dec 2024 08:29:56 -0800
Subject: [PATCH 34/56] fix the order in getNativeQueryLine (#17326)

---
 .../src/main/java/org/apache/druid/server/RequestLogLine.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/server/src/main/java/org/apache/druid/server/RequestLogLine.java b/server/src/main/java/org/apache/druid/server/RequestLogLine.java
index 4c6f31582c07..0e744520cc3b 100644
--- a/server/src/main/java/org/apache/druid/server/RequestLogLine.java
+++ b/server/src/main/java/org/apache/druid/server/RequestLogLine.java
@@ -84,8 +84,8 @@ public String getNativeQueryLine(ObjectMapper objectMapper) throws JsonProcessin
         Arrays.asList(
             timestamp,
             remoteAddr,
-            objectMapper.writeValueAsString(query),
-            objectMapper.writeValueAsString(queryStats)
+            objectMapper.writeValueAsString(queryStats),
+            objectMapper.writeValueAsString(query)
         )
     );
   }

From 29ab12ccd7bdaf2310492c680e1322cb814ed6cc Mon Sep 17 00:00:00 2001
From: Atul Mohan <atulmohan.mec@gmail.com>
Date: Sun, 15 Dec 2024 21:35:01 -0800
Subject: [PATCH 35/56] Add missing docs for lookup based task context
 properties (#17562)

* Add missing docs for lookup based task context properties

* Fix text based on comments
---
 docs/ingestion/tasks.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/ingestion/tasks.md b/docs/ingestion/tasks.md
index 92f21b924874..9396378bcdb5 100644
--- a/docs/ingestion/tasks.md
+++ b/docs/ingestion/tasks.md
@@ -470,6 +470,8 @@ The following parameters apply to all task types.
 |`storeEmptyColumns`|Enables the task to store empty columns during ingestion. When `true`, Druid stores every column specified in the [`dimensionsSpec`](ingestion-spec.md#dimensionsspec). When `false`, Druid SQL queries referencing empty columns will fail. If you intend to leave `storeEmptyColumns` disabled, you should either ingest dummy data for empty columns or else not query on empty columns.<br/><br/>When set in the task context, `storeEmptyColumns` overrides the system property [`druid.indexer.task.storeEmptyColumns`](../configuration/index.md#additional-peon-configuration).|`true`|
 |`taskLockTimeout`|Task lock timeout in milliseconds. For more details, see [Locking](#locking).<br/><br/>When a task acquires a lock, it sends a request via HTTP and awaits until it receives a response containing the lock acquisition result. As a result, an HTTP timeout error can occur if `taskLockTimeout` is greater than `druid.server.http.maxIdleTime` of Overlords.|300000|
 |`useLineageBasedSegmentAllocation`|Enables the new lineage-based segment allocation protocol for the native Parallel task with dynamic partitioning. This option should be off during the replacing rolling upgrade from one of the Druid versions between 0.19 and 0.21 to Druid 0.22 or higher. Once the upgrade is done, it must be set to `true` to ensure data correctness.|`false` in 0.21 or earlier, `true` in 0.22 or later|
+|`lookupLoadingMode`|Controls the lookup loading behavior in tasks. This property supports three values: `ALL` mode loads all the lookups, `NONE` mode does not load any lookups and `ONLY_REQUIRED` mode loads the lookups specified with context key `lookupsToLoad`. This property must not be specified for `MSQ` and `kill` tasks as the task engine enforces `ONLY_REQUIRED` mode for `MSQWorkerTask` and `NONE` mode for `MSQControllerTask` and `kill` tasks.|`ALL`|
+|`lookupsToLoad`|List of lookup names to load in tasks. This property is required only if the `lookupLoadingMode` is set to `ONLY_REQUIRED`. For `MSQWorkerTask` type, the lookup names to load are identified by the controller task by parsing the SQL. |`null`|
 
 ## Task logs
 

From 0335bdd90f25debe45ae0cde48b66f1a94f898a7 Mon Sep 17 00:00:00 2001
From: Kashif Faraz <kashif.faraz@gmail.com>
Date: Mon, 16 Dec 2024 03:18:39 -0800
Subject: [PATCH 36/56] Reduce coordinator logs (#17566)

---
 .../DataSourceCompactibleSegmentIterator.java     |  5 ++---
 .../coordinator/loading/HttpLoadQueuePeon.java    | 15 ++++++---------
 .../loading/HttpLoadQueuePeonTest.java            |  6 ++----
 3 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/server/src/main/java/org/apache/druid/server/compaction/DataSourceCompactibleSegmentIterator.java b/server/src/main/java/org/apache/druid/server/compaction/DataSourceCompactibleSegmentIterator.java
index 0abbd00e9755..86678e9da9bd 100644
--- a/server/src/main/java/org/apache/druid/server/compaction/DataSourceCompactibleSegmentIterator.java
+++ b/server/src/main/java/org/apache/druid/server/compaction/DataSourceCompactibleSegmentIterator.java
@@ -491,10 +491,9 @@ static List<Interval> filterSkipIntervals(Interval totalInterval, List<Interval>
         remainingStart = skipInterval.getEnd();
       } else {
         // Ignore this skipInterval
-        log.warn(
+        log.debug(
             "skipInterval[%s] is not contained in remainingInterval[%s]",
-            skipInterval,
-            new Interval(remainingStart, remainingEnd)
+            skipInterval, new Interval(remainingStart, remainingEnd)
         );
       }
     }
diff --git a/server/src/main/java/org/apache/druid/server/coordinator/loading/HttpLoadQueuePeon.java b/server/src/main/java/org/apache/druid/server/coordinator/loading/HttpLoadQueuePeon.java
index a72cb22e1519..cea693a56757 100644
--- a/server/src/main/java/org/apache/druid/server/coordinator/loading/HttpLoadQueuePeon.java
+++ b/server/src/main/java/org/apache/druid/server/coordinator/loading/HttpLoadQueuePeon.java
@@ -76,14 +76,10 @@
 public class HttpLoadQueuePeon implements LoadQueuePeon
 {
   public static final TypeReference<List<DataSegmentChangeRequest>> REQUEST_ENTITY_TYPE_REF =
-      new TypeReference<List<DataSegmentChangeRequest>>()
-      {
-      };
+      new TypeReference<>() {};
 
   public static final TypeReference<List<DataSegmentChangeResponse>> RESPONSE_ENTITY_TYPE_REF =
-      new TypeReference<List<DataSegmentChangeResponse>>()
-      {
-      };
+      new TypeReference<>() {};
 
   private static final EmittingLogger log = new EmittingLogger(HttpLoadQueuePeon.class);
 
@@ -389,9 +385,10 @@ public void stop()
       log.info("Stopping load queue peon for server[%s].", serverId);
       stopped = true;
 
-      // Cancel all queued requests
-      queuedSegments.forEach(holder -> onRequestCompleted(holder, RequestStatus.CANCELLED));
-      log.info("Cancelled [%d] requests queued on server [%s].", queuedSegments.size(), serverId);
+      if (!queuedSegments.isEmpty()) {
+        queuedSegments.forEach(holder -> onRequestCompleted(holder, RequestStatus.CANCELLED));
+        log.info("Cancelled [%d] requests queued on server[%s].", queuedSegments.size(), serverId);
+      }
 
       segmentsToDrop.clear();
       segmentsToLoad.clear();
diff --git a/server/src/test/java/org/apache/druid/server/coordinator/loading/HttpLoadQueuePeonTest.java b/server/src/test/java/org/apache/druid/server/coordinator/loading/HttpLoadQueuePeonTest.java
index 5928f47e0bb2..fa4ce7cc45bf 100644
--- a/server/src/test/java/org/apache/druid/server/coordinator/loading/HttpLoadQueuePeonTest.java
+++ b/server/src/test/java/org/apache/druid/server/coordinator/loading/HttpLoadQueuePeonTest.java
@@ -19,7 +19,6 @@
 
 package org.apache.druid.server.coordinator.loading;
 
-import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
@@ -350,9 +349,8 @@ public <Intermediate, Final> ListenableFuture<Final> go(
       httpResponseHandler.handleResponse(httpResponse, null);
       try {
         List<DataSegmentChangeRequest> changeRequests = MAPPER.readValue(
-            request.getContent().array(), new TypeReference<List<DataSegmentChangeRequest>>()
-            {
-            }
+            request.getContent().array(),
+            HttpLoadQueuePeon.REQUEST_ENTITY_TYPE_REF
         );
 
         List<DataSegmentChangeResponse> statuses = new ArrayList<>(changeRequests.size());

From 622a6a6f89e8374b4deb0a538483e89dda3d543d Mon Sep 17 00:00:00 2001
From: Clint Wylie <cwylie@apache.org>
Date: Mon, 16 Dec 2024 15:51:12 -0800
Subject: [PATCH 37/56] remove sql_compatibility from build matrix and only
 test sql compatible mode (#17557)

---
 .github/scripts/unit_tests_script.sh                 |  2 +-
 .github/workflows/reusable-unit-tests.yml            | 12 ------------
 .../workflows/unit-and-integration-tests-unified.yml | 10 ++--------
 .github/workflows/unit-tests.yml                     |  9 ---------
 4 files changed, 3 insertions(+), 30 deletions(-)

diff --git a/.github/scripts/unit_tests_script.sh b/.github/scripts/unit_tests_script.sh
index 28de3e943796..00bcdad62622 100755
--- a/.github/scripts/unit_tests_script.sh
+++ b/.github/scripts/unit_tests_script.sh
@@ -21,7 +21,7 @@ unset _JAVA_OPTIONS
 
 # Set MAVEN_OPTS for Surefire launcher.
 MAVEN_OPTS='-Xmx2500m' ${MVN} test -pl ${MAVEN_PROJECTS} \
-${MAVEN_SKIP} -Ddruid.generic.useDefaultValueForNull=${DRUID_USE_DEFAULT_VALUE_FOR_NULL} \
+${MAVEN_SKIP} \
 -DjfrProfilerArgLine="${JFR_PROFILER_ARG_LINE}" -Pci
 sh -c "dmesg | egrep -i '(oom|out of memory|kill process|killed).*' -C 1 || exit 0"
 free -m
diff --git a/.github/workflows/reusable-unit-tests.yml b/.github/workflows/reusable-unit-tests.yml
index fe55e563b2dd..5f18f61eab55 100644
--- a/.github/workflows/reusable-unit-tests.yml
+++ b/.github/workflows/reusable-unit-tests.yml
@@ -21,11 +21,6 @@ on:
         required: true
         type: string
         description: 'JDK version used to test Druid'
-      sql_compatibility:
-        required: false
-        type: boolean
-        default: true
-        description: 'For SQL compatibility'
       module:
         required: true
         type: string
@@ -84,13 +79,6 @@ jobs:
         run: |
           export base_ref=${{ github.base_ref }}
           echo "GITHUB_BASE_REF=${base_ref}" >> $GITHUB_ENV
-          # If sql_compatibilty is true, we want to set default_value_for_null
-          # which enables compatibility mode
-          if (${{ inputs.sql_compatibility }} == true); then
-            echo "DRUID_USE_DEFAULT_VALUE_FOR_NULL=false" >> $GITHUB_ENV
-          else
-            echo "DRUID_USE_DEFAULT_VALUE_FOR_NULL=true" >> $GITHUB_ENV
-          fi
 
       - name: test profiling
         run: | 
diff --git a/.github/workflows/unit-and-integration-tests-unified.yml b/.github/workflows/unit-and-integration-tests-unified.yml
index 81375f33c090..11a7d17944be 100644
--- a/.github/workflows/unit-and-integration-tests-unified.yml
+++ b/.github/workflows/unit-and-integration-tests-unified.yml
@@ -163,25 +163,19 @@ jobs:
       matrix:
         # Use JDK 21.0.4 to work around https://github.com/apache/druid/issues/17429
         jdk: [ '11', '21.0.4' ]
-    name: "unit tests (jdk${{ matrix.jdk }}, sql-compat=true)"
+    name: "unit tests (jdk${{ matrix.jdk }})"
     uses: ./.github/workflows/unit-tests.yml
     needs: unit-tests
     if: ${{ always() && (needs.unit-tests.result == 'success' || needs.unit-tests.outputs.continue_tests) }}
     with:
       jdk: ${{ matrix.jdk }}
-      sql_compatibility: true
 
   unit-tests:
-    strategy:
-      fail-fast: false
-      matrix:
-        sql_compatibility: [ false, true ]
-    name: "unit tests (jdk17, sql-compat=${{ matrix.sql_compatibility }})"
+    name: "unit tests (jdk17)"
     uses: ./.github/workflows/unit-tests.yml
     needs: build
     with:
       jdk: 17
-      sql_compatibility: ${{ matrix.sql_compatibility }}
 
   standard-its:
     needs: unit-tests
diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
index 60cf5ccbd366..42f86b48edd5 100644
--- a/.github/workflows/unit-tests.yml
+++ b/.github/workflows/unit-tests.yml
@@ -21,11 +21,6 @@ on:
         required: true
         type: string
         description: 'JDK version used to test Druid'
-      sql_compatibility:
-        required: false
-        type: boolean
-        default: true
-        description: 'For SQL compatibility'
     outputs:
       continue_tests:
         description: 'Flag to decide if next tests need to run incase coverage issue failures'
@@ -72,7 +67,6 @@ jobs:
     uses: ./.github/workflows/reusable-unit-tests.yml
     with:
       jdk: ${{ inputs.jdk }}
-      sql_compatibility: ${{ inputs.sql_compatibility }}
       module: indexing
       maven_projects: 'indexing-hadoop,indexing-service,extensions-core/kafka-indexing-service,extensions-core/kinesis-indexing-service'
 
@@ -82,7 +76,6 @@ jobs:
     uses: ./.github/workflows/reusable-unit-tests.yml
     with:
       jdk: ${{ inputs.jdk }}
-      sql_compatibility: ${{ inputs.sql_compatibility }}
       module: processing
       maven_projects: 'processing'
 
@@ -92,7 +85,6 @@ jobs:
     uses: ./.github/workflows/reusable-unit-tests.yml
     with:
       jdk: ${{ inputs.jdk }}
-      sql_compatibility: ${{ inputs.sql_compatibility }}
       module: server
       maven_projects: 'server'
 
@@ -100,6 +92,5 @@ jobs:
     uses: ./.github/workflows/reusable-unit-tests.yml
     with:
       jdk: ${{ inputs.jdk }}
-      sql_compatibility: ${{ inputs.sql_compatibility }}
       module: other
       maven_projects: '!processing,!indexing-hadoop,!indexing-service,!extensions-core/kafka-indexing-service,!extensions-core/kinesis-indexing-service,!server,!web-console,!integration-tests,!:druid-it-tools,!:druid-it-image,!:druid-it-cases'

From 9bdb3d205cc021c606faf9d71b3e2db63e5a300c Mon Sep 17 00:00:00 2001
From: Zoltan Haindrich <kirk@rxd.hu>
Date: Tue, 17 Dec 2024 08:13:01 +0100
Subject: [PATCH 38/56] Upgrade maven commit-id plugi(#17571)

---
 pom.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 3f80196334aa..3704542d0ce5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1732,9 +1732,9 @@
                 </configuration>
             </plugin>
             <plugin>
-                <groupId>pl.project13.maven</groupId>
-                <artifactId>git-commit-id-plugin</artifactId>
-                <version>4.9.10</version>
+                <groupId>io.github.git-commit-id</groupId>
+                <artifactId>git-commit-id-maven-plugin</artifactId>
+                <version>9.0.1</version>
                 <executions>
                     <execution>
                         <goals>

From cd6083fb9423260e46876bfb3f4527c3581a9cb9 Mon Sep 17 00:00:00 2001
From: Akshat Jain <akjn11@gmail.com>
Date: Tue, 17 Dec 2024 12:43:12 +0530
Subject: [PATCH 39/56] Add back `UnnecessaryFullyQualifiedName` rule in pmd
 ruleset (#17570)

* Add back UnnecessaryFullyQualifiedName rule in pmd ruleset

* Fix checkstyle
---
 codestyle/pmd-ruleset.xml                     |  1 +
 .../apache/druid/storage/aliyun/OssUtils.java |  2 +-
 .../druid/compressedbigdecimal/Utils.java     |  2 +-
 .../druid/k8s/overlord/common/PeonPhase.java  |  2 +-
 .../RabbitStreamSupervisorTuningConfig.java   |  4 +-
 .../datasketches/hll/HllSketchHolder.java     | 10 +--
 .../datasketches/theta/SketchHolder.java      | 20 ++---
 .../druid/security/basic/BasicAuthUtils.java  |  6 +-
 .../druid/catalog/CatalogException.java       |  2 +-
 .../storage/hdfs/HdfsStorageDruidModule.java  |  6 +-
 .../KafkaSupervisorTuningConfig.java          |  2 +-
 .../k8s/discovery/DefaultK8sApiClient.java    |  4 +-
 .../k8s/discovery/K8sDruidNodeAnnouncer.java  | 10 +--
 ...SegmentGeneratorFrameProcessorFactory.java |  4 +-
 .../druid/msq/querykit/QueryKitUtils.java     | 18 ++---
 .../org/apache/druid/msq/sql/MSQMode.java     |  6 +-
 .../org/apache/druid/storage/s3/S3Utils.java  |  4 +-
 .../druid/indexer/DeterminePartitionsJob.java |  2 +-
 .../indexer/HadoopDruidIndexerConfig.java     | 14 ++--
 .../druid/indexer/HadoopTuningConfig.java     |  4 +-
 .../org/apache/druid/indexer/JobHelper.java   | 10 +--
 .../indexer/hadoop/DatasourceInputFormat.java |  2 +-
 .../common/task/AbstractBatchIndexTask.java   |  4 +-
 .../indexing/common/task/HadoopIndexTask.java |  4 +-
 .../druid/indexing/common/task/IndexTask.java | 17 ++---
 .../indexing/common/task/IndexTaskUtils.java  |  4 +-
 .../parallel/LegacySinglePhaseSubTask.java    |  2 +-
 .../PartialDimensionCardinalityTask.java      |  3 +-
 .../PartialDimensionDistributionTask.java     |  3 +-
 .../parallel/PartialSegmentMergeTask.java     |  3 +-
 .../batch/parallel/SinglePhaseSubTask.java    |  6 +-
 .../indexing/input/DruidInputSource.java      |  4 +-
 .../overlord/QuotableWhiteSpaceSplitter.java  |  2 +-
 .../SeekableStreamIndexTaskTuningConfig.java  |  7 +-
 .../testing/tools/CliCustomNodeRole.java      |  8 +-
 .../apache/druid/cli/CliCustomNodeRole.java   |  8 +-
 .../AvroSchemaRegistryEventSerializer.java    |  2 +-
 ...ProtobufSchemaRegistryEventSerializer.java |  2 +-
 .../spatial/search/PolygonBound.java          |  2 +-
 .../druid/common/config/NullHandling.java     |  6 +-
 .../druid/common/guava/FutureUtils.java       |  6 +-
 .../apache/druid/common/utils/IdUtils.java    |  2 +-
 .../druid/data/input/impl/DimensionsSpec.java |  2 +-
 .../input/impl/DoubleDimensionSchema.java     |  2 +-
 .../data/input/impl/FloatDimensionSchema.java |  2 +-
 .../data/input/impl/LongDimensionSchema.java  |  2 +-
 .../input/impl/NewSpatialDimensionSchema.java |  2 +-
 .../input/impl/StringDimensionSchema.java     |  2 +-
 .../intset/ImmutableConciseSet.java           |  2 +-
 .../java/org/apache/druid/frame/Frame.java    |  4 +-
 .../apache/druid/frame/key/RowKeyReader.java  |  2 +-
 .../druid/frame/processor/OutputChannel.java  |  2 +-
 .../druid/frame/util/DurableStorageUtils.java |  2 +-
 .../druid/frame/write/FrameWriterUtils.java   |  2 +-
 .../druid/hll/HyperLogLogCollector.java       |  6 +-
 .../apache/druid/indexer/TaskLocation.java    |  2 +-
 .../DimensionRangePartitionsSpec.java         |  2 +-
 .../partitions/DynamicPartitionsSpec.java     |  2 +-
 .../partitions/HashedPartitionsSpec.java      |  2 +-
 .../apache/druid/java/util/common/Either.java |  2 +-
 .../java/util/common/HumanReadableBytes.java  |  2 +-
 .../druid/java/util/common/StringUtils.java   | 14 ++--
 .../common/granularity/Granularities.java     |  2 +-
 .../common/granularity/GranularityType.java   | 30 ++++----
 .../java/util/common/guava/Sequences.java     |  2 +-
 .../common/parsers/JSONPathFieldSpec.java     |  2 +-
 .../java/util/common/parsers/ParserUtils.java |  2 +-
 .../util/emitter/core/HttpPostEmitter.java    |  4 +-
 .../util/emitter/service/AlertBuilder.java    |  2 +-
 .../org/apache/druid/math/expr/Evals.java     |  6 +-
 .../org/apache/druid/math/expr/ExprEval.java  | 74 +++++++++----------
 .../druid/math/expr/ExprMacroTable.java       |  2 +-
 .../org/apache/druid/math/expr/ExprType.java  |  2 +-
 .../druid/math/expr/ExpressionType.java       |  2 +-
 .../math/expr/ExpressionTypeConversion.java   |  2 +-
 .../org/apache/druid/math/expr/Parser.java    |  2 +-
 .../apache/druid/query/JoinDataSource.java    |  2 +-
 .../query/aggregation/AggregatorUtil.java     |  4 +-
 .../any/StringAnyAggregatorFactory.java       |  2 +-
 .../first/StringFirstAggregatorFactory.java   |  2 +-
 .../post/ArithmeticPostAggregator.java        |  2 +-
 .../DataSourceMetadataQuery.java              |  2 +-
 .../druid/query/filter/InDimFilter.java       |  2 +-
 .../druid/query/groupby/GroupByQuery.java     |  2 +-
 .../druid/query/groupby/GroupingEngine.java   |  2 +-
 .../apache/druid/query/groupby/ResultRow.java |  2 +-
 .../epinephelinae/RowBasedGrouperHelper.java  |  2 +-
 .../groupby/orderby/OrderByColumnSpec.java    |  4 +-
 .../metadata/metadata/ColumnAnalysis.java     |  6 +-
 .../metadata/SegmentMetadataQuery.java        |  2 +-
 .../query/operator/WindowOperatorQuery.java   |  2 +-
 .../query/ordering/StringComparators.java     | 14 ++--
 .../MapOfColumnsRowsAndColumns.java           |  2 +-
 .../druid/query/search/SearchQuery.java       |  2 +-
 .../query/timeboundary/TimeBoundaryQuery.java |  2 +-
 .../query/timeseries/TimeseriesQuery.java     |  2 +-
 .../druid/query/topn/PooledTopNAlgorithm.java |  8 +-
 .../druid/segment/AutoTypeColumnIndexer.java  |  4 +-
 .../druid/segment/DimensionHandlerUtils.java  |  4 +-
 .../apache/druid/segment/IndexMergerV9.java   |  2 +-
 .../org/apache/druid/segment/IndexSpec.java   |  2 +-
 .../segment/NestedDataColumnIndexerV4.java    |  2 +-
 .../RowBasedColumnSelectorFactory.java        |  2 +-
 .../segment/column/ColumnCapabilities.java    |  4 +-
 .../column/ColumnCapabilitiesImpl.java        |  2 +-
 .../druid/segment/column/ColumnType.java      | 18 ++---
 .../druid/segment/column/ValueType.java       |  6 +-
 .../segment/data/CompressionFactory.java      |  2 +-
 .../segment/data/CompressionStrategy.java     |  4 +-
 .../druid/segment/data/FrontCodedIndexed.java |  6 +-
 .../apache/druid/segment/data/Indexed.java    |  2 +-
 .../apache/druid/segment/filter/Filters.java  |  4 +-
 .../druid/segment/filter/ValueMatchers.java   |  2 +-
 .../index/IndexedUtf8ValueIndexes.java        |  2 +-
 .../druid/segment/nested/FieldTypeInfo.java   |  2 +-
 .../NestedCommonFormatColumnSerializer.java   |  2 +-
 .../NestedFieldColumnIndexSupplier.java       |  6 +-
 .../ScalarDoubleColumnAndIndexSupplier.java   |  4 +-
 .../ScalarLongColumnAndIndexSupplier.java     |  4 +-
 .../DictionaryEncodedColumnPartSerde.java     |  2 +-
 ...ExpressionMultiValueDimensionSelector.java |  2 +-
 ...EvaluationExpressionDimensionSelector.java |  3 +-
 ...tionExpressionDimensionVectorSelector.java |  3 +-
 ...AsBrokerQueryComponentSupplierWrapper.java |  2 +-
 .../apache/druid/quidem/QuidemRecorder.java   |  6 +-
 .../druid/catalog/model/CatalogUtils.java     |  4 +-
 .../catalog/model/table/DatasourceDefn.java   |  2 +-
 .../discovery/DruidNodeDiscoveryProvider.java |  2 +-
 .../org/apache/druid/guice/DruidBinders.java  |  2 +-
 .../org/apache/druid/metadata/SortOrder.java  |  4 +-
 .../druid/rpc/guice/ServiceClientModule.java  |  2 +-
 .../server/compaction/CompactionStatus.java   | 24 +++---
 .../BroadcastDatasourceLoadingSpec.java       |  2 +-
 .../druid/server/coordination/ServerType.java |  6 +-
 .../balancer/SegmentToMoveCalculator.java     |  6 +-
 .../server/http/HostAndPortWithScheme.java    |  4 +-
 .../StandardResponseHeaderFilterHolder.java   |  2 +-
 .../lookup/cache/LookupLoadingSpec.java       |  2 +-
 .../druid/server/metrics/MonitorsConfig.java  |  4 +-
 .../server/security/AuthorizationUtils.java   |  4 +-
 .../plan/volcano/DruidVolcanoCost.java        |  8 +-
 .../aggregation/builtin/MaxSqlAggregator.java |  2 +-
 .../aggregation/builtin/MinSqlAggregator.java |  2 +-
 .../aggregation/builtin/SumSqlAggregator.java |  2 +-
 .../expression/DefaultOperandTypeChecker.java |  2 +-
 .../filtration/ConvertSelectorsToIns.java     |  6 +-
 .../calcite/planner/CalciteRulesManager.java  |  6 +-
 .../druid/sql/calcite/planner/Calcites.java   |  6 +-
 .../calcite/planner/DruidOperatorTable.java   |  2 +-
 .../sql/calcite/planner/DruidTypeSystem.java  | 28 +++----
 .../sql/calcite/planner/PlannerConfig.java    |  2 +-
 .../druid/sql/calcite/rel/Grouping.java       |  2 +-
 .../apache/druid/sql/http/ObjectWriter.java   |  6 +-
 .../apache/druid/sql/http/SqlResource.java    |  2 +-
 154 files changed, 364 insertions(+), 376 deletions(-)

diff --git a/codestyle/pmd-ruleset.xml b/codestyle/pmd-ruleset.xml
index 7d7285d0a516..f10d4f3da197 100644
--- a/codestyle/pmd-ruleset.xml
+++ b/codestyle/pmd-ruleset.xml
@@ -29,4 +29,5 @@ This ruleset defines the PMD rules for the Apache Druid project.
 
   <rule ref="category/java/codestyle.xml/UnnecessaryImport" />
   <rule ref="category/java/codestyle.xml/TooManyStaticImports" />
+  <rule ref="category/java/codestyle.xml/UnnecessaryFullyQualifiedName"/>
 </ruleset>
diff --git a/extensions-contrib/aliyun-oss-extensions/src/main/java/org/apache/druid/storage/aliyun/OssUtils.java b/extensions-contrib/aliyun-oss-extensions/src/main/java/org/apache/druid/storage/aliyun/OssUtils.java
index c9ec689eccaa..b369870ed8c2 100644
--- a/extensions-contrib/aliyun-oss-extensions/src/main/java/org/apache/druid/storage/aliyun/OssUtils.java
+++ b/extensions-contrib/aliyun-oss-extensions/src/main/java/org/apache/druid/storage/aliyun/OssUtils.java
@@ -227,7 +227,7 @@ private static void deleteBucketKeys(
       throws Exception
   {
     DeleteObjectsRequest deleteRequest = new DeleteObjectsRequest(bucket).withKeys(keysToDelete);
-    OssUtils.retry(() -> {
+    retry(() -> {
       client.deleteObjects(deleteRequest);
       return null;
     });
diff --git a/extensions-contrib/compressed-bigdecimal/src/main/java/org/apache/druid/compressedbigdecimal/Utils.java b/extensions-contrib/compressed-bigdecimal/src/main/java/org/apache/druid/compressedbigdecimal/Utils.java
index a214bfd057a8..b02765f92ccd 100644
--- a/extensions-contrib/compressed-bigdecimal/src/main/java/org/apache/druid/compressedbigdecimal/Utils.java
+++ b/extensions-contrib/compressed-bigdecimal/src/main/java/org/apache/druid/compressedbigdecimal/Utils.java
@@ -128,7 +128,7 @@ public static CompressedBigDecimal objToCompressedBigDecimalWithScale(
       boolean strictNumberParse
   )
   {
-    CompressedBigDecimal compressedBigDecimal = Utils.objToCompressedBigDecimal(obj, strictNumberParse);
+    CompressedBigDecimal compressedBigDecimal = objToCompressedBigDecimal(obj, strictNumberParse);
 
     if (compressedBigDecimal != null) {
       return scaleIfNeeded(compressedBigDecimal, scale);
diff --git a/extensions-contrib/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/common/PeonPhase.java b/extensions-contrib/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/common/PeonPhase.java
index 6efcd34872b8..db155269d4fd 100644
--- a/extensions-contrib/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/common/PeonPhase.java
+++ b/extensions-contrib/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/common/PeonPhase.java
@@ -34,7 +34,7 @@ public enum PeonPhase
   UNKNOWN("Unknown"),
   RUNNING("Running");
 
-  private static final Map<String, PeonPhase> PHASE_MAP = Arrays.stream(PeonPhase.values())
+  private static final Map<String, PeonPhase> PHASE_MAP = Arrays.stream(values())
                                                                 .collect(Collectors.toMap(
                                                                     PeonPhase::getPhase,
                                                                     Function.identity()
diff --git a/extensions-contrib/rabbit-stream-indexing-service/src/main/java/org/apache/druid/indexing/rabbitstream/supervisor/RabbitStreamSupervisorTuningConfig.java b/extensions-contrib/rabbit-stream-indexing-service/src/main/java/org/apache/druid/indexing/rabbitstream/supervisor/RabbitStreamSupervisorTuningConfig.java
index a2667026fffd..6b8640144854 100644
--- a/extensions-contrib/rabbit-stream-indexing-service/src/main/java/org/apache/druid/indexing/rabbitstream/supervisor/RabbitStreamSupervisorTuningConfig.java
+++ b/extensions-contrib/rabbit-stream-indexing-service/src/main/java/org/apache/druid/indexing/rabbitstream/supervisor/RabbitStreamSupervisorTuningConfig.java
@@ -173,9 +173,7 @@ public Duration getShutdownTimeout()
   public Duration getRepartitionTransitionDuration()
   {
     // just return a default for now.
-    return SeekableStreamSupervisorTuningConfig.defaultDuration(
-        null,
-        SeekableStreamSupervisorTuningConfig.DEFAULT_REPARTITION_TRANSITION_DURATION);
+    return SeekableStreamSupervisorTuningConfig.defaultDuration(null, DEFAULT_REPARTITION_TRANSITION_DURATION);
   }
 
   @Override
diff --git a/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/hll/HllSketchHolder.java b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/hll/HllSketchHolder.java
index df0b884eaaec..a79c4a5c4ab4 100644
--- a/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/hll/HllSketchHolder.java
+++ b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/hll/HllSketchHolder.java
@@ -38,15 +38,15 @@ public static HllSketchHolder fromObj(Object obj)
     if (obj instanceof HllSketchHolder) {
       return (HllSketchHolder) obj;
     } else if (obj instanceof HllSketch) {
-      return HllSketchHolder.of((HllSketch) obj);
+      return of((HllSketch) obj);
     } else if (obj instanceof Union) {
-      return HllSketchHolder.of((Union) obj);
+      return of((Union) obj);
     } else if (obj instanceof byte[]) {
-      return HllSketchHolder.of(HllSketch.heapify((byte[]) obj));
+      return of(HllSketch.heapify((byte[]) obj));
     } else if (obj instanceof Memory) {
-      return HllSketchHolder.of(HllSketch.wrap((Memory) obj));
+      return of(HllSketch.wrap((Memory) obj));
     } else if (obj instanceof String) {
-      return HllSketchHolder.of(HllSketch.heapify(StringUtils.decodeBase64(StringUtils.toUtf8((String) obj))));
+      return of(HllSketch.heapify(StringUtils.decodeBase64(StringUtils.toUtf8((String) obj))));
     }
 
     throw new ISE("Object is not of a type[%s] that can be deserialized to sketch.", obj.getClass());
diff --git a/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/theta/SketchHolder.java b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/theta/SketchHolder.java
index 0d1ac2f1becf..a2445590ecb6 100644
--- a/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/theta/SketchHolder.java
+++ b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/theta/SketchHolder.java
@@ -45,7 +45,7 @@
  */
 public class SketchHolder
 {
-  public static final SketchHolder EMPTY = SketchHolder.of(
+  public static final SketchHolder EMPTY = of(
       Sketches.updateSketchBuilder()
               .build()
               .compact(true, null)
@@ -195,7 +195,7 @@ public static SketchHolder combine(Object o1, Object o2, int nomEntries)
       Union union = (Union) SetOperation.builder().setNominalEntries(nomEntries).build(Family.UNION);
       holder1.updateUnion(union);
       holder2.updateUnion(union);
-      return SketchHolder.of(union);
+      return of(union);
     }
   }
 
@@ -208,15 +208,15 @@ void invalidateCache()
   public static SketchHolder deserialize(Object serializedSketch)
   {
     if (serializedSketch instanceof String) {
-      return SketchHolder.of(deserializeFromBase64EncodedString((String) serializedSketch));
+      return of(deserializeFromBase64EncodedString((String) serializedSketch));
     } else if (serializedSketch instanceof byte[]) {
-      return SketchHolder.of(deserializeFromByteArray((byte[]) serializedSketch));
+      return of(deserializeFromByteArray((byte[]) serializedSketch));
     } else if (serializedSketch instanceof SketchHolder) {
       return (SketchHolder) serializedSketch;
     } else if (serializedSketch instanceof Sketch
                || serializedSketch instanceof Union
                || serializedSketch instanceof Memory) {
-      return SketchHolder.of(serializedSketch);
+      return of(serializedSketch);
     }
 
     throw new ISE(
@@ -228,9 +228,9 @@ public static SketchHolder deserialize(Object serializedSketch)
   public static SketchHolder deserializeSafe(Object serializedSketch)
   {
     if (serializedSketch instanceof String) {
-      return SketchHolder.of(deserializeFromBase64EncodedStringSafe((String) serializedSketch));
+      return of(deserializeFromBase64EncodedStringSafe((String) serializedSketch));
     } else if (serializedSketch instanceof byte[]) {
-      return SketchHolder.of(deserializeFromByteArraySafe((byte[]) serializedSketch));
+      return of(deserializeFromByteArraySafe((byte[]) serializedSketch));
     }
 
     return deserialize(serializedSketch);
@@ -285,13 +285,13 @@ public static SketchHolder sketchSetOperation(Func func, int sketchSize, Object.
         for (Object o : holders) {
           ((SketchHolder) o).updateUnion(union);
         }
-        return SketchHolder.of(union);
+        return of(union);
       case INTERSECT:
         Intersection intersection = (Intersection) SetOperation.builder().setNominalEntries(sketchSize).build(Family.INTERSECTION);
         for (Object o : holders) {
           intersection.intersect(((SketchHolder) o).getSketch());
         }
-        return SketchHolder.of(intersection.getResult(false, null));
+        return of(intersection.getResult(false, null));
       case NOT:
         if (holders.length < 1) {
           throw new IllegalArgumentException("A-Not-B requires at least 1 sketch");
@@ -306,7 +306,7 @@ public static SketchHolder sketchSetOperation(Func func, int sketchSize, Object.
           AnotB anotb = (AnotB) SetOperation.builder().setNominalEntries(sketchSize).build(Family.A_NOT_B);
           result = anotb.aNotB(result, ((SketchHolder) holders[i]).getSketch());
         }
-        return SketchHolder.of(result);
+        return of(result);
       default:
         throw new IllegalArgumentException("Unknown sketch operation " + func);
     }
diff --git a/extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/BasicAuthUtils.java b/extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/BasicAuthUtils.java
index 5169ae56d8e6..410fb679c61d 100644
--- a/extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/BasicAuthUtils.java
+++ b/extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/BasicAuthUtils.java
@@ -172,7 +172,7 @@ public static Map<String, BasicAuthorizerUser> deserializeAuthorizerUserMap(
       userMap = new HashMap<>();
     } else {
       try {
-        userMap = objectMapper.readValue(userMapBytes, BasicAuthUtils.AUTHORIZER_USER_MAP_TYPE_REFERENCE);
+        userMap = objectMapper.readValue(userMapBytes, AUTHORIZER_USER_MAP_TYPE_REFERENCE);
       }
       catch (IOException ioe) {
         throw new RuntimeException("Couldn't deserialize authorizer userMap!", ioe);
@@ -201,7 +201,7 @@ public static Map<String, BasicAuthorizerGroupMapping> deserializeAuthorizerGrou
       groupMappingMap = new HashMap<>();
     } else {
       try {
-        groupMappingMap = objectMapper.readValue(groupMappingMapBytes, BasicAuthUtils.AUTHORIZER_GROUP_MAPPING_MAP_TYPE_REFERENCE);
+        groupMappingMap = objectMapper.readValue(groupMappingMapBytes, AUTHORIZER_GROUP_MAPPING_MAP_TYPE_REFERENCE);
       }
       catch (IOException ioe) {
         throw new RuntimeException("Couldn't deserialize authorizer groupMappingMap!", ioe);
@@ -230,7 +230,7 @@ public static Map<String, BasicAuthorizerRole> deserializeAuthorizerRoleMap(
       roleMap = new HashMap<>();
     } else {
       try {
-        roleMap = objectMapper.readValue(roleMapBytes, BasicAuthUtils.AUTHORIZER_ROLE_MAP_TYPE_REFERENCE);
+        roleMap = objectMapper.readValue(roleMapBytes, AUTHORIZER_ROLE_MAP_TYPE_REFERENCE);
       }
       catch (IOException ioe) {
         throw new RuntimeException("Couldn't deserialize authorizer roleMap!", ioe);
diff --git a/extensions-core/druid-catalog/src/main/java/org/apache/druid/catalog/CatalogException.java b/extensions-core/druid-catalog/src/main/java/org/apache/druid/catalog/CatalogException.java
index c09fe35a5a14..e7a7d63e1ecb 100644
--- a/extensions-core/druid-catalog/src/main/java/org/apache/druid/catalog/CatalogException.java
+++ b/extensions-core/druid-catalog/src/main/java/org/apache/druid/catalog/CatalogException.java
@@ -79,7 +79,7 @@ public CatalogException(
   public static CatalogException badRequest(String msg, Object...args)
   {
     return new CatalogException(
-        CatalogException.INVALID_ERROR,
+        INVALID_ERROR,
         Response.Status.BAD_REQUEST,
         msg,
         args
diff --git a/extensions-core/hdfs-storage/src/main/java/org/apache/druid/storage/hdfs/HdfsStorageDruidModule.java b/extensions-core/hdfs-storage/src/main/java/org/apache/druid/storage/hdfs/HdfsStorageDruidModule.java
index e2c79785fe4f..159c247becc3 100644
--- a/extensions-core/hdfs-storage/src/main/java/org/apache/druid/storage/hdfs/HdfsStorageDruidModule.java
+++ b/extensions-core/hdfs-storage/src/main/java/org/apache/druid/storage/hdfs/HdfsStorageDruidModule.java
@@ -65,9 +65,9 @@ public List<? extends Module> getJacksonModules()
   {
     return Collections.singletonList(
         new SimpleModule().registerSubtypes(
-            new NamedType(HdfsLoadSpec.class, HdfsStorageDruidModule.SCHEME),
-            new NamedType(HdfsInputSource.class, HdfsStorageDruidModule.SCHEME),
-            new NamedType(HdfsInputSourceFactory.class, HdfsStorageDruidModule.SCHEME)
+            new NamedType(HdfsLoadSpec.class, SCHEME),
+            new NamedType(HdfsInputSource.class, SCHEME),
+            new NamedType(HdfsInputSourceFactory.class, SCHEME)
         )
     );
   }
diff --git a/extensions-core/kafka-indexing-service/src/main/java/org/apache/druid/indexing/kafka/supervisor/KafkaSupervisorTuningConfig.java b/extensions-core/kafka-indexing-service/src/main/java/org/apache/druid/indexing/kafka/supervisor/KafkaSupervisorTuningConfig.java
index 1e0b35874090..4186837bbb00 100644
--- a/extensions-core/kafka-indexing-service/src/main/java/org/apache/druid/indexing/kafka/supervisor/KafkaSupervisorTuningConfig.java
+++ b/extensions-core/kafka-indexing-service/src/main/java/org/apache/druid/indexing/kafka/supervisor/KafkaSupervisorTuningConfig.java
@@ -169,7 +169,7 @@ public Duration getRepartitionTransitionDuration()
     // just return a default for now.
     return SeekableStreamSupervisorTuningConfig.defaultDuration(
         null,
-        SeekableStreamSupervisorTuningConfig.DEFAULT_REPARTITION_TRANSITION_DURATION
+        DEFAULT_REPARTITION_TRANSITION_DURATION
     );
   }
 
diff --git a/extensions-core/kubernetes-extensions/src/main/java/org/apache/druid/k8s/discovery/DefaultK8sApiClient.java b/extensions-core/kubernetes-extensions/src/main/java/org/apache/druid/k8s/discovery/DefaultK8sApiClient.java
index 00ad6b76abb2..04ee4683274d 100644
--- a/extensions-core/kubernetes-extensions/src/main/java/org/apache/druid/k8s/discovery/DefaultK8sApiClient.java
+++ b/extensions-core/kubernetes-extensions/src/main/java/org/apache/druid/k8s/discovery/DefaultK8sApiClient.java
@@ -131,7 +131,7 @@ public boolean hasNext() throws SocketTimeoutException
           try {
             while (watch.hasNext()) {
               Watch.Response<V1Pod> item = watch.next();
-              if (item != null && item.type != null && !item.type.equals(WatchResult.BOOKMARK)) {
+              if (item != null && item.type != null && !BOOKMARK.equals(item.type)) {
                 DiscoveryDruidNodeAndResourceVersion result = null;
                 if (item.object != null) {
                   result = new DiscoveryDruidNodeAndResourceVersion(
@@ -150,7 +150,7 @@ public boolean hasNext() throws SocketTimeoutException
                     result
                 );
                 return true;
-              } else if (item != null && item.type != null && item.type.equals(WatchResult.BOOKMARK)) {
+              } else if (item != null && item.type != null && BOOKMARK.equals(item.type)) {
                 // Events with type BOOKMARK will only contain resourceVersion and no metadata. See
                 // Kubernetes API documentation for details.
                 LOGGER.debug("BOOKMARK event fired, no nothing, only update resourceVersion");
diff --git a/extensions-core/kubernetes-extensions/src/main/java/org/apache/druid/k8s/discovery/K8sDruidNodeAnnouncer.java b/extensions-core/kubernetes-extensions/src/main/java/org/apache/druid/k8s/discovery/K8sDruidNodeAnnouncer.java
index f47fcfc0c9aa..184b766128f9 100644
--- a/extensions-core/kubernetes-extensions/src/main/java/org/apache/druid/k8s/discovery/K8sDruidNodeAnnouncer.java
+++ b/extensions-core/kubernetes-extensions/src/main/java/org/apache/druid/k8s/discovery/K8sDruidNodeAnnouncer.java
@@ -208,8 +208,8 @@ public static String getLabelSelectorForNodeRole(K8sDiscoveryConfig discoveryCon
         "%s=%s,%s=%s",
         getClusterIdentifierAnnouncementLabel(),
         discoveryConfig.getClusterIdentifier(),
-        K8sDruidNodeAnnouncer.getRoleAnnouncementLabel(nodeRole),
-        K8sDruidNodeAnnouncer.ANNOUNCEMENT_DONE
+        getRoleAnnouncementLabel(nodeRole),
+        ANNOUNCEMENT_DONE
     );
   }
 
@@ -219,9 +219,9 @@ public static String getLabelSelectorForNode(K8sDiscoveryConfig discoveryConfig,
         "%s=%s,%s=%s,%s=%s",
         getClusterIdentifierAnnouncementLabel(),
         discoveryConfig.getClusterIdentifier(),
-        K8sDruidNodeAnnouncer.getRoleAnnouncementLabel(nodeRole),
-        K8sDruidNodeAnnouncer.ANNOUNCEMENT_DONE,
-        K8sDruidNodeAnnouncer.getIdHashAnnouncementLabel(),
+        getRoleAnnouncementLabel(nodeRole),
+        ANNOUNCEMENT_DONE,
+        getIdHashAnnouncementLabel(),
         hashEncodeStringForLabelValue(node.getHostAndPortToUse())
     );
   }
diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/processor/SegmentGeneratorFrameProcessorFactory.java b/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/processor/SegmentGeneratorFrameProcessorFactory.java
index 1796df89bf71..039fb233e4c5 100644
--- a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/processor/SegmentGeneratorFrameProcessorFactory.java
+++ b/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/processor/SegmentGeneratorFrameProcessorFactory.java
@@ -287,7 +287,7 @@ private static AppenderatorConfig makeAppenderatorConfig(
       @Override
       public AppendableIndexSpec getAppendableIndexSpec()
       {
-        return TuningConfig.DEFAULT_APPENDABLE_INDEX;
+        return DEFAULT_APPENDABLE_INDEX;
       }
 
       @Override
@@ -346,7 +346,7 @@ public int getMaxPendingPersists()
       @Override
       public boolean isSkipBytesInMemoryOverheadCheck()
       {
-        return TuningConfig.DEFAULT_SKIP_BYTES_IN_MEMORY_OVERHEAD_CHECK;
+        return DEFAULT_SKIP_BYTES_IN_MEMORY_OVERHEAD_CHECK;
       }
 
       @Override
diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/querykit/QueryKitUtils.java b/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/querykit/QueryKitUtils.java
index bc0c64c251a7..ea6b00a8c867 100644
--- a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/querykit/QueryKitUtils.java
+++ b/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/querykit/QueryKitUtils.java
@@ -111,7 +111,7 @@ public static ClusterBy clusterByWithSegmentGranularity(
       return clusterBy;
     } else {
       final List<KeyColumn> newColumns = new ArrayList<>(clusterBy.getColumns().size() + 1);
-      newColumns.add(new KeyColumn(QueryKitUtils.SEGMENT_GRANULARITY_COLUMN, KeyOrder.ASCENDING));
+      newColumns.add(new KeyColumn(SEGMENT_GRANULARITY_COLUMN, KeyOrder.ASCENDING));
       newColumns.addAll(clusterBy.getColumns());
       return new ClusterBy(newColumns, 1);
     }
@@ -123,10 +123,10 @@ public static ClusterBy clusterByWithSegmentGranularity(
    */
   public static void verifyRowSignature(final RowSignature signature)
   {
-    if (signature.contains(QueryKitUtils.PARTITION_BOOST_COLUMN)) {
-      throw new MSQException(new ColumnNameRestrictedFault(QueryKitUtils.PARTITION_BOOST_COLUMN));
-    } else if (signature.contains(QueryKitUtils.SEGMENT_GRANULARITY_COLUMN)) {
-      throw new MSQException(new ColumnNameRestrictedFault(QueryKitUtils.SEGMENT_GRANULARITY_COLUMN));
+    if (signature.contains(PARTITION_BOOST_COLUMN)) {
+      throw new MSQException(new ColumnNameRestrictedFault(PARTITION_BOOST_COLUMN));
+    } else if (signature.contains(SEGMENT_GRANULARITY_COLUMN)) {
+      throw new MSQException(new ColumnNameRestrictedFault(SEGMENT_GRANULARITY_COLUMN));
     }
   }
 
@@ -144,7 +144,7 @@ public static RowSignature signatureWithSegmentGranularity(
     } else {
       return RowSignature.builder()
                          .addAll(signature)
-                         .add(QueryKitUtils.SEGMENT_GRANULARITY_COLUMN, ColumnType.LONG)
+                         .add(SEGMENT_GRANULARITY_COLUMN, ColumnType.LONG)
                          .build();
     }
   }
@@ -194,8 +194,8 @@ public static RowSignature sortableSignature(
   public static VirtualColumn makeSegmentGranularityVirtualColumn(final ObjectMapper jsonMapper, final QueryContext queryContext)
   {
     final Granularity segmentGranularity =
-        QueryKitUtils.getSegmentGranularityFromContext(jsonMapper, queryContext.asMap());
-    final String timeColumnName = queryContext.getString(QueryKitUtils.CTX_TIME_COLUMN_NAME);
+        getSegmentGranularityFromContext(jsonMapper, queryContext.asMap());
+    final String timeColumnName = queryContext.getString(CTX_TIME_COLUMN_NAME);
 
     if (timeColumnName == null || Granularities.ALL.equals(segmentGranularity)) {
       return null;
@@ -213,7 +213,7 @@ public static VirtualColumn makeSegmentGranularityVirtualColumn(final ObjectMapp
     }
 
     return new ExpressionVirtualColumn(
-        QueryKitUtils.SEGMENT_GRANULARITY_COLUMN,
+        SEGMENT_GRANULARITY_COLUMN,
         StringUtils.format(
             "timestamp_floor(%s, %s)",
             CalciteSqlDialect.DEFAULT.quoteIdentifier(timeColumnName),
diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/sql/MSQMode.java b/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/sql/MSQMode.java
index d2f017b04dd6..3685b876c93f 100644
--- a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/sql/MSQMode.java
+++ b/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/sql/MSQMode.java
@@ -50,7 +50,7 @@ public enum MSQMode
   @Nullable
   public static MSQMode fromString(String str)
   {
-    for (MSQMode msqMode : MSQMode.values()) {
+    for (MSQMode msqMode : values()) {
       if (msqMode.value.equalsIgnoreCase(str)) {
         return msqMode;
       }
@@ -66,12 +66,12 @@ public String toString()
 
   public static void populateDefaultQueryContext(final String modeStr, final Map<String, Object> originalQueryContext)
   {
-    MSQMode mode = MSQMode.fromString(modeStr);
+    MSQMode mode = fromString(modeStr);
     if (mode == null) {
       throw new ISE(
           "%s is an unknown multi stage query mode. Acceptable modes: %s",
           modeStr,
-          Arrays.stream(MSQMode.values()).map(m -> m.value).collect(Collectors.toList())
+          Arrays.stream(values()).map(m -> m.value).collect(Collectors.toList())
       );
     }
     log.debug("Populating default query context with %s for the %s multi stage query mode", mode.defaultQueryContext, mode);
diff --git a/extensions-core/s3-extensions/src/main/java/org/apache/druid/storage/s3/S3Utils.java b/extensions-core/s3-extensions/src/main/java/org/apache/druid/storage/s3/S3Utils.java
index ecea31c94f74..0e7dd016ae2a 100644
--- a/extensions-core/s3-extensions/src/main/java/org/apache/druid/storage/s3/S3Utils.java
+++ b/extensions-core/s3-extensions/src/main/java/org/apache/druid/storage/s3/S3Utils.java
@@ -327,7 +327,7 @@ public static void deleteBucketKeys(
       log.debug("Deleting keys from bucket: [%s], keys: [%s]", bucket, keys);
     }
     DeleteObjectsRequest deleteRequest = new DeleteObjectsRequest(bucket).withKeys(keysToDelete);
-    S3Utils.retryS3Operation(() -> {
+    retryS3Operation(() -> {
       s3Client.deleteObjects(deleteRequest);
       return null;
     }, retries);
@@ -353,7 +353,7 @@ static void uploadFileIfPossible(
     final PutObjectRequest putObjectRequest = new PutObjectRequest(bucket, key, file);
 
     if (!disableAcl) {
-      putObjectRequest.setAccessControlList(S3Utils.grantFullControlToBucketOwner(service, bucket));
+      putObjectRequest.setAccessControlList(grantFullControlToBucketOwner(service, bucket));
     }
     log.info("Pushing [%s] to bucket[%s] and key[%s].", file, bucket, key);
     service.putObject(putObjectRequest);
diff --git a/indexing-hadoop/src/main/java/org/apache/druid/indexer/DeterminePartitionsJob.java b/indexing-hadoop/src/main/java/org/apache/druid/indexer/DeterminePartitionsJob.java
index d7e4eb2e10dc..7b0973826295 100644
--- a/indexing-hadoop/src/main/java/org/apache/druid/indexer/DeterminePartitionsJob.java
+++ b/indexing-hadoop/src/main/java/org/apache/druid/indexer/DeterminePartitionsJob.java
@@ -958,7 +958,7 @@ public void close(TaskAttemptContext context)
     @Override
     public void checkOutputSpecs(JobContext job) throws IOException
     {
-      Path outDir = FileOutputFormat.getOutputPath(job);
+      Path outDir = getOutputPath(job);
       if (outDir == null) {
         throw new InvalidJobConfException("Output directory not set.");
       }
diff --git a/indexing-hadoop/src/main/java/org/apache/druid/indexer/HadoopDruidIndexerConfig.java b/indexing-hadoop/src/main/java/org/apache/druid/indexer/HadoopDruidIndexerConfig.java
index 246a068e4609..c38084813ff2 100644
--- a/indexing-hadoop/src/main/java/org/apache/druid/indexer/HadoopDruidIndexerConfig.java
+++ b/indexing-hadoop/src/main/java/org/apache/druid/indexer/HadoopDruidIndexerConfig.java
@@ -148,13 +148,13 @@ private static HadoopDruidIndexerConfig fromMap(Map<String, Object> argSpec)
     // the Map<> intermediary
 
     if (argSpec.containsKey("spec")) {
-      return HadoopDruidIndexerConfig.JSON_MAPPER.convertValue(
+      return JSON_MAPPER.convertValue(
           argSpec,
           HadoopDruidIndexerConfig.class
       );
     }
     return new HadoopDruidIndexerConfig(
-        HadoopDruidIndexerConfig.JSON_MAPPER.convertValue(
+        JSON_MAPPER.convertValue(
             argSpec,
             HadoopIngestionSpec.class
         )
@@ -166,7 +166,7 @@ public static HadoopDruidIndexerConfig fromFile(File file)
   {
     try {
       return fromMap(
-          HadoopDruidIndexerConfig.JSON_MAPPER.readValue(file, JacksonUtils.TYPE_REFERENCE_MAP_STRING_OBJECT)
+          JSON_MAPPER.readValue(file, JacksonUtils.TYPE_REFERENCE_MAP_STRING_OBJECT)
       );
     }
     catch (IOException e) {
@@ -180,7 +180,7 @@ public static HadoopDruidIndexerConfig fromString(String str)
     // This is a map to try and prevent dependency screwbally-ness
     try {
       return fromMap(
-          HadoopDruidIndexerConfig.JSON_MAPPER.readValue(str, JacksonUtils.TYPE_REFERENCE_MAP_STRING_OBJECT)
+          JSON_MAPPER.readValue(str, JacksonUtils.TYPE_REFERENCE_MAP_STRING_OBJECT)
       );
     }
     catch (IOException e) {
@@ -197,7 +197,7 @@ public static HadoopDruidIndexerConfig fromDistributedFileSystem(String path)
       Reader reader = new InputStreamReader(fs.open(pt), StandardCharsets.UTF_8);
 
       return fromMap(
-          HadoopDruidIndexerConfig.JSON_MAPPER.readValue(reader, JacksonUtils.TYPE_REFERENCE_MAP_STRING_OBJECT)
+          JSON_MAPPER.readValue(reader, JacksonUtils.TYPE_REFERENCE_MAP_STRING_OBJECT)
       );
     }
     catch (Exception e) {
@@ -207,7 +207,7 @@ public static HadoopDruidIndexerConfig fromDistributedFileSystem(String path)
 
   public static HadoopDruidIndexerConfig fromConfiguration(Configuration conf)
   {
-    final HadoopDruidIndexerConfig retVal = fromString(conf.get(HadoopDruidIndexerConfig.CONFIG_PROPERTY));
+    final HadoopDruidIndexerConfig retVal = fromString(conf.get(CONFIG_PROPERTY));
     retVal.verify();
     return retVal;
   }
@@ -590,7 +590,7 @@ public void intoConfiguration(Job job)
     Configuration conf = job.getConfiguration();
 
     try {
-      conf.set(HadoopDruidIndexerConfig.CONFIG_PROPERTY, HadoopDruidIndexerConfig.JSON_MAPPER.writeValueAsString(this));
+      conf.set(CONFIG_PROPERTY, JSON_MAPPER.writeValueAsString(this));
     }
     catch (IOException e) {
       throw new RuntimeException(e);
diff --git a/indexing-hadoop/src/main/java/org/apache/druid/indexer/HadoopTuningConfig.java b/indexing-hadoop/src/main/java/org/apache/druid/indexer/HadoopTuningConfig.java
index 9da6ead38cf1..dfc3a4c69355 100644
--- a/indexing-hadoop/src/main/java/org/apache/druid/indexer/HadoopTuningConfig.java
+++ b/indexing-hadoop/src/main/java/org/apache/druid/indexer/HadoopTuningConfig.java
@@ -188,9 +188,9 @@ public HadoopTuningConfig(
     this.ignoreInvalidRows = Configs.valueOrDefault(ignoreInvalidRows, false);
     this.maxParseExceptions = Configs.valueOrDefault(
         maxParseExceptions,
-        this.ignoreInvalidRows ? TuningConfig.DEFAULT_MAX_PARSE_EXCEPTIONS : 0
+        this.ignoreInvalidRows ? DEFAULT_MAX_PARSE_EXCEPTIONS : 0
     );
-    this.logParseExceptions = Configs.valueOrDefault(logParseExceptions, TuningConfig.DEFAULT_LOG_PARSE_EXCEPTIONS);
+    this.logParseExceptions = Configs.valueOrDefault(logParseExceptions, DEFAULT_LOG_PARSE_EXCEPTIONS);
     this.useYarnRMJobStatusFallback = Configs.valueOrDefault(useYarnRMJobStatusFallback, true);
 
     if (awaitSegmentAvailabilityTimeoutMillis == null || awaitSegmentAvailabilityTimeoutMillis < 0) {
diff --git a/indexing-hadoop/src/main/java/org/apache/druid/indexer/JobHelper.java b/indexing-hadoop/src/main/java/org/apache/druid/indexer/JobHelper.java
index 6b1b84d02d7a..538b2eaecea1 100644
--- a/indexing-hadoop/src/main/java/org/apache/druid/indexer/JobHelper.java
+++ b/indexing-hadoop/src/main/java/org/apache/druid/indexer/JobHelper.java
@@ -413,9 +413,9 @@ public static void maybeDeleteIntermediatePath(
     authenticate();
 
     HadoopDruidIndexerConfig config = HadoopDruidIndexerConfig.fromSpec(indexerSchema);
-    final Configuration configuration = JobHelper.injectSystemProperties(new Configuration(), config);
+    final Configuration configuration = injectSystemProperties(new Configuration(), config);
     config.addJobProperties(configuration);
-    JobHelper.injectDruidProperties(configuration, config);
+    injectDruidProperties(configuration, config);
     if (!config.getSchema().getTuningConfig().isLeaveIntermediate()) {
       if (jobSucceeded || config.getSchema().getTuningConfig().isCleanupOnFailure()) {
         Path workingPath = config.makeIntermediatePath();
@@ -619,7 +619,7 @@ public static Path makeTmpPath(
         prependFSIfNullScheme(fs, basePath),
         StringUtils.format(
             "./%s.%d",
-            dataSegmentPusher.makeIndexPathName(segmentTemplate, JobHelper.INDEX_ZIP),
+            dataSegmentPusher.makeIndexPathName(segmentTemplate, INDEX_ZIP),
             taskAttemptID.getId()
         )
     );
@@ -640,9 +640,9 @@ public static void renameIndexFilesForSegments(
   ) throws IOException
   {
     HadoopDruidIndexerConfig config = HadoopDruidIndexerConfig.fromSpec(indexerSchema);
-    final Configuration configuration = JobHelper.injectSystemProperties(new Configuration(), config);
+    final Configuration configuration = injectSystemProperties(new Configuration(), config);
     config.addJobProperties(configuration);
-    JobHelper.injectDruidProperties(configuration, config);
+    injectDruidProperties(configuration, config);
     for (DataSegmentAndIndexZipFilePath segmentAndIndexZipFilePath : segmentAndIndexZipFilePaths) {
       Path tmpPath = new Path(segmentAndIndexZipFilePath.getTmpIndexZipFilePath());
       Path finalIndexZipFilePath = new Path(segmentAndIndexZipFilePath.getFinalIndexZipFilePath());
diff --git a/indexing-hadoop/src/main/java/org/apache/druid/indexer/hadoop/DatasourceInputFormat.java b/indexing-hadoop/src/main/java/org/apache/druid/indexer/hadoop/DatasourceInputFormat.java
index 0937c19bd569..dee0d11b10dd 100644
--- a/indexing-hadoop/src/main/java/org/apache/druid/indexer/hadoop/DatasourceInputFormat.java
+++ b/indexing-hadoop/src/main/java/org/apache/druid/indexer/hadoop/DatasourceInputFormat.java
@@ -160,7 +160,7 @@ protected FileStatus[] listStatus(JobConf job) throws IOException
         {
           // to avoid globbing which needs input path should be hadoop-compatible (':' is not acceptable in path, etc.)
           List<FileStatus> statusList = new ArrayList<>();
-          for (Path path : FileInputFormat.getInputPaths(job)) {
+          for (Path path : getInputPaths(job)) {
             // load spec in segment points specifically zip file itself
             statusList.add(path.getFileSystem(job).getFileStatus(path));
           }
diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/common/task/AbstractBatchIndexTask.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/AbstractBatchIndexTask.java
index 0f124389399e..fe7f1e1134fc 100644
--- a/indexing-service/src/main/java/org/apache/druid/indexing/common/task/AbstractBatchIndexTask.java
+++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/AbstractBatchIndexTask.java
@@ -812,7 +812,7 @@ public static NonnullPair<Interval, String> findIntervalAndVersion(
         throw new ISE("Unspecified interval[%s] in granularitySpec[%s]", interval, granularitySpec);
       }
 
-      version = AbstractBatchIndexTask.findVersion(versions, interval);
+      version = findVersion(versions, interval);
       if (version == null) {
         throw new ISE("Cannot find a version for interval[%s]", interval);
       }
@@ -820,7 +820,7 @@ public static NonnullPair<Interval, String> findIntervalAndVersion(
       // We don't have explicit intervals. We can use the segment granularity to figure out what
       // interval we need, but we might not have already locked it.
       interval = granularitySpec.getSegmentGranularity().bucket(timestamp);
-      final String existingLockVersion = AbstractBatchIndexTask.findVersion(versions, interval);
+      final String existingLockVersion = findVersion(versions, interval);
       if (existingLockVersion == null) {
         if (ingestionSpec.getTuningConfig() instanceof ParallelIndexTuningConfig) {
           final int maxAllowedLockCount = ((ParallelIndexTuningConfig) ingestionSpec.getTuningConfig())
diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/common/task/HadoopIndexTask.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/HadoopIndexTask.java
index 81721cabb44b..61f647ea5059 100644
--- a/indexing-service/src/main/java/org/apache/druid/indexing/common/task/HadoopIndexTask.java
+++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/HadoopIndexTask.java
@@ -535,7 +535,7 @@ private void killHadoopJob()
       String hadoopJobIdFile = getHadoopJobIdFileName();
 
       try {
-        ClassLoader loader = HadoopTask.buildClassLoader(
+        ClassLoader loader = buildClassLoader(
             getHadoopDependencyCoordinates(),
             taskConfig.getDefaultHadoopCoordinates()
         );
@@ -616,7 +616,7 @@ private void indexerGeneratorCleanupJob(
 
     final ClassLoader oldLoader = Thread.currentThread().getContextClassLoader();
     try {
-      ClassLoader loader = HadoopTask.buildClassLoader(
+      ClassLoader loader = buildClassLoader(
           getHadoopDependencyCoordinates(),
           taskConfig.getDefaultHadoopCoordinates()
       );
diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/common/task/IndexTask.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/IndexTask.java
index 9c114d3403f1..d745a8934315 100644
--- a/indexing-service/src/main/java/org/apache/druid/indexing/common/task/IndexTask.java
+++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/IndexTask.java
@@ -81,7 +81,6 @@
 import org.apache.druid.segment.indexing.BatchIOConfig;
 import org.apache.druid.segment.indexing.DataSchema;
 import org.apache.druid.segment.indexing.IngestionSpec;
-import org.apache.druid.segment.indexing.TuningConfig;
 import org.apache.druid.segment.indexing.granularity.ArbitraryGranularitySpec;
 import org.apache.druid.segment.indexing.granularity.GranularitySpec;
 import org.apache.druid.segment.realtime.ChatHandler;
@@ -742,7 +741,7 @@ private Map<Interval, Optional<HyperLogLogCollector>> collectIntervalsAndShardSp
         Comparators.intervalsByStartThenEnd()
     );
     final Granularity queryGranularity = granularitySpec.getQueryGranularity();
-    try (final CloseableIterator<InputRow> inputRowIterator = AbstractBatchIndexTask.inputSourceReader(
+    try (final CloseableIterator<InputRow> inputRowIterator = inputSourceReader(
         tmpDir,
         ingestionSchema.getDataSchema(),
         inputSource,
@@ -1070,7 +1069,7 @@ public IndexIngestionSpec(
         throw new IAE("Cannot use parser and inputSource together. Try using inputFormat instead of parser.");
       }
 
-      IngestionMode ingestionMode = AbstractTask.computeBatchIngestionMode(ioConfig);
+      IngestionMode ingestionMode = computeBatchIngestionMode(ioConfig);
 
       if (ingestionMode == IngestionMode.REPLACE && dataSchema.getGranularitySpec()
                                                               .inputIntervals()
@@ -1133,8 +1132,8 @@ public IndexIOConfig(
     {
       this.inputSource = inputSource;
       this.inputFormat = inputFormat;
-      this.appendToExisting = appendToExisting == null ? BatchIOConfig.DEFAULT_APPEND_EXISTING : appendToExisting;
-      this.dropExisting = dropExisting == null ? BatchIOConfig.DEFAULT_DROP_EXISTING : dropExisting;
+      this.appendToExisting = appendToExisting == null ? DEFAULT_APPEND_EXISTING : appendToExisting;
+      this.dropExisting = dropExisting == null ? DEFAULT_DROP_EXISTING : dropExisting;
     }
 
     @Nullable
@@ -1367,7 +1366,7 @@ private IndexTuningConfig(
     )
     {
       this.appendableIndexSpec = appendableIndexSpec == null ? DEFAULT_APPENDABLE_INDEX : appendableIndexSpec;
-      this.maxRowsInMemory = maxRowsInMemory == null ? TuningConfig.DEFAULT_MAX_ROWS_IN_MEMORY_BATCH : maxRowsInMemory;
+      this.maxRowsInMemory = maxRowsInMemory == null ? DEFAULT_MAX_ROWS_IN_MEMORY_BATCH : maxRowsInMemory;
       // initializing this to 0, it will be lazily initialized to a value
       // @see #getMaxBytesInMemoryOrDefault()
       this.maxBytesInMemory = maxBytesInMemory == null ? 0 : maxBytesInMemory;
@@ -1395,14 +1394,14 @@ private IndexTuningConfig(
         this.maxSavedParseExceptions = maxSavedParseExceptions == null ? 0 : Math.min(1, maxSavedParseExceptions);
       } else {
         this.maxParseExceptions = maxParseExceptions == null
-                                  ? TuningConfig.DEFAULT_MAX_PARSE_EXCEPTIONS
+                                  ? DEFAULT_MAX_PARSE_EXCEPTIONS
                                   : maxParseExceptions;
         this.maxSavedParseExceptions = maxSavedParseExceptions == null
-                                       ? TuningConfig.DEFAULT_MAX_SAVED_PARSE_EXCEPTIONS
+                                       ? DEFAULT_MAX_SAVED_PARSE_EXCEPTIONS
                                        : maxSavedParseExceptions;
       }
       this.logParseExceptions = logParseExceptions == null
-                                ? TuningConfig.DEFAULT_LOG_PARSE_EXCEPTIONS
+                                ? DEFAULT_LOG_PARSE_EXCEPTIONS
                                 : logParseExceptions;
       if (awaitSegmentAvailabilityTimeoutMillis == null || awaitSegmentAvailabilityTimeoutMillis < 0) {
         this.awaitSegmentAvailabilityTimeoutMillis = DEFAULT_AWAIT_SEGMENT_AVAILABILITY_TIMEOUT_MILLIS;
diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/common/task/IndexTaskUtils.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/IndexTaskUtils.java
index 79a3e8993a8c..06a2da71f8aa 100644
--- a/indexing-service/src/main/java/org/apache/druid/indexing/common/task/IndexTaskUtils.java
+++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/IndexTaskUtils.java
@@ -138,12 +138,12 @@ public static void emitSegmentPublishMetrics(
   )
   {
     final ServiceMetricEvent.Builder metricBuilder = new ServiceMetricEvent.Builder();
-    IndexTaskUtils.setTaskDimensions(metricBuilder, task);
+    setTaskDimensions(metricBuilder, task);
 
     if (publishResult.isSuccess()) {
       toolbox.getEmitter().emit(metricBuilder.setMetric("segment/txn/success", 1));
       for (DataSegment segment : publishResult.getSegments()) {
-        IndexTaskUtils.setSegmentDimensions(metricBuilder, segment);
+        setSegmentDimensions(metricBuilder, segment);
         toolbox.getEmitter().emit(metricBuilder.setMetric("segment/added/bytes", segment.getSize()));
         toolbox.getEmitter().emit(SegmentMetadataEvent.create(segment, DateTimes.nowUtc()));
       }
diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/LegacySinglePhaseSubTask.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/LegacySinglePhaseSubTask.java
index d2694c7afd92..36853987a6dc 100644
--- a/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/LegacySinglePhaseSubTask.java
+++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/LegacySinglePhaseSubTask.java
@@ -54,7 +54,7 @@ public LegacySinglePhaseSubTask(
   @Override
   public String getType()
   {
-    return SinglePhaseSubTask.OLD_TYPE_NAME;
+    return OLD_TYPE_NAME;
   }
 
 }
diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/PartialDimensionCardinalityTask.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/PartialDimensionCardinalityTask.java
index d75304f38c08..67d97c62b815 100644
--- a/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/PartialDimensionCardinalityTask.java
+++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/PartialDimensionCardinalityTask.java
@@ -37,7 +37,6 @@
 import org.apache.druid.indexing.common.TaskToolbox;
 import org.apache.druid.indexing.common.actions.SurrogateTaskActionClient;
 import org.apache.druid.indexing.common.actions.TaskActionClient;
-import org.apache.druid.indexing.common.task.AbstractBatchIndexTask;
 import org.apache.druid.indexing.common.task.TaskResource;
 import org.apache.druid.java.util.common.granularity.Granularity;
 import org.apache.druid.java.util.common.parsers.CloseableIterator;
@@ -182,7 +181,7 @@ public TaskStatus runTask(TaskToolbox toolbox) throws Exception
         tuningConfig.getMaxSavedParseExceptions()
     );
     try (
-        final CloseableIterator<InputRow> inputRowIterator = AbstractBatchIndexTask.inputSourceReader(
+        final CloseableIterator<InputRow> inputRowIterator = inputSourceReader(
             toolbox.getIndexingTmpDir(),
             dataSchema,
             inputSource,
diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/PartialDimensionDistributionTask.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/PartialDimensionDistributionTask.java
index 4bb395420b3f..089424377aa4 100644
--- a/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/PartialDimensionDistributionTask.java
+++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/PartialDimensionDistributionTask.java
@@ -40,7 +40,6 @@
 import org.apache.druid.indexing.common.TaskToolbox;
 import org.apache.druid.indexing.common.actions.SurrogateTaskActionClient;
 import org.apache.druid.indexing.common.actions.TaskActionClient;
-import org.apache.druid.indexing.common.task.AbstractBatchIndexTask;
 import org.apache.druid.indexing.common.task.TaskResource;
 import org.apache.druid.indexing.common.task.batch.parallel.distribution.StringDistribution;
 import org.apache.druid.indexing.common.task.batch.parallel.distribution.StringSketch;
@@ -229,7 +228,7 @@ public TaskStatus runTask(TaskToolbox toolbox) throws Exception
         tuningConfig.getMaxSavedParseExceptions()
     );
     try (
-        final CloseableIterator<InputRow> inputRowIterator = AbstractBatchIndexTask.inputSourceReader(
+        final CloseableIterator<InputRow> inputRowIterator = inputSourceReader(
             toolbox.getIndexingTmpDir(),
             dataSchema,
             inputSource,
diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/PartialSegmentMergeTask.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/PartialSegmentMergeTask.java
index 17d9936c6851..fa4122904c5d 100644
--- a/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/PartialSegmentMergeTask.java
+++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/PartialSegmentMergeTask.java
@@ -32,7 +32,6 @@
 import org.apache.druid.indexing.common.actions.LockListAction;
 import org.apache.druid.indexing.common.actions.SurrogateAction;
 import org.apache.druid.indexing.common.actions.TaskActionClient;
-import org.apache.druid.indexing.common.task.AbstractBatchIndexTask;
 import org.apache.druid.indexing.common.task.TaskResource;
 import org.apache.druid.java.util.common.FileUtils;
 import org.apache.druid.java.util.common.ISE;
@@ -293,7 +292,7 @@ private DataSegmentsWithSchemas mergeAndPushSegments(
                 getDataSource(),
                 interval,
                 Preconditions.checkNotNull(
-                    AbstractBatchIndexTask.findVersion(intervalToVersion, interval),
+                    findVersion(intervalToVersion, interval),
                     "version for interval[%s]",
                     interval
                 ),
diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/SinglePhaseSubTask.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/SinglePhaseSubTask.java
index 8d49a7f3dbe7..db9dc26372c6 100644
--- a/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/SinglePhaseSubTask.java
+++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/SinglePhaseSubTask.java
@@ -38,8 +38,6 @@
 import org.apache.druid.indexing.common.actions.SurrogateTaskActionClient;
 import org.apache.druid.indexing.common.actions.TaskActionClient;
 import org.apache.druid.indexing.common.stats.TaskRealtimeMetricsMonitor;
-import org.apache.druid.indexing.common.task.AbstractBatchIndexTask;
-import org.apache.druid.indexing.common.task.AbstractTask;
 import org.apache.druid.indexing.common.task.BatchAppenderators;
 import org.apache.druid.indexing.common.task.IndexTask;
 import org.apache.druid.indexing.common.task.IndexTaskUtils;
@@ -165,7 +163,7 @@ public SinglePhaseSubTask(
         taskResource,
         ingestionSchema.getDataSchema().getDataSource(),
         context,
-        AbstractTask.computeBatchIngestionMode(ingestionSchema.getIOConfig()),
+        computeBatchIngestionMode(ingestionSchema.getIOConfig()),
         supervisorTaskId
     );
 
@@ -409,7 +407,7 @@ private DataSegmentsWithSchemas generateAndPushSegments(
     boolean exceptionOccurred = false;
     try (
         final BatchAppenderatorDriver driver = BatchAppenderators.newDriver(appenderator, toolbox, segmentAllocator);
-        final CloseableIterator<InputRow> inputRowIterator = AbstractBatchIndexTask.inputSourceReader(
+        final CloseableIterator<InputRow> inputRowIterator = inputSourceReader(
             tmpDir,
             dataSchema,
             inputSource,
diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/input/DruidInputSource.java b/indexing-service/src/main/java/org/apache/druid/indexing/input/DruidInputSource.java
index 84c17f1a8fa0..8f83a63057c7 100644
--- a/indexing-service/src/main/java/org/apache/druid/indexing/input/DruidInputSource.java
+++ b/indexing-service/src/main/java/org/apache/druid/indexing/input/DruidInputSource.java
@@ -397,7 +397,7 @@ public Stream<InputSplit<List<WindowedSegmentId>>> createSplits(
               coordinatorClient,
               dataSource,
               interval,
-              splitHintSpec == null ? SplittableInputSource.DEFAULT_SPLIT_HINT_SPEC : splitHintSpec
+              splitHintSpec == null ? DEFAULT_SPLIT_HINT_SPEC : splitHintSpec
           )
       );
     } else {
@@ -417,7 +417,7 @@ public int estimateNumSplits(InputFormat inputFormat, @Nullable SplitHintSpec sp
               coordinatorClient,
               dataSource,
               interval,
-              splitHintSpec == null ? SplittableInputSource.DEFAULT_SPLIT_HINT_SPEC : splitHintSpec
+              splitHintSpec == null ? DEFAULT_SPLIT_HINT_SPEC : splitHintSpec
           )
       );
     } else {
diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/overlord/QuotableWhiteSpaceSplitter.java b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/QuotableWhiteSpaceSplitter.java
index 88e11821abc7..49c8d1661502 100644
--- a/indexing-service/src/main/java/org/apache/druid/indexing/overlord/QuotableWhiteSpaceSplitter.java
+++ b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/QuotableWhiteSpaceSplitter.java
@@ -54,7 +54,7 @@ public boolean matches(char c)
             if (inQuotes) {
               return false;
             }
-            return CharMatcher.breakingWhitespace().matches(c);
+            return breakingWhitespace().matches(c);
           }
         }
     ).omitEmptyStrings().split(string).iterator();
diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/seekablestream/SeekableStreamIndexTaskTuningConfig.java b/indexing-service/src/main/java/org/apache/druid/indexing/seekablestream/SeekableStreamIndexTaskTuningConfig.java
index 309336e1d532..b802ffc044d5 100644
--- a/indexing-service/src/main/java/org/apache/druid/indexing/seekablestream/SeekableStreamIndexTaskTuningConfig.java
+++ b/indexing-service/src/main/java/org/apache/druid/indexing/seekablestream/SeekableStreamIndexTaskTuningConfig.java
@@ -23,7 +23,6 @@
 import org.apache.druid.indexer.partitions.DynamicPartitionsSpec;
 import org.apache.druid.segment.IndexSpec;
 import org.apache.druid.segment.incremental.AppendableIndexSpec;
-import org.apache.druid.segment.indexing.TuningConfig;
 import org.apache.druid.segment.realtime.appenderator.AppenderatorConfig;
 import org.apache.druid.segment.writeout.SegmentWriteOutMediumFactory;
 import org.joda.time.Period;
@@ -131,14 +130,14 @@ public SeekableStreamIndexTaskTuningConfig(
       this.maxSavedParseExceptions = maxSavedParseExceptions == null ? 0 : Math.min(1, maxSavedParseExceptions);
     } else {
       this.maxParseExceptions = maxParseExceptions == null
-                                ? TuningConfig.DEFAULT_MAX_PARSE_EXCEPTIONS
+                                ? DEFAULT_MAX_PARSE_EXCEPTIONS
                                 : maxParseExceptions;
       this.maxSavedParseExceptions = maxSavedParseExceptions == null
-                                     ? TuningConfig.DEFAULT_MAX_SAVED_PARSE_EXCEPTIONS
+                                     ? DEFAULT_MAX_SAVED_PARSE_EXCEPTIONS
                                      : maxSavedParseExceptions;
     }
     this.logParseExceptions = logParseExceptions == null
-                              ? TuningConfig.DEFAULT_LOG_PARSE_EXCEPTIONS
+                              ? DEFAULT_LOG_PARSE_EXCEPTIONS
                               : logParseExceptions;
     this.numPersistThreads = numPersistThreads == null ?
                                 DEFAULT_NUM_PERSIST_THREADS : Math.max(numPersistThreads, DEFAULT_NUM_PERSIST_THREADS);
diff --git a/integration-tests-ex/tools/src/main/java/org/apache/druid/testing/tools/CliCustomNodeRole.java b/integration-tests-ex/tools/src/main/java/org/apache/druid/testing/tools/CliCustomNodeRole.java
index 087cb24bec5d..df5ef8827eb5 100644
--- a/integration-tests-ex/tools/src/main/java/org/apache/druid/testing/tools/CliCustomNodeRole.java
+++ b/integration-tests-ex/tools/src/main/java/org/apache/druid/testing/tools/CliCustomNodeRole.java
@@ -66,7 +66,7 @@ public class CliCustomNodeRole extends ServerRunnable
   public static final String SERVICE_NAME = "custom-node-role";
   public static final int PORT = 9301;
   public static final int TLS_PORT = 9501;
-  public static final NodeRole NODE_ROLE = new NodeRole(CliCustomNodeRole.SERVICE_NAME);
+  public static final NodeRole NODE_ROLE = new NodeRole(SERVICE_NAME);
 
   public CliCustomNodeRole()
   {
@@ -85,9 +85,9 @@ protected List<? extends Module> getModules()
     return ImmutableList.of(
         binder -> {
           LOG.info("starting up custom node role");
-          binder.bindConstant().annotatedWith(Names.named("serviceName")).to(CliCustomNodeRole.SERVICE_NAME);
-          binder.bindConstant().annotatedWith(Names.named("servicePort")).to(CliCustomNodeRole.PORT);
-          binder.bindConstant().annotatedWith(Names.named("tlsServicePort")).to(CliCustomNodeRole.TLS_PORT);
+          binder.bindConstant().annotatedWith(Names.named("serviceName")).to(SERVICE_NAME);
+          binder.bindConstant().annotatedWith(Names.named("servicePort")).to(PORT);
+          binder.bindConstant().annotatedWith(Names.named("tlsServicePort")).to(TLS_PORT);
 
           binder.bind(JettyServerInitializer.class).to(CustomJettyServiceInitializer.class).in(LazySingleton.class);
           LifecycleModule.register(binder, Server.class);
diff --git a/integration-tests/src/main/java/org/apache/druid/cli/CliCustomNodeRole.java b/integration-tests/src/main/java/org/apache/druid/cli/CliCustomNodeRole.java
index e0e1605b3026..eade6b9eda0e 100644
--- a/integration-tests/src/main/java/org/apache/druid/cli/CliCustomNodeRole.java
+++ b/integration-tests/src/main/java/org/apache/druid/cli/CliCustomNodeRole.java
@@ -65,7 +65,7 @@ public class CliCustomNodeRole extends ServerRunnable
   public static final String SERVICE_NAME = "custom-node-role";
   public static final int PORT = 9301;
   public static final int TLS_PORT = 9501;
-  public static final NodeRole NODE_ROLE = new NodeRole(CliCustomNodeRole.SERVICE_NAME);
+  public static final NodeRole NODE_ROLE = new NodeRole(SERVICE_NAME);
 
   public CliCustomNodeRole()
   {
@@ -84,9 +84,9 @@ protected List<? extends Module> getModules()
     return ImmutableList.of(
         binder -> {
           LOG.info("starting up");
-          binder.bindConstant().annotatedWith(Names.named("serviceName")).to(CliCustomNodeRole.SERVICE_NAME);
-          binder.bindConstant().annotatedWith(Names.named("servicePort")).to(CliCustomNodeRole.PORT);
-          binder.bindConstant().annotatedWith(Names.named("tlsServicePort")).to(CliCustomNodeRole.TLS_PORT);
+          binder.bindConstant().annotatedWith(Names.named("serviceName")).to(SERVICE_NAME);
+          binder.bindConstant().annotatedWith(Names.named("servicePort")).to(PORT);
+          binder.bindConstant().annotatedWith(Names.named("tlsServicePort")).to(TLS_PORT);
 
           binder.bind(JettyServerInitializer.class).to(CustomJettyServiceInitializer.class).in(LazySingleton.class);
           LifecycleModule.register(binder, Server.class);
diff --git a/integration-tests/src/main/java/org/apache/druid/testing/utils/AvroSchemaRegistryEventSerializer.java b/integration-tests/src/main/java/org/apache/druid/testing/utils/AvroSchemaRegistryEventSerializer.java
index dd1e82f82dfe..a5df23466ca6 100644
--- a/integration-tests/src/main/java/org/apache/druid/testing/utils/AvroSchemaRegistryEventSerializer.java
+++ b/integration-tests/src/main/java/org/apache/druid/testing/utils/AvroSchemaRegistryEventSerializer.java
@@ -73,7 +73,7 @@ public void initialize(String topic)
     try {
       RetryUtils.retry(
           () -> {
-            schemaId = client.register(topic, AvroEventSerializer.SCHEMA);
+            schemaId = client.register(topic, SCHEMA);
             fromRegistry = client.getById(schemaId);
             return 0;
           },
diff --git a/integration-tests/src/main/java/org/apache/druid/testing/utils/ProtobufSchemaRegistryEventSerializer.java b/integration-tests/src/main/java/org/apache/druid/testing/utils/ProtobufSchemaRegistryEventSerializer.java
index 8d80b22af35d..f2a65ae95dfa 100644
--- a/integration-tests/src/main/java/org/apache/druid/testing/utils/ProtobufSchemaRegistryEventSerializer.java
+++ b/integration-tests/src/main/java/org/apache/druid/testing/utils/ProtobufSchemaRegistryEventSerializer.java
@@ -68,7 +68,7 @@ public void initialize(String topic)
     try {
       RetryUtils.retry(
           () -> {
-            schemaId = client.register(topic, new ProtobufSchema(ProtobufEventSerializer.SCHEMA.newMessageBuilder("Wikipedia").getDescriptorForType()));
+            schemaId = client.register(topic, new ProtobufSchema(SCHEMA.newMessageBuilder("Wikipedia").getDescriptorForType()));
             return 0;
           },
           (e) -> true,
diff --git a/processing/src/main/java/org/apache/druid/collections/spatial/search/PolygonBound.java b/processing/src/main/java/org/apache/druid/collections/spatial/search/PolygonBound.java
index 68dc2174a891..840a9f9c2d10 100644
--- a/processing/src/main/java/org/apache/druid/collections/spatial/search/PolygonBound.java
+++ b/processing/src/main/java/org/apache/druid/collections/spatial/search/PolygonBound.java
@@ -101,7 +101,7 @@ public static PolygonBound from(
 
   public static PolygonBound from(float[] abscissa, float[] ordinate)
   {
-    return PolygonBound.from(abscissa, ordinate, 0);
+    return from(abscissa, ordinate, 0);
   }
 
   @JsonProperty
diff --git a/processing/src/main/java/org/apache/druid/common/config/NullHandling.java b/processing/src/main/java/org/apache/druid/common/config/NullHandling.java
index 747512cece53..b98d81421d25 100644
--- a/processing/src/main/java/org/apache/druid/common/config/NullHandling.java
+++ b/processing/src/main/java/org/apache/druid/common/config/NullHandling.java
@@ -129,7 +129,7 @@ public static boolean sqlCompatible()
    */
   public static boolean useThreeValueLogic()
   {
-    return NullHandling.sqlCompatible() &&
+    return sqlCompatible() &&
            INSTANCE.isUseThreeValueLogicForNativeFilters() &&
            ExpressionProcessing.useStrictBooleans();
   }
@@ -268,7 +268,7 @@ public static boolean isNullOrEquivalent(@Nullable ByteBuffer buffer)
    */
   public static boolean mustCombineNullAndEmptyInDictionary(final Indexed<ByteBuffer> dictionaryUtf8)
   {
-    return NullHandling.replaceWithDefault()
+    return replaceWithDefault()
            && dictionaryUtf8.size() >= 2
            && isNullOrEquivalent(dictionaryUtf8.get(0))
            && isNullOrEquivalent(dictionaryUtf8.get(1));
@@ -285,7 +285,7 @@ && isNullOrEquivalent(dictionaryUtf8.get(0))
    */
   public static boolean mustReplaceFirstValueWithNullInDictionary(final Indexed<ByteBuffer> dictionaryUtf8)
   {
-    if (NullHandling.replaceWithDefault() && dictionaryUtf8.size() >= 1) {
+    if (replaceWithDefault() && dictionaryUtf8.size() >= 1) {
       final ByteBuffer firstValue = dictionaryUtf8.get(0);
       return firstValue != null && firstValue.remaining() == 0;
     }
diff --git a/processing/src/main/java/org/apache/druid/common/guava/FutureUtils.java b/processing/src/main/java/org/apache/druid/common/guava/FutureUtils.java
index 43ab45ef4579..32625f1ec498 100644
--- a/processing/src/main/java/org/apache/druid/common/guava/FutureUtils.java
+++ b/processing/src/main/java/org/apache/druid/common/guava/FutureUtils.java
@@ -73,7 +73,7 @@ public static <T> T get(final ListenableFuture<T> future, final boolean cancelIf
   public static <T> T getUnchecked(final ListenableFuture<T> future, final boolean cancelIfInterrupted)
   {
     try {
-      return FutureUtils.get(future, cancelIfInterrupted);
+      return get(future, cancelIfInterrupted);
     }
     catch (InterruptedException e) {
       Thread.currentThread().interrupt();
@@ -103,7 +103,7 @@ public static <T> T getUncheckedImmediately(final ListenableFuture<T> future)
   /**
    * Like {@link Futures#transform}, but works better with lambdas due to not having overloads.
    *
-   * One can write {@code FutureUtils.transform(future, v -> ...)} instead of
+   * One can write {@code transform(future, v -> ...)} instead of
    * {@code Futures.transform(future, (Function<? super T, ?>) v -> ...)}
    */
   public static <T, R> ListenableFuture<R> transform(final ListenableFuture<T> future, final Function<T, R> fn)
@@ -115,7 +115,7 @@ public static <T, R> ListenableFuture<R> transform(final ListenableFuture<T> fut
    * Like {@link Futures#transformAsync(ListenableFuture, AsyncFunction, java.util.concurrent.Executor)}, but works better with lambdas due to not having
    * overloads.
    *
-   * One can write {@code FutureUtils.transformAsync(future, v -> ...)} instead of
+   * One can write {@code transformAsync(future, v -> ...)} instead of
    * {@code Futures.transform(future, (Function<? super T, ?>) v -> ...)}
    */
   public static <T, R> ListenableFuture<R> transformAsync(final ListenableFuture<T> future, final AsyncFunction<T, R> fn)
diff --git a/processing/src/main/java/org/apache/druid/common/utils/IdUtils.java b/processing/src/main/java/org/apache/druid/common/utils/IdUtils.java
index 88d4d0d413ba..ee769dfd89eb 100644
--- a/processing/src/main/java/org/apache/druid/common/utils/IdUtils.java
+++ b/processing/src/main/java/org/apache/druid/common/utils/IdUtils.java
@@ -100,7 +100,7 @@ public static String getRandomId()
 
   public static String getRandomIdWithPrefix(String prefix)
   {
-    return UNDERSCORE_JOINER.join(prefix, IdUtils.getRandomId());
+    return UNDERSCORE_JOINER.join(prefix, getRandomId());
   }
 
   public static String newTaskId(String typeName, String dataSource, @Nullable Interval interval)
diff --git a/processing/src/main/java/org/apache/druid/data/input/impl/DimensionsSpec.java b/processing/src/main/java/org/apache/druid/data/input/impl/DimensionsSpec.java
index efc3718d4ff4..b7369fe55f59 100644
--- a/processing/src/main/java/org/apache/druid/data/input/impl/DimensionsSpec.java
+++ b/processing/src/main/java/org/apache/druid/data/input/impl/DimensionsSpec.java
@@ -139,7 +139,7 @@ private DimensionsSpec(
     }
 
     for (SpatialDimensionSchema spatialSchema : spatialDims) {
-      DimensionSchema newSchema = DimensionsSpec.convertSpatialSchema(spatialSchema);
+      DimensionSchema newSchema = convertSpatialSchema(spatialSchema);
       this.dimensions.add(newSchema);
       dimensionSchemaMap.put(newSchema.getName(), newSchema);
     }
diff --git a/processing/src/main/java/org/apache/druid/data/input/impl/DoubleDimensionSchema.java b/processing/src/main/java/org/apache/druid/data/input/impl/DoubleDimensionSchema.java
index 2bde08122149..041907a09cea 100644
--- a/processing/src/main/java/org/apache/druid/data/input/impl/DoubleDimensionSchema.java
+++ b/processing/src/main/java/org/apache/druid/data/input/impl/DoubleDimensionSchema.java
@@ -36,7 +36,7 @@ public DoubleDimensionSchema(@JsonProperty("name") String name)
   @Override
   public String getTypeName()
   {
-    return DimensionSchema.DOUBLE_TYPE_NAME;
+    return DOUBLE_TYPE_NAME;
   }
 
   @Override
diff --git a/processing/src/main/java/org/apache/druid/data/input/impl/FloatDimensionSchema.java b/processing/src/main/java/org/apache/druid/data/input/impl/FloatDimensionSchema.java
index 1a9d6e73fe39..ca7b3e2a4002 100644
--- a/processing/src/main/java/org/apache/druid/data/input/impl/FloatDimensionSchema.java
+++ b/processing/src/main/java/org/apache/druid/data/input/impl/FloatDimensionSchema.java
@@ -39,7 +39,7 @@ public FloatDimensionSchema(
   @Override
   public String getTypeName()
   {
-    return DimensionSchema.FLOAT_TYPE_NAME;
+    return FLOAT_TYPE_NAME;
   }
 
   @Override
diff --git a/processing/src/main/java/org/apache/druid/data/input/impl/LongDimensionSchema.java b/processing/src/main/java/org/apache/druid/data/input/impl/LongDimensionSchema.java
index e8a90a7a4818..3c9ee334ffb1 100644
--- a/processing/src/main/java/org/apache/druid/data/input/impl/LongDimensionSchema.java
+++ b/processing/src/main/java/org/apache/druid/data/input/impl/LongDimensionSchema.java
@@ -40,7 +40,7 @@ public LongDimensionSchema(
   @Override
   public String getTypeName()
   {
-    return DimensionSchema.LONG_TYPE_NAME;
+    return LONG_TYPE_NAME;
   }
 
   @Override
diff --git a/processing/src/main/java/org/apache/druid/data/input/impl/NewSpatialDimensionSchema.java b/processing/src/main/java/org/apache/druid/data/input/impl/NewSpatialDimensionSchema.java
index bd1fd8292aea..d46c7ca130a1 100644
--- a/processing/src/main/java/org/apache/druid/data/input/impl/NewSpatialDimensionSchema.java
+++ b/processing/src/main/java/org/apache/druid/data/input/impl/NewSpatialDimensionSchema.java
@@ -59,7 +59,7 @@ public List<String> getDims()
   @Override
   public String getTypeName()
   {
-    return DimensionSchema.SPATIAL_TYPE_NAME;
+    return SPATIAL_TYPE_NAME;
   }
 
   @Override
diff --git a/processing/src/main/java/org/apache/druid/data/input/impl/StringDimensionSchema.java b/processing/src/main/java/org/apache/druid/data/input/impl/StringDimensionSchema.java
index 2af2fbbaac23..117750396558 100644
--- a/processing/src/main/java/org/apache/druid/data/input/impl/StringDimensionSchema.java
+++ b/processing/src/main/java/org/apache/druid/data/input/impl/StringDimensionSchema.java
@@ -54,7 +54,7 @@ public StringDimensionSchema(String name)
   @Override
   public String getTypeName()
   {
-    return DimensionSchema.STRING_TYPE_NAME;
+    return STRING_TYPE_NAME;
   }
 
   @Override
diff --git a/processing/src/main/java/org/apache/druid/extendedset/intset/ImmutableConciseSet.java b/processing/src/main/java/org/apache/druid/extendedset/intset/ImmutableConciseSet.java
index 43591e2b59d1..f87a032cc6df 100755
--- a/processing/src/main/java/org/apache/druid/extendedset/intset/ImmutableConciseSet.java
+++ b/processing/src/main/java/org/apache/druid/extendedset/intset/ImmutableConciseSet.java
@@ -209,7 +209,7 @@ public static ImmutableConciseSet complement(ImmutableConciseSet set, int length
         }
       }
       ConciseSet newSet = new ConciseSet(words, false);
-      return ImmutableConciseSet.newImmutableFromMutable(newSet);
+      return newImmutableFromMutable(newSet);
     }
 
     IntList retVal = new IntList();
diff --git a/processing/src/main/java/org/apache/druid/frame/Frame.java b/processing/src/main/java/org/apache/druid/frame/Frame.java
index 8185190a28da..49a9a2347d76 100644
--- a/processing/src/main/java/org/apache/druid/frame/Frame.java
+++ b/processing/src/main/java/org/apache/druid/frame/Frame.java
@@ -240,12 +240,12 @@ public static Frame decompress(final Memory memory, final long position, final l
         );
       }
 
-      return Frame.wrap(dstBuffer);
+      return wrap(dstBuffer);
     } else {
       // Copy first, then decompress.
       final byte[] compressedFrame = new byte[compressedFrameLength];
       memory.getByteArray(frameStart, compressedFrame, 0, compressedFrameLength);
-      return Frame.wrap(LZ4_DECOMPRESSOR.decompress(compressedFrame, uncompressedFrameLength));
+      return wrap(LZ4_DECOMPRESSOR.decompress(compressedFrame, uncompressedFrameLength));
     }
   }
 
diff --git a/processing/src/main/java/org/apache/druid/frame/key/RowKeyReader.java b/processing/src/main/java/org/apache/druid/frame/key/RowKeyReader.java
index d26f248e8016..69958187b86b 100644
--- a/processing/src/main/java/org/apache/druid/frame/key/RowKeyReader.java
+++ b/processing/src/main/java/org/apache/druid/frame/key/RowKeyReader.java
@@ -149,7 +149,7 @@ public RowKeyReader trimmedKeyReader(int trimmedFieldCount)
       newSignature.add(columnName, columnType);
     }
 
-    return RowKeyReader.create(newSignature.build());
+    return create(newSignature.build());
   }
 
   /**
diff --git a/processing/src/main/java/org/apache/druid/frame/processor/OutputChannel.java b/processing/src/main/java/org/apache/druid/frame/processor/OutputChannel.java
index e1377eddca35..058450dd0631 100644
--- a/processing/src/main/java/org/apache/druid/frame/processor/OutputChannel.java
+++ b/processing/src/main/java/org/apache/druid/frame/processor/OutputChannel.java
@@ -243,7 +243,7 @@ public synchronized OutputChannel mapWritableChannel(final Function<WritableFram
    */
   public OutputChannel readOnly()
   {
-    return OutputChannel.readOnly(readableChannelSupplier, partitionNumber);
+    return readOnly(readableChannelSupplier, partitionNumber);
   }
 
   /**
diff --git a/processing/src/main/java/org/apache/druid/frame/util/DurableStorageUtils.java b/processing/src/main/java/org/apache/druid/frame/util/DurableStorageUtils.java
index 168d96fc20ab..476b7f3f015d 100644
--- a/processing/src/main/java/org/apache/druid/frame/util/DurableStorageUtils.java
+++ b/processing/src/main/java/org/apache/druid/frame/util/DurableStorageUtils.java
@@ -252,7 +252,7 @@ public static boolean isQueryResultFileActive(String path, Set<String> knownTask
     if (elements.size() < 2) {
       return false;
     }
-    if (!DurableStorageUtils.QUERY_RESULTS_DIR.equals(elements.get(0))) {
+    if (!QUERY_RESULTS_DIR.equals(elements.get(0))) {
       return false;
     }
     return knownTasks.contains(elements.get(1));
diff --git a/processing/src/main/java/org/apache/druid/frame/write/FrameWriterUtils.java b/processing/src/main/java/org/apache/druid/frame/write/FrameWriterUtils.java
index a480767f1113..affa5a453cad 100644
--- a/processing/src/main/java/org/apache/druid/frame/write/FrameWriterUtils.java
+++ b/processing/src/main/java/org/apache/druid/frame/write/FrameWriterUtils.java
@@ -318,7 +318,7 @@ private static ByteBuffer getUtf8ByteBufferFromStringSelector(
         return buf;
       }
     } else {
-      return FrameWriterUtils.getUtf8ByteBufferFromString(selector.lookupName(dictionaryId));
+      return getUtf8ByteBufferFromString(selector.lookupName(dictionaryId));
     }
   }
 
diff --git a/processing/src/main/java/org/apache/druid/hll/HyperLogLogCollector.java b/processing/src/main/java/org/apache/druid/hll/HyperLogLogCollector.java
index d285f1cd044e..f8ef6acc152a 100644
--- a/processing/src/main/java/org/apache/druid/hll/HyperLogLogCollector.java
+++ b/processing/src/main/java/org/apache/druid/hll/HyperLogLogCollector.java
@@ -394,7 +394,7 @@ public HyperLogLogCollector fold(@Nullable HyperLogLogCollector other)
         convertToDenseStorage();
       }
 
-      other = HyperLogLogCollector.makeCollector(tmpBuffer);
+      other = makeCollector(tmpBuffer);
     }
 
     final ByteBuffer otherBuffer = other.storageBuffer;
@@ -574,7 +574,7 @@ public boolean equals(Object o)
 
     final ByteBuffer denseStorageBuffer;
     if (storageBuffer.remaining() != getNumBytesForDenseStorage()) {
-      HyperLogLogCollector denseCollector = HyperLogLogCollector.makeCollector(storageBuffer.duplicate());
+      HyperLogLogCollector denseCollector = makeCollector(storageBuffer.duplicate());
       denseCollector.convertToDenseStorage();
       denseStorageBuffer = denseCollector.storageBuffer;
     } else {
@@ -582,7 +582,7 @@ public boolean equals(Object o)
     }
 
     if (otherBuffer.remaining() != getNumBytesForDenseStorage()) {
-      HyperLogLogCollector otherCollector = HyperLogLogCollector.makeCollector(otherBuffer.duplicate());
+      HyperLogLogCollector otherCollector = makeCollector(otherBuffer.duplicate());
       otherCollector.convertToDenseStorage();
       otherBuffer = otherCollector.storageBuffer;
     }
diff --git a/processing/src/main/java/org/apache/druid/indexer/TaskLocation.java b/processing/src/main/java/org/apache/druid/indexer/TaskLocation.java
index 2992814de457..ed664775f4e7 100644
--- a/processing/src/main/java/org/apache/druid/indexer/TaskLocation.java
+++ b/processing/src/main/java/org/apache/druid/indexer/TaskLocation.java
@@ -60,7 +60,7 @@ public static TaskLocation create(String host, int port, int tlsPort, boolean is
 
   public static TaskLocation unknown()
   {
-    return TaskLocation.UNKNOWN;
+    return UNKNOWN;
   }
 
   @JsonCreator
diff --git a/processing/src/main/java/org/apache/druid/indexer/partitions/DimensionRangePartitionsSpec.java b/processing/src/main/java/org/apache/druid/indexer/partitions/DimensionRangePartitionsSpec.java
index 744f5c9e6815..5b83a5feca0b 100644
--- a/processing/src/main/java/org/apache/druid/indexer/partitions/DimensionRangePartitionsSpec.java
+++ b/processing/src/main/java/org/apache/druid/indexer/partitions/DimensionRangePartitionsSpec.java
@@ -125,7 +125,7 @@ public Integer getMaxRowsPerSegment()
     return resolvedMaxRowPerSegment;  // NOTE: This returns the *resolved* value
   }
 
-  @JsonProperty(PartitionsSpec.MAX_ROWS_PER_SEGMENT)
+  @JsonProperty(MAX_ROWS_PER_SEGMENT)
   protected Integer getMaxRowsPerSegmentForJson()
   {
     return maxRowsPerSegment;
diff --git a/processing/src/main/java/org/apache/druid/indexer/partitions/DynamicPartitionsSpec.java b/processing/src/main/java/org/apache/druid/indexer/partitions/DynamicPartitionsSpec.java
index 2c5d294f3c1c..bd60493bd791 100644
--- a/processing/src/main/java/org/apache/druid/indexer/partitions/DynamicPartitionsSpec.java
+++ b/processing/src/main/java/org/apache/druid/indexer/partitions/DynamicPartitionsSpec.java
@@ -46,7 +46,7 @@ public class DynamicPartitionsSpec implements PartitionsSpec
 
   @JsonCreator
   public DynamicPartitionsSpec(
-      @JsonProperty(PartitionsSpec.MAX_ROWS_PER_SEGMENT) @Nullable Integer maxRowsPerSegment,
+      @JsonProperty(MAX_ROWS_PER_SEGMENT) @Nullable Integer maxRowsPerSegment,
       @JsonProperty("maxTotalRows") @Nullable Long maxTotalRows
   )
   {
diff --git a/processing/src/main/java/org/apache/druid/indexer/partitions/HashedPartitionsSpec.java b/processing/src/main/java/org/apache/druid/indexer/partitions/HashedPartitionsSpec.java
index c9561ac47dac..688d4a601379 100644
--- a/processing/src/main/java/org/apache/druid/indexer/partitions/HashedPartitionsSpec.java
+++ b/processing/src/main/java/org/apache/druid/indexer/partitions/HashedPartitionsSpec.java
@@ -93,7 +93,7 @@ public HashedPartitionsSpec(
     // Supply default for targetRowsPerSegment if needed
     if (target.getValue() == null) {
       //noinspection VariableNotUsedInsideIf (false positive for this.numShards)
-      this.maxRowsPerSegment = (this.numShards == null ? PartitionsSpec.DEFAULT_MAX_ROWS_PER_SEGMENT : null);
+      this.maxRowsPerSegment = (this.numShards == null ? DEFAULT_MAX_ROWS_PER_SEGMENT : null);
     } else {
       this.maxRowsPerSegment = target.getValue();
     }
diff --git a/processing/src/main/java/org/apache/druid/java/util/common/Either.java b/processing/src/main/java/org/apache/druid/java/util/common/Either.java
index 5a2720d07481..342c06212dd1 100644
--- a/processing/src/main/java/org/apache/druid/java/util/common/Either.java
+++ b/processing/src/main/java/org/apache/druid/java/util/common/Either.java
@@ -111,7 +111,7 @@ public R valueOrThrow()
   public <T> Either<L, T> map(final Function<R, T> fn)
   {
     if (isValue()) {
-      return Either.value(fn.apply(value));
+      return value(fn.apply(value));
     } else {
       // Safe because the value is never going to be returned.
       //noinspection unchecked
diff --git a/processing/src/main/java/org/apache/druid/java/util/common/HumanReadableBytes.java b/processing/src/main/java/org/apache/druid/java/util/common/HumanReadableBytes.java
index 63e697cc9549..f44e6c327a53 100644
--- a/processing/src/main/java/org/apache/druid/java/util/common/HumanReadableBytes.java
+++ b/processing/src/main/java/org/apache/druid/java/util/common/HumanReadableBytes.java
@@ -30,7 +30,7 @@ public class HumanReadableBytes
 
   public HumanReadableBytes(String bytes)
   {
-    this.bytes = HumanReadableBytes.parse(bytes);
+    this.bytes = parse(bytes);
   }
 
   public HumanReadableBytes(long bytes)
diff --git a/processing/src/main/java/org/apache/druid/java/util/common/StringUtils.java b/processing/src/main/java/org/apache/druid/java/util/common/StringUtils.java
index d8ef9956d9bf..282c436ebcde 100644
--- a/processing/src/main/java/org/apache/druid/java/util/common/StringUtils.java
+++ b/processing/src/main/java/org/apache/druid/java/util/common/StringUtils.java
@@ -54,7 +54,7 @@ public class StringUtils
   private static final Base64.Decoder BASE64_DECODER = Base64.getDecoder();
 
   // should be used only for estimation
-  // returns the same result with StringUtils.fromUtf8(value).length for valid string values
+  // returns the same result with fromUtf8(value).length for valid string values
   // does not check validity of format and returns over-estimated result for invalid string (see UT)
   public static int estimatedBinaryLengthAsUTF8(String value)
   {
@@ -257,7 +257,7 @@ public static String fromUtf8(final ByteBuffer buffer, final int numBytes)
    */
   public static String fromUtf8(final ByteBuffer buffer)
   {
-    return StringUtils.fromUtf8(buffer, buffer.remaining());
+    return fromUtf8(buffer, buffer.remaining());
   }
 
   /**
@@ -273,7 +273,7 @@ public static String fromUtf8Nullable(@Nullable final ByteBuffer buffer)
     if (buffer == null) {
       return null;
     }
-    return StringUtils.fromUtf8(buffer, buffer.remaining());
+    return fromUtf8(buffer, buffer.remaining());
   }
 
   /**
@@ -390,7 +390,7 @@ public static String encodeForFormat(@Nullable final String s)
     if (s == null) {
       return null;
     } else {
-      return StringUtils.replaceChar(s, '%', "%%");
+      return replaceChar(s, '%', "%%");
     }
   }
 
@@ -422,7 +422,7 @@ public static String urlEncode(@Nullable String s)
     }
 
     try {
-      return StringUtils.replace(URLEncoder.encode(s, "UTF-8"), "+", "%20");
+      return replace(URLEncoder.encode(s, "UTF-8"), "+", "%20");
     }
     catch (UnsupportedEncodingException e) {
       throw new RuntimeException(e);
@@ -792,7 +792,7 @@ public static String chop(@Nullable final String s, final int maxBytes)
     } else {
       // Shorten firstValue to what could fit in maxBytes as UTF-8.
       final byte[] bytes = new byte[maxBytes];
-      final int len = StringUtils.toUtf8WithLimit(s, ByteBuffer.wrap(bytes));
+      final int len = toUtf8WithLimit(s, ByteBuffer.wrap(bytes));
       return new String(bytes, 0, len, StandardCharsets.UTF_8);
     }
   }
@@ -831,6 +831,6 @@ public static String getResource(Object ref, String resource)
    */
   public static String escapeSql(String str)
   {
-    return str == null ? null : StringUtils.replace(str, "'", "''");
+    return str == null ? null : replace(str, "'", "''");
   }
 }
diff --git a/processing/src/main/java/org/apache/druid/java/util/common/granularity/Granularities.java b/processing/src/main/java/org/apache/druid/java/util/common/granularity/Granularities.java
index 08de0a364ec3..1ae9281e8ab7 100644
--- a/processing/src/main/java/org/apache/druid/java/util/common/granularity/Granularities.java
+++ b/processing/src/main/java/org/apache/druid/java/util/common/granularity/Granularities.java
@@ -68,7 +68,7 @@ public class Granularities
 
   public static Granularity nullToAll(Granularity granularity)
   {
-    return granularity == null ? Granularities.ALL : granularity;
+    return granularity == null ? ALL : granularity;
   }
 
   /**
diff --git a/processing/src/main/java/org/apache/druid/java/util/common/granularity/GranularityType.java b/processing/src/main/java/org/apache/druid/java/util/common/granularity/GranularityType.java
index b4b78390605d..26fe8e44f648 100644
--- a/processing/src/main/java/org/apache/druid/java/util/common/granularity/GranularityType.java
+++ b/processing/src/main/java/org/apache/druid/java/util/common/granularity/GranularityType.java
@@ -176,7 +176,7 @@ public DateTime getDateTime(Integer[] vals)
    */
   public static boolean isStandard(Granularity granularity)
   {
-    final GranularityType[] values = GranularityType.values();
+    final GranularityType[] values = values();
     for (GranularityType value : values) {
       if (value.getDefaultGranularity().equals(granularity)) {
         return true;
@@ -205,42 +205,42 @@ public static GranularityType fromPeriod(Period period)
 
     switch (index) {
       case 0:
-        return GranularityType.YEAR;
+        return YEAR;
       case 1:
         if (vals[index] == 3) {
-          return GranularityType.QUARTER;
+          return QUARTER;
         } else if (vals[index] == 1) {
-          return GranularityType.MONTH;
+          return MONTH;
         }
         break;
       case 2:
-        return GranularityType.WEEK;
+        return WEEK;
       case 3:
-        return GranularityType.DAY;
+        return DAY;
       case 4:
         if (vals[index] == 8) {
-          return GranularityType.EIGHT_HOUR;
+          return EIGHT_HOUR;
         } else if (vals[index] == 6) {
-          return GranularityType.SIX_HOUR;
+          return SIX_HOUR;
         } else if (vals[index] == 1) {
-          return GranularityType.HOUR;
+          return HOUR;
         }
         break;
       case 5:
         if (vals[index] == 30) {
-          return GranularityType.THIRTY_MINUTE;
+          return THIRTY_MINUTE;
         } else if (vals[index] == 15) {
-          return GranularityType.FIFTEEN_MINUTE;
+          return FIFTEEN_MINUTE;
         } else if (vals[index] == 10) {
-          return GranularityType.TEN_MINUTE;
+          return TEN_MINUTE;
         } else if (vals[index] == 5) {
-          return GranularityType.FIVE_MINUTE;
+          return FIVE_MINUTE;
         } else if (vals[index] == 1) {
-          return GranularityType.MINUTE;
+          return MINUTE;
         }
         break;
       case 6:
-        return GranularityType.SECOND;
+        return SECOND;
       default:
         break;
     }
diff --git a/processing/src/main/java/org/apache/druid/java/util/common/guava/Sequences.java b/processing/src/main/java/org/apache/druid/java/util/common/guava/Sequences.java
index e66ba29e4d7c..daac8b235f49 100644
--- a/processing/src/main/java/org/apache/druid/java/util/common/guava/Sequences.java
+++ b/processing/src/main/java/org/apache/druid/java/util/common/guava/Sequences.java
@@ -56,7 +56,7 @@ public static <T> Sequence<T> concat(Sequence<T>... sequences)
 
   public static <T> Sequence<T> concat(Iterable<Sequence<T>> sequences)
   {
-    return concat(Sequences.simple(sequences));
+    return concat(simple(sequences));
   }
 
   public static <T> Sequence<T> concat(Sequence<? extends Sequence<T>> sequences)
diff --git a/processing/src/main/java/org/apache/druid/java/util/common/parsers/JSONPathFieldSpec.java b/processing/src/main/java/org/apache/druid/java/util/common/parsers/JSONPathFieldSpec.java
index 9ddde9b89700..04e372f4f5d5 100644
--- a/processing/src/main/java/org/apache/druid/java/util/common/parsers/JSONPathFieldSpec.java
+++ b/processing/src/main/java/org/apache/druid/java/util/common/parsers/JSONPathFieldSpec.java
@@ -103,7 +103,7 @@ public List<String> getNodes()
   @JsonCreator
   public static JSONPathFieldSpec fromString(String name)
   {
-    return JSONPathFieldSpec.createRootField(name);
+    return createRootField(name);
   }
 
   public static JSONPathFieldSpec createNestedField(String name, String expr)
diff --git a/processing/src/main/java/org/apache/druid/java/util/common/parsers/ParserUtils.java b/processing/src/main/java/org/apache/druid/java/util/common/parsers/ParserUtils.java
index 18afba4491d9..fe86ae3035b7 100644
--- a/processing/src/main/java/org/apache/druid/java/util/common/parsers/ParserUtils.java
+++ b/processing/src/main/java/org/apache/druid/java/util/common/parsers/ParserUtils.java
@@ -76,7 +76,7 @@ public static Function<String, Object> getTransformationFunction(
       if (input.contains(listDelimiter)) {
         return StreamSupport.stream(listSplitter.split(input).spliterator(), false)
             .map(NullHandling::emptyToNullIfNeeded)
-            .map(value -> tryParseNumbers ? ParserUtils.tryParseStringAsNumber(value) : value)
+            .map(value -> tryParseNumbers ? tryParseStringAsNumber(value) : value)
             .collect(Collectors.toList());
       } else {
         return tryParseNumbers ?
diff --git a/processing/src/main/java/org/apache/druid/java/util/emitter/core/HttpPostEmitter.java b/processing/src/main/java/org/apache/druid/java/util/emitter/core/HttpPostEmitter.java
index f70b7e7d3fd8..e2fb9d436bfe 100644
--- a/processing/src/main/java/org/apache/druid/java/util/emitter/core/HttpPostEmitter.java
+++ b/processing/src/main/java/org/apache/druid/java/util/emitter/core/HttpPostEmitter.java
@@ -524,7 +524,7 @@ public void run()
 
     private boolean needsToShutdown()
     {
-      boolean needsToShutdown = Thread.interrupted() || shuttingDown;
+      boolean needsToShutdown = interrupted() || shuttingDown;
       if (needsToShutdown) {
         Object lastBatch = concurrentBatch.getAndSet(null);
         if (lastBatch instanceof Batch) {
@@ -722,7 +722,7 @@ void sendBackoffDelay()
       final long backoffCheckDelayMillis = config.getMinHttpTimeoutMillis() / 5;
 
       try {
-        Thread.sleep(backoffCheckDelayMillis);
+        sleep(backoffCheckDelayMillis);
       }
       catch (InterruptedException ignored) {
         return;
diff --git a/processing/src/main/java/org/apache/druid/java/util/emitter/service/AlertBuilder.java b/processing/src/main/java/org/apache/druid/java/util/emitter/service/AlertBuilder.java
index 352272d67bc4..c0c2b98b901f 100644
--- a/processing/src/main/java/org/apache/druid/java/util/emitter/service/AlertBuilder.java
+++ b/processing/src/main/java/org/apache/druid/java/util/emitter/service/AlertBuilder.java
@@ -46,7 +46,7 @@ public class AlertBuilder extends ServiceEventBuilder<AlertEvent>
 
   public static AlertBuilder create(String descriptionFormat, Object... objects)
   {
-    return AlertBuilder.createEmittable(null, descriptionFormat, objects);
+    return createEmittable(null, descriptionFormat, objects);
   }
 
   public static AlertBuilder createEmittable(ServiceEmitter emitter, String descriptionFormat, Object... objects)
diff --git a/processing/src/main/java/org/apache/druid/math/expr/Evals.java b/processing/src/main/java/org/apache/druid/math/expr/Evals.java
index 0010679a8144..91a1dce688a4 100644
--- a/processing/src/main/java/org/apache/druid/math/expr/Evals.java
+++ b/processing/src/main/java/org/apache/druid/math/expr/Evals.java
@@ -82,11 +82,11 @@ public static boolean objectAsBoolean(@Nullable Object val)
     if (val instanceof Boolean) {
       return (Boolean) val;
     } else if (val instanceof String) {
-      return Evals.asBoolean((String) val);
+      return asBoolean((String) val);
     } else if (val instanceof Long) {
-      return Evals.asBoolean((Long) val);
+      return asBoolean((Long) val);
     } else if (val instanceof Number) {
-      return Evals.asBoolean(((Number) val).doubleValue());
+      return asBoolean(((Number) val).doubleValue());
     }
     return false;
   }
diff --git a/processing/src/main/java/org/apache/druid/math/expr/ExprEval.java b/processing/src/main/java/org/apache/druid/math/expr/ExprEval.java
index a16b563c77ca..a18ca8b61e2a 100644
--- a/processing/src/main/java/org/apache/druid/math/expr/ExprEval.java
+++ b/processing/src/main/java/org/apache/druid/math/expr/ExprEval.java
@@ -166,14 +166,14 @@ public static NonnullPair<ExpressionType, Object[]> coerceListToArray(@Nullable
         Object[] array = new Object[val.size()];
         int i = 0;
         for (Object o : val) {
-          array[i++] = o != null ? ExprEval.ofType(ExpressionType.LONG, o).value() : null;
+          array[i++] = o != null ? ofType(ExpressionType.LONG, o).value() : null;
         }
         return new NonnullPair<>(ExpressionType.LONG_ARRAY, array);
       } else if (coercedType == Float.class || coercedType == Double.class) {
         Object[] array = new Object[val.size()];
         int i = 0;
         for (Object o : val) {
-          array[i++] = o != null ? ExprEval.ofType(ExpressionType.DOUBLE, o).value() : null;
+          array[i++] = o != null ? ofType(ExpressionType.DOUBLE, o).value() : null;
         }
         return new NonnullPair<>(ExpressionType.DOUBLE_ARRAY, array);
       } else if (coercedType == Object.class) {
@@ -184,7 +184,7 @@ public static NonnullPair<ExpressionType, Object[]> coerceListToArray(@Nullable
         ExpressionType elementType = null;
         for (Object o : val) {
           if (o != null) {
-            ExprEval<?> eval = ExprEval.bestEffortOf(o);
+            ExprEval<?> eval = bestEffortOf(o);
             elementType = ExpressionTypeConversion.leastRestrictiveType(elementType, eval.type());
             evals[i++] = eval;
           } else {
@@ -196,7 +196,7 @@ public static NonnullPair<ExpressionType, Object[]> coerceListToArray(@Nullable
           if (eval != null) {
             array[i++] = eval.castTo(elementType).value();
           } else {
-            array[i++] = ExprEval.ofType(elementType, null).value();
+            array[i++] = ofType(elementType, null).value();
           }
         }
         ExpressionType arrayType = elementType == null
@@ -208,7 +208,7 @@ public static NonnullPair<ExpressionType, Object[]> coerceListToArray(@Nullable
       Object[] array = new Object[val.size()];
       int i = 0;
       for (Object o : val) {
-        array[i++] = o != null ? ExprEval.ofType(ExpressionType.STRING, o).value() : null;
+        array[i++] = o != null ? ofType(ExpressionType.STRING, o).value() : null;
       }
       return new NonnullPair<>(ExpressionType.STRING_ARRAY, array);
     }
@@ -362,11 +362,11 @@ public static ExprEval ofBoolean(boolean value, ExpressionType type)
   {
     switch (type.getType()) {
       case DOUBLE:
-        return ExprEval.of(Evals.asDouble(value));
+        return of(Evals.asDouble(value));
       case LONG:
         return ofLongBoolean(value);
       case STRING:
-        return ExprEval.of(String.valueOf(value));
+        return of(String.valueOf(value));
       default:
         throw new Types.InvalidCastBooleanException(type);
     }
@@ -559,7 +559,7 @@ public static ExprEval ofType(@Nullable ExpressionType type, @Nullable Object va
           return ofLongBoolean((Boolean) value);
         }
         if (value instanceof String) {
-          return ofLong(ExprEval.computeNumber((String) value));
+          return ofLong(computeNumber((String) value));
         }
         return ofLong(null);
       case DOUBLE:
@@ -570,7 +570,7 @@ public static ExprEval ofType(@Nullable ExpressionType type, @Nullable Object va
           return ofDouble(Evals.asDouble((Boolean) value));
         }
         if (value instanceof String) {
-          return ofDouble(ExprEval.computeNumber((String) value));
+          return ofDouble(computeNumber((String) value));
         }
         return ofDouble(null);
       case COMPLEX:
@@ -605,7 +605,7 @@ public static ExprEval ofType(@Nullable ExpressionType type, @Nullable Object va
           Object[] array = new Object[theList.size()];
           int i = 0;
           for (Object o : theList) {
-            array[i++] = ExprEval.ofType(elementType, o).value();
+            array[i++] = ofType(elementType, o).value();
           }
           return ofArray(type, array);
         }
@@ -615,7 +615,7 @@ public static ExprEval ofType(@Nullable ExpressionType type, @Nullable Object va
           Object[] array = new Object[inputArray.length];
           int i = 0;
           for (Object o : inputArray) {
-            array[i++] = ExprEval.ofType(elementType, o).value();
+            array[i++] = ofType(elementType, o).value();
           }
           return ofArray(type, array);
         }
@@ -890,20 +890,20 @@ public final ExprEval castTo(ExpressionType castTo)
           return this;
         case LONG:
           if (value == null) {
-            return ExprEval.ofLong(null);
+            return ofLong(null);
           } else {
-            return ExprEval.of(asLong());
+            return of(asLong());
           }
         case STRING:
-          return ExprEval.of(asString());
+          return of(asString());
         case ARRAY:
           switch (castTo.getElementType().getType()) {
             case DOUBLE:
-              return ExprEval.ofDoubleArray(asArray());
+              return ofDoubleArray(asArray());
             case LONG:
-              return ExprEval.ofLongArray(value == null ? null : new Object[]{value.longValue()});
+              return ofLongArray(value == null ? null : new Object[]{value.longValue()});
             case STRING:
-              return ExprEval.ofStringArray(value == null ? null : new Object[]{value.toString()});
+              return ofStringArray(value == null ? null : new Object[]{value.toString()});
             default:
               ExpressionType elementType = (ExpressionType) castTo.getElementType();
               return new ArrayExprEval(castTo, new Object[]{castTo(elementType).value()});
@@ -971,25 +971,25 @@ public final ExprEval castTo(ExpressionType castTo)
       switch (castTo.getType()) {
         case DOUBLE:
           if (value == null) {
-            return ExprEval.ofDouble(null);
+            return ofDouble(null);
           } else {
-            return ExprEval.of(asDouble());
+            return of(asDouble());
           }
         case LONG:
           return this;
         case STRING:
-          return ExprEval.of(asString());
+          return of(asString());
         case ARRAY:
           if (value == null) {
             return new ArrayExprEval(castTo, null);
           }
           switch (castTo.getElementType().getType()) {
             case DOUBLE:
-              return ExprEval.ofDoubleArray(new Object[]{value.doubleValue()});
+              return ofDoubleArray(new Object[]{value.doubleValue()});
             case LONG:
-              return ExprEval.ofLongArray(asArray());
+              return ofLongArray(asArray());
             case STRING:
-              return ExprEval.ofStringArray(new Object[]{value.toString()});
+              return ofStringArray(new Object[]{value.toString()});
             default:
               ExpressionType elementType = (ExpressionType) castTo.getElementType();
               return new ArrayExprEval(castTo, new Object[]{castTo(elementType).value()});
@@ -1150,10 +1150,10 @@ public final ExprEval castTo(ExpressionType castTo)
     {
       switch (castTo.getType()) {
         case DOUBLE:
-          return ExprEval.ofDouble(computeNumber());
+          return ofDouble(computeNumber());
 
         case LONG:
-          return ExprEval.ofLong(computeNumber());
+          return ofLong(computeNumber());
 
         case STRING:
           return this;
@@ -1165,12 +1165,12 @@ public final ExprEval castTo(ExpressionType castTo)
           ExprType type = castTo.getElementType().getType();
           if (type == ExprType.DOUBLE) {
             final Number number = computeNumber();
-            return ExprEval.ofDoubleArray(new Object[]{number == null ? null : number.doubleValue()});
+            return ofDoubleArray(new Object[]{number == null ? null : number.doubleValue()});
           } else if (type == ExprType.LONG) {
             final Number number = computeNumber();
-            return ExprEval.ofLongArray(new Object[]{number == null ? null : number.longValue()});
+            return ofLongArray(new Object[]{number == null ? null : number.longValue()});
           } else if (type == ExprType.STRING) {
-            return ExprEval.ofStringArray(new Object[]{value});
+            return ofStringArray(new Object[]{value});
           }
 
           ExpressionType elementType = (ExpressionType) castTo.getElementType();
@@ -1335,7 +1335,7 @@ public ExprEval castTo(ExpressionType castTo)
         if (castTo.isArray()) {
           return new ArrayExprEval(castTo, null);
         }
-        return ExprEval.ofType(castTo, null);
+        return ofType(castTo, null);
       }
       if (type().equals(castTo)) {
         return this;
@@ -1343,26 +1343,26 @@ public ExprEval castTo(ExpressionType castTo)
       switch (castTo.getType()) {
         case STRING:
           if (value.length == 1) {
-            return ExprEval.of(asString());
+            return of(asString());
           }
           break;
         case LONG:
           if (value.length == 1) {
-            return isNumericNull() ? ExprEval.ofLong(null) : ExprEval.ofLong(asLong());
+            return isNumericNull() ? ofLong(null) : ofLong(asLong());
           }
           break;
         case DOUBLE:
           if (value.length == 1) {
-            return isNumericNull() ? ExprEval.ofDouble(null) : ExprEval.ofDouble(asDouble());
+            return isNumericNull() ? ofDouble(null) : ofDouble(asDouble());
           }
           break;
         case ARRAY:
           ExpressionType elementType = (ExpressionType) castTo.getElementType();
           Object[] cast = new Object[value.length];
           for (int i = 0; i < value.length; i++) {
-            cast[i] = ExprEval.ofType(elementType(), value[i]).castTo(elementType).value();
+            cast[i] = ofType(elementType(), value[i]).castTo(elementType).value();
           }
-          return ExprEval.ofArray(castTo, cast);
+          return ofArray(castTo, cast);
         case COMPLEX:
           if (ExpressionType.NESTED_DATA.equals(castTo)) {
             return new NestedDataExprEval(value);
@@ -1536,7 +1536,7 @@ private void computeNumber()
         } else if (val instanceof Boolean) {
           number = Evals.asLong((Boolean) val);
         } else if (val instanceof String) {
-          number = ExprEval.computeNumber((String) val);
+          number = computeNumber((String) val);
         }
       }
     }
@@ -1546,7 +1546,7 @@ private void computeNumber()
     public Object[] asArray()
     {
       Object val = StructuredData.unwrap(value);
-      ExprEval maybeArray = ExprEval.bestEffortOf(val);
+      ExprEval maybeArray = bestEffortOf(val);
       if (maybeArray.type().isPrimitive() || maybeArray.isArray()) {
         return maybeArray.asArray();
       }
@@ -1561,7 +1561,7 @@ public ExprEval castTo(ExpressionType castTo)
       }
 
       Object val = StructuredData.unwrap(value);
-      ExprEval bestEffortOf = ExprEval.bestEffortOf(val);
+      ExprEval bestEffortOf = bestEffortOf(val);
 
       if (bestEffortOf.type().isPrimitive() || bestEffortOf.type().isArray()) {
         return bestEffortOf.castTo(castTo);
diff --git a/processing/src/main/java/org/apache/druid/math/expr/ExprMacroTable.java b/processing/src/main/java/org/apache/druid/math/expr/ExprMacroTable.java
index 40d8ba1112c4..9aa1029898a1 100644
--- a/processing/src/main/java/org/apache/druid/math/expr/ExprMacroTable.java
+++ b/processing/src/main/java/org/apache/druid/math/expr/ExprMacroTable.java
@@ -159,7 +159,7 @@ public String stringify()
           macro.name(),
           args.size() == 1
           ? args.get(0).stringify()
-          : Expr.ARG_JOINER.join(args.stream().map(Expr::stringify).iterator())
+          : ARG_JOINER.join(args.stream().map(Expr::stringify).iterator())
       );
     }
 
diff --git a/processing/src/main/java/org/apache/druid/math/expr/ExprType.java b/processing/src/main/java/org/apache/druid/math/expr/ExprType.java
index 9a9294cb404a..40da7469566f 100644
--- a/processing/src/main/java/org/apache/druid/math/expr/ExprType.java
+++ b/processing/src/main/java/org/apache/druid/math/expr/ExprType.java
@@ -49,6 +49,6 @@ public boolean isPrimitive()
   @Override
   public boolean isArray()
   {
-    return this == ExprType.ARRAY;
+    return this == ARRAY;
   }
 }
diff --git a/processing/src/main/java/org/apache/druid/math/expr/ExpressionType.java b/processing/src/main/java/org/apache/druid/math/expr/ExpressionType.java
index 42f322120978..86d47d92cb26 100644
--- a/processing/src/main/java/org/apache/druid/math/expr/ExpressionType.java
+++ b/processing/src/main/java/org/apache/druid/math/expr/ExpressionType.java
@@ -54,7 +54,7 @@ public class ExpressionType extends BaseTypeSignature<ExprType>
   public static final ExpressionType DOUBLE_ARRAY =
       new ExpressionType(ExprType.ARRAY, null, DOUBLE);
   public static final ExpressionType NESTED_DATA =
-      ExpressionType.fromColumnTypeStrict(ColumnType.NESTED_DATA);
+      fromColumnTypeStrict(ColumnType.NESTED_DATA);
   public static final ExpressionType UNKNOWN_COMPLEX =
       new ExpressionType(ExprType.COMPLEX, null, null);
 
diff --git a/processing/src/main/java/org/apache/druid/math/expr/ExpressionTypeConversion.java b/processing/src/main/java/org/apache/druid/math/expr/ExpressionTypeConversion.java
index 16ae50248307..cffb2c002073 100644
--- a/processing/src/main/java/org/apache/druid/math/expr/ExpressionTypeConversion.java
+++ b/processing/src/main/java/org/apache/druid/math/expr/ExpressionTypeConversion.java
@@ -241,7 +241,7 @@ public static ExpressionType leastRestrictiveType(@Nullable ExpressionType type,
   @Nullable
   public static ExpressionType integerMathFunction(@Nullable ExpressionType type, @Nullable ExpressionType other)
   {
-    final ExpressionType functionType = ExpressionTypeConversion.function(type, other);
+    final ExpressionType functionType = function(type, other);
     // any number is long
     return Types.isNumeric(functionType) ? ExpressionType.LONG : functionType;
   }
diff --git a/processing/src/main/java/org/apache/druid/math/expr/Parser.java b/processing/src/main/java/org/apache/druid/math/expr/Parser.java
index e92dd130b7ce..80bd58ad4ecd 100644
--- a/processing/src/main/java/org/apache/druid/math/expr/Parser.java
+++ b/processing/src/main/java/org/apache/druid/math/expr/Parser.java
@@ -110,7 +110,7 @@ public static ApplyFunction getApplyFunction(String name)
    */
   public static Supplier<Expr> lazyParse(@Nullable String in, ExprMacroTable macroTable)
   {
-    return Suppliers.memoize(() -> in == null ? null : Parser.parse(in, macroTable));
+    return Suppliers.memoize(() -> in == null ? null : parse(in, macroTable));
   }
 
   /**
diff --git a/processing/src/main/java/org/apache/druid/query/JoinDataSource.java b/processing/src/main/java/org/apache/druid/query/JoinDataSource.java
index 220f18a94855..e75ee5f63fe5 100644
--- a/processing/src/main/java/org/apache/druid/query/JoinDataSource.java
+++ b/processing/src/main/java/org/apache/druid/query/JoinDataSource.java
@@ -313,7 +313,7 @@ public DataSource withUpdatedDataSource(DataSource newSource)
     DimFilter joinBaseFilter = analysis.getJoinBaseTableFilter().orElse(null);
 
     for (final PreJoinableClause clause : analysis.getPreJoinableClauses()) {
-      current = JoinDataSource.create(
+      current = create(
           current,
           clause.getDataSource(),
           clause.getPrefix(),
diff --git a/processing/src/main/java/org/apache/druid/query/aggregation/AggregatorUtil.java b/processing/src/main/java/org/apache/druid/query/aggregation/AggregatorUtil.java
index c4c9a7875ef0..c1cc0c5f523b 100755
--- a/processing/src/main/java/org/apache/druid/query/aggregation/AggregatorUtil.java
+++ b/processing/src/main/java/org/apache/druid/query/aggregation/AggregatorUtil.java
@@ -219,7 +219,7 @@ public static Pair<List<AggregatorFactory>, List<PostAggregator>> condensedAggre
   )
   {
 
-    List<PostAggregator> condensedPostAggs = AggregatorUtil.pruneDependentPostAgg(postAggList, metric);
+    List<PostAggregator> condensedPostAggs = pruneDependentPostAgg(postAggList, metric);
     // calculate dependent aggregators for these postAgg
     Set<String> dependencySet = new HashSet<>();
     dependencySet.add(metric);
@@ -427,7 +427,7 @@ public static Supplier<byte[]> getSimpleAggregatorCacheKeySupplier(
       return ByteBuffer.allocate(2 + fieldNameBytes.length + expressionBytes.length)
                        .put(aggregatorType)
                        .put(fieldNameBytes)
-                       .put(AggregatorUtil.STRING_SEPARATOR)
+                       .put(STRING_SEPARATOR)
                        .put(expressionBytes)
                        .array();
     });
diff --git a/processing/src/main/java/org/apache/druid/query/aggregation/any/StringAnyAggregatorFactory.java b/processing/src/main/java/org/apache/druid/query/aggregation/any/StringAnyAggregatorFactory.java
index 418bb32f64eb..286ac4d47b7a 100644
--- a/processing/src/main/java/org/apache/druid/query/aggregation/any/StringAnyAggregatorFactory.java
+++ b/processing/src/main/java/org/apache/druid/query/aggregation/any/StringAnyAggregatorFactory.java
@@ -119,7 +119,7 @@ public boolean canVectorize(ColumnInspector columnInspector)
   @Override
   public Comparator getComparator()
   {
-    return StringAnyAggregatorFactory.VALUE_COMPARATOR;
+    return VALUE_COMPARATOR;
   }
 
   @Override
diff --git a/processing/src/main/java/org/apache/druid/query/aggregation/firstlast/first/StringFirstAggregatorFactory.java b/processing/src/main/java/org/apache/druid/query/aggregation/firstlast/first/StringFirstAggregatorFactory.java
index 8ff45a27380b..80a4ca8ddce2 100644
--- a/processing/src/main/java/org/apache/druid/query/aggregation/firstlast/first/StringFirstAggregatorFactory.java
+++ b/processing/src/main/java/org/apache/druid/query/aggregation/firstlast/first/StringFirstAggregatorFactory.java
@@ -150,7 +150,7 @@ public StringFirstAggregatorFactory(
     this.fieldName = fieldName;
     this.timeColumn = timeColumn == null ? ColumnHolder.TIME_COLUMN_NAME : timeColumn;
     this.maxStringBytes = maxStringBytes == null
-                          ? StringFirstAggregatorFactory.DEFAULT_MAX_STRING_SIZE
+                          ? DEFAULT_MAX_STRING_SIZE
                           : maxStringBytes;
   }
 
diff --git a/processing/src/main/java/org/apache/druid/query/aggregation/post/ArithmeticPostAggregator.java b/processing/src/main/java/org/apache/druid/query/aggregation/post/ArithmeticPostAggregator.java
index 468be2b2a62b..2c343d7062f8 100644
--- a/processing/src/main/java/org/apache/druid/query/aggregation/post/ArithmeticPostAggregator.java
+++ b/processing/src/main/java/org/apache/druid/query/aggregation/post/ArithmeticPostAggregator.java
@@ -265,7 +265,7 @@ public double compute(double lhs, double rhs)
     private static final Map<String, Ops> LOOKUP_MAP = new HashMap<>();
 
     static {
-      for (Ops op : Ops.values()) {
+      for (Ops op : values()) {
         LOOKUP_MAP.put(op.getFn(), op);
       }
     }
diff --git a/processing/src/main/java/org/apache/druid/query/datasourcemetadata/DataSourceMetadataQuery.java b/processing/src/main/java/org/apache/druid/query/datasourcemetadata/DataSourceMetadataQuery.java
index 5c43c6445bc9..e5e6ead376dc 100644
--- a/processing/src/main/java/org/apache/druid/query/datasourcemetadata/DataSourceMetadataQuery.java
+++ b/processing/src/main/java/org/apache/druid/query/datasourcemetadata/DataSourceMetadataQuery.java
@@ -69,7 +69,7 @@ public DimFilter getFilter()
   @Override
   public String getType()
   {
-    return Query.DATASOURCE_METADATA;
+    return DATASOURCE_METADATA;
   }
 
   @Override
diff --git a/processing/src/main/java/org/apache/druid/query/filter/InDimFilter.java b/processing/src/main/java/org/apache/druid/query/filter/InDimFilter.java
index d678f4b53f12..36b4cb9b44b4 100644
--- a/processing/src/main/java/org/apache/druid/query/filter/InDimFilter.java
+++ b/processing/src/main/java/org/apache/druid/query/filter/InDimFilter.java
@@ -789,7 +789,7 @@ public static ValuesSet create()
      */
     public static ValuesSet of(@Nullable final String value)
     {
-      final ValuesSet retVal = ValuesSet.create();
+      final ValuesSet retVal = create();
       retVal.add(NullHandling.emptyToNullIfNeeded(value));
       return retVal;
     }
diff --git a/processing/src/main/java/org/apache/druid/query/groupby/GroupByQuery.java b/processing/src/main/java/org/apache/druid/query/groupby/GroupByQuery.java
index 79282735f384..05416039be78 100644
--- a/processing/src/main/java/org/apache/druid/query/groupby/GroupByQuery.java
+++ b/processing/src/main/java/org/apache/druid/query/groupby/GroupByQuery.java
@@ -1196,7 +1196,7 @@ public Builder setContext(Map<String, Object> context)
 
     public Builder queryId(String queryId)
     {
-      context = BaseQuery.computeOverriddenContext(context, ImmutableMap.of(BaseQuery.QUERY_ID, queryId));
+      context = computeOverriddenContext(context, ImmutableMap.of(QUERY_ID, queryId));
       return this;
     }
 
diff --git a/processing/src/main/java/org/apache/druid/query/groupby/GroupingEngine.java b/processing/src/main/java/org/apache/druid/query/groupby/GroupingEngine.java
index 5dc995b55386..f53c64a566ed 100644
--- a/processing/src/main/java/org/apache/druid/query/groupby/GroupingEngine.java
+++ b/processing/src/main/java/org/apache/druid/query/groupby/GroupingEngine.java
@@ -502,7 +502,7 @@ public Sequence<ResultRow> process(
     closer.register(bufferHolder);
     try {
       final String fudgeTimestampString = NullHandling.emptyToNullIfNeeded(
-          query.context().getString(GroupingEngine.CTX_KEY_FUDGE_TIMESTAMP)
+          query.context().getString(CTX_KEY_FUDGE_TIMESTAMP)
       );
 
       final DateTime fudgeTimestamp = fudgeTimestampString == null
diff --git a/processing/src/main/java/org/apache/druid/query/groupby/ResultRow.java b/processing/src/main/java/org/apache/druid/query/groupby/ResultRow.java
index 977cba96034b..1232fc7c5916 100644
--- a/processing/src/main/java/org/apache/druid/query/groupby/ResultRow.java
+++ b/processing/src/main/java/org/apache/druid/query/groupby/ResultRow.java
@@ -91,7 +91,7 @@ public static ResultRow create(final int size)
   public static ResultRow fromLegacyRow(Row row, final GroupByQuery query)
   {
     // Can't be sure if we'll get result rows with or without postaggregations, so be safe.
-    final ResultRow resultRow = ResultRow.create(query.getResultRowSizeWithPostAggregators());
+    final ResultRow resultRow = create(query.getResultRowSizeWithPostAggregators());
 
     int i = 0;
     if (query.getResultRowHasTimestamp()) {
diff --git a/processing/src/main/java/org/apache/druid/query/groupby/epinephelinae/RowBasedGrouperHelper.java b/processing/src/main/java/org/apache/druid/query/groupby/epinephelinae/RowBasedGrouperHelper.java
index 063348f35b70..bd0768297d74 100644
--- a/processing/src/main/java/org/apache/druid/query/groupby/epinephelinae/RowBasedGrouperHelper.java
+++ b/processing/src/main/java/org/apache/druid/query/groupby/epinephelinae/RowBasedGrouperHelper.java
@@ -449,7 +449,7 @@ private static Predicate<ResultRow> getResultRowPredicate(final GroupByQuery que
     final ColumnSelectorFactory columnSelectorFactory =
         query.getVirtualColumns()
              .wrap(
-                 RowBasedGrouperHelper.createResultRowBasedColumnSelectorFactory(
+                 createResultRowBasedColumnSelectorFactory(
                      subquery,
                      rowSupplier,
                      RowSignature.Finalization.UNKNOWN
diff --git a/processing/src/main/java/org/apache/druid/query/groupby/orderby/OrderByColumnSpec.java b/processing/src/main/java/org/apache/druid/query/groupby/orderby/OrderByColumnSpec.java
index ac043d781c20..01ca2b8431cf 100644
--- a/processing/src/main/java/org/apache/druid/query/groupby/orderby/OrderByColumnSpec.java
+++ b/processing/src/main/java/org/apache/druid/query/groupby/orderby/OrderByColumnSpec.java
@@ -55,7 +55,7 @@ public enum Direction
     private static final Map<String, Direction> STUPID_ENUM_MAP;
     static {
       final ImmutableMap.Builder<String, Direction> bob = ImmutableMap.builder();
-      for (Direction direction : Direction.values()) {
+      for (Direction direction : values()) {
         bob.put(direction.name(), direction);
       }
       STUPID_ENUM_MAP = bob.build();
@@ -75,7 +75,7 @@ public static Direction fromString(String name)
       Direction direction = STUPID_ENUM_MAP.get(upperName);
 
       if (direction == null) {
-        for (Direction dir : Direction.values()) {
+        for (Direction dir : values()) {
           if (dir.name().startsWith(upperName)) {
             if (direction != null) {
               throw new ISE("Ambiguous directions[%s] and [%s]", direction, dir);
diff --git a/processing/src/main/java/org/apache/druid/query/metadata/metadata/ColumnAnalysis.java b/processing/src/main/java/org/apache/druid/query/metadata/metadata/ColumnAnalysis.java
index d157ee8c1a1a..1ce8f4f3e95f 100644
--- a/processing/src/main/java/org/apache/druid/query/metadata/metadata/ColumnAnalysis.java
+++ b/processing/src/main/java/org/apache/druid/query/metadata/metadata/ColumnAnalysis.java
@@ -151,7 +151,7 @@ public ColumnAnalysis fold(ColumnAnalysis rhs)
     }
 
     if (isError() && rhs.isError()) {
-      return errorMessage.equals(rhs.getErrorMessage()) ? this : ColumnAnalysis.error("multiple_errors");
+      return errorMessage.equals(rhs.getErrorMessage()) ? this : error("multiple_errors");
     } else if (isError()) {
       return this;
     } else if (rhs.isError()) {
@@ -159,13 +159,13 @@ public ColumnAnalysis fold(ColumnAnalysis rhs)
     }
 
     if (!Objects.equals(type, rhs.getType())) {
-      return ColumnAnalysis.error(
+      return error(
           StringUtils.format("cannot_merge_diff_types: [%s] and [%s]", type, rhs.getType())
       );
     }
 
     if (!Objects.equals(typeSignature, rhs.getTypeSignature())) {
-      return ColumnAnalysis.error(
+      return error(
           StringUtils.format(
               "cannot_merge_diff_types: [%s] and [%s]",
               typeSignature.asTypeString(),
diff --git a/processing/src/main/java/org/apache/druid/query/metadata/metadata/SegmentMetadataQuery.java b/processing/src/main/java/org/apache/druid/query/metadata/metadata/SegmentMetadataQuery.java
index f2d434bab8a5..1e365ea4b516 100644
--- a/processing/src/main/java/org/apache/druid/query/metadata/metadata/SegmentMetadataQuery.java
+++ b/processing/src/main/java/org/apache/druid/query/metadata/metadata/SegmentMetadataQuery.java
@@ -164,7 +164,7 @@ public DimFilter getFilter()
   @Override
   public String getType()
   {
-    return Query.SEGMENT_METADATA;
+    return SEGMENT_METADATA;
   }
 
   @JsonProperty
diff --git a/processing/src/main/java/org/apache/druid/query/operator/WindowOperatorQuery.java b/processing/src/main/java/org/apache/druid/query/operator/WindowOperatorQuery.java
index 79a8ebdb19d2..97d053491eba 100644
--- a/processing/src/main/java/org/apache/druid/query/operator/WindowOperatorQuery.java
+++ b/processing/src/main/java/org/apache/druid/query/operator/WindowOperatorQuery.java
@@ -186,7 +186,7 @@ public DimFilter getFilter()
   @Override
   public String getType()
   {
-    return Query.WINDOW_OPERATOR;
+    return WINDOW_OPERATOR;
   }
 
 
diff --git a/processing/src/main/java/org/apache/druid/query/ordering/StringComparators.java b/processing/src/main/java/org/apache/druid/query/ordering/StringComparators.java
index 650b259ed562..eb44210d911d 100644
--- a/processing/src/main/java/org/apache/druid/query/ordering/StringComparators.java
+++ b/processing/src/main/java/org/apache/druid/query/ordering/StringComparators.java
@@ -98,7 +98,7 @@ public int hashCode()
     @Override
     public String toString()
     {
-      return StringComparators.LEXICOGRAPHIC_NAME;
+      return LEXICOGRAPHIC_NAME;
     }
 
     @Override
@@ -286,7 +286,7 @@ public int hashCode()
     @Override
     public String toString()
     {
-      return StringComparators.ALPHANUMERIC_NAME;
+      return ALPHANUMERIC_NAME;
     }
 
     @Override
@@ -340,7 +340,7 @@ public int hashCode()
     @Override
     public String toString()
     {
-      return StringComparators.STRLEN_NAME;
+      return STRLEN_NAME;
     }
 
     @Override
@@ -404,7 +404,7 @@ public int compare(String o1, String o2)
 
       if (bd1 == null && bd2 == null) {
         // both Strings are unparseable, just compare lexicographically to have a well-defined ordering
-        return StringComparators.LEXICOGRAPHIC.compare(o1, o2);
+        return LEXICOGRAPHIC.compare(o1, o2);
       }
 
       if (bd1 == null) {
@@ -417,7 +417,7 @@ public int compare(String o1, String o2)
     @Override
     public String toString()
     {
-      return StringComparators.NUMERIC_NAME;
+      return NUMERIC_NAME;
     }
 
     @Override
@@ -469,7 +469,7 @@ public int compare(String o1, String o2)
     @Override
     public String toString()
     {
-      return StringComparators.VERSION_NAME;
+      return VERSION_NAME;
     }
 
     @Override
@@ -520,7 +520,7 @@ public int compare(String o1, String o2)
     @Override
     public String toString()
     {
-      return StringComparators.NATURAL_NAME;
+      return NATURAL_NAME;
     }
 
     @Override
diff --git a/processing/src/main/java/org/apache/druid/query/rowsandcols/MapOfColumnsRowsAndColumns.java b/processing/src/main/java/org/apache/druid/query/rowsandcols/MapOfColumnsRowsAndColumns.java
index d6bc1026a98d..48e93f10e759 100644
--- a/processing/src/main/java/org/apache/druid/query/rowsandcols/MapOfColumnsRowsAndColumns.java
+++ b/processing/src/main/java/org/apache/druid/query/rowsandcols/MapOfColumnsRowsAndColumns.java
@@ -205,7 +205,7 @@ public Builder add(String name, Column col)
 
     public MapOfColumnsRowsAndColumns build()
     {
-      return MapOfColumnsRowsAndColumns.fromMap(cols);
+      return fromMap(cols);
     }
   }
 
diff --git a/processing/src/main/java/org/apache/druid/query/search/SearchQuery.java b/processing/src/main/java/org/apache/druid/query/search/SearchQuery.java
index aa10b6ab5790..06ef3aa0a32b 100644
--- a/processing/src/main/java/org/apache/druid/query/search/SearchQuery.java
+++ b/processing/src/main/java/org/apache/druid/query/search/SearchQuery.java
@@ -94,7 +94,7 @@ public DimFilter getFilter()
   @Override
   public String getType()
   {
-    return Query.SEARCH;
+    return SEARCH;
   }
 
   @Override
diff --git a/processing/src/main/java/org/apache/druid/query/timeboundary/TimeBoundaryQuery.java b/processing/src/main/java/org/apache/druid/query/timeboundary/TimeBoundaryQuery.java
index 47412f7d7d50..95913b77940b 100644
--- a/processing/src/main/java/org/apache/druid/query/timeboundary/TimeBoundaryQuery.java
+++ b/processing/src/main/java/org/apache/druid/query/timeboundary/TimeBoundaryQuery.java
@@ -89,7 +89,7 @@ public DimFilter getFilter()
   @Override
   public String getType()
   {
-    return Query.TIME_BOUNDARY;
+    return TIME_BOUNDARY;
   }
 
   @JsonProperty
diff --git a/processing/src/main/java/org/apache/druid/query/timeseries/TimeseriesQuery.java b/processing/src/main/java/org/apache/druid/query/timeseries/TimeseriesQuery.java
index b2165cd5b704..f85237c8be88 100644
--- a/processing/src/main/java/org/apache/druid/query/timeseries/TimeseriesQuery.java
+++ b/processing/src/main/java/org/apache/druid/query/timeseries/TimeseriesQuery.java
@@ -120,7 +120,7 @@ public DimFilter getFilter()
   @Override
   public String getType()
   {
-    return Query.TIMESERIES;
+    return TIMESERIES;
   }
 
   @JsonProperty
diff --git a/processing/src/main/java/org/apache/druid/query/topn/PooledTopNAlgorithm.java b/processing/src/main/java/org/apache/druid/query/topn/PooledTopNAlgorithm.java
index d2ba16746218..9ab0241c31e9 100644
--- a/processing/src/main/java/org/apache/druid/query/topn/PooledTopNAlgorithm.java
+++ b/processing/src/main/java/org/apache/druid/query/topn/PooledTopNAlgorithm.java
@@ -81,28 +81,28 @@ public class PooledTopNAlgorithm
   @VisibleForTesting
   static void setSpecializeGeneric1AggPooledTopN(boolean value)
   {
-    PooledTopNAlgorithm.SPECIALIZE_GENERIC_ONE_AGG_POOLED_TOPN = value;
+    SPECIALIZE_GENERIC_ONE_AGG_POOLED_TOPN = value;
     computeSpecializedScanAndAggregateImplementations();
   }
 
   @VisibleForTesting
   static void setSpecializeGeneric2AggPooledTopN(boolean value)
   {
-    PooledTopNAlgorithm.SPECIALIZE_GENERIC_TWO_AGG_POOLED_TOPN = value;
+    SPECIALIZE_GENERIC_TWO_AGG_POOLED_TOPN = value;
     computeSpecializedScanAndAggregateImplementations();
   }
 
   @VisibleForTesting
   static void setSpecializeHistorical1SimpleDoubleAggPooledTopN(boolean value)
   {
-    PooledTopNAlgorithm.SPECIALIZE_HISTORICAL_ONE_SIMPLE_DOUBLE_AGG_POOLED_TOPN = value;
+    SPECIALIZE_HISTORICAL_ONE_SIMPLE_DOUBLE_AGG_POOLED_TOPN = value;
     computeSpecializedScanAndAggregateImplementations();
   }
 
   @VisibleForTesting
   static void setSpecializeHistoricalSingleValueDimSelector1SimpleDoubleAggPooledTopN(boolean value)
   {
-    PooledTopNAlgorithm.SPECIALIZE_HISTORICAL_SINGLE_VALUE_DIM_SELECTOR_ONE_SIMPLE_DOUBLE_AGG_POOLED_TOPN = value;
+    SPECIALIZE_HISTORICAL_SINGLE_VALUE_DIM_SELECTOR_ONE_SIMPLE_DOUBLE_AGG_POOLED_TOPN = value;
     computeSpecializedScanAndAggregateImplementations();
   }
 
diff --git a/processing/src/main/java/org/apache/druid/segment/AutoTypeColumnIndexer.java b/processing/src/main/java/org/apache/druid/segment/AutoTypeColumnIndexer.java
index d0209b0bfea8..45a58dfcdd77 100644
--- a/processing/src/main/java/org/apache/druid/segment/AutoTypeColumnIndexer.java
+++ b/processing/src/main/java/org/apache/druid/segment/AutoTypeColumnIndexer.java
@@ -99,7 +99,7 @@ public ProcessedValue<?> processField(ArrayList<NestedPathPart> fieldPath, @Null
         ExprEval<?> eval = ExprEval.bestEffortOf(fieldValue);
         FieldIndexer fieldIndexer = fieldIndexers.get(fieldName);
         if (fieldIndexer == null) {
-          estimatedFieldKeySize += StructuredDataProcessor.estimateStringSize(fieldName);
+          estimatedFieldKeySize += estimateStringSize(fieldName);
           fieldIndexer = new FieldIndexer(globalDictionary);
           fieldIndexers.put(fieldName, fieldIndexer);
         }
@@ -120,7 +120,7 @@ public ProcessedValue<?> processArrayField(
         final String fieldName = NestedPathFinder.toNormalizedJsonPath(fieldPath);
         FieldIndexer fieldIndexer = fieldIndexers.get(fieldName);
         if (fieldIndexer == null) {
-          estimatedFieldKeySize += StructuredDataProcessor.estimateStringSize(fieldName);
+          estimatedFieldKeySize += estimateStringSize(fieldName);
           fieldIndexer = new FieldIndexer(globalDictionary);
           fieldIndexers.put(fieldName, fieldIndexer);
         }
diff --git a/processing/src/main/java/org/apache/druid/segment/DimensionHandlerUtils.java b/processing/src/main/java/org/apache/druid/segment/DimensionHandlerUtils.java
index e129ceb41778..18e1334af44a 100644
--- a/processing/src/main/java/org/apache/druid/segment/DimensionHandlerUtils.java
+++ b/processing/src/main/java/org/apache/druid/segment/DimensionHandlerUtils.java
@@ -327,7 +327,7 @@ public static Long convertObjectToLong(
     } else if (valObj instanceof Boolean) {
       return Evals.asLong((Boolean) valObj);
     } else if (valObj instanceof String) {
-      Long ret = DimensionHandlerUtils.getExactLongFromDecimalString((String) valObj);
+      Long ret = getExactLongFromDecimalString((String) valObj);
       if (reportParseExceptions && ret == null) {
         final String message;
         if (objectKey != null) {
@@ -518,7 +518,7 @@ public static Object convertObjectToType(
       case ARRAY:
         return coerceToObjectArrayWithElementCoercionFunction(
             obj,
-            x -> DimensionHandlerUtils.convertObjectToType(x, type.getElementType(), reportParseExceptions, fieldName)
+            x -> convertObjectToType(x, type.getElementType(), reportParseExceptions, fieldName)
         );
       case COMPLEX:
         // Can't coerce complex objects, and we shouldn't need to. If in future selectors behave weirdly, or we need to
diff --git a/processing/src/main/java/org/apache/druid/segment/IndexMergerV9.java b/processing/src/main/java/org/apache/druid/segment/IndexMergerV9.java
index 7da89edaff75..2be3966b6509 100644
--- a/processing/src/main/java/org/apache/druid/segment/IndexMergerV9.java
+++ b/processing/src/main/java/org/apache/druid/segment/IndexMergerV9.java
@@ -1232,7 +1232,7 @@ private File multiphaseMerge(
 
     List<File> tempDirs = new ArrayList<>();
 
-    if (maxColumnsToMerge == IndexMerger.UNLIMITED_MAX_COLUMNS_TO_MERGE) {
+    if (maxColumnsToMerge == UNLIMITED_MAX_COLUMNS_TO_MERGE) {
       return merge(
           indexes,
           rollup,
diff --git a/processing/src/main/java/org/apache/druid/segment/IndexSpec.java b/processing/src/main/java/org/apache/druid/segment/IndexSpec.java
index 1dc2f8496821..939adf87d4f4 100644
--- a/processing/src/main/java/org/apache/druid/segment/IndexSpec.java
+++ b/processing/src/main/java/org/apache/druid/segment/IndexSpec.java
@@ -43,7 +43,7 @@
  */
 public class IndexSpec
 {
-  public static final IndexSpec DEFAULT = IndexSpec.builder().build();
+  public static final IndexSpec DEFAULT = builder().build();
 
   public static Builder builder()
   {
diff --git a/processing/src/main/java/org/apache/druid/segment/NestedDataColumnIndexerV4.java b/processing/src/main/java/org/apache/druid/segment/NestedDataColumnIndexerV4.java
index f3c92806e4fc..c7107f868ad1 100644
--- a/processing/src/main/java/org/apache/druid/segment/NestedDataColumnIndexerV4.java
+++ b/processing/src/main/java/org/apache/druid/segment/NestedDataColumnIndexerV4.java
@@ -73,7 +73,7 @@ public ProcessedValue<?> processField(ArrayList<NestedPathPart> fieldPath, @Null
         ExprEval<?> eval = ExprEval.bestEffortOf(fieldValue);
         FieldIndexer fieldIndexer = fieldIndexers.get(fieldName);
         if (fieldIndexer == null) {
-          estimatedFieldKeySize += StructuredDataProcessor.estimateStringSize(fieldName);
+          estimatedFieldKeySize += estimateStringSize(fieldName);
           fieldIndexer = new FieldIndexer(globalDictionary);
           fieldIndexers.put(fieldName, fieldIndexer);
         }
diff --git a/processing/src/main/java/org/apache/druid/segment/RowBasedColumnSelectorFactory.java b/processing/src/main/java/org/apache/druid/segment/RowBasedColumnSelectorFactory.java
index 43ae6ae14646..6e89942e1f92 100644
--- a/processing/src/main/java/org/apache/druid/segment/RowBasedColumnSelectorFactory.java
+++ b/processing/src/main/java/org/apache/druid/segment/RowBasedColumnSelectorFactory.java
@@ -298,7 +298,7 @@ public void inspectRuntimeShape(RuntimeShapeInspector inspector)
         @Override
         public int getValueCardinality()
         {
-          return DimensionDictionarySelector.CARDINALITY_UNKNOWN;
+          return CARDINALITY_UNKNOWN;
         }
 
         @Override
diff --git a/processing/src/main/java/org/apache/druid/segment/column/ColumnCapabilities.java b/processing/src/main/java/org/apache/druid/segment/column/ColumnCapabilities.java
index 59f0e18c0ae8..014dfe2227c1 100644
--- a/processing/src/main/java/org/apache/druid/segment/column/ColumnCapabilities.java
+++ b/processing/src/main/java/org/apache/druid/segment/column/ColumnCapabilities.java
@@ -119,7 +119,7 @@ public boolean isUnknown()
 
     public Capable coerceUnknownToBoolean(boolean unknownIsTrue)
     {
-      return this == UNKNOWN ? Capable.of(unknownIsTrue) : this;
+      return this == UNKNOWN ? of(unknownIsTrue) : this;
     }
 
     public Capable and(Capable other)
@@ -146,7 +146,7 @@ public static Capable of(boolean bool)
     @JsonCreator
     public static Capable ofNullable(@Nullable Boolean bool)
     {
-      return bool == null ? Capable.UNKNOWN : of(bool);
+      return bool == null ? UNKNOWN : of(bool);
     }
 
     @JsonValue
diff --git a/processing/src/main/java/org/apache/druid/segment/column/ColumnCapabilitiesImpl.java b/processing/src/main/java/org/apache/druid/segment/column/ColumnCapabilitiesImpl.java
index f0b13a7115ea..956352e1c288 100644
--- a/processing/src/main/java/org/apache/druid/segment/column/ColumnCapabilitiesImpl.java
+++ b/processing/src/main/java/org/apache/druid/segment/column/ColumnCapabilitiesImpl.java
@@ -110,7 +110,7 @@ public static ColumnCapabilitiesImpl snapshot(@Nullable final ColumnCapabilities
    */
   public static ColumnCapabilitiesImpl createDefault()
   {
-    return ColumnCapabilitiesImpl.snapshot(new ColumnCapabilitiesImpl(), ALL_FALSE);
+    return snapshot(new ColumnCapabilitiesImpl(), ALL_FALSE);
   }
 
   /**
diff --git a/processing/src/main/java/org/apache/druid/segment/column/ColumnType.java b/processing/src/main/java/org/apache/druid/segment/column/ColumnType.java
index b670d8f4370f..60da75855fc1 100644
--- a/processing/src/main/java/org/apache/druid/segment/column/ColumnType.java
+++ b/processing/src/main/java/org/apache/druid/segment/column/ColumnType.java
@@ -179,8 +179,8 @@ public static ColumnType leastRestrictiveType(@Nullable ColumnType type, @Nullab
     }
     // if either is nested data, use nested data, otherwise error
     if (type.is(ValueType.COMPLEX) || other.is(ValueType.COMPLEX)) {
-      if (ColumnType.NESTED_DATA.equals(type) || ColumnType.NESTED_DATA.equals(other)) {
-        return ColumnType.NESTED_DATA;
+      if (NESTED_DATA.equals(type) || NESTED_DATA.equals(other)) {
+        return NESTED_DATA;
       }
       throw new Types.IncompatibleTypeException(type, other);
     }
@@ -198,14 +198,14 @@ public static ColumnType leastRestrictiveType(@Nullable ColumnType type, @Nullab
             (ColumnType) other.getElementType()
         );
 
-        return ColumnType.ofArray(commonElementType);
+        return ofArray(commonElementType);
       } else {
         commonElementType = leastRestrictiveType(
             (ColumnType) type.getElementType(),
             other
         );
       }
-      return ColumnType.ofArray(commonElementType);
+      return ofArray(commonElementType);
     }
     if (other.isArray()) {
       if (type.equals(type.getElementType())) {
@@ -217,22 +217,22 @@ public static ColumnType leastRestrictiveType(@Nullable ColumnType type, @Nullab
           type,
           (ColumnType) other.getElementType()
       );
-      return ColumnType.ofArray(commonElementType);
+      return ofArray(commonElementType);
     }
     // if either argument is a string, type becomes a string
     if (Types.is(type, ValueType.STRING) || Types.is(other, ValueType.STRING)) {
-      return ColumnType.STRING;
+      return STRING;
     }
 
     // all numbers win over longs
     if (Types.is(type, ValueType.LONG) && Types.isNullOr(other, ValueType.LONG)) {
-      return ColumnType.LONG;
+      return LONG;
     }
     // doubles win over floats
     if (Types.is(type, ValueType.FLOAT) && Types.isNullOr(other, ValueType.FLOAT)) {
-      return ColumnType.FLOAT;
+      return FLOAT;
     }
-    return ColumnType.DOUBLE;
+    return DOUBLE;
   }
 
 }
diff --git a/processing/src/main/java/org/apache/druid/segment/column/ValueType.java b/processing/src/main/java/org/apache/druid/segment/column/ValueType.java
index 6e114ec89955..083e87bf5fc9 100644
--- a/processing/src/main/java/org/apache/druid/segment/column/ValueType.java
+++ b/processing/src/main/java/org/apache/druid/segment/column/ValueType.java
@@ -128,7 +128,7 @@ public boolean isArray()
   @Override
   public boolean isPrimitive()
   {
-    return this.equals(ValueType.STRING) || isNumeric(this);
+    return STRING.equals(this) || isNumeric(this);
   }
 
   @Nullable
@@ -143,11 +143,11 @@ public static ValueType fromString(@Nullable String name)
 
   public static boolean isNumeric(ValueType type)
   {
-    return type == ValueType.LONG || type == ValueType.FLOAT || type == ValueType.DOUBLE;
+    return type == LONG || type == FLOAT || type == DOUBLE;
   }
 
   public static boolean isArray(ValueType type)
   {
-    return type == ValueType.ARRAY;
+    return type == ARRAY;
   }
 }
diff --git a/processing/src/main/java/org/apache/druid/segment/data/CompressionFactory.java b/processing/src/main/java/org/apache/druid/segment/data/CompressionFactory.java
index 9e7d2ea5b616..40931b0fa815 100644
--- a/processing/src/main/java/org/apache/druid/segment/data/CompressionFactory.java
+++ b/processing/src/main/java/org/apache/druid/segment/data/CompressionFactory.java
@@ -203,7 +203,7 @@ public byte getId()
     static final Map<Byte, LongEncodingFormat> ID_MAP = new HashMap<>();
 
     static {
-      for (LongEncodingFormat format : LongEncodingFormat.values()) {
+      for (LongEncodingFormat format : values()) {
         ID_MAP.put(format.getId(), format);
       }
     }
diff --git a/processing/src/main/java/org/apache/druid/segment/data/CompressionStrategy.java b/processing/src/main/java/org/apache/druid/segment/data/CompressionStrategy.java
index 18ea27cc4044..34eb269851a5 100644
--- a/processing/src/main/java/org/apache/druid/segment/data/CompressionStrategy.java
+++ b/processing/src/main/java/org/apache/druid/segment/data/CompressionStrategy.java
@@ -158,7 +158,7 @@ public static CompressionStrategy fromString(String name)
   static final Map<Byte, CompressionStrategy> ID_MAP = new HashMap<>();
 
   static {
-    for (CompressionStrategy strategy : CompressionStrategy.values()) {
+    for (CompressionStrategy strategy : values()) {
       ID_MAP.put(strategy.getId(), strategy);
     }
   }
@@ -171,7 +171,7 @@ public static CompressionStrategy forId(byte id)
   // TODO remove this method and change all its callers to use all CompressionStrategy values when NONE type is supported by all types
   public static CompressionStrategy[] noNoneValues()
   {
-    return (CompressionStrategy[]) ArrayUtils.removeElement(CompressionStrategy.values(), NONE);
+    return (CompressionStrategy[]) ArrayUtils.removeElement(values(), NONE);
   }
 
   public interface Decompressor
diff --git a/processing/src/main/java/org/apache/druid/segment/data/FrontCodedIndexed.java b/processing/src/main/java/org/apache/druid/segment/data/FrontCodedIndexed.java
index f3f1457c503f..1ba694cbcfc0 100644
--- a/processing/src/main/java/org/apache/druid/segment/data/FrontCodedIndexed.java
+++ b/processing/src/main/java/org/apache/druid/segment/data/FrontCodedIndexed.java
@@ -83,12 +83,12 @@ public abstract class FrontCodedIndexed implements Indexed<ByteBuffer>
 
   public static byte validateVersion(byte version)
   {
-    if (version != FrontCodedIndexed.V0 && version != FrontCodedIndexed.V1) {
+    if (version != V0 && version != V1) {
       throw new IAE(
           "Unknown format version for FrontCodedIndexed [%s], must be [%s] or [%s]",
           version,
-          FrontCodedIndexed.V0,
-          FrontCodedIndexed.V1
+          V0,
+          V1
       );
     }
     return version;
diff --git a/processing/src/main/java/org/apache/druid/segment/data/Indexed.java b/processing/src/main/java/org/apache/druid/segment/data/Indexed.java
index f85e1a84168e..cf5687b8461f 100644
--- a/processing/src/main/java/org/apache/druid/segment/data/Indexed.java
+++ b/processing/src/main/java/org/apache/druid/segment/data/Indexed.java
@@ -53,7 +53,7 @@ public int size()
       @Override
       public T get(int index)
       {
-        Indexed.checkIndex(index, 0);
+        checkIndex(index, 0);
         return null;
       }
 
diff --git a/processing/src/main/java/org/apache/druid/segment/filter/Filters.java b/processing/src/main/java/org/apache/druid/segment/filter/Filters.java
index 1c0893b4a052..1d83e2eda11c 100644
--- a/processing/src/main/java/org/apache/druid/segment/filter/Filters.java
+++ b/processing/src/main/java/org/apache/druid/segment/filter/Filters.java
@@ -164,7 +164,7 @@ public static Filter convertToCNFFromQueryContext(Query query, @Nullable Filter
     }
     boolean useCNF = query.context().getBoolean(QueryContexts.USE_FILTER_CNF_KEY, QueryContexts.DEFAULT_USE_FILTER_CNF);
     try {
-      return useCNF ? Filters.toCnf(filter) : filter;
+      return useCNF ? toCnf(filter) : filter;
     }
     catch (CNFFilterExplosionException cnfFilterExplosionException) {
       return filter; // cannot convert to CNF, return the filter as is
@@ -321,7 +321,7 @@ public static Optional<Filter> maybeOr(final List<Filter> filters)
    */
   public static List<Filter> toNormalizedOrClauses(Filter filter) throws CNFFilterExplosionException
   {
-    Filter normalizedFilter = Filters.toCnf(filter);
+    Filter normalizedFilter = toCnf(filter);
 
     // List of candidates for pushdown
     // CNF normalization will generate either
diff --git a/processing/src/main/java/org/apache/druid/segment/filter/ValueMatchers.java b/processing/src/main/java/org/apache/druid/segment/filter/ValueMatchers.java
index 344fbbb70cbf..a543f56fa9fd 100644
--- a/processing/src/main/java/org/apache/druid/segment/filter/ValueMatchers.java
+++ b/processing/src/main/java/org/apache/druid/segment/filter/ValueMatchers.java
@@ -411,7 +411,7 @@ public void inspectRuntimeShape(RuntimeShapeInspector inspector)
       final int nullId = lookup.lookupId(null);
       if (nullId < 0) {
         // column doesn't have null value so no unknowns, can safely return always false matcher
-        return ValueMatchers.allFalse();
+        return allFalse();
       }
       if (multiValue) {
         return new ValueMatcher()
diff --git a/processing/src/main/java/org/apache/druid/segment/index/IndexedUtf8ValueIndexes.java b/processing/src/main/java/org/apache/druid/segment/index/IndexedUtf8ValueIndexes.java
index a9819fd75cb3..4476d70f1126 100644
--- a/processing/src/main/java/org/apache/druid/segment/index/IndexedUtf8ValueIndexes.java
+++ b/processing/src/main/java/org/apache/druid/segment/index/IndexedUtf8ValueIndexes.java
@@ -241,7 +241,7 @@ public BitmapColumnIndex forSortedValues(@Nonnull List<?> sortedValues, TypeSign
       } else {
         tailSet = baseSet;
       }
-      if (tailSet.size() > ValueSetIndexes.SORTED_SCAN_RATIO_THRESHOLD * dictionary.size()) {
+      if (tailSet.size() > SORTED_SCAN_RATIO_THRESHOLD * dictionary.size()) {
         return ValueSetIndexes.buildBitmapColumnIndexFromSortedIteratorScan(
             bitmapFactory,
             ByteBufferUtils.utf8Comparator(),
diff --git a/processing/src/main/java/org/apache/druid/segment/nested/FieldTypeInfo.java b/processing/src/main/java/org/apache/druid/segment/nested/FieldTypeInfo.java
index b00af7a132f0..7750b8645449 100644
--- a/processing/src/main/java/org/apache/druid/segment/nested/FieldTypeInfo.java
+++ b/processing/src/main/java/org/apache/druid/segment/nested/FieldTypeInfo.java
@@ -253,7 +253,7 @@ public void write(MutableTypeSet types) throws IOException
       byte typeByte = types.getByteValue();
       // adjust for empty array if needed
       if (types.hasUntypedArray()) {
-        Set<ColumnType> columnTypes = FieldTypeInfo.convertToSet(types.getByteValue());
+        Set<ColumnType> columnTypes = convertToSet(types.getByteValue());
         ColumnType leastRestrictive = null;
         for (ColumnType type : columnTypes) {
           leastRestrictive = ColumnType.leastRestrictiveType(leastRestrictive, type);
diff --git a/processing/src/main/java/org/apache/druid/segment/nested/NestedCommonFormatColumnSerializer.java b/processing/src/main/java/org/apache/druid/segment/nested/NestedCommonFormatColumnSerializer.java
index 88b5c240e1b0..acaa9a32c12b 100644
--- a/processing/src/main/java/org/apache/druid/segment/nested/NestedCommonFormatColumnSerializer.java
+++ b/processing/src/main/java/org/apache/druid/segment/nested/NestedCommonFormatColumnSerializer.java
@@ -88,7 +88,7 @@ protected static void copyFromTempSmoosh(FileSmoosher smoosher, SmooshedFileMapp
 
   public static void writeV0Header(WritableByteChannel channel, ByteBuffer columnNameBuffer) throws IOException
   {
-    channel.write(ByteBuffer.wrap(new byte[]{NestedCommonFormatColumnSerializer.V0}));
+    channel.write(ByteBuffer.wrap(new byte[]{V0}));
     channel.write(columnNameBuffer);
   }
 
diff --git a/processing/src/main/java/org/apache/druid/segment/nested/NestedFieldColumnIndexSupplier.java b/processing/src/main/java/org/apache/druid/segment/nested/NestedFieldColumnIndexSupplier.java
index d53596964f8b..5e2d38238c4a 100644
--- a/processing/src/main/java/org/apache/druid/segment/nested/NestedFieldColumnIndexSupplier.java
+++ b/processing/src/main/java/org/apache/druid/segment/nested/NestedFieldColumnIndexSupplier.java
@@ -1314,7 +1314,7 @@ public BitmapColumnIndex forValue(@Nullable String value)
         @Override
         public int estimatedComputeCost()
         {
-          return NestedVariantIndexes.INDEX_COMPUTE_SCALE;
+          return INDEX_COMPUTE_SCALE;
         }
 
         @Override
@@ -1357,10 +1357,10 @@ public BitmapColumnIndex forSortedValues(SortedSet<String> values)
         @Override
         public int estimatedComputeCost()
         {
-          if (values.size() >= Integer.MAX_VALUE / NestedVariantIndexes.INDEX_COMPUTE_SCALE) {
+          if (values.size() >= Integer.MAX_VALUE / INDEX_COMPUTE_SCALE) {
             return Integer.MAX_VALUE;
           }
-          return values.size() * NestedVariantIndexes.INDEX_COMPUTE_SCALE;
+          return values.size() * INDEX_COMPUTE_SCALE;
         }
 
         @Override
diff --git a/processing/src/main/java/org/apache/druid/segment/nested/ScalarDoubleColumnAndIndexSupplier.java b/processing/src/main/java/org/apache/druid/segment/nested/ScalarDoubleColumnAndIndexSupplier.java
index 1bde18e188a8..8452e143d6e3 100644
--- a/processing/src/main/java/org/apache/druid/segment/nested/ScalarDoubleColumnAndIndexSupplier.java
+++ b/processing/src/main/java/org/apache/druid/segment/nested/ScalarDoubleColumnAndIndexSupplier.java
@@ -323,7 +323,7 @@ public BitmapColumnIndex forSortedValues(@Nonnull List<?> sortedValues, TypeSign
         final List<Double> tailSet;
         final List<Double> baseSet = (List<Double>) sortedValues;
 
-        if (sortedValues.size() >= ValueSetIndexes.SIZE_WORTH_CHECKING_MIN) {
+        if (sortedValues.size() >= SIZE_WORTH_CHECKING_MIN) {
           final double minValueInColumn = dictionary.get(0) == null ? dictionary.get(1) : dictionary.get(0);
           final int position = Collections.binarySearch(
               sortedValues,
@@ -335,7 +335,7 @@ public BitmapColumnIndex forSortedValues(@Nonnull List<?> sortedValues, TypeSign
         } else {
           tailSet = baseSet;
         }
-        if (tailSet.size() > ValueSetIndexes.SORTED_SCAN_RATIO_THRESHOLD * dictionary.size()) {
+        if (tailSet.size() > SORTED_SCAN_RATIO_THRESHOLD * dictionary.size()) {
           return ValueSetIndexes.buildBitmapColumnIndexFromSortedIteratorScan(
               bitmapFactory,
               ColumnType.DOUBLE.getNullableStrategy(),
diff --git a/processing/src/main/java/org/apache/druid/segment/nested/ScalarLongColumnAndIndexSupplier.java b/processing/src/main/java/org/apache/druid/segment/nested/ScalarLongColumnAndIndexSupplier.java
index 1b1b9fb97e7b..b76f5d99be48 100644
--- a/processing/src/main/java/org/apache/druid/segment/nested/ScalarLongColumnAndIndexSupplier.java
+++ b/processing/src/main/java/org/apache/druid/segment/nested/ScalarLongColumnAndIndexSupplier.java
@@ -321,7 +321,7 @@ public BitmapColumnIndex forSortedValues(@Nonnull List<?> sortedValues, TypeSign
         final List<Long> tailSet;
         final List<Long> baseSet = (List<Long>) sortedValues;
 
-        if (sortedValues.size() >= ValueSetIndexes.SIZE_WORTH_CHECKING_MIN) {
+        if (sortedValues.size() >= SIZE_WORTH_CHECKING_MIN) {
           final long minValueInColumn = dictionary.get(0) == null ? dictionary.get(1) : dictionary.get(0);
           final int position = Collections.binarySearch(
               sortedValues,
@@ -332,7 +332,7 @@ public BitmapColumnIndex forSortedValues(@Nonnull List<?> sortedValues, TypeSign
         } else {
           tailSet = baseSet;
         }
-        if (tailSet.size() > ValueSetIndexes.SORTED_SCAN_RATIO_THRESHOLD * dictionary.size()) {
+        if (tailSet.size() > SORTED_SCAN_RATIO_THRESHOLD * dictionary.size()) {
           return ValueSetIndexes.buildBitmapColumnIndexFromSortedIteratorScan(
               bitmapFactory,
               ColumnType.LONG.getNullableStrategy(),
diff --git a/processing/src/main/java/org/apache/druid/segment/serde/DictionaryEncodedColumnPartSerde.java b/processing/src/main/java/org/apache/druid/segment/serde/DictionaryEncodedColumnPartSerde.java
index 02e7f5b4d397..536b562ebdaa 100644
--- a/processing/src/main/java/org/apache/druid/segment/serde/DictionaryEncodedColumnPartSerde.java
+++ b/processing/src/main/java/org/apache/druid/segment/serde/DictionaryEncodedColumnPartSerde.java
@@ -91,7 +91,7 @@ public enum VERSION
 
     public static VERSION fromByte(byte b)
     {
-      final VERSION[] values = VERSION.values();
+      final VERSION[] values = values();
       Preconditions.checkArgument(b < values.length, "Unsupported dictionary column version[%s]", b);
       return values[b];
     }
diff --git a/processing/src/main/java/org/apache/druid/segment/virtual/ExpressionMultiValueDimensionSelector.java b/processing/src/main/java/org/apache/druid/segment/virtual/ExpressionMultiValueDimensionSelector.java
index dd70b3566e16..a9773551d2b6 100644
--- a/processing/src/main/java/org/apache/druid/segment/virtual/ExpressionMultiValueDimensionSelector.java
+++ b/processing/src/main/java/org/apache/druid/segment/virtual/ExpressionMultiValueDimensionSelector.java
@@ -252,7 +252,7 @@ List<String> getArrayAsList(ExprEval evaluated)
     @Override
     String getArrayValue(ExprEval evaluated, int i)
     {
-      return extractionFn.apply(ExpressionMultiValueDimensionSelector.getArrayElement(evaluated, i));
+      return extractionFn.apply(getArrayElement(evaluated, i));
     }
 
     @Override
diff --git a/processing/src/main/java/org/apache/druid/segment/virtual/SingleStringInputDeferredEvaluationExpressionDimensionSelector.java b/processing/src/main/java/org/apache/druid/segment/virtual/SingleStringInputDeferredEvaluationExpressionDimensionSelector.java
index b8a4e2d82f92..88dc833a2503 100644
--- a/processing/src/main/java/org/apache/druid/segment/virtual/SingleStringInputDeferredEvaluationExpressionDimensionSelector.java
+++ b/processing/src/main/java/org/apache/druid/segment/virtual/SingleStringInputDeferredEvaluationExpressionDimensionSelector.java
@@ -26,7 +26,6 @@
 import org.apache.druid.query.filter.DruidPredicateFactory;
 import org.apache.druid.query.filter.ValueMatcher;
 import org.apache.druid.query.monomorphicprocessing.RuntimeShapeInspector;
-import org.apache.druid.segment.DimensionDictionarySelector;
 import org.apache.druid.segment.DimensionSelector;
 import org.apache.druid.segment.DimensionSelectorUtils;
 import org.apache.druid.segment.IdLookup;
@@ -57,7 +56,7 @@ public SingleStringInputDeferredEvaluationExpressionDimensionSelector(
   )
   {
     // Verify selector has a working dictionary.
-    if (selector.getValueCardinality() == DimensionDictionarySelector.CARDINALITY_UNKNOWN
+    if (selector.getValueCardinality() == CARDINALITY_UNKNOWN
         || !selector.nameLookupPossibleInAdvance()) {
       throw new ISE("Selector of class[%s] does not have a dictionary, cannot use it.", selector.getClass().getName());
     }
diff --git a/processing/src/main/java/org/apache/druid/segment/virtual/SingleStringInputDeferredEvaluationExpressionDimensionVectorSelector.java b/processing/src/main/java/org/apache/druid/segment/virtual/SingleStringInputDeferredEvaluationExpressionDimensionVectorSelector.java
index 5a1dd4955069..47586c753b54 100644
--- a/processing/src/main/java/org/apache/druid/segment/virtual/SingleStringInputDeferredEvaluationExpressionDimensionVectorSelector.java
+++ b/processing/src/main/java/org/apache/druid/segment/virtual/SingleStringInputDeferredEvaluationExpressionDimensionVectorSelector.java
@@ -24,7 +24,6 @@
 import org.apache.druid.math.expr.Expr;
 import org.apache.druid.math.expr.ExpressionType;
 import org.apache.druid.math.expr.vector.ExprVectorProcessor;
-import org.apache.druid.segment.DimensionDictionarySelector;
 import org.apache.druid.segment.IdLookup;
 import org.apache.druid.segment.vector.SingleValueDimensionVectorSelector;
 
@@ -53,7 +52,7 @@ public SingleStringInputDeferredEvaluationExpressionDimensionVectorSelector(
   )
   {
     // Verify selector has a working dictionary.
-    if (selector.getValueCardinality() == DimensionDictionarySelector.CARDINALITY_UNKNOWN
+    if (selector.getValueCardinality() == CARDINALITY_UNKNOWN
         || !selector.nameLookupPossibleInAdvance()) {
       throw new ISE(
           "Selector of class[%s] does not have a dictionary, cannot use it.",
diff --git a/quidem-ut/src/main/java/org/apache/druid/quidem/ExposedAsBrokerQueryComponentSupplierWrapper.java b/quidem-ut/src/main/java/org/apache/druid/quidem/ExposedAsBrokerQueryComponentSupplierWrapper.java
index d1fa6a349ba4..b564fbdc50b7 100644
--- a/quidem-ut/src/main/java/org/apache/druid/quidem/ExposedAsBrokerQueryComponentSupplierWrapper.java
+++ b/quidem-ut/src/main/java/org/apache/druid/quidem/ExposedAsBrokerQueryComponentSupplierWrapper.java
@@ -123,7 +123,7 @@ public void configureGuice(CoreInjectorBuilder builder, List<Module> overrideMod
     installForServerModules(builder);
     builder.add(new QueryRunnerFactoryModule());
 
-    overrideModules.addAll(ExposedAsBrokerQueryComponentSupplierWrapper.brokerModules());
+    overrideModules.addAll(brokerModules());
     overrideModules.add(new BrokerTestModule());
     builder.add(QuidemCaptureModule.class);
   }
diff --git a/quidem-ut/src/main/java/org/apache/druid/quidem/QuidemRecorder.java b/quidem-ut/src/main/java/org/apache/druid/quidem/QuidemRecorder.java
index d95de9f3f764..dc34b25697c4 100644
--- a/quidem-ut/src/main/java/org/apache/druid/quidem/QuidemRecorder.java
+++ b/quidem-ut/src/main/java/org/apache/druid/quidem/QuidemRecorder.java
@@ -53,7 +53,7 @@ public QuidemRecorder(URI quidemURI, DruidHookDispatcher hookDispatcher, File fi
     printStream.println("#started " + new Date());
     printStream.println("!use " + quidemURI);
     printStream.println("!set outputformat mysql");
-    hookDispatcher.register(DruidHook.SQL, this);
+    hookDispatcher.register(SQL, this);
   }
 
   @Override
@@ -63,13 +63,13 @@ public synchronized void close()
       printStream.close();
       printStream = null;
     }
-    hookDispatcher.unregister(DruidHook.SQL, this);
+    hookDispatcher.unregister(SQL, this);
   }
 
   @Override
   public synchronized void invoke(HookKey<String> key, String query)
   {
-    if (DruidHook.SQL.equals(key)) {
+    if (SQL.equals(key)) {
       if (queries.contains(query)) {
         // ignore duplicate queries
         return;
diff --git a/server/src/main/java/org/apache/druid/catalog/model/CatalogUtils.java b/server/src/main/java/org/apache/druid/catalog/model/CatalogUtils.java
index d0ac6c31e76b..88cfcc1a587a 100644
--- a/server/src/main/java/org/apache/druid/catalog/model/CatalogUtils.java
+++ b/server/src/main/java/org/apache/druid/catalog/model/CatalogUtils.java
@@ -203,7 +203,7 @@ public static <T> List<T> concatLists(
    */
   public static String getNonBlankString(Map<String, Object> args, String parameter)
   {
-    String value = CatalogUtils.getString(args, parameter);
+    String value = getString(args, parameter);
     if (value != null) {
       value = value.trim();
       if (value.isEmpty()) {
@@ -215,7 +215,7 @@ public static String getNonBlankString(Map<String, Object> args, String paramete
 
   public static List<String> getUriListArg(Map<String, Object> args, String parameter)
   {
-    String urisString = CatalogUtils.getString(args, parameter);
+    String urisString = getString(args, parameter);
     if (Strings.isNullOrEmpty(urisString)) {
       throw new IAE("One or more values are required for parameter %s", parameter);
     }
diff --git a/server/src/main/java/org/apache/druid/catalog/model/table/DatasourceDefn.java b/server/src/main/java/org/apache/druid/catalog/model/table/DatasourceDefn.java
index cca497f0b7ff..9516d1c917f9 100644
--- a/server/src/main/java/org/apache/druid/catalog/model/table/DatasourceDefn.java
+++ b/server/src/main/java/org/apache/druid/catalog/model/table/DatasourceDefn.java
@@ -158,7 +158,7 @@ protected void validateColumn(ColumnSpec spec)
 
   public static boolean isDatasource(String tableType)
   {
-    return DatasourceDefn.TABLE_TYPE.equals(tableType);
+    return TABLE_TYPE.equals(tableType);
   }
 
   public static boolean isDatasource(ResolvedTable table)
diff --git a/server/src/main/java/org/apache/druid/discovery/DruidNodeDiscoveryProvider.java b/server/src/main/java/org/apache/druid/discovery/DruidNodeDiscoveryProvider.java
index 44ce7ff98246..42abbb23f2a0 100644
--- a/server/src/main/java/org/apache/druid/discovery/DruidNodeDiscoveryProvider.java
+++ b/server/src/main/java/org/apache/druid/discovery/DruidNodeDiscoveryProvider.java
@@ -67,7 +67,7 @@ public DruidNodeDiscovery getForService(String serviceName)
         serviceName,
         service -> {
 
-          Set<NodeRole> nodeRolesToWatch = DruidNodeDiscoveryProvider.SERVICE_TO_NODE_TYPES.get(service);
+          Set<NodeRole> nodeRolesToWatch = SERVICE_TO_NODE_TYPES.get(service);
           if (nodeRolesToWatch == null) {
             throw new IAE("Unknown service [%s].", service);
           }
diff --git a/server/src/main/java/org/apache/druid/guice/DruidBinders.java b/server/src/main/java/org/apache/druid/guice/DruidBinders.java
index 63f2061ce136..87886b411d44 100644
--- a/server/src/main/java/org/apache/druid/guice/DruidBinders.java
+++ b/server/src/main/java/org/apache/druid/guice/DruidBinders.java
@@ -75,7 +75,7 @@ public static class QueryLogicBinder
     public QueryLogicBinder(Binder binder)
     {
       this.binder = binder;
-      queryLogicMapBinder = DruidBinders.queryLogicBinderType(binder);
+      queryLogicMapBinder = queryLogicBinderType(binder);
     }
 
     QueryLogicBinder bindQueryLogic(
diff --git a/server/src/main/java/org/apache/druid/metadata/SortOrder.java b/server/src/main/java/org/apache/druid/metadata/SortOrder.java
index afabd0cde59a..d7e0de4677d0 100644
--- a/server/src/main/java/org/apache/druid/metadata/SortOrder.java
+++ b/server/src/main/java/org/apache/druid/metadata/SortOrder.java
@@ -53,14 +53,14 @@ public String toString()
   @JsonCreator
   public static SortOrder fromValue(String value)
   {
-    for (SortOrder b : SortOrder.values()) {
+    for (SortOrder b : values()) {
       if (String.valueOf(b.value).equalsIgnoreCase(String.valueOf(value))) {
         return b;
       }
     }
     throw InvalidInput.exception(StringUtils.format(
         "Unexpected value[%s] for SortOrder. Possible values are: %s",
-        value, Arrays.stream(SortOrder.values()).map(SortOrder::toString).collect(Collectors.toList())
+        value, Arrays.stream(values()).map(SortOrder::toString).collect(Collectors.toList())
     ));
   }
 }
diff --git a/server/src/main/java/org/apache/druid/rpc/guice/ServiceClientModule.java b/server/src/main/java/org/apache/druid/rpc/guice/ServiceClientModule.java
index a0d9a5e3725c..52b2e8379156 100644
--- a/server/src/main/java/org/apache/druid/rpc/guice/ServiceClientModule.java
+++ b/server/src/main/java/org/apache/druid/rpc/guice/ServiceClientModule.java
@@ -139,7 +139,7 @@ public BrokerClient makeBrokerClient(
         clientFactory.makeClient(
             NodeRole.BROKER.getJsonName(),
             serviceLocator,
-            StandardRetryPolicy.builder().maxAttempts(ServiceClientModule.CLIENT_MAX_ATTEMPTS).build()
+            StandardRetryPolicy.builder().maxAttempts(CLIENT_MAX_ATTEMPTS).build()
         ),
         jsonMapper
     );
diff --git a/server/src/main/java/org/apache/druid/server/compaction/CompactionStatus.java b/server/src/main/java/org/apache/druid/server/compaction/CompactionStatus.java
index fd53ed38c257..a2e6385b46f2 100644
--- a/server/src/main/java/org/apache/druid/server/compaction/CompactionStatus.java
+++ b/server/src/main/java/org/apache/druid/server/compaction/CompactionStatus.java
@@ -140,7 +140,7 @@ private static <T> CompactionStatus configChanged(
       Function<T, String> stringFunction
   )
   {
-    return CompactionStatus.incomplete(
+    return incomplete(
         "'%s' mismatch: required[%s], current[%s]",
         field,
         target == null ? null : stringFunction.apply(target),
@@ -298,7 +298,7 @@ private Evaluator(
     private CompactionStatus segmentsHaveBeenCompactedAtLeastOnce()
     {
       if (lastCompactionState == null) {
-        return CompactionStatus.incomplete("not compacted yet");
+        return incomplete("not compacted yet");
       } else {
         return COMPLETE;
       }
@@ -312,7 +312,7 @@ private CompactionStatus allCandidatesHaveSameCompactionState()
       if (allHaveSameCompactionState) {
         return COMPLETE;
       } else {
-        return CompactionStatus.incomplete("segments have different last compaction states");
+        return incomplete("segments have different last compaction states");
       }
     }
 
@@ -322,7 +322,7 @@ private CompactionStatus partitionsSpecIsUpToDate()
       if (existingPartionsSpec instanceof DimensionRangePartitionsSpec) {
         existingPartionsSpec = getEffectiveRangePartitionsSpec((DimensionRangePartitionsSpec) existingPartionsSpec);
       }
-      return CompactionStatus.completeIfEqual(
+      return completeIfEqual(
           "partitionsSpec",
           findPartitionsSpecFromConfig(tuningConfig),
           existingPartionsSpec,
@@ -332,7 +332,7 @@ private CompactionStatus partitionsSpecIsUpToDate()
 
     private CompactionStatus indexSpecIsUpToDate()
     {
-      return CompactionStatus.completeIfEqual(
+      return completeIfEqual(
           "indexSpec",
           Configs.valueOrDefault(tuningConfig.getIndexSpec(), IndexSpec.DEFAULT),
           objectMapper.convertValue(lastCompactionState.getIndexSpec(), IndexSpec.class),
@@ -360,13 +360,13 @@ private CompactionStatus segmentGranularityIsUpToDate()
             segment -> !configuredSegmentGranularity.isAligned(segment.getInterval())
         );
         if (needsCompaction) {
-          return CompactionStatus.incomplete(
+          return incomplete(
               "segmentGranularity: segments do not align with target[%s]",
               asString(configuredSegmentGranularity)
           );
         }
       } else {
-        return CompactionStatus.configChanged(
+        return configChanged(
             "segmentGranularity",
             configuredSegmentGranularity,
             existingSegmentGranularity,
@@ -382,7 +382,7 @@ private CompactionStatus rollupIsUpToDate()
       if (configuredGranularitySpec == null) {
         return COMPLETE;
       } else {
-        return CompactionStatus.completeIfEqual(
+        return completeIfEqual(
             "rollup",
             configuredGranularitySpec.isRollup(),
             existingGranularitySpec == null ? null : existingGranularitySpec.isRollup(),
@@ -396,7 +396,7 @@ private CompactionStatus queryGranularityIsUpToDate()
       if (configuredGranularitySpec == null) {
         return COMPLETE;
       } else {
-        return CompactionStatus.completeIfEqual(
+        return completeIfEqual(
             "queryGranularity",
             configuredGranularitySpec.getQueryGranularity(),
             existingGranularitySpec == null ? null : existingGranularitySpec.getQueryGranularity(),
@@ -426,7 +426,7 @@ private CompactionStatus dimensionsSpecIsUpToDate()
             compactionConfig.getTuningConfig() == null ? null : compactionConfig.getTuningConfig().getPartitionsSpec()
         );
         {
-          return CompactionStatus.completeIfEqual(
+          return completeIfEqual(
               "dimensionsSpec",
               configuredDimensions,
               existingDimensions,
@@ -449,7 +449,7 @@ private CompactionStatus metricsSpecIsUpToDate()
             ? null : objectMapper.convertValue(metricSpecList, AggregatorFactory[].class);
 
       if (existingMetricsSpec == null || !Arrays.deepEquals(configuredMetricsSpec, existingMetricsSpec)) {
-        return CompactionStatus.configChanged(
+        return configChanged(
             "metricsSpec",
             configuredMetricsSpec,
             existingMetricsSpec,
@@ -470,7 +470,7 @@ private CompactionStatus transformSpecFilterIsUpToDate()
           lastCompactionState.getTransformSpec(),
           ClientCompactionTaskTransformSpec.class
       );
-      return CompactionStatus.completeIfEqual(
+      return completeIfEqual(
           "transformSpec filter",
           compactionConfig.getTransformSpec().getFilter(),
           existingTransformSpec == null ? null : existingTransformSpec.getFilter(),
diff --git a/server/src/main/java/org/apache/druid/server/coordination/BroadcastDatasourceLoadingSpec.java b/server/src/main/java/org/apache/druid/server/coordination/BroadcastDatasourceLoadingSpec.java
index 3a11027311e6..28d83adab5b9 100644
--- a/server/src/main/java/org/apache/druid/server/coordination/BroadcastDatasourceLoadingSpec.java
+++ b/server/src/main/java/org/apache/druid/server/coordination/BroadcastDatasourceLoadingSpec.java
@@ -134,7 +134,7 @@ public static BroadcastDatasourceLoadingSpec createFromContext(Map<String, Objec
       if (broadcastDatasourcesToLoad == null || broadcastDatasourcesToLoad.isEmpty()) {
         throw InvalidInput.exception("Set of broadcast datasources to load cannot be %s for mode[ONLY_REQUIRED].", broadcastDatasourcesToLoad);
       }
-      return BroadcastDatasourceLoadingSpec.loadOnly(new HashSet<>(broadcastDatasourcesToLoad));
+      return loadOnly(new HashSet<>(broadcastDatasourcesToLoad));
     } else {
       return defaultSpec;
     }
diff --git a/server/src/main/java/org/apache/druid/server/coordination/ServerType.java b/server/src/main/java/org/apache/druid/server/coordination/ServerType.java
index 59d6f6bcc61b..829a662d1af4 100644
--- a/server/src/main/java/org/apache/druid/server/coordination/ServerType.java
+++ b/server/src/main/java/org/apache/druid/server/coordination/ServerType.java
@@ -153,11 +153,11 @@ public static ServerType fromNodeRole(NodeRole nodeRole)
   {
     // this doesn't actually check that the NodeRole is a typical data node
     if (nodeRole.equals(NodeRole.HISTORICAL)) {
-      return ServerType.HISTORICAL;
+      return HISTORICAL;
     } else if (nodeRole.equals(NodeRole.BROKER)) {
-      return ServerType.BROKER;
+      return BROKER;
     } else {
-      return ServerType.INDEXER_EXECUTOR;
+      return INDEXER_EXECUTOR;
     }
   }
 
diff --git a/server/src/main/java/org/apache/druid/server/coordinator/balancer/SegmentToMoveCalculator.java b/server/src/main/java/org/apache/druid/server/coordinator/balancer/SegmentToMoveCalculator.java
index 01c7da44c116..a84d63ebe76c 100644
--- a/server/src/main/java/org/apache/druid/server/coordinator/balancer/SegmentToMoveCalculator.java
+++ b/server/src/main/java/org/apache/druid/server/coordinator/balancer/SegmentToMoveCalculator.java
@@ -70,10 +70,8 @@ public static int computeNumSegmentsToMoveInTier(
     ).sum();
 
     // Move at least some segments to ensure that the cluster is always balancing itself
-    final int minSegmentsToMove = SegmentToMoveCalculator
-        .computeMinSegmentsToMoveInTier(totalSegments);
-    final int segmentsToMoveToFixDeviation = SegmentToMoveCalculator
-        .computeNumSegmentsToMoveToBalanceTier(tier, historicals);
+    final int minSegmentsToMove = computeMinSegmentsToMoveInTier(totalSegments);
+    final int segmentsToMoveToFixDeviation = computeNumSegmentsToMoveToBalanceTier(tier, historicals);
     log.info(
         "Need to move [%,d] segments in tier[%s] to attain balance. Allowed values are [min=%d, max=%d].",
         segmentsToMoveToFixDeviation, tier, minSegmentsToMove, maxSegmentsToMoveInTier
diff --git a/server/src/main/java/org/apache/druid/server/http/HostAndPortWithScheme.java b/server/src/main/java/org/apache/druid/server/http/HostAndPortWithScheme.java
index 297e86f38984..6a76ebc89ff6 100644
--- a/server/src/main/java/org/apache/druid/server/http/HostAndPortWithScheme.java
+++ b/server/src/main/java/org/apache/druid/server/http/HostAndPortWithScheme.java
@@ -47,12 +47,12 @@ public static HostAndPortWithScheme fromString(String hostPortMaybeSchemeString)
       if (colonIndex == -1) {
         throw new IAE("Invalid host with scheme string: [%s]", hostPortMaybeSchemeString);
       }
-      return HostAndPortWithScheme.fromString(
+      return fromString(
           hostPortMaybeSchemeString.substring(0, colonIndex),
           hostPortMaybeSchemeString.substring(colonIndex + 1)
       );
     }
-    return HostAndPortWithScheme.fromString("http", hostPortMaybeSchemeString);
+    return fromString("http", hostPortMaybeSchemeString);
   }
 
   public static HostAndPortWithScheme fromString(String scheme, String hostPortString)
diff --git a/server/src/main/java/org/apache/druid/server/initialization/jetty/StandardResponseHeaderFilterHolder.java b/server/src/main/java/org/apache/druid/server/initialization/jetty/StandardResponseHeaderFilterHolder.java
index 2f12ff2402c8..b6d79e930f41 100644
--- a/server/src/main/java/org/apache/druid/server/initialization/jetty/StandardResponseHeaderFilterHolder.java
+++ b/server/src/main/java/org/apache/druid/server/initialization/jetty/StandardResponseHeaderFilterHolder.java
@@ -73,7 +73,7 @@ public static void deduplicateHeadersInProxyServlet(
       final Response serverResponse
   )
   {
-    for (final String headerName : StandardResponseHeaderFilterHolder.STANDARD_HEADERS) {
+    for (final String headerName : STANDARD_HEADERS) {
       if (serverResponse.getHeaders().containsKey(headerName) && proxyResponse.containsHeader(headerName)) {
         ((org.eclipse.jetty.server.Response) proxyResponse).getHttpFields().remove(headerName);
       }
diff --git a/server/src/main/java/org/apache/druid/server/lookup/cache/LookupLoadingSpec.java b/server/src/main/java/org/apache/druid/server/lookup/cache/LookupLoadingSpec.java
index 4665bdd18cf4..2d798e657ea0 100644
--- a/server/src/main/java/org/apache/druid/server/lookup/cache/LookupLoadingSpec.java
+++ b/server/src/main/java/org/apache/druid/server/lookup/cache/LookupLoadingSpec.java
@@ -127,7 +127,7 @@ public static LookupLoadingSpec createFromContext(Map<String, Object> context, L
       if (lookupsToLoad == null || lookupsToLoad.isEmpty()) {
         throw InvalidInput.exception("Set of lookups to load cannot be %s for mode[ONLY_REQUIRED].", lookupsToLoad);
       }
-      return LookupLoadingSpec.loadOnly(new HashSet<>(lookupsToLoad));
+      return loadOnly(new HashSet<>(lookupsToLoad));
     } else {
       return defaultSpec;
     }
diff --git a/server/src/main/java/org/apache/druid/server/metrics/MonitorsConfig.java b/server/src/main/java/org/apache/druid/server/metrics/MonitorsConfig.java
index 25e124c19837..fd06b3adb830 100644
--- a/server/src/main/java/org/apache/druid/server/metrics/MonitorsConfig.java
+++ b/server/src/main/java/org/apache/druid/server/metrics/MonitorsConfig.java
@@ -95,8 +95,8 @@ public static Map<String, String[]> extractDimensions(Properties props, List<Str
   {
     Map<String, String[]> dimensionsMap = new HashMap<>();
     for (String property : props.stringPropertyNames()) {
-      if (property.startsWith(MonitorsConfig.METRIC_DIMENSION_PREFIX)) {
-        String dimension = property.substring(MonitorsConfig.METRIC_DIMENSION_PREFIX.length());
+      if (property.startsWith(METRIC_DIMENSION_PREFIX)) {
+        String dimension = property.substring(METRIC_DIMENSION_PREFIX.length());
         if (dimensions.contains(dimension)) {
           dimensionsMap.put(
               dimension,
diff --git a/server/src/main/java/org/apache/druid/server/security/AuthorizationUtils.java b/server/src/main/java/org/apache/druid/server/security/AuthorizationUtils.java
index 431819da8a42..af0ba920a85e 100644
--- a/server/src/main/java/org/apache/druid/server/security/AuthorizationUtils.java
+++ b/server/src/main/java/org/apache/druid/server/security/AuthorizationUtils.java
@@ -404,7 +404,7 @@ public static <KeyType, ResType> Map<KeyType, List<ResType>> filterAuthorizedRes
       throw new ISE("Request already had authorization check.");
     }
 
-    final AuthenticationResult authenticationResult = AuthorizationUtils.authenticationResultFromRequest(request);
+    final AuthenticationResult authenticationResult = authenticationResultFromRequest(request);
 
     Map<KeyType, List<ResType>> filteredResources = new HashMap<>();
     for (Map.Entry<KeyType, List<ResType>> entry : unfilteredResources.entrySet()) {
@@ -413,7 +413,7 @@ public static <KeyType, ResType> Map<KeyType, List<ResType>> filterAuthorizedRes
       }
 
       final List<ResType> filteredList = Lists.newArrayList(
-          AuthorizationUtils.filterAuthorizedResources(
+          filterAuthorizedResources(
               authenticationResult,
               entry.getValue(),
               resourceActionGenerator,
diff --git a/sql/src/main/java/org/apache/calcite/plan/volcano/DruidVolcanoCost.java b/sql/src/main/java/org/apache/calcite/plan/volcano/DruidVolcanoCost.java
index c26fe21c6922..af57df6f562c 100644
--- a/sql/src/main/java/org/apache/calcite/plan/volcano/DruidVolcanoCost.java
+++ b/sql/src/main/java/org/apache/calcite/plan/volcano/DruidVolcanoCost.java
@@ -264,25 +264,25 @@ public RelOptCost makeCost(double dRows, double dCpu, double dIo)
     @Override
     public RelOptCost makeHugeCost()
     {
-      return DruidVolcanoCost.HUGE;
+      return HUGE;
     }
 
     @Override
     public RelOptCost makeInfiniteCost()
     {
-      return DruidVolcanoCost.INFINITY;
+      return INFINITY;
     }
 
     @Override
     public RelOptCost makeTinyCost()
     {
-      return DruidVolcanoCost.TINY;
+      return TINY;
     }
 
     @Override
     public RelOptCost makeZeroCost()
     {
-      return DruidVolcanoCost.ZERO;
+      return ZERO;
     }
   }
 }
diff --git a/sql/src/main/java/org/apache/druid/sql/calcite/aggregation/builtin/MaxSqlAggregator.java b/sql/src/main/java/org/apache/druid/sql/calcite/aggregation/builtin/MaxSqlAggregator.java
index 4f29b276a544..eb8fbd502001 100644
--- a/sql/src/main/java/org/apache/druid/sql/calcite/aggregation/builtin/MaxSqlAggregator.java
+++ b/sql/src/main/java/org/apache/druid/sql/calcite/aggregation/builtin/MaxSqlAggregator.java
@@ -71,7 +71,7 @@ private static AggregatorFactory createMaxAggregatorFactory(
       default:
         // This error refers to the Druid type. But, we're in SQL validation.
         // It should refer to the SQL type.
-        throw SimpleSqlAggregator.badTypeException(fieldName, "MAX", aggregationType);
+        throw badTypeException(fieldName, "MAX", aggregationType);
     }
   }
 }
diff --git a/sql/src/main/java/org/apache/druid/sql/calcite/aggregation/builtin/MinSqlAggregator.java b/sql/src/main/java/org/apache/druid/sql/calcite/aggregation/builtin/MinSqlAggregator.java
index 93b87d376b52..4d83c64da526 100644
--- a/sql/src/main/java/org/apache/druid/sql/calcite/aggregation/builtin/MinSqlAggregator.java
+++ b/sql/src/main/java/org/apache/druid/sql/calcite/aggregation/builtin/MinSqlAggregator.java
@@ -66,7 +66,7 @@ private static AggregatorFactory createMinAggregatorFactory(
       case DOUBLE:
         return new DoubleMinAggregatorFactory(name, fieldName, null, macroTable);
       default:
-        throw SimpleSqlAggregator.badTypeException(fieldName, "MIN", aggregationType);
+        throw badTypeException(fieldName, "MIN", aggregationType);
     }
   }
 }
diff --git a/sql/src/main/java/org/apache/druid/sql/calcite/aggregation/builtin/SumSqlAggregator.java b/sql/src/main/java/org/apache/druid/sql/calcite/aggregation/builtin/SumSqlAggregator.java
index 29790ab7154a..e7244f463860 100644
--- a/sql/src/main/java/org/apache/druid/sql/calcite/aggregation/builtin/SumSqlAggregator.java
+++ b/sql/src/main/java/org/apache/druid/sql/calcite/aggregation/builtin/SumSqlAggregator.java
@@ -80,7 +80,7 @@ static AggregatorFactory createSumAggregatorFactory(
       case DOUBLE:
         return new DoubleSumAggregatorFactory(name, fieldName, null, macroTable);
       default:
-        throw SimpleSqlAggregator.badTypeException(fieldName, "SUM", aggregationType);
+        throw badTypeException(fieldName, "SUM", aggregationType);
     }
   }
 }
diff --git a/sql/src/main/java/org/apache/druid/sql/calcite/expression/DefaultOperandTypeChecker.java b/sql/src/main/java/org/apache/druid/sql/calcite/expression/DefaultOperandTypeChecker.java
index a52ce5707c14..99a446c270c5 100644
--- a/sql/src/main/java/org/apache/druid/sql/calcite/expression/DefaultOperandTypeChecker.java
+++ b/sql/src/main/java/org/apache/druid/sql/calcite/expression/DefaultOperandTypeChecker.java
@@ -243,7 +243,7 @@ public DefaultOperandTypeChecker build()
           operandNames,
           operandTypes,
           computedRequiredOperandCount,
-          DefaultOperandTypeChecker.buildNullableOperands(computedRequiredOperandCount, operandTypes.size(), notNullOperands),
+          buildNullableOperands(computedRequiredOperandCount, operandTypes.size(), notNullOperands),
           literalOperands
       );
     }
diff --git a/sql/src/main/java/org/apache/druid/sql/calcite/filtration/ConvertSelectorsToIns.java b/sql/src/main/java/org/apache/druid/sql/calcite/filtration/ConvertSelectorsToIns.java
index 413d75fbc6dc..5d58988dda54 100644
--- a/sql/src/main/java/org/apache/druid/sql/calcite/filtration/ConvertSelectorsToIns.java
+++ b/sql/src/main/java/org/apache/druid/sql/calcite/filtration/ConvertSelectorsToIns.java
@@ -149,7 +149,7 @@ public CollectSelectors(final List<DimFilter> orExprs, final RowSignature source
     @Override
     protected Pair<SelectorDimFilter, List<DimFilter>> getCollectibleComparison(DimFilter filter)
     {
-      return ConvertSelectorsToIns.splitAnd(
+      return splitAnd(
           filter,
           SelectorDimFilter.class,
 
@@ -217,7 +217,7 @@ public CollectEqualities(final List<DimFilter> orExprs)
     @Override
     protected Pair<EqualityFilter, List<DimFilter>> getCollectibleComparison(DimFilter filter)
     {
-      return ConvertSelectorsToIns.splitAnd(
+      return splitAnd(
           filter,
           EqualityFilter.class,
 
@@ -275,7 +275,7 @@ public CollectEqualitiesDefaultValueMode(final List<DimFilter> orExprs)
     @Override
     protected Pair<EqualityFilter, List<DimFilter>> getCollectibleComparison(DimFilter filter)
     {
-      return ConvertSelectorsToIns.splitAnd(
+      return splitAnd(
           filter,
           EqualityFilter.class,
 
diff --git a/sql/src/main/java/org/apache/druid/sql/calcite/planner/CalciteRulesManager.java b/sql/src/main/java/org/apache/druid/sql/calcite/planner/CalciteRulesManager.java
index 917f0cc204a9..1b20dab7d793 100644
--- a/sql/src/main/java/org/apache/druid/sql/calcite/planner/CalciteRulesManager.java
+++ b/sql/src/main/java/org/apache/druid/sql/calcite/planner/CalciteRulesManager.java
@@ -277,7 +277,7 @@ public List<Program> programs(final PlannerContext plannerContext)
   private Program buildDecoupledLogicalOptimizationProgram(PlannerContext plannerContext)
   {
     final HepProgramBuilder builder = HepProgram.builder();
-    builder.addMatchLimit(CalciteRulesManager.HEP_DEFAULT_MATCH_LIMIT);
+    builder.addMatchLimit(HEP_DEFAULT_MATCH_LIMIT);
     builder.addRuleCollection(baseRuleSet(plannerContext));
     builder.addRuleInstance(CoreRules.UNION_MERGE);
     builder.addRuleInstance(JoinExtractFilterRule.Config.DEFAULT.toRule());
@@ -330,7 +330,7 @@ private Program sqlToRelWorkaroundProgram()
   private Program buildPreVolcanoManipulationProgram(final PlannerContext plannerContext)
   {
     final HepProgramBuilder builder = HepProgram.builder();
-    builder.addMatchLimit(CalciteRulesManager.HEP_DEFAULT_MATCH_LIMIT);
+    builder.addMatchLimit(HEP_DEFAULT_MATCH_LIMIT);
 
     // Apply FILTER_INTO_JOIN early, if using a join algorithm that requires subqueries anyway.
     if (plannerContext.getJoinAlgorithm().requiresSubquery()) {
@@ -350,7 +350,7 @@ private Program buildPreVolcanoManipulationProgram(final PlannerContext plannerC
   private Program buildReductionProgram(final PlannerContext plannerContext, final boolean isDruid)
   {
     final HepProgramBuilder builder = HepProgram.builder();
-    builder.addMatchLimit(CalciteRulesManager.HEP_DEFAULT_MATCH_LIMIT);
+    builder.addMatchLimit(HEP_DEFAULT_MATCH_LIMIT);
 
     if (isDruid) {
       // COALESCE rules must run before REDUCTION_RULES, since otherwise ReduceExpressionsRule#pushPredicateIntoCase may
diff --git a/sql/src/main/java/org/apache/druid/sql/calcite/planner/Calcites.java b/sql/src/main/java/org/apache/druid/sql/calcite/planner/Calcites.java
index 6310b23543de..32e74887bf2d 100644
--- a/sql/src/main/java/org/apache/druid/sql/calcite/planner/Calcites.java
+++ b/sql/src/main/java/org/apache/druid/sql/calcite/planner/Calcites.java
@@ -299,7 +299,7 @@ public static RelDataType createSqlTypeWithNullability(
       case VARCHAR:
         dataType = typeFactory.createTypeWithCharsetAndCollation(
             typeFactory.createSqlType(typeName),
-            Calcites.defaultCharset(),
+            defaultCharset(),
             SqlCollation.IMPLICIT
         );
         break;
@@ -566,7 +566,7 @@ public RelDataType inferReturnType(SqlOperatorBinding opBinding)
       if (SqlTypeUtil.isArray(type)) {
         return type;
       }
-      return Calcites.createSqlArrayTypeWithNullability(
+      return createSqlArrayTypeWithNullability(
           opBinding.getTypeFactory(),
           type.getSqlTypeName(),
           true
@@ -583,7 +583,7 @@ public RelDataType inferReturnType(SqlOperatorBinding opBinding)
       if (SqlTypeUtil.isArray(type)) {
         return type;
       }
-      return Calcites.createSqlArrayTypeWithNullability(
+      return createSqlArrayTypeWithNullability(
           opBinding.getTypeFactory(),
           type.getSqlTypeName(),
           true
diff --git a/sql/src/main/java/org/apache/druid/sql/calcite/planner/DruidOperatorTable.java b/sql/src/main/java/org/apache/druid/sql/calcite/planner/DruidOperatorTable.java
index 0fb1c9fb9ff0..6d1cd1243e21 100644
--- a/sql/src/main/java/org/apache/druid/sql/calcite/planner/DruidOperatorTable.java
+++ b/sql/src/main/java/org/apache/druid/sql/calcite/planner/DruidOperatorTable.java
@@ -558,7 +558,7 @@ public static boolean isFunctionSyntax(final SqlSyntax syntax)
 
   private static SqlSyntax normalizeSyntax(final SqlSyntax syntax)
   {
-    if (!DruidOperatorTable.isFunctionSyntax(syntax)) {
+    if (!isFunctionSyntax(syntax)) {
       return syntax;
     } else {
       return SqlSyntax.FUNCTION;
diff --git a/sql/src/main/java/org/apache/druid/sql/calcite/planner/DruidTypeSystem.java b/sql/src/main/java/org/apache/druid/sql/calcite/planner/DruidTypeSystem.java
index 521291c3244d..1041269090d4 100644
--- a/sql/src/main/java/org/apache/druid/sql/calcite/planner/DruidTypeSystem.java
+++ b/sql/src/main/java/org/apache/druid/sql/calcite/planner/DruidTypeSystem.java
@@ -28,7 +28,7 @@
 public class DruidTypeSystem implements RelDataTypeSystem
 {
   public static final DruidTypeSystem INSTANCE = new DruidTypeSystem();
-  public static final RelDataTypeFactory TYPE_FACTORY = new SqlTypeFactoryImpl(DruidTypeSystem.INSTANCE);
+  public static final RelDataTypeFactory TYPE_FACTORY = new SqlTypeFactoryImpl(INSTANCE);
 
   /**
    * Druid uses millisecond precision for timestamps internally. This is also the default at the SQL layer.
@@ -43,7 +43,7 @@ private DruidTypeSystem()
   @Override
   public int getMaxScale(final SqlTypeName typeName)
   {
-    return RelDataTypeSystem.DEFAULT.getMaxScale(typeName);
+    return DEFAULT.getMaxScale(typeName);
   }
 
   @Override
@@ -54,7 +54,7 @@ public int getDefaultPrecision(final SqlTypeName typeName)
       case TIMESTAMP_WITH_LOCAL_TIME_ZONE:
         return DEFAULT_TIMESTAMP_PRECISION;
       default:
-        return RelDataTypeSystem.DEFAULT.getDefaultPrecision(typeName);
+        return DEFAULT.getDefaultPrecision(typeName);
     }
   }
 
@@ -64,44 +64,44 @@ public int getMaxPrecision(final SqlTypeName typeName)
     if (typeName == SqlTypeName.TIME || typeName == SqlTypeName.TIMESTAMP) {
       return DEFAULT_TIMESTAMP_PRECISION;
     } else {
-      return RelDataTypeSystem.DEFAULT.getMaxPrecision(typeName);
+      return DEFAULT.getMaxPrecision(typeName);
     }
   }
 
   @Override
   public int getMaxNumericScale()
   {
-    return RelDataTypeSystem.DEFAULT.getMaxNumericScale();
+    return DEFAULT.getMaxNumericScale();
   }
 
   @Override
   public int getMaxNumericPrecision()
   {
-    return RelDataTypeSystem.DEFAULT.getMaxNumericPrecision();
+    return DEFAULT.getMaxNumericPrecision();
   }
 
   @Override
   public String getLiteral(final SqlTypeName typeName, final boolean isPrefix)
   {
-    return RelDataTypeSystem.DEFAULT.getLiteral(typeName, isPrefix);
+    return DEFAULT.getLiteral(typeName, isPrefix);
   }
 
   @Override
   public boolean isCaseSensitive(final SqlTypeName typeName)
   {
-    return RelDataTypeSystem.DEFAULT.isCaseSensitive(typeName);
+    return DEFAULT.isCaseSensitive(typeName);
   }
 
   @Override
   public boolean isAutoincrement(final SqlTypeName typeName)
   {
-    return RelDataTypeSystem.DEFAULT.isAutoincrement(typeName);
+    return DEFAULT.isAutoincrement(typeName);
   }
 
   @Override
   public int getNumTypeRadix(final SqlTypeName typeName)
   {
-    return RelDataTypeSystem.DEFAULT.getNumTypeRadix(typeName);
+    return DEFAULT.getNumTypeRadix(typeName);
   }
 
   @Override
@@ -132,25 +132,25 @@ public RelDataType deriveCovarType(
       final RelDataType arg1Type
   )
   {
-    return RelDataTypeSystem.DEFAULT.deriveCovarType(typeFactory, arg0Type, arg1Type);
+    return DEFAULT.deriveCovarType(typeFactory, arg0Type, arg1Type);
   }
 
   @Override
   public RelDataType deriveFractionalRankType(final RelDataTypeFactory typeFactory)
   {
-    return RelDataTypeSystem.DEFAULT.deriveFractionalRankType(typeFactory);
+    return DEFAULT.deriveFractionalRankType(typeFactory);
   }
 
   @Override
   public RelDataType deriveRankType(final RelDataTypeFactory typeFactory)
   {
-    return RelDataTypeSystem.DEFAULT.deriveRankType(typeFactory);
+    return DEFAULT.deriveRankType(typeFactory);
   }
 
   @Override
   public boolean isSchemaCaseSensitive()
   {
-    return RelDataTypeSystem.DEFAULT.isSchemaCaseSensitive();
+    return DEFAULT.isSchemaCaseSensitive();
   }
 
   @Override
diff --git a/sql/src/main/java/org/apache/druid/sql/calcite/planner/PlannerConfig.java b/sql/src/main/java/org/apache/druid/sql/calcite/planner/PlannerConfig.java
index 589d68d43055..dbc2be0b0910 100644
--- a/sql/src/main/java/org/apache/druid/sql/calcite/planner/PlannerConfig.java
+++ b/sql/src/main/java/org/apache/druid/sql/calcite/planner/PlannerConfig.java
@@ -430,7 +430,7 @@ public Map<String, Object> getNonDefaultAsQueryContext()
       );
     }
 
-    PlannerConfig newConfig = PlannerConfig.builder().withOverrides(overrides).build();
+    PlannerConfig newConfig = builder().withOverrides(overrides).build();
     if (!equals(newConfig)) {
       throw DruidException.defensive(
           "Not all PlannerConfig options are not persistable as QueryContext keys!\nold: %s\nnew: %s",
diff --git a/sql/src/main/java/org/apache/druid/sql/calcite/rel/Grouping.java b/sql/src/main/java/org/apache/druid/sql/calcite/rel/Grouping.java
index 8bcf1544fc89..dbdc79883da0 100644
--- a/sql/src/main/java/org/apache/druid/sql/calcite/rel/Grouping.java
+++ b/sql/src/main/java/org/apache/druid/sql/calcite/rel/Grouping.java
@@ -265,7 +265,7 @@ public Grouping applyProject(final PlannerContext plannerContext, final Project
       newSubtotals = subtotals;
     }
 
-    return Grouping.create(
+    return create(
         newDimensions,
         newSubtotals,
         newAggregations,
diff --git a/sql/src/main/java/org/apache/druid/sql/http/ObjectWriter.java b/sql/src/main/java/org/apache/druid/sql/http/ObjectWriter.java
index 27a027d0abd6..d4dbd674d862 100644
--- a/sql/src/main/java/org/apache/druid/sql/http/ObjectWriter.java
+++ b/sql/src/main/java/org/apache/druid/sql/http/ObjectWriter.java
@@ -126,14 +126,14 @@ static void writeHeader(
 
         if (includeTypes) {
           jsonGenerator.writeStringField(
-              ObjectWriter.TYPE_HEADER_NAME,
+              TYPE_HEADER_NAME,
               signature.getColumnType(i).map(TypeSignature::asTypeString).orElse(null)
           );
         }
 
         if (includeSqlTypes) {
           jsonGenerator.writeStringField(
-              ObjectWriter.SQL_TYPE_HEADER_NAME,
+              SQL_TYPE_HEADER_NAME,
               rowType.getFieldList().get(i).getType().getSqlTypeName().getName()
           );
         }
@@ -162,7 +162,7 @@ static void writeHeader(
         jsonGenerator.writeStartObject();
 
         jsonGenerator.writeStringField(
-            ObjectWriter.TYPE_HEADER_NAME,
+            TYPE_HEADER_NAME,
             signature.getColumnType(i).map(TypeSignature::asTypeString).orElse(null)
         );
 
diff --git a/sql/src/main/java/org/apache/druid/sql/http/SqlResource.java b/sql/src/main/java/org/apache/druid/sql/http/SqlResource.java
index d957e7155b5e..9af6e15e0357 100644
--- a/sql/src/main/java/org/apache/druid/sql/http/SqlResource.java
+++ b/sql/src/main/java/org/apache/druid/sql/http/SqlResource.java
@@ -211,7 +211,7 @@ public SqlResourceQueryResultPusher(
           jsonMapper,
           responseContextConfig,
           selfNode,
-          SqlResource.QUERY_METRIC_COUNTER,
+          QUERY_METRIC_COUNTER,
           sqlQueryId,
           MediaType.APPLICATION_JSON_TYPE,
           headers

From e80a05c38e5f77b754d520af12c0feb4ed387466 Mon Sep 17 00:00:00 2001
From: Kashif Faraz <kashif.faraz@gmail.com>
Date: Mon, 16 Dec 2024 23:40:13 -0800
Subject: [PATCH 40/56] Add test and comments for RetryUtils.nextSleep (#17556)

---
 .../druid/java/util/common/RetryUtils.java    | 20 +++++++++++++++
 .../java/util/common/RetryUtilsTest.java      | 25 +++++++++++++++++++
 2 files changed, 45 insertions(+)

diff --git a/processing/src/main/java/org/apache/druid/java/util/common/RetryUtils.java b/processing/src/main/java/org/apache/druid/java/util/common/RetryUtils.java
index 98c422b1dcac..a94f8d1df7b5 100644
--- a/processing/src/main/java/org/apache/druid/java/util/common/RetryUtils.java
+++ b/processing/src/main/java/org/apache/druid/java/util/common/RetryUtils.java
@@ -206,9 +206,29 @@ public static void awaitNextRetry(
     Thread.sleep(sleepMillis);
   }
 
+  /**
+   * Calculates the duration in milliseconds to sleep before the next attempt of
+   * a retryable operation. The duration is calculated in an exponential back-off
+   * manner with a fuzzy multiplier to introduce some variance.
+   * <p>
+   * Sleep duration in milliseconds for subsequent retries:
+   * <ul>
+   * <li>Retry 1: [0, 2000]</li>
+   * <li>Retry 2: [0, 4000]</li>
+   * <li>Retry 3: [0, 8000]</li>
+   * <li>...</li>
+   * <li>Retry 7 and later: [0, 120,000]</li>
+   * </ul>
+   *
+   * @param nTry Index of the next retry, starting with 1
+   * @return Next sleep duration in the range [0, 120,000] millis
+   */
   public static long nextRetrySleepMillis(final int nTry)
   {
+    // fuzzyMultiplier in [0, 2]
     final double fuzzyMultiplier = Math.min(Math.max(1 + 0.2 * ThreadLocalRandom.current().nextGaussian(), 0), 2);
+
+    // sleepMillis in [1 x 2^(nTry-1), 60] * [0, 2] seconds
     final long sleepMillis = (long) (Math.min(MAX_SLEEP_MILLIS, BASE_SLEEP_MILLIS * Math.pow(2, nTry - 1))
                                      * fuzzyMultiplier);
     return sleepMillis;
diff --git a/processing/src/test/java/org/apache/druid/java/util/common/RetryUtilsTest.java b/processing/src/test/java/org/apache/druid/java/util/common/RetryUtilsTest.java
index 7df0aa0687c7..8d0271397d7f 100644
--- a/processing/src/test/java/org/apache/druid/java/util/common/RetryUtilsTest.java
+++ b/processing/src/test/java/org/apache/druid/java/util/common/RetryUtilsTest.java
@@ -186,4 +186,29 @@ public void testExceptionPredicateForRetryableException() throws Exception
     Assert.assertEquals(result, "hey");
     Assert.assertEquals("count", 2, count.get());
   }
+
+  @Test
+  public void testNextRetrySleepMillis()
+  {
+    long totalSleepTimeMillis = 0;
+
+    for (int i = 1; i < 7; ++i) {
+      final long nextSleepMillis = RetryUtils.nextRetrySleepMillis(i);
+      Assert.assertTrue(nextSleepMillis >= 0);
+      Assert.assertTrue(nextSleepMillis <= (2_000 * Math.pow(2, i - 1)));
+
+      totalSleepTimeMillis += nextSleepMillis;
+    }
+
+    for (int i = 7; i < 11; ++i) {
+      final long nextSleepMillis = RetryUtils.nextRetrySleepMillis(i);
+      Assert.assertTrue(nextSleepMillis >= 0);
+      Assert.assertTrue(nextSleepMillis <= 120_000);
+
+      totalSleepTimeMillis += nextSleepMillis;
+    }
+
+    Assert.assertTrue(totalSleepTimeMillis > 3 * 60_000);
+    Assert.assertTrue(totalSleepTimeMillis < 8 * 60_000);
+  }
 }

From 98b960c6ac8f249eda436e28ed3522654e508c69 Mon Sep 17 00:00:00 2001
From: Akshat Jain <akjn11@gmail.com>
Date: Tue, 17 Dec 2024 14:37:45 +0530
Subject: [PATCH 41/56] Refactor: Replace explicit type arguments with diamond
 operator (#17567)

Since we aren't supporting Java 8 anymore, we can switch to diamond operators
without specifying explicit type arguments.
---
 .../druid/benchmark/FlattenJSONBenchmark.java |  6 +--
 .../benchmark/GenericIndexedBenchmark.java    |  2 +-
 .../IncrementalIndexRowTypeBenchmark.java     | 12 ++---
 .../StupidPoolConcurrencyBenchmark.java       |  2 +-
 .../OnheapIncrementalIndexBenchmark.java      |  2 +-
 .../sequences/MergeSequenceBenchmark.java     |  8 ++--
 .../storage/aliyun/OssDataSegmentMover.java   |  2 +-
 .../storage/aliyun/OssDataSegmentPuller.java  |  2 +-
 .../apache/druid/storage/aliyun/OssUtils.java |  2 +-
 .../storage/cassandra/CassandraStorage.java   |  2 +-
 .../storage/cloudfiles/CloudFilesUtils.java   |  2 +-
 .../CompressedBigDecimalMetricSerde.java      |  2 +-
 .../ddsketch/DDSketchAggregatorFactory.java   |  2 +-
 .../DistinctCountTopNQueryTest.java           |  2 +-
 .../delta/input/DeltaInputSourceReader.java   |  2 +-
 .../emitter/kafka/KafkaEmitterConfigTest.java |  2 +-
 .../overlord/KubernetesTaskRunnerTest.java    |  2 +-
 .../DerivativeDataSourceManager.java          |  2 +-
 .../MaterializedViewUtils.java                |  2 +-
 .../MovingAverageQueryToolChest.java          |  6 +--
 .../movingaverage/MovingAverageQueryTest.java |  4 +-
 .../averagers/BaseAveragerFactoryTest.java    |  2 +-
 ...PublishingRabbitStreamIndexTaskRunner.java |  7 ++-
 .../RabbitStreamRecordSupplier.java           |  6 +--
 .../supervisor/RabbitStreamSupervisor.java    |  3 +-
 .../histogram/SpectatorHistogramTest.java     |  2 +-
 .../storage/sqlserver/SQLServerConnector.java |  2 +-
 .../input/thrift/ThriftDeserialization.java   |  8 ++--
 .../druid/data/input/avro/AvroOCFReader.java  |  2 +-
 .../input/AvroStreamInputRowParserTest.java   |  6 +--
 .../input/avro/AvroOCFInputFormatTest.java    |  4 +-
 .../data/input/avro/AvroOCFReaderTest.java    |  8 +---
 .../azure/output/AzureStorageConnector.java   |  2 +-
 .../KllDoublesSketchAggregatorFactory.java    |  2 +-
 ...llDoublesSketchMergeAggregatorFactory.java |  4 +-
 .../kll/KllFloatsSketchAggregatorFactory.java |  2 +-
 ...KllFloatsSketchMergeAggregatorFactory.java |  4 +-
 .../kll/KllSketchAggregatorFactory.java       |  8 ++--
 .../kll/KllSketchMergeAggregatorFactory.java  |  4 +-
 .../DoublesSketchAggregatorFactory.java       |  2 +-
 .../datasketches/theta/SketchHolder.java      |  6 +--
 .../ArrayOfDoublesSketchBuildAggregator.java  |  2 +-
 ...yOfDoublesSketchBuildBufferAggregator.java |  2 +-
 ...yOfDoublesSketchAggregatorFactoryTest.java |  4 +-
 .../druid/security/basic/BasicAuthUtils.java  | 24 +++-------
 ...icAuthenticatorMetadataStorageUpdater.java |  2 +-
 .../LDAPCredentialsValidatorTest.java         |  2 +-
 .../bloom/BloomFilterAggregatorTest.java      |  2 +-
 .../storage/sql/SQLCatalogManager.java        | 26 +++++-----
 .../druid/catalog/sync/CatalogClient.java     |  8 +---
 .../DruidKerberosAuthenticationHandler.java   |  6 +--
 .../kerberos/KerberosAuthenticator.java       |  8 ++--
 .../security/kerberos/KerberosHttpClient.java |  4 +-
 .../kerberos/ResponseCookieHandler.java       |  2 +-
 .../kerberos/RetryResponseHolder.java         |  2 +-
 .../autoscaling/ec2/EC2AutoScaler.java        |  6 +--
 .../google/GoogleDataSegmentPuller.java       |  2 +-
 .../google/output/GoogleStorageConnector.java |  2 +-
 .../storage/hdfs/HdfsDataSegmentPuller.java   |  2 +-
 .../hdfs/HdfsDataSegmentPusherTest.java       |  2 +-
 .../histogram/ApproximateHistogram.java       |  2 +-
 .../ApproximateHistogramFoldingSerde.java     |  2 +-
 ...pproximateHistogramPostAggregatorTest.java |  2 +-
 .../ApproximateHistogramTopNQueryTest.java    |  2 +-
 .../FixedBucketsHistogramTopNQueryTest.java   |  2 +-
 .../input/kafkainput/KafkaInputReader.java    |  2 +-
 ...ementalPublishingKafkaIndexTaskRunner.java |  8 +---
 .../kafka/supervisor/KafkaSupervisor.java     |  4 +-
 .../KafkaStringHeaderFormatTest.java          |  6 +--
 .../indexing/kafka/KafkaIndexTaskTest.java    |  4 +-
 ...aSeekableStreamEndSequenceNumbersTest.java |  2 +-
 ...eekableStreamStartSequenceNumbersTest.java |  2 +-
 .../kafka/supervisor/KafkaSupervisorTest.java |  6 +--
 .../input/kinesis/KinesisInputReader.java     |  2 +-
 .../kinesis/KinesisIndexTaskRunner.java       |  8 +---
 .../kinesis/supervisor/KinesisSupervisor.java |  4 +-
 .../supervisor/KinesisSupervisorTest.java     | 12 ++---
 .../k8s/discovery/DefaultK8sApiClient.java    |  2 +-
 .../discovery/K8sDruidNodeAnnouncerTest.java  |  8 +---
 .../K8sDruidNodeDiscoveryProviderTest.java    |  2 +-
 .../apache/druid/data/input/MapPopulator.java |  2 +-
 .../namespace/UriExtractionNamespace.java     |  2 +-
 .../namespace/NamespaceExtractionModule.java  |  8 +---
 .../druid/query/lookup/LookupUtilsTest.java   |  8 +---
 .../namespace/JSONFlatDataParserTest.java     |  2 +-
 .../namespace/UriCacheGeneratorTest.java      |  2 +-
 .../namespace/cache/CacheSchedulerTest.java   |  4 +-
 .../cache/loading/OffHeapLoadingCache.java    |  2 +-
 .../cache/polling/OffHeapPollingCache.java    |  4 +-
 .../druid/server/lookup/jdbc/QueryKeys.java   |  2 +-
 .../lookup/LoadingLookupFactoryTest.java      |  4 +-
 .../dart/controller/sql/DartQueryMaker.java   |  2 +-
 .../exec/ExceptionWrappingWorkerClient.java   |  2 +-
 .../druid/msq/exec/ProcessingBuffersSet.java  |  2 +-
 .../apache/druid/msq/exec/RunWorkOrder.java   |  4 +-
 .../org/apache/druid/msq/exec/WorkerImpl.java |  2 +-
 .../druid/msq/exec/WorkerSketchFetcher.java   |  2 +-
 ...SegmentGeneratorFrameProcessorFactory.java |  4 +-
 .../msq/input/external/ExternalSegment.java   |  2 +-
 .../querykit/BaseFrameProcessorFactory.java   |  2 +-
 .../ExportResultsFrameProcessorFactory.java   |  2 +-
 .../druid/msq/rpc/BaseWorkerClientImpl.java   |  4 +-
 .../apache/druid/msq/rpc/WorkerResource.java  |  2 +-
 .../input/WorkerInputChannelFactory.java      |  2 +-
 .../apache/druid/msq/util/MSQFutureUtils.java |  2 +-
 .../msq/util/MultiStageQueryContext.java      |  4 +-
 .../msq/util/SqlStatementResourceHelper.java  |  2 +-
 .../controller/http/DartSqlResourceTest.java  |  4 +-
 .../indexing/TaskReportQueryListenerTest.java |  4 +-
 .../scan/ScanQueryFrameProcessorTest.java     |  4 +-
 .../druid/data/input/orc/OrcReader.java       |  2 +-
 .../data/input/parquet/ParquetReader.java     |  2 +-
 .../postgresql/PostgreSQLConnector.java       |  2 +-
 .../druid/storage/s3/S3DataSegmentMover.java  |  2 +-
 .../org/apache/druid/storage/s3/S3Utils.java  |  2 +-
 .../storage/s3/output/S3StorageConnector.java |  2 +-
 .../data/input/s3/S3InputSourceTest.java      |  4 +-
 .../indexer/DetermineHashedPartitionsJob.java |  4 +-
 .../druid/indexer/DeterminePartitionsJob.java |  6 +--
 .../indexer/HadoopDruidIndexerConfig.java     |  2 +-
 .../org/apache/druid/indexer/JobHelper.java   |  2 +-
 .../java/org/apache/druid/indexer/Utils.java  |  4 +-
 .../indexer/hadoop/DatasourceInputFormat.java |  6 +--
 .../indexer/hadoop/DatasourceInputSplit.java  |  4 +-
 .../hadoop/DatasourceRecordReader.java        |  6 +--
 .../indexer/hadoop/FSSpideringIterator.java   |  2 +-
 .../druid/indexer/IndexGeneratorJobTest.java  |  2 +-
 .../apache/druid/indexer/JobHelperTest.java   |  2 +-
 .../hadoop/DatasourceInputFormatTest.java     |  2 +-
 .../hadoop/FSSpideringIteratorTest.java       |  4 +-
 .../CheckPointDataSourceMetadataAction.java   |  4 +-
 .../common/actions/LockListAction.java        |  2 +-
 .../common/actions/LockReleaseAction.java     |  2 +-
 .../actions/MarkSegmentsAsUnusedAction.java   |  4 +-
 .../ResetDataSourceMetadataAction.java        |  4 +-
 .../actions/RetrieveSegmentsByIdAction.java   |  4 +-
 .../actions/RetrieveUnusedSegmentsAction.java |  2 +-
 .../RetrieveUpgradedFromSegmentIdsAction.java |  4 +-
 .../RetrieveUpgradedToSegmentIdsAction.java   |  4 +-
 .../actions/RetrieveUsedSegmentsAction.java   |  2 +-
 .../common/actions/SegmentAllocateAction.java |  4 +-
 .../actions/SegmentLockAcquireAction.java     |  4 +-
 .../actions/SegmentLockTryAcquireAction.java  |  4 +-
 .../actions/SegmentMetadataUpdateAction.java  |  2 +-
 .../common/actions/SegmentNukeAction.java     |  4 +-
 .../SegmentTransactionalAppendAction.java     |  4 +-
 .../SegmentTransactionalInsertAction.java     |  4 +-
 .../SegmentTransactionalReplaceAction.java    |  4 +-
 .../actions/TimeChunkLockAcquireAction.java   |  4 +-
 .../TimeChunkLockTryAcquireAction.java        |  4 +-
 .../common/actions/UpdateLocationAction.java  |  4 +-
 .../common/actions/UpdateStatusAction.java    |  4 +-
 .../common/task/AbstractBatchIndexTask.java   |  2 +-
 .../indexing/common/task/HadoopIndexTask.java |  8 +---
 .../indexing/common/task/HadoopTask.java      |  2 +-
 .../parallel/ParallelIndexPhaseRunner.java    |  2 +-
 ...ionCardinalityParallelIndexTaskRunner.java |  2 +-
 ...onDistributionParallelIndexTaskRunner.java |  2 +-
 ...icSegmentMergeParallelIndexTaskRunner.java |  2 +-
 ...egmentGenerateParallelIndexTaskRunner.java |  2 +-
 ...egmentGenerateParallelIndexTaskRunner.java |  2 +-
 .../indexing/input/DruidSegmentReader.java    |  2 +-
 .../input/DruidTombstoneSegmentReader.java    |  2 +-
 .../indexing/input/GeneratorInputSource.java  |  4 +-
 .../indexing/overlord/ForkingTaskRunner.java  |  8 ++--
 .../overlord/MetadataTaskStorage.java         | 14 ++----
 .../indexing/overlord/RemoteTaskRunner.java   |  2 +-
 .../druid/indexing/overlord/TaskLockbox.java  |  2 +-
 .../druid/indexing/overlord/TaskQueue.java    |  2 +-
 .../overlord/ThreadingTaskRunner.java         |  3 +-
 ...ngTaskBasedWorkerProvisioningStrategy.java |  6 +--
 .../autoscaling/ProvisioningUtil.java         |  4 +-
 .../SimpleWorkerProvisioningStrategy.java     |  8 ++--
 .../indexing/overlord/hrtr/WorkerHolder.java  |  6 +--
 .../overlord/http/OverlordResource.java       |  2 +-
 .../security/SupervisorResourceFilter.java    |  2 +-
 .../RecordSupplierInputSource.java            |  2 +-
 .../SeekableStreamIndexTaskClient.java        |  2 +-
 ...eekableStreamIndexTaskClientAsyncImpl.java |  4 +-
 .../SeekableStreamIndexTaskClientFactory.java |  2 +-
 .../SeekableStreamIndexTaskRunner.java        |  4 +-
 .../SeekableStreamSamplerSpec.java            |  4 +-
 .../supervisor/SeekableStreamSupervisor.java  | 11 +++--
 .../indexing/worker/WorkerTaskManager.java    |  2 +-
 .../worker/executor/ExecutorLifecycle.java    |  2 +-
 ...ilteringCloseableInputRowIteratorTest.java | 10 ++--
 .../indexing/common/task/IndexTaskTest.java   |  4 +-
 .../ParallelIndexPhaseRunnerTest.java         |  2 +-
 ...InputRowIteratorBuilderTestingFactory.java |  2 +-
 .../input/DruidSegmentReaderTest.java         |  2 +-
 .../overlord/OverlordBlinkLeadershipTest.java |  2 +-
 .../overlord/RemoteTaskRunnerTest.java        | 10 ++--
 .../indexing/overlord/TaskLifecycleTest.java  |  8 ++--
 .../indexing/overlord/TestTaskRunner.java     |  2 +-
 ...dingTaskBasedProvisioningStrategyTest.java | 14 +++---
 .../SimpleProvisioningStrategyTest.java       |  2 +-
 .../overlord/http/OverlordResourceTest.java   |  4 +-
 .../indexing/overlord/http/OverlordTest.java  |  6 +--
 .../SeekableStreamEndSequenceNumbersTest.java |  2 +-
 ...eekableStreamStartSequenceNumbersTest.java |  2 +-
 .../SeekableStreamSupervisorSpecTest.java     |  6 +--
 .../seekablestream/SequenceMetadataTest.java  |  2 +-
 ...kableStreamSupervisorStateManagerTest.java |  4 +-
 .../SeekableStreamSupervisorStateTest.java    |  8 ++--
 .../worker/shuffle/ShuffleModuleTest.java     |  4 +-
 .../druid/testsEx/cluster/CatalogClient.java  |  8 ++--
 .../tools/ServerManagerForQueryErrorTest.java | 10 ++--
 .../ServerManagerForQueryErrorTest.java       | 10 ++--
 .../AbstractQueryResourceTestClient.java      |  4 +-
 .../clients/ClientInfoResourceTestClient.java |  4 +-
 .../clients/CompactionResourceTestClient.java |  8 ++--
 .../CoordinatorResourceTestClient.java        | 28 +++--------
 .../clients/OverlordResourceTestClient.java   | 24 +++-------
 .../utils/AbstractTestQueryHelper.java        |  8 +---
 .../testing/utils/MsqTestQueryHelper.java     |  4 +-
 .../testing/utils/ServerDiscoveryUtil.java    |  2 +-
 .../duty/ITAutoCompactionTest.java            |  6 +--
 .../ITQueryRetryTestOnMissingSegments.java    |  8 +---
 .../AbstractAuthConfigurationTest.java        |  4 +-
 .../druid/collections/CircularList.java       |  2 +-
 .../ReferenceCountingResourceHolder.java      |  2 +-
 .../collections/StableLimitingSorter.java     |  2 +-
 .../bitmap/ConciseBitmapFactory.java          |  4 +-
 .../bitmap/RoaringBitmapFactory.java          |  4 +-
 .../spatial/ImmutableFloatNode.java           |  4 +-
 .../spatial/search/GutmanSearchStrategy.java  |  8 ++--
 .../spatial/search/PolygonBound.java          |  2 +-
 .../spatial/search/RadiusBound.java           |  2 +-
 .../spatial/search/RectangularBound.java      |  2 +-
 .../druid/common/config/ConfigManager.java    | 10 ++--
 .../common/config/JacksonConfigManager.java   |  4 +-
 .../druid/common/guava/CombiningSequence.java |  2 +-
 .../apache/druid/common/guava/DSuppliers.java |  2 +-
 .../druid/common/guava/FutureUtils.java       |  2 +-
 .../input/IntermediateRowParsingReader.java   |  4 +-
 .../data/input/MaxSizeSplitHintSpec.java      |  2 +-
 .../apache/druid/data/input/TextReader.java   |  2 +-
 .../druid/data/input/impl/DimensionsSpec.java |  6 +--
 .../druid/data/input/impl/JsonNodeReader.java |  4 +-
 .../data/input/impl/TimeAndDimsParseSpec.java |  2 +-
 .../impl/TimedShutoffInputSourceReader.java   |  2 +-
 .../intset/ImmutableConciseSet.java           |  4 +-
 .../allocation/ArenaMemoryAllocator.java      |  2 +-
 .../frame/allocation/HeapMemoryAllocator.java |  2 +-
 .../frame/channel/FrameChannelSequence.java   |  2 +-
 .../frame/field/NumericArrayFieldWriter.java  |  2 +-
 .../apache/druid/frame/file/FrameFile.java    |  2 +-
 .../processor/FrameProcessorExecutor.java     |  2 +-
 .../frame/processor/RunAllFullyWidget.java    |  2 +-
 .../druid/frame/processor/SuperSorter.java    |  2 +-
 .../druid/frame/read/FrameReaderUtils.java    |  2 +-
 .../columnar/ComplexFrameColumnReader.java    |  2 +-
 .../NumericArrayFrameColumnReader.java        |  2 +-
 .../StringArrayFrameColumnReader.java         |  2 +-
 .../druid/frame/segment/FrameCursorUtils.java |  2 +-
 .../druid/guice/ConditionalMultibind.java     |  8 ++--
 .../apache/druid/guice/ConfigProvider.java    |  2 +-
 .../druid/guice/JacksonConfigProvider.java    |  2 +-
 .../apache/druid/guice/JsonConfigurator.java  |  2 +-
 .../apache/druid/guice/LifecycleModule.java   |  2 +-
 .../apache/druid/guice/LifecycleScope.java    |  2 +-
 .../DruidDefaultSerializersModule.java        | 12 ++---
 .../java/util/common/CloseableIterators.java  |  2 +-
 .../druid/java/util/common/JodaUtils.java     |  2 +-
 .../common/concurrent/ScheduledExecutors.java |  2 +-
 .../util/common/config/DurationCoercible.java |  2 +-
 .../util/common/granularity/Granularity.java  |  2 +-
 .../java/util/common/guava/Accumulators.java  |  2 +-
 .../java/util/common/guava/BaseSequence.java  |  2 +-
 .../java/util/common/guava/Comparators.java   |  6 +--
 .../util/common/guava/ConcatSequence.java     |  4 +-
 .../util/common/guava/ExplodingSequence.java  |  2 +-
 .../util/common/guava/FilteredSequence.java   |  2 +-
 .../java/util/common/guava/MergeSequence.java |  4 +-
 .../guava/ParallelMergeCombiningSequence.java |  8 ++--
 .../java/util/common/guava/Sequences.java     |  2 +-
 .../util/common/guava/SimpleSequence.java     |  2 +-
 .../util/common/guava/SkippingSequence.java   |  2 +-
 .../java/util/common/guava/TopNSequence.java  |  2 +-
 .../util/common/guava/WrappingSequence.java   |  4 +-
 .../util/common/guava/WrappingYielder.java    |  2 +-
 .../java/util/common/guava/Yielders.java      |  4 +-
 .../common/guava/YieldingAccumulators.java    |  2 +-
 .../util/common/jackson/JacksonUtils.java     | 12 ++---
 .../common/parsers/CloseableIterator.java     |  4 +-
 .../CloseableIteratorWithMetadata.java        |  2 +-
 .../common/parsers/JSONToLowerParser.java     |  2 +-
 .../util/common/parsers/JavaScriptParser.java |  2 +-
 .../util/common/parsers/ObjectFlatteners.java |  4 +-
 .../java/util/common/parsers/RegexParser.java |  2 +-
 .../util/emitter/core/HttpPostEmitter.java    |  4 +-
 .../druid/java/util/http/client/Request.java  |  2 +-
 .../util/http/client/pool/ResourcePool.java   |  4 +-
 .../SequenceInputStreamResponseHandler.java   |  2 +-
 .../druid/java/util/metrics/KeyedDiff.java    |  2 +-
 .../druid/java/util/metrics/SysMonitor.java   |  2 +-
 .../apache/druid/math/expr/CartesianList.java |  4 +-
 .../apache/druid/math/expr/ConstantExpr.java  |  2 +-
 .../math/expr/vector/VectorProcessors.java    |  6 +--
 .../query/ChainedExecutionQueryRunner.java    |  6 +--
 .../apache/druid/query/ConcatQueryRunner.java |  2 +-
 .../java/org/apache/druid/query/Druids.java   |  2 +-
 .../apache/druid/query/FluentQueryRunner.java |  2 +-
 .../query/FrameBasedInlineDataSource.java     |  2 +-
 .../druid/query/IterableRowsCursorHelper.java |  4 +-
 .../query/PrioritizedExecutorService.java     |  4 +-
 .../apache/druid/query/QueryRunnerHelper.java |  2 +-
 .../apache/druid/query/SinkQueryRunners.java  |  2 +-
 .../apache/druid/query/TimewarpOperator.java  |  4 +-
 ...stractSerializableLongObjectPairSerde.java |  2 +-
 ...zablePairLongDoubleComplexMetricSerde.java |  4 +-
 ...izablePairLongFloatComplexMetricSerde.java |  4 +-
 ...lizablePairLongLongComplexMetricSerde.java |  4 +-
 ...zablePairLongStringComplexMetricSerde.java |  8 ++--
 .../CardinalityAggregatorFactory.java         |  4 +-
 .../hyperloglog/HyperUniquesSerde.java        |  2 +-
 .../druid/query/context/ResponseContext.java  |  4 +-
 .../DataSourceMetadataQueryRunnerFactory.java |  2 +-
 .../DataSourceQueryQueryToolChest.java        |  4 +-
 .../extraction/FunctionalExtraction.java      |  4 +-
 .../extraction/JavaScriptExtractionFn.java    |  2 +-
 .../groupby/GroupByQueryQueryToolChest.java   | 16 +++----
 .../query/groupby/GroupByQueryResources.java  |  2 +-
 .../ResultRowObjectMapperDecoratorUtil.java   |  8 ++--
 .../epinephelinae/BufferArrayGrouper.java     |  4 +-
 .../epinephelinae/BufferHashGrouper.java      |  6 +--
 .../GroupByMergingQueryRunner.java            |  4 +-
 .../epinephelinae/GroupByRowProcessor.java    |  2 +-
 .../epinephelinae/HashVectorGrouper.java      |  2 +-
 .../LimitedBufferHashGrouper.java             | 12 ++---
 .../epinephelinae/ParallelCombiner.java       |  4 +-
 .../epinephelinae/RowBasedGrouperHelper.java  |  4 +-
 .../epinephelinae/SpillingGrouper.java        |  2 +-
 .../StreamingMergeSortedGrouper.java          |  2 +-
 .../vector/VectorGroupByEngine.java           |  2 +-
 .../groupby/orderby/DefaultLimitSpec.java     |  4 +-
 .../groupby/orderby/OrderByColumnSpec.java    |  4 +-
 .../query/lookup/LookupExtractionFn.java      |  2 +-
 .../druid/query/lookup/LookupSegment.java     |  2 +-
 .../query/lookup/LookupSnapshotTaker.java     |  2 +-
 .../SegmentMetadataQueryQueryToolChest.java   |  8 ++--
 .../SegmentMetadataQueryRunnerFactory.java    | 15 +++---
 .../metadata/metadata/ColumnAnalysis.java     |  2 +-
 .../SpecializationService.java                |  2 +-
 .../query/operator/OperatorSequence.java      |  4 +-
 ...WindowOperatorQueryQueryRunnerFactory.java |  2 +-
 .../WindowOperatorQueryQueryToolChest.java    |  4 +-
 .../DefaultFramedOnHeapAggregatable.java      |  4 +-
 .../druid/query/scan/ScanQueryEngine.java     |  2 +-
 .../query/scan/ScanQueryLimitRowIterator.java |  2 +-
 .../query/scan/ScanQueryOffsetSequence.java   |  2 +-
 .../query/scan/ScanQueryQueryToolChest.java   |  4 +-
 .../search/SearchQueryQueryToolChest.java     | 24 ++++------
 .../druid/query/search/SearchSortSpec.java    |  2 +-
 .../spec/SpecificSegmentQueryRunner.java      |  4 +-
 .../TimeBoundaryQueryQueryToolChest.java      | 16 +++----
 .../TimeBoundaryQueryRunnerFactory.java       |  2 +-
 .../query/timeseries/TimeseriesBinaryFn.java  |  6 +--
 .../TimeseriesQueryQueryToolChest.java        | 14 ++----
 .../timeseries/TimeseriesResultBuilder.java   |  2 +-
 .../query/topn/NumericTopNMetricSpec.java     |  4 +-
 .../druid/query/topn/PooledTopNAlgorithm.java |  2 +-
 .../query/topn/TopNQueryQueryToolChest.java   | 28 +++++------
 .../query/topn/TopNQueryRunnerFactory.java    |  2 +-
 .../druid/segment/AutoTypeColumnIndexer.java  |  4 +-
 .../ComparatorDimensionDictionary.java        |  2 +-
 .../apache/druid/segment/CompressedPools.java | 12 ++---
 .../DictionaryEncodedColumnIndexer.java       |  2 +-
 .../org/apache/druid/segment/IndexSpec.java   |  4 +-
 .../segment/NestedDataColumnIndexerV4.java    |  2 +-
 .../QueryableIndexIndexableAdapter.java       |  2 +-
 .../org/apache/druid/segment/RowAdapters.java |  2 +-
 .../RowBasedColumnSelectorFactory.java        |  2 +-
 .../druid/segment/column/RowSignature.java    |  2 +-
 .../column/StringEncodingStrategies.java      |  2 +-
 .../data/CompressedColumnarIntsSupplier.java  |  8 ++--
 .../CompressedVSizeColumnarIntsSupplier.java  |  4 +-
 .../segment/data/CompressionFactory.java      |  2 +-
 ...DecompressingByteBufferObjectStrategy.java |  2 +-
 .../segment/data/FixedIndexedWriter.java      |  3 +-
 .../druid/segment/data/FrontCodedIndexed.java |  2 +-
 .../data/FrontCodedIntArrayIndexed.java       |  2 +-
 .../druid/segment/data/GenericIndexed.java    |  4 +-
 .../segment/data/GenericIndexedWriter.java    |  2 +-
 .../apache/druid/segment/data/Indexed.java    |  2 +-
 .../druid/segment/data/IndexedIterable.java   |  4 +-
 .../segment/generator/DataGenerator.java      |  2 +-
 .../generator/SequentialDistribution.java     |  2 +-
 .../incremental/IncrementalIndexRow.java      |  2 +-
 .../SpatialDimensionRowTransformer.java       |  2 +-
 .../IndexedStringDruidPredicateIndexes.java   |  2 +-
 ...ndexedUtf8LexicographicalRangeIndexes.java |  4 +-
 .../index/semantic/ValueSetIndexes.java       |  6 +--
 .../join/lookup/LookupJoinMatcher.java        |  2 +-
 .../CompressedNestedDataComplexColumn.java    |  6 +--
 .../nested/NestedDataComplexTypeSerde.java    |  4 +-
 .../NestedFieldColumnIndexSupplier.java       | 12 ++---
 .../NestedFieldDictionaryEncodedColumn.java   |  2 +-
 .../ScalarDoubleColumnAndIndexSupplier.java   |  4 +-
 .../ScalarLongColumnAndIndexSupplier.java     |  4 +-
 .../druid/segment/nested/ValueDictionary.java | 16 +++----
 .../druid/segment/nested/VariantColumn.java   |  6 +--
 .../serde/CombineFirstTwoEntriesIndexed.java  |  4 +-
 .../druid/segment/serde/MetaSerdeHelper.java  |  4 +-
 .../druid/segment/serde/cell/StagedSerde.java |  2 +-
 .../virtual/ListFilteredVirtualColumn.java    |  2 +-
 .../virtual/NestedFieldVirtualColumn.java     |  2 +-
 .../remote/ChunkingStorageConnector.java      |  2 +-
 .../partition/IntegerPartitionChunk.java      |  2 +-
 .../partition/NumberedPartitionChunk.java     |  2 +-
 .../partition/OvershadowableManager.java      |  2 +-
 .../partition/TombstonePartitionedChunk.java  |  2 +-
 .../apache/druid/utils/CollectionUtils.java   |  2 +-
 .../bitmap/BitmapIterationTest.java           |  2 +-
 .../bitmap/BitmapOperationTestBase.java       |  4 +-
 .../bitmap/ConciseBitmapFactoryTest.java      |  2 +-
 .../bitmap/RoaringBitmapFactoryTest.java      |  2 +-
 .../config/JacksonConfigManagerTest.java      |  4 +-
 .../common/guava/CombiningSequenceTest.java   |  4 +-
 .../common/guava/ComplexSequenceTest.java     |  2 +-
 .../druid/common/guava/GuavaUtilsTest.java    |  2 +-
 .../common/jackson/JacksonUtilsTest.java      |  4 +-
 .../semantic/SemanticCreatorUsageTest.java    |  2 +-
 .../druid/common/utils/UUIDUtilsTest.java     |  2 +-
 .../input/HandlingInputRowIteratorTest.java   |  4 +-
 .../data/input/impl/JSONParseSpecTest.java    |  2 +-
 .../input/impl/prefetch/JsonIteratorTest.java |  4 +-
 .../druid/frame/file/FrameFileTest.java       |  2 +-
 .../processor/FrameProcessorExecutorTest.java |  2 +-
 .../processor/RunAllFullyWidgetTest.java      |  2 +-
 .../frame/processor/SuperSorterTest.java      |  2 +-
 .../frame/testutil/FrameSequenceBuilder.java  |  2 +-
 .../write/cast/TypeCastSelectorsTest.java     |  2 +-
 .../druid/guice/ConditionalMultibindTest.java | 32 ++++---------
 .../util/common/guava/BaseSequenceTest.java   |  6 +--
 .../util/common/guava/ConcatSequenceTest.java | 16 +++----
 .../common/guava/FilteredSequenceTest.java    |  2 +-
 .../common/guava/FunctionalIterableTest.java  |  2 +-
 .../common/guava/FunctionalIteratorTest.java  |  2 +-
 .../common/guava/LimitedSequenceTest.java     |  4 +-
 .../util/common/guava/MappedSequenceTest.java |  2 +-
 .../ParallelMergeCombiningSequenceTest.java   | 13 +++--
 .../util/common/guava/SequenceTestHelper.java |  6 +--
 .../common/guava/SkippingSequenceTest.java    |  4 +-
 .../common/parsers/CloseableIteratorTest.java |  2 +-
 .../java/util/emitter/core/GoHandlers.java    |  2 +-
 .../core/HttpPostEmitterStressTest.java       |  2 +-
 .../util/emitter/service/AlertEventTest.java  |  2 +-
 .../AppendableByteArrayInputStreamTest.java   |  4 +-
 .../http/client/pool/ResourcePoolTest.java    |  4 +-
 .../response/BytesFullResponseHolderTest.java |  3 +-
 .../java/util/metrics/OshiSysMonitorTest.java |  2 +-
 .../druid/math/expr/VectorExprSanityTest.java |  2 +-
 .../MetadataStorageActionHandlerTest.java     |  2 +-
 .../druid/query/MultiValuedDimensionTest.java |  4 +-
 .../druid/query/NestedDataTestUtils.java      |  8 ++--
 .../query/PrioritizedExecutorServiceTest.java |  6 +--
 .../druid/query/QueryRunnerTestHelper.java    |  4 +-
 ...ResultGranularTimestampComparatorTest.java | 20 ++++----
 .../druid/query/TimewarpOperatorTest.java     |  8 ++--
 .../aggregation/AggregationTestHelper.java    | 10 ++--
 ...ePairLongDoubleComplexMetricSerdeTest.java |  2 +-
 ...lePairLongFloatComplexMetricSerdeTest.java |  2 +-
 ...blePairLongLongComplexMetricSerdeTest.java |  2 +-
 ...ePairLongStringComplexMetricSerdeTest.java |  2 +-
 .../CardinalityAggregatorTest.java            |  8 ++--
 .../post/ArithmeticPostAggregatorTest.java    |  2 +-
 .../DoubleGreatestPostAggregatorTest.java     |  4 +-
 .../post/DoubleLeastPostAggregatorTest.java   |  4 +-
 .../post/FieldAccessPostAggregatorTest.java   |  2 +-
 .../post/LongGreatestPostAggregatorTest.java  |  4 +-
 .../post/LongLeastPostAggregatorTest.java     |  4 +-
 .../dimension/LegacyDimensionSpecTest.java    |  4 +-
 .../druid/query/explain/ExplainPlanTest.java  |  2 +-
 .../extraction/FunctionalExtractionTest.java  | 10 ++--
 .../query/filter/DimFilterUtilsTest.java      |  2 +-
 ...ByLimitPushDownInsufficientBufferTest.java |  4 +-
 ...roupByLimitPushDownMultiNodeMergeTest.java |  6 +--
 .../query/groupby/GroupByQueryRunnerTest.java | 20 ++++----
 .../epinephelinae/BufferHashGrouperTest.java  |  2 +-
 .../epinephelinae/ConcurrentGrouperTest.java  |  4 +-
 .../GroupByTestColumnSelectorFactory.java     |  2 +-
 .../druid/query/lookup/LookupsStateTest.java  |  4 +-
 .../metadata/SegmentMetadataQueryTest.java    |  2 +-
 .../query/operator/OperatorSequenceTest.java  |  8 ++--
 .../RearrangedRowsAndColumnsTest.java         |  2 +-
 .../scan/ScanQueryResultOrderingTest.java     |  2 +-
 .../druid/query/scan/ScanQueryRunnerTest.java |  4 +-
 .../query/search/SearchBinaryFnTest.java      | 48 +++++++++----------
 .../query/search/SearchQueryRunnerTest.java   |  2 +-
 .../timeseries/TimeseriesBinaryFnTest.java    | 20 ++++----
 .../timeseries/TimeseriesQueryRunnerTest.java |  2 +-
 .../druid/query/topn/TopNBinaryFnTest.java    | 32 ++++++-------
 .../query/topn/TopNQueryRunnerBenchmark.java  |  4 +-
 .../druid/query/topn/TopNQueryRunnerTest.java |  2 +-
 .../query/topn/TopNQueryRunnerTestHelper.java |  2 +-
 .../union/UnionQueryQueryToolChestTest.java   |  4 +-
 .../segment/CursorFactoryProjectionTest.java  |  2 +-
 .../DictionaryMergingIteratorTest.java        | 10 ++--
 .../org/apache/druid/segment/IndexIOTest.java | 10 ++--
 .../segment/RowBasedCursorFactoryTest.java    |  5 +-
 .../druid/segment/SchemalessIndexTest.java    |  6 +--
 .../segment/SchemalessTestSimpleTest.java     |  4 +-
 .../org/apache/druid/segment/TestIndex.java   |  2 +-
 .../segment/UnnestCursorFactoryTest.java      |  2 +-
 .../CompressedColumnarIntsSupplierTest.java   |  2 +-
 .../data/CompressedDoublesSerdeTest.java      |  2 +-
 .../data/CompressedFloatsSerdeTest.java       |  2 +-
 .../data/CompressedLongsSerdeTest.java        |  2 +-
 ...SizeColumnarMultiIntsSupplierTestBase.java |  2 +-
 .../segment/data/IncrementalIndexTest.java    |  6 +--
 .../data/VSizeColumnarMultiIntsTest.java      |  2 +-
 .../filter/SpatialFilterBonusTest.java        | 12 ++---
 .../segment/filter/SpatialFilterTest.java     | 14 +++---
 .../segment/generator/DataGeneratorTest.java  |  2 +-
 .../IncrementalIndexMultiValueSpecTest.java   |  2 +-
 .../druid/segment/join/JoinTestHelper.java    |  4 +-
 .../segment/nested/NestedPathPartTest.java    |  4 +-
 .../CombineFirstTwoEntriesIndexedTest.java    |  2 +-
 .../serde/cell/BytesReadWriteTestBase.java    |  2 +-
 .../virtual/ExpressionSelectorsTest.java      |  2 +-
 .../storage/remote/TestStorageConnector.java  |  2 +-
 .../HashBasedNumberedShardSpecTest.java       |  2 +-
 .../partition/NumberedShardSpecTest.java      |  2 +-
 .../PartitionHolderCompletenessTest.java      |  2 +-
 .../TombstonePartitionedChunkTest.java        |  2 +-
 .../druid/catalog/model/ModelProperties.java  |  2 +-
 .../catalog/model/SchemaRegistryImpl.java     |  2 +-
 .../catalog/model/table/ClusterKeySpec.java   |  2 +-
 .../catalog/model/table/DatasourceDefn.java   |  2 +-
 .../model/table/ExternalTableDefn.java        |  6 +--
 .../model/table/HttpInputSourceDefn.java      |  2 +-
 .../client/BatchServerInventoryView.java      |  8 ++--
 .../druid/client/CachingClusteredClient.java  |  6 +--
 .../druid/client/DirectDruidClient.java       |  8 ++--
 .../druid/client/HttpServerInventoryView.java |  8 ++--
 .../druid/client/broker/BrokerClientImpl.java |  2 +-
 .../cache/BackgroundCachePopulator.java       |  2 +-
 .../druid/client/cache/MemcachedCache.java    |  8 ++--
 .../cache/MemcachedOperationQueueFactory.java |  2 +-
 .../coordinator/CoordinatorClientImpl.java    | 10 ++--
 .../ClientCompactionTaskTransformSpec.java    |  2 +-
 .../druid/curator/announcement/Announcer.java |  4 +-
 .../curator/discovery/DiscoveryModule.java    |  6 +--
 .../discovery/ServerDiscoverySelector.java    |  2 +-
 .../druid/discovery/DataServerClient.java     |  2 +-
 .../discovery/DataServerResponseHandler.java  |  2 +-
 .../org/apache/druid/guice/DruidBinders.java  | 24 +++++-----
 .../http/AbstractHttpClientProvider.java      |  6 +--
 .../druid/messages/client/MessageRelay.java   |  2 +-
 .../messages/server/MessageRelayResource.java |  2 +-
 .../IndexerSQLMetadataStorageCoordinator.java |  2 +-
 .../druid/metadata/SQLMetadataConnector.java  |  6 +--
 .../SQLMetadataStorageActionHandler.java      | 10 ++--
 .../metadata/SqlSegmentsMetadataManager.java  |  6 +--
 .../druid/metadata/input/SqlReader.java       |  4 +-
 .../storage/derby/DerbyConnector.java         |  2 +-
 .../query/ResultLevelCachingQueryRunner.java  |  2 +-
 .../apache/druid/query/RetryQueryRunner.java  |  6 +--
 .../query/lookup/LookupListeningResource.java |  8 +---
 .../query/lookup/LookupReferencesManager.java |  4 +-
 .../apache/druid/rpc/ServiceClientImpl.java   |  4 +-
 .../rpc/indexing/OverlordClientImpl.java      |  6 +--
 .../indexing/SpecificTaskServiceLocator.java  |  4 +-
 .../granularity/BaseGranularitySpec.java      |  2 +-
 .../loading/LocalDataSegmentPuller.java       |  2 +-
 ...dRobinStorageLocationSelectorStrategy.java |  2 +-
 .../SegmentMetadataQuerySegmentWalker.java    |  2 +-
 .../appenderator/BatchAppenderator.java       |  2 +-
 .../appenderator/StreamAppenderator.java      |  4 +-
 .../druid/segment/realtime/sink/Sink.java     |  2 +-
 .../druid/server/ClientInfoResource.java      |  2 +-
 .../server/ClientQuerySegmentWalker.java      |  7 +--
 .../apache/druid/server/QueryLifecycle.java   |  4 +-
 .../apache/druid/server/QueryResponse.java    |  2 +-
 .../BatchDataSegmentAnnouncer.java            | 10 ++--
 .../coordination/ChangeRequestHttpSyncer.java |  2 +-
 .../loading/HttpLoadQueuePeon.java            |  2 +-
 .../emitter/ComposingEmitterModule.java       |  2 +-
 .../druid/server/emitter/EmitterModule.java   |  4 +-
 .../http/LookupCoordinatorResource.java       |  4 +-
 .../server/http/SegmentListerResource.java    |  4 +-
 .../druid/server/http/ServersResource.java    |  4 +-
 .../http/security/RulesResourceFilter.java    |  2 +-
 .../jetty/JettyServerInitUtils.java           |  4 +-
 .../resource/AbstractListenerHandler.java     |  2 +-
 .../DefaultRequestLogEventBuilderFactory.java |  2 +-
 .../druid/server/log/FileRequestLogger.java   |  2 +-
 .../cache/LookupCoordinatorManager.java       | 10 ++--
 .../security/TLSCertificateCheckerModule.java |  4 +-
 .../druid/catalog/model/PropertyDefnTest.java |  4 +-
 .../client/CachingClusteredClientTest.java    | 14 +++---
 .../client/CoordinatorServerViewTest.java     |  4 +-
 .../druid/client/JsonParserIteratorTest.java  |  2 +-
 .../apache/druid/client/RangeIterable.java    |  2 +-
 .../cache/BytesBoundedLinkedQueueTest.java    |  6 +--
 .../client/cache/MemcachedCacheTest.java      |  8 ++--
 .../client/BatchServerInventoryViewTest.java  | 10 ++--
 .../guice/JoinableFactoryModuleTest.java      |  8 ++--
 .../ServerInjectorBuilderTest.java            |  2 +-
 .../druid/messages/MessageBatchTest.java      |  2 +-
 .../SQLMetadataStorageActionHandlerTest.java  | 14 ++----
 ...SegmentMetadataQuerySegmentWalkerTest.java |  3 +-
 .../StreamAppenderatorDriverFailTest.java     |  2 +-
 .../appenderator/StreamAppenderatorTest.java  |  6 +--
 .../druid/server/ClientInfoResourceTest.java  |  2 +-
 .../druid/server/QueryResourceTest.java       | 12 ++---
 .../druid/server/QueryResultPusherTest.java   |  2 +-
 .../druid/server/QuerySchedulerTest.java      |  8 ++--
 .../druid/server/StatusResourceTest.java      |  3 +-
 .../NewestSegmentFirstPolicyTest.java         | 14 +++---
 .../ChangeRequestHistoryTest.java             |  4 +-
 .../ChangeRequestHttpSyncerTest.java          |  4 +-
 .../coordination/ServerManagerTest.java       |  8 ++--
 .../BatchDataSegmentAnnouncerTest.java        |  4 +-
 .../coordinator/duty/CompactSegmentsTest.java |  8 ++--
 .../loading/CuratorLoadQueuePeonTest.java     |  4 +-
 .../BroadcastDistributionRuleSerdeTest.java   |  2 +-
 .../TestSegmentLoadingHttpClient.java         |  4 +-
 .../server/http/DataSourcesResourceTest.java  |  2 +-
 .../security/ResourceFilterTestHelper.java    |  6 +--
 .../security/AuthorizationUtilsTest.java      |  2 +-
 .../org/apache/druid/cli/CliCoordinator.java  |  4 +-
 .../org/apache/druid/cli/DumpSegment.java     |  6 +--
 .../cli/validate/DruidJsonValidator.java      |  2 +-
 .../guice/AbstractDruidServiceModule.java     |  6 +--
 .../server/router/CoordinatorRuleManager.java |  4 +-
 .../router/TieredBrokerHostSelector.java      |  4 +-
 .../router/TieredBrokerHostSelectorTest.java  |  2 +-
 .../druid/sql/calcite/filtration/Bounds.java  |  2 +-
 .../calcite/planner/DruidSqlValidator.java    |  6 ++-
 .../sql/calcite/planner/QueryHandler.java     |  2 +-
 .../druid/sql/calcite/rel/DruidUnionRel.java  |  2 +-
 .../druid/sql/calcite/rule/DruidJoinRule.java |  2 +-
 .../sql/calcite/schema/InformationSchema.java | 10 ++--
 .../calcite/schema/MetadataSegmentView.java   |  4 +-
 .../sql/calcite/schema/SystemSchema.java      |  6 +--
 .../druid/quidem/DruidQuidemTestBase.java     |  2 +-
 .../apache/druid/quidem/DynamicComposite.java |  2 +-
 .../druid/quidem/DynamicCompositeTest.java    |  2 +-
 .../apache/druid/sql/SqlStatementTest.java    |  2 +-
 .../druid/sql/avatica/AvaticaModuleTest.java  |  7 ++-
 .../sql/calcite/BaseCalciteQueryTest.java     |  2 +-
 .../sql/calcite/NotYetSupportedUsageTest.java |  2 +-
 .../sql/calcite/SqlTestFrameworkConfig.java   | 12 ++---
 .../aggregation/SqlAggregationModuleTest.java |  2 +-
 .../schema/DruidCalciteSchemaModuleTest.java  |  2 +-
 .../druid/sql/calcite/util/CalciteTests.java  |  2 +-
 .../druid/sql/http/SqlHttpModuleTest.java     |  4 +-
 649 files changed, 1264 insertions(+), 1519 deletions(-)

diff --git a/benchmarks/src/test/java/org/apache/druid/benchmark/FlattenJSONBenchmark.java b/benchmarks/src/test/java/org/apache/druid/benchmark/FlattenJSONBenchmark.java
index 7dd0c3fc9173..ee2b39bc941a 100644
--- a/benchmarks/src/test/java/org/apache/druid/benchmark/FlattenJSONBenchmark.java
+++ b/benchmarks/src/test/java/org/apache/druid/benchmark/FlattenJSONBenchmark.java
@@ -68,15 +68,15 @@ public class FlattenJSONBenchmark
   public void prepare() throws Exception
   {
     FlattenJSONBenchmarkUtil gen = new FlattenJSONBenchmarkUtil();
-    flatInputs = new ArrayList<String>();
+    flatInputs = new ArrayList<>();
     for (int i = 0; i < NUM_EVENTS; i++) {
       flatInputs.add(gen.generateFlatEvent());
     }
-    nestedInputs = new ArrayList<String>();
+    nestedInputs = new ArrayList<>();
     for (int i = 0; i < NUM_EVENTS; i++) {
       nestedInputs.add(gen.generateNestedEvent());
     }
-    jqInputs = new ArrayList<String>();
+    jqInputs = new ArrayList<>();
     for (int i = 0; i < NUM_EVENTS; i++) {
       jqInputs.add(gen.generateNestedEvent()); // reuse the same event as "nested"
     }
diff --git a/benchmarks/src/test/java/org/apache/druid/benchmark/GenericIndexedBenchmark.java b/benchmarks/src/test/java/org/apache/druid/benchmark/GenericIndexedBenchmark.java
index 6f699efe0264..afbcb97b19f8 100644
--- a/benchmarks/src/test/java/org/apache/druid/benchmark/GenericIndexedBenchmark.java
+++ b/benchmarks/src/test/java/org/apache/druid/benchmark/GenericIndexedBenchmark.java
@@ -67,7 +67,7 @@ public class GenericIndexedBenchmark
 
   public static final int ITERATIONS = 10000;
 
-  static final ObjectStrategy<byte[]> BYTE_ARRAY_STRATEGY = new ObjectStrategy<byte[]>()
+  static final ObjectStrategy<byte[]> BYTE_ARRAY_STRATEGY = new ObjectStrategy<>()
   {
     @Override
     public Class<byte[]> getClazz()
diff --git a/benchmarks/src/test/java/org/apache/druid/benchmark/IncrementalIndexRowTypeBenchmark.java b/benchmarks/src/test/java/org/apache/druid/benchmark/IncrementalIndexRowTypeBenchmark.java
index 395f9d6d7c70..e411fc92b1ed 100644
--- a/benchmarks/src/test/java/org/apache/druid/benchmark/IncrementalIndexRowTypeBenchmark.java
+++ b/benchmarks/src/test/java/org/apache/druid/benchmark/IncrementalIndexRowTypeBenchmark.java
@@ -67,9 +67,9 @@ public class IncrementalIndexRowTypeBenchmark
   private static AggregatorFactory[] aggs;
   static final int DIMENSION_COUNT = 8;
 
-  private ArrayList<InputRow> longRows = new ArrayList<InputRow>();
-  private ArrayList<InputRow> floatRows = new ArrayList<InputRow>();
-  private ArrayList<InputRow> stringRows = new ArrayList<InputRow>();
+  private ArrayList<InputRow> longRows = new ArrayList<>();
+  private ArrayList<InputRow> floatRows = new ArrayList<>();
+  private ArrayList<InputRow> stringRows = new ArrayList<>();
 
 
   static {
@@ -95,7 +95,7 @@ public class IncrementalIndexRowTypeBenchmark
   private MapBasedInputRow getLongRow(long timestamp, int dimensionCount)
   {
     Random rng = ThreadLocalRandom.current();
-    List<String> dimensionList = new ArrayList<String>(dimensionCount);
+    List<String> dimensionList = new ArrayList<>(dimensionCount);
     ImmutableMap.Builder<String, Object> builder = ImmutableMap.builder();
     for (int i = 0; i < dimensionCount; i++) {
       String dimName = StringUtils.format("Dim_%d", i);
@@ -108,7 +108,7 @@ private MapBasedInputRow getLongRow(long timestamp, int dimensionCount)
   private MapBasedInputRow getFloatRow(long timestamp, int dimensionCount)
   {
     Random rng = ThreadLocalRandom.current();
-    List<String> dimensionList = new ArrayList<String>(dimensionCount);
+    List<String> dimensionList = new ArrayList<>(dimensionCount);
     ImmutableMap.Builder<String, Object> builder = ImmutableMap.builder();
     for (int i = 0; i < dimensionCount; i++) {
       String dimName = StringUtils.format("Dim_%d", i);
@@ -121,7 +121,7 @@ private MapBasedInputRow getFloatRow(long timestamp, int dimensionCount)
   private MapBasedInputRow getStringRow(long timestamp, int dimensionCount)
   {
     Random rng = ThreadLocalRandom.current();
-    List<String> dimensionList = new ArrayList<String>(dimensionCount);
+    List<String> dimensionList = new ArrayList<>(dimensionCount);
     ImmutableMap.Builder<String, Object> builder = ImmutableMap.builder();
     for (int i = 0; i < dimensionCount; i++) {
       String dimName = StringUtils.format("Dim_%d", i);
diff --git a/benchmarks/src/test/java/org/apache/druid/benchmark/StupidPoolConcurrencyBenchmark.java b/benchmarks/src/test/java/org/apache/druid/benchmark/StupidPoolConcurrencyBenchmark.java
index b7ed8eade071..8462a3cca58a 100644
--- a/benchmarks/src/test/java/org/apache/druid/benchmark/StupidPoolConcurrencyBenchmark.java
+++ b/benchmarks/src/test/java/org/apache/druid/benchmark/StupidPoolConcurrencyBenchmark.java
@@ -44,7 +44,7 @@ public static class BenchmarkPool
     private final AtomicLong numPools = new AtomicLong(0L);
     private final NonBlockingPool<Object> pool = new StupidPool<>(
         "simpleObject pool",
-        new Supplier<Object>()
+        new Supplier<>()
         {
           @Override
           public Object get()
diff --git a/benchmarks/src/test/java/org/apache/druid/benchmark/indexing/OnheapIncrementalIndexBenchmark.java b/benchmarks/src/test/java/org/apache/druid/benchmark/indexing/OnheapIncrementalIndexBenchmark.java
index 7c67e7895ab5..8f662f273a34 100644
--- a/benchmarks/src/test/java/org/apache/druid/benchmark/indexing/OnheapIncrementalIndexBenchmark.java
+++ b/benchmarks/src/test/java/org/apache/druid/benchmark/indexing/OnheapIncrementalIndexBenchmark.java
@@ -116,7 +116,7 @@ public class OnheapIncrementalIndexBenchmark
 
   private static MapBasedInputRow getLongRow(long timestamp, int rowID, int dimensionCount)
   {
-    List<String> dimensionList = new ArrayList<String>(dimensionCount);
+    List<String> dimensionList = new ArrayList<>(dimensionCount);
     ImmutableMap.Builder<String, Object> builder = ImmutableMap.builder();
     for (int i = 0; i < dimensionCount; i++) {
       String dimName = StringUtils.format("Dim_%d", i);
diff --git a/benchmarks/src/test/java/org/apache/druid/benchmark/sequences/MergeSequenceBenchmark.java b/benchmarks/src/test/java/org/apache/druid/benchmark/sequences/MergeSequenceBenchmark.java
index 995163077e50..61bee5d59332 100644
--- a/benchmarks/src/test/java/org/apache/druid/benchmark/sequences/MergeSequenceBenchmark.java
+++ b/benchmarks/src/test/java/org/apache/druid/benchmark/sequences/MergeSequenceBenchmark.java
@@ -80,14 +80,14 @@ public void setup()
   public void mergeHierarchical(Blackhole blackhole)
   {
     Iterator<Sequence<Integer>> iterator = sequences.iterator();
-    List<Sequence<Integer>> partialMerged = new ArrayList<Sequence<Integer>>();
-    List<Sequence<Integer>> toMerge = new ArrayList<Sequence<Integer>>();
+    List<Sequence<Integer>> partialMerged = new ArrayList<>();
+    List<Sequence<Integer>> toMerge = new ArrayList<>();
 
     while (iterator.hasNext()) {
       toMerge.add(iterator.next());
       if (toMerge.size() == mergeAtOnce) {
-        partialMerged.add(new MergeSequence<Integer>(Ordering.natural(), Sequences.simple(toMerge)));
-        toMerge = new ArrayList<Sequence<Integer>>();
+        partialMerged.add(new MergeSequence<>(Ordering.natural(), Sequences.simple(toMerge)));
+        toMerge = new ArrayList<>();
       }
     }
 
diff --git a/extensions-contrib/aliyun-oss-extensions/src/main/java/org/apache/druid/storage/aliyun/OssDataSegmentMover.java b/extensions-contrib/aliyun-oss-extensions/src/main/java/org/apache/druid/storage/aliyun/OssDataSegmentMover.java
index eff024d3e0e9..0bfd3efaff57 100644
--- a/extensions-contrib/aliyun-oss-extensions/src/main/java/org/apache/druid/storage/aliyun/OssDataSegmentMover.java
+++ b/extensions-contrib/aliyun-oss-extensions/src/main/java/org/apache/druid/storage/aliyun/OssDataSegmentMover.java
@@ -101,7 +101,7 @@ public DataSegment move(DataSegment segment, Map<String, Object> targetLoadSpec)
               .putAll(
                   Maps.filterKeys(
                       loadSpec,
-                      new Predicate<String>()
+                      new Predicate<>()
                       {
                         @Override
                         public boolean apply(String input)
diff --git a/extensions-contrib/aliyun-oss-extensions/src/main/java/org/apache/druid/storage/aliyun/OssDataSegmentPuller.java b/extensions-contrib/aliyun-oss-extensions/src/main/java/org/apache/druid/storage/aliyun/OssDataSegmentPuller.java
index ebe9b2b49439..fa8e0193b052 100644
--- a/extensions-contrib/aliyun-oss-extensions/src/main/java/org/apache/druid/storage/aliyun/OssDataSegmentPuller.java
+++ b/extensions-contrib/aliyun-oss-extensions/src/main/java/org/apache/druid/storage/aliyun/OssDataSegmentPuller.java
@@ -245,7 +245,7 @@ public boolean delete()
   public Predicate<Throwable> shouldRetryPredicate()
   {
     // Yay! smart retries!
-    return new Predicate<Throwable>()
+    return new Predicate<>()
     {
       @Override
       public boolean apply(Throwable e)
diff --git a/extensions-contrib/aliyun-oss-extensions/src/main/java/org/apache/druid/storage/aliyun/OssUtils.java b/extensions-contrib/aliyun-oss-extensions/src/main/java/org/apache/druid/storage/aliyun/OssUtils.java
index b369870ed8c2..60037389276a 100644
--- a/extensions-contrib/aliyun-oss-extensions/src/main/java/org/apache/druid/storage/aliyun/OssUtils.java
+++ b/extensions-contrib/aliyun-oss-extensions/src/main/java/org/apache/druid/storage/aliyun/OssUtils.java
@@ -57,7 +57,7 @@ static boolean isServiceExceptionRecoverable(OSSException ex)
     return !badStatusCode && (isIOException || isTimeout);
   }
 
-  public static final Predicate<Throwable> RETRYABLE = new Predicate<Throwable>()
+  public static final Predicate<Throwable> RETRYABLE = new Predicate<>()
   {
     @Override
     public boolean apply(Throwable e)
diff --git a/extensions-contrib/cassandra-storage/src/main/java/org/apache/druid/storage/cassandra/CassandraStorage.java b/extensions-contrib/cassandra-storage/src/main/java/org/apache/druid/storage/cassandra/CassandraStorage.java
index 9588eb946fb5..de03b3476a2d 100644
--- a/extensions-contrib/cassandra-storage/src/main/java/org/apache/druid/storage/cassandra/CassandraStorage.java
+++ b/extensions-contrib/cassandra-storage/src/main/java/org/apache/druid/storage/cassandra/CassandraStorage.java
@@ -66,7 +66,7 @@ public CassandraStorage(CassandraDataSegmentConfig config)
     this.config = config;
     indexStorage = new CassandraChunkedStorageProvider(keyspace, INDEX_TABLE_NAME);
 
-    descriptorStorage = new ColumnFamily<String, String>(DESCRIPTOR_TABLE_NAME,
+    descriptorStorage = new ColumnFamily<>(DESCRIPTOR_TABLE_NAME,
         StringSerializer.get(), StringSerializer.get());
   }
 }
diff --git a/extensions-contrib/cloudfiles-extensions/src/main/java/org/apache/druid/storage/cloudfiles/CloudFilesUtils.java b/extensions-contrib/cloudfiles-extensions/src/main/java/org/apache/druid/storage/cloudfiles/CloudFilesUtils.java
index bc883b28fd84..fe903b080230 100644
--- a/extensions-contrib/cloudfiles-extensions/src/main/java/org/apache/druid/storage/cloudfiles/CloudFilesUtils.java
+++ b/extensions-contrib/cloudfiles-extensions/src/main/java/org/apache/druid/storage/cloudfiles/CloudFilesUtils.java
@@ -31,7 +31,7 @@
 public class CloudFilesUtils
 {
 
-  public static final Predicate<Throwable> CLOUDFILESRETRY = new Predicate<Throwable>()
+  public static final Predicate<Throwable> CLOUDFILESRETRY = new Predicate<>()
   {
     @Override
     public boolean apply(Throwable e)
diff --git a/extensions-contrib/compressed-bigdecimal/src/main/java/org/apache/druid/compressedbigdecimal/CompressedBigDecimalMetricSerde.java b/extensions-contrib/compressed-bigdecimal/src/main/java/org/apache/druid/compressedbigdecimal/CompressedBigDecimalMetricSerde.java
index 1decd3df137a..d76896c83e09 100644
--- a/extensions-contrib/compressed-bigdecimal/src/main/java/org/apache/druid/compressedbigdecimal/CompressedBigDecimalMetricSerde.java
+++ b/extensions-contrib/compressed-bigdecimal/src/main/java/org/apache/druid/compressedbigdecimal/CompressedBigDecimalMetricSerde.java
@@ -49,7 +49,7 @@ public String getTypeName()
   @Override
   public ComplexMetricExtractor<CompressedBigDecimal> getExtractor()
   {
-    return new ComplexMetricExtractor<CompressedBigDecimal>()
+    return new ComplexMetricExtractor<>()
     {
       @Override
       public Class<CompressedBigDecimal> extractedClass()
diff --git a/extensions-contrib/ddsketch/src/main/java/org/apache/druid/query/aggregation/ddsketch/DDSketchAggregatorFactory.java b/extensions-contrib/ddsketch/src/main/java/org/apache/druid/query/aggregation/ddsketch/DDSketchAggregatorFactory.java
index 1081fdbd0ead..e70a7cc2c6cf 100644
--- a/extensions-contrib/ddsketch/src/main/java/org/apache/druid/query/aggregation/ddsketch/DDSketchAggregatorFactory.java
+++ b/extensions-contrib/ddsketch/src/main/java/org/apache/druid/query/aggregation/ddsketch/DDSketchAggregatorFactory.java
@@ -264,7 +264,7 @@ public AggregatorFactory withName(String newName)
   @Override
   public AggregateCombiner<DDSketch> makeAggregateCombiner()
   {
-    return new ObjectAggregateCombiner<DDSketch>()
+    return new ObjectAggregateCombiner<>()
     {
       private DDSketch combined = DDSketches.collapsingLowestDense(relativeError, numBins);
 
diff --git a/extensions-contrib/distinctcount/src/test/java/org/apache/druid/query/aggregation/distinctcount/DistinctCountTopNQueryTest.java b/extensions-contrib/distinctcount/src/test/java/org/apache/druid/query/aggregation/distinctcount/DistinctCountTopNQueryTest.java
index 7e3690cc1cb6..b54c9af1b2f7 100644
--- a/extensions-contrib/distinctcount/src/test/java/org/apache/druid/query/aggregation/distinctcount/DistinctCountTopNQueryTest.java
+++ b/extensions-contrib/distinctcount/src/test/java/org/apache/druid/query/aggregation/distinctcount/DistinctCountTopNQueryTest.java
@@ -60,7 +60,7 @@ public void setup()
   {
     pool = new CloseableStupidPool<>(
         "TopNQueryEngine-bufferPool",
-        new Supplier<ByteBuffer>()
+        new Supplier<>()
         {
           @Override
           public ByteBuffer get()
diff --git a/extensions-contrib/druid-deltalake-extensions/src/main/java/org/apache/druid/delta/input/DeltaInputSourceReader.java b/extensions-contrib/druid-deltalake-extensions/src/main/java/org/apache/druid/delta/input/DeltaInputSourceReader.java
index 9ac7c253ef35..672a126f7c46 100644
--- a/extensions-contrib/druid-deltalake-extensions/src/main/java/org/apache/druid/delta/input/DeltaInputSourceReader.java
+++ b/extensions-contrib/druid-deltalake-extensions/src/main/java/org/apache/druid/delta/input/DeltaInputSourceReader.java
@@ -68,7 +68,7 @@ public CloseableIterator<InputRowListPlusRawValues> sample()
   {
 
     CloseableIterator<InputRow> inner = read();
-    return new CloseableIterator<InputRowListPlusRawValues>()
+    return new CloseableIterator<>()
     {
       @Override
       public void close() throws IOException
diff --git a/extensions-contrib/kafka-emitter/src/test/java/org/apache/druid/emitter/kafka/KafkaEmitterConfigTest.java b/extensions-contrib/kafka-emitter/src/test/java/org/apache/druid/emitter/kafka/KafkaEmitterConfigTest.java
index 24b743a06611..0d5c5e312e84 100644
--- a/extensions-contrib/kafka-emitter/src/test/java/org/apache/druid/emitter/kafka/KafkaEmitterConfigTest.java
+++ b/extensions-contrib/kafka-emitter/src/test/java/org/apache/druid/emitter/kafka/KafkaEmitterConfigTest.java
@@ -91,7 +91,7 @@ public void testSerDeserKafkaEmitterConfigNullRequestTopic() throws IOException
   @Test
   public void testSerDeserKafkaEmitterConfigNullMetricsTopic() throws IOException
   {
-    Set<KafkaEmitterConfig.EventType> eventTypeSet = new HashSet<KafkaEmitterConfig.EventType>();
+    Set<KafkaEmitterConfig.EventType> eventTypeSet = new HashSet<>();
     eventTypeSet.add(KafkaEmitterConfig.EventType.SEGMENT_METADATA);
     KafkaEmitterConfig kafkaEmitterConfig = new KafkaEmitterConfig(
         "hostname",
diff --git a/extensions-contrib/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/KubernetesTaskRunnerTest.java b/extensions-contrib/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/KubernetesTaskRunnerTest.java
index a6c01ee306a5..756a4ad5a548 100644
--- a/extensions-contrib/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/KubernetesTaskRunnerTest.java
+++ b/extensions-contrib/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/KubernetesTaskRunnerTest.java
@@ -603,7 +603,7 @@ public TaskLocation getLocation()
 
     runner.tasks.put(task.getId(), workItem);
 
-    ListenableFuture<InputStream> future = new ListenableFuture<InputStream>()
+    ListenableFuture<InputStream> future = new ListenableFuture<>()
     {
       @Override
       public void addListener(Runnable runnable, Executor executor)
diff --git a/extensions-contrib/materialized-view-selection/src/main/java/org/apache/druid/query/materializedview/DerivativeDataSourceManager.java b/extensions-contrib/materialized-view-selection/src/main/java/org/apache/druid/query/materializedview/DerivativeDataSourceManager.java
index 3cff0da0075a..82ad698d8bda 100644
--- a/extensions-contrib/materialized-view-selection/src/main/java/org/apache/druid/query/materializedview/DerivativeDataSourceManager.java
+++ b/extensions-contrib/materialized-view-selection/src/main/java/org/apache/druid/query/materializedview/DerivativeDataSourceManager.java
@@ -219,7 +219,7 @@ private void updateDerivatives()
   private long getAvgSizePerGranularity(String datasource)
   {
     return connector.retryWithHandle(
-        new HandleCallback<Long>() {
+        new HandleCallback<>() {
           Set<Interval> intervals = new HashSet<>();
           long totalSize = 0;
           @Override
diff --git a/extensions-contrib/materialized-view-selection/src/main/java/org/apache/druid/query/materializedview/MaterializedViewUtils.java b/extensions-contrib/materialized-view-selection/src/main/java/org/apache/druid/query/materializedview/MaterializedViewUtils.java
index f28d67a62629..7c39b8fdc447 100644
--- a/extensions-contrib/materialized-view-selection/src/main/java/org/apache/druid/query/materializedview/MaterializedViewUtils.java
+++ b/extensions-contrib/materialized-view-selection/src/main/java/org/apache/druid/query/materializedview/MaterializedViewUtils.java
@@ -47,7 +47,7 @@ public class MaterializedViewUtils
    */
   public static Set<String> getRequiredFields(Query query)
   {
-    Set<String> dimsInFilter = null == query.getFilter() ? new HashSet<String>() : query.getFilter().getRequiredColumns();
+    Set<String> dimsInFilter = null == query.getFilter() ? new HashSet<>() : query.getFilter().getRequiredColumns();
     Set<String> dimensions = new HashSet<>(dimsInFilter);
 
     if (query instanceof TopNQuery) {
diff --git a/extensions-contrib/moving-average-query/src/main/java/org/apache/druid/query/movingaverage/MovingAverageQueryToolChest.java b/extensions-contrib/moving-average-query/src/main/java/org/apache/druid/query/movingaverage/MovingAverageQueryToolChest.java
index 8d28faaa251b..19492c4a0d51 100644
--- a/extensions-contrib/moving-average-query/src/main/java/org/apache/druid/query/movingaverage/MovingAverageQueryToolChest.java
+++ b/extensions-contrib/moving-average-query/src/main/java/org/apache/druid/query/movingaverage/MovingAverageQueryToolChest.java
@@ -84,7 +84,7 @@ public QueryMetrics<? super MovingAverageQuery> makeMetrics(MovingAverageQuery q
   public Function<Row, Row> makePostComputeManipulatorFn(MovingAverageQuery query, MetricManipulationFn fn)
   {
 
-    return new Function<Row, Row>()
+    return new Function<>()
     {
 
       @Override
@@ -122,9 +122,7 @@ public Row apply(Row result)
   @Override
   public TypeReference<Row> getResultTypeReference()
   {
-    return new TypeReference<Row>()
-    {
-    };
+    return new TypeReference<>() {};
   }
 
   @Override
diff --git a/extensions-contrib/moving-average-query/src/test/java/org/apache/druid/query/movingaverage/MovingAverageQueryTest.java b/extensions-contrib/moving-average-query/src/test/java/org/apache/druid/query/movingaverage/MovingAverageQueryTest.java
index 68668c9b3aa3..d86b6913cfb0 100644
--- a/extensions-contrib/moving-average-query/src/test/java/org/apache/druid/query/movingaverage/MovingAverageQueryTest.java
+++ b/extensions-contrib/moving-average-query/src/test/java/org/apache/druid/query/movingaverage/MovingAverageQueryTest.java
@@ -234,9 +234,7 @@ private Class<?> getExpectedQueryType()
 
   private TypeReference<List<MapBasedRow>> getExpectedResultType()
   {
-    return new TypeReference<List<MapBasedRow>>()
-    {
-    };
+    return new TypeReference<>() {};
   }
 
   /**
diff --git a/extensions-contrib/moving-average-query/src/test/java/org/apache/druid/query/movingaverage/averagers/BaseAveragerFactoryTest.java b/extensions-contrib/moving-average-query/src/test/java/org/apache/druid/query/movingaverage/averagers/BaseAveragerFactoryTest.java
index 30d97c81eb30..6c43e2aa7f62 100644
--- a/extensions-contrib/moving-average-query/src/test/java/org/apache/druid/query/movingaverage/averagers/BaseAveragerFactoryTest.java
+++ b/extensions-contrib/moving-average-query/src/test/java/org/apache/druid/query/movingaverage/averagers/BaseAveragerFactoryTest.java
@@ -33,7 +33,7 @@ public class BaseAveragerFactoryTest
   @Before
   public void setup()
   {
-    fac = new BaseAveragerFactory<Long, Long>("test", 5, "field", 1)
+    fac = new BaseAveragerFactory<>("test", 5, "field", 1)
     {
       @Override
       public Averager<Long> createAverager()
diff --git a/extensions-contrib/rabbit-stream-indexing-service/src/main/java/org/apache/druid/indexing/rabbitstream/IncrementalPublishingRabbitStreamIndexTaskRunner.java b/extensions-contrib/rabbit-stream-indexing-service/src/main/java/org/apache/druid/indexing/rabbitstream/IncrementalPublishingRabbitStreamIndexTaskRunner.java
index 9265d70f992c..75663d23063f 100644
--- a/extensions-contrib/rabbit-stream-indexing-service/src/main/java/org/apache/druid/indexing/rabbitstream/IncrementalPublishingRabbitStreamIndexTaskRunner.java
+++ b/extensions-contrib/rabbit-stream-indexing-service/src/main/java/org/apache/druid/indexing/rabbitstream/IncrementalPublishingRabbitStreamIndexTaskRunner.java
@@ -135,8 +135,7 @@ protected boolean isEndOfShard(Long seqNum)
   @Override
   public TypeReference<List<SequenceMetadata<String, Long>>> getSequenceMetadataTypeReference()
   {
-    return new TypeReference<List<SequenceMetadata<String, Long>>>() {
-    };
+    return new TypeReference<>() {};
   }
 
   @Nullable
@@ -149,8 +148,8 @@ protected TreeMap<Integer, Map<String, Long>> getCheckPointsFromContext(
       log.debug("Got checkpoints from task context[%s].", checkpointsString);
       return toolbox.getJsonMapper().readValue(
           checkpointsString,
-          new TypeReference<TreeMap<Integer, Map<String, Long>>>() {
-          });
+          new TypeReference<>() {}
+      );
     } else {
       return null;
     }
diff --git a/extensions-contrib/rabbit-stream-indexing-service/src/main/java/org/apache/druid/indexing/rabbitstream/RabbitStreamRecordSupplier.java b/extensions-contrib/rabbit-stream-indexing-service/src/main/java/org/apache/druid/indexing/rabbitstream/RabbitStreamRecordSupplier.java
index 7488f76dfd92..56d7cf44ea1d 100644
--- a/extensions-contrib/rabbit-stream-indexing-service/src/main/java/org/apache/druid/indexing/rabbitstream/RabbitStreamRecordSupplier.java
+++ b/extensions-contrib/rabbit-stream-indexing-service/src/main/java/org/apache/druid/indexing/rabbitstream/RabbitStreamRecordSupplier.java
@@ -112,7 +112,7 @@ public RabbitStreamRecordSupplier(
     // stateSemaphore protects isRunning and consumers
     stateSemaphore = new Semaphore(1, true);
     isRunning = false;
-    consumers = new ArrayList<Consumer>();
+    consumers = new ArrayList<>();
 
     this.password = null;
     this.username = null;
@@ -238,7 +238,7 @@ private void removeOldAssignments(Set<StreamPartition<String>> streamPartitionst
     Iterator<Map.Entry<String, ConsumerBuilder>> streamBuilderIterator = streamBuilders.entrySet().iterator();
     while (streamBuilderIterator.hasNext()) {
       Map.Entry<String, ConsumerBuilder> entry = streamBuilderIterator.next();
-      StreamPartition<String> comparitor = new StreamPartition<String>(getStreamFromSubstream(entry.getKey()), entry.getKey());
+      StreamPartition<String> comparitor = new StreamPartition<>(getStreamFromSubstream(entry.getKey()), entry.getKey());
       if (!streamPartitionstoKeep.contains(comparitor)) {
         streamBuilderIterator.remove();
       }
@@ -247,7 +247,7 @@ private void removeOldAssignments(Set<StreamPartition<String>> streamPartitionst
     Iterator<Map.Entry<String, OffsetSpecification>> offsetIterator = offsetMap.entrySet().iterator();
     while (offsetIterator.hasNext()) {
       Map.Entry<String, OffsetSpecification> entry = offsetIterator.next();
-      StreamPartition<String> comparitor = new StreamPartition<String>(getStreamFromSubstream(entry.getKey()), entry.getKey());
+      StreamPartition<String> comparitor = new StreamPartition<>(getStreamFromSubstream(entry.getKey()), entry.getKey());
       if (!streamPartitionstoKeep.contains(comparitor)) {
         offsetIterator.remove();
       }
diff --git a/extensions-contrib/rabbit-stream-indexing-service/src/main/java/org/apache/druid/indexing/rabbitstream/supervisor/RabbitStreamSupervisor.java b/extensions-contrib/rabbit-stream-indexing-service/src/main/java/org/apache/druid/indexing/rabbitstream/supervisor/RabbitStreamSupervisor.java
index 5e9d3c3d2c6a..9ce9bd331cfc 100644
--- a/extensions-contrib/rabbit-stream-indexing-service/src/main/java/org/apache/druid/indexing/rabbitstream/supervisor/RabbitStreamSupervisor.java
+++ b/extensions-contrib/rabbit-stream-indexing-service/src/main/java/org/apache/druid/indexing/rabbitstream/supervisor/RabbitStreamSupervisor.java
@@ -83,8 +83,7 @@
  */
 public class RabbitStreamSupervisor extends SeekableStreamSupervisor<String, Long, ByteEntity>
 {
-  public static final TypeReference<TreeMap<Integer, Map<String, Long>>> CHECKPOINTS_TYPE_REF = new TypeReference<TreeMap<Integer, Map<String, Long>>>() {
-  };
+  public static final TypeReference<TreeMap<Integer, Map<String, Long>>> CHECKPOINTS_TYPE_REF = new TypeReference<>() {};
 
   private static final EmittingLogger log = new EmittingLogger(RabbitStreamSupervisor.class);
   private static final Long NOT_SET = -1L;
diff --git a/extensions-contrib/spectator-histogram/src/test/java/org/apache/druid/spectator/histogram/SpectatorHistogramTest.java b/extensions-contrib/spectator-histogram/src/test/java/org/apache/druid/spectator/histogram/SpectatorHistogramTest.java
index 77b81f398477..ac0d59189dbd 100644
--- a/extensions-contrib/spectator-histogram/src/test/java/org/apache/druid/spectator/histogram/SpectatorHistogramTest.java
+++ b/extensions-contrib/spectator-histogram/src/test/java/org/apache/druid/spectator/histogram/SpectatorHistogramTest.java
@@ -281,7 +281,7 @@ public void testSerializeAndDeserialize() throws IOException
     histogram.add(32, 4294967295L);
     histogram.add(33, 4294967296L);
 
-    ColumnValueSelector<SpectatorHistogram> selector = new ColumnValueSelector<SpectatorHistogram>()
+    ColumnValueSelector<SpectatorHistogram> selector = new ColumnValueSelector<>()
     {
       private int callCount = 0;
 
diff --git a/extensions-contrib/sqlserver-metadata-storage/src/main/java/org/apache/druid/metadata/storage/sqlserver/SQLServerConnector.java b/extensions-contrib/sqlserver-metadata-storage/src/main/java/org/apache/druid/metadata/storage/sqlserver/SQLServerConnector.java
index 42787a0733cd..7b3c94f49926 100644
--- a/extensions-contrib/sqlserver-metadata-storage/src/main/java/org/apache/druid/metadata/storage/sqlserver/SQLServerConnector.java
+++ b/extensions-contrib/sqlserver-metadata-storage/src/main/java/org/apache/druid/metadata/storage/sqlserver/SQLServerConnector.java
@@ -240,7 +240,7 @@ public Void insertOrUpdate(
       final byte[] value)
   {
     return getDBI().withHandle(
-        new HandleCallback<Void>()
+        new HandleCallback<>()
         {
           @Override
           public Void withHandle(Handle handle)
diff --git a/extensions-contrib/thrift-extensions/src/main/java/org/apache/druid/data/input/thrift/ThriftDeserialization.java b/extensions-contrib/thrift-extensions/src/main/java/org/apache/druid/data/input/thrift/ThriftDeserialization.java
index 90b802788499..956d9f3c8ce7 100644
--- a/extensions-contrib/thrift-extensions/src/main/java/org/apache/druid/data/input/thrift/ThriftDeserialization.java
+++ b/extensions-contrib/thrift-extensions/src/main/java/org/apache/druid/data/input/thrift/ThriftDeserialization.java
@@ -39,7 +39,7 @@ public class ThriftDeserialization
   private static final Logger log = LoggerFactory.getLogger(ThriftDeserialization.class);
 
 
-  private static final ThreadLocal<TDeserializer> DESERIALIZER_COMPACT = new ThreadLocal<TDeserializer>()
+  private static final ThreadLocal<TDeserializer> DESERIALIZER_COMPACT = new ThreadLocal<>()
   {
     @Override
     protected TDeserializer initialValue()
@@ -48,7 +48,7 @@ protected TDeserializer initialValue()
     }
   };
 
-  private static final ThreadLocal<TDeserializer> DESERIALIZER_BINARY = new ThreadLocal<TDeserializer>()
+  private static final ThreadLocal<TDeserializer> DESERIALIZER_BINARY = new ThreadLocal<>()
   {
     @Override
     protected TDeserializer initialValue()
@@ -57,7 +57,7 @@ protected TDeserializer initialValue()
     }
   };
 
-  private static final ThreadLocal<TDeserializer> DESERIALIZER_JSON = new ThreadLocal<TDeserializer>()
+  private static final ThreadLocal<TDeserializer> DESERIALIZER_JSON = new ThreadLocal<>()
   {
     @Override
     protected TDeserializer initialValue()
@@ -66,7 +66,7 @@ protected TDeserializer initialValue()
     }
   };
 
-  public static final ThreadLocal<TSerializer> SERIALIZER_SIMPLE_JSON = new ThreadLocal<TSerializer>()
+  public static final ThreadLocal<TSerializer> SERIALIZER_SIMPLE_JSON = new ThreadLocal<>()
   {
     @Override
     protected TSerializer initialValue()
diff --git a/extensions-core/avro-extensions/src/main/java/org/apache/druid/data/input/avro/AvroOCFReader.java b/extensions-core/avro-extensions/src/main/java/org/apache/druid/data/input/avro/AvroOCFReader.java
index 012e2e801a0d..a071f38abb76 100644
--- a/extensions-core/avro-extensions/src/main/java/org/apache/druid/data/input/avro/AvroOCFReader.java
+++ b/extensions-core/avro-extensions/src/main/java/org/apache/druid/data/input/avro/AvroOCFReader.java
@@ -92,7 +92,7 @@ protected CloseableIterator<GenericRecord> intermediateRowIterator() throws IOEx
       datumReader.setExpected(readerSchema);
       closer.register(dataFileReader);
 
-      return new CloseableIterator<GenericRecord>()
+      return new CloseableIterator<>()
       {
         @Override
         public boolean hasNext()
diff --git a/extensions-core/avro-extensions/src/test/java/org/apache/druid/data/input/AvroStreamInputRowParserTest.java b/extensions-core/avro-extensions/src/test/java/org/apache/druid/data/input/AvroStreamInputRowParserTest.java
index f0cfd372cb84..a7ad60b13064 100644
--- a/extensions-core/avro-extensions/src/test/java/org/apache/druid/data/input/AvroStreamInputRowParserTest.java
+++ b/extensions-core/avro-extensions/src/test/java/org/apache/druid/data/input/AvroStreamInputRowParserTest.java
@@ -136,7 +136,7 @@ public class AvroStreamInputRowParserTest
   private static final List<CharSequence> SOME_STRING_ARRAY_VALUE = Arrays.asList("8", "4", "2", "1", null);
   private static final List<Integer> SOME_INT_ARRAY_VALUE = Arrays.asList(1, 2, 4, 8);
   static final Map<CharSequence, Integer> SOME_INT_VALUE_MAP_VALUE = Maps.asMap(
-      new HashSet<>(Arrays.asList("8", "2", "4", "1")), new Function<CharSequence, Integer>()
+      new HashSet<>(Arrays.asList("8", "2", "4", "1")), new Function<>()
       {
         @Nonnull
         @Override
@@ -147,7 +147,7 @@ public Integer apply(@Nullable CharSequence input)
       }
   );
   static final Map<CharSequence, CharSequence> SOME_STRING_VALUE_MAP_VALUE = Maps.asMap(
-      new HashSet<>(Arrays.asList("8", "2", "4", "1")), new Function<CharSequence, CharSequence>()
+      new HashSet<>(Arrays.asList("8", "2", "4", "1")), new Function<>()
       {
         @Nonnull
         @Override
@@ -429,7 +429,7 @@ static void assertInputRowCorrect(InputRow inputRow, List<String> expectedDimens
                     .on(",")
                     .withKeyValueSeparator("=")
                     .split(BRACES_AND_SPACE.matcher(inputRow.getDimension("someIntValueMap").get(0)).replaceAll("")),
-                new Function<String, Integer>()
+                new Function<>()
                 {
                   @Nullable
                   @Override
diff --git a/extensions-core/avro-extensions/src/test/java/org/apache/druid/data/input/avro/AvroOCFInputFormatTest.java b/extensions-core/avro-extensions/src/test/java/org/apache/druid/data/input/avro/AvroOCFInputFormatTest.java
index ceb394b0b3b3..c5caaa387ca2 100644
--- a/extensions-core/avro-extensions/src/test/java/org/apache/druid/data/input/avro/AvroOCFInputFormatTest.java
+++ b/extensions-core/avro-extensions/src/test/java/org/apache/druid/data/input/avro/AvroOCFInputFormatTest.java
@@ -87,9 +87,7 @@ public void testSerdeNonDefaults() throws Exception
                        + "  ]\n"
                        + "}";
 
-    TypeReference<Map<String, Object>> typeRef = new TypeReference<Map<String, Object>>()
-    {
-    };
+    TypeReference<Map<String, Object>> typeRef = new TypeReference<>() {};
     final Map<String, Object> readerSchema = jsonMapper.readValue(schemaStr, typeRef);
     AvroOCFInputFormat inputFormat = new AvroOCFInputFormat(
         jsonMapper,
diff --git a/extensions-core/avro-extensions/src/test/java/org/apache/druid/data/input/avro/AvroOCFReaderTest.java b/extensions-core/avro-extensions/src/test/java/org/apache/druid/data/input/avro/AvroOCFReaderTest.java
index b00c1e4ad7a1..9ee52c2ce43d 100644
--- a/extensions-core/avro-extensions/src/test/java/org/apache/druid/data/input/avro/AvroOCFReaderTest.java
+++ b/extensions-core/avro-extensions/src/test/java/org/apache/druid/data/input/avro/AvroOCFReaderTest.java
@@ -84,9 +84,7 @@ public void testParseWithReaderSchema() throws Exception
                        + "  ]\n"
                        + "}";
 
-    TypeReference<Map<String, Object>> typeRef = new TypeReference<Map<String, Object>>()
-    {
-    };
+    TypeReference<Map<String, Object>> typeRef = new TypeReference<>() {};
     final Map<String, Object> readerSchema = mapper.readValue(schemaStr, typeRef);
 
     final InputEntityReader reader = createReader(mapper, readerSchema);
@@ -114,9 +112,7 @@ public void testParseWithReaderSchemaAlias() throws Exception
                        + "  ]\n"
                        + "}";
 
-    TypeReference<Map<String, Object>> typeRef = new TypeReference<Map<String, Object>>()
-    {
-    };
+    TypeReference<Map<String, Object>> typeRef = new TypeReference<>() {};
     final Map<String, Object> readerSchema = mapper.readValue(schemaStr, typeRef);
 
     final InputEntityReader reader = createReader(mapper, readerSchema);
diff --git a/extensions-core/azure-extensions/src/main/java/org/apache/druid/storage/azure/output/AzureStorageConnector.java b/extensions-core/azure-extensions/src/main/java/org/apache/druid/storage/azure/output/AzureStorageConnector.java
index 2d6276c5a6d8..bc762ebea2cc 100644
--- a/extensions-core/azure-extensions/src/main/java/org/apache/druid/storage/azure/output/AzureStorageConnector.java
+++ b/extensions-core/azure-extensions/src/main/java/org/apache/druid/storage/azure/output/AzureStorageConnector.java
@@ -86,7 +86,7 @@ public ChunkingStorageConnectorParameters<AzureInputRange> buildInputParams(Stri
         objectPath(path)
     ));
     parameters.objectOpenFunction(
-        new ObjectOpenFunction<AzureInputRange>()
+        new ObjectOpenFunction<>()
         {
           @Override
           public InputStream open(AzureInputRange inputRange) throws IOException
diff --git a/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/kll/KllDoublesSketchAggregatorFactory.java b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/kll/KllDoublesSketchAggregatorFactory.java
index 267953e23647..8ceedd6c5980 100644
--- a/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/kll/KllDoublesSketchAggregatorFactory.java
+++ b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/kll/KllDoublesSketchAggregatorFactory.java
@@ -158,7 +158,7 @@ public VectorAggregator factorizeVector(VectorColumnSelectorFactory selectorFact
   {
     return ColumnProcessors.makeVectorProcessor(
         getFieldName(),
-        new VectorColumnProcessorFactory<VectorAggregator>()
+        new VectorColumnProcessorFactory<>()
         {
           @Override
           public VectorAggregator makeSingleValueDimensionProcessor(
diff --git a/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/kll/KllDoublesSketchMergeAggregatorFactory.java b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/kll/KllDoublesSketchMergeAggregatorFactory.java
index dbcd34b26c6c..5598a9646248 100644
--- a/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/kll/KllDoublesSketchMergeAggregatorFactory.java
+++ b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/kll/KllDoublesSketchMergeAggregatorFactory.java
@@ -59,7 +59,7 @@ public Aggregator factorize(final ColumnSelectorFactory metricFactory)
   {
     final ColumnValueSelector<KllDoublesSketch> selector = metricFactory.makeColumnValueSelector(getFieldName());
     if (selector instanceof NilColumnValueSelector) {
-      return new KllSketchNoOpAggregator<KllDoublesSketch>(KllDoublesSketchOperations.EMPTY_SKETCH);
+      return new KllSketchNoOpAggregator<>(KllDoublesSketchOperations.EMPTY_SKETCH);
     }
     return getMergeAggregator(selector);
   }
@@ -69,7 +69,7 @@ public BufferAggregator factorizeBuffered(final ColumnSelectorFactory metricFact
   {
     final ColumnValueSelector<KllDoublesSketch> selector = metricFactory.makeColumnValueSelector(getFieldName());
     if (selector instanceof NilColumnValueSelector) {
-      return new KllSketchNoOpBufferAggregator<KllDoublesSketch>(KllDoublesSketchOperations.EMPTY_SKETCH);
+      return new KllSketchNoOpBufferAggregator<>(KllDoublesSketchOperations.EMPTY_SKETCH);
     }
     return getMergeBufferAggregator(selector);
   }
diff --git a/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/kll/KllFloatsSketchAggregatorFactory.java b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/kll/KllFloatsSketchAggregatorFactory.java
index bdd672ab1257..e60d2541d568 100644
--- a/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/kll/KllFloatsSketchAggregatorFactory.java
+++ b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/kll/KllFloatsSketchAggregatorFactory.java
@@ -158,7 +158,7 @@ public VectorAggregator factorizeVector(VectorColumnSelectorFactory selectorFact
   {
     return ColumnProcessors.makeVectorProcessor(
         getFieldName(),
-        new VectorColumnProcessorFactory<VectorAggregator>()
+        new VectorColumnProcessorFactory<>()
         {
           @Override
           public VectorAggregator makeSingleValueDimensionProcessor(
diff --git a/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/kll/KllFloatsSketchMergeAggregatorFactory.java b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/kll/KllFloatsSketchMergeAggregatorFactory.java
index e1b0c2d6244c..c1b470ea1739 100644
--- a/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/kll/KllFloatsSketchMergeAggregatorFactory.java
+++ b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/kll/KllFloatsSketchMergeAggregatorFactory.java
@@ -59,7 +59,7 @@ public Aggregator factorize(final ColumnSelectorFactory metricFactory)
   {
     final ColumnValueSelector<KllFloatsSketch> selector = metricFactory.makeColumnValueSelector(getFieldName());
     if (selector instanceof NilColumnValueSelector) {
-      return new KllSketchNoOpAggregator<KllFloatsSketch>(KllFloatsSketchOperations.EMPTY_SKETCH);
+      return new KllSketchNoOpAggregator<>(KllFloatsSketchOperations.EMPTY_SKETCH);
     }
     return getMergeAggregator(selector);
   }
@@ -69,7 +69,7 @@ public BufferAggregator factorizeBuffered(final ColumnSelectorFactory metricFact
   {
     final ColumnValueSelector<KllFloatsSketch> selector = metricFactory.makeColumnValueSelector(getFieldName());
     if (selector instanceof NilColumnValueSelector) {
-      return new KllSketchNoOpBufferAggregator<KllFloatsSketch>(KllFloatsSketchOperations.EMPTY_SKETCH);
+      return new KllSketchNoOpBufferAggregator<>(KllFloatsSketchOperations.EMPTY_SKETCH);
     }
     return getMergeBufferAggregator(selector);
   }
diff --git a/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/kll/KllSketchAggregatorFactory.java b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/kll/KllSketchAggregatorFactory.java
index 04b6d2d23031..98b46511f062 100644
--- a/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/kll/KllSketchAggregatorFactory.java
+++ b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/kll/KllSketchAggregatorFactory.java
@@ -80,13 +80,13 @@ public Aggregator factorize(final ColumnSelectorFactory metricFactory)
         && metricFactory.getColumnCapabilities(fieldName).isNumeric()) {
       final ColumnValueSelector<ValueType> selector = metricFactory.makeColumnValueSelector(fieldName);
       if (selector instanceof NilColumnValueSelector) {
-        return new KllSketchNoOpAggregator<SketchType>(getEmptySketch());
+        return new KllSketchNoOpAggregator<>(getEmptySketch());
       }
       return getBuildAggregator(selector);
     }
     final ColumnValueSelector<SketchType> selector = metricFactory.makeColumnValueSelector(fieldName);
     if (selector instanceof NilColumnValueSelector) {
-      return new KllSketchNoOpAggregator<SketchType>(getEmptySketch());
+      return new KllSketchNoOpAggregator<>(getEmptySketch());
     }
     return getMergeAggregator(selector);
   }
@@ -98,13 +98,13 @@ public BufferAggregator factorizeBuffered(final ColumnSelectorFactory metricFact
         && metricFactory.getColumnCapabilities(fieldName).isNumeric()) {
       final ColumnValueSelector<ValueType> selector = metricFactory.makeColumnValueSelector(fieldName);
       if (selector instanceof NilColumnValueSelector) {
-        return new KllSketchNoOpBufferAggregator<SketchType>(getEmptySketch());
+        return new KllSketchNoOpBufferAggregator<>(getEmptySketch());
       }
       return getBuildBufferAggregator(selector);
     }
     final ColumnValueSelector<SketchType> selector = metricFactory.makeColumnValueSelector(fieldName);
     if (selector instanceof NilColumnValueSelector) {
-      return new KllSketchNoOpBufferAggregator<SketchType>(getEmptySketch());
+      return new KllSketchNoOpBufferAggregator<>(getEmptySketch());
     }
     return getMergeBufferAggregator(selector);
   }
diff --git a/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/kll/KllSketchMergeAggregatorFactory.java b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/kll/KllSketchMergeAggregatorFactory.java
index 86b9b507e0ae..9e9d2a98d34a 100644
--- a/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/kll/KllSketchMergeAggregatorFactory.java
+++ b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/kll/KllSketchMergeAggregatorFactory.java
@@ -53,7 +53,7 @@ public Aggregator factorize(final ColumnSelectorFactory metricFactory)
   {
     final ColumnValueSelector<SketchType> selector = metricFactory.makeColumnValueSelector(getFieldName());
     if (selector instanceof NilColumnValueSelector) {
-      return new KllSketchNoOpAggregator<SketchType>(getEmptySketch());
+      return new KllSketchNoOpAggregator<>(getEmptySketch());
     }
     return getMergeAggregator(selector);
   }
@@ -63,7 +63,7 @@ public BufferAggregator factorizeBuffered(final ColumnSelectorFactory metricFact
   {
     final ColumnValueSelector<SketchType> selector = metricFactory.makeColumnValueSelector(getFieldName());
     if (selector instanceof NilColumnValueSelector) {
-      return new KllSketchNoOpBufferAggregator<SketchType>(getEmptySketch());
+      return new KllSketchNoOpBufferAggregator<>(getEmptySketch());
     }
     return getMergeBufferAggregator(selector);
   }
diff --git a/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/quantiles/DoublesSketchAggregatorFactory.java b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/quantiles/DoublesSketchAggregatorFactory.java
index acdef51178fd..2d8751515426 100644
--- a/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/quantiles/DoublesSketchAggregatorFactory.java
+++ b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/quantiles/DoublesSketchAggregatorFactory.java
@@ -170,7 +170,7 @@ public VectorAggregator factorizeVector(VectorColumnSelectorFactory selectorFact
   {
     return ColumnProcessors.makeVectorProcessor(
         fieldName,
-        new VectorColumnProcessorFactory<VectorAggregator>()
+        new VectorColumnProcessorFactory<>()
         {
           @Override
           public VectorAggregator makeSingleValueDimensionProcessor(
diff --git a/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/theta/SketchHolder.java b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/theta/SketchHolder.java
index a2445590ecb6..ab8abaf34213 100644
--- a/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/theta/SketchHolder.java
+++ b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/theta/SketchHolder.java
@@ -52,7 +52,7 @@ public class SketchHolder
   );
 
   public static final Comparator<Object> COMPARATOR = Ordering.from(
-      new Comparator<Object>()
+      new Comparator<>()
       {
         @Override
         public int compare(Object o1, Object o2)
@@ -81,7 +81,7 @@ public int compare(Object o1, Object o2)
       }
   ).nullsFirst();
 
-  private static final Comparator<Sketch> SKETCH_COMPARATOR = new Comparator<Sketch>()
+  private static final Comparator<Sketch> SKETCH_COMPARATOR = new Comparator<>()
   {
     @Override
     public int compare(Sketch o1, Sketch o2)
@@ -90,7 +90,7 @@ public int compare(Sketch o1, Sketch o2)
     }
   };
 
-  private static final Comparator<Memory> MEMORY_COMPARATOR = new Comparator<Memory>()
+  private static final Comparator<Memory> MEMORY_COMPARATOR = new Comparator<>()
   {
     @SuppressWarnings("SubtractionInCompareTo")
     @Override
diff --git a/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchBuildAggregator.java b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchBuildAggregator.java
index 11ad6b218e1e..d0cde7c85f5c 100644
--- a/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchBuildAggregator.java
+++ b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchBuildAggregator.java
@@ -50,7 +50,7 @@ public class ArrayOfDoublesSketchBuildAggregator implements Aggregator
   private final int nominalEntries;
   private final boolean canLookupUtf8;
   private final boolean canCacheById;
-  private final LinkedHashMap<Integer, Object> stringCache = new LinkedHashMap<Integer, Object>()
+  private final LinkedHashMap<Integer, Object> stringCache = new LinkedHashMap<>()
   {
     @Override
     protected boolean removeEldestEntry(Map.Entry eldest)
diff --git a/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchBuildBufferAggregator.java b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchBuildBufferAggregator.java
index b925220c89fd..8acaef908191 100644
--- a/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchBuildBufferAggregator.java
+++ b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchBuildBufferAggregator.java
@@ -53,7 +53,7 @@ public class ArrayOfDoublesSketchBuildBufferAggregator implements BufferAggregat
 
   private final boolean canLookupUtf8;
   private final boolean canCacheById;
-  private final LinkedHashMap<Integer, Object> stringCache = new LinkedHashMap<Integer, Object>()
+  private final LinkedHashMap<Integer, Object> stringCache = new LinkedHashMap<>()
   {
     @Override
     protected boolean removeEldestEntry(Map.Entry eldest)
diff --git a/extensions-core/datasketches/src/test/java/org/apache/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchAggregatorFactoryTest.java b/extensions-core/datasketches/src/test/java/org/apache/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchAggregatorFactoryTest.java
index d62c6c61ce7a..1009391c9574 100644
--- a/extensions-core/datasketches/src/test/java/org/apache/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchAggregatorFactoryTest.java
+++ b/extensions-core/datasketches/src/test/java/org/apache/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchAggregatorFactoryTest.java
@@ -56,7 +56,9 @@ public void makeAggregateCombiner()
     sketch2.update("b", new double[] {1});
     sketch2.update("c", new double[] {1});
 
-    TestObjectColumnSelector<ArrayOfDoublesSketch> selector = new TestObjectColumnSelector<ArrayOfDoublesSketch>(new ArrayOfDoublesSketch[] {sketch1, sketch2});
+    TestObjectColumnSelector<ArrayOfDoublesSketch> selector = new TestObjectColumnSelector<>(
+        new ArrayOfDoublesSketch[]{sketch1, sketch2}
+    );
 
     combiner.reset(selector);
     Assert.assertEquals(1, combiner.getObject().getEstimate(), 0);
diff --git a/extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/BasicAuthUtils.java b/extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/BasicAuthUtils.java
index 410fb679c61d..03aec3954e5a 100644
--- a/extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/BasicAuthUtils.java
+++ b/extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/BasicAuthUtils.java
@@ -63,34 +63,22 @@ public class BasicAuthUtils
       (throwable) -> throwable instanceof BasicSecurityDBResourceException;
 
   public static final TypeReference<Map<String, BasicAuthenticatorUser>> AUTHENTICATOR_USER_MAP_TYPE_REFERENCE =
-      new TypeReference<Map<String, BasicAuthenticatorUser>>()
-      {
-      };
+      new TypeReference<>() {};
 
   public static final TypeReference<Map<String, BasicAuthorizerUser>> AUTHORIZER_USER_MAP_TYPE_REFERENCE =
-      new TypeReference<Map<String, BasicAuthorizerUser>>()
-      {
-      };
+      new TypeReference<>() {};
 
   public static final TypeReference<Map<String, BasicAuthorizerGroupMapping>> AUTHORIZER_GROUP_MAPPING_MAP_TYPE_REFERENCE =
-      new TypeReference<Map<String, BasicAuthorizerGroupMapping>>()
-      {
-      };
+      new TypeReference<>() {};
 
   public static final TypeReference<Map<String, BasicAuthorizerRole>> AUTHORIZER_ROLE_MAP_TYPE_REFERENCE =
-      new TypeReference<Map<String, BasicAuthorizerRole>>()
-      {
-      };
+      new TypeReference<>() {};
 
   public static final TypeReference<UserAndRoleMap> AUTHORIZER_USER_AND_ROLE_MAP_TYPE_REFERENCE =
-      new TypeReference<UserAndRoleMap>()
-      {
-      };
+      new TypeReference<>() {};
 
   public static final TypeReference<GroupMappingAndRoleMap> AUTHORIZER_GROUP_MAPPING_AND_ROLE_MAP_TYPE_REFERENCE =
-      new TypeReference<GroupMappingAndRoleMap>()
-      {
-      };
+      new TypeReference<>() {};
 
   public static byte[] generateSalt()
   {
diff --git a/extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/authentication/db/updater/CoordinatorBasicAuthenticatorMetadataStorageUpdater.java b/extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/authentication/db/updater/CoordinatorBasicAuthenticatorMetadataStorageUpdater.java
index c0761c03ec21..bbebdf9e7282 100644
--- a/extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/authentication/db/updater/CoordinatorBasicAuthenticatorMetadataStorageUpdater.java
+++ b/extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/authentication/db/updater/CoordinatorBasicAuthenticatorMetadataStorageUpdater.java
@@ -168,7 +168,7 @@ public void start()
           exec,
           new Duration(commonCacheConfig.getPollingPeriod()),
           new Duration(commonCacheConfig.getPollingPeriod()),
-          new Callable<ScheduledExecutors.Signal>()
+          new Callable<>()
           {
             @Override
             public ScheduledExecutors.Signal call()
diff --git a/extensions-core/druid-basic-security/src/test/java/org/apache/druid/security/authentication/validator/LDAPCredentialsValidatorTest.java b/extensions-core/druid-basic-security/src/test/java/org/apache/druid/security/authentication/validator/LDAPCredentialsValidatorTest.java
index 7a1ae2cc917b..19e35b0f8e6e 100644
--- a/extensions-core/druid-basic-security/src/test/java/org/apache/druid/security/authentication/validator/LDAPCredentialsValidatorTest.java
+++ b/extensions-core/druid-basic-security/src/test/java/org/apache/druid/security/authentication/validator/LDAPCredentialsValidatorTest.java
@@ -114,7 +114,7 @@ public Context getInitialContext(Hashtable<?, ?> environment) throws NamingExcep
               ArgumentMatchers.eq(LDAP_CONFIG.getBaseDn()),
               ArgumentMatchers.eq(StringUtils.format(LDAP_CONFIG.getUserSearch(), encodedUsername)),
               ArgumentMatchers.any(SearchControls.class))
-      ).thenReturn(new NamingEnumeration<SearchResult>()
+      ).thenReturn(new NamingEnumeration<>()
       {
         @Override
         public SearchResult next()
diff --git a/extensions-core/druid-bloom-filter/src/test/java/org/apache/druid/query/aggregation/bloom/BloomFilterAggregatorTest.java b/extensions-core/druid-bloom-filter/src/test/java/org/apache/druid/query/aggregation/bloom/BloomFilterAggregatorTest.java
index 5888b7d13dde..d914e71ccac5 100644
--- a/extensions-core/druid-bloom-filter/src/test/java/org/apache/druid/query/aggregation/bloom/BloomFilterAggregatorTest.java
+++ b/extensions-core/druid-bloom-filter/src/test/java/org/apache/druid/query/aggregation/bloom/BloomFilterAggregatorTest.java
@@ -158,7 +158,7 @@ private static void createStringFilter(List<String[]> values, BloomKFilter filte
   private static List<String[]> dimensionValues(Object... values)
   {
     return Lists.transform(
-        Lists.newArrayList(values), new Function<Object, String[]>()
+        Lists.newArrayList(values), new Function<>()
         {
           @Nullable
           @Override
diff --git a/extensions-core/druid-catalog/src/main/java/org/apache/druid/catalog/storage/sql/SQLCatalogManager.java b/extensions-core/druid-catalog/src/main/java/org/apache/druid/catalog/storage/sql/SQLCatalogManager.java
index fa24bd825613..a2300fc7c404 100644
--- a/extensions-core/druid-catalog/src/main/java/org/apache/druid/catalog/storage/sql/SQLCatalogManager.java
+++ b/extensions-core/druid-catalog/src/main/java/org/apache/druid/catalog/storage/sql/SQLCatalogManager.java
@@ -142,7 +142,7 @@ public long create(TableMetadata table) throws DuplicateKeyException
   {
     try {
       return dbi.withHandle(
-          new HandleCallback<Long>()
+          new HandleCallback<>()
           {
             @Override
             public Long withHandle(Handle handle) throws DuplicateKeyException
@@ -197,7 +197,7 @@ public TableMetadata read(TableId id) throws NotFoundException
   {
     try {
       return dbi.withHandle(
-          new HandleCallback<TableMetadata>()
+          new HandleCallback<>()
           {
             @Override
             public TableMetadata withHandle(Handle handle) throws NotFoundException
@@ -248,7 +248,7 @@ public long replace(TableMetadata table) throws NotFoundException
   {
     try {
       final TableMetadata revised = dbi.withHandle(
-          new HandleCallback<TableMetadata>()
+          new HandleCallback<>()
           {
             @Override
             public TableMetadata withHandle(Handle handle) throws NotFoundException
@@ -293,7 +293,7 @@ public long update(TableMetadata table, long oldVersion) throws NotFoundExceptio
   {
     try {
       final TableMetadata revised = dbi.withHandle(
-          new HandleCallback<TableMetadata>()
+          new HandleCallback<>()
           {
             @Override
             public TableMetadata withHandle(Handle handle) throws NotFoundException
@@ -354,7 +354,7 @@ public long updateProperties(
   {
     try {
       final TableMetadata result = dbi.withHandle(
-          new HandleCallback<TableMetadata>()
+          new HandleCallback<>()
           {
             @Override
             public TableMetadata withHandle(Handle handle) throws CatalogException
@@ -446,7 +446,7 @@ public long updateColumns(
   {
     try {
       final TableMetadata result = dbi.withHandle(
-          new HandleCallback<TableMetadata>()
+          new HandleCallback<>()
           {
             @Override
             public TableMetadata withHandle(Handle handle) throws CatalogException
@@ -527,7 +527,7 @@ public TableMetadata withHandle(Handle handle) throws CatalogException
   public long markDeleting(TableId id)
   {
     return dbi.withHandle(
-        new HandleCallback<Long>()
+        new HandleCallback<>()
         {
           @Override
           public Long withHandle(Handle handle)
@@ -593,7 +593,7 @@ public Void withHandle(Handle handle) throws NotFoundException
   public List<TableId> allTablePaths()
   {
     return dbi.withHandle(
-        new HandleCallback<List<TableId>>()
+        new HandleCallback<>()
         {
           @Override
           public List<TableId> withHandle(Handle handle)
@@ -621,7 +621,7 @@ public List<TableId> withHandle(Handle handle)
   public List<String> tableNamesInSchema(String dbSchema)
   {
     return dbi.withHandle(
-        new HandleCallback<List<String>>()
+        new HandleCallback<>()
         {
           @Override
           public List<String> withHandle(Handle handle)
@@ -650,7 +650,7 @@ public List<String> withHandle(Handle handle)
   public List<TableMetadata> tablesInSchema(String dbSchema)
   {
     return dbi.withHandle(
-        new HandleCallback<List<TableMetadata>>()
+        new HandleCallback<>()
         {
           @Override
           public List<TableMetadata> withHandle(Handle handle)
@@ -762,8 +762,7 @@ private static TableSpec tableSpecFromBytes(
     );
   }
 
-  private static final TypeReference<Map<String, Object>> PROPERTIES_TYPE_REF =
-      new TypeReference<Map<String, Object>>() { };
+  private static final TypeReference<Map<String, Object>> PROPERTIES_TYPE_REF = new TypeReference<>() {};
 
   private static Map<String, Object> propertiesFromBytes(
       final ObjectMapper jsonMapper,
@@ -773,8 +772,7 @@ private static Map<String, Object> propertiesFromBytes(
     return fromBytes(jsonMapper, properties, PROPERTIES_TYPE_REF);
   }
 
-  private static final TypeReference<List<ColumnSpec>> COLUMNS_TYPE_REF =
-      new TypeReference<List<ColumnSpec>>() { };
+  private static final TypeReference<List<ColumnSpec>> COLUMNS_TYPE_REF = new TypeReference<>() {};
 
   private static List<ColumnSpec> columnsFromBytes(
       final ObjectMapper jsonMapper,
diff --git a/extensions-core/druid-catalog/src/main/java/org/apache/druid/catalog/sync/CatalogClient.java b/extensions-core/druid-catalog/src/main/java/org/apache/druid/catalog/sync/CatalogClient.java
index 5426f001a34b..21c198480908 100644
--- a/extensions-core/druid-catalog/src/main/java/org/apache/druid/catalog/sync/CatalogClient.java
+++ b/extensions-core/druid-catalog/src/main/java/org/apache/druid/catalog/sync/CatalogClient.java
@@ -59,13 +59,9 @@ public class CatalogClient implements CatalogSource
 {
   public static final String SCHEMA_SYNC_PATH = CatalogResource.ROOT_PATH + CatalogResource.SCHEMA_SYNC;
   public static final String TABLE_SYNC_PATH = CatalogResource.ROOT_PATH + CatalogResource.TABLE_SYNC;
-  private static final TypeReference<List<TableMetadata>> LIST_OF_TABLE_METADATA_TYPE = new TypeReference<List<TableMetadata>>()
-  {
-  };
+  private static final TypeReference<List<TableMetadata>> LIST_OF_TABLE_METADATA_TYPE = new TypeReference<>() {};
   // Not strictly needed as a TypeReference, but doing so makes the code simpler.
-  private static final TypeReference<TableMetadata> TABLE_METADATA_TYPE = new TypeReference<TableMetadata>()
-  {
-  };
+  private static final TypeReference<TableMetadata> TABLE_METADATA_TYPE = new TypeReference<>() {};
 
   private final DruidLeaderClient coordClient;
   private final ObjectMapper smileMapper;
diff --git a/extensions-core/druid-kerberos/src/main/java/org/apache/druid/security/kerberos/DruidKerberosAuthenticationHandler.java b/extensions-core/druid-kerberos/src/main/java/org/apache/druid/security/kerberos/DruidKerberosAuthenticationHandler.java
index add376761a92..16eb3b28e6b9 100644
--- a/extensions-core/druid-kerberos/src/main/java/org/apache/druid/security/kerberos/DruidKerberosAuthenticationHandler.java
+++ b/extensions-core/druid-kerberos/src/main/java/org/apache/druid/security/kerberos/DruidKerberosAuthenticationHandler.java
@@ -53,7 +53,7 @@ public class DruidKerberosAuthenticationHandler extends KerberosAuthenticationHa
   private String keytab;
   private GSSManager gssManager;
   private Subject serverSubject = new Subject();
-  private List<LoginContext> loginContexts = new ArrayList<LoginContext>();
+  private List<LoginContext> loginContexts = new ArrayList<>();
 
   @Override
   public void destroy()
@@ -120,7 +120,7 @@ public void init(Properties config) throws ServletException
         loginContexts.add(loginContext);
       }
       try {
-        gssManager = Subject.doAs(serverSubject, new PrivilegedExceptionAction<GSSManager>()
+        gssManager = Subject.doAs(serverSubject, new PrivilegedExceptionAction<>()
         {
 
           @Override
@@ -157,7 +157,7 @@ public AuthenticationToken authenticate(HttpServletRequest request, final HttpSe
       final byte[] clientToken = StringUtils.decodeBase64String(authorization);
       final String serverName = request.getServerName();
       try {
-        token = Subject.doAs(serverSubject, new PrivilegedExceptionAction<AuthenticationToken>()
+        token = Subject.doAs(serverSubject, new PrivilegedExceptionAction<>()
         {
 
           @Override
diff --git a/extensions-core/druid-kerberos/src/main/java/org/apache/druid/security/kerberos/KerberosAuthenticator.java b/extensions-core/druid-kerberos/src/main/java/org/apache/druid/security/kerberos/KerberosAuthenticator.java
index a58c7997aa48..3e0e04e215e7 100644
--- a/extensions-core/druid-kerberos/src/main/java/org/apache/druid/security/kerberos/KerberosAuthenticator.java
+++ b/extensions-core/druid-kerberos/src/main/java/org/apache/druid/security/kerberos/KerberosAuthenticator.java
@@ -376,7 +376,7 @@ public Class<? extends Filter> getFilterClass()
   @Override
   public Map<String, String> getInitParameters()
   {
-    Map<String, String> params = new HashMap<String, String>();
+    Map<String, String> params = new HashMap<>();
     params.put("kerberos.principal", serverPrincipal);
     params.put("kerberos.keytab", serverKeytab);
     params.put(AuthenticationFilter.AUTH_TYPE, DruidKerberosAuthenticationHandler.class.getName());
@@ -447,7 +447,7 @@ public DruidKerberosConfiguration(String keytab, String principal)
     @Override
     public AppConfigurationEntry[] getAppConfigurationEntry(String name)
     {
-      Map<String, String> options = new HashMap<String, String>();
+      Map<String, String> options = new HashMap<>();
       if (System.getProperty("java.vendor").contains("IBM")) {
         options.put(
             "useKeytab",
@@ -508,9 +508,9 @@ private void initializeKerberosLogin() throws ServletException
         throw new ServletException("Keytab does not exist: " + keytab);
       }
 
-      Set<Principal> principals = new HashSet<Principal>();
+      Set<Principal> principals = new HashSet<>();
       principals.add(new KerberosPrincipal(serverPrincipal));
-      Subject subject = new Subject(false, principals, new HashSet<Object>(), new HashSet<Object>());
+      Subject subject = new Subject(false, principals, new HashSet<>(), new HashSet<>());
 
       DruidKerberosConfiguration kerberosConfiguration = new DruidKerberosConfiguration(keytab, serverPrincipal);
 
diff --git a/extensions-core/druid-kerberos/src/main/java/org/apache/druid/security/kerberos/KerberosHttpClient.java b/extensions-core/druid-kerberos/src/main/java/org/apache/druid/security/kerberos/KerberosHttpClient.java
index eee32ac44e24..da1cc598cabd 100644
--- a/extensions-core/druid-kerberos/src/main/java/org/apache/druid/security/kerberos/KerberosHttpClient.java
+++ b/extensions-core/druid-kerberos/src/main/java/org/apache/druid/security/kerberos/KerberosHttpClient.java
@@ -99,7 +99,7 @@ private <Intermediate, Final> void inner_go(
         );
         DruidKerberosUtil.authenticateIfRequired(internalClientPrincipal, internalClientKeytab);
         UserGroupInformation currentUser = UserGroupInformation.getCurrentUser();
-        String challenge = currentUser.doAs(new PrivilegedExceptionAction<String>()
+        String challenge = currentUser.doAs(new PrivilegedExceptionAction<>()
         {
           @Override
           public String run() throws Exception
@@ -122,7 +122,7 @@ public String run() throws Exception
           duration
       );
 
-      Futures.addCallback(internalFuture, new FutureCallback<RetryResponseHolder<Final>>()
+      Futures.addCallback(internalFuture, new FutureCallback<>()
       {
         @Override
         public void onSuccess(RetryResponseHolder<Final> result)
diff --git a/extensions-core/druid-kerberos/src/main/java/org/apache/druid/security/kerberos/ResponseCookieHandler.java b/extensions-core/druid-kerberos/src/main/java/org/apache/druid/security/kerberos/ResponseCookieHandler.java
index 50973447b57d..ece3bc69906a 100644
--- a/extensions-core/druid-kerberos/src/main/java/org/apache/druid/security/kerberos/ResponseCookieHandler.java
+++ b/extensions-core/druid-kerberos/src/main/java/org/apache/druid/security/kerberos/ResponseCookieHandler.java
@@ -53,7 +53,7 @@ public ClientResponse<Intermediate> handleResponse(HttpResponse httpResponse, Tr
   {
     try {
       final HttpHeaders headers = httpResponse.headers();
-      manager.put(uri, Maps.asMap(headers.names(), new Function<String, List<String>>()
+      manager.put(uri, Maps.asMap(headers.names(), new Function<>()
       {
         @Override
         public List<String> apply(String input)
diff --git a/extensions-core/druid-kerberos/src/main/java/org/apache/druid/security/kerberos/RetryResponseHolder.java b/extensions-core/druid-kerberos/src/main/java/org/apache/druid/security/kerberos/RetryResponseHolder.java
index acfb747914ee..c8721f1d3400 100644
--- a/extensions-core/druid-kerberos/src/main/java/org/apache/druid/security/kerberos/RetryResponseHolder.java
+++ b/extensions-core/druid-kerberos/src/main/java/org/apache/druid/security/kerberos/RetryResponseHolder.java
@@ -32,7 +32,7 @@ public RetryResponseHolder(boolean shouldRetry, T obj)
 
   public static <T> RetryResponseHolder<T> retry()
   {
-    return new RetryResponseHolder<T>(true, null);
+    return new RetryResponseHolder<>(true, null);
   }
 
   public boolean shouldRetry()
diff --git a/extensions-core/ec2-extensions/src/main/java/org/apache/druid/indexing/overlord/autoscaling/ec2/EC2AutoScaler.java b/extensions-core/ec2-extensions/src/main/java/org/apache/druid/indexing/overlord/autoscaling/ec2/EC2AutoScaler.java
index 56ffc6b74efc..7d996297b12e 100644
--- a/extensions-core/ec2-extensions/src/main/java/org/apache/druid/indexing/overlord/autoscaling/ec2/EC2AutoScaler.java
+++ b/extensions-core/ec2-extensions/src/main/java/org/apache/druid/indexing/overlord/autoscaling/ec2/EC2AutoScaler.java
@@ -152,7 +152,7 @@ public AutoScalingData provision()
 
       final List<String> instanceIds = Lists.transform(
           result.getReservation().getInstances(),
-          new Function<Instance, String>()
+          new Function<>()
           {
             @Override
             public String apply(Instance input)
@@ -167,7 +167,7 @@ public String apply(Instance input)
       return new AutoScalingData(
           Lists.transform(
               result.getReservation().getInstances(),
-              new Function<Instance, String>()
+              new Function<>()
               {
                 @Override
                 public String apply(Instance input)
@@ -208,7 +208,7 @@ public AutoScalingData terminate(List<String> ips)
       return terminateWithIds(
           Lists.transform(
               instances,
-              new Function<Instance, String>()
+              new Function<>()
               {
                 @Override
                 public String apply(Instance input)
diff --git a/extensions-core/google-extensions/src/main/java/org/apache/druid/storage/google/GoogleDataSegmentPuller.java b/extensions-core/google-extensions/src/main/java/org/apache/druid/storage/google/GoogleDataSegmentPuller.java
index 61595264fc67..8e155f6a4ce8 100644
--- a/extensions-core/google-extensions/src/main/java/org/apache/druid/storage/google/GoogleDataSegmentPuller.java
+++ b/extensions-core/google-extensions/src/main/java/org/apache/druid/storage/google/GoogleDataSegmentPuller.java
@@ -96,7 +96,7 @@ public String getVersion(URI uri) throws IOException
   @Override
   public Predicate<Throwable> shouldRetryPredicate()
   {
-    return new Predicate<Throwable>()
+    return new Predicate<>()
     {
       @Override
       public boolean apply(Throwable e)
diff --git a/extensions-core/google-extensions/src/main/java/org/apache/druid/storage/google/output/GoogleStorageConnector.java b/extensions-core/google-extensions/src/main/java/org/apache/druid/storage/google/output/GoogleStorageConnector.java
index 0d147cce25a3..69b3e28c8060 100644
--- a/extensions-core/google-extensions/src/main/java/org/apache/druid/storage/google/output/GoogleStorageConnector.java
+++ b/extensions-core/google-extensions/src/main/java/org/apache/druid/storage/google/output/GoogleStorageConnector.java
@@ -199,7 +199,7 @@ public ChunkingStorageConnectorParameters<GoogleInputRange> buildInputParams(Str
         config.getBucket(),
         objectPath(path)
     )));
-    builder.objectOpenFunction(new ObjectOpenFunction<GoogleInputRange>()
+    builder.objectOpenFunction(new ObjectOpenFunction<>()
     {
       @Override
       public InputStream open(GoogleInputRange googleInputRange) throws IOException
diff --git a/extensions-core/hdfs-storage/src/main/java/org/apache/druid/storage/hdfs/HdfsDataSegmentPuller.java b/extensions-core/hdfs-storage/src/main/java/org/apache/druid/storage/hdfs/HdfsDataSegmentPuller.java
index 1c0adbd133c3..5dc6d810cbcc 100644
--- a/extensions-core/hdfs-storage/src/main/java/org/apache/druid/storage/hdfs/HdfsDataSegmentPuller.java
+++ b/extensions-core/hdfs-storage/src/main/java/org/apache/druid/storage/hdfs/HdfsDataSegmentPuller.java
@@ -56,7 +56,7 @@ public class HdfsDataSegmentPuller implements URIDataPuller
 {
   public static final int DEFAULT_RETRY_COUNT = 3;
 
-  public static final Predicate<Throwable> RETRY_PREDICATE = new Predicate<Throwable>()
+  public static final Predicate<Throwable> RETRY_PREDICATE = new Predicate<>()
   {
     @Override
     public boolean apply(Throwable input)
diff --git a/extensions-core/hdfs-storage/src/test/java/org/apache/druid/storage/hdfs/HdfsDataSegmentPusherTest.java b/extensions-core/hdfs-storage/src/test/java/org/apache/druid/storage/hdfs/HdfsDataSegmentPusherTest.java
index b26c2858f4b9..7bdf8c06980f 100644
--- a/extensions-core/hdfs-storage/src/test/java/org/apache/druid/storage/hdfs/HdfsDataSegmentPusherTest.java
+++ b/extensions-core/hdfs-storage/src/test/java/org/apache/druid/storage/hdfs/HdfsDataSegmentPusherTest.java
@@ -397,7 +397,7 @@ public static class TestModule extends SimpleModule
         addSerializer(NumberedShardSpec.class, ToStringSerializer.instance);
         addDeserializer(
             Interval.class,
-            new StdDeserializer<Interval>(Interval.class)
+            new StdDeserializer<>(Interval.class)
             {
               @Override
               public Interval deserialize(JsonParser jsonParser, DeserializationContext deserializationContext)
diff --git a/extensions-core/histogram/src/main/java/org/apache/druid/query/aggregation/histogram/ApproximateHistogram.java b/extensions-core/histogram/src/main/java/org/apache/druid/query/aggregation/histogram/ApproximateHistogram.java
index 12f1afa296de..11236b8d25fe 100644
--- a/extensions-core/histogram/src/main/java/org/apache/druid/query/aggregation/histogram/ApproximateHistogram.java
+++ b/extensions-core/histogram/src/main/java/org/apache/druid/query/aggregation/histogram/ApproximateHistogram.java
@@ -1659,7 +1659,7 @@ public Histogram toHistogram(final float bucketSize, final float offset)
 
     final float cutoff = 0.1f;
 
-    final ArrayList<Float> breaks = new ArrayList<Float>();
+    final ArrayList<Float> breaks = new ArrayList<>();
 
     // to deal with left inclusivity when the min is the same as a break
     final float bottomBreak = minFloor - bucketSize;
diff --git a/extensions-core/histogram/src/main/java/org/apache/druid/query/aggregation/histogram/ApproximateHistogramFoldingSerde.java b/extensions-core/histogram/src/main/java/org/apache/druid/query/aggregation/histogram/ApproximateHistogramFoldingSerde.java
index dd35874b8e27..31784f0d744a 100644
--- a/extensions-core/histogram/src/main/java/org/apache/druid/query/aggregation/histogram/ApproximateHistogramFoldingSerde.java
+++ b/extensions-core/histogram/src/main/java/org/apache/druid/query/aggregation/histogram/ApproximateHistogramFoldingSerde.java
@@ -82,7 +82,7 @@ public ApproximateHistogram extractValue(InputRow inputRow, String metricName)
   @Override
   public ObjectStrategy<ApproximateHistogram> getObjectStrategy()
   {
-    return new ObjectStrategy<ApproximateHistogram>()
+    return new ObjectStrategy<>()
     {
       @Override
       public Class<ApproximateHistogram> getClazz()
diff --git a/extensions-core/histogram/src/test/java/org/apache/druid/query/aggregation/histogram/ApproximateHistogramPostAggregatorTest.java b/extensions-core/histogram/src/test/java/org/apache/druid/query/aggregation/histogram/ApproximateHistogramPostAggregatorTest.java
index bcdc7d46e98c..232979f677ea 100644
--- a/extensions-core/histogram/src/test/java/org/apache/druid/query/aggregation/histogram/ApproximateHistogramPostAggregatorTest.java
+++ b/extensions-core/histogram/src/test/java/org/apache/druid/query/aggregation/histogram/ApproximateHistogramPostAggregatorTest.java
@@ -60,7 +60,7 @@ public void testApproxHistogramCompute()
       selector.increment();
     }
 
-    Map<String, Object> metricValues = new HashMap<String, Object>();
+    Map<String, Object> metricValues = new HashMap<>();
     metricValues.put("price", agg.get());
 
     ApproximateHistogramPostAggregator approximateHistogramPostAggregator = new EqualBucketsPostAggregator(
diff --git a/extensions-core/histogram/src/test/java/org/apache/druid/query/aggregation/histogram/ApproximateHistogramTopNQueryTest.java b/extensions-core/histogram/src/test/java/org/apache/druid/query/aggregation/histogram/ApproximateHistogramTopNQueryTest.java
index ae6c634ad0bc..531b530328b7 100644
--- a/extensions-core/histogram/src/test/java/org/apache/druid/query/aggregation/histogram/ApproximateHistogramTopNQueryTest.java
+++ b/extensions-core/histogram/src/test/java/org/apache/druid/query/aggregation/histogram/ApproximateHistogramTopNQueryTest.java
@@ -114,7 +114,7 @@ public void testTopNWithApproximateHistogramAgg()
         .build();
 
     List<Result<TopNResultValue>> expectedResults = Collections.singletonList(
-        new Result<TopNResultValue>(
+        new Result<>(
             DateTimes.of("2011-01-12T00:00:00.000Z"),
             TopNResultValue.create(
                 Arrays.<Map<String, Object>>asList(
diff --git a/extensions-core/histogram/src/test/java/org/apache/druid/query/aggregation/histogram/FixedBucketsHistogramTopNQueryTest.java b/extensions-core/histogram/src/test/java/org/apache/druid/query/aggregation/histogram/FixedBucketsHistogramTopNQueryTest.java
index cead791167d3..474cd9759dac 100644
--- a/extensions-core/histogram/src/test/java/org/apache/druid/query/aggregation/histogram/FixedBucketsHistogramTopNQueryTest.java
+++ b/extensions-core/histogram/src/test/java/org/apache/druid/query/aggregation/histogram/FixedBucketsHistogramTopNQueryTest.java
@@ -113,7 +113,7 @@ public void testTopNWithFixedHistogramAgg()
         .build();
 
     List<Result<TopNResultValue>> expectedResults = Collections.singletonList(
-        new Result<TopNResultValue>(
+        new Result<>(
             DateTimes.of("2011-01-12T00:00:00.000Z"),
             TopNResultValue.create(
                 Arrays.<Map<String, Object>>asList(
diff --git a/extensions-core/kafka-indexing-service/src/main/java/org/apache/druid/data/input/kafkainput/KafkaInputReader.java b/extensions-core/kafka-indexing-service/src/main/java/org/apache/druid/data/input/kafkainput/KafkaInputReader.java
index 1ce992d7cc37..b0964dfe5467 100644
--- a/extensions-core/kafka-indexing-service/src/main/java/org/apache/druid/data/input/kafkainput/KafkaInputReader.java
+++ b/extensions-core/kafka-indexing-service/src/main/java/org/apache/druid/data/input/kafkainput/KafkaInputReader.java
@@ -289,7 +289,7 @@ private static Map<String, Object> buildBlendedEventMap(
     final Set<String> keySet = new HashSet<>(fallback.keySet());
     keySet.addAll(rowDimensions);
 
-    return new AbstractMap<String, Object>()
+    return new AbstractMap<>()
     {
       @Override
       public Object get(Object key)
diff --git a/extensions-core/kafka-indexing-service/src/main/java/org/apache/druid/indexing/kafka/IncrementalPublishingKafkaIndexTaskRunner.java b/extensions-core/kafka-indexing-service/src/main/java/org/apache/druid/indexing/kafka/IncrementalPublishingKafkaIndexTaskRunner.java
index 5756d6a3fae5..b16f825308fc 100644
--- a/extensions-core/kafka-indexing-service/src/main/java/org/apache/druid/indexing/kafka/IncrementalPublishingKafkaIndexTaskRunner.java
+++ b/extensions-core/kafka-indexing-service/src/main/java/org/apache/druid/indexing/kafka/IncrementalPublishingKafkaIndexTaskRunner.java
@@ -218,9 +218,7 @@ protected boolean isEndOfShard(Long seqNum)
   @Override
   public TypeReference<List<SequenceMetadata<KafkaTopicPartition, Long>>> getSequenceMetadataTypeReference()
   {
-    return new TypeReference<List<SequenceMetadata<KafkaTopicPartition, Long>>>()
-    {
-    };
+    return new TypeReference<>() {};
   }
 
   @Nullable
@@ -234,9 +232,7 @@ protected TreeMap<Integer, Map<KafkaTopicPartition, Long>> getCheckPointsFromCon
       log.debug("Got checkpoints from task context[%s].", checkpointsString);
       return toolbox.getJsonMapper().readValue(
           checkpointsString,
-          new TypeReference<TreeMap<Integer, Map<KafkaTopicPartition, Long>>>()
-          {
-          }
+          new TypeReference<>() {}
       );
     } else {
       return null;
diff --git a/extensions-core/kafka-indexing-service/src/main/java/org/apache/druid/indexing/kafka/supervisor/KafkaSupervisor.java b/extensions-core/kafka-indexing-service/src/main/java/org/apache/druid/indexing/kafka/supervisor/KafkaSupervisor.java
index 2618c22495ea..f449c158789a 100644
--- a/extensions-core/kafka-indexing-service/src/main/java/org/apache/druid/indexing/kafka/supervisor/KafkaSupervisor.java
+++ b/extensions-core/kafka-indexing-service/src/main/java/org/apache/druid/indexing/kafka/supervisor/KafkaSupervisor.java
@@ -85,9 +85,7 @@
 public class KafkaSupervisor extends SeekableStreamSupervisor<KafkaTopicPartition, Long, KafkaRecordEntity>
 {
   public static final TypeReference<TreeMap<Integer, Map<KafkaTopicPartition, Long>>> CHECKPOINTS_TYPE_REF =
-      new TypeReference<TreeMap<Integer, Map<KafkaTopicPartition, Long>>>()
-      {
-      };
+      new TypeReference<>() {};
 
   private static final EmittingLogger log = new EmittingLogger(KafkaSupervisor.class);
   private static final Long NOT_SET = -1L;
diff --git a/extensions-core/kafka-indexing-service/src/test/java/org/apache/druid/data/input/kafkainput/KafkaStringHeaderFormatTest.java b/extensions-core/kafka-indexing-service/src/test/java/org/apache/druid/data/input/kafkainput/KafkaStringHeaderFormatTest.java
index ab634b3d6715..913c1aca1ad9 100644
--- a/extensions-core/kafka-indexing-service/src/test/java/org/apache/druid/data/input/kafkainput/KafkaStringHeaderFormatTest.java
+++ b/extensions-core/kafka-indexing-service/src/test/java/org/apache/druid/data/input/kafkainput/KafkaStringHeaderFormatTest.java
@@ -100,7 +100,7 @@ public void testDefaultHeaderFormat()
   {
     String headerLabelPrefix = "test.kafka.header.";
     Headers headers = new RecordHeaders(SAMPLE_HEADERS);
-    inputEntity = new KafkaRecordEntity(new ConsumerRecord<byte[], byte[]>(
+    inputEntity = new KafkaRecordEntity(new ConsumerRecord<>(
         "sample", 0, 0, timestamp,
         null, null, 0, 0,
         null, "sampleValue".getBytes(StandardCharsets.UTF_8), headers
@@ -151,7 +151,7 @@ public byte[] value()
 
     String headerLabelPrefix = "test.kafka.header.";
     Headers headers = new RecordHeaders(header);
-    inputEntity = new KafkaRecordEntity(new ConsumerRecord<byte[], byte[]>(
+    inputEntity = new KafkaRecordEntity(new ConsumerRecord<>(
         "sample", 0, 0, timestamp,
         null, null, 0, 0,
         null, "sampleValue".getBytes(StandardCharsets.UTF_8), headers
@@ -203,7 +203,7 @@ public byte[] value()
 
     String headerLabelPrefix = "test.kafka.header.";
     Headers headers = new RecordHeaders(header);
-    inputEntity = new KafkaRecordEntity(new ConsumerRecord<byte[], byte[]>(
+    inputEntity = new KafkaRecordEntity(new ConsumerRecord<>(
         "sample", 0, 0, timestamp,
         null, null, 0, 0,
         null, "sampleValue".getBytes(StandardCharsets.UTF_8), headers
diff --git a/extensions-core/kafka-indexing-service/src/test/java/org/apache/druid/indexing/kafka/KafkaIndexTaskTest.java b/extensions-core/kafka-indexing-service/src/test/java/org/apache/druid/indexing/kafka/KafkaIndexTaskTest.java
index 0621f6f9ba15..a0eb4e942aa3 100644
--- a/extensions-core/kafka-indexing-service/src/test/java/org/apache/druid/indexing/kafka/KafkaIndexTaskTest.java
+++ b/extensions-core/kafka-indexing-service/src/test/java/org/apache/druid/indexing/kafka/KafkaIndexTaskTest.java
@@ -2287,9 +2287,7 @@ public void testRunWithPauseAndResume() throws Exception
 
     Map<KafkaTopicPartition, Long> currentOffsets = OBJECT_MAPPER.readValue(
         task.getRunner().pause().getEntity().toString(),
-        new TypeReference<Map<KafkaTopicPartition, Long>>()
-        {
-        }
+        new TypeReference<>() {}
     );
     Assert.assertEquals(Status.PAUSED, task.getRunner().getStatus());
     Assert.assertEquals(Status.PAUSED.toString(), task.getCurrentRunnerStatus());
diff --git a/extensions-core/kafka-indexing-service/src/test/java/org/apache/druid/indexing/kafka/KafkaSeekableStreamEndSequenceNumbersTest.java b/extensions-core/kafka-indexing-service/src/test/java/org/apache/druid/indexing/kafka/KafkaSeekableStreamEndSequenceNumbersTest.java
index e3b3cef6cb20..d8aa85369359 100644
--- a/extensions-core/kafka-indexing-service/src/test/java/org/apache/druid/indexing/kafka/KafkaSeekableStreamEndSequenceNumbersTest.java
+++ b/extensions-core/kafka-indexing-service/src/test/java/org/apache/druid/indexing/kafka/KafkaSeekableStreamEndSequenceNumbersTest.java
@@ -61,7 +61,7 @@ public void testSerde() throws Exception
     // Check round-trip.
     final SeekableStreamEndSequenceNumbers<KafkaTopicPartition, Long> partitions2 = OBJECT_MAPPER.readValue(
         serializedString,
-        new TypeReference<SeekableStreamEndSequenceNumbers<KafkaTopicPartition, Long>>() {}
+        new TypeReference<>() {}
     );
 
     Assert.assertEquals(
diff --git a/extensions-core/kafka-indexing-service/src/test/java/org/apache/druid/indexing/kafka/KafkaSeekableStreamStartSequenceNumbersTest.java b/extensions-core/kafka-indexing-service/src/test/java/org/apache/druid/indexing/kafka/KafkaSeekableStreamStartSequenceNumbersTest.java
index 07eaced75559..5ed51f092a84 100644
--- a/extensions-core/kafka-indexing-service/src/test/java/org/apache/druid/indexing/kafka/KafkaSeekableStreamStartSequenceNumbersTest.java
+++ b/extensions-core/kafka-indexing-service/src/test/java/org/apache/druid/indexing/kafka/KafkaSeekableStreamStartSequenceNumbersTest.java
@@ -66,7 +66,7 @@ public void testSerde() throws Exception
     // Check round-trip.
     final SeekableStreamStartSequenceNumbers<KafkaTopicPartition, Long> partitions2 = OBJECT_MAPPER.readValue(
         serializedString,
-        new TypeReference<SeekableStreamStartSequenceNumbers<KafkaTopicPartition, Long>>() {}
+        new TypeReference<>() {}
     );
 
     Assert.assertEquals(
diff --git a/extensions-core/kafka-indexing-service/src/test/java/org/apache/druid/indexing/kafka/supervisor/KafkaSupervisorTest.java b/extensions-core/kafka-indexing-service/src/test/java/org/apache/druid/indexing/kafka/supervisor/KafkaSupervisorTest.java
index 8f2f3167ecd9..40a97f1e1ada 100644
--- a/extensions-core/kafka-indexing-service/src/test/java/org/apache/druid/indexing/kafka/supervisor/KafkaSupervisorTest.java
+++ b/extensions-core/kafka-indexing-service/src/test/java/org/apache/druid/indexing/kafka/supervisor/KafkaSupervisorTest.java
@@ -2666,7 +2666,7 @@ public void testSupervisorIsIdleIfStreamInactiveWhenNoActiveTasks() throws Excep
     taskRunner.registerListener(EasyMock.anyObject(TaskRunnerListener.class), EasyMock.anyObject(Executor.class));
     EasyMock.expect(indexerMetadataStorageCoordinator.retrieveDataSourceMetadata(DATASOURCE)).andReturn(
         new KafkaDataSourceMetadata(
-            new SeekableStreamEndSequenceNumbers<KafkaTopicPartition, Long>(
+            new SeekableStreamEndSequenceNumbers<>(
                 topic,
                 singlePartitionMap(topic,
                                    0,
@@ -2724,7 +2724,7 @@ public void testSupervisorNotIdleIfStreamInactiveWhenSuspended() throws Exceptio
     taskRunner.registerListener(EasyMock.anyObject(TaskRunnerListener.class), EasyMock.anyObject(Executor.class));
     EasyMock.expect(indexerMetadataStorageCoordinator.retrieveDataSourceMetadata(DATASOURCE)).andReturn(
         new KafkaDataSourceMetadata(
-            new SeekableStreamEndSequenceNumbers<KafkaTopicPartition, Long>(
+            new SeekableStreamEndSequenceNumbers<>(
                 topic,
                 singlePartitionMap(topic,
                                    0,
@@ -2784,7 +2784,7 @@ public void testSupervisorIsIdleIfStreamInactiveWhenSuspended() throws Exception
     taskRunner.registerListener(EasyMock.anyObject(TaskRunnerListener.class), EasyMock.anyObject(Executor.class));
     EasyMock.expect(indexerMetadataStorageCoordinator.retrieveDataSourceMetadata(DATASOURCE)).andReturn(
         new KafkaDataSourceMetadata(
-            new SeekableStreamEndSequenceNumbers<KafkaTopicPartition, Long>(
+            new SeekableStreamEndSequenceNumbers<>(
                 topic,
                 singlePartitionMap(topic,
                                    0,
diff --git a/extensions-core/kinesis-indexing-service/src/main/java/org/apache/druid/data/input/kinesis/KinesisInputReader.java b/extensions-core/kinesis-indexing-service/src/main/java/org/apache/druid/data/input/kinesis/KinesisInputReader.java
index d0c30280a2b7..b5633c1c3c7e 100644
--- a/extensions-core/kinesis-indexing-service/src/main/java/org/apache/druid/data/input/kinesis/KinesisInputReader.java
+++ b/extensions-core/kinesis-indexing-service/src/main/java/org/apache/druid/data/input/kinesis/KinesisInputReader.java
@@ -204,7 +204,7 @@ private Map<String, Object> buildBlendedEventMap(
     final Set<String> keySet = new HashSet<>(fallback.keySet());
     keySet.addAll(rowDimensions);
 
-    return new AbstractMap<String, Object>()
+    return new AbstractMap<>()
     {
       @Override
       public Object get(Object key)
diff --git a/extensions-core/kinesis-indexing-service/src/main/java/org/apache/druid/indexing/kinesis/KinesisIndexTaskRunner.java b/extensions-core/kinesis-indexing-service/src/main/java/org/apache/druid/indexing/kinesis/KinesisIndexTaskRunner.java
index 72e61635912c..dfca894d2819 100644
--- a/extensions-core/kinesis-indexing-service/src/main/java/org/apache/druid/indexing/kinesis/KinesisIndexTaskRunner.java
+++ b/extensions-core/kinesis-indexing-service/src/main/java/org/apache/druid/indexing/kinesis/KinesisIndexTaskRunner.java
@@ -181,9 +181,7 @@ protected boolean isEndOfShard(String seqNum)
   @Override
   public TypeReference<List<SequenceMetadata<String, String>>> getSequenceMetadataTypeReference()
   {
-    return new TypeReference<List<SequenceMetadata<String, String>>>()
-    {
-    };
+    return new TypeReference<>() {};
   }
 
   @Nullable
@@ -197,9 +195,7 @@ protected TreeMap<Integer, Map<String, String>> getCheckPointsFromContext(
       log.debug("Got checkpoints from task context[%s]", checkpointsString);
       return toolbox.getJsonMapper().readValue(
           checkpointsString,
-          new TypeReference<TreeMap<Integer, Map<String, String>>>()
-          {
-          }
+          new TypeReference<>() {}
       );
     } else {
       return null;
diff --git a/extensions-core/kinesis-indexing-service/src/main/java/org/apache/druid/indexing/kinesis/supervisor/KinesisSupervisor.java b/extensions-core/kinesis-indexing-service/src/main/java/org/apache/druid/indexing/kinesis/supervisor/KinesisSupervisor.java
index 2391b1265bab..db29d0dae53d 100644
--- a/extensions-core/kinesis-indexing-service/src/main/java/org/apache/druid/indexing/kinesis/supervisor/KinesisSupervisor.java
+++ b/extensions-core/kinesis-indexing-service/src/main/java/org/apache/druid/indexing/kinesis/supervisor/KinesisSupervisor.java
@@ -79,9 +79,7 @@ public class KinesisSupervisor extends SeekableStreamSupervisor<String, String,
   private static final EmittingLogger log = new EmittingLogger(KinesisSupervisor.class);
 
   public static final TypeReference<TreeMap<Integer, Map<String, String>>> CHECKPOINTS_TYPE_REF =
-      new TypeReference<TreeMap<Integer, Map<String, String>>>()
-      {
-      };
+      new TypeReference<>() {};
 
   public static final String OFFSET_NOT_SET = "-1";
   private final KinesisSupervisorSpec spec;
diff --git a/extensions-core/kinesis-indexing-service/src/test/java/org/apache/druid/indexing/kinesis/supervisor/KinesisSupervisorTest.java b/extensions-core/kinesis-indexing-service/src/test/java/org/apache/druid/indexing/kinesis/supervisor/KinesisSupervisorTest.java
index dc10e348138a..1fc1da973859 100644
--- a/extensions-core/kinesis-indexing-service/src/test/java/org/apache/druid/indexing/kinesis/supervisor/KinesisSupervisorTest.java
+++ b/extensions-core/kinesis-indexing-service/src/test/java/org/apache/druid/indexing/kinesis/supervisor/KinesisSupervisorTest.java
@@ -4311,7 +4311,7 @@ private List<Task> testShardSplitPhaseTwo(List<Task> phaseOneTasks) throws Excep
     // first task ran, its shard 0 has reached EOS
     EasyMock.expect(indexerMetadataStorageCoordinator.retrieveDataSourceMetadata(DATASOURCE)).andReturn(
         new KinesisDataSourceMetadata(
-            new SeekableStreamEndSequenceNumbers<String, String>(
+            new SeekableStreamEndSequenceNumbers<>(
                 STREAM,
                 ImmutableMap.of(SHARD_ID0, KinesisSequenceNumber.END_OF_SHARD_MARKER)
             )
@@ -4468,7 +4468,7 @@ private void testShardSplitPhaseThree(List<Task> phaseTwoTasks) throws Exception
     // second set of tasks ran, shard 0 has expired, but shard 1 and 2 have data
     EasyMock.expect(indexerMetadataStorageCoordinator.retrieveDataSourceMetadata(DATASOURCE)).andReturn(
         new KinesisDataSourceMetadata(
-            new SeekableStreamEndSequenceNumbers<String, String>(
+            new SeekableStreamEndSequenceNumbers<>(
                 STREAM,
                 ImmutableMap.of(
                     SHARD_ID0, KinesisSequenceNumber.END_OF_SHARD_MARKER,
@@ -4483,7 +4483,7 @@ private void testShardSplitPhaseThree(List<Task> phaseTwoTasks) throws Exception
         indexerMetadataStorageCoordinator.resetDataSourceMetadata(
             DATASOURCE,
             new KinesisDataSourceMetadata(
-                new SeekableStreamEndSequenceNumbers<String, String>(
+                new SeekableStreamEndSequenceNumbers<>(
                     STREAM,
                     ImmutableMap.of(
                         SHARD_ID0, KinesisSequenceNumber.EXPIRED_MARKER,
@@ -4768,7 +4768,7 @@ private List<Task> testShardMergePhaseTwo(List<Task> phaseOneTasks) throws Excep
     // first tasks ran, both shard 0 and shard 1 have reached EOS, merged into shard 2
     EasyMock.expect(indexerMetadataStorageCoordinator.retrieveDataSourceMetadata(DATASOURCE)).andReturn(
         new KinesisDataSourceMetadata(
-            new SeekableStreamEndSequenceNumbers<String, String>(
+            new SeekableStreamEndSequenceNumbers<>(
                 STREAM,
                 ImmutableMap.of(
                     SHARD_ID0, KinesisSequenceNumber.END_OF_SHARD_MARKER,
@@ -4909,7 +4909,7 @@ private void testShardMergePhaseThree(List<Task> phaseTwoTasks) throws Exception
     // second set of tasks ran, shard 0 has expired, but shard 1 and 2 have data
     EasyMock.expect(indexerMetadataStorageCoordinator.retrieveDataSourceMetadata(DATASOURCE)).andReturn(
         new KinesisDataSourceMetadata(
-            new SeekableStreamEndSequenceNumbers<String, String>(
+            new SeekableStreamEndSequenceNumbers<>(
                 STREAM,
                 ImmutableMap.of(
                     SHARD_ID0, KinesisSequenceNumber.END_OF_SHARD_MARKER,
@@ -4924,7 +4924,7 @@ private void testShardMergePhaseThree(List<Task> phaseTwoTasks) throws Exception
         indexerMetadataStorageCoordinator.resetDataSourceMetadata(
             DATASOURCE,
             new KinesisDataSourceMetadata(
-                new SeekableStreamEndSequenceNumbers<String, String>(
+                new SeekableStreamEndSequenceNumbers<>(
                     STREAM,
                     ImmutableMap.of(
                         SHARD_ID0, KinesisSequenceNumber.EXPIRED_MARKER,
diff --git a/extensions-core/kubernetes-extensions/src/main/java/org/apache/druid/k8s/discovery/DefaultK8sApiClient.java b/extensions-core/kubernetes-extensions/src/main/java/org/apache/druid/k8s/discovery/DefaultK8sApiClient.java
index 04ee4683274d..023605a28a92 100644
--- a/extensions-core/kubernetes-extensions/src/main/java/org/apache/druid/k8s/discovery/DefaultK8sApiClient.java
+++ b/extensions-core/kubernetes-extensions/src/main/java/org/apache/druid/k8s/discovery/DefaultK8sApiClient.java
@@ -145,7 +145,7 @@ public boolean hasNext() throws SocketTimeoutException
                   LOGGER.debug("item of type " + item.type + " was NULL when watching nodeRole [%s]", nodeRole);
                 }
 
-                obj = new Watch.Response<DiscoveryDruidNodeAndResourceVersion>(
+                obj = new Watch.Response<>(
                     item.type,
                     result
                 );
diff --git a/extensions-core/kubernetes-extensions/src/test/java/org/apache/druid/k8s/discovery/K8sDruidNodeAnnouncerTest.java b/extensions-core/kubernetes-extensions/src/test/java/org/apache/druid/k8s/discovery/K8sDruidNodeAnnouncerTest.java
index ffcaefb56177..fc0304009f73 100644
--- a/extensions-core/kubernetes-extensions/src/test/java/org/apache/druid/k8s/discovery/K8sDruidNodeAnnouncerTest.java
+++ b/extensions-core/kubernetes-extensions/src/test/java/org/apache/druid/k8s/discovery/K8sDruidNodeAnnouncerTest.java
@@ -67,9 +67,7 @@ public void testAnnounce() throws Exception
 
     List<Map<String, Object>> actualPatchList = jsonMapper.readValue(
         patchArg.getValue(),
-        new TypeReference<List<Map<String, Object>>>()
-        {
-        }
+        new TypeReference<>() {}
     );
 
     List<Map<String, Object>> expectedPatchList = Lists.newArrayList(
@@ -115,9 +113,7 @@ public void testUnannounce() throws Exception
 
     List<Map<String, String>> actualPatchList = jsonMapper.readValue(
         patchArg.getValue(),
-        new TypeReference<List<Map<String, String>>>()
-        {
-        }
+        new TypeReference<>() {}
     );
 
     List<Map<String, String>> expectedPatchList = Lists.newArrayList(
diff --git a/extensions-core/kubernetes-extensions/src/test/java/org/apache/druid/k8s/discovery/K8sDruidNodeDiscoveryProviderTest.java b/extensions-core/kubernetes-extensions/src/test/java/org/apache/druid/k8s/discovery/K8sDruidNodeDiscoveryProviderTest.java
index 4a9c5d041642..12a3a6118da8 100644
--- a/extensions-core/kubernetes-extensions/src/test/java/org/apache/druid/k8s/discovery/K8sDruidNodeDiscoveryProviderTest.java
+++ b/extensions-core/kubernetes-extensions/src/test/java/org/apache/druid/k8s/discovery/K8sDruidNodeDiscoveryProviderTest.java
@@ -240,7 +240,7 @@ public void testNodeRoleWatcherLoopOnNullItems() throws Exception
             )
         )
     );
-    List<Watch.Response<DiscoveryDruidNodeAndResourceVersion>> nullList = new ArrayList<Watch.Response<DiscoveryDruidNodeAndResourceVersion>>();
+    List<Watch.Response<DiscoveryDruidNodeAndResourceVersion>> nullList = new ArrayList<>();
     nullList.add(null);
     EasyMock.expect(mockK8sApiClient.watchPods(
         podInfo.getPodNamespace(), labelSelector, "v1", NodeRole.ROUTER)).andReturn(
diff --git a/extensions-core/lookups-cached-global/src/main/java/org/apache/druid/data/input/MapPopulator.java b/extensions-core/lookups-cached-global/src/main/java/org/apache/druid/data/input/MapPopulator.java
index c5e8c6e4bfc8..a0b591f21227 100644
--- a/extensions-core/lookups-cached-global/src/main/java/org/apache/druid/data/input/MapPopulator.java
+++ b/extensions-core/lookups-cached-global/src/main/java/org/apache/druid/data/input/MapPopulator.java
@@ -124,7 +124,7 @@ public PopulateResult populateAndWarnAtByteLimit(
   ) throws IOException
   {
     return source.asCharSource(StandardCharsets.UTF_8).readLines(
-        new LineProcessor<PopulateResult>()
+        new LineProcessor<>()
         {
           private int lines = 0;
           private int entries = 0;
diff --git a/extensions-core/lookups-cached-global/src/main/java/org/apache/druid/query/lookup/namespace/UriExtractionNamespace.java b/extensions-core/lookups-cached-global/src/main/java/org/apache/druid/query/lookup/namespace/UriExtractionNamespace.java
index e1c103c0ca23..75981f0b63cc 100644
--- a/extensions-core/lookups-cached-global/src/main/java/org/apache/druid/query/lookup/namespace/UriExtractionNamespace.java
+++ b/extensions-core/lookups-cached-global/src/main/java/org/apache/druid/query/lookup/namespace/UriExtractionNamespace.java
@@ -644,7 +644,7 @@ public ObjectMapperFlatDataParser(
       final JsonFactory jsonFactory = jsonMapper.getFactory().copy();
       jsonFactory.configure(JsonFactory.Feature.CANONICALIZE_FIELD_NAMES, false);
 
-      parser = new Parser<String, String>()
+      parser = new Parser<>()
       {
         @Override
         public Map<String, String> parseToMap(String input)
diff --git a/extensions-core/lookups-cached-global/src/main/java/org/apache/druid/server/lookup/namespace/NamespaceExtractionModule.java b/extensions-core/lookups-cached-global/src/main/java/org/apache/druid/server/lookup/namespace/NamespaceExtractionModule.java
index 3aa087a4a1bb..2b25a877a43b 100644
--- a/extensions-core/lookups-cached-global/src/main/java/org/apache/druid/server/lookup/namespace/NamespaceExtractionModule.java
+++ b/extensions-core/lookups-cached-global/src/main/java/org/apache/druid/server/lookup/namespace/NamespaceExtractionModule.java
@@ -66,12 +66,8 @@ public static MapBinder<Class<? extends ExtractionNamespace>, CacheGenerator<?>>
   {
     return MapBinder.newMapBinder(
         binder,
-        new TypeLiteral<Class<? extends ExtractionNamespace>>()
-        {
-        },
-        new TypeLiteral<CacheGenerator<?>>()
-        {
-        }
+        new TypeLiteral<>() {},
+        new TypeLiteral<>() {}
     );
   }
 
diff --git a/extensions-core/lookups-cached-global/src/test/java/org/apache/druid/query/lookup/LookupUtilsTest.java b/extensions-core/lookups-cached-global/src/test/java/org/apache/druid/query/lookup/LookupUtilsTest.java
index 7ef6ca501e50..503c97145c5e 100644
--- a/extensions-core/lookups-cached-global/src/test/java/org/apache/druid/query/lookup/LookupUtilsTest.java
+++ b/extensions-core/lookups-cached-global/src/test/java/org/apache/druid/query/lookup/LookupUtilsTest.java
@@ -42,14 +42,10 @@
 public class LookupUtilsTest
 {
   private static final TypeReference<Map<String, Object>> LOOKUPS_ALL_GENERIC_REFERENCE =
-      new TypeReference<Map<String, Object>>()
-      {
-      };
+      new TypeReference<>() {};
 
   private static final TypeReference<Map<String, LookupExtractorFactoryContainer>> LOOKUPS_ALL_REFERENCE =
-      new TypeReference<Map<String, LookupExtractorFactoryContainer>>()
-      {
-      };
+      new TypeReference<>() {};
 
   private static final String LOOKUP_VALID_INNER = "  \"lookup_uri_good\": {\n"
                                                    + "    \"version\": \"2021-12-03T01:04:05.151Z\",\n"
diff --git a/extensions-core/lookups-cached-global/src/test/java/org/apache/druid/query/lookup/namespace/JSONFlatDataParserTest.java b/extensions-core/lookups-cached-global/src/test/java/org/apache/druid/query/lookup/namespace/JSONFlatDataParserTest.java
index e44641924dc2..bb0c91e49533 100644
--- a/extensions-core/lookups-cached-global/src/test/java/org/apache/druid/query/lookup/namespace/JSONFlatDataParserTest.java
+++ b/extensions-core/lookups-cached-global/src/test/java/org/apache/druid/query/lookup/namespace/JSONFlatDataParserTest.java
@@ -70,7 +70,7 @@ public void setUp() throws Exception
     sink.writeLines(
         Iterables.transform(
             MAPPINGS,
-            new Function<Map<String, Object>, CharSequence>()
+            new Function<>()
             {
               @Override
               public CharSequence apply(Map<String, Object> input)
diff --git a/extensions-core/lookups-cached-global/src/test/java/org/apache/druid/server/lookup/namespace/UriCacheGeneratorTest.java b/extensions-core/lookups-cached-global/src/test/java/org/apache/druid/server/lookup/namespace/UriCacheGeneratorTest.java
index 58ef2dc15de3..3caad9cec343 100644
--- a/extensions-core/lookups-cached-global/src/test/java/org/apache/druid/server/lookup/namespace/UriCacheGeneratorTest.java
+++ b/extensions-core/lookups-cached-global/src/test/java/org/apache/druid/server/lookup/namespace/UriCacheGeneratorTest.java
@@ -182,7 +182,7 @@ public void close() throws IOException
             new NamespaceExtractionConfig()
         )
     );
-    return () -> new Iterator<Object[]>()
+    return () -> new Iterator<>()
     {
       Iterator<Object[]> compressionIt = compressionParams.iterator();
       Iterator<Function<Lifecycle, NamespaceExtractionCacheManager>> cacheManagerCreatorsIt =
diff --git a/extensions-core/lookups-cached-global/src/test/java/org/apache/druid/server/lookup/namespace/cache/CacheSchedulerTest.java b/extensions-core/lookups-cached-global/src/test/java/org/apache/druid/server/lookup/namespace/cache/CacheSchedulerTest.java
index fb4d6070e3e8..b6deed7be5ec 100644
--- a/extensions-core/lookups-cached-global/src/test/java/org/apache/druid/server/lookup/namespace/cache/CacheSchedulerTest.java
+++ b/extensions-core/lookups-cached-global/src/test/java/org/apache/druid/server/lookup/namespace/cache/CacheSchedulerTest.java
@@ -74,7 +74,7 @@
 public class CacheSchedulerTest
 {
   public static final Function<Lifecycle, NamespaceExtractionCacheManager> CREATE_ON_HEAP_CACHE_MANAGER =
-      new Function<Lifecycle, NamespaceExtractionCacheManager>()
+      new Function<>()
       {
         @Nullable
         @Override
@@ -88,7 +88,7 @@ public NamespaceExtractionCacheManager apply(@Nullable Lifecycle lifecycle)
         }
       };
   public static final Function<Lifecycle, NamespaceExtractionCacheManager> CREATE_OFF_HEAP_CACHE_MANAGER =
-      new Function<Lifecycle, NamespaceExtractionCacheManager>()
+      new Function<>()
       {
         @Nullable
         @Override
diff --git a/extensions-core/lookups-cached-single/src/main/java/org/apache/druid/server/lookup/cache/loading/OffHeapLoadingCache.java b/extensions-core/lookups-cached-single/src/main/java/org/apache/druid/server/lookup/cache/loading/OffHeapLoadingCache.java
index 2d26ed7fdf82..2688dcaa0ef7 100644
--- a/extensions-core/lookups-cached-single/src/main/java/org/apache/druid/server/lookup/cache/loading/OffHeapLoadingCache.java
+++ b/extensions-core/lookups-cached-single/src/main/java/org/apache/druid/server/lookup/cache/loading/OffHeapLoadingCache.java
@@ -91,7 +91,7 @@ public OffHeapLoadingCache(
                    .expireAfterAccess(this.expireAfterAccess, TimeUnit.MILLISECONDS)
                    .expireMaxSize(this.maxEntriesSize)
                    .make();
-    cache.modificationListenerAdd(new Bind.MapListener<K, V>()
+    cache.modificationListenerAdd(new Bind.MapListener<>()
     {
       @Override
       public void update(K key, V oldVal, V newVal)
diff --git a/extensions-core/lookups-cached-single/src/main/java/org/apache/druid/server/lookup/cache/polling/OffHeapPollingCache.java b/extensions-core/lookups-cached-single/src/main/java/org/apache/druid/server/lookup/cache/polling/OffHeapPollingCache.java
index b042e1ea1df9..a7cabf8d64fc 100644
--- a/extensions-core/lookups-cached-single/src/main/java/org/apache/druid/server/lookup/cache/polling/OffHeapPollingCache.java
+++ b/extensions-core/lookups-cached-single/src/main/java/org/apache/druid/server/lookup/cache/polling/OffHeapPollingCache.java
@@ -63,12 +63,12 @@ public OffHeapPollingCache(final Iterable<Map.Entry<K, V>> entries)
       final Set<V> setOfValues = setOfValuesBuilder.build();
       reverseCache.putAll(Maps.asMap(
           setOfValues,
-          new Function<V, List<K>>()
+          new Function<>()
           {
             @Override
             public List<K> apply(final V input)
             {
-              return Lists.newArrayList(Maps.filterKeys(mapCache, new Predicate<K>()
+              return Lists.newArrayList(Maps.filterKeys(mapCache, new Predicate<>()
               {
                 @Override
                 public boolean apply(K key)
diff --git a/extensions-core/lookups-cached-single/src/main/java/org/apache/druid/server/lookup/jdbc/QueryKeys.java b/extensions-core/lookups-cached-single/src/main/java/org/apache/druid/server/lookup/jdbc/QueryKeys.java
index ca90fa668569..308191002044 100644
--- a/extensions-core/lookups-cached-single/src/main/java/org/apache/druid/server/lookup/jdbc/QueryKeys.java
+++ b/extensions-core/lookups-cached-single/src/main/java/org/apache/druid/server/lookup/jdbc/QueryKeys.java
@@ -55,7 +55,7 @@ public boolean accepts(Class<?> type)
     @Override
     public ContainerBuilder<ImmutableSet<?>> newContainerBuilderFor(Class<?> type)
     {
-      return new ContainerBuilder<ImmutableSet<?>>()
+      return new ContainerBuilder<>()
       {
         final ImmutableSet.Builder<Object> builder = new ImmutableSet.Builder<>();
 
diff --git a/extensions-core/lookups-cached-single/src/test/java/org/apache/druid/server/lookup/LoadingLookupFactoryTest.java b/extensions-core/lookups-cached-single/src/test/java/org/apache/druid/server/lookup/LoadingLookupFactoryTest.java
index cf67e6e32eaf..4f98411e86d4 100644
--- a/extensions-core/lookups-cached-single/src/test/java/org/apache/druid/server/lookup/LoadingLookupFactoryTest.java
+++ b/extensions-core/lookups-cached-single/src/test/java/org/apache/druid/server/lookup/LoadingLookupFactoryTest.java
@@ -109,14 +109,14 @@ public void testSerDeser() throws IOException
     ObjectMapper mapper = TestHelper.makeJsonMapper();
     LoadingLookupFactory loadingLookupFactory = new LoadingLookupFactory(
         new MockDataFetcher(),
-        new OnHeapLoadingCache<String, String>(
+        new OnHeapLoadingCache<>(
             0,
             100,
             100L,
             0L,
             0L
         ),
-        new OffHeapLoadingCache<String, List<String>>(
+        new OffHeapLoadingCache<>(
             100,
             100L,
             0L,
diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/dart/controller/sql/DartQueryMaker.java b/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/dart/controller/sql/DartQueryMaker.java
index 66686f7640f9..c35ca39a9f04 100644
--- a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/dart/controller/sql/DartQueryMaker.java
+++ b/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/dart/controller/sql/DartQueryMaker.java
@@ -237,7 +237,7 @@ private Sequence<Object[]> runWithReport(final ControllerHolder controllerHolder
 
     // Return a sequence that reads one row (the report) from reportFuture.
     return new BaseSequence<>(
-        new BaseSequence.IteratorMaker<Object[], Iterator<Object[]>>()
+        new BaseSequence.IteratorMaker<>()
         {
           @Override
           public Iterator<Object[]> make()
diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/ExceptionWrappingWorkerClient.java b/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/ExceptionWrappingWorkerClient.java
index 3373bbd883ee..daad4021368c 100644
--- a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/ExceptionWrappingWorkerClient.java
+++ b/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/ExceptionWrappingWorkerClient.java
@@ -147,7 +147,7 @@ private static <T> ListenableFuture<T> wrap(
 
     Futures.addCallback(
         clientFuture,
-        new FutureCallback<T>()
+        new FutureCallback<>()
         {
           @Override
           public void onSuccess(@Nullable T result)
diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/ProcessingBuffersSet.java b/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/ProcessingBuffersSet.java
index 7f81a9c4a9c1..95f0335b71f5 100644
--- a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/ProcessingBuffersSet.java
+++ b/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/ProcessingBuffersSet.java
@@ -74,7 +74,7 @@ public ResourceHolder<ProcessingBuffers> acquireForStage(final StageDefinition s
       throw DruidException.defensive("Processing buffers not available");
     }
 
-    return new ResourceHolder<ProcessingBuffers>()
+    return new ResourceHolder<>()
     {
       @Override
       public ProcessingBuffers get()
diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/RunWorkOrder.java b/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/RunWorkOrder.java
index 8b6216861a13..024036cdbff5 100644
--- a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/RunWorkOrder.java
+++ b/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/RunWorkOrder.java
@@ -541,7 +541,7 @@ private void setUpCompletionCallbacks()
                 stageOutputChannelsFuture
             )
         ),
-        new FutureCallback<List<Object>>()
+        new FutureCallback<>()
         {
           @Override
           public void onSuccess(final List<Object> workerResultAndOutputChannelsResolved)
@@ -1086,7 +1086,7 @@ private ResultAndChannels<?> gatherResultKeyStatistics(final OutputChannels chan
 
       Futures.addCallback(
           clusterByStatisticsCollectorFuture,
-          new FutureCallback<ClusterByStatisticsCollector>()
+          new FutureCallback<>()
           {
             @Override
             public void onSuccess(final ClusterByStatisticsCollector result)
diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/WorkerImpl.java b/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/WorkerImpl.java
index 6c9f1d899413..44654810ac61 100644
--- a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/WorkerImpl.java
+++ b/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/WorkerImpl.java
@@ -867,7 +867,7 @@ private ListeningExecutorService makeProcessingPool()
           @Override
           public <T> Callable<T> decorateCallable(Callable<T> callable)
           {
-            return new PrioritizedCallable<T>()
+            return new PrioritizedCallable<>()
             {
               @Override
               public int getPriority()
diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/WorkerSketchFetcher.java b/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/WorkerSketchFetcher.java
index b0da5b83a46b..256e76307c81 100644
--- a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/WorkerSketchFetcher.java
+++ b/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/WorkerSketchFetcher.java
@@ -156,7 +156,7 @@ private void fetchStatsFromWorker(
 
     SettableFuture<Boolean> kernelActionFuture = SettableFuture.create();
 
-    Futures.addCallback(fetchFuture, new FutureCallback<ClusterByStatisticsSnapshot>()
+    Futures.addCallback(fetchFuture, new FutureCallback<>()
     {
       @Override
       public void onSuccess(@Nullable ClusterByStatisticsSnapshot result)
diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/processor/SegmentGeneratorFrameProcessorFactory.java b/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/processor/SegmentGeneratorFrameProcessorFactory.java
index 039fb233e4c5..428fed78cf45 100644
--- a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/processor/SegmentGeneratorFrameProcessorFactory.java
+++ b/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/processor/SegmentGeneratorFrameProcessorFactory.java
@@ -151,7 +151,7 @@ public ProcessorsAndChannels<DataSegment, Set<DataSegment>> makeProcessors(
     final Sequence<Pair<Integer, ReadableInput>> inputSequence =
         Sequences.simple(Iterables.transform(
             inputSliceReader.attach(0, slice, counters, warningPublisher),
-            new Function<ReadableInput, Pair<Integer, ReadableInput>>()
+            new Function<>()
             {
               int i = 0;
 
@@ -237,7 +237,7 @@ public boolean usesProcessingBuffers()
   @Override
   public TypeReference<Set<DataSegment>> getResultTypeReference()
   {
-    return new TypeReference<Set<DataSegment>>() {};
+    return new TypeReference<>() {};
   }
 
   @Nullable
diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/input/external/ExternalSegment.java b/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/input/external/ExternalSegment.java
index 4b69a930b1a6..3aae435b8d99 100644
--- a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/input/external/ExternalSegment.java
+++ b/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/input/external/ExternalSegment.java
@@ -76,7 +76,7 @@ public CloseableIterator<InputRow> make()
               {
                 try {
                   CloseableIterator<InputRow> baseIterator = reader.read(inputStats);
-                  return new CloseableIterator<InputRow>()
+                  return new CloseableIterator<>()
                   {
                     private InputRow next = null;
 
diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/querykit/BaseFrameProcessorFactory.java b/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/querykit/BaseFrameProcessorFactory.java
index 33f702aca0cc..4540af086cd5 100644
--- a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/querykit/BaseFrameProcessorFactory.java
+++ b/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/querykit/BaseFrameProcessorFactory.java
@@ -37,7 +37,7 @@ public abstract class BaseFrameProcessorFactory implements FrameProcessorFactory
   @Override
   public TypeReference<Long> getResultTypeReference()
   {
-    return new TypeReference<Long>() {};
+    return new TypeReference<>() {};
   }
 
   @Override
diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/querykit/results/ExportResultsFrameProcessorFactory.java b/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/querykit/results/ExportResultsFrameProcessorFactory.java
index d4ba2120c9c3..468f18214236 100644
--- a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/querykit/results/ExportResultsFrameProcessorFactory.java
+++ b/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/querykit/results/ExportResultsFrameProcessorFactory.java
@@ -184,7 +184,7 @@ public ProcessorsAndChannels<Object, Object> makeProcessors(
   @Override
   public TypeReference<Object> getResultTypeReference()
   {
-    return new TypeReference<Object>() {};
+    return new TypeReference<>() {};
   }
 
   @Override
diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/rpc/BaseWorkerClientImpl.java b/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/rpc/BaseWorkerClientImpl.java
index d3428a6c3428..8e4f9678d056 100644
--- a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/rpc/BaseWorkerClientImpl.java
+++ b/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/rpc/BaseWorkerClientImpl.java
@@ -190,7 +190,7 @@ public ListenableFuture<CounterSnapshotsTree> getCounters(String workerId)
             new RequestBuilder(HttpMethod.GET, "/counters").header(HttpHeaders.ACCEPT, contentType),
             new BytesFullResponseHandler()
         ),
-        holder -> deserialize(holder, new TypeReference<CounterSnapshotsTree>() {})
+        holder -> deserialize(holder, new TypeReference<>() {})
     );
   }
 
@@ -216,7 +216,7 @@ public ListenableFuture<Boolean> fetchChannelData(
 
     Futures.addCallback(
         clientFuture,
-        new FutureCallback<FrameFilePartialFetch>()
+        new FutureCallback<>()
         {
           @Override
           public void onSuccess(FrameFilePartialFetch partialFetch)
diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/rpc/WorkerResource.java b/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/rpc/WorkerResource.java
index fd6207662af8..0cc784cf36dd 100644
--- a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/rpc/WorkerResource.java
+++ b/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/rpc/WorkerResource.java
@@ -144,7 +144,7 @@ public void onStartAsync(AsyncEvent event)
 
     Futures.addCallback(
         dataFuture,
-        new FutureCallback<InputStream>()
+        new FutureCallback<>()
         {
           @Override
           public void onSuccess(final InputStream inputStream)
diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/shuffle/input/WorkerInputChannelFactory.java b/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/shuffle/input/WorkerInputChannelFactory.java
index 4dde34a67f59..84bf1cccb9d4 100644
--- a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/shuffle/input/WorkerInputChannelFactory.java
+++ b/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/shuffle/input/WorkerInputChannelFactory.java
@@ -74,7 +74,7 @@ private void fetch(
 
     Futures.addCallback(
         fetchFuture,
-        new FutureCallback<Boolean>()
+        new FutureCallback<>()
         {
           @Override
           public void onSuccess(final Boolean lastFetch)
diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/util/MSQFutureUtils.java b/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/util/MSQFutureUtils.java
index 1635a7964198..15f8d3143483 100644
--- a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/util/MSQFutureUtils.java
+++ b/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/util/MSQFutureUtils.java
@@ -47,7 +47,7 @@ public static <T> ListenableFuture<List<T>> allAsList(
     if (cancelOnErrorOrInterrupt) {
       Futures.addCallback(
           retVal,
-          new FutureCallback<List<T>>()
+          new FutureCallback<>()
           {
             @Override
             public void onSuccess(@Nullable List<T> result)
diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/util/MultiStageQueryContext.java b/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/util/MultiStageQueryContext.java
index 7112a101c04f..f3cb66fd27a4 100644
--- a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/util/MultiStageQueryContext.java
+++ b/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/util/MultiStageQueryContext.java
@@ -448,9 +448,7 @@ static List<String> decodeList(final String keyName, @Nullable final String list
       try {
         // Not caching this ObjectMapper in a static, because we expect to use it infrequently (once per INSERT
         // query that uses this feature) and there is no need to keep it around longer than that.
-        return new ObjectMapper().readValue(listString, new TypeReference<List<String>>()
-        {
-        });
+        return new ObjectMapper().readValue(listString, new TypeReference<>() {});
       }
       catch (JsonProcessingException e) {
         throw QueryContexts.badValueException(keyName, "CSV or JSON array", listString);
diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/util/SqlStatementResourceHelper.java b/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/util/SqlStatementResourceHelper.java
index 0820342ba727..f70dd81caee0 100644
--- a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/util/SqlStatementResourceHelper.java
+++ b/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/util/SqlStatementResourceHelper.java
@@ -321,7 +321,7 @@ public static Sequence<Object[]> getResultSequence(
                             .map(mapping -> columnSelectorFactory.makeColumnValueSelector(mapping.getQueryColumn()))
                             .collect(Collectors.toList());
 
-    final Iterable<Object[]> retVal = () -> new Iterator<Object[]>()
+    final Iterable<Object[]> retVal = () -> new Iterator<>()
     {
       @Override
       public boolean hasNext()
diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/dart/controller/http/DartSqlResourceTest.java b/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/dart/controller/http/DartSqlResourceTest.java
index 51e17235203d..981f96fbe2a8 100644
--- a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/dart/controller/http/DartSqlResourceTest.java
+++ b/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/dart/controller/http/DartSqlResourceTest.java
@@ -571,7 +571,7 @@ public void test_doPost_regularUser_fullReport() throws Exception
 
     final List<List<TaskReport.ReportMap>> reportMaps = objectMapper.readValue(
         asyncResponse.baos.toByteArray(),
-        new TypeReference<List<List<TaskReport.ReportMap>>>() {}
+        new TypeReference<>() {}
     );
 
     Assertions.assertEquals(1, reportMaps.size());
@@ -610,7 +610,7 @@ public void test_doPost_regularUser_runtimeError_fullReport() throws Exception
 
     final List<List<TaskReport.ReportMap>> reportMaps = objectMapper.readValue(
         asyncResponse.baos.toByteArray(),
-        new TypeReference<List<List<TaskReport.ReportMap>>>() {}
+        new TypeReference<>() {}
     );
 
     Assertions.assertEquals(1, reportMaps.size());
diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/indexing/TaskReportQueryListenerTest.java b/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/indexing/TaskReportQueryListenerTest.java
index 11c33d215170..252419f7227a 100644
--- a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/indexing/TaskReportQueryListenerTest.java
+++ b/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/indexing/TaskReportQueryListenerTest.java
@@ -114,7 +114,7 @@ public void test_taskReportDestination() throws IOException
     final TaskReport.ReportMap reportMap =
         JSON_MAPPER.readValue(
             baos.toByteArray(),
-            new TypeReference<TaskReport.ReportMap>() {}
+            new TypeReference<>() {}
         );
 
     Assert.assertEquals(ImmutableSet.of("multiStageQuery", TaskContextReport.REPORT_KEY), reportMap.keySet());
@@ -183,7 +183,7 @@ public void test_durableDestination() throws IOException
     final TaskReport.ReportMap reportMap =
         JSON_MAPPER.readValue(
             baos.toByteArray(),
-            new TypeReference<TaskReport.ReportMap>() {}
+            new TypeReference<>() {}
         );
 
     Assert.assertEquals(ImmutableSet.of("multiStageQuery", TaskContextReport.REPORT_KEY), reportMap.keySet());
diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/querykit/scan/ScanQueryFrameProcessorTest.java b/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/querykit/scan/ScanQueryFrameProcessorTest.java
index 96957da53213..21e3707f00fd 100644
--- a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/querykit/scan/ScanQueryFrameProcessorTest.java
+++ b/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/querykit/scan/ScanQueryFrameProcessorTest.java
@@ -120,7 +120,7 @@ public void test_runWithSegments() throws Exception
             )
         ),
         Function.identity(),
-        new ResourceHolder<WritableFrameChannel>()
+        new ResourceHolder<>()
         {
           @Override
           public WritableFrameChannel get()
@@ -214,7 +214,7 @@ public void test_runWithInputChannel() throws Exception
         new DefaultObjectMapper(),
         ReadableInput.channel(inputChannel.readable(), FrameReader.create(signature), stagePartition),
         Function.identity(),
-        new ResourceHolder<WritableFrameChannel>()
+        new ResourceHolder<>()
         {
           @Override
           public WritableFrameChannel get()
diff --git a/extensions-core/orc-extensions/src/main/java/org/apache/druid/data/input/orc/OrcReader.java b/extensions-core/orc-extensions/src/main/java/org/apache/druid/data/input/orc/OrcReader.java
index 3f4c0386d46a..de49086cc01b 100644
--- a/extensions-core/orc-extensions/src/main/java/org/apache/druid/data/input/orc/OrcReader.java
+++ b/extensions-core/orc-extensions/src/main/java/org/apache/druid/data/input/orc/OrcReader.java
@@ -105,7 +105,7 @@ protected CloseableIterator<OrcStruct> intermediateRowIterator() throws IOExcept
     final RecordReader batchReader = reader.rows(reader.options());
     final OrcMapredRecordReader<OrcStruct> recordReader = new OrcMapredRecordReader<>(batchReader, schema);
     closer.register(recordReader::close);
-    return new CloseableIterator<OrcStruct>()
+    return new CloseableIterator<>()
     {
       final NullWritable key = recordReader.createKey();
       OrcStruct value = null;
diff --git a/extensions-core/parquet-extensions/src/main/java/org/apache/druid/data/input/parquet/ParquetReader.java b/extensions-core/parquet-extensions/src/main/java/org/apache/druid/data/input/parquet/ParquetReader.java
index 0bc5f374a0cf..26b5d6d4774b 100644
--- a/extensions-core/parquet-extensions/src/main/java/org/apache/druid/data/input/parquet/ParquetReader.java
+++ b/extensions-core/parquet-extensions/src/main/java/org/apache/druid/data/input/parquet/ParquetReader.java
@@ -101,7 +101,7 @@ protected CloseableIterator<Group> intermediateRowIterator() throws IOException
       Thread.currentThread().setContextClassLoader(currentClassLoader);
     }
 
-    return new CloseableIterator<Group>()
+    return new CloseableIterator<>()
     {
       Group value = null;
 
diff --git a/extensions-core/postgresql-metadata-storage/src/main/java/org/apache/druid/metadata/storage/postgresql/PostgreSQLConnector.java b/extensions-core/postgresql-metadata-storage/src/main/java/org/apache/druid/metadata/storage/postgresql/PostgreSQLConnector.java
index f0b9ba0b4a0b..765e12aa39a8 100644
--- a/extensions-core/postgresql-metadata-storage/src/main/java/org/apache/druid/metadata/storage/postgresql/PostgreSQLConnector.java
+++ b/extensions-core/postgresql-metadata-storage/src/main/java/org/apache/druid/metadata/storage/postgresql/PostgreSQLConnector.java
@@ -187,7 +187,7 @@ public Void insertOrUpdate(
   )
   {
     return getDBI().withHandle(
-        new HandleCallback<Void>()
+        new HandleCallback<>()
         {
           @Override
           public Void withHandle(Handle handle) throws Exception
diff --git a/extensions-core/s3-extensions/src/main/java/org/apache/druid/storage/s3/S3DataSegmentMover.java b/extensions-core/s3-extensions/src/main/java/org/apache/druid/storage/s3/S3DataSegmentMover.java
index d7c92a309f12..770fe356e498 100644
--- a/extensions-core/s3-extensions/src/main/java/org/apache/druid/storage/s3/S3DataSegmentMover.java
+++ b/extensions-core/s3-extensions/src/main/java/org/apache/druid/storage/s3/S3DataSegmentMover.java
@@ -100,7 +100,7 @@ public DataSegment move(DataSegment segment, Map<String, Object> targetLoadSpec)
               .putAll(
                   Maps.filterKeys(
                       loadSpec,
-                      new Predicate<String>()
+                      new Predicate<>()
                       {
                         @Override
                         public boolean apply(String input)
diff --git a/extensions-core/s3-extensions/src/main/java/org/apache/druid/storage/s3/S3Utils.java b/extensions-core/s3-extensions/src/main/java/org/apache/druid/storage/s3/S3Utils.java
index 0e7dd016ae2a..11bf1f613f02 100644
--- a/extensions-core/s3-extensions/src/main/java/org/apache/druid/storage/s3/S3Utils.java
+++ b/extensions-core/s3-extensions/src/main/java/org/apache/druid/storage/s3/S3Utils.java
@@ -70,7 +70,7 @@ public class S3Utils
    */
   public static final String ERROR_ENTITY_TOO_LARGE = "EntityTooLarge";
 
-  public static final Predicate<Throwable> S3RETRY = new Predicate<Throwable>()
+  public static final Predicate<Throwable> S3RETRY = new Predicate<>()
   {
     @Override
     public boolean apply(Throwable e)
diff --git a/extensions-core/s3-extensions/src/main/java/org/apache/druid/storage/s3/output/S3StorageConnector.java b/extensions-core/s3-extensions/src/main/java/org/apache/druid/storage/s3/output/S3StorageConnector.java
index 9ea0e7a8ae03..99d0207bc282 100644
--- a/extensions-core/s3-extensions/src/main/java/org/apache/druid/storage/s3/output/S3StorageConnector.java
+++ b/extensions-core/s3-extensions/src/main/java/org/apache/druid/storage/s3/output/S3StorageConnector.java
@@ -121,7 +121,7 @@ public ChunkingStorageConnectorParameters<GetObjectRequest> buildInputParams(Str
     builder.maxRetry(config.getMaxRetry());
     builder.retryCondition(S3Utils.S3RETRY);
     builder.objectSupplier((start, end) -> new GetObjectRequest(config.getBucket(), objectPath(path)).withRange(start, end - 1));
-    builder.objectOpenFunction(new ObjectOpenFunction<GetObjectRequest>()
+    builder.objectOpenFunction(new ObjectOpenFunction<>()
     {
       @Override
       public InputStream open(GetObjectRequest object)
diff --git a/extensions-core/s3-extensions/src/test/java/org/apache/druid/data/input/s3/S3InputSourceTest.java b/extensions-core/s3-extensions/src/test/java/org/apache/druid/data/input/s3/S3InputSourceTest.java
index bbb1b294abf7..4f14364e7222 100644
--- a/extensions-core/s3-extensions/src/test/java/org/apache/druid/data/input/s3/S3InputSourceTest.java
+++ b/extensions-core/s3-extensions/src/test/java/org/apache/druid/data/input/s3/S3InputSourceTest.java
@@ -1352,8 +1352,8 @@ public List<? extends Module> getJacksonModules()
       // See https://github.com/FasterXML/jackson-databind/issues/962.
       return ImmutableList.of(
           new SimpleModule()
-              .addDeserializer(AmazonS3.class, new ItemDeserializer<AmazonS3>())
-              .addDeserializer(AmazonS3ClientBuilder.class, new ItemDeserializer<AmazonS3ClientBuilder>())
+              .addDeserializer(AmazonS3.class, new ItemDeserializer<>())
+              .addDeserializer(AmazonS3ClientBuilder.class, new ItemDeserializer<>())
       );
     }
 
diff --git a/indexing-hadoop/src/main/java/org/apache/druid/indexer/DetermineHashedPartitionsJob.java b/indexing-hadoop/src/main/java/org/apache/druid/indexer/DetermineHashedPartitionsJob.java
index 1d0c3c4b14fc..2328552efb7b 100644
--- a/indexing-hadoop/src/main/java/org/apache/druid/indexer/DetermineHashedPartitionsJob.java
+++ b/indexing-hadoop/src/main/java/org/apache/druid/indexer/DetermineHashedPartitionsJob.java
@@ -159,9 +159,7 @@ public boolean run()
         }
         List<Interval> intervals = HadoopDruidIndexerConfig.JSON_MAPPER.readValue(
             Utils.openInputStream(groupByJob, intervalInfoPath),
-            new TypeReference<List<Interval>>()
-            {
-            }
+            new TypeReference<>() {}
         );
         config.setGranularitySpec(
             new UniformGranularitySpec(
diff --git a/indexing-hadoop/src/main/java/org/apache/druid/indexer/DeterminePartitionsJob.java b/indexing-hadoop/src/main/java/org/apache/druid/indexer/DeterminePartitionsJob.java
index 7b0973826295..82b04c5bb8aa 100644
--- a/indexing-hadoop/src/main/java/org/apache/druid/indexer/DeterminePartitionsJob.java
+++ b/indexing-hadoop/src/main/java/org/apache/druid/indexer/DeterminePartitionsJob.java
@@ -272,9 +272,7 @@ public boolean run()
         }
         if (Utils.exists(dimSelectionJob, fileSystem, partitionInfoPath)) {
           List<ShardSpec> specs = HadoopDruidIndexerConfig.JSON_MAPPER.readValue(
-              Utils.openInputStream(dimSelectionJob, partitionInfoPath), new TypeReference<List<ShardSpec>>()
-              {
-              }
+              Utils.openInputStream(dimSelectionJob, partitionInfoPath), new TypeReference<>() {}
           );
 
           List<HadoopyShardSpec> actualSpecs = Lists.newArrayListWithExpectedSize(specs.size());
@@ -619,7 +617,7 @@ protected abstract void innerReduce(
 
     private static Iterable<DimValueCount> combineRows(Iterable<Text> input)
     {
-      final Comparator<List<String>> dimsComparator = new Comparator<List<String>>()
+      final Comparator<List<String>> dimsComparator = new Comparator<>()
       {
         @Override
         public int compare(List<String> o1, List<String> o2)
diff --git a/indexing-hadoop/src/main/java/org/apache/druid/indexer/HadoopDruidIndexerConfig.java b/indexing-hadoop/src/main/java/org/apache/druid/indexer/HadoopDruidIndexerConfig.java
index c38084813ff2..2d46563c9056 100644
--- a/indexing-hadoop/src/main/java/org/apache/druid/indexer/HadoopDruidIndexerConfig.java
+++ b/indexing-hadoop/src/main/java/org/apache/druid/indexer/HadoopDruidIndexerConfig.java
@@ -488,7 +488,7 @@ Optional<Iterable<Bucket>> getAllBuckets()
                     return FunctionalIterable
                         .create(specs)
                         .transform(
-                            new Function<HadoopyShardSpec, Bucket>()
+                            new Function<>()
                             {
                               int i = 0;
 
diff --git a/indexing-hadoop/src/main/java/org/apache/druid/indexer/JobHelper.java b/indexing-hadoop/src/main/java/org/apache/druid/indexer/JobHelper.java
index 538b2eaecea1..ce042451d753 100644
--- a/indexing-hadoop/src/main/java/org/apache/druid/indexer/JobHelper.java
+++ b/indexing-hadoop/src/main/java/org/apache/druid/indexer/JobHelper.java
@@ -179,7 +179,7 @@ public static void setupClasspath(
 
   public static Predicate<Throwable> shouldRetryPredicate()
   {
-    return new Predicate<Throwable>()
+    return new Predicate<>()
     {
       @Override
       public boolean apply(Throwable input)
diff --git a/indexing-hadoop/src/main/java/org/apache/druid/indexer/Utils.java b/indexing-hadoop/src/main/java/org/apache/druid/indexer/Utils.java
index 19dfe3093a52..79ed14ad961c 100644
--- a/indexing-hadoop/src/main/java/org/apache/druid/indexer/Utils.java
+++ b/indexing-hadoop/src/main/java/org/apache/druid/indexer/Utils.java
@@ -232,9 +232,7 @@ private static void checkAppSuccessFromYarnRMOnce(
     log.info("App status response from YARN RM: " + res.getContentAsString());
     Map<String, Object> respMap = HadoopDruidIndexerConfig.JSON_MAPPER.readValue(
         res.getContentAsString(),
-        new TypeReference<Map<String, Object>>()
-        {
-        }
+        new TypeReference<>() {}
     );
 
     Map<String, Object> appMap = (Map<String, Object>) respMap.get("app");
diff --git a/indexing-hadoop/src/main/java/org/apache/druid/indexer/hadoop/DatasourceInputFormat.java b/indexing-hadoop/src/main/java/org/apache/druid/indexer/hadoop/DatasourceInputFormat.java
index dee0d11b10dd..788b4987a38f 100644
--- a/indexing-hadoop/src/main/java/org/apache/druid/indexer/hadoop/DatasourceInputFormat.java
+++ b/indexing-hadoop/src/main/java/org/apache/druid/indexer/hadoop/DatasourceInputFormat.java
@@ -139,7 +139,7 @@ public RecordReader<NullWritable, InputRow> createRecordReader(
     return new DatasourceRecordReader();
   }
 
-  private Supplier<org.apache.hadoop.mapred.InputFormat> supplier = new Supplier<org.apache.hadoop.mapred.InputFormat>()
+  private Supplier<org.apache.hadoop.mapred.InputFormat> supplier = new Supplier<>()
   {
     @Override
     public org.apache.hadoop.mapred.InputFormat get()
@@ -253,7 +253,7 @@ public static List<String> getDataSources(final Configuration conf) throws IOExc
 
     return HadoopDruidIndexerConfig.JSON_MAPPER.readValue(
         currentDatasources,
-        new TypeReference<List<String>>() {}
+        new TypeReference<>() {}
     );
   }
 
@@ -286,7 +286,7 @@ public static List<WindowedDataSegment> getSegments(final Configuration conf, fi
   {
     return HadoopDruidIndexerConfig.JSON_MAPPER.readValue(
         conf.get(StringUtils.format("%s.%s", CONF_SEGMENTS, dataSource)),
-        new TypeReference<List<WindowedDataSegment>>() {}
+        new TypeReference<>() {}
     );
   }
 
diff --git a/indexing-hadoop/src/main/java/org/apache/druid/indexer/hadoop/DatasourceInputSplit.java b/indexing-hadoop/src/main/java/org/apache/druid/indexer/hadoop/DatasourceInputSplit.java
index e842adeed1a7..a2cd03e2a22e 100644
--- a/indexing-hadoop/src/main/java/org/apache/druid/indexer/hadoop/DatasourceInputSplit.java
+++ b/indexing-hadoop/src/main/java/org/apache/druid/indexer/hadoop/DatasourceInputSplit.java
@@ -91,9 +91,7 @@ public void readFields(DataInput in) throws IOException
     in.readFully(buf);
     segments = HadoopDruidIndexerConfig.JSON_MAPPER.readValue(
         buf,
-        new TypeReference<List<WindowedDataSegment>>()
-        {
-        }
+        new TypeReference<>() {}
     );
     locations = new String[in.readInt()];
     for (int i = 0; i < locations.length; i++) {
diff --git a/indexing-hadoop/src/main/java/org/apache/druid/indexer/hadoop/DatasourceRecordReader.java b/indexing-hadoop/src/main/java/org/apache/druid/indexer/hadoop/DatasourceRecordReader.java
index 5ef56583f7c6..b604937b1b01 100644
--- a/indexing-hadoop/src/main/java/org/apache/druid/indexer/hadoop/DatasourceRecordReader.java
+++ b/indexing-hadoop/src/main/java/org/apache/druid/indexer/hadoop/DatasourceRecordReader.java
@@ -100,7 +100,7 @@ public void initialize(InputSplit split, final TaskAttemptContext context) throw
 
     List<WindowedCursorFactory> adapters = Lists.transform(
         segments,
-        new Function<WindowedDataSegment, WindowedCursorFactory>()
+        new Function<>()
         {
           @Override
           public WindowedCursorFactory apply(WindowedDataSegment segment)
@@ -205,7 +205,7 @@ public SegmentReader(
       Sequence<InputRow> rows = Sequences.concat(
           Iterables.transform(
               cursorFactories,
-              new Function<WindowedCursorFactory, Sequence<InputRow>>()
+              new Function<>()
               {
                 @Nullable
                 @Override
@@ -247,7 +247,7 @@ public Sequence<InputRow> apply(WindowedCursorFactory windowed)
                         @Override
                         public Iterator<InputRow> iterator()
                         {
-                          return new Iterator<InputRow>()
+                          return new Iterator<>()
                           {
                             @Override
                             public boolean hasNext()
diff --git a/indexing-hadoop/src/main/java/org/apache/druid/indexer/hadoop/FSSpideringIterator.java b/indexing-hadoop/src/main/java/org/apache/druid/indexer/hadoop/FSSpideringIterator.java
index 9c76cdd6c55a..8355b354989e 100644
--- a/indexing-hadoop/src/main/java/org/apache/druid/indexer/hadoop/FSSpideringIterator.java
+++ b/indexing-hadoop/src/main/java/org/apache/druid/indexer/hadoop/FSSpideringIterator.java
@@ -50,7 +50,7 @@ public static FSSpideringIterator spiderPathPropagateExceptions(FileSystem fs, P
 
   public static Iterable<FileStatus> spiderIterable(final FileSystem fs, final Path path)
   {
-    return new Iterable<FileStatus>()
+    return new Iterable<>()
     {
       @Override
       public Iterator<FileStatus> iterator()
diff --git a/indexing-hadoop/src/test/java/org/apache/druid/indexer/IndexGeneratorJobTest.java b/indexing-hadoop/src/test/java/org/apache/druid/indexer/IndexGeneratorJobTest.java
index 241746ca58d6..a53850704e65 100644
--- a/indexing-hadoop/src/test/java/org/apache/druid/indexer/IndexGeneratorJobTest.java
+++ b/indexing-hadoop/src/test/java/org/apache/druid/indexer/IndexGeneratorJobTest.java
@@ -491,7 +491,7 @@ public void setUp() throws Exception
     dataFile = temporaryFolder.newFile();
     tmpDir = temporaryFolder.newFolder();
 
-    HashMap<String, Object> inputSpec = new HashMap<String, Object>();
+    HashMap<String, Object> inputSpec = new HashMap<>();
     inputSpec.put("paths", dataFile.getCanonicalPath());
     inputSpec.put("type", "static");
     if (inputFormatName != null) {
diff --git a/indexing-hadoop/src/test/java/org/apache/druid/indexer/JobHelperTest.java b/indexing-hadoop/src/test/java/org/apache/druid/indexer/JobHelperTest.java
index 530c0f657a51..d7825aa01478 100644
--- a/indexing-hadoop/src/test/java/org/apache/druid/indexer/JobHelperTest.java
+++ b/indexing-hadoop/src/test/java/org/apache/druid/indexer/JobHelperTest.java
@@ -311,7 +311,7 @@ public void progress()
   private static class HadoopDruidIndexerConfigSpy extends HadoopDruidIndexerConfig
   {
 
-    private Map<String, String> jobProperties = new HashMap<String, String>();
+    private Map<String, String> jobProperties = new HashMap<>();
 
     public HadoopDruidIndexerConfigSpy(HadoopDruidIndexerConfig delegate)
     {
diff --git a/indexing-hadoop/src/test/java/org/apache/druid/indexer/hadoop/DatasourceInputFormatTest.java b/indexing-hadoop/src/test/java/org/apache/druid/indexer/hadoop/DatasourceInputFormatTest.java
index 2da6b210e87e..562ba7f19abc 100644
--- a/indexing-hadoop/src/test/java/org/apache/druid/indexer/hadoop/DatasourceInputFormatTest.java
+++ b/indexing-hadoop/src/test/java/org/apache/druid/indexer/hadoop/DatasourceInputFormatTest.java
@@ -213,7 +213,7 @@ private static <T extends Configuration> T populateConfiguration(
     return conf;
   }
 
-  private Supplier<InputFormat> testFormatter = new Supplier<InputFormat>()
+  private Supplier<InputFormat> testFormatter = new Supplier<>()
   {
     @Override
     public InputFormat get()
diff --git a/indexing-hadoop/src/test/java/org/apache/druid/indexer/hadoop/FSSpideringIteratorTest.java b/indexing-hadoop/src/test/java/org/apache/druid/indexer/hadoop/FSSpideringIteratorTest.java
index 896ee8460741..f028eeeeec32 100644
--- a/indexing-hadoop/src/test/java/org/apache/druid/indexer/hadoop/FSSpideringIteratorTest.java
+++ b/indexing-hadoop/src/test/java/org/apache/druid/indexer/hadoop/FSSpideringIteratorTest.java
@@ -63,7 +63,7 @@ public void testNonEmptyDirs()
                   FileSystem.getLocal(new Configuration()),
                   new Path(baseDir.toString())
               ),
-              new Function<FileStatus, String>()
+              new Function<>()
               {
                 @Override
                 public String apply(@Nullable FileStatus input)
@@ -111,7 +111,7 @@ public void testEmptyDirs()
                   FileSystem.getLocal(new Configuration()),
                   new Path(baseDir.toString())
               ),
-              new Function<FileStatus, String>()
+              new Function<>()
               {
                 @Override
                 public String apply(@Nullable FileStatus input)
diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/CheckPointDataSourceMetadataAction.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/CheckPointDataSourceMetadataAction.java
index e319dc242660..23fce6740c5d 100644
--- a/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/CheckPointDataSourceMetadataAction.java
+++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/CheckPointDataSourceMetadataAction.java
@@ -106,9 +106,7 @@ public SeekableStreamDataSourceMetadata getCheckpointMetadata()
   @Override
   public TypeReference<Boolean> getReturnTypeReference()
   {
-    return new TypeReference<Boolean>()
-    {
-    };
+    return new TypeReference<>() {};
   }
 
   @Override
diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/LockListAction.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/LockListAction.java
index c60c57407984..cc7c2907fd18 100644
--- a/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/LockListAction.java
+++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/LockListAction.java
@@ -30,7 +30,7 @@ public class LockListAction implements TaskAction<List<TaskLock>>
   @Override
   public TypeReference<List<TaskLock>> getReturnTypeReference()
   {
-    return new TypeReference<List<TaskLock>>() {};
+    return new TypeReference<>() {};
   }
 
   @Override
diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/LockReleaseAction.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/LockReleaseAction.java
index 32974117cc7b..63f97bae69c7 100644
--- a/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/LockReleaseAction.java
+++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/LockReleaseAction.java
@@ -46,7 +46,7 @@ public Interval getInterval()
   @Override
   public TypeReference<Void> getReturnTypeReference()
   {
-    return new TypeReference<Void>() {};
+    return new TypeReference<>() {};
   }
 
   @Override
diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/MarkSegmentsAsUnusedAction.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/MarkSegmentsAsUnusedAction.java
index 35a8ed3e35c0..a3341022f625 100644
--- a/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/MarkSegmentsAsUnusedAction.java
+++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/MarkSegmentsAsUnusedAction.java
@@ -55,9 +55,7 @@ public Interval getInterval()
   @Override
   public TypeReference<Integer> getReturnTypeReference()
   {
-    return new TypeReference<Integer>()
-    {
-    };
+    return new TypeReference<>() {};
   }
 
   @Override
diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/ResetDataSourceMetadataAction.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/ResetDataSourceMetadataAction.java
index 42259b381830..1310b0f69acf 100644
--- a/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/ResetDataSourceMetadataAction.java
+++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/ResetDataSourceMetadataAction.java
@@ -53,9 +53,7 @@ public DataSourceMetadata getResetMetadata()
   @Override
   public TypeReference<Boolean> getReturnTypeReference()
   {
-    return new TypeReference<Boolean>()
-    {
-    };
+    return new TypeReference<>() {};
   }
 
   @Override
diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/RetrieveSegmentsByIdAction.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/RetrieveSegmentsByIdAction.java
index a4ca90ac62ed..e20096745a7b 100644
--- a/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/RetrieveSegmentsByIdAction.java
+++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/RetrieveSegmentsByIdAction.java
@@ -62,9 +62,7 @@ public Set<String> getSegmentIds()
   @Override
   public TypeReference<Set<DataSegment>> getReturnTypeReference()
   {
-    return new TypeReference<Set<DataSegment>>()
-    {
-    };
+    return new TypeReference<>() {};
   }
 
   @Override
diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/RetrieveUnusedSegmentsAction.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/RetrieveUnusedSegmentsAction.java
index fb58328b3d76..a43540cb98ec 100644
--- a/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/RetrieveUnusedSegmentsAction.java
+++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/RetrieveUnusedSegmentsAction.java
@@ -91,7 +91,7 @@ public DateTime getMaxUsedStatusLastUpdatedTime()
   @Override
   public TypeReference<List<DataSegment>> getReturnTypeReference()
   {
-    return new TypeReference<List<DataSegment>>() {};
+    return new TypeReference<>() {};
   }
 
   @Override
diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/RetrieveUpgradedFromSegmentIdsAction.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/RetrieveUpgradedFromSegmentIdsAction.java
index 4f54131dee6f..2f86f568c450 100644
--- a/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/RetrieveUpgradedFromSegmentIdsAction.java
+++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/RetrieveUpgradedFromSegmentIdsAction.java
@@ -59,9 +59,7 @@ public Set<String> getSegmentIds()
   @Override
   public TypeReference<UpgradedFromSegmentsResponse> getReturnTypeReference()
   {
-    return new TypeReference<UpgradedFromSegmentsResponse>()
-    {
-    };
+    return new TypeReference<>() {};
   }
 
   @Override
diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/RetrieveUpgradedToSegmentIdsAction.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/RetrieveUpgradedToSegmentIdsAction.java
index 256a663a1a47..ab2547ecb7ef 100644
--- a/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/RetrieveUpgradedToSegmentIdsAction.java
+++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/RetrieveUpgradedToSegmentIdsAction.java
@@ -64,9 +64,7 @@ public Set<String> getSegmentIds()
   @Override
   public TypeReference<UpgradedToSegmentsResponse> getReturnTypeReference()
   {
-    return new TypeReference<UpgradedToSegmentsResponse>()
-    {
-    };
+    return new TypeReference<>() {};
   }
 
   @Override
diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/RetrieveUsedSegmentsAction.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/RetrieveUsedSegmentsAction.java
index 473976efd1ea..51bec50a600e 100644
--- a/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/RetrieveUsedSegmentsAction.java
+++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/RetrieveUsedSegmentsAction.java
@@ -107,7 +107,7 @@ public Segments getVisibility()
   @Override
   public TypeReference<Collection<DataSegment>> getReturnTypeReference()
   {
-    return new TypeReference<Collection<DataSegment>>() {};
+    return new TypeReference<>() {};
   }
 
   @Override
diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/SegmentAllocateAction.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/SegmentAllocateAction.java
index 902dad5dd879..c9581318e711 100644
--- a/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/SegmentAllocateAction.java
+++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/SegmentAllocateAction.java
@@ -184,9 +184,7 @@ public TaskLockType getTaskLockType()
   @Override
   public TypeReference<SegmentIdWithShardSpec> getReturnTypeReference()
   {
-    return new TypeReference<SegmentIdWithShardSpec>()
-    {
-    };
+    return new TypeReference<>() {};
   }
 
   @Override
diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/SegmentLockAcquireAction.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/SegmentLockAcquireAction.java
index e17af3847ca8..ac922a6aae25 100644
--- a/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/SegmentLockAcquireAction.java
+++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/SegmentLockAcquireAction.java
@@ -93,9 +93,7 @@ public long getTimeoutMs()
   @Override
   public TypeReference<LockResult> getReturnTypeReference()
   {
-    return new TypeReference<LockResult>()
-    {
-    };
+    return new TypeReference<>() {};
   }
 
   @Override
diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/SegmentLockTryAcquireAction.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/SegmentLockTryAcquireAction.java
index c5084eb61cda..b54004bd3574 100644
--- a/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/SegmentLockTryAcquireAction.java
+++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/SegmentLockTryAcquireAction.java
@@ -86,9 +86,7 @@ public Set<Integer> getPartitionIds()
   @Override
   public TypeReference<List<LockResult>> getReturnTypeReference()
   {
-    return new TypeReference<List<LockResult>>()
-    {
-    };
+    return new TypeReference<>() {};
   }
 
   @Override
diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/SegmentMetadataUpdateAction.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/SegmentMetadataUpdateAction.java
index b2a5ee5843be..af3f535422b6 100644
--- a/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/SegmentMetadataUpdateAction.java
+++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/SegmentMetadataUpdateAction.java
@@ -56,7 +56,7 @@ public Set<DataSegment> getSegments()
   @Override
   public TypeReference<Void> getReturnTypeReference()
   {
-    return new TypeReference<Void>() {};
+    return new TypeReference<>() {};
   }
 
   @Override
diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/SegmentNukeAction.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/SegmentNukeAction.java
index 326907c8f0a5..84445d3968a5 100644
--- a/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/SegmentNukeAction.java
+++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/SegmentNukeAction.java
@@ -56,9 +56,7 @@ public Set<DataSegment> getSegments()
   @Override
   public TypeReference<Void> getReturnTypeReference()
   {
-    return new TypeReference<Void>()
-    {
-    };
+    return new TypeReference<>() {};
   }
 
   @Override
diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/SegmentTransactionalAppendAction.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/SegmentTransactionalAppendAction.java
index 2326176885b3..ea3a4fd36d2a 100644
--- a/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/SegmentTransactionalAppendAction.java
+++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/SegmentTransactionalAppendAction.java
@@ -132,9 +132,7 @@ public SegmentSchemaMapping getSegmentSchemaMapping()
   @Override
   public TypeReference<SegmentPublishResult> getReturnTypeReference()
   {
-    return new TypeReference<SegmentPublishResult>()
-    {
-    };
+    return new TypeReference<>() {};
   }
 
   @Override
diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/SegmentTransactionalInsertAction.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/SegmentTransactionalInsertAction.java
index e8dd472cf31d..fb988e78e5d4 100644
--- a/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/SegmentTransactionalInsertAction.java
+++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/SegmentTransactionalInsertAction.java
@@ -169,9 +169,7 @@ public SegmentSchemaMapping getSegmentSchemaMapping()
   @Override
   public TypeReference<SegmentPublishResult> getReturnTypeReference()
   {
-    return new TypeReference<SegmentPublishResult>()
-    {
-    };
+    return new TypeReference<>() {};
   }
 
   /**
diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/SegmentTransactionalReplaceAction.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/SegmentTransactionalReplaceAction.java
index 572f4aa3f284..6546ed80d9d9 100644
--- a/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/SegmentTransactionalReplaceAction.java
+++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/SegmentTransactionalReplaceAction.java
@@ -105,9 +105,7 @@ public SegmentSchemaMapping getSegmentSchemaMapping()
   @Override
   public TypeReference<SegmentPublishResult> getReturnTypeReference()
   {
-    return new TypeReference<SegmentPublishResult>()
-    {
-    };
+    return new TypeReference<>() {};
   }
 
   /**
diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/TimeChunkLockAcquireAction.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/TimeChunkLockAcquireAction.java
index 42f4e40d0e64..1b9f60353a6f 100644
--- a/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/TimeChunkLockAcquireAction.java
+++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/TimeChunkLockAcquireAction.java
@@ -76,9 +76,7 @@ public long getTimeoutMs()
   @Override
   public TypeReference<TaskLock> getReturnTypeReference()
   {
-    return new TypeReference<TaskLock>()
-    {
-    };
+    return new TypeReference<>() {};
   }
 
   @Override
diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/TimeChunkLockTryAcquireAction.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/TimeChunkLockTryAcquireAction.java
index b2dc6e3d5e62..5bbb7999c61c 100644
--- a/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/TimeChunkLockTryAcquireAction.java
+++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/TimeChunkLockTryAcquireAction.java
@@ -65,9 +65,7 @@ public Interval getInterval()
   @Override
   public TypeReference<TaskLock> getReturnTypeReference()
   {
-    return new TypeReference<TaskLock>()
-    {
-    };
+    return new TypeReference<>() {};
   }
 
   @Override
diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/UpdateLocationAction.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/UpdateLocationAction.java
index 2c7c265a7f40..6bce838fc5c0 100644
--- a/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/UpdateLocationAction.java
+++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/UpdateLocationAction.java
@@ -48,9 +48,7 @@ public TaskLocation getTaskLocation()
   @Override
   public TypeReference<Void> getReturnTypeReference()
   {
-    return new TypeReference<Void>()
-    {
-    };
+    return new TypeReference<>() {};
   }
 
   @Override
diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/UpdateStatusAction.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/UpdateStatusAction.java
index d02020acb9d0..e5170c79eac2 100644
--- a/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/UpdateStatusAction.java
+++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/actions/UpdateStatusAction.java
@@ -68,9 +68,7 @@ public TaskStatus getStatusFull()
   @Override
   public TypeReference<Void> getReturnTypeReference()
   {
-    return new TypeReference<Void>()
-    {
-    };
+    return new TypeReference<>() {};
   }
 
   @Override
diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/common/task/AbstractBatchIndexTask.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/AbstractBatchIndexTask.java
index fe7f1e1134fc..08c5accea335 100644
--- a/indexing-service/src/main/java/org/apache/druid/indexing/common/task/AbstractBatchIndexTask.java
+++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/AbstractBatchIndexTask.java
@@ -639,7 +639,7 @@ public static Function<Set<DataSegment>, Set<DataSegment>> addCompactionStateToS
                                           : new ClientCompactionTaskTransformSpec(ingestionSpec.getDataSchema().getTransformSpec().getFilter()).asMap(toolbox.getJsonMapper());
       List<Object> metricsSpec = ingestionSpec.getDataSchema().getAggregators() == null
                                  ? null
-                                 : toolbox.getJsonMapper().convertValue(ingestionSpec.getDataSchema().getAggregators(), new TypeReference<List<Object>>() {});
+                                 : toolbox.getJsonMapper().convertValue(ingestionSpec.getDataSchema().getAggregators(), new TypeReference<>() {});
 
       return CompactionState.addCompactionStateToSegments(
           tuningConfig.getPartitionsSpec(),
diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/common/task/HadoopIndexTask.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/HadoopIndexTask.java
index 61f647ea5059..a8927d2fe1d3 100644
--- a/indexing-service/src/main/java/org/apache/druid/indexing/common/task/HadoopIndexTask.java
+++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/HadoopIndexTask.java
@@ -921,9 +921,7 @@ public String[] runTask(String[] args) throws Exception
   public static class HadoopRenameSegmentIndexFilesRunner
   {
     TypeReference<List<DataSegmentAndIndexZipFilePath>> LIST_DATA_SEGMENT_AND_INDEX_ZIP_FILE_PATH =
-        new TypeReference<List<DataSegmentAndIndexZipFilePath>>()
-        {
-        };
+        new TypeReference<>() {};
 
     public void runTask(String[] args) throws Exception
     {
@@ -963,9 +961,7 @@ public void runTask(String[] args) throws Exception
   public static class HadoopIndexerGeneratorCleanupRunner
   {
     TypeReference<List<DataSegmentAndIndexZipFilePath>> LIST_DATA_SEGMENT_AND_INDEX_ZIP_FILE_PATH =
-        new TypeReference<List<DataSegmentAndIndexZipFilePath>>()
-        {
-        };
+        new TypeReference<>() {};
 
     public void runTask(String[] args) throws Exception
     {
diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/common/task/HadoopTask.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/HadoopTask.java
index a15b77b90d18..a239025ee05d 100644
--- a/indexing-service/src/main/java/org/apache/druid/indexing/common/task/HadoopTask.java
+++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/HadoopTask.java
@@ -81,7 +81,7 @@ public List<String> getHadoopDependencyCoordinates()
   // This is only used for classpath isolation in the runTask isolation stuff, so it shooouuullldddd be ok.
   /** {@link #buildClassLoader(TaskToolbox)} has outdated javadocs referencing this field, TODO update */
   @SuppressWarnings("unused")
-  protected static final Predicate<URL> IS_DRUID_URL = new Predicate<URL>()
+  protected static final Predicate<URL> IS_DRUID_URL = new Predicate<>()
   {
     @Override
     public boolean apply(@Nullable URL input)
diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/ParallelIndexPhaseRunner.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/ParallelIndexPhaseRunner.java
index 96e4292926c2..579c1e492c38 100644
--- a/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/ParallelIndexPhaseRunner.java
+++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/ParallelIndexPhaseRunner.java
@@ -247,7 +247,7 @@ private void submitNewTask(
     final ListenableFuture<SubTaskCompleteEvent<SubTaskType>> future = taskMonitor.submit(spec);
     Futures.addCallback(
         future,
-        new FutureCallback<SubTaskCompleteEvent<SubTaskType>>()
+        new FutureCallback<>()
         {
           @Override
           public void onSuccess(SubTaskCompleteEvent<SubTaskType> completeEvent)
diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/PartialDimensionCardinalityParallelIndexTaskRunner.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/PartialDimensionCardinalityParallelIndexTaskRunner.java
index f297bfc2002f..686bf9e5dc8a 100644
--- a/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/PartialDimensionCardinalityParallelIndexTaskRunner.java
+++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/PartialDimensionCardinalityParallelIndexTaskRunner.java
@@ -68,7 +68,7 @@ SubTaskSpec<PartialDimensionCardinalityTask> createSubTaskSpec(
       ParallelIndexIngestionSpec subTaskIngestionSpec
   )
   {
-    return new SubTaskSpec<PartialDimensionCardinalityTask>(
+    return new SubTaskSpec<>(
         id,
         groupId,
         supervisorTaskId,
diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/PartialDimensionDistributionParallelIndexTaskRunner.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/PartialDimensionDistributionParallelIndexTaskRunner.java
index a6c332b3907d..d18bdae97486 100644
--- a/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/PartialDimensionDistributionParallelIndexTaskRunner.java
+++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/PartialDimensionDistributionParallelIndexTaskRunner.java
@@ -295,7 +295,7 @@ SubTaskSpec<PartialDimensionDistributionTask> createSubTaskSpec(
       ParallelIndexIngestionSpec subTaskIngestionSpec
   )
   {
-    return new SubTaskSpec<PartialDimensionDistributionTask>(
+    return new SubTaskSpec<>(
         id,
         groupId,
         supervisorTaskId,
diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/PartialGenericSegmentMergeParallelIndexTaskRunner.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/PartialGenericSegmentMergeParallelIndexTaskRunner.java
index 8babf50d8265..f469385ec546 100644
--- a/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/PartialGenericSegmentMergeParallelIndexTaskRunner.java
+++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/PartialGenericSegmentMergeParallelIndexTaskRunner.java
@@ -83,7 +83,7 @@ SubTaskSpec<PartialGenericSegmentMergeTask> newTaskSpec(PartialSegmentMergeIOCon
         getTuningConfig()
     );
     final String subtaskSpecId = getBaseSubtaskSpecName() + "_" + getAndIncrementNextSpecId();
-    return new SubTaskSpec<PartialGenericSegmentMergeTask>(
+    return new SubTaskSpec<>(
         subtaskSpecId,
         getGroupId(),
         getTaskId(),
diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/PartialHashSegmentGenerateParallelIndexTaskRunner.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/PartialHashSegmentGenerateParallelIndexTaskRunner.java
index 3bb9a1544f5d..dfd7e27466f2 100644
--- a/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/PartialHashSegmentGenerateParallelIndexTaskRunner.java
+++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/PartialHashSegmentGenerateParallelIndexTaskRunner.java
@@ -67,7 +67,7 @@ SubTaskSpec<PartialHashSegmentGenerateTask> createSubTaskSpec(
       ParallelIndexIngestionSpec subTaskIngestionSpec
   )
   {
-    return new SubTaskSpec<PartialHashSegmentGenerateTask>(
+    return new SubTaskSpec<>(
         id,
         groupId,
         supervisorTaskId,
diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/PartialRangeSegmentGenerateParallelIndexTaskRunner.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/PartialRangeSegmentGenerateParallelIndexTaskRunner.java
index d37b432965b3..c6049e2379cb 100644
--- a/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/PartialRangeSegmentGenerateParallelIndexTaskRunner.java
+++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/PartialRangeSegmentGenerateParallelIndexTaskRunner.java
@@ -66,7 +66,7 @@ SubTaskSpec<PartialRangeSegmentGenerateTask> createSubTaskSpec(
       ParallelIndexIngestionSpec subTaskIngestionSpec
   )
   {
-    return new SubTaskSpec<PartialRangeSegmentGenerateTask>(
+    return new SubTaskSpec<>(
         id,
         groupId,
         supervisorTaskId,
diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/input/DruidSegmentReader.java b/indexing-service/src/main/java/org/apache/druid/indexing/input/DruidSegmentReader.java
index d2da00f38c87..2e4d64799aaa 100644
--- a/indexing-service/src/main/java/org/apache/druid/indexing/input/DruidSegmentReader.java
+++ b/indexing-service/src/main/java/org/apache/druid/indexing/input/DruidSegmentReader.java
@@ -195,7 +195,7 @@ static CloseableIterator<Map<String, Object>> makeCloseableIteratorFromSequenceA
       final CleanableFile segmentFile
   )
   {
-    return new CloseableIterator<Map<String, Object>>()
+    return new CloseableIterator<>()
     {
       Yielder<Map<String, Object>> rowYielder = Yielders.each(sequence);
 
diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/input/DruidTombstoneSegmentReader.java b/indexing-service/src/main/java/org/apache/druid/indexing/input/DruidTombstoneSegmentReader.java
index a8b98dd7d0f8..39a0bc3848bd 100644
--- a/indexing-service/src/main/java/org/apache/druid/indexing/input/DruidTombstoneSegmentReader.java
+++ b/indexing-service/src/main/java/org/apache/druid/indexing/input/DruidTombstoneSegmentReader.java
@@ -47,7 +47,7 @@ public DruidTombstoneSegmentReader(
   @Override
   protected CloseableIterator<Map<String, Object>> intermediateRowIterator()
   {
-    return new CloseableIterator<Map<String, Object>>()
+    return new CloseableIterator<>()
     {
       @Override
       public void close()
diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/input/GeneratorInputSource.java b/indexing-service/src/main/java/org/apache/druid/indexing/input/GeneratorInputSource.java
index b5dc706f3747..6228d341cf4c 100644
--- a/indexing-service/src/main/java/org/apache/druid/indexing/input/GeneratorInputSource.java
+++ b/indexing-service/src/main/java/org/apache/druid/indexing/input/GeneratorInputSource.java
@@ -165,7 +165,7 @@ protected InputSourceReader fixedFormatReader(InputRowSchema inputRowSchema, @Nu
       @Override
       public CloseableIterator<InputRow> read(InputStats inputStats)
       {
-        return CloseableIterators.withEmptyBaggage(new Iterator<InputRow>()
+        return CloseableIterators.withEmptyBaggage(new Iterator<>()
         {
           int rowCount = 0;
           private final DataGenerator generator = makeGenerator();
@@ -191,7 +191,7 @@ public InputRow next()
       @Override
       public CloseableIterator<InputRowListPlusRawValues> sample()
       {
-        return CloseableIterators.withEmptyBaggage(new Iterator<InputRowListPlusRawValues>()
+        return CloseableIterators.withEmptyBaggage(new Iterator<>()
         {
           int rowCount = 0;
           private final DataGenerator generator = makeGenerator();
diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/overlord/ForkingTaskRunner.java b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/ForkingTaskRunner.java
index 1a34c76e33fb..d51d919a295e 100644
--- a/indexing-service/src/main/java/org/apache/druid/indexing/overlord/ForkingTaskRunner.java
+++ b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/ForkingTaskRunner.java
@@ -168,7 +168,7 @@ public ListenableFuture<TaskStatus> run(final Task task)
           new ForkingTaskRunnerWorkItem(
             task,
             exec.submit(
-              new Callable<TaskStatus>() {
+              new Callable<>() {
                 @Override
                 public TaskStatus call()
                 {
@@ -244,7 +244,9 @@ public TaskStatus call()
 
                         command.add(config.getJavaCommand());
 
-                        command.addAll(STRONG_ENCAPSULATION_PROPERTIES);
+                        if (JvmUtils.majorVersion() >= 11) {
+                          command.addAll(STRONG_ENCAPSULATION_PROPERTIES);
+                        }
 
                         command.add("-cp");
                         command.add(taskClasspath);
@@ -271,7 +273,7 @@ public TaskStatus call()
                         try {
                           List<String> taskJavaOptsArray = jsonMapper.convertValue(
                               task.getContextValue(ForkingTaskRunnerConfig.JAVA_OPTS_ARRAY_PROPERTY),
-                              new TypeReference<List<String>>() {}
+                              new TypeReference<>() {}
                           );
                           if (taskJavaOptsArray != null) {
                             command.addAll(taskJavaOptsArray);
diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/overlord/MetadataTaskStorage.java b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/MetadataTaskStorage.java
index 3608f0238992..683b9e805492 100644
--- a/indexing-service/src/main/java/org/apache/druid/indexing/overlord/MetadataTaskStorage.java
+++ b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/MetadataTaskStorage.java
@@ -57,30 +57,24 @@
 public class MetadataTaskStorage implements TaskStorage
 {
 
-  private static final MetadataStorageActionHandlerTypes<Task, TaskStatus, TaskAction, TaskLock> TASK_TYPES = new MetadataStorageActionHandlerTypes<Task, TaskStatus, TaskAction, TaskLock>()
+  private static final MetadataStorageActionHandlerTypes<Task, TaskStatus, TaskAction, TaskLock> TASK_TYPES = new MetadataStorageActionHandlerTypes<>()
   {
     @Override
     public TypeReference<Task> getEntryType()
     {
-      return new TypeReference<Task>()
-      {
-      };
+      return new TypeReference<>() {};
     }
 
     @Override
     public TypeReference<TaskStatus> getStatusType()
     {
-      return new TypeReference<TaskStatus>()
-      {
-      };
+      return new TypeReference<>() {};
     }
 
     @Override
     public TypeReference<TaskLock> getLockType()
     {
-      return new TypeReference<TaskLock>()
-      {
-      };
+      return new TypeReference<>() {};
     }
   };
 
diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/overlord/RemoteTaskRunner.java b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/RemoteTaskRunner.java
index 4fd7b57f38b5..4a4f0a084649 100644
--- a/indexing-service/src/main/java/org/apache/druid/indexing/overlord/RemoteTaskRunner.java
+++ b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/RemoteTaskRunner.java
@@ -248,7 +248,7 @@ public void start()
                 }
                 Futures.addCallback(
                     addWorker(worker),
-                    new FutureCallback<ZkWorker>()
+                    new FutureCallback<>()
                     {
                       @Override
                       public void onSuccess(ZkWorker zkWorker)
diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/overlord/TaskLockbox.java b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/TaskLockbox.java
index 2c1b78d3adab..1e1a43994925 100644
--- a/indexing-service/src/main/java/org/apache/druid/indexing/overlord/TaskLockbox.java
+++ b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/TaskLockbox.java
@@ -146,7 +146,7 @@ public TaskLockboxSyncResult syncFromStorage()
         }
       }
       // Sort locks by version, so we add them back in the order they were acquired.
-      final Ordering<Pair<Task, TaskLock>> byVersionOrdering = new Ordering<Pair<Task, TaskLock>>()
+      final Ordering<Pair<Task, TaskLock>> byVersionOrdering = new Ordering<>()
       {
         @Override
         public int compare(Pair<Task, TaskLock> left, Pair<Task, TaskLock> right)
diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/overlord/TaskQueue.java b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/TaskQueue.java
index ea8f1a56ed85..94f691eecb75 100644
--- a/indexing-service/src/main/java/org/apache/druid/indexing/overlord/TaskQueue.java
+++ b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/TaskQueue.java
@@ -741,7 +741,7 @@ private void attachCallbacks(final Task task, final ListenableFuture<TaskStatus>
 
     Futures.addCallback(
         statusFuture,
-        new FutureCallback<TaskStatus>()
+        new FutureCallback<>()
         {
           @Override
           public void onSuccess(final TaskStatus status)
diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/overlord/ThreadingTaskRunner.java b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/ThreadingTaskRunner.java
index 70b4a927af90..909163049f27 100644
--- a/indexing-service/src/main/java/org/apache/druid/indexing/overlord/ThreadingTaskRunner.java
+++ b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/ThreadingTaskRunner.java
@@ -151,7 +151,8 @@ public ListenableFuture<TaskStatus> run(Task task)
               new ThreadingTaskRunnerWorkItem(
                   task,
                   taskExecutor.submit(
-                      new Callable<TaskStatus>() {
+                      new Callable<>()
+                      {
                         @Override
                         public TaskStatus call()
                         {
diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/overlord/autoscaling/PendingTaskBasedWorkerProvisioningStrategy.java b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/autoscaling/PendingTaskBasedWorkerProvisioningStrategy.java
index 6990973e564f..0d715b53549f 100644
--- a/indexing-service/src/main/java/org/apache/druid/indexing/overlord/autoscaling/PendingTaskBasedWorkerProvisioningStrategy.java
+++ b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/autoscaling/PendingTaskBasedWorkerProvisioningStrategy.java
@@ -117,7 +117,7 @@ public PendingTaskBasedWorkerProvisioningStrategy(
         config,
         workerConfigRef,
         provisioningSchedulerConfig,
-        new Supplier<ScheduledExecutorService>()
+        new Supplier<>()
         {
           @Override
           public ScheduledExecutorService get()
@@ -178,7 +178,7 @@ public synchronized boolean doProvision()
       final Collection<String> workerNodeIds = getWorkerNodeIDs(
           Collections2.transform(
               workers,
-              new Function<ImmutableWorkerInfo, Worker>()
+              new Function<>()
               {
                 @Override
                 public Worker apply(ImmutableWorkerInfo input)
@@ -378,7 +378,7 @@ public synchronized boolean doTerminate()
         final Collection<String> laziestWorkerIps =
             Collections2.transform(
                 runner.markWorkersLazy(isLazyWorker, maxWorkersToTerminate),
-                new Function<Worker, String>()
+                new Function<>()
                 {
                   @Override
                   public String apply(Worker zkWorker)
diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/overlord/autoscaling/ProvisioningUtil.java b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/autoscaling/ProvisioningUtil.java
index 6eb7e05305cf..162597e08b42 100644
--- a/indexing-service/src/main/java/org/apache/druid/indexing/overlord/autoscaling/ProvisioningUtil.java
+++ b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/autoscaling/ProvisioningUtil.java
@@ -29,7 +29,7 @@ public static Predicate<ImmutableWorkerInfo> createValidWorkerPredicate(
       final SimpleWorkerProvisioningConfig config
   )
   {
-    return new Predicate<ImmutableWorkerInfo>()
+    return new Predicate<>()
     {
       @Override
       public boolean apply(ImmutableWorkerInfo worker)
@@ -49,7 +49,7 @@ public static Predicate<ImmutableWorkerInfo> createLazyWorkerPredicate(
   {
     final Predicate<ImmutableWorkerInfo> isValidWorker = createValidWorkerPredicate(config);
 
-    return new Predicate<ImmutableWorkerInfo>()
+    return new Predicate<>()
     {
       @Override
       public boolean apply(ImmutableWorkerInfo worker)
diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/overlord/autoscaling/SimpleWorkerProvisioningStrategy.java b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/autoscaling/SimpleWorkerProvisioningStrategy.java
index afdaa57c565d..fc0397393df7 100644
--- a/indexing-service/src/main/java/org/apache/druid/indexing/overlord/autoscaling/SimpleWorkerProvisioningStrategy.java
+++ b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/autoscaling/SimpleWorkerProvisioningStrategy.java
@@ -68,7 +68,7 @@ public SimpleWorkerProvisioningStrategy(
         config,
         workerConfigRef,
         provisioningSchedulerConfig,
-        new Supplier<ScheduledExecutorService>()
+        new Supplier<>()
         {
           @Override
           public ScheduledExecutorService get()
@@ -133,7 +133,7 @@ public synchronized boolean doProvision()
           Lists.newArrayList(
               Iterables.transform(
                   workers,
-                  new Function<ImmutableWorkerInfo, String>()
+                  new Function<>()
                   {
                     @Override
                     public String apply(ImmutableWorkerInfo input)
@@ -197,7 +197,7 @@ public synchronized boolean doTerminate()
               Lists.newArrayList(
                   Iterables.transform(
                       runner.getLazyWorkers(),
-                      new Function<Worker, String>()
+                      new Function<>()
                       {
                         @Override
                         public String apply(Worker input)
@@ -223,7 +223,7 @@ public String apply(Worker input)
           final Collection<String> laziestWorkerIps =
               Collections2.transform(
                   runner.markWorkersLazy(isLazyWorker, excessWorkers),
-                  new Function<Worker, String>()
+                  new Function<>()
                   {
                     @Override
                     public String apply(Worker worker)
diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/overlord/hrtr/WorkerHolder.java b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/hrtr/WorkerHolder.java
index 6294318ec54c..9d177c654109 100644
--- a/indexing-service/src/main/java/org/apache/druid/indexing/overlord/hrtr/WorkerHolder.java
+++ b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/hrtr/WorkerHolder.java
@@ -62,9 +62,7 @@ public class WorkerHolder
 {
   private static final EmittingLogger log = new EmittingLogger(WorkerHolder.class);
 
-  public static final TypeReference<ChangeRequestsSnapshot<WorkerHistoryItem>> WORKER_SYNC_RESP_TYPE_REF = new TypeReference<ChangeRequestsSnapshot<WorkerHistoryItem>>()
-  {
-  };
+  public static final TypeReference<ChangeRequestsSnapshot<WorkerHistoryItem>> WORKER_SYNC_RESP_TYPE_REF = new TypeReference<>() {};
 
 
   private final Worker worker;
@@ -318,7 +316,7 @@ public ChangeRequestHttpSyncer<WorkerHistoryItem> getUnderlyingSyncer()
 
   public ChangeRequestHttpSyncer.Listener<WorkerHistoryItem> createSyncListener()
   {
-    return new ChangeRequestHttpSyncer.Listener<WorkerHistoryItem>()
+    return new ChangeRequestHttpSyncer.Listener<>()
     {
       @Override
       public void fullSync(List<WorkerHistoryItem> changes)
diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/overlord/http/OverlordResource.java b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/http/OverlordResource.java
index 84bf260b6f99..fc2b00ad6f58 100644
--- a/indexing-service/src/main/java/org/apache/druid/indexing/overlord/http/OverlordResource.java
+++ b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/http/OverlordResource.java
@@ -512,7 +512,7 @@ public Response doAction(final TaskActionHolder holder)
   {
     return asLeaderWith(
         taskMaster.getTaskActionClient(holder.getTask()),
-        new Function<TaskActionClient, Response>()
+        new Function<>()
         {
           @Override
           public Response apply(TaskActionClient taskActionClient)
diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/overlord/http/security/SupervisorResourceFilter.java b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/http/security/SupervisorResourceFilter.java
index 7e9aaa927407..c4be66719913 100644
--- a/indexing-service/src/main/java/org/apache/druid/indexing/overlord/http/security/SupervisorResourceFilter.java
+++ b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/http/security/SupervisorResourceFilter.java
@@ -64,7 +64,7 @@ public ContainerRequest filter(ContainerRequest request)
                .get(
                    Iterables.indexOf(
                        request.getPathSegments(),
-                       new Predicate<PathSegment>()
+                       new Predicate<>()
                        {
                          @Override
                          public boolean apply(PathSegment input)
diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/seekablestream/RecordSupplierInputSource.java b/indexing-service/src/main/java/org/apache/druid/indexing/seekablestream/RecordSupplierInputSource.java
index b9bef3c7314f..96dda8ca88a7 100644
--- a/indexing-service/src/main/java/org/apache/druid/indexing/seekablestream/RecordSupplierInputSource.java
+++ b/indexing-service/src/main/java/org/apache/druid/indexing/seekablestream/RecordSupplierInputSource.java
@@ -137,7 +137,7 @@ protected InputSourceReader formattableReader(
    */
   CloseableIterator<InputEntity> createEntityIterator()
   {
-    return new CloseableIterator<InputEntity>()
+    return new CloseableIterator<>()
     {
       private Iterator<OrderedPartitionableRecord<PartitionIdType, SequenceOffsetType, RecordType>> recordIterator;
       private Iterator<? extends ByteEntity> bytesIterator;
diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/seekablestream/SeekableStreamIndexTaskClient.java b/indexing-service/src/main/java/org/apache/druid/indexing/seekablestream/SeekableStreamIndexTaskClient.java
index 7fd282e44ce2..484ad15f7cd6 100644
--- a/indexing-service/src/main/java/org/apache/druid/indexing/seekablestream/SeekableStreamIndexTaskClient.java
+++ b/indexing-service/src/main/java/org/apache/druid/indexing/seekablestream/SeekableStreamIndexTaskClient.java
@@ -32,7 +32,7 @@
 public interface SeekableStreamIndexTaskClient<PartitionIdType, SequenceOffsetType>
 {
   TypeReference<List<ParseExceptionReport>> TYPE_REFERENCE_LIST_PARSE_EXCEPTION_REPORT =
-      new TypeReference<List<ParseExceptionReport>>() {};
+      new TypeReference<>() {};
 
   /**
    * Retrieve current task checkpoints.
diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/seekablestream/SeekableStreamIndexTaskClientAsyncImpl.java b/indexing-service/src/main/java/org/apache/druid/indexing/seekablestream/SeekableStreamIndexTaskClientAsyncImpl.java
index 5de1cb50a971..6af2735e995b 100644
--- a/indexing-service/src/main/java/org/apache/druid/indexing/seekablestream/SeekableStreamIndexTaskClientAsyncImpl.java
+++ b/indexing-service/src/main/java/org/apache/druid/indexing/seekablestream/SeekableStreamIndexTaskClientAsyncImpl.java
@@ -412,7 +412,7 @@ private ListenableFuture<Map<PartitionIdType, SequenceOffsetType>> getOffsetsWhe
                   () ->
                       Futures.addCallback(
                           getOffsetsWhenPaused(taskId, retryPolicy),
-                          new FutureCallback<Map<PartitionIdType, SequenceOffsetType>>()
+                          new FutureCallback<>()
                           {
                             @Override
                             public void onSuccess(@Nullable Map<PartitionIdType, SequenceOffsetType> result)
@@ -567,7 +567,7 @@ public ListenableFuture<T> go()
               client.asyncRequest(requestBuilder.timeout(httpTimeout), responseHandler),
               responseTransformer
           ),
-          new FutureCallback<T>()
+          new FutureCallback<>()
           {
             @Override
             public void onSuccess(@Nullable T result)
diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/seekablestream/SeekableStreamIndexTaskClientFactory.java b/indexing-service/src/main/java/org/apache/druid/indexing/seekablestream/SeekableStreamIndexTaskClientFactory.java
index c3b4e69f8327..92acb3a33296 100644
--- a/indexing-service/src/main/java/org/apache/druid/indexing/seekablestream/SeekableStreamIndexTaskClientFactory.java
+++ b/indexing-service/src/main/java/org/apache/druid/indexing/seekablestream/SeekableStreamIndexTaskClientFactory.java
@@ -70,7 +70,7 @@ public SeekableStreamIndexTaskClient<PartitionIdType, SequenceOffsetType> build(
         tuningConfig.getChatRetries()
     );
 
-    return new SeekableStreamIndexTaskClientAsyncImpl<PartitionIdType, SequenceOffsetType>(
+    return new SeekableStreamIndexTaskClientAsyncImpl<>(
         dataSource,
         new ServiceClientFactoryImpl(httpClient, connectExec),
         taskInfoProvider,
diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/seekablestream/SeekableStreamIndexTaskRunner.java b/indexing-service/src/main/java/org/apache/druid/indexing/seekablestream/SeekableStreamIndexTaskRunner.java
index a2db12d005e9..fddd8f8e4536 100644
--- a/indexing-service/src/main/java/org/apache/druid/indexing/seekablestream/SeekableStreamIndexTaskRunner.java
+++ b/indexing-service/src/main/java/org/apache/druid/indexing/seekablestream/SeekableStreamIndexTaskRunner.java
@@ -711,7 +711,7 @@ public void run()
               if (isPersistRequired) {
                 Futures.addCallback(
                     driver.persistAsync(committerSupplier.get()),
-                    new FutureCallback<Object>()
+                    new FutureCallback<>()
                     {
                       @Override
                       public void onSuccess(@Nullable Object result)
@@ -1022,7 +1022,7 @@ private void publishAndRegisterHandoff(SequenceMetadata<PartitionIdType, Sequenc
 
     Futures.addCallback(
         publishFuture,
-        new FutureCallback<SegmentsAndCommitMetadata>()
+        new FutureCallback<>()
         {
           @Override
           public void onSuccess(SegmentsAndCommitMetadata publishedSegmentsAndCommitMetadata)
diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/seekablestream/SeekableStreamSamplerSpec.java b/indexing-service/src/main/java/org/apache/druid/indexing/seekablestream/SeekableStreamSamplerSpec.java
index 4705f3337229..dddb46012891 100644
--- a/indexing-service/src/main/java/org/apache/druid/indexing/seekablestream/SeekableStreamSamplerSpec.java
+++ b/indexing-service/src/main/java/org/apache/druid/indexing/seekablestream/SeekableStreamSamplerSpec.java
@@ -193,7 +193,7 @@ public SeekableStreamSamplerInputSourceReader(InputRowParser parser)
     @Override
     public CloseableIterator<InputRow> read()
     {
-      return new CloseableIterator<InputRow>()
+      return new CloseableIterator<>()
       {
 
         @Override
@@ -225,7 +225,7 @@ public CloseableIterator<InputRow> read(InputStats inputStats)
     @Override
     public CloseableIterator<InputRowListPlusRawValues> sample()
     {
-      return new CloseableIterator<InputRowListPlusRawValues>()
+      return new CloseableIterator<>()
       {
         @Override
         public boolean hasNext()
diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/seekablestream/supervisor/SeekableStreamSupervisor.java b/indexing-service/src/main/java/org/apache/druid/indexing/seekablestream/supervisor/SeekableStreamSupervisor.java
index 8b4845b08d07..43b3ba895bb9 100644
--- a/indexing-service/src/main/java/org/apache/druid/indexing/seekablestream/supervisor/SeekableStreamSupervisor.java
+++ b/indexing-service/src/main/java/org/apache/druid/indexing/seekablestream/supervisor/SeekableStreamSupervisor.java
@@ -2064,7 +2064,7 @@ private void discoverTasks() throws ExecutionException, InterruptedException
           futures.add(
               Futures.transform(
                   getStatusAndPossiblyEndOffsets(taskId),
-                  new Function<Pair<SeekableStreamIndexTaskRunner.Status, Map<PartitionIdType, SequenceOffsetType>>, Boolean>()
+                  new Function<>()
                   {
                     @Override
                     public Boolean apply(Pair<SeekableStreamIndexTaskRunner.Status, Map<PartitionIdType, SequenceOffsetType>> pair)
@@ -2100,7 +2100,8 @@ public Boolean apply(Pair<SeekableStreamIndexTaskRunner.Status, Map<PartitionIdT
                             if (sequence.equals(getEndOfPartitionMarker())) {
                               log.info(
                                   "Got end-of-partition(EOS) marker for partition[%s] from task[%s] in discoverTasks, clearing partition offset to refetch from metadata.",
-                                  partition, taskId
+                                  partition,
+                                  taskId
                               );
                               endOffsetsAreInvalid = true;
                               partitionOffsets.put(partition, getNotSetMarker());
@@ -2603,7 +2604,7 @@ private void verifySameSequenceNameForAllTasksInGroup(int groupId)
   private ListenableFuture<Void> stopTask(final String id, final boolean publish)
   {
     return Futures.transform(
-        taskClient.stopAsync(id, publish), new Function<Boolean, Void>()
+        taskClient.stopAsync(id, publish), new Function<>()
         {
           @Nullable
           @Override
@@ -3155,7 +3156,7 @@ private void updateTaskStatus() throws ExecutionException, InterruptedException
           futureTaskIds.add(taskId);
           futures.add(
               Futures.transform(
-                  taskClient.getStartTimeAsync(taskId), new Function<DateTime, Boolean>()
+                  taskClient.getStartTimeAsync(taskId), new Function<>()
                   {
                     @Override
                     public Boolean apply(@Nullable DateTime startTime)
@@ -3377,7 +3378,7 @@ public Map<PartitionIdType, SequenceOffsetType> apply(@Nullable Object input)
 
     return Futures.transformAsync(
         FutureUtils.coalesce(pauseFutures),
-        new AsyncFunction<List<Either<Throwable, Map<PartitionIdType, SequenceOffsetType>>>, Map<PartitionIdType, SequenceOffsetType>>()
+        new AsyncFunction<>()
         {
           @Override
           public ListenableFuture<Map<PartitionIdType, SequenceOffsetType>> apply(List<Either<Throwable, Map<PartitionIdType, SequenceOffsetType>>> input)
diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/worker/WorkerTaskManager.java b/indexing-service/src/main/java/org/apache/druid/indexing/worker/WorkerTaskManager.java
index a1c131ad0f49..8b1153376791 100644
--- a/indexing-service/src/main/java/org/apache/druid/indexing/worker/WorkerTaskManager.java
+++ b/indexing-service/src/main/java/org/apache/druid/indexing/worker/WorkerTaskManager.java
@@ -245,7 +245,7 @@ private void addRunningTask(final Task task, final ListenableFuture<TaskStatus>
     runningTasks.put(task.getId(), new TaskDetails(task));
     Futures.addCallback(
         future,
-        new FutureCallback<TaskStatus>()
+        new FutureCallback<>()
         {
           @Override
           public void onSuccess(TaskStatus result)
diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/worker/executor/ExecutorLifecycle.java b/indexing-service/src/main/java/org/apache/druid/indexing/worker/executor/ExecutorLifecycle.java
index 8784ee044618..44a2d5508ca5 100644
--- a/indexing-service/src/main/java/org/apache/druid/indexing/worker/executor/ExecutorLifecycle.java
+++ b/indexing-service/src/main/java/org/apache/druid/indexing/worker/executor/ExecutorLifecycle.java
@@ -176,7 +176,7 @@ public void start() throws InterruptedException
 
     statusFuture = Futures.transform(
         taskRunner.run(task),
-        new Function<TaskStatus, TaskStatus>()
+        new Function<>()
         {
           @Override
           public TaskStatus apply(TaskStatus taskStatus)
diff --git a/indexing-service/src/test/java/org/apache/druid/indexing/common/task/FilteringCloseableInputRowIteratorTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/FilteringCloseableInputRowIteratorTest.java
index a0b1c101d40c..2b4ffe26f31b 100644
--- a/indexing-service/src/test/java/org/apache/druid/indexing/common/task/FilteringCloseableInputRowIteratorTest.java
+++ b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/FilteringCloseableInputRowIteratorTest.java
@@ -95,7 +95,7 @@ public void testFilterOutRows()
   public void testParseExceptionInDelegateNext()
   {
     // This iterator throws ParseException every other call to next().
-    final CloseableIterator<InputRow> parseExceptionThrowingIterator = new CloseableIterator<InputRow>()
+    final CloseableIterator<InputRow> parseExceptionThrowingIterator = new CloseableIterator<>()
     {
       final int numRowsToIterate = ROWS.size() * 2;
       int nextIdx = 0;
@@ -144,7 +144,7 @@ public void testParseExceptionInPredicateTest()
         ROWS.iterator()
     );
     // This filter throws ParseException every other call to test().
-    final Predicate<InputRow> filter = new Predicate<InputRow>()
+    final Predicate<InputRow> filter = new Predicate<>()
     {
       boolean throwParseException = false;
 
@@ -183,7 +183,7 @@ public boolean test(InputRow inputRow)
   public void testParseExceptionInDelegateHasNext()
   {
     // This iterator throws ParseException every other call to hasNext().
-    final CloseableIterator<InputRow> parseExceptionThrowingIterator = new CloseableIterator<InputRow>()
+    final CloseableIterator<InputRow> parseExceptionThrowingIterator = new CloseableIterator<>()
     {
       final int numRowsToIterate = ROWS.size() * 2;
       int currentIndex = 0;
@@ -229,7 +229,7 @@ public void close()
   public void testNonParseExceptionInDelegateHasNext()
   {
     // This iterator throws ParseException every other call to hasNext().
-    final CloseableIterator<InputRow> parseExceptionThrowingIterator = new CloseableIterator<InputRow>()
+    final CloseableIterator<InputRow> parseExceptionThrowingIterator = new CloseableIterator<>()
     {
       final int numRowsToIterate = ROWS.size() * 2;
       int currentIndex = 0;
@@ -294,7 +294,7 @@ public void testParseExceptionSaveExceptionCause()
   {
 
     // This iterator throws ParseException every other call to hasNext().
-    final CloseableIterator<InputRow> parseExceptionThrowingIterator = new CloseableIterator<InputRow>()
+    final CloseableIterator<InputRow> parseExceptionThrowingIterator = new CloseableIterator<>()
     {
       final int numRowsToIterate = ROWS.size() * 2;
       int currentIndex = 0;
diff --git a/indexing-service/src/test/java/org/apache/druid/indexing/common/task/IndexTaskTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/IndexTaskTest.java
index 7fbd6317d82f..d1e54665f2d7 100644
--- a/indexing-service/src/test/java/org/apache/druid/indexing/common/task/IndexTaskTest.java
+++ b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/IndexTaskTest.java
@@ -2551,9 +2551,7 @@ private IngestionStatsAndErrors getTaskReportData() throws IOException
   {
     TaskReport.ReportMap taskReports = jsonMapper.readValue(
         taskRunner.getTaskReportsFile(),
-        new TypeReference<TaskReport.ReportMap>()
-        {
-        }
+        new TypeReference<>() {}
     );
     return IngestionStatsAndErrors.getPayloadFromTaskReports(taskReports);
   }
diff --git a/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/ParallelIndexPhaseRunnerTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/ParallelIndexPhaseRunnerTest.java
index ade1692ca1c4..5e0b09103c76 100644
--- a/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/ParallelIndexPhaseRunnerTest.java
+++ b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/ParallelIndexPhaseRunnerTest.java
@@ -142,7 +142,7 @@ private static class TestPhaseRunner extends ParallelIndexPhaseRunner<ReportingN
     @Override
     Iterator<SubTaskSpec<ReportingNoopTask>> subTaskSpecIterator()
     {
-      return new Iterator<SubTaskSpec<ReportingNoopTask>>()
+      return new Iterator<>()
       {
         int subTaskCount = 0;
 
diff --git a/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/iterator/IndexTaskInputRowIteratorBuilderTestingFactory.java b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/iterator/IndexTaskInputRowIteratorBuilderTestingFactory.java
index a1821318ba56..dab24fbb3a03 100644
--- a/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/iterator/IndexTaskInputRowIteratorBuilderTestingFactory.java
+++ b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/iterator/IndexTaskInputRowIteratorBuilderTestingFactory.java
@@ -63,7 +63,7 @@ static InputRow createInputRow(DateTime timestamp, List<String> dimensionValues)
 
   static CloseableIterator<InputRow> createInputRowIterator(InputRow inputRow)
   {
-    return new CloseableIterator<InputRow>()
+    return new CloseableIterator<>()
     {
       @Override
       public void close()
diff --git a/indexing-service/src/test/java/org/apache/druid/indexing/input/DruidSegmentReaderTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/input/DruidSegmentReaderTest.java
index 5dcc11c9f1c5..0875cdde8677 100644
--- a/indexing-service/src/test/java/org/apache/druid/indexing/input/DruidSegmentReaderTest.java
+++ b/indexing-service/src/test/java/org/apache/druid/indexing/input/DruidSegmentReaderTest.java
@@ -646,7 +646,7 @@ public void testMakeCloseableIteratorFromSequenceAndSegmentFileCloseYielderOnClo
     MutableBoolean isSequenceClosed = new MutableBoolean(false);
     MutableBoolean isFileClosed = new MutableBoolean(false);
     Sequence<Map<String, Object>> sequence = new BaseSequence<>(
-        new IteratorMaker<Map<String, Object>, Iterator<Map<String, Object>>>()
+        new IteratorMaker<>()
         {
           @Override
           public Iterator<Map<String, Object>> make()
diff --git a/indexing-service/src/test/java/org/apache/druid/indexing/overlord/OverlordBlinkLeadershipTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/overlord/OverlordBlinkLeadershipTest.java
index 3824cc20f85e..af3b81977998 100644
--- a/indexing-service/src/test/java/org/apache/druid/indexing/overlord/OverlordBlinkLeadershipTest.java
+++ b/indexing-service/src/test/java/org/apache/druid/indexing/overlord/OverlordBlinkLeadershipTest.java
@@ -36,7 +36,7 @@ public class OverlordBlinkLeadershipTest
   private RemoteTaskRunnerTestUtils rtrUtils;
   private final TestRemoteTaskRunnerConfig remoteTaskRunnerConfig = new TestRemoteTaskRunnerConfig(new Period("PT5M"));
   private final DefaultWorkerBehaviorConfig defaultWorkerBehaviourConfig = DefaultWorkerBehaviorConfig.defaultConfig();
-  private final Supplier<WorkerBehaviorConfig> workerBehaviorConfigSupplier = new Supplier<WorkerBehaviorConfig>()
+  private final Supplier<WorkerBehaviorConfig> workerBehaviorConfigSupplier = new Supplier<>()
   {
     @Override
     public DefaultWorkerBehaviorConfig get()
diff --git a/indexing-service/src/test/java/org/apache/druid/indexing/overlord/RemoteTaskRunnerTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/overlord/RemoteTaskRunnerTest.java
index 2ab63cd79ee5..8207584f2136 100644
--- a/indexing-service/src/test/java/org/apache/druid/indexing/overlord/RemoteTaskRunnerTest.java
+++ b/indexing-service/src/test/java/org/apache/druid/indexing/overlord/RemoteTaskRunnerTest.java
@@ -454,7 +454,7 @@ public void testBootstrap() throws Exception
     final Set<String> runningTasks = Sets.newHashSet(
         Iterables.transform(
             remoteTaskRunner.getRunningTasks(),
-            new Function<RemoteTaskRunnerWorkItem, String>()
+            new Function<>()
             {
               @Override
               public String apply(RemoteTaskRunnerWorkItem input)
@@ -721,7 +721,7 @@ public void testFindLazyWorkerTaskRunning() throws Exception
     Assert.assertTrue(taskAnnounced(task.getId()));
     mockWorkerRunningTask(task);
     Collection<Worker> lazyworkers = remoteTaskRunner.markWorkersLazy(
-        new Predicate<ImmutableWorkerInfo>()
+        new Predicate<>()
         {
           @Override
           public boolean apply(ImmutableWorkerInfo input)
@@ -742,7 +742,7 @@ public void testFindLazyWorkerForWorkerJustAssignedTask() throws Exception
     remoteTaskRunner.run(task);
     Assert.assertTrue(taskAnnounced(task.getId()));
     Collection<Worker> lazyworkers = remoteTaskRunner.markWorkersLazy(
-        new Predicate<ImmutableWorkerInfo>()
+        new Predicate<>()
         {
           @Override
           public boolean apply(ImmutableWorkerInfo input)
@@ -761,7 +761,7 @@ public void testFindLazyWorkerNotRunningAnyTask() throws Exception
   {
     doSetup();
     Collection<Worker> lazyworkers = remoteTaskRunner.markWorkersLazy(
-        new Predicate<ImmutableWorkerInfo>()
+        new Predicate<>()
         {
           @Override
           public boolean apply(ImmutableWorkerInfo input)
@@ -782,7 +782,7 @@ public void testFindLazyWorkerNotRunningAnyTaskButWithZeroMaxWorkers() throws Ex
   {
     doSetup();
     Collection<Worker> lazyworkers = remoteTaskRunner.markWorkersLazy(
-        new Predicate<ImmutableWorkerInfo>()
+        new Predicate<>()
         {
           @Override
           public boolean apply(ImmutableWorkerInfo input)
diff --git a/indexing-service/src/test/java/org/apache/druid/indexing/overlord/TaskLifecycleTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/overlord/TaskLifecycleTest.java
index abab38bf0c9b..eb1b8e891ecf 100644
--- a/indexing-service/src/test/java/org/apache/druid/indexing/overlord/TaskLifecycleTest.java
+++ b/indexing-service/src/test/java/org/apache/druid/indexing/overlord/TaskLifecycleTest.java
@@ -201,7 +201,7 @@ public TaskLifecycleTest(String taskStorageType)
   @Rule
   public final TemporaryFolder temporaryFolder = new TemporaryFolder();
 
-  private static final Ordering<DataSegment> BY_INTERVAL_ORDERING = new Ordering<DataSegment>()
+  private static final Ordering<DataSegment> BY_INTERVAL_ORDERING = new Ordering<>()
   {
     @Override
     public int compare(DataSegment dataSegment, DataSegment dataSegment2)
@@ -287,7 +287,7 @@ protected InputSourceReader fixedFormatReader(InputRowSchema inputRowSchema, @Nu
         @Override
         public CloseableIterator<InputRow> read(InputStats inputStats)
         {
-          return new CloseableIterator<InputRow>()
+          return new CloseableIterator<>()
           {
             @Override
             public void close()
@@ -777,7 +777,7 @@ public void testKillUnusedSegmentsTask() throws Exception
             "2011-04-01/2011-04-02",
             "2011-04-02/2011-04-03",
             "2011-04-04/2011-04-05"
-        ), new Function<String, DataSegment>()
+        ), new Function<>()
         {
           @Override
           public DataSegment apply(String input)
@@ -874,7 +874,7 @@ public void testKillUnusedSegmentsTaskWithMaxSegmentsToKill() throws Exception
             "2011-04-01/2011-04-02",
             "2011-04-02/2011-04-03",
             "2011-04-04/2011-04-05"
-        ), new Function<String, DataSegment>()
+        ), new Function<>()
         {
           @Override
           public DataSegment apply(String input)
diff --git a/indexing-service/src/test/java/org/apache/druid/indexing/overlord/TestTaskRunner.java b/indexing-service/src/test/java/org/apache/druid/indexing/overlord/TestTaskRunner.java
index 2b97b170be36..2afb2b4dae31 100644
--- a/indexing-service/src/test/java/org/apache/druid/indexing/overlord/TestTaskRunner.java
+++ b/indexing-service/src/test/java/org/apache/druid/indexing/overlord/TestTaskRunner.java
@@ -219,7 +219,7 @@ public ListenableFuture<TaskStatus> run(final Task task)
     runningItems.add(taskRunnerWorkItem);
     Futures.addCallback(
         statusFuture,
-        new FutureCallback<TaskStatus>()
+        new FutureCallback<>()
         {
           @Override
           public void onSuccess(TaskStatus result)
diff --git a/indexing-service/src/test/java/org/apache/druid/indexing/overlord/autoscaling/PendingTaskBasedProvisioningStrategyTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/overlord/autoscaling/PendingTaskBasedProvisioningStrategyTest.java
index 249f510d818c..8a1232b95714 100644
--- a/indexing-service/src/test/java/org/apache/druid/indexing/overlord/autoscaling/PendingTaskBasedProvisioningStrategyTest.java
+++ b/indexing-service/src/test/java/org/apache/druid/indexing/overlord/autoscaling/PendingTaskBasedProvisioningStrategyTest.java
@@ -101,7 +101,7 @@ public void setUp()
         config,
         DSuppliers.of(workerConfig),
         new ProvisioningSchedulerConfig(),
-        new Supplier<ScheduledExecutorService>()
+        new Supplier<>()
         {
           @Override
           public ScheduledExecutorService get()
@@ -127,7 +127,7 @@ public void testGetExpectedWorkerCapacityWithNoWorkerAndHintIsValid()
         config,
         DSuppliers.of(workerConfig),
         new ProvisioningSchedulerConfig(),
-        new Supplier<ScheduledExecutorService>()
+        new Supplier<>()
         {
           @Override
           public ScheduledExecutorService get()
@@ -155,7 +155,7 @@ public void testGetExpectedWorkerCapacityWithNoWorkerAndHintIsNotValid()
         config,
         DSuppliers.of(workerConfig),
         new ProvisioningSchedulerConfig(),
-        new Supplier<ScheduledExecutorService>()
+        new Supplier<>()
         {
           @Override
           public ScheduledExecutorService get()
@@ -278,7 +278,7 @@ public void testProvisionNoCurrentlyRunningWorkerWithCapacityHintSetAndNoPending
         config,
         DSuppliers.of(workerConfig),
         new ProvisioningSchedulerConfig(),
-        new Supplier<ScheduledExecutorService>()
+        new Supplier<>()
         {
           @Override
           public ScheduledExecutorService get()
@@ -329,7 +329,7 @@ public void testProvisionNoCurrentlyRunningWorkerWithCapacityHintSetAndNoPending
         config,
         DSuppliers.of(workerConfig),
         new ProvisioningSchedulerConfig(),
-        new Supplier<ScheduledExecutorService>()
+        new Supplier<>()
         {
           @Override
           public ScheduledExecutorService get()
@@ -493,7 +493,7 @@ public void testProvisionWithPendingTaskAndWorkerCapacityHintSetButNonEmptyCurre
         config,
         DSuppliers.of(workerConfig),
         new ProvisioningSchedulerConfig(),
-        new Supplier<ScheduledExecutorService>()
+        new Supplier<>()
         {
           @Override
           public ScheduledExecutorService get()
@@ -568,7 +568,7 @@ public void testProvisionWithPendingTaskAndWorkerCapacityHintSetButEmptyCurrentl
         config,
         DSuppliers.of(workerConfig),
         new ProvisioningSchedulerConfig(),
-        new Supplier<ScheduledExecutorService>()
+        new Supplier<>()
         {
           @Override
           public ScheduledExecutorService get()
diff --git a/indexing-service/src/test/java/org/apache/druid/indexing/overlord/autoscaling/SimpleProvisioningStrategyTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/overlord/autoscaling/SimpleProvisioningStrategyTest.java
index 7f9739ad55ff..0799b3ba6e43 100644
--- a/indexing-service/src/test/java/org/apache/druid/indexing/overlord/autoscaling/SimpleProvisioningStrategyTest.java
+++ b/indexing-service/src/test/java/org/apache/druid/indexing/overlord/autoscaling/SimpleProvisioningStrategyTest.java
@@ -93,7 +93,7 @@ public void setUp()
         simpleWorkerProvisioningConfig,
         DSuppliers.of(workerConfig),
         schedulerConfig,
-        new Supplier<ScheduledExecutorService>()
+        new Supplier<>()
         {
           @Override
           public ScheduledExecutorService get()
diff --git a/indexing-service/src/test/java/org/apache/druid/indexing/overlord/http/OverlordResourceTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/overlord/http/OverlordResourceTest.java
index 732d586002f8..2837f63e0590 100644
--- a/indexing-service/src/test/java/org/apache/druid/indexing/overlord/http/OverlordResourceTest.java
+++ b/indexing-service/src/test/java/org/apache/druid/indexing/overlord/http/OverlordResourceTest.java
@@ -1076,9 +1076,7 @@ public void testGetLockedIntervals() throws Exception
     final ObjectMapper jsonMapper = TestHelper.makeJsonMapper();
     Map<String, List<Interval>> observedIntervals = jsonMapper.readValue(
         jsonMapper.writeValueAsString(response.getEntity()),
-        new TypeReference<Map<String, List<Interval>>>()
-        {
-        }
+        new TypeReference<>() {}
     );
 
     Assert.assertEquals(expectedIntervals, observedIntervals);
diff --git a/indexing-service/src/test/java/org/apache/druid/indexing/overlord/http/OverlordTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/overlord/http/OverlordTest.java
index f1a8b65a509f..8c5e9e924cc0 100644
--- a/indexing-service/src/test/java/org/apache/druid/indexing/overlord/http/OverlordTest.java
+++ b/indexing-service/src/test/java/org/apache/druid/indexing/overlord/http/OverlordTest.java
@@ -215,7 +215,7 @@ public void setUp() throws Exception
     taskCompletionCountDownLatches.put(badTaskId, new CountDownLatch(1));
     taskCompletionCountDownLatches.put(goodTaskId, new CountDownLatch(1));
 
-    TaskRunnerFactory<MockTaskRunner> taskRunnerFactory = new TaskRunnerFactory<MockTaskRunner>()
+    TaskRunnerFactory<MockTaskRunner> taskRunnerFactory = new TaskRunnerFactory<>()
     {
       private MockTaskRunner runner;
 
@@ -440,7 +440,7 @@ public synchronized ListenableFuture<TaskStatus> run(final Task task)
               "noop_test_task_exec_%s"
           )
       ).submit(
-          new Callable<TaskStatus>()
+          new Callable<>()
           {
             @Override
             public TaskStatus call() throws Exception
@@ -499,7 +499,7 @@ public synchronized Collection<? extends TaskRunnerWorkItem> getRunningTasks()
     {
       return Lists.transform(
           runningTasks,
-          new Function<String, TaskRunnerWorkItem>()
+          new Function<>()
           {
             @Nullable
             @Override
diff --git a/indexing-service/src/test/java/org/apache/druid/indexing/seekablestream/SeekableStreamEndSequenceNumbersTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/seekablestream/SeekableStreamEndSequenceNumbersTest.java
index 9cf29d6cbd25..6f0f5d3b51eb 100644
--- a/indexing-service/src/test/java/org/apache/druid/indexing/seekablestream/SeekableStreamEndSequenceNumbersTest.java
+++ b/indexing-service/src/test/java/org/apache/druid/indexing/seekablestream/SeekableStreamEndSequenceNumbersTest.java
@@ -50,7 +50,7 @@ public void testSerde() throws Exception
     // Check round-trip.
     final SeekableStreamEndSequenceNumbers<Integer, Long> partitions2 = OBJECT_MAPPER.readValue(
         serializedString,
-        new TypeReference<SeekableStreamEndSequenceNumbers<Integer, Long>>() {}
+        new TypeReference<>() {}
     );
 
     Assert.assertEquals("Round trip", partitions, partitions2);
diff --git a/indexing-service/src/test/java/org/apache/druid/indexing/seekablestream/SeekableStreamStartSequenceNumbersTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/seekablestream/SeekableStreamStartSequenceNumbersTest.java
index f632cf61ecf2..9f93648e3821 100644
--- a/indexing-service/src/test/java/org/apache/druid/indexing/seekablestream/SeekableStreamStartSequenceNumbersTest.java
+++ b/indexing-service/src/test/java/org/apache/druid/indexing/seekablestream/SeekableStreamStartSequenceNumbersTest.java
@@ -51,7 +51,7 @@ public void testSerde() throws Exception
     // Check round-trip.
     final SeekableStreamStartSequenceNumbers<Integer, Long> partitions2 = OBJECT_MAPPER.readValue(
         serializedString,
-        new TypeReference<SeekableStreamStartSequenceNumbers<Integer, Long>>() {}
+        new TypeReference<>() {}
     );
 
     Assert.assertEquals("Round trip", partitions, partitions2);
diff --git a/indexing-service/src/test/java/org/apache/druid/indexing/seekablestream/SeekableStreamSupervisorSpecTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/seekablestream/SeekableStreamSupervisorSpecTest.java
index 5f5aeb0ca853..425b38045970 100644
--- a/indexing-service/src/test/java/org/apache/druid/indexing/seekablestream/SeekableStreamSupervisorSpecTest.java
+++ b/indexing-service/src/test/java/org/apache/druid/indexing/seekablestream/SeekableStreamSupervisorSpecTest.java
@@ -188,7 +188,7 @@ protected SeekableStreamIndexTaskIOConfig createTaskIoConfig(
         SeekableStreamSupervisorIOConfig ioConfig
     )
     {
-      return new SeekableStreamIndexTaskIOConfig<String, String>(
+      return new SeekableStreamIndexTaskIOConfig<>(
           groupId,
           baseSequenceName,
           new SeekableStreamStartSequenceNumbers<>(STREAM, startPartitions, exclusiveStartSequenceNumberPartitions),
@@ -247,7 +247,7 @@ protected SeekableStreamDataSourceMetadata<String, String> createDataSourceMetaD
     @Override
     protected OrderedSequenceNumber<String> makeSequenceNumber(String seq, boolean isExclusive)
     {
-      return new OrderedSequenceNumber<String>(seq, isExclusive)
+      return new OrderedSequenceNumber<>(seq, isExclusive)
       {
         @Override
         public int compareTo(OrderedSequenceNumber<String> o)
@@ -281,7 +281,7 @@ protected SeekableStreamSupervisorReportPayload<String, String> createReportPayl
         boolean includeOffsets
     )
     {
-      return new SeekableStreamSupervisorReportPayload<String, String>(
+      return new SeekableStreamSupervisorReportPayload<>(
           DATASOURCE,
           STREAM,
           1,
diff --git a/indexing-service/src/test/java/org/apache/druid/indexing/seekablestream/SequenceMetadataTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/seekablestream/SequenceMetadataTest.java
index cae9ec1e686f..d65a21ddf942 100644
--- a/indexing-service/src/test/java/org/apache/druid/indexing/seekablestream/SequenceMetadataTest.java
+++ b/indexing-service/src/test/java/org/apache/druid/indexing/seekablestream/SequenceMetadataTest.java
@@ -164,7 +164,7 @@ public void testCanHandle()
 
   private OrderedSequenceNumber<String> makeSequenceNumber(String seq, boolean isExclusive)
   {
-    return new OrderedSequenceNumber<String>(seq, isExclusive)
+    return new OrderedSequenceNumber<>(seq, isExclusive)
     {
       @Override
       public int compareTo(OrderedSequenceNumber<String> o)
diff --git a/indexing-service/src/test/java/org/apache/druid/indexing/seekablestream/supervisor/SeekableStreamSupervisorStateManagerTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/seekablestream/supervisor/SeekableStreamSupervisorStateManagerTest.java
index 4d4eaccb60c5..6ffe9dcdfc5d 100644
--- a/indexing-service/src/test/java/org/apache/druid/indexing/seekablestream/supervisor/SeekableStreamSupervisorStateManagerTest.java
+++ b/indexing-service/src/test/java/org/apache/druid/indexing/seekablestream/supervisor/SeekableStreamSupervisorStateManagerTest.java
@@ -372,9 +372,7 @@ public void testExceptionEventSerde() throws IOException
 
     String serialized = defaultMapper.writeValueAsString(event);
 
-    Map<String, String> deserialized = defaultMapper.readValue(serialized, new TypeReference<Map<String, String>>()
-    {
-    });
+    Map<String, String> deserialized = defaultMapper.readValue(serialized, new TypeReference<>() {});
     Assert.assertNotNull(deserialized.get("timestamp"));
     Assert.assertEquals("java.lang.NullPointerException", deserialized.get("exceptionClass"));
     Assert.assertFalse(Boolean.getBoolean(deserialized.get("streamException")));
diff --git a/indexing-service/src/test/java/org/apache/druid/indexing/seekablestream/supervisor/SeekableStreamSupervisorStateTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/seekablestream/supervisor/SeekableStreamSupervisorStateTest.java
index f182ced69fbb..e5b26c337066 100644
--- a/indexing-service/src/test/java/org/apache/druid/indexing/seekablestream/supervisor/SeekableStreamSupervisorStateTest.java
+++ b/indexing-service/src/test/java/org/apache/druid/indexing/seekablestream/supervisor/SeekableStreamSupervisorStateTest.java
@@ -2836,7 +2836,7 @@ protected SeekableStreamIndexTaskIOConfig createTaskIoConfig(
         SeekableStreamSupervisorIOConfig ioConfig
     )
     {
-      return new SeekableStreamIndexTaskIOConfig<String, String>(
+      return new SeekableStreamIndexTaskIOConfig<>(
           groupId,
           baseSequenceName,
           new SeekableStreamStartSequenceNumbers<>(STREAM, startPartitions, exclusiveStartSequenceNumberPartitions),
@@ -2908,7 +2908,7 @@ protected SeekableStreamDataSourceMetadata<String, String> createDataSourceMetaD
     @Override
     protected OrderedSequenceNumber<String> makeSequenceNumber(String seq, boolean isExclusive)
     {
-      return new OrderedSequenceNumber<String>(seq, isExclusive)
+      return new OrderedSequenceNumber<>(seq, isExclusive)
       {
         @Override
         public int compareTo(OrderedSequenceNumber<String> o)
@@ -2942,7 +2942,7 @@ protected SeekableStreamSupervisorReportPayload<String, String> createReportPayl
         boolean includeOffsets
     )
     {
-      return new SeekableStreamSupervisorReportPayload<String, String>(
+      return new SeekableStreamSupervisorReportPayload<>(
           DATASOURCE,
           STREAM,
           1,
@@ -3196,7 +3196,7 @@ private static SeekableStreamIndexTaskIOConfig createTaskIoConfigExt(
           SeekableStreamSupervisorIOConfig ioConfig
   )
   {
-    return new SeekableStreamIndexTaskIOConfig<String, String>(
+    return new SeekableStreamIndexTaskIOConfig<>(
             groupId,
             baseSequenceName,
             new SeekableStreamStartSequenceNumbers<>(STREAM, startPartitions, exclusiveStartSequenceNumberPartitions),
diff --git a/indexing-service/src/test/java/org/apache/druid/indexing/worker/shuffle/ShuffleModuleTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/worker/shuffle/ShuffleModuleTest.java
index fec860ab502d..8d9280111e31 100644
--- a/indexing-service/src/test/java/org/apache/druid/indexing/worker/shuffle/ShuffleModuleTest.java
+++ b/indexing-service/src/test/java/org/apache/druid/indexing/worker/shuffle/ShuffleModuleTest.java
@@ -53,7 +53,7 @@ public void testGetShuffleMetricsWhenShuffleMonitorExists()
            .thenReturn(Optional.of(shuffleMonitor));
     final Injector injector = createInjector(monitorScheduler);
     final Optional<ShuffleMetrics> optional = injector.getInstance(
-        Key.get(new TypeLiteral<Optional<ShuffleMetrics>>() {})
+        Key.get(new TypeLiteral<>() {})
     );
     Assert.assertTrue(optional.isPresent());
   }
@@ -66,7 +66,7 @@ public void testGetShuffleMetricsWithNoShuffleMonitor()
            .thenReturn(Optional.empty());
     final Injector injector = createInjector(monitorScheduler);
     final Optional<ShuffleMetrics> optional = injector.getInstance(
-        Key.get(new TypeLiteral<Optional<ShuffleMetrics>>() {})
+        Key.get(new TypeLiteral<>() {})
     );
     Assert.assertFalse(optional.isPresent());
   }
diff --git a/integration-tests-ex/cases/src/test/java/org/apache/druid/testsEx/cluster/CatalogClient.java b/integration-tests-ex/cases/src/test/java/org/apache/druid/testsEx/cluster/CatalogClient.java
index eee5b3d79730..03d79fef49d7 100644
--- a/integration-tests-ex/cases/src/test/java/org/apache/druid/testsEx/cluster/CatalogClient.java
+++ b/integration-tests-ex/cases/src/test/java/org/apache/druid/testsEx/cluster/CatalogClient.java
@@ -131,7 +131,7 @@ public List<String> listSchemas()
         clusterClient.leadCoordinatorUrl(),
         CatalogResource.ROOT_PATH
     );
-    return clusterClient.getAs(url, new TypeReference<List<String>>() { });
+    return clusterClient.getAs(url, new TypeReference<>() {});
   }
 
   public List<TableId> listTables()
@@ -141,7 +141,7 @@ public List<TableId> listTables()
         clusterClient.leadCoordinatorUrl(),
         CatalogResource.ROOT_PATH
     );
-    return clusterClient.getAs(url, new TypeReference<List<TableId>>() { });
+    return clusterClient.getAs(url, new TypeReference<>() {});
   }
 
   public List<String> listTableNamesInSchema(String schemaName)
@@ -152,7 +152,7 @@ public List<String> listTableNamesInSchema(String schemaName)
         CatalogResource.ROOT_PATH,
         schemaName
     );
-    return clusterClient.getAs(url, new TypeReference<List<String>>() { });
+    return clusterClient.getAs(url, new TypeReference<>() {});
   }
 
   public List<TableMetadata> listTablesInSchema(String schemaName)
@@ -163,6 +163,6 @@ public List<TableMetadata> listTablesInSchema(String schemaName)
         CatalogResource.ROOT_PATH,
         schemaName
     );
-    return clusterClient.getAs(url, new TypeReference<List<TableMetadata>>() { });
+    return clusterClient.getAs(url, new TypeReference<>() {});
   }
 }
diff --git a/integration-tests-ex/tools/src/main/java/org/apache/druid/testing/tools/ServerManagerForQueryErrorTest.java b/integration-tests-ex/tools/src/main/java/org/apache/druid/testing/tools/ServerManagerForQueryErrorTest.java
index d5b82e9c8d58..91434232b92c 100644
--- a/integration-tests-ex/tools/src/main/java/org/apache/druid/testing/tools/ServerManagerForQueryErrorTest.java
+++ b/integration-tests-ex/tools/src/main/java/org/apache/druid/testing/tools/ServerManagerForQueryErrorTest.java
@@ -147,7 +147,7 @@ protected <T> QueryRunner<T> buildQueryRunnerForSegment(
         return new ReportTimelineMissingSegmentQueryRunner<>(descriptor);
       }
     } else if (queryContext.getBoolean(QUERY_TIMEOUT_TEST_CONTEXT_KEY, false)) {
-      return (queryPlus, responseContext) -> new Sequence<T>()
+      return (queryPlus, responseContext) -> new Sequence<>()
       {
         @Override
         public <OutType> OutType accumulate(OutType initValue, Accumulator<OutType, T> accumulator)
@@ -162,7 +162,7 @@ public <OutType> Yielder<OutType> toYielder(OutType initValue, YieldingAccumulat
         }
       };
     } else if (queryContext.getBoolean(QUERY_CAPACITY_EXCEEDED_TEST_CONTEXT_KEY, false)) {
-      return (queryPlus, responseContext) -> new Sequence<T>()
+      return (queryPlus, responseContext) -> new Sequence<>()
       {
         @Override
         public <OutType> OutType accumulate(OutType initValue, Accumulator<OutType, T> accumulator)
@@ -177,7 +177,7 @@ public <OutType> Yielder<OutType> toYielder(OutType initValue, YieldingAccumulat
         }
       };
     } else if (queryContext.getBoolean(QUERY_UNSUPPORTED_TEST_CONTEXT_KEY, false)) {
-      return (queryPlus, responseContext) -> new Sequence<T>()
+      return (queryPlus, responseContext) -> new Sequence<>()
       {
         @Override
         public <OutType> OutType accumulate(OutType initValue, Accumulator<OutType, T> accumulator)
@@ -192,7 +192,7 @@ public <OutType> Yielder<OutType> toYielder(OutType initValue, YieldingAccumulat
         }
       };
     } else if (queryContext.getBoolean(RESOURCE_LIMIT_EXCEEDED_TEST_CONTEXT_KEY, false)) {
-      return (queryPlus, responseContext) -> new Sequence<T>()
+      return (queryPlus, responseContext) -> new Sequence<>()
       {
         @Override
         public <OutType> OutType accumulate(OutType initValue, Accumulator<OutType, T> accumulator)
@@ -207,7 +207,7 @@ public <OutType> Yielder<OutType> toYielder(OutType initValue, YieldingAccumulat
         }
       };
     } else if (queryContext.getBoolean(QUERY_FAILURE_TEST_CONTEXT_KEY, false)) {
-      return (queryPlus, responseContext) -> new Sequence<T>()
+      return (queryPlus, responseContext) -> new Sequence<>()
       {
         @Override
         public <OutType> OutType accumulate(OutType initValue, Accumulator<OutType, T> accumulator)
diff --git a/integration-tests/src/main/java/org/apache/druid/server/coordination/ServerManagerForQueryErrorTest.java b/integration-tests/src/main/java/org/apache/druid/server/coordination/ServerManagerForQueryErrorTest.java
index 8bfceb544708..6e225304a4a3 100644
--- a/integration-tests/src/main/java/org/apache/druid/server/coordination/ServerManagerForQueryErrorTest.java
+++ b/integration-tests/src/main/java/org/apache/druid/server/coordination/ServerManagerForQueryErrorTest.java
@@ -145,7 +145,7 @@ protected <T> QueryRunner<T> buildQueryRunnerForSegment(
         return new ReportTimelineMissingSegmentQueryRunner<>(descriptor);
       }
     } else if (queryContext.getBoolean(QUERY_TIMEOUT_TEST_CONTEXT_KEY, false)) {
-      return (queryPlus, responseContext) -> new Sequence<T>()
+      return (queryPlus, responseContext) -> new Sequence<>()
       {
         @Override
         public <OutType> OutType accumulate(OutType initValue, Accumulator<OutType, T> accumulator)
@@ -160,7 +160,7 @@ public <OutType> Yielder<OutType> toYielder(OutType initValue, YieldingAccumulat
         }
       };
     } else if (queryContext.getBoolean(QUERY_CAPACITY_EXCEEDED_TEST_CONTEXT_KEY, false)) {
-      return (queryPlus, responseContext) -> new Sequence<T>()
+      return (queryPlus, responseContext) -> new Sequence<>()
       {
         @Override
         public <OutType> OutType accumulate(OutType initValue, Accumulator<OutType, T> accumulator)
@@ -175,7 +175,7 @@ public <OutType> Yielder<OutType> toYielder(OutType initValue, YieldingAccumulat
         }
       };
     } else if (queryContext.getBoolean(QUERY_UNSUPPORTED_TEST_CONTEXT_KEY, false)) {
-      return (queryPlus, responseContext) -> new Sequence<T>()
+      return (queryPlus, responseContext) -> new Sequence<>()
       {
         @Override
         public <OutType> OutType accumulate(OutType initValue, Accumulator<OutType, T> accumulator)
@@ -190,7 +190,7 @@ public <OutType> Yielder<OutType> toYielder(OutType initValue, YieldingAccumulat
         }
       };
     } else if (queryContext.getBoolean(RESOURCE_LIMIT_EXCEEDED_TEST_CONTEXT_KEY, false)) {
-      return (queryPlus, responseContext) -> new Sequence<T>()
+      return (queryPlus, responseContext) -> new Sequence<>()
       {
         @Override
         public <OutType> OutType accumulate(OutType initValue, Accumulator<OutType, T> accumulator)
@@ -205,7 +205,7 @@ public <OutType> Yielder<OutType> toYielder(OutType initValue, YieldingAccumulat
         }
       };
     } else if (queryContext.getBoolean(QUERY_FAILURE_TEST_CONTEXT_KEY, false)) {
-      return (queryPlus, responseContext) -> new Sequence<T>()
+      return (queryPlus, responseContext) -> new Sequence<>()
       {
         @Override
         public <OutType> OutType accumulate(OutType initValue, Accumulator<OutType, T> accumulator)
diff --git a/integration-tests/src/main/java/org/apache/druid/testing/clients/AbstractQueryResourceTestClient.java b/integration-tests/src/main/java/org/apache/druid/testing/clients/AbstractQueryResourceTestClient.java
index c558ff91ca3d..18a8affeac7a 100644
--- a/integration-tests/src/main/java/org/apache/druid/testing/clients/AbstractQueryResourceTestClient.java
+++ b/integration-tests/src/main/java/org/apache/druid/testing/clients/AbstractQueryResourceTestClient.java
@@ -99,9 +99,7 @@ public byte[] encode(Object content) throws IOException
     @Override
     public List<Map<String, Object>> decode(byte[] content) throws IOException
     {
-      return om.readValue(content, new TypeReference<List<Map<String, Object>>>()
-      {
-      });
+      return om.readValue(content, new TypeReference<>() {});
     }
   }
 
diff --git a/integration-tests/src/main/java/org/apache/druid/testing/clients/ClientInfoResourceTestClient.java b/integration-tests/src/main/java/org/apache/druid/testing/clients/ClientInfoResourceTestClient.java
index 09dfff04c605..0a54ee6e581f 100644
--- a/integration-tests/src/main/java/org/apache/druid/testing/clients/ClientInfoResourceTestClient.java
+++ b/integration-tests/src/main/java/org/apache/druid/testing/clients/ClientInfoResourceTestClient.java
@@ -89,9 +89,7 @@ public List<String> getDimensions(String dataSource, String interval)
         );
       }
       return jsonMapper.readValue(
-          response.getContent(), new TypeReference<List<String>>()
-          {
-          }
+          response.getContent(), new TypeReference<>() {}
       );
     }
     catch (Exception e) {
diff --git a/integration-tests/src/main/java/org/apache/druid/testing/clients/CompactionResourceTestClient.java b/integration-tests/src/main/java/org/apache/druid/testing/clients/CompactionResourceTestClient.java
index 74d56065ef45..849af4975673 100644
--- a/integration-tests/src/main/java/org/apache/druid/testing/clients/CompactionResourceTestClient.java
+++ b/integration-tests/src/main/java/org/apache/druid/testing/clients/CompactionResourceTestClient.java
@@ -113,7 +113,7 @@ public DruidCompactionConfig getCompactionConfig() throws Exception
           response.getContent()
       );
     }
-    return jsonMapper.readValue(response.getContent(), new TypeReference<DruidCompactionConfig>() {});
+    return jsonMapper.readValue(response.getContent(), new TypeReference<>() {});
   }
 
   public DataSourceCompactionConfig getDataSourceCompactionConfig(String dataSource) throws Exception
@@ -129,7 +129,7 @@ public DataSourceCompactionConfig getDataSourceCompactionConfig(String dataSourc
           response.getContent()
       );
     }
-    return jsonMapper.readValue(response.getContent(), new TypeReference<DataSourceCompactionConfig>() {});
+    return jsonMapper.readValue(response.getContent(), new TypeReference<>() {});
   }
 
   public void forceTriggerAutoCompaction() throws Exception
@@ -183,7 +183,7 @@ public Map<String, String> getCompactionProgress(String dataSource) throws Excep
           response.getContent()
       );
     }
-    return jsonMapper.readValue(response.getContent(), new TypeReference<Map<String, String>>() {});
+    return jsonMapper.readValue(response.getContent(), new TypeReference<>() {});
   }
 
   public Map<String, String> getCompactionStatus(String dataSource) throws Exception
@@ -201,7 +201,7 @@ public Map<String, String> getCompactionStatus(String dataSource) throws Excepti
           response.getContent()
       );
     }
-    Map<String, List<Map<String, String>>> latestSnapshots = jsonMapper.readValue(response.getContent(), new TypeReference<Map<String, List<Map<String, String>>>>() {});
+    Map<String, List<Map<String, String>>> latestSnapshots = jsonMapper.readValue(response.getContent(), new TypeReference<>() {});
     return latestSnapshots.get("latestStatus").get(0);
   }
 }
diff --git a/integration-tests/src/main/java/org/apache/druid/testing/clients/CoordinatorResourceTestClient.java b/integration-tests/src/main/java/org/apache/druid/testing/clients/CoordinatorResourceTestClient.java
index 7a42119e6cca..e82580cd312e 100644
--- a/integration-tests/src/main/java/org/apache/druid/testing/clients/CoordinatorResourceTestClient.java
+++ b/integration-tests/src/main/java/org/apache/druid/testing/clients/CoordinatorResourceTestClient.java
@@ -131,9 +131,7 @@ public List<String> getSegments(final String dataSource)
       );
 
       segments = jsonMapper.readValue(
-          response.getContent(), new TypeReference<List<String>>()
-          {
-          }
+          response.getContent(), new TypeReference<>() {}
       );
     }
     catch (Exception e) {
@@ -152,9 +150,7 @@ public List<DataSegment> getFullSegmentsMetadata(final String dataSource)
       );
 
       segments = jsonMapper.readValue(
-          response.getContent(), new TypeReference<List<DataSegment>>()
-          {
-          }
+          response.getContent(), new TypeReference<>() {}
       );
     }
     catch (Exception e) {
@@ -171,9 +167,7 @@ public List<String> getSegmentIntervals(final String dataSource)
       StatusResponseHolder response = makeRequest(HttpMethod.GET, getIntervalsURL(dataSource));
 
       segments = jsonMapper.readValue(
-          response.getContent(), new TypeReference<List<String>>()
-          {
-          }
+          response.getContent(), new TypeReference<>() {}
       );
     }
     catch (Exception e) {
@@ -189,9 +183,7 @@ public List<DataSegment> getAvailableSegments(final String dataSource)
       StatusResponseHolder response = makeRequest(HttpMethod.GET, getFullSegmentsURL(dataSource));
 
       return jsonMapper.readValue(
-          response.getContent(), new TypeReference<List<DataSegment>>()
-          {
-          }
+          response.getContent(), new TypeReference<>() {}
       );
     }
     catch (Exception e) {
@@ -222,9 +214,7 @@ private Map<String, Integer> getLoadStatus(String dataSource)
       }
 
       status = jsonMapper.readValue(
-          response.getContent(), new TypeReference<Map<String, Integer>>()
-          {
-          }
+          response.getContent(), new TypeReference<>() {}
       );
     }
     catch (Exception e) {
@@ -333,9 +323,7 @@ public Map<String, Object> initializeLookups(String filePath) throws Exception
 
     Map<String, Object> results2 = jsonMapper.readValue(
         response.getContent(),
-        new TypeReference<Map<String, Object>>()
-        {
-        }
+        new TypeReference<>() {}
     );
 
     return results2;
@@ -367,9 +355,7 @@ private Map<String, Map<HostAndPort, LookupsState<LookupExtractorFactoryMapConta
 
       status = jsonMapper.readValue(
           response.getContent(),
-          new TypeReference<Map<String, Map<HostAndPort, LookupsState<LookupExtractorFactoryMapContainer>>>>()
-          {
-          }
+          new TypeReference<>() {}
       );
     }
     catch (Exception e) {
diff --git a/integration-tests/src/main/java/org/apache/druid/testing/clients/OverlordResourceTestClient.java b/integration-tests/src/main/java/org/apache/druid/testing/clients/OverlordResourceTestClient.java
index f75dc6043f9d..9b6c3ec1ef74 100644
--- a/integration-tests/src/main/java/org/apache/druid/testing/clients/OverlordResourceTestClient.java
+++ b/integration-tests/src/main/java/org/apache/druid/testing/clients/OverlordResourceTestClient.java
@@ -147,9 +147,7 @@ public TaskStatusPlus getTaskStatus(String taskID)
       LOG.debug("Index status response" + response.getContent());
       TaskStatusResponse taskStatusResponse = jsonMapper.readValue(
           response.getContent(),
-          new TypeReference<TaskStatusResponse>()
-          {
-          }
+          new TypeReference<>() {}
       );
       return taskStatusResponse.getStatus();
     }
@@ -236,9 +234,7 @@ private List<TaskResponseObject> getTasks(String identifier)
         LOG.debug("Tasks %s response %s", identifier, response.getContent());
       }
       return jsonMapper.readValue(
-          response.getContent(), new TypeReference<List<TaskResponseObject>>()
-          {
-          }
+          response.getContent(), new TypeReference<>() {}
       );
     }
     catch (Exception e) {
@@ -257,9 +253,7 @@ public TaskPayloadResponse getTaskPayload(String taskId)
         LOG.debug("Task %s response %s", taskId, response.getContent());
       }
       return jsonMapper.readValue(
-          response.getContent(), new TypeReference<TaskPayloadResponse>()
-          {
-          }
+          response.getContent(), new TypeReference<>() {}
       );
     }
     catch (ISE e) {
@@ -350,9 +344,7 @@ public Map<String, List<Interval>> getLockedIntervals(List<LockFilterPolicy> loc
       ).get();
       return jsonMapper.readValue(
           response.getContent(),
-          new TypeReference<Map<String, List<Interval>>>()
-          {
-          }
+          new TypeReference<>() {}
       );
     }
     catch (Exception e) {
@@ -368,7 +360,7 @@ public void waitUntilTaskCompletes(final String taskID)
   public void waitUntilTaskCompletes(final String taskID, final long millisEach, final int numTimes)
   {
     ITRetryUtil.retryUntil(
-        new Callable<Boolean>()
+        new Callable<>()
         {
           @Override
           public Boolean call()
@@ -398,7 +390,7 @@ public void waitUntilTaskFails(final String taskID)
   public void waitUntilTaskFails(final String taskID, final long millisEach, final int numTimes)
   {
     ITRetryUtil.retryUntil(
-        new Callable<Boolean>()
+        new Callable<>()
         {
           @Override
           public Boolean call()
@@ -758,9 +750,7 @@ public List<Object> getSupervisorHistory(String id)
         );
       }
       List<Object> responseData = jsonMapper.readValue(
-          response.getContent(), new TypeReference<List<Object>>()
-          {
-          }
+          response.getContent(), new TypeReference<>() {}
       );
       return responseData;
     }
diff --git a/integration-tests/src/main/java/org/apache/druid/testing/utils/AbstractTestQueryHelper.java b/integration-tests/src/main/java/org/apache/druid/testing/utils/AbstractTestQueryHelper.java
index f680ad909a63..673db41e7f74 100644
--- a/integration-tests/src/main/java/org/apache/druid/testing/utils/AbstractTestQueryHelper.java
+++ b/integration-tests/src/main/java/org/apache/druid/testing/utils/AbstractTestQueryHelper.java
@@ -117,9 +117,7 @@ public void testQueriesFromFile(String url, String filePath) throws Exception
     List<QueryResultType> queries =
         jsonMapper.readValue(
             TestQueryHelper.class.getResourceAsStream(filePath),
-            new TypeReference<List<QueryResultType>>()
-            {
-            }
+            new TypeReference<>() {}
         );
 
     testQueries(url, queries);
@@ -131,9 +129,7 @@ public void testQueriesFromString(String url, String str) throws Exception
     List<QueryResultType> queries =
         jsonMapper.readValue(
             str,
-            new TypeReference<List<QueryResultType>>()
-            {
-            }
+            new TypeReference<>() {}
         );
     testQueries(url, queries);
   }
diff --git a/integration-tests/src/main/java/org/apache/druid/testing/utils/MsqTestQueryHelper.java b/integration-tests/src/main/java/org/apache/druid/testing/utils/MsqTestQueryHelper.java
index c4a70a475e5d..0b544244509a 100644
--- a/integration-tests/src/main/java/org/apache/druid/testing/utils/MsqTestQueryHelper.java
+++ b/integration-tests/src/main/java/org/apache/druid/testing/utils/MsqTestQueryHelper.java
@@ -269,9 +269,7 @@ public void testQueriesFromFile(String filePath, String fullDatasourcePath) thro
     List<MsqQueryWithResults> queries =
         jsonMapper.readValue(
             TestQueryHelper.class.getResourceAsStream(filePath),
-            new TypeReference<List<MsqQueryWithResults>>()
-            {
-            }
+            new TypeReference<>() {}
         );
     for (MsqQueryWithResults queryWithResults : queries) {
       String queryString = queryWithResults.getQuery();
diff --git a/integration-tests/src/main/java/org/apache/druid/testing/utils/ServerDiscoveryUtil.java b/integration-tests/src/main/java/org/apache/druid/testing/utils/ServerDiscoveryUtil.java
index 56b475f102fa..cfaa7080b21b 100644
--- a/integration-tests/src/main/java/org/apache/druid/testing/utils/ServerDiscoveryUtil.java
+++ b/integration-tests/src/main/java/org/apache/druid/testing/utils/ServerDiscoveryUtil.java
@@ -50,7 +50,7 @@ public static boolean isInstanceReady(ServerDiscoverySelector serviceProvider)
   public static void waitUntilInstanceReady(final ServerDiscoverySelector serviceProvider, String instanceType)
   {
     ITRetryUtil.retryUntilTrue(
-        new Callable<Boolean>()
+        new Callable<>()
         {
           @Override
           public Boolean call()
diff --git a/integration-tests/src/test/java/org/apache/druid/tests/coordinator/duty/ITAutoCompactionTest.java b/integration-tests/src/test/java/org/apache/druid/tests/coordinator/duty/ITAutoCompactionTest.java
index 7895423268a9..8218328c9221 100644
--- a/integration-tests/src/test/java/org/apache/druid/tests/coordinator/duty/ITAutoCompactionTest.java
+++ b/integration-tests/src/test/java/org/apache/druid/tests/coordinator/duty/ITAutoCompactionTest.java
@@ -149,7 +149,7 @@ public void testAutoCompactionRowWithMetricAndRowWithoutMetricShouldPreserveExis
       intervalsBeforeCompaction.sort(null);
       // 2 segments across 1 days...
       verifySegmentsCount(2);
-      ArrayList<Object> nullList = new ArrayList<Object>();
+      ArrayList<Object> nullList = new ArrayList<>();
       nullList.add(null);
       Map<String, Object> queryAndResultFields = ImmutableMap.of(
           "%%FIELD_TO_QUERY%%", "added",
@@ -245,7 +245,7 @@ public void testAutoCompactionRowWithMetricAndRowWithoutMetricShouldPreserveExis
       intervalsBeforeCompaction.sort(null);
       // 2 segments across 1 days...
       verifySegmentsCount(2);
-      ArrayList<Object> nullList = new ArrayList<Object>();
+      ArrayList<Object> nullList = new ArrayList<>();
       nullList.add(null);
       Map<String, Object> queryAndResultFields = ImmutableMap.of(
           "%%FIELD_TO_QUERY%%", "added",
@@ -348,7 +348,7 @@ public void testAutoCompactionOnlyRowsWithoutMetricShouldAddNewMetrics() throws
       intervalsBeforeCompaction.sort(null);
       // 2 segments across 1 days...
       verifySegmentsCount(2);
-      ArrayList<Object> nullList = new ArrayList<Object>();
+      ArrayList<Object> nullList = new ArrayList<>();
       nullList.add(null);
       Map<String, Object> queryAndResultFields = ImmutableMap.of(
           "%%FIELD_TO_QUERY%%", "added",
diff --git a/integration-tests/src/test/java/org/apache/druid/tests/query/ITQueryRetryTestOnMissingSegments.java b/integration-tests/src/test/java/org/apache/druid/tests/query/ITQueryRetryTestOnMissingSegments.java
index 999ebc8c6804..f05e5c42e6e8 100644
--- a/integration-tests/src/test/java/org/apache/druid/tests/query/ITQueryRetryTestOnMissingSegments.java
+++ b/integration-tests/src/test/java/org/apache/druid/tests/query/ITQueryRetryTestOnMissingSegments.java
@@ -132,9 +132,7 @@ private void testQueries(String queryWithResultsStr, Expectation expectation) th
   {
     final List<QueryWithResults> queries = jsonMapper.readValue(
         queryWithResultsStr,
-        new TypeReference<List<QueryWithResults>>()
-        {
-        }
+        new TypeReference<>() {}
     );
     testQueries(queries, expectation);
   }
@@ -156,9 +154,7 @@ private void testQueries(List<QueryWithResults> queries, Expectation expectation
 
         List<Map<String, Object>> result = jsonMapper.readValue(
             responseHolder.getContent(),
-            new TypeReference<List<Map<String, Object>>>()
-            {
-            }
+            new TypeReference<>() {}
         );
         if (!QueryResultVerifier.compareResults(
             result,
diff --git a/integration-tests/src/test/java/org/apache/druid/tests/security/AbstractAuthConfigurationTest.java b/integration-tests/src/test/java/org/apache/druid/tests/security/AbstractAuthConfigurationTest.java
index 1c5867916137..b2ecc596e7c6 100644
--- a/integration-tests/src/test/java/org/apache/druid/tests/security/AbstractAuthConfigurationTest.java
+++ b/integration-tests/src/test/java/org/apache/druid/tests/security/AbstractAuthConfigurationTest.java
@@ -94,9 +94,7 @@ public abstract class AbstractAuthConfigurationTest
       "SELECT * FROM sys.tasks WHERE datasource IN ('auth_test')";
 
   protected static final TypeReference<List<Map<String, Object>>> SYS_SCHEMA_RESULTS_TYPE_REFERENCE =
-      new TypeReference<List<Map<String, Object>>>()
-      {
-      };
+      new TypeReference<>() {};
 
   /**
    * create a ResourceAction set of permissions that can only read a 'auth_test' datasource, for Authorizer
diff --git a/processing/src/main/java/org/apache/druid/collections/CircularList.java b/processing/src/main/java/org/apache/druid/collections/CircularList.java
index 7cf551d6cf88..3eb08bc2cf17 100644
--- a/processing/src/main/java/org/apache/druid/collections/CircularList.java
+++ b/processing/src/main/java/org/apache/druid/collections/CircularList.java
@@ -51,7 +51,7 @@ public CircularList(final Set<T> elements, final Comparator<? super T> comparato
   @Override
   public Iterator<T> iterator()
   {
-    return new Iterator<T>()
+    return new Iterator<>()
     {
       @Override
       public boolean hasNext()
diff --git a/processing/src/main/java/org/apache/druid/collections/ReferenceCountingResourceHolder.java b/processing/src/main/java/org/apache/druid/collections/ReferenceCountingResourceHolder.java
index 6d731923c556..215ebda95aa7 100644
--- a/processing/src/main/java/org/apache/druid/collections/ReferenceCountingResourceHolder.java
+++ b/processing/src/main/java/org/apache/druid/collections/ReferenceCountingResourceHolder.java
@@ -97,7 +97,7 @@ public ResourceHolder<T> increment()
     }
 
     // This ResourceHolder is supposed to be used from a single thread, so no synchronization/atomicity
-    return new ResourceHolder<T>()
+    return new ResourceHolder<>()
     {
       boolean released = false;
 
diff --git a/processing/src/main/java/org/apache/druid/collections/StableLimitingSorter.java b/processing/src/main/java/org/apache/druid/collections/StableLimitingSorter.java
index 76208bc05f9d..d0c53781ca7c 100644
--- a/processing/src/main/java/org/apache/druid/collections/StableLimitingSorter.java
+++ b/processing/src/main/java/org/apache/druid/collections/StableLimitingSorter.java
@@ -80,7 +80,7 @@ public int size()
    */
   public Iterator<T> drain()
   {
-    return new Iterator<T>()
+    return new Iterator<>()
     {
       @Override
       public boolean hasNext()
diff --git a/processing/src/main/java/org/apache/druid/collections/bitmap/ConciseBitmapFactory.java b/processing/src/main/java/org/apache/druid/collections/bitmap/ConciseBitmapFactory.java
index a6cbb568cdee..6e1a4ddca5ca 100644
--- a/processing/src/main/java/org/apache/druid/collections/bitmap/ConciseBitmapFactory.java
+++ b/processing/src/main/java/org/apache/druid/collections/bitmap/ConciseBitmapFactory.java
@@ -41,13 +41,13 @@ private static Iterable<ImmutableConciseSet> unwrap(
       final Iterable<ImmutableBitmap> b
   )
   {
-    return new Iterable<ImmutableConciseSet>()
+    return new Iterable<>()
     {
       @Override
       public Iterator<ImmutableConciseSet> iterator()
       {
         final Iterator<ImmutableBitmap> i = b.iterator();
-        return new Iterator<ImmutableConciseSet>()
+        return new Iterator<>()
         {
           @Override
           public void remove()
diff --git a/processing/src/main/java/org/apache/druid/collections/bitmap/RoaringBitmapFactory.java b/processing/src/main/java/org/apache/druid/collections/bitmap/RoaringBitmapFactory.java
index a62c74cf2914..c62264fc343f 100644
--- a/processing/src/main/java/org/apache/druid/collections/bitmap/RoaringBitmapFactory.java
+++ b/processing/src/main/java/org/apache/druid/collections/bitmap/RoaringBitmapFactory.java
@@ -58,13 +58,13 @@ private static Iterable<ImmutableRoaringBitmap> unwrap(
       final Iterable<ImmutableBitmap> b
   )
   {
-    return new Iterable<ImmutableRoaringBitmap>()
+    return new Iterable<>()
     {
       @Override
       public Iterator<ImmutableRoaringBitmap> iterator()
       {
         final Iterator<ImmutableBitmap> i = b.iterator();
-        return new Iterator<ImmutableRoaringBitmap>()
+        return new Iterator<>()
         {
           @Override
           public void remove()
diff --git a/processing/src/main/java/org/apache/druid/collections/spatial/ImmutableFloatNode.java b/processing/src/main/java/org/apache/druid/collections/spatial/ImmutableFloatNode.java
index 8025f83bee3d..30d596ab18ec 100644
--- a/processing/src/main/java/org/apache/druid/collections/spatial/ImmutableFloatNode.java
+++ b/processing/src/main/java/org/apache/druid/collections/spatial/ImmutableFloatNode.java
@@ -159,12 +159,12 @@ public ImmutableBitmap getImmutableBitmap()
   @SuppressWarnings("ArgumentParameterSwap")
   public Iterable<ImmutableNode<float[]>> getChildren()
   {
-    return new Iterable<ImmutableNode<float[]>>()
+    return new Iterable<>()
     {
       @Override
       public Iterator<ImmutableNode<float[]>> iterator()
       {
-        return new Iterator<ImmutableNode<float[]>>()
+        return new Iterator<>()
         {
           private int count = 0;
 
diff --git a/processing/src/main/java/org/apache/druid/collections/spatial/search/GutmanSearchStrategy.java b/processing/src/main/java/org/apache/druid/collections/spatial/search/GutmanSearchStrategy.java
index 7070a29c66d6..2cb3df491ca5 100644
--- a/processing/src/main/java/org/apache/druid/collections/spatial/search/GutmanSearchStrategy.java
+++ b/processing/src/main/java/org/apache/druid/collections/spatial/search/GutmanSearchStrategy.java
@@ -36,7 +36,7 @@ public Iterable<ImmutableBitmap> search(ImmutableNode<TCoordinateArray> node, Bo
     if (bound.getLimit() > 0) {
       return Iterables.transform(
           breadthFirstSearch(node, bound),
-          new Function<ImmutableNode, ImmutableBitmap>()
+          new Function<>()
           {
             @Override
             public ImmutableBitmap apply(ImmutableNode immutableNode)
@@ -49,7 +49,7 @@ public ImmutableBitmap apply(ImmutableNode immutableNode)
 
     return Iterables.transform(
         depthFirstSearch(node, bound),
-        new Function<ImmutableFloatPoint, ImmutableBitmap>()
+        new Function<>()
         {
           @Override
           public ImmutableBitmap apply(ImmutableFloatPoint immutablePoint)
@@ -134,7 +134,7 @@ public Iterable<ImmutableNode> breadthFirstSearch(
         Iterables.transform(
             Iterables.filter(
                 nodes,
-                new Predicate<ImmutableNode>()
+                new Predicate<>()
                 {
                   @Override
                   public boolean apply(ImmutableNode immutableNode)
@@ -166,7 +166,7 @@ public boolean apply(ImmutableNode immutableNode)
 
     Iterable<ImmutableNode> overlappingNodes = Iterables.filter(
         nodes,
-        new Predicate<ImmutableNode>()
+        new Predicate<>()
         {
           @Override
           public boolean apply(ImmutableNode immutableNode)
diff --git a/processing/src/main/java/org/apache/druid/collections/spatial/search/PolygonBound.java b/processing/src/main/java/org/apache/druid/collections/spatial/search/PolygonBound.java
index 840a9f9c2d10..f8d14f81e3d6 100644
--- a/processing/src/main/java/org/apache/druid/collections/spatial/search/PolygonBound.java
+++ b/processing/src/main/java/org/apache/druid/collections/spatial/search/PolygonBound.java
@@ -165,7 +165,7 @@ public Iterable<ImmutableFloatPoint> filter(Iterable<ImmutableFloatPoint> points
   {
     return Iterables.filter(
         points,
-        new Predicate<ImmutableFloatPoint>()
+        new Predicate<>()
         {
           @Override
           public boolean apply(ImmutableFloatPoint immutablePoint)
diff --git a/processing/src/main/java/org/apache/druid/collections/spatial/search/RadiusBound.java b/processing/src/main/java/org/apache/druid/collections/spatial/search/RadiusBound.java
index 0a817ce58496..4f5ddabad258 100644
--- a/processing/src/main/java/org/apache/druid/collections/spatial/search/RadiusBound.java
+++ b/processing/src/main/java/org/apache/druid/collections/spatial/search/RadiusBound.java
@@ -140,7 +140,7 @@ public Iterable<ImmutableFloatPoint> filter(Iterable<ImmutableFloatPoint> points
   {
     return Iterables.filter(
         points,
-        new Predicate<ImmutableFloatPoint>()
+        new Predicate<>()
         {
           @Override
           public boolean apply(ImmutableFloatPoint point)
diff --git a/processing/src/main/java/org/apache/druid/collections/spatial/search/RectangularBound.java b/processing/src/main/java/org/apache/druid/collections/spatial/search/RectangularBound.java
index f2413fc5e3c7..1bc25079a03f 100644
--- a/processing/src/main/java/org/apache/druid/collections/spatial/search/RectangularBound.java
+++ b/processing/src/main/java/org/apache/druid/collections/spatial/search/RectangularBound.java
@@ -139,7 +139,7 @@ public Iterable<ImmutableFloatPoint> filter(Iterable<ImmutableFloatPoint> points
   {
     return Iterables.filter(
         points,
-        new Predicate<ImmutableFloatPoint>()
+        new Predicate<>()
         {
           @Override
           public boolean apply(ImmutableFloatPoint immutablePoint)
diff --git a/processing/src/main/java/org/apache/druid/common/config/ConfigManager.java b/processing/src/main/java/org/apache/druid/common/config/ConfigManager.java
index 7ba1481e97d2..87cbad379410 100644
--- a/processing/src/main/java/org/apache/druid/common/config/ConfigManager.java
+++ b/processing/src/main/java/org/apache/druid/common/config/ConfigManager.java
@@ -141,20 +141,20 @@ public <T> AtomicReference<T> watchConfig(final String key, final ConfigSerde<T>
               public ConfigHolder<T> call()
               {
                 if (!started) {
-                  watchedConfigs.put(key, new ConfigHolder<T>(null, serde));
+                  watchedConfigs.put(key, new ConfigHolder<>(null, serde));
                 } else {
                   try {
                     // Multiple of these callables can be submitted at the same time, but the callables themselves
                     // are executed serially, so double check that it hasn't already been populated.
                     if (!watchedConfigs.containsKey(key)) {
                       byte[] value = dbConnector.lookup(configTable, "name", "payload", key);
-                      ConfigHolder<T> holder = new ConfigHolder<T>(value, serde);
+                      ConfigHolder<T> holder = new ConfigHolder<>(value, serde);
                       watchedConfigs.put(key, holder);
                     }
                   }
                   catch (Exception e) {
                     log.warn(e, "Failed loading config for key[%s]", key);
-                    watchedConfigs.put(key, new ConfigHolder<T>(null, serde));
+                    watchedConfigs.put(key, new ConfigHolder<>(null, serde));
                   }
                 }
 
@@ -291,9 +291,9 @@ private static class ConfigHolder<T>
         ConfigSerde<T> serde
     )
     {
-      this.rawBytes = new AtomicReference<byte[]>(rawBytes);
+      this.rawBytes = new AtomicReference<>(rawBytes);
       this.serde = serde;
-      this.reference = new AtomicReference<T>(serde.deserialize(rawBytes));
+      this.reference = new AtomicReference<>(serde.deserialize(rawBytes));
     }
 
     public AtomicReference<T> getReference()
diff --git a/processing/src/main/java/org/apache/druid/common/config/JacksonConfigManager.java b/processing/src/main/java/org/apache/druid/common/config/JacksonConfigManager.java
index 92a9ea0ebee7..aa432058f0af 100644
--- a/processing/src/main/java/org/apache/druid/common/config/JacksonConfigManager.java
+++ b/processing/src/main/java/org/apache/druid/common/config/JacksonConfigManager.java
@@ -130,7 +130,7 @@ public <T> SetResult set(
   @VisibleForTesting
   <T> ConfigSerde<T> create(final Class<? extends T> clazz, final T defaultVal)
   {
-    return new ConfigSerde<T>()
+    return new ConfigSerde<>()
     {
       @Override
       public byte[] serialize(T obj)
@@ -158,7 +158,7 @@ public T deserialize(byte[] bytes)
   @VisibleForTesting
   <T> ConfigSerde<T> create(final TypeReference<? extends T> clazz, final T defaultVal)
   {
-    return new ConfigSerde<T>()
+    return new ConfigSerde<>()
     {
       @Override
       public byte[] serialize(T obj)
diff --git a/processing/src/main/java/org/apache/druid/common/guava/CombiningSequence.java b/processing/src/main/java/org/apache/druid/common/guava/CombiningSequence.java
index de33963ff425..815db844ef8c 100644
--- a/processing/src/main/java/org/apache/druid/common/guava/CombiningSequence.java
+++ b/processing/src/main/java/org/apache/druid/common/guava/CombiningSequence.java
@@ -113,7 +113,7 @@ private <OutType> Yielder<OutType> makeYielder(
       final CombiningYieldingAccumulator<OutType, T> combiningAccumulator
   )
   {
-    return new Yielder<OutType>()
+    return new Yielder<>()
     {
       private Yielder<T> myYielder = yielder;
       private CombiningYieldingAccumulator<OutType, T> accum = combiningAccumulator;
diff --git a/processing/src/main/java/org/apache/druid/common/guava/DSuppliers.java b/processing/src/main/java/org/apache/druid/common/guava/DSuppliers.java
index 86d76b11c8c8..72398aefabbd 100644
--- a/processing/src/main/java/org/apache/druid/common/guava/DSuppliers.java
+++ b/processing/src/main/java/org/apache/druid/common/guava/DSuppliers.java
@@ -29,7 +29,7 @@ public class DSuppliers
 {
   public static <T> Supplier<T> of(final AtomicReference<T> ref)
   {
-    return new Supplier<T>()
+    return new Supplier<>()
     {
       @Override
       public T get()
diff --git a/processing/src/main/java/org/apache/druid/common/guava/FutureUtils.java b/processing/src/main/java/org/apache/druid/common/guava/FutureUtils.java
index 32625f1ec498..83a83b4f1a56 100644
--- a/processing/src/main/java/org/apache/druid/common/guava/FutureUtils.java
+++ b/processing/src/main/java/org/apache/druid/common/guava/FutureUtils.java
@@ -173,7 +173,7 @@ public static <T> ListenableFuture<T> futureWithBaggage(final ListenableFuture<T
 
     Futures.addCallback(
         future,
-        new FutureCallback<T>()
+        new FutureCallback<>()
         {
           @Override
           public void onSuccess(@Nullable T result)
diff --git a/processing/src/main/java/org/apache/druid/data/input/IntermediateRowParsingReader.java b/processing/src/main/java/org/apache/druid/data/input/IntermediateRowParsingReader.java
index 6c98f823311b..912b0bdebbeb 100644
--- a/processing/src/main/java/org/apache/druid/data/input/IntermediateRowParsingReader.java
+++ b/processing/src/main/java/org/apache/druid/data/input/IntermediateRowParsingReader.java
@@ -48,7 +48,7 @@ public CloseableIterator<InputRow> read() throws IOException
   {
     final CloseableIteratorWithMetadata<T> intermediateRowIteratorWithMetadata = intermediateRowIteratorWithMetadata();
 
-    return new CloseableIterator<InputRow>()
+    return new CloseableIterator<>()
     {
       // since parseInputRows() returns a list, the below line always iterates over the list,
       // which means it calls Iterator.hasNext() and Iterator.next() at least once per row.
@@ -124,7 +124,7 @@ public CloseableIterator<InputRowListPlusRawValues> sample() throws IOException
 
     final CloseableIteratorWithMetadata<T> delegate = intermediateRowIteratorWithMetadata();
 
-    return new CloseableIterator<InputRowListPlusRawValues>()
+    return new CloseableIterator<>()
     {
       @Override
       public void close() throws IOException
diff --git a/processing/src/main/java/org/apache/druid/data/input/MaxSizeSplitHintSpec.java b/processing/src/main/java/org/apache/druid/data/input/MaxSizeSplitHintSpec.java
index 880940b820a4..4efe75e6a1f8 100644
--- a/processing/src/main/java/org/apache/druid/data/input/MaxSizeSplitHintSpec.java
+++ b/processing/src/main/java/org/apache/druid/data/input/MaxSizeSplitHintSpec.java
@@ -97,7 +97,7 @@ public int getMaxNumFiles()
   @Override
   public <T> Iterator<List<T>> split(Iterator<T> inputIterator, Function<T, InputFileAttribute> inputAttributeExtractor)
   {
-    return new Iterator<List<T>>()
+    return new Iterator<>()
     {
       private final long maxSplitSizeBytes = maxSplitSize.getBytes();
       private T peeking;
diff --git a/processing/src/main/java/org/apache/druid/data/input/TextReader.java b/processing/src/main/java/org/apache/druid/data/input/TextReader.java
index af092442fb16..0ffcb646c1e7 100644
--- a/processing/src/main/java/org/apache/druid/data/input/TextReader.java
+++ b/processing/src/main/java/org/apache/druid/data/input/TextReader.java
@@ -66,7 +66,7 @@ public CloseableIteratorWithMetadata<T> intermediateRowIteratorWithMetadata() th
       processHeaderLine(delegate.next());
     }
 
-    return new CloseableIteratorWithMetadata<T>()
+    return new CloseableIteratorWithMetadata<>()
     {
       private static final String LINE_KEY = "Line";
       private long currentLineNumber = numHeaderLines + (needsToProcessHeaderLine() ? 1 : 0);
diff --git a/processing/src/main/java/org/apache/druid/data/input/impl/DimensionsSpec.java b/processing/src/main/java/org/apache/druid/data/input/impl/DimensionsSpec.java
index b7369fe55f59..a22f72ab9fb4 100644
--- a/processing/src/main/java/org/apache/druid/data/input/impl/DimensionsSpec.java
+++ b/processing/src/main/java/org/apache/druid/data/input/impl/DimensionsSpec.java
@@ -201,7 +201,7 @@ public List<SpatialDimensionSchema> getSpatialDimensions()
 
     Iterable<SpatialDimensionSchema> transformedList = Iterables.transform(
         filteredList,
-        new Function<NewSpatialDimensionSchema, SpatialDimensionSchema>()
+        new Function<>()
         {
           @Nullable
           @Override
@@ -221,7 +221,7 @@ public List<String> getDimensionNames()
   {
     return Lists.transform(
         dimensions,
-        new Function<DimensionSchema, String>()
+        new Function<>()
         {
           @Override
           public String apply(DimensionSchema input)
@@ -295,7 +295,7 @@ private void verify(List<SpatialDimensionSchema> spatialDimensions)
 
     List<String> spatialDimNames = Lists.transform(
         spatialDimensions,
-        new Function<SpatialDimensionSchema, String>()
+        new Function<>()
         {
           @Override
           public String apply(SpatialDimensionSchema input)
diff --git a/processing/src/main/java/org/apache/druid/data/input/impl/JsonNodeReader.java b/processing/src/main/java/org/apache/druid/data/input/impl/JsonNodeReader.java
index d45a34e8b815..58564370132d 100644
--- a/processing/src/main/java/org/apache/druid/data/input/impl/JsonNodeReader.java
+++ b/processing/src/main/java/org/apache/druid/data/input/impl/JsonNodeReader.java
@@ -164,9 +164,7 @@ protected List<Map<String, Object>> toMap(JsonNode intermediateRow) throws IOExc
       throw ((ParseExceptionMarkerJsonNode) intermediateRow).getParseException();
     }
     return Collections.singletonList(
-        mapper.readValue(intermediateRow.toString(), new TypeReference<Map<String, Object>>()
-        {
-        })
+        mapper.readValue(intermediateRow.toString(), new TypeReference<>() {})
     );
   }
 
diff --git a/processing/src/main/java/org/apache/druid/data/input/impl/TimeAndDimsParseSpec.java b/processing/src/main/java/org/apache/druid/data/input/impl/TimeAndDimsParseSpec.java
index 7d6065bfdc68..823e0920b7ff 100644
--- a/processing/src/main/java/org/apache/druid/data/input/impl/TimeAndDimsParseSpec.java
+++ b/processing/src/main/java/org/apache/druid/data/input/impl/TimeAndDimsParseSpec.java
@@ -45,7 +45,7 @@ public TimeAndDimsParseSpec(
   @Override
   public Parser<String, Object> makeParser()
   {
-    return new Parser<String, Object>()
+    return new Parser<>()
     {
       @Override
       public Map<String, Object> parseToMap(String input)
diff --git a/processing/src/main/java/org/apache/druid/data/input/impl/TimedShutoffInputSourceReader.java b/processing/src/main/java/org/apache/druid/data/input/impl/TimedShutoffInputSourceReader.java
index 3438abb02e29..c26f197bf3e2 100644
--- a/processing/src/main/java/org/apache/druid/data/input/impl/TimedShutoffInputSourceReader.java
+++ b/processing/src/main/java/org/apache/druid/data/input/impl/TimedShutoffInputSourceReader.java
@@ -72,7 +72,7 @@ private <T> CloseableIterator<T> decorateShutdownTimeout(
     final Closer closer = Closer.create();
     closer.register(delegateIterator);
     closer.register(exec::shutdownNow);
-    final CloseableIterator<T> wrappingIterator = new CloseableIterator<T>()
+    final CloseableIterator<T> wrappingIterator = new CloseableIterator<>()
     {
       /**
        * Indicates this iterator has been closed or not.
diff --git a/processing/src/main/java/org/apache/druid/extendedset/intset/ImmutableConciseSet.java b/processing/src/main/java/org/apache/druid/extendedset/intset/ImmutableConciseSet.java
index f87a032cc6df..0d3ac643de66 100755
--- a/processing/src/main/java/org/apache/druid/extendedset/intset/ImmutableConciseSet.java
+++ b/processing/src/main/java/org/apache/druid/extendedset/intset/ImmutableConciseSet.java
@@ -38,7 +38,7 @@ public class ImmutableConciseSet
 {
   private static final int CHUNK_SIZE = 10000;
 
-  private static final Comparator<WordIterator> UNION_COMPARATOR = new Comparator<WordIterator>()
+  private static final Comparator<WordIterator> UNION_COMPARATOR = new Comparator<>()
   {
     // Comparison is first by index, then one fills < literals < zero fills
     // one fills are sorted by length (longer one fills have priority)
@@ -81,7 +81,7 @@ public int compare(WordIterator i1, WordIterator i2)
     }
   };
 
-  private static final Comparator<WordIterator> INTERSECTION_COMPARATOR = new Comparator<WordIterator>()
+  private static final Comparator<WordIterator> INTERSECTION_COMPARATOR = new Comparator<>()
   {
     // Comparison is first by index, then zero fills < literals < one fills
     // zero fills are sorted by length (longer zero fills have priority)
diff --git a/processing/src/main/java/org/apache/druid/frame/allocation/ArenaMemoryAllocator.java b/processing/src/main/java/org/apache/druid/frame/allocation/ArenaMemoryAllocator.java
index ebc493335521..64865f35b9d1 100644
--- a/processing/src/main/java/org/apache/druid/frame/allocation/ArenaMemoryAllocator.java
+++ b/processing/src/main/java/org/apache/druid/frame/allocation/ArenaMemoryAllocator.java
@@ -74,7 +74,7 @@ public Optional<ResourceHolder<WritableMemory>> allocate(final long size)
       lastAllocation = memory;
 
       return Optional.of(
-          new ResourceHolder<WritableMemory>()
+          new ResourceHolder<>()
           {
             boolean closed;
 
diff --git a/processing/src/main/java/org/apache/druid/frame/allocation/HeapMemoryAllocator.java b/processing/src/main/java/org/apache/druid/frame/allocation/HeapMemoryAllocator.java
index a78c53c4a372..84ff9d6caa52 100644
--- a/processing/src/main/java/org/apache/druid/frame/allocation/HeapMemoryAllocator.java
+++ b/processing/src/main/java/org/apache/druid/frame/allocation/HeapMemoryAllocator.java
@@ -59,7 +59,7 @@ public Optional<ResourceHolder<WritableMemory>> allocate(final long size)
       bytesAllocated += size;
 
       return Optional.of(
-          new ResourceHolder<WritableMemory>()
+          new ResourceHolder<>()
           {
             private WritableMemory memory =
                 WritableMemory.writableWrap(ByteBuffer.allocate(Ints.checkedCast(size)).order(ByteOrder.LITTLE_ENDIAN));
diff --git a/processing/src/main/java/org/apache/druid/frame/channel/FrameChannelSequence.java b/processing/src/main/java/org/apache/druid/frame/channel/FrameChannelSequence.java
index 3ef3b118774f..d56e7a2aa887 100644
--- a/processing/src/main/java/org/apache/druid/frame/channel/FrameChannelSequence.java
+++ b/processing/src/main/java/org/apache/druid/frame/channel/FrameChannelSequence.java
@@ -39,7 +39,7 @@ public class FrameChannelSequence extends BaseSequence<Frame, FrameChannelSequen
   public FrameChannelSequence(final ReadableFrameChannel channel)
   {
     super(
-        new IteratorMaker<Frame, FrameChannelIterator>()
+        new IteratorMaker<>()
         {
           @Override
           public FrameChannelIterator make()
diff --git a/processing/src/main/java/org/apache/druid/frame/field/NumericArrayFieldWriter.java b/processing/src/main/java/org/apache/druid/frame/field/NumericArrayFieldWriter.java
index 8096e323dc32..52e83a201c5f 100644
--- a/processing/src/main/java/org/apache/druid/frame/field/NumericArrayFieldWriter.java
+++ b/processing/src/main/java/org/apache/druid/frame/field/NumericArrayFieldWriter.java
@@ -137,7 +137,7 @@ public long writeTo(WritableMemory memory, long position, long maxSize)
     } else {
       // Create a columnValueSelector to write the individual elements re-using the NumericFieldWriter
       AtomicInteger index = new AtomicInteger(0);
-      ColumnValueSelector<Number> columnValueSelector = new ColumnValueSelector<Number>()
+      ColumnValueSelector<Number> columnValueSelector = new ColumnValueSelector<>()
       {
         @Override
         public double getDouble()
diff --git a/processing/src/main/java/org/apache/druid/frame/file/FrameFile.java b/processing/src/main/java/org/apache/druid/frame/file/FrameFile.java
index 7d21a54d8524..358997efcdd9 100644
--- a/processing/src/main/java/org/apache/druid/frame/file/FrameFile.java
+++ b/processing/src/main/java/org/apache/druid/frame/file/FrameFile.java
@@ -259,7 +259,7 @@ static FrameFile open(
       }
 
       final ReferenceCountingCloseableObject<Closeable> referenceCounter =
-          new ReferenceCountingCloseableObject<Closeable>(fileCloser) {};
+          new ReferenceCountingCloseableObject<>(fileCloser) {};
 
       return new FrameFile(
           file,
diff --git a/processing/src/main/java/org/apache/druid/frame/processor/FrameProcessorExecutor.java b/processing/src/main/java/org/apache/druid/frame/processor/FrameProcessorExecutor.java
index 49573b39b4ec..b76263b52e90 100644
--- a/processing/src/main/java/org/apache/druid/frame/processor/FrameProcessorExecutor.java
+++ b/processing/src/main/java/org/apache/druid/frame/processor/FrameProcessorExecutor.java
@@ -278,7 +278,7 @@ private <V> void runProcessorAfterFutureResolves(final ListenableFuture<V> futur
 
         Futures.addCallback(
             cancelableFuture,
-            new FutureCallback<V>()
+            new FutureCallback<>()
             {
               @Override
               public void onSuccess(final V ignored)
diff --git a/processing/src/main/java/org/apache/druid/frame/processor/RunAllFullyWidget.java b/processing/src/main/java/org/apache/druid/frame/processor/RunAllFullyWidget.java
index 7f79a319c280..bd5bdafe66bc 100644
--- a/processing/src/main/java/org/apache/druid/frame/processor/RunAllFullyWidget.java
+++ b/processing/src/main/java/org/apache/druid/frame/processor/RunAllFullyWidget.java
@@ -276,7 +276,7 @@ public void run()
 
         Futures.addCallback(
             future,
-            new FutureCallback<T>()
+            new FutureCallback<>()
             {
               @Override
               public void onSuccess(T result)
diff --git a/processing/src/main/java/org/apache/druid/frame/processor/SuperSorter.java b/processing/src/main/java/org/apache/druid/frame/processor/SuperSorter.java
index 8de4c8e86166..f16299bb1637 100644
--- a/processing/src/main/java/org/apache/druid/frame/processor/SuperSorter.java
+++ b/processing/src/main/java/org/apache/druid/frame/processor/SuperSorter.java
@@ -789,7 +789,7 @@ private <T> void runWorker(final FrameProcessor<T> worker, final Consumer<T> out
   {
     Futures.addCallback(
         exec.runFully(processorDecorator.decorate(worker), cancellationId),
-        new FutureCallback<T>()
+        new FutureCallback<>()
         {
           @Override
           public void onSuccess(T result)
diff --git a/processing/src/main/java/org/apache/druid/frame/read/FrameReaderUtils.java b/processing/src/main/java/org/apache/druid/frame/read/FrameReaderUtils.java
index 15ea29bcdd60..b6f73228c874 100644
--- a/processing/src/main/java/org/apache/druid/frame/read/FrameReaderUtils.java
+++ b/processing/src/main/java/org/apache/druid/frame/read/FrameReaderUtils.java
@@ -83,7 +83,7 @@ public static Supplier<MemoryRange<Memory>> makeRowMemorySupplier(
       final ColumnValueSelector<?> memorySelector =
           columnSelectorFactory.makeColumnValueSelector(FrameColumnSelectorFactory.ROW_MEMORY_COLUMN);
 
-      return new Supplier<MemoryRange<Memory>>()
+      return new Supplier<>()
       {
         private RowSignature lastSignature = null;
         private boolean lastSignatureOk = false;
diff --git a/processing/src/main/java/org/apache/druid/frame/read/columnar/ComplexFrameColumnReader.java b/processing/src/main/java/org/apache/druid/frame/read/columnar/ComplexFrameColumnReader.java
index f22aeb8000b9..fc30d7c996f6 100644
--- a/processing/src/main/java/org/apache/druid/frame/read/columnar/ComplexFrameColumnReader.java
+++ b/processing/src/main/java/org/apache/druid/frame/read/columnar/ComplexFrameColumnReader.java
@@ -149,7 +149,7 @@ private ComplexFrameColumn(
     @Override
     public ColumnValueSelector<?> makeColumnValueSelector(final ReadableOffset offset)
     {
-      return new ObjectColumnSelector<Object>()
+      return new ObjectColumnSelector<>()
       {
         @Nullable
         @Override
diff --git a/processing/src/main/java/org/apache/druid/frame/read/columnar/NumericArrayFrameColumnReader.java b/processing/src/main/java/org/apache/druid/frame/read/columnar/NumericArrayFrameColumnReader.java
index 986baaa099d9..81f4bcfaa5a0 100644
--- a/processing/src/main/java/org/apache/druid/frame/read/columnar/NumericArrayFrameColumnReader.java
+++ b/processing/src/main/java/org/apache/druid/frame/read/columnar/NumericArrayFrameColumnReader.java
@@ -187,7 +187,7 @@ protected Comparator<Object> getComparator()
     public ColumnValueSelector<?> makeColumnValueSelector(ReadableOffset offset)
     {
       // Cache's the row's value before returning
-      return new ObjectColumnSelector<Object>()
+      return new ObjectColumnSelector<>()
       {
 
         // Cached row number
diff --git a/processing/src/main/java/org/apache/druid/frame/read/columnar/StringArrayFrameColumnReader.java b/processing/src/main/java/org/apache/druid/frame/read/columnar/StringArrayFrameColumnReader.java
index 31c56bf38e7d..34d6ae2cd65b 100644
--- a/processing/src/main/java/org/apache/druid/frame/read/columnar/StringArrayFrameColumnReader.java
+++ b/processing/src/main/java/org/apache/druid/frame/read/columnar/StringArrayFrameColumnReader.java
@@ -178,7 +178,7 @@ private StringArrayFrameColumn(
     @Override
     public ColumnValueSelector<?> makeColumnValueSelector(ReadableOffset offset)
     {
-      return new ObjectColumnSelector<Object>()
+      return new ObjectColumnSelector<>()
       {
         @Override
         public void inspectRuntimeShape(RuntimeShapeInspector inspector)
diff --git a/processing/src/main/java/org/apache/druid/frame/segment/FrameCursorUtils.java b/processing/src/main/java/org/apache/druid/frame/segment/FrameCursorUtils.java
index de970363bb4f..1071b6a4792f 100644
--- a/processing/src/main/java/org/apache/druid/frame/segment/FrameCursorUtils.java
+++ b/processing/src/main/java/org/apache/druid/frame/segment/FrameCursorUtils.java
@@ -114,7 +114,7 @@ public static Iterable<Frame> cursorToFramesIterable(
   {
     throwIfColumnsHaveUnknownType(frameWriterFactory.signature());
 
-    return () -> new Iterator<Frame>()
+    return () -> new Iterator<>()
     {
       @Override
       public boolean hasNext()
diff --git a/processing/src/main/java/org/apache/druid/guice/ConditionalMultibind.java b/processing/src/main/java/org/apache/druid/guice/ConditionalMultibind.java
index d0ca652544f1..654732c9a7d8 100644
--- a/processing/src/main/java/org/apache/druid/guice/ConditionalMultibind.java
+++ b/processing/src/main/java/org/apache/druid/guice/ConditionalMultibind.java
@@ -61,7 +61,7 @@ public class ConditionalMultibind<T>
    */
   public static <T> ConditionalMultibind<T> create(Properties properties, Binder binder, Class<T> type)
   {
-    return new ConditionalMultibind<T>(properties, Multibinder.newSetBinder(binder, type));
+    return new ConditionalMultibind<>(properties, Multibinder.newSetBinder(binder, type));
   }
 
   /**
@@ -82,7 +82,7 @@ public static <T> ConditionalMultibind<T> create(
       Class<? extends Annotation> annotationType
   )
   {
-    return new ConditionalMultibind<T>(properties, Multibinder.newSetBinder(binder, type, annotationType));
+    return new ConditionalMultibind<>(properties, Multibinder.newSetBinder(binder, type, annotationType));
   }
 
   /**
@@ -97,7 +97,7 @@ public static <T> ConditionalMultibind<T> create(
    */
   public static <T> ConditionalMultibind<T> create(Properties properties, Binder binder, TypeLiteral<T> type)
   {
-    return new ConditionalMultibind<T>(properties, Multibinder.newSetBinder(binder, type));
+    return new ConditionalMultibind<>(properties, Multibinder.newSetBinder(binder, type));
   }
 
   /**
@@ -118,7 +118,7 @@ public static <T> ConditionalMultibind<T> create(
       Class<? extends Annotation> annotationType
   )
   {
-    return new ConditionalMultibind<T>(properties, Multibinder.newSetBinder(binder, type, annotationType));
+    return new ConditionalMultibind<>(properties, Multibinder.newSetBinder(binder, type, annotationType));
   }
 
 
diff --git a/processing/src/main/java/org/apache/druid/guice/ConfigProvider.java b/processing/src/main/java/org/apache/druid/guice/ConfigProvider.java
index 66cc6261c9f3..682dce0f7cb4 100644
--- a/processing/src/main/java/org/apache/druid/guice/ConfigProvider.java
+++ b/processing/src/main/java/org/apache/druid/guice/ConfigProvider.java
@@ -48,7 +48,7 @@ public static <T> Provider<T> of(Class<T> clazz)
 
   public static <T> Provider<T> of(Class<T> clazz, Map<String, String> replacements)
   {
-    return new ConfigProvider<T>(clazz, replacements);
+    return new ConfigProvider<>(clazz, replacements);
   }
 
   private final Class<T> clazz;
diff --git a/processing/src/main/java/org/apache/druid/guice/JacksonConfigProvider.java b/processing/src/main/java/org/apache/druid/guice/JacksonConfigProvider.java
index 79d0e54e9e0a..2082de7c55f2 100644
--- a/processing/src/main/java/org/apache/druid/guice/JacksonConfigProvider.java
+++ b/processing/src/main/java/org/apache/druid/guice/JacksonConfigProvider.java
@@ -42,7 +42,7 @@ public static <T> void bind(Binder binder, String key, Class<T> clazz, T default
 
   public static <T> JacksonConfigProvider<T> of(String key, Class<T> clazz, T defaultVal)
   {
-    return new JacksonConfigProvider<T>(key, clazz, null, defaultVal);
+    return new JacksonConfigProvider<>(key, clazz, null, defaultVal);
   }
 
   private final String key;
diff --git a/processing/src/main/java/org/apache/druid/guice/JsonConfigurator.java b/processing/src/main/java/org/apache/druid/guice/JsonConfigurator.java
index 8a53dbffabf0..2d7db35e2acb 100644
--- a/processing/src/main/java/org/apache/druid/guice/JsonConfigurator.java
+++ b/processing/src/main/java/org/apache/druid/guice/JsonConfigurator.java
@@ -189,7 +189,7 @@ public <T> T configurate(
       throw new ProvisionException(
           Iterables.transform(
               messages,
-              new Function<String, Message>()
+              new Function<>()
               {
                 @Override
                 public Message apply(String input)
diff --git a/processing/src/main/java/org/apache/druid/guice/LifecycleModule.java b/processing/src/main/java/org/apache/druid/guice/LifecycleModule.java
index c411526b91b8..d09e39a7db4c 100644
--- a/processing/src/main/java/org/apache/druid/guice/LifecycleModule.java
+++ b/processing/src/main/java/org/apache/druid/guice/LifecycleModule.java
@@ -138,7 +138,7 @@ public void configure(Binder binder)
   @Provides @LazySingleton
   public Lifecycle getLifecycle(final Injector injector)
   {
-    final Key<Set<KeyHolder>> keyHolderKey = Key.get(new TypeLiteral<Set<KeyHolder>>(){}, Names.named("lifecycle"));
+    final Key<Set<KeyHolder>> keyHolderKey = Key.get(new TypeLiteral<>() {}, Names.named("lifecycle"));
     final Set<KeyHolder> eagerClasses = injector.getInstance(keyHolderKey);
 
     Lifecycle lifecycle = new Lifecycle("module")
diff --git a/processing/src/main/java/org/apache/druid/guice/LifecycleScope.java b/processing/src/main/java/org/apache/druid/guice/LifecycleScope.java
index e8496c1e3ec8..775781d40bb4 100644
--- a/processing/src/main/java/org/apache/druid/guice/LifecycleScope.java
+++ b/processing/src/main/java/org/apache/druid/guice/LifecycleScope.java
@@ -57,7 +57,7 @@ public void setLifecycle(Lifecycle lifecycle)
   @Override
   public <T> Provider<T> scope(final Key<T> key, final Provider<T> unscoped)
   {
-    return new Provider<T>()
+    return new Provider<>()
     {
       private volatile T value = null;
 
diff --git a/processing/src/main/java/org/apache/druid/jackson/DruidDefaultSerializersModule.java b/processing/src/main/java/org/apache/druid/jackson/DruidDefaultSerializersModule.java
index cad8fdfd8315..daa7ea813173 100644
--- a/processing/src/main/java/org/apache/druid/jackson/DruidDefaultSerializersModule.java
+++ b/processing/src/main/java/org/apache/druid/jackson/DruidDefaultSerializersModule.java
@@ -59,7 +59,7 @@ public DruidDefaultSerializersModule()
 
     addDeserializer(
         DateTimeZone.class,
-        new JsonDeserializer<DateTimeZone>()
+        new JsonDeserializer<>()
         {
           @Override
           public DateTimeZone deserialize(JsonParser jp, DeserializationContext ctxt)
@@ -72,7 +72,7 @@ public DateTimeZone deserialize(JsonParser jp, DeserializationContext ctxt)
     );
     addSerializer(
         DateTimeZone.class,
-        new JsonSerializer<DateTimeZone>()
+        new JsonSerializer<>()
         {
           @Override
           public void serialize(
@@ -87,7 +87,7 @@ public void serialize(
     );
     addSerializer(
         Sequence.class,
-        new JsonSerializer<Sequence>()
+        new JsonSerializer<>()
         {
           @SuppressWarnings("unchecked")
           @Override
@@ -97,7 +97,7 @@ public void serialize(Sequence value, final JsonGenerator jgen, SerializerProvid
             jgen.writeStartArray();
             value.accumulate(
                 null,
-                new Accumulator<Object, Object>()
+                new Accumulator<>()
                 {
                   // Save allocations in jgen.writeObject by caching serializer.
                   JsonSerializer<Object> serializer = null;
@@ -133,7 +133,7 @@ public Object accumulate(Object ignored, Object object)
     );
     addSerializer(
         Yielder.class,
-        new JsonSerializer<Yielder>()
+        new JsonSerializer<>()
         {
           @SuppressWarnings("unchecked")
           @Override
@@ -174,7 +174,7 @@ public void serialize(Yielder yielder, final JsonGenerator jgen, SerializerProvi
     addSerializer(ByteOrder.class, ToStringSerializer.instance);
     addDeserializer(
         ByteOrder.class,
-        new JsonDeserializer<ByteOrder>()
+        new JsonDeserializer<>()
         {
           @Override
           public ByteOrder deserialize(JsonParser jp, DeserializationContext ctxt) throws IOException
diff --git a/processing/src/main/java/org/apache/druid/java/util/common/CloseableIterators.java b/processing/src/main/java/org/apache/druid/java/util/common/CloseableIterators.java
index a26bcf4dd200..ac8da7af1f57 100644
--- a/processing/src/main/java/org/apache/druid/java/util/common/CloseableIterators.java
+++ b/processing/src/main/java/org/apache/druid/java/util/common/CloseableIterators.java
@@ -59,7 +59,7 @@ public static <T> CloseableIterator<T> mergeSorted(
 
   public static <T> CloseableIterator<T> wrap(Iterator<T> innerIterator, @Nullable Closeable closeable)
   {
-    return new CloseableIterator<T>()
+    return new CloseableIterator<>()
     {
       private boolean closed;
 
diff --git a/processing/src/main/java/org/apache/druid/java/util/common/JodaUtils.java b/processing/src/main/java/org/apache/druid/java/util/common/JodaUtils.java
index 54ec9411a2b2..ad83f5d983b8 100644
--- a/processing/src/main/java/org/apache/druid/java/util/common/JodaUtils.java
+++ b/processing/src/main/java/org/apache/druid/java/util/common/JodaUtils.java
@@ -104,7 +104,7 @@ public static Iterator<Interval> condensedIntervalsIterator(Iterator<Interval> s
             )
         );
 
-    return new Iterator<Interval>()
+    return new Iterator<>()
     {
       private Interval previous;
 
diff --git a/processing/src/main/java/org/apache/druid/java/util/common/concurrent/ScheduledExecutors.java b/processing/src/main/java/org/apache/druid/java/util/common/concurrent/ScheduledExecutors.java
index 72cdaf15edf2..70e7aa18a2b0 100644
--- a/processing/src/main/java/org/apache/druid/java/util/common/concurrent/ScheduledExecutors.java
+++ b/processing/src/main/java/org/apache/druid/java/util/common/concurrent/ScheduledExecutors.java
@@ -47,7 +47,7 @@ public static void scheduleWithFixedDelay(
         exec,
         initialDelay,
         delay,
-        new Callable<Signal>()
+        new Callable<>()
         {
           @Override
           public Signal call()
diff --git a/processing/src/main/java/org/apache/druid/java/util/common/config/DurationCoercible.java b/processing/src/main/java/org/apache/druid/java/util/common/config/DurationCoercible.java
index cea559f055a7..5ba543bbfc08 100644
--- a/processing/src/main/java/org/apache/druid/java/util/common/config/DurationCoercible.java
+++ b/processing/src/main/java/org/apache/druid/java/util/common/config/DurationCoercible.java
@@ -35,7 +35,7 @@ public Coercer<Duration> accept(Class<?> clazz)
       return null;
     }
 
-    return new Coercer<Duration>()
+    return new Coercer<>()
     {
       @Override
       public Duration coerce(String value)
diff --git a/processing/src/main/java/org/apache/druid/java/util/common/granularity/Granularity.java b/processing/src/main/java/org/apache/druid/java/util/common/granularity/Granularity.java
index b841eb541938..35a503e6ba18 100644
--- a/processing/src/main/java/org/apache/druid/java/util/common/granularity/Granularity.java
+++ b/processing/src/main/java/org/apache/druid/java/util/common/granularity/Granularity.java
@@ -41,7 +41,7 @@
 
 public abstract class Granularity implements Cacheable
 {
-  public static final Comparator<Granularity> IS_FINER_THAN = new Comparator<Granularity>()
+  public static final Comparator<Granularity> IS_FINER_THAN = new Comparator<>()
   {
     @Override
     /**
diff --git a/processing/src/main/java/org/apache/druid/java/util/common/guava/Accumulators.java b/processing/src/main/java/org/apache/druid/java/util/common/guava/Accumulators.java
index 8a47398c4917..9e1b9fa95132 100644
--- a/processing/src/main/java/org/apache/druid/java/util/common/guava/Accumulators.java
+++ b/processing/src/main/java/org/apache/druid/java/util/common/guava/Accumulators.java
@@ -27,7 +27,7 @@ public class Accumulators
 {
   public static <ListType extends List<T>, T> Accumulator<ListType, T> list()
   {
-    return new Accumulator<ListType, T>()
+    return new Accumulator<>()
     {
       @Override
       public ListType accumulate(ListType accumulated, T in)
diff --git a/processing/src/main/java/org/apache/druid/java/util/common/guava/BaseSequence.java b/processing/src/main/java/org/apache/druid/java/util/common/guava/BaseSequence.java
index bb849fa6598e..c46aef033b74 100644
--- a/processing/src/main/java/org/apache/druid/java/util/common/guava/BaseSequence.java
+++ b/processing/src/main/java/org/apache/druid/java/util/common/guava/BaseSequence.java
@@ -97,7 +97,7 @@ private <OutType> Yielder<OutType> makeYielder(
       final IterType iter
   )
   {
-    return new Yielder<OutType>()
+    return new Yielder<>()
     {
       OutType retVal = retValue;
 
diff --git a/processing/src/main/java/org/apache/druid/java/util/common/guava/Comparators.java b/processing/src/main/java/org/apache/druid/java/util/common/guava/Comparators.java
index 9eb4578820b1..618698c4ac46 100644
--- a/processing/src/main/java/org/apache/druid/java/util/common/guava/Comparators.java
+++ b/processing/src/main/java/org/apache/druid/java/util/common/guava/Comparators.java
@@ -31,7 +31,7 @@
  */
 public class Comparators
 {
-  private static final Ordering<Object> ALWAYS_EQUAL = new Ordering<Object>()
+  private static final Ordering<Object> ALWAYS_EQUAL = new Ordering<>()
   {
     @SuppressWarnings("ComparatorMethodParameterNotUsed")
     @Override
@@ -75,7 +75,7 @@ public static <T extends Comparable<? super T>> Ordering<T> naturalNullsFirst()
     return NATURAL_NULLS_FIRST;
   }
 
-  private static final Comparator<Interval> INTERVAL_BY_START_THEN_END = new Comparator<Interval>()
+  private static final Comparator<Interval> INTERVAL_BY_START_THEN_END = new Comparator<>()
   {
     private final DateTimeComparator dateTimeComp = DateTimeComparator.getInstance();
 
@@ -97,7 +97,7 @@ public int compare(Interval lhs, Interval rhs)
     }
   };
 
-  private static final Comparator<Interval> INTERVAL_BY_END_THEN_START = new Comparator<Interval>()
+  private static final Comparator<Interval> INTERVAL_BY_END_THEN_START = new Comparator<>()
   {
     private final DateTimeComparator dateTimeComp = DateTimeComparator.getInstance();
 
diff --git a/processing/src/main/java/org/apache/druid/java/util/common/guava/ConcatSequence.java b/processing/src/main/java/org/apache/druid/java/util/common/guava/ConcatSequence.java
index ca1ff489eee9..3a02d84471fd 100644
--- a/processing/src/main/java/org/apache/druid/java/util/common/guava/ConcatSequence.java
+++ b/processing/src/main/java/org/apache/druid/java/util/common/guava/ConcatSequence.java
@@ -50,7 +50,7 @@ public <OutType> Yielder<OutType> toYielder(
   {
     Yielder<Sequence<T>> yielderYielder = baseSequences.toYielder(
         null,
-        new YieldingAccumulator<Sequence<T>, Sequence<T>>()
+        new YieldingAccumulator<>()
         {
           @Override
           public Sequence<T> accumulate(Sequence<T> accumulated, Sequence<T> in)
@@ -119,7 +119,7 @@ private <OutType> Yielder<OutType> wrapYielder(
       return makeYielder(yielderYielder.next(null), nextInit, accumulator);
     }
 
-    return new Yielder<OutType>()
+    return new Yielder<>()
     {
       @Override
       public OutType get()
diff --git a/processing/src/main/java/org/apache/druid/java/util/common/guava/ExplodingSequence.java b/processing/src/main/java/org/apache/druid/java/util/common/guava/ExplodingSequence.java
index 5468a5d86033..e89dae5430af 100644
--- a/processing/src/main/java/org/apache/druid/java/util/common/guava/ExplodingSequence.java
+++ b/processing/src/main/java/org/apache/druid/java/util/common/guava/ExplodingSequence.java
@@ -55,7 +55,7 @@ public long getCloseCount()
 
   private <OutType> Yielder<OutType> wrapYielder(final Yielder<OutType> baseYielder)
   {
-    return new Yielder<OutType>()
+    return new Yielder<>()
     {
       @Override
       public OutType get()
diff --git a/processing/src/main/java/org/apache/druid/java/util/common/guava/FilteredSequence.java b/processing/src/main/java/org/apache/druid/java/util/common/guava/FilteredSequence.java
index 81210d76c267..a10c85c524a9 100644
--- a/processing/src/main/java/org/apache/druid/java/util/common/guava/FilteredSequence.java
+++ b/processing/src/main/java/org/apache/druid/java/util/common/guava/FilteredSequence.java
@@ -58,7 +58,7 @@ private <OutType> Yielder<OutType> wrapYielder(
       final Yielder<OutType> yielder, final FilteringYieldingAccumulator<OutType, T> accumulator
   )
   {
-    return new Yielder<OutType>()
+    return new Yielder<>()
     {
       @Override
       public OutType get()
diff --git a/processing/src/main/java/org/apache/druid/java/util/common/guava/MergeSequence.java b/processing/src/main/java/org/apache/druid/java/util/common/guava/MergeSequence.java
index ad35f418ffa7..103e26a673c1 100644
--- a/processing/src/main/java/org/apache/druid/java/util/common/guava/MergeSequence.java
+++ b/processing/src/main/java/org/apache/druid/java/util/common/guava/MergeSequence.java
@@ -65,7 +65,7 @@ public <OutType> Yielder<OutType> toYielder(OutType initValue, YieldingAccumulat
           (queue, in) -> {
             final Yielder<T> yielder = in.toYielder(
                 null,
-                new YieldingAccumulator<T, T>()
+                new YieldingAccumulator<>()
                 {
                   @Override
                   public T accumulate(T accumulated, T in)
@@ -159,7 +159,7 @@ private <OutType> Yielder<OutType> makeYielder(
     }
 
     final OutType yieldVal = retVal;
-    return new Yielder<OutType>()
+    return new Yielder<>()
     {
       @Override
       public OutType get()
diff --git a/processing/src/main/java/org/apache/druid/java/util/common/guava/ParallelMergeCombiningSequence.java b/processing/src/main/java/org/apache/druid/java/util/common/guava/ParallelMergeCombiningSequence.java
index 53b7d68636dc..abf6e29ae8fa 100644
--- a/processing/src/main/java/org/apache/druid/java/util/common/guava/ParallelMergeCombiningSequence.java
+++ b/processing/src/main/java/org/apache/druid/java/util/common/guava/ParallelMergeCombiningSequence.java
@@ -205,12 +205,12 @@ static <T> Sequence<T> makeOutputSequenceForQueue(
   )
   {
     return new BaseSequence<>(
-        new BaseSequence.IteratorMaker<T, Iterator<T>>()
+        new BaseSequence.IteratorMaker<>()
         {
           @Override
           public Iterator<T> make()
           {
-            return new Iterator<T>()
+            return new Iterator<>()
             {
               private ResultBatch<T> currentBatch;
 
@@ -777,7 +777,7 @@ protected void compute()
           }
         }
         if (!cancellationGizmo.isCanceled() && !cursors.isEmpty()) {
-          getPool().execute(new MergeCombineAction<T>(
+          getPool().execute(new MergeCombineAction<>(
               cursors,
               outputQueue,
               orderingFn,
@@ -931,7 +931,7 @@ static <E> Yielder<ResultBatch<E>> fromSequence(Sequence<E> sequence, int batchS
     {
       return sequence.toYielder(
           new ResultBatch<>(batchSize),
-          new YieldingAccumulator<ResultBatch<E>, E>()
+          new YieldingAccumulator<>()
           {
             int count = 0;
 
diff --git a/processing/src/main/java/org/apache/druid/java/util/common/guava/Sequences.java b/processing/src/main/java/org/apache/druid/java/util/common/guava/Sequences.java
index daac8b235f49..5b4cd7f2e6da 100644
--- a/processing/src/main/java/org/apache/druid/java/util/common/guava/Sequences.java
+++ b/processing/src/main/java/org/apache/druid/java/util/common/guava/Sequences.java
@@ -106,7 +106,7 @@ public static <T> Sequence<T> withEffect(final Sequence<T> seq, final Runnable e
     // instead of extending YieldingSequenceBase, it's not possible to distinguish exception thrown during elements
     // processing in accumulate() of the underlying seq, from exception thrown after all elements are processed,
     // in close().
-    return new YieldingSequenceBase<T>()
+    return new YieldingSequenceBase<>()
     {
       @Override
       public <OutType> Yielder<OutType> toYielder(OutType initValue, YieldingAccumulator<OutType, T> accumulator)
diff --git a/processing/src/main/java/org/apache/druid/java/util/common/guava/SimpleSequence.java b/processing/src/main/java/org/apache/druid/java/util/common/guava/SimpleSequence.java
index 48fa4c688173..428738378563 100644
--- a/processing/src/main/java/org/apache/druid/java/util/common/guava/SimpleSequence.java
+++ b/processing/src/main/java/org/apache/druid/java/util/common/guava/SimpleSequence.java
@@ -31,7 +31,7 @@ public class SimpleSequence<T> extends BaseSequence<T, Iterator<T>>
   SimpleSequence(final Iterable<T> iterable)
   {
     super(
-        new BaseSequence.IteratorMaker<T, Iterator<T>>()
+        new BaseSequence.IteratorMaker<>()
         {
           @Override
           public Iterator<T> make()
diff --git a/processing/src/main/java/org/apache/druid/java/util/common/guava/SkippingSequence.java b/processing/src/main/java/org/apache/druid/java/util/common/guava/SkippingSequence.java
index 4eba7a5473f6..db5d6d1c4e75 100644
--- a/processing/src/main/java/org/apache/druid/java/util/common/guava/SkippingSequence.java
+++ b/processing/src/main/java/org/apache/druid/java/util/common/guava/SkippingSequence.java
@@ -53,7 +53,7 @@ private <OutType> Yielder<OutType> wrapYielder(
       final SkippingYieldingAccumulator<OutType> accumulator
   )
   {
-    return new Yielder<OutType>()
+    return new Yielder<>()
     {
       @Override
       public OutType get()
diff --git a/processing/src/main/java/org/apache/druid/java/util/common/guava/TopNSequence.java b/processing/src/main/java/org/apache/druid/java/util/common/guava/TopNSequence.java
index 0b37c0022e5d..79ff44718228 100644
--- a/processing/src/main/java/org/apache/druid/java/util/common/guava/TopNSequence.java
+++ b/processing/src/main/java/org/apache/druid/java/util/common/guava/TopNSequence.java
@@ -39,7 +39,7 @@ public TopNSequence(
   )
   {
     super(
-        new IteratorMaker<T, Iterator<T>>()
+        new IteratorMaker<>()
         {
           @Override
           public Iterator<T> make()
diff --git a/processing/src/main/java/org/apache/druid/java/util/common/guava/WrappingSequence.java b/processing/src/main/java/org/apache/druid/java/util/common/guava/WrappingSequence.java
index 39889fc5997e..da80b256f25d 100644
--- a/processing/src/main/java/org/apache/druid/java/util/common/guava/WrappingSequence.java
+++ b/processing/src/main/java/org/apache/druid/java/util/common/guava/WrappingSequence.java
@@ -42,7 +42,7 @@ public <OutType> OutType accumulate(final OutType outType, final Accumulator<Out
     OutType result;
     try {
       wrapper.before();
-      result = wrapper.wrap(new Supplier<OutType>()
+      result = wrapper.wrap(new Supplier<>()
       {
         @Override
         public OutType get()
@@ -80,7 +80,7 @@ public <OutType> Yielder<OutType> toYielder(
   {
     try {
       wrapper.before();
-      return wrapper.wrap(new Supplier<Yielder<OutType>>()
+      return wrapper.wrap(new Supplier<>()
       {
         @Override
         public Yielder<OutType> get()
diff --git a/processing/src/main/java/org/apache/druid/java/util/common/guava/WrappingYielder.java b/processing/src/main/java/org/apache/druid/java/util/common/guava/WrappingYielder.java
index fe52ce7fbb3e..4faa769a2c43 100644
--- a/processing/src/main/java/org/apache/druid/java/util/common/guava/WrappingYielder.java
+++ b/processing/src/main/java/org/apache/druid/java/util/common/guava/WrappingYielder.java
@@ -45,7 +45,7 @@ public OutType get()
   public Yielder<OutType> next(final OutType initValue)
   {
     try {
-      return wrapper.wrap(new Supplier<Yielder<OutType>>()
+      return wrapper.wrap(new Supplier<>()
       {
         @Override
         public Yielder<OutType> get()
diff --git a/processing/src/main/java/org/apache/druid/java/util/common/guava/Yielders.java b/processing/src/main/java/org/apache/druid/java/util/common/guava/Yielders.java
index fbd1db105286..7b6bf49b3fb6 100644
--- a/processing/src/main/java/org/apache/druid/java/util/common/guava/Yielders.java
+++ b/processing/src/main/java/org/apache/druid/java/util/common/guava/Yielders.java
@@ -31,7 +31,7 @@ public static <T> Yielder<T> each(final Sequence<T> sequence)
   {
     return sequence.toYielder(
         null,
-        new YieldingAccumulator<T, T>()
+        new YieldingAccumulator<>()
         {
           @Override
           public T accumulate(T accumulated, T in)
@@ -45,7 +45,7 @@ public T accumulate(T accumulated, T in)
 
   public static <T> Yielder<T> done(final T finalVal, final AutoCloseable closeable)
   {
-    return new Yielder<T>()
+    return new Yielder<>()
     {
       @Override
       public T get()
diff --git a/processing/src/main/java/org/apache/druid/java/util/common/guava/YieldingAccumulators.java b/processing/src/main/java/org/apache/druid/java/util/common/guava/YieldingAccumulators.java
index a00562d9909b..3ba84930d52b 100644
--- a/processing/src/main/java/org/apache/druid/java/util/common/guava/YieldingAccumulators.java
+++ b/processing/src/main/java/org/apache/druid/java/util/common/guava/YieldingAccumulators.java
@@ -27,7 +27,7 @@ public static <AccumulatedType, InType> YieldingAccumulator<AccumulatedType, InT
       final Accumulator<AccumulatedType, InType> accumulator
   )
   {
-    return new YieldingAccumulator<AccumulatedType, InType>()
+    return new YieldingAccumulator<>()
     {
       @Override
       public AccumulatedType accumulate(AccumulatedType accumulated, InType in)
diff --git a/processing/src/main/java/org/apache/druid/java/util/common/jackson/JacksonUtils.java b/processing/src/main/java/org/apache/druid/java/util/common/jackson/JacksonUtils.java
index b02de3ce4932..ed6567bf9313 100644
--- a/processing/src/main/java/org/apache/druid/java/util/common/jackson/JacksonUtils.java
+++ b/processing/src/main/java/org/apache/druid/java/util/common/jackson/JacksonUtils.java
@@ -39,17 +39,11 @@
 public final class JacksonUtils
 {
   public static final TypeReference<Map<String, Object>> TYPE_REFERENCE_MAP_STRING_OBJECT =
-      new TypeReference<Map<String, Object>>()
-      {
-      };
+      new TypeReference<>() {};
   public static final TypeReference<Map<String, String>> TYPE_REFERENCE_MAP_STRING_STRING =
-      new TypeReference<Map<String, String>>()
-      {
-      };
+      new TypeReference<>() {};
   public static final TypeReference<Map<String, Boolean>> TYPE_REFERENCE_MAP_STRING_BOOLEAN =
-      new TypeReference<Map<String, Boolean>>()
-      {
-      };
+      new TypeReference<>() {};
 
   private JacksonUtils()
   {
diff --git a/processing/src/main/java/org/apache/druid/java/util/common/parsers/CloseableIterator.java b/processing/src/main/java/org/apache/druid/java/util/common/parsers/CloseableIterator.java
index 7b81934367d1..dbd9bff58215 100644
--- a/processing/src/main/java/org/apache/druid/java/util/common/parsers/CloseableIterator.java
+++ b/processing/src/main/java/org/apache/druid/java/util/common/parsers/CloseableIterator.java
@@ -34,7 +34,7 @@ default <R> CloseableIterator<R> map(Function<T, R> mapFunction)
   {
     final CloseableIterator<T> delegate = this;
 
-    return new CloseableIterator<R>()
+    return new CloseableIterator<>()
     {
       @Override
       public boolean hasNext()
@@ -63,7 +63,7 @@ default <R> CloseableIterator<R> flatMap(Function<T, CloseableIterator<R>> funct
   {
     final CloseableIterator<T> outerIterator = this;
 
-    return new CloseableIterator<R>()
+    return new CloseableIterator<>()
     {
       CloseableIterator<R> currInnerIterator = null;
 
diff --git a/processing/src/main/java/org/apache/druid/java/util/common/parsers/CloseableIteratorWithMetadata.java b/processing/src/main/java/org/apache/druid/java/util/common/parsers/CloseableIteratorWithMetadata.java
index e1e4895ce2ef..0a26d2ba5358 100644
--- a/processing/src/main/java/org/apache/druid/java/util/common/parsers/CloseableIteratorWithMetadata.java
+++ b/processing/src/main/java/org/apache/druid/java/util/common/parsers/CloseableIteratorWithMetadata.java
@@ -50,7 +50,7 @@ public interface CloseableIteratorWithMetadata<T> extends CloseableIterator<T>
    */
   static <T> CloseableIteratorWithMetadata<T> withEmptyMetadata(CloseableIterator<T> delegate)
   {
-    return new CloseableIteratorWithMetadata<T>()
+    return new CloseableIteratorWithMetadata<>()
     {
 
       @Override
diff --git a/processing/src/main/java/org/apache/druid/java/util/common/parsers/JSONToLowerParser.java b/processing/src/main/java/org/apache/druid/java/util/common/parsers/JSONToLowerParser.java
index 166833cc061f..8776d300586f 100644
--- a/processing/src/main/java/org/apache/druid/java/util/common/parsers/JSONToLowerParser.java
+++ b/processing/src/main/java/org/apache/druid/java/util/common/parsers/JSONToLowerParser.java
@@ -47,7 +47,7 @@
 @Deprecated
 public class JSONToLowerParser implements Parser<String, Object>
 {
-  private static final Function<JsonNode, Object> VALUE_FUNCTION = new Function<JsonNode, Object>()
+  private static final Function<JsonNode, Object> VALUE_FUNCTION = new Function<>()
   {
     @Override
     public Object apply(JsonNode node)
diff --git a/processing/src/main/java/org/apache/druid/java/util/common/parsers/JavaScriptParser.java b/processing/src/main/java/org/apache/druid/java/util/common/parsers/JavaScriptParser.java
index 8a307e58efb8..f3c676bb6c5a 100644
--- a/processing/src/main/java/org/apache/druid/java/util/common/parsers/JavaScriptParser.java
+++ b/processing/src/main/java/org/apache/druid/java/util/common/parsers/JavaScriptParser.java
@@ -42,7 +42,7 @@ private static Function<Object, Object> compile(String function)
     final org.mozilla.javascript.Function fn = context.compileFunction(scope, function, "fn", 1, null);
     Context.exit();
 
-    return new Function<Object, Object>()
+    return new Function<>()
     {
       @Override
       public Object apply(Object input)
diff --git a/processing/src/main/java/org/apache/druid/java/util/common/parsers/ObjectFlatteners.java b/processing/src/main/java/org/apache/druid/java/util/common/parsers/ObjectFlatteners.java
index 2c76c14c7b79..496f5a766bd1 100644
--- a/processing/src/main/java/org/apache/druid/java/util/common/parsers/ObjectFlatteners.java
+++ b/processing/src/main/java/org/apache/druid/java/util/common/parsers/ObjectFlatteners.java
@@ -78,12 +78,12 @@ public static <T> ObjectFlattener<T> create(
       }
     }
 
-    return new ObjectFlattener<T>()
+    return new ObjectFlattener<>()
     {
       @Override
       public Map<String, Object> flatten(final T obj)
       {
-        return new AbstractMap<String, Object>()
+        return new AbstractMap<>()
         {
           @Override
           public int size()
diff --git a/processing/src/main/java/org/apache/druid/java/util/common/parsers/RegexParser.java b/processing/src/main/java/org/apache/druid/java/util/common/parsers/RegexParser.java
index 010696ca2797..15b4f235187c 100644
--- a/processing/src/main/java/org/apache/druid/java/util/common/parsers/RegexParser.java
+++ b/processing/src/main/java/org/apache/druid/java/util/common/parsers/RegexParser.java
@@ -55,7 +55,7 @@ public RegexParser(
     this.listSplitter = Splitter.onPattern(listDelimiter.isPresent()
                                            ? listDelimiter.get()
                                            : Parsers.DEFAULT_LIST_DELIMITER);
-    this.valueFunction = new Function<String, Object>()
+    this.valueFunction = new Function<>()
     {
       @Override
       public Object apply(String input)
diff --git a/processing/src/main/java/org/apache/druid/java/util/emitter/core/HttpPostEmitter.java b/processing/src/main/java/org/apache/druid/java/util/emitter/core/HttpPostEmitter.java
index e2fb9d436bfe..93ef6b1a1245 100644
--- a/processing/src/main/java/org/apache/druid/java/util/emitter/core/HttpPostEmitter.java
+++ b/processing/src/main/java/org/apache/druid/java/util/emitter/core/HttpPostEmitter.java
@@ -659,7 +659,7 @@ private boolean sendWithRetries(final byte[] buffer, final int length, final int
       long deadLineMillis = System.currentTimeMillis() + computeTimeoutForSendRequestInMillis(lastBatchFillTimeMillis);
       try {
         RetryUtils.retry(
-            new RetryUtils.Task<Object>()
+            new RetryUtils.Task<>()
             {
               @Override
               public Void perform() throws Exception
@@ -668,7 +668,7 @@ public Void perform() throws Exception
                 return null;
               }
             },
-            new Predicate<Throwable>()
+            new Predicate<>()
             {
               @Override
               public boolean apply(Throwable e)
diff --git a/processing/src/main/java/org/apache/druid/java/util/http/client/Request.java b/processing/src/main/java/org/apache/druid/java/util/http/client/Request.java
index 479468090e6b..bee0aeb167bc 100644
--- a/processing/src/main/java/org/apache/druid/java/util/http/client/Request.java
+++ b/processing/src/main/java/org/apache/druid/java/util/http/client/Request.java
@@ -49,7 +49,7 @@ public class Request
   private final URL url;
   private final Multimap<String, String> headers = Multimaps.newListMultimap(
       new HashMap<>(),
-      new Supplier<List<String>>()
+      new Supplier<>()
       {
         @Override
         public List<String> get()
diff --git a/processing/src/main/java/org/apache/druid/java/util/http/client/pool/ResourcePool.java b/processing/src/main/java/org/apache/druid/java/util/http/client/pool/ResourcePool.java
index 2476e4c9ebfd..dfa9903b9001 100644
--- a/processing/src/main/java/org/apache/druid/java/util/http/client/pool/ResourcePool.java
+++ b/processing/src/main/java/org/apache/druid/java/util/http/client/pool/ResourcePool.java
@@ -63,7 +63,7 @@ public ResourcePool(final ResourceFactory<K, V> factory, final ResourcePoolConfi
                       final boolean eagerInitialization)
   {
     this.pool = CacheBuilder.newBuilder().build(
-        new CacheLoader<K, ResourceHolderPerKey<K, V>>()
+        new CacheLoader<>()
         {
           @Override
           public ResourceHolderPerKey<K, V> load(K input)
@@ -108,7 +108,7 @@ public ResourceContainer<V> take(final K key)
     }
     final V value = holder.get();
 
-    return new ResourceContainer<V>()
+    return new ResourceContainer<>()
     {
       private final AtomicBoolean returned = new AtomicBoolean(false);
 
diff --git a/processing/src/main/java/org/apache/druid/java/util/http/client/response/SequenceInputStreamResponseHandler.java b/processing/src/main/java/org/apache/druid/java/util/http/client/response/SequenceInputStreamResponseHandler.java
index e1094ba8908b..f988ffedb58a 100644
--- a/processing/src/main/java/org/apache/druid/java/util/http/client/response/SequenceInputStreamResponseHandler.java
+++ b/processing/src/main/java/org/apache/druid/java/util/http/client/response/SequenceInputStreamResponseHandler.java
@@ -70,7 +70,7 @@ public ClientResponse<InputStream> handleResponse(HttpResponse response, Traffic
     byteCount.addAndGet(response.getContent().readableBytes());
     return ClientResponse.finished(
         new SequenceInputStream(
-            new Enumeration<InputStream>()
+            new Enumeration<>()
             {
               @Override
               public boolean hasMoreElements()
diff --git a/processing/src/main/java/org/apache/druid/java/util/metrics/KeyedDiff.java b/processing/src/main/java/org/apache/druid/java/util/metrics/KeyedDiff.java
index c1a3bae768cb..50ae6767be69 100644
--- a/processing/src/main/java/org/apache/druid/java/util/metrics/KeyedDiff.java
+++ b/processing/src/main/java/org/apache/druid/java/util/metrics/KeyedDiff.java
@@ -28,7 +28,7 @@ public class KeyedDiff
 {
   private static final Logger log = new Logger(KeyedDiff.class);
 
-  private final Map<String, Map<String, Long>> prevs = new HashMap<String, Map<String, Long>>();
+  private final Map<String, Map<String, Long>> prevs = new HashMap<>();
 
   public Map<String, Long> to(String key, Map<String, Long> curr)
   {
diff --git a/processing/src/main/java/org/apache/druid/java/util/metrics/SysMonitor.java b/processing/src/main/java/org/apache/druid/java/util/metrics/SysMonitor.java
index ee3627986c9f..6082fb261e38 100644
--- a/processing/src/main/java/org/apache/druid/java/util/metrics/SysMonitor.java
+++ b/processing/src/main/java/org/apache/druid/java/util/metrics/SysMonitor.java
@@ -85,7 +85,7 @@ public SysMonitor(Map<String, String[]> dimensions, String feed)
 
     sigar.enableLogging(true);
 
-    this.statsList = new ArrayList<Stats>();
+    this.statsList = new ArrayList<>();
     this.statsList.addAll(
         Arrays.asList(
             new MemStats(),
diff --git a/processing/src/main/java/org/apache/druid/math/expr/CartesianList.java b/processing/src/main/java/org/apache/druid/math/expr/CartesianList.java
index d1373bd62a4b..ac2d17d2ae36 100644
--- a/processing/src/main/java/org/apache/druid/math/expr/CartesianList.java
+++ b/processing/src/main/java/org/apache/druid/math/expr/CartesianList.java
@@ -51,7 +51,7 @@ public static <E> List<List<E>> create(List<? extends List<? extends E>> lists)
       }
       axesBuilder.add(new ArrayList<>(list));
     }
-    return new CartesianList<E>(axesBuilder);
+    return new CartesianList<>(axesBuilder);
   }
 
   CartesianList(List<List<? extends E>> axes)
@@ -103,7 +103,7 @@ public int indexOf(Object o)
   public List<E> get(final int index)
   {
     Preconditions.checkElementIndex(index, size());
-    return new AbstractList<E>()
+    return new AbstractList<>()
     {
       @Override
       public int size()
diff --git a/processing/src/main/java/org/apache/druid/math/expr/ConstantExpr.java b/processing/src/main/java/org/apache/druid/math/expr/ConstantExpr.java
index 9d3c847e2089..e2f823eae28e 100644
--- a/processing/src/main/java/org/apache/druid/math/expr/ConstantExpr.java
+++ b/processing/src/main/java/org/apache/druid/math/expr/ConstantExpr.java
@@ -124,7 +124,7 @@ public String toString()
   @Override
   public Expr asSingleThreaded(InputBindingInspector inspector)
   {
-    return new ExprEvalBasedConstantExpr<T>(realEval());
+    return new ExprEvalBasedConstantExpr<>(realEval());
   }
 
   @Override
diff --git a/processing/src/main/java/org/apache/druid/math/expr/vector/VectorProcessors.java b/processing/src/main/java/org/apache/druid/math/expr/vector/VectorProcessors.java
index 33e4c82cbe8a..d5d3933b860b 100644
--- a/processing/src/main/java/org/apache/druid/math/expr/vector/VectorProcessors.java
+++ b/processing/src/main/java/org/apache/druid/math/expr/vector/VectorProcessors.java
@@ -95,7 +95,7 @@ public static <T> ExprVectorProcessor<T> constant(@Nullable Object constant, int
     final Object[] objects = new Object[maxVectorSize];
     Arrays.fill(objects, constant);
     final ExprEvalObjectVector eval = new ExprEvalObjectVector(objects, type);
-    return new ExprVectorProcessor<T>()
+    return new ExprVectorProcessor<>()
     {
       @Override
       public ExprEvalVector<T> evalVector(Expr.VectorInputBinding bindings)
@@ -132,7 +132,7 @@ public static <T> ExprVectorProcessor<T> constant(@Nullable Double constant, int
       Arrays.fill(doubles, constant);
     }
     final ExprEvalDoubleVector eval = new ExprEvalDoubleVector(doubles, nulls);
-    return new ExprVectorProcessor<T>()
+    return new ExprVectorProcessor<>()
     {
       @Override
       public ExprEvalVector<T> evalVector(Expr.VectorInputBinding bindings)
@@ -169,7 +169,7 @@ public static <T> ExprVectorProcessor<T> constant(@Nullable Long constant, int m
       Arrays.fill(longs, constant);
     }
     final ExprEvalLongVector eval = new ExprEvalLongVector(longs, nulls);
-    return new ExprVectorProcessor<T>()
+    return new ExprVectorProcessor<>()
     {
       @Override
       public ExprEvalVector<T> evalVector(Expr.VectorInputBinding bindings)
diff --git a/processing/src/main/java/org/apache/druid/query/ChainedExecutionQueryRunner.java b/processing/src/main/java/org/apache/druid/query/ChainedExecutionQueryRunner.java
index c8485814b595..4cc5a9fbd2d1 100644
--- a/processing/src/main/java/org/apache/druid/query/ChainedExecutionQueryRunner.java
+++ b/processing/src/main/java/org/apache/druid/query/ChainedExecutionQueryRunner.java
@@ -81,8 +81,8 @@ public Sequence<T> run(final QueryPlus<T> queryPlus, final ResponseContext respo
     final int priority = query.context().getPriority();
     final Ordering ordering = query.getResultOrdering();
     final QueryPlus<T> threadSafeQueryPlus = queryPlus.withoutThreadUnsafeState();
-    return new BaseSequence<T, Iterator<T>>(
-        new BaseSequence.IteratorMaker<T, Iterator<T>>()
+    return new BaseSequence<>(
+        new BaseSequence.IteratorMaker<>()
         {
           @Override
           public Iterator<T> make()
@@ -98,7 +98,7 @@ public Iterator<T> make()
                           }
 
                           return queryProcessingPool.submitRunnerTask(
-                              new AbstractPrioritizedQueryRunnerCallable<Iterable<T>, T>(priority, input)
+                              new AbstractPrioritizedQueryRunnerCallable<>(priority, input)
                               {
                                 @Override
                                 public Iterable<T> call()
diff --git a/processing/src/main/java/org/apache/druid/query/ConcatQueryRunner.java b/processing/src/main/java/org/apache/druid/query/ConcatQueryRunner.java
index 1a22b3e5e52f..3647521afcae 100644
--- a/processing/src/main/java/org/apache/druid/query/ConcatQueryRunner.java
+++ b/processing/src/main/java/org/apache/druid/query/ConcatQueryRunner.java
@@ -41,7 +41,7 @@ public Sequence<T> run(final QueryPlus<T> queryPlus, final ResponseContext respo
     return Sequences.concat(
         Sequences.map(
             queryRunners,
-            new Function<QueryRunner<T>, Sequence<T>>()
+            new Function<>()
             {
               @Override
               public Sequence<T> apply(final QueryRunner<T> input)
diff --git a/processing/src/main/java/org/apache/druid/query/Druids.java b/processing/src/main/java/org/apache/druid/query/Druids.java
index aad70c9ecb5d..5ce472c9b31e 100644
--- a/processing/src/main/java/org/apache/druid/query/Druids.java
+++ b/processing/src/main/java/org/apache/druid/query/Druids.java
@@ -71,7 +71,7 @@
  */
 public class Druids
 {
-  public static final Function<String, DimensionSpec> DIMENSION_IDENTITY = new Function<String, DimensionSpec>()
+  public static final Function<String, DimensionSpec> DIMENSION_IDENTITY = new Function<>()
   {
     @Nullable
     @Override
diff --git a/processing/src/main/java/org/apache/druid/query/FluentQueryRunner.java b/processing/src/main/java/org/apache/druid/query/FluentQueryRunner.java
index e6f52d47b541..25c783ed7615 100644
--- a/processing/src/main/java/org/apache/druid/query/FluentQueryRunner.java
+++ b/processing/src/main/java/org/apache/druid/query/FluentQueryRunner.java
@@ -54,7 +54,7 @@ public Sequence<T> run(QueryPlus<T> queryPlus, ResponseContext responseContext)
 
   public FluentQueryRunner<T> from(QueryRunner<T> runner)
   {
-    return new FluentQueryRunner<T>(runner, toolChest);
+    return new FluentQueryRunner<>(runner, toolChest);
   }
 
   public FluentQueryRunner<T> applyPostMergeDecoration()
diff --git a/processing/src/main/java/org/apache/druid/query/FrameBasedInlineDataSource.java b/processing/src/main/java/org/apache/druid/query/FrameBasedInlineDataSource.java
index 68d3db9a36d3..c821d061a5e9 100644
--- a/processing/src/main/java/org/apache/druid/query/FrameBasedInlineDataSource.java
+++ b/processing/src/main/java/org/apache/druid/query/FrameBasedInlineDataSource.java
@@ -103,7 +103,7 @@ public Sequence<Object[]> getRowsAsSequence()
               .collect(Collectors.toList());
 
           return Sequences.simple(
-              () -> new Iterator<Object[]>()
+              () -> new Iterator<>()
               {
                 @Override
                 public boolean hasNext()
diff --git a/processing/src/main/java/org/apache/druid/query/IterableRowsCursorHelper.java b/processing/src/main/java/org/apache/druid/query/IterableRowsCursorHelper.java
index 46a39ad4cb52..8120a8f5645a 100644
--- a/processing/src/main/java/org/apache/druid/query/IterableRowsCursorHelper.java
+++ b/processing/src/main/java/org/apache/druid/query/IterableRowsCursorHelper.java
@@ -86,13 +86,13 @@ public static Pair<Cursor, Closeable> getCursorFromSequence(Sequence<Object[]> r
   public static Pair<Cursor, Closeable> getCursorFromYielder(Yielder<Object[]> yielderParam, RowSignature rowSignature)
   {
     return getCursorFromIterable(
-        new Iterable<Object[]>()
+        new Iterable<>()
         {
           Yielder<Object[]> yielder = yielderParam;
           @Override
           public Iterator<Object[]> iterator()
           {
-            return new Iterator<Object[]>()
+            return new Iterator<>()
             {
               @Override
               public boolean hasNext()
diff --git a/processing/src/main/java/org/apache/druid/query/PrioritizedExecutorService.java b/processing/src/main/java/org/apache/druid/query/PrioritizedExecutorService.java
index 02636df107ff..af14e4cc83bf 100644
--- a/processing/src/main/java/org/apache/druid/query/PrioritizedExecutorService.java
+++ b/processing/src/main/java/org/apache/druid/query/PrioritizedExecutorService.java
@@ -53,7 +53,7 @@ public static PrioritizedExecutorService create(Lifecycle lifecycle, DruidProces
             config.getNumThreads(),
             0L,
             TimeUnit.MILLISECONDS,
-            new PriorityBlockingQueue<Runnable>(),
+            new PriorityBlockingQueue<>(),
             new ThreadFactoryBuilder().setDaemon(true).setNameFormat(config.getFormatString()).build()
         ),
         config
@@ -227,7 +227,7 @@ public int compare(PrioritizedListenableFutureTask left, PrioritizedListenableFu
       return Integer.compare(right.getPriority(), left.getPriority());
     }
   }.compound(
-      new Ordering<PrioritizedListenableFutureTask>()
+      new Ordering<>()
       {
         @Override
         public int compare(PrioritizedListenableFutureTask left, PrioritizedListenableFutureTask right)
diff --git a/processing/src/main/java/org/apache/druid/query/QueryRunnerHelper.java b/processing/src/main/java/org/apache/druid/query/QueryRunnerHelper.java
index bb9837bac2d0..042dd707406b 100644
--- a/processing/src/main/java/org/apache/druid/query/QueryRunnerHelper.java
+++ b/processing/src/main/java/org/apache/druid/query/QueryRunnerHelper.java
@@ -32,7 +32,7 @@ public class QueryRunnerHelper
 
   public static <T> QueryRunner<T> makeClosingQueryRunner(final QueryRunner<T> runner, final Closeable closeable)
   {
-    return new QueryRunner<T>()
+    return new QueryRunner<>()
     {
       @Override
       public Sequence<T> run(QueryPlus<T> queryPlus, ResponseContext responseContext)
diff --git a/processing/src/main/java/org/apache/druid/query/SinkQueryRunners.java b/processing/src/main/java/org/apache/druid/query/SinkQueryRunners.java
index 9cec39a61b13..8b2224e5b7a9 100644
--- a/processing/src/main/java/org/apache/druid/query/SinkQueryRunners.java
+++ b/processing/src/main/java/org/apache/druid/query/SinkQueryRunners.java
@@ -42,7 +42,7 @@ public Iterator<Pair<Interval, QueryRunner<T>>> runnerIntervalMappingIterator()
   public Iterator<QueryRunner<T>> iterator()
   {
     Iterator<Pair<Interval, QueryRunner<T>>> runnerIntervalIterator = runners.iterator();
-    return new Iterator<QueryRunner<T>>()
+    return new Iterator<>()
     {
       @Override
       public boolean hasNext()
diff --git a/processing/src/main/java/org/apache/druid/query/TimewarpOperator.java b/processing/src/main/java/org/apache/druid/query/TimewarpOperator.java
index 88c88b324890..78e409075a46 100644
--- a/processing/src/main/java/org/apache/druid/query/TimewarpOperator.java
+++ b/processing/src/main/java/org/apache/druid/query/TimewarpOperator.java
@@ -76,7 +76,7 @@ public QueryRunner<T> postProcess(QueryRunner<T> baseQueryRunner)
 
   public QueryRunner<T> postProcess(final QueryRunner<T> baseRunner, final long now)
   {
-    return new QueryRunner<T>()
+    return new QueryRunner<>()
     {
       @Override
       public Sequence<T> run(final QueryPlus<T> queryPlus, final ResponseContext responseContext)
@@ -99,7 +99,7 @@ public Sequence<T> run(final QueryPlus<T> queryPlus, final ResponseContext respo
                 ),
                 responseContext
             ),
-            new Function<T, T>()
+            new Function<>()
             {
               @Override
               public T apply(T input)
diff --git a/processing/src/main/java/org/apache/druid/query/aggregation/AbstractSerializableLongObjectPairSerde.java b/processing/src/main/java/org/apache/druid/query/aggregation/AbstractSerializableLongObjectPairSerde.java
index 75274555cf3c..2304e739c94f 100644
--- a/processing/src/main/java/org/apache/druid/query/aggregation/AbstractSerializableLongObjectPairSerde.java
+++ b/processing/src/main/java/org/apache/druid/query/aggregation/AbstractSerializableLongObjectPairSerde.java
@@ -42,7 +42,7 @@ public abstract class AbstractSerializableLongObjectPairSerde<T extends Serializ
   @Override
   public ComplexMetricExtractor<?> getExtractor()
   {
-    return new ComplexMetricExtractor<Object>()
+    return new ComplexMetricExtractor<>()
     {
       @Override
       public Class<T> extractedClass()
diff --git a/processing/src/main/java/org/apache/druid/query/aggregation/SerializablePairLongDoubleComplexMetricSerde.java b/processing/src/main/java/org/apache/druid/query/aggregation/SerializablePairLongDoubleComplexMetricSerde.java
index 15b36d6182d1..692639e87c0c 100644
--- a/processing/src/main/java/org/apache/druid/query/aggregation/SerializablePairLongDoubleComplexMetricSerde.java
+++ b/processing/src/main/java/org/apache/druid/query/aggregation/SerializablePairLongDoubleComplexMetricSerde.java
@@ -84,7 +84,7 @@ public void deserializeColumn(ByteBuffer buffer, ColumnBuilder columnBuilder)
   @Override
   public ObjectStrategy<SerializablePairLongDouble> getObjectStrategy()
   {
-    return new ObjectStrategy<SerializablePairLongDouble>()
+    return new ObjectStrategy<>()
     {
       @Override
       public int compare(SerializablePairLongDouble o1, SerializablePairLongDouble o2)
@@ -128,7 +128,7 @@ public TypeStrategy<SerializablePairLongDouble> getTypeStrategy()
     return new ObjectStrategyComplexTypeStrategy<>(
         getObjectStrategy(),
         ColumnType.ofComplex(getTypeName()),
-        new Hash.Strategy<SerializablePairLongDouble>()
+        new Hash.Strategy<>()
         {
           @Override
           public int hashCode(SerializablePairLongDouble o)
diff --git a/processing/src/main/java/org/apache/druid/query/aggregation/SerializablePairLongFloatComplexMetricSerde.java b/processing/src/main/java/org/apache/druid/query/aggregation/SerializablePairLongFloatComplexMetricSerde.java
index 4df89153caf9..9c5841be9354 100644
--- a/processing/src/main/java/org/apache/druid/query/aggregation/SerializablePairLongFloatComplexMetricSerde.java
+++ b/processing/src/main/java/org/apache/druid/query/aggregation/SerializablePairLongFloatComplexMetricSerde.java
@@ -85,7 +85,7 @@ public void deserializeColumn(ByteBuffer buffer, ColumnBuilder columnBuilder)
   @Override
   public ObjectStrategy<SerializablePairLongFloat> getObjectStrategy()
   {
-    return new ObjectStrategy<SerializablePairLongFloat>()
+    return new ObjectStrategy<>()
     {
       @Override
       public int compare(SerializablePairLongFloat o1, SerializablePairLongFloat o2)
@@ -129,7 +129,7 @@ public TypeStrategy<SerializablePairLongFloat> getTypeStrategy()
     return new ObjectStrategyComplexTypeStrategy<>(
         getObjectStrategy(),
         ColumnType.ofComplex(getTypeName()),
-        new Hash.Strategy<SerializablePairLongFloat>()
+        new Hash.Strategy<>()
         {
           @Override
           public int hashCode(SerializablePairLongFloat o)
diff --git a/processing/src/main/java/org/apache/druid/query/aggregation/SerializablePairLongLongComplexMetricSerde.java b/processing/src/main/java/org/apache/druid/query/aggregation/SerializablePairLongLongComplexMetricSerde.java
index 00f4c6a6ab8b..2be1d434c442 100644
--- a/processing/src/main/java/org/apache/druid/query/aggregation/SerializablePairLongLongComplexMetricSerde.java
+++ b/processing/src/main/java/org/apache/druid/query/aggregation/SerializablePairLongLongComplexMetricSerde.java
@@ -84,7 +84,7 @@ public void deserializeColumn(ByteBuffer buffer, ColumnBuilder columnBuilder)
   @Override
   public ObjectStrategy<SerializablePairLongLong> getObjectStrategy()
   {
-    return new ObjectStrategy<SerializablePairLongLong>()
+    return new ObjectStrategy<>()
     {
       @Override
       public int compare(SerializablePairLongLong o1, SerializablePairLongLong o2)
@@ -128,7 +128,7 @@ public TypeStrategy<SerializablePairLongLong> getTypeStrategy()
     return new ObjectStrategyComplexTypeStrategy<>(
         getObjectStrategy(),
         ColumnType.ofComplex(getTypeName()),
-        new Hash.Strategy<SerializablePairLongLong>()
+        new Hash.Strategy<>()
         {
           @Override
           public int hashCode(SerializablePairLongLong o)
diff --git a/processing/src/main/java/org/apache/druid/query/aggregation/SerializablePairLongStringComplexMetricSerde.java b/processing/src/main/java/org/apache/druid/query/aggregation/SerializablePairLongStringComplexMetricSerde.java
index fa393a5f2201..4f3171d8f673 100644
--- a/processing/src/main/java/org/apache/druid/query/aggregation/SerializablePairLongStringComplexMetricSerde.java
+++ b/processing/src/main/java/org/apache/druid/query/aggregation/SerializablePairLongStringComplexMetricSerde.java
@@ -102,7 +102,7 @@ public String getTypeName()
   @Override
   public ComplexMetricExtractor<?> getExtractor()
   {
-    return new ComplexMetricExtractor<Object>()
+    return new ComplexMetricExtractor<>()
     {
       @Override
       public Class<SerializablePairLongString> extractedClass()
@@ -137,7 +137,7 @@ public void deserializeColumn(ByteBuffer buffer, ColumnBuilder columnBuilder)
   @Override
   public ObjectStrategy<SerializablePairLongString> getObjectStrategy()
   {
-    return new ObjectStrategy<SerializablePairLongString>()
+    return new ObjectStrategy<>()
     {
       @Override
       public int compare(@Nullable SerializablePairLongString o1, @Nullable SerializablePairLongString o2)
@@ -176,7 +176,7 @@ public TypeStrategy<SerializablePairLongString> getTypeStrategy()
     return new ObjectStrategyComplexTypeStrategy<>(
         getObjectStrategy(),
         ColumnType.ofComplex(getTypeName()),
-        new Hash.Strategy<SerializablePairLongString>()
+        new Hash.Strategy<>()
         {
           @Override
           public int hashCode(SerializablePairLongString o)
@@ -215,7 +215,7 @@ public GenericColumnSerializer<?> getSerializer(
   }
 
   private static final ObjectStrategy<SerializablePairLongString> LEGACY_STRATEGY =
-      new ObjectStrategy<SerializablePairLongString>()
+      new ObjectStrategy<>()
       {
         @Override
         public int compare(@Nullable SerializablePairLongString o1, @Nullable SerializablePairLongString o2)
diff --git a/processing/src/main/java/org/apache/druid/query/aggregation/cardinality/CardinalityAggregatorFactory.java b/processing/src/main/java/org/apache/druid/query/aggregation/cardinality/CardinalityAggregatorFactory.java
index 5f2297b65521..bd2b06697d0f 100644
--- a/processing/src/main/java/org/apache/druid/query/aggregation/cardinality/CardinalityAggregatorFactory.java
+++ b/processing/src/main/java/org/apache/druid/query/aggregation/cardinality/CardinalityAggregatorFactory.java
@@ -67,7 +67,7 @@ private static List<String> makeRequiredFieldNamesFromFields(List<DimensionSpec>
     return ImmutableList.copyOf(
         Lists.transform(
             fields,
-            new Function<DimensionSpec, String>()
+            new Function<>()
             {
               @Override
               public String apply(DimensionSpec input)
@@ -84,7 +84,7 @@ private static List<DimensionSpec> makeFieldsFromFieldNames(List<String> fieldNa
     return ImmutableList.copyOf(
         Lists.transform(
             fieldNames,
-            new Function<String, DimensionSpec>()
+            new Function<>()
             {
               @Override
               public DimensionSpec apply(String input)
diff --git a/processing/src/main/java/org/apache/druid/query/aggregation/hyperloglog/HyperUniquesSerde.java b/processing/src/main/java/org/apache/druid/query/aggregation/hyperloglog/HyperUniquesSerde.java
index eabcc4333308..bd8c9093f93c 100644
--- a/processing/src/main/java/org/apache/druid/query/aggregation/hyperloglog/HyperUniquesSerde.java
+++ b/processing/src/main/java/org/apache/druid/query/aggregation/hyperloglog/HyperUniquesSerde.java
@@ -58,7 +58,7 @@ public String getTypeName()
   @Override
   public ComplexMetricExtractor<HyperLogLogCollector> getExtractor()
   {
-    return new ComplexMetricExtractor<HyperLogLogCollector>()
+    return new ComplexMetricExtractor<>()
     {
       @Override
       public Class<HyperLogLogCollector> extractedClass()
diff --git a/processing/src/main/java/org/apache/druid/query/context/ResponseContext.java b/processing/src/main/java/org/apache/druid/query/context/ResponseContext.java
index 6727782cc406..a2a068207188 100644
--- a/processing/src/main/java/org/apache/druid/query/context/ResponseContext.java
+++ b/processing/src/main/java/org/apache/druid/query/context/ResponseContext.java
@@ -324,7 +324,7 @@ public static class Keys
       @SuppressWarnings("unchecked")
       public Object mergeValues(Object oldValue, Object newValue)
       {
-        final List<Interval> result = new ArrayList<Interval>((List<Interval>) oldValue);
+        final List<Interval> result = new ArrayList<>((List<Interval>) oldValue);
         result.addAll((List<Interval>) newValue);
         return result;
       }
@@ -385,7 +385,7 @@ public Object mergeValues(Object totalRemainingPerId, Object idAndNumResponses)
       @SuppressWarnings("unchecked")
       public Object mergeValues(Object oldValue, Object newValue)
       {
-        final List<SegmentDescriptor> result = new ArrayList<SegmentDescriptor>((List<SegmentDescriptor>) oldValue);
+        final List<SegmentDescriptor> result = new ArrayList<>((List<SegmentDescriptor>) oldValue);
         result.addAll((List<SegmentDescriptor>) newValue);
         return result;
       }
diff --git a/processing/src/main/java/org/apache/druid/query/datasourcemetadata/DataSourceMetadataQueryRunnerFactory.java b/processing/src/main/java/org/apache/druid/query/datasourcemetadata/DataSourceMetadataQueryRunnerFactory.java
index 2b4a0cbb5715..0a5ef2a7680a 100644
--- a/processing/src/main/java/org/apache/druid/query/datasourcemetadata/DataSourceMetadataQueryRunnerFactory.java
+++ b/processing/src/main/java/org/apache/druid/query/datasourcemetadata/DataSourceMetadataQueryRunnerFactory.java
@@ -103,7 +103,7 @@ public Sequence<Result<DataSourceMetadataResultValue>> run(
       final DataSourceMetadataQuery legacyQuery = (DataSourceMetadataQuery) query;
 
       return new BaseSequence<>(
-          new BaseSequence.IteratorMaker<Result<DataSourceMetadataResultValue>, Iterator<Result<DataSourceMetadataResultValue>>>()
+          new BaseSequence.IteratorMaker<>()
           {
             @Override
             public Iterator<Result<DataSourceMetadataResultValue>> make()
diff --git a/processing/src/main/java/org/apache/druid/query/datasourcemetadata/DataSourceQueryQueryToolChest.java b/processing/src/main/java/org/apache/druid/query/datasourcemetadata/DataSourceQueryQueryToolChest.java
index 21fb5c53afcc..e91a4004007c 100644
--- a/processing/src/main/java/org/apache/druid/query/datasourcemetadata/DataSourceQueryQueryToolChest.java
+++ b/processing/src/main/java/org/apache/druid/query/datasourcemetadata/DataSourceQueryQueryToolChest.java
@@ -49,7 +49,7 @@ public class DataSourceQueryQueryToolChest
     extends QueryToolChest<Result<DataSourceMetadataResultValue>, DataSourceMetadataQuery>
 {
   private static final TypeReference<Result<DataSourceMetadataResultValue>> TYPE_REFERENCE =
-      new TypeReference<Result<DataSourceMetadataResultValue>>() {};
+      new TypeReference<>() {};
 
   private final GenericQueryMetricsFactory queryMetricsFactory;
 
@@ -78,7 +78,7 @@ public QueryRunner<Result<DataSourceMetadataResultValue>> mergeResults(
       final QueryRunner<Result<DataSourceMetadataResultValue>> runner
   )
   {
-    return new BySegmentSkippingQueryRunner<Result<DataSourceMetadataResultValue>>(runner)
+    return new BySegmentSkippingQueryRunner<>(runner)
     {
       @Override
       protected Sequence<Result<DataSourceMetadataResultValue>> doRun(
diff --git a/processing/src/main/java/org/apache/druid/query/extraction/FunctionalExtraction.java b/processing/src/main/java/org/apache/druid/query/extraction/FunctionalExtraction.java
index c01a21d109f3..ec58aa08ed77 100644
--- a/processing/src/main/java/org/apache/druid/query/extraction/FunctionalExtraction.java
+++ b/processing/src/main/java/org/apache/druid/query/extraction/FunctionalExtraction.java
@@ -62,7 +62,7 @@ public FunctionalExtraction(
     // This is intended to have the absolutely fastest code path possible and not have any extra logic in the function
     if (this.retainMissingValue) {
 
-      this.extractionFunction = new Function<String, String>()
+      this.extractionFunction = new Function<>()
       {
         @Nullable
         @Override
@@ -73,7 +73,7 @@ public String apply(@Nullable String dimValue)
         }
       };
     } else {
-      this.extractionFunction = new Function<String, String>()
+      this.extractionFunction = new Function<>()
       {
         @Nullable
         @Override
diff --git a/processing/src/main/java/org/apache/druid/query/extraction/JavaScriptExtractionFn.java b/processing/src/main/java/org/apache/druid/query/extraction/JavaScriptExtractionFn.java
index 679121b699d8..ad73cff52f3a 100644
--- a/processing/src/main/java/org/apache/druid/query/extraction/JavaScriptExtractionFn.java
+++ b/processing/src/main/java/org/apache/druid/query/extraction/JavaScriptExtractionFn.java
@@ -50,7 +50,7 @@ private static Function<Object, String> compile(String function)
     Context.exit();
 
 
-    return new Function<Object, String>()
+    return new Function<>()
     {
       @Override
       public String apply(Object input)
diff --git a/processing/src/main/java/org/apache/druid/query/groupby/GroupByQueryQueryToolChest.java b/processing/src/main/java/org/apache/druid/query/groupby/GroupByQueryQueryToolChest.java
index 83cd8cecac76..b5712ebdda38 100644
--- a/processing/src/main/java/org/apache/druid/query/groupby/GroupByQueryQueryToolChest.java
+++ b/processing/src/main/java/org/apache/druid/query/groupby/GroupByQueryQueryToolChest.java
@@ -89,12 +89,8 @@ public class GroupByQueryQueryToolChest extends QueryToolChest<ResultRow, GroupB
 {
   private static final byte GROUPBY_QUERY = 0x14;
   private static final TypeReference<Object> OBJECT_TYPE_REFERENCE =
-      new TypeReference<Object>()
-      {
-      };
-  private static final TypeReference<ResultRow> TYPE_REFERENCE = new TypeReference<ResultRow>()
-  {
-  };
+      new TypeReference<>() {};
+  private static final TypeReference<ResultRow> TYPE_REFERENCE = new TypeReference<>() {};
 
   private final GroupingEngine groupingEngine;
   private final GroupByQueryConfig queryConfig;
@@ -501,7 +497,7 @@ public ObjectMapper decorateObjectMapper(final ObjectMapper objectMapper, final
   public QueryRunner<ResultRow> preMergeQueryDecoration(final QueryRunner<ResultRow> runner)
   {
     return new SubqueryQueryRunner<>(
-        new QueryRunner<ResultRow>()
+        new QueryRunner<>()
         {
           @Override
           public Sequence<ResultRow> run(QueryPlus<ResultRow> queryPlus, ResponseContext responseContext)
@@ -556,7 +552,7 @@ public CacheStrategy<ResultRow, Object, GroupByQuery> getCacheStrategy(
     }
     final Class<?>[] dimensionClasses = createDimensionClasses(query);
 
-    return new CacheStrategy<ResultRow, Object, GroupByQuery>()
+    return new CacheStrategy<>()
     {
       private static final byte CACHE_STRATEGY_VERSION = 0x1;
       private final List<AggregatorFactory> aggs = query.getAggregatorSpecs();
@@ -619,7 +615,7 @@ public Function<ResultRow, Object> prepareForCache(boolean isResultLevelCache)
       {
         final boolean resultRowHasTimestamp = query.getResultRowHasTimestamp();
 
-        return new Function<ResultRow, Object>()
+        return new Function<>()
         {
           @Override
           public Object apply(ResultRow resultRow)
@@ -657,7 +653,7 @@ public Function<Object, ResultRow> pullFromCache(boolean isResultLevelCache)
         final int aggregatorStart = query.getResultRowAggregatorStart();
         final int postAggregatorStart = query.getResultRowPostAggregatorStart();
 
-        return new Function<Object, ResultRow>()
+        return new Function<>()
         {
           private final Granularity granularity = query.getGranularity();
 
diff --git a/processing/src/main/java/org/apache/druid/query/groupby/GroupByQueryResources.java b/processing/src/main/java/org/apache/druid/query/groupby/GroupByQueryResources.java
index 348e49d91a45..d756de5c5bab 100644
--- a/processing/src/main/java/org/apache/druid/query/groupby/GroupByQueryResources.java
+++ b/processing/src/main/java/org/apache/druid/query/groupby/GroupByQueryResources.java
@@ -184,7 +184,7 @@ private static ResourceHolder<ByteBuffer> getMergeBuffer(Deque<ByteBuffer> acqui
       throw DruidException.defensive("Insufficient free merge buffers present.");
     }
     final ByteBuffer buffer = acquiredBufferPool.pop();
-    return new ResourceHolder<ByteBuffer>()
+    return new ResourceHolder<>()
     {
       @Override
       public ByteBuffer get()
diff --git a/processing/src/main/java/org/apache/druid/query/groupby/ResultRowObjectMapperDecoratorUtil.java b/processing/src/main/java/org/apache/druid/query/groupby/ResultRowObjectMapperDecoratorUtil.java
index 60b55ce74828..cf21a9f896ca 100644
--- a/processing/src/main/java/org/apache/druid/query/groupby/ResultRowObjectMapperDecoratorUtil.java
+++ b/processing/src/main/java/org/apache/druid/query/groupby/ResultRowObjectMapperDecoratorUtil.java
@@ -113,7 +113,7 @@ private static JsonDeserializer<ResultRow> getDeserializer(
     } else if (!arrayBasedRows && !dimensionsRequireConversion) {
       // We have to deserialize map based rows, however we don't have to deserialize the dimensions individually
       // Returns a deserializer that can deserialize both map and array based rows simultaneously
-      return new JsonDeserializer<ResultRow>()
+      return new JsonDeserializer<>()
       {
         @Override
         public ResultRow deserialize(final JsonParser jp, final DeserializationContext ctxt) throws IOException
@@ -129,7 +129,7 @@ public ResultRow deserialize(final JsonParser jp, final DeserializationContext c
 
     } else {
       // Dimensions need to be serialized individually because some of them require conversion to specialized types
-      return new JsonDeserializer<ResultRow>()
+      return new JsonDeserializer<>()
       {
         final JavaType[] javaTypes = createJavaTypesForResultRow(query);
 
@@ -192,7 +192,7 @@ private static JsonSerializer<ResultRow> getSerializer(
       return null;
     } else {
       if (resultAsArray) {
-        return new JsonSerializer<ResultRow>()
+        return new JsonSerializer<>()
         {
           @Override
           public void serialize(ResultRow resultRow, JsonGenerator jsonGenerator, SerializerProvider serializerProvider)
@@ -203,7 +203,7 @@ public void serialize(ResultRow resultRow, JsonGenerator jsonGenerator, Serializ
         };
 
       } else {
-        return new JsonSerializer<ResultRow>()
+        return new JsonSerializer<>()
         {
           @Override
           public void serialize(ResultRow resultRow, JsonGenerator jsonGenerator, SerializerProvider serializerProvider)
diff --git a/processing/src/main/java/org/apache/druid/query/groupby/epinephelinae/BufferArrayGrouper.java b/processing/src/main/java/org/apache/druid/query/groupby/epinephelinae/BufferArrayGrouper.java
index 616ac190dd83..565afe285a06 100644
--- a/processing/src/main/java/org/apache/druid/query/groupby/epinephelinae/BufferArrayGrouper.java
+++ b/processing/src/main/java/org/apache/druid/query/groupby/epinephelinae/BufferArrayGrouper.java
@@ -292,7 +292,7 @@ public CloseableIterator<Entry<MemoryPointer>> iterator()
     final MemoryPointer reusableKey = new MemoryPointer(keyMemory, 0);
     final ReusableEntry<MemoryPointer> reusableEntry = new ReusableEntry<>(reusableKey, new Object[aggregators.size()]);
 
-    return new CloseableIterator<Entry<MemoryPointer>>()
+    return new CloseableIterator<>()
     {
       @Override
       public boolean hasNext()
@@ -324,7 +324,7 @@ public CloseableIterator<Entry<IntKey>> iterator(boolean sorted)
       throw new UnsupportedOperationException("sorted iterator is not supported yet");
     }
 
-    return new CloseableIterator<Entry<IntKey>>()
+    return new CloseableIterator<>()
     {
       final ReusableEntry<IntKey> reusableEntry =
           new ReusableEntry<>(new IntKey(0), new Object[aggregators.size()]);
diff --git a/processing/src/main/java/org/apache/druid/query/groupby/epinephelinae/BufferHashGrouper.java b/processing/src/main/java/org/apache/druid/query/groupby/epinephelinae/BufferHashGrouper.java
index 182a48577609..4970ebe9e83e 100644
--- a/processing/src/main/java/org/apache/druid/query/groupby/epinephelinae/BufferHashGrouper.java
+++ b/processing/src/main/java/org/apache/druid/query/groupby/epinephelinae/BufferHashGrouper.java
@@ -165,7 +165,7 @@ public CloseableIterator<Entry<KeyType>> iterator(boolean sorted)
 
     if (sorted) {
       @SuppressWarnings("MismatchedQueryAndUpdateOfCollection")
-      final List<Integer> wrappedOffsets = new AbstractList<Integer>()
+      final List<Integer> wrappedOffsets = new AbstractList<>()
       {
         @Override
         public Integer get(int index)
@@ -212,7 +212,7 @@ public int size()
           }
       );
 
-      return new CloseableIterator<Entry<KeyType>>()
+      return new CloseableIterator<>()
       {
         final ReusableEntry<KeyType> reusableEntry = ReusableEntry.create(keySerde, aggregators.size());
 
@@ -248,7 +248,7 @@ public void close()
       };
     } else {
       // Unsorted iterator
-      return new CloseableIterator<Entry<KeyType>>()
+      return new CloseableIterator<>()
       {
         final ReusableEntry<KeyType> reusableEntry = ReusableEntry.create(keySerde, aggregators.size());
 
diff --git a/processing/src/main/java/org/apache/druid/query/groupby/epinephelinae/GroupByMergingQueryRunner.java b/processing/src/main/java/org/apache/druid/query/groupby/epinephelinae/GroupByMergingQueryRunner.java
index be5110d4f7ff..7ff0258b9499 100644
--- a/processing/src/main/java/org/apache/druid/query/groupby/epinephelinae/GroupByMergingQueryRunner.java
+++ b/processing/src/main/java/org/apache/druid/query/groupby/epinephelinae/GroupByMergingQueryRunner.java
@@ -238,7 +238,7 @@ public CloseableGrouperIterator<RowBasedKey, ResultRow> make()
               List<ListenableFuture<AggregateResult>> futures = Lists.newArrayList(
                       Iterables.transform(
                           queryables,
-                          new Function<QueryRunner<ResultRow>, ListenableFuture<AggregateResult>>()
+                          new Function<>()
                           {
                             @Override
                             public ListenableFuture<AggregateResult> apply(final QueryRunner<ResultRow> input)
@@ -248,7 +248,7 @@ public ListenableFuture<AggregateResult> apply(final QueryRunner<ResultRow> inpu
                               }
 
                               ListenableFuture<AggregateResult> future = queryProcessingPool.submitRunnerTask(
-                                  new AbstractPrioritizedQueryRunnerCallable<AggregateResult, ResultRow>(priority, input)
+                                  new AbstractPrioritizedQueryRunnerCallable<>(priority, input)
                                   {
                                     @Override
                                     public AggregateResult call()
diff --git a/processing/src/main/java/org/apache/druid/query/groupby/epinephelinae/GroupByRowProcessor.java b/processing/src/main/java/org/apache/druid/query/groupby/epinephelinae/GroupByRowProcessor.java
index 6d777426d35e..e2ca5c7e83b1 100644
--- a/processing/src/main/java/org/apache/druid/query/groupby/epinephelinae/GroupByRowProcessor.java
+++ b/processing/src/main/java/org/apache/druid/query/groupby/epinephelinae/GroupByRowProcessor.java
@@ -119,7 +119,7 @@ public static ResultSupplier process(
         subquery,
         querySpecificConfig,
         processingConfig,
-        new Supplier<ByteBuffer>()
+        new Supplier<>()
         {
           @Override
           public ByteBuffer get()
diff --git a/processing/src/main/java/org/apache/druid/query/groupby/epinephelinae/HashVectorGrouper.java b/processing/src/main/java/org/apache/druid/query/groupby/epinephelinae/HashVectorGrouper.java
index e5c2801c3b74..dc1a9e599d70 100644
--- a/processing/src/main/java/org/apache/druid/query/groupby/epinephelinae/HashVectorGrouper.java
+++ b/processing/src/main/java/org/apache/druid/query/groupby/epinephelinae/HashVectorGrouper.java
@@ -219,7 +219,7 @@ public CloseableIterator<Grouper.Entry<MemoryPointer>> iterator()
 
     final IntIterator baseIterator = hashTable.bucketIterator();
 
-    return new CloseableIterator<Grouper.Entry<MemoryPointer>>()
+    return new CloseableIterator<>()
     {
       final MemoryPointer reusableKey = new MemoryPointer();
       final ReusableEntry<MemoryPointer> reusableEntry = new ReusableEntry<>(reusableKey, new Object[aggregators.size()]);
diff --git a/processing/src/main/java/org/apache/druid/query/groupby/epinephelinae/LimitedBufferHashGrouper.java b/processing/src/main/java/org/apache/druid/query/groupby/epinephelinae/LimitedBufferHashGrouper.java
index 90a0e1e250d6..0627fba0333d 100644
--- a/processing/src/main/java/org/apache/druid/query/groupby/epinephelinae/LimitedBufferHashGrouper.java
+++ b/processing/src/main/java/org/apache/druid/query/groupby/epinephelinae/LimitedBufferHashGrouper.java
@@ -249,7 +249,7 @@ private CloseableIterator<Entry<KeyType>> makeDefaultOrderingIterator()
     final int size = offsetHeap.getHeapSize();
 
     @SuppressWarnings("MismatchedQueryAndUpdateOfCollection")
-    final List<Integer> wrappedOffsets = new AbstractList<Integer>()
+    final List<Integer> wrappedOffsets = new AbstractList<>()
     {
       @Override
       public Integer get(int index)
@@ -277,7 +277,7 @@ public int size()
     // Sort offsets in-place.
     Collections.sort(
         wrappedOffsets,
-        new Comparator<Integer>()
+        new Comparator<>()
         {
           @Override
           public int compare(Integer lhs, Integer rhs)
@@ -293,7 +293,7 @@ public int compare(Integer lhs, Integer rhs)
         }
     );
 
-    return new CloseableIterator<Entry<KeyType>>()
+    return new CloseableIterator<>()
     {
       final ReusableEntry<KeyType> reusableEntry = ReusableEntry.create(keySerde, aggregators.size());
       int curr = 0;
@@ -332,7 +332,7 @@ private CloseableIterator<Entry<KeyType>> makeHeapIterator()
     if (!hasIterated) {
       hasIterated = true;
       offsetHeapIterableSize = initialHeapSize;
-      return new CloseableIterator<Entry<KeyType>>()
+      return new CloseableIterator<>()
       {
         final ReusableEntry<KeyType> reusableEntry = ReusableEntry.create(keySerde, aggregators.size());
         int curr = 0;
@@ -372,7 +372,7 @@ public void close()
       };
     } else {
       // subsequent iterations just walk the buffer backwards
-      return new CloseableIterator<Entry<KeyType>>()
+      return new CloseableIterator<>()
       {
         final ReusableEntry<KeyType> reusableEntry = ReusableEntry.create(keySerde, aggregators.size());
         int curr = offsetHeapIterableSize - 1;
@@ -420,7 +420,7 @@ private void checkHeapAlreadyIterated()
 
   private Comparator<Integer> makeHeapComparator()
   {
-    return new Comparator<Integer>()
+    return new Comparator<>()
     {
       final BufferComparator bufferComparator = keySerde.bufferComparatorWithAggregators(
           aggregators.factories().toArray(new AggregatorFactory[0]),
diff --git a/processing/src/main/java/org/apache/druid/query/groupby/epinephelinae/ParallelCombiner.java b/processing/src/main/java/org/apache/druid/query/groupby/epinephelinae/ParallelCombiner.java
index 97ef49ece3a7..113c4c3c3176 100644
--- a/processing/src/main/java/org/apache/druid/query/groupby/epinephelinae/ParallelCombiner.java
+++ b/processing/src/main/java/org/apache/druid/query/groupby/epinephelinae/ParallelCombiner.java
@@ -212,7 +212,7 @@ private static Supplier<ByteBuffer> createCombineBufferSupplier(
       int sliceSize
   )
   {
-    return new Supplier<ByteBuffer>()
+    return new Supplier<>()
     {
       private int i = 0;
 
@@ -473,7 +473,7 @@ public DimensionSelector makeDimensionSelector(DimensionSpec dimensionSpec)
     @Override
     public ColumnValueSelector<Object> makeColumnValueSelector(String columnName)
     {
-      return new ObjectBasedColumnSelector<Object>()
+      return new ObjectBasedColumnSelector<>()
       {
         @Override
         public void inspectRuntimeShape(RuntimeShapeInspector inspector)
diff --git a/processing/src/main/java/org/apache/druid/query/groupby/epinephelinae/RowBasedGrouperHelper.java b/processing/src/main/java/org/apache/druid/query/groupby/epinephelinae/RowBasedGrouperHelper.java
index bd0768297d74..02e7fea12f54 100644
--- a/processing/src/main/java/org/apache/druid/query/groupby/epinephelinae/RowBasedGrouperHelper.java
+++ b/processing/src/main/java/org/apache/druid/query/groupby/epinephelinae/RowBasedGrouperHelper.java
@@ -379,7 +379,7 @@ public static ColumnSelectorFactory createResultRowBasedColumnSelectorFactory(
     final RowSignature signature = query.getResultRowSignature(finalization);
 
     final RowAdapter<ResultRow> adapter =
-        new RowAdapter<ResultRow>()
+        new RowAdapter<>()
         {
           @Override
           public ToLongFunction<ResultRow> timestampFunction()
@@ -1382,7 +1382,7 @@ public Grouper.BufferComparator bufferComparatorWithAggregators(
     public ObjectMapper decorateObjectMapper(ObjectMapper spillMapper)
     {
 
-      final JsonDeserializer<RowBasedKey> deserializer = new JsonDeserializer<RowBasedKey>()
+      final JsonDeserializer<RowBasedKey> deserializer = new JsonDeserializer<>()
       {
         @Override
         public RowBasedKey deserialize(
diff --git a/processing/src/main/java/org/apache/druid/query/groupby/epinephelinae/SpillingGrouper.java b/processing/src/main/java/org/apache/druid/query/groupby/epinephelinae/SpillingGrouper.java
index 0d422387cc37..fadcfa02c95d 100644
--- a/processing/src/main/java/org/apache/druid/query/groupby/epinephelinae/SpillingGrouper.java
+++ b/processing/src/main/java/org/apache/druid/query/groupby/epinephelinae/SpillingGrouper.java
@@ -281,7 +281,7 @@ public CloseableIterator<Entry<KeyType>> iterator(final boolean sorted)
           CloseableIterators.withEmptyBaggage(
               Iterators.transform(
                   fileIterator,
-                  new Function<Entry<KeyType>, Entry<KeyType>>()
+                  new Function<>()
                   {
                     final ReusableEntry<KeyType> reusableEntry =
                         ReusableEntry.create(keySerde, aggregatorFactories.length);
diff --git a/processing/src/main/java/org/apache/druid/query/groupby/epinephelinae/StreamingMergeSortedGrouper.java b/processing/src/main/java/org/apache/druid/query/groupby/epinephelinae/StreamingMergeSortedGrouper.java
index a4ad0c6348d2..c900f4c06278 100644
--- a/processing/src/main/java/org/apache/druid/query/groupby/epinephelinae/StreamingMergeSortedGrouper.java
+++ b/processing/src/main/java/org/apache/druid/query/groupby/epinephelinae/StreamingMergeSortedGrouper.java
@@ -383,7 +383,7 @@ public CloseableIterator<Entry<KeyType>> iterator()
       throw new ISE("Grouper should be initialized first");
     }
 
-    return new CloseableIterator<Entry<KeyType>>()
+    return new CloseableIterator<>()
     {
       final ReusableEntry<KeyType> reusableEntry = ReusableEntry.create(keySerde, aggregators.length);
 
diff --git a/processing/src/main/java/org/apache/druid/query/groupby/epinephelinae/vector/VectorGroupByEngine.java b/processing/src/main/java/org/apache/druid/query/groupby/epinephelinae/vector/VectorGroupByEngine.java
index 78fa8e532a33..957a5f4189e8 100644
--- a/processing/src/main/java/org/apache/druid/query/groupby/epinephelinae/vector/VectorGroupByEngine.java
+++ b/processing/src/main/java/org/apache/druid/query/groupby/epinephelinae/vector/VectorGroupByEngine.java
@@ -98,7 +98,7 @@ public CloseableIterator<ResultRow> make()
 
             if (cursor == null) {
               // Return empty iterator.
-              return new CloseableIterator<ResultRow>()
+              return new CloseableIterator<>()
               {
                 @Override
                 public boolean hasNext()
diff --git a/processing/src/main/java/org/apache/druid/query/groupby/orderby/DefaultLimitSpec.java b/processing/src/main/java/org/apache/druid/query/groupby/orderby/DefaultLimitSpec.java
index a34d58b6d140..db7a8f1f02d4 100644
--- a/processing/src/main/java/org/apache/druid/query/groupby/orderby/DefaultLimitSpec.java
+++ b/processing/src/main/java/org/apache/druid/query/groupby/orderby/DefaultLimitSpec.java
@@ -344,7 +344,7 @@ private Ordering<ResultRow> makeComparator(
     final Ordering<ResultRow> timeOrdering;
 
     if (hasTimestamp) {
-      timeOrdering = new Ordering<ResultRow>()
+      timeOrdering = new Ordering<>()
       {
         @Override
         public int compare(ResultRow left, ResultRow right)
@@ -468,7 +468,7 @@ private Ordering<ResultRow> dimensionOrdering(
                 DimensionHandlerUtils.coerceToStringArray(o2)
             );
           }
-          return new DimensionComparisonUtils.ArrayComparator<String>(stringComparator)
+          return new DimensionComparisonUtils.ArrayComparator<>(stringComparator)
               .compare(
                   DimensionHandlerUtils.coerceToStringArray(o1),
                   DimensionHandlerUtils.coerceToStringArray(o2)
diff --git a/processing/src/main/java/org/apache/druid/query/groupby/orderby/OrderByColumnSpec.java b/processing/src/main/java/org/apache/druid/query/groupby/orderby/OrderByColumnSpec.java
index 01ca2b8431cf..67cfcfc16c7b 100644
--- a/processing/src/main/java/org/apache/druid/query/groupby/orderby/OrderByColumnSpec.java
+++ b/processing/src/main/java/org/apache/druid/query/groupby/orderby/OrderByColumnSpec.java
@@ -122,7 +122,7 @@ public static List<OrderByColumnSpec> ascending(String... dimension)
   {
     return Lists.transform(
         Arrays.asList(dimension),
-        new Function<String, OrderByColumnSpec>()
+        new Function<>()
         {
           @Override
           public OrderByColumnSpec apply(@Nullable String input)
@@ -142,7 +142,7 @@ public static List<OrderByColumnSpec> descending(String... dimension)
   {
     return Lists.transform(
         Arrays.asList(dimension),
-        new Function<String, OrderByColumnSpec>()
+        new Function<>()
         {
           @Override
           public OrderByColumnSpec apply(@Nullable String input)
diff --git a/processing/src/main/java/org/apache/druid/query/lookup/LookupExtractionFn.java b/processing/src/main/java/org/apache/druid/query/lookup/LookupExtractionFn.java
index fa918af1c755..b1280fcfb04f 100644
--- a/processing/src/main/java/org/apache/druid/query/lookup/LookupExtractionFn.java
+++ b/processing/src/main/java/org/apache/druid/query/lookup/LookupExtractionFn.java
@@ -46,7 +46,7 @@ public LookupExtractionFn(
   )
   {
     super(
-        new Function<String, String>()
+        new Function<>()
         {
           @Nullable
           @Override
diff --git a/processing/src/main/java/org/apache/druid/query/lookup/LookupSegment.java b/processing/src/main/java/org/apache/druid/query/lookup/LookupSegment.java
index 4e841455b6be..58c64c47239d 100644
--- a/processing/src/main/java/org/apache/druid/query/lookup/LookupSegment.java
+++ b/processing/src/main/java/org/apache/druid/query/lookup/LookupSegment.java
@@ -57,7 +57,7 @@ public LookupSegment(final String lookupName, final LookupExtractorFactory looku
 
           return extractor.asMap().entrySet().iterator();
         }),
-        new RowAdapter<Map.Entry<String, String>>()
+        new RowAdapter<>()
         {
           @Override
           public ToLongFunction<Map.Entry<String, String>> timestampFunction()
diff --git a/processing/src/main/java/org/apache/druid/query/lookup/LookupSnapshotTaker.java b/processing/src/main/java/org/apache/druid/query/lookup/LookupSnapshotTaker.java
index 6111d99372ee..4cdd88973135 100644
--- a/processing/src/main/java/org/apache/druid/query/lookup/LookupSnapshotTaker.java
+++ b/processing/src/main/java/org/apache/druid/query/lookup/LookupSnapshotTaker.java
@@ -69,7 +69,7 @@ public synchronized List<LookupBean> pullExistingSnapshot(final String tier)
         LOGGER.warn("found empty file no lookups to load from [%s]", persistFile.getAbsolutePath());
         return Collections.emptyList();
       }
-      lookupBeanList = objectMapper.readValue(persistFile, new TypeReference<List<LookupBean>>() {});
+      lookupBeanList = objectMapper.readValue(persistFile, new TypeReference<>() {});
       return lookupBeanList;
     }
     catch (IOException e) {
diff --git a/processing/src/main/java/org/apache/druid/query/metadata/SegmentMetadataQueryQueryToolChest.java b/processing/src/main/java/org/apache/druid/query/metadata/SegmentMetadataQueryQueryToolChest.java
index fd8d7e7009c9..23e583214c84 100644
--- a/processing/src/main/java/org/apache/druid/query/metadata/SegmentMetadataQueryQueryToolChest.java
+++ b/processing/src/main/java/org/apache/druid/query/metadata/SegmentMetadataQueryQueryToolChest.java
@@ -76,9 +76,7 @@
 
 public class SegmentMetadataQueryQueryToolChest extends QueryToolChest<SegmentAnalysis, SegmentMetadataQuery>
 {
-  private static final TypeReference<SegmentAnalysis> TYPE_REFERENCE = new TypeReference<SegmentAnalysis>()
-  {
-  };
+  private static final TypeReference<SegmentAnalysis> TYPE_REFERENCE = new TypeReference<>() {};
   private static final byte SEGMENT_METADATA_CACHE_PREFIX = 0x4;
   private static final byte SEGMENT_METADATA_QUERY = 0x16;
   private static final Function<SegmentAnalysis, SegmentAnalysis> MERGE_TRANSFORM_FN =
@@ -106,7 +104,7 @@ public SegmentMetadataQueryQueryToolChest(
   @Override
   public QueryRunner<SegmentAnalysis> mergeResults(final QueryRunner<SegmentAnalysis> runner)
   {
-    return new BySegmentSkippingQueryRunner<SegmentAnalysis>(runner)
+    return new BySegmentSkippingQueryRunner<>(runner)
     {
       @Override
       public Sequence<SegmentAnalysis> doRun(
@@ -196,7 +194,7 @@ public CacheStrategy<SegmentAnalysis, SegmentAnalysis, SegmentMetadataQuery> get
       @Nullable final ObjectMapper objectMapper
   )
   {
-    return new CacheStrategy<SegmentAnalysis, SegmentAnalysis, SegmentMetadataQuery>()
+    return new CacheStrategy<>()
     {
       @Override
       public boolean isCacheable(SegmentMetadataQuery query, boolean willMergeRunners, boolean bySegment)
diff --git a/processing/src/main/java/org/apache/druid/query/metadata/SegmentMetadataQueryRunnerFactory.java b/processing/src/main/java/org/apache/druid/query/metadata/SegmentMetadataQueryRunnerFactory.java
index a2edb6638863..664b5d32bdce 100644
--- a/processing/src/main/java/org/apache/druid/query/metadata/SegmentMetadataQueryRunnerFactory.java
+++ b/processing/src/main/java/org/apache/druid/query/metadata/SegmentMetadataQueryRunnerFactory.java
@@ -83,7 +83,7 @@ public SegmentMetadataQueryRunnerFactory(
   @Override
   public QueryRunner<SegmentAnalysis> createRunner(final Segment segment)
   {
-    return new QueryRunner<SegmentAnalysis>()
+    return new QueryRunner<>()
     {
       @Override
       public Sequence<SegmentAnalysis> run(QueryPlus<SegmentAnalysis> inQ, ResponseContext responseContext)
@@ -190,15 +190,15 @@ public QueryRunner<SegmentAnalysis> mergeRunners(
       Iterable<QueryRunner<SegmentAnalysis>> queryRunners
   )
   {
-    return new ConcatQueryRunner<SegmentAnalysis>(
+    return new ConcatQueryRunner<>(
         Sequences.map(
             Sequences.simple(queryRunners),
-            new Function<QueryRunner<SegmentAnalysis>, QueryRunner<SegmentAnalysis>>()
+            new Function<>()
             {
               @Override
               public QueryRunner<SegmentAnalysis> apply(final QueryRunner<SegmentAnalysis> input)
               {
-                return new QueryRunner<SegmentAnalysis>()
+                return new QueryRunner<>()
                 {
                   @Override
                   public Sequence<SegmentAnalysis> run(
@@ -210,7 +210,7 @@ public Sequence<SegmentAnalysis> run(
                     final int priority = query.context().getPriority();
                     final QueryPlus<SegmentAnalysis> threadSafeQueryPlus = queryPlus.withoutThreadUnsafeState();
                     ListenableFuture<Sequence<SegmentAnalysis>> future = queryProcessingPool.submitRunnerTask(
-                        new AbstractPrioritizedQueryRunnerCallable<Sequence<SegmentAnalysis>, SegmentAnalysis>(priority, input)
+                        new AbstractPrioritizedQueryRunnerCallable<>(priority, input)
                         {
                           @Override
                           public Sequence<SegmentAnalysis> call()
@@ -239,7 +239,10 @@ public Sequence<SegmentAnalysis> call()
                     catch (TimeoutException e) {
                       log.info("Query timeout, cancelling pending results for query id [%s]", query.getId());
                       future.cancel(true);
-                      throw new QueryTimeoutException(StringUtils.nonStrictFormat("Query [%s] timed out", query.getId()));
+                      throw new QueryTimeoutException(StringUtils.nonStrictFormat(
+                          "Query [%s] timed out",
+                          query.getId()
+                      ));
                     }
                     catch (ExecutionException e) {
                       throw new RuntimeException(e);
diff --git a/processing/src/main/java/org/apache/druid/query/metadata/metadata/ColumnAnalysis.java b/processing/src/main/java/org/apache/druid/query/metadata/metadata/ColumnAnalysis.java
index 1ce8f4f3e95f..b5df9e212a2e 100644
--- a/processing/src/main/java/org/apache/druid/query/metadata/metadata/ColumnAnalysis.java
+++ b/processing/src/main/java/org/apache/druid/query/metadata/metadata/ColumnAnalysis.java
@@ -38,7 +38,7 @@ public class ColumnAnalysis
 
   public static <T> Builder<T> builder()
   {
-    return new Builder<T>();
+    return new Builder<>();
   }
 
   public static ColumnAnalysis error(String reason)
diff --git a/processing/src/main/java/org/apache/druid/query/monomorphicprocessing/SpecializationService.java b/processing/src/main/java/org/apache/druid/query/monomorphicprocessing/SpecializationService.java
index c04f4b1dc5df..f866a9fb9a34 100644
--- a/processing/src/main/java/org/apache/druid/query/monomorphicprocessing/SpecializationService.java
+++ b/processing/src/main/java/org/apache/druid/query/monomorphicprocessing/SpecializationService.java
@@ -93,7 +93,7 @@ public final class SpecializationService
   private static final AtomicLong SPECIALIZED_CLASS_COUNTER = new AtomicLong();
 
   private static final ClassValue<PerPrototypeClassState> PER_PROTOTYPE_CLASS_STATE =
-      new ClassValue<PerPrototypeClassState>()
+      new ClassValue<>()
       {
         @Override
         protected PerPrototypeClassState computeValue(Class<?> type)
diff --git a/processing/src/main/java/org/apache/druid/query/operator/OperatorSequence.java b/processing/src/main/java/org/apache/druid/query/operator/OperatorSequence.java
index 9bb90189cdb2..c5376d577351 100644
--- a/processing/src/main/java/org/apache/druid/query/operator/OperatorSequence.java
+++ b/processing/src/main/java/org/apache/druid/query/operator/OperatorSequence.java
@@ -52,7 +52,7 @@ public <OutType> OutType accumulate(
   {
     final MyReceiver<OutType> receiver = new MyReceiver<>(
         initValue,
-        new YieldingAccumulator<OutType, RowsAndColumns>()
+        new YieldingAccumulator<>()
         {
           @Override
           public OutType accumulate(OutType accumulated, RowsAndColumns in)
@@ -78,7 +78,7 @@ public <OutType> Yielder<OutType> toYielder(
       // We finished processing, and the accumulator did not yield, so we return a done yielder with our value
       return Yielders.done(receiver.getRetVal(), null);
     } else {
-      return new Yielder<OutType>()
+      return new Yielder<>()
       {
         private Closeable continuation = finalContinuation;
 
diff --git a/processing/src/main/java/org/apache/druid/query/operator/WindowOperatorQueryQueryRunnerFactory.java b/processing/src/main/java/org/apache/druid/query/operator/WindowOperatorQueryQueryRunnerFactory.java
index f86f91be18be..22688f9dc2be 100644
--- a/processing/src/main/java/org/apache/druid/query/operator/WindowOperatorQueryQueryRunnerFactory.java
+++ b/processing/src/main/java/org/apache/druid/query/operator/WindowOperatorQueryQueryRunnerFactory.java
@@ -91,7 +91,7 @@ public Sequence<RowsAndColumns> apply(
               {
                 return Sequences.map(
                     input.run(queryPlus, responseContext),
-                    new Function<RowsAndColumns, RowsAndColumns>()
+                    new Function<>()
                     {
                       @Nullable
                       @Override
diff --git a/processing/src/main/java/org/apache/druid/query/operator/WindowOperatorQueryQueryToolChest.java b/processing/src/main/java/org/apache/druid/query/operator/WindowOperatorQueryQueryToolChest.java
index 7fb67e8732db..e5c115fd2d75 100644
--- a/processing/src/main/java/org/apache/druid/query/operator/WindowOperatorQueryQueryToolChest.java
+++ b/processing/src/main/java/org/apache/druid/query/operator/WindowOperatorQueryQueryToolChest.java
@@ -100,9 +100,7 @@ public Function<RowsAndColumns, RowsAndColumns> makePreComputeManipulatorFn(
   @Override
   public TypeReference<RowsAndColumns> getResultTypeReference()
   {
-    return new TypeReference<RowsAndColumns>()
-    {
-    };
+    return new TypeReference<>() {};
   }
 
   @Override
diff --git a/processing/src/main/java/org/apache/druid/query/rowsandcols/semantic/DefaultFramedOnHeapAggregatable.java b/processing/src/main/java/org/apache/druid/query/rowsandcols/semantic/DefaultFramedOnHeapAggregatable.java
index 7130fafd8671..7520f6ea0ab3 100644
--- a/processing/src/main/java/org/apache/druid/query/rowsandcols/semantic/DefaultFramedOnHeapAggregatable.java
+++ b/processing/src/main/java/org/apache/druid/query/rowsandcols/semantic/DefaultFramedOnHeapAggregatable.java
@@ -176,7 +176,7 @@ public GroupIteratorForWindowFrame(WindowFrame.OffsetFrame frame, int[] groupBou
     @Override
     public Iterator<AggInterval> iterator()
     {
-      return new Iterator<AggInterval>()
+      return new Iterator<>()
       {
         int currentGroupIndex = 0;
 
@@ -270,7 +270,7 @@ public Interval(int a, int b)
     @Override
     public Iterator<Integer> iterator()
     {
-      return new Iterator<Integer>()
+      return new Iterator<>()
       {
         int current = a;
 
diff --git a/processing/src/main/java/org/apache/druid/query/scan/ScanQueryEngine.java b/processing/src/main/java/org/apache/druid/query/scan/ScanQueryEngine.java
index 0286b7b9886f..7d314e972c62 100644
--- a/processing/src/main/java/org/apache/druid/query/scan/ScanQueryEngine.java
+++ b/processing/src/main/java/org/apache/druid/query/scan/ScanQueryEngine.java
@@ -156,7 +156,7 @@ public Iterator<ScanResultValue> make()
             }
 
             final int batchSize = query.getBatchSize();
-            return new Iterator<ScanResultValue>()
+            return new Iterator<>()
             {
               private long offset = 0;
 
diff --git a/processing/src/main/java/org/apache/druid/query/scan/ScanQueryLimitRowIterator.java b/processing/src/main/java/org/apache/druid/query/scan/ScanQueryLimitRowIterator.java
index 45cd4c2624c0..4d69062dc20e 100644
--- a/processing/src/main/java/org/apache/druid/query/scan/ScanQueryLimitRowIterator.java
+++ b/processing/src/main/java/org/apache/druid/query/scan/ScanQueryLimitRowIterator.java
@@ -73,7 +73,7 @@ public class ScanQueryLimitRowIterator implements CloseableIterator<ScanResultVa
     Sequence<ScanResultValue> baseSequence = baseRunner.run(QueryPlus.wrap(historicalQuery), responseContext);
     this.yielder = baseSequence.toYielder(
         null,
-        new YieldingAccumulator<ScanResultValue, ScanResultValue>()
+        new YieldingAccumulator<>()
         {
           @Override
           public ScanResultValue accumulate(ScanResultValue accumulated, ScanResultValue in)
diff --git a/processing/src/main/java/org/apache/druid/query/scan/ScanQueryOffsetSequence.java b/processing/src/main/java/org/apache/druid/query/scan/ScanQueryOffsetSequence.java
index 57bf6672d702..5ef69934795e 100644
--- a/processing/src/main/java/org/apache/druid/query/scan/ScanQueryOffsetSequence.java
+++ b/processing/src/main/java/org/apache/druid/query/scan/ScanQueryOffsetSequence.java
@@ -64,7 +64,7 @@ private <OutType> Yielder<OutType> wrapYielder(
       final SkippingYieldingAccumulator<OutType> accumulator
   )
   {
-    return new Yielder<OutType>()
+    return new Yielder<>()
     {
       @Override
       public OutType get()
diff --git a/processing/src/main/java/org/apache/druid/query/scan/ScanQueryQueryToolChest.java b/processing/src/main/java/org/apache/druid/query/scan/ScanQueryQueryToolChest.java
index 717a40d1062e..57bbe6a49429 100644
--- a/processing/src/main/java/org/apache/druid/query/scan/ScanQueryQueryToolChest.java
+++ b/processing/src/main/java/org/apache/druid/query/scan/ScanQueryQueryToolChest.java
@@ -46,9 +46,7 @@
 
 public class ScanQueryQueryToolChest extends QueryToolChest<ScanResultValue, ScanQuery>
 {
-  private static final TypeReference<ScanResultValue> TYPE_REFERENCE = new TypeReference<ScanResultValue>()
-  {
-  };
+  private static final TypeReference<ScanResultValue> TYPE_REFERENCE = new TypeReference<>() {};
 
   private final GenericQueryMetricsFactory queryMetricsFactory;
 
diff --git a/processing/src/main/java/org/apache/druid/query/search/SearchQueryQueryToolChest.java b/processing/src/main/java/org/apache/druid/query/search/SearchQueryQueryToolChest.java
index 3519de9b2f82..fba270cdcc69 100644
--- a/processing/src/main/java/org/apache/druid/query/search/SearchQueryQueryToolChest.java
+++ b/processing/src/main/java/org/apache/druid/query/search/SearchQueryQueryToolChest.java
@@ -59,12 +59,8 @@
 public class SearchQueryQueryToolChest extends QueryToolChest<Result<SearchResultValue>, SearchQuery>
 {
   private static final byte SEARCH_QUERY = 0x15;
-  private static final TypeReference<Result<SearchResultValue>> TYPE_REFERENCE = new TypeReference<Result<SearchResultValue>>()
-  {
-  };
-  private static final TypeReference<Object> OBJECT_TYPE_REFERENCE = new TypeReference<Object>()
-  {
-  };
+  private static final TypeReference<Result<SearchResultValue>> TYPE_REFERENCE = new TypeReference<>() {};
+  private static final TypeReference<Object> OBJECT_TYPE_REFERENCE = new TypeReference<>() {};
 
   private final SearchQueryConfig config;
   private final SearchQueryMetricsFactory queryMetricsFactory;
@@ -136,7 +132,7 @@ public CacheStrategy<Result<SearchResultValue>, Object, SearchQuery> getCacheStr
   )
   {
 
-    return new CacheStrategy<Result<SearchResultValue>, Object, SearchQuery>()
+    return new CacheStrategy<>()
     {
       private final List<DimensionSpec> dimensionSpecs =
           query.getDimensions() != null ? query.getDimensions() : Collections.emptyList();
@@ -179,7 +175,7 @@ public TypeReference<Object> getCacheObjectClazz()
       @Override
       public Function<Result<SearchResultValue>, Object> prepareForCache(boolean isResultLevelCache)
       {
-        return new Function<Result<SearchResultValue>, Object>()
+        return new Function<>()
         {
           @Override
           public Object apply(Result<SearchResultValue> input)
@@ -194,7 +190,7 @@ public Object apply(Result<SearchResultValue> input)
       @Override
       public Function<Object, Result<SearchResultValue>> pullFromCache(boolean isResultLevelCache)
       {
-        return new Function<Object, Result<SearchResultValue>>()
+        return new Function<>()
         {
           @Override
           @SuppressWarnings("unchecked")
@@ -342,7 +338,7 @@ public Sequence<Result<SearchResultValue>> run(
 
       return Sequences.map(
           runner.run(queryPlus.withQuery(query.withLimit(config.getMaxSearchLimit())), responseContext),
-          new Function<Result<SearchResultValue>, Result<SearchResultValue>>()
+          new Function<>()
           {
             @Override
             public Result<SearchResultValue> apply(Result<SearchResultValue> input)
@@ -350,17 +346,17 @@ public Result<SearchResultValue> apply(Result<SearchResultValue> input)
               if (isBySegment) {
                 BySegmentSearchResultValue value = (BySegmentSearchResultValue) input.getValue();
 
-                return new Result<SearchResultValue>(
+                return new Result<>(
                     input.getTimestamp(),
                     new BySegmentSearchResultValue(
                         Lists.transform(
                             value.getResults(),
-                            new Function<Result<SearchResultValue>, Result<SearchResultValue>>()
+                            new Function<>()
                             {
                               @Override
                               public Result<SearchResultValue> apply(@Nullable Result<SearchResultValue> input)
                               {
-                                return new Result<SearchResultValue>(
+                                return new Result<>(
                                     input.getTimestamp(),
                                     new SearchResultValue(
                                         Lists.newArrayList(
@@ -380,7 +376,7 @@ public Result<SearchResultValue> apply(@Nullable Result<SearchResultValue> input
                 );
               }
 
-              return new Result<SearchResultValue>(
+              return new Result<>(
                   input.getTimestamp(),
                   new SearchResultValue(
                       Lists.newArrayList(
diff --git a/processing/src/main/java/org/apache/druid/query/search/SearchSortSpec.java b/processing/src/main/java/org/apache/druid/query/search/SearchSortSpec.java
index e97414a7c361..09f590bd7cbe 100644
--- a/processing/src/main/java/org/apache/druid/query/search/SearchSortSpec.java
+++ b/processing/src/main/java/org/apache/druid/query/search/SearchSortSpec.java
@@ -50,7 +50,7 @@ public StringComparator getOrdering()
 
   public Comparator<SearchHit> getComparator()
   {
-    return new Comparator<SearchHit>()
+    return new Comparator<>()
     {
       @Override
       public int compare(SearchHit searchHit, SearchHit searchHit1)
diff --git a/processing/src/main/java/org/apache/druid/query/spec/SpecificSegmentQueryRunner.java b/processing/src/main/java/org/apache/druid/query/spec/SpecificSegmentQueryRunner.java
index 60c5891afafc..7f1a37f61e63 100644
--- a/processing/src/main/java/org/apache/druid/query/spec/SpecificSegmentQueryRunner.java
+++ b/processing/src/main/java/org/apache/druid/query/spec/SpecificSegmentQueryRunner.java
@@ -89,7 +89,7 @@ public Sequence<T> run(final QueryPlus<T> input, final ResponseContext responseC
       baseSequence = base.run(queryPlus, responseContext);
     }
 
-    Sequence<T> segmentMissingCatchingSequence = new Sequence<T>()
+    Sequence<T> segmentMissingCatchingSequence = new Sequence<>()
     {
       @Override
       public <OutType> OutType accumulate(final OutType initValue, final Accumulator<OutType, T> accumulator)
@@ -120,7 +120,7 @@ public <OutType> Yielder<OutType> toYielder(
 
       private <OutType> Yielder<OutType> makeYielder(final Yielder<OutType> yielder)
       {
-        return new Yielder<OutType>()
+        return new Yielder<>()
         {
           @Override
           public OutType get()
diff --git a/processing/src/main/java/org/apache/druid/query/timeboundary/TimeBoundaryQueryQueryToolChest.java b/processing/src/main/java/org/apache/druid/query/timeboundary/TimeBoundaryQueryQueryToolChest.java
index eab5e0f5abcf..ffa31c3cea6b 100644
--- a/processing/src/main/java/org/apache/druid/query/timeboundary/TimeBoundaryQueryQueryToolChest.java
+++ b/processing/src/main/java/org/apache/druid/query/timeboundary/TimeBoundaryQueryQueryToolChest.java
@@ -62,12 +62,8 @@ public class TimeBoundaryQueryQueryToolChest
 {
   private static final byte TIMEBOUNDARY_QUERY = 0x3;
 
-  private static final TypeReference<Result<TimeBoundaryResultValue>> TYPE_REFERENCE = new TypeReference<Result<TimeBoundaryResultValue>>()
-  {
-  };
-  private static final TypeReference<Object> OBJECT_TYPE_REFERENCE = new TypeReference<Object>()
-  {
-  };
+  private static final TypeReference<Result<TimeBoundaryResultValue>> TYPE_REFERENCE = new TypeReference<>() {};
+  private static final TypeReference<Object> OBJECT_TYPE_REFERENCE = new TypeReference<>() {};
 
   private final GenericQueryMetricsFactory queryMetricsFactory;
 
@@ -104,7 +100,7 @@ public QueryRunner<Result<TimeBoundaryResultValue>> mergeResults(
       final QueryRunner<Result<TimeBoundaryResultValue>> runner
   )
   {
-    return new BySegmentSkippingQueryRunner<Result<TimeBoundaryResultValue>>(runner)
+    return new BySegmentSkippingQueryRunner<>(runner)
     {
       @Override
       protected Sequence<Result<TimeBoundaryResultValue>> doRun(
@@ -176,7 +172,7 @@ public CacheStrategy<Result<TimeBoundaryResultValue>, Object, TimeBoundaryQuery>
       @Nullable final ObjectMapper objectMapper
   )
   {
-    return new CacheStrategy<Result<TimeBoundaryResultValue>, Object, TimeBoundaryQuery>()
+    return new CacheStrategy<>()
     {
       @Override
       public boolean isCacheable(TimeBoundaryQuery query, boolean willMergeRunners, boolean bySegment)
@@ -209,7 +205,7 @@ public TypeReference<Object> getCacheObjectClazz()
       @Override
       public Function<Result<TimeBoundaryResultValue>, Object> prepareForCache(boolean isResultLevelCache)
       {
-        return new Function<Result<TimeBoundaryResultValue>, Object>()
+        return new Function<>()
         {
           @Override
           public Object apply(Result<TimeBoundaryResultValue> input)
@@ -222,7 +218,7 @@ public Object apply(Result<TimeBoundaryResultValue> input)
       @Override
       public Function<Object, Result<TimeBoundaryResultValue>> pullFromCache(boolean isResultLevelCache)
       {
-        return new Function<Object, Result<TimeBoundaryResultValue>>()
+        return new Function<>()
         {
           @Override
           @SuppressWarnings("unchecked")
diff --git a/processing/src/main/java/org/apache/druid/query/timeboundary/TimeBoundaryQueryRunnerFactory.java b/processing/src/main/java/org/apache/druid/query/timeboundary/TimeBoundaryQueryRunnerFactory.java
index a5d8fa027d43..3f84da545c98 100644
--- a/processing/src/main/java/org/apache/druid/query/timeboundary/TimeBoundaryQueryRunnerFactory.java
+++ b/processing/src/main/java/org/apache/druid/query/timeboundary/TimeBoundaryQueryRunnerFactory.java
@@ -120,7 +120,7 @@ public Sequence<Result<TimeBoundaryResultValue>> run(
       final TimeBoundaryQuery query = (TimeBoundaryQuery) input;
 
       return new BaseSequence<>(
-          new BaseSequence.IteratorMaker<Result<TimeBoundaryResultValue>, Iterator<Result<TimeBoundaryResultValue>>>()
+          new BaseSequence.IteratorMaker<>()
           {
             @Override
             public Iterator<Result<TimeBoundaryResultValue>> make()
diff --git a/processing/src/main/java/org/apache/druid/query/timeseries/TimeseriesBinaryFn.java b/processing/src/main/java/org/apache/druid/query/timeseries/TimeseriesBinaryFn.java
index 6436e3df7862..5fb6db169b6a 100644
--- a/processing/src/main/java/org/apache/druid/query/timeseries/TimeseriesBinaryFn.java
+++ b/processing/src/main/java/org/apache/druid/query/timeseries/TimeseriesBinaryFn.java
@@ -59,7 +59,7 @@ public Result<TimeseriesResultValue> apply(Result<TimeseriesResultValue> arg1, R
     TimeseriesResultValue arg1Val = arg1.getValue();
     TimeseriesResultValue arg2Val = arg2.getValue();
 
-    Map<String, Object> retVal = new LinkedHashMap<String, Object>();
+    Map<String, Object> retVal = new LinkedHashMap<>();
 
     for (AggregatorFactory factory : aggregations) {
       final String metricName = factory.getName();
@@ -67,11 +67,11 @@ public Result<TimeseriesResultValue> apply(Result<TimeseriesResultValue> arg1, R
     }
 
     return (gran instanceof AllGranularity) ?
-           new Result<TimeseriesResultValue>(
+           new Result<>(
                arg1.getTimestamp(),
                new TimeseriesResultValue(retVal)
            ) :
-           new Result<TimeseriesResultValue>(
+           new Result<>(
                gran.bucketStart(arg1.getTimestamp()),
                new TimeseriesResultValue(retVal)
            );
diff --git a/processing/src/main/java/org/apache/druid/query/timeseries/TimeseriesQueryQueryToolChest.java b/processing/src/main/java/org/apache/druid/query/timeseries/TimeseriesQueryQueryToolChest.java
index acaf1427ce32..91fddf49eefa 100644
--- a/processing/src/main/java/org/apache/druid/query/timeseries/TimeseriesQueryQueryToolChest.java
+++ b/processing/src/main/java/org/apache/druid/query/timeseries/TimeseriesQueryQueryToolChest.java
@@ -84,13 +84,9 @@ public class TimeseriesQueryQueryToolChest extends QueryToolChest<Result<Timeser
 {
   private static final byte TIMESERIES_QUERY = 0x0;
   private static final TypeReference<Object> OBJECT_TYPE_REFERENCE =
-      new TypeReference<Object>()
-      {
-      };
+      new TypeReference<>() {};
   private static final TypeReference<Result<TimeseriesResultValue>> TYPE_REFERENCE =
-      new TypeReference<Result<TimeseriesResultValue>>()
-      {
-      };
+      new TypeReference<>() {};
 
   private final TimeseriesQueryMetricsFactory queryMetricsFactory;
 
@@ -111,7 +107,7 @@ public QueryRunner<Result<TimeseriesResultValue>> mergeResults(
       QueryRunner<Result<TimeseriesResultValue>> queryRunner
   )
   {
-    final QueryRunner<Result<TimeseriesResultValue>> resultMergeQueryRunner = new ResultMergeQueryRunner<Result<TimeseriesResultValue>>(
+    final QueryRunner<Result<TimeseriesResultValue>> resultMergeQueryRunner = new ResultMergeQueryRunner<>(
         queryRunner,
         this::createResultComparator,
         this::createMergeFn
@@ -288,7 +284,7 @@ public CacheStrategy<Result<TimeseriesResultValue>, Object, TimeseriesQuery> get
       @Nullable final ObjectMapper objectMapper
   )
   {
-    return new CacheStrategy<Result<TimeseriesResultValue>, Object, TimeseriesQuery>()
+    return new CacheStrategy<>()
     {
       private final List<AggregatorFactory> aggs = query.getAggregatorSpecs();
 
@@ -363,7 +359,7 @@ public Function<Result<TimeseriesResultValue>, Object> prepareForCache(boolean i
       @Override
       public Function<Object, Result<TimeseriesResultValue>> pullFromCache(boolean isResultLevelCache)
       {
-        return new Function<Object, Result<TimeseriesResultValue>>()
+        return new Function<>()
         {
           private final Granularity granularity = query.getGranularity();
 
diff --git a/processing/src/main/java/org/apache/druid/query/timeseries/TimeseriesResultBuilder.java b/processing/src/main/java/org/apache/druid/query/timeseries/TimeseriesResultBuilder.java
index 2332f53c7b45..efb4218297e4 100644
--- a/processing/src/main/java/org/apache/druid/query/timeseries/TimeseriesResultBuilder.java
+++ b/processing/src/main/java/org/apache/druid/query/timeseries/TimeseriesResultBuilder.java
@@ -31,7 +31,7 @@ public class TimeseriesResultBuilder
 {
   private final DateTime timestamp;
 
-  private final Map<String, Object> metricValues = new HashMap<String, Object>();
+  private final Map<String, Object> metricValues = new HashMap<>();
 
   public TimeseriesResultBuilder(
       DateTime timestamp
diff --git a/processing/src/main/java/org/apache/druid/query/topn/NumericTopNMetricSpec.java b/processing/src/main/java/org/apache/druid/query/topn/NumericTopNMetricSpec.java
index 878c010e3b03..5559f5d8d43a 100644
--- a/processing/src/main/java/org/apache/druid/query/topn/NumericTopNMetricSpec.java
+++ b/processing/src/main/java/org/apache/druid/query/topn/NumericTopNMetricSpec.java
@@ -62,7 +62,7 @@ public void verifyPreconditions(List<AggregatorFactory> aggregatorSpecs, List<Po
 
     final AggregatorFactory aggregator = Iterables.tryFind(
         aggregatorSpecs,
-        new Predicate<AggregatorFactory>()
+        new Predicate<>()
         {
           @Override
           public boolean apply(AggregatorFactory input)
@@ -74,7 +74,7 @@ public boolean apply(AggregatorFactory input)
 
     final PostAggregator postAggregator = Iterables.tryFind(
         postAggregatorSpecs,
-        new Predicate<PostAggregator>()
+        new Predicate<>()
         {
           @Override
           public boolean apply(PostAggregator input)
diff --git a/processing/src/main/java/org/apache/druid/query/topn/PooledTopNAlgorithm.java b/processing/src/main/java/org/apache/druid/query/topn/PooledTopNAlgorithm.java
index 9ab0241c31e9..9dfc9ee3ded6 100644
--- a/processing/src/main/java/org/apache/druid/query/topn/PooledTopNAlgorithm.java
+++ b/processing/src/main/java/org/apache/druid/query/topn/PooledTopNAlgorithm.java
@@ -231,7 +231,7 @@ public PooledTopNParams makeInitParams(ColumnSelectorPlus selectorPlus, Cursor c
       throw new UnsupportedOperationException("Cannot operate on a dimension with no dictionary");
     }
 
-    final TopNMetricSpecBuilder<int[]> arrayProvider = new BaseArrayProvider<int[]>(dimSelector, query, cursorInspector)
+    final TopNMetricSpecBuilder<int[]> arrayProvider = new BaseArrayProvider<>(dimSelector, query, cursorInspector)
     {
       private final int[] positions = new int[cardinality];
 
diff --git a/processing/src/main/java/org/apache/druid/query/topn/TopNQueryQueryToolChest.java b/processing/src/main/java/org/apache/druid/query/topn/TopNQueryQueryToolChest.java
index 5500230f04c3..f0d5fa586718 100644
--- a/processing/src/main/java/org/apache/druid/query/topn/TopNQueryQueryToolChest.java
+++ b/processing/src/main/java/org/apache/druid/query/topn/TopNQueryQueryToolChest.java
@@ -80,12 +80,8 @@
 public class TopNQueryQueryToolChest extends QueryToolChest<Result<TopNResultValue>, TopNQuery>
 {
   private static final byte TOPN_QUERY = 0x1;
-  private static final TypeReference<Result<TopNResultValue>> TYPE_REFERENCE = new TypeReference<Result<TopNResultValue>>()
-  {
-  };
-  private static final TypeReference<Object> OBJECT_TYPE_REFERENCE = new TypeReference<Object>()
-  {
-  };
+  private static final TypeReference<Result<TopNResultValue>> TYPE_REFERENCE = new TypeReference<>() {};
+  private static final TypeReference<Object> OBJECT_TYPE_REFERENCE = new TypeReference<>() {};
 
   private final TopNQueryConfig config;
   private final TopNQueryMetricsFactory queryMetricsFactory;
@@ -192,7 +188,7 @@ public Function<Result<TopNResultValue>, Result<TopNResultValue>> makePreCompute
       throw DruidException.defensive("This method can only be used to deserialize.");
     }
 
-    return new Function<Result<TopNResultValue>, Result<TopNResultValue>>()
+    return new Function<>()
     {
       private final AggregatorFactory[] aggregatorFactories = query.getAggregatorSpecs()
                                                                    .toArray(new AggregatorFactory[0]);
@@ -232,7 +228,7 @@ public Function<Result<TopNResultValue>, Result<TopNResultValue>> makePostComput
     }
 
     if (MetricManipulatorFns.finalizing() == fn) {
-      return new Function<Result<TopNResultValue>, Result<TopNResultValue>>()
+      return new Function<>()
       {
         private final AggregatorFactory[] aggregatorFactories = query.getAggregatorSpecs()
                                                                      .toArray(new AggregatorFactory[0]);
@@ -282,7 +278,7 @@ public CacheStrategy<Result<TopNResultValue>, Object, TopNQuery> getCacheStrateg
       @Nullable final ObjectMapper objectMapper
   )
   {
-    return new CacheStrategy<Result<TopNResultValue>, Object, TopNQuery>()
+    return new CacheStrategy<>()
     {
       private final List<AggregatorFactory> aggs = Lists.newArrayList(query.getAggregatorSpecs());
       private final List<PostAggregator> postAggs = AggregatorUtil.pruneDependentPostAgg(
@@ -342,7 +338,7 @@ public TypeReference<Object> getCacheObjectClazz()
       @Override
       public Function<Result<TopNResultValue>, Object> prepareForCache(boolean isResultLevelCache)
       {
-        return new Function<Result<TopNResultValue>, Object>()
+        return new Function<>()
         {
           private final String[] aggFactoryNames = extractFactoryName(query.getAggregatorSpecs());
 
@@ -375,7 +371,7 @@ public Object apply(final Result<TopNResultValue> input)
       @Override
       public Function<Object, Result<TopNResultValue>> pullFromCache(boolean isResultLevelCache)
       {
-        return new Function<Object, Result<TopNResultValue>>()
+        return new Function<>()
         {
           private final Granularity granularity = query.getGranularity();
 
@@ -458,7 +454,7 @@ public QueryRunner<Result<TopNResultValue>> postMergeQueryDecoration(final Query
         runner,
         config
     );
-    return new QueryRunner<Result<TopNResultValue>>()
+    return new QueryRunner<>()
     {
 
       @Override
@@ -474,14 +470,14 @@ public Sequence<Result<TopNResultValue>> run(
         } else {
           return Sequences.map(
               resultSequence,
-              new Function<Result<TopNResultValue>, Result<TopNResultValue>>()
+              new Function<>()
               {
                 @Override
                 public Result<TopNResultValue> apply(Result<TopNResultValue> input)
                 {
                   TopNResultValue resultValue = input.getValue();
 
-                  return new Result<TopNResultValue>(
+                  return new Result<>(
                       input.getTimestamp(),
                       TopNResultValue.create(
                           Lists.transform(
@@ -642,7 +638,7 @@ public Sequence<Result<TopNResultValue>> run(
 
       return Sequences.map(
           runner.run(queryPlus.withQuery(query.withThreshold(minTopNThreshold)), responseContext),
-          new Function<Result<TopNResultValue>, Result<TopNResultValue>>()
+          new Function<>()
           {
             @Override
             public Result<TopNResultValue> apply(Result<TopNResultValue> input)
@@ -656,7 +652,7 @@ public Result<TopNResultValue> apply(Result<TopNResultValue> input)
                     new BySegmentTopNResultValue(
                         Lists.transform(
                             value.getResults(),
-                            new Function<Result<TopNResultValue>, Result<TopNResultValue>>()
+                            new Function<>()
                             {
                               @Override
                               public Result<TopNResultValue> apply(Result<TopNResultValue> input)
diff --git a/processing/src/main/java/org/apache/druid/query/topn/TopNQueryRunnerFactory.java b/processing/src/main/java/org/apache/druid/query/topn/TopNQueryRunnerFactory.java
index 0229bdbcc592..f813a2b885ea 100644
--- a/processing/src/main/java/org/apache/druid/query/topn/TopNQueryRunnerFactory.java
+++ b/processing/src/main/java/org/apache/druid/query/topn/TopNQueryRunnerFactory.java
@@ -62,7 +62,7 @@ public TopNQueryRunnerFactory(
   public QueryRunner<Result<TopNResultValue>> createRunner(final Segment segment)
   {
     final TopNQueryEngine queryEngine = new TopNQueryEngine(computationBufferPool);
-    return new QueryRunner<Result<TopNResultValue>>()
+    return new QueryRunner<>()
     {
       @Override
       public Sequence<Result<TopNResultValue>> run(
diff --git a/processing/src/main/java/org/apache/druid/segment/AutoTypeColumnIndexer.java b/processing/src/main/java/org/apache/druid/segment/AutoTypeColumnIndexer.java
index 45a58dfcdd77..1953c887b953 100644
--- a/processing/src/main/java/org/apache/druid/segment/AutoTypeColumnIndexer.java
+++ b/processing/src/main/java/org/apache/druid/segment/AutoTypeColumnIndexer.java
@@ -361,7 +361,7 @@ public ColumnValueSelector<?> makeColumnValueSelector(
       return rootLiteralSelector;
     }
 
-    return new ColumnValueSelector<Object>()
+    return new ColumnValueSelector<>()
     {
       @Override
       public double getDouble()
@@ -593,7 +593,7 @@ private ColumnValueSelector<?> getRootLiteralValueSelector(
       return null;
     }
     final Object defaultValue = getDefaultValueForType(getLogicalType());
-    return new ColumnValueSelector<Object>()
+    return new ColumnValueSelector<>()
     {
       @Override
       public boolean isNull()
diff --git a/processing/src/main/java/org/apache/druid/segment/ComparatorDimensionDictionary.java b/processing/src/main/java/org/apache/druid/segment/ComparatorDimensionDictionary.java
index 41b793ae07c6..b8d1e1f47a14 100644
--- a/processing/src/main/java/org/apache/druid/segment/ComparatorDimensionDictionary.java
+++ b/processing/src/main/java/org/apache/druid/segment/ComparatorDimensionDictionary.java
@@ -140,7 +140,7 @@ public int getIdForNull()
 
   public ComparatorSortedDimensionDictionary<T> sort()
   {
-    return new ComparatorSortedDimensionDictionary<T>(idToValue, comparator, idToValue.size());
+    return new ComparatorSortedDimensionDictionary<>(idToValue, comparator, idToValue.size());
   }
 
   /**
diff --git a/processing/src/main/java/org/apache/druid/segment/CompressedPools.java b/processing/src/main/java/org/apache/druid/segment/CompressedPools.java
index 449a25f7c166..eef78a901f1f 100644
--- a/processing/src/main/java/org/apache/druid/segment/CompressedPools.java
+++ b/processing/src/main/java/org/apache/druid/segment/CompressedPools.java
@@ -36,7 +36,7 @@ public class CompressedPools
   public static final int BUFFER_SIZE = 0x10000;
   private static final StupidPool<BufferRecycler> BUFFER_RECYCLER_POOL = new StupidPool<>(
       "bufferRecyclerPool",
-      new Supplier<BufferRecycler>()
+      new Supplier<>()
       {
         private final AtomicLong counter = new AtomicLong(0);
 
@@ -54,9 +54,9 @@ public static ResourceHolder<BufferRecycler> getBufferRecycler()
     return BUFFER_RECYCLER_POOL.take();
   }
 
-  private static final StupidPool<byte[]> OUTPUT_BYTES_POOL = new StupidPool<byte[]>(
+  private static final StupidPool<byte[]> OUTPUT_BYTES_POOL = new StupidPool<>(
       "outputBytesPool",
-      new Supplier<byte[]>()
+      new Supplier<>()
       {
         private final AtomicLong counter = new AtomicLong(0);
 
@@ -74,9 +74,9 @@ public static ResourceHolder<byte[]> getOutputBytes()
     return OUTPUT_BYTES_POOL.take();
   }
 
-  private static final StupidPool<ByteBuffer> BIG_ENDIAN_BYTE_BUF_POOL = new StupidPool<ByteBuffer>(
+  private static final StupidPool<ByteBuffer> BIG_ENDIAN_BYTE_BUF_POOL = new StupidPool<>(
       "bigEndByteBufPool",
-      new Supplier<ByteBuffer>()
+      new Supplier<>()
       {
         private final AtomicLong counter = new AtomicLong(0);
 
@@ -91,7 +91,7 @@ public ByteBuffer get()
 
   private static final StupidPool<ByteBuffer> LITTLE_ENDIAN_BYTE_BUF_POOL = new StupidPool<>(
       "littleEndByteBufPool",
-      new Supplier<ByteBuffer>()
+      new Supplier<>()
       {
         private final AtomicLong counter = new AtomicLong(0);
 
diff --git a/processing/src/main/java/org/apache/druid/segment/DictionaryEncodedColumnIndexer.java b/processing/src/main/java/org/apache/druid/segment/DictionaryEncodedColumnIndexer.java
index 9a4d41ca10bf..af77db50cc64 100644
--- a/processing/src/main/java/org/apache/druid/segment/DictionaryEncodedColumnIndexer.java
+++ b/processing/src/main/java/org/apache/druid/segment/DictionaryEncodedColumnIndexer.java
@@ -78,7 +78,7 @@ public Integer getUnsortedEncodedValueFromSorted(Integer sortedIntermediateValue
   @Override
   public CloseableIndexed<ActualType> getSortedIndexedValues()
   {
-    return new CloseableIndexed<ActualType>()
+    return new CloseableIndexed<>()
     {
       @Override
       public int size()
diff --git a/processing/src/main/java/org/apache/druid/segment/IndexSpec.java b/processing/src/main/java/org/apache/druid/segment/IndexSpec.java
index 939adf87d4f4..fcf9677b0760 100644
--- a/processing/src/main/java/org/apache/druid/segment/IndexSpec.java
+++ b/processing/src/main/java/org/apache/druid/segment/IndexSpec.java
@@ -169,9 +169,7 @@ public Map<String, Object> asMap(ObjectMapper objectMapper)
   {
     return objectMapper.convertValue(
         this,
-        new TypeReference<Map<String, Object>>()
-        {
-        }
+        new TypeReference<>() {}
     );
   }
 
diff --git a/processing/src/main/java/org/apache/druid/segment/NestedDataColumnIndexerV4.java b/processing/src/main/java/org/apache/druid/segment/NestedDataColumnIndexerV4.java
index c7107f868ad1..1eef86db7d87 100644
--- a/processing/src/main/java/org/apache/druid/segment/NestedDataColumnIndexerV4.java
+++ b/processing/src/main/java/org/apache/druid/segment/NestedDataColumnIndexerV4.java
@@ -386,7 +386,7 @@ private ColumnValueSelector<?> getRootLiteralValueSelector(
     if (root == null || !root.isSingleType()) {
       return null;
     }
-    return new ColumnValueSelector<Object>()
+    return new ColumnValueSelector<>()
     {
       @Override
       public boolean isNull()
diff --git a/processing/src/main/java/org/apache/druid/segment/QueryableIndexIndexableAdapter.java b/processing/src/main/java/org/apache/druid/segment/QueryableIndexIndexableAdapter.java
index fdec3477cd81..a6dac64981fd 100644
--- a/processing/src/main/java/org/apache/druid/segment/QueryableIndexIndexableAdapter.java
+++ b/processing/src/main/java/org/apache/druid/segment/QueryableIndexIndexableAdapter.java
@@ -172,7 +172,7 @@ public <T extends Comparable<? super T>> CloseableIndexed<T> getDimValueLookup(S
     @SuppressWarnings("unchecked")
     DictionaryEncodedColumn<T> dict = (DictionaryEncodedColumn<T>) col;
 
-    return new CloseableIndexed<T>()
+    return new CloseableIndexed<>()
     {
 
       @Override
diff --git a/processing/src/main/java/org/apache/druid/segment/RowAdapters.java b/processing/src/main/java/org/apache/druid/segment/RowAdapters.java
index 22abf5da2af4..5f906f5f9fc3 100644
--- a/processing/src/main/java/org/apache/druid/segment/RowAdapters.java
+++ b/processing/src/main/java/org/apache/druid/segment/RowAdapters.java
@@ -29,7 +29,7 @@
  */
 public class RowAdapters
 {
-  private static final RowAdapter<? extends Row> STANDARD_ROW_ADAPTER = new RowAdapter<Row>()
+  private static final RowAdapter<? extends Row> STANDARD_ROW_ADAPTER = new RowAdapter<>()
   {
     @Override
     public ToLongFunction<Row> timestampFunction()
diff --git a/processing/src/main/java/org/apache/druid/segment/RowBasedColumnSelectorFactory.java b/processing/src/main/java/org/apache/druid/segment/RowBasedColumnSelectorFactory.java
index 6e89942e1f92..8fff2da8f869 100644
--- a/processing/src/main/java/org/apache/druid/segment/RowBasedColumnSelectorFactory.java
+++ b/processing/src/main/java/org/apache/druid/segment/RowBasedColumnSelectorFactory.java
@@ -448,7 +448,7 @@ public void inspectRuntimeShape(RuntimeShapeInspector inspector)
       final ValueType numberType =
           capabilities != null && capabilities.getType().isNumeric() ? capabilities.getType() : null;
 
-      return new ColumnValueSelector<Object>()
+      return new ColumnValueSelector<>()
       {
         private long currentValueId = RowIdSupplier.INIT;
         private long currentValueAsNumberId = RowIdSupplier.INIT;
diff --git a/processing/src/main/java/org/apache/druid/segment/column/RowSignature.java b/processing/src/main/java/org/apache/druid/segment/column/RowSignature.java
index 7ee2eb2575e5..3c7b3a98a816 100644
--- a/processing/src/main/java/org/apache/druid/segment/column/RowSignature.java
+++ b/processing/src/main/java/org/apache/druid/segment/column/RowSignature.java
@@ -416,7 +416,7 @@ public RowSignature buildSafeSignature(ImmutableList<String> requestedColumnName
    */
   public List<ColumnType> getColumnTypes()
   {
-    List<ColumnType> ret = new ArrayList<ColumnType>();
+    List<ColumnType> ret = new ArrayList<>();
     for (String colName : columnNames) {
       ret.add(columnTypes.get(colName));
     }
diff --git a/processing/src/main/java/org/apache/druid/segment/column/StringEncodingStrategies.java b/processing/src/main/java/org/apache/druid/segment/column/StringEncodingStrategies.java
index bf95f1ed70c1..be41cb5f0215 100644
--- a/processing/src/main/java/org/apache/druid/segment/column/StringEncodingStrategies.java
+++ b/processing/src/main/java/org/apache/druid/segment/column/StringEncodingStrategies.java
@@ -140,7 +140,7 @@ public int indexOf(@Nullable String value)
     public Iterator<String> iterator()
     {
       final Iterator<ByteBuffer> delegateIterator = delegate.iterator();
-      return new Iterator<String>()
+      return new Iterator<>()
       {
         @Override
         public boolean hasNext()
diff --git a/processing/src/main/java/org/apache/druid/segment/data/CompressedColumnarIntsSupplier.java b/processing/src/main/java/org/apache/druid/segment/data/CompressedColumnarIntsSupplier.java
index 88e78f798087..22b477c019cc 100644
--- a/processing/src/main/java/org/apache/druid/segment/data/CompressedColumnarIntsSupplier.java
+++ b/processing/src/main/java/org/apache/druid/segment/data/CompressedColumnarIntsSupplier.java
@@ -173,12 +173,12 @@ static CompressedColumnarIntsSupplier fromIntBuffer(
         buffer.remaining(),
         chunkFactor,
         GenericIndexed.ofCompressedByteBuffers(
-            new Iterable<ByteBuffer>()
+            new Iterable<>()
             {
               @Override
               public Iterator<ByteBuffer> iterator()
               {
-                return new Iterator<ByteBuffer>()
+                return new Iterator<>()
                 {
                   final IntBuffer myBuffer = buffer.asReadOnlyBuffer();
                   final ByteBuffer retVal = compression
@@ -241,12 +241,12 @@ public static CompressedColumnarIntsSupplier fromList(
         list.size(),
         chunkFactor,
         GenericIndexed.ofCompressedByteBuffers(
-            new Iterable<ByteBuffer>()
+            new Iterable<>()
             {
               @Override
               public Iterator<ByteBuffer> iterator()
               {
-                return new Iterator<ByteBuffer>()
+                return new Iterator<>()
                 {
                   private final ByteBuffer retVal = compression
                       .getCompressor()
diff --git a/processing/src/main/java/org/apache/druid/segment/data/CompressedVSizeColumnarIntsSupplier.java b/processing/src/main/java/org/apache/druid/segment/data/CompressedVSizeColumnarIntsSupplier.java
index dfa6667bf01f..b02f4fd6c88b 100644
--- a/processing/src/main/java/org/apache/druid/segment/data/CompressedVSizeColumnarIntsSupplier.java
+++ b/processing/src/main/java/org/apache/druid/segment/data/CompressedVSizeColumnarIntsSupplier.java
@@ -219,12 +219,12 @@ public static CompressedVSizeColumnarIntsSupplier fromList(
         chunkFactor,
         numBytes,
         GenericIndexed.ofCompressedByteBuffers(
-            new Iterable<ByteBuffer>()
+            new Iterable<>()
             {
               @Override
               public Iterator<ByteBuffer> iterator()
               {
-                return new Iterator<ByteBuffer>()
+                return new Iterator<>()
                 {
                   int position = 0;
                   private final ByteBuffer retVal =
diff --git a/processing/src/main/java/org/apache/druid/segment/data/CompressionFactory.java b/processing/src/main/java/org/apache/druid/segment/data/CompressionFactory.java
index 40931b0fa815..f2320f4bf097 100644
--- a/processing/src/main/java/org/apache/druid/segment/data/CompressionFactory.java
+++ b/processing/src/main/java/org/apache/druid/segment/data/CompressionFactory.java
@@ -270,7 +270,7 @@ static <T> MetaSerdeHelper.FieldWriter<T> longEncodingWriter(
       Function<T, CompressionStrategy> getCompressionStrategy
   )
   {
-    return new MetaSerdeHelper.FieldWriter<T>()
+    return new MetaSerdeHelper.FieldWriter<>()
     {
       @Override
       public void writeTo(ByteBuffer buffer, T x)
diff --git a/processing/src/main/java/org/apache/druid/segment/data/DecompressingByteBufferObjectStrategy.java b/processing/src/main/java/org/apache/druid/segment/data/DecompressingByteBufferObjectStrategy.java
index 72db63b1a190..b2e44587c057 100644
--- a/processing/src/main/java/org/apache/druid/segment/data/DecompressingByteBufferObjectStrategy.java
+++ b/processing/src/main/java/org/apache/druid/segment/data/DecompressingByteBufferObjectStrategy.java
@@ -75,7 +75,7 @@ public ResourceHolder<ByteBuffer> fromByteBuffer(ByteBuffer buffer, int numBytes
     // Needed, because if e. g. if this compressed buffer contains 3-byte integers, it should be possible to getInt()
     // from the buffer, including padding. See CompressedVSizeColumnarIntsSupplier.bufferPadding().
     buf.limit(buf.capacity());
-    return new ResourceHolder<ByteBuffer>()
+    return new ResourceHolder<>()
     {
       @Override
       public ByteBuffer get()
diff --git a/processing/src/main/java/org/apache/druid/segment/data/FixedIndexedWriter.java b/processing/src/main/java/org/apache/druid/segment/data/FixedIndexedWriter.java
index 42ca16b78f42..c93b1ecc730b 100644
--- a/processing/src/main/java/org/apache/druid/segment/data/FixedIndexedWriter.java
+++ b/processing/src/main/java/org/apache/druid/segment/data/FixedIndexedWriter.java
@@ -174,9 +174,10 @@ public Iterator<T> getIterator()
     final int totalCount = cardinality;
 
     final int startPos = hasNulls ? 1 : 0;
-    return new Iterator<T>()
+    return new Iterator<>()
     {
       int pos = 0;
+
       @Override
       public boolean hasNext()
       {
diff --git a/processing/src/main/java/org/apache/druid/segment/data/FrontCodedIndexed.java b/processing/src/main/java/org/apache/druid/segment/data/FrontCodedIndexed.java
index 1ba694cbcfc0..4adc39e87aaf 100644
--- a/processing/src/main/java/org/apache/druid/segment/data/FrontCodedIndexed.java
+++ b/processing/src/main/java/org/apache/druid/segment/data/FrontCodedIndexed.java
@@ -346,7 +346,7 @@ public Iterator<ByteBuffer> iterator()
     copy.position(bucketsPosition);
     final ByteBuffer[] firstBucket = readBucket(copy, numBuckets > 1 ? bucketSize : lastBucketNumValues);
     // iterator decodes and buffers a bucket at a time, paging through buckets as the iterator is consumed
-    return new Iterator<ByteBuffer>()
+    return new Iterator<>()
     {
       private int currIndex = 0;
       private int currentBucketIndex = 0;
diff --git a/processing/src/main/java/org/apache/druid/segment/data/FrontCodedIntArrayIndexed.java b/processing/src/main/java/org/apache/druid/segment/data/FrontCodedIntArrayIndexed.java
index de7ce2d977f7..9543bdfb3287 100644
--- a/processing/src/main/java/org/apache/druid/segment/data/FrontCodedIntArrayIndexed.java
+++ b/processing/src/main/java/org/apache/druid/segment/data/FrontCodedIntArrayIndexed.java
@@ -289,7 +289,7 @@ public Iterator<int[]> iterator()
     copy.position(bucketsPosition);
     final int[][] firstBucket = readBucket(copy, numBuckets > 1 ? bucketSize : lastBucketNumValues);
     // iterator decodes and buffers a bucket at a time, paging through buckets as the iterator is consumed
-    return new Iterator<int[]>()
+    return new Iterator<>()
     {
       private int currIndex = 0;
       private int currentBucketIndex = 0;
diff --git a/processing/src/main/java/org/apache/druid/segment/data/GenericIndexed.java b/processing/src/main/java/org/apache/druid/segment/data/GenericIndexed.java
index 19c58e411f33..0bf8aebd22ac 100644
--- a/processing/src/main/java/org/apache/druid/segment/data/GenericIndexed.java
+++ b/processing/src/main/java/org/apache/druid/segment/data/GenericIndexed.java
@@ -103,7 +103,7 @@ public abstract class GenericIndexed<T> implements CloseableIndexed<T>, Serializ
    * The compare method of this instance uses {@link StringUtils#compareUtf8UsingJavaStringOrdering(byte[], byte[])}
    * so that behavior is consistent with {@link #STRING_STRATEGY}.
    */
-  public static final ObjectStrategy<ByteBuffer> UTF8_STRATEGY = new ObjectStrategy<ByteBuffer>()
+  public static final ObjectStrategy<ByteBuffer> UTF8_STRATEGY = new ObjectStrategy<>()
   {
     @Override
     public Class<ByteBuffer> getClazz()
@@ -141,7 +141,7 @@ public int compare(@Nullable ByteBuffer o1, @Nullable ByteBuffer o2)
     }
   };
 
-  public static final ObjectStrategy<String> STRING_STRATEGY = new ObjectStrategy<String>()
+  public static final ObjectStrategy<String> STRING_STRATEGY = new ObjectStrategy<>()
   {
     @Override
     public Class<String> getClazz()
diff --git a/processing/src/main/java/org/apache/druid/segment/data/GenericIndexedWriter.java b/processing/src/main/java/org/apache/druid/segment/data/GenericIndexedWriter.java
index a87a61843fac..ebf8f08d768e 100644
--- a/processing/src/main/java/org/apache/druid/segment/data/GenericIndexedWriter.java
+++ b/processing/src/main/java/org/apache/druid/segment/data/GenericIndexedWriter.java
@@ -96,7 +96,7 @@ public static ObjectStrategy<ByteBuffer> compressedByteBuffersWriteObjectStrateg
       final Closer closer
   )
   {
-    return new ObjectStrategy<ByteBuffer>()
+    return new ObjectStrategy<>()
     {
       private final CompressionStrategy.Compressor compressor = compressionStrategy.getCompressor();
       private final ByteBuffer compressedDataBuffer = compressor.allocateOutBuffer(bufferSize, closer);
diff --git a/processing/src/main/java/org/apache/druid/segment/data/Indexed.java b/processing/src/main/java/org/apache/druid/segment/data/Indexed.java
index cf5687b8461f..a2fffd81cb8b 100644
--- a/processing/src/main/java/org/apache/druid/segment/data/Indexed.java
+++ b/processing/src/main/java/org/apache/druid/segment/data/Indexed.java
@@ -41,7 +41,7 @@ public interface Indexed<T> extends Iterable<T>, HotLoopCallee
 {
   static <T> Indexed<T> empty()
   {
-    return new Indexed<T>()
+    return new Indexed<>()
     {
       @Override
       public int size()
diff --git a/processing/src/main/java/org/apache/druid/segment/data/IndexedIterable.java b/processing/src/main/java/org/apache/druid/segment/data/IndexedIterable.java
index 2fe15f2880cb..c01e90388e36 100644
--- a/processing/src/main/java/org/apache/druid/segment/data/IndexedIterable.java
+++ b/processing/src/main/java/org/apache/druid/segment/data/IndexedIterable.java
@@ -30,7 +30,7 @@ public class IndexedIterable<T> implements Iterable<T>
 
   public static <T> IndexedIterable<T> create(Indexed<T> indexed)
   {
-    return new IndexedIterable<T>(indexed);
+    return new IndexedIterable<>(indexed);
   }
 
   public IndexedIterable(Indexed<T> indexed)
@@ -41,7 +41,7 @@ public IndexedIterable(Indexed<T> indexed)
   @Override
   public Iterator<T> iterator()
   {
-    return new Iterator<T>()
+    return new Iterator<>()
     {
       private int currIndex = 0;
 
diff --git a/processing/src/main/java/org/apache/druid/segment/generator/DataGenerator.java b/processing/src/main/java/org/apache/druid/segment/generator/DataGenerator.java
index f078e8dbac51..07af8e6d3bd8 100644
--- a/processing/src/main/java/org/apache/druid/segment/generator/DataGenerator.java
+++ b/processing/src/main/java/org/apache/druid/segment/generator/DataGenerator.java
@@ -139,7 +139,7 @@ public DataGenerator reset(long seed)
     columnGenerators.addAll(
         Lists.transform(
             columnSchemas,
-            new Function<GeneratorColumnSchema, ColumnValueGenerator>()
+            new Function<>()
             {
               @Override
               public ColumnValueGenerator apply(
diff --git a/processing/src/main/java/org/apache/druid/segment/generator/SequentialDistribution.java b/processing/src/main/java/org/apache/druid/segment/generator/SequentialDistribution.java
index 514540be0631..ab16c1b8dff8 100644
--- a/processing/src/main/java/org/apache/druid/segment/generator/SequentialDistribution.java
+++ b/processing/src/main/java/org/apache/druid/segment/generator/SequentialDistribution.java
@@ -37,7 +37,7 @@ public class SequentialDistribution extends EnumeratedDistribution
   public SequentialDistribution(Integer start, Integer end, List<Object> enumeratedValues)
   {
     // just pass in some bogus probability mass function, we won't be using it
-    super(Collections.singletonList(new Pair<Object, Double>(null, 1.0)));
+    super(Collections.singletonList(new Pair<>(null, 1.0)));
     this.start = start;
     this.end = end;
     this.enumeratedValues = enumeratedValues;
diff --git a/processing/src/main/java/org/apache/druid/segment/incremental/IncrementalIndexRow.java b/processing/src/main/java/org/apache/druid/segment/incremental/IncrementalIndexRow.java
index 2e817b993ce0..8c3b0a8cc42e 100644
--- a/processing/src/main/java/org/apache/druid/segment/incremental/IncrementalIndexRow.java
+++ b/processing/src/main/java/org/apache/druid/segment/incremental/IncrementalIndexRow.java
@@ -137,7 +137,7 @@ public String toString()
     return "IncrementalIndexRow{" +
            "timestamp=" + DateTimes.utc(timestamp) +
            ", dims=" + Lists.transform(
-        Arrays.asList(dims), new Function<Object, Object>()
+        Arrays.asList(dims), new Function<>()
         {
           @Override
           public Object apply(@Nullable Object input)
diff --git a/processing/src/main/java/org/apache/druid/segment/incremental/SpatialDimensionRowTransformer.java b/processing/src/main/java/org/apache/druid/segment/incremental/SpatialDimensionRowTransformer.java
index 8c4c8d4448be..27b908126280 100644
--- a/processing/src/main/java/org/apache/druid/segment/incremental/SpatialDimensionRowTransformer.java
+++ b/processing/src/main/java/org/apache/druid/segment/incremental/SpatialDimensionRowTransformer.java
@@ -87,7 +87,7 @@ public InputRow apply(final InputRow row)
     final List<String> finalDims = Lists.newArrayList(
         Iterables.filter(
             row.getDimensions(),
-            new Predicate<String>()
+            new Predicate<>()
             {
               @Override
               public boolean apply(String input)
diff --git a/processing/src/main/java/org/apache/druid/segment/index/IndexedStringDruidPredicateIndexes.java b/processing/src/main/java/org/apache/druid/segment/index/IndexedStringDruidPredicateIndexes.java
index 42a8982d7baf..ca866f1c2a25 100644
--- a/processing/src/main/java/org/apache/druid/segment/index/IndexedStringDruidPredicateIndexes.java
+++ b/processing/src/main/java/org/apache/druid/segment/index/IndexedStringDruidPredicateIndexes.java
@@ -59,7 +59,7 @@ public BitmapColumnIndex forPredicate(DruidPredicateFactory matcherFactory)
       @Override
       public Iterable<ImmutableBitmap> getBitmapIterable(boolean includeUnknown)
       {
-        return () -> new Iterator<ImmutableBitmap>()
+        return () -> new Iterator<>()
         {
           final Iterator<String> iterator = dictionary.iterator();
           boolean nextSet = false;
diff --git a/processing/src/main/java/org/apache/druid/segment/index/IndexedUtf8LexicographicalRangeIndexes.java b/processing/src/main/java/org/apache/druid/segment/index/IndexedUtf8LexicographicalRangeIndexes.java
index bc553b1bd019..60e67e22d36b 100644
--- a/processing/src/main/java/org/apache/druid/segment/index/IndexedUtf8LexicographicalRangeIndexes.java
+++ b/processing/src/main/java/org/apache/druid/segment/index/IndexedUtf8LexicographicalRangeIndexes.java
@@ -78,7 +78,7 @@ public Iterable<ImmutableBitmap> getBitmapIterable()
       {
         final IntIntPair range = getRange(startValue, startStrict, endValue, endStrict);
         final int start = range.leftInt(), end = range.rightInt();
-        return () -> new Iterator<ImmutableBitmap>()
+        return () -> new Iterator<>()
         {
           final IntIterator rangeIterator = IntListUtils.fromTo(start, end).iterator();
 
@@ -125,7 +125,7 @@ public BitmapColumnIndex forRange(
       @Override
       public Iterable<ImmutableBitmap> getBitmapIterable()
       {
-        return () -> new Iterator<ImmutableBitmap>()
+        return () -> new Iterator<>()
         {
           int currIndex = start;
           int found;
diff --git a/processing/src/main/java/org/apache/druid/segment/index/semantic/ValueSetIndexes.java b/processing/src/main/java/org/apache/druid/segment/index/semantic/ValueSetIndexes.java
index f31f0a7bfedf..5472cc84433f 100644
--- a/processing/src/main/java/org/apache/druid/segment/index/semantic/ValueSetIndexes.java
+++ b/processing/src/main/java/org/apache/druid/segment/index/semantic/ValueSetIndexes.java
@@ -107,7 +107,7 @@ public int estimatedComputeCost()
       @Override
       public Iterable<ImmutableBitmap> getBitmapIterable()
       {
-        return () -> new Iterator<ImmutableBitmap>()
+        return () -> new Iterator<>()
         {
           final PeekingIterator<T> valuesIterator = Iterators.peekingIterator(values.iterator());
           final PeekingIterator<T> dictionaryIterator = Iterators.peekingIterator(dictionary.iterator());
@@ -196,7 +196,7 @@ public int estimatedComputeCost()
       @Override
       public Iterable<ImmutableBitmap> getBitmapIterable()
       {
-        return () -> new Iterator<ImmutableBitmap>()
+        return () -> new Iterator<>()
         {
           final int dictionarySize = dictionary.size();
           final Iterator<T> iterator = values.iterator();
@@ -277,7 +277,7 @@ public int estimatedComputeCost()
       @Override
       public Iterable<ImmutableBitmap> getBitmapIterable()
       {
-        return () -> new Iterator<ImmutableBitmap>()
+        return () -> new Iterator<>()
         {
           final Iterator<T> iterator = values.iterator();
           int next = -1;
diff --git a/processing/src/main/java/org/apache/druid/segment/join/lookup/LookupJoinMatcher.java b/processing/src/main/java/org/apache/druid/segment/join/lookup/LookupJoinMatcher.java
index 4f2c7e873f00..235ffd7c4dbc 100644
--- a/processing/src/main/java/org/apache/druid/segment/join/lookup/LookupJoinMatcher.java
+++ b/processing/src/main/java/org/apache/druid/segment/join/lookup/LookupJoinMatcher.java
@@ -57,7 +57,7 @@
 public class LookupJoinMatcher implements JoinMatcher
 {
   private static final ColumnProcessorFactory<Supplier<String>> LEFT_KEY_READER =
-      new ColumnProcessorFactory<Supplier<String>>()
+      new ColumnProcessorFactory<>()
       {
         @Override
         public ColumnType defaultType()
diff --git a/processing/src/main/java/org/apache/druid/segment/nested/CompressedNestedDataComplexColumn.java b/processing/src/main/java/org/apache/druid/segment/nested/CompressedNestedDataComplexColumn.java
index c2e46cec107a..311e72cdcfe7 100644
--- a/processing/src/main/java/org/apache/druid/segment/nested/CompressedNestedDataComplexColumn.java
+++ b/processing/src/main/java/org/apache/druid/segment/nested/CompressedNestedDataComplexColumn.java
@@ -237,7 +237,7 @@ public Indexed<Object[]> getArrayDictionary()
       final FixedIndexed<Long> longDictionary = longDictionarySupplier.get();
       final FixedIndexed<Double> doubleDictionary = doubleDictionarySupplier.get();
 
-      return new Iterator<Object[]>()
+      return new Iterator<>()
       {
         final Iterator<int[]> delegate = arrayDictionarySupplier.get().iterator();
 
@@ -276,7 +276,7 @@ private Object lookupId(int globalId)
         }
       };
     };
-    return new Indexed<Object[]>()
+    return new Indexed<>()
     {
       @Override
       public int size()
@@ -553,7 +553,7 @@ public ColumnValueSelector<?> makeColumnValueSelector(List<NestedPathPart> path,
             arrayFieldIndex
         ).getColumn();
         ColumnValueSelector arraySelector = col.makeColumnValueSelector(readableOffset);
-        return new ColumnValueSelector<Object>()
+        return new ColumnValueSelector<>()
         {
           @Override
           public boolean isNull()
diff --git a/processing/src/main/java/org/apache/druid/segment/nested/NestedDataComplexTypeSerde.java b/processing/src/main/java/org/apache/druid/segment/nested/NestedDataComplexTypeSerde.java
index 3236b42402c5..931dec70a9f0 100644
--- a/processing/src/main/java/org/apache/druid/segment/nested/NestedDataComplexTypeSerde.java
+++ b/processing/src/main/java/org/apache/druid/segment/nested/NestedDataComplexTypeSerde.java
@@ -98,7 +98,7 @@ public void deserializeColumn(
   @Override
   public ObjectStrategy getObjectStrategy()
   {
-    return new ObjectStrategy<Object>()
+    return new ObjectStrategy<>()
     {
       @Override
       public int compare(Object o1, Object o2)
@@ -206,7 +206,7 @@ public <T extends Comparable<T>> TypeStrategy<T> getTypeStrategy()
     return new ObjectStrategyComplexTypeStrategy<>(
         getObjectStrategy(),
         ColumnType.ofComplex(TYPE_NAME),
-        new Hash.Strategy<Object>()
+        new Hash.Strategy<>()
         {
           @Override
           public int hashCode(Object o)
diff --git a/processing/src/main/java/org/apache/druid/segment/nested/NestedFieldColumnIndexSupplier.java b/processing/src/main/java/org/apache/druid/segment/nested/NestedFieldColumnIndexSupplier.java
index 5e2d38238c4a..f32907595536 100644
--- a/processing/src/main/java/org/apache/druid/segment/nested/NestedFieldColumnIndexSupplier.java
+++ b/processing/src/main/java/org/apache/druid/segment/nested/NestedFieldColumnIndexSupplier.java
@@ -323,7 +323,7 @@ private <T> BitmapColumnIndex makeRangeIndex(
       @Override
       public Iterable<ImmutableBitmap> getBitmapIterable()
       {
-        return () -> new Iterator<ImmutableBitmap>()
+        return () -> new Iterator<>()
         {
           final IntIterator rangeIterator = IntListUtils.fromTo(startIndex, endIndex).iterator();
 
@@ -550,7 +550,7 @@ public BitmapColumnIndex forRange(
         @Override
         public Iterable<ImmutableBitmap> getBitmapIterable()
         {
-          return () -> new Iterator<ImmutableBitmap>()
+          return () -> new Iterator<>()
           {
             int currIndex = start;
             int found;
@@ -620,7 +620,7 @@ public BitmapColumnIndex forPredicate(DruidPredicateFactory matcherFactory)
         @Override
         public Iterable<ImmutableBitmap> getBitmapIterable(boolean includeUnknown)
         {
-          return () -> new Iterator<ImmutableBitmap>()
+          return () -> new Iterator<>()
           {
             final Indexed<ByteBuffer> stringDictionary = globalStringDictionarySupplier.get();
             final DruidObjectPredicate<String> stringPredicate = matcherFactory.makeStringPredicate();
@@ -914,7 +914,7 @@ public BitmapColumnIndex forPredicate(DruidPredicateFactory matcherFactory)
         @Override
         public Iterable<ImmutableBitmap> getBitmapIterable(boolean includeUnknown)
         {
-          return () -> new Iterator<ImmutableBitmap>()
+          return () -> new Iterator<>()
           {
             final FixedIndexed<Long> longDictionary = globalLongDictionarySupplier.get();
             final DruidLongPredicate longPredicate = matcherFactory.makeLongPredicate();
@@ -1194,7 +1194,7 @@ public BitmapColumnIndex forPredicate(DruidPredicateFactory matcherFactory)
         @Override
         public Iterable<ImmutableBitmap> getBitmapIterable(boolean includeUnknown)
         {
-          return () -> new Iterator<ImmutableBitmap>()
+          return () -> new Iterator<>()
           {
             final FixedIndexed<Integer> localDictionary = localDictionarySupplier.get();
             final FixedIndexed<Double> doubleDictionary = globalDoubleDictionarySupplier.get();
@@ -1430,7 +1430,7 @@ public BitmapColumnIndex forPredicate(DruidPredicateFactory matcherFactory)
         @Override
         public Iterable<ImmutableBitmap> getBitmapIterable(boolean includeUnknown)
         {
-          return () -> new Iterator<ImmutableBitmap>()
+          return () -> new Iterator<>()
           {
             final DruidObjectPredicate<String> stringPredicate = matcherFactory.makeStringPredicate();
             final DruidLongPredicate longPredicate = matcherFactory.makeLongPredicate();
diff --git a/processing/src/main/java/org/apache/druid/segment/nested/NestedFieldDictionaryEncodedColumn.java b/processing/src/main/java/org/apache/druid/segment/nested/NestedFieldDictionaryEncodedColumn.java
index e4746219e092..09877ab4c692 100644
--- a/processing/src/main/java/org/apache/druid/segment/nested/NestedFieldDictionaryEncodedColumn.java
+++ b/processing/src/main/java/org/apache/druid/segment/nested/NestedFieldDictionaryEncodedColumn.java
@@ -613,7 +613,7 @@ public boolean isNull()
       }
     }
     if (singleType == null || singleType.isArray()) {
-      return new ColumnValueSelector<Object>()
+      return new ColumnValueSelector<>()
       {
 
         private PeekableIntIterator nullIterator = nullBitmap.peekableIterator();
diff --git a/processing/src/main/java/org/apache/druid/segment/nested/ScalarDoubleColumnAndIndexSupplier.java b/processing/src/main/java/org/apache/druid/segment/nested/ScalarDoubleColumnAndIndexSupplier.java
index 8452e143d6e3..4c52eb2810da 100644
--- a/processing/src/main/java/org/apache/druid/segment/nested/ScalarDoubleColumnAndIndexSupplier.java
+++ b/processing/src/main/java/org/apache/druid/segment/nested/ScalarDoubleColumnAndIndexSupplier.java
@@ -547,7 +547,7 @@ public BitmapColumnIndex forRange(
         @Override
         public Iterable<ImmutableBitmap> getBitmapIterable()
         {
-          return () -> new Iterator<ImmutableBitmap>()
+          return () -> new Iterator<>()
           {
             final IntIterator rangeIterator = IntListUtils.fromTo(startIndex, endIndex).iterator();
 
@@ -587,7 +587,7 @@ public BitmapColumnIndex forPredicate(DruidPredicateFactory matcherFactory)
         @Override
         public Iterable<ImmutableBitmap> getBitmapIterable(boolean includeUnknown)
         {
-          return () -> new Iterator<ImmutableBitmap>()
+          return () -> new Iterator<>()
           {
             final Iterator<Double> iterator = doubleDictionarySupplier.get().iterator();
             final DruidDoublePredicate doublePredicate = matcherFactory.makeDoublePredicate();
diff --git a/processing/src/main/java/org/apache/druid/segment/nested/ScalarLongColumnAndIndexSupplier.java b/processing/src/main/java/org/apache/druid/segment/nested/ScalarLongColumnAndIndexSupplier.java
index b76f5d99be48..1e572f6069ec 100644
--- a/processing/src/main/java/org/apache/druid/segment/nested/ScalarLongColumnAndIndexSupplier.java
+++ b/processing/src/main/java/org/apache/druid/segment/nested/ScalarLongColumnAndIndexSupplier.java
@@ -556,7 +556,7 @@ public BitmapColumnIndex forRange(
         @Override
         public Iterable<ImmutableBitmap> getBitmapIterable()
         {
-          return () -> new Iterator<ImmutableBitmap>()
+          return () -> new Iterator<>()
           {
             final IntIterator rangeIterator = IntListUtils.fromTo(startIndex, endIndex).iterator();
 
@@ -596,7 +596,7 @@ public BitmapColumnIndex forPredicate(DruidPredicateFactory matcherFactory)
         @Override
         public Iterable<ImmutableBitmap> getBitmapIterable(boolean includeUnknown)
         {
-          return () -> new Iterator<ImmutableBitmap>()
+          return () -> new Iterator<>()
           {
             final Iterator<Long> iterator = dictionary.iterator();
             final DruidLongPredicate longPredicate = matcherFactory.makeLongPredicate();
diff --git a/processing/src/main/java/org/apache/druid/segment/nested/ValueDictionary.java b/processing/src/main/java/org/apache/druid/segment/nested/ValueDictionary.java
index b3f9dd0eca49..e4827ad43729 100644
--- a/processing/src/main/java/org/apache/druid/segment/nested/ValueDictionary.java
+++ b/processing/src/main/java/org/apache/druid/segment/nested/ValueDictionary.java
@@ -55,7 +55,7 @@ public class ValueDictionary
 
   public ValueDictionary()
   {
-    this.stringDictionary = new ComparatorDimensionDictionary<String>(GenericIndexed.STRING_STRATEGY)
+    this.stringDictionary = new ComparatorDimensionDictionary<>(GenericIndexed.STRING_STRATEGY)
     {
       @Override
       public long estimateSizeOfValue(String value)
@@ -63,7 +63,7 @@ public long estimateSizeOfValue(String value)
         return StructuredDataProcessor.estimateStringSize(value);
       }
     };
-    this.longDictionary = new ComparatorDimensionDictionary<Long>(ColumnType.LONG.getNullableStrategy())
+    this.longDictionary = new ComparatorDimensionDictionary<>(ColumnType.LONG.getNullableStrategy())
     {
       @Override
       public long estimateSizeOfValue(Long value)
@@ -71,7 +71,7 @@ public long estimateSizeOfValue(Long value)
         return StructuredDataProcessor.getLongObjectEstimateSize();
       }
     };
-    this.doubleDictionary = new ComparatorDimensionDictionary<Double>(ColumnType.DOUBLE.getNullableStrategy())
+    this.doubleDictionary = new ComparatorDimensionDictionary<>(ColumnType.DOUBLE.getNullableStrategy())
     {
       @Override
       public long estimateSizeOfValue(Double value)
@@ -161,7 +161,7 @@ public SortedValueDictionary getSortedCollector()
     final ComparatorSortedDimensionDictionary<String> sortedStringDimensionDictionary =
         stringDictionary.sort();
 
-    Indexed<String> strings = new Indexed<String>()
+    Indexed<String> strings = new Indexed<>()
     {
       @Override
       public int size()
@@ -200,7 +200,7 @@ public void inspectRuntimeShape(RuntimeShapeInspector inspector)
     final ComparatorSortedDimensionDictionary<Long> sortedLongDimensionDictionary =
         longDictionary.sort();
 
-    Indexed<Long> longs = new Indexed<Long>()
+    Indexed<Long> longs = new Indexed<>()
     {
       @Override
       public int size()
@@ -239,7 +239,7 @@ public void inspectRuntimeShape(RuntimeShapeInspector inspector)
     final ComparatorSortedDimensionDictionary<Double> sortedDoubleDimensionDictionary =
         doubleDictionary.sort();
 
-    Indexed<Double> doubles = new Indexed<Double>()
+    Indexed<Double> doubles = new Indexed<>()
     {
       @Override
       public int size()
@@ -278,7 +278,7 @@ public void inspectRuntimeShape(RuntimeShapeInspector inspector)
     // offset by 1 because nulls are ignored by the indexer, but always global id 0
     final int adjustLongs = 1 + strings.size();
     final int adjustDoubles = adjustLongs + longs.size();
-    TreeSet<Object[]> sortedArrays = new TreeSet<>(new Comparator<Object[]>()
+    TreeSet<Object[]> sortedArrays = new TreeSet<>(new Comparator<>()
     {
       @Override
       public int compare(Object[] o1, Object[] o2)
@@ -319,7 +319,7 @@ private int[] convertArray(Object[] array)
     sortedArrays.addAll(stringArrays);
     sortedArrays.addAll(longArrays);
     sortedArrays.addAll(doubleArrays);
-    Indexed<Object[]> sortedArraysIndexed = new Indexed<Object[]>()
+    Indexed<Object[]> sortedArraysIndexed = new Indexed<>()
     {
       @Override
       public Iterator<Object[]> iterator()
diff --git a/processing/src/main/java/org/apache/druid/segment/nested/VariantColumn.java b/processing/src/main/java/org/apache/druid/segment/nested/VariantColumn.java
index 8125fe531006..4dd8feca9982 100644
--- a/processing/src/main/java/org/apache/druid/segment/nested/VariantColumn.java
+++ b/processing/src/main/java/org/apache/druid/segment/nested/VariantColumn.java
@@ -174,7 +174,7 @@ public Indexed<Double> getDoubleDictionary()
   @Override
   public Indexed<Object[]> getArrayDictionary()
   {
-    Iterable<Object[]> arrays = () -> new Iterator<Object[]>()
+    Iterable<Object[]> arrays = () -> new Iterator<>()
     {
       final Iterator<int[]> delegate = arrayDictionary.iterator();
 
@@ -213,7 +213,7 @@ private Object lookupId(int id)
         throw new IAE("Unknown id [%s]", id);
       }
     };
-    return new Indexed<Object[]>()
+    return new Indexed<>()
     {
       @Override
       public int size()
@@ -620,7 +620,7 @@ public int lookupId(String name)
   @Override
   public ColumnValueSelector<?> makeColumnValueSelector(ReadableOffset offset)
   {
-    return new ColumnValueSelector<Object>()
+    return new ColumnValueSelector<>()
     {
       private PeekableIntIterator nullIterator = nullValueBitmap.peekableIterator();
       private int nullMark = -1;
diff --git a/processing/src/main/java/org/apache/druid/segment/serde/CombineFirstTwoEntriesIndexed.java b/processing/src/main/java/org/apache/druid/segment/serde/CombineFirstTwoEntriesIndexed.java
index 3e109946d72e..539b89acf16f 100644
--- a/processing/src/main/java/org/apache/druid/segment/serde/CombineFirstTwoEntriesIndexed.java
+++ b/processing/src/main/java/org/apache/druid/segment/serde/CombineFirstTwoEntriesIndexed.java
@@ -68,7 +68,7 @@ protected CombineFirstTwoEntriesIndexed(Indexed<T> delegate)
    */
   public static <T> CombineFirstTwoEntriesIndexed<T> returnNull(final Indexed<T> delegate)
   {
-    return new CombineFirstTwoEntriesIndexed<T>(delegate)
+    return new CombineFirstTwoEntriesIndexed<>(delegate)
     {
       @Nullable
       @Override
@@ -87,7 +87,7 @@ public static CombineFirstTwoEntriesIndexed<ImmutableBitmap> unionBitmaps(
       final Indexed<ImmutableBitmap> delegate
   )
   {
-    return new CombineFirstTwoEntriesIndexed<ImmutableBitmap>(delegate)
+    return new CombineFirstTwoEntriesIndexed<>(delegate)
     {
       @Nullable
       @Override
diff --git a/processing/src/main/java/org/apache/druid/segment/serde/MetaSerdeHelper.java b/processing/src/main/java/org/apache/druid/segment/serde/MetaSerdeHelper.java
index 08e97e3e5017..d4a22c5945a1 100644
--- a/processing/src/main/java/org/apache/druid/segment/serde/MetaSerdeHelper.java
+++ b/processing/src/main/java/org/apache/druid/segment/serde/MetaSerdeHelper.java
@@ -55,7 +55,7 @@ public MetaSerdeHelper<T> writeByte(ByteFieldWriter<T> fieldWriter)
   public MetaSerdeHelper<T> maybeWriteByte(Predicate<T> condition, ByteFieldWriter<T> fieldWriter)
   {
     return writeSomething(
-        new FieldWriter<T>()
+        new FieldWriter<>()
         {
           @Override
           public void writeTo(ByteBuffer buffer, T x)
@@ -77,7 +77,7 @@ public int size(T x)
   public MetaSerdeHelper<T> writeByteArray(Function<T, byte[]> getByteArray)
   {
     return writeSomething(
-        new FieldWriter<T>()
+        new FieldWriter<>()
         {
           @Override
           public void writeTo(ByteBuffer buffer, T x)
diff --git a/processing/src/main/java/org/apache/druid/segment/serde/cell/StagedSerde.java b/processing/src/main/java/org/apache/druid/segment/serde/cell/StagedSerde.java
index 476795b9f5e0..b6813189286a 100644
--- a/processing/src/main/java/org/apache/druid/segment/serde/cell/StagedSerde.java
+++ b/processing/src/main/java/org/apache/druid/segment/serde/cell/StagedSerde.java
@@ -66,7 +66,7 @@ public interface StagedSerde<T>
 {
   static StagedSerde<byte[]> forBytes()
   {
-    return new StagedSerde<byte[]>()
+    return new StagedSerde<>()
     {
       @Override
       public byte[] serialize(byte[] value)
diff --git a/processing/src/main/java/org/apache/druid/segment/virtual/ListFilteredVirtualColumn.java b/processing/src/main/java/org/apache/druid/segment/virtual/ListFilteredVirtualColumn.java
index f82949512345..dceae11099b4 100644
--- a/processing/src/main/java/org/apache/druid/segment/virtual/ListFilteredVirtualColumn.java
+++ b/processing/src/main/java/org/apache/druid/segment/virtual/ListFilteredVirtualColumn.java
@@ -322,7 +322,7 @@ private static Iterable<ImmutableBitmap> getBitmapsInRange(
       boolean includeUnknown
   )
   {
-    return () -> new Iterator<ImmutableBitmap>()
+    return () -> new Iterator<>()
     {
       int currIndex = start;
       int found;
diff --git a/processing/src/main/java/org/apache/druid/segment/virtual/NestedFieldVirtualColumn.java b/processing/src/main/java/org/apache/druid/segment/virtual/NestedFieldVirtualColumn.java
index 5ec5958f5863..663b272917b9 100644
--- a/processing/src/main/java/org/apache/druid/segment/virtual/NestedFieldVirtualColumn.java
+++ b/processing/src/main/java/org/apache/druid/segment/virtual/NestedFieldVirtualColumn.java
@@ -389,7 +389,7 @@ public ColumnValueSelector<?> makeColumnValueSelector(
       if (elementNumber < 0) {
         throw new IAE("Cannot make array element selector, negative array index not supported");
       }
-      return new ColumnValueSelector<Object>()
+      return new ColumnValueSelector<>()
       {
         @Override
         public boolean isNull()
diff --git a/processing/src/main/java/org/apache/druid/storage/remote/ChunkingStorageConnector.java b/processing/src/main/java/org/apache/druid/storage/remote/ChunkingStorageConnector.java
index 5d181b724881..80faf510c0a9 100644
--- a/processing/src/main/java/org/apache/druid/storage/remote/ChunkingStorageConnector.java
+++ b/processing/src/main/java/org/apache/druid/storage/remote/ChunkingStorageConnector.java
@@ -103,7 +103,7 @@ private InputStream buildInputStream(ChunkingStorageConnectorParameters<T> param
 
     return new SequenceInputStream(
 
-        new Enumeration<InputStream>()
+        new Enumeration<>()
         {
           boolean initStream = false;
 
diff --git a/processing/src/main/java/org/apache/druid/timeline/partition/IntegerPartitionChunk.java b/processing/src/main/java/org/apache/druid/timeline/partition/IntegerPartitionChunk.java
index 8855f0151e8c..a6e46f9ee9e3 100644
--- a/processing/src/main/java/org/apache/druid/timeline/partition/IntegerPartitionChunk.java
+++ b/processing/src/main/java/org/apache/druid/timeline/partition/IntegerPartitionChunk.java
@@ -32,7 +32,7 @@ public class IntegerPartitionChunk<T extends Overshadowable> implements Partitio
 
   public static <T extends Overshadowable> IntegerPartitionChunk<T> make(Integer start, Integer end, int chunkNumber, T obj)
   {
-    return new IntegerPartitionChunk<T>(start, end, chunkNumber, obj);
+    return new IntegerPartitionChunk<>(start, end, chunkNumber, obj);
   }
 
   public IntegerPartitionChunk(
diff --git a/processing/src/main/java/org/apache/druid/timeline/partition/NumberedPartitionChunk.java b/processing/src/main/java/org/apache/druid/timeline/partition/NumberedPartitionChunk.java
index 2d32532bece0..a4d50b315b8e 100644
--- a/processing/src/main/java/org/apache/druid/timeline/partition/NumberedPartitionChunk.java
+++ b/processing/src/main/java/org/apache/druid/timeline/partition/NumberedPartitionChunk.java
@@ -35,7 +35,7 @@ public static <T> NumberedPartitionChunk<T> make(
       T obj
   )
   {
-    return new NumberedPartitionChunk<T>(chunkNumber, chunks, obj);
+    return new NumberedPartitionChunk<>(chunkNumber, chunks, obj);
   }
 
   public NumberedPartitionChunk(
diff --git a/processing/src/main/java/org/apache/druid/timeline/partition/OvershadowableManager.java b/processing/src/main/java/org/apache/druid/timeline/partition/OvershadowableManager.java
index dbcf5658f017..c7376a874ab6 100644
--- a/processing/src/main/java/org/apache/druid/timeline/partition/OvershadowableManager.java
+++ b/processing/src/main/java/org/apache/druid/timeline/partition/OvershadowableManager.java
@@ -1202,7 +1202,7 @@ public ShortSortedSet keySet()
     @Override
     public ObjectCollection<V> values()
     {
-      return new AbstractObjectCollection<V>()
+      return new AbstractObjectCollection<>()
       {
         @Override
         public ObjectIterator<V> iterator()
diff --git a/processing/src/main/java/org/apache/druid/timeline/partition/TombstonePartitionedChunk.java b/processing/src/main/java/org/apache/druid/timeline/partition/TombstonePartitionedChunk.java
index 5bf8a430ee25..23f7eb643d96 100644
--- a/processing/src/main/java/org/apache/druid/timeline/partition/TombstonePartitionedChunk.java
+++ b/processing/src/main/java/org/apache/druid/timeline/partition/TombstonePartitionedChunk.java
@@ -27,7 +27,7 @@ public class TombstonePartitionedChunk<T> implements PartitionChunk<T>
 
   public static <T> TombstonePartitionedChunk<T> make(T obj)
   {
-    return new TombstonePartitionedChunk<T>(obj);
+    return new TombstonePartitionedChunk<>(obj);
   }
 
   public TombstonePartitionedChunk(T object)
diff --git a/processing/src/main/java/org/apache/druid/utils/CollectionUtils.java b/processing/src/main/java/org/apache/druid/utils/CollectionUtils.java
index bd7600f6c03c..1309d85f4e12 100644
--- a/processing/src/main/java/org/apache/druid/utils/CollectionUtils.java
+++ b/processing/src/main/java/org/apache/druid/utils/CollectionUtils.java
@@ -51,7 +51,7 @@ public final class CollectionUtils
    */
   public static <E> Collection<E> createLazyCollectionFromStream(Supplier<Stream<E>> sequentialStreamSupplier, int size)
   {
-    return new AbstractCollection<E>()
+    return new AbstractCollection<>()
     {
       @Override
       public Iterator<E> iterator()
diff --git a/processing/src/test/java/org/apache/druid/collections/bitmap/BitmapIterationTest.java b/processing/src/test/java/org/apache/druid/collections/bitmap/BitmapIterationTest.java
index be37546d3bb7..94a9b3a95406 100644
--- a/processing/src/test/java/org/apache/druid/collections/bitmap/BitmapIterationTest.java
+++ b/processing/src/test/java/org/apache/druid/collections/bitmap/BitmapIterationTest.java
@@ -89,7 +89,7 @@ private BitmapCollection(ImmutableBitmap bitmap, int size)
     public UnmodifiableIterator<Integer> iterator()
     {
       final IntIterator iterator = bitmap.iterator();
-      return new UnmodifiableIterator<Integer>()
+      return new UnmodifiableIterator<>()
       {
         @Override
         public boolean hasNext()
diff --git a/processing/src/test/java/org/apache/druid/collections/bitmap/BitmapOperationTestBase.java b/processing/src/test/java/org/apache/druid/collections/bitmap/BitmapOperationTestBase.java
index d521f2ef4ece..e94db7f42e34 100644
--- a/processing/src/test/java/org/apache/druid/collections/bitmap/BitmapOperationTestBase.java
+++ b/processing/src/test/java/org/apache/druid/collections/bitmap/BitmapOperationTestBase.java
@@ -74,7 +74,7 @@ protected static ResourceHolder<ImmutableConciseSet> makeOffheapConcise(Immutabl
     buf.rewind();
     final ImmutableConciseSet bitmap = new ImmutableConciseSet(buf.asIntBuffer());
 
-    return new ResourceHolder<ImmutableConciseSet>()
+    return new ResourceHolder<>()
     {
       @Override
       public ImmutableConciseSet get()
@@ -151,7 +151,7 @@ protected static ResourceHolder<ImmutableRoaringBitmap> makeOffheapRoaring(Mutab
     roaringCount++;
     final ImmutableRoaringBitmap bitmap = writeImmutable(r, buf);
 
-    return new ResourceHolder<ImmutableRoaringBitmap>()
+    return new ResourceHolder<>()
     {
       @Override
       public ImmutableRoaringBitmap get()
diff --git a/processing/src/test/java/org/apache/druid/collections/bitmap/ConciseBitmapFactoryTest.java b/processing/src/test/java/org/apache/druid/collections/bitmap/ConciseBitmapFactoryTest.java
index c172630765aa..71062abffd98 100644
--- a/processing/src/test/java/org/apache/druid/collections/bitmap/ConciseBitmapFactoryTest.java
+++ b/processing/src/test/java/org/apache/druid/collections/bitmap/ConciseBitmapFactoryTest.java
@@ -41,7 +41,7 @@ public void testUnwrapWithNull()
     ImmutableBitmap bitmap = factory.union(
         Iterables.transform(
             Collections.singletonList(new WrappedConciseBitmap()),
-            new Function<WrappedConciseBitmap, ImmutableBitmap>()
+            new Function<>()
             {
               @Override
               public ImmutableBitmap apply(WrappedConciseBitmap input)
diff --git a/processing/src/test/java/org/apache/druid/collections/bitmap/RoaringBitmapFactoryTest.java b/processing/src/test/java/org/apache/druid/collections/bitmap/RoaringBitmapFactoryTest.java
index af60e3f806e1..9814e13ad150 100644
--- a/processing/src/test/java/org/apache/druid/collections/bitmap/RoaringBitmapFactoryTest.java
+++ b/processing/src/test/java/org/apache/druid/collections/bitmap/RoaringBitmapFactoryTest.java
@@ -59,7 +59,7 @@ public void testUnwrapWithNull()
     ImmutableBitmap bitmap = factory.union(
         Iterables.transform(
             Collections.singletonList(new WrappedRoaringBitmap()),
-            new Function<WrappedRoaringBitmap, ImmutableBitmap>()
+            new Function<>()
             {
               @Override
               public ImmutableBitmap apply(WrappedRoaringBitmap input)
diff --git a/processing/src/test/java/org/apache/druid/common/config/JacksonConfigManagerTest.java b/processing/src/test/java/org/apache/druid/common/config/JacksonConfigManagerTest.java
index 0d0393459445..404eb5547139 100644
--- a/processing/src/test/java/org/apache/druid/common/config/JacksonConfigManagerTest.java
+++ b/processing/src/test/java/org/apache/druid/common/config/JacksonConfigManagerTest.java
@@ -88,9 +88,7 @@ public void testConvertByteToConfigWithNullConfigInByte()
   @Test
   public void testConvertByteToConfigWithNonNullConfigInByte()
   {
-    ConfigSerde<TestConfig> configConfigSerdeFromTypeReference = jacksonConfigManager.create(new TypeReference<TestConfig>()
-    {
-    }, null);
+    ConfigSerde<TestConfig> configConfigSerdeFromTypeReference = jacksonConfigManager.create(new TypeReference<>() {}, null);
     TestConfig defaultConfig = new TestConfig("version", null, 3);
     TestConfig expectedConfig = new TestConfig("version2", null, 5);
     byte[] expectedConfigInByte = configConfigSerdeFromTypeReference.serialize(expectedConfig);
diff --git a/processing/src/test/java/org/apache/druid/common/guava/CombiningSequenceTest.java b/processing/src/test/java/org/apache/druid/common/guava/CombiningSequenceTest.java
index 437c38251703..d8888a792587 100644
--- a/processing/src/test/java/org/apache/druid/common/guava/CombiningSequenceTest.java
+++ b/processing/src/test/java/org/apache/druid/common/guava/CombiningSequenceTest.java
@@ -283,7 +283,7 @@ private void testCombining(
 
     Yielder<Pair<Integer, Integer>> yielder = seq.toYielder(
         null,
-        new YieldingAccumulator<Pair<Integer, Integer>, Pair<Integer, Integer>>()
+        new YieldingAccumulator<>()
         {
           int count = 0;
 
@@ -303,7 +303,7 @@ public Pair<Integer, Integer> accumulate(
 
     Iterator<Pair<Integer, Integer>> expectedVals = Iterators.filter(
         expected.iterator(),
-        new Predicate<Pair<Integer, Integer>>()
+        new Predicate<>()
         {
           int count = 0;
 
diff --git a/processing/src/test/java/org/apache/druid/common/guava/ComplexSequenceTest.java b/processing/src/test/java/org/apache/druid/common/guava/ComplexSequenceTest.java
index bf1099ccc0f9..440c57ad8010 100644
--- a/processing/src/test/java/org/apache/druid/common/guava/ComplexSequenceTest.java
+++ b/processing/src/test/java/org/apache/druid/common/guava/ComplexSequenceTest.java
@@ -66,7 +66,7 @@ private void check(String expected, Sequence<Integer> complex)
 
     Yielder<Integer> yielder = complex.toYielder(
         null,
-        new YieldingAccumulator<Integer, Integer>()
+        new YieldingAccumulator<>()
         {
           @Override
           public Integer accumulate(Integer accumulated, Integer in)
diff --git a/processing/src/test/java/org/apache/druid/common/guava/GuavaUtilsTest.java b/processing/src/test/java/org/apache/druid/common/guava/GuavaUtilsTest.java
index 8ec9584dcac9..110268ba84e3 100644
--- a/processing/src/test/java/org/apache/druid/common/guava/GuavaUtilsTest.java
+++ b/processing/src/test/java/org/apache/druid/common/guava/GuavaUtilsTest.java
@@ -84,7 +84,7 @@ public void testCancelAll()
         for (int i = 0; i < taskCount; i++) {
           final CountDownLatch latch = new CountDownLatch(1);
           latches.add(latch);
-          ListenableFuture<Object> future = exc.submit(new Callable<Object>()
+          ListenableFuture<Object> future = exc.submit(new Callable<>()
           {
             @Override
             public Object call() throws RuntimeException, InterruptedException
diff --git a/processing/src/test/java/org/apache/druid/common/jackson/JacksonUtilsTest.java b/processing/src/test/java/org/apache/druid/common/jackson/JacksonUtilsTest.java
index 5e70962ef8a9..8b546d36aff9 100644
--- a/processing/src/test/java/org/apache/druid/common/jackson/JacksonUtilsTest.java
+++ b/processing/src/test/java/org/apache/druid/common/jackson/JacksonUtilsTest.java
@@ -58,7 +58,7 @@ public void testWriteObjectUsingSerializerProvider() throws IOException
 
     final List<SerializableClass> deserializedValues = objectMapper.readValue(
         baos.toByteArray(),
-        new TypeReference<List<SerializableClass>>() {}
+        new TypeReference<>() {}
     );
 
     Assert.assertEquals(
@@ -85,7 +85,7 @@ public void testWritePrimitivesUsingSerializerProvider() throws IOException
 
     final List<Object> deserializedValues = objectMapper.readValue(
         baos.toByteArray(),
-        new TypeReference<List<Object>>() {}
+        new TypeReference<>() {}
     );
 
     Assert.assertEquals(
diff --git a/processing/src/test/java/org/apache/druid/common/semantic/SemanticCreatorUsageTest.java b/processing/src/test/java/org/apache/druid/common/semantic/SemanticCreatorUsageTest.java
index 0dd61fb4b3ea..e5cebcb9c52a 100644
--- a/processing/src/test/java/org/apache/druid/common/semantic/SemanticCreatorUsageTest.java
+++ b/processing/src/test/java/org/apache/druid/common/semantic/SemanticCreatorUsageTest.java
@@ -49,7 +49,7 @@ public class SemanticCreatorUsageTest
   @Parameters(name = "{0}")
   public static List<Object[]> getParameters()
   {
-    List<Object[]> params = new ArrayList<Object[]>();
+    List<Object[]> params = new ArrayList<>();
     Set<Method> methodsAnnotatedWith = new Reflections("org.apache", new MethodAnnotationsScanner())
         .getMethodsAnnotatedWith(SemanticCreator.class);
 
diff --git a/processing/src/test/java/org/apache/druid/common/utils/UUIDUtilsTest.java b/processing/src/test/java/org/apache/druid/common/utils/UUIDUtilsTest.java
index d822d2280663..7a3f7fcb3876 100644
--- a/processing/src/test/java/org/apache/druid/common/utils/UUIDUtilsTest.java
+++ b/processing/src/test/java/org/apache/druid/common/utils/UUIDUtilsTest.java
@@ -59,7 +59,7 @@ public static Collection<Object[]> constructorFeeder()
     }
     return Collections2.transform(
         args,
-        new Function<String[], Object[]>()
+        new Function<>()
         {
           @Override
           public Object[] apply(String[] input)
diff --git a/processing/src/test/java/org/apache/druid/data/input/HandlingInputRowIteratorTest.java b/processing/src/test/java/org/apache/druid/data/input/HandlingInputRowIteratorTest.java
index 3fa5a3bef27e..bd481435e067 100644
--- a/processing/src/test/java/org/apache/druid/data/input/HandlingInputRowIteratorTest.java
+++ b/processing/src/test/java/org/apache/druid/data/input/HandlingInputRowIteratorTest.java
@@ -44,7 +44,7 @@ public class HandlingInputRowIteratorTest
   public static class AbsentRowTest
   {
     private static final CloseableIterator<InputRow> EMPTY_ITERATOR = CloseableIterators.withEmptyBaggage(
-        new Iterator<InputRow>()
+        new Iterator<>()
         {
           @Override
           public boolean hasNext()
@@ -143,7 +143,7 @@ private static HandlingInputRowIterator createInputRowIterator(
         HandlingInputRowIterator.InputRowHandler secondHandler)
     {
       CloseableIterator<InputRow> iterator = CloseableIterators.withEmptyBaggage(
-          new Iterator<InputRow>()
+          new Iterator<>()
           {
             private final Iterator<InputRow> delegate = INPUT_ROWS.iterator();
 
diff --git a/processing/src/test/java/org/apache/druid/data/input/impl/JSONParseSpecTest.java b/processing/src/test/java/org/apache/druid/data/input/impl/JSONParseSpecTest.java
index dfb9d73d243a..08c3f4dd1544 100644
--- a/processing/src/test/java/org/apache/druid/data/input/impl/JSONParseSpecTest.java
+++ b/processing/src/test/java/org/apache/druid/data/input/impl/JSONParseSpecTest.java
@@ -153,7 +153,7 @@ public void testParseRowWithNullsInArrays()
   @Test
   public void testSerde() throws IOException
   {
-    HashMap<String, Boolean> feature = new HashMap<String, Boolean>();
+    HashMap<String, Boolean> feature = new HashMap<>();
     feature.put("ALLOW_UNQUOTED_CONTROL_CHARS", true);
     JSONParseSpec spec = new JSONParseSpec(
         new TimestampSpec("timestamp", "iso", null),
diff --git a/processing/src/test/java/org/apache/druid/data/input/impl/prefetch/JsonIteratorTest.java b/processing/src/test/java/org/apache/druid/data/input/impl/prefetch/JsonIteratorTest.java
index 8a6241e25b94..24791d800f90 100644
--- a/processing/src/test/java/org/apache/druid/data/input/impl/prefetch/JsonIteratorTest.java
+++ b/processing/src/test/java/org/apache/druid/data/input/impl/prefetch/JsonIteratorTest.java
@@ -47,9 +47,7 @@ public void testSerde() throws IOException
     final ObjectMapper mapper = new ObjectMapper(new SmileFactory());
     List<Map<String, Object>> expectedList = ImmutableList.of(ImmutableMap.of("key1", "value1", "key2", 2));
     File testFile = File.createTempFile("testfile", "");
-    TypeReference<Map<String, Object>> type = new TypeReference<Map<String, Object>>()
-    {
-    };
+    TypeReference<Map<String, Object>> type = new TypeReference<>() {};
     try (FileOutputStream fos = new FileOutputStream(testFile)) {
       final JsonGenerator jg = mapper.getFactory().createGenerator(fos);
       final SerializerProvider serializers = mapper.getSerializerProviderInstance();
diff --git a/processing/src/test/java/org/apache/druid/frame/file/FrameFileTest.java b/processing/src/test/java/org/apache/druid/frame/file/FrameFileTest.java
index acc2572664b8..3853cf697cd5 100644
--- a/processing/src/test/java/org/apache/druid/frame/file/FrameFileTest.java
+++ b/processing/src/test/java/org/apache/druid/frame/file/FrameFileTest.java
@@ -427,7 +427,7 @@ private static byte[] computeFrameFile(final FrameFileKey frameFileKey)
                                 .maxRowsPerFrame(frameFileKey.maxRowsPerFrame)
                                 .frames()
                                 .map(
-                                    new Function<Frame, IntObjectPair<Frame>>()
+                                    new Function<>()
                                     {
                                       private int rows = 0;
 
diff --git a/processing/src/test/java/org/apache/druid/frame/processor/FrameProcessorExecutorTest.java b/processing/src/test/java/org/apache/druid/frame/processor/FrameProcessorExecutorTest.java
index 000de90a83de..f6ced8f7c1c5 100644
--- a/processing/src/test/java/org/apache/druid/frame/processor/FrameProcessorExecutorTest.java
+++ b/processing/src/test/java/org/apache/druid/frame/processor/FrameProcessorExecutorTest.java
@@ -470,7 +470,7 @@ List<File> writeToNFiles(final CursorFactory cursorFactory, final int numFiles)
         }
 
         // Write to input files.
-        final Consumer<Frame> writer = new Consumer<Frame>()
+        final Consumer<Frame> writer = new Consumer<>()
         {
           private int j = 0;
 
diff --git a/processing/src/test/java/org/apache/druid/frame/processor/RunAllFullyWidgetTest.java b/processing/src/test/java/org/apache/druid/frame/processor/RunAllFullyWidgetTest.java
index d0ae5a986a00..f872608f3a38 100644
--- a/processing/src/test/java/org/apache/druid/frame/processor/RunAllFullyWidgetTest.java
+++ b/processing/src/test/java/org/apache/druid/frame/processor/RunAllFullyWidgetTest.java
@@ -637,7 +637,7 @@ public ListenableFuture<Optional<ProcessorAndCallback<T>>> next()
 
       Futures.addCallback(
           future,
-          new FutureCallback<Optional<ProcessorAndCallback<T>>>()
+          new FutureCallback<>()
           {
             @Override
             public void onSuccess(Optional<ProcessorAndCallback<T>> result)
diff --git a/processing/src/test/java/org/apache/druid/frame/processor/SuperSorterTest.java b/processing/src/test/java/org/apache/druid/frame/processor/SuperSorterTest.java
index 80e7f6352d00..6f49fdb82f35 100644
--- a/processing/src/test/java/org/apache/druid/frame/processor/SuperSorterTest.java
+++ b/processing/src/test/java/org/apache/druid/frame/processor/SuperSorterTest.java
@@ -818,7 +818,7 @@ private static List<ReadableFrameChannel> makeRoundRobinChannels(
     }
 
     frames.forEach(
-        new Consumer<Frame>()
+        new Consumer<>()
         {
           private int i;
 
diff --git a/processing/src/test/java/org/apache/druid/frame/testutil/FrameSequenceBuilder.java b/processing/src/test/java/org/apache/druid/frame/testutil/FrameSequenceBuilder.java
index 1cb6298b8b10..ac6faf00363f 100644
--- a/processing/src/test/java/org/apache/druid/frame/testutil/FrameSequenceBuilder.java
+++ b/processing/src/test/java/org/apache/druid/frame/testutil/FrameSequenceBuilder.java
@@ -157,7 +157,7 @@ public Iterator<Frame> make()
           {
             final ColumnSelectorFactory columnSelectorFactory = cursor.getColumnSelectorFactory();
 
-            return new Iterator<Frame>()
+            return new Iterator<>()
             {
               @Override
               public boolean hasNext()
diff --git a/processing/src/test/java/org/apache/druid/frame/write/cast/TypeCastSelectorsTest.java b/processing/src/test/java/org/apache/druid/frame/write/cast/TypeCastSelectorsTest.java
index dc2a4a5b46cf..77f06dc00372 100644
--- a/processing/src/test/java/org/apache/druid/frame/write/cast/TypeCastSelectorsTest.java
+++ b/processing/src/test/java/org/apache/druid/frame/write/cast/TypeCastSelectorsTest.java
@@ -337,7 +337,7 @@ public DimensionSelector makeDimensionSelector(DimensionSpec dimensionSpec)
     @Override
     public ColumnValueSelector<?> makeColumnValueSelector(String columnName)
     {
-      return new ColumnValueSelector<Object>()
+      return new ColumnValueSelector<>()
       {
         @Override
         public double getDouble()
diff --git a/processing/src/test/java/org/apache/druid/guice/ConditionalMultibindTest.java b/processing/src/test/java/org/apache/druid/guice/ConditionalMultibindTest.java
index 4387ab240686..7343e2879b11 100644
--- a/processing/src/test/java/org/apache/druid/guice/ConditionalMultibindTest.java
+++ b/processing/src/test/java/org/apache/druid/guice/ConditionalMultibindTest.java
@@ -72,9 +72,7 @@ public void configure(Binder binder)
       }
     });
 
-    Set<Animal> animalSet = injector.getInstance(Key.get(new TypeLiteral<Set<Animal>>()
-    {
-    }));
+    Set<Animal> animalSet = injector.getInstance(Key.get(new TypeLiteral<>() {}));
 
     Assert.assertEquals(1, animalSet.size());
     Assert.assertEquals(animalSet, ImmutableSet.<Animal>of(new Cat()));
@@ -96,9 +94,7 @@ public void configure(Binder binder)
       }
     });
 
-    Set<Animal> animalSet = injector.getInstance(Key.get(new TypeLiteral<Set<Animal>>()
-    {
-    }));
+    Set<Animal> animalSet = injector.getInstance(Key.get(new TypeLiteral<>() {}));
 
     Assert.assertEquals(2, animalSet.size());
     Assert.assertEquals(animalSet, ImmutableSet.of(new Cat(), new Dog()));
@@ -123,9 +119,7 @@ public void configure(Binder binder)
       }
     });
 
-    Set<Animal> animalSet = injector.getInstance(Key.get(new TypeLiteral<Set<Animal>>()
-    {
-    }));
+    Set<Animal> animalSet = injector.getInstance(Key.get(new TypeLiteral<>() {}));
 
     Assert.assertEquals(2, animalSet.size());
     Assert.assertEquals(animalSet, ImmutableSet.of(new Cat(), new Dog()));
@@ -159,9 +153,7 @@ public void configure(Binder binder)
         }
     );
 
-    Set<Animal> animalSet = injector.getInstance(Key.get(new TypeLiteral<Set<Animal>>()
-    {
-    }));
+    Set<Animal> animalSet = injector.getInstance(Key.get(new TypeLiteral<>() {}));
 
     Assert.assertEquals(3, animalSet.size());
     Assert.assertEquals(animalSet, ImmutableSet.of(new Cat(), new Dog(), new Fish()));
@@ -198,15 +190,11 @@ public void configure(Binder binder)
         }
     );
 
-    Set<Animal> animalSet_1 = injector.getInstance(Key.get(new TypeLiteral<Set<Animal>>()
-    {
-    }, SanDiego.class));
+    Set<Animal> animalSet_1 = injector.getInstance(Key.get(new TypeLiteral<>() {}, SanDiego.class));
     Assert.assertEquals(4, animalSet_1.size());
     Assert.assertEquals(animalSet_1, ImmutableSet.of(new Bird(), new Cat(), new Dog(), new Tiger()));
 
-    Set<Animal> animalSet_2 = injector.getInstance(Key.get(new TypeLiteral<Set<Animal>>()
-    {
-    }, SanJose.class));
+    Set<Animal> animalSet_2 = injector.getInstance(Key.get(new TypeLiteral<>() {}, SanJose.class));
     Assert.assertEquals(1, animalSet_2.size());
     Assert.assertEquals(animalSet_2, ImmutableSet.<Animal>of(new Fish()));
   }
@@ -293,21 +281,21 @@ public void configure(Binder binder)
 
             ConditionalMultibind
                 .create(props, binder, new TypeLiteral<Zoo<Animal>>() {})
-                .addBinding(new TypeLiteral<Zoo<Animal>>() {});
+                .addBinding(new TypeLiteral<>() {});
 
           }
         }
     );
 
-    Set<Set<Animal>> actualAnimalSet = injector.getInstance(Key.get(new TypeLiteral<Set<Set<Animal>>>() {}));
+    Set<Set<Animal>> actualAnimalSet = injector.getInstance(Key.get(new TypeLiteral<>() {}));
     Assert.assertEquals(3, actualAnimalSet.size());
     Assert.assertEquals(ImmutableSet.of(set1, set2, set3), actualAnimalSet);
 
-    actualAnimalSet = injector.getInstance(Key.get(new TypeLiteral<Set<Set<Animal>>>() {}, SanDiego.class));
+    actualAnimalSet = injector.getInstance(Key.get(new TypeLiteral<>() {}, SanDiego.class));
     Assert.assertEquals(1, actualAnimalSet.size());
     Assert.assertEquals(ImmutableSet.of(union), actualAnimalSet);
 
-    final Set<Zoo<Animal>> actualZooSet = injector.getInstance(Key.get(new TypeLiteral<Set<Zoo<Animal>>>() {}));
+    final Set<Zoo<Animal>> actualZooSet = injector.getInstance(Key.get(new TypeLiteral<>() {}));
     Assert.assertEquals(2, actualZooSet.size());
     Assert.assertEquals(ImmutableSet.of(zoo1, zoo2), actualZooSet);
   }
diff --git a/processing/src/test/java/org/apache/druid/java/util/common/guava/BaseSequenceTest.java b/processing/src/test/java/org/apache/druid/java/util/common/guava/BaseSequenceTest.java
index 3417e05b6944..7b547801d930 100644
--- a/processing/src/test/java/org/apache/druid/java/util/common/guava/BaseSequenceTest.java
+++ b/processing/src/test/java/org/apache/druid/java/util/common/guava/BaseSequenceTest.java
@@ -51,12 +51,12 @@ public void testExceptionThrownInIterator()
   {
     final AtomicInteger closedCounter = new AtomicInteger(0);
     Sequence<Integer> seq = new BaseSequence<>(
-        new BaseSequence.IteratorMaker<Integer, Iterator<Integer>>()
+        new BaseSequence.IteratorMaker<>()
         {
           @Override
           public Iterator<Integer> make()
           {
-            return new Iterator<Integer>()
+            return new Iterator<>()
             {
               @Override
               public boolean hasNext()
@@ -92,7 +92,7 @@ public void cleanup(Iterator<Integer> iterFromMake)
   private static <T> Sequence<T> makeBaseSequence(final Iterable<T> iterable)
   {
     return new BaseSequence<>(
-        new BaseSequence.IteratorMaker<T, Iterator<T>>()
+        new BaseSequence.IteratorMaker<>()
         {
           @Override
           public Iterator<T> make()
diff --git a/processing/src/test/java/org/apache/druid/java/util/common/guava/ConcatSequenceTest.java b/processing/src/test/java/org/apache/druid/java/util/common/guava/ConcatSequenceTest.java
index 477357e07920..8e26afbf4b40 100644
--- a/processing/src/test/java/org/apache/druid/java/util/common/guava/ConcatSequenceTest.java
+++ b/processing/src/test/java/org/apache/druid/java/util/common/guava/ConcatSequenceTest.java
@@ -108,7 +108,7 @@ public void testClosingOfSequenceSequence() throws Exception
     final int[] closedCount = {0};
     final Sequence<Integer> seq = Sequences.concat(
         new BaseSequence<>(
-            new BaseSequence.IteratorMaker<Sequence<Integer>, Iterator<Sequence<Integer>>>()
+            new BaseSequence.IteratorMaker<>()
             {
               @Override
               public Iterator<Sequence<Integer>> make()
@@ -132,7 +132,7 @@ public void cleanup(Iterator<Sequence<Integer>> iterFromMake)
         9,
         seq.accumulate(
             1,
-            new Accumulator<Integer, Integer>()
+            new Accumulator<>()
             {
               @Override
               public Integer accumulate(Integer accumulated, Integer in)
@@ -148,7 +148,7 @@ public Integer accumulate(Integer accumulated, Integer in)
 
     final Yielder<Integer> yielder = seq.toYielder(
         1,
-        new YieldingAccumulator<Integer, Integer>()
+        new YieldingAccumulator<>()
         {
           @Override
           public Integer accumulate(Integer accumulated, Integer in)
@@ -171,7 +171,7 @@ public void testClosingOfSequenceSequenceWhenExceptionThrown()
     final AtomicInteger closedCount = new AtomicInteger(0);
     final Sequence<Integer> seq = Sequences.concat(
         new BaseSequence<>(
-            new BaseSequence.IteratorMaker<Sequence<Integer>, Iterator<Sequence<Integer>>>()
+            new BaseSequence.IteratorMaker<>()
             {
               @Override
               public Iterator<Sequence<Integer>> make()
@@ -207,21 +207,21 @@ public void testEnsureNextSequenceIsCalledLazilyInToYielder() throws Exception
                     ImmutableList.of(4, 5, 6)
                 )
             ),
-            new Function<ImmutableList<Integer>, Sequence<Integer>>()
+            new Function<>()
             {
               @Override
               public Sequence<Integer> apply(final ImmutableList<Integer> input)
               {
                 if (lastSeqFullyRead.getAndSet(false)) {
                   return Sequences.simple(
-                      new Iterable<Integer>()
+                      new Iterable<>()
                       {
                         private Iterator<Integer> baseIter = input.iterator();
 
                         @Override
                         public Iterator<Integer> iterator()
                         {
-                          return new Iterator<Integer>()
+                          return new Iterator<>()
                           {
                             @Override
                             public boolean hasNext()
@@ -258,7 +258,7 @@ public void remove()
 
     Yielder<Integer> yielder = seq.toYielder(
         null,
-        new YieldingAccumulator<Integer, Integer>()
+        new YieldingAccumulator<>()
         {
           @Override
           public Integer accumulate(Integer accumulated, Integer in)
diff --git a/processing/src/test/java/org/apache/druid/java/util/common/guava/FilteredSequenceTest.java b/processing/src/test/java/org/apache/druid/java/util/common/guava/FilteredSequenceTest.java
index a7d9aebab545..60982a60ca25 100644
--- a/processing/src/test/java/org/apache/druid/java/util/common/guava/FilteredSequenceTest.java
+++ b/processing/src/test/java/org/apache/druid/java/util/common/guava/FilteredSequenceTest.java
@@ -35,7 +35,7 @@ public class FilteredSequenceTest
   @Test
   public void testSanity() throws Exception
   {
-    Predicate<Integer> pred = new Predicate<Integer>()
+    Predicate<Integer> pred = new Predicate<>()
     {
       @Override
       public boolean apply(Integer input)
diff --git a/processing/src/test/java/org/apache/druid/java/util/common/guava/FunctionalIterableTest.java b/processing/src/test/java/org/apache/druid/java/util/common/guava/FunctionalIterableTest.java
index 1c866f18488f..2bc1468903f5 100644
--- a/processing/src/test/java/org/apache/druid/java/util/common/guava/FunctionalIterableTest.java
+++ b/processing/src/test/java/org/apache/druid/java/util/common/guava/FunctionalIterableTest.java
@@ -106,7 +106,7 @@ public void testFilter()
         Lists.newArrayList(
             FunctionalIterable.create(Arrays.asList("1", "2", "3"))
                               .filter(
-                                  new Predicate<String>()
+                                  new Predicate<>()
                                   {
                                     @Override
                                     public boolean apply(String input)
diff --git a/processing/src/test/java/org/apache/druid/java/util/common/guava/FunctionalIteratorTest.java b/processing/src/test/java/org/apache/druid/java/util/common/guava/FunctionalIteratorTest.java
index d32bc014240e..73feacc21adb 100644
--- a/processing/src/test/java/org/apache/druid/java/util/common/guava/FunctionalIteratorTest.java
+++ b/processing/src/test/java/org/apache/druid/java/util/common/guava/FunctionalIteratorTest.java
@@ -107,7 +107,7 @@ public void testFilter()
         Lists.newArrayList(
             FunctionalIterator.create(Arrays.asList("1", "2", "3").iterator())
                               .filter(
-                                  new Predicate<String>()
+                                  new Predicate<>()
                                   {
                                     @Override
                                     public boolean apply(String input)
diff --git a/processing/src/test/java/org/apache/druid/java/util/common/guava/LimitedSequenceTest.java b/processing/src/test/java/org/apache/druid/java/util/common/guava/LimitedSequenceTest.java
index d26a950bdd74..625449038306 100644
--- a/processing/src/test/java/org/apache/druid/java/util/common/guava/LimitedSequenceTest.java
+++ b/processing/src/test/java/org/apache/druid/java/util/common/guava/LimitedSequenceTest.java
@@ -74,7 +74,7 @@ public void testWithYieldingSequence()
     // Create a Sequence whose Yielders will yield for each element, regardless of what the accumulator passed
     // to "toYielder" does.
     final BaseSequence<Integer, Iterator<Integer>> sequence = new BaseSequence<Integer, Iterator<Integer>>(
-        new BaseSequence.IteratorMaker<Integer, Iterator<Integer>>()
+        new BaseSequence.IteratorMaker<>()
         {
           @Override
           public Iterator<Integer> make()
@@ -98,7 +98,7 @@ public <OutType> Yielder<OutType> toYielder(
       {
         return super.toYielder(
             initValue,
-            new DelegatingYieldingAccumulator<OutType, Integer>(accumulator)
+            new DelegatingYieldingAccumulator<>(accumulator)
             {
               @Override
               public OutType accumulate(OutType accumulated, Integer in)
diff --git a/processing/src/test/java/org/apache/druid/java/util/common/guava/MappedSequenceTest.java b/processing/src/test/java/org/apache/druid/java/util/common/guava/MappedSequenceTest.java
index 1464615b9d4d..d91fe2377eb1 100644
--- a/processing/src/test/java/org/apache/druid/java/util/common/guava/MappedSequenceTest.java
+++ b/processing/src/test/java/org/apache/druid/java/util/common/guava/MappedSequenceTest.java
@@ -34,7 +34,7 @@ public class MappedSequenceTest
   @Test
   public void testSanity() throws Exception
   {
-    Function<Integer, Integer> fn = new Function<Integer, Integer>()
+    Function<Integer, Integer> fn = new Function<>()
     {
       @Override
       public Integer apply(Integer input)
diff --git a/processing/src/test/java/org/apache/druid/java/util/common/guava/ParallelMergeCombiningSequenceTest.java b/processing/src/test/java/org/apache/druid/java/util/common/guava/ParallelMergeCombiningSequenceTest.java
index cbe84cb4eec1..d088e7e1afd2 100644
--- a/processing/src/test/java/org/apache/druid/java/util/common/guava/ParallelMergeCombiningSequenceTest.java
+++ b/processing/src/test/java/org/apache/druid/java/util/common/guava/ParallelMergeCombiningSequenceTest.java
@@ -985,15 +985,16 @@ public static Sequence<IntPair> nonBlockingSequence(int size, boolean lazyGenera
   {
     List<IntPair> pairs = lazyGenerate ? null : generateOrderedPairs(size);
     return new BaseSequence<>(
-        new BaseSequence.IteratorMaker<IntPair, Iterator<IntPair>>()
+        new BaseSequence.IteratorMaker<>()
         {
           @Override
           public Iterator<IntPair> make()
           {
-            return new Iterator<IntPair>()
+            return new Iterator<>()
             {
               int mergeKey = 0;
               int rowCounter = 0;
+
               @Override
               public boolean hasNext()
               {
@@ -1046,15 +1047,16 @@ public static Sequence<IntPair> blockingSequence(
     final long startDelayMillis = ThreadLocalRandom.current().nextLong(startDelayStartMillis, startDelayEndMillis);
     final long delayUntil = System.nanoTime() + TimeUnit.NANOSECONDS.convert(startDelayMillis, TimeUnit.MILLISECONDS);
     return new BaseSequence<>(
-        new BaseSequence.IteratorMaker<IntPair, Iterator<IntPair>>()
+        new BaseSequence.IteratorMaker<>()
         {
           @Override
           public Iterator<IntPair> make()
           {
-            return new Iterator<IntPair>()
+            return new Iterator<>()
             {
               int mergeKey = 0;
               int rowCounter = 0;
+
               @Override
               public boolean hasNext()
               {
@@ -1130,10 +1132,11 @@ public Iterator<IntPair> make()
             {
               // we got yielder, decrement so we expect it to be incremented again on cleanup
               explodedIteratorMakerCleanup.decrementAndGet();
-              return new Iterator<IntPair>()
+              return new Iterator<>()
               {
                 int mergeKey = 0;
                 int rowCounter = 0;
+
                 @Override
                 public boolean hasNext()
                 {
diff --git a/processing/src/test/java/org/apache/druid/java/util/common/guava/SequenceTestHelper.java b/processing/src/test/java/org/apache/druid/java/util/common/guava/SequenceTestHelper.java
index afbb960e00a5..2d0ccb9d7e9c 100644
--- a/processing/src/test/java/org/apache/druid/java/util/common/guava/SequenceTestHelper.java
+++ b/processing/src/test/java/org/apache/druid/java/util/common/guava/SequenceTestHelper.java
@@ -55,7 +55,7 @@ public static void testYield(
     Iterator<Integer> numsIter = nums.iterator();
     Yielder<Integer> yielder = seq.toYielder(
         0,
-        new YieldingAccumulator<Integer, Integer>()
+        new YieldingAccumulator<>()
         {
           final Iterator<Integer> valsIter = nums.iterator();
           int count = 0;
@@ -105,7 +105,7 @@ public static void testAccumulation(final String prefix, Sequence<Integer> seq,
 
     int sum = seq.accumulate(
         0,
-        new Accumulator<Integer, Integer>()
+        new Accumulator<>()
         {
           final Iterator<Integer> valsIter = nums.iterator();
 
@@ -144,7 +144,7 @@ public static void testClosed(AtomicInteger closedCounter, Sequence<Integer> seq
     try {
       yielder = seq.toYielder(
           1,
-          new YieldingAccumulator<Integer, Integer>()
+          new YieldingAccumulator<>()
           {
             @Override
             public Integer accumulate(Integer accumulated, Integer in)
diff --git a/processing/src/test/java/org/apache/druid/java/util/common/guava/SkippingSequenceTest.java b/processing/src/test/java/org/apache/druid/java/util/common/guava/SkippingSequenceTest.java
index 2b299d0b79ba..9f883e5b381e 100644
--- a/processing/src/test/java/org/apache/druid/java/util/common/guava/SkippingSequenceTest.java
+++ b/processing/src/test/java/org/apache/druid/java/util/common/guava/SkippingSequenceTest.java
@@ -79,7 +79,7 @@ public void testWithYieldingSequence()
   {
     // Create a Sequence whose Yielders will yield for each element, regardless of what the accumulator passed
     // to "toYielder" does.
-    final BaseSequence<Integer, Iterator<Integer>> sequence = new BaseSequence<Integer, Iterator<Integer>>(
+    final BaseSequence<Integer, Iterator<Integer>> sequence = new BaseSequence<>(
         new BaseSequence.IteratorMaker<Integer, Iterator<Integer>>()
         {
           @Override
@@ -104,7 +104,7 @@ public <OutType> Yielder<OutType> toYielder(
       {
         return super.toYielder(
             initValue,
-            new DelegatingYieldingAccumulator<OutType, Integer>(accumulator)
+            new DelegatingYieldingAccumulator<>(accumulator)
             {
               @Override
               public OutType accumulate(OutType accumulated, Integer in)
diff --git a/processing/src/test/java/org/apache/druid/java/util/common/parsers/CloseableIteratorTest.java b/processing/src/test/java/org/apache/druid/java/util/common/parsers/CloseableIteratorTest.java
index 3f701ee92f6f..fc9921a92499 100644
--- a/processing/src/test/java/org/apache/druid/java/util/common/parsers/CloseableIteratorTest.java
+++ b/processing/src/test/java/org/apache/druid/java/util/common/parsers/CloseableIteratorTest.java
@@ -163,7 +163,7 @@ public void testFlatMapInnerClose() throws IOException
 
   private static CloseableIterator<List<Integer>> generateTestIterator(int numIterates)
   {
-    return new CloseableIterator<List<Integer>>()
+    return new CloseableIterator<>()
     {
       private int cnt = 0;
 
diff --git a/processing/src/test/java/org/apache/druid/java/util/emitter/core/GoHandlers.java b/processing/src/test/java/org/apache/druid/java/util/emitter/core/GoHandlers.java
index 961a7226544d..b29f9186ff76 100644
--- a/processing/src/test/java/org/apache/druid/java/util/emitter/core/GoHandlers.java
+++ b/processing/src/test/java/org/apache/druid/java/util/emitter/core/GoHandlers.java
@@ -61,7 +61,7 @@ protected ListenableFuture<Response> go(Request request)
   static <T> ListenableFuture<T> immediateFuture(T val)
   {
     CompletableFuture<T> future = CompletableFuture.completedFuture(val);
-    return new ListenableFuture<T>()
+    return new ListenableFuture<>()
     {
       @Override
       public void done()
diff --git a/processing/src/test/java/org/apache/druid/java/util/emitter/core/HttpPostEmitterStressTest.java b/processing/src/test/java/org/apache/druid/java/util/emitter/core/HttpPostEmitterStressTest.java
index 2509db7a4b0a..e26c08d92b9e 100644
--- a/processing/src/test/java/org/apache/druid/java/util/emitter/core/HttpPostEmitterStressTest.java
+++ b/processing/src/test/java/org/apache/druid/java/util/emitter/core/HttpPostEmitterStressTest.java
@@ -71,7 +71,7 @@ public void eventCountBased() throws InterruptedException, IOException
       final List<List<Batch>> eventBatchesPerThread = new ArrayList<>(nThreads);
       for (int i = 0; i < nThreads; i++) {
         eventsPerThread.add(new IntArrayList());
-        eventBatchesPerThread.add(new ArrayList<Batch>());
+        eventBatchesPerThread.add(new ArrayList<>());
       }
       for (int i = 0; i < N; i++) {
         eventsPerThread.get(ThreadLocalRandom.current().nextInt(nThreads)).add(i);
diff --git a/processing/src/test/java/org/apache/druid/java/util/emitter/service/AlertEventTest.java b/processing/src/test/java/org/apache/druid/java/util/emitter/service/AlertEventTest.java
index a8f1b196353c..68bebb61f02b 100644
--- a/processing/src/test/java/org/apache/druid/java/util/emitter/service/AlertEventTest.java
+++ b/processing/src/test/java/org/apache/druid/java/util/emitter/service/AlertEventTest.java
@@ -169,7 +169,7 @@ public void testDefaulting()
 
   public Map<String, Object> contents(AlertEvent a)
   {
-    return Maps.filterKeys(a.toMap(), new Predicate<String>()
+    return Maps.filterKeys(a.toMap(), new Predicate<>()
     {
       @Override
       public boolean apply(String k)
diff --git a/processing/src/test/java/org/apache/druid/java/util/http/client/io/AppendableByteArrayInputStreamTest.java b/processing/src/test/java/org/apache/druid/java/util/http/client/io/AppendableByteArrayInputStreamTest.java
index 780cd12aa563..56e18f72823f 100644
--- a/processing/src/test/java/org/apache/druid/java/util/http/client/io/AppendableByteArrayInputStreamTest.java
+++ b/processing/src/test/java/org/apache/druid/java/util/http/client/io/AppendableByteArrayInputStreamTest.java
@@ -158,7 +158,7 @@ public void testBlockingRead() throws Exception
     Assert.assertEquals(5, in.available());
 
     Future<byte[]> bytesFuture = Executors.newSingleThreadExecutor().submit(
-        new Callable<byte[]>()
+        new Callable<>()
         {
           @Override
           public byte[] call() throws Exception
@@ -218,7 +218,7 @@ public void testExceptionUnblocks() throws InterruptedException
     in.add(new byte[]{});
     in.add(new byte[]{1});
     in.add(new byte[]{});
-    final AtomicReference<IOException> exceptionThrown = new AtomicReference<IOException>();
+    final AtomicReference<IOException> exceptionThrown = new AtomicReference<>();
     final CountDownLatch latch = new CountDownLatch(1);
     Executors.newSingleThreadExecutor().submit(
         new Callable()
diff --git a/processing/src/test/java/org/apache/druid/java/util/http/client/pool/ResourcePoolTest.java b/processing/src/test/java/org/apache/druid/java/util/http/client/pool/ResourcePoolTest.java
index 2961f6504695..d9ab3ea919bd 100644
--- a/processing/src/test/java/org/apache/druid/java/util/http/client/pool/ResourcePoolTest.java
+++ b/processing/src/test/java/org/apache/druid/java/util/http/client/pool/ResourcePoolTest.java
@@ -52,7 +52,7 @@ public void setUpPool(boolean eagerInitialization)
     resourceFactory = (ResourceFactory<String, String>) EasyMock.createMock(ResourceFactory.class);
 
     EasyMock.replay(resourceFactory);
-    pool = new ResourcePool<String, String>(
+    pool = new ResourcePool<>(
         resourceFactory,
         new ResourcePoolConfig(2, TimeUnit.MINUTES.toMillis(4)),
         eagerInitialization
@@ -418,7 +418,7 @@ public void testTimedOutResource() throws Exception
   {
     resourceFactory = (ResourceFactory<String, String>) EasyMock.createMock(ResourceFactory.class);
 
-    pool = new ResourcePool<String, String>(
+    pool = new ResourcePool<>(
         resourceFactory,
         new ResourcePoolConfig(2, TimeUnit.MILLISECONDS.toMillis(10)),
         true
diff --git a/processing/src/test/java/org/apache/druid/java/util/http/client/response/BytesFullResponseHolderTest.java b/processing/src/test/java/org/apache/druid/java/util/http/client/response/BytesFullResponseHolderTest.java
index fbabbb48d5a2..29c65f93aa25 100644
--- a/processing/src/test/java/org/apache/druid/java/util/http/client/response/BytesFullResponseHolderTest.java
+++ b/processing/src/test/java/org/apache/druid/java/util/http/client/response/BytesFullResponseHolderTest.java
@@ -52,8 +52,7 @@ public void testDeserialize() throws Exception
     final BytesFullResponseHolder target = spy(new BytesFullResponseHolder(response));
     target.addChunk(objectMapper.writeValueAsBytes(payload));
 
-    final ResponseObject deserialize = target.deserialize(objectMapper, new TypeReference<ResponseObject>() {
-    });
+    final ResponseObject deserialize = target.deserialize(objectMapper, new TypeReference<>() {});
 
     Assert.assertEquals(payload, deserialize);
     Mockito.verify(target, Mockito.times(1)).deserialize(ArgumentMatchers.any(), ArgumentMatchers.any());
diff --git a/processing/src/test/java/org/apache/druid/java/util/metrics/OshiSysMonitorTest.java b/processing/src/test/java/org/apache/druid/java/util/metrics/OshiSysMonitorTest.java
index d1c0f0ed1ba5..ece54cd3fa64 100644
--- a/processing/src/test/java/org/apache/druid/java/util/metrics/OshiSysMonitorTest.java
+++ b/processing/src/test/java/org/apache/druid/java/util/metrics/OshiSysMonitorTest.java
@@ -472,7 +472,7 @@ public void testCpuStats()
     m.stop();
     Assert.assertEquals(16, emitter.getEvents().size()); // 8 ticktype * 2 processors
 
-    Map<String, Object> userDims = new HashMap<String, Object>();
+    Map<String, Object> userDims = new HashMap<>();
     userDims.put("cpuName", "0");
     userDims.put("cpuTime", "user");
     List<Number> metricValues1 = emitter.getMetricValues("sys/cpu", userDims);
diff --git a/processing/src/test/java/org/apache/druid/math/expr/VectorExprSanityTest.java b/processing/src/test/java/org/apache/druid/math/expr/VectorExprSanityTest.java
index 2da11bb4e29c..ef7ab7fa4f85 100644
--- a/processing/src/test/java/org/apache/druid/math/expr/VectorExprSanityTest.java
+++ b/processing/src/test/java/org/apache/druid/math/expr/VectorExprSanityTest.java
@@ -478,7 +478,7 @@ public double getAsDouble()
           }
         },
         () -> ThreadLocalRandom.current().nextBoolean(),
-        new Supplier<String>()
+        new Supplier<>()
         {
           int counter = 1;
 
diff --git a/processing/src/test/java/org/apache/druid/metadata/MetadataStorageActionHandlerTest.java b/processing/src/test/java/org/apache/druid/metadata/MetadataStorageActionHandlerTest.java
index 41a0a55b284f..98d579821f6a 100644
--- a/processing/src/test/java/org/apache/druid/metadata/MetadataStorageActionHandlerTest.java
+++ b/processing/src/test/java/org/apache/druid/metadata/MetadataStorageActionHandlerTest.java
@@ -46,7 +46,7 @@ public class MetadataStorageActionHandlerTest
   @Before
   public void setup()
   {
-    this.handler = new MetadataStorageActionHandler<String, String, String, String>()
+    this.handler = new MetadataStorageActionHandler<>()
     {
       @Override
       public void insert(
diff --git a/processing/src/test/java/org/apache/druid/query/MultiValuedDimensionTest.java b/processing/src/test/java/org/apache/druid/query/MultiValuedDimensionTest.java
index a7abce4943c9..09a16932bcf9 100644
--- a/processing/src/test/java/org/apache/druid/query/MultiValuedDimensionTest.java
+++ b/processing/src/test/java/org/apache/druid/query/MultiValuedDimensionTest.java
@@ -1068,7 +1068,7 @@ public void testTopNWithDimFilterAndWithFilteredDimSpec()
       );
       Sequence<Result<TopNResultValue>> result = runner.run(QueryPlus.wrap(query));
       List<Result<TopNResultValue>> expectedResults = Collections.singletonList(
-          new Result<TopNResultValue>(
+          new Result<>(
               DateTimes.of("2011-01-12T00:00:00.000Z"),
               TopNResultValue.create(
                   Collections.<Map<String, Object>>singletonList(
@@ -1193,7 +1193,7 @@ public void testTopNExpressionAutoTransform()
               .build();
 
       List<Result<TopNResultValue>> expectedResults = Collections.singletonList(
-          new Result<TopNResultValue>(
+          new Result<>(
               DateTimes.of("2011-01-12T00:00:00.000Z"),
               TopNResultValue.create(
                   expected
diff --git a/processing/src/test/java/org/apache/druid/query/NestedDataTestUtils.java b/processing/src/test/java/org/apache/druid/query/NestedDataTestUtils.java
index 8361f6b0d32c..d270d53c015e 100644
--- a/processing/src/test/java/org/apache/druid/query/NestedDataTestUtils.java
+++ b/processing/src/test/java/org/apache/druid/query/NestedDataTestUtils.java
@@ -493,7 +493,7 @@ public static List<BiFunction<TemporaryFolder, Closer, List<Segment>>> getSegmen
   {
     final List<BiFunction<TemporaryFolder, Closer, List<Segment>>> segmentsGenerators =
         new ArrayList<>();
-    segmentsGenerators.add(new BiFunction<TemporaryFolder, Closer, List<Segment>>()
+    segmentsGenerators.add(new BiFunction<>()
     {
       @Override
       public List<Segment> apply(TemporaryFolder tempFolder, Closer closer)
@@ -522,7 +522,7 @@ public String toString()
         return MIX_SEGMENTS_NAME;
       }
     });
-    segmentsGenerators.add(new BiFunction<TemporaryFolder, Closer, List<Segment>>()
+    segmentsGenerators.add(new BiFunction<>()
     {
       @Override
       public List<Segment> apply(TemporaryFolder tempFolder, Closer closer)
@@ -544,7 +544,7 @@ public String toString()
         return INCREMENTAL_SEGMENTS_NAME;
       }
     });
-    segmentsGenerators.add(new BiFunction<TemporaryFolder, Closer, List<Segment>>()
+    segmentsGenerators.add(new BiFunction<>()
     {
       @Override
       public List<Segment> apply(TemporaryFolder tempFolder, Closer closer)
@@ -580,7 +580,7 @@ public String toString()
         return DEFAULT_SEGMENTS_NAME;
       }
     });
-    segmentsGenerators.add(new BiFunction<TemporaryFolder, Closer, List<Segment>>()
+    segmentsGenerators.add(new BiFunction<>()
     {
       @Override
       public List<Segment> apply(TemporaryFolder tempFolder, Closer closer)
diff --git a/processing/src/test/java/org/apache/druid/query/PrioritizedExecutorServiceTest.java b/processing/src/test/java/org/apache/druid/query/PrioritizedExecutorServiceTest.java
index 06954b8629ae..34a665829efb 100644
--- a/processing/src/test/java/org/apache/druid/query/PrioritizedExecutorServiceTest.java
+++ b/processing/src/test/java/org/apache/druid/query/PrioritizedExecutorServiceTest.java
@@ -123,7 +123,7 @@ public void tearDown()
   @Test
   public void testSubmit() throws Exception
   {
-    final ConcurrentLinkedQueue<Integer> order = new ConcurrentLinkedQueue<Integer>();
+    final ConcurrentLinkedQueue<Integer> order = new ConcurrentLinkedQueue<>();
 
     exec.submit(
         new AbstractPrioritizedCallable<Void>(0)
@@ -349,7 +349,7 @@ private PrioritizedCallable<Boolean> getCheckingPrioritizedCallable(
   )
   {
     final Callable<Boolean> delegate = getCheckingCallable(myOrder, hasRun);
-    return new AbstractPrioritizedCallable<Boolean>(priority)
+    return new AbstractPrioritizedCallable<>(priority)
     {
       @Override
       public Boolean call() throws Exception
@@ -365,7 +365,7 @@ private Callable<Boolean> getCheckingCallable(
   )
   {
     final Runnable runnable = getCheckingRunnable(myOrder, hasRun);
-    return new Callable<Boolean>()
+    return new Callable<>()
     {
       @Override
       public Boolean call()
diff --git a/processing/src/test/java/org/apache/druid/query/QueryRunnerTestHelper.java b/processing/src/test/java/org/apache/druid/query/QueryRunnerTestHelper.java
index 0a24a36cf74f..120ef503b8a0 100644
--- a/processing/src/test/java/org/apache/druid/query/QueryRunnerTestHelper.java
+++ b/processing/src/test/java/org/apache/druid/query/QueryRunnerTestHelper.java
@@ -335,13 +335,13 @@ public static Iterable<Object[]> transformToConstructionFeeder(Iterable<?> in)
   // simple cartesian iterable
   public static Iterable<Object[]> cartesian(final Iterable... iterables)
   {
-    return new Iterable<Object[]>()
+    return new Iterable<>()
     {
 
       @Override
       public Iterator<Object[]> iterator()
       {
-        return new Iterator<Object[]>()
+        return new Iterator<>()
         {
           private final Iterator[] iterators = new Iterator[iterables.length];
           private final Object[] cached = new Object[iterables.length];
diff --git a/processing/src/test/java/org/apache/druid/query/ResultGranularTimestampComparatorTest.java b/processing/src/test/java/org/apache/druid/query/ResultGranularTimestampComparatorTest.java
index 7edcca9a232a..08c1d5f4388d 100644
--- a/processing/src/test/java/org/apache/druid/query/ResultGranularTimestampComparatorTest.java
+++ b/processing/src/test/java/org/apache/druid/query/ResultGranularTimestampComparatorTest.java
@@ -53,8 +53,8 @@ public ResultGranularTimestampComparatorTest(boolean descending)
   @Test
   public void testCompareAll()
   {
-    Result<Object> r1 = new Result<Object>(time, null);
-    Result<Object> r2 = new Result<Object>(time.plusYears(5), null);
+    Result<Object> r1 = new Result<>(time, null);
+    Result<Object> r2 = new Result<>(time.plusYears(5), null);
 
     Assert.assertEquals(ResultGranularTimestampComparator.create(Granularities.ALL, descending).compare(r1, r2), 0);
   }
@@ -62,10 +62,10 @@ public void testCompareAll()
   @Test
   public void testCompareDay()
   {
-    Result<Object> res = new Result<Object>(time, null);
-    Result<Object> same = new Result<Object>(time.plusHours(12), null);
-    Result<Object> greater = new Result<Object>(time.plusHours(25), null);
-    Result<Object> less = new Result<Object>(time.minusHours(1), null);
+    Result<Object> res = new Result<>(time, null);
+    Result<Object> same = new Result<>(time.plusHours(12), null);
+    Result<Object> greater = new Result<>(time.plusHours(25), null);
+    Result<Object> less = new Result<>(time.minusHours(1), null);
 
     Granularity day = Granularities.DAY;
     Assert.assertEquals(ResultGranularTimestampComparator.create(day, descending).compare(res, same), 0);
@@ -76,10 +76,10 @@ public void testCompareDay()
   @Test
   public void testCompareHour()
   {
-    Result<Object> res = new Result<Object>(time, null);
-    Result<Object> same = new Result<Object>(time.plusMinutes(55), null);
-    Result<Object> greater = new Result<Object>(time.plusHours(1), null);
-    Result<Object> less = new Result<Object>(time.minusHours(1), null);
+    Result<Object> res = new Result<>(time, null);
+    Result<Object> same = new Result<>(time.plusMinutes(55), null);
+    Result<Object> greater = new Result<>(time.plusHours(1), null);
+    Result<Object> less = new Result<>(time.minusHours(1), null);
 
     Granularity hour = Granularities.HOUR;
     Assert.assertEquals(ResultGranularTimestampComparator.create(hour, descending).compare(res, same), 0);
diff --git a/processing/src/test/java/org/apache/druid/query/TimewarpOperatorTest.java b/processing/src/test/java/org/apache/druid/query/TimewarpOperatorTest.java
index 679501a25150..0563b98977b5 100644
--- a/processing/src/test/java/org/apache/druid/query/TimewarpOperatorTest.java
+++ b/processing/src/test/java/org/apache/druid/query/TimewarpOperatorTest.java
@@ -80,7 +80,7 @@ public void testComputeOffset()
   public void testPostProcess()
   {
     QueryRunner<Result<TimeseriesResultValue>> queryRunner = testOperator.postProcess(
-        new QueryRunner<Result<TimeseriesResultValue>>()
+        new QueryRunner<>()
         {
           @Override
           public Sequence<Result<TimeseriesResultValue>> run(
@@ -142,7 +142,7 @@ public Sequence<Result<TimeseriesResultValue>> run(
     );
 
     QueryRunner<Result<TimeBoundaryResultValue>> timeBoundaryRunner = timeBoundaryOperator.postProcess(
-        new QueryRunner<Result<TimeBoundaryResultValue>>()
+        new QueryRunner<>()
         {
           @Override
           public Sequence<Result<TimeBoundaryResultValue>> run(
@@ -189,7 +189,7 @@ public Sequence<Result<TimeBoundaryResultValue>> run(
   public void testPostProcessWithTimezonesAndDstShift()
   {
     QueryRunner<Result<TimeseriesResultValue>> queryRunner = testOperator.postProcess(
-        new QueryRunner<Result<TimeseriesResultValue>>()
+        new QueryRunner<>()
         {
           @Override
           public Sequence<Result<TimeseriesResultValue>> run(
@@ -249,7 +249,7 @@ public Sequence<Result<TimeseriesResultValue>> run(
   public void testPostProcessWithTimezonesAndNoDstShift()
   {
     QueryRunner<Result<TimeseriesResultValue>> queryRunner = testOperator.postProcess(
-        new QueryRunner<Result<TimeseriesResultValue>>()
+        new QueryRunner<>()
         {
           @Override
           public Sequence<Result<TimeseriesResultValue>> run(
diff --git a/processing/src/test/java/org/apache/druid/query/aggregation/AggregationTestHelper.java b/processing/src/test/java/org/apache/druid/query/aggregation/AggregationTestHelper.java
index c1d643d519ec..81f62cb7421c 100644
--- a/processing/src/test/java/org/apache/druid/query/aggregation/AggregationTestHelper.java
+++ b/processing/src/test/java/org/apache/druid/query/aggregation/AggregationTestHelper.java
@@ -234,7 +234,7 @@ public static AggregationTestHelper createTopNQueryAggregationTestHelper(
 
     final CloseableStupidPool<ByteBuffer> pool = new CloseableStupidPool<>(
         "TopNQueryRunnerFactory-bufferPool",
-        new Supplier<ByteBuffer>()
+        new Supplier<>()
         {
           @Override
           public ByteBuffer get()
@@ -471,9 +471,7 @@ public void createIndex(
       LineIterator iter = IOUtils.lineIterator(inputDataStream, "UTF-8");
       List<AggregatorFactory> aggregatorSpecs = mapper.readValue(
           aggregators,
-          new TypeReference<List<AggregatorFactory>>()
-          {
-          }
+          new TypeReference<>() {}
       );
 
       createIndex(
@@ -673,7 +671,7 @@ public <T> Sequence<T> runQueryOnSegments(final List<File> segmentDirs, final Qu
   {
     final List<Segment> segments = Lists.transform(
         segmentDirs,
-        new Function<File, Segment>()
+        new Function<>()
         {
           @Override
           public Segment apply(File segmentDir)
@@ -743,7 +741,7 @@ public QueryRunner<ResultRow> makeStringSerdeQueryRunner(
       final QueryRunner<ResultRow> baseRunner
   )
   {
-    return new QueryRunner<ResultRow>()
+    return new QueryRunner<>()
     {
       @Override
       public Sequence<ResultRow> run(QueryPlus<ResultRow> queryPlus, ResponseContext map)
diff --git a/processing/src/test/java/org/apache/druid/query/aggregation/SerializablePairLongDoubleComplexMetricSerdeTest.java b/processing/src/test/java/org/apache/druid/query/aggregation/SerializablePairLongDoubleComplexMetricSerdeTest.java
index 8dc5120958fb..f225b83b8553 100644
--- a/processing/src/test/java/org/apache/druid/query/aggregation/SerializablePairLongDoubleComplexMetricSerdeTest.java
+++ b/processing/src/test/java/org/apache/druid/query/aggregation/SerializablePairLongDoubleComplexMetricSerdeTest.java
@@ -194,7 +194,7 @@ private static ByteBuffer serializeAllValuesToByteBuffer(
 
     final AtomicReference<SerializablePairLongDouble> reference = new AtomicReference<>(null);
     ColumnValueSelector<SerializablePairLongDouble> valueSelector =
-        new SingleObjectColumnValueSelector<SerializablePairLongDouble>(
+        new SingleObjectColumnValueSelector<>(
             SerializablePairLongDouble.class
         )
         {
diff --git a/processing/src/test/java/org/apache/druid/query/aggregation/SerializablePairLongFloatComplexMetricSerdeTest.java b/processing/src/test/java/org/apache/druid/query/aggregation/SerializablePairLongFloatComplexMetricSerdeTest.java
index 1ca8c44d7be3..7fd74be211e8 100644
--- a/processing/src/test/java/org/apache/druid/query/aggregation/SerializablePairLongFloatComplexMetricSerdeTest.java
+++ b/processing/src/test/java/org/apache/druid/query/aggregation/SerializablePairLongFloatComplexMetricSerdeTest.java
@@ -194,7 +194,7 @@ private static ByteBuffer serializeAllValuesToByteBuffer(
 
     final AtomicReference<SerializablePairLongFloat> reference = new AtomicReference<>(null);
     ColumnValueSelector<SerializablePairLongFloat> valueSelector =
-        new SingleObjectColumnValueSelector<SerializablePairLongFloat>(
+        new SingleObjectColumnValueSelector<>(
             SerializablePairLongFloat.class
         )
         {
diff --git a/processing/src/test/java/org/apache/druid/query/aggregation/SerializablePairLongLongComplexMetricSerdeTest.java b/processing/src/test/java/org/apache/druid/query/aggregation/SerializablePairLongLongComplexMetricSerdeTest.java
index 3e03e05ee3bc..e54dd5e1d3f5 100644
--- a/processing/src/test/java/org/apache/druid/query/aggregation/SerializablePairLongLongComplexMetricSerdeTest.java
+++ b/processing/src/test/java/org/apache/druid/query/aggregation/SerializablePairLongLongComplexMetricSerdeTest.java
@@ -194,7 +194,7 @@ private static ByteBuffer serializeAllValuesToByteBuffer(
 
     final AtomicReference<SerializablePairLongLong> reference = new AtomicReference<>(null);
     ColumnValueSelector<SerializablePairLongLong> valueSelector =
-        new SingleObjectColumnValueSelector<SerializablePairLongLong>(
+        new SingleObjectColumnValueSelector<>(
             SerializablePairLongLong.class
         )
         {
diff --git a/processing/src/test/java/org/apache/druid/query/aggregation/SerializablePairLongStringComplexMetricSerdeTest.java b/processing/src/test/java/org/apache/druid/query/aggregation/SerializablePairLongStringComplexMetricSerdeTest.java
index b6ba96c1cece..7aeca212d62c 100644
--- a/processing/src/test/java/org/apache/druid/query/aggregation/SerializablePairLongStringComplexMetricSerdeTest.java
+++ b/processing/src/test/java/org/apache/druid/query/aggregation/SerializablePairLongStringComplexMetricSerdeTest.java
@@ -205,7 +205,7 @@ private static ByteBuffer serializeAllValuesToByteBuffer(
 
     final AtomicReference<SerializablePairLongString> reference = new AtomicReference<>(null);
     ColumnValueSelector<SerializablePairLongString> valueSelector =
-        new SingleObjectColumnValueSelector<SerializablePairLongString>(
+        new SingleObjectColumnValueSelector<>(
             SerializablePairLongString.class
         )
         {
diff --git a/processing/src/test/java/org/apache/druid/query/aggregation/cardinality/CardinalityAggregatorTest.java b/processing/src/test/java/org/apache/druid/query/aggregation/cardinality/CardinalityAggregatorTest.java
index 3a306a6bd9e6..e5efa184c9da 100644
--- a/processing/src/test/java/org/apache/druid/query/aggregation/cardinality/CardinalityAggregatorTest.java
+++ b/processing/src/test/java/org/apache/druid/query/aggregation/cardinality/CardinalityAggregatorTest.java
@@ -91,7 +91,7 @@ public TestDimensionSelector(Iterable<String[]> values, ExtractionFn exFn)
       this.column = Lists.newArrayList(
           Iterables.transform(
               values,
-              new Function<String[], Integer[]>()
+              new Function<>()
               {
                 @Nullable
                 @Override
@@ -229,7 +229,7 @@ public void inspectRuntimeShape(RuntimeShapeInspector inspector)
   private static List<String[]> dimensionValues(Object... values)
   {
     return Lists.transform(
-        Lists.newArrayList(values), new Function<Object, String[]>()
+        Lists.newArrayList(values), new Function<>()
         {
           @Nullable
           @Override
@@ -295,12 +295,12 @@ public CardinalityAggregatorTest()
     dim2 = new TestDimensionSelector(VALUES2, null);
 
     dimInfoList = Lists.newArrayList(
-        new ColumnSelectorPlus<CardinalityAggregatorColumnSelectorStrategy>(
+        new ColumnSelectorPlus<>(
             dimSpec1.getDimension(),
             dimSpec1.getOutputName(),
             new StringCardinalityAggregatorColumnSelectorStrategy(), dim1
         ),
-        new ColumnSelectorPlus<CardinalityAggregatorColumnSelectorStrategy>(
+        new ColumnSelectorPlus<>(
             dimSpec2.getDimension(),
             dimSpec2.getOutputName(),
             new StringCardinalityAggregatorColumnSelectorStrategy(), dim2
diff --git a/processing/src/test/java/org/apache/druid/query/aggregation/post/ArithmeticPostAggregatorTest.java b/processing/src/test/java/org/apache/druid/query/aggregation/post/ArithmeticPostAggregatorTest.java
index 5edc9773dd91..211df0de8c2d 100644
--- a/processing/src/test/java/org/apache/druid/query/aggregation/post/ArithmeticPostAggregatorTest.java
+++ b/processing/src/test/java/org/apache/druid/query/aggregation/post/ArithmeticPostAggregatorTest.java
@@ -55,7 +55,7 @@ public void testCompute()
     agg.aggregate();
     agg.aggregate();
     agg.aggregate();
-    Map<String, Object> metricValues = new HashMap<String, Object>();
+    Map<String, Object> metricValues = new HashMap<>();
     metricValues.put(aggName, agg.get());
 
     List<PostAggregator> postAggregatorList =
diff --git a/processing/src/test/java/org/apache/druid/query/aggregation/post/DoubleGreatestPostAggregatorTest.java b/processing/src/test/java/org/apache/druid/query/aggregation/post/DoubleGreatestPostAggregatorTest.java
index 48477c1fa45d..60f3636300da 100644
--- a/processing/src/test/java/org/apache/druid/query/aggregation/post/DoubleGreatestPostAggregatorTest.java
+++ b/processing/src/test/java/org/apache/druid/query/aggregation/post/DoubleGreatestPostAggregatorTest.java
@@ -51,7 +51,7 @@ public void testCompute()
     agg.aggregate();
     agg.aggregate();
     agg.aggregate();
-    Map<String, Object> metricValues = new HashMap<String, Object>();
+    Map<String, Object> metricValues = new HashMap<>();
     metricValues.put(aggName, agg.get());
 
     List<PostAggregator> postAggregatorList =
@@ -74,7 +74,7 @@ public void testComparator()
     final String aggName = "rows";
     DoubleGreatestPostAggregator greatestPostAggregator;
     CountAggregator agg = new CountAggregator();
-    Map<String, Object> metricValues = new HashMap<String, Object>();
+    Map<String, Object> metricValues = new HashMap<>();
     metricValues.put(aggName, agg.get());
 
     List<PostAggregator> postAggregatorList =
diff --git a/processing/src/test/java/org/apache/druid/query/aggregation/post/DoubleLeastPostAggregatorTest.java b/processing/src/test/java/org/apache/druid/query/aggregation/post/DoubleLeastPostAggregatorTest.java
index 96810fb0b945..87845d7d2e48 100644
--- a/processing/src/test/java/org/apache/druid/query/aggregation/post/DoubleLeastPostAggregatorTest.java
+++ b/processing/src/test/java/org/apache/druid/query/aggregation/post/DoubleLeastPostAggregatorTest.java
@@ -51,7 +51,7 @@ public void testCompute()
     agg.aggregate();
     agg.aggregate();
     agg.aggregate();
-    Map<String, Object> metricValues = new HashMap<String, Object>();
+    Map<String, Object> metricValues = new HashMap<>();
     metricValues.put(aggName, agg.get());
 
     List<PostAggregator> postAggregatorList =
@@ -74,7 +74,7 @@ public void testComparator()
     final String aggName = "rows";
     DoubleLeastPostAggregator leastPostAggregator;
     CountAggregator agg = new CountAggregator();
-    Map<String, Object> metricValues = new HashMap<String, Object>();
+    Map<String, Object> metricValues = new HashMap<>();
     metricValues.put(aggName, agg.get());
 
     List<PostAggregator> postAggregatorList =
diff --git a/processing/src/test/java/org/apache/druid/query/aggregation/post/FieldAccessPostAggregatorTest.java b/processing/src/test/java/org/apache/druid/query/aggregation/post/FieldAccessPostAggregatorTest.java
index d80eb106b82b..f477b5db5ab9 100644
--- a/processing/src/test/java/org/apache/druid/query/aggregation/post/FieldAccessPostAggregatorTest.java
+++ b/processing/src/test/java/org/apache/druid/query/aggregation/post/FieldAccessPostAggregatorTest.java
@@ -87,7 +87,7 @@ public void testCompute()
 
     fieldAccessPostAggregator = new FieldAccessPostAggregator("To be, or not to be, that is the question:", "rows");
     CountAggregator agg = new CountAggregator();
-    Map<String, Object> metricValues = new HashMap<String, Object>();
+    Map<String, Object> metricValues = new HashMap<>();
     metricValues.put(aggName, agg.get());
     Assert.assertEquals(new Long(0L), fieldAccessPostAggregator.compute(metricValues));
 
diff --git a/processing/src/test/java/org/apache/druid/query/aggregation/post/LongGreatestPostAggregatorTest.java b/processing/src/test/java/org/apache/druid/query/aggregation/post/LongGreatestPostAggregatorTest.java
index 5f93b09359a8..34902b0bc1c1 100644
--- a/processing/src/test/java/org/apache/druid/query/aggregation/post/LongGreatestPostAggregatorTest.java
+++ b/processing/src/test/java/org/apache/druid/query/aggregation/post/LongGreatestPostAggregatorTest.java
@@ -51,7 +51,7 @@ public void testCompute()
     agg.aggregate();
     agg.aggregate();
     agg.aggregate();
-    Map<String, Object> metricValues = new HashMap<String, Object>();
+    Map<String, Object> metricValues = new HashMap<>();
     metricValues.put(aggName, agg.get());
 
     List<PostAggregator> postAggregatorList =
@@ -74,7 +74,7 @@ public void testComparator()
     final String aggName = "rows";
     LongGreatestPostAggregator greatestPostAggregator;
     CountAggregator agg = new CountAggregator();
-    Map<String, Object> metricValues = new HashMap<String, Object>();
+    Map<String, Object> metricValues = new HashMap<>();
     metricValues.put(aggName, agg.get());
 
     List<PostAggregator> postAggregatorList =
diff --git a/processing/src/test/java/org/apache/druid/query/aggregation/post/LongLeastPostAggregatorTest.java b/processing/src/test/java/org/apache/druid/query/aggregation/post/LongLeastPostAggregatorTest.java
index b97b52b5183a..af58830b3eee 100644
--- a/processing/src/test/java/org/apache/druid/query/aggregation/post/LongLeastPostAggregatorTest.java
+++ b/processing/src/test/java/org/apache/druid/query/aggregation/post/LongLeastPostAggregatorTest.java
@@ -51,7 +51,7 @@ public void testCompute()
     agg.aggregate();
     agg.aggregate();
     agg.aggregate();
-    Map<String, Object> metricValues = new HashMap<String, Object>();
+    Map<String, Object> metricValues = new HashMap<>();
     metricValues.put(aggName, agg.get());
 
     List<PostAggregator> postAggregatorList =
@@ -74,7 +74,7 @@ public void testComparator()
     final String aggName = "rows";
     LongLeastPostAggregator leastPostAggregator;
     CountAggregator agg = new CountAggregator();
-    Map<String, Object> metricValues = new HashMap<String, Object>();
+    Map<String, Object> metricValues = new HashMap<>();
     metricValues.put(aggName, agg.get());
 
     List<PostAggregator> postAggregatorList =
diff --git a/processing/src/test/java/org/apache/druid/query/dimension/LegacyDimensionSpecTest.java b/processing/src/test/java/org/apache/druid/query/dimension/LegacyDimensionSpecTest.java
index aaf6aece9f59..0c68146dfaeb 100644
--- a/processing/src/test/java/org/apache/druid/query/dimension/LegacyDimensionSpecTest.java
+++ b/processing/src/test/java/org/apache/druid/query/dimension/LegacyDimensionSpecTest.java
@@ -38,9 +38,7 @@ public void testEqualsSerde() throws IOException
   {
     final String dimension = "testDimension";
     final List<DimensionSpec> deserializedSpecs = mapper.readValue(
-        StringUtils.format("[\"%s\"]", dimension), new TypeReference<List<DimensionSpec>>()
-        {
-        }
+        StringUtils.format("[\"%s\"]", dimension), new TypeReference<>() {}
     );
     Assert.assertEquals(dimension, deserializedSpecs.get(0).getDimension());
     Assert.assertEquals(dimension, deserializedSpecs.get(0).getOutputName());
diff --git a/processing/src/test/java/org/apache/druid/query/explain/ExplainPlanTest.java b/processing/src/test/java/org/apache/druid/query/explain/ExplainPlanTest.java
index 7ff56b7c6fd9..0273ec412851 100644
--- a/processing/src/test/java/org/apache/druid/query/explain/ExplainPlanTest.java
+++ b/processing/src/test/java/org/apache/druid/query/explain/ExplainPlanTest.java
@@ -110,7 +110,7 @@ private void testSerde(
     try {
       observedExplainPlans = MAPPER.readValue(
           MAPPER.writeValueAsString(givenPlans),
-          new TypeReference<List<ExplainPlan>>() {}
+          new TypeReference<>() {}
       );
     }
     catch (Exception e) {
diff --git a/processing/src/test/java/org/apache/druid/query/extraction/FunctionalExtractionTest.java b/processing/src/test/java/org/apache/druid/query/extraction/FunctionalExtractionTest.java
index c00ac686c57b..a4e4c9feef7a 100644
--- a/processing/src/test/java/org/apache/druid/query/extraction/FunctionalExtractionTest.java
+++ b/processing/src/test/java/org/apache/druid/query/extraction/FunctionalExtractionTest.java
@@ -52,7 +52,7 @@ public byte[] getCacheKey()
     }
   }
 
-  private static final Function<String, String> NULL_FN = new Function<String, String>()
+  private static final Function<String, String> NULL_FN = new Function<>()
   {
     @Nullable
     @Override
@@ -62,7 +62,7 @@ public String apply(String input)
     }
   };
 
-  private static final Function<String, String> TURTLE_FN = new Function<String, String>()
+  private static final Function<String, String> TURTLE_FN = new Function<>()
   {
     @Nullable
     @Override
@@ -72,7 +72,7 @@ public String apply(@Nullable String input)
     }
   };
 
-  private static final Function<String, String> EMPTY_STR_FN = new Function<String, String>()
+  private static final Function<String, String> EMPTY_STR_FN = new Function<>()
   {
     @Nullable
     @Override
@@ -82,7 +82,7 @@ public String apply(@Nullable String input)
     }
   };
 
-  private static final Function<String, String> IDENTITY_FN = new Function<String, String>()
+  private static final Function<String, String> IDENTITY_FN = new Function<>()
   {
     @Nullable
     @Override
@@ -92,7 +92,7 @@ public String apply(@Nullable String input)
     }
   };
 
-  private static final Function<String, String> ONLY_PRESENT = new Function<String, String>()
+  private static final Function<String, String> ONLY_PRESENT = new Function<>()
   {
     @Nullable
     @Override
diff --git a/processing/src/test/java/org/apache/druid/query/filter/DimFilterUtilsTest.java b/processing/src/test/java/org/apache/druid/query/filter/DimFilterUtilsTest.java
index 13e15891d2f3..179abe02121d 100644
--- a/processing/src/test/java/org/apache/druid/query/filter/DimFilterUtilsTest.java
+++ b/processing/src/test/java/org/apache/druid/query/filter/DimFilterUtilsTest.java
@@ -41,7 +41,7 @@
 
 public class DimFilterUtilsTest
 {
-  private static final Function<ShardSpec, ShardSpec> CONVERTER = new Function<ShardSpec, ShardSpec>()
+  private static final Function<ShardSpec, ShardSpec> CONVERTER = new Function<>()
   {
     @Nullable
     @Override
diff --git a/processing/src/test/java/org/apache/druid/query/groupby/GroupByLimitPushDownInsufficientBufferTest.java b/processing/src/test/java/org/apache/druid/query/groupby/GroupByLimitPushDownInsufficientBufferTest.java
index 6fb14ef6707b..b2c723a0fe27 100644
--- a/processing/src/test/java/org/apache/druid/query/groupby/GroupByLimitPushDownInsufficientBufferTest.java
+++ b/processing/src/test/java/org/apache/druid/query/groupby/GroupByLimitPushDownInsufficientBufferTest.java
@@ -412,7 +412,7 @@ public void testPartialLimitPushDownMerge()
 
     QueryRunner<ResultRow> theRunner3 = new FinalizeResultsQueryRunner<>(
         toolChest.mergeResults(
-            new QueryRunner<ResultRow>()
+            new QueryRunner<>()
             {
               @Override
               public Sequence<ResultRow> run(QueryPlus<ResultRow> queryPlus, ResponseContext responseContext)
@@ -515,7 +515,7 @@ public void testPartialLimitPushDownMergeForceAggs()
 
     QueryRunner<ResultRow> theRunner3 = new FinalizeResultsQueryRunner<>(
         toolChest.mergeResults(
-            new QueryRunner<ResultRow>()
+            new QueryRunner<>()
             {
               @Override
               public Sequence<ResultRow> run(QueryPlus<ResultRow> queryPlus, ResponseContext responseContext)
diff --git a/processing/src/test/java/org/apache/druid/query/groupby/GroupByLimitPushDownMultiNodeMergeTest.java b/processing/src/test/java/org/apache/druid/query/groupby/GroupByLimitPushDownMultiNodeMergeTest.java
index 8daa143db4cb..116e3b811748 100644
--- a/processing/src/test/java/org/apache/druid/query/groupby/GroupByLimitPushDownMultiNodeMergeTest.java
+++ b/processing/src/test/java/org/apache/druid/query/groupby/GroupByLimitPushDownMultiNodeMergeTest.java
@@ -677,7 +677,7 @@ public void testDescendingNumerics()
 
     QueryRunner<ResultRow> finalRunner = new FinalizeResultsQueryRunner<>(
         toolChestBroker.mergeResults(
-            new QueryRunner<ResultRow>()
+            new QueryRunner<>()
             {
               @Override
               public Sequence<ResultRow> run(QueryPlus<ResultRow> queryPlus, ResponseContext responseContext)
@@ -823,7 +823,7 @@ public void testPartialLimitPushDownMerge()
 
     QueryRunner<ResultRow> finalRunner = new FinalizeResultsQueryRunner<>(
         toolchestBroker.mergeResults(
-            new QueryRunner<ResultRow>()
+            new QueryRunner<>()
             {
               @Override
               public Sequence<ResultRow> run(QueryPlus<ResultRow> queryPlus, ResponseContext responseContext)
@@ -972,7 +972,7 @@ private List<ResultRow> testForcePushLimitDownAccuracyWhenSortHasNonGroupingFiel
     QueryToolChest<ResultRow, GroupByQuery> toolchestBroker = groupByFactoryBroker.getToolchest();
     QueryRunner<ResultRow> finalRunner = new FinalizeResultsQueryRunner<>(
         toolchestBroker.mergeResults(
-            new QueryRunner<ResultRow>()
+            new QueryRunner<>()
             {
               @Override
               public Sequence<ResultRow> run(QueryPlus<ResultRow> queryPlus, ResponseContext responseContext)
diff --git a/processing/src/test/java/org/apache/druid/query/groupby/GroupByQueryRunnerTest.java b/processing/src/test/java/org/apache/druid/query/groupby/GroupByQueryRunnerTest.java
index f8107245c93b..13e0702f3ef8 100644
--- a/processing/src/test/java/org/apache/druid/query/groupby/GroupByQueryRunnerTest.java
+++ b/processing/src/test/java/org/apache/druid/query/groupby/GroupByQueryRunnerTest.java
@@ -3889,7 +3889,7 @@ public void testMergeResults()
     final GroupByQuery allGranQuery = builder.copy().setGranularity(Granularities.ALL).build();
 
     QueryRunner mergedRunner = factory.getToolchest().mergeResults(
-        new QueryRunner<ResultRow>()
+        new QueryRunner<>()
         {
           @Override
           public Sequence<ResultRow> run(QueryPlus<ResultRow> queryPlus, ResponseContext responseContext)
@@ -4253,7 +4253,7 @@ private void doTestMergeResultsWithOrderBy(
   )
   {
     QueryRunner mergedRunner = factory.getToolchest().mergeResults(
-        new QueryRunner<ResultRow>()
+        new QueryRunner<>()
         {
           @Override
           public Sequence<ResultRow> run(QueryPlus<ResultRow> queryPlus, ResponseContext responseContext)
@@ -5070,7 +5070,7 @@ public void testPostAggMergedHavingSpec()
     );
 
     QueryRunner mergedRunner = factory.getToolchest().mergeResults(
-        new QueryRunner<ResultRow>()
+        new QueryRunner<>()
         {
           @Override
           public Sequence<ResultRow> run(QueryPlus<ResultRow> queryPlus, ResponseContext responseContext)
@@ -5535,7 +5535,7 @@ public void testMergedHavingSpec()
     );
 
     QueryRunner mergedRunner = factory.getToolchest().mergeResults(
-        new QueryRunner<ResultRow>()
+        new QueryRunner<>()
         {
           @Override
           public Sequence<ResultRow> run(QueryPlus<ResultRow> queryPlus, ResponseContext responseContext)
@@ -5626,7 +5626,7 @@ public void testMergedPostAggHavingSpec()
     );
 
     QueryRunner mergedRunner = factory.getToolchest().mergeResults(
-        new QueryRunner<ResultRow>()
+        new QueryRunner<>()
         {
           @Override
           public Sequence<ResultRow> run(QueryPlus<ResultRow> queryPlus, ResponseContext responseContext)
@@ -11673,7 +11673,7 @@ public void testMergeResultsWithLimitPushDown()
     final GroupByQuery allGranQuery = builder.build();
 
     QueryRunner mergedRunner = factory.getToolchest().mergeResults(
-        new QueryRunner<ResultRow>()
+        new QueryRunner<>()
         {
           @Override
           public Sequence<ResultRow> run(QueryPlus<ResultRow> queryPlus, ResponseContext responseContext)
@@ -11739,7 +11739,7 @@ public void testMergeResultsWithLimitPushDownSortByAgg()
     final GroupByQuery allGranQuery = builder.build();
 
     QueryRunner mergedRunner = factory.getToolchest().mergeResults(
-        new QueryRunner<ResultRow>()
+        new QueryRunner<>()
         {
           @Override
           public Sequence<ResultRow> run(QueryPlus<ResultRow> queryPlus, ResponseContext responseContext)
@@ -11806,7 +11806,7 @@ public void testMergeResultsWithLimitPushDownSortByAggWithOffset()
     final GroupByQuery allGranQuery = builder.build();
 
     QueryRunner mergedRunner = factory.getToolchest().mergeResults(
-        new QueryRunner<ResultRow>()
+        new QueryRunner<>()
         {
           @Override
           public Sequence<ResultRow> run(QueryPlus<ResultRow> queryPlus, ResponseContext responseContext)
@@ -11880,7 +11880,7 @@ public void testMergeResultsWithLimitPushDownSortByDimDim()
     final GroupByQuery allGranQuery = builder.build();
 
     QueryRunner mergedRunner = factory.getToolchest().mergeResults(
-        new QueryRunner<ResultRow>()
+        new QueryRunner<>()
         {
           @Override
           public Sequence<ResultRow> run(QueryPlus<ResultRow> queryPlus, ResponseContext responseContext)
@@ -11964,7 +11964,7 @@ public void testMergeResultsWithLimitPushDownSortByDimAggDim()
     final GroupByQuery allGranQuery = builder.build();
 
     QueryRunner mergedRunner = factory.getToolchest().mergeResults(
-        new QueryRunner<ResultRow>()
+        new QueryRunner<>()
         {
           @Override
           public Sequence<ResultRow> run(QueryPlus<ResultRow> queryPlus, ResponseContext responseContext)
diff --git a/processing/src/test/java/org/apache/druid/query/groupby/epinephelinae/BufferHashGrouperTest.java b/processing/src/test/java/org/apache/druid/query/groupby/epinephelinae/BufferHashGrouperTest.java
index 1a06e725aead..a67479f7c222 100644
--- a/processing/src/test/java/org/apache/druid/query/groupby/epinephelinae/BufferHashGrouperTest.java
+++ b/processing/src/test/java/org/apache/druid/query/groupby/epinephelinae/BufferHashGrouperTest.java
@@ -206,7 +206,7 @@ private ResourceHolder<Grouper<IntKey>> makeGrouper(
 
     grouper.init();
 
-    return new ResourceHolder<Grouper<IntKey>>()
+    return new ResourceHolder<>()
     {
       @Override
       public BufferHashGrouper<IntKey> get()
diff --git a/processing/src/test/java/org/apache/druid/query/groupby/epinephelinae/ConcurrentGrouperTest.java b/processing/src/test/java/org/apache/druid/query/groupby/epinephelinae/ConcurrentGrouperTest.java
index 8a06eb6b0252..50e01b0f60c7 100644
--- a/processing/src/test/java/org/apache/druid/query/groupby/epinephelinae/ConcurrentGrouperTest.java
+++ b/processing/src/test/java/org/apache/druid/query/groupby/epinephelinae/ConcurrentGrouperTest.java
@@ -127,7 +127,7 @@ public ConcurrentGrouperTest(
     this.concurrencyHint = concurrencyHint;
     this.parallelCombineThreads = parallelCombineThreads;
     this.mergeThreadLocal = mergeThreadLocal;
-    this.bufferSupplier = new Supplier<ByteBuffer>()
+    this.bufferSupplier = new Supplier<>()
     {
       private final AtomicBoolean called = new AtomicBoolean(false);
       private ByteBuffer buffer;
@@ -368,7 +368,7 @@ public long getMaxDictionarySize()
     @Override
     public KeySerde<LongKey> factorize()
     {
-      return new KeySerde<LongKey>()
+      return new KeySerde<>()
       {
         final ByteBuffer buffer = ByteBuffer.allocate(8);
 
diff --git a/processing/src/test/java/org/apache/druid/query/groupby/epinephelinae/GroupByTestColumnSelectorFactory.java b/processing/src/test/java/org/apache/druid/query/groupby/epinephelinae/GroupByTestColumnSelectorFactory.java
index e6b2dbd8364f..d602ada4f86a 100644
--- a/processing/src/test/java/org/apache/druid/query/groupby/epinephelinae/GroupByTestColumnSelectorFactory.java
+++ b/processing/src/test/java/org/apache/druid/query/groupby/epinephelinae/GroupByTestColumnSelectorFactory.java
@@ -47,7 +47,7 @@ public DimensionSelector makeDimensionSelector(DimensionSpec dimensionSpec)
   @Override
   public ColumnValueSelector<?> makeColumnValueSelector(String columnName)
   {
-    return new ColumnValueSelector<Object>()
+    return new ColumnValueSelector<>()
     {
       @Override
       public double getDouble()
diff --git a/processing/src/test/java/org/apache/druid/query/lookup/LookupsStateTest.java b/processing/src/test/java/org/apache/druid/query/lookup/LookupsStateTest.java
index f54efca38985..5bcec0140cf4 100644
--- a/processing/src/test/java/org/apache/druid/query/lookup/LookupsStateTest.java
+++ b/processing/src/test/java/org/apache/druid/query/lookup/LookupsStateTest.java
@@ -55,9 +55,7 @@ public void testSerde() throws Exception
                      + "}";
 
     TypeReference<LookupsState<LookupExtractorFactoryContainer>> typeRef =
-        new TypeReference<LookupsState<LookupExtractorFactoryContainer>>()
-        {
-        };
+        new TypeReference<>() {};
 
     final ObjectMapper mapper = new DefaultObjectMapper();
     mapper.registerSubtypes(LookupExtractorFactoryContainerTest.TestLookupExtractorFactory.class);
diff --git a/processing/src/test/java/org/apache/druid/query/metadata/SegmentMetadataQueryTest.java b/processing/src/test/java/org/apache/druid/query/metadata/SegmentMetadataQueryTest.java
index af17379367ed..04a53908b484 100644
--- a/processing/src/test/java/org/apache/druid/query/metadata/SegmentMetadataQueryTest.java
+++ b/processing/src/test/java/org/apache/druid/query/metadata/SegmentMetadataQueryTest.java
@@ -1012,7 +1012,7 @@ public void testSegmentMetadataQueryWithQueryGranularityMerge()
   @Test
   public void testBySegmentResults()
   {
-    Result<BySegmentResultValue> bySegmentResult = new Result<BySegmentResultValue>(
+    Result<BySegmentResultValue> bySegmentResult = new Result<>(
         expectedSegmentAnalysis1.getIntervals().get(0).getStart(),
         new BySegmentResultValueClass(
             Collections.singletonList(
diff --git a/processing/src/test/java/org/apache/druid/query/operator/OperatorSequenceTest.java b/processing/src/test/java/org/apache/druid/query/operator/OperatorSequenceTest.java
index a1b5e9f1aea3..cad76a471780 100644
--- a/processing/src/test/java/org/apache/druid/query/operator/OperatorSequenceTest.java
+++ b/processing/src/test/java/org/apache/druid/query/operator/OperatorSequenceTest.java
@@ -54,7 +54,7 @@ public void testAccumulateAndYielderJustOne()
         ).intValue()
     );
 
-    Yielder<Integer> yielder = seq.toYielder(0, new YieldingAccumulator<Integer, RowsAndColumns>()
+    Yielder<Integer> yielder = seq.toYielder(0, new YieldingAccumulator<>()
     {
       @Override
       public Integer accumulate(Integer accumulated, RowsAndColumns in)
@@ -101,7 +101,7 @@ public void testAccumulateAndYielderMultiple()
     );
 
     // Never yield
-    Yielder<Integer> yielder = seq.toYielder(0, new YieldingAccumulator<Integer, RowsAndColumns>()
+    Yielder<Integer> yielder = seq.toYielder(0, new YieldingAccumulator<>()
     {
       @Override
       public Integer accumulate(Integer accumulated, RowsAndColumns in)
@@ -118,7 +118,7 @@ public Integer accumulate(Integer accumulated, RowsAndColumns in)
     Assert.assertTrue(yielder.isDone());
 
     // Yield at the very end...
-    yielder = seq.toYielder(0, new YieldingAccumulator<Integer, RowsAndColumns>()
+    yielder = seq.toYielder(0, new YieldingAccumulator<>()
     {
       @Override
       public Integer accumulate(Integer accumulated, RowsAndColumns in)
@@ -141,7 +141,7 @@ public Integer accumulate(Integer accumulated, RowsAndColumns in)
     Assert.assertTrue(yielder.isDone());
 
     // Aggregate each RAC and yield every other.
-    yielder = seq.toYielder(0, new YieldingAccumulator<Integer, RowsAndColumns>()
+    yielder = seq.toYielder(0, new YieldingAccumulator<>()
     {
       @Override
       public Integer accumulate(Integer accumulated, RowsAndColumns in)
diff --git a/processing/src/test/java/org/apache/druid/query/rowsandcols/RearrangedRowsAndColumnsTest.java b/processing/src/test/java/org/apache/druid/query/rowsandcols/RearrangedRowsAndColumnsTest.java
index cb75c656775d..35e95ed551ca 100644
--- a/processing/src/test/java/org/apache/druid/query/rowsandcols/RearrangedRowsAndColumnsTest.java
+++ b/processing/src/test/java/org/apache/druid/query/rowsandcols/RearrangedRowsAndColumnsTest.java
@@ -64,7 +64,7 @@ public RearrangedRowsAndColumnsTest()
   @SuppressWarnings("UnusedCollectionModifiedInPlace")
   private static void shuffleArray(int[] pointers)
   {
-    Collections.shuffle(new AbstractList<Object>()
+    Collections.shuffle(new AbstractList<>()
     {
       @Override
       public Object get(int index)
diff --git a/processing/src/test/java/org/apache/druid/query/scan/ScanQueryResultOrderingTest.java b/processing/src/test/java/org/apache/druid/query/scan/ScanQueryResultOrderingTest.java
index 776f89cc8b5b..9c507cdcc8dc 100644
--- a/processing/src/test/java/org/apache/druid/query/scan/ScanQueryResultOrderingTest.java
+++ b/processing/src/test/java/org/apache/druid/query/scan/ScanQueryResultOrderingTest.java
@@ -323,7 +323,7 @@ private void assertResultsEquals(final ScanQuery query, final List<Integer> expe
                      .map(
                          runners ->
                              queryRunnerFactory.getToolchest().mergeResults(
-                                 new QueryRunner<ScanResultValue>()
+                                 new QueryRunner<>()
                                  {
                                    @Override
                                    public Sequence<ScanResultValue> run(
diff --git a/processing/src/test/java/org/apache/druid/query/scan/ScanQueryRunnerTest.java b/processing/src/test/java/org/apache/druid/query/scan/ScanQueryRunnerTest.java
index 7d88d5decfa6..365fdbb465d1 100644
--- a/processing/src/test/java/org/apache/druid/query/scan/ScanQueryRunnerTest.java
+++ b/processing/src/test/java/org/apache/druid/query/scan/ScanQueryRunnerTest.java
@@ -103,7 +103,7 @@ private static List<String> readLinesFromSample(
     List<String> lines = new ArrayList<>();
     try {
       sampleData.readLines(
-          new LineProcessor<Object>()
+          new LineProcessor<>()
           {
             int count = 0;
 
@@ -1155,7 +1155,7 @@ private static Iterable<ScanResultValue> populateNullColumnAtLastForQueryableInd
 
   private Iterable<ScanResultValue> compactedListToRow(Iterable<ScanResultValue> results)
   {
-    return Lists.newArrayList(Iterables.transform(results, new Function<ScanResultValue, ScanResultValue>()
+    return Lists.newArrayList(Iterables.transform(results, new Function<>()
     {
       @Override
       public ScanResultValue apply(ScanResultValue input)
diff --git a/processing/src/test/java/org/apache/druid/query/search/SearchBinaryFnTest.java b/processing/src/test/java/org/apache/druid/query/search/SearchBinaryFnTest.java
index a48fc66506e2..2aa2588406e2 100644
--- a/processing/src/test/java/org/apache/druid/query/search/SearchBinaryFnTest.java
+++ b/processing/src/test/java/org/apache/druid/query/search/SearchBinaryFnTest.java
@@ -57,7 +57,7 @@ private void assertSearchMergeResult(SearchResultValue o1, SearchResultValue o2)
   @Test
   public void testMerge()
   {
-    Result<SearchResultValue> r1 = new Result<SearchResultValue>(
+    Result<SearchResultValue> r1 = new Result<>(
         currTime,
         new SearchResultValue(
             ImmutableList.of(
@@ -69,7 +69,7 @@ public void testMerge()
         )
     );
 
-    Result<SearchResultValue> r2 = new Result<SearchResultValue>(
+    Result<SearchResultValue> r2 = new Result<>(
         currTime,
         new SearchResultValue(
             ImmutableList.of(
@@ -81,7 +81,7 @@ public void testMerge()
         )
     );
 
-    Result<SearchResultValue> expected = new Result<SearchResultValue>(
+    Result<SearchResultValue> expected = new Result<>(
         currTime,
         new SearchResultValue(
             ImmutableList.of(
@@ -105,7 +105,7 @@ public void testMerge()
   @Test
   public void testMergeDay()
   {
-    Result<SearchResultValue> r1 = new Result<SearchResultValue>(
+    Result<SearchResultValue> r1 = new Result<>(
         currTime,
         new SearchResultValue(
             ImmutableList.of(
@@ -117,7 +117,7 @@ public void testMergeDay()
         )
     );
 
-    Result<SearchResultValue> r2 = new Result<SearchResultValue>(
+    Result<SearchResultValue> r2 = new Result<>(
         currTime,
         new SearchResultValue(
             ImmutableList.of(
@@ -129,7 +129,7 @@ public void testMergeDay()
         )
     );
 
-    Result<SearchResultValue> expected = new Result<SearchResultValue>(
+    Result<SearchResultValue> expected = new Result<>(
         Granularities.DAY.bucketStart(currTime),
         new SearchResultValue(
             ImmutableList.of(
@@ -153,7 +153,7 @@ public void testMergeDay()
   @Test
   public void testMergeOneResultNull()
   {
-    Result<SearchResultValue> r1 = new Result<SearchResultValue>(
+    Result<SearchResultValue> r1 = new Result<>(
         currTime,
         new SearchResultValue(
             ImmutableList.of(
@@ -177,7 +177,7 @@ public void testMergeOneResultNull()
   @Test
   public void testMergeShiftedTimestamp()
   {
-    Result<SearchResultValue> r1 = new Result<SearchResultValue>(
+    Result<SearchResultValue> r1 = new Result<>(
         currTime,
         new SearchResultValue(
             ImmutableList.of(
@@ -189,7 +189,7 @@ public void testMergeShiftedTimestamp()
         )
     );
 
-    Result<SearchResultValue> r2 = new Result<SearchResultValue>(
+    Result<SearchResultValue> r2 = new Result<>(
         currTime.plusHours(2),
         new SearchResultValue(
             ImmutableList.of(
@@ -201,7 +201,7 @@ public void testMergeShiftedTimestamp()
         )
     );
 
-    Result<SearchResultValue> expected = new Result<SearchResultValue>(
+    Result<SearchResultValue> expected = new Result<>(
         currTime,
         new SearchResultValue(
             ImmutableList.of(
@@ -228,17 +228,17 @@ public void testStrlenMerge()
     SearchSortSpec searchSortSpec = new SearchSortSpec(StringComparators.STRLEN);
     Comparator<SearchHit> c = searchSortSpec.getComparator();
 
-    Result<SearchResultValue> r1 = new Result<SearchResultValue>(
+    Result<SearchResultValue> r1 = new Result<>(
         currTime,
         new SearchResultValue(toHits(c, "blah:thisislong"))
     );
 
-    Result<SearchResultValue> r2 = new Result<SearchResultValue>(
+    Result<SearchResultValue> r2 = new Result<>(
         currTime,
         new SearchResultValue(toHits(c, "blah:short"))
     );
 
-    Result<SearchResultValue> expected = new Result<SearchResultValue>(
+    Result<SearchResultValue> expected = new Result<>(
         currTime,
         new SearchResultValue(toHits(c, "blah:short", "blah:thisislong"))
     );
@@ -254,17 +254,17 @@ public void testStrlenMerge2()
     SearchSortSpec searchSortSpec = new SearchSortSpec(StringComparators.STRLEN);
     Comparator<SearchHit> c = searchSortSpec.getComparator();
 
-    Result<SearchResultValue> r1 = new Result<SearchResultValue>(
+    Result<SearchResultValue> r1 = new Result<>(
         currTime,
         new SearchResultValue(toHits(c, "blah:short", "blah:thisislong", "blah2:thisislong"))
     );
 
-    Result<SearchResultValue> r2 = new Result<SearchResultValue>(
+    Result<SearchResultValue> r2 = new Result<>(
         currTime,
         new SearchResultValue(toHits(c, "blah:short", "blah2:thisislong"))
     );
 
-    Result<SearchResultValue> expected = new Result<SearchResultValue>(
+    Result<SearchResultValue> expected = new Result<>(
         currTime,
         new SearchResultValue(toHits(c, "blah:short", "blah:thisislong", "blah2:thisislong"))
     );
@@ -280,17 +280,17 @@ public void testAlphanumericMerge()
     SearchSortSpec searchSortSpec = new SearchSortSpec(StringComparators.ALPHANUMERIC);
     Comparator<SearchHit> c = searchSortSpec.getComparator();
 
-    Result<SearchResultValue> r1 = new Result<SearchResultValue>(
+    Result<SearchResultValue> r1 = new Result<>(
         currTime,
         new SearchResultValue(toHits(c, "blah:a100", "blah:a9", "alah:a100"))
     );
 
-    Result<SearchResultValue> r2 = new Result<SearchResultValue>(
+    Result<SearchResultValue> r2 = new Result<>(
         currTime,
         new SearchResultValue(toHits(c, "blah:b0", "alah:c3"))
     );
 
-    Result<SearchResultValue> expected = new Result<SearchResultValue>(
+    Result<SearchResultValue> expected = new Result<>(
         currTime,
         new SearchResultValue(toHits(c, "blah:a9", "alah:a100", "blah:a100", "blah:b0", "alah:c3"))
     );
@@ -319,7 +319,7 @@ private List<SearchHit> toHits(Comparator<SearchHit> comparator, String... hits)
   @Test
   public void testMergeUniqueResults()
   {
-    Result<SearchResultValue> r1 = new Result<SearchResultValue>(
+    Result<SearchResultValue> r1 = new Result<>(
         currTime,
         new SearchResultValue(
             ImmutableList.of(
@@ -343,7 +343,7 @@ public void testMergeUniqueResults()
   @Test
   public void testMergeLimit()
   {
-    Result<SearchResultValue> r1 = new Result<SearchResultValue>(
+    Result<SearchResultValue> r1 = new Result<>(
         currTime,
         new SearchResultValue(
             ImmutableList.of(
@@ -355,7 +355,7 @@ public void testMergeLimit()
         )
     );
 
-    Result<SearchResultValue> r2 = new Result<SearchResultValue>(
+    Result<SearchResultValue> r2 = new Result<>(
         currTime,
         new SearchResultValue(
             ImmutableList.of(
@@ -375,7 +375,7 @@ public void testMergeLimit()
   @Test
   public void testMergeCountWithNull()
   {
-    Result<SearchResultValue> r1 = new Result<SearchResultValue>(
+    Result<SearchResultValue> r1 = new Result<>(
             currTime,
             new SearchResultValue(
                     ImmutableList.of(
@@ -387,7 +387,7 @@ public void testMergeCountWithNull()
             )
     );
 
-    Result<SearchResultValue> r2 = new Result<SearchResultValue>(
+    Result<SearchResultValue> r2 = new Result<>(
             currTime,
             new SearchResultValue(
                     ImmutableList.of(
diff --git a/processing/src/test/java/org/apache/druid/query/search/SearchQueryRunnerTest.java b/processing/src/test/java/org/apache/druid/query/search/SearchQueryRunnerTest.java
index 8e6156dbe761..b38283662c02 100644
--- a/processing/src/test/java/org/apache/druid/query/search/SearchQueryRunnerTest.java
+++ b/processing/src/test/java/org/apache/druid/query/search/SearchQueryRunnerTest.java
@@ -166,7 +166,7 @@ public void testSearchWithCardinality()
 
     // double the value
     QueryRunner mergedRunner = TOOL_CHEST.mergeResults(
-        new QueryRunner<Result<SearchResultValue>>()
+        new QueryRunner<>()
         {
           @Override
           public Sequence<Result<SearchResultValue>> run(
diff --git a/processing/src/test/java/org/apache/druid/query/timeseries/TimeseriesBinaryFnTest.java b/processing/src/test/java/org/apache/druid/query/timeseries/TimeseriesBinaryFnTest.java
index 3442b11509a6..0cd3df176bbb 100644
--- a/processing/src/test/java/org/apache/druid/query/timeseries/TimeseriesBinaryFnTest.java
+++ b/processing/src/test/java/org/apache/druid/query/timeseries/TimeseriesBinaryFnTest.java
@@ -48,7 +48,7 @@ public class TimeseriesBinaryFnTest
   @Test
   public void testMerge()
   {
-    Result<TimeseriesResultValue> result1 = new Result<TimeseriesResultValue>(
+    Result<TimeseriesResultValue> result1 = new Result<>(
         currTime,
         new TimeseriesResultValue(
             ImmutableMap.of(
@@ -57,7 +57,7 @@ public void testMerge()
             )
         )
     );
-    Result<TimeseriesResultValue> result2 = new Result<TimeseriesResultValue>(
+    Result<TimeseriesResultValue> result2 = new Result<>(
         currTime,
         new TimeseriesResultValue(
             ImmutableMap.of(
@@ -67,7 +67,7 @@ public void testMerge()
         )
     );
 
-    Result<TimeseriesResultValue> expected = new Result<TimeseriesResultValue>(
+    Result<TimeseriesResultValue> expected = new Result<>(
         currTime,
         new TimeseriesResultValue(
             ImmutableMap.of(
@@ -90,7 +90,7 @@ public void testMerge()
   @Test
   public void testMergeDay()
   {
-    Result<TimeseriesResultValue> result1 = new Result<TimeseriesResultValue>(
+    Result<TimeseriesResultValue> result1 = new Result<>(
         currTime,
         new TimeseriesResultValue(
             ImmutableMap.of(
@@ -99,7 +99,7 @@ public void testMergeDay()
             )
         )
     );
-    Result<TimeseriesResultValue> result2 = new Result<TimeseriesResultValue>(
+    Result<TimeseriesResultValue> result2 = new Result<>(
         currTime,
         new TimeseriesResultValue(
             ImmutableMap.of(
@@ -109,7 +109,7 @@ public void testMergeDay()
         )
     );
 
-    Result<TimeseriesResultValue> expected = new Result<TimeseriesResultValue>(
+    Result<TimeseriesResultValue> expected = new Result<>(
         Granularities.DAY.bucketStart(currTime),
         new TimeseriesResultValue(
             ImmutableMap.of(
@@ -132,7 +132,7 @@ public void testMergeDay()
   @Test
   public void testMergeOneNullResult()
   {
-    Result<TimeseriesResultValue> result1 = new Result<TimeseriesResultValue>(
+    Result<TimeseriesResultValue> result1 = new Result<>(
         currTime,
         new TimeseriesResultValue(
             ImmutableMap.of(
@@ -158,7 +158,7 @@ public void testMergeOneNullResult()
   @Test
   public void testMergeShiftedTimestamp()
   {
-    Result<TimeseriesResultValue> result1 = new Result<TimeseriesResultValue>(
+    Result<TimeseriesResultValue> result1 = new Result<>(
         currTime,
         new TimeseriesResultValue(
             ImmutableMap.of(
@@ -167,7 +167,7 @@ public void testMergeShiftedTimestamp()
             )
         )
     );
-    Result<TimeseriesResultValue> result2 = new Result<TimeseriesResultValue>(
+    Result<TimeseriesResultValue> result2 = new Result<>(
         currTime.plusHours(2),
         new TimeseriesResultValue(
             ImmutableMap.of(
@@ -177,7 +177,7 @@ public void testMergeShiftedTimestamp()
         )
     );
 
-    Result<TimeseriesResultValue> expected = new Result<TimeseriesResultValue>(
+    Result<TimeseriesResultValue> expected = new Result<>(
         currTime,
         new TimeseriesResultValue(
             ImmutableMap.of(
diff --git a/processing/src/test/java/org/apache/druid/query/timeseries/TimeseriesQueryRunnerTest.java b/processing/src/test/java/org/apache/druid/query/timeseries/TimeseriesQueryRunnerTest.java
index 9c89d6308525..a2a85b2fc6f8 100644
--- a/processing/src/test/java/org/apache/druid/query/timeseries/TimeseriesQueryRunnerTest.java
+++ b/processing/src/test/java/org/apache/druid/query/timeseries/TimeseriesQueryRunnerTest.java
@@ -223,7 +223,7 @@ public void testFullOnTimeseries()
 
     StubServiceEmitter stubServiceEmitter = new StubServiceEmitter("", "");
     MetricsEmittingQueryRunner<Result<TimeseriesResultValue>> metricsEmittingQueryRunner =
-        new MetricsEmittingQueryRunner<Result<TimeseriesResultValue>>(
+        new MetricsEmittingQueryRunner<>(
             stubServiceEmitter,
             new TimeseriesQueryQueryToolChest(),
             runner,
diff --git a/processing/src/test/java/org/apache/druid/query/topn/TopNBinaryFnTest.java b/processing/src/test/java/org/apache/druid/query/topn/TopNBinaryFnTest.java
index c834b24b2c80..b024b681189b 100644
--- a/processing/src/test/java/org/apache/druid/query/topn/TopNBinaryFnTest.java
+++ b/processing/src/test/java/org/apache/druid/query/topn/TopNBinaryFnTest.java
@@ -81,7 +81,7 @@ private void assertTopNMergeResult(Object o1, Object o2)
   @Test
   public void testMerge()
   {
-    Result<TopNResultValue> result1 = new Result<TopNResultValue>(
+    Result<TopNResultValue> result1 = new Result<>(
         currTime,
         TopNResultValue.create(
             ImmutableList.<Map<String, Object>>of(
@@ -103,7 +103,7 @@ public void testMerge()
             )
         )
     );
-    Result<TopNResultValue> result2 = new Result<TopNResultValue>(
+    Result<TopNResultValue> result2 = new Result<>(
         currTime,
         TopNResultValue.create(
             ImmutableList.<Map<String, Object>>of(
@@ -126,7 +126,7 @@ public void testMerge()
         )
     );
 
-    Result<TopNResultValue> expected = new Result<TopNResultValue>(
+    Result<TopNResultValue> expected = new Result<>(
         currTime,
         TopNResultValue.create(
             ImmutableList.<Map<String, Object>>of(
@@ -163,7 +163,7 @@ public void testMerge()
   @Test
   public void testMergeDay()
   {
-    Result<TopNResultValue> result1 = new Result<TopNResultValue>(
+    Result<TopNResultValue> result1 = new Result<>(
         currTime,
         TopNResultValue.create(
             ImmutableList.<Map<String, Object>>of(
@@ -185,7 +185,7 @@ public void testMergeDay()
             )
         )
     );
-    Result<TopNResultValue> result2 = new Result<TopNResultValue>(
+    Result<TopNResultValue> result2 = new Result<>(
         currTime,
         TopNResultValue.create(
             ImmutableList.<Map<String, Object>>of(
@@ -208,7 +208,7 @@ public void testMergeDay()
         )
     );
 
-    Result<TopNResultValue> expected = new Result<TopNResultValue>(
+    Result<TopNResultValue> expected = new Result<>(
         Granularities.DAY.bucketStart(currTime),
         TopNResultValue.create(
             ImmutableList.<Map<String, Object>>of(
@@ -244,7 +244,7 @@ public void testMergeDay()
   @Test
   public void testMergeOneResultNull()
   {
-    Result<TopNResultValue> result1 = new Result<TopNResultValue>(
+    Result<TopNResultValue> result1 = new Result<>(
         currTime,
         TopNResultValue.create(
             ImmutableList.<Map<String, Object>>of(
@@ -288,7 +288,7 @@ public void testMergeOneResultNull()
   @Test
   public void testMergeByPostAgg()
   {
-    Result<TopNResultValue> result1 = new Result<TopNResultValue>(
+    Result<TopNResultValue> result1 = new Result<>(
         currTime,
         TopNResultValue.create(
             ImmutableList.<Map<String, Object>>of(
@@ -313,7 +313,7 @@ public void testMergeByPostAgg()
             )
         )
     );
-    Result<TopNResultValue> result2 = new Result<TopNResultValue>(
+    Result<TopNResultValue> result2 = new Result<>(
         currTime,
         TopNResultValue.create(
             ImmutableList.<Map<String, Object>>of(
@@ -339,7 +339,7 @@ public void testMergeByPostAgg()
         )
     );
 
-    Result<TopNResultValue> expected = new Result<TopNResultValue>(
+    Result<TopNResultValue> expected = new Result<>(
         currTime,
         TopNResultValue.create(
             ImmutableList.<Map<String, Object>>of(
@@ -383,7 +383,7 @@ public void testMergeByPostAgg()
   @Test
   public void testMergeShiftedTimestamp()
   {
-    Result<TopNResultValue> result1 = new Result<TopNResultValue>(
+    Result<TopNResultValue> result1 = new Result<>(
         currTime,
         TopNResultValue.create(
             ImmutableList.<Map<String, Object>>of(
@@ -405,7 +405,7 @@ public void testMergeShiftedTimestamp()
             )
         )
     );
-    Result<TopNResultValue> result2 = new Result<TopNResultValue>(
+    Result<TopNResultValue> result2 = new Result<>(
         currTime.plusHours(2),
         TopNResultValue.create(
             ImmutableList.<Map<String, Object>>of(
@@ -428,7 +428,7 @@ public void testMergeShiftedTimestamp()
         )
     );
 
-    Result<TopNResultValue> expected = new Result<TopNResultValue>(
+    Result<TopNResultValue> expected = new Result<>(
         currTime,
         TopNResultValue.create(
             ImmutableList.<Map<String, Object>>of(
@@ -464,7 +464,7 @@ public void testMergeShiftedTimestamp()
   @Test
   public void testMergeLexicographicWithInvalidDimName()
   {
-    Result<TopNResultValue> result1 = new Result<TopNResultValue>(
+    Result<TopNResultValue> result1 = new Result<>(
         currTime,
         TopNResultValue.create(
             ImmutableList.<Map<String, Object>>of(
@@ -476,7 +476,7 @@ public void testMergeLexicographicWithInvalidDimName()
             )
         )
     );
-    Result<TopNResultValue> result2 = new Result<TopNResultValue>(
+    Result<TopNResultValue> result2 = new Result<>(
         currTime,
         TopNResultValue.create(
             ImmutableList.<Map<String, Object>>of(
@@ -494,7 +494,7 @@ public void testMergeLexicographicWithInvalidDimName()
     resultMap.put("rows", 3L);
     resultMap.put("index", 5L);
 
-    Result<TopNResultValue> expected = new Result<TopNResultValue>(
+    Result<TopNResultValue> expected = new Result<>(
         currTime,
         TopNResultValue.create(
             ImmutableList.of(
diff --git a/processing/src/test/java/org/apache/druid/query/topn/TopNQueryRunnerBenchmark.java b/processing/src/test/java/org/apache/druid/query/topn/TopNQueryRunnerBenchmark.java
index cf8a3eb6e2e7..07431ffc077a 100644
--- a/processing/src/test/java/org/apache/druid/query/topn/TopNQueryRunnerBenchmark.java
+++ b/processing/src/test/java/org/apache/druid/query/topn/TopNQueryRunnerBenchmark.java
@@ -83,9 +83,9 @@ public enum TestCases
   public static void setUp()
   {
     QueryRunnerFactory factory = new TopNQueryRunnerFactory(
-        new StupidPool<ByteBuffer>(
+        new StupidPool<>(
             "TopNQueryRunnerFactory-directBufferPool",
-            new Supplier<ByteBuffer>()
+            new Supplier<>()
             {
               @Override
               public ByteBuffer get()
diff --git a/processing/src/test/java/org/apache/druid/query/topn/TopNQueryRunnerTest.java b/processing/src/test/java/org/apache/druid/query/topn/TopNQueryRunnerTest.java
index 285ccf31a60e..42d8a72a0a03 100644
--- a/processing/src/test/java/org/apache/druid/query/topn/TopNQueryRunnerTest.java
+++ b/processing/src/test/java/org/apache/druid/query/topn/TopNQueryRunnerTest.java
@@ -1172,7 +1172,7 @@ public void testTopNOverFirstLastFloatAggregatorUsingFloatColumn()
   public void testTopNBySegment()
   {
 
-    final HashMap<String, Object> specialContext = new HashMap<String, Object>();
+    final HashMap<String, Object> specialContext = new HashMap<>();
     specialContext.put(QueryContexts.BY_SEGMENT_KEY, "true");
     TopNQuery query = new TopNQueryBuilder()
         .dataSource(QueryRunnerTestHelper.DATA_SOURCE)
diff --git a/processing/src/test/java/org/apache/druid/query/topn/TopNQueryRunnerTestHelper.java b/processing/src/test/java/org/apache/druid/query/topn/TopNQueryRunnerTestHelper.java
index fb783c74432e..2017fc0d5656 100644
--- a/processing/src/test/java/org/apache/druid/query/topn/TopNQueryRunnerTestHelper.java
+++ b/processing/src/test/java/org/apache/druid/query/topn/TopNQueryRunnerTestHelper.java
@@ -43,6 +43,6 @@ public static Result<TopNResultValue> createExpectedRows(String date, String[] c
       }
       expected.add(theVals);
     }
-    return new Result<TopNResultValue>(DateTimes.of(date), TopNResultValue.create(expected));
+    return new Result<>(DateTimes.of(date), TopNResultValue.create(expected));
   }
 }
diff --git a/processing/src/test/java/org/apache/druid/query/union/UnionQueryQueryToolChestTest.java b/processing/src/test/java/org/apache/druid/query/union/UnionQueryQueryToolChestTest.java
index fbb8a9d358de..295b34b4b2b0 100644
--- a/processing/src/test/java/org/apache/druid/query/union/UnionQueryQueryToolChestTest.java
+++ b/processing/src/test/java/org/apache/druid/query/union/UnionQueryQueryToolChestTest.java
@@ -112,7 +112,7 @@ public void testResultArraySignatureWithTimestampResultField()
   static class TestScanQuery
   {
     final ScanQuery query;
-    final List<Object[]> results = new ArrayList<Object[]>();
+    final List<Object[]> results = new ArrayList<>();
 
     public TestScanQuery(String sourceName, RowSignature signature)
     {
@@ -143,7 +143,7 @@ public Sequence<ScanResultValue> makeResultSequence()
 
     private List<List<Object>> convertResultsToListOfLists()
     {
-      List<List<Object>> resultsRows = new ArrayList<List<Object>>();
+      List<List<Object>> resultsRows = new ArrayList<>();
       for (Object[] objects : results) {
         resultsRows.add(Arrays.asList(objects));
       }
diff --git a/processing/src/test/java/org/apache/druid/segment/CursorFactoryProjectionTest.java b/processing/src/test/java/org/apache/druid/segment/CursorFactoryProjectionTest.java
index b2236a1fabdd..7ddf086eb5a0 100644
--- a/processing/src/test/java/org/apache/druid/segment/CursorFactoryProjectionTest.java
+++ b/processing/src/test/java/org/apache/druid/segment/CursorFactoryProjectionTest.java
@@ -1238,7 +1238,7 @@ private static IndexBuilder makeBuilder(DimensionsSpec dimensionsSpec, boolean a
   private static Set<Object[]> makeArrayResultSet()
   {
     Set<Object[]> resultsInNoParticularOrder = new ObjectOpenCustomHashSet<>(
-        new Hash.Strategy<Object[]>()
+        new Hash.Strategy<>()
         {
           @Override
           public int hashCode(Object[] o)
diff --git a/processing/src/test/java/org/apache/druid/segment/DictionaryMergingIteratorTest.java b/processing/src/test/java/org/apache/druid/segment/DictionaryMergingIteratorTest.java
index e8a8a9ba7127..a97fe8c998eb 100644
--- a/processing/src/test/java/org/apache/druid/segment/DictionaryMergingIteratorTest.java
+++ b/processing/src/test/java/org/apache/druid/segment/DictionaryMergingIteratorTest.java
@@ -38,11 +38,11 @@ public void basicTest()
     String[] s3 = {"a", "d", "f"};        // 0 3 5
     String[] s4 = {"a", "b", "c"};
     String[] s5 = {"a", "b", "c", "d", "e", "f"};
-    Indexed<String> i1 = new ListIndexed<String>(s1);
-    Indexed<String> i2 = new ListIndexed<String>(s2);
-    Indexed<String> i3 = new ListIndexed<String>(s3);
-    Indexed<String> i4 = new ListIndexed<String>(s4);
-    Indexed<String> i5 = new ListIndexed<String>(s5);
+    Indexed<String> i1 = new ListIndexed<>(s1);
+    Indexed<String> i2 = new ListIndexed<>(s2);
+    Indexed<String> i3 = new ListIndexed<>(s3);
+    Indexed<String> i4 = new ListIndexed<>(s4);
+    Indexed<String> i5 = new ListIndexed<>(s5);
 
     DictionaryMergingIterator<String> iterator = new DictionaryMergingIterator<>(
         new Indexed[]{i1, i2, i3, i4, i5},
diff --git a/processing/src/test/java/org/apache/druid/segment/IndexIOTest.java b/processing/src/test/java/org/apache/druid/segment/IndexIOTest.java
index 03fac9ebcfdc..e755df26822a 100644
--- a/processing/src/test/java/org/apache/druid/segment/IndexIOTest.java
+++ b/processing/src/test/java/org/apache/druid/segment/IndexIOTest.java
@@ -120,7 +120,7 @@ public static Iterable<Object[]> constructionFeeder()
               @Override
               public Iterator<Iterable<Object[]>> iterator()
               {
-                return new Iterator<Iterable<Object[]>>()
+                return new Iterator<>()
                 {
                   long nextBitset = 1L;
 
@@ -136,7 +136,7 @@ public Iterable<Object[]> next()
                     final BitSet bitset = BitSet.valueOf(new long[]{nextBitset++});
                     final List<Map<String, Object>> myMaps = filterByBitset(maps, bitset);
                     return Collections2.transform(
-                        Collections2.permutations(myMaps), new Function<List<Map<String, Object>>, Object[]>()
+                        Collections2.permutations(myMaps), new Function<>()
                         {
                           @Nullable
                           @Override
@@ -164,7 +164,7 @@ public void remove()
               @Override
               public Iterator<Iterable<Object[]>> iterator()
               {
-                return new Iterator<Iterable<Object[]>>()
+                return new Iterator<>()
                 {
                   long nextMap1Bits = 1L;
 
@@ -179,12 +179,12 @@ public Iterable<Object[]> next()
                   {
                     final BitSet bitset1 = BitSet.valueOf(new long[]{nextMap1Bits++});
                     final List<Map<String, Object>> maplist1 = filterByBitset(maps, bitset1);
-                    return new Iterable<Object[]>()
+                    return new Iterable<>()
                     {
                       @Override
                       public Iterator<Object[]> iterator()
                       {
-                        return new Iterator<Object[]>()
+                        return new Iterator<>()
                         {
                           long nextMap2Bits = 1L;
 
diff --git a/processing/src/test/java/org/apache/druid/segment/RowBasedCursorFactoryTest.java b/processing/src/test/java/org/apache/druid/segment/RowBasedCursorFactoryTest.java
index aab86309eaa5..9c5e79ae95e5 100644
--- a/processing/src/test/java/org/apache/druid/segment/RowBasedCursorFactoryTest.java
+++ b/processing/src/test/java/org/apache/druid/segment/RowBasedCursorFactoryTest.java
@@ -180,7 +180,7 @@ public static void setUpClass()
    * other columns return null.
    */
   private static final RowAdapter<Integer> ROW_ADAPTER =
-      new RowAdapter<Integer>()
+      new RowAdapter<>()
       {
         @Override
         public ToLongFunction<Integer> timestampFunction()
@@ -209,9 +209,10 @@ public Function<Integer, Object> columnFunction(String columnName)
       };
 
   private static final RowAdapter<Integer> SAME_TIME_ROW_ADAPTER =
-      new RowAdapter<Integer>()
+      new RowAdapter<>()
       {
         private DateTime startTime = DateTimes.nowUtc();
+
         @Override
         public ToLongFunction<Integer> timestampFunction()
         {
diff --git a/processing/src/test/java/org/apache/druid/segment/SchemalessIndexTest.java b/processing/src/test/java/org/apache/druid/segment/SchemalessIndexTest.java
index 220baec27b77..b7810d8a1b17 100644
--- a/processing/src/test/java/org/apache/druid/segment/SchemalessIndexTest.java
+++ b/processing/src/test/java/org/apache/druid/segment/SchemalessIndexTest.java
@@ -310,8 +310,8 @@ public QueryableIndex getMergedIncrementalIndexDiffMetrics()
   {
     return getMergedIncrementalIndex(
         Arrays.asList(
-            new Pair<String, AggregatorFactory[]>("druid.sample.json.top", METRIC_AGGS_NO_UNIQ),
-            new Pair<String, AggregatorFactory[]>("druid.sample.json.bottom", METRIC_AGGS)
+            new Pair<>("druid.sample.json.top", METRIC_AGGS_NO_UNIQ),
+            new Pair<>("druid.sample.json.bottom", METRIC_AGGS)
         )
     );
   }
@@ -463,7 +463,7 @@ private QueryableIndex makeMergedMMappedIndex(Iterable<Pair<String, AggregatorFa
               Lists.newArrayList(
                   Iterables.transform(
                       filesToMap,
-                      new Function<File, QueryableIndex>()
+                      new Function<>()
                       {
                         @Override
                         public QueryableIndex apply(@Nullable File input)
diff --git a/processing/src/test/java/org/apache/druid/segment/SchemalessTestSimpleTest.java b/processing/src/test/java/org/apache/druid/segment/SchemalessTestSimpleTest.java
index 23498cf6d3ba..063e8cc0c2d7 100644
--- a/processing/src/test/java/org/apache/druid/segment/SchemalessTestSimpleTest.java
+++ b/processing/src/test/java/org/apache/druid/segment/SchemalessTestSimpleTest.java
@@ -253,7 +253,7 @@ public void testFullOnSearch()
                               .build();
 
     List<Result<SearchResultValue>> expectedResults = Collections.singletonList(
-        new Result<SearchResultValue>(
+        new Result<>(
             DateTimes.of("2011-01-12T00:00:00.000Z"),
             new SearchResultValue(
                 Arrays.asList(
@@ -278,7 +278,7 @@ public void testTimeBoundary()
                                     .build();
 
     List<Result<TimeBoundaryResultValue>> expectedResults = Collections.singletonList(
-        new Result<TimeBoundaryResultValue>(
+        new Result<>(
             DateTimes.of("2011-01-12T00:00:00.000Z"),
             new TimeBoundaryResultValue(
                 ImmutableMap.of(
diff --git a/processing/src/test/java/org/apache/druid/segment/TestIndex.java b/processing/src/test/java/org/apache/druid/segment/TestIndex.java
index b4cd022e442c..83f1ec476495 100644
--- a/processing/src/test/java/org/apache/druid/segment/TestIndex.java
+++ b/processing/src/test/java/org/apache/druid/segment/TestIndex.java
@@ -567,7 +567,7 @@ public static IncrementalIndex loadIncrementalIndexFromCharSource(
     final IncrementalIndex retVal = indexSupplier.get();
     final AtomicLong startTime = new AtomicLong();
     int lineCount = source.readLines(
-        new LineProcessor<Integer>()
+        new LineProcessor<>()
         {
           boolean runOnce = false;
           int lineCount = 0;
diff --git a/processing/src/test/java/org/apache/druid/segment/UnnestCursorFactoryTest.java b/processing/src/test/java/org/apache/druid/segment/UnnestCursorFactoryTest.java
index d736b5622730..ef26393a7734 100644
--- a/processing/src/test/java/org/apache/druid/segment/UnnestCursorFactoryTest.java
+++ b/processing/src/test/java/org/apache/druid/segment/UnnestCursorFactoryTest.java
@@ -298,7 +298,7 @@ public void test_unnest_factory_basic_row_based_array_column()
                     new Object[]{3L, new Object[]{8L, 9L, 10L}}
                 )
             ),
-            new RowAdapter<Object[]>()
+            new RowAdapter<>()
             {
               @Override
               public ToLongFunction<Object[]> timestampFunction()
diff --git a/processing/src/test/java/org/apache/druid/segment/data/CompressedColumnarIntsSupplierTest.java b/processing/src/test/java/org/apache/druid/segment/data/CompressedColumnarIntsSupplierTest.java
index 945f86eb8ef1..214da00365bc 100644
--- a/processing/src/test/java/org/apache/druid/segment/data/CompressedColumnarIntsSupplierTest.java
+++ b/processing/src/test/java/org/apache/druid/segment/data/CompressedColumnarIntsSupplierTest.java
@@ -183,7 +183,7 @@ public void testConcurrentThreadReads() throws Exception
   {
     setupSimple(5);
 
-    final AtomicReference<String> reason = new AtomicReference<String>("none");
+    final AtomicReference<String> reason = new AtomicReference<>("none");
 
     final int numRuns = 1000;
     final CountDownLatch startLatch = new CountDownLatch(1);
diff --git a/processing/src/test/java/org/apache/druid/segment/data/CompressedDoublesSerdeTest.java b/processing/src/test/java/org/apache/druid/segment/data/CompressedDoublesSerdeTest.java
index 613809b836fb..e4f416c31ee4 100644
--- a/processing/src/test/java/org/apache/druid/segment/data/CompressedDoublesSerdeTest.java
+++ b/processing/src/test/java/org/apache/druid/segment/data/CompressedDoublesSerdeTest.java
@@ -234,7 +234,7 @@ private void testConcurrentThreadReads(
       final double[] vals
   ) throws Exception
   {
-    final AtomicReference<String> reason = new AtomicReference<String>("none");
+    final AtomicReference<String> reason = new AtomicReference<>("none");
 
     final int numRuns = 1000;
     final CountDownLatch startLatch = new CountDownLatch(1);
diff --git a/processing/src/test/java/org/apache/druid/segment/data/CompressedFloatsSerdeTest.java b/processing/src/test/java/org/apache/druid/segment/data/CompressedFloatsSerdeTest.java
index 02e320f46a47..1994e316de49 100644
--- a/processing/src/test/java/org/apache/druid/segment/data/CompressedFloatsSerdeTest.java
+++ b/processing/src/test/java/org/apache/druid/segment/data/CompressedFloatsSerdeTest.java
@@ -256,7 +256,7 @@ private void testConcurrentThreadReads(
       final ColumnarFloats indexed, final float[] vals
   ) throws Exception
   {
-    final AtomicReference<String> reason = new AtomicReference<String>("none");
+    final AtomicReference<String> reason = new AtomicReference<>("none");
 
     final int numRuns = 1000;
     final CountDownLatch startLatch = new CountDownLatch(1);
diff --git a/processing/src/test/java/org/apache/druid/segment/data/CompressedLongsSerdeTest.java b/processing/src/test/java/org/apache/druid/segment/data/CompressedLongsSerdeTest.java
index 00a7b339ddb1..dfc457fe8b9e 100644
--- a/processing/src/test/java/org/apache/druid/segment/data/CompressedLongsSerdeTest.java
+++ b/processing/src/test/java/org/apache/druid/segment/data/CompressedLongsSerdeTest.java
@@ -271,7 +271,7 @@ private void testConcurrentThreadReads(
       final ColumnarLongs indexed, final long[] vals
   ) throws Exception
   {
-    final AtomicReference<String> reason = new AtomicReference<String>("none");
+    final AtomicReference<String> reason = new AtomicReference<>("none");
 
     final int numRuns = 1000;
     final CountDownLatch startLatch = new CountDownLatch(1);
diff --git a/processing/src/test/java/org/apache/druid/segment/data/CompressedVSizeColumnarMultiIntsSupplierTestBase.java b/processing/src/test/java/org/apache/druid/segment/data/CompressedVSizeColumnarMultiIntsSupplierTestBase.java
index 9944c7216545..039cd0b57bbe 100644
--- a/processing/src/test/java/org/apache/druid/segment/data/CompressedVSizeColumnarMultiIntsSupplierTestBase.java
+++ b/processing/src/test/java/org/apache/druid/segment/data/CompressedVSizeColumnarMultiIntsSupplierTestBase.java
@@ -116,7 +116,7 @@ public static <T extends Closeable> WritableSupplier<T> wrapSupplier(
       Closer closer
   )
   {
-    return new WritableSupplier<T>()
+    return new WritableSupplier<>()
     {
       @Override
       public T get()
diff --git a/processing/src/test/java/org/apache/druid/segment/data/IncrementalIndexTest.java b/processing/src/test/java/org/apache/druid/segment/data/IncrementalIndexTest.java
index b29a571389ce..55bf31d8c176 100644
--- a/processing/src/test/java/org/apache/druid/segment/data/IncrementalIndexTest.java
+++ b/processing/src/test/java/org/apache/druid/segment/data/IncrementalIndexTest.java
@@ -192,7 +192,7 @@ public static void populateIndex(long timestamp, IncrementalIndex index) throws
 
   public static MapBasedInputRow getRow(long timestamp, int rowID, int dimensionCount)
   {
-    List<String> dimensionList = new ArrayList<String>(dimensionCount);
+    List<String> dimensionList = new ArrayList<>(dimensionCount);
     ImmutableMap.Builder<String, Object> builder = ImmutableMap.builder();
     for (int i = 0; i < dimensionCount; i++) {
       String dimName = StringUtils.format("Dim_%d", i);
@@ -204,7 +204,7 @@ public static MapBasedInputRow getRow(long timestamp, int rowID, int dimensionCo
 
   private static MapBasedInputRow getLongRow(long timestamp, int dimensionCount)
   {
-    List<String> dimensionList = new ArrayList<String>(dimensionCount);
+    List<String> dimensionList = new ArrayList<>(dimensionCount);
     ImmutableMap.Builder<String, Object> builder = ImmutableMap.builder();
     for (int i = 0; i < dimensionCount; i++) {
       String dimName = StringUtils.format("Dim_%d", i);
@@ -561,7 +561,7 @@ public void run()
 
                     Double[] results = sequence.accumulate(
                         new Double[0],
-                        new Accumulator<Double[], Result<TimeseriesResultValue>>()
+                        new Accumulator<>()
                         {
                           @Override
                           public Double[] accumulate(Double[] accumulated, Result<TimeseriesResultValue> in)
diff --git a/processing/src/test/java/org/apache/druid/segment/data/VSizeColumnarMultiIntsTest.java b/processing/src/test/java/org/apache/druid/segment/data/VSizeColumnarMultiIntsTest.java
index 74bcb42413cc..1ead006ac3c7 100644
--- a/processing/src/test/java/org/apache/druid/segment/data/VSizeColumnarMultiIntsTest.java
+++ b/processing/src/test/java/org/apache/druid/segment/data/VSizeColumnarMultiIntsTest.java
@@ -46,7 +46,7 @@ public void testSanity() throws Exception
     VSizeColumnarMultiInts indexed = VSizeColumnarMultiInts.fromIterable(
         Iterables.transform(
             someInts,
-            new Function<int[], VSizeColumnarInts>()
+            new Function<>()
             {
               @Override
               public VSizeColumnarInts apply(int[] input)
diff --git a/processing/src/test/java/org/apache/druid/segment/filter/SpatialFilterBonusTest.java b/processing/src/test/java/org/apache/druid/segment/filter/SpatialFilterBonusTest.java
index cbe2dd39e11f..15cd257d0253 100644
--- a/processing/src/test/java/org/apache/druid/segment/filter/SpatialFilterBonusTest.java
+++ b/processing/src/test/java/org/apache/druid/segment/filter/SpatialFilterBonusTest.java
@@ -490,7 +490,7 @@ public void testSpatialQuery()
                                   .build();
 
     List<Result<TimeseriesResultValue>> expectedResults = Collections.singletonList(
-        new Result<TimeseriesResultValue>(
+        new Result<>(
             DateTimes.of("2013-01-01T00:00:00.000Z"),
             new TimeseriesResultValue(
                 ImmutableMap.<String, Object>builder()
@@ -540,7 +540,7 @@ public void testSpatialQueryMorePoints()
                                   .build();
 
     List<Result<TimeseriesResultValue>> expectedResults = Arrays.asList(
-        new Result<TimeseriesResultValue>(
+        new Result<>(
             DateTimes.of("2013-01-01T00:00:00.000Z"),
             new TimeseriesResultValue(
                 ImmutableMap.<String, Object>builder()
@@ -549,7 +549,7 @@ public void testSpatialQueryMorePoints()
                     .build()
             )
         ),
-        new Result<TimeseriesResultValue>(
+        new Result<>(
             DateTimes.of("2013-01-02T00:00:00.000Z"),
             new TimeseriesResultValue(
                 ImmutableMap.<String, Object>builder()
@@ -558,7 +558,7 @@ public void testSpatialQueryMorePoints()
                     .build()
             )
         ),
-        new Result<TimeseriesResultValue>(
+        new Result<>(
             DateTimes.of("2013-01-03T00:00:00.000Z"),
             new TimeseriesResultValue(
                 ImmutableMap.<String, Object>builder()
@@ -567,7 +567,7 @@ public void testSpatialQueryMorePoints()
                     .build()
             )
         ),
-        new Result<TimeseriesResultValue>(
+        new Result<>(
             DateTimes.of("2013-01-04T00:00:00.000Z"),
             new TimeseriesResultValue(
                 ImmutableMap.<String, Object>builder()
@@ -576,7 +576,7 @@ public void testSpatialQueryMorePoints()
                     .build()
             )
         ),
-        new Result<TimeseriesResultValue>(
+        new Result<>(
             DateTimes.of("2013-01-05T00:00:00.000Z"),
             new TimeseriesResultValue(
                 ImmutableMap.<String, Object>builder()
diff --git a/processing/src/test/java/org/apache/druid/segment/filter/SpatialFilterTest.java b/processing/src/test/java/org/apache/druid/segment/filter/SpatialFilterTest.java
index 2d2b98035af3..4d7d2d26c98a 100644
--- a/processing/src/test/java/org/apache/druid/segment/filter/SpatialFilterTest.java
+++ b/processing/src/test/java/org/apache/druid/segment/filter/SpatialFilterTest.java
@@ -578,7 +578,7 @@ public void testSpatialQuery()
                                   .build();
 
     List<Result<TimeseriesResultValue>> expectedResults = Collections.singletonList(
-        new Result<TimeseriesResultValue>(
+        new Result<>(
             DateTimes.of("2013-01-01T00:00:00.000Z"),
             new TimeseriesResultValue(
                 ImmutableMap.<String, Object>builder()
@@ -630,7 +630,7 @@ public void testSpatialQueryWithOtherSpatialDim()
                                   .build();
 
     List<Result<TimeseriesResultValue>> expectedResults = Collections.singletonList(
-        new Result<TimeseriesResultValue>(
+        new Result<>(
             DateTimes.of("2013-01-01T00:00:00.000Z"),
             new TimeseriesResultValue(
                 ImmutableMap.<String, Object>builder()
@@ -681,7 +681,7 @@ public void testSpatialQueryMorePoints()
                                   .build();
 
     List<Result<TimeseriesResultValue>> expectedResults = Arrays.asList(
-        new Result<TimeseriesResultValue>(
+        new Result<>(
             DateTimes.of("2013-01-01T00:00:00.000Z"),
             new TimeseriesResultValue(
                 ImmutableMap.<String, Object>builder()
@@ -690,7 +690,7 @@ public void testSpatialQueryMorePoints()
                             .build()
             )
         ),
-        new Result<TimeseriesResultValue>(
+        new Result<>(
             DateTimes.of("2013-01-02T00:00:00.000Z"),
             new TimeseriesResultValue(
                 ImmutableMap.<String, Object>builder()
@@ -699,7 +699,7 @@ public void testSpatialQueryMorePoints()
                             .build()
             )
         ),
-        new Result<TimeseriesResultValue>(
+        new Result<>(
             DateTimes.of("2013-01-03T00:00:00.000Z"),
             new TimeseriesResultValue(
                 ImmutableMap.<String, Object>builder()
@@ -708,7 +708,7 @@ public void testSpatialQueryMorePoints()
                             .build()
             )
         ),
-        new Result<TimeseriesResultValue>(
+        new Result<>(
             DateTimes.of("2013-01-04T00:00:00.000Z"),
             new TimeseriesResultValue(
                 ImmutableMap.<String, Object>builder()
@@ -717,7 +717,7 @@ public void testSpatialQueryMorePoints()
                             .build()
             )
         ),
-        new Result<TimeseriesResultValue>(
+        new Result<>(
             DateTimes.of("2013-01-05T00:00:00.000Z"),
             new TimeseriesResultValue(
                 ImmutableMap.<String, Object>builder()
diff --git a/processing/src/test/java/org/apache/druid/segment/generator/DataGeneratorTest.java b/processing/src/test/java/org/apache/druid/segment/generator/DataGeneratorTest.java
index dd88367e7832..11f5223d6831 100644
--- a/processing/src/test/java/org/apache/druid/segment/generator/DataGeneratorTest.java
+++ b/processing/src/test/java/org/apache/druid/segment/generator/DataGeneratorTest.java
@@ -546,7 +546,7 @@ public void addRow(InputRow row)
     {
       for (String dim : row.getDimensions()) {
         if (dimensionMap.get(dim) == null) {
-          dimensionMap.put(dim, new HashMap<Object, RowValuePropertyTracker>());
+          dimensionMap.put(dim, new HashMap<>());
         }
 
         Map<Object, RowValuePropertyTracker> valueMap = dimensionMap.get(dim);
diff --git a/processing/src/test/java/org/apache/druid/segment/incremental/IncrementalIndexMultiValueSpecTest.java b/processing/src/test/java/org/apache/druid/segment/incremental/IncrementalIndexMultiValueSpecTest.java
index f5779bf73629..261ac1ccf55c 100644
--- a/processing/src/test/java/org/apache/druid/segment/incremental/IncrementalIndexMultiValueSpecTest.java
+++ b/processing/src/test/java/org/apache/druid/segment/incremental/IncrementalIndexMultiValueSpecTest.java
@@ -82,7 +82,7 @@ public void test() throws IndexSizeExceededException
                                                           .withDimensionsSpec(dimensionsSpec)
                                                           .withRollup(false)
                                                           .build();
-    Map<String, Object> map = new HashMap<String, Object>()
+    Map<String, Object> map = new HashMap<>()
     {
       @Override
       public Object get(Object key)
diff --git a/processing/src/test/java/org/apache/druid/segment/join/JoinTestHelper.java b/processing/src/test/java/org/apache/druid/segment/join/JoinTestHelper.java
index 33ad0dfb6a8a..7536c74c4a3f 100644
--- a/processing/src/test/java/org/apache/druid/segment/join/JoinTestHelper.java
+++ b/processing/src/test/java/org/apache/druid/segment/join/JoinTestHelper.java
@@ -121,7 +121,7 @@ public class JoinTestHelper
                   .build();
 
   private static final ColumnProcessorFactory<Supplier<Object>> SIMPLE_READER =
-      new ColumnProcessorFactory<Supplier<Object>>()
+      new ColumnProcessorFactory<>()
       {
         @Override
         public ColumnType defaultType()
@@ -174,7 +174,7 @@ public Supplier<Object> makeComplexProcessor(BaseObjectColumnValueSelector<?> se
 
   private static RowAdapter<Map<String, Object>> createMapRowAdapter(final RowSignature signature)
   {
-    return new RowAdapter<Map<String, Object>>()
+    return new RowAdapter<>()
     {
       @Override
       public ToLongFunction<Map<String, Object>> timestampFunction()
diff --git a/processing/src/test/java/org/apache/druid/segment/nested/NestedPathPartTest.java b/processing/src/test/java/org/apache/druid/segment/nested/NestedPathPartTest.java
index 21118836f199..f11c748789e1 100644
--- a/processing/src/test/java/org/apache/druid/segment/nested/NestedPathPartTest.java
+++ b/processing/src/test/java/org/apache/druid/segment/nested/NestedPathPartTest.java
@@ -32,9 +32,7 @@
 public class NestedPathPartTest
 {
   private static final ObjectMapper JSON_MAPPER = new DefaultObjectMapper();
-  private static final TypeReference<List<NestedPathPart>> TYPE_REF = new TypeReference<List<NestedPathPart>>()
-  {
-  };
+  private static final TypeReference<List<NestedPathPart>> TYPE_REF = new TypeReference<>() {};
 
   @Test
   public void testMapFieldSerde() throws JsonProcessingException
diff --git a/processing/src/test/java/org/apache/druid/segment/serde/CombineFirstTwoEntriesIndexedTest.java b/processing/src/test/java/org/apache/druid/segment/serde/CombineFirstTwoEntriesIndexedTest.java
index e5dd68978a3d..0b8886e04a8b 100644
--- a/processing/src/test/java/org/apache/druid/segment/serde/CombineFirstTwoEntriesIndexedTest.java
+++ b/processing/src/test/java/org/apache/druid/segment/serde/CombineFirstTwoEntriesIndexedTest.java
@@ -150,7 +150,7 @@ public void testSizeThreeSorted()
 
   private <T> CombineFirstTwoEntriesIndexed<T> wrap(final Indexed<T> indexed, @Nullable final T newFirstValue)
   {
-    return new CombineFirstTwoEntriesIndexed<T>(indexed)
+    return new CombineFirstTwoEntriesIndexed<>(indexed)
     {
       @Override
       protected T newFirstValue()
diff --git a/processing/src/test/java/org/apache/druid/segment/serde/cell/BytesReadWriteTestBase.java b/processing/src/test/java/org/apache/druid/segment/serde/cell/BytesReadWriteTestBase.java
index f8c79ab6064c..251c5296b255 100644
--- a/processing/src/test/java/org/apache/druid/segment/serde/cell/BytesReadWriteTestBase.java
+++ b/processing/src/test/java/org/apache/druid/segment/serde/cell/BytesReadWriteTestBase.java
@@ -206,7 +206,7 @@ public void testSingleWriteByteBufferAlternateByteBufferProvider() throws Except
 
     List<ByteBuffer> bufferList = testHelper.generateRaggedPayloadBuffer(100, 1024, 10, 0, 0, 10);
 
-    testHelper.setByteBufferProvider(() -> new ResourceHolder<ByteBuffer>()
+    testHelper.setByteBufferProvider(() -> new ResourceHolder<>()
     {
       @Override
       public ByteBuffer get()
diff --git a/processing/src/test/java/org/apache/druid/segment/virtual/ExpressionSelectorsTest.java b/processing/src/test/java/org/apache/druid/segment/virtual/ExpressionSelectorsTest.java
index 6bf483df36be..fe0d8c6f75a9 100644
--- a/processing/src/test/java/org/apache/druid/segment/virtual/ExpressionSelectorsTest.java
+++ b/processing/src/test/java/org/apache/druid/segment/virtual/ExpressionSelectorsTest.java
@@ -734,7 +734,7 @@ private static <T> ColumnValueSelector<T> objectSelectorFromSupplier(
       final Class<T> clazz
   )
   {
-    return new TestObjectColumnSelector<T>()
+    return new TestObjectColumnSelector<>()
     {
       @Override
       public Class<T> classOfObject()
diff --git a/processing/src/test/java/org/apache/druid/storage/remote/TestStorageConnector.java b/processing/src/test/java/org/apache/druid/storage/remote/TestStorageConnector.java
index e5757a949265..f6ac89df1ae3 100644
--- a/processing/src/test/java/org/apache/druid/storage/remote/TestStorageConnector.java
+++ b/processing/src/test/java/org/apache/druid/storage/remote/TestStorageConnector.java
@@ -68,7 +68,7 @@ public ChunkingStorageConnectorParameters<TestStorageConnector.InputRange> build
     builder.retryCondition(Predicates.alwaysFalse());
     builder.maxRetry(2);
     builder.objectSupplier((start, end) -> new InputRange((int) start, (int) end));
-    builder.objectOpenFunction(new ObjectOpenFunction<InputRange>()
+    builder.objectOpenFunction(new ObjectOpenFunction<>()
     {
       @Override
       public InputStream open(InputRange ir)
diff --git a/processing/src/test/java/org/apache/druid/timeline/partition/HashBasedNumberedShardSpecTest.java b/processing/src/test/java/org/apache/druid/timeline/partition/HashBasedNumberedShardSpecTest.java
index c3cceae5fa5d..9996b0aeb82f 100644
--- a/processing/src/test/java/org/apache/druid/timeline/partition/HashBasedNumberedShardSpecTest.java
+++ b/processing/src/test/java/org/apache/druid/timeline/partition/HashBasedNumberedShardSpecTest.java
@@ -121,7 +121,7 @@ public void testPartitionChunks()
 
     final List<PartitionChunk<String>> chunks = Lists.transform(
         specs,
-        new Function<ShardSpec, PartitionChunk<String>>()
+        new Function<>()
         {
           @Override
           public PartitionChunk<String> apply(ShardSpec shardSpec)
diff --git a/processing/src/test/java/org/apache/druid/timeline/partition/NumberedShardSpecTest.java b/processing/src/test/java/org/apache/druid/timeline/partition/NumberedShardSpecTest.java
index 4a3ba4c2df19..12b737211e32 100644
--- a/processing/src/test/java/org/apache/druid/timeline/partition/NumberedShardSpecTest.java
+++ b/processing/src/test/java/org/apache/druid/timeline/partition/NumberedShardSpecTest.java
@@ -84,7 +84,7 @@ public void testPartitionChunks()
 
     final List<PartitionChunk<String>> chunks = Lists.transform(
         specs,
-        new Function<ShardSpec, PartitionChunk<String>>()
+        new Function<>()
         {
           @Override
           public PartitionChunk<String> apply(ShardSpec shardSpec)
diff --git a/processing/src/test/java/org/apache/druid/timeline/partition/PartitionHolderCompletenessTest.java b/processing/src/test/java/org/apache/druid/timeline/partition/PartitionHolderCompletenessTest.java
index 098f39116589..2c3442645d26 100644
--- a/processing/src/test/java/org/apache/druid/timeline/partition/PartitionHolderCompletenessTest.java
+++ b/processing/src/test/java/org/apache/druid/timeline/partition/PartitionHolderCompletenessTest.java
@@ -177,7 +177,7 @@ public void testHasNoData()
                                              .size(1)
                                              .build();
     final PartitionChunk<DataSegment> partitionChunk = new TombstonePartitionedChunk<>(tombstone);
-    final PartitionHolder<DataSegment> partitionHolder = new PartitionHolder<DataSegment>(partitionChunk);
+    final PartitionHolder<DataSegment> partitionHolder = new PartitionHolder<>(partitionChunk);
     Assert.assertFalse(partitionHolder.hasData());
   }
 }
diff --git a/processing/src/test/java/org/apache/druid/timeline/partition/TombstonePartitionedChunkTest.java b/processing/src/test/java/org/apache/druid/timeline/partition/TombstonePartitionedChunkTest.java
index f1b5bf40f658..7a9a460bea55 100644
--- a/processing/src/test/java/org/apache/druid/timeline/partition/TombstonePartitionedChunkTest.java
+++ b/processing/src/test/java/org/apache/druid/timeline/partition/TombstonePartitionedChunkTest.java
@@ -73,7 +73,7 @@ public void compareTo()
     Exception exception = Assert.assertThrows(
         IllegalArgumentException.class,
         () -> tombstonePartitionedChunk.compareTo(
-              new NumberedPartitionChunk<Object>(0, 1, new Object()))
+            new NumberedPartitionChunk<>(0, 1, new Object()))
     );
     Assert.assertEquals("Cannot compare against something that is not a TombstonePartitionedChunk.",
                         exception.getMessage());
diff --git a/server/src/main/java/org/apache/druid/catalog/model/ModelProperties.java b/server/src/main/java/org/apache/druid/catalog/model/ModelProperties.java
index 25545cc6883e..6069321a0d3f 100644
--- a/server/src/main/java/org/apache/druid/catalog/model/ModelProperties.java
+++ b/server/src/main/java/org/apache/druid/catalog/model/ModelProperties.java
@@ -364,7 +364,7 @@ public StringListPropertyDefn(String name)
       super(
           name,
           "string list",
-          new TypeReference<List<String>>() {}
+          new TypeReference<>() {}
       );
     }
   }
diff --git a/server/src/main/java/org/apache/druid/catalog/model/SchemaRegistryImpl.java b/server/src/main/java/org/apache/druid/catalog/model/SchemaRegistryImpl.java
index 7e9eced28462..ff3b25b45e7b 100644
--- a/server/src/main/java/org/apache/druid/catalog/model/SchemaRegistryImpl.java
+++ b/server/src/main/java/org/apache/druid/catalog/model/SchemaRegistryImpl.java
@@ -139,7 +139,7 @@ public SchemaSpec schema(String name)
   @Override
   public Set<String> names()
   {
-    return new TreeSet<String>(builtIns.keySet());
+    return new TreeSet<>(builtIns.keySet());
   }
 
   @Override
diff --git a/server/src/main/java/org/apache/druid/catalog/model/table/ClusterKeySpec.java b/server/src/main/java/org/apache/druid/catalog/model/table/ClusterKeySpec.java
index fb4e899d3be3..10a06705113b 100644
--- a/server/src/main/java/org/apache/druid/catalog/model/table/ClusterKeySpec.java
+++ b/server/src/main/java/org/apache/druid/catalog/model/table/ClusterKeySpec.java
@@ -41,7 +41,7 @@
 public class ClusterKeySpec
 {
   public static final TypeReference<List<ClusterKeySpec>> CLUSTER_KEY_LIST_TYPE_REF =
-      new TypeReference<List<ClusterKeySpec>>() { };
+      new TypeReference<>() {};
 
   private final String expr;
   private final boolean desc;
diff --git a/server/src/main/java/org/apache/druid/catalog/model/table/DatasourceDefn.java b/server/src/main/java/org/apache/druid/catalog/model/table/DatasourceDefn.java
index 9516d1c917f9..e349ffb7ede4 100644
--- a/server/src/main/java/org/apache/druid/catalog/model/table/DatasourceDefn.java
+++ b/server/src/main/java/org/apache/druid/catalog/model/table/DatasourceDefn.java
@@ -110,7 +110,7 @@ public ClusterKeysDefn()
       super(
           CLUSTER_KEYS_PROPERTY,
           "ClusterKeySpec list",
-          new TypeReference<List<ClusterKeySpec>>() {}
+          new TypeReference<>() {}
       );
     }
 
diff --git a/server/src/main/java/org/apache/druid/catalog/model/table/ExternalTableDefn.java b/server/src/main/java/org/apache/druid/catalog/model/table/ExternalTableDefn.java
index 09a19d118276..015f7195c2a3 100644
--- a/server/src/main/java/org/apache/druid/catalog/model/table/ExternalTableDefn.java
+++ b/server/src/main/java/org/apache/druid/catalog/model/table/ExternalTableDefn.java
@@ -224,19 +224,19 @@ public class ExternalTableDefn extends TableDefn
    * Definition of the input source property.
    */
   private static final PropertyDefn<InputSource> SOURCE_PROPERTY_DEFN =
-      new ObjectPropertyDefn<InputSource>(SOURCE_PROPERTY, InputSource.class);
+      new ObjectPropertyDefn<>(SOURCE_PROPERTY, InputSource.class);
 
   /**
    * Definition of the input format property.
    */
   private static final PropertyDefn<InputFormat> FORMAT_PROPERTY_DEFN =
-      new ObjectPropertyDefn<InputFormat>(FORMAT_PROPERTY, InputFormat.class);
+      new ObjectPropertyDefn<>(FORMAT_PROPERTY, InputFormat.class);
 
   /**
    * Type reference used to deserialize JSON to a generic map.
    */
   @VisibleForTesting
-  public static final TypeReference<Map<String, Object>> MAP_TYPE_REF = new TypeReference<Map<String, Object>>() { };
+  public static final TypeReference<Map<String, Object>> MAP_TYPE_REF = new TypeReference<>() {};
 
   private TableDefnRegistry registry;
 
diff --git a/server/src/main/java/org/apache/druid/catalog/model/table/HttpInputSourceDefn.java b/server/src/main/java/org/apache/druid/catalog/model/table/HttpInputSourceDefn.java
index 110974d18ca7..e6272e2de4b7 100644
--- a/server/src/main/java/org/apache/druid/catalog/model/table/HttpInputSourceDefn.java
+++ b/server/src/main/java/org/apache/druid/catalog/model/table/HttpInputSourceDefn.java
@@ -310,7 +310,7 @@ private void convertHeaderArg(Map<String, Object> jsonMap, Map<String, Object> a
     Map<String, String> headersMap;
     if (requestHeaders != null) {
       try {
-        headersMap = DefaultObjectMapper.INSTANCE.readValue(requestHeaders, new TypeReference<Map<String, String>>(){});
+        headersMap = DefaultObjectMapper.INSTANCE.readValue(requestHeaders, new TypeReference<>() {});
       }
       catch (JsonProcessingException e) {
         throw new ISE("Failed read map from headers json");
diff --git a/server/src/main/java/org/apache/druid/client/BatchServerInventoryView.java b/server/src/main/java/org/apache/druid/client/BatchServerInventoryView.java
index 00dfbce8b899..58d4fb0927ee 100644
--- a/server/src/main/java/org/apache/druid/client/BatchServerInventoryView.java
+++ b/server/src/main/java/org/apache/druid/client/BatchServerInventoryView.java
@@ -98,7 +98,7 @@ public String getInventoryPath()
           }
         },
         Execs.singleThreaded(pathChildrenCacheExecPrefix + "-%s"),
-        new CuratorInventoryManagerStrategy<DruidServer, Set<DataSegment>>()
+        new CuratorInventoryManagerStrategy<>()
         {
           @Override
           public DruidServer deserializeContainer(byte[] bytes)
@@ -115,9 +115,7 @@ public DruidServer deserializeContainer(byte[] bytes)
           public Set<DataSegment> deserializeInventory(byte[] bytes)
           {
             try {
-              return jsonMapper.readValue(bytes, new TypeReference<Set<DataSegment>>()
-              {
-              });
+              return jsonMapper.readValue(bytes, new TypeReference<>() {});
             }
             catch (IOException e) {
               log.error(e, "Could not parse json: %s", StringUtils.fromUtf8(bytes));
@@ -343,7 +341,7 @@ private Set<DataSegment> filterInventory(final DruidServer container, Set<DataSe
             Iterables.filter(
                 Iterables.transform(
                     inventory,
-                    new Function<DataSegment, Pair<DruidServerMetadata, DataSegment>>()
+                    new Function<>()
                     {
                       @Override
                       public Pair<DruidServerMetadata, DataSegment> apply(DataSegment input)
diff --git a/server/src/main/java/org/apache/druid/client/CachingClusteredClient.java b/server/src/main/java/org/apache/druid/client/CachingClusteredClient.java
index fe64ba7ed42e..a4c8327f1a47 100644
--- a/server/src/main/java/org/apache/druid/client/CachingClusteredClient.java
+++ b/server/src/main/java/org/apache/druid/client/CachingClusteredClient.java
@@ -180,7 +180,7 @@ public ServerView.CallbackAction segmentRemoved(DruidServerMetadata server, Data
   @Override
   public <T> QueryRunner<T> getQueryRunnerForIntervals(final Query<T> query, final Iterable<Interval> intervals)
   {
-    return new QueryRunner<T>()
+    return new QueryRunner<>()
     {
       @Override
       public Sequence<T> run(final QueryPlus<T> queryPlus, final ResponseContext responseContext)
@@ -219,7 +219,7 @@ private static <T> void initializeNumRemainingResponsesInResponseContext(
   @Override
   public <T> QueryRunner<T> getQueryRunnerForSegments(final Query<T> query, final Iterable<SegmentDescriptor> specs)
   {
-    return new QueryRunner<T>()
+    return new QueryRunner<>()
     {
       @Override
       public Sequence<T> run(final QueryPlus<T> queryPlus, final ResponseContext responseContext)
@@ -630,7 +630,7 @@ private void addSequencesFromCache(
       for (Pair<Interval, byte[]> cachedResultPair : cachedResults) {
         final byte[] cachedResult = cachedResultPair.rhs;
         Sequence<Object> cachedSequence = new BaseSequence<>(
-            new BaseSequence.IteratorMaker<Object, Iterator<Object>>()
+            new BaseSequence.IteratorMaker<>()
             {
               @Override
               public Iterator<Object> make()
diff --git a/server/src/main/java/org/apache/druid/client/DirectDruidClient.java b/server/src/main/java/org/apache/druid/client/DirectDruidClient.java
index 0ae29c2e741c..ce79ad7140d6 100644
--- a/server/src/main/java/org/apache/druid/client/DirectDruidClient.java
+++ b/server/src/main/java/org/apache/druid/client/DirectDruidClient.java
@@ -174,7 +174,7 @@ public Sequence<T> run(final QueryPlus<T> queryPlus, final ResponseContext conte
       final long maxQueuedBytes = queryContext.getMaxQueuedBytes(0);
       final boolean usingBackpressure = maxQueuedBytes > 0;
 
-      final HttpResponseHandler<InputStream, InputStream> responseHandler = new HttpResponseHandler<InputStream, InputStream>()
+      final HttpResponseHandler<InputStream, InputStream> responseHandler = new HttpResponseHandler<>()
       {
         private final AtomicLong totalByteCount = new AtomicLong(0);
         private final AtomicLong queuedByteCount = new AtomicLong(0);
@@ -276,7 +276,7 @@ public int read() throws IOException
           totalByteCount.addAndGet(response.getContent().readableBytes());
           return ClientResponse.finished(
               new SequenceInputStream(
-                  new Enumeration<InputStream>()
+                  new Enumeration<>()
                   {
                     @Override
                     public boolean hasMoreElements()
@@ -480,7 +480,7 @@ private void checkTotalBytesLimit(long bytes)
       queryWatcher.registerQueryFuture(query, future);
       Futures.addCallback(
           future,
-          new FutureCallback<InputStream>()
+          new FutureCallback<>()
           {
             @Override
             public void onSuccess(InputStream result)
@@ -511,7 +511,7 @@ public void onFailure(Throwable t)
           @Override
           public JsonParserIterator<T> make()
           {
-            return new JsonParserIterator<T>(
+            return new JsonParserIterator<>(
                 queryResultType,
                 future,
                 url,
diff --git a/server/src/main/java/org/apache/druid/client/HttpServerInventoryView.java b/server/src/main/java/org/apache/druid/client/HttpServerInventoryView.java
index 894eee051aff..d19df0c2d73e 100644
--- a/server/src/main/java/org/apache/druid/client/HttpServerInventoryView.java
+++ b/server/src/main/java/org/apache/druid/client/HttpServerInventoryView.java
@@ -86,7 +86,7 @@
 public class HttpServerInventoryView implements ServerInventoryView, FilteredServerInventoryView
 {
   public static final TypeReference<ChangeRequestsSnapshot<DataSegmentChangeRequest>> SEGMENT_LIST_RESP_TYPE_REF =
-      new TypeReference<ChangeRequestsSnapshot<DataSegmentChangeRequest>>() {};
+      new TypeReference<>() {};
 
   private final EmittingLogger log = new EmittingLogger(HttpServerInventoryView.class);
   private final DruidNodeDiscoveryProvider druidNodeDiscoveryProvider;
@@ -583,7 +583,7 @@ boolean isSyncedSuccessfullyAtleastOnce()
 
     private ChangeRequestHttpSyncer.Listener<DataSegmentChangeRequest> createSyncListener()
     {
-      return new ChangeRequestHttpSyncer.Listener<DataSegmentChangeRequest>()
+      return new ChangeRequestHttpSyncer.Listener<>()
       {
         @Override
         public void fullSync(List<DataSegmentChangeRequest> changes)
@@ -641,7 +641,7 @@ private void addSegment(DataSegment segment, boolean fullSync)
           DataSegment theSegment = DataSegmentInterner.intern(segment);
           druidServer.addDataSegment(theSegment);
           runSegmentCallbacks(
-              new Function<SegmentCallback, CallbackAction>()
+              new Function<>()
               {
                 @Override
                 public CallbackAction apply(SegmentCallback input)
@@ -665,7 +665,7 @@ private void removeSegment(final DataSegment segment, boolean fullSync)
     {
       if (druidServer.removeDataSegment(segment.getId()) != null) {
         runSegmentCallbacks(
-            new Function<SegmentCallback, CallbackAction>()
+            new Function<>()
             {
               @Override
               public CallbackAction apply(SegmentCallback input)
diff --git a/server/src/main/java/org/apache/druid/client/broker/BrokerClientImpl.java b/server/src/main/java/org/apache/druid/client/broker/BrokerClientImpl.java
index 012aea746181..728a67401b2e 100644
--- a/server/src/main/java/org/apache/druid/client/broker/BrokerClientImpl.java
+++ b/server/src/main/java/org/apache/druid/client/broker/BrokerClientImpl.java
@@ -77,7 +77,7 @@ public ListenableFuture<List<ExplainPlan>> fetchExplainPlan(final ClientSqlQuery
                 .jsonContent(jsonMapper, explainSqlQuery),
             new BytesFullResponseHandler()
         ),
-        holder -> JacksonUtils.readValue(jsonMapper, holder.getContent(), new TypeReference<List<ExplainPlan>>() {})
+        holder -> JacksonUtils.readValue(jsonMapper, holder.getContent(), new TypeReference<>() {})
     );
   }
 }
diff --git a/server/src/main/java/org/apache/druid/client/cache/BackgroundCachePopulator.java b/server/src/main/java/org/apache/druid/client/cache/BackgroundCachePopulator.java
index 57209edea29c..ee032e84b308 100644
--- a/server/src/main/java/org/apache/druid/client/cache/BackgroundCachePopulator.java
+++ b/server/src/main/java/org/apache/druid/client/cache/BackgroundCachePopulator.java
@@ -90,7 +90,7 @@ public <T, CacheType> Sequence<T> wrap(
         () -> {
           Futures.addCallback(
               Futures.allAsList(cacheFutures),
-              new FutureCallback<List<CacheType>>()
+              new FutureCallback<>()
               {
                 @Override
                 public void onSuccess(List<CacheType> results)
diff --git a/server/src/main/java/org/apache/druid/client/cache/MemcachedCache.java b/server/src/main/java/org/apache/druid/client/cache/MemcachedCache.java
index d5849fad99e8..6b8fd8fd4f60 100644
--- a/server/src/main/java/org/apache/druid/client/cache/MemcachedCache.java
+++ b/server/src/main/java/org/apache/druid/client/cache/MemcachedCache.java
@@ -111,7 +111,7 @@ public static MemcachedCache create(final MemcachedCacheConfig config)
     final AbstractMonitor monitor =
         new AbstractMonitor()
         {
-          final AtomicReference<Map<String, Long>> priorValues = new AtomicReference<Map<String, Long>>(new HashMap<String, Long>());
+          final AtomicReference<Map<String, Long>> priorValues = new AtomicReference<>(new HashMap<>());
 
           @Override
           public boolean doMonitor(ServiceEmitter emitter)
@@ -168,7 +168,7 @@ private Map<String, Long> getCurrentValues()
         opQueueFactory = new LinkedOperationQueueFactory();
       }
 
-      final Predicate<String> interesting = new Predicate<String>()
+      final Predicate<String> interesting = new Predicate<>()
       {
         // See net.spy.memcached.MemcachedConnection.registerMetrics()
         private final Set<String> interestingMetrics = ImmutableSet.of(
@@ -356,7 +356,7 @@ public void updateHistogram(String name, int amount)
       if (config.getNumConnections() > 1) {
         clientSupplier = new MemcacheClientPool(
             config.getNumConnections(),
-            new Supplier<MemcachedClientIF>()
+            new Supplier<>()
             {
               @Override
               public MemcachedClientIF get()
@@ -566,7 +566,7 @@ public Map<NamedKey, byte[]> getBulk(Iterable<NamedKey> keys)
     try (ResourceHolder<MemcachedClientIF> clientHolder = client.get()) {
       Map<String, NamedKey> keyLookup = Maps.uniqueIndex(
           keys,
-          new Function<NamedKey, String>()
+          new Function<>()
           {
             @Override
             public String apply(
diff --git a/server/src/main/java/org/apache/druid/client/cache/MemcachedOperationQueueFactory.java b/server/src/main/java/org/apache/druid/client/cache/MemcachedOperationQueueFactory.java
index b046dc06c900..d3ee91064124 100644
--- a/server/src/main/java/org/apache/druid/client/cache/MemcachedOperationQueueFactory.java
+++ b/server/src/main/java/org/apache/druid/client/cache/MemcachedOperationQueueFactory.java
@@ -36,7 +36,7 @@ public MemcachedOperationQueueFactory(long maxQueueSize)
   @Override
   public BlockingQueue<Operation> create()
   {
-    return new BytesBoundedLinkedQueue<Operation>(maxQueueSize)
+    return new BytesBoundedLinkedQueue<>(maxQueueSize)
     {
       @Override
       public long getBytesSize(Operation operation)
diff --git a/server/src/main/java/org/apache/druid/client/coordinator/CoordinatorClientImpl.java b/server/src/main/java/org/apache/druid/client/coordinator/CoordinatorClientImpl.java
index fc3deee12ed3..224a766c719d 100644
--- a/server/src/main/java/org/apache/druid/client/coordinator/CoordinatorClientImpl.java
+++ b/server/src/main/java/org/apache/druid/client/coordinator/CoordinatorClientImpl.java
@@ -118,9 +118,7 @@ public Iterable<ImmutableSegmentLoadInfo> fetchServerViewSegments(String dataSou
           holder -> JacksonUtils.readValue(
               jsonMapper,
               holder.getContent(),
-              new TypeReference<Iterable<ImmutableSegmentLoadInfo>>()
-              {
-              }
+              new TypeReference<>() {}
           )
       );
       FutureUtils.getUnchecked(segments, true).forEach(retVal::add);
@@ -143,7 +141,7 @@ public ListenableFuture<List<DataSegment>> fetchUsedSegments(String dataSource,
                 .jsonContent(jsonMapper, intervals),
             new BytesFullResponseHandler()
         ),
-        holder -> JacksonUtils.readValue(jsonMapper, holder.getContent(), new TypeReference<List<DataSegment>>() {})
+        holder -> JacksonUtils.readValue(jsonMapper, holder.getContent(), new TypeReference<>() {})
     );
   }
 
@@ -157,7 +155,7 @@ public ListenableFuture<List<DataSourceInformation>> fetchDataSourceInformation(
                 .jsonContent(jsonMapper, dataSources),
             new BytesFullResponseHandler()
         ),
-        holder -> JacksonUtils.readValue(jsonMapper, holder.getContent(), new TypeReference<List<DataSourceInformation>>() {})
+        holder -> JacksonUtils.readValue(jsonMapper, holder.getContent(), new TypeReference<>() {})
     );
   }
 
@@ -198,7 +196,7 @@ public ListenableFuture<Set<String>> fetchDataSourcesWithUsedSegments()
             new RequestBuilder(HttpMethod.GET, path),
             new BytesFullResponseHandler()
         ),
-        holder -> JacksonUtils.readValue(jsonMapper, holder.getContent(), new TypeReference<Set<String>>() {})
+        holder -> JacksonUtils.readValue(jsonMapper, holder.getContent(), new TypeReference<>() {})
     );
   }
 }
diff --git a/server/src/main/java/org/apache/druid/client/indexing/ClientCompactionTaskTransformSpec.java b/server/src/main/java/org/apache/druid/client/indexing/ClientCompactionTaskTransformSpec.java
index 5aa72023dc07..c8e3281956ac 100644
--- a/server/src/main/java/org/apache/druid/client/indexing/ClientCompactionTaskTransformSpec.java
+++ b/server/src/main/java/org/apache/druid/client/indexing/ClientCompactionTaskTransformSpec.java
@@ -59,7 +59,7 @@ public Map<String, Object> asMap(ObjectMapper objectMapper)
   {
     return objectMapper.convertValue(
         this,
-        new TypeReference<Map<String, Object>>() {}
+        new TypeReference<>() {}
     );
   }
 
diff --git a/server/src/main/java/org/apache/druid/curator/announcement/Announcer.java b/server/src/main/java/org/apache/druid/curator/announcement/Announcer.java
index b65d85644d40..4abd24045245 100644
--- a/server/src/main/java/org/apache/druid/curator/announcement/Announcer.java
+++ b/server/src/main/java/org/apache/druid/curator/announcement/Announcer.java
@@ -67,7 +67,7 @@ public class Announcer
   private final List<Announceable> toUpdate = new ArrayList<>();
   private final ConcurrentMap<String, PathChildrenCache> listeners = new ConcurrentHashMap<>();
   private final ConcurrentMap<String, ConcurrentMap<String, byte[]>> announcements = new ConcurrentHashMap<>();
-  private final List<String> parentsIBuilt = new CopyOnWriteArrayList<String>();
+  private final List<String> parentsIBuilt = new CopyOnWriteArrayList<>();
 
   // Used for testing
   private Set<String> addedChildren;
@@ -228,7 +228,7 @@ public void announce(String path, byte[] bytes, boolean removeParentIfCreated)
           cache.getListenable().addListener(
               new PathChildrenCacheListener()
               {
-                private final AtomicReference<Set<String>> pathsLost = new AtomicReference<Set<String>>(null);
+                private final AtomicReference<Set<String>> pathsLost = new AtomicReference<>(null);
 
                 @Override
                 public void childEvent(CuratorFramework client, PathChildrenCacheEvent event) throws Exception
diff --git a/server/src/main/java/org/apache/druid/curator/discovery/DiscoveryModule.java b/server/src/main/java/org/apache/druid/curator/discovery/DiscoveryModule.java
index 4889261fcae4..a54801699cbf 100644
--- a/server/src/main/java/org/apache/druid/curator/discovery/DiscoveryModule.java
+++ b/server/src/main/java/org/apache/druid/curator/discovery/DiscoveryModule.java
@@ -107,7 +107,7 @@ public void configure(Properties properties)
    */
   public static void registerDefault(Binder binder)
   {
-    registerKey(binder, Key.get(new TypeLiteral<DruidNode>(){}));
+    registerKey(binder, Key.get(new TypeLiteral<>() {}));
   }
 
   /**
@@ -121,7 +121,7 @@ public static void registerDefault(Binder binder)
    */
   public static void register(Binder binder, Annotation annotation)
   {
-    registerKey(binder, Key.get(new TypeLiteral<DruidNode>(){}, annotation));
+    registerKey(binder, Key.get(new TypeLiteral<>() {}, annotation));
   }
 
   /**
@@ -136,7 +136,7 @@ public static void register(Binder binder, Annotation annotation)
    */
   public static void register(Binder binder, Class<? extends Annotation> annotation)
   {
-    registerKey(binder, Key.get(new TypeLiteral<DruidNode>(){}, annotation));
+    registerKey(binder, Key.get(new TypeLiteral<>() {}, annotation));
   }
 
   /**
diff --git a/server/src/main/java/org/apache/druid/curator/discovery/ServerDiscoverySelector.java b/server/src/main/java/org/apache/druid/curator/discovery/ServerDiscoverySelector.java
index 9d29d8015eaa..84f4fe81ce0f 100644
--- a/server/src/main/java/org/apache/druid/curator/discovery/ServerDiscoverySelector.java
+++ b/server/src/main/java/org/apache/druid/curator/discovery/ServerDiscoverySelector.java
@@ -53,7 +53,7 @@ public ServerDiscoverySelector(ServiceProvider serviceProvider, String name)
     this.name = name;
   }
 
-  private static final Function<ServiceInstance, Server> TO_SERVER = new Function<ServiceInstance, Server>()
+  private static final Function<ServiceInstance, Server> TO_SERVER = new Function<>()
   {
     @Override
     public Server apply(final ServiceInstance instance)
diff --git a/server/src/main/java/org/apache/druid/discovery/DataServerClient.java b/server/src/main/java/org/apache/druid/discovery/DataServerClient.java
index ce3d62ca91b5..c75b646bc8f9 100644
--- a/server/src/main/java/org/apache/druid/discovery/DataServerClient.java
+++ b/server/src/main/java/org/apache/druid/discovery/DataServerClient.java
@@ -102,7 +102,7 @@ public <T> Sequence<T> run(Query<T> query, ResponseContext responseContext, Java
     closer.register(() -> resultStreamFuture.cancel(true));
     Futures.addCallback(
         resultStreamFuture,
-        new FutureCallback<InputStream>()
+        new FutureCallback<>()
         {
           @Override
           public void onSuccess(InputStream result)
diff --git a/server/src/main/java/org/apache/druid/discovery/DataServerResponseHandler.java b/server/src/main/java/org/apache/druid/discovery/DataServerResponseHandler.java
index 5b52025a60e2..f710fefb8069 100644
--- a/server/src/main/java/org/apache/druid/discovery/DataServerResponseHandler.java
+++ b/server/src/main/java/org/apache/druid/discovery/DataServerResponseHandler.java
@@ -118,7 +118,7 @@ public int read() throws IOException
     }
     return ClientResponse.finished(
         new SequenceInputStream(
-            new Enumeration<InputStream>()
+            new Enumeration<>()
             {
               @Override
               public boolean hasMoreElements()
diff --git a/server/src/main/java/org/apache/druid/guice/DruidBinders.java b/server/src/main/java/org/apache/druid/guice/DruidBinders.java
index 87886b411d44..b243930d6191 100644
--- a/server/src/main/java/org/apache/druid/guice/DruidBinders.java
+++ b/server/src/main/java/org/apache/druid/guice/DruidBinders.java
@@ -39,7 +39,7 @@ public static MapBinder<Class<? extends Query>, QueryRunnerFactory> queryRunnerF
   {
     return MapBinder.newMapBinder(
         binder,
-        new TypeLiteral<Class<? extends Query>>() {},
+        new TypeLiteral<>() {},
         TypeLiteral.get(QueryRunnerFactory.class)
     );
   }
@@ -48,8 +48,8 @@ public static MapBinder<Class<? extends Query>, QueryToolChest> queryToolChestBi
   {
     return MapBinder.newMapBinder(
         binder,
-        new TypeLiteral<Class<? extends Query>>() {},
-        new TypeLiteral<QueryToolChest>() {}
+        new TypeLiteral<>() {},
+        new TypeLiteral<>() {}
     );
   }
 
@@ -57,8 +57,8 @@ public static MapBinder<Class<? extends Query>, QueryLogic> queryLogicBinderType
   {
     return MapBinder.newMapBinder(
         binder,
-        new TypeLiteral<Class<? extends Query>>() {},
-        new TypeLiteral<QueryLogic>() {}
+        new TypeLiteral<>() {},
+        new TypeLiteral<>() {}
     );
   }
 
@@ -91,20 +91,20 @@ QueryLogicBinder bindQueryLogic(
 
   public static Multibinder<KeyHolder<DruidNode>> discoveryAnnouncementBinder(Binder binder)
   {
-    return Multibinder.newSetBinder(binder, new TypeLiteral<KeyHolder<DruidNode>>() {});
+    return Multibinder.newSetBinder(binder, new TypeLiteral<>() {});
   }
 
   public static Multibinder<Class<? extends Monitor>> metricMonitorBinder(Binder binder)
   {
-    return Multibinder.newSetBinder(binder, new TypeLiteral<Class<? extends Monitor>>() {});
+    return Multibinder.newSetBinder(binder, new TypeLiteral<>() {});
   }
 
   public static MapBinder<Class<? extends DataSource>, SegmentWrangler> segmentWranglerBinder(Binder binder)
   {
     return MapBinder.newMapBinder(
         binder,
-        new TypeLiteral<Class<? extends DataSource>>() {},
-        new TypeLiteral<SegmentWrangler>() {}
+        new TypeLiteral<>() {},
+        new TypeLiteral<>() {}
     );
   }
 
@@ -112,7 +112,7 @@ public static Multibinder<JoinableFactory> joinableFactoryMultiBinder(Binder bin
   {
     return Multibinder.newSetBinder(
         binder,
-        new TypeLiteral<JoinableFactory>() {}
+        new TypeLiteral<>() {}
     );
   }
 
@@ -120,8 +120,8 @@ public static MapBinder<Class<? extends JoinableFactory>, Class<? extends DataSo
   {
     return MapBinder.newMapBinder(
         binder,
-        new TypeLiteral<Class<? extends JoinableFactory>>() {},
-        new TypeLiteral<Class<? extends DataSource>>() {}
+        new TypeLiteral<>() {},
+        new TypeLiteral<>() {}
     );
   }
 }
diff --git a/server/src/main/java/org/apache/druid/guice/http/AbstractHttpClientProvider.java b/server/src/main/java/org/apache/druid/guice/http/AbstractHttpClientProvider.java
index 2967f9faedc7..3dbfd6351333 100644
--- a/server/src/main/java/org/apache/druid/guice/http/AbstractHttpClientProvider.java
+++ b/server/src/main/java/org/apache/druid/guice/http/AbstractHttpClientProvider.java
@@ -46,11 +46,7 @@ public AbstractHttpClientProvider(Class<? extends Annotation> annotation)
   {
     Preconditions.checkNotNull(annotation, "annotation");
 
-    configKey = Key.get(
-        new TypeLiteral<Supplier<DruidHttpClientConfig>>()
-        {
-        }, annotation
-    );
+    configKey = Key.get(new TypeLiteral<>() {}, annotation);
     sslContextKey = Key.get(SSLContext.class, annotation);
   }
 
diff --git a/server/src/main/java/org/apache/druid/messages/client/MessageRelay.java b/server/src/main/java/org/apache/druid/messages/client/MessageRelay.java
index deda87c7d23d..be67e5d412ee 100644
--- a/server/src/main/java/org/apache/druid/messages/client/MessageRelay.java
+++ b/server/src/main/java/org/apache/druid/messages/client/MessageRelay.java
@@ -148,7 +148,7 @@ private void issueNextGetMessagesCall()
 
       Futures.addCallback(
           future,
-          new FutureCallback<MessageBatch<MessageType>>()
+          new FutureCallback<>()
           {
             @Override
             public void onSuccess(final MessageBatch<MessageType> result)
diff --git a/server/src/main/java/org/apache/druid/messages/server/MessageRelayResource.java b/server/src/main/java/org/apache/druid/messages/server/MessageRelayResource.java
index f8e771d378c7..550fa64c89c0 100644
--- a/server/src/main/java/org/apache/druid/messages/server/MessageRelayResource.java
+++ b/server/src/main/java/org/apache/druid/messages/server/MessageRelayResource.java
@@ -149,7 +149,7 @@ public void onStartAsync(AsyncEvent event)
 
     Futures.addCallback(
         batchFuture,
-        new FutureCallback<MessageBatch<MessageType>>()
+        new FutureCallback<>()
         {
           @Override
           public void onSuccess(MessageBatch<MessageType> result)
diff --git a/server/src/main/java/org/apache/druid/metadata/IndexerSQLMetadataStorageCoordinator.java b/server/src/main/java/org/apache/druid/metadata/IndexerSQLMetadataStorageCoordinator.java
index c85fd1c49608..8ecc2647e55d 100644
--- a/server/src/main/java/org/apache/druid/metadata/IndexerSQLMetadataStorageCoordinator.java
+++ b/server/src/main/java/org/apache/druid/metadata/IndexerSQLMetadataStorageCoordinator.java
@@ -658,7 +658,7 @@ public SegmentPublishResult commitMetadataOnly(
 
     try {
       return connector.retryTransaction(
-          new TransactionCallback<SegmentPublishResult>()
+          new TransactionCallback<>()
           {
             @Override
             public SegmentPublishResult inTransaction(
diff --git a/server/src/main/java/org/apache/druid/metadata/SQLMetadataConnector.java b/server/src/main/java/org/apache/druid/metadata/SQLMetadataConnector.java
index 3f4e1da069ae..2daab510591a 100644
--- a/server/src/main/java/org/apache/druid/metadata/SQLMetadataConnector.java
+++ b/server/src/main/java/org/apache/druid/metadata/SQLMetadataConnector.java
@@ -622,7 +622,7 @@ public Void insertOrUpdate(
   )
   {
     return getDBI().inTransaction(
-        new TransactionCallback<Void>()
+        new TransactionCallback<>()
         {
           @Override
           public Void inTransaction(Handle handle, TransactionStatus transactionStatus)
@@ -668,7 +668,7 @@ public boolean compareAndSwap(
   {
     return getDBI().inTransaction(
         TransactionIsolationLevel.REPEATABLE_READ,
-        new TransactionCallback<Boolean>()
+        new TransactionCallback<>()
         {
           @Override
           public Boolean inTransaction(Handle handle, TransactionStatus transactionStatus)
@@ -891,7 +891,7 @@ public final <T> T inReadOnlyTransaction(
   )
   {
     return getDBI().withHandle(
-        new HandleCallback<T>()
+        new HandleCallback<>()
         {
           @Override
           public T withHandle(Handle handle) throws Exception
diff --git a/server/src/main/java/org/apache/druid/metadata/SQLMetadataStorageActionHandler.java b/server/src/main/java/org/apache/druid/metadata/SQLMetadataStorageActionHandler.java
index 6cbefc84eeb4..eaf2efc82aaf 100644
--- a/server/src/main/java/org/apache/druid/metadata/SQLMetadataStorageActionHandler.java
+++ b/server/src/main/java/org/apache/druid/metadata/SQLMetadataStorageActionHandler.java
@@ -261,7 +261,7 @@ private boolean isTransientDruidException(Throwable t)
   public boolean setStatus(final String entryId, final boolean active, final StatusType status)
   {
     return connector.retryWithHandle(
-        new HandleCallback<Boolean>()
+        new HandleCallback<>()
         {
           @Override
           public Boolean withHandle(Handle handle) throws Exception
@@ -285,7 +285,7 @@ public Boolean withHandle(Handle handle) throws Exception
   public Optional<EntryType> getEntry(final String entryId)
   {
     return connector.retryWithHandle(
-        new HandleCallback<Optional<EntryType>>()
+        new HandleCallback<>()
         {
           @Override
           public Optional<EntryType> withHandle(Handle handle) throws Exception
@@ -310,7 +310,7 @@ public Optional<EntryType> withHandle(Handle handle) throws Exception
   public Optional<StatusType> getStatus(final String entryId)
   {
     return connector.retryWithHandle(
-        new HandleCallback<Optional<StatusType>>()
+        new HandleCallback<>()
         {
           @Override
           public Optional<StatusType> withHandle(Handle handle) throws Exception
@@ -801,7 +801,7 @@ public TaskInfo<EntryType, StatusType> map(int index, ResultSet resultSet, State
   public boolean addLock(final String entryId, final LockType lock)
   {
     return connector.retryWithHandle(
-        new HandleCallback<Boolean>()
+        new HandleCallback<>()
         {
           @Override
           public Boolean withHandle(Handle handle) throws Exception
@@ -889,7 +889,7 @@ private int removeLock(Handle handle, long lockId)
   public Map<Long, LockType> getLocks(final String entryId)
   {
     return connector.retryWithHandle(
-        new HandleCallback<Map<Long, LockType>>()
+        new HandleCallback<>()
         {
           @Override
           public Map<Long, LockType> withHandle(Handle handle)
diff --git a/server/src/main/java/org/apache/druid/metadata/SqlSegmentsMetadataManager.java b/server/src/main/java/org/apache/druid/metadata/SqlSegmentsMetadataManager.java
index 053dc10f41c2..7213cd3481b2 100644
--- a/server/src/main/java/org/apache/druid/metadata/SqlSegmentsMetadataManager.java
+++ b/server/src/main/java/org/apache/druid/metadata/SqlSegmentsMetadataManager.java
@@ -1093,7 +1093,7 @@ private void doPollSegmentAndSchema()
     // setting connection to read-only will allow some database such as MySQL
     // to automatically use read-only transaction mode, further optimizing the query
     final List<DataSegment> segments = connector.inReadOnlyTransaction(
-        new TransactionCallback<List<DataSegment>>()
+        new TransactionCallback<>()
         {
           @Override
           public List<DataSegment> inTransaction(Handle handle, TransactionStatus status)
@@ -1251,7 +1251,7 @@ public List<Interval> getUnusedSegmentIntervals(
   {
     // Note that we handle the case where used_status_last_updated IS NULL here to allow smooth transition to Druid version that uses used_status_last_updated column
     return connector.inReadOnlyTransaction(
-        new TransactionCallback<List<Interval>>()
+        new TransactionCallback<>()
         {
           @Override
           public List<Interval> inTransaction(Handle handle, TransactionStatus status)
@@ -1272,7 +1272,7 @@ public List<Interval> inTransaction(Handle handle, TransactionStatus status)
                 .bind("end", maxEndTime.toString())
                 .bind("used_status_last_updated", maxUsedStatusLastUpdatedTime.toString())
                 .map(
-                    new BaseResultSetMapper<Interval>()
+                    new BaseResultSetMapper<>()
                     {
                       @Override
                       protected Interval mapInternal(int index, Map<String, Object> row)
diff --git a/server/src/main/java/org/apache/druid/metadata/input/SqlReader.java b/server/src/main/java/org/apache/druid/metadata/input/SqlReader.java
index 27c1f612c8b9..1e90e19a0a08 100644
--- a/server/src/main/java/org/apache/druid/metadata/input/SqlReader.java
+++ b/server/src/main/java/org/apache/druid/metadata/input/SqlReader.java
@@ -69,9 +69,7 @@ protected CloseableIterator<Map<String, Object>> intermediateRowIterator() throw
     //The results are fetched into local storage as this avoids having to keep a persistent database connection for a long time
     final InputEntity.CleanableFile resultFile = closer.register(source.fetch(temporaryDirectory, null));
     FileInputStream inputStream = new FileInputStream(resultFile.file());
-    JsonIterator<Map<String, Object>> jsonIterator = new JsonIterator<>(new TypeReference<Map<String, Object>>()
-    {
-    }, inputStream, closer, objectMapper);
+    JsonIterator<Map<String, Object>> jsonIterator = new JsonIterator<>(new TypeReference<>() {}, inputStream, closer, objectMapper);
     return jsonIterator;
   }
 
diff --git a/server/src/main/java/org/apache/druid/metadata/storage/derby/DerbyConnector.java b/server/src/main/java/org/apache/druid/metadata/storage/derby/DerbyConnector.java
index 05e6300ba6d3..0ee9779a190d 100644
--- a/server/src/main/java/org/apache/druid/metadata/storage/derby/DerbyConnector.java
+++ b/server/src/main/java/org/apache/druid/metadata/storage/derby/DerbyConnector.java
@@ -184,7 +184,7 @@ public ResultSet getIndexInfo(DatabaseMetaData databaseMetaData, String tableNam
   public boolean tableHasColumn(String tableName, String columnName)
   {
     return getDBI().withHandle(
-        new HandleCallback<Boolean>()
+        new HandleCallback<>()
         {
           @Override
           public Boolean withHandle(Handle handle)
diff --git a/server/src/main/java/org/apache/druid/query/ResultLevelCachingQueryRunner.java b/server/src/main/java/org/apache/druid/query/ResultLevelCachingQueryRunner.java
index 0af6ebca3ede..dedfb0028b77 100644
--- a/server/src/main/java/org/apache/druid/query/ResultLevelCachingQueryRunner.java
+++ b/server/src/main/java/org/apache/druid/query/ResultLevelCachingQueryRunner.java
@@ -120,7 +120,7 @@ public Sequence<T> run(QueryPlus queryPlus, ResponseContext responseContext)
         return Sequences.wrap(
             Sequences.map(
                 resultFromClient,
-                new Function<T, T>()
+                new Function<>()
                 {
                   @Override
                   public T apply(T input)
diff --git a/server/src/main/java/org/apache/druid/query/RetryQueryRunner.java b/server/src/main/java/org/apache/druid/query/RetryQueryRunner.java
index 00b9dd030c32..6d0899e9eaa2 100644
--- a/server/src/main/java/org/apache/druid/query/RetryQueryRunner.java
+++ b/server/src/main/java/org/apache/druid/query/RetryQueryRunner.java
@@ -108,7 +108,7 @@ public Sequence<T> run(final QueryPlus<T> queryPlus, final ResponseContext conte
     // runnableAfterFirstAttempt is only for testing, it must be no-op for production code.
     runnableAfterFirstAttempt.run();
 
-    return new YieldingSequenceBase<T>()
+    return new YieldingSequenceBase<>()
     {
       @Override
       public <OutType> Yielder<OutType> toYielder(OutType initValue, YieldingAccumulator<OutType, T> accumulator)
@@ -167,9 +167,7 @@ private List<SegmentDescriptor> getMissingSegments(QueryPlus<T> queryPlus, final
 
     return jsonMapper.convertValue(
         maybeMissingSegments,
-        new TypeReference<List<SegmentDescriptor>>()
-        {
-        }
+        new TypeReference<>() {}
     );
   }
 
diff --git a/server/src/main/java/org/apache/druid/query/lookup/LookupListeningResource.java b/server/src/main/java/org/apache/druid/query/lookup/LookupListeningResource.java
index 51117835b3bc..581fc7b97e58 100644
--- a/server/src/main/java/org/apache/druid/query/lookup/LookupListeningResource.java
+++ b/server/src/main/java/org/apache/druid/query/lookup/LookupListeningResource.java
@@ -47,9 +47,7 @@ class LookupListeningResource extends ListenerResource
   private static final Logger LOG = new Logger(LookupListeningResource.class);
 
   private static final TypeReference<LookupsState<Object>> LOOKUPS_STATE_GENERIC_REFERENCE =
-      new TypeReference<LookupsState<Object>>()
-      {
-      };
+      new TypeReference<>() {};
 
   @Inject
   public LookupListeningResource(
@@ -61,9 +59,7 @@ public LookupListeningResource(
     super(
         jsonMapper,
         smileMapper,
-        new AbstractListenerHandler<LookupExtractorFactory>(new TypeReference<LookupExtractorFactory>()
-        {
-        })
+        new AbstractListenerHandler<LookupExtractorFactory>(new TypeReference<>() {})
         {
           @Override
           public Response handleUpdates(InputStream inputStream, ObjectMapper mapper)
diff --git a/server/src/main/java/org/apache/druid/query/lookup/LookupReferencesManager.java b/server/src/main/java/org/apache/druid/query/lookup/LookupReferencesManager.java
index e840a5f89eeb..80dd522b0104 100644
--- a/server/src/main/java/org/apache/druid/query/lookup/LookupReferencesManager.java
+++ b/server/src/main/java/org/apache/druid/query/lookup/LookupReferencesManager.java
@@ -90,9 +90,7 @@ public class LookupReferencesManager implements LookupExtractorFactoryContainerP
   private static final EmittingLogger LOG = new EmittingLogger(LookupReferencesManager.class);
 
   private static final TypeReference<Map<String, Object>> LOOKUPS_ALL_GENERIC_REFERENCE =
-      new TypeReference<Map<String, Object>>()
-      {
-      };
+      new TypeReference<>() {};
 
   // Lookups state (loaded/to-be-loaded/to-be-dropped etc) is managed by immutable LookupUpdateState instance.
   // Any update to state is done by creating updated LookupUpdateState instance and atomically setting that
diff --git a/server/src/main/java/org/apache/druid/rpc/ServiceClientImpl.java b/server/src/main/java/org/apache/druid/rpc/ServiceClientImpl.java
index 172f220fabad..a1f63c5c8b25 100644
--- a/server/src/main/java/org/apache/druid/rpc/ServiceClientImpl.java
+++ b/server/src/main/java/org/apache/druid/rpc/ServiceClientImpl.java
@@ -178,7 +178,7 @@ private <IntermediateType, FinalType> void tryRequest(
 
           Futures.addCallback(
               responseFuture,
-              new FutureCallback<Either<StringFullResponseHolder, FinalType>>()
+              new FutureCallback<>()
               {
                 @Override
                 public void onSuccess(@Nullable final Either<StringFullResponseHolder, FinalType> result)
@@ -396,7 +396,7 @@ private <T> void whenServiceReady(final Consumer<ServiceLocations> callback, fin
   {
     Futures.addCallback(
         serviceLocator.locate(),
-        new FutureCallback<ServiceLocations>()
+        new FutureCallback<>()
         {
           @Override
           public void onSuccess(final ServiceLocations locations)
diff --git a/server/src/main/java/org/apache/druid/rpc/indexing/OverlordClientImpl.java b/server/src/main/java/org/apache/druid/rpc/indexing/OverlordClientImpl.java
index 1653962e1940..76077a2fbddb 100644
--- a/server/src/main/java/org/apache/druid/rpc/indexing/OverlordClientImpl.java
+++ b/server/src/main/java/org/apache/druid/rpc/indexing/OverlordClientImpl.java
@@ -173,7 +173,7 @@ public ListenableFuture<Map<String, TaskStatus>> taskStatuses(final Set<String>
             new BytesFullResponseHandler()
         ),
         holder ->
-            JacksonUtils.readValue(jsonMapper, holder.getContent(), new TypeReference<Map<String, TaskStatus>>() {})
+            JacksonUtils.readValue(jsonMapper, holder.getContent(), new TypeReference<>() {})
     );
   }
 
@@ -208,7 +208,7 @@ public ListenableFuture<Map<String, List<Interval>>> findLockedIntervals(
           final Map<String, List<Interval>> response = JacksonUtils.readValue(
               jsonMapper,
               holder.getContent(),
-              new TypeReference<Map<String, List<Interval>>>() {}
+              new TypeReference<>() {}
           );
 
           return response == null ? Collections.emptyMap() : response;
@@ -255,7 +255,7 @@ public ListenableFuture<List<IndexingWorkerInfo>> getWorkers()
             new BytesFullResponseHandler()
         ),
         holder ->
-            JacksonUtils.readValue(jsonMapper, holder.getContent(), new TypeReference<List<IndexingWorkerInfo>>() {})
+            JacksonUtils.readValue(jsonMapper, holder.getContent(), new TypeReference<>() {})
     );
   }
 
diff --git a/server/src/main/java/org/apache/druid/rpc/indexing/SpecificTaskServiceLocator.java b/server/src/main/java/org/apache/druid/rpc/indexing/SpecificTaskServiceLocator.java
index 689cbdce3072..a0c2d5a0272c 100644
--- a/server/src/main/java/org/apache/druid/rpc/indexing/SpecificTaskServiceLocator.java
+++ b/server/src/main/java/org/apache/druid/rpc/indexing/SpecificTaskServiceLocator.java
@@ -113,7 +113,7 @@ public ListenableFuture<ServiceLocations> locate()
 
         Futures.addCallback(
             taskStatusFuture,
-            new FutureCallback<Map<String, TaskStatus>>()
+            new FutureCallback<>()
             {
               @Override
               public void onSuccess(final Map<String, TaskStatus> taskStatusMap)
@@ -241,7 +241,7 @@ private void fetchFallbackTaskLocation()
 
         Futures.addCallback(
             taskStatusFuture,
-            new FutureCallback<TaskStatusResponse>()
+            new FutureCallback<>()
             {
               @Override
               public void onSuccess(final TaskStatusResponse taskStatusResponse)
diff --git a/server/src/main/java/org/apache/druid/segment/indexing/granularity/BaseGranularitySpec.java b/server/src/main/java/org/apache/druid/segment/indexing/granularity/BaseGranularitySpec.java
index ac9fdcae7e16..17185bac7f49 100644
--- a/server/src/main/java/org/apache/druid/segment/indexing/granularity/BaseGranularitySpec.java
+++ b/server/src/main/java/org/apache/druid/segment/indexing/granularity/BaseGranularitySpec.java
@@ -85,7 +85,7 @@ public Map<String, Object> asMap(ObjectMapper objectMapper)
   {
     return objectMapper.convertValue(
         this,
-        new TypeReference<Map<String, Object>>() {}
+        new TypeReference<>() {}
     );
   }
 
diff --git a/server/src/main/java/org/apache/druid/segment/loading/LocalDataSegmentPuller.java b/server/src/main/java/org/apache/druid/segment/loading/LocalDataSegmentPuller.java
index 27807a5c3c87..af75ba8f3119 100644
--- a/server/src/main/java/org/apache/druid/segment/loading/LocalDataSegmentPuller.java
+++ b/server/src/main/java/org/apache/druid/segment/loading/LocalDataSegmentPuller.java
@@ -220,7 +220,7 @@ public Predicate<Throwable> shouldRetryPredicate()
     // not found, there's only so much that retries would do (unless the file was temporarily absent for some reason).
     // Since this is not a commonly used puller in production, and in general is more useful in testing/debugging,
     // I do not have a good sense of what kind of Exceptions people would expect to encounter in the wild
-    return new Predicate<Throwable>()
+    return new Predicate<>()
     {
       @Override
       public boolean apply(Throwable input)
diff --git a/server/src/main/java/org/apache/druid/segment/loading/RoundRobinStorageLocationSelectorStrategy.java b/server/src/main/java/org/apache/druid/segment/loading/RoundRobinStorageLocationSelectorStrategy.java
index 95e57f5130e4..3d14f8eda0b6 100644
--- a/server/src/main/java/org/apache/druid/segment/loading/RoundRobinStorageLocationSelectorStrategy.java
+++ b/server/src/main/java/org/apache/druid/segment/loading/RoundRobinStorageLocationSelectorStrategy.java
@@ -47,7 +47,7 @@ public RoundRobinStorageLocationSelectorStrategy(@JacksonInject List<StorageLoca
   @Override
   public Iterator<StorageLocation> getLocations()
   {
-    return new Iterator<StorageLocation>()
+    return new Iterator<>()
     {
 
       private final int numStorageLocations = storageLocations.size();
diff --git a/server/src/main/java/org/apache/druid/segment/metadata/SegmentMetadataQuerySegmentWalker.java b/server/src/main/java/org/apache/druid/segment/metadata/SegmentMetadataQuerySegmentWalker.java
index 68f264cebb48..6e721b552ca0 100644
--- a/server/src/main/java/org/apache/druid/segment/metadata/SegmentMetadataQuerySegmentWalker.java
+++ b/server/src/main/java/org/apache/druid/segment/metadata/SegmentMetadataQuerySegmentWalker.java
@@ -96,7 +96,7 @@ public <T> QueryRunner<T> getQueryRunnerForIntervals(Query<T> query, Iterable<In
   @Override
   public <T> QueryRunner<T> getQueryRunnerForSegments(Query<T> query, Iterable<SegmentDescriptor> specs)
   {
-    return decorateRunner(query, new QueryRunner<T>()
+    return decorateRunner(query, new QueryRunner<>()
     {
       @Override
       public Sequence<T> run(final QueryPlus<T> queryPlus, final ResponseContext responseContext)
diff --git a/server/src/main/java/org/apache/druid/segment/realtime/appenderator/BatchAppenderator.java b/server/src/main/java/org/apache/druid/segment/realtime/appenderator/BatchAppenderator.java
index 16ac5ebfb969..2c6fe0f8769b 100644
--- a/server/src/main/java/org/apache/druid/segment/realtime/appenderator/BatchAppenderator.java
+++ b/server/src/main/java/org/apache/druid/segment/realtime/appenderator/BatchAppenderator.java
@@ -397,7 +397,7 @@ public AppenderatorAddResult add(
 
       Futures.addCallback(
           persistAll(null),
-          new FutureCallback<Object>()
+          new FutureCallback<>()
           {
             @Override
             public void onSuccess(@Nullable Object result)
diff --git a/server/src/main/java/org/apache/druid/segment/realtime/appenderator/StreamAppenderator.java b/server/src/main/java/org/apache/druid/segment/realtime/appenderator/StreamAppenderator.java
index 71ba15fff68e..9597ae0b54cb 100644
--- a/server/src/main/java/org/apache/druid/segment/realtime/appenderator/StreamAppenderator.java
+++ b/server/src/main/java/org/apache/druid/segment/realtime/appenderator/StreamAppenderator.java
@@ -439,7 +439,7 @@ public AppenderatorAddResult add(
 
         Futures.addCallback(
             persistAll(committerSupplier == null ? null : committerSupplier.get()),
-            new FutureCallback<Object>()
+            new FutureCallback<>()
             {
               @Override
               public void onSuccess(@Nullable Object result)
@@ -684,7 +684,7 @@ public ListenableFuture<Object> persistAll(@Nullable final Committer committer)
     final Stopwatch persistStopwatch = Stopwatch.createStarted();
     AtomicLong totalPersistedRows = new AtomicLong(numPersistedRows);
     final ListenableFuture<Object> future = persistExecutor.submit(
-        new Callable<Object>()
+        new Callable<>()
         {
           @Override
           public Object call() throws IOException
diff --git a/server/src/main/java/org/apache/druid/segment/realtime/sink/Sink.java b/server/src/main/java/org/apache/druid/segment/realtime/sink/Sink.java
index 702bc3e77adb..6d7e963208c5 100644
--- a/server/src/main/java/org/apache/druid/segment/realtime/sink/Sink.java
+++ b/server/src/main/java/org/apache/druid/segment/realtime/sink/Sink.java
@@ -443,7 +443,7 @@ public Iterator<FireHydrant> iterator()
   {
     return Iterators.filter(
         hydrants.iterator(),
-        new Predicate<FireHydrant>()
+        new Predicate<>()
         {
           @Override
           public boolean apply(FireHydrant input)
diff --git a/server/src/main/java/org/apache/druid/server/ClientInfoResource.java b/server/src/main/java/org/apache/druid/server/ClientInfoResource.java
index e6632edfe5ea..7a404faf7c92 100644
--- a/server/src/main/java/org/apache/druid/server/ClientInfoResource.java
+++ b/server/src/main/java/org/apache/druid/server/ClientInfoResource.java
@@ -162,7 +162,7 @@ KEY_METRICS, getDataSourceMetrics(dataSourceName, interval)
       return Collections.emptyMap();
     }
     Map<Interval, Object> servedIntervals = new TreeMap<>(
-        new Comparator<Interval>()
+        new Comparator<>()
         {
           @Override
           public int compare(Interval o1, Interval o2)
diff --git a/server/src/main/java/org/apache/druid/server/ClientQuerySegmentWalker.java b/server/src/main/java/org/apache/druid/server/ClientQuerySegmentWalker.java
index b75161bdde6d..6b5b89124ceb 100644
--- a/server/src/main/java/org/apache/druid/server/ClientQuerySegmentWalker.java
+++ b/server/src/main/java/org/apache/druid/server/ClientQuerySegmentWalker.java
@@ -46,7 +46,6 @@
 import org.apache.druid.query.FrameSignaturePair;
 import org.apache.druid.query.GlobalTableDataSource;
 import org.apache.druid.query.InlineDataSource;
-import org.apache.druid.query.PostProcessingOperator;
 import org.apache.druid.query.Query;
 import org.apache.druid.query.QueryContext;
 import org.apache.druid.query.QueryContexts;
@@ -513,7 +512,7 @@ private <T> DataSource inlineIfNecessary(
       } else {
         // Cannot inline subquery. Attempt to inline one level deeper, and then try again.
 
-        List<DataSource> newDataSources = new ArrayList<DataSource>();
+        List<DataSource> newDataSources = new ArrayList<>();
         for (DataSource ds : dataSource.getChildren()) {
           newDataSources.add(
               inlineIfNecessary(
@@ -595,9 +594,7 @@ private <T> QueryRunner<T> decorateClusterRunner(Query<T> query, QueryRunner<T>
         .postProcess(
             objectMapper.convertValue(
                 query.context().getString("postProcessing"),
-                new TypeReference<PostProcessingOperator<T>>()
-                {
-                }
+                new TypeReference<>() {}
             )
         )
         .map(
diff --git a/server/src/main/java/org/apache/druid/server/QueryLifecycle.java b/server/src/main/java/org/apache/druid/server/QueryLifecycle.java
index c4ead8bedce7..292ad958e509 100644
--- a/server/src/main/java/org/apache/druid/server/QueryLifecycle.java
+++ b/server/src/main/java/org/apache/druid/server/QueryLifecycle.java
@@ -173,7 +173,7 @@ public <T> QueryResponse<T> runSimple(
      * cannot be moved into execute().  We leave this as an exercise for the future, however as this oddity
      * was discovered while just trying to expose HTTP response headers
      */
-    return new QueryResponse<T>(
+    return new QueryResponse<>(
         Sequences.wrap(
             results,
             new SequenceWrapper()
@@ -314,7 +314,7 @@ public <T> QueryResponse<T> execute()
                                   .withIdentity(authenticationResult.getIdentity())
                                   .run(texasRanger, responseContext);
 
-    return new QueryResponse<T>(res == null ? Sequences.empty() : res, responseContext);
+    return new QueryResponse<>(res == null ? Sequences.empty() : res, responseContext);
   }
 
   /**
diff --git a/server/src/main/java/org/apache/druid/server/QueryResponse.java b/server/src/main/java/org/apache/druid/server/QueryResponse.java
index d590c5014ef5..aa6b07c8e381 100644
--- a/server/src/main/java/org/apache/druid/server/QueryResponse.java
+++ b/server/src/main/java/org/apache/druid/server/QueryResponse.java
@@ -35,7 +35,7 @@ public QueryResponse(final Sequence<T> results, final ResponseContext responseCo
 
   public static <T> QueryResponse<T> withEmptyContext(Sequence<T> results)
   {
-    return new QueryResponse<T>(results, ResponseContext.createEmpty());
+    return new QueryResponse<>(results, ResponseContext.createEmpty());
   }
 
   public Sequence<T> getResults()
diff --git a/server/src/main/java/org/apache/druid/server/coordination/BatchDataSegmentAnnouncer.java b/server/src/main/java/org/apache/druid/server/coordination/BatchDataSegmentAnnouncer.java
index cf407102c5a7..d95dee729af0 100644
--- a/server/src/main/java/org/apache/druid/server/coordination/BatchDataSegmentAnnouncer.java
+++ b/server/src/main/java/org/apache/druid/server/coordination/BatchDataSegmentAnnouncer.java
@@ -73,7 +73,7 @@ public class BatchDataSegmentAnnouncer implements DataSegmentAnnouncer
   private final Object lock = new Object();
   private final AtomicLong counter = new AtomicLong(0);
 
-  private final Set<SegmentZNode> availableZNodes = new ConcurrentSkipListSet<SegmentZNode>();
+  private final Set<SegmentZNode> availableZNodes = new ConcurrentSkipListSet<>();
   private final ConcurrentMap<DataSegment, SegmentZNode> segmentLookup = new ConcurrentHashMap<>();
   private final Function<DataSegment, DataSegment> segmentTransformer;
 
@@ -348,7 +348,7 @@ public ListenableFuture<ChangeRequestsSnapshot<DataSegmentChangeRequest>> getSeg
       synchronized (lock) {
         Iterable<DataSegmentChangeRequest> segments = Iterables.transform(
             segmentLookup.keySet(),
-            new Function<DataSegment, DataSegmentChangeRequest>()
+            new Function<>()
             {
               @Nullable
               @Override
@@ -361,7 +361,7 @@ public SegmentChangeRequestLoad apply(DataSegment input)
 
         Iterable<DataSegmentChangeRequest> sinkSchema = Iterables.transform(
             taskSinkSchema.values(),
-            new Function<SegmentSchemas, DataSegmentChangeRequest>()
+            new Function<>()
             {
               @Override
               public SegmentSchemasChangeRequest apply(SegmentSchemas input)
@@ -433,9 +433,7 @@ public Set<DataSegment> getSegments()
       try {
         return jsonMapper.readValue(
             bytes,
-            new TypeReference<Set<DataSegment>>()
-            {
-            }
+            new TypeReference<>() {}
         );
       }
       catch (Exception e) {
diff --git a/server/src/main/java/org/apache/druid/server/coordination/ChangeRequestHttpSyncer.java b/server/src/main/java/org/apache/druid/server/coordination/ChangeRequestHttpSyncer.java
index ef14b901b6c8..6db1eac5d5d6 100644
--- a/server/src/main/java/org/apache/druid/server/coordination/ChangeRequestHttpSyncer.java
+++ b/server/src/main/java/org/apache/druid/server/coordination/ChangeRequestHttpSyncer.java
@@ -256,7 +256,7 @@ private void sendSyncRequest()
 
       Futures.addCallback(
           syncRequestFuture,
-          new FutureCallback<InputStream>()
+          new FutureCallback<>()
           {
             @Override
             public void onSuccess(InputStream stream)
diff --git a/server/src/main/java/org/apache/druid/server/coordinator/loading/HttpLoadQueuePeon.java b/server/src/main/java/org/apache/druid/server/coordinator/loading/HttpLoadQueuePeon.java
index cea693a56757..2a6e03c8d1db 100644
--- a/server/src/main/java/org/apache/druid/server/coordinator/loading/HttpLoadQueuePeon.java
+++ b/server/src/main/java/org/apache/druid/server/coordinator/loading/HttpLoadQueuePeon.java
@@ -219,7 +219,7 @@ private void doSegmentManagement()
 
       Futures.addCallback(
           future,
-          new FutureCallback<InputStream>()
+          new FutureCallback<>()
           {
             @Override
             public void onSuccess(InputStream result)
diff --git a/server/src/main/java/org/apache/druid/server/emitter/ComposingEmitterModule.java b/server/src/main/java/org/apache/druid/server/emitter/ComposingEmitterModule.java
index dd06e855290b..254f86193a12 100644
--- a/server/src/main/java/org/apache/druid/server/emitter/ComposingEmitterModule.java
+++ b/server/src/main/java/org/apache/druid/server/emitter/ComposingEmitterModule.java
@@ -57,7 +57,7 @@ public Emitter getEmitter(ComposingEmitterConfig config, final Injector injector
 
     List<Emitter> emitters = Lists.transform(
         config.getEmitters(),
-        new Function<String, Emitter>()
+        new Function<>()
         {
           @Override
           public Emitter apply(String s)
diff --git a/server/src/main/java/org/apache/druid/server/emitter/EmitterModule.java b/server/src/main/java/org/apache/druid/server/emitter/EmitterModule.java
index 7f4821768193..164416114cd5 100644
--- a/server/src/main/java/org/apache/druid/server/emitter/EmitterModule.java
+++ b/server/src/main/java/org/apache/druid/server/emitter/EmitterModule.java
@@ -130,7 +130,9 @@ private static class EmitterProvider implements Provider<Emitter>
     @Inject
     public void inject(Injector injector)
     {
-      final List<Binding<Emitter>> emitterBindings = injector.findBindingsByType(new TypeLiteral<Emitter>() {});
+      final List<Binding<Emitter>> emitterBindings = injector.findBindingsByType(new TypeLiteral<>()
+      {
+      });
 
       if (Strings.isNullOrEmpty(emitterType)) {
         // If the emitter is unspecified, we want to default to the no-op emitter. Include empty string here too, just
diff --git a/server/src/main/java/org/apache/druid/server/http/LookupCoordinatorResource.java b/server/src/main/java/org/apache/druid/server/http/LookupCoordinatorResource.java
index e954fb521363..eedf6bc9505c 100644
--- a/server/src/main/java/org/apache/druid/server/http/LookupCoordinatorResource.java
+++ b/server/src/main/java/org/apache/druid/server/http/LookupCoordinatorResource.java
@@ -154,9 +154,7 @@ public Response updateAllLookups(
       final ObjectMapper mapper = isSmile ? smileMapper : jsonMapper;
       final Map<String, Map<String, LookupExtractorFactoryMapContainer>> map;
       try {
-        map = mapper.readValue(in, new TypeReference<Map<String, Map<String, LookupExtractorFactoryMapContainer>>>()
-        {
-        });
+        map = mapper.readValue(in, new TypeReference<>() {});
       }
       catch (IOException e) {
         return Response.status(Response.Status.BAD_REQUEST).entity(ServletResourceUtils.sanitizeException(e)).build();
diff --git a/server/src/main/java/org/apache/druid/server/http/SegmentListerResource.java b/server/src/main/java/org/apache/druid/server/http/SegmentListerResource.java
index 1486355a7768..38911950f024 100644
--- a/server/src/main/java/org/apache/druid/server/http/SegmentListerResource.java
+++ b/server/src/main/java/org/apache/druid/server/http/SegmentListerResource.java
@@ -174,7 +174,7 @@ public void onStartAsync(AsyncEvent event)
 
     Futures.addCallback(
         future,
-        new FutureCallback<ChangeRequestsSnapshot<DataSegmentChangeRequest>>()
+        new FutureCallback<>()
         {
           @Override
           public void onSuccess(ChangeRequestsSnapshot<DataSegmentChangeRequest> result)
@@ -287,7 +287,7 @@ public void onStartAsync(AsyncEvent event)
 
     Futures.addCallback(
         future,
-        new FutureCallback<List<DataSegmentChangeResponse>>()
+        new FutureCallback<>()
         {
           @Override
           public void onSuccess(List<DataSegmentChangeResponse> result)
diff --git a/server/src/main/java/org/apache/druid/server/http/ServersResource.java b/server/src/main/java/org/apache/druid/server/http/ServersResource.java
index c6b105ad16c6..001ccc177e49 100644
--- a/server/src/main/java/org/apache/druid/server/http/ServersResource.java
+++ b/server/src/main/java/org/apache/druid/server/http/ServersResource.java
@@ -85,12 +85,12 @@ private static Map<String, Object> makeFullServer(DruidServer server)
    */
   private static Map<SegmentId, DataSegment> createLazySegmentsMap(DruidServer server)
   {
-    return new AbstractMap<SegmentId, DataSegment>()
+    return new AbstractMap<>()
     {
       @Override
       public Set<Entry<SegmentId, DataSegment>> entrySet()
       {
-        return new AbstractSet<Entry<SegmentId, DataSegment>>()
+        return new AbstractSet<>()
         {
           @Override
           public Iterator<Entry<SegmentId, DataSegment>> iterator()
diff --git a/server/src/main/java/org/apache/druid/server/http/security/RulesResourceFilter.java b/server/src/main/java/org/apache/druid/server/http/security/RulesResourceFilter.java
index f314c77d7431..e48c38e0260d 100644
--- a/server/src/main/java/org/apache/druid/server/http/security/RulesResourceFilter.java
+++ b/server/src/main/java/org/apache/druid/server/http/security/RulesResourceFilter.java
@@ -58,7 +58,7 @@ public ContainerRequest filter(ContainerRequest request)
                                          .get(
                                              Iterables.indexOf(
                                                  request.getPathSegments(),
-                                                 new Predicate<PathSegment>()
+                                                 new Predicate<>()
                                                  {
                                                    @Override
                                                    public boolean apply(PathSegment input)
diff --git a/server/src/main/java/org/apache/druid/server/initialization/jetty/JettyServerInitUtils.java b/server/src/main/java/org/apache/druid/server/initialization/jetty/JettyServerInitUtils.java
index b82d79529226..72ddbe9c4387 100644
--- a/server/src/main/java/org/apache/druid/server/initialization/jetty/JettyServerInitUtils.java
+++ b/server/src/main/java/org/apache/druid/server/initialization/jetty/JettyServerInitUtils.java
@@ -67,14 +67,14 @@ public static GzipHandler wrapWithDefaultGzipHandler(final Handler handler, int
   public static void addQosFilters(ServletContextHandler handler, Injector injector)
   {
     final Set<JettyBindings.QosFilterHolder> filters =
-        injector.getInstance(Key.get(new TypeLiteral<Set<JettyBindings.QosFilterHolder>>() {}));
+        injector.getInstance(Key.get(new TypeLiteral<>() {}));
     addFilters(handler, filters);
   }
 
   public static void addExtensionFilters(ServletContextHandler handler, Injector injector)
   {
     final Set<ServletFilterHolder> filters =
-        injector.getInstance(Key.get(new TypeLiteral<Set<ServletFilterHolder>>() {}));
+        injector.getInstance(Key.get(new TypeLiteral<>() {}));
     addFilters(handler, filters);
   }
 
diff --git a/server/src/main/java/org/apache/druid/server/listener/resource/AbstractListenerHandler.java b/server/src/main/java/org/apache/druid/server/listener/resource/AbstractListenerHandler.java
index 5553b7320c27..1f89fb3f3567 100644
--- a/server/src/main/java/org/apache/druid/server/listener/resource/AbstractListenerHandler.java
+++ b/server/src/main/java/org/apache/druid/server/listener/resource/AbstractListenerHandler.java
@@ -87,7 +87,7 @@ public final Response handlePOSTAll(final InputStream inputStream, final ObjectM
       // Now do the ACTUAL conversion
       inObjMap = ImmutableMap.copyOf(Maps.transformValues(
           tempMap,
-          new Function<Object, ObjType>()
+          new Function<>()
           {
             @Override
             public ObjType apply(Object input)
diff --git a/server/src/main/java/org/apache/druid/server/log/DefaultRequestLogEventBuilderFactory.java b/server/src/main/java/org/apache/druid/server/log/DefaultRequestLogEventBuilderFactory.java
index 08eb2b72830d..712874187697 100644
--- a/server/src/main/java/org/apache/druid/server/log/DefaultRequestLogEventBuilderFactory.java
+++ b/server/src/main/java/org/apache/druid/server/log/DefaultRequestLogEventBuilderFactory.java
@@ -44,7 +44,7 @@ private DefaultRequestLogEventBuilderFactory()
   @Override
   public ServiceEventBuilder<RequestLogEvent> createRequestLogEventBuilder(String feed, RequestLogLine requestLogLine)
   {
-    return new ServiceEventBuilder<RequestLogEvent>()
+    return new ServiceEventBuilder<>()
     {
       @Override
       public RequestLogEvent build(ImmutableMap<String, String> serviceDimensions)
diff --git a/server/src/main/java/org/apache/druid/server/log/FileRequestLogger.java b/server/src/main/java/org/apache/druid/server/log/FileRequestLogger.java
index 35a10d9a8f2f..a4fe842f3cb5 100644
--- a/server/src/main/java/org/apache/druid/server/log/FileRequestLogger.java
+++ b/server/src/main/java/org/apache/druid/server/log/FileRequestLogger.java
@@ -102,7 +102,7 @@ public void start()
           exec,
           initialDelay,
           Duration.standardDays(1),
-          new Callable<ScheduledExecutors.Signal>()
+          new Callable<>()
           {
             @Override
             public ScheduledExecutors.Signal call()
diff --git a/server/src/main/java/org/apache/druid/server/lookup/cache/LookupCoordinatorManager.java b/server/src/main/java/org/apache/druid/server/lookup/cache/LookupCoordinatorManager.java
index fcb1a81fd5fe..e914c1382231 100644
--- a/server/src/main/java/org/apache/druid/server/lookup/cache/LookupCoordinatorManager.java
+++ b/server/src/main/java/org/apache/druid/server/lookup/cache/LookupCoordinatorManager.java
@@ -104,9 +104,7 @@ public class LookupCoordinatorManager
   private static final String LOOKUP_UPDATE_REQUEST_PATH = LOOKUP_BASE_REQUEST_PATH + "/" + "updates";
 
   private static final TypeReference<LookupsState<LookupExtractorFactoryMapContainer>> LOOKUPS_STATE_TYPE_REFERENCE =
-      new TypeReference<LookupsState<LookupExtractorFactoryMapContainer>>()
-      {
-      };
+      new TypeReference<>() {};
 
   private static final EmittingLogger LOG = new EmittingLogger(LookupCoordinatorManager.class);
 
@@ -321,7 +319,7 @@ public Collection<HostAndPort> discoverNodesInTier(String tier)
     Preconditions.checkState(lifecycleLock.awaitStarted(5, TimeUnit.SECONDS), "not started");
     return Collections2.transform(
         lookupNodeDiscovery.getNodesInTier(tier),
-        new Function<HostAndPortWithScheme, HostAndPort>()
+        new Function<>()
         {
           @Override
           public HostAndPort apply(HostAndPortWithScheme input)
@@ -490,9 +488,7 @@ private void initializeLookupsConfigWatcher()
     //Note: this call is idempotent, so multiple start() would not cause any problems.
     lookupMapConfigRef = configManager.watch(
         LOOKUP_CONFIG_KEY,
-        new TypeReference<Map<String, Map<String, LookupExtractorFactoryMapContainer>>>()
-        {
-        },
+        new TypeReference<>() {},
         null
     );
 
diff --git a/server/src/main/java/org/apache/druid/server/security/TLSCertificateCheckerModule.java b/server/src/main/java/org/apache/druid/server/security/TLSCertificateCheckerModule.java
index c8a7c9a14946..c59c21ce0c79 100644
--- a/server/src/main/java/org/apache/druid/server/security/TLSCertificateCheckerModule.java
+++ b/server/src/main/java/org/apache/druid/server/security/TLSCertificateCheckerModule.java
@@ -76,7 +76,9 @@ public TLSCertificateCheckerProvider(
     @Inject
     public void inject(Injector injector)
     {
-      final List<Binding<TLSCertificateChecker>> checkerBindings = injector.findBindingsByType(new TypeLiteral<TLSCertificateChecker>(){});
+      final List<Binding<TLSCertificateChecker>> checkerBindings = injector.findBindingsByType(new TypeLiteral<>()
+      {
+      });
 
       checker = findChecker(checkerType, checkerBindings);
       if (checker == null) {
diff --git a/server/src/test/java/org/apache/druid/catalog/model/PropertyDefnTest.java b/server/src/test/java/org/apache/druid/catalog/model/PropertyDefnTest.java
index 99714f0411ef..a8b78826e010 100644
--- a/server/src/test/java/org/apache/druid/catalog/model/PropertyDefnTest.java
+++ b/server/src/test/java/org/apache/druid/catalog/model/PropertyDefnTest.java
@@ -117,10 +117,10 @@ public void testStringList()
   @Test
   public void testClusterKeyList()
   {
-    ListPropertyDefn<ClusterKeySpec> prop = new ListPropertyDefn<ClusterKeySpec>(
+    ListPropertyDefn<ClusterKeySpec> prop = new ListPropertyDefn<>(
         "prop",
         "cluster key list",
-        new TypeReference<List<ClusterKeySpec>>() { }
+        new TypeReference<>() {}
     );
     assertEquals("prop", prop.name());
     assertEquals("cluster key list", prop.typeName());
diff --git a/server/src/test/java/org/apache/druid/client/CachingClusteredClientTest.java b/server/src/test/java/org/apache/druid/client/CachingClusteredClientTest.java
index e6d67d7d91d2..d5be2c269f31 100644
--- a/server/src/test/java/org/apache/druid/client/CachingClusteredClientTest.java
+++ b/server/src/test/java/org/apache/druid/client/CachingClusteredClientTest.java
@@ -273,7 +273,7 @@ public static Iterable<Object[]> constructorFeeder()
   {
     return Lists.transform(
         Lists.newArrayList(new RangeIterable(RANDOMNESS)),
-        new Function<Integer, Object[]>()
+        new Function<>()
         {
           @Override
           public Object[] apply(Integer input)
@@ -1900,7 +1900,7 @@ public void testQueryCachingWithFilter(
             results.add(expectation.getResults());
           }
           EasyMock.expect(queryable.run(EasyMock.capture(capture), EasyMock.capture(context)))
-                  .andAnswer(new IAnswer<Sequence>()
+                  .andAnswer(new IAnswer<>()
                   {
                     @Override
                     public Sequence answer()
@@ -2259,7 +2259,7 @@ private Sequence<Result<TimeseriesResultValue>> toQueryableTimeseriesResults(
               .trinaryTransform(
                   intervals,
                   results,
-                  new TrinaryFn<SegmentId, Interval, Iterable<Result<TimeseriesResultValue>>, Result<TimeseriesResultValue>>()
+                  new TrinaryFn<>()
                   {
                     @Override
                     @SuppressWarnings("unchecked")
@@ -2298,7 +2298,7 @@ private Sequence<Result<TopNResultValue>> toQueryableTopNResults(
             .trinaryTransform(
                 intervals,
                 results,
-                new TrinaryFn<SegmentId, Interval, Iterable<Result<TopNResultValue>>, Result<TopNResultValue>>()
+                new TrinaryFn<>()
                 {
                   @Override
                   @SuppressWarnings("unchecked")
@@ -2334,7 +2334,7 @@ private Sequence<Result<SearchResultValue>> toQueryableSearchResults(
             .trinaryTransform(
                 intervals,
                 results,
-                new TrinaryFn<SegmentId, Interval, Iterable<Result<SearchResultValue>>, Result<SearchResultValue>>()
+                new TrinaryFn<>()
                 {
                   @Override
                   @SuppressWarnings("unchecked")
@@ -2371,7 +2371,7 @@ private Sequence<Result> toQueryableGroupByResults(
             .trinaryTransform(
                 intervals,
                 results,
-                new TrinaryFn<SegmentId, Interval, Iterable<ResultRow>, Result>()
+                new TrinaryFn<>()
                 {
                   @Override
                   @SuppressWarnings("unchecked")
@@ -2415,7 +2415,7 @@ private Sequence<Result<TimeBoundaryResultValue>> toQueryableTimeBoundaryResults
             .trinaryTransform(
                 intervals,
                 results,
-                new TrinaryFn<SegmentId, Interval, Iterable<Result<TimeBoundaryResultValue>>, Result<TimeBoundaryResultValue>>()
+                new TrinaryFn<>()
                 {
                   @Override
                   @SuppressWarnings("unchecked")
diff --git a/server/src/test/java/org/apache/druid/client/CoordinatorServerViewTest.java b/server/src/test/java/org/apache/druid/client/CoordinatorServerViewTest.java
index df58f0519390..19ad1c8a45f0 100644
--- a/server/src/test/java/org/apache/druid/client/CoordinatorServerViewTest.java
+++ b/server/src/test/java/org/apache/druid/client/CoordinatorServerViewTest.java
@@ -197,7 +197,7 @@ public void testMultipleServerAddedRemovedSegment() throws Exception
 
     final List<DruidServer> druidServers = Lists.transform(
         ImmutableList.of("localhost:0", "localhost:1", "localhost:2", "localhost:3", "localhost:4"),
-        new Function<String, DruidServer>()
+        new Function<>()
         {
           @Override
           public DruidServer apply(String input)
@@ -226,7 +226,7 @@ public DruidServer apply(String input)
             Pair.of("2011-04-01/2011-04-09", "v2"),
             Pair.of("2011-04-06/2011-04-09", "v3"),
             Pair.of("2011-04-01/2011-04-02", "v3")
-        ), new Function<Pair<String, String>, DataSegment>()
+        ), new Function<>()
         {
           @Override
           public DataSegment apply(Pair<String, String> input)
diff --git a/server/src/test/java/org/apache/druid/client/JsonParserIteratorTest.java b/server/src/test/java/org/apache/druid/client/JsonParserIteratorTest.java
index ab0e44c04303..ff617d9eaccf 100644
--- a/server/src/test/java/org/apache/druid/client/JsonParserIteratorTest.java
+++ b/server/src/test/java/org/apache/druid/client/JsonParserIteratorTest.java
@@ -254,7 +254,7 @@ public void testTimeoutBeforeCallingFuture()
     @Test
     public void testTimeoutWhileCallingFuture()
     {
-      Future<InputStream> future = new AbstractFuture<InputStream>()
+      Future<InputStream> future = new AbstractFuture<>()
       {
         @Override
         public InputStream get(long timeout, TimeUnit unit)
diff --git a/server/src/test/java/org/apache/druid/client/RangeIterable.java b/server/src/test/java/org/apache/druid/client/RangeIterable.java
index 64ec9d93481b..4cabb0f2fd86 100644
--- a/server/src/test/java/org/apache/druid/client/RangeIterable.java
+++ b/server/src/test/java/org/apache/druid/client/RangeIterable.java
@@ -58,7 +58,7 @@ public RangeIterable(
   @Override
   public Iterator<Integer> iterator()
   {
-    return new Iterator<Integer>()
+    return new Iterator<>()
     {
       private int curr = start;
 
diff --git a/server/src/test/java/org/apache/druid/client/cache/BytesBoundedLinkedQueueTest.java b/server/src/test/java/org/apache/druid/client/cache/BytesBoundedLinkedQueueTest.java
index b01ad7993117..b4c1ea833630 100644
--- a/server/src/test/java/org/apache/druid/client/cache/BytesBoundedLinkedQueueTest.java
+++ b/server/src/test/java/org/apache/druid/client/cache/BytesBoundedLinkedQueueTest.java
@@ -45,7 +45,7 @@ public class BytesBoundedLinkedQueueTest
 
   private static BlockingQueue<TestObject> getQueue(final int capacity)
   {
-    return new BytesBoundedLinkedQueue<TestObject>(capacity)
+    return new BytesBoundedLinkedQueue<>(capacity)
     {
       @Override
       public long getBytesSize(TestObject o)
@@ -91,7 +91,7 @@ public void testTake() throws Exception
     final CountDownLatch latch = new CountDownLatch(1);
     final TestObject object = new TestObject(4);
     Future<TestObject> future = exec.submit(
-        new Callable<TestObject>()
+        new Callable<>()
         {
           @Override
           public TestObject call() throws Exception
@@ -139,7 +139,7 @@ public void testOfferAndPut() throws Exception
     final CyclicBarrier barrier = new CyclicBarrier(2);
 
     Future<Boolean> future = exec.submit(
-        new Callable<Boolean>()
+        new Callable<>()
         {
           @Override
           public Boolean call() throws Exception
diff --git a/server/src/test/java/org/apache/druid/client/cache/MemcachedCacheTest.java b/server/src/test/java/org/apache/druid/client/cache/MemcachedCacheTest.java
index 7c1cfebae97a..f87c7b679cc5 100644
--- a/server/src/test/java/org/apache/druid/client/cache/MemcachedCacheTest.java
+++ b/server/src/test/java/org/apache/druid/client/cache/MemcachedCacheTest.java
@@ -352,7 +352,7 @@ public Cache get()
 
 class MockMemcachedClient implements MemcachedClientIF
 {
-  private final ConcurrentMap<String, CachedData> theMap = new ConcurrentHashMap<String, CachedData>();
+  private final ConcurrentMap<String, CachedData> theMap = new ConcurrentHashMap<>();
   private final SerializingTranscoder transcoder;
 
   public MockMemcachedClient()
@@ -504,7 +504,7 @@ public <T> Future<Boolean> set(String key, int exp, T o, Transcoder<T> tc)
   {
     theMap.put(key, tc.encode(o));
 
-    return new Future<Boolean>()
+    return new Future<>()
     {
       @Override
       public boolean cancel(boolean b)
@@ -562,7 +562,7 @@ public <T> Future<T> asyncGet(String key, final Transcoder<T> tc)
     CachedData data = theMap.get(key);
     final T theValue = data != null ? tc.decode(data) : null;
 
-    return new Future<T>()
+    return new Future<>()
     {
       @Override
       public boolean cancel(boolean b)
@@ -678,7 +678,7 @@ public <T> BulkFuture<Map<String, T>> asyncGetBulk(Collection<String> keys, Iter
   @Override
   public <T> BulkFuture<Map<String, T>> asyncGetBulk(final Iterator<String> keys, final Transcoder<T> tc)
   {
-    return new BulkFuture<Map<String, T>>()
+    return new BulkFuture<>()
     {
       @Override
       public boolean isTimeout()
diff --git a/server/src/test/java/org/apache/druid/client/client/BatchServerInventoryViewTest.java b/server/src/test/java/org/apache/druid/client/client/BatchServerInventoryViewTest.java
index 330fe98332de..86ee872dafed 100644
--- a/server/src/test/java/org/apache/druid/client/client/BatchServerInventoryViewTest.java
+++ b/server/src/test/java/org/apache/druid/client/client/BatchServerInventoryViewTest.java
@@ -197,7 +197,7 @@ public String getBase()
         },
         cf,
         jsonMapper,
-        new Predicate<Pair<DruidServerMetadata, DataSegment>>()
+        new Predicate<>()
         {
           @Override
           public boolean apply(@Nullable Pair<DruidServerMetadata, DataSegment> input)
@@ -324,7 +324,7 @@ public void testRunWithFilterCallback() throws Exception
             )
         )
         .andAnswer(
-            new IAnswer<ServerView.CallbackAction>()
+            new IAnswer<>()
             {
               @Override
               public ServerView.CallbackAction answer()
@@ -342,7 +342,7 @@ public ServerView.CallbackAction answer()
     filteredBatchServerInventoryView.registerSegmentCallback(
         Execs.directExecutor(),
         callback,
-        new Predicate<Pair<DruidServerMetadata, DataSegment>>()
+        new Predicate<>()
         {
           @Override
           public boolean apply(@Nullable Pair<DruidServerMetadata, DataSegment> input)
@@ -443,7 +443,7 @@ public void testSameTimeZnode() throws Exception
       final int ii = i;
       futures.add(
           executor.submit(
-              new Callable<BatchDataSegmentAnnouncer>()
+              new Callable<>()
               {
                 @Override
                 public BatchDataSegmentAnnouncer call()
@@ -477,7 +477,7 @@ public String getBase()
                       announcer,
                       jsonMapper
                   );
-                  List<DataSegment> segments = new ArrayList<DataSegment>();
+                  List<DataSegment> segments = new ArrayList<>();
                   try {
                     for (int j = 0; j < INITIAL_SEGMENTS / numThreads; ++j) {
                       segments.add(makeSegment(INITIAL_SEGMENTS + ii + numThreads * j));
diff --git a/server/src/test/java/org/apache/druid/guice/JoinableFactoryModuleTest.java b/server/src/test/java/org/apache/druid/guice/JoinableFactoryModuleTest.java
index 4c2727f07d2d..71dca5020189 100644
--- a/server/src/test/java/org/apache/druid/guice/JoinableFactoryModuleTest.java
+++ b/server/src/test/java/org/apache/druid/guice/JoinableFactoryModuleTest.java
@@ -72,10 +72,10 @@ public void testInjectJoinableFactoryIsSingleton()
   public void testInjectDefaultBindingsShouldBeInjected()
   {
     final Set<JoinableFactory> factories =
-        injector.getInstance(Key.get(new TypeLiteral<Set<JoinableFactory>>() {}));
+        injector.getInstance(Key.get(new TypeLiteral<>() {}));
     Assert.assertEquals(JoinableFactoryModule.FACTORY_MAPPINGS.size(), factories.size());
     Map<Class<? extends JoinableFactory>, Class<? extends DataSource>> joinableFactoriesMappings = injector.getInstance(
-        Key.get(new TypeLiteral<Map<Class<? extends JoinableFactory>, Class<? extends DataSource>>>() {})
+        Key.get(new TypeLiteral<>() {})
     );
     assertDefaultFactories(joinableFactoriesMappings);
   }
@@ -90,9 +90,9 @@ public void testJoinableFactoryCanBind()
         }
     );
     Map<Class<? extends JoinableFactory>, Class<? extends DataSource>> joinableFactoriesMappings = injector.getInstance(
-        Key.get(new TypeLiteral<Map<Class<? extends JoinableFactory>, Class<? extends DataSource>>>() {})
+        Key.get(new TypeLiteral<>() {})
     );
-    Set<JoinableFactory> factories = injector.getInstance(Key.get(new TypeLiteral<Set<JoinableFactory>>() {}));
+    Set<JoinableFactory> factories = injector.getInstance(Key.get(new TypeLiteral<>() {}));
 
     Assert.assertEquals(JoinableFactoryModule.FACTORY_MAPPINGS.size() + 1, factories.size());
     Assert.assertEquals(NoopDataSource.class, joinableFactoriesMappings.get(NoopJoinableFactory.class));
diff --git a/server/src/test/java/org/apache/druid/initialization/ServerInjectorBuilderTest.java b/server/src/test/java/org/apache/druid/initialization/ServerInjectorBuilderTest.java
index b45424b075bc..b8fd387888c2 100644
--- a/server/src/test/java/org/apache/druid/initialization/ServerInjectorBuilderTest.java
+++ b/server/src/test/java/org/apache/druid/initialization/ServerInjectorBuilderTest.java
@@ -67,7 +67,7 @@ public void test03ClassLoaderExtensionsLoading()
     Injector startupInjector = startupInjector();
     ExtensionsLoader extnLoader = ExtensionsLoader.instance(startupInjector);
 
-    Function<DruidModule, String> fnClassName = new Function<DruidModule, String>()
+    Function<DruidModule, String> fnClassName = new Function<>()
     {
       @Nullable
       @Override
diff --git a/server/src/test/java/org/apache/druid/messages/MessageBatchTest.java b/server/src/test/java/org/apache/druid/messages/MessageBatchTest.java
index bcf9fb3423d1..840ee9b88724 100644
--- a/server/src/test/java/org/apache/druid/messages/MessageBatchTest.java
+++ b/server/src/test/java/org/apache/druid/messages/MessageBatchTest.java
@@ -37,7 +37,7 @@ public void test_serde() throws IOException
     final ObjectMapper objectMapper = TestHelper.JSON_MAPPER;
     final MessageBatch<String> batch = new MessageBatch<>(ImmutableList.of("foo", "bar"), 123L, 456L);
     final MessageBatch<String> batch2 =
-        objectMapper.readValue(objectMapper.writeValueAsBytes(batch), new TypeReference<MessageBatch<String>>() {});
+        objectMapper.readValue(objectMapper.writeValueAsBytes(batch), new TypeReference<>() {});
     Assert.assertEquals(batch, batch2);
   }
 
diff --git a/server/src/test/java/org/apache/druid/metadata/SQLMetadataStorageActionHandlerTest.java b/server/src/test/java/org/apache/druid/metadata/SQLMetadataStorageActionHandlerTest.java
index 8117d6dcb735..56ff7751efb3 100644
--- a/server/src/test/java/org/apache/druid/metadata/SQLMetadataStorageActionHandlerTest.java
+++ b/server/src/test/java/org/apache/druid/metadata/SQLMetadataStorageActionHandlerTest.java
@@ -80,30 +80,24 @@ public void setUp()
     handler = new DerbyMetadataStorageActionHandler<>(
         connector,
         JSON_MAPPER,
-        new MetadataStorageActionHandlerTypes<Map<String, Object>, Map<String, Object>, Map<String, String>, Map<String, Object>>()
+        new MetadataStorageActionHandlerTypes<>()
         {
           @Override
           public TypeReference<Map<String, Object>> getEntryType()
           {
-            return new TypeReference<Map<String, Object>>()
-            {
-            };
+            return new TypeReference<>() {};
           }
 
           @Override
           public TypeReference<Map<String, Object>> getStatusType()
           {
-            return new TypeReference<Map<String, Object>>()
-            {
-            };
+            return new TypeReference<>() {};
           }
 
           @Override
           public TypeReference<Map<String, Object>> getLockType()
           {
-            return new TypeReference<Map<String, Object>>()
-            {
-            };
+            return new TypeReference<>() {};
           }
         },
         entryType,
diff --git a/server/src/test/java/org/apache/druid/segment/metadata/SegmentMetadataQuerySegmentWalkerTest.java b/server/src/test/java/org/apache/druid/segment/metadata/SegmentMetadataQuerySegmentWalkerTest.java
index 99ec5a4068f9..3ad88baf81ec 100644
--- a/server/src/test/java/org/apache/druid/segment/metadata/SegmentMetadataQuerySegmentWalkerTest.java
+++ b/server/src/test/java/org/apache/druid/segment/metadata/SegmentMetadataQuerySegmentWalkerTest.java
@@ -376,7 +376,8 @@ private List<SegmentAnalysis> toSegmentAnalysis(List<ServerExpectation> serverEx
       SegmentAnalysis mockSegmentAnalysis = EasyMock.mock(SegmentAnalysis.class);
       EasyMock.expect(mockSegmentAnalysis.getId()).andReturn(serverExpectation.getSegmentId().toString()).anyTimes();
       EasyMock.expect(mockSegmentAnalysis.compareTo(EasyMock.isA(SegmentAnalysis.class)))
-          .andAnswer(new IAnswer<Integer>() {
+          .andAnswer(new IAnswer<>()
+          {
             @Override
             public Integer answer()
             {
diff --git a/server/src/test/java/org/apache/druid/segment/realtime/appenderator/StreamAppenderatorDriverFailTest.java b/server/src/test/java/org/apache/druid/segment/realtime/appenderator/StreamAppenderatorDriverFailTest.java
index ed3fe97d6ccb..a5b4709e919a 100644
--- a/server/src/test/java/org/apache/druid/segment/realtime/appenderator/StreamAppenderatorDriverFailTest.java
+++ b/server/src/test/java/org/apache/druid/segment/realtime/appenderator/StreamAppenderatorDriverFailTest.java
@@ -497,7 +497,7 @@ public ListenableFuture<SegmentsAndCommitMetadata> push(
         );
       } else {
         if (interruptPush) {
-          return new AbstractFuture<SegmentsAndCommitMetadata>()
+          return new AbstractFuture<>()
           {
             @Override
             public SegmentsAndCommitMetadata get(long timeout, TimeUnit unit)
diff --git a/server/src/test/java/org/apache/druid/segment/realtime/appenderator/StreamAppenderatorTest.java b/server/src/test/java/org/apache/druid/segment/realtime/appenderator/StreamAppenderatorTest.java
index eaa24af3d6c5..f9c7445a60a1 100644
--- a/server/src/test/java/org/apache/druid/segment/realtime/appenderator/StreamAppenderatorTest.java
+++ b/server/src/test/java/org/apache/druid/segment/realtime/appenderator/StreamAppenderatorTest.java
@@ -812,7 +812,7 @@ public void testMaxRowsInMemory() throws Exception
                                                   .build()) {
       final Appenderator appenderator = tester.getAppenderator();
       final AtomicInteger eventCount = new AtomicInteger(0);
-      final Supplier<Committer> committerSupplier = new Supplier<Committer>()
+      final Supplier<Committer> committerSupplier = new Supplier<>()
       {
         @Override
         public Committer get()
@@ -920,7 +920,7 @@ public void testRestoreFromDisk() throws Exception
       tuningConfig = tester.getTuningConfig();
 
       final AtomicInteger eventCount = new AtomicInteger(0);
-      final Supplier<Committer> committerSupplier = new Supplier<Committer>()
+      final Supplier<Committer> committerSupplier = new Supplier<>()
       {
         @Override
         public Committer get()
@@ -2352,7 +2352,7 @@ static InputRow ir(String ts, String dim, Object met)
 
   private static Supplier<Committer> committerSupplierFromConcurrentMap(final ConcurrentMap<String, String> map)
   {
-    return new Supplier<Committer>()
+    return new Supplier<>()
     {
       @Override
       public Committer get()
diff --git a/server/src/test/java/org/apache/druid/server/ClientInfoResourceTest.java b/server/src/test/java/org/apache/druid/server/ClientInfoResourceTest.java
index f6c880c0e205..534b58daae4b 100644
--- a/server/src/test/java/org/apache/druid/server/ClientInfoResourceTest.java
+++ b/server/src/test/java/org/apache/druid/server/ClientInfoResourceTest.java
@@ -369,7 +369,7 @@ private void addSegment(
                                      .build();
     server.addDataSegment(segment);
     ServerSelector ss = new ServerSelector(segment, new HighestPriorityTierSelectorStrategy(new RandomServerSelectorStrategy()));
-    timeline.add(Intervals.of(interval), version, new SingleElementPartitionChunk<ServerSelector>(ss));
+    timeline.add(Intervals.of(interval), version, new SingleElementPartitionChunk<>(ss));
   }
 
   private void addSegmentWithShardSpec(
diff --git a/server/src/test/java/org/apache/druid/server/QueryResourceTest.java b/server/src/test/java/org/apache/druid/server/QueryResourceTest.java
index 03af2dcea0ee..b5580f90dfec 100644
--- a/server/src/test/java/org/apache/druid/server/QueryResourceTest.java
+++ b/server/src/test/java/org/apache/druid/server/QueryResourceTest.java
@@ -298,9 +298,7 @@ public void testGoodQueryWithQueryConfigOverrideDefault() throws IOException
 
     final List<Result<TimeBoundaryResultValue>> responses = jsonMapper.readValue(
         response.baos.toByteArray(),
-        new TypeReference<List<Result<TimeBoundaryResultValue>>>()
-        {
-        }
+        new TypeReference<>() {}
     );
 
     Assert.assertEquals(0, responses.size());
@@ -625,9 +623,7 @@ public void testGoodQueryWithQueryConfigDoesNotOverrideQueryContext() throws IOE
 
     final List<Result<TimeBoundaryResultValue>> responses = jsonMapper.readValue(
         response.baos.toByteArray(),
-        new TypeReference<List<Result<TimeBoundaryResultValue>>>()
-        {
-        }
+        new TypeReference<>() {}
     );
 
     Assert.assertNotNull(response);
@@ -876,9 +872,7 @@ public Access authorize(AuthenticationResult authenticationResult, Resource reso
 
     final List<Result<TimeBoundaryResultValue>> responses = jsonMapper.readValue(
         response.baos.toByteArray(),
-        new TypeReference<List<Result<TimeBoundaryResultValue>>>()
-        {
-        }
+        new TypeReference<>() {}
     );
 
     Assert.assertEquals(0, responses.size());
diff --git a/server/src/test/java/org/apache/druid/server/QueryResultPusherTest.java b/server/src/test/java/org/apache/druid/server/QueryResultPusherTest.java
index 5b123b7cc2ac..008366392026 100644
--- a/server/src/test/java/org/apache/druid/server/QueryResultPusherTest.java
+++ b/server/src/test/java/org/apache/druid/server/QueryResultPusherTest.java
@@ -61,7 +61,7 @@ public void testResultPusherRetainsNestedExceptionBacktraces()
     QueryResource.QueryMetricCounter counter = new NoopQueryMetricCounter();
     String queryId = "someQuery";
     MediaType contentType = MediaType.APPLICATION_JSON_TYPE;
-    Map<String, String> extraHeaders = new HashMap<String, String>();
+    Map<String, String> extraHeaders = new HashMap<>();
     AtomicBoolean recordFailureInvoked = new AtomicBoolean();
 
     String embeddedExceptionMessage = "Embedded Exception Message!";
diff --git a/server/src/test/java/org/apache/druid/server/QuerySchedulerTest.java b/server/src/test/java/org/apache/druid/server/QuerySchedulerTest.java
index b670cd4dd787..40865155e55b 100644
--- a/server/src/test/java/org/apache/druid/server/QuerySchedulerTest.java
+++ b/server/src/test/java/org/apache/druid/server/QuerySchedulerTest.java
@@ -667,12 +667,12 @@ private Sequence<Integer> makeSequence(int count)
   {
     return new LazySequence<>(() -> {
       return new BaseSequence<>(
-          new BaseSequence.IteratorMaker<Integer, Iterator<Integer>>()
+          new BaseSequence.IteratorMaker<>()
           {
             @Override
             public Iterator<Integer> make()
             {
-              return new Iterator<Integer>()
+              return new Iterator<>()
               {
                 int rowCounter = 0;
 
@@ -705,12 +705,12 @@ private Sequence<Integer> makeExplodingSequence(int explodeAfter)
   {
     final int explodeAt = explodeAfter + 1;
     return new BaseSequence<>(
-        new BaseSequence.IteratorMaker<Integer, Iterator<Integer>>()
+        new BaseSequence.IteratorMaker<>()
         {
           @Override
           public Iterator<Integer> make()
           {
-            return new Iterator<Integer>()
+            return new Iterator<>()
             {
               int rowCounter = 0;
 
diff --git a/server/src/test/java/org/apache/druid/server/StatusResourceTest.java b/server/src/test/java/org/apache/druid/server/StatusResourceTest.java
index 8ea8da4b78c7..41c52382f557 100644
--- a/server/src/test/java/org/apache/druid/server/StatusResourceTest.java
+++ b/server/src/test/java/org/apache/druid/server/StatusResourceTest.java
@@ -94,7 +94,8 @@ private void testHiddenPropertiesWithPropertyFileName(String fileName) throws Ex
 
     Set<String> hiddenProperties = new ObjectMapper().readValue(
         returnedProperties.get("druid.server.hiddenProperties"),
-        new TypeReference<Set<String>>() {});
+        new TypeReference<>() {}
+    );
 
     hiddenProperties.forEach(
         (property) -> {
diff --git a/server/src/test/java/org/apache/druid/server/compaction/NewestSegmentFirstPolicyTest.java b/server/src/test/java/org/apache/druid/server/compaction/NewestSegmentFirstPolicyTest.java
index 5659a0ff5bfc..d866f996eaf8 100644
--- a/server/src/test/java/org/apache/druid/server/compaction/NewestSegmentFirstPolicyTest.java
+++ b/server/src/test/java/org/apache/druid/server/compaction/NewestSegmentFirstPolicyTest.java
@@ -1237,7 +1237,7 @@ public void testIteratorReturnsSegmentsAsSegmentsWasCompactedAndHaveDifferentFil
                     partitionsSpec,
                     null,
                     null,
-                    mapper.readValue(mapper.writeValueAsString(new TransformSpec(new SelectorDimFilter("dim1", "foo", null), null)), new TypeReference<Map<String, Object>>() {}),
+                    mapper.readValue(mapper.writeValueAsString(new TransformSpec(new SelectorDimFilter("dim1", "foo", null), null)), new TypeReference<>() {}),
                     indexSpec,
                     null
                 )
@@ -1250,7 +1250,7 @@ public void testIteratorReturnsSegmentsAsSegmentsWasCompactedAndHaveDifferentFil
                     partitionsSpec,
                     null,
                     null,
-                    mapper.readValue(mapper.writeValueAsString(new TransformSpec(new SelectorDimFilter("dim1", "bar", null), null)), new TypeReference<Map<String, Object>>() {}),
+                    mapper.readValue(mapper.writeValueAsString(new TransformSpec(new SelectorDimFilter("dim1", "bar", null), null)), new TypeReference<>() {}),
                     indexSpec,
                     null
                 )
@@ -1263,7 +1263,7 @@ public void testIteratorReturnsSegmentsAsSegmentsWasCompactedAndHaveDifferentFil
                     partitionsSpec,
                     null,
                     null,
-                    mapper.readValue(mapper.writeValueAsString(new TransformSpec(null, null)), new TypeReference<Map<String, Object>>() {}),
+                    mapper.readValue(mapper.writeValueAsString(new TransformSpec(null, null)), new TypeReference<>() {}),
                     indexSpec,
                     null
                 )
@@ -1346,7 +1346,7 @@ public void testIteratorReturnsSegmentsAsSegmentsWasCompactedAndHaveDifferentMet
                 new CompactionState(
                     partitionsSpec,
                     null,
-                    mapper.convertValue(new AggregatorFactory[] {new CountAggregatorFactory("cnt")}, new TypeReference<List<Object>>() {}),
+                    mapper.convertValue(new AggregatorFactory[] {new CountAggregatorFactory("cnt")}, new TypeReference<>() {}),
                     null,
                     indexSpec,
                     null
@@ -1359,7 +1359,7 @@ public void testIteratorReturnsSegmentsAsSegmentsWasCompactedAndHaveDifferentMet
                 new CompactionState(
                     partitionsSpec,
                     null,
-                    mapper.convertValue(new AggregatorFactory[] {new CountAggregatorFactory("cnt"), new LongSumAggregatorFactory("val", "val")}, new TypeReference<List<Object>>() {}),
+                    mapper.convertValue(new AggregatorFactory[] {new CountAggregatorFactory("cnt"), new LongSumAggregatorFactory("val", "val")}, new TypeReference<>() {}),
                     null,
                     indexSpec,
                     null
@@ -1372,7 +1372,7 @@ public void testIteratorReturnsSegmentsAsSegmentsWasCompactedAndHaveDifferentMet
                 new CompactionState(
                     partitionsSpec,
                     null,
-                    mapper.convertValue(new AggregatorFactory[] {}, new TypeReference<List<Object>>() {}),
+                    mapper.convertValue(new AggregatorFactory[] {}, new TypeReference<>() {}),
                     null,
                     indexSpec,
                     null
@@ -1464,7 +1464,7 @@ public void testIteratorReturnsSegmentsAsCompactionStateChangedWithCompactedStat
   {
     // Different indexSpec as what is set in the auto compaction config
     IndexSpec newIndexSpec = IndexSpec.builder().withBitmapSerdeFactory(new ConciseBitmapSerdeFactory()).build();
-    Map<String, Object> newIndexSpecMap = mapper.convertValue(newIndexSpec, new TypeReference<Map<String, Object>>() {});
+    Map<String, Object> newIndexSpecMap = mapper.convertValue(newIndexSpec, new TypeReference<>() {});
     PartitionsSpec partitionsSpec = CompactionStatus.findPartitionsSpecFromConfig(ClientCompactionTaskQueryTuningConfig.from(null));
 
     // Create segments that were compacted (CompactionState != null) and have segmentGranularity=DAY
diff --git a/server/src/test/java/org/apache/druid/server/coordination/ChangeRequestHistoryTest.java b/server/src/test/java/org/apache/druid/server/coordination/ChangeRequestHistoryTest.java
index 40af9d8b4369..8bd95d19d591 100644
--- a/server/src/test/java/org/apache/druid/server/coordination/ChangeRequestHistoryTest.java
+++ b/server/src/test/java/org/apache/druid/server/coordination/ChangeRequestHistoryTest.java
@@ -136,7 +136,7 @@ public void testCancel()
     final AtomicBoolean callbackExcecuted = new AtomicBoolean(false);
     Futures.addCallback(
         future,
-        new FutureCallback<ChangeRequestsSnapshot<DataSegmentChangeRequest>>()
+        new FutureCallback<>()
         {
           @Override
           public void onSuccess(ChangeRequestsSnapshot result)
@@ -194,7 +194,7 @@ public void testStop()
     final AtomicBoolean callbackExcecuted = new AtomicBoolean(false);
     Futures.addCallback(
         future,
-        new FutureCallback<ChangeRequestsSnapshot<DataSegmentChangeRequest>>()
+        new FutureCallback<>()
         {
           @Override
           public void onSuccess(ChangeRequestsSnapshot result)
diff --git a/server/src/test/java/org/apache/druid/server/coordination/ChangeRequestHttpSyncerTest.java b/server/src/test/java/org/apache/druid/server/coordination/ChangeRequestHttpSyncerTest.java
index f4dd564e13ea..b96e51f0c91f 100644
--- a/server/src/test/java/org/apache/druid/server/coordination/ChangeRequestHttpSyncerTest.java
+++ b/server/src/test/java/org/apache/druid/server/coordination/ChangeRequestHttpSyncerTest.java
@@ -54,9 +54,7 @@ public class ChangeRequestHttpSyncerTest
   public void testSimple() throws Exception
   {
     ObjectMapper jsonMapper = TestHelper.makeJsonMapper();
-    TypeReference<ChangeRequestsSnapshot<String>> typeRef = new TypeReference<ChangeRequestsSnapshot<String>>()
-    {
-    };
+    TypeReference<ChangeRequestsSnapshot<String>> typeRef = new TypeReference<>() {};
 
     TestHttpClient httpClient = new TestHttpClient(
         ImmutableList.of(
diff --git a/server/src/test/java/org/apache/druid/server/coordination/ServerManagerTest.java b/server/src/test/java/org/apache/druid/server/coordination/ServerManagerTest.java
index 2e20b907184e..e93f08c03de6 100644
--- a/server/src/test/java/org/apache/druid/server/coordination/ServerManagerTest.java
+++ b/server/src/test/java/org/apache/druid/server/coordination/ServerManagerTest.java
@@ -588,7 +588,7 @@ public void testGetQueryRunnerForSegmentsForUnknownQueryThrowingException()
     expectedException.expect(QueryUnsupportedException.class);
     expectedException.expectMessage("Unknown query type");
     serverManager.getQueryRunnerForSegments(
-        new BaseQuery<Object>(
+        new BaseQuery<>(
             new TableDataSource("test"),
             new MultipleSpecificSegmentSpec(descriptors),
             new HashMap<>()
@@ -864,9 +864,7 @@ public Function<T, T> makePreComputeManipulatorFn(QueryType query, MetricManipul
     @Override
     public TypeReference<T> getResultTypeReference()
     {
-      return new TypeReference<T>()
-      {
-      };
+      return new TypeReference<>() {};
     }
   }
 
@@ -934,7 +932,7 @@ public <OutType> Yielder<OutType> toYielder(
       }
 
       final Yielder<OutType> baseYielder = baseSequence.toYielder(initValue, accumulator);
-      return new Yielder<OutType>()
+      return new Yielder<>()
       {
         @Override
         public OutType get()
diff --git a/server/src/test/java/org/apache/druid/server/coordination/coordination/BatchDataSegmentAnnouncerTest.java b/server/src/test/java/org/apache/druid/server/coordination/coordination/BatchDataSegmentAnnouncerTest.java
index 986252d75502..98644cdc5655 100644
--- a/server/src/test/java/org/apache/druid/server/coordination/coordination/BatchDataSegmentAnnouncerTest.java
+++ b/server/src/test/java/org/apache/druid/server/coordination/coordination/BatchDataSegmentAnnouncerTest.java
@@ -606,9 +606,7 @@ public Set<DataSegment> read(String path)
       try {
         if (cf.checkExists().forPath(path) != null) {
           return jsonMapper.readValue(
-              cf.getData().forPath(path), new TypeReference<Set<DataSegment>>()
-              {
-              }
+              cf.getData().forPath(path), new TypeReference<>() {}
           );
         }
       }
diff --git a/server/src/test/java/org/apache/druid/server/coordinator/duty/CompactSegmentsTest.java b/server/src/test/java/org/apache/druid/server/coordinator/duty/CompactSegmentsTest.java
index 31789dd540ca..882bb87a25a5 100644
--- a/server/src/test/java/org/apache/druid/server/coordinator/duty/CompactSegmentsTest.java
+++ b/server/src/test/java/org/apache/druid/server/coordinator/duty/CompactSegmentsTest.java
@@ -271,7 +271,7 @@ public void testRun()
     final TestOverlordClient overlordClient = new TestOverlordClient(JSON_MAPPER);
     final CompactSegments compactSegments = new CompactSegments(statusTracker, overlordClient);
 
-    final Supplier<String> expectedVersionSupplier = new Supplier<String>()
+    final Supplier<String> expectedVersionSupplier = new Supplier<>()
     {
       private int i = 0;
 
@@ -2175,9 +2175,7 @@ private void compactSegments(
           transformSpec = jsonMapper.readValue(
               jsonMapper.writeValueAsString(new TransformSpec(clientCompactionTaskQuery.getTransformSpec()
                                                                                        .getFilter(), null)),
-              new TypeReference<Map<String, Object>>()
-              {
-              }
+              new TypeReference<>() {}
           );
         }
       }
@@ -2187,7 +2185,7 @@ private void compactSegments(
 
       List<Object> metricsSpec = null;
       if (clientCompactionTaskQuery.getMetricsSpec() != null) {
-        metricsSpec = jsonMapper.convertValue(clientCompactionTaskQuery.getMetricsSpec(), new TypeReference<List<Object>>() {});
+        metricsSpec = jsonMapper.convertValue(clientCompactionTaskQuery.getMetricsSpec(), new TypeReference<>() {});
       }
 
       for (int i = 0; i < 2; i++) {
diff --git a/server/src/test/java/org/apache/druid/server/coordinator/loading/CuratorLoadQueuePeonTest.java b/server/src/test/java/org/apache/druid/server/coordinator/loading/CuratorLoadQueuePeonTest.java
index e22b037707ae..4de59af1f2d3 100644
--- a/server/src/test/java/org/apache/druid/server/coordinator/loading/CuratorLoadQueuePeonTest.java
+++ b/server/src/test/java/org/apache/druid/server/coordinator/loading/CuratorLoadQueuePeonTest.java
@@ -105,7 +105,7 @@ public void testMultipleLoadDropSegments() throws Exception
             "2014-10-24T00:00:00Z/P1D",
             "2014-10-23T00:00:00Z/P1D",
             "2014-10-22T00:00:00Z/P1D"
-        ), new Function<String, DataSegment>()
+        ), new Function<>()
         {
           @Override
           public DataSegment apply(String intervalStr)
@@ -135,7 +135,7 @@ public DataSegment apply(String intervalStr)
             "2014-10-31T00:00:00Z/P1D",
             "2014-10-30T00:00:00Z/P1D",
             "2014-10-28T00:00:00Z/P1D"
-        ), new Function<String, DataSegment>()
+        ), new Function<>()
         {
           @Override
           public DataSegment apply(String intervalStr)
diff --git a/server/src/test/java/org/apache/druid/server/coordinator/rules/BroadcastDistributionRuleSerdeTest.java b/server/src/test/java/org/apache/druid/server/coordinator/rules/BroadcastDistributionRuleSerdeTest.java
index f2405060fea8..e156ba25b5cc 100644
--- a/server/src/test/java/org/apache/druid/server/coordinator/rules/BroadcastDistributionRuleSerdeTest.java
+++ b/server/src/test/java/org/apache/druid/server/coordinator/rules/BroadcastDistributionRuleSerdeTest.java
@@ -61,7 +61,7 @@ public void testSerde() throws IOException
   {
     final List<Rule> rules = Collections.singletonList(testRule);
     final String json = MAPPER.writeValueAsString(rules);
-    final List<Rule> fromJson = MAPPER.readValue(json, new TypeReference<List<Rule>>(){});
+    final List<Rule> fromJson = MAPPER.readValue(json, new TypeReference<>() {});
     Assert.assertEquals(rules, fromJson);
   }
 }
diff --git a/server/src/test/java/org/apache/druid/server/coordinator/simulate/TestSegmentLoadingHttpClient.java b/server/src/test/java/org/apache/druid/server/coordinator/simulate/TestSegmentLoadingHttpClient.java
index f7007bfd833d..5caa90d8dfdb 100644
--- a/server/src/test/java/org/apache/druid/server/coordinator/simulate/TestSegmentLoadingHttpClient.java
+++ b/server/src/test/java/org/apache/druid/server/coordinator/simulate/TestSegmentLoadingHttpClient.java
@@ -134,9 +134,7 @@ private List<DataSegmentChangeResponse> processRequest(
   {
     final List<DataSegmentChangeRequest> changeRequests = objectMapper.readValue(
         request.getContent().array(),
-        new TypeReference<List<DataSegmentChangeRequest>>()
-        {
-        }
+        new TypeReference<>() {}
     );
 
     return changeRequests
diff --git a/server/src/test/java/org/apache/druid/server/http/DataSourcesResourceTest.java b/server/src/test/java/org/apache/druid/server/http/DataSourcesResourceTest.java
index f6bccbeb7da4..4d7939021491 100644
--- a/server/src/test/java/org/apache/druid/server/http/DataSourcesResourceTest.java
+++ b/server/src/test/java/org/apache/druid/server/http/DataSourcesResourceTest.java
@@ -677,7 +677,7 @@ public void testIsHandOffComplete()
     SegmentLoadInfo segmentLoadInfo = new SegmentLoadInfo(createSegment(Intervals.of(interval3), "v1", 1));
     segmentLoadInfo.addServer(createHistoricalServerMetadata("test"));
     VersionedIntervalTimeline<String, SegmentLoadInfo> timeline =
-        new VersionedIntervalTimeline<String, SegmentLoadInfo>(null)
+        new VersionedIntervalTimeline<>(null)
     {
       @Override
       public List<TimelineObjectHolder<String, SegmentLoadInfo>> lookupWithIncompletePartitions(Interval interval)
diff --git a/server/src/test/java/org/apache/druid/server/http/security/ResourceFilterTestHelper.java b/server/src/test/java/org/apache/druid/server/http/security/ResourceFilterTestHelper.java
index 95a0cc29e31a..82b15bd453a9 100644
--- a/server/src/test/java/org/apache/druid/server/http/security/ResourceFilterTestHelper.java
+++ b/server/src/test/java/org/apache/druid/server/http/security/ResourceFilterTestHelper.java
@@ -86,7 +86,7 @@ public void setUpMockExpectations(
         ImmutableList.copyOf(
             Iterables.transform(
                 Arrays.asList(requestPath.split("/")),
-                new Function<String, PathSegment>()
+                new Function<>()
                 {
                   @Override
                   public PathSegment apply(final String input)
@@ -209,7 +209,7 @@ public void configure(Binder binder)
                     // and also the endpoints that does not have any
                     // ResourceFilters applied to them
                     methods,
-                    new Predicate<Method>()
+                    new Predicate<>()
                     {
                       @Override
                       public boolean apply(Method input)
@@ -233,7 +233,7 @@ public Collection<Object[]> apply(final Method method)
 
                     return Collections2.transform(
                         resourceFilters,
-                        new Function<Class<? extends ResourceFilter>, Object[]>()
+                        new Function<>()
                         {
                           @Override
                           public Object[] apply(Class<? extends ResourceFilter> input)
diff --git a/server/src/test/java/org/apache/druid/server/security/AuthorizationUtilsTest.java b/server/src/test/java/org/apache/druid/server/security/AuthorizationUtilsTest.java
index a66cdde9487d..2d61ba586a7a 100644
--- a/server/src/test/java/org/apache/druid/server/security/AuthorizationUtilsTest.java
+++ b/server/src/test/java/org/apache/druid/server/security/AuthorizationUtilsTest.java
@@ -52,7 +52,7 @@ public void testFilterResourcesWithAllowAllAuthorizer()
     resources.add("filteredResource");
     resources.add("hello");
 
-    Function<String, Iterable<ResourceAction>> resourceActionGenerator = new Function<String, Iterable<ResourceAction>>()
+    Function<String, Iterable<ResourceAction>> resourceActionGenerator = new Function<>()
     {
       @Nullable
       @Override
diff --git a/services/src/main/java/org/apache/druid/cli/CliCoordinator.java b/services/src/main/java/org/apache/druid/cli/CliCoordinator.java
index b819bb0ded7e..207090a06ddf 100644
--- a/services/src/main/java/org/apache/druid/cli/CliCoordinator.java
+++ b/services/src/main/java/org/apache/druid/cli/CliCoordinator.java
@@ -361,13 +361,13 @@ public CoordinatorCustomDutyGroups get()
           return new CoordinatorCustomDutyGroups(coordinatorCustomDutyGroups);
         }
         List<String> coordinatorCustomDutyGroupNames = jsonMapper.readValue(props.getProperty(
-            "druid.coordinator.dutyGroups"), new TypeReference<List<String>>() {});
+            "druid.coordinator.dutyGroups"), new TypeReference<>() {});
         for (String coordinatorCustomDutyGroupName : coordinatorCustomDutyGroupNames) {
           String dutyListProperty = StringUtils.format("druid.coordinator.%s.duties", coordinatorCustomDutyGroupName);
           if (Strings.isNullOrEmpty(props.getProperty(dutyListProperty))) {
             throw new IAE("Coordinator custom duty group given without any duty for group %s", coordinatorCustomDutyGroupName);
           }
-          List<String> dutyForGroup = jsonMapper.readValue(props.getProperty(dutyListProperty), new TypeReference<List<String>>() {});
+          List<String> dutyForGroup = jsonMapper.readValue(props.getProperty(dutyListProperty), new TypeReference<>() {});
           List<CoordinatorCustomDuty> coordinatorCustomDuties = new ArrayList<>();
           for (String dutyName : dutyForGroup) {
             final String dutyPropertyBase = StringUtils.format(
diff --git a/services/src/main/java/org/apache/druid/cli/DumpSegment.java b/services/src/main/java/org/apache/druid/cli/DumpSegment.java
index 5c31f02b6039..a98b9aafdbf6 100644
--- a/services/src/main/java/org/apache/druid/cli/DumpSegment.java
+++ b/services/src/main/java/org/apache/druid/cli/DumpSegment.java
@@ -252,7 +252,7 @@ private void runMetadata(final Injector injector, final QueryableIndex index) th
         null
     );
     withOutputStream(
-        new Function<OutputStream, Object>()
+        new Function<>()
         {
           @Override
           public Object apply(final OutputStream out)
@@ -260,7 +260,7 @@ public Object apply(final OutputStream out)
             evaluateSequenceForSideEffects(
                 Sequences.map(
                     executeQuery(injector, index, query),
-                    new Function<SegmentAnalysis, Object>()
+                    new Function<>()
                     {
                       @Override
                       public Object apply(SegmentAnalysis analysis)
@@ -309,7 +309,7 @@ public static void runDump(
       }
 
       withOutputStream(
-          new Function<OutputStream, Object>()
+          new Function<>()
           {
             @Override
             public Object apply(final OutputStream out)
diff --git a/services/src/main/java/org/apache/druid/cli/validate/DruidJsonValidator.java b/services/src/main/java/org/apache/druid/cli/validate/DruidJsonValidator.java
index 50684cee0e87..18339246a851 100644
--- a/services/src/main/java/org/apache/druid/cli/validate/DruidJsonValidator.java
+++ b/services/src/main/java/org/apache/druid/cli/validate/DruidJsonValidator.java
@@ -227,7 +227,7 @@ private Void readData(final StringInputRowParser parser, final CharSource source
       throws IOException
   {
     return source.readLines(
-        new LineProcessor<Void>()
+        new LineProcessor<>()
         {
           private final StringBuilder builder = new StringBuilder();
 
diff --git a/services/src/main/java/org/apache/druid/guice/AbstractDruidServiceModule.java b/services/src/main/java/org/apache/druid/guice/AbstractDruidServiceModule.java
index fb69005675f1..0638d090901a 100644
--- a/services/src/main/java/org/apache/druid/guice/AbstractDruidServiceModule.java
+++ b/services/src/main/java/org/apache/druid/guice/AbstractDruidServiceModule.java
@@ -71,11 +71,11 @@ public static void configure(Binder binder, NodeRole role)
     binder.install(MultibindingsScanner.asModule());
     MapBinder<NodeRole, Set<Class<? extends DruidService>>> serviceBinder = MapBinder.newMapBinder(
         binder,
-        new TypeLiteral<NodeRole>(){},
-        new TypeLiteral<Set<Class<? extends DruidService>>>(){}
+        new TypeLiteral<>() {},
+        new TypeLiteral<>() {}
     );
     serviceBinder
         .addBinding(role)
-        .to(Key.get(new TypeLiteral<Set<Class<? extends DruidService>>>(){}, role.getDruidServiceInjectName()));
+        .to(Key.get(new TypeLiteral<>() {}, role.getDruidServiceInjectName()));
   }
 }
diff --git a/services/src/main/java/org/apache/druid/server/router/CoordinatorRuleManager.java b/services/src/main/java/org/apache/druid/server/router/CoordinatorRuleManager.java
index 44f4605ea71d..f60087024b58 100644
--- a/services/src/main/java/org/apache/druid/server/router/CoordinatorRuleManager.java
+++ b/services/src/main/java/org/apache/druid/server/router/CoordinatorRuleManager.java
@@ -59,9 +59,7 @@ public class CoordinatorRuleManager
   private static final Logger LOG = new Logger(CoordinatorRuleManager.class);
 
   private static final TypeReference<Map<String, List<Rule>>> TYPE_REFERENCE =
-      new TypeReference<Map<String, List<Rule>>>()
-      {
-      };
+      new TypeReference<>() {};
 
   private final ObjectMapper jsonMapper;
   private final Supplier<TieredBrokerConfig> config;
diff --git a/services/src/main/java/org/apache/druid/server/router/TieredBrokerHostSelector.java b/services/src/main/java/org/apache/druid/server/router/TieredBrokerHostSelector.java
index ea7b615187a9..e1732b44fb20 100644
--- a/services/src/main/java/org/apache/druid/server/router/TieredBrokerHostSelector.java
+++ b/services/src/main/java/org/apache/druid/server/router/TieredBrokerHostSelector.java
@@ -68,7 +68,7 @@ public class TieredBrokerHostSelector
 
   private volatile boolean started = false;
 
-  private static final Function<DiscoveryDruidNode, Server> TO_SERVER = new Function<DiscoveryDruidNode, Server>()
+  private static final Function<DiscoveryDruidNode, Server> TO_SERVER = new Function<>()
   {
     @Override
     public Server apply(final DiscoveryDruidNode instance)
@@ -315,7 +315,7 @@ public Map<String, List<Server>> getAllBrokers()
   {
     return Maps.transformValues(
         servers,
-        new Function<NodesHolder, List<Server>>()
+        new Function<>()
         {
           @Override
           public List<Server> apply(NodesHolder input)
diff --git a/services/src/test/java/org/apache/druid/server/router/TieredBrokerHostSelectorTest.java b/services/src/test/java/org/apache/druid/server/router/TieredBrokerHostSelectorTest.java
index 8dbf03292360..20ef4bd9ff25 100644
--- a/services/src/test/java/org/apache/druid/server/router/TieredBrokerHostSelectorTest.java
+++ b/services/src/test/java/org/apache/druid/server/router/TieredBrokerHostSelectorTest.java
@@ -122,7 +122,7 @@ public void registerListener(Listener listener)
           @Override
           public LinkedHashMap<String, String> getTierToBrokerMap()
           {
-            return new LinkedHashMap<String, String>(
+            return new LinkedHashMap<>(
                 ImmutableMap.of(
                     "hot", "hotBroker",
                     "medium", "mediumBroker",
diff --git a/sql/src/main/java/org/apache/druid/sql/calcite/filtration/Bounds.java b/sql/src/main/java/org/apache/druid/sql/calcite/filtration/Bounds.java
index a1c310522c8f..b197a2babcd6 100644
--- a/sql/src/main/java/org/apache/druid/sql/calcite/filtration/Bounds.java
+++ b/sql/src/main/java/org/apache/druid/sql/calcite/filtration/Bounds.java
@@ -93,7 +93,7 @@ public static List<Range<BoundValue>> toRanges(final List<BoundDimFilter> bounds
     return ImmutableList.copyOf(
         Lists.transform(
             bounds,
-            new Function<BoundDimFilter, Range<BoundValue>>()
+            new Function<>()
             {
               @Override
               public Range<BoundValue> apply(BoundDimFilter bound)
diff --git a/sql/src/main/java/org/apache/druid/sql/calcite/planner/DruidSqlValidator.java b/sql/src/main/java/org/apache/druid/sql/calcite/planner/DruidSqlValidator.java
index 797b5397f1d7..66d66174cc52 100644
--- a/sql/src/main/java/org/apache/druid/sql/calcite/planner/DruidSqlValidator.java
+++ b/sql/src/main/java/org/apache/druid/sql/calcite/planner/DruidSqlValidator.java
@@ -951,8 +951,10 @@ private static boolean containsCall(SqlNode node,
   {
     try {
       SqlVisitor<Void> visitor =
-          new SqlBasicVisitor<Void>() {
-            @Override public Void visit(SqlCall call)
+          new SqlBasicVisitor<>()
+          {
+            @Override
+            public Void visit(SqlCall call)
             {
               if (callPredicate.test(call)) {
                 throw new Util.FoundOne(call);
diff --git a/sql/src/main/java/org/apache/druid/sql/calcite/planner/QueryHandler.java b/sql/src/main/java/org/apache/druid/sql/calcite/planner/QueryHandler.java
index 8481efdbcbd1..844a06d862d6 100644
--- a/sql/src/main/java/org/apache/druid/sql/calcite/planner/QueryHandler.java
+++ b/sql/src/main/java/org/apache/druid/sql/calcite/planner/QueryHandler.java
@@ -343,7 +343,7 @@ private PlannerResult planWithBindableConvention()
                   @Override
                   public QueryHandler.EnumeratorIterator<Object[]> make()
                   {
-                    return new QueryHandler.EnumeratorIterator<>(new Iterator<Object[]>()
+                    return new QueryHandler.EnumeratorIterator<>(new Iterator<>()
                     {
                       @Override
                       public boolean hasNext()
diff --git a/sql/src/main/java/org/apache/druid/sql/calcite/rel/DruidUnionRel.java b/sql/src/main/java/org/apache/druid/sql/calcite/rel/DruidUnionRel.java
index 17fcbd6bfc37..5a91a5a6a2fe 100644
--- a/sql/src/main/java/org/apache/druid/sql/calcite/rel/DruidUnionRel.java
+++ b/sql/src/main/java/org/apache/druid/sql/calcite/rel/DruidUnionRel.java
@@ -111,7 +111,7 @@ public QueryResponse<Object[]> runQuery()
   {
     // Lazy: run each query in sequence, not all at once.
     if (limit == 0) {
-      return new QueryResponse<Object[]>(Sequences.empty(), ResponseContext.createEmpty());
+      return new QueryResponse<>(Sequences.empty(), ResponseContext.createEmpty());
     } else {
 
       // We run the first rel here for two reasons:
diff --git a/sql/src/main/java/org/apache/druid/sql/calcite/rule/DruidJoinRule.java b/sql/src/main/java/org/apache/druid/sql/calcite/rule/DruidJoinRule.java
index 8d6230afcc8f..c4cf6150d63d 100644
--- a/sql/src/main/java/org/apache/druid/sql/calcite/rule/DruidJoinRule.java
+++ b/sql/src/main/java/org/apache/druid/sql/calcite/rule/DruidJoinRule.java
@@ -452,7 +452,7 @@ public static ConditionAnalysis analyzeCondition(
     final List<RexNode> unSupportedSubConditions = new ArrayList<>();
     final Set<RexInputRef> rightColumns = new HashSet<>();
     final int numLeftFields = leftRowType.getFieldCount();
-    final List<String> errors = new ArrayList<String>();
+    final List<String> errors = new ArrayList<>();
 
     for (RexNode subCondition : subConditions) {
       if (RexUtil.isLiteral(subCondition, true)) {
diff --git a/sql/src/main/java/org/apache/druid/sql/calcite/schema/InformationSchema.java b/sql/src/main/java/org/apache/druid/sql/calcite/schema/InformationSchema.java
index f564d23413a6..a9e3d2e31d2c 100644
--- a/sql/src/main/java/org/apache/druid/sql/calcite/schema/InformationSchema.java
+++ b/sql/src/main/java/org/apache/druid/sql/calcite/schema/InformationSchema.java
@@ -186,7 +186,7 @@ public Enumerable<Object[]> scan(final DataContext root)
       final FluentIterable<Object[]> results = FluentIterable
           .from(rootSchema.getSubSchemaNames())
           .transform(
-              new Function<String, Object[]>()
+              new Function<>()
               {
                 @Override
                 public Object[] apply(final String schemaName)
@@ -282,7 +282,7 @@ public Iterable<Object[]> apply(final String schemaName)
                               }
                           ),
                           FluentIterable.from(authorizedFunctionNames).transform(
-                              new Function<String, Object[]>()
+                              new Function<>()
                               {
                                 @Override
                                 public Object[] apply(final String functionName)
@@ -364,7 +364,7 @@ public Iterable<Object[]> apply(final String schemaName)
                       Iterables.filter(
                           Iterables.concat(
                               FluentIterable.from(authorizedTableNames).transform(
-                                  new Function<String, Iterable<Object[]>>()
+                                  new Function<>()
                                   {
                                     @Override
                                     public Iterable<Object[]> apply(final String tableName)
@@ -384,7 +384,7 @@ public Iterable<Object[]> apply(final String tableName)
                                   }
                               ),
                               FluentIterable.from(authorizedFunctionNames).transform(
-                                  new Function<String, Iterable<Object[]>>()
+                                  new Function<>()
                                   {
                                     @Override
                                     public Iterable<Object[]> apply(final String functionName)
@@ -449,7 +449,7 @@ private Iterable<Object[]> generateColumnMetadata(
       return FluentIterable
           .from(tableSchema.getFieldList())
           .transform(
-              new Function<RelDataTypeField, Object[]>()
+              new Function<>()
               {
                 @Override
                 public Object[] apply(final RelDataTypeField field)
diff --git a/sql/src/main/java/org/apache/druid/sql/calcite/schema/MetadataSegmentView.java b/sql/src/main/java/org/apache/druid/sql/calcite/schema/MetadataSegmentView.java
index 89280252bc66..738c497caa05 100644
--- a/sql/src/main/java/org/apache/druid/sql/calcite/schema/MetadataSegmentView.java
+++ b/sql/src/main/java/org/apache/druid/sql/calcite/schema/MetadataSegmentView.java
@@ -210,9 +210,7 @@ private JsonParserIterator<SegmentStatusInCluster> getMetadataSegments(
 
     return SystemSchema.getThingsFromLeaderNode(
         queryBuilder.toString(),
-        new TypeReference<SegmentStatusInCluster>()
-        {
-        },
+        new TypeReference<>() {},
         coordinatorClient,
         jsonMapper
     );
diff --git a/sql/src/main/java/org/apache/druid/sql/calcite/schema/SystemSchema.java b/sql/src/main/java/org/apache/druid/sql/calcite/schema/SystemSchema.java
index 0af8c19ca064..0551480125c1 100644
--- a/sql/src/main/java/org/apache/druid/sql/calcite/schema/SystemSchema.java
+++ b/sql/src/main/java/org/apache/druid/sql/calcite/schema/SystemSchema.java
@@ -840,7 +840,7 @@ public Iterator<Object[]> iterator()
         @Override
         public Enumerator<Object[]> enumerator()
         {
-          return new Enumerator<Object[]>()
+          return new Enumerator<>()
           {
             @Override
             public Object[] current()
@@ -970,7 +970,7 @@ public Iterator<Object[]> iterator()
         @Override
         public Enumerator<Object[]> enumerator()
         {
-          return new Enumerator<Object[]>()
+          return new Enumerator<>()
           {
             @Override
             public Object[] current()
@@ -1087,7 +1087,7 @@ public static <T> JsonParserIterator<T> getThingsFromLeaderNode(
 
   private static <T> CloseableIterator<T> wrap(Iterator<T> iterator, Closeable closer)
   {
-    return new CloseableIterator<T>()
+    return new CloseableIterator<>()
     {
       @Override
       public boolean hasNext()
diff --git a/sql/src/test/java/org/apache/druid/quidem/DruidQuidemTestBase.java b/sql/src/test/java/org/apache/druid/quidem/DruidQuidemTestBase.java
index 8c8d50fba475..0bd8ed4b48af 100644
--- a/sql/src/test/java/org/apache/druid/quidem/DruidQuidemTestBase.java
+++ b/sql/src/test/java/org/apache/druid/quidem/DruidQuidemTestBase.java
@@ -181,7 +181,7 @@ public static boolean isOverwrite()
 
   protected final List<String> getFileNames() throws IOException
   {
-    List<String> ret = new ArrayList<String>();
+    List<String> ret = new ArrayList<>();
 
     File testRoot = getTestRoot();
     if (!testRoot.exists()) {
diff --git a/sql/src/test/java/org/apache/druid/quidem/DynamicComposite.java b/sql/src/test/java/org/apache/druid/quidem/DynamicComposite.java
index 290e972761ee..e67c0178c05c 100644
--- a/sql/src/test/java/org/apache/druid/quidem/DynamicComposite.java
+++ b/sql/src/test/java/org/apache/druid/quidem/DynamicComposite.java
@@ -34,7 +34,7 @@ public static <T, E> T make(T base, Class<T> baseClass, E ext, Class<E> extClass
     return (T) Proxy.newProxyInstance(
         base.getClass().getClassLoader(),
         new Class[] {baseClass, extClass},
-        new DynamicComposite<T, E>(base, ext, extClass)
+        new DynamicComposite<>(base, ext, extClass)
     );
   }
 
diff --git a/sql/src/test/java/org/apache/druid/quidem/DynamicCompositeTest.java b/sql/src/test/java/org/apache/druid/quidem/DynamicCompositeTest.java
index b8fb71f6acae..b837650aa4ed 100644
--- a/sql/src/test/java/org/apache/druid/quidem/DynamicCompositeTest.java
+++ b/sql/src/test/java/org/apache/druid/quidem/DynamicCompositeTest.java
@@ -33,7 +33,7 @@ public class DynamicCompositeTest
   @Test
   public void testCompose()
   {
-    HashSet<Integer> set = new HashSet<Integer>();
+    HashSet<Integer> set = new HashSet<>();
     Function<Integer, Integer> sq = x -> x * x;
     Set<Integer> composite = DynamicComposite.make(set, Set.class, sq, Function.class);
     composite.add(1);
diff --git a/sql/src/test/java/org/apache/druid/sql/SqlStatementTest.java b/sql/src/test/java/org/apache/druid/sql/SqlStatementTest.java
index 32c873c0fe10..e924102284f3 100644
--- a/sql/src/test/java/org/apache/druid/sql/SqlStatementTest.java
+++ b/sql/src/test/java/org/apache/druid/sql/SqlStatementTest.java
@@ -115,7 +115,7 @@ public <T> Sequence<T> run(Query<?> query, Sequence<T> resultSequence)
       {
         return super.run(
             query,
-            new LazySequence<T>(() -> resultSequence)
+            new LazySequence<>(() -> resultSequence)
         );
       }
     };
diff --git a/sql/src/test/java/org/apache/druid/sql/avatica/AvaticaModuleTest.java b/sql/src/test/java/org/apache/druid/sql/avatica/AvaticaModuleTest.java
index 2c10994c4a37..1918736af32f 100644
--- a/sql/src/test/java/org/apache/druid/sql/avatica/AvaticaModuleTest.java
+++ b/sql/src/test/java/org/apache/druid/sql/avatica/AvaticaModuleTest.java
@@ -94,7 +94,7 @@ public void testAvaticaMonitorIsInjectedAsSingleton()
   public void testAvaticaMonitorIsRegisterdWithMetricsModule()
   {
     Set<Class<? extends Monitor>> monitors =
-        injector.getInstance(Key.get(new TypeLiteral<Set<Class<? extends Monitor>>>(){}));
+        injector.getInstance(Key.get(new TypeLiteral<>() {}));
     Assert.assertTrue(monitors.contains(AvaticaMonitor.class));
   }
 
@@ -197,15 +197,14 @@ public void testDruidAvaticaProtobufHandlerIsInjected()
   public void testDruidAvaticaJsonHandlerIsRegisterdWithJerseyModule()
   {
     Set<Handler> handlers =
-        injector.getInstance(Key.get(new TypeLiteral<Set<Handler>>(){}));
+        injector.getInstance(Key.get(new TypeLiteral<>() {}));
     Assert.assertTrue(handlers.stream().anyMatch(h -> DruidAvaticaJsonHandler.class.equals(h.getClass())));
   }
 
   @Test
   public void testDruidAvaticaProtobufHandlerIsRegisterdWithJerseyModule()
   {
-    Set<Handler> handlers =
-            injector.getInstance(Key.get(new TypeLiteral<Set<Handler>>(){}));
+    Set<Handler> handlers = injector.getInstance(Key.get(new TypeLiteral<>() {}));
     Assert.assertTrue(handlers.stream().anyMatch(h -> DruidAvaticaProtobufHandler.class.equals(h.getClass())));
   }
 }
diff --git a/sql/src/test/java/org/apache/druid/sql/calcite/BaseCalciteQueryTest.java b/sql/src/test/java/org/apache/druid/sql/calcite/BaseCalciteQueryTest.java
index de621ba3ee33..099d3e0254d1 100644
--- a/sql/src/test/java/org/apache/druid/sql/calcite/BaseCalciteQueryTest.java
+++ b/sql/src/test/java/org/apache/druid/sql/calcite/BaseCalciteQueryTest.java
@@ -1369,7 +1369,7 @@ public static <T> Query<?> recursivelyClearContext(final Query<T> query, ObjectM
   private static List<DataSource> recursivelyClearDatasource(final List<DataSource> dataSources,
       ObjectMapper queryJsonMapper)
   {
-    List<DataSource> ret = new ArrayList<DataSource>();
+    List<DataSource> ret = new ArrayList<>();
     for (DataSource dataSource : dataSources) {
       ret.add(recursivelyClearContext(dataSource, queryJsonMapper));
     }
diff --git a/sql/src/test/java/org/apache/druid/sql/calcite/NotYetSupportedUsageTest.java b/sql/src/test/java/org/apache/druid/sql/calcite/NotYetSupportedUsageTest.java
index 571ba3f1b798..6b64dff9fee9 100644
--- a/sql/src/test/java/org/apache/druid/sql/calcite/NotYetSupportedUsageTest.java
+++ b/sql/src/test/java/org/apache/druid/sql/calcite/NotYetSupportedUsageTest.java
@@ -62,7 +62,7 @@ private Set<Method> getAnnotatedMethods()
 
   static class ReportEntry
   {
-    public static final Comparator<ReportEntry> CLASS_NCASES_MODE_COMPARATOR = new Comparator<ReportEntry>()
+    public static final Comparator<ReportEntry> CLASS_NCASES_MODE_COMPARATOR = new Comparator<>()
     {
       @Override
       public int compare(ReportEntry l, ReportEntry r)
diff --git a/sql/src/test/java/org/apache/druid/sql/calcite/SqlTestFrameworkConfig.java b/sql/src/test/java/org/apache/druid/sql/calcite/SqlTestFrameworkConfig.java
index 56ac2445d632..ded918d64d8c 100644
--- a/sql/src/test/java/org/apache/druid/sql/calcite/SqlTestFrameworkConfig.java
+++ b/sql/src/test/java/org/apache/druid/sql/calcite/SqlTestFrameworkConfig.java
@@ -98,7 +98,7 @@ public class SqlTestFrameworkConfig
   @NumMergeBuffers(QueryStackTests.DEFAULT_NUM_MERGE_BUFFERS)
   public @interface NumMergeBuffers
   {
-    ConfigOptionProcessor<Integer> PROCESSOR = new ConfigOptionProcessor<Integer>(NumMergeBuffers.class)
+    ConfigOptionProcessor<Integer> PROCESSOR = new ConfigOptionProcessor<>(NumMergeBuffers.class)
     {
       @Override
       public Integer fromString(String str) throws NumberFormatException
@@ -115,7 +115,7 @@ public Integer fromString(String str) throws NumberFormatException
   @MinTopNThreshold(TopNQueryConfig.DEFAULT_MIN_TOPN_THRESHOLD)
   public @interface MinTopNThreshold
   {
-    ConfigOptionProcessor<Integer> PROCESSOR = new ConfigOptionProcessor<Integer>(MinTopNThreshold.class)
+    ConfigOptionProcessor<Integer> PROCESSOR = new ConfigOptionProcessor<>(MinTopNThreshold.class)
     {
       @Override
       public Integer fromString(String str) throws NumberFormatException
@@ -132,7 +132,7 @@ public Integer fromString(String str) throws NumberFormatException
   @ResultCache(ResultCacheMode.DISABLED)
   public @interface ResultCache
   {
-    ConfigOptionProcessor<ResultCacheMode> PROCESSOR = new ConfigOptionProcessor<ResultCacheMode>(ResultCache.class)
+    ConfigOptionProcessor<ResultCacheMode> PROCESSOR = new ConfigOptionProcessor<>(ResultCache.class)
     {
       @Override
       public ResultCacheMode fromString(String str)
@@ -152,7 +152,7 @@ public ResultCacheMode fromString(String str)
   @ComponentSupplier(StandardComponentSupplier.class)
   public @interface ComponentSupplier
   {
-    ConfigOptionProcessor<Class<? extends QueryComponentSupplier>> PROCESSOR = new ConfigOptionProcessor<Class<? extends QueryComponentSupplier>>(
+    ConfigOptionProcessor<Class<? extends QueryComponentSupplier>> PROCESSOR = new ConfigOptionProcessor<>(
         ComponentSupplier.class
     )
     {
@@ -323,7 +323,7 @@ public void setConfig(SqlTestFrameworkConfig config)
      */
     public String buildTestCaseName(ExtensionContext context)
     {
-      List<String> names = new ArrayList<String>();
+      List<String> names = new ArrayList<>();
       Pattern pattern = Pattern.compile("\\([^)]*\\)");
       // this will add all name pieces - except the "last" which would be the
       // Class level name
@@ -509,7 +509,7 @@ public final T fromMap(Map<String, String> map) throws Exception
 
   static LoadingCache<String, Set<Class<? extends QueryComponentSupplier>>> componentSupplierClassCache = CacheBuilder
       .newBuilder()
-      .build(new CacheLoader<String, Set<Class<? extends QueryComponentSupplier>>>()
+      .build(new CacheLoader<>()
       {
         @Override
         public Set<Class<? extends QueryComponentSupplier>> load(String pkg)
diff --git a/sql/src/test/java/org/apache/druid/sql/calcite/aggregation/SqlAggregationModuleTest.java b/sql/src/test/java/org/apache/druid/sql/calcite/aggregation/SqlAggregationModuleTest.java
index 599dd2fb2616..790c6eae3921 100644
--- a/sql/src/test/java/org/apache/druid/sql/calcite/aggregation/SqlAggregationModuleTest.java
+++ b/sql/src/test/java/org/apache/druid/sql/calcite/aggregation/SqlAggregationModuleTest.java
@@ -52,7 +52,7 @@ public void setUp()
   @Test
   public void testDefaultSqlAggregatorsAreBound()
   {
-    Set<SqlAggregator> sqlAggregators = injector.getInstance(Key.get(new TypeLiteral<Set<SqlAggregator>>() {}));
+    Set<SqlAggregator> sqlAggregators = injector.getInstance(Key.get(new TypeLiteral<>() {}));
     Assert.assertNotNull(sqlAggregators);
     Assert.assertEquals(2, sqlAggregators.size());
 
diff --git a/sql/src/test/java/org/apache/druid/sql/calcite/schema/DruidCalciteSchemaModuleTest.java b/sql/src/test/java/org/apache/druid/sql/calcite/schema/DruidCalciteSchemaModuleTest.java
index 0616dd2a3a34..c419d04d92cc 100644
--- a/sql/src/test/java/org/apache/druid/sql/calcite/schema/DruidCalciteSchemaModuleTest.java
+++ b/sql/src/test/java/org/apache/druid/sql/calcite/schema/DruidCalciteSchemaModuleTest.java
@@ -168,7 +168,7 @@ public void testSystemSqlSchemaIsInjectedAsSingleton()
   @Test
   public void testDruidCalciteSchemasAreInjected()
   {
-    Set<NamedSchema> sqlSchemas = injector.getInstance(Key.get(new TypeLiteral<Set<NamedSchema>>(){}));
+    Set<NamedSchema> sqlSchemas = injector.getInstance(Key.get(new TypeLiteral<>() {}));
     Set<Class<? extends NamedSchema>> expectedSchemas =
         ImmutableSet.of(NamedSystemSchema.class, NamedDruidSchema.class, NamedLookupSchema.class, NamedViewSchema.class);
     Assert.assertEquals(expectedSchemas.size(), sqlSchemas.size());
diff --git a/sql/src/test/java/org/apache/druid/sql/calcite/util/CalciteTests.java b/sql/src/test/java/org/apache/druid/sql/calcite/util/CalciteTests.java
index 05c267a00bbe..04845efa1652 100644
--- a/sql/src/test/java/org/apache/druid/sql/calcite/util/CalciteTests.java
+++ b/sql/src/test/java/org/apache/druid/sql/calcite/util/CalciteTests.java
@@ -425,7 +425,7 @@ public ListenableFuture<CloseableIterator<TaskStatusPlus>> taskStatuses(
           @Nullable Integer maxCompletedTasks
       )
       {
-        List<TaskStatusPlus> tasks = new ArrayList<TaskStatusPlus>();
+        List<TaskStatusPlus> tasks = new ArrayList<>();
         tasks.add(createTaskStatus("id1", DATASOURCE1, 10L));
         tasks.add(createTaskStatus("id1", DATASOURCE1, 1L));
         tasks.add(createTaskStatus("id2", DATASOURCE2, 20L));
diff --git a/sql/src/test/java/org/apache/druid/sql/http/SqlHttpModuleTest.java b/sql/src/test/java/org/apache/druid/sql/http/SqlHttpModuleTest.java
index 6916358cb5b8..ff9c41eab9a1 100644
--- a/sql/src/test/java/org/apache/druid/sql/http/SqlHttpModuleTest.java
+++ b/sql/src/test/java/org/apache/druid/sql/http/SqlHttpModuleTest.java
@@ -90,9 +90,7 @@ public void testSqlResourceIsInjectedAndSingleton()
   public void testSqlResourceIsAvailableViaJersey()
   {
     Set<Class<?>> jerseyResourceClasses =
-        injector.getInstance(Key.get(new TypeLiteral<Set<Class<?>>>()
-        {
-        }, JSR311Resource.class));
+        injector.getInstance(Key.get(new TypeLiteral<>() {}, JSR311Resource.class));
     Assert.assertEquals(1, jerseyResourceClasses.size());
     Assert.assertEquals(SqlResource.class, jerseyResourceClasses.iterator().next());
   }

From de9da373846c1796c9e6fa624956043896129bf1 Mon Sep 17 00:00:00 2001
From: Clint Wylie <cwylie@apache.org>
Date: Tue, 17 Dec 2024 07:51:24 -0800
Subject: [PATCH 42/56] topn with granularity regression fixes (#17565)

* topn with granularity regression fixes

changes:
* fix issue where topN with query granularity other than ALL would use the heap algorithm when it was actual able to use the pooled algorithm, and incorrectly used the pool algorithm in cases where it must use the heap algorithm, a regression from #16533
* fix issue where topN with query granularity other than ALL could incorrectly process values in the wrong time bucket, another regression from #16533

* move defensive check outside of loop

* more test

* extra layer of safety

* move check outside of loop

* fix spelling

* add query context parameter to allow using pooled algorithm for topN when multi-passes is required even wihen query granularity is not all

* add comment, revert IT context changes and add new context flag
---
 .../queries/twitterstream_queries.json        |  12 +-
 .../druid/query/CursorGranularizer.java       |  16 +-
 .../org/apache/druid/query/QueryContexts.java |   6 +
 .../epinephelinae/GroupByQueryEngine.java     |   2 +-
 .../AggregateTopNMetricFirstAlgorithm.java    |   1 +
 .../druid/query/topn/BaseTopNAlgorithm.java   |   7 +-
 ...Generic1AggPooledTopNScannerPrototype.java |  38 +-
 ...Generic2AggPooledTopNScannerPrototype.java |  46 +-
 .../druid/query/topn/PooledTopNAlgorithm.java | 242 ++---
 .../topn/TimeExtractionTopNAlgorithm.java     |  26 +-
 .../druid/query/topn/TopNQueryEngine.java     |  29 +-
 ...eNumericTopNColumnAggregatesProcessor.java |  32 +-
 .../StringTopNColumnAggregatesProcessor.java  |  72 +-
 .../druid/query/topn/TopNQueryRunnerTest.java | 923 ++++++++++++++++++
 14 files changed, 1213 insertions(+), 239 deletions(-)

diff --git a/integration-tests/src/test/resources/queries/twitterstream_queries.json b/integration-tests/src/test/resources/queries/twitterstream_queries.json
index cdd4057eb572..104b07ba47a2 100644
--- a/integration-tests/src/test/resources/queries/twitterstream_queries.json
+++ b/integration-tests/src/test/resources/queries/twitterstream_queries.json
@@ -94,7 +94,8 @@
             "context": {
                 "useCache": "true",
                 "populateCache": "true",
-                "timeout": 60000
+                "timeout": 60000,
+                "useTopNMultiPassPooledQueryGranularity": "true"
             }
         },
         "expectedResults": [
@@ -198,7 +199,8 @@
             "context": {
                 "useCache": "true",
                 "populateCache": "true",
-                "timeout": 60000
+                "timeout": 60000,
+                "useTopNMultiPassPooledQueryGranularity": "true"
             }
         },
         "expectedResults": [
@@ -322,7 +324,8 @@
             "context": {
                 "useCache": "true",
                 "populateCache": "true",
-                "timeout": 60000
+                "timeout": 60000,
+                "useTopNMultiPassPooledQueryGranularity": "true"
             }
         },
         "expectedResults": [
@@ -741,7 +744,8 @@
             "context": {
                 "useCache": "true",
                 "populateCache": "true",
-                "timeout": 60000
+                "timeout": 60000,
+                "useTopNMultiPassPooledQueryGranularity": "true"
             }
         },
         "expectedResults": [
diff --git a/processing/src/main/java/org/apache/druid/query/CursorGranularizer.java b/processing/src/main/java/org/apache/druid/query/CursorGranularizer.java
index 6bc387183bae..ffdb5bd15fa9 100644
--- a/processing/src/main/java/org/apache/druid/query/CursorGranularizer.java
+++ b/processing/src/main/java/org/apache/druid/query/CursorGranularizer.java
@@ -24,6 +24,7 @@
 import com.google.common.collect.Lists;
 import org.apache.druid.error.DruidException;
 import org.apache.druid.java.util.common.DateTimes;
+import org.apache.druid.java.util.common.Intervals;
 import org.apache.druid.java.util.common.granularity.Granularities;
 import org.apache.druid.java.util.common.granularity.Granularity;
 import org.apache.druid.segment.ColumnValueSelector;
@@ -94,11 +95,13 @@ public static CursorGranularizer create(
       timeSelector = cursor.getColumnSelectorFactory().makeColumnValueSelector(ColumnHolder.TIME_COLUMN_NAME);
     }
 
-    return new CursorGranularizer(cursor, bucketIterable, timeSelector, timeOrder == Order.DESCENDING);
+    return new CursorGranularizer(cursor, granularity, bucketIterable, timeSelector, timeOrder == Order.DESCENDING);
   }
 
   private final Cursor cursor;
 
+  private final Granularity granularity;
+
   // Iterable that iterates over time buckets.
   private final Iterable<Interval> bucketIterable;
 
@@ -112,12 +115,14 @@ public static CursorGranularizer create(
 
   private CursorGranularizer(
       Cursor cursor,
+      Granularity granularity,
       Iterable<Interval> bucketIterable,
       @Nullable ColumnValueSelector timeSelector,
       boolean descending
   )
   {
     this.cursor = cursor;
+    this.granularity = granularity;
     this.bucketIterable = bucketIterable;
     this.timeSelector = timeSelector;
     this.descending = descending;
@@ -133,13 +138,18 @@ public DateTime getBucketStart()
     return DateTimes.utc(currentBucketStart);
   }
 
+  public Interval getCurrentInterval()
+  {
+    return Intervals.utc(currentBucketStart, currentBucketEnd);
+  }
+
   public boolean advanceToBucket(final Interval bucketInterval)
   {
+    currentBucketStart = bucketInterval.getStartMillis();
+    currentBucketEnd = bucketInterval.getEndMillis();
     if (cursor.isDone()) {
       return false;
     }
-    currentBucketStart = bucketInterval.getStartMillis();
-    currentBucketEnd = bucketInterval.getEndMillis();
     if (timeSelector == null) {
       return true;
     }
diff --git a/processing/src/main/java/org/apache/druid/query/QueryContexts.java b/processing/src/main/java/org/apache/druid/query/QueryContexts.java
index 74b45023d041..a2a81c6eb746 100644
--- a/processing/src/main/java/org/apache/druid/query/QueryContexts.java
+++ b/processing/src/main/java/org/apache/druid/query/QueryContexts.java
@@ -89,6 +89,12 @@ public class QueryContexts
   public static final String UNCOVERED_INTERVALS_LIMIT_KEY = "uncoveredIntervalsLimit";
   public static final String MIN_TOP_N_THRESHOLD = "minTopNThreshold";
   public static final String CATALOG_VALIDATION_ENABLED = "catalogValidationEnabled";
+  // this flag controls whether the topN engine can use the 'pooled' algorithm when query granularity is set to
+  // anything other than 'ALL' and the cardinality + number of aggregators would require more size than is available
+  // in the buffers and so must reset the cursor to use multiple passes. This is likely slower than the default
+  // behavior of falling back to heap memory, but less dangerous since too large of a query can cause the heap to run
+  // out of memory
+  public static final String TOPN_USE_MULTI_PASS_POOLED_QUERY_GRANULARITY = "useTopNMultiPassPooledQueryGranularity";
   /**
    * Context parameter to enable/disable the extended filtered sum rewrite logic.
    *
diff --git a/processing/src/main/java/org/apache/druid/query/groupby/epinephelinae/GroupByQueryEngine.java b/processing/src/main/java/org/apache/druid/query/groupby/epinephelinae/GroupByQueryEngine.java
index 8a1f142cd14d..35d958f7ad1f 100644
--- a/processing/src/main/java/org/apache/druid/query/groupby/epinephelinae/GroupByQueryEngine.java
+++ b/processing/src/main/java/org/apache/druid/query/groupby/epinephelinae/GroupByQueryEngine.java
@@ -391,7 +391,7 @@ public boolean hasNext()
       if (delegate != null && delegate.hasNext()) {
         return true;
       } else {
-        if (!cursor.isDone() && granularizer.currentOffsetWithinBucket()) {
+        if (granularizer.currentOffsetWithinBucket()) {
           if (delegate != null) {
             delegate.close();
           }
diff --git a/processing/src/main/java/org/apache/druid/query/topn/AggregateTopNMetricFirstAlgorithm.java b/processing/src/main/java/org/apache/druid/query/topn/AggregateTopNMetricFirstAlgorithm.java
index a4605c3f2652..b51b79da049c 100644
--- a/processing/src/main/java/org/apache/druid/query/topn/AggregateTopNMetricFirstAlgorithm.java
+++ b/processing/src/main/java/org/apache/druid/query/topn/AggregateTopNMetricFirstAlgorithm.java
@@ -113,6 +113,7 @@ public void run(
     try {
       // reset cursor since we call run again
       params.getCursor().reset();
+      params.getGranularizer().advanceToBucket(params.getGranularizer().getCurrentInterval());
       // Run topN for all metrics for top N dimension values
       allMetricsParam = allMetricAlgo.makeInitParams(params.getSelectorPlus(), params.getCursor(), params.getGranularizer());
       allMetricAlgo.run(
diff --git a/processing/src/main/java/org/apache/druid/query/topn/BaseTopNAlgorithm.java b/processing/src/main/java/org/apache/druid/query/topn/BaseTopNAlgorithm.java
index 4c0bb066eecb..b375db72d842 100644
--- a/processing/src/main/java/org/apache/druid/query/topn/BaseTopNAlgorithm.java
+++ b/processing/src/main/java/org/apache/druid/query/topn/BaseTopNAlgorithm.java
@@ -97,12 +97,14 @@ private void runWithCardinalityKnown(
     }
     boolean hasDimValSelector = (dimValSelector != null);
 
-    int cardinality = params.getCardinality();
+    final int cardinality = params.getCardinality();
+    final int numValuesPerPass = params.getNumValuesPerPass();
     int numProcessed = 0;
     long processedRows = 0;
     while (numProcessed < cardinality) {
       final int numToProcess;
-      int maxNumToProcess = Math.min(params.getNumValuesPerPass(), cardinality - numProcessed);
+      int maxNumToProcess = Math.min(numValuesPerPass, cardinality - numProcessed);
+
 
       DimValSelector theDimValSelector;
       if (!hasDimValSelector) {
@@ -125,6 +127,7 @@ private void runWithCardinalityKnown(
       numProcessed += numToProcess;
       if (numProcessed < cardinality) {
         params.getCursor().reset();
+        params.getGranularizer().advanceToBucket(params.getGranularizer().getCurrentInterval());
       }
     }
     if (queryMetrics != null) {
diff --git a/processing/src/main/java/org/apache/druid/query/topn/Generic1AggPooledTopNScannerPrototype.java b/processing/src/main/java/org/apache/druid/query/topn/Generic1AggPooledTopNScannerPrototype.java
index f4c2ba1863bd..2de0a3db65fa 100644
--- a/processing/src/main/java/org/apache/druid/query/topn/Generic1AggPooledTopNScannerPrototype.java
+++ b/processing/src/main/java/org/apache/druid/query/topn/Generic1AggPooledTopNScannerPrototype.java
@@ -54,25 +54,27 @@ public long scanAndAggregate(
   {
     long processedRows = 0;
     int positionToAllocate = 0;
-    while (!cursor.isDoneOrInterrupted()) {
-      final IndexedInts dimValues = dimensionSelector.getRow();
-      final int dimSize = dimValues.size();
-      for (int i = 0; i < dimSize; i++) {
-        int dimIndex = dimValues.get(i);
-        int position = positions[dimIndex];
-        if (position >= 0) {
-          aggregator.aggregate(resultsBuffer, position);
-        } else if (position == TopNAlgorithm.INIT_POSITION_VALUE) {
-          positions[dimIndex] = positionToAllocate;
-          position = positionToAllocate;
-          aggregator.init(resultsBuffer, position);
-          aggregator.aggregate(resultsBuffer, position);
-          positionToAllocate += aggregatorSize;
+    if (granularizer.currentOffsetWithinBucket()) {
+      while (!cursor.isDoneOrInterrupted()) {
+        final IndexedInts dimValues = dimensionSelector.getRow();
+        final int dimSize = dimValues.size();
+        for (int i = 0; i < dimSize; i++) {
+          int dimIndex = dimValues.get(i);
+          int position = positions[dimIndex];
+          if (position >= 0) {
+            aggregator.aggregate(resultsBuffer, position);
+          } else if (position == TopNAlgorithm.INIT_POSITION_VALUE) {
+            positions[dimIndex] = positionToAllocate;
+            position = positionToAllocate;
+            aggregator.init(resultsBuffer, position);
+            aggregator.aggregate(resultsBuffer, position);
+            positionToAllocate += aggregatorSize;
+          }
+        }
+        processedRows++;
+        if (!granularizer.advanceCursorWithinBucketUninterruptedly()) {
+          break;
         }
-      }
-      processedRows++;
-      if (!granularizer.advanceCursorWithinBucketUninterruptedly()) {
-        break;
       }
     }
     return processedRows;
diff --git a/processing/src/main/java/org/apache/druid/query/topn/Generic2AggPooledTopNScannerPrototype.java b/processing/src/main/java/org/apache/druid/query/topn/Generic2AggPooledTopNScannerPrototype.java
index 4de281d8a0b8..1e221992b023 100644
--- a/processing/src/main/java/org/apache/druid/query/topn/Generic2AggPooledTopNScannerPrototype.java
+++ b/processing/src/main/java/org/apache/druid/query/topn/Generic2AggPooledTopNScannerPrototype.java
@@ -57,29 +57,31 @@ public long scanAndAggregate(
     int totalAggregatorsSize = aggregator1Size + aggregator2Size;
     long processedRows = 0;
     int positionToAllocate = 0;
-    while (!cursor.isDoneOrInterrupted()) {
-      final IndexedInts dimValues = dimensionSelector.getRow();
-      final int dimSize = dimValues.size();
-      for (int i = 0; i < dimSize; i++) {
-        int dimIndex = dimValues.get(i);
-        int position = positions[dimIndex];
-        if (position >= 0) {
-          aggregator1.aggregate(resultsBuffer, position);
-          aggregator2.aggregate(resultsBuffer, position + aggregator1Size);
-        } else if (position == TopNAlgorithm.INIT_POSITION_VALUE) {
-          positions[dimIndex] = positionToAllocate;
-          position = positionToAllocate;
-          aggregator1.init(resultsBuffer, position);
-          aggregator1.aggregate(resultsBuffer, position);
-          position += aggregator1Size;
-          aggregator2.init(resultsBuffer, position);
-          aggregator2.aggregate(resultsBuffer, position);
-          positionToAllocate += totalAggregatorsSize;
+    if (granularizer.currentOffsetWithinBucket()) {
+      while (!cursor.isDoneOrInterrupted()) {
+        final IndexedInts dimValues = dimensionSelector.getRow();
+        final int dimSize = dimValues.size();
+        for (int i = 0; i < dimSize; i++) {
+          int dimIndex = dimValues.get(i);
+          int position = positions[dimIndex];
+          if (position >= 0) {
+            aggregator1.aggregate(resultsBuffer, position);
+            aggregator2.aggregate(resultsBuffer, position + aggregator1Size);
+          } else if (position == TopNAlgorithm.INIT_POSITION_VALUE) {
+            positions[dimIndex] = positionToAllocate;
+            position = positionToAllocate;
+            aggregator1.init(resultsBuffer, position);
+            aggregator1.aggregate(resultsBuffer, position);
+            position += aggregator1Size;
+            aggregator2.init(resultsBuffer, position);
+            aggregator2.aggregate(resultsBuffer, position);
+            positionToAllocate += totalAggregatorsSize;
+          }
+        }
+        processedRows++;
+        if (!granularizer.advanceCursorWithinBucketUninterruptedly()) {
+          break;
         }
-      }
-      processedRows++;
-      if (!granularizer.advanceCursorWithinBucketUninterruptedly()) {
-        break;
       }
     }
     return processedRows;
diff --git a/processing/src/main/java/org/apache/druid/query/topn/PooledTopNAlgorithm.java b/processing/src/main/java/org/apache/druid/query/topn/PooledTopNAlgorithm.java
index 9dfc9ee3ded6..f31b6c1e6560 100644
--- a/processing/src/main/java/org/apache/druid/query/topn/PooledTopNAlgorithm.java
+++ b/processing/src/main/java/org/apache/druid/query/topn/PooledTopNAlgorithm.java
@@ -477,13 +477,105 @@ private static long scanAndAggregateDefault(
     final int aggExtra = aggSize % AGG_UNROLL_COUNT;
     int currentPosition = 0;
     long processedRows = 0;
-    while (!cursor.isDoneOrInterrupted()) {
-      final IndexedInts dimValues = dimSelector.getRow();
-
-      final int dimSize = dimValues.size();
-      final int dimExtra = dimSize % AGG_UNROLL_COUNT;
-      switch (dimExtra) {
-        case 7:
+    if (granularizer.currentOffsetWithinBucket()) {
+      while (!cursor.isDoneOrInterrupted()) {
+        final IndexedInts dimValues = dimSelector.getRow();
+
+        final int dimSize = dimValues.size();
+        final int dimExtra = dimSize % AGG_UNROLL_COUNT;
+        switch (dimExtra) {
+          case 7:
+            currentPosition = aggregateDimValue(
+                positions,
+                theAggregators,
+                resultsBuf,
+                numBytesPerRecord,
+                aggregatorOffsets,
+                aggSize,
+                aggExtra,
+                dimValues.get(6),
+                currentPosition
+            );
+            // fall through
+          case 6:
+            currentPosition = aggregateDimValue(
+                positions,
+                theAggregators,
+                resultsBuf,
+                numBytesPerRecord,
+                aggregatorOffsets,
+                aggSize,
+                aggExtra,
+                dimValues.get(5),
+                currentPosition
+            );
+            // fall through
+          case 5:
+            currentPosition = aggregateDimValue(
+                positions,
+                theAggregators,
+                resultsBuf,
+                numBytesPerRecord,
+                aggregatorOffsets,
+                aggSize,
+                aggExtra,
+                dimValues.get(4),
+                currentPosition
+            );
+            // fall through
+          case 4:
+            currentPosition = aggregateDimValue(
+                positions,
+                theAggregators,
+                resultsBuf,
+                numBytesPerRecord,
+                aggregatorOffsets,
+                aggSize,
+                aggExtra,
+                dimValues.get(3),
+                currentPosition
+            );
+            // fall through
+          case 3:
+            currentPosition = aggregateDimValue(
+                positions,
+                theAggregators,
+                resultsBuf,
+                numBytesPerRecord,
+                aggregatorOffsets,
+                aggSize,
+                aggExtra,
+                dimValues.get(2),
+                currentPosition
+            );
+            // fall through
+          case 2:
+            currentPosition = aggregateDimValue(
+                positions,
+                theAggregators,
+                resultsBuf,
+                numBytesPerRecord,
+                aggregatorOffsets,
+                aggSize,
+                aggExtra,
+                dimValues.get(1),
+                currentPosition
+            );
+            // fall through
+          case 1:
+            currentPosition = aggregateDimValue(
+                positions,
+                theAggregators,
+                resultsBuf,
+                numBytesPerRecord,
+                aggregatorOffsets,
+                aggSize,
+                aggExtra,
+                dimValues.get(0),
+                currentPosition
+            );
+        }
+        for (int i = dimExtra; i < dimSize; i += AGG_UNROLL_COUNT) {
           currentPosition = aggregateDimValue(
               positions,
               theAggregators,
@@ -492,11 +584,9 @@ private static long scanAndAggregateDefault(
               aggregatorOffsets,
               aggSize,
               aggExtra,
-              dimValues.get(6),
+              dimValues.get(i),
               currentPosition
           );
-          // fall through
-        case 6:
           currentPosition = aggregateDimValue(
               positions,
               theAggregators,
@@ -505,11 +595,9 @@ private static long scanAndAggregateDefault(
               aggregatorOffsets,
               aggSize,
               aggExtra,
-              dimValues.get(5),
+              dimValues.get(i + 1),
               currentPosition
           );
-          // fall through
-        case 5:
           currentPosition = aggregateDimValue(
               positions,
               theAggregators,
@@ -518,11 +606,9 @@ private static long scanAndAggregateDefault(
               aggregatorOffsets,
               aggSize,
               aggExtra,
-              dimValues.get(4),
+              dimValues.get(i + 2),
               currentPosition
           );
-          // fall through
-        case 4:
           currentPosition = aggregateDimValue(
               positions,
               theAggregators,
@@ -531,11 +617,9 @@ private static long scanAndAggregateDefault(
               aggregatorOffsets,
               aggSize,
               aggExtra,
-              dimValues.get(3),
+              dimValues.get(i + 3),
               currentPosition
           );
-          // fall through
-        case 3:
           currentPosition = aggregateDimValue(
               positions,
               theAggregators,
@@ -544,11 +628,9 @@ private static long scanAndAggregateDefault(
               aggregatorOffsets,
               aggSize,
               aggExtra,
-              dimValues.get(2),
+              dimValues.get(i + 4),
               currentPosition
           );
-          // fall through
-        case 2:
           currentPosition = aggregateDimValue(
               positions,
               theAggregators,
@@ -557,11 +639,9 @@ private static long scanAndAggregateDefault(
               aggregatorOffsets,
               aggSize,
               aggExtra,
-              dimValues.get(1),
+              dimValues.get(i + 5),
               currentPosition
           );
-          // fall through
-        case 1:
           currentPosition = aggregateDimValue(
               positions,
               theAggregators,
@@ -570,103 +650,25 @@ private static long scanAndAggregateDefault(
               aggregatorOffsets,
               aggSize,
               aggExtra,
-              dimValues.get(0),
+              dimValues.get(i + 6),
               currentPosition
           );
-      }
-      for (int i = dimExtra; i < dimSize; i += AGG_UNROLL_COUNT) {
-        currentPosition = aggregateDimValue(
-            positions,
-            theAggregators,
-            resultsBuf,
-            numBytesPerRecord,
-            aggregatorOffsets,
-            aggSize,
-            aggExtra,
-            dimValues.get(i),
-            currentPosition
-        );
-        currentPosition = aggregateDimValue(
-            positions,
-            theAggregators,
-            resultsBuf,
-            numBytesPerRecord,
-            aggregatorOffsets,
-            aggSize,
-            aggExtra,
-            dimValues.get(i + 1),
-            currentPosition
-        );
-        currentPosition = aggregateDimValue(
-            positions,
-            theAggregators,
-            resultsBuf,
-            numBytesPerRecord,
-            aggregatorOffsets,
-            aggSize,
-            aggExtra,
-            dimValues.get(i + 2),
-            currentPosition
-        );
-        currentPosition = aggregateDimValue(
-            positions,
-            theAggregators,
-            resultsBuf,
-            numBytesPerRecord,
-            aggregatorOffsets,
-            aggSize,
-            aggExtra,
-            dimValues.get(i + 3),
-            currentPosition
-        );
-        currentPosition = aggregateDimValue(
-            positions,
-            theAggregators,
-            resultsBuf,
-            numBytesPerRecord,
-            aggregatorOffsets,
-            aggSize,
-            aggExtra,
-            dimValues.get(i + 4),
-            currentPosition
-        );
-        currentPosition = aggregateDimValue(
-            positions,
-            theAggregators,
-            resultsBuf,
-            numBytesPerRecord,
-            aggregatorOffsets,
-            aggSize,
-            aggExtra,
-            dimValues.get(i + 5),
-            currentPosition
-        );
-        currentPosition = aggregateDimValue(
-            positions,
-            theAggregators,
-            resultsBuf,
-            numBytesPerRecord,
-            aggregatorOffsets,
-            aggSize,
-            aggExtra,
-            dimValues.get(i + 6),
-            currentPosition
-        );
-        currentPosition = aggregateDimValue(
-            positions,
-            theAggregators,
-            resultsBuf,
-            numBytesPerRecord,
-            aggregatorOffsets,
-            aggSize,
-            aggExtra,
-            dimValues.get(i + 7),
-            currentPosition
-        );
-      }
-      processedRows++;
-      if (!granularizer.advanceCursorWithinBucketUninterruptedly()) {
-        break;
+          currentPosition = aggregateDimValue(
+              positions,
+              theAggregators,
+              resultsBuf,
+              numBytesPerRecord,
+              aggregatorOffsets,
+              aggSize,
+              aggExtra,
+              dimValues.get(i + 7),
+              currentPosition
+          );
+        }
+        processedRows++;
+        if (!granularizer.advanceCursorWithinBucketUninterruptedly()) {
+          break;
+        }
       }
     }
     return processedRows;
diff --git a/processing/src/main/java/org/apache/druid/query/topn/TimeExtractionTopNAlgorithm.java b/processing/src/main/java/org/apache/druid/query/topn/TimeExtractionTopNAlgorithm.java
index 0c79e7c8d31b..b6079a29f294 100644
--- a/processing/src/main/java/org/apache/druid/query/topn/TimeExtractionTopNAlgorithm.java
+++ b/processing/src/main/java/org/apache/druid/query/topn/TimeExtractionTopNAlgorithm.java
@@ -93,20 +93,22 @@ protected long scanAndAggregate(
     final DimensionSelector dimSelector = params.getDimSelector();
 
     long processedRows = 0;
-    while (!cursor.isDone()) {
-      final Object key = dimensionValueConverter.apply(dimSelector.lookupName(dimSelector.getRow().get(0)));
+    if (granularizer.currentOffsetWithinBucket()) {
+      while (!cursor.isDone()) {
+        final Object key = dimensionValueConverter.apply(dimSelector.lookupName(dimSelector.getRow().get(0)));
 
-      Aggregator[] theAggregators = aggregatesStore.computeIfAbsent(
-          key,
-          k -> makeAggregators(cursor, query.getAggregatorSpecs())
-      );
+        Aggregator[] theAggregators = aggregatesStore.computeIfAbsent(
+            key,
+            k -> makeAggregators(cursor, query.getAggregatorSpecs())
+        );
 
-      for (Aggregator aggregator : theAggregators) {
-        aggregator.aggregate();
-      }
-      processedRows++;
-      if (!granularizer.advanceCursorWithinBucket()) {
-        break;
+        for (Aggregator aggregator : theAggregators) {
+          aggregator.aggregate();
+        }
+        processedRows++;
+        if (!granularizer.advanceCursorWithinBucket()) {
+          break;
+        }
       }
     }
     return processedRows;
diff --git a/processing/src/main/java/org/apache/druid/query/topn/TopNQueryEngine.java b/processing/src/main/java/org/apache/druid/query/topn/TopNQueryEngine.java
index 1382c9aaa4b7..c8aa32921586 100644
--- a/processing/src/main/java/org/apache/druid/query/topn/TopNQueryEngine.java
+++ b/processing/src/main/java/org/apache/druid/query/topn/TopNQueryEngine.java
@@ -28,6 +28,7 @@
 import org.apache.druid.java.util.common.guava.Sequences;
 import org.apache.druid.query.ColumnSelectorPlus;
 import org.apache.druid.query.CursorGranularizer;
+import org.apache.druid.query.QueryContexts;
 import org.apache.druid.query.QueryMetrics;
 import org.apache.druid.query.Result;
 import org.apache.druid.query.aggregation.AggregatorFactory;
@@ -245,6 +246,11 @@ private static boolean canUsePooledAlgorithm(
       final int numBytesPerRecord
   )
   {
+    if (cardinality < 0) {
+      // unknown cardinality doesn't work with the pooled algorithm which requires an exact count of dictionary ids
+      return false;
+    }
+
     if (selector.isHasExtractionFn()) {
       // extraction functions can have a many to one mapping, and should use a heap algorithm
       return false;
@@ -254,28 +260,35 @@ private static boolean canUsePooledAlgorithm(
       // non-string output cannot use the pooled algorith, even if the underlying selector supports it
       return false;
     }
+
     if (!Types.is(capabilities, ValueType.STRING)) {
       // non-strings are not eligible to use the pooled algorithm, and should use a heap algorithm
       return false;
     }
 
-    // string columns must use the on heap algorithm unless they have the following capabilites
     if (!capabilities.isDictionaryEncoded().isTrue() || !capabilities.areDictionaryValuesUnique().isTrue()) {
+      // string columns must use the on heap algorithm unless they have the following capabilites
       return false;
     }
-    if (Granularities.ALL.equals(query.getGranularity())) {
-      // all other requirements have been satisfied, ALL granularity can always use the pooled algorithms
-      return true;
-    }
-    // if not using ALL granularity, we can still potentially use the pooled algorithm if we are certain it doesn't
-    // need to make multiple passes (e.g. reset the cursor)
+
+    // num values per pass must be greater than 0 or else the pooled algorithm cannot progress
     try (final ResourceHolder<ByteBuffer> resultsBufHolder = bufferPool.take()) {
       final ByteBuffer resultsBuf = resultsBufHolder.get();
 
       final int numBytesToWorkWith = resultsBuf.capacity();
       final int numValuesPerPass = numBytesPerRecord > 0 ? numBytesToWorkWith / numBytesPerRecord : cardinality;
 
-      return numValuesPerPass <= cardinality;
+      final boolean allowMultiPassPooled = query.context().getBoolean(
+          QueryContexts.TOPN_USE_MULTI_PASS_POOLED_QUERY_GRANULARITY,
+          false
+      );
+      if (Granularities.ALL.equals(query.getGranularity()) || allowMultiPassPooled) {
+        return numValuesPerPass > 0;
+      }
+
+      // if not using multi-pass for pooled + query granularity other than 'ALL', we must check that all values can fit
+      // in a single pass
+      return numValuesPerPass >= cardinality;
     }
   }
 
diff --git a/processing/src/main/java/org/apache/druid/query/topn/types/NullableNumericTopNColumnAggregatesProcessor.java b/processing/src/main/java/org/apache/druid/query/topn/types/NullableNumericTopNColumnAggregatesProcessor.java
index 565ad036cea0..41709e354975 100644
--- a/processing/src/main/java/org/apache/druid/query/topn/types/NullableNumericTopNColumnAggregatesProcessor.java
+++ b/processing/src/main/java/org/apache/druid/query/topn/types/NullableNumericTopNColumnAggregatesProcessor.java
@@ -94,23 +94,25 @@ public long scanAndAggregate(
   )
   {
     long processedRows = 0;
-    while (!cursor.isDone()) {
-      if (hasNulls && selector.isNull()) {
-        if (nullValueAggregates == null) {
-          nullValueAggregates = BaseTopNAlgorithm.makeAggregators(cursor, query.getAggregatorSpecs());
+    if (granularizer.currentOffsetWithinBucket()) {
+      while (!cursor.isDone()) {
+        if (hasNulls && selector.isNull()) {
+          if (nullValueAggregates == null) {
+            nullValueAggregates = BaseTopNAlgorithm.makeAggregators(cursor, query.getAggregatorSpecs());
+          }
+          for (Aggregator aggregator : nullValueAggregates) {
+            aggregator.aggregate();
+          }
+        } else {
+          Aggregator[] valueAggregates = getValueAggregators(query, selector, cursor);
+          for (Aggregator aggregator : valueAggregates) {
+            aggregator.aggregate();
+          }
         }
-        for (Aggregator aggregator : nullValueAggregates) {
-          aggregator.aggregate();
+        processedRows++;
+        if (!granularizer.advanceCursorWithinBucket()) {
+          break;
         }
-      } else {
-        Aggregator[] valueAggregates = getValueAggregators(query, selector, cursor);
-        for (Aggregator aggregator : valueAggregates) {
-          aggregator.aggregate();
-        }
-      }
-      processedRows++;
-      if (!granularizer.advanceCursorWithinBucket()) {
-        break;
       }
     }
     return processedRows;
diff --git a/processing/src/main/java/org/apache/druid/query/topn/types/StringTopNColumnAggregatesProcessor.java b/processing/src/main/java/org/apache/druid/query/topn/types/StringTopNColumnAggregatesProcessor.java
index 9eca369fdc7e..ac83de847603 100644
--- a/processing/src/main/java/org/apache/druid/query/topn/types/StringTopNColumnAggregatesProcessor.java
+++ b/processing/src/main/java/org/apache/druid/query/topn/types/StringTopNColumnAggregatesProcessor.java
@@ -150,28 +150,30 @@ private long scanAndAggregateWithCardinalityKnown(
   )
   {
     long processedRows = 0;
-    while (!cursor.isDone()) {
-      final IndexedInts dimValues = selector.getRow();
-      for (int i = 0, size = dimValues.size(); i < size; ++i) {
-        final int dimIndex = dimValues.get(i);
-        Aggregator[] aggs = rowSelector[dimIndex];
-        if (aggs == null) {
-          final Object key = dimensionValueConverter.apply(selector.lookupName(dimIndex));
-          aggs = aggregatesStore.computeIfAbsent(
-              key,
-              k -> BaseTopNAlgorithm.makeAggregators(cursor, query.getAggregatorSpecs())
-          );
-          rowSelector[dimIndex] = aggs;
+    if (granularizer.currentOffsetWithinBucket()) {
+      while (!cursor.isDone()) {
+        final IndexedInts dimValues = selector.getRow();
+        for (int i = 0, size = dimValues.size(); i < size; ++i) {
+          final int dimIndex = dimValues.get(i);
+          Aggregator[] aggs = rowSelector[dimIndex];
+          if (aggs == null) {
+            final Object key = dimensionValueConverter.apply(selector.lookupName(dimIndex));
+            aggs = aggregatesStore.computeIfAbsent(
+                key,
+                k -> BaseTopNAlgorithm.makeAggregators(cursor, query.getAggregatorSpecs())
+            );
+            rowSelector[dimIndex] = aggs;
+          }
+
+          for (Aggregator aggregator : aggs) {
+            aggregator.aggregate();
+          }
         }
-
-        for (Aggregator aggregator : aggs) {
-          aggregator.aggregate();
+        processedRows++;
+        if (!granularizer.advanceCursorWithinBucket()) {
+          break;
         }
       }
-      processedRows++;
-      if (!granularizer.advanceCursorWithinBucket()) {
-        break;
-      }
     }
     return processedRows;
   }
@@ -192,22 +194,24 @@ private long scanAndAggregateWithCardinalityUnknown(
   )
   {
     long processedRows = 0;
-    while (!cursor.isDone()) {
-      final IndexedInts dimValues = selector.getRow();
-      for (int i = 0, size = dimValues.size(); i < size; ++i) {
-        final int dimIndex = dimValues.get(i);
-        final Object key = dimensionValueConverter.apply(selector.lookupName(dimIndex));
-        Aggregator[] aggs = aggregatesStore.computeIfAbsent(
-            key,
-            k -> BaseTopNAlgorithm.makeAggregators(cursor, query.getAggregatorSpecs())
-        );
-        for (Aggregator aggregator : aggs) {
-          aggregator.aggregate();
+    if (granularizer.currentOffsetWithinBucket()) {
+      while (!cursor.isDone()) {
+        final IndexedInts dimValues = selector.getRow();
+        for (int i = 0, size = dimValues.size(); i < size; ++i) {
+          final int dimIndex = dimValues.get(i);
+          final Object key = dimensionValueConverter.apply(selector.lookupName(dimIndex));
+          Aggregator[] aggs = aggregatesStore.computeIfAbsent(
+              key,
+              k -> BaseTopNAlgorithm.makeAggregators(cursor, query.getAggregatorSpecs())
+          );
+          for (Aggregator aggregator : aggs) {
+            aggregator.aggregate();
+          }
+        }
+        processedRows++;
+        if (!granularizer.advanceCursorWithinBucket()) {
+          break;
         }
-      }
-      processedRows++;
-      if (!granularizer.advanceCursorWithinBucket()) {
-        break;
       }
     }
     return processedRows;
diff --git a/processing/src/test/java/org/apache/druid/query/topn/TopNQueryRunnerTest.java b/processing/src/test/java/org/apache/druid/query/topn/TopNQueryRunnerTest.java
index 42d8a72a0a03..c3a0982d3716 100644
--- a/processing/src/test/java/org/apache/druid/query/topn/TopNQueryRunnerTest.java
+++ b/processing/src/test/java/org/apache/druid/query/topn/TopNQueryRunnerTest.java
@@ -60,6 +60,7 @@
 import org.apache.druid.query.aggregation.FloatMaxAggregatorFactory;
 import org.apache.druid.query.aggregation.FloatMinAggregatorFactory;
 import org.apache.druid.query.aggregation.LongSumAggregatorFactory;
+import org.apache.druid.query.aggregation.any.StringAnyAggregatorFactory;
 import org.apache.druid.query.aggregation.cardinality.CardinalityAggregatorFactory;
 import org.apache.druid.query.aggregation.firstlast.first.DoubleFirstAggregatorFactory;
 import org.apache.druid.query.aggregation.firstlast.first.FloatFirstAggregatorFactory;
@@ -6378,6 +6379,928 @@ public void testTopNAggregateTopnMetricFirstWithGranularity()
     assertExpectedResults(expectedResults, query);
   }
 
+
+  @Test
+  public void testTopN_time_granularity_empty_buckets()
+  {
+    assumeTimeOrdered();
+    TopNQuery query = new TopNQueryBuilder()
+        .dataSource(QueryRunnerTestHelper.DATA_SOURCE)
+        .granularity(Granularities.HOUR)
+        .dimension(QueryRunnerTestHelper.MARKET_DIMENSION)
+        .metric(QueryRunnerTestHelper.INDEX_METRIC)
+        .threshold(10_000)
+        .intervals(QueryRunnerTestHelper.FIRST_TO_THIRD)
+        .aggregators(QueryRunnerTestHelper.INDEX_LONG_SUM)
+        .build();
+
+    List<Result<TopNResultValue>> expectedResults = Arrays.asList(
+        new Result<>(
+            DateTimes.of("2011-04-01T00:00:00.000Z"),
+            TopNResultValue.create(
+                Arrays.<Map<String, Object>>asList(
+                    ImmutableMap.of(
+                        QueryRunnerTestHelper.MARKET_DIMENSION, "total_market",
+                        "index", 2836L
+                    ),
+                    ImmutableMap.of(
+                        QueryRunnerTestHelper.MARKET_DIMENSION, "upfront",
+                        "index", 2681L
+                    ),
+                    ImmutableMap.of(
+                        QueryRunnerTestHelper.MARKET_DIMENSION, "spot",
+                        "index", 1102L
+                    )
+                )
+            )
+        ),
+        new Result<>(DateTimes.of("2011-04-01T01:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-01T02:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-01T03:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-01T04:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-01T05:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-01T06:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-01T07:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-01T08:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-01T09:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-01T10:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-01T11:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-01T12:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-01T13:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-01T14:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-01T15:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-01T16:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-01T17:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-01T18:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-01T19:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-01T20:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-01T21:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-01T22:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-01T23:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(
+            DateTimes.of("2011-04-02T00:00:00.000Z"),
+            TopNResultValue.create(
+                Arrays.<Map<String, Object>>asList(
+                    ImmutableMap.of(
+                        QueryRunnerTestHelper.MARKET_DIMENSION, "total_market",
+                        "index", 2514L
+                    ),
+                    ImmutableMap.of(
+                        QueryRunnerTestHelper.MARKET_DIMENSION, "upfront",
+                        "index", 2193L
+                    ),
+                    ImmutableMap.of(
+                        QueryRunnerTestHelper.MARKET_DIMENSION, "spot",
+                        "index", 1120L
+                    )
+                )
+            )
+        ),
+        new Result<>(DateTimes.of("2011-04-02T01:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-02T02:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-02T03:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-02T04:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-02T05:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-02T06:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-02T07:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-02T08:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-02T09:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-02T10:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-02T11:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-02T12:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-02T13:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-02T14:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-02T15:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-02T16:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-02T17:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-02T18:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-02T19:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-02T20:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-02T21:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-02T22:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-02T23:00:00.000Z"), TopNResultValue.create(Collections.emptyList()))
+    );
+
+    assertExpectedResults(expectedResults, query);
+  }
+
+  @Test
+  public void testTopN_time_granularity_empty_buckets_expression()
+  {
+    assumeTimeOrdered();
+    TopNQuery query = new TopNQueryBuilder()
+        .dataSource(QueryRunnerTestHelper.DATA_SOURCE)
+        .granularity(Granularities.HOUR)
+        .virtualColumns(
+            new ExpressionVirtualColumn(
+                "vc",
+                "market + ' ' + placement",
+                ColumnType.STRING,
+                TestExprMacroTable.INSTANCE
+            )
+        )
+        .dimension("vc")
+        .metric(QueryRunnerTestHelper.INDEX_METRIC)
+        .threshold(10_000)
+        .intervals(QueryRunnerTestHelper.FIRST_TO_THIRD)
+        .aggregators(QueryRunnerTestHelper.INDEX_LONG_SUM)
+        .build();
+
+    List<Result<TopNResultValue>> expectedResults = Arrays.asList(
+        new Result<>(
+            DateTimes.of("2011-04-01T00:00:00.000Z"),
+            TopNResultValue.create(
+                Arrays.<Map<String, Object>>asList(
+                    ImmutableMap.of(
+                        "vc", "total_market preferred",
+                        "index", 2836L
+                    ),
+                    ImmutableMap.of(
+                        "vc", "upfront preferred",
+                        "index", 2681L
+                    ),
+                    ImmutableMap.of(
+                        "vc", "spot preferred",
+                        "index", 1102L
+                    )
+                )
+            )
+        ),
+        new Result<>(DateTimes.of("2011-04-01T01:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-01T02:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-01T03:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-01T04:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-01T05:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-01T06:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-01T07:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-01T08:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-01T09:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-01T10:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-01T11:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-01T12:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-01T13:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-01T14:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-01T15:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-01T16:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-01T17:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-01T18:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-01T19:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-01T20:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-01T21:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-01T22:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-01T23:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(
+            DateTimes.of("2011-04-02T00:00:00.000Z"),
+            TopNResultValue.create(
+                Arrays.<Map<String, Object>>asList(
+                    ImmutableMap.of(
+                        "vc", "total_market preferred",
+                        "index", 2514L
+                    ),
+                    ImmutableMap.of(
+                        "vc", "upfront preferred",
+                        "index", 2193L
+                    ),
+                    ImmutableMap.of(
+                        "vc", "spot preferred",
+                        "index", 1120L
+                    )
+                )
+            )
+        ),
+        new Result<>(DateTimes.of("2011-04-02T01:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-02T02:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-02T03:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-02T04:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-02T05:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-02T06:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-02T07:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-02T08:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-02T09:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-02T10:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-02T11:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-02T12:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-02T13:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-02T14:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-02T15:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-02T16:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-02T17:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-02T18:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-02T19:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-02T20:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-02T21:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-02T22:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-02T23:00:00.000Z"), TopNResultValue.create(Collections.emptyList()))
+    );
+
+    assertExpectedResults(expectedResults, query);
+  }
+
+  @Test
+  public void testTopN_time_granularity_empty_buckets_2pool()
+  {
+    assumeTimeOrdered();
+    TopNQuery query = new TopNQueryBuilder()
+        .dataSource(QueryRunnerTestHelper.DATA_SOURCE)
+        .granularity(Granularities.HOUR)
+        .dimension(QueryRunnerTestHelper.MARKET_DIMENSION)
+        .metric(QueryRunnerTestHelper.INDEX_METRIC)
+        .threshold(10_000)
+        .intervals(QueryRunnerTestHelper.FIRST_TO_THIRD)
+        .aggregators(
+            QueryRunnerTestHelper.INDEX_LONG_SUM,
+            QueryRunnerTestHelper.INDEX_DOUBLE_MAX
+        )
+        .build();
+
+    List<Result<TopNResultValue>> expectedResults = Arrays.asList(
+        new Result<>(
+            DateTimes.of("2011-04-01T00:00:00.000Z"),
+            TopNResultValue.create(
+                Arrays.<Map<String, Object>>asList(
+                    ImmutableMap.of(
+                        QueryRunnerTestHelper.MARKET_DIMENSION, "total_market",
+                        "index", 2836L,
+                        "doubleMaxIndex", 1522.043733
+                    ),
+                    ImmutableMap.of(
+                        QueryRunnerTestHelper.MARKET_DIMENSION, "upfront",
+                        "index", 2681L,
+                        "doubleMaxIndex", 1447.34116
+                    ),
+                    ImmutableMap.of(
+                        QueryRunnerTestHelper.MARKET_DIMENSION, "spot",
+                        "index", 1102L,
+                        "doubleMaxIndex", 158.747224
+                    )
+                )
+            )
+        ),
+        new Result<>(DateTimes.of("2011-04-01T01:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-01T02:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-01T03:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-01T04:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-01T05:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-01T06:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-01T07:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-01T08:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-01T09:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-01T10:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-01T11:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-01T12:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-01T13:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-01T14:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-01T15:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-01T16:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-01T17:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-01T18:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-01T19:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-01T20:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-01T21:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-01T22:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-01T23:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(
+            DateTimes.of("2011-04-02T00:00:00.000Z"),
+            TopNResultValue.create(
+                Arrays.<Map<String, Object>>asList(
+                    ImmutableMap.of(
+                        QueryRunnerTestHelper.MARKET_DIMENSION, "total_market",
+                        "index", 2514L,
+                        "doubleMaxIndex", 1321.375057
+                    ),
+                    ImmutableMap.of(
+                        QueryRunnerTestHelper.MARKET_DIMENSION, "upfront",
+                        "index", 2193L,
+                        "doubleMaxIndex", 1144.342401
+                    ),
+                    ImmutableMap.of(
+                        QueryRunnerTestHelper.MARKET_DIMENSION, "spot",
+                        "index", 1120L,
+                        "doubleMaxIndex", 166.016049
+                    )
+                )
+            )
+        ),
+        new Result<>(DateTimes.of("2011-04-02T01:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-02T02:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-02T03:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-02T04:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-02T05:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-02T06:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-02T07:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-02T08:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-02T09:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-02T10:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-02T11:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-02T12:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-02T13:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-02T14:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-02T15:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-02T16:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-02T17:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-02T18:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-02T19:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-02T20:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-02T21:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-02T22:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-02T23:00:00.000Z"), TopNResultValue.create(Collections.emptyList()))
+    );
+
+    assertExpectedResults(expectedResults, query);
+  }
+
+  @Test
+  public void testTopN_time_granularity_empty_buckets_timeExtract()
+  {
+    // this is pretty wierd to have both query granularity and a time extractionFn... but it is not explicitly
+    // forbidden so might as well test it
+    assumeTimeOrdered();
+    TopNQuery query = new TopNQueryBuilder()
+        .dataSource(QueryRunnerTestHelper.DATA_SOURCE)
+        .granularity(Granularities.HOUR)
+        .dimension(
+            new ExtractionDimensionSpec(
+                ColumnHolder.TIME_COLUMN_NAME,
+                "dayOfWeek",
+                new TimeFormatExtractionFn("EEEE", null, null, null, false)
+            )
+        )
+        .metric(QueryRunnerTestHelper.INDEX_METRIC)
+        .threshold(10_000)
+        .intervals(QueryRunnerTestHelper.FIRST_TO_THIRD)
+        .aggregators(
+            QueryRunnerTestHelper.INDEX_LONG_SUM
+        )
+        .build();
+
+    List<Result<TopNResultValue>> expectedResults = Arrays.asList(
+        new Result<>(
+            DateTimes.of("2011-04-01T00:00:00.000Z"),
+            TopNResultValue.create(
+                Collections.singletonList(
+                    ImmutableMap.of(
+                        "dayOfWeek", "Friday",
+                        "index", 6619L
+                    )
+                )
+            )
+        ),
+        new Result<>(DateTimes.of("2011-04-01T01:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-01T02:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-01T03:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-01T04:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-01T05:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-01T06:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-01T07:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-01T08:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-01T09:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-01T10:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-01T11:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-01T12:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-01T13:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-01T14:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-01T15:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-01T16:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-01T17:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-01T18:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-01T19:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-01T20:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-01T21:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-01T22:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-01T23:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(
+            DateTimes.of("2011-04-02T00:00:00.000Z"),
+            TopNResultValue.create(
+                Collections.singletonList(
+                    ImmutableMap.of(
+                        "dayOfWeek", "Saturday",
+                        "index", 5827L
+                    )
+                )
+            )
+        ),
+        new Result<>(DateTimes.of("2011-04-02T01:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-02T02:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-02T03:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-02T04:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-02T05:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-02T06:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-02T07:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-02T08:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-02T09:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-02T10:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-02T11:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-02T12:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-02T13:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-02T14:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-02T15:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-02T16:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-02T17:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-02T18:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-02T19:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-02T20:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-02T21:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-02T22:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-02T23:00:00.000Z"), TopNResultValue.create(Collections.emptyList()))
+    );
+
+    assertExpectedResults(expectedResults, query);
+  }
+
+  @Test
+  public void testTopN_time_granularity_empty_buckets_numeric()
+  {
+    assumeTimeOrdered();
+    TopNQuery query = new TopNQueryBuilder()
+        .dataSource(QueryRunnerTestHelper.DATA_SOURCE)
+        .granularity(Granularities.HOUR)
+        .dimension(new DefaultDimensionSpec("qualityLong", "qualityLong", ColumnType.LONG))
+        .metric(QueryRunnerTestHelper.INDEX_METRIC)
+        .threshold(10_000)
+        .intervals(QueryRunnerTestHelper.FIRST_TO_THIRD)
+        .aggregators(
+            QueryRunnerTestHelper.INDEX_LONG_SUM
+        )
+        .build();
+
+    List<Result<TopNResultValue>> expectedResults = Arrays.asList(
+        new Result<>(
+            DateTimes.of("2011-04-01T00:00:00.000Z"),
+            TopNResultValue.create(
+                Arrays.asList(
+                    ImmutableMap.of(
+                        "qualityLong", 1600L,
+                        "index", 2900L
+                    ),
+                    ImmutableMap.of(
+                        "qualityLong", 1400L,
+                        "index", 2870L
+                    ),
+                    ImmutableMap.of(
+                        "qualityLong", 1200L,
+                        "index", 158L
+                    ),
+                    ImmutableMap.of(
+                        "qualityLong", 1000L,
+                        "index", 135L
+                    ),
+                    ImmutableMap.of(
+                        "qualityLong", 1500L,
+                        "index", 121L
+                    ),
+                    ImmutableMap.of(
+                        "qualityLong", 1300L,
+                        "index", 120L
+                    ),
+                    ImmutableMap.of(
+                        "qualityLong", 1800L,
+                        "index", 119L
+                    ),
+                    ImmutableMap.of(
+                        "qualityLong", 1100L,
+                        "index", 118L
+                    ),
+                    ImmutableMap.of(
+                        "qualityLong", 1700L,
+                        "index", 78L
+                    )
+                )
+            )
+        ),
+        new Result<>(DateTimes.of("2011-04-01T01:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-01T02:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-01T03:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-01T04:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-01T05:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-01T06:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-01T07:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-01T08:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-01T09:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-01T10:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-01T11:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-01T12:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-01T13:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-01T14:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-01T15:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-01T16:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-01T17:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-01T18:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-01T19:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-01T20:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-01T21:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-01T22:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-01T23:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(
+            DateTimes.of("2011-04-02T00:00:00.000Z"),
+            TopNResultValue.create(
+                Arrays.asList(
+                    ImmutableMap.of(
+                        "qualityLong", 1600L,
+                        "index", 2505L
+                    ),
+                    ImmutableMap.of(
+                        "qualityLong", 1400L,
+                        "index", 2447L
+                    ),
+                    ImmutableMap.of(
+                        "qualityLong", 1200L,
+                        "index", 166L
+                    ),
+                    ImmutableMap.of(
+                        "qualityLong", 1000L,
+                        "index", 147L
+                    ),
+                    ImmutableMap.of(
+                        "qualityLong", 1800L,
+                        "index", 126L
+                    ),
+                    ImmutableMap.of(
+                        "qualityLong", 1500L,
+                        "index", 114L
+                    ),
+                    ImmutableMap.of(
+                        "qualityLong", 1300L,
+                        "index", 113L
+                    ),
+                    ImmutableMap.of(
+                        "qualityLong", 1100L,
+                        "index", 112L
+                    ),
+                    ImmutableMap.of(
+                        "qualityLong", 1700L,
+                        "index", 97L
+                    )
+                )
+            )
+        ),
+        new Result<>(DateTimes.of("2011-04-02T01:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-02T02:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-02T03:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-02T04:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-02T05:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-02T06:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-02T07:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-02T08:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-02T09:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-02T10:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-02T11:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-02T12:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-02T13:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-02T14:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-02T15:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-02T16:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-02T17:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-02T18:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-02T19:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-02T20:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-02T21:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-02T22:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-02T23:00:00.000Z"), TopNResultValue.create(Collections.emptyList()))
+    );
+
+    assertExpectedResults(expectedResults, query);
+  }
+
+  @Test
+  public void testTopN_time_granularity_multipass_no_pool()
+  {
+    assumeTimeOrdered();
+    TopNQuery query = new TopNQueryBuilder()
+        .dataSource(QueryRunnerTestHelper.DATA_SOURCE)
+        .granularity(Granularities.HOUR)
+        .dimension(QueryRunnerTestHelper.MARKET_DIMENSION)
+        .metric(QueryRunnerTestHelper.INDEX_METRIC)
+        .threshold(10_000)
+        .intervals(QueryRunnerTestHelper.FIRST_TO_THIRD)
+        .aggregators(
+            QueryRunnerTestHelper.INDEX_LONG_SUM,
+            new StringAnyAggregatorFactory("big", QueryRunnerTestHelper.PLACEMENT_DIMENSION, 4000000, null)
+        )
+        .build();
+
+    List<Result<TopNResultValue>> expectedResults = Arrays.asList(
+        new Result<>(
+            DateTimes.of("2011-04-01T00:00:00.000Z"),
+            TopNResultValue.create(
+                Arrays.<Map<String, Object>>asList(
+                    ImmutableMap.of(
+                        QueryRunnerTestHelper.MARKET_DIMENSION, "total_market",
+                        "big", "preferred",
+                        "index", 2836L
+                    ),
+                    ImmutableMap.of(
+                        QueryRunnerTestHelper.MARKET_DIMENSION, "upfront",
+                        "big", "preferred",
+                        "index", 2681L
+                    ),
+                    ImmutableMap.of(
+                        QueryRunnerTestHelper.MARKET_DIMENSION, "spot",
+                        "big", "preferred",
+                        "index", 1102L
+                    )
+                )
+            )
+        ),
+        new Result<>(DateTimes.of("2011-04-01T01:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-01T02:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-01T03:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-01T04:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-01T05:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-01T06:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-01T07:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-01T08:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-01T09:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-01T10:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-01T11:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-01T12:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-01T13:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-01T14:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-01T15:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-01T16:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-01T17:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-01T18:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-01T19:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-01T20:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-01T21:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-01T22:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-01T23:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(
+            DateTimes.of("2011-04-02T00:00:00.000Z"),
+            TopNResultValue.create(
+                Arrays.<Map<String, Object>>asList(
+                    ImmutableMap.of(
+                        QueryRunnerTestHelper.MARKET_DIMENSION, "total_market",
+                        "big", "preferred",
+                        "index", 2514L
+                    ),
+                    ImmutableMap.of(
+                        QueryRunnerTestHelper.MARKET_DIMENSION, "upfront",
+                        "big", "preferred",
+                        "index", 2193L
+                    ),
+                    ImmutableMap.of(
+                        QueryRunnerTestHelper.MARKET_DIMENSION, "spot",
+                        "big", "preferred",
+                        "index", 1120L
+                    )
+                )
+            )
+        ),
+        new Result<>(DateTimes.of("2011-04-02T01:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-02T02:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-02T03:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-02T04:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-02T05:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-02T06:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-02T07:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-02T08:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-02T09:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-02T10:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-02T11:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-02T12:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-02T13:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-02T14:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-02T15:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-02T16:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-02T17:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-02T18:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-02T19:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-02T20:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-02T21:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-02T22:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-02T23:00:00.000Z"), TopNResultValue.create(Collections.emptyList()))
+    );
+
+    assertExpectedResults(expectedResults, query);
+  }
+
+  @Test
+  public void testTopN_time_granularity_multipass_with_pooled()
+  {
+    assumeTimeOrdered();
+    TopNQuery query = new TopNQueryBuilder()
+        .dataSource(QueryRunnerTestHelper.DATA_SOURCE)
+        .granularity(Granularities.HOUR)
+        .dimension(QueryRunnerTestHelper.MARKET_DIMENSION)
+        .metric(QueryRunnerTestHelper.INDEX_METRIC)
+        .threshold(10_000)
+        .intervals(QueryRunnerTestHelper.FIRST_TO_THIRD)
+        .context(ImmutableMap.of(QueryContexts.TOPN_USE_MULTI_PASS_POOLED_QUERY_GRANULARITY, true))
+        .aggregators(
+            QueryRunnerTestHelper.INDEX_LONG_SUM,
+            new StringAnyAggregatorFactory("big", QueryRunnerTestHelper.PLACEMENT_DIMENSION, 4000000, null)
+        )
+        .build();
+
+    List<Result<TopNResultValue>> expectedResults = Arrays.asList(
+        new Result<>(
+            DateTimes.of("2011-04-01T00:00:00.000Z"),
+            TopNResultValue.create(
+                Arrays.<Map<String, Object>>asList(
+                    ImmutableMap.of(
+                        QueryRunnerTestHelper.MARKET_DIMENSION, "total_market",
+                        "big", "preferred",
+                        "index", 2836L
+                    ),
+                    ImmutableMap.of(
+                        QueryRunnerTestHelper.MARKET_DIMENSION, "upfront",
+                        "big", "preferred",
+                        "index", 2681L
+                    ),
+                    ImmutableMap.of(
+                        QueryRunnerTestHelper.MARKET_DIMENSION, "spot",
+                        "big", "preferred",
+                        "index", 1102L
+                    )
+                )
+            )
+        ),
+        new Result<>(DateTimes.of("2011-04-01T01:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-01T02:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-01T03:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-01T04:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-01T05:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-01T06:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-01T07:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-01T08:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-01T09:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-01T10:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-01T11:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-01T12:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-01T13:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-01T14:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-01T15:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-01T16:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-01T17:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-01T18:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-01T19:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-01T20:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-01T21:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-01T22:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-01T23:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(
+            DateTimes.of("2011-04-02T00:00:00.000Z"),
+            TopNResultValue.create(
+                Arrays.<Map<String, Object>>asList(
+                    ImmutableMap.of(
+                        QueryRunnerTestHelper.MARKET_DIMENSION, "total_market",
+                        "big", "preferred",
+                        "index", 2514L
+                    ),
+                    ImmutableMap.of(
+                        QueryRunnerTestHelper.MARKET_DIMENSION, "upfront",
+                        "big", "preferred",
+                        "index", 2193L
+                    ),
+                    ImmutableMap.of(
+                        QueryRunnerTestHelper.MARKET_DIMENSION, "spot",
+                        "big", "preferred",
+                        "index", 1120L
+                    )
+                )
+            )
+        ),
+        new Result<>(DateTimes.of("2011-04-02T01:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-02T02:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-02T03:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-02T04:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-02T05:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-02T06:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-02T07:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-02T08:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-02T09:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-02T10:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-02T11:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-02T12:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-02T13:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-02T14:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-02T15:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-02T16:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-02T17:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-02T18:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-02T19:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-02T20:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-02T21:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-02T22:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-02T23:00:00.000Z"), TopNResultValue.create(Collections.emptyList()))
+    );
+
+    assertExpectedResults(expectedResults, query);
+  }
+
+  @Test
+  public void testTopN_time_granularity_uses_heap_if_too_big()
+  {
+    assumeTimeOrdered();
+    TopNQuery query = new TopNQueryBuilder()
+        .dataSource(QueryRunnerTestHelper.DATA_SOURCE)
+        .granularity(Granularities.HOUR)
+        .dimension(QueryRunnerTestHelper.MARKET_DIMENSION)
+        .metric(QueryRunnerTestHelper.INDEX_METRIC)
+        .threshold(10_000)
+        .intervals(QueryRunnerTestHelper.FIRST_TO_THIRD)
+        .aggregators(
+            QueryRunnerTestHelper.INDEX_LONG_SUM,
+            new StringAnyAggregatorFactory("big", QueryRunnerTestHelper.PLACEMENT_DIMENSION, 40000000, null)
+        )
+        .build();
+
+    List<Result<TopNResultValue>> expectedResults = Arrays.asList(
+        new Result<>(
+            DateTimes.of("2011-04-01T00:00:00.000Z"),
+            TopNResultValue.create(
+                Arrays.<Map<String, Object>>asList(
+                    ImmutableMap.of(
+                        QueryRunnerTestHelper.MARKET_DIMENSION, "total_market",
+                        "big", "preferred",
+                        "index", 2836L
+                    ),
+                    ImmutableMap.of(
+                        QueryRunnerTestHelper.MARKET_DIMENSION, "upfront",
+                        "big", "preferred",
+                        "index", 2681L
+                    ),
+                    ImmutableMap.of(
+                        QueryRunnerTestHelper.MARKET_DIMENSION, "spot",
+                        "big", "preferred",
+                        "index", 1102L
+                    )
+                )
+            )
+        ),
+        new Result<>(DateTimes.of("2011-04-01T01:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-01T02:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-01T03:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-01T04:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-01T05:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-01T06:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-01T07:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-01T08:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-01T09:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-01T10:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-01T11:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-01T12:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-01T13:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-01T14:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-01T15:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-01T16:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-01T17:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-01T18:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-01T19:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-01T20:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-01T21:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-01T22:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-01T23:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(
+            DateTimes.of("2011-04-02T00:00:00.000Z"),
+            TopNResultValue.create(
+                Arrays.<Map<String, Object>>asList(
+                    ImmutableMap.of(
+                        QueryRunnerTestHelper.MARKET_DIMENSION, "total_market",
+                        "big", "preferred",
+                        "index", 2514L
+                    ),
+                    ImmutableMap.of(
+                        QueryRunnerTestHelper.MARKET_DIMENSION, "upfront",
+                        "big", "preferred",
+                        "index", 2193L
+                    ),
+                    ImmutableMap.of(
+                        QueryRunnerTestHelper.MARKET_DIMENSION, "spot",
+                        "big", "preferred",
+                        "index", 1120L
+                    )
+                )
+            )
+        ),
+        new Result<>(DateTimes.of("2011-04-02T01:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-02T02:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-02T03:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-02T04:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-02T05:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-02T06:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-02T07:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-02T08:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-02T09:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-02T10:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-02T11:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-02T12:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-02T13:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-02T14:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-02T15:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-02T16:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-02T17:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-02T18:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-02T19:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-02T20:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-02T21:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-02T22:00:00.000Z"), TopNResultValue.create(Collections.emptyList())),
+        new Result<>(DateTimes.of("2011-04-02T23:00:00.000Z"), TopNResultValue.create(Collections.emptyList()))
+    );
+
+    assertExpectedResults(expectedResults, query);
+  }
+
   private void assumeTimeOrdered()
   {
     try (final CursorHolder cursorHolder =

From bb4416a17b7ace1eaa3b59ac61607700e7e600c5 Mon Sep 17 00:00:00 2001
From: Adarsh Sanjeev <adarshsanjeev@gmail.com>
Date: Tue, 17 Dec 2024 22:25:22 +0530
Subject: [PATCH 43/56] Join context hints (#17541)

* join hints draft

* join algo

* propagate join hints

* review comments

* Use direct hints instead

* Add tests

* Pass preferred algo through pre join clause

* Refactors

* Fix tests

* Revert test changes

* Fix serialization

* Fix tests

* Fix test

* Fix test

* Fix test for sql compat mode

* Increase coverage

* Refactored hint class

---------

Co-authored-by: sreemanamala <sree.manamala@imply.io>
---
 .../sql/DoublesSketchSqlAggregatorTest.java   |   4 +-
 .../error/BroadcastTablesTooLargeFault.java   |   2 +-
 .../BroadcastJoinSegmentMapFnProcessor.java   |   2 +-
 .../druid/msq/querykit/DataSourcePlan.java    |  15 +-
 .../apache/druid/msq/exec/MSQSelectTest.java  |  10 +-
 .../msq/indexing/error/MSQFaultSerdeTest.java |   2 +-
 ...roadcastJoinSegmentMapFnProcessorTest.java |   3 +-
 .../test/CalciteSelectJoinQueryMSQTest.java   |   2 +-
 .../msqJoinHint.iq                            | 752 +++++++++++++++
 .../msqNestedJoinHint.iq                      | 913 ++++++++++++++++++
 .../apache/druid/query}/JoinAlgorithm.java    |   2 +-
 .../apache/druid/query/JoinDataSource.java    |  43 +-
 .../query/planning/PreJoinableClause.java     |  25 +-
 .../druid/query/JoinDataSourceTest.java       |  68 +-
 .../org/apache/druid/query/QueriesTest.java   |  22 +-
 .../metadata/SegmentMetadataQueryTest.java    |   6 +-
 .../planning/DataSourceAnalysisTest.java      |  30 +-
 .../query/planning/PreJoinableClauseTest.java |   3 +-
 .../server/ClientQuerySegmentWalkerTest.java  |  10 +-
 .../sql/calcite/planner/CalcitePlanner.java   |   7 +-
 .../calcite/planner/CalciteRulesManager.java  |   1 +
 .../druid/sql/calcite/planner/DruidHint.java  |  98 ++
 .../sql/calcite/planner/PlannerContext.java   |   1 +
 .../druid/sql/calcite/planner/QueryUtils.java |  20 +
 .../sql/calcite/planner/QueryValidations.java |   1 +
 .../sql/calcite/rel/DruidJoinQueryRel.java    |  12 +-
 .../druid/sql/calcite/rel/DruidQuery.java     |   3 +-
 .../druid/sql/calcite/rule/DruidJoinRule.java |   7 +-
 .../druid/sql/calcite/run/EngineFeature.java  |   3 +-
 .../sql/calcite/run/NativeSqlEngine.java      |   2 +-
 .../quidem/DruidQuidemCommandHandler.java     |  61 +-
 .../sql/calcite/BaseCalciteQueryTest.java     |  27 +-
 .../sql/calcite/CalciteJoinQueryTest.java     |  16 +-
 .../druid/sql/calcite/CalciteQueryTest.java   |   7 +-
 .../sql/calcite/CalciteSubqueryTest.java      |  22 +-
 .../sql/calcite/planner/DruidHintTest.java    |  38 +
 .../druid/sql/calcite/rel/DruidQueryTest.java |   4 +-
 .../sql/calcite/rule/DruidJoinRuleTest.java   |   2 +-
 38 files changed, 2133 insertions(+), 113 deletions(-)
 create mode 100644 extensions-core/multi-stage-query/src/test/quidem/org.apache.druid.msq.quidem.MSQQuidemTest/msqJoinHint.iq
 create mode 100644 extensions-core/multi-stage-query/src/test/quidem/org.apache.druid.msq.quidem.MSQQuidemTest/msqNestedJoinHint.iq
 rename {sql/src/main/java/org/apache/druid/sql/calcite/planner => processing/src/main/java/org/apache/druid/query}/JoinAlgorithm.java (97%)
 create mode 100644 sql/src/main/java/org/apache/druid/sql/calcite/planner/DruidHint.java
 create mode 100644 sql/src/test/java/org/apache/druid/sql/calcite/planner/DruidHintTest.java

diff --git a/extensions-core/datasketches/src/test/java/org/apache/druid/query/aggregation/datasketches/quantiles/sql/DoublesSketchSqlAggregatorTest.java b/extensions-core/datasketches/src/test/java/org/apache/druid/query/aggregation/datasketches/quantiles/sql/DoublesSketchSqlAggregatorTest.java
index ba1eb347fe71..9cc90617347d 100644
--- a/extensions-core/datasketches/src/test/java/org/apache/druid/query/aggregation/datasketches/quantiles/sql/DoublesSketchSqlAggregatorTest.java
+++ b/extensions-core/datasketches/src/test/java/org/apache/druid/query/aggregation/datasketches/quantiles/sql/DoublesSketchSqlAggregatorTest.java
@@ -27,6 +27,7 @@
 import org.apache.druid.java.util.common.Intervals;
 import org.apache.druid.java.util.common.granularity.Granularities;
 import org.apache.druid.query.Druids;
+import org.apache.druid.query.JoinAlgorithm;
 import org.apache.druid.query.JoinDataSource;
 import org.apache.druid.query.QueryContexts;
 import org.apache.druid.query.QueryDataSource;
@@ -390,7 +391,8 @@ public void testSubqueryWithNestedGroupBy()
                         JoinType.INNER,
                         null,
                         TestExprMacroTable.INSTANCE,
-                        null
+                        null,
+                        JoinAlgorithm.BROADCAST
                     )
                 )
                 .intervals(querySegmentSpec(Intervals.ETERNITY))
diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/BroadcastTablesTooLargeFault.java b/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/BroadcastTablesTooLargeFault.java
index 6912fefa6b65..31337cbcfe69 100644
--- a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/BroadcastTablesTooLargeFault.java
+++ b/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/error/BroadcastTablesTooLargeFault.java
@@ -24,7 +24,7 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import org.apache.druid.java.util.common.StringUtils;
-import org.apache.druid.sql.calcite.planner.JoinAlgorithm;
+import org.apache.druid.query.JoinAlgorithm;
 import org.apache.druid.sql.calcite.planner.PlannerContext;
 
 import javax.annotation.Nullable;
diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/querykit/BroadcastJoinSegmentMapFnProcessor.java b/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/querykit/BroadcastJoinSegmentMapFnProcessor.java
index cbb79c45702b..b47a450aa000 100644
--- a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/querykit/BroadcastJoinSegmentMapFnProcessor.java
+++ b/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/querykit/BroadcastJoinSegmentMapFnProcessor.java
@@ -38,11 +38,11 @@
 import org.apache.druid.msq.input.ReadableInput;
 import org.apache.druid.query.DataSource;
 import org.apache.druid.query.InlineDataSource;
+import org.apache.druid.query.JoinAlgorithm;
 import org.apache.druid.query.Query;
 import org.apache.druid.segment.ColumnValueSelector;
 import org.apache.druid.segment.Cursor;
 import org.apache.druid.segment.SegmentReference;
-import org.apache.druid.sql.calcite.planner.JoinAlgorithm;
 import org.apache.druid.sql.calcite.planner.PlannerContext;
 
 import java.io.IOException;
diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/querykit/DataSourcePlan.java b/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/querykit/DataSourcePlan.java
index 6b8fbcb6f352..d20adc1e0062 100644
--- a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/querykit/DataSourcePlan.java
+++ b/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/querykit/DataSourcePlan.java
@@ -47,6 +47,7 @@
 import org.apache.druid.query.DataSource;
 import org.apache.druid.query.FilteredDataSource;
 import org.apache.druid.query.InlineDataSource;
+import org.apache.druid.query.JoinAlgorithm;
 import org.apache.druid.query.JoinDataSource;
 import org.apache.druid.query.LookupDataSource;
 import org.apache.druid.query.QueryContext;
@@ -65,8 +66,6 @@
 import org.apache.druid.segment.join.JoinConditionAnalysis;
 import org.apache.druid.sql.calcite.external.ExternalDataSource;
 import org.apache.druid.sql.calcite.parser.DruidSqlInsert;
-import org.apache.druid.sql.calcite.planner.JoinAlgorithm;
-import org.apache.druid.sql.calcite.planner.PlannerContext;
 import org.joda.time.Interval;
 
 import javax.annotation.Nullable;
@@ -212,10 +211,11 @@ public static DataSourcePlan forDataSource(
           broadcast
       );
     } else if (dataSource instanceof JoinDataSource) {
-      final JoinAlgorithm preferredJoinAlgorithm = PlannerContext.getJoinAlgorithm(queryContext);
+      JoinDataSource joinDataSource = (JoinDataSource) dataSource;
+      final JoinAlgorithm preferredJoinAlgorithm = joinDataSource.getJoinAlgorithm();
       final JoinAlgorithm deducedJoinAlgorithm = deduceJoinAlgorithm(
           preferredJoinAlgorithm,
-          ((JoinDataSource) dataSource)
+          joinDataSource
       );
 
       switch (deducedJoinAlgorithm) {
@@ -223,7 +223,7 @@ public static DataSourcePlan forDataSource(
           return forBroadcastHashJoin(
               queryKitSpec,
               queryContext,
-              (JoinDataSource) dataSource,
+              joinDataSource,
               querySegmentSpec,
               filter,
               filterFields,
@@ -234,7 +234,7 @@ public static DataSourcePlan forDataSource(
         case SORT_MERGE:
           return forSortMergeJoin(
               queryKitSpec,
-              (JoinDataSource) dataSource,
+              joinDataSource,
               querySegmentSpec,
               minStageNumber,
               broadcast
@@ -615,7 +615,8 @@ private static DataSourcePlan forBroadcastHashJoin(
           clause.getJoinType(),
           // First JoinDataSource (i == 0) involves the base table, so we need to propagate the base table filter.
           i == 0 ? analysis.getJoinBaseTableFilter().orElse(null) : null,
-          dataSource.getJoinableFactoryWrapper()
+          dataSource.getJoinableFactoryWrapper(),
+          clause.getJoinAlgorithm()
       );
       inputSpecs.addAll(clausePlan.getInputSpecs());
       clausePlan.getBroadcastInputs().intStream().forEach(n -> broadcastInputs.add(n + shift));
diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/exec/MSQSelectTest.java b/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/exec/MSQSelectTest.java
index 09dcbfcda144..6b904e5f1495 100644
--- a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/exec/MSQSelectTest.java
+++ b/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/exec/MSQSelectTest.java
@@ -50,6 +50,7 @@
 import org.apache.druid.msq.test.MSQTestBase;
 import org.apache.druid.msq.util.MultiStageQueryContext;
 import org.apache.druid.query.InlineDataSource;
+import org.apache.druid.query.JoinAlgorithm;
 import org.apache.druid.query.LookupDataSource;
 import org.apache.druid.query.OrderBy;
 import org.apache.druid.query.Query;
@@ -81,7 +82,6 @@
 import org.apache.druid.sql.calcite.filtration.Filtration;
 import org.apache.druid.sql.calcite.planner.ColumnMapping;
 import org.apache.druid.sql.calcite.planner.ColumnMappings;
-import org.apache.druid.sql.calcite.planner.JoinAlgorithm;
 import org.apache.druid.sql.calcite.planner.PlannerContext;
 import org.apache.druid.sql.calcite.util.CalciteTests;
 import org.hamcrest.CoreMatchers;
@@ -1043,7 +1043,9 @@ private void testJoin(String contextName, Map<String, Object> context, final Joi
                                 DruidExpression.ofColumn(ColumnType.FLOAT, "m1"),
                                 DruidExpression.ofColumn(ColumnType.FLOAT, "j0.m1")
                             ),
-                            JoinType.INNER
+                            JoinType.INNER,
+                            null,
+                            joinAlgorithm
                         )
                     )
                     .setInterval(querySegmentSpec(Filtration.eternity()))
@@ -2523,7 +2525,9 @@ public void testJoinUsesDifferentAlgorithm(String contextName, Map<String, Objec
                 ),
                 "j0.",
                 "(CAST(floor(100), 'DOUBLE') == \"j0.d0\")",
-                JoinType.LEFT
+                JoinType.LEFT,
+                null,
+                JoinAlgorithm.SORT_MERGE
             )
         )
         .setAggregatorSpecs(
diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/indexing/error/MSQFaultSerdeTest.java b/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/indexing/error/MSQFaultSerdeTest.java
index 55c6c48c1afe..3d26444a3d27 100644
--- a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/indexing/error/MSQFaultSerdeTest.java
+++ b/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/indexing/error/MSQFaultSerdeTest.java
@@ -26,9 +26,9 @@
 import org.apache.druid.java.util.common.Intervals;
 import org.apache.druid.java.util.common.granularity.Granularities;
 import org.apache.druid.msq.guice.MSQIndexingModule;
+import org.apache.druid.query.JoinAlgorithm;
 import org.apache.druid.segment.TestHelper;
 import org.apache.druid.segment.column.ColumnType;
-import org.apache.druid.sql.calcite.planner.JoinAlgorithm;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/querykit/BroadcastJoinSegmentMapFnProcessorTest.java b/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/querykit/BroadcastJoinSegmentMapFnProcessorTest.java
index 4270fe8bdccc..2f3efa679cd8 100644
--- a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/querykit/BroadcastJoinSegmentMapFnProcessorTest.java
+++ b/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/querykit/BroadcastJoinSegmentMapFnProcessorTest.java
@@ -42,6 +42,7 @@
 import org.apache.druid.msq.indexing.error.MSQException;
 import org.apache.druid.query.DataSource;
 import org.apache.druid.query.InlineDataSource;
+import org.apache.druid.query.JoinAlgorithm;
 import org.apache.druid.query.JoinDataSource;
 import org.apache.druid.query.Query;
 import org.apache.druid.query.QueryContext;
@@ -50,7 +51,6 @@
 import org.apache.druid.segment.TestIndex;
 import org.apache.druid.segment.join.JoinConditionAnalysis;
 import org.apache.druid.segment.join.JoinType;
-import org.apache.druid.sql.calcite.planner.JoinAlgorithm;
 import org.apache.druid.sql.calcite.planner.PlannerContext;
 import org.apache.druid.testing.InitializedNullHandlingTest;
 import org.easymock.EasyMock;
@@ -190,6 +190,7 @@ public void testBuildTableAndInlineData() throws IOException
             JoinConditionAnalysis.forExpression("x == \"j.x\"", "j.", ExprMacroTable.nil()),
             JoinType.INNER,
             null,
+            null,
             null
         )
     );
diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/test/CalciteSelectJoinQueryMSQTest.java b/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/test/CalciteSelectJoinQueryMSQTest.java
index 30724dcd4ce0..42ee5bac3528 100644
--- a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/test/CalciteSelectJoinQueryMSQTest.java
+++ b/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/test/CalciteSelectJoinQueryMSQTest.java
@@ -21,11 +21,11 @@
 
 import com.google.common.collect.ImmutableMap;
 import org.apache.druid.msq.sql.MSQTaskSqlEngine;
+import org.apache.druid.query.JoinAlgorithm;
 import org.apache.druid.sql.calcite.BaseCalciteQueryTest;
 import org.apache.druid.sql.calcite.CalciteJoinQueryTest;
 import org.apache.druid.sql.calcite.QueryTestBuilder;
 import org.apache.druid.sql.calcite.SqlTestFrameworkConfig;
-import org.apache.druid.sql.calcite.planner.JoinAlgorithm;
 import org.apache.druid.sql.calcite.planner.PlannerContext;
 import java.util.Map;
 
diff --git a/extensions-core/multi-stage-query/src/test/quidem/org.apache.druid.msq.quidem.MSQQuidemTest/msqJoinHint.iq b/extensions-core/multi-stage-query/src/test/quidem/org.apache.druid.msq.quidem.MSQQuidemTest/msqJoinHint.iq
new file mode 100644
index 000000000000..d6319fadf9ed
--- /dev/null
+++ b/extensions-core/multi-stage-query/src/test/quidem/org.apache.druid.msq.quidem.MSQQuidemTest/msqJoinHint.iq
@@ -0,0 +1,752 @@
+!use druidtest://?componentSupplier=DrillWindowQueryMSQComponentSupplier
+!set outputformat mysql
+
+select w1.cityName, w2.countryName
+from (select cityName, countryName from wikipedia where cityName='New York') w1
+JOIN wikipedia w2 ON w1.cityName = w2.cityName
+where w1.cityName='New York';
+
+[ {
+  "stageNumber" : 0,
+  "definition" : {
+    "id" : "<taskId>_0",
+    "input" : [ {
+      "type" : "table",
+      "dataSource" : "wikipedia",
+      "intervals" : [ "-146136543-09-08T08:23:32.096Z/146140482-04-24T15:36:27.903Z" ],
+      "filter" : {
+        "type" : "equals",
+        "column" : "cityName",
+        "matchValueType" : "STRING",
+        "matchValue" : "New York"
+      },
+      "filterFields" : [ "cityName" ]
+    } ],
+    "processor" : {
+      "type" : "scan",
+      "query" : {
+        "queryType" : "scan",
+        "dataSource" : {
+          "type" : "inputNumber",
+          "inputNumber" : 0
+        },
+        "intervals" : {
+          "type" : "intervals",
+          "intervals" : [ "-146136543-09-08T08:23:32.096Z/146140482-04-24T15:36:27.903Z" ]
+        },
+        "resultFormat" : "compactedList",
+        "filter" : {
+          "type" : "equals",
+          "column" : "cityName",
+          "matchValueType" : "STRING",
+          "matchValue" : "New York"
+        },
+        "columns" : [ "cityName" ],
+        "context" : {
+          "scanSignature" : "[{\"name\":\"cityName\",\"type\":\"STRING\"}]",
+          "sqlInsertSegmentGranularity" : null,
+          "sqlQueryId" : __SQL_QUERY_ID__
+          "sqlStringifyArrays" : false
+        },
+        "columnTypes" : [ "STRING" ],
+        "granularity" : {
+          "type" : "all"
+        },
+        "legacy" : false
+      }
+    },
+    "signature" : [ {
+      "name" : "__boost",
+      "type" : "LONG"
+    }, {
+      "name" : "cityName",
+      "type" : "STRING"
+    } ],
+    "shuffleSpec" : {
+      "type" : "maxCount",
+      "clusterBy" : {
+        "columns" : [ {
+          "columnName" : "__boost",
+          "order" : "ASCENDING"
+        } ]
+      },
+      "partitions" : 1
+    },
+    "maxWorkerCount" : 1
+  },
+  "phase" : "FINISHED",
+  "workerCount" : 1,
+  "partitionCount" : 1,
+  "shuffle" : "globalSort",
+  "output" : "localStorage",
+  "startTime" : __TIMESTAMP__
+  "duration" : __DURATION__
+  "sort" : true
+}, {
+  "stageNumber" : 1,
+  "definition" : {
+    "id" : "<taskId>_1",
+    "input" : [ {
+      "type" : "table",
+      "dataSource" : "wikipedia",
+      "intervals" : [ "-146136543-09-08T08:23:32.096Z/146140482-04-24T15:36:27.903Z" ]
+    } ],
+    "processor" : {
+      "type" : "scan",
+      "query" : {
+        "queryType" : "scan",
+        "dataSource" : {
+          "type" : "inputNumber",
+          "inputNumber" : 0
+        },
+        "intervals" : {
+          "type" : "intervals",
+          "intervals" : [ "-146136543-09-08T08:23:32.096Z/146140482-04-24T15:36:27.903Z" ]
+        },
+        "resultFormat" : "compactedList",
+        "columns" : [ "cityName", "countryName" ],
+        "context" : {
+          "scanSignature" : "[{\"name\":\"cityName\",\"type\":\"STRING\"},{\"name\":\"countryName\",\"type\":\"STRING\"}]",
+          "sqlInsertSegmentGranularity" : null,
+          "sqlQueryId" : __SQL_QUERY_ID__
+          "sqlStringifyArrays" : false
+        },
+        "columnTypes" : [ "STRING", "STRING" ],
+        "granularity" : {
+          "type" : "all"
+        },
+        "legacy" : false
+      }
+    },
+    "signature" : [ {
+      "name" : "__boost",
+      "type" : "LONG"
+    }, {
+      "name" : "cityName",
+      "type" : "STRING"
+    }, {
+      "name" : "countryName",
+      "type" : "STRING"
+    } ],
+    "shuffleSpec" : {
+      "type" : "maxCount",
+      "clusterBy" : {
+        "columns" : [ {
+          "columnName" : "__boost",
+          "order" : "ASCENDING"
+        } ]
+      },
+      "partitions" : 1
+    },
+    "maxWorkerCount" : 1
+  },
+  "phase" : "FINISHED",
+  "workerCount" : 1,
+  "partitionCount" : 1,
+  "shuffle" : "globalSort",
+  "output" : "localStorage",
+  "startTime" : __TIMESTAMP__
+  "duration" : __DURATION__
+  "sort" : true
+}, {
+  "stageNumber" : 2,
+  "definition" : {
+    "id" : "<taskId>_2",
+    "input" : [ {
+      "type" : "stage",
+      "stage" : 0
+    }, {
+      "type" : "stage",
+      "stage" : 1
+    } ],
+    "broadcast" : [ 1 ],
+    "processor" : {
+      "type" : "scan",
+      "query" : {
+        "queryType" : "scan",
+        "dataSource" : {
+          "type" : "join",
+          "left" : {
+            "type" : "inputNumber",
+            "inputNumber" : 0
+          },
+          "right" : {
+            "type" : "inputNumber",
+            "inputNumber" : 1
+          },
+          "rightPrefix" : "j0.",
+          "condition" : "(\"cityName\" == \"j0.cityName\")",
+          "joinType" : "INNER"
+        },
+        "intervals" : {
+          "type" : "intervals",
+          "intervals" : [ "-146136543-09-08T08:23:32.096Z/146140482-04-24T15:36:27.903Z" ]
+        },
+        "virtualColumns" : [ {
+          "type" : "expression",
+          "name" : "v0",
+          "expression" : "'New York'",
+          "outputType" : "STRING"
+        } ],
+        "resultFormat" : "compactedList",
+        "columns" : [ "v0", "j0.countryName" ],
+        "context" : {
+          "__user" : null,
+          "finalize" : true,
+          "maxParseExceptions" : 0,
+          "scanSignature" : "[{\"name\":\"v0\",\"type\":\"STRING\"},{\"name\":\"j0.countryName\",\"type\":\"STRING\"}]",
+          "sqlQueryId" : __SQL_QUERY_ID__
+          "sqlStringifyArrays" : false,
+          "windowFunctionOperatorTransformation" : true
+        },
+        "columnTypes" : [ "STRING", "STRING" ],
+        "granularity" : {
+          "type" : "all"
+        },
+        "legacy" : false
+      }
+    },
+    "signature" : [ {
+      "name" : "__boost",
+      "type" : "LONG"
+    }, {
+      "name" : "v0",
+      "type" : "STRING"
+    }, {
+      "name" : "j0.countryName",
+      "type" : "STRING"
+    } ],
+    "shuffleSpec" : {
+      "type" : "maxCount",
+      "clusterBy" : {
+        "columns" : [ {
+          "columnName" : "__boost",
+          "order" : "ASCENDING"
+        } ]
+      },
+      "partitions" : 1
+    },
+    "maxWorkerCount" : 1
+  },
+  "phase" : "FINISHED",
+  "workerCount" : 1,
+  "partitionCount" : 1,
+  "shuffle" : "globalSort",
+  "output" : "localStorage",
+  "startTime" : __TIMESTAMP__
+  "duration" : __DURATION__
+  "sort" : true
+} ]
+!msqPlan
+
+select /*+ broadcast */ w1.cityName, w2.countryName
+from (select cityName, countryName from wikipedia where cityName='New York') w1
+JOIN wikipedia w2 ON w1.cityName = w2.cityName
+where w1.cityName='New York';
+
+LogicalJoin:[[broadcast inheritPath:[0, 0]]]
+
+!hints
+
+[ {
+  "stageNumber" : 0,
+  "definition" : {
+    "id" : "<taskId>_0",
+    "input" : [ {
+      "type" : "table",
+      "dataSource" : "wikipedia",
+      "intervals" : [ "-146136543-09-08T08:23:32.096Z/146140482-04-24T15:36:27.903Z" ],
+      "filter" : {
+        "type" : "equals",
+        "column" : "cityName",
+        "matchValueType" : "STRING",
+        "matchValue" : "New York"
+      },
+      "filterFields" : [ "cityName" ]
+    } ],
+    "processor" : {
+      "type" : "scan",
+      "query" : {
+        "queryType" : "scan",
+        "dataSource" : {
+          "type" : "inputNumber",
+          "inputNumber" : 0
+        },
+        "intervals" : {
+          "type" : "intervals",
+          "intervals" : [ "-146136543-09-08T08:23:32.096Z/146140482-04-24T15:36:27.903Z" ]
+        },
+        "resultFormat" : "compactedList",
+        "filter" : {
+          "type" : "equals",
+          "column" : "cityName",
+          "matchValueType" : "STRING",
+          "matchValue" : "New York"
+        },
+        "columns" : [ "cityName" ],
+        "context" : {
+          "scanSignature" : "[{\"name\":\"cityName\",\"type\":\"STRING\"}]",
+          "sqlInsertSegmentGranularity" : null,
+          "sqlQueryId" : __SQL_QUERY_ID__
+          "sqlStringifyArrays" : false
+        },
+        "columnTypes" : [ "STRING" ],
+        "granularity" : {
+          "type" : "all"
+        },
+        "legacy" : false
+      }
+    },
+    "signature" : [ {
+      "name" : "__boost",
+      "type" : "LONG"
+    }, {
+      "name" : "cityName",
+      "type" : "STRING"
+    } ],
+    "shuffleSpec" : {
+      "type" : "maxCount",
+      "clusterBy" : {
+        "columns" : [ {
+          "columnName" : "__boost",
+          "order" : "ASCENDING"
+        } ]
+      },
+      "partitions" : 1
+    },
+    "maxWorkerCount" : 1
+  },
+  "phase" : "FINISHED",
+  "workerCount" : 1,
+  "partitionCount" : 1,
+  "shuffle" : "globalSort",
+  "output" : "localStorage",
+  "startTime" : __TIMESTAMP__
+  "duration" : __DURATION__
+  "sort" : true
+}, {
+  "stageNumber" : 1,
+  "definition" : {
+    "id" : "<taskId>_1",
+    "input" : [ {
+      "type" : "table",
+      "dataSource" : "wikipedia",
+      "intervals" : [ "-146136543-09-08T08:23:32.096Z/146140482-04-24T15:36:27.903Z" ]
+    } ],
+    "processor" : {
+      "type" : "scan",
+      "query" : {
+        "queryType" : "scan",
+        "dataSource" : {
+          "type" : "inputNumber",
+          "inputNumber" : 0
+        },
+        "intervals" : {
+          "type" : "intervals",
+          "intervals" : [ "-146136543-09-08T08:23:32.096Z/146140482-04-24T15:36:27.903Z" ]
+        },
+        "resultFormat" : "compactedList",
+        "columns" : [ "cityName", "countryName" ],
+        "context" : {
+          "scanSignature" : "[{\"name\":\"cityName\",\"type\":\"STRING\"},{\"name\":\"countryName\",\"type\":\"STRING\"}]",
+          "sqlInsertSegmentGranularity" : null,
+          "sqlQueryId" : __SQL_QUERY_ID__
+          "sqlStringifyArrays" : false
+        },
+        "columnTypes" : [ "STRING", "STRING" ],
+        "granularity" : {
+          "type" : "all"
+        },
+        "legacy" : false
+      }
+    },
+    "signature" : [ {
+      "name" : "__boost",
+      "type" : "LONG"
+    }, {
+      "name" : "cityName",
+      "type" : "STRING"
+    }, {
+      "name" : "countryName",
+      "type" : "STRING"
+    } ],
+    "shuffleSpec" : {
+      "type" : "maxCount",
+      "clusterBy" : {
+        "columns" : [ {
+          "columnName" : "__boost",
+          "order" : "ASCENDING"
+        } ]
+      },
+      "partitions" : 1
+    },
+    "maxWorkerCount" : 1
+  },
+  "phase" : "FINISHED",
+  "workerCount" : 1,
+  "partitionCount" : 1,
+  "shuffle" : "globalSort",
+  "output" : "localStorage",
+  "startTime" : __TIMESTAMP__
+  "duration" : __DURATION__
+  "sort" : true
+}, {
+  "stageNumber" : 2,
+  "definition" : {
+    "id" : "<taskId>_2",
+    "input" : [ {
+      "type" : "stage",
+      "stage" : 0
+    }, {
+      "type" : "stage",
+      "stage" : 1
+    } ],
+    "broadcast" : [ 1 ],
+    "processor" : {
+      "type" : "scan",
+      "query" : {
+        "queryType" : "scan",
+        "dataSource" : {
+          "type" : "join",
+          "left" : {
+            "type" : "inputNumber",
+            "inputNumber" : 0
+          },
+          "right" : {
+            "type" : "inputNumber",
+            "inputNumber" : 1
+          },
+          "rightPrefix" : "j0.",
+          "condition" : "(\"cityName\" == \"j0.cityName\")",
+          "joinType" : "INNER"
+        },
+        "intervals" : {
+          "type" : "intervals",
+          "intervals" : [ "-146136543-09-08T08:23:32.096Z/146140482-04-24T15:36:27.903Z" ]
+        },
+        "virtualColumns" : [ {
+          "type" : "expression",
+          "name" : "v0",
+          "expression" : "'New York'",
+          "outputType" : "STRING"
+        } ],
+        "resultFormat" : "compactedList",
+        "columns" : [ "v0", "j0.countryName" ],
+        "context" : {
+          "__user" : null,
+          "finalize" : true,
+          "maxParseExceptions" : 0,
+          "scanSignature" : "[{\"name\":\"v0\",\"type\":\"STRING\"},{\"name\":\"j0.countryName\",\"type\":\"STRING\"}]",
+          "sqlQueryId" : __SQL_QUERY_ID__
+          "sqlStringifyArrays" : false,
+          "windowFunctionOperatorTransformation" : true
+        },
+        "columnTypes" : [ "STRING", "STRING" ],
+        "granularity" : {
+          "type" : "all"
+        },
+        "legacy" : false
+      }
+    },
+    "signature" : [ {
+      "name" : "__boost",
+      "type" : "LONG"
+    }, {
+      "name" : "v0",
+      "type" : "STRING"
+    }, {
+      "name" : "j0.countryName",
+      "type" : "STRING"
+    } ],
+    "shuffleSpec" : {
+      "type" : "maxCount",
+      "clusterBy" : {
+        "columns" : [ {
+          "columnName" : "__boost",
+          "order" : "ASCENDING"
+        } ]
+      },
+      "partitions" : 1
+    },
+    "maxWorkerCount" : 1
+  },
+  "phase" : "FINISHED",
+  "workerCount" : 1,
+  "partitionCount" : 1,
+  "shuffle" : "globalSort",
+  "output" : "localStorage",
+  "startTime" : __TIMESTAMP__
+  "duration" : __DURATION__
+  "sort" : true
+} ]
+!msqPlan
+
+select /*+ sort_merge */ w1.cityName, w2.countryName
+from (select cityName, countryName from wikipedia where cityName='New York') w1
+JOIN wikipedia w2 ON w1.cityName = w2.cityName
+where w1.cityName='New York';
+
+
+LogicalJoin:[[sort_merge inheritPath:[0, 0]]]
+
+!hints
+
+[ {
+  "stageNumber" : 0,
+  "definition" : {
+    "id" : "<taskId>_0",
+    "input" : [ {
+      "type" : "table",
+      "dataSource" : "wikipedia",
+      "intervals" : [ "-146136543-09-08T08:23:32.096Z/146140482-04-24T15:36:27.903Z" ],
+      "filter" : {
+        "type" : "equals",
+        "column" : "cityName",
+        "matchValueType" : "STRING",
+        "matchValue" : "New York"
+      },
+      "filterFields" : [ "cityName" ]
+    } ],
+    "processor" : {
+      "type" : "scan",
+      "query" : {
+        "queryType" : "scan",
+        "dataSource" : {
+          "type" : "inputNumber",
+          "inputNumber" : 0
+        },
+        "intervals" : {
+          "type" : "intervals",
+          "intervals" : [ "-146136543-09-08T08:23:32.096Z/146140482-04-24T15:36:27.903Z" ]
+        },
+        "resultFormat" : "compactedList",
+        "filter" : {
+          "type" : "equals",
+          "column" : "cityName",
+          "matchValueType" : "STRING",
+          "matchValue" : "New York"
+        },
+        "columns" : [ "cityName" ],
+        "context" : {
+          "scanSignature" : "[{\"name\":\"cityName\",\"type\":\"STRING\"}]",
+          "sqlInsertSegmentGranularity" : null,
+          "sqlQueryId" : __SQL_QUERY_ID__
+          "sqlStringifyArrays" : false
+        },
+        "columnTypes" : [ "STRING" ],
+        "granularity" : {
+          "type" : "all"
+        },
+        "legacy" : false
+      }
+    },
+    "signature" : [ {
+      "name" : "cityName",
+      "type" : "STRING"
+    }, {
+      "name" : "__boost",
+      "type" : "LONG"
+    } ],
+    "shuffleSpec" : {
+      "type" : "hash",
+      "clusterBy" : {
+        "columns" : [ {
+          "columnName" : "cityName",
+          "order" : "ASCENDING"
+        } ]
+      },
+      "partitions" : 1
+    },
+    "maxWorkerCount" : 1
+  },
+  "phase" : "FINISHED",
+  "workerCount" : 1,
+  "partitionCount" : 1,
+  "shuffle" : "hashLocalSort",
+  "output" : "localStorage",
+  "startTime" : __TIMESTAMP__
+  "duration" : __DURATION__
+  "sort" : true
+}, {
+  "stageNumber" : 1,
+  "definition" : {
+    "id" : "<taskId>_1",
+    "input" : [ {
+      "type" : "table",
+      "dataSource" : "wikipedia",
+      "intervals" : [ "-146136543-09-08T08:23:32.096Z/146140482-04-24T15:36:27.903Z" ]
+    } ],
+    "processor" : {
+      "type" : "scan",
+      "query" : {
+        "queryType" : "scan",
+        "dataSource" : {
+          "type" : "inputNumber",
+          "inputNumber" : 0
+        },
+        "intervals" : {
+          "type" : "intervals",
+          "intervals" : [ "-146136543-09-08T08:23:32.096Z/146140482-04-24T15:36:27.903Z" ]
+        },
+        "resultFormat" : "compactedList",
+        "columns" : [ "cityName", "countryName" ],
+        "context" : {
+          "scanSignature" : "[{\"name\":\"cityName\",\"type\":\"STRING\"},{\"name\":\"countryName\",\"type\":\"STRING\"}]",
+          "sqlInsertSegmentGranularity" : null,
+          "sqlQueryId" : __SQL_QUERY_ID__
+          "sqlStringifyArrays" : false
+        },
+        "columnTypes" : [ "STRING", "STRING" ],
+        "granularity" : {
+          "type" : "all"
+        },
+        "legacy" : false
+      }
+    },
+    "signature" : [ {
+      "name" : "cityName",
+      "type" : "STRING"
+    }, {
+      "name" : "__boost",
+      "type" : "LONG"
+    }, {
+      "name" : "countryName",
+      "type" : "STRING"
+    } ],
+    "shuffleSpec" : {
+      "type" : "hash",
+      "clusterBy" : {
+        "columns" : [ {
+          "columnName" : "cityName",
+          "order" : "ASCENDING"
+        } ]
+      },
+      "partitions" : 1
+    },
+    "maxWorkerCount" : 1
+  },
+  "phase" : "FINISHED",
+  "workerCount" : 1,
+  "partitionCount" : 1,
+  "shuffle" : "hashLocalSort",
+  "output" : "localStorage",
+  "startTime" : __TIMESTAMP__
+  "duration" : __DURATION__
+  "sort" : true
+}, {
+  "stageNumber" : 2,
+  "definition" : {
+    "id" : "<taskId>_2",
+    "input" : [ {
+      "type" : "stage",
+      "stage" : 0
+    }, {
+      "type" : "stage",
+      "stage" : 1
+    } ],
+    "processor" : {
+      "type" : "sortMergeJoin",
+      "rightPrefix" : "j0.",
+      "condition" : "(\"cityName\" == \"j0.cityName\")",
+      "joinType" : "INNER"
+    },
+    "signature" : [ {
+      "name" : "cityName",
+      "type" : "STRING"
+    }, {
+      "name" : "__boost",
+      "type" : "LONG"
+    }, {
+      "name" : "j0.cityName",
+      "type" : "STRING"
+    }, {
+      "name" : "j0.__boost",
+      "type" : "LONG"
+    }, {
+      "name" : "j0.countryName",
+      "type" : "STRING"
+    } ],
+    "maxWorkerCount" : 1
+  },
+  "phase" : "FINISHED",
+  "workerCount" : 1,
+  "partitionCount" : 1,
+  "output" : "localStorage",
+  "startTime" : __TIMESTAMP__
+  "duration" : __DURATION__
+}, {
+  "stageNumber" : 3,
+  "definition" : {
+    "id" : "<taskId>_3",
+    "input" : [ {
+      "type" : "stage",
+      "stage" : 2
+    } ],
+    "processor" : {
+      "type" : "scan",
+      "query" : {
+        "queryType" : "scan",
+        "dataSource" : {
+          "type" : "inputNumber",
+          "inputNumber" : 0
+        },
+        "intervals" : {
+          "type" : "intervals",
+          "intervals" : [ "-146136543-09-08T08:23:32.096Z/146140482-04-24T15:36:27.903Z" ]
+        },
+        "virtualColumns" : [ {
+          "type" : "expression",
+          "name" : "v0",
+          "expression" : "'New York'",
+          "outputType" : "STRING"
+        } ],
+        "resultFormat" : "compactedList",
+        "columns" : [ "v0", "j0.countryName" ],
+        "context" : {
+          "__user" : null,
+          "finalize" : true,
+          "maxParseExceptions" : 0,
+          "scanSignature" : "[{\"name\":\"v0\",\"type\":\"STRING\"},{\"name\":\"j0.countryName\",\"type\":\"STRING\"}]",
+          "sqlQueryId" : __SQL_QUERY_ID__
+          "sqlStringifyArrays" : false,
+          "windowFunctionOperatorTransformation" : true
+        },
+        "columnTypes" : [ "STRING", "STRING" ],
+        "granularity" : {
+          "type" : "all"
+        },
+        "legacy" : false
+      }
+    },
+    "signature" : [ {
+      "name" : "__boost",
+      "type" : "LONG"
+    }, {
+      "name" : "v0",
+      "type" : "STRING"
+    }, {
+      "name" : "j0.countryName",
+      "type" : "STRING"
+    } ],
+    "shuffleSpec" : {
+      "type" : "maxCount",
+      "clusterBy" : {
+        "columns" : [ {
+          "columnName" : "__boost",
+          "order" : "ASCENDING"
+        } ]
+      },
+      "partitions" : 1
+    },
+    "maxWorkerCount" : 1
+  },
+  "phase" : "FINISHED",
+  "workerCount" : 1,
+  "partitionCount" : 1,
+  "shuffle" : "globalSort",
+  "output" : "localStorage",
+  "startTime" : __TIMESTAMP__
+  "duration" : __DURATION__
+  "sort" : true
+} ]
+!msqPlan
diff --git a/extensions-core/multi-stage-query/src/test/quidem/org.apache.druid.msq.quidem.MSQQuidemTest/msqNestedJoinHint.iq b/extensions-core/multi-stage-query/src/test/quidem/org.apache.druid.msq.quidem.MSQQuidemTest/msqNestedJoinHint.iq
new file mode 100644
index 000000000000..acf6240d5467
--- /dev/null
+++ b/extensions-core/multi-stage-query/src/test/quidem/org.apache.druid.msq.quidem.MSQQuidemTest/msqNestedJoinHint.iq
@@ -0,0 +1,913 @@
+!use druidtest://?componentSupplier=DrillWindowQueryMSQComponentSupplier
+!set outputformat mysql
+
+select w1.cityName, w2.countryName
+from
+(
+  select w3.cityName AS cityName, w4.countryName AS countryName from wikipedia w3 LEFT JOIN wikipedia w4 ON w3.regionName = w4.regionName
+) w1
+JOIN wikipedia w2 ON w1.cityName = w2.cityName
+where w1.cityName='New York';
+
+[ {
+  "stageNumber" : 0,
+  "definition" : {
+    "id" : "<taskId>_0",
+    "input" : [ {
+      "type" : "table",
+      "dataSource" : "wikipedia",
+      "intervals" : [ "-146136543-09-08T08:23:32.096Z/146140482-04-24T15:36:27.903Z" ]
+    } ],
+    "processor" : {
+      "type" : "scan",
+      "query" : {
+        "queryType" : "scan",
+        "dataSource" : {
+          "type" : "inputNumber",
+          "inputNumber" : 0
+        },
+        "intervals" : {
+          "type" : "intervals",
+          "intervals" : [ "-146136543-09-08T08:23:32.096Z/146140482-04-24T15:36:27.903Z" ]
+        },
+        "resultFormat" : "compactedList",
+        "columns" : [ "regionName" ],
+        "context" : {
+          "scanSignature" : "[{\"name\":\"regionName\",\"type\":\"STRING\"}]",
+          "sqlInsertSegmentGranularity" : null,
+          "sqlQueryId" : __SQL_QUERY_ID__
+          "sqlStringifyArrays" : false
+        },
+        "columnTypes" : [ "STRING" ],
+        "granularity" : {
+          "type" : "all"
+        },
+        "legacy" : false
+      }
+    },
+    "signature" : [ {
+      "name" : "__boost",
+      "type" : "LONG"
+    }, {
+      "name" : "regionName",
+      "type" : "STRING"
+    } ],
+    "shuffleSpec" : {
+      "type" : "maxCount",
+      "clusterBy" : {
+        "columns" : [ {
+          "columnName" : "__boost",
+          "order" : "ASCENDING"
+        } ]
+      },
+      "partitions" : 1
+    },
+    "maxWorkerCount" : 1
+  },
+  "phase" : "FINISHED",
+  "workerCount" : 1,
+  "partitionCount" : 1,
+  "shuffle" : "globalSort",
+  "output" : "localStorage",
+  "startTime" : __TIMESTAMP__
+  "duration" : __DURATION__
+  "sort" : true
+}, {
+  "stageNumber" : 1,
+  "definition" : {
+    "id" : "<taskId>_1",
+    "input" : [ {
+      "type" : "table",
+      "dataSource" : "wikipedia",
+      "intervals" : [ "-146136543-09-08T08:23:32.096Z/146140482-04-24T15:36:27.903Z" ]
+    } ],
+    "processor" : {
+      "type" : "scan",
+      "query" : {
+        "queryType" : "scan",
+        "dataSource" : {
+          "type" : "inputNumber",
+          "inputNumber" : 0
+        },
+        "intervals" : {
+          "type" : "intervals",
+          "intervals" : [ "-146136543-09-08T08:23:32.096Z/146140482-04-24T15:36:27.903Z" ]
+        },
+        "resultFormat" : "compactedList",
+        "columns" : [ "cityName", "countryName" ],
+        "context" : {
+          "scanSignature" : "[{\"name\":\"cityName\",\"type\":\"STRING\"},{\"name\":\"countryName\",\"type\":\"STRING\"}]",
+          "sqlInsertSegmentGranularity" : null,
+          "sqlQueryId" : __SQL_QUERY_ID__
+          "sqlStringifyArrays" : false
+        },
+        "columnTypes" : [ "STRING", "STRING" ],
+        "granularity" : {
+          "type" : "all"
+        },
+        "legacy" : false
+      }
+    },
+    "signature" : [ {
+      "name" : "__boost",
+      "type" : "LONG"
+    }, {
+      "name" : "cityName",
+      "type" : "STRING"
+    }, {
+      "name" : "countryName",
+      "type" : "STRING"
+    } ],
+    "shuffleSpec" : {
+      "type" : "maxCount",
+      "clusterBy" : {
+        "columns" : [ {
+          "columnName" : "__boost",
+          "order" : "ASCENDING"
+        } ]
+      },
+      "partitions" : 1
+    },
+    "maxWorkerCount" : 1
+  },
+  "phase" : "FINISHED",
+  "workerCount" : 1,
+  "partitionCount" : 1,
+  "shuffle" : "globalSort",
+  "output" : "localStorage",
+  "startTime" : __TIMESTAMP__
+  "duration" : __DURATION__
+  "sort" : true
+}, {
+  "stageNumber" : 2,
+  "definition" : {
+    "id" : "<taskId>_2",
+    "input" : [ {
+      "type" : "table",
+      "dataSource" : "wikipedia",
+      "intervals" : [ "-146136543-09-08T08:23:32.096Z/146140482-04-24T15:36:27.903Z" ],
+      "filter" : {
+        "type" : "equals",
+        "column" : "cityName",
+        "matchValueType" : "STRING",
+        "matchValue" : "New York"
+      },
+      "filterFields" : [ "cityName" ]
+    }, {
+      "type" : "stage",
+      "stage" : 0
+    }, {
+      "type" : "stage",
+      "stage" : 1
+    } ],
+    "broadcast" : [ 1, 2 ],
+    "processor" : {
+      "type" : "scan",
+      "query" : {
+        "queryType" : "scan",
+        "dataSource" : {
+          "type" : "join",
+          "left" : {
+            "type" : "join",
+            "left" : {
+              "type" : "inputNumber",
+              "inputNumber" : 0
+            },
+            "right" : {
+              "type" : "inputNumber",
+              "inputNumber" : 1
+            },
+            "rightPrefix" : "j0.",
+            "condition" : "(\"regionName\" == \"j0.regionName\")",
+            "joinType" : "LEFT"
+          },
+          "right" : {
+            "type" : "inputNumber",
+            "inputNumber" : 2
+          },
+          "rightPrefix" : "_j0.",
+          "condition" : "(\"cityName\" == \"_j0.cityName\")",
+          "joinType" : "INNER"
+        },
+        "intervals" : {
+          "type" : "intervals",
+          "intervals" : [ "-146136543-09-08T08:23:32.096Z/146140482-04-24T15:36:27.903Z" ]
+        },
+        "virtualColumns" : [ {
+          "type" : "expression",
+          "name" : "v0",
+          "expression" : "'New York'",
+          "outputType" : "STRING"
+        } ],
+        "resultFormat" : "compactedList",
+        "filter" : {
+          "type" : "equals",
+          "column" : "cityName",
+          "matchValueType" : "STRING",
+          "matchValue" : "New York"
+        },
+        "columns" : [ "v0", "_j0.countryName" ],
+        "context" : {
+          "__user" : null,
+          "finalize" : true,
+          "maxParseExceptions" : 0,
+          "scanSignature" : "[{\"name\":\"v0\",\"type\":\"STRING\"},{\"name\":\"_j0.countryName\",\"type\":\"STRING\"}]",
+          "sqlQueryId" : __SQL_QUERY_ID__
+          "sqlStringifyArrays" : false,
+          "windowFunctionOperatorTransformation" : true
+        },
+        "columnTypes" : [ "STRING", "STRING" ],
+        "granularity" : {
+          "type" : "all"
+        },
+        "legacy" : false
+      }
+    },
+    "signature" : [ {
+      "name" : "__boost",
+      "type" : "LONG"
+    }, {
+      "name" : "v0",
+      "type" : "STRING"
+    }, {
+      "name" : "_j0.countryName",
+      "type" : "STRING"
+    } ],
+    "shuffleSpec" : {
+      "type" : "maxCount",
+      "clusterBy" : {
+        "columns" : [ {
+          "columnName" : "__boost",
+          "order" : "ASCENDING"
+        } ]
+      },
+      "partitions" : 1
+    },
+    "maxWorkerCount" : 1
+  },
+  "phase" : "FINISHED",
+  "workerCount" : 1,
+  "partitionCount" : 1,
+  "shuffle" : "globalSort",
+  "output" : "localStorage",
+  "startTime" : __TIMESTAMP__
+  "duration" : __DURATION__
+  "sort" : true
+} ]
+!msqPlan
+
+select w1.cityName, w2.countryName
+from
+(
+  select /*+ sort_merge */ w3.cityName AS cityName, w4.countryName AS countryName from wikipedia w3 LEFT JOIN wikipedia w4 ON w3.regionName = w4.regionName
+) w1
+JOIN wikipedia w2 ON w1.cityName = w2.cityName
+where w1.cityName='New York';
+
+LogicalJoin:[[sort_merge inheritPath:[0]]]
+
+!hints
+
+[ {
+  "stageNumber" : 0,
+  "definition" : {
+    "id" : "<taskId>_0",
+    "input" : [ {
+      "type" : "table",
+      "dataSource" : "wikipedia",
+      "intervals" : [ "-146136543-09-08T08:23:32.096Z/146140482-04-24T15:36:27.903Z" ]
+    } ],
+    "processor" : {
+      "type" : "scan",
+      "query" : {
+        "queryType" : "scan",
+        "dataSource" : {
+          "type" : "inputNumber",
+          "inputNumber" : 0
+        },
+        "intervals" : {
+          "type" : "intervals",
+          "intervals" : [ "-146136543-09-08T08:23:32.096Z/146140482-04-24T15:36:27.903Z" ]
+        },
+        "resultFormat" : "compactedList",
+        "columns" : [ "cityName", "regionName" ],
+        "context" : {
+          "scanSignature" : "[{\"name\":\"cityName\",\"type\":\"STRING\"},{\"name\":\"regionName\",\"type\":\"STRING\"}]",
+          "sqlInsertSegmentGranularity" : null,
+          "sqlQueryId" : __SQL_QUERY_ID__
+          "sqlStringifyArrays" : false
+        },
+        "columnTypes" : [ "STRING", "STRING" ],
+        "granularity" : {
+          "type" : "all"
+        },
+        "legacy" : false
+      }
+    },
+    "signature" : [ {
+      "name" : "__boost",
+      "type" : "LONG"
+    }, {
+      "name" : "cityName",
+      "type" : "STRING"
+    }, {
+      "name" : "regionName",
+      "type" : "STRING"
+    } ],
+    "shuffleSpec" : {
+      "type" : "maxCount",
+      "clusterBy" : {
+        "columns" : [ {
+          "columnName" : "__boost",
+          "order" : "ASCENDING"
+        } ]
+      },
+      "partitions" : 1
+    },
+    "maxWorkerCount" : 1
+  },
+  "phase" : "FINISHED",
+  "workerCount" : 1,
+  "partitionCount" : 1,
+  "shuffle" : "globalSort",
+  "output" : "localStorage",
+  "startTime" : __TIMESTAMP__
+  "duration" : __DURATION__
+  "sort" : true
+}, {
+  "stageNumber" : 1,
+  "definition" : {
+    "id" : "<taskId>_1",
+    "input" : [ {
+      "type" : "table",
+      "dataSource" : "wikipedia",
+      "intervals" : [ "-146136543-09-08T08:23:32.096Z/146140482-04-24T15:36:27.903Z" ]
+    } ],
+    "processor" : {
+      "type" : "scan",
+      "query" : {
+        "queryType" : "scan",
+        "dataSource" : {
+          "type" : "inputNumber",
+          "inputNumber" : 0
+        },
+        "intervals" : {
+          "type" : "intervals",
+          "intervals" : [ "-146136543-09-08T08:23:32.096Z/146140482-04-24T15:36:27.903Z" ]
+        },
+        "resultFormat" : "compactedList",
+        "columns" : [ "regionName" ],
+        "context" : {
+          "scanSignature" : "[{\"name\":\"regionName\",\"type\":\"STRING\"}]",
+          "sqlInsertSegmentGranularity" : null,
+          "sqlQueryId" : __SQL_QUERY_ID__
+          "sqlStringifyArrays" : false
+        },
+        "columnTypes" : [ "STRING" ],
+        "granularity" : {
+          "type" : "all"
+        },
+        "legacy" : false
+      }
+    },
+    "signature" : [ {
+      "name" : "__boost",
+      "type" : "LONG"
+    }, {
+      "name" : "regionName",
+      "type" : "STRING"
+    } ],
+    "shuffleSpec" : {
+      "type" : "maxCount",
+      "clusterBy" : {
+        "columns" : [ {
+          "columnName" : "__boost",
+          "order" : "ASCENDING"
+        } ]
+      },
+      "partitions" : 1
+    },
+    "maxWorkerCount" : 1
+  },
+  "phase" : "FINISHED",
+  "workerCount" : 1,
+  "partitionCount" : 1,
+  "shuffle" : "globalSort",
+  "output" : "localStorage",
+  "startTime" : __TIMESTAMP__
+  "duration" : __DURATION__
+  "sort" : true
+}, {
+  "stageNumber" : 2,
+  "definition" : {
+    "id" : "<taskId>_2",
+    "input" : [ {
+      "type" : "table",
+      "dataSource" : "wikipedia",
+      "intervals" : [ "-146136543-09-08T08:23:32.096Z/146140482-04-24T15:36:27.903Z" ]
+    } ],
+    "processor" : {
+      "type" : "scan",
+      "query" : {
+        "queryType" : "scan",
+        "dataSource" : {
+          "type" : "inputNumber",
+          "inputNumber" : 0
+        },
+        "intervals" : {
+          "type" : "intervals",
+          "intervals" : [ "-146136543-09-08T08:23:32.096Z/146140482-04-24T15:36:27.903Z" ]
+        },
+        "resultFormat" : "compactedList",
+        "columns" : [ "cityName", "countryName" ],
+        "context" : {
+          "scanSignature" : "[{\"name\":\"cityName\",\"type\":\"STRING\"},{\"name\":\"countryName\",\"type\":\"STRING\"}]",
+          "sqlInsertSegmentGranularity" : null,
+          "sqlQueryId" : __SQL_QUERY_ID__
+          "sqlStringifyArrays" : false
+        },
+        "columnTypes" : [ "STRING", "STRING" ],
+        "granularity" : {
+          "type" : "all"
+        },
+        "legacy" : false
+      }
+    },
+    "signature" : [ {
+      "name" : "__boost",
+      "type" : "LONG"
+    }, {
+      "name" : "cityName",
+      "type" : "STRING"
+    }, {
+      "name" : "countryName",
+      "type" : "STRING"
+    } ],
+    "shuffleSpec" : {
+      "type" : "maxCount",
+      "clusterBy" : {
+        "columns" : [ {
+          "columnName" : "__boost",
+          "order" : "ASCENDING"
+        } ]
+      },
+      "partitions" : 1
+    },
+    "maxWorkerCount" : 1
+  },
+  "phase" : "FINISHED",
+  "workerCount" : 1,
+  "partitionCount" : 1,
+  "shuffle" : "globalSort",
+  "output" : "localStorage",
+  "startTime" : __TIMESTAMP__
+  "duration" : __DURATION__
+  "sort" : true
+}, {
+  "stageNumber" : 3,
+  "definition" : {
+    "id" : "<taskId>_3",
+    "input" : [ {
+      "type" : "stage",
+      "stage" : 0
+    }, {
+      "type" : "stage",
+      "stage" : 1
+    }, {
+      "type" : "stage",
+      "stage" : 2
+    } ],
+    "broadcast" : [ 1, 2 ],
+    "processor" : {
+      "type" : "scan",
+      "query" : {
+        "queryType" : "scan",
+        "dataSource" : {
+          "type" : "join",
+          "left" : {
+            "type" : "join",
+            "left" : {
+              "type" : "inputNumber",
+              "inputNumber" : 0
+            },
+            "right" : {
+              "type" : "inputNumber",
+              "inputNumber" : 1
+            },
+            "rightPrefix" : "j0.",
+            "condition" : "(\"regionName\" == \"j0.regionName\")",
+            "joinType" : "LEFT",
+            "joinAlgorithm" : "sortMerge"
+          },
+          "right" : {
+            "type" : "inputNumber",
+            "inputNumber" : 2
+          },
+          "rightPrefix" : "_j0.",
+          "condition" : "(\"cityName\" == \"_j0.cityName\")",
+          "joinType" : "INNER"
+        },
+        "intervals" : {
+          "type" : "intervals",
+          "intervals" : [ "-146136543-09-08T08:23:32.096Z/146140482-04-24T15:36:27.903Z" ]
+        },
+        "virtualColumns" : [ {
+          "type" : "expression",
+          "name" : "v0",
+          "expression" : "'New York'",
+          "outputType" : "STRING"
+        } ],
+        "resultFormat" : "compactedList",
+        "filter" : {
+          "type" : "equals",
+          "column" : "cityName",
+          "matchValueType" : "STRING",
+          "matchValue" : "New York"
+        },
+        "columns" : [ "v0", "_j0.countryName" ],
+        "context" : {
+          "__user" : null,
+          "finalize" : true,
+          "maxParseExceptions" : 0,
+          "scanSignature" : "[{\"name\":\"v0\",\"type\":\"STRING\"},{\"name\":\"_j0.countryName\",\"type\":\"STRING\"}]",
+          "sqlQueryId" : __SQL_QUERY_ID__
+          "sqlStringifyArrays" : false,
+          "windowFunctionOperatorTransformation" : true
+        },
+        "columnTypes" : [ "STRING", "STRING" ],
+        "granularity" : {
+          "type" : "all"
+        },
+        "legacy" : false
+      }
+    },
+    "signature" : [ {
+      "name" : "__boost",
+      "type" : "LONG"
+    }, {
+      "name" : "v0",
+      "type" : "STRING"
+    }, {
+      "name" : "_j0.countryName",
+      "type" : "STRING"
+    } ],
+    "shuffleSpec" : {
+      "type" : "maxCount",
+      "clusterBy" : {
+        "columns" : [ {
+          "columnName" : "__boost",
+          "order" : "ASCENDING"
+        } ]
+      },
+      "partitions" : 1
+    },
+    "maxWorkerCount" : 1
+  },
+  "phase" : "FINISHED",
+  "workerCount" : 1,
+  "partitionCount" : 1,
+  "shuffle" : "globalSort",
+  "output" : "localStorage",
+  "startTime" : __TIMESTAMP__
+  "duration" : __DURATION__
+  "sort" : true
+} ]
+!msqPlan
+
+select /*+ sort_merge */ w1.cityName, w2.countryName
+from
+(
+  select /*+ broadcast */ w3.cityName AS cityName, w4.countryName AS countryName from wikipedia w3 LEFT JOIN wikipedia w4 ON w3.regionName = w4.regionName
+) w1
+JOIN wikipedia w2 ON w1.cityName = w2.cityName
+where w1.cityName='New York';
+
+[ {
+  "stageNumber" : 0,
+  "definition" : {
+    "id" : "<taskId>_0",
+    "input" : [ {
+      "type" : "table",
+      "dataSource" : "wikipedia",
+      "intervals" : [ "-146136543-09-08T08:23:32.096Z/146140482-04-24T15:36:27.903Z" ]
+    } ],
+    "processor" : {
+      "type" : "scan",
+      "query" : {
+        "queryType" : "scan",
+        "dataSource" : {
+          "type" : "inputNumber",
+          "inputNumber" : 0
+        },
+        "intervals" : {
+          "type" : "intervals",
+          "intervals" : [ "-146136543-09-08T08:23:32.096Z/146140482-04-24T15:36:27.903Z" ]
+        },
+        "resultFormat" : "compactedList",
+        "columns" : [ "regionName" ],
+        "context" : {
+          "scanSignature" : "[{\"name\":\"regionName\",\"type\":\"STRING\"}]",
+          "sqlInsertSegmentGranularity" : null,
+          "sqlQueryId" : __SQL_QUERY_ID__
+          "sqlStringifyArrays" : false
+        },
+        "columnTypes" : [ "STRING" ],
+        "granularity" : {
+          "type" : "all"
+        },
+        "legacy" : false
+      }
+    },
+    "signature" : [ {
+      "name" : "__boost",
+      "type" : "LONG"
+    }, {
+      "name" : "regionName",
+      "type" : "STRING"
+    } ],
+    "shuffleSpec" : {
+      "type" : "maxCount",
+      "clusterBy" : {
+        "columns" : [ {
+          "columnName" : "__boost",
+          "order" : "ASCENDING"
+        } ]
+      },
+      "partitions" : 1
+    },
+    "maxWorkerCount" : 1
+  },
+  "phase" : "FINISHED",
+  "workerCount" : 1,
+  "partitionCount" : 1,
+  "shuffle" : "globalSort",
+  "output" : "localStorage",
+  "startTime" : __TIMESTAMP__
+  "duration" : __DURATION__
+  "sort" : true
+}, {
+  "stageNumber" : 1,
+  "definition" : {
+    "id" : "<taskId>_1",
+    "input" : [ {
+      "type" : "table",
+      "dataSource" : "wikipedia",
+      "intervals" : [ "-146136543-09-08T08:23:32.096Z/146140482-04-24T15:36:27.903Z" ]
+    }, {
+      "type" : "stage",
+      "stage" : 0
+    } ],
+    "broadcast" : [ 1 ],
+    "processor" : {
+      "type" : "scan",
+      "query" : {
+        "queryType" : "scan",
+        "dataSource" : {
+          "type" : "join",
+          "left" : {
+            "type" : "inputNumber",
+            "inputNumber" : 0
+          },
+          "right" : {
+            "type" : "inputNumber",
+            "inputNumber" : 1
+          },
+          "rightPrefix" : "j0.",
+          "condition" : "(\"regionName\" == \"j0.regionName\")",
+          "joinType" : "LEFT"
+        },
+        "intervals" : {
+          "type" : "intervals",
+          "intervals" : [ "-146136543-09-08T08:23:32.096Z/146140482-04-24T15:36:27.903Z" ]
+        },
+        "resultFormat" : "compactedList",
+        "columns" : [ "cityName" ],
+        "context" : {
+          "scanSignature" : "[{\"name\":\"cityName\",\"type\":\"STRING\"}]",
+          "sqlInsertSegmentGranularity" : null,
+          "sqlQueryId" : __SQL_QUERY_ID__
+          "sqlStringifyArrays" : false
+        },
+        "columnTypes" : [ "STRING" ],
+        "granularity" : {
+          "type" : "all"
+        },
+        "legacy" : false
+      }
+    },
+    "signature" : [ {
+      "name" : "cityName",
+      "type" : "STRING"
+    }, {
+      "name" : "__boost",
+      "type" : "LONG"
+    } ],
+    "shuffleSpec" : {
+      "type" : "hash",
+      "clusterBy" : {
+        "columns" : [ {
+          "columnName" : "cityName",
+          "order" : "ASCENDING"
+        } ]
+      },
+      "partitions" : 1
+    },
+    "maxWorkerCount" : 1
+  },
+  "phase" : "FINISHED",
+  "workerCount" : 1,
+  "partitionCount" : 1,
+  "shuffle" : "hashLocalSort",
+  "output" : "localStorage",
+  "startTime" : __TIMESTAMP__
+  "duration" : __DURATION__
+  "sort" : true
+}, {
+  "stageNumber" : 2,
+  "definition" : {
+    "id" : "<taskId>_2",
+    "input" : [ {
+      "type" : "table",
+      "dataSource" : "wikipedia",
+      "intervals" : [ "-146136543-09-08T08:23:32.096Z/146140482-04-24T15:36:27.903Z" ]
+    } ],
+    "processor" : {
+      "type" : "scan",
+      "query" : {
+        "queryType" : "scan",
+        "dataSource" : {
+          "type" : "inputNumber",
+          "inputNumber" : 0
+        },
+        "intervals" : {
+          "type" : "intervals",
+          "intervals" : [ "-146136543-09-08T08:23:32.096Z/146140482-04-24T15:36:27.903Z" ]
+        },
+        "resultFormat" : "compactedList",
+        "columns" : [ "cityName", "countryName" ],
+        "context" : {
+          "scanSignature" : "[{\"name\":\"cityName\",\"type\":\"STRING\"},{\"name\":\"countryName\",\"type\":\"STRING\"}]",
+          "sqlInsertSegmentGranularity" : null,
+          "sqlQueryId" : __SQL_QUERY_ID__
+          "sqlStringifyArrays" : false
+        },
+        "columnTypes" : [ "STRING", "STRING" ],
+        "granularity" : {
+          "type" : "all"
+        },
+        "legacy" : false
+      }
+    },
+    "signature" : [ {
+      "name" : "cityName",
+      "type" : "STRING"
+    }, {
+      "name" : "__boost",
+      "type" : "LONG"
+    }, {
+      "name" : "countryName",
+      "type" : "STRING"
+    } ],
+    "shuffleSpec" : {
+      "type" : "hash",
+      "clusterBy" : {
+        "columns" : [ {
+          "columnName" : "cityName",
+          "order" : "ASCENDING"
+        } ]
+      },
+      "partitions" : 1
+    },
+    "maxWorkerCount" : 1
+  },
+  "phase" : "FINISHED",
+  "workerCount" : 1,
+  "partitionCount" : 1,
+  "shuffle" : "hashLocalSort",
+  "output" : "localStorage",
+  "startTime" : __TIMESTAMP__
+  "duration" : __DURATION__
+  "sort" : true
+}, {
+  "stageNumber" : 3,
+  "definition" : {
+    "id" : "<taskId>_3",
+    "input" : [ {
+      "type" : "stage",
+      "stage" : 1
+    }, {
+      "type" : "stage",
+      "stage" : 2
+    } ],
+    "processor" : {
+      "type" : "sortMergeJoin",
+      "rightPrefix" : "_j0.",
+      "condition" : "(\"cityName\" == \"_j0.cityName\")",
+      "joinType" : "INNER"
+    },
+    "signature" : [ {
+      "name" : "cityName",
+      "type" : "STRING"
+    }, {
+      "name" : "__boost",
+      "type" : "LONG"
+    }, {
+      "name" : "_j0.cityName",
+      "type" : "STRING"
+    }, {
+      "name" : "_j0.__boost",
+      "type" : "LONG"
+    }, {
+      "name" : "_j0.countryName",
+      "type" : "STRING"
+    } ],
+    "maxWorkerCount" : 1
+  },
+  "phase" : "FINISHED",
+  "workerCount" : 1,
+  "partitionCount" : 1,
+  "output" : "localStorage",
+  "startTime" : __TIMESTAMP__
+  "duration" : __DURATION__
+}, {
+  "stageNumber" : 4,
+  "definition" : {
+    "id" : "<taskId>_4",
+    "input" : [ {
+      "type" : "stage",
+      "stage" : 3
+    } ],
+    "processor" : {
+      "type" : "scan",
+      "query" : {
+        "queryType" : "scan",
+        "dataSource" : {
+          "type" : "inputNumber",
+          "inputNumber" : 0
+        },
+        "intervals" : {
+          "type" : "intervals",
+          "intervals" : [ "-146136543-09-08T08:23:32.096Z/146140482-04-24T15:36:27.903Z" ]
+        },
+        "virtualColumns" : [ {
+          "type" : "expression",
+          "name" : "v0",
+          "expression" : "'New York'",
+          "outputType" : "STRING"
+        } ],
+        "resultFormat" : "compactedList",
+        "filter" : {
+          "type" : "equals",
+          "column" : "cityName",
+          "matchValueType" : "STRING",
+          "matchValue" : "New York"
+        },
+        "columns" : [ "v0", "_j0.countryName" ],
+        "context" : {
+          "__user" : null,
+          "finalize" : true,
+          "maxParseExceptions" : 0,
+          "scanSignature" : "[{\"name\":\"v0\",\"type\":\"STRING\"},{\"name\":\"_j0.countryName\",\"type\":\"STRING\"}]",
+          "sqlQueryId" : __SQL_QUERY_ID__
+          "sqlStringifyArrays" : false,
+          "windowFunctionOperatorTransformation" : true
+        },
+        "columnTypes" : [ "STRING", "STRING" ],
+        "granularity" : {
+          "type" : "all"
+        },
+        "legacy" : false
+      }
+    },
+    "signature" : [ {
+      "name" : "__boost",
+      "type" : "LONG"
+    }, {
+      "name" : "v0",
+      "type" : "STRING"
+    }, {
+      "name" : "_j0.countryName",
+      "type" : "STRING"
+    } ],
+    "shuffleSpec" : {
+      "type" : "maxCount",
+      "clusterBy" : {
+        "columns" : [ {
+          "columnName" : "__boost",
+          "order" : "ASCENDING"
+        } ]
+      },
+      "partitions" : 1
+    },
+    "maxWorkerCount" : 1
+  },
+  "phase" : "FINISHED",
+  "workerCount" : 1,
+  "partitionCount" : 1,
+  "shuffle" : "globalSort",
+  "output" : "localStorage",
+  "startTime" : __TIMESTAMP__
+  "duration" : __DURATION__
+  "sort" : true
+} ]
+!msqPlan
diff --git a/sql/src/main/java/org/apache/druid/sql/calcite/planner/JoinAlgorithm.java b/processing/src/main/java/org/apache/druid/query/JoinAlgorithm.java
similarity index 97%
rename from sql/src/main/java/org/apache/druid/sql/calcite/planner/JoinAlgorithm.java
rename to processing/src/main/java/org/apache/druid/query/JoinAlgorithm.java
index 2e53795c4ffa..94cd209e5780 100644
--- a/sql/src/main/java/org/apache/druid/sql/calcite/planner/JoinAlgorithm.java
+++ b/processing/src/main/java/org/apache/druid/query/JoinAlgorithm.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.druid.sql.calcite.planner;
+package org.apache.druid.query;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
diff --git a/processing/src/main/java/org/apache/druid/query/JoinDataSource.java b/processing/src/main/java/org/apache/druid/query/JoinDataSource.java
index e75ee5f63fe5..440739e7e31c 100644
--- a/processing/src/main/java/org/apache/druid/query/JoinDataSource.java
+++ b/processing/src/main/java/org/apache/druid/query/JoinDataSource.java
@@ -96,6 +96,7 @@ public class JoinDataSource implements DataSource
   private final DimFilter leftFilter;
   @Nullable
   private final JoinableFactoryWrapper joinableFactoryWrapper;
+  private final JoinAlgorithm joinAlgorithm;
   private static final Logger log = new Logger(JoinDataSource.class);
   private final DataSourceAnalysis analysis;
 
@@ -106,7 +107,8 @@ private JoinDataSource(
       JoinConditionAnalysis conditionAnalysis,
       JoinType joinType,
       @Nullable DimFilter leftFilter,
-      @Nullable JoinableFactoryWrapper joinableFactoryWrapper
+      @Nullable JoinableFactoryWrapper joinableFactoryWrapper,
+      JoinAlgorithm joinAlgorithm
   )
   {
     this.left = Preconditions.checkNotNull(left, "left");
@@ -116,6 +118,7 @@ private JoinDataSource(
     this.joinType = Preconditions.checkNotNull(joinType, "joinType");
     this.leftFilter = validateLeftFilter(left, leftFilter);
     this.joinableFactoryWrapper = joinableFactoryWrapper;
+    this.joinAlgorithm = JoinAlgorithm.BROADCAST.equals(joinAlgorithm) ? null : joinAlgorithm;
 
     this.analysis = this.getAnalysisForDataSource();
   }
@@ -132,7 +135,8 @@ public static JoinDataSource create(
       @JsonProperty("joinType") JoinType joinType,
       @Nullable @JsonProperty("leftFilter") DimFilter leftFilter,
       @JacksonInject ExprMacroTable macroTable,
-      @Nullable @JacksonInject JoinableFactoryWrapper joinableFactoryWrapper
+      @Nullable @JacksonInject JoinableFactoryWrapper joinableFactoryWrapper,
+      @Nullable @JsonProperty("joinAlgorithm") JoinAlgorithm joinAlgorithm
   )
   {
     return new JoinDataSource(
@@ -146,7 +150,8 @@ public static JoinDataSource create(
         ),
         joinType,
         leftFilter,
-        joinableFactoryWrapper
+        joinableFactoryWrapper,
+        joinAlgorithm
     );
   }
 
@@ -160,7 +165,8 @@ public static JoinDataSource create(
       final JoinConditionAnalysis conditionAnalysis,
       final JoinType joinType,
       final DimFilter leftFilter,
-      @Nullable final JoinableFactoryWrapper joinableFactoryWrapper
+      @Nullable final JoinableFactoryWrapper joinableFactoryWrapper,
+      @Nullable final JoinAlgorithm joinAlgorithm
   )
   {
     return new JoinDataSource(
@@ -170,11 +176,11 @@ public static JoinDataSource create(
         conditionAnalysis,
         joinType,
         leftFilter,
-        joinableFactoryWrapper
+        joinableFactoryWrapper,
+        joinAlgorithm
     );
   }
 
-
   @Override
   public Set<String> getTableNames()
   {
@@ -253,7 +259,8 @@ public DataSource withChildren(List<DataSource> children)
         conditionAnalysis,
         joinType,
         leftFilter,
-        joinableFactoryWrapper
+        joinableFactoryWrapper,
+        joinAlgorithm
     );
   }
 
@@ -320,7 +327,8 @@ public DataSource withUpdatedDataSource(DataSource newSource)
           clause.getCondition(),
           clause.getJoinType(),
           joinBaseFilter,
-          this.joinableFactoryWrapper
+          this.joinableFactoryWrapper,
+          clause.getJoinAlgorithm()
       );
       joinBaseFilter = null;
     }
@@ -363,6 +371,18 @@ public DataSourceAnalysis getAnalysis()
     return analysis;
   }
 
+  @JsonProperty("joinAlgorithm")
+  @JsonInclude(Include.NON_NULL)
+  private JoinAlgorithm getJoinAlgorithmForSerialization()
+  {
+    return joinAlgorithm;
+  }
+
+  public JoinAlgorithm getJoinAlgorithm()
+  {
+    return joinAlgorithm == null ? JoinAlgorithm.BROADCAST : joinAlgorithm;
+  }
+
   @Override
   public boolean equals(Object o)
   {
@@ -378,13 +398,14 @@ public boolean equals(Object o)
            Objects.equals(rightPrefix, that.rightPrefix) &&
            Objects.equals(conditionAnalysis, that.conditionAnalysis) &&
            Objects.equals(leftFilter, that.leftFilter) &&
+           joinAlgorithm == that.joinAlgorithm &&
            joinType == that.joinType;
   }
 
   @Override
   public int hashCode()
   {
-    return Objects.hash(left, right, rightPrefix, conditionAnalysis, joinType, leftFilter);
+    return Objects.hash(left, right, rightPrefix, conditionAnalysis, joinType, leftFilter, joinAlgorithm);
   }
 
   @Override
@@ -397,6 +418,7 @@ public String toString()
            ", condition=" + conditionAnalysis +
            ", joinType=" + joinType +
            ", leftFilter=" + leftFilter +
+           ", joinAlgorithm=" + joinAlgorithm +
            '}';
   }
 
@@ -539,7 +561,8 @@ private static Triple<DataSource, DimFilter, List<PreJoinableClause>> flattenJoi
                 joinDataSource.getRightPrefix(),
                 joinDataSource.getRight(),
                 joinDataSource.getJoinType(),
-                joinDataSource.getConditionAnalysis()
+                joinDataSource.getConditionAnalysis(),
+                joinDataSource.getJoinAlgorithm()
             )
         );
       } else if (current instanceof UnnestDataSource) {
diff --git a/processing/src/main/java/org/apache/druid/query/planning/PreJoinableClause.java b/processing/src/main/java/org/apache/druid/query/planning/PreJoinableClause.java
index 44e3f77262fb..ee3ed01020f1 100644
--- a/processing/src/main/java/org/apache/druid/query/planning/PreJoinableClause.java
+++ b/processing/src/main/java/org/apache/druid/query/planning/PreJoinableClause.java
@@ -21,10 +21,12 @@
 
 import com.google.common.base.Preconditions;
 import org.apache.druid.query.DataSource;
+import org.apache.druid.query.JoinAlgorithm;
 import org.apache.druid.segment.join.JoinConditionAnalysis;
 import org.apache.druid.segment.join.JoinPrefixUtils;
 import org.apache.druid.segment.join.JoinType;
 
+import javax.annotation.Nullable;
 import java.util.Objects;
 
 /**
@@ -38,18 +40,21 @@ public class PreJoinableClause
   private final DataSource dataSource;
   private final JoinType joinType;
   private final JoinConditionAnalysis condition;
+  private final JoinAlgorithm joinAlgorithm;
 
   public PreJoinableClause(
       final String prefix,
       final DataSource dataSource,
       final JoinType joinType,
-      final JoinConditionAnalysis condition
+      final JoinConditionAnalysis condition,
+      @Nullable final JoinAlgorithm joinAlgorithm
   )
   {
     this.prefix = JoinPrefixUtils.validatePrefix(prefix);
     this.dataSource = Preconditions.checkNotNull(dataSource, "dataSource");
     this.joinType = Preconditions.checkNotNull(joinType, "joinType");
     this.condition = Preconditions.checkNotNull(condition, "condition");
+    this.joinAlgorithm = joinAlgorithm;
   }
 
   public String getPrefix()
@@ -72,6 +77,12 @@ public JoinConditionAnalysis getCondition()
     return condition;
   }
 
+  @Nullable
+  public JoinAlgorithm getJoinAlgorithm()
+  {
+    return joinAlgorithm;
+  }
+
   @Override
   public boolean equals(Object o)
   {
@@ -82,16 +93,17 @@ public boolean equals(Object o)
       return false;
     }
     PreJoinableClause that = (PreJoinableClause) o;
-    return Objects.equals(prefix, that.prefix) &&
-           Objects.equals(dataSource, that.dataSource) &&
-           joinType == that.joinType &&
-           Objects.equals(condition, that.condition);
+    return Objects.equals(prefix, that.prefix)
+           && Objects.equals(dataSource, that.dataSource)
+           && joinType == that.joinType
+           && Objects.equals(condition, that.condition)
+           && joinAlgorithm == that.joinAlgorithm;
   }
 
   @Override
   public int hashCode()
   {
-    return Objects.hash(prefix, dataSource, joinType, condition);
+    return Objects.hash(prefix, dataSource, joinType, condition, joinAlgorithm);
   }
 
   @Override
@@ -102,6 +114,7 @@ public String toString()
            ", dataSource=" + dataSource +
            ", joinType=" + joinType +
            ", condition=" + condition +
+           ", joinAlgorithm=" + joinAlgorithm +
            '}';
   }
 }
diff --git a/processing/src/test/java/org/apache/druid/query/JoinDataSourceTest.java b/processing/src/test/java/org/apache/druid/query/JoinDataSourceTest.java
index b821bc49c4e7..ac3786282cf5 100644
--- a/processing/src/test/java/org/apache/druid/query/JoinDataSourceTest.java
+++ b/processing/src/test/java/org/apache/druid/query/JoinDataSourceTest.java
@@ -65,7 +65,9 @@ public class JoinDataSourceTest
       JoinType.LEFT,
       null,
       ExprMacroTable.nil(),
-      null
+      null,
+      JoinAlgorithm.BROADCAST
+
   );
   private final JoinDataSource joinTableToTable = JoinDataSource.create(
       fooTable,
@@ -75,7 +77,9 @@ public class JoinDataSourceTest
       JoinType.LEFT,
       null,
       ExprMacroTable.nil(),
-      null
+      null,
+      JoinAlgorithm.BROADCAST
+
   );
   @Rule
   public ExpectedException expectedException = ExpectedException.none();
@@ -182,7 +186,8 @@ public void test_serde() throws Exception
         JoinType.LEFT,
         TrueDimFilter.instance(),
         ExprMacroTable.nil(),
-        joinableFactoryWrapper
+        joinableFactoryWrapper,
+        JoinAlgorithm.BROADCAST
     );
 
     final JoinDataSource deserialized = (JoinDataSource) jsonMapper.readValue(
@@ -206,7 +211,8 @@ public void testException_leftFilterOnNonTableSource()
         JoinType.LEFT,
         TrueDimFilter.instance(),
         ExprMacroTable.nil(),
-        null
+        null,
+        JoinAlgorithm.BROADCAST
     );
   }
 
@@ -221,7 +227,8 @@ public void testLeftFilter()
         JoinType.LEFT,
         TrueDimFilter.instance(),
         ExprMacroTable.nil(),
-        null
+        null,
+        JoinAlgorithm.BROADCAST
     );
     Assert.assertEquals(TrueDimFilter.instance(), dataSource.getLeftFilter());
   }
@@ -237,7 +244,8 @@ public void testVirtualColumnCandidates()
         JoinType.LEFT,
         null,
         ExprMacroTable.nil(),
-        null
+        null,
+        JoinAlgorithm.BROADCAST
     );
     Assert.assertEquals(dataSource.getVirtualColumnCandidates(), ImmutableSet.of("x"));
   }
@@ -253,7 +261,8 @@ public void test_computeJoinDataSourceCacheKey_noHashJoin()
         JoinType.LEFT,
         null,
         ExprMacroTable.nil(),
-        NOOP_JOINABLE_FACTORY_WRAPPER
+        NOOP_JOINABLE_FACTORY_WRAPPER,
+        JoinAlgorithm.BROADCAST
     );
 
     Optional<byte[]> cacheKey = Optional.ofNullable(dataSource.getCacheKey());
@@ -274,7 +283,8 @@ public void test_computeJoinDataSourceCacheKey_sameKeyForSameJoin()
         JoinType.LEFT,
         null,
         ExprMacroTable.nil(),
-        joinableFactoryWrapper
+        joinableFactoryWrapper,
+        JoinAlgorithm.BROADCAST
     );
 
     JoinDataSource joinDataSource1 = JoinDataSource.create(
@@ -285,7 +295,8 @@ public void test_computeJoinDataSourceCacheKey_sameKeyForSameJoin()
         JoinType.LEFT,
         null,
         ExprMacroTable.nil(),
-        joinableFactoryWrapper
+        joinableFactoryWrapper,
+        JoinAlgorithm.BROADCAST
     );
 
     byte[] cacheKey1 = joinDataSource.getCacheKey();
@@ -309,7 +320,8 @@ public void test_computeJoinDataSourceCacheKey_keyChangesWithTables()
         JoinType.LEFT,
         null,
         ExprMacroTable.nil(),
-        joinableFactoryWrapper
+        joinableFactoryWrapper,
+        JoinAlgorithm.BROADCAST
     );
 
     JoinDataSource joinDataSource1 = JoinDataSource.create(
@@ -320,7 +332,8 @@ public void test_computeJoinDataSourceCacheKey_keyChangesWithTables()
         JoinType.LEFT,
         null,
         ExprMacroTable.nil(),
-        joinableFactoryWrapper
+        joinableFactoryWrapper,
+        JoinAlgorithm.BROADCAST
     );
 
     byte[] cacheKey1 = joinDataSource.getCacheKey();
@@ -344,7 +357,8 @@ public void test_computeJoinDataSourceCacheKey_keyChangesWithExpressions()
         JoinType.LEFT,
         null,
         ExprMacroTable.nil(),
-        joinableFactoryWrapper
+        joinableFactoryWrapper,
+        JoinAlgorithm.BROADCAST
     );
 
     JoinDataSource joinDataSource1 = JoinDataSource.create(
@@ -355,7 +369,8 @@ public void test_computeJoinDataSourceCacheKey_keyChangesWithExpressions()
         JoinType.LEFT,
         null,
         ExprMacroTable.nil(),
-        joinableFactoryWrapper
+        joinableFactoryWrapper,
+        JoinAlgorithm.BROADCAST
     );
 
     byte[] cacheKey1 = joinDataSource.getCacheKey();
@@ -379,7 +394,8 @@ public void test_computeJoinDataSourceCacheKey_keyChangesWithJoinType()
         JoinType.LEFT,
         null,
         ExprMacroTable.nil(),
-        joinableFactoryWrapper
+        joinableFactoryWrapper,
+        JoinAlgorithm.BROADCAST
     );
 
     JoinDataSource joinDataSource1 = JoinDataSource.create(
@@ -390,7 +406,8 @@ public void test_computeJoinDataSourceCacheKey_keyChangesWithJoinType()
         JoinType.INNER,
         null,
         ExprMacroTable.nil(),
-        joinableFactoryWrapper
+        joinableFactoryWrapper,
+        JoinAlgorithm.BROADCAST
     );
 
     byte[] cacheKey1 = joinDataSource.getCacheKey();
@@ -414,7 +431,8 @@ public void test_computeJoinDataSourceCacheKey_keyChangesWithPrefix()
         JoinType.LEFT,
         null,
         ExprMacroTable.nil(),
-        joinableFactoryWrapper
+        joinableFactoryWrapper,
+        JoinAlgorithm.BROADCAST
     );
 
     JoinDataSource joinDataSource1 = JoinDataSource.create(
@@ -425,7 +443,8 @@ public void test_computeJoinDataSourceCacheKey_keyChangesWithPrefix()
         JoinType.LEFT,
         null,
         ExprMacroTable.nil(),
-        joinableFactoryWrapper
+        joinableFactoryWrapper,
+        JoinAlgorithm.BROADCAST
     );
 
     byte[] cacheKey1 = joinDataSource.getCacheKey();
@@ -451,7 +470,8 @@ public void testGetAnalysisWithUnnestDS()
         JoinType.LEFT,
         null,
         ExprMacroTable.nil(),
-        null
+        null,
+        JoinAlgorithm.BROADCAST
     );
     DataSourceAnalysis analysis = dataSource.getAnalysis();
     Assert.assertEquals("table1", analysis.getBaseDataSource().getTableNames().iterator().next());
@@ -475,7 +495,8 @@ public void testGetAnalysisWithFilteredDS()
         JoinType.LEFT,
         null,
         ExprMacroTable.nil(),
-        null
+        null,
+        JoinAlgorithm.BROADCAST
     );
     DataSourceAnalysis analysis = dataSource.getAnalysis();
     Assert.assertEquals("table1", analysis.getBaseDataSource().getTableNames().iterator().next());
@@ -496,7 +517,8 @@ public void test_computeJoinDataSourceCacheKey_keyChangesWithBaseFilter()
         JoinType.LEFT,
         expectedInDimFilter,
         ExprMacroTable.nil(),
-        joinableFactoryWrapper
+        joinableFactoryWrapper,
+        JoinAlgorithm.BROADCAST
     );
 
     JoinDataSource joinDataSource1 = JoinDataSource.create(
@@ -507,7 +529,8 @@ public void test_computeJoinDataSourceCacheKey_keyChangesWithBaseFilter()
         JoinType.LEFT,
         null,
         ExprMacroTable.nil(),
-        joinableFactoryWrapper
+        joinableFactoryWrapper,
+        JoinAlgorithm.BROADCAST
     );
 
     byte[] cacheKey1 = joinDataSource.getCacheKey();
@@ -531,7 +554,8 @@ public void test_computeJoinDataSourceCacheKey_cachingUnsupported()
         JoinType.LEFT,
         null,
         ExprMacroTable.nil(),
-        joinableFactoryWrapper
+        joinableFactoryWrapper,
+        JoinAlgorithm.BROADCAST
     );
 
     byte[] cacheKey1 = joinDataSource.getCacheKey();
diff --git a/processing/src/test/java/org/apache/druid/query/QueriesTest.java b/processing/src/test/java/org/apache/druid/query/QueriesTest.java
index b83e256d7a80..444e67e2e462 100644
--- a/processing/src/test/java/org/apache/druid/query/QueriesTest.java
+++ b/processing/src/test/java/org/apache/druid/query/QueriesTest.java
@@ -426,7 +426,8 @@ public void testWithBaseDataSourceSubQueryStackWithJoinOnUnion()
                                                   JoinType.INNER,
                                                   null,
                                                   ExprMacroTable.nil(),
-                                                  null
+                                                  null,
+                                                  JoinAlgorithm.BROADCAST
                                               )
                                           )
                                           .intervals("2000/3000")
@@ -464,7 +465,8 @@ public void testWithBaseDataSourceSubQueryStackWithJoinOnUnion()
                                                       JoinType.INNER,
                                                       null,
                                                       ExprMacroTable.nil(),
-                                                      null
+                                                      null,
+                                                      JoinAlgorithm.BROADCAST
                                                   )
                                               )
                                               .intervals("2000/3000")
@@ -503,7 +505,9 @@ public void testWithBaseDataSourcedBaseFilterWithMultiJoin()
                                         JoinType.INNER,
                                         TrueDimFilter.instance(),
                                         ExprMacroTable.nil(),
-                                        null
+                                        null,
+                                        JoinAlgorithm.BROADCAST
+
                                     ),
                                     new TableDataSource("foo_outer"),
                                     "j0.",
@@ -511,7 +515,9 @@ public void testWithBaseDataSourcedBaseFilterWithMultiJoin()
                                     JoinType.INNER,
                                     null,
                                     ExprMacroTable.nil(),
-                                    null
+                                    null,
+                                    JoinAlgorithm.BROADCAST
+
                                 )
 
                             )
@@ -538,7 +544,9 @@ public void testWithBaseDataSourcedBaseFilterWithMultiJoin()
                                             JoinType.INNER,
                                             TrueDimFilter.instance(),
                                             ExprMacroTable.nil(),
-                                            null
+                                            null,
+                                            JoinAlgorithm.BROADCAST
+
                                         ),
                                         new TableDataSource("foo_outer"),
                                         "j0.",
@@ -546,7 +554,9 @@ public void testWithBaseDataSourcedBaseFilterWithMultiJoin()
                                         JoinType.INNER,
                                         null,
                                         ExprMacroTable.nil(),
-                                        null
+                                        null,
+                                        JoinAlgorithm.BROADCAST
+
                                     )
 
                                 )
diff --git a/processing/src/test/java/org/apache/druid/query/metadata/SegmentMetadataQueryTest.java b/processing/src/test/java/org/apache/druid/query/metadata/SegmentMetadataQueryTest.java
index 04a53908b484..1abe8ec08c29 100644
--- a/processing/src/test/java/org/apache/druid/query/metadata/SegmentMetadataQueryTest.java
+++ b/processing/src/test/java/org/apache/druid/query/metadata/SegmentMetadataQueryTest.java
@@ -39,6 +39,7 @@
 import org.apache.druid.query.Druids;
 import org.apache.druid.query.FinalizeResultsQueryRunner;
 import org.apache.druid.query.InlineDataSource;
+import org.apache.druid.query.JoinAlgorithm;
 import org.apache.druid.query.JoinDataSource;
 import org.apache.druid.query.LookupDataSource;
 import org.apache.druid.query.Query;
@@ -1601,7 +1602,8 @@ public void testSegmentMetadataQueryWithInvalidDatasourceTypes()
                     JoinType.LEFT,
                     null,
                     ExprMacroTable.nil(),
-                    null
+                    null,
+                    JoinAlgorithm.BROADCAST
                 ),
                 new LegacySegmentSpec("2015-01-01/2015-01-02"),
                 null,
@@ -1616,7 +1618,7 @@ public void testSegmentMetadataQueryWithInvalidDatasourceTypes()
         DruidExceptionMatcher
             .invalidInput()
             .expectMessageIs(
-                "Invalid dataSource type [JoinDataSource{left=table1, right=table2, rightPrefix='j.', condition=x == \"j.x\", joinType=LEFT, leftFilter=null}]. SegmentMetadataQuery only supports table or union datasources.")
+                "Invalid dataSource type [JoinDataSource{left=table1, right=table2, rightPrefix='j.', condition=x == \"j.x\", joinType=LEFT, leftFilter=null, joinAlgorithm=null}]. SegmentMetadataQuery only supports table or union datasources.")
     );
   }
 
diff --git a/processing/src/test/java/org/apache/druid/query/planning/DataSourceAnalysisTest.java b/processing/src/test/java/org/apache/druid/query/planning/DataSourceAnalysisTest.java
index fc85b4e3fb6c..522e58daf1f5 100644
--- a/processing/src/test/java/org/apache/druid/query/planning/DataSourceAnalysisTest.java
+++ b/processing/src/test/java/org/apache/druid/query/planning/DataSourceAnalysisTest.java
@@ -27,6 +27,7 @@
 import org.apache.druid.math.expr.ExprMacroTable;
 import org.apache.druid.query.DataSource;
 import org.apache.druid.query.InlineDataSource;
+import org.apache.druid.query.JoinAlgorithm;
 import org.apache.druid.query.JoinDataSource;
 import org.apache.druid.query.LookupDataSource;
 import org.apache.druid.query.QueryDataSource;
@@ -245,9 +246,9 @@ public void testJoinSimpleLeftLeaning()
     Assert.assertEquals(Optional.empty(), analysis.getBaseQuerySegmentSpec());
     Assert.assertEquals(
         ImmutableList.of(
-            new PreJoinableClause("1.", LOOKUP_LOOKYLOO, JoinType.INNER, joinClause("1.")),
-            new PreJoinableClause("2.", INLINE, JoinType.LEFT, joinClause("2.")),
-            new PreJoinableClause("3.", subquery(LOOKUP_LOOKYLOO), JoinType.FULL, joinClause("3."))
+            new PreJoinableClause("1.", LOOKUP_LOOKYLOO, JoinType.INNER, joinClause("1."), JoinAlgorithm.BROADCAST),
+            new PreJoinableClause("2.", INLINE, JoinType.LEFT, joinClause("2."), JoinAlgorithm.BROADCAST),
+            new PreJoinableClause("3.", subquery(LOOKUP_LOOKYLOO), JoinType.FULL, joinClause("3."), JoinAlgorithm.BROADCAST)
         ),
         analysis.getPreJoinableClauses()
     );
@@ -296,9 +297,9 @@ public void testJoinSimpleLeftLeaningWithLeftFilter()
     Assert.assertEquals(Optional.empty(), analysis.getBaseQuerySegmentSpec());
     Assert.assertEquals(
         ImmutableList.of(
-            new PreJoinableClause("1.", LOOKUP_LOOKYLOO, JoinType.INNER, joinClause("1.")),
-            new PreJoinableClause("2.", INLINE, JoinType.LEFT, joinClause("2.")),
-            new PreJoinableClause("3.", subquery(LOOKUP_LOOKYLOO), JoinType.FULL, joinClause("3."))
+            new PreJoinableClause("1.", LOOKUP_LOOKYLOO, JoinType.INNER, joinClause("1."), JoinAlgorithm.BROADCAST),
+            new PreJoinableClause("2.", INLINE, JoinType.LEFT, joinClause("2."), JoinAlgorithm.BROADCAST),
+            new PreJoinableClause("3.", subquery(LOOKUP_LOOKYLOO), JoinType.FULL, joinClause("3."), JoinAlgorithm.BROADCAST)
         ),
         analysis.getPreJoinableClauses()
     );
@@ -353,7 +354,7 @@ public void testJoinSimpleRightLeaning()
     Assert.assertEquals(Optional.empty(), analysis.getBaseQuerySegmentSpec());
     Assert.assertEquals(
         ImmutableList.of(
-            new PreJoinableClause("3.", rightLeaningJoinStack, JoinType.RIGHT, joinClause("3."))
+            new PreJoinableClause("3.", rightLeaningJoinStack, JoinType.RIGHT, joinClause("3."), JoinAlgorithm.BROADCAST)
         ),
         analysis.getPreJoinableClauses()
     );
@@ -403,7 +404,7 @@ public void testJoinSimpleRightLeaningWithLeftFilter()
     Assert.assertEquals(Optional.empty(), analysis.getBaseQuerySegmentSpec());
     Assert.assertEquals(
         ImmutableList.of(
-            new PreJoinableClause("3.", rightLeaningJoinStack, JoinType.RIGHT, joinClause("3."))
+            new PreJoinableClause("3.", rightLeaningJoinStack, JoinType.RIGHT, joinClause("3."), JoinAlgorithm.BROADCAST)
         ),
         analysis.getPreJoinableClauses()
     );
@@ -437,7 +438,7 @@ public void testJoinOverTableSubquery()
     Assert.assertEquals(Optional.empty(), analysis.getBaseUnionDataSource());
     Assert.assertEquals(
         ImmutableList.of(
-            new PreJoinableClause("1.", subquery(TABLE_FOO), JoinType.INNER, joinClause("1."))
+            new PreJoinableClause("1.", subquery(TABLE_FOO), JoinType.INNER, joinClause("1."), JoinAlgorithm.BROADCAST)
         ),
         analysis.getPreJoinableClauses()
     );
@@ -471,7 +472,7 @@ public void testJoinTableUnionToLookup()
     Assert.assertEquals(Optional.empty(), analysis.getBaseQuerySegmentSpec());
     Assert.assertEquals(
         ImmutableList.of(
-            new PreJoinableClause("1.", LOOKUP_LOOKYLOO, JoinType.INNER, joinClause("1."))
+            new PreJoinableClause("1.", LOOKUP_LOOKYLOO, JoinType.INNER, joinClause("1."), JoinAlgorithm.BROADCAST)
         ),
         analysis.getPreJoinableClauses()
     );
@@ -526,7 +527,7 @@ public void testJoinUnderTopLevelSubqueries()
     );
     Assert.assertEquals(
         ImmutableList.of(
-            new PreJoinableClause("1.", LOOKUP_LOOKYLOO, JoinType.INNER, joinClause("1."))
+            new PreJoinableClause("1.", LOOKUP_LOOKYLOO, JoinType.INNER, joinClause("1."), JoinAlgorithm.BROADCAST)
         ),
         analysis.getPreJoinableClauses()
     );
@@ -559,7 +560,7 @@ public void testJoinLookupToLookup()
     Assert.assertEquals(Optional.empty(), analysis.getJoinBaseTableFilter());
     Assert.assertEquals(
         ImmutableList.of(
-            new PreJoinableClause("1.", LOOKUP_LOOKYLOO, JoinType.INNER, joinClause("1."))
+            new PreJoinableClause("1.", LOOKUP_LOOKYLOO, JoinType.INNER, joinClause("1."), JoinAlgorithm.BROADCAST)
         ),
         analysis.getPreJoinableClauses()
     );
@@ -592,7 +593,7 @@ public void testJoinLookupToTable()
     Assert.assertEquals(Optional.empty(), analysis.getJoinBaseTableFilter());
     Assert.assertEquals(
         ImmutableList.of(
-            new PreJoinableClause("1.", TABLE_FOO, JoinType.INNER, joinClause("1."))
+            new PreJoinableClause("1.", TABLE_FOO, JoinType.INNER, joinClause("1."), JoinAlgorithm.BROADCAST)
         ),
         analysis.getPreJoinableClauses()
     );
@@ -633,7 +634,8 @@ private static JoinDataSource join(
         joinType,
         dimFilter,
         ExprMacroTable.nil(),
-        null
+        null,
+        JoinAlgorithm.BROADCAST
     );
   }
 
diff --git a/processing/src/test/java/org/apache/druid/query/planning/PreJoinableClauseTest.java b/processing/src/test/java/org/apache/druid/query/planning/PreJoinableClauseTest.java
index 80762a758c83..a9fbaae6a056 100644
--- a/processing/src/test/java/org/apache/druid/query/planning/PreJoinableClauseTest.java
+++ b/processing/src/test/java/org/apache/druid/query/planning/PreJoinableClauseTest.java
@@ -33,7 +33,8 @@ public class PreJoinableClauseTest
       "j.",
       new TableDataSource("foo"),
       JoinType.LEFT,
-      JoinConditionAnalysis.forExpression("x == \"j.x\"", "j.", ExprMacroTable.nil())
+      JoinConditionAnalysis.forExpression("x == \"j.x\"", "j.", ExprMacroTable.nil()),
+      null
   );
 
   @Test
diff --git a/server/src/test/java/org/apache/druid/server/ClientQuerySegmentWalkerTest.java b/server/src/test/java/org/apache/druid/server/ClientQuerySegmentWalkerTest.java
index 7a8e2248367d..f9c6c02cca33 100644
--- a/server/src/test/java/org/apache/druid/server/ClientQuerySegmentWalkerTest.java
+++ b/server/src/test/java/org/apache/druid/server/ClientQuerySegmentWalkerTest.java
@@ -42,6 +42,7 @@
 import org.apache.druid.query.FrameBasedInlineDataSource;
 import org.apache.druid.query.GlobalTableDataSource;
 import org.apache.druid.query.InlineDataSource;
+import org.apache.druid.query.JoinAlgorithm;
 import org.apache.druid.query.JoinDataSource;
 import org.apache.druid.query.Query;
 import org.apache.druid.query.QueryContexts;
@@ -552,7 +553,8 @@ public void testJoinOnGroupByOnTable()
                                            new JoinableFactoryWrapper(QueryStackTests.makeJoinableFactoryFromDefault(
                                                null,
                                                null,
-                                               null))
+                                               null)),
+                                           JoinAlgorithm.BROADCAST
                                        )
                                    )
                                    .setGranularity(Granularities.ALL)
@@ -624,7 +626,8 @@ public void testJoinOnGroupByOnUnionOfTables()
                                            new JoinableFactoryWrapper(QueryStackTests.makeJoinableFactoryFromDefault(
                                                null,
                                                null,
-                                               null))
+                                               null)),
+                                           JoinAlgorithm.BROADCAST
                                        )
                                    )
                                    .setGranularity(Granularities.ALL)
@@ -801,7 +804,8 @@ public void testJoinOnTableErrorCantInlineTable()
                                            JoinType.INNER,
                                            null,
                                            ExprMacroTable.nil(),
-                                           null
+                                           null,
+                                           JoinAlgorithm.BROADCAST
                                        )
                                    )
                                    .setGranularity(Granularities.ALL)
diff --git a/sql/src/main/java/org/apache/druid/sql/calcite/planner/CalcitePlanner.java b/sql/src/main/java/org/apache/druid/sql/calcite/planner/CalcitePlanner.java
index 8eb9541961c6..559d4bbaa3c6 100644
--- a/sql/src/main/java/org/apache/druid/sql/calcite/planner/CalcitePlanner.java
+++ b/sql/src/main/java/org/apache/druid/sql/calcite/planner/CalcitePlanner.java
@@ -235,7 +235,7 @@ public SqlNode parse(final Reader reader) throws SqlParseException
   @Override
   public SqlNode validate(SqlNode sqlNode) throws ValidationException
   {
-    Hook.PARSE_TREE.run(new Object[] {null, sqlNode});
+    Hook.PARSE_TREE.run(new Object[]{null, sqlNode});
     ensure(CalcitePlanner.State.STATE_3_PARSED);
     this.validator = createSqlValidator(createCatalogReader());
     try {
@@ -295,10 +295,11 @@ public RelRoot rel(SqlNode sql)
         rexBuilder
     );
     final SqlToRelConverter.Config config =
-        sqlToRelConverterConfig.withTrimUnusedFields(false);
+        sqlToRelConverterConfig.withTrimUnusedFields(false)
+                               .withHintStrategyTable(DruidHint.HINT_STRATEGY_TABLE);
     final SqlToRelConverter sqlToRelConverter =
         new DruidSqlToRelConverter(this, validator,
-                              createCatalogReader(), cluster, convertletTable, config
+                                   createCatalogReader(), cluster, convertletTable, config
         );
     RelRoot root =
         sqlToRelConverter.convertQuery(sql, false, true);
diff --git a/sql/src/main/java/org/apache/druid/sql/calcite/planner/CalciteRulesManager.java b/sql/src/main/java/org/apache/druid/sql/calcite/planner/CalciteRulesManager.java
index 1b20dab7d793..08a5df39d98c 100644
--- a/sql/src/main/java/org/apache/druid/sql/calcite/planner/CalciteRulesManager.java
+++ b/sql/src/main/java/org/apache/druid/sql/calcite/planner/CalciteRulesManager.java
@@ -50,6 +50,7 @@
 import org.apache.calcite.tools.Programs;
 import org.apache.calcite.tools.RelBuilder;
 import org.apache.druid.java.util.common.logger.Logger;
+import org.apache.druid.query.JoinAlgorithm;
 import org.apache.druid.sql.calcite.external.ExternalTableScanRule;
 import org.apache.druid.sql.calcite.rule.AggregatePullUpLookupRule;
 import org.apache.druid.sql.calcite.rule.CaseToCoalesceRule;
diff --git a/sql/src/main/java/org/apache/druid/sql/calcite/planner/DruidHint.java b/sql/src/main/java/org/apache/druid/sql/calcite/planner/DruidHint.java
new file mode 100644
index 000000000000..a5c57c95e282
--- /dev/null
+++ b/sql/src/main/java/org/apache/druid/sql/calcite/planner/DruidHint.java
@@ -0,0 +1,98 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.druid.sql.calcite.planner;
+
+import org.apache.calcite.rel.hint.HintPredicates;
+import org.apache.calcite.rel.hint.HintStrategyTable;
+import org.apache.druid.query.JoinAlgorithm;
+
+import javax.annotation.Nullable;
+
+public abstract class DruidHint
+{
+  public abstract static class DruidJoinHint extends DruidHint
+  {
+    @Nullable
+    public static DruidJoinHint fromString(String hintName)
+    {
+      switch (hintName) {
+        case BroadcastJoinHint.BROADCAST_JOIN:
+          return new BroadcastJoinHint();
+        case SortMergeJoinHint.SORT_MERGE_JOIN:
+          return new SortMergeJoinHint();
+        default:
+          return null;
+      }
+    }
+
+    abstract JoinAlgorithm asJoinAlgorithm();
+
+    abstract String id();
+
+    public static class SortMergeJoinHint extends DruidJoinHint
+    {
+      static final String SORT_MERGE_JOIN = "sort_merge";
+
+      @Override
+      String id()
+      {
+        return SORT_MERGE_JOIN;
+      }
+
+      @Override
+      public JoinAlgorithm asJoinAlgorithm()
+      {
+        return JoinAlgorithm.SORT_MERGE;
+      }
+    }
+
+    public static class BroadcastJoinHint extends DruidJoinHint
+    {
+      static final String BROADCAST_JOIN = "broadcast";
+
+      @Override
+      String id()
+      {
+        return BROADCAST_JOIN;
+      }
+
+      @Override
+      public JoinAlgorithm asJoinAlgorithm()
+      {
+        return JoinAlgorithm.BROADCAST;
+      }
+    }
+  }
+
+  public static final HintStrategyTable HINT_STRATEGY_TABLE = createHintStrategies();
+
+  /**
+   * Creates hint strategies.
+   *
+   * @return HintStrategyTable instance
+   */
+  private static HintStrategyTable createHintStrategies()
+  {
+    return HintStrategyTable.builder()
+                            .hintStrategy(DruidJoinHint.SortMergeJoinHint.SORT_MERGE_JOIN, HintPredicates.JOIN)
+                            .hintStrategy(DruidJoinHint.BroadcastJoinHint.BROADCAST_JOIN, HintPredicates.JOIN)
+                            .build();
+  }
+}
diff --git a/sql/src/main/java/org/apache/druid/sql/calcite/planner/PlannerContext.java b/sql/src/main/java/org/apache/druid/sql/calcite/planner/PlannerContext.java
index 51be1f93502a..74744c2bb8f4 100644
--- a/sql/src/main/java/org/apache/druid/sql/calcite/planner/PlannerContext.java
+++ b/sql/src/main/java/org/apache/druid/sql/calcite/planner/PlannerContext.java
@@ -37,6 +37,7 @@
 import org.apache.druid.java.util.common.granularity.Granularities;
 import org.apache.druid.math.expr.Expr;
 import org.apache.druid.math.expr.ExprMacroTable;
+import org.apache.druid.query.JoinAlgorithm;
 import org.apache.druid.query.QueryContext;
 import org.apache.druid.query.QueryContexts;
 import org.apache.druid.query.explain.ExplainAttributes;
diff --git a/sql/src/main/java/org/apache/druid/sql/calcite/planner/QueryUtils.java b/sql/src/main/java/org/apache/druid/sql/calcite/planner/QueryUtils.java
index e0a5cce94187..e7de26f6f6f1 100644
--- a/sql/src/main/java/org/apache/druid/sql/calcite/planner/QueryUtils.java
+++ b/sql/src/main/java/org/apache/druid/sql/calcite/planner/QueryUtils.java
@@ -19,6 +19,9 @@
 
 package org.apache.druid.sql.calcite.planner;
 
+import org.apache.calcite.rel.core.Join;
+import org.apache.calcite.rel.hint.RelHint;
+import org.apache.druid.query.JoinAlgorithm;
 import org.apache.druid.sql.calcite.rel.DruidQuery;
 
 import java.util.ArrayList;
@@ -55,4 +58,21 @@ public static List<ColumnMapping> buildColumnMappings(
 
     return columnMappings;
   }
+
+  public static JoinAlgorithm getJoinAlgorithm(Join join, PlannerContext plannerContext)
+  {
+    RelHint closestHint = null;
+    for (RelHint hint : join.getHints()) {
+      if ((closestHint == null || hint.inheritPath.size() < closestHint.inheritPath.size())
+          && DruidHint.DruidJoinHint.fromString(hint.hintName) != null) {
+        closestHint = hint;
+      }
+    }
+
+    if (closestHint != null) {
+      return DruidHint.DruidJoinHint.fromString(closestHint.hintName).asJoinAlgorithm();
+    } else {
+      return plannerContext.getJoinAlgorithm();
+    }
+  }
 }
diff --git a/sql/src/main/java/org/apache/druid/sql/calcite/planner/QueryValidations.java b/sql/src/main/java/org/apache/druid/sql/calcite/planner/QueryValidations.java
index c516496af31e..27c5ca7e9e82 100644
--- a/sql/src/main/java/org/apache/druid/sql/calcite/planner/QueryValidations.java
+++ b/sql/src/main/java/org/apache/druid/sql/calcite/planner/QueryValidations.java
@@ -25,6 +25,7 @@
 import org.apache.calcite.rel.logical.LogicalJoin;
 import org.apache.calcite.tools.ValidationException;
 import org.apache.druid.java.util.common.StringUtils;
+import org.apache.druid.query.JoinAlgorithm;
 import org.apache.druid.sql.calcite.run.EngineFeature;
 
 /**
diff --git a/sql/src/main/java/org/apache/druid/sql/calcite/rel/DruidJoinQueryRel.java b/sql/src/main/java/org/apache/druid/sql/calcite/rel/DruidJoinQueryRel.java
index 5615da3344fe..312ba1885dd9 100644
--- a/sql/src/main/java/org/apache/druid/sql/calcite/rel/DruidJoinQueryRel.java
+++ b/sql/src/main/java/org/apache/druid/sql/calcite/rel/DruidJoinQueryRel.java
@@ -55,6 +55,7 @@
 import org.apache.druid.sql.calcite.planner.Calcites;
 import org.apache.druid.sql.calcite.planner.PlannerConfig;
 import org.apache.druid.sql.calcite.planner.PlannerContext;
+import org.apache.druid.sql.calcite.planner.QueryUtils;
 import org.apache.druid.sql.calcite.planner.querygen.SourceDescProducer.SourceDesc;
 import org.apache.druid.sql.calcite.table.RowSignatures;
 
@@ -151,7 +152,7 @@ private SourceDesc buildLeftSourceDesc()
     final DruidQuery leftQuery = Preconditions.checkNotNull(leftDruidRel.toDruidQuery(false), "leftQuery");
     final RowSignature leftSignature = leftQuery.getOutputRowSignature();
     final DataSource leftDataSource;
-    if (computeLeftRequiresSubquery(getPlannerContext(), leftDruidRel)) {
+    if (computeLeftRequiresSubquery(getPlannerContext(), leftDruidRel, joinRel)) {
       leftDataSource = new QueryDataSource(leftQuery.getQuery());
       if (leftFilter != null) {
         throw new ISE("Filter on left table is supposed to be null if left child is a query source");
@@ -225,7 +226,8 @@ public static SourceDesc buildJoinSourceDesc(final SourceDesc leftDesc, final So
         ),
         toDruidJoinType(joinRel.getJoinType()),
         getDimFilter(plannerContext, leftDesc.rowSignature, leftFilter),
-        plannerContext.getJoinableFactoryWrapper()
+        plannerContext.getJoinableFactoryWrapper(),
+        QueryUtils.getJoinAlgorithm(joinRel, plannerContext)
     );
 
     SourceDesc sourceDesc = new SourceDesc(joinDataSource, signature, virtualColumnRegistry);
@@ -360,7 +362,7 @@ public RelOptCost computeSelfCost(final RelOptPlanner planner, final RelMetadata
       joinCost *= CostEstimates.MULTIPLIER_OUTER_QUERY;
     } else {
       // Penalize subqueries if we don't have to do them.
-      if (computeLeftRequiresSubquery(getPlannerContext(), getSomeDruidChild(left))) {
+      if (computeLeftRequiresSubquery(getPlannerContext(), getSomeDruidChild(left), joinRel)) {
         joinCost += CostEstimates.COST_SUBQUERY;
       } else {
         if (joinRel.getJoinType() == JoinRelType.INNER && plannerConfig.isComputeInnerJoinCostAsFilter()) {
@@ -400,9 +402,9 @@ public static JoinType toDruidJoinType(JoinRelType calciteJoinType)
     }
   }
 
-  public static boolean computeLeftRequiresSubquery(final PlannerContext plannerContext, final DruidRel<?> left)
+  public static boolean computeLeftRequiresSubquery(final PlannerContext plannerContext, final DruidRel<?> left, final Join joinRel)
   {
-    if (plannerContext.getJoinAlgorithm().requiresSubquery()) {
+    if (QueryUtils.getJoinAlgorithm(joinRel, plannerContext).requiresSubquery()) {
       return true;
     }
 
diff --git a/sql/src/main/java/org/apache/druid/sql/calcite/rel/DruidQuery.java b/sql/src/main/java/org/apache/druid/sql/calcite/rel/DruidQuery.java
index 5d6fc2d2899a..72f72cd6d932 100644
--- a/sql/src/main/java/org/apache/druid/sql/calcite/rel/DruidQuery.java
+++ b/sql/src/main/java/org/apache/druid/sql/calcite/rel/DruidQuery.java
@@ -873,7 +873,8 @@ static Pair<DataSource, Filtration> getFiltration(
           joinDataSource.getConditionAnalysis(),
           joinDataSource.getJoinType(),
           leftFiltration.getDimFilter(),
-          joinableFactoryWrapper
+          joinableFactoryWrapper,
+          joinDataSource.getJoinAlgorithm()
       );
       return Pair.of(newDataSource, queryFiltration);
     } else {
diff --git a/sql/src/main/java/org/apache/druid/sql/calcite/rule/DruidJoinRule.java b/sql/src/main/java/org/apache/druid/sql/calcite/rule/DruidJoinRule.java
index c4cf6150d63d..d604999e41b3 100644
--- a/sql/src/main/java/org/apache/druid/sql/calcite/rule/DruidJoinRule.java
+++ b/sql/src/main/java/org/apache/druid/sql/calcite/rule/DruidJoinRule.java
@@ -49,8 +49,10 @@
 import org.apache.druid.common.config.NullHandling;
 import org.apache.druid.error.DruidException;
 import org.apache.druid.java.util.common.StringUtils;
+import org.apache.druid.query.JoinAlgorithm;
 import org.apache.druid.query.LookupDataSource;
 import org.apache.druid.sql.calcite.planner.PlannerContext;
+import org.apache.druid.sql.calcite.planner.QueryUtils;
 import org.apache.druid.sql.calcite.rel.DruidJoinQueryRel;
 import org.apache.druid.sql.calcite.rel.DruidQueryRel;
 import org.apache.druid.sql.calcite.rel.DruidRel;
@@ -130,7 +132,8 @@ public void onMatch(RelOptRuleCall call)
     plannerContext.setPlanningError(conditionAnalysis.errorStr);
     final boolean isLeftDirectAccessPossible = enableLeftScanDirect && (left instanceof DruidQueryRel);
 
-    if (!plannerContext.getJoinAlgorithm().requiresSubquery()
+    final JoinAlgorithm joinAlgorithm = QueryUtils.getJoinAlgorithm(join, plannerContext);
+    if (!joinAlgorithm.requiresSubquery()
         && left.getPartialDruidQuery().stage() == PartialDruidQuery.Stage.SELECT_PROJECT
         && (isLeftDirectAccessPossible || left.getPartialDruidQuery().getWhereFilter() == null)) {
       // Swap the left-side projection above the join, so the left side is a simple scan or mapping. This helps us
@@ -153,7 +156,7 @@ public void onMatch(RelOptRuleCall call)
       leftFilter = null;
     }
 
-    if (!plannerContext.getJoinAlgorithm().requiresSubquery()
+    if (!joinAlgorithm.requiresSubquery()
         && right.getPartialDruidQuery().stage() == PartialDruidQuery.Stage.SELECT_PROJECT
         && right.getPartialDruidQuery().getWhereFilter() == null
         && !right.getPartialDruidQuery().getSelectProject().isMapping()
diff --git a/sql/src/main/java/org/apache/druid/sql/calcite/run/EngineFeature.java b/sql/src/main/java/org/apache/druid/sql/calcite/run/EngineFeature.java
index 97e81c2ef5c3..9bf4fac8e1e7 100644
--- a/sql/src/main/java/org/apache/druid/sql/calcite/run/EngineFeature.java
+++ b/sql/src/main/java/org/apache/druid/sql/calcite/run/EngineFeature.java
@@ -19,6 +19,7 @@
 
 package org.apache.druid.sql.calcite.run;
 
+import org.apache.druid.query.JoinAlgorithm;
 import org.apache.druid.sql.calcite.external.ExternalDataSource;
 
 /**
@@ -103,7 +104,7 @@ public enum EngineFeature
   UNNEST,
 
   /**
-   * Planner is permitted to use {@link org.apache.druid.sql.calcite.planner.JoinAlgorithm#BROADCAST} with RIGHT
+   * Planner is permitted to use {@link JoinAlgorithm#BROADCAST} with RIGHT
    * and FULL join. Not guaranteed to produce correct results in either the native or MSQ engines, but we allow
    * it in native for two reasons: legacy (the docs caution against it, but it's always been allowed), and the fact
    * that it actually *does* generate correct results in native when the join is processed on the Broker. It is much
diff --git a/sql/src/main/java/org/apache/druid/sql/calcite/run/NativeSqlEngine.java b/sql/src/main/java/org/apache/druid/sql/calcite/run/NativeSqlEngine.java
index 4f3d86b1b420..16228a19e127 100644
--- a/sql/src/main/java/org/apache/druid/sql/calcite/run/NativeSqlEngine.java
+++ b/sql/src/main/java/org/apache/druid/sql/calcite/run/NativeSqlEngine.java
@@ -27,12 +27,12 @@
 import org.apache.calcite.rel.type.RelDataTypeFactory;
 import org.apache.druid.error.InvalidSqlInput;
 import org.apache.druid.guice.LazySingleton;
+import org.apache.druid.query.JoinAlgorithm;
 import org.apache.druid.query.groupby.GroupByQuery;
 import org.apache.druid.query.timeboundary.TimeBoundaryQuery;
 import org.apache.druid.server.QueryLifecycleFactory;
 import org.apache.druid.sql.calcite.parser.DruidSqlInsert;
 import org.apache.druid.sql.calcite.parser.DruidSqlReplace;
-import org.apache.druid.sql.calcite.planner.JoinAlgorithm;
 import org.apache.druid.sql.calcite.planner.PlannerContext;
 import org.apache.druid.sql.calcite.rel.DruidQuery;
 import org.apache.druid.sql.destination.IngestDestination;
diff --git a/sql/src/test/java/org/apache/druid/quidem/DruidQuidemCommandHandler.java b/sql/src/test/java/org/apache/druid/quidem/DruidQuidemCommandHandler.java
index a183ba9ecad1..5bf6d18050f5 100644
--- a/sql/src/test/java/org/apache/druid/quidem/DruidQuidemCommandHandler.java
+++ b/sql/src/test/java/org/apache/druid/quidem/DruidQuidemCommandHandler.java
@@ -26,7 +26,9 @@
 import net.hydromatic.quidem.CommandHandler;
 import net.hydromatic.quidem.Quidem.SqlCommand;
 import org.apache.calcite.plan.RelOptUtil;
+import org.apache.calcite.rel.RelHomogeneousShuttle;
 import org.apache.calcite.rel.RelNode;
+import org.apache.calcite.rel.hint.Hintable;
 import org.apache.calcite.runtime.Hook;
 import org.apache.calcite.sql.SqlExplainFormat;
 import org.apache.calcite.sql.SqlExplainLevel;
@@ -59,6 +61,9 @@ public Command parseCommand(List<String> lines, List<String> content, String lin
     if (line.startsWith("druidPlan")) {
       return new DruidPlanCommand(lines, content);
     }
+    if (line.startsWith("hints")) {
+      return new HintPlanCommand(lines, content);
+    }
     if (line.startsWith("nativePlan")) {
       return new NativePlanCommand(lines, content);
     }
@@ -202,10 +207,16 @@ protected final void executeExplain(Context context) throws IOException
         if (node instanceof DruidRel<?>) {
           node = ((DruidRel<?>) node).unwrapLogicalPlan();
         }
-        String str = RelOptUtil.dumpPlan("", node, SqlExplainFormat.TEXT, SqlExplainLevel.EXPPLAN_ATTRIBUTES);
+        String str = convertRelToString(node);
         context.echo(ImmutableList.of(str));
       }
     }
+
+    protected String convertRelToString(RelNode node)
+    {
+      String str = RelOptUtil.dumpPlan("", node, SqlExplainFormat.TEXT, SqlExplainLevel.EXPPLAN_ATTRIBUTES);
+      return str;
+    }
   }
 
   /**
@@ -245,6 +256,54 @@ static class DruidPlanCommand extends AbstractRelPlanCommand
     }
   }
 
+  static class HintPlanCommand extends AbstractRelPlanCommand
+  {
+    HintPlanCommand(List<String> lines, List<String> content)
+    {
+      super(lines, content, DruidHook.DRUID_PLAN);
+    }
+
+    @Override
+    protected String convertRelToString(RelNode node)
+    {
+      final HintCollector collector = new HintCollector();
+      node.accept(collector);
+      return collector.getCollectedHintsAsString();
+    }
+
+    private static class HintCollector extends RelHomogeneousShuttle
+    {
+      private final List<String> hintsCollect;
+
+      HintCollector()
+      {
+        this.hintsCollect = new ArrayList<>();
+      }
+
+      @Override
+      public RelNode visit(RelNode relNode)
+      {
+        if (relNode instanceof Hintable) {
+          Hintable hintableRelNode = (Hintable) relNode;
+          if (!hintableRelNode.getHints().isEmpty()) {
+            this.hintsCollect.add(relNode.getClass().getSimpleName() + ":" + hintableRelNode.getHints());
+          }
+        }
+        return super.visit(relNode);
+      }
+
+      public String getCollectedHintsAsString()
+      {
+        StringBuilder builder = new StringBuilder();
+        for (String hintLine : hintsCollect) {
+          builder.append(hintLine).append("\n");
+        }
+
+        return builder.toString();
+      }
+    }
+  }
+
   static class ConvertedPlanCommand extends AbstractRelPlanCommand
   {
     ConvertedPlanCommand(List<String> lines, List<String> content)
diff --git a/sql/src/test/java/org/apache/druid/sql/calcite/BaseCalciteQueryTest.java b/sql/src/test/java/org/apache/druid/sql/calcite/BaseCalciteQueryTest.java
index 099d3e0254d1..cfdad72d40be 100644
--- a/sql/src/test/java/org/apache/druid/sql/calcite/BaseCalciteQueryTest.java
+++ b/sql/src/test/java/org/apache/druid/sql/calcite/BaseCalciteQueryTest.java
@@ -45,6 +45,7 @@
 import org.apache.druid.math.expr.ExpressionProcessing;
 import org.apache.druid.query.DataSource;
 import org.apache.druid.query.Druids;
+import org.apache.druid.query.JoinAlgorithm;
 import org.apache.druid.query.JoinDataSource;
 import org.apache.druid.query.Query;
 import org.apache.druid.query.QueryContexts;
@@ -584,7 +585,8 @@ public static JoinDataSource join(
       String rightPrefix,
       String condition,
       JoinType joinType,
-      DimFilter filter
+      DimFilter filter,
+      JoinAlgorithm joinAlgorithm
   )
   {
     return JoinDataSource.create(
@@ -595,7 +597,28 @@ public static JoinDataSource join(
         joinType,
         filter,
         CalciteTests.createExprMacroTable(),
-        CalciteTests.createJoinableFactoryWrapper()
+        CalciteTests.createJoinableFactoryWrapper(),
+        joinAlgorithm
+    );
+  }
+
+  public static JoinDataSource join(
+      DataSource left,
+      DataSource right,
+      String rightPrefix,
+      String condition,
+      JoinType joinType,
+      DimFilter filter
+  )
+  {
+    return join(
+        left,
+        right,
+        rightPrefix,
+        condition,
+        joinType,
+        filter,
+        JoinAlgorithm.BROADCAST
     );
   }
 
diff --git a/sql/src/test/java/org/apache/druid/sql/calcite/CalciteJoinQueryTest.java b/sql/src/test/java/org/apache/druid/sql/calcite/CalciteJoinQueryTest.java
index 02a1a3fe2816..fb4be084efcf 100644
--- a/sql/src/test/java/org/apache/druid/sql/calcite/CalciteJoinQueryTest.java
+++ b/sql/src/test/java/org/apache/druid/sql/calcite/CalciteJoinQueryTest.java
@@ -39,6 +39,7 @@
 import org.apache.druid.query.FilteredDataSource;
 import org.apache.druid.query.GlobalTableDataSource;
 import org.apache.druid.query.InlineDataSource;
+import org.apache.druid.query.JoinAlgorithm;
 import org.apache.druid.query.JoinDataSource;
 import org.apache.druid.query.LookupDataSource;
 import org.apache.druid.query.Order;
@@ -163,7 +164,8 @@ public void testInnerJoinWithLimitAndAlias()
                         JoinType.INNER,
                         null,
                         ExprMacroTable.nil(),
-                        CalciteTests.createJoinableFactoryWrapper()
+                        CalciteTests.createJoinableFactoryWrapper(),
+                        JoinAlgorithm.BROADCAST
                     )
                 )
                 .columns("d0")
@@ -222,7 +224,8 @@ public void testExactTopNOnInnerJoinWithLimit()
                         JoinType.INNER,
                         null,
                         ExprMacroTable.nil(),
-                        CalciteTests.createJoinableFactoryWrapper()
+                        CalciteTests.createJoinableFactoryWrapper(),
+                        JoinAlgorithm.BROADCAST
                     )
                 )
                 .context(context)
@@ -3624,7 +3627,8 @@ public void testLeftJoinRightTableCanBeEmpty()
                         JoinType.LEFT,
                         null,
                         ExprMacroTable.nil(),
-                        CalciteTests.createJoinableFactoryWrapper()
+                        CalciteTests.createJoinableFactoryWrapper(),
+                        JoinAlgorithm.BROADCAST
                     )
                 )
                 .setInterval(querySegmentSpec(Filtration.eternity()))
@@ -5725,7 +5729,8 @@ public void testPlanWithInFilterMoreThanInSubQueryThreshold()
                           JoinType.INNER,
                           null,
                           ExprMacroTable.nil(),
-                          CalciteTests.createJoinableFactoryWrapper()
+                          CalciteTests.createJoinableFactoryWrapper(),
+                          JoinAlgorithm.BROADCAST
                       )
                   )
                   .columns("l1")
@@ -5973,7 +5978,8 @@ public void testJoinWithAliasAndOrderByNoGroupBy()
                         JoinType.INNER,
                         null,
                         ExprMacroTable.nil(),
-                        CalciteTests.createJoinableFactoryWrapper()
+                        CalciteTests.createJoinableFactoryWrapper(),
+                        JoinAlgorithm.BROADCAST
                     )
                 )
                 .columns("__time")
diff --git a/sql/src/test/java/org/apache/druid/sql/calcite/CalciteQueryTest.java b/sql/src/test/java/org/apache/druid/sql/calcite/CalciteQueryTest.java
index 12f17b015c15..ed5fbe7c2069 100644
--- a/sql/src/test/java/org/apache/druid/sql/calcite/CalciteQueryTest.java
+++ b/sql/src/test/java/org/apache/druid/sql/calcite/CalciteQueryTest.java
@@ -41,6 +41,7 @@
 import org.apache.druid.math.expr.ExprMacroTable;
 import org.apache.druid.query.Druids;
 import org.apache.druid.query.InlineDataSource;
+import org.apache.druid.query.JoinAlgorithm;
 import org.apache.druid.query.JoinDataSource;
 import org.apache.druid.query.LookupDataSource;
 import org.apache.druid.query.OperatorFactoryBuilders;
@@ -15580,7 +15581,8 @@ public void testOrderByAlongWithInternalScanQuery()
                         JoinType.INNER,
                         null,
                         ExprMacroTable.nil(),
-                        CalciteTests.createJoinableFactoryWrapper()
+                        CalciteTests.createJoinableFactoryWrapper(),
+                        JoinAlgorithm.BROADCAST
                     )
                 )
                 .context(QUERY_CONTEXT_DEFAULT)
@@ -15623,7 +15625,8 @@ public void testOrderByAlongWithInternalScanQueryNoDistinct()
                         JoinType.INNER,
                         null,
                         ExprMacroTable.nil(),
-                        CalciteTests.createJoinableFactoryWrapper()
+                        CalciteTests.createJoinableFactoryWrapper(),
+                        JoinAlgorithm.BROADCAST
                     )
                 )
                 .context(QUERY_CONTEXT_DEFAULT)
diff --git a/sql/src/test/java/org/apache/druid/sql/calcite/CalciteSubqueryTest.java b/sql/src/test/java/org/apache/druid/sql/calcite/CalciteSubqueryTest.java
index 8117e6ff02bf..38ac3f2b2912 100644
--- a/sql/src/test/java/org/apache/druid/sql/calcite/CalciteSubqueryTest.java
+++ b/sql/src/test/java/org/apache/druid/sql/calcite/CalciteSubqueryTest.java
@@ -36,6 +36,7 @@
 import org.apache.druid.java.util.common.granularity.PeriodGranularity;
 import org.apache.druid.math.expr.ExprMacroTable;
 import org.apache.druid.query.Druids;
+import org.apache.druid.query.JoinAlgorithm;
 import org.apache.druid.query.JoinDataSource;
 import org.apache.druid.query.Order;
 import org.apache.druid.query.QueryContexts;
@@ -977,7 +978,8 @@ public void testJoinWithTimeDimension(String testName, Map<String, Object> query
                                    JoinType.INNER,
                                    null,
                                    ExprMacroTable.nil(),
-                                   CalciteTests.createJoinableFactoryWrapper()
+                                   CalciteTests.createJoinableFactoryWrapper(),
+                                   JoinAlgorithm.BROADCAST
                                ))
                                .intervals(querySegmentSpec(Filtration.eternity()))
                                .granularity(Granularities.ALL)
@@ -1108,7 +1110,8 @@ public void testJoinWithSubqueries(String testName, Map<String, Object> queryCon
                             JoinType.LEFT,
                             null,
                             ExprMacroTable.nil(),
-                            CalciteTests.createJoinableFactoryWrapper()
+                            CalciteTests.createJoinableFactoryWrapper(),
+                            JoinAlgorithm.BROADCAST
                         ),
                         new QueryDataSource(
                             newScanQueryBuilder()
@@ -1128,7 +1131,8 @@ public void testJoinWithSubqueries(String testName, Map<String, Object> queryCon
                                         JoinType.LEFT,
                                         null,
                                         ExprMacroTable.nil(),
-                                        CalciteTests.createJoinableFactoryWrapper()
+                                        CalciteTests.createJoinableFactoryWrapper(),
+                                        JoinAlgorithm.BROADCAST
                                     )
                                 )
                                 .columns("dim1", "j0.dim2")
@@ -1141,7 +1145,8 @@ public void testJoinWithSubqueries(String testName, Map<String, Object> queryCon
                         JoinType.FULL,
                         null,
                         ExprMacroTable.nil(),
-                        CalciteTests.createJoinableFactoryWrapper()
+                        CalciteTests.createJoinableFactoryWrapper(),
+                        JoinAlgorithm.BROADCAST
                     )
                 )
                 .columns("dim1", "_j0.j0.dim2")
@@ -1468,7 +1473,8 @@ public void testGroupBySubqueryWithEarliestAggregator(String testName, Map<Strin
                         JoinType.INNER,
                         null,
                         TestExprMacroTable.INSTANCE,
-                        null
+                        null,
+                        JoinAlgorithm.BROADCAST
                     )
                 )
                 .intervals(querySegmentSpec(Intervals.ETERNITY))
@@ -1545,7 +1551,8 @@ public void testTopNSubqueryWithEarliestAggregator(String testName, Map<String,
                         JoinType.INNER,
                         null,
                         TestExprMacroTable.INSTANCE,
-                        null
+                        null,
+                        JoinAlgorithm.BROADCAST
                     )
                 )
                 .intervals(querySegmentSpec(Intervals.ETERNITY))
@@ -1600,7 +1607,8 @@ public void testTimeseriesSubqueryWithEarliestAggregator(String testName, Map<St
                         JoinType.INNER,
                         null,
                         TestExprMacroTable.INSTANCE,
-                        null
+                        null,
+                        JoinAlgorithm.BROADCAST
                     )
                 )
                 .intervals(querySegmentSpec(Intervals.ETERNITY))
diff --git a/sql/src/test/java/org/apache/druid/sql/calcite/planner/DruidHintTest.java b/sql/src/test/java/org/apache/druid/sql/calcite/planner/DruidHintTest.java
new file mode 100644
index 000000000000..bada2ace92c9
--- /dev/null
+++ b/sql/src/test/java/org/apache/druid/sql/calcite/planner/DruidHintTest.java
@@ -0,0 +1,38 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.druid.sql.calcite.planner;
+
+import org.apache.druid.query.JoinAlgorithm;
+import org.junit.Assert;
+import org.junit.Test;
+
+public class DruidHintTest
+{
+  @Test
+  public void testFromString()
+  {
+    Assert.assertEquals(DruidHint.DruidJoinHint.fromString("sort_merge").id(), DruidHint.DruidJoinHint.SortMergeJoinHint.SORT_MERGE_JOIN);
+    Assert.assertEquals(DruidHint.DruidJoinHint.fromString("broadcast").id(), DruidHint.DruidJoinHint.BroadcastJoinHint.BROADCAST_JOIN);
+    Assert.assertNull(DruidHint.DruidJoinHint.fromString("hash"));
+
+    Assert.assertEquals(DruidHint.DruidJoinHint.fromString("sort_merge").asJoinAlgorithm(), JoinAlgorithm.SORT_MERGE);
+    Assert.assertEquals(DruidHint.DruidJoinHint.fromString("broadcast").asJoinAlgorithm(), JoinAlgorithm.BROADCAST);
+  }
+}
diff --git a/sql/src/test/java/org/apache/druid/sql/calcite/rel/DruidQueryTest.java b/sql/src/test/java/org/apache/druid/sql/calcite/rel/DruidQueryTest.java
index dfc6229681ab..6de0d973b378 100644
--- a/sql/src/test/java/org/apache/druid/sql/calcite/rel/DruidQueryTest.java
+++ b/sql/src/test/java/org/apache/druid/sql/calcite/rel/DruidQueryTest.java
@@ -24,6 +24,7 @@
 import org.apache.druid.java.util.common.Pair;
 import org.apache.druid.math.expr.ExprMacroTable;
 import org.apache.druid.query.DataSource;
+import org.apache.druid.query.JoinAlgorithm;
 import org.apache.druid.query.JoinDataSource;
 import org.apache.druid.query.TableDataSource;
 import org.apache.druid.query.expression.TestExprMacroTable;
@@ -214,7 +215,8 @@ private JoinDataSource join(JoinType joinType, DimFilter filter)
         joinType,
         filter,
         ExprMacroTable.nil(),
-        CalciteTests.createJoinableFactoryWrapper()
+        CalciteTests.createJoinableFactoryWrapper(),
+        JoinAlgorithm.BROADCAST
     );
   }
 
diff --git a/sql/src/test/java/org/apache/druid/sql/calcite/rule/DruidJoinRuleTest.java b/sql/src/test/java/org/apache/druid/sql/calcite/rule/DruidJoinRuleTest.java
index fa76ba3a3c90..7b9ed21f89e9 100644
--- a/sql/src/test/java/org/apache/druid/sql/calcite/rule/DruidJoinRuleTest.java
+++ b/sql/src/test/java/org/apache/druid/sql/calcite/rule/DruidJoinRuleTest.java
@@ -31,9 +31,9 @@
 import org.apache.calcite.sql.type.SqlTypeFactoryImpl;
 import org.apache.calcite.sql.type.SqlTypeName;
 import org.apache.druid.common.config.NullHandling;
+import org.apache.druid.query.JoinAlgorithm;
 import org.apache.druid.query.QueryContext;
 import org.apache.druid.sql.calcite.planner.DruidTypeSystem;
-import org.apache.druid.sql.calcite.planner.JoinAlgorithm;
 import org.apache.druid.sql.calcite.planner.PlannerContext;
 import org.junit.Assert;
 import org.junit.Before;

From 8b81c919792edbb78c7050d63e326cbbc6e2752a Mon Sep 17 00:00:00 2001
From: Karan Kumar <karankumar1100@gmail.com>
Date: Wed, 18 Dec 2024 03:04:50 +0530
Subject: [PATCH 44/56] Remove unused fields. (#17579)

---
 .../main/java/org/apache/druid/query/CursorGranularizer.java | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/processing/src/main/java/org/apache/druid/query/CursorGranularizer.java b/processing/src/main/java/org/apache/druid/query/CursorGranularizer.java
index ffdb5bd15fa9..06b9ec56fd86 100644
--- a/processing/src/main/java/org/apache/druid/query/CursorGranularizer.java
+++ b/processing/src/main/java/org/apache/druid/query/CursorGranularizer.java
@@ -95,12 +95,11 @@ public static CursorGranularizer create(
       timeSelector = cursor.getColumnSelectorFactory().makeColumnValueSelector(ColumnHolder.TIME_COLUMN_NAME);
     }
 
-    return new CursorGranularizer(cursor, granularity, bucketIterable, timeSelector, timeOrder == Order.DESCENDING);
+    return new CursorGranularizer(cursor, bucketIterable, timeSelector, timeOrder == Order.DESCENDING);
   }
 
   private final Cursor cursor;
 
-  private final Granularity granularity;
 
   // Iterable that iterates over time buckets.
   private final Iterable<Interval> bucketIterable;
@@ -115,14 +114,12 @@ public static CursorGranularizer create(
 
   private CursorGranularizer(
       Cursor cursor,
-      Granularity granularity,
       Iterable<Interval> bucketIterable,
       @Nullable ColumnValueSelector timeSelector,
       boolean descending
   )
   {
     this.cursor = cursor;
-    this.granularity = granularity;
     this.bucketIterable = bucketIterable;
     this.timeSelector = timeSelector;
     this.descending = descending;

From a44ab109d55ab52366386d99cd116db359ebdd43 Mon Sep 17 00:00:00 2001
From: Clint Wylie <cwylie@apache.org>
Date: Tue, 17 Dec 2024 18:49:16 -0800
Subject: [PATCH 45/56] remove druid.expressions.useStrictBooleans in favor of
 always being true (#17568)

---
 .../InputSourceSamplerDiscoveryTest.java      |  66 ---
 .../druid/common/config/NullHandling.java     |   4 +-
 .../druid/math/expr/BinaryEvalOpExprBase.java |  10 +-
 .../math/expr/BinaryLogicalOperatorExpr.java  |  20 +-
 .../org/apache/druid/math/expr/ExprEval.java  |  33 +-
 .../druid/math/expr/ExpressionProcessing.java |  15 -
 .../math/expr/ExpressionProcessingConfig.java |  17 +-
 .../druid/math/expr/UnaryOperatorExpr.java    |  13 -
 .../vector/VectorComparisonProcessors.java    | 467 ----------------
 .../math/expr/vector/VectorProcessors.java    |  26 +-
 .../druid/segment/filter/NotFilter.java       |  10 +-
 .../org/apache/druid/math/expr/EvalTest.java  | 514 ++++++------------
 .../druid/math/expr/OutputTypeTest.java       | 110 ++--
 .../query/scan/NestedDataScanQueryTest.java   |  71 ---
 ...ExpressionFilterNonStrictBooleansTest.java | 143 -----
 .../segment/filter/ExpressionFilterTest.java  |  17 +-
 .../segment/transform/TransformSpecTest.java  |  88 +--
 .../calcite/rule/DruidLogicalValuesRule.java  |   3 +-
 .../rule/DruidLogicalValuesRuleTest.java      |   3 +-
 19 files changed, 236 insertions(+), 1394 deletions(-)
 delete mode 100644 processing/src/test/java/org/apache/druid/segment/filter/ExpressionFilterNonStrictBooleansTest.java

diff --git a/indexing-service/src/test/java/org/apache/druid/indexing/overlord/sampler/InputSourceSamplerDiscoveryTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/overlord/sampler/InputSourceSamplerDiscoveryTest.java
index 0220aacd8922..463416fc33e6 100644
--- a/indexing-service/src/test/java/org/apache/druid/indexing/overlord/sampler/InputSourceSamplerDiscoveryTest.java
+++ b/indexing-service/src/test/java/org/apache/druid/indexing/overlord/sampler/InputSourceSamplerDiscoveryTest.java
@@ -31,7 +31,6 @@
 import org.apache.druid.data.input.impl.StringDimensionSchema;
 import org.apache.druid.data.input.impl.TimestampSpec;
 import org.apache.druid.jackson.DefaultObjectMapper;
-import org.apache.druid.math.expr.ExpressionProcessing;
 import org.apache.druid.segment.AutoTypeColumnSchema;
 import org.apache.druid.segment.column.ColumnType;
 import org.apache.druid.segment.column.RowSignature;
@@ -56,71 +55,6 @@ public class InputSourceSamplerDiscoveryTest extends InitializedNullHandlingTest
   );
   private InputSourceSampler inputSourceSampler = new InputSourceSampler(OBJECT_MAPPER);
 
-  @Test
-  public void testDiscoveredTypesNonStrictBooleans()
-  {
-
-    try {
-      ExpressionProcessing.initializeForStrictBooleansTests(false);
-      final InputSource inputSource = new InlineInputSource(Strings.join(STR_JSON_ROWS, '\n'));
-      final SamplerResponse response = inputSourceSampler.sample(
-          inputSource,
-          new JsonInputFormat(null, null, null, null, null),
-          DataSchema.builder()
-                    .withDataSource("test")
-                    .withTimestamp(new TimestampSpec("t", null, null))
-                    .withDimensions(DimensionsSpec.builder().useSchemaDiscovery(true).build())
-                    .build(),
-          null
-      );
-
-      Assert.assertEquals(6, response.getNumRowsRead());
-      Assert.assertEquals(5, response.getNumRowsIndexed());
-      Assert.assertEquals(6, response.getData().size());
-      Assert.assertEquals(
-          ImmutableList.of(
-              new StringDimensionSchema("string"),
-              new LongDimensionSchema("long"),
-              new DoubleDimensionSchema("double"),
-              new StringDimensionSchema("bool"),
-              new StringDimensionSchema("variant"),
-              new AutoTypeColumnSchema("array", null),
-              new AutoTypeColumnSchema("nested", null)
-          ),
-          response.getLogicalDimensions()
-      );
-
-      Assert.assertEquals(
-          ImmutableList.of(
-              new AutoTypeColumnSchema("string", null),
-              new AutoTypeColumnSchema("long", null),
-              new AutoTypeColumnSchema("double", null),
-              new AutoTypeColumnSchema("bool", null),
-              new AutoTypeColumnSchema("variant", null),
-              new AutoTypeColumnSchema("array", null),
-              new AutoTypeColumnSchema("nested", null)
-          ),
-          response.getPhysicalDimensions()
-      );
-      Assert.assertEquals(
-          RowSignature.builder()
-                      .addTimeColumn()
-                      .add("string", ColumnType.STRING)
-                      .add("long", ColumnType.LONG)
-                      .add("double", ColumnType.DOUBLE)
-                      .add("bool", ColumnType.STRING)
-                      .add("variant", ColumnType.STRING)
-                      .add("array", ColumnType.LONG_ARRAY)
-                      .add("nested", ColumnType.NESTED_DATA)
-                      .build(),
-          response.getLogicalSegmentSchema()
-      );
-    }
-    finally {
-      ExpressionProcessing.initializeForTests();
-    }
-  }
-
   @Test
   public void testDiscoveredTypesStrictBooleans()
   {
diff --git a/processing/src/main/java/org/apache/druid/common/config/NullHandling.java b/processing/src/main/java/org/apache/druid/common/config/NullHandling.java
index b98d81421d25..578c64acbc56 100644
--- a/processing/src/main/java/org/apache/druid/common/config/NullHandling.java
+++ b/processing/src/main/java/org/apache/druid/common/config/NullHandling.java
@@ -22,7 +22,6 @@
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Strings;
 import com.google.inject.Inject;
-import org.apache.druid.math.expr.ExpressionProcessing;
 import org.apache.druid.query.BitmapResultFactory;
 import org.apache.druid.query.filter.DimFilter;
 import org.apache.druid.query.filter.ValueMatcher;
@@ -130,8 +129,7 @@ public static boolean sqlCompatible()
   public static boolean useThreeValueLogic()
   {
     return sqlCompatible() &&
-           INSTANCE.isUseThreeValueLogicForNativeFilters() &&
-           ExpressionProcessing.useStrictBooleans();
+           INSTANCE.isUseThreeValueLogicForNativeFilters();
   }
 
   @Nullable
diff --git a/processing/src/main/java/org/apache/druid/math/expr/BinaryEvalOpExprBase.java b/processing/src/main/java/org/apache/druid/math/expr/BinaryEvalOpExprBase.java
index 2104dcc45db7..6b7bb21a1f7e 100644
--- a/processing/src/main/java/org/apache/druid/math/expr/BinaryEvalOpExprBase.java
+++ b/processing/src/main/java/org/apache/druid/math/expr/BinaryEvalOpExprBase.java
@@ -23,7 +23,6 @@
 import org.apache.druid.common.config.NullHandling;
 import org.apache.druid.java.util.common.IAE;
 import org.apache.druid.java.util.common.StringUtils;
-import org.apache.druid.segment.column.Types;
 
 import javax.annotation.Nullable;
 import java.util.Objects;
@@ -206,9 +205,6 @@ public ExprEval eval(ObjectBinding bindings)
         result = evalDouble(leftVal.asDouble(), rightVal.asDouble());
         break;
     }
-    if (!ExpressionProcessing.useStrictBooleans() && !type.is(ExprType.STRING) && !type.isArray()) {
-      return ExprEval.ofBoolean(result, type);
-    }
     return ExprEval.ofLongBoolean(result);
   }
 
@@ -224,11 +220,7 @@ public ExprEval eval(ObjectBinding bindings)
   @Override
   public ExpressionType getOutputType(InputBindingInspector inspector)
   {
-    ExpressionType implicitCast = super.getOutputType(inspector);
-    if (ExpressionProcessing.useStrictBooleans() || Types.isNullOr(implicitCast, ExprType.STRING)) {
-      return ExpressionType.LONG;
-    }
-    return implicitCast;
+    return ExpressionType.LONG;
   }
 
   @Override
diff --git a/processing/src/main/java/org/apache/druid/math/expr/BinaryLogicalOperatorExpr.java b/processing/src/main/java/org/apache/druid/math/expr/BinaryLogicalOperatorExpr.java
index 13bb4e7f52f1..880271ff1de1 100644
--- a/processing/src/main/java/org/apache/druid/math/expr/BinaryLogicalOperatorExpr.java
+++ b/processing/src/main/java/org/apache/druid/math/expr/BinaryLogicalOperatorExpr.java
@@ -340,9 +340,6 @@ protected BinaryOpExprBase copy(Expr left, Expr right)
   public ExprEval eval(ObjectBinding bindings)
   {
     ExprEval leftVal = left.eval(bindings);
-    if (!ExpressionProcessing.useStrictBooleans()) {
-      return leftVal.asBoolean() ? right.eval(bindings) : leftVal;
-    }
 
     // if left is false, always false
     if (leftVal.value() != null && !leftVal.asBoolean()) {
@@ -376,9 +373,7 @@ public ExprEval eval(ObjectBinding bindings)
   @Override
   public boolean canVectorize(InputBindingInspector inspector)
   {
-    return ExpressionProcessing.useStrictBooleans() &&
-           inspector.areSameTypes(left, right) &&
-           inspector.canVectorize(left, right);
+    return inspector.areSameTypes(left, right) && inspector.canVectorize(left, right);
   }
 
   @Override
@@ -391,9 +386,6 @@ public <T> ExprVectorProcessor<T> asVectorProcessor(VectorInputBindingInspector
   @Override
   public ExpressionType getOutputType(InputBindingInspector inspector)
   {
-    if (!ExpressionProcessing.useStrictBooleans()) {
-      return super.getOutputType(inspector);
-    }
     return ExpressionType.LONG;
   }
 }
@@ -415,9 +407,6 @@ protected BinaryOpExprBase copy(Expr left, Expr right)
   public ExprEval eval(ObjectBinding bindings)
   {
     ExprEval leftVal = left.eval(bindings);
-    if (!ExpressionProcessing.useStrictBooleans()) {
-      return leftVal.asBoolean() ? leftVal : right.eval(bindings);
-    }
 
     // if left is true, always true
     if (leftVal.value() != null && leftVal.asBoolean()) {
@@ -454,9 +443,7 @@ public ExprEval eval(ObjectBinding bindings)
   public boolean canVectorize(InputBindingInspector inspector)
   {
 
-    return ExpressionProcessing.useStrictBooleans() &&
-           inspector.areSameTypes(left, right) &&
-           inspector.canVectorize(left, right);
+    return inspector.areSameTypes(left, right) && inspector.canVectorize(left, right);
   }
 
   @Override
@@ -469,9 +456,6 @@ public <T> ExprVectorProcessor<T> asVectorProcessor(VectorInputBindingInspector
   @Override
   public ExpressionType getOutputType(InputBindingInspector inspector)
   {
-    if (!ExpressionProcessing.useStrictBooleans()) {
-      return super.getOutputType(inspector);
-    }
     return ExpressionType.LONG;
   }
 }
diff --git a/processing/src/main/java/org/apache/druid/math/expr/ExprEval.java b/processing/src/main/java/org/apache/druid/math/expr/ExprEval.java
index a18ca8b61e2a..3c2e5630df47 100644
--- a/processing/src/main/java/org/apache/druid/math/expr/ExprEval.java
+++ b/processing/src/main/java/org/apache/druid/math/expr/ExprEval.java
@@ -242,11 +242,7 @@ private static Class convertType(@Nullable Class existing, Class next)
     if (Number.class.isAssignableFrom(next) || next == String.class || next == Boolean.class) {
       // coerce booleans
       if (next == Boolean.class) {
-        if (ExpressionProcessing.useStrictBooleans()) {
-          next = Long.class;
-        } else {
-          next = String.class;
-        }
+        next = Long.class;
       }
       if (existing == null) {
         return next;
@@ -350,28 +346,6 @@ public static ExprEval ofArray(ExpressionType outputType, @Nullable Object[] val
     return new ArrayExprEval(outputType, value);
   }
 
-  /**
-   * Convert a boolean back into native expression type
-   *
-   * Do not use this method unless {@link ExpressionProcessing#useStrictBooleans()} is set to false.
-   * {@link ExpressionType#LONG} is the Druid boolean unless this mode is enabled, so use {@link #ofLongBoolean}
-   * instead.
-   */
-  @Deprecated
-  public static ExprEval ofBoolean(boolean value, ExpressionType type)
-  {
-    switch (type.getType()) {
-      case DOUBLE:
-        return of(Evals.asDouble(value));
-      case LONG:
-        return ofLongBoolean(value);
-      case STRING:
-        return of(String.valueOf(value));
-      default:
-        throw new Types.InvalidCastBooleanException(type);
-    }
-  }
-
   /**
    * Convert a boolean into a long expression type
    */
@@ -421,10 +395,7 @@ public static ExprEval bestEffortOf(@Nullable Object val)
       return new LongExprEval((Number) val);
     }
     if (val instanceof Boolean) {
-      if (ExpressionProcessing.useStrictBooleans()) {
-        return ofLongBoolean((Boolean) val);
-      }
-      return new StringExprEval(String.valueOf(val));
+      return ofLongBoolean((Boolean) val);
     }
     if (val instanceof Long[]) {
       final Long[] inputArray = (Long[]) val;
diff --git a/processing/src/main/java/org/apache/druid/math/expr/ExpressionProcessing.java b/processing/src/main/java/org/apache/druid/math/expr/ExpressionProcessing.java
index 9a4d2ef46942..2387cea909f1 100644
--- a/processing/src/main/java/org/apache/druid/math/expr/ExpressionProcessing.java
+++ b/processing/src/main/java/org/apache/druid/math/expr/ExpressionProcessing.java
@@ -48,12 +48,6 @@ public static void initializeForTests()
     INSTANCE = new ExpressionProcessingConfig(null, null, null, null);
   }
 
-  @VisibleForTesting
-  public static void initializeForStrictBooleansTests(boolean useStrict)
-  {
-    INSTANCE = new ExpressionProcessingConfig(useStrict, null, null, null);
-  }
-
   @VisibleForTesting
   public static void initializeForHomogenizeNullMultiValueStrings()
   {
@@ -66,15 +60,6 @@ public static void initializeForFallback()
     INSTANCE = new ExpressionProcessingConfig(null, null, null, true);
   }
 
-  /**
-   * All boolean expressions are {@link ExpressionType#LONG}
-   */
-  public static boolean useStrictBooleans()
-  {
-    checkInitialized();
-    return INSTANCE.isUseStrictBooleans();
-  }
-
   /**
    * All {@link ExprType#ARRAY} values will be converted to {@link ExpressionType#STRING} by their column selectors
    * (not within expression processing) to be treated as multi-value strings instead of native arrays.
diff --git a/processing/src/main/java/org/apache/druid/math/expr/ExpressionProcessingConfig.java b/processing/src/main/java/org/apache/druid/math/expr/ExpressionProcessingConfig.java
index 3d235fe3ddaa..a0d58eb48064 100644
--- a/processing/src/main/java/org/apache/druid/math/expr/ExpressionProcessingConfig.java
+++ b/processing/src/main/java/org/apache/druid/math/expr/ExpressionProcessingConfig.java
@@ -30,6 +30,7 @@ public class ExpressionProcessingConfig
 {
   private static final Logger LOG = new Logger(ExpressionProcessingConfig.class);
 
+  @Deprecated
   public static final String NULL_HANDLING_LEGACY_LOGICAL_OPS_STRING = "druid.expressions.useStrictBooleans";
   // Coerce arrays to multi value strings
   public static final String PROCESS_ARRAYS_AS_MULTIVALUE_STRINGS_CONFIG_STRING =
@@ -39,9 +40,6 @@ public class ExpressionProcessingConfig
       "druid.expressions.homogenizeNullMultiValueStringArrays";
   public static final String ALLOW_VECTORIZE_FALLBACK = "druid.expressions.allowVectorizeFallback";
 
-  @JsonProperty("useStrictBooleans")
-  private final boolean useStrictBooleans;
-
   @JsonProperty("processArraysAsMultiValueStrings")
   private final boolean processArraysAsMultiValueStrings;
 
@@ -51,9 +49,13 @@ public class ExpressionProcessingConfig
   @JsonProperty("allowVectorizeFallback")
   private final boolean allowVectorizeFallback;
 
+  @Deprecated
+  @JsonProperty("useStrictBooleans")
+  private final boolean useStrictBooleans;
+
   @JsonCreator
   public ExpressionProcessingConfig(
-      @JsonProperty("useStrictBooleans") @Nullable Boolean useStrictBooleans,
+      @Deprecated @JsonProperty("useStrictBooleans") @Nullable Boolean useStrictBooleans,
       @JsonProperty("processArraysAsMultiValueStrings") @Nullable Boolean processArraysAsMultiValueStrings,
       @JsonProperty("homogenizeNullMultiValueStringArrays") @Nullable Boolean homogenizeNullMultiValueStringArrays,
       @JsonProperty("allowVectorizeFallback") @Nullable Boolean allowVectorizeFallback
@@ -83,17 +85,12 @@ public ExpressionProcessingConfig(
     final String docsBaseFormat = "https://druid.apache.org/docs/%s/querying/sql-data-types#%s";
     if (!this.useStrictBooleans) {
       LOG.warn(
-          "druid.expressions.useStrictBooleans set to 'false', we recommend using 'true' if using SQL to query Druid for the most SQL compliant behavior, see %s for details",
+          "druid.expressions.useStrictBooleans set to 'false', but has been removed from Druid and is always 'true' now for the most SQL compliant behavior, see %s for details",
           StringUtils.format(docsBaseFormat, version, "boolean-logic")
       );
     }
   }
 
-  public boolean isUseStrictBooleans()
-  {
-    return useStrictBooleans;
-  }
-
   public boolean processArraysAsMultiValueStrings()
   {
     return processArraysAsMultiValueStrings;
diff --git a/processing/src/main/java/org/apache/druid/math/expr/UnaryOperatorExpr.java b/processing/src/main/java/org/apache/druid/math/expr/UnaryOperatorExpr.java
index f9f2c5bbcc28..30b3f9f4fc7a 100644
--- a/processing/src/main/java/org/apache/druid/math/expr/UnaryOperatorExpr.java
+++ b/processing/src/main/java/org/apache/druid/math/expr/UnaryOperatorExpr.java
@@ -26,7 +26,6 @@
 import org.apache.druid.math.expr.vector.ExprVectorProcessor;
 import org.apache.druid.math.expr.vector.VectorMathProcessors;
 import org.apache.druid.math.expr.vector.VectorProcessors;
-import org.apache.druid.segment.column.Types;
 
 import javax.annotation.Nullable;
 import java.math.BigInteger;
@@ -181,11 +180,6 @@ public ExprEval eval(ObjectBinding bindings)
     if (NullHandling.sqlCompatible() && (ret.value() == null)) {
       return ExprEval.of(null);
     }
-    if (!ExpressionProcessing.useStrictBooleans()) {
-      // conforming to other boolean-returning binary operators
-      ExpressionType retType = ret.type().is(ExprType.DOUBLE) ? ExpressionType.DOUBLE : ExpressionType.LONG;
-      return ExprEval.ofBoolean(!ret.asBoolean(), retType);
-    }
     return ExprEval.ofLongBoolean(!ret.asBoolean());
   }
 
@@ -193,13 +187,6 @@ public ExprEval eval(ObjectBinding bindings)
   @Override
   public ExpressionType getOutputType(InputBindingInspector inspector)
   {
-    if (!ExpressionProcessing.useStrictBooleans()) {
-      ExpressionType implicitCast = super.getOutputType(inspector);
-      if (Types.is(implicitCast, ExprType.STRING)) {
-        return ExpressionType.LONG;
-      }
-      return implicitCast;
-    }
     return ExpressionType.LONG;
   }
 
diff --git a/processing/src/main/java/org/apache/druid/math/expr/vector/VectorComparisonProcessors.java b/processing/src/main/java/org/apache/druid/math/expr/vector/VectorComparisonProcessors.java
index a132c0ee6725..1df76f2bed21 100644
--- a/processing/src/main/java/org/apache/druid/math/expr/vector/VectorComparisonProcessors.java
+++ b/processing/src/main/java/org/apache/druid/math/expr/vector/VectorComparisonProcessors.java
@@ -23,7 +23,6 @@
 import org.apache.druid.math.expr.Evals;
 import org.apache.druid.math.expr.Expr;
 import org.apache.druid.math.expr.ExprType;
-import org.apache.druid.math.expr.ExpressionProcessing;
 import org.apache.druid.math.expr.ExpressionType;
 import org.apache.druid.segment.column.Types;
 
@@ -33,50 +32,6 @@
 
 public class VectorComparisonProcessors
 {
-  @Deprecated
-  public static <T> ExprVectorProcessor<T> makeComparisonProcessor(
-      Expr.VectorInputBindingInspector inspector,
-      Expr left,
-      Expr right,
-      Supplier<LongOutObjectsInFunctionVectorProcessor> longOutStringsInFunctionVectorProcessor,
-      Supplier<LongOutLongsInFunctionVectorValueProcessor> longOutLongsInProcessor,
-      Supplier<DoubleOutLongDoubleInFunctionVectorValueProcessor> doubleOutLongDoubleInProcessor,
-      Supplier<DoubleOutDoubleLongInFunctionVectorValueProcessor> doubleOutDoubleLongInProcessor,
-      Supplier<DoubleOutDoublesInFunctionVectorValueProcessor> doubleOutDoublesInProcessor
-  )
-  {
-    assert !ExpressionProcessing.useStrictBooleans();
-    final ExpressionType leftType = left.getOutputType(inspector);
-    final ExpressionType rightType = right.getOutputType(inspector);
-    ExprVectorProcessor<?> processor = null;
-    if (Types.is(leftType, ExprType.STRING)) {
-      if (Types.isNullOr(rightType, ExprType.STRING)) {
-        processor = longOutStringsInFunctionVectorProcessor.get();
-      } else {
-        processor = doubleOutDoublesInProcessor.get();
-      }
-    } else if (leftType == null) {
-      if (Types.isNullOr(rightType, ExprType.STRING)) {
-        processor = longOutStringsInFunctionVectorProcessor.get();
-      }
-    } else if (leftType.is(ExprType.DOUBLE) || Types.is(rightType, ExprType.DOUBLE)) {
-      processor = doubleOutDoublesInProcessor.get();
-    }
-    if (processor != null) {
-      return (ExprVectorProcessor<T>) processor;
-    }
-    // fall through to normal math processor logic
-    return VectorMathProcessors.makeMathProcessor(
-        inspector,
-        left,
-        right,
-        longOutLongsInProcessor,
-        doubleOutLongDoubleInProcessor,
-        doubleOutDoubleLongInProcessor,
-        doubleOutDoublesInProcessor
-    );
-  }
-
   public static <T> ExprVectorProcessor<T> makeBooleanProcessor(
       Expr.VectorInputBindingInspector inspector,
       Expr left,
@@ -131,75 +86,6 @@ public static <T> ExprVectorProcessor<T> equal(
       Expr right
   )
   {
-    if (!ExpressionProcessing.useStrictBooleans()) {
-      return makeComparisonProcessor(
-          inspector,
-          left,
-          right,
-          () -> new LongOutObjectsInFunctionVectorProcessor(
-              left.asVectorProcessor(inspector),
-              right.asVectorProcessor(inspector),
-              inspector.getMaxVectorSize(),
-              ExpressionType.STRING
-          )
-          {
-            @Nullable
-            @Override
-            Long processValue(@Nullable Object leftVal, @Nullable Object rightVal)
-            {
-              return Evals.asLong(Objects.equals(leftVal, rightVal));
-            }
-          },
-          () -> new LongOutLongsInFunctionVectorValueProcessor(
-              left.asVectorProcessor(inspector),
-              right.asVectorProcessor(inspector),
-              inspector.getMaxVectorSize()
-          )
-          {
-            @Override
-            public long apply(long left, long right)
-            {
-              return Evals.asLong(left == right);
-            }
-          },
-          () -> new DoubleOutLongDoubleInFunctionVectorValueProcessor(
-              left.asVectorProcessor(inspector),
-              right.asVectorProcessor(inspector),
-              inspector.getMaxVectorSize()
-          )
-          {
-            @Override
-            public double apply(long left, double right)
-            {
-              return Evals.asDouble(left == right);
-            }
-          },
-          () -> new DoubleOutDoubleLongInFunctionVectorValueProcessor(
-              left.asVectorProcessor(inspector),
-              right.asVectorProcessor(inspector),
-              inspector.getMaxVectorSize()
-          )
-          {
-            @Override
-            public double apply(double left, long right)
-            {
-              return Evals.asDouble(left == right);
-            }
-          },
-          () -> new DoubleOutDoublesInFunctionVectorValueProcessor(
-              left.asVectorProcessor(inspector),
-              right.asVectorProcessor(inspector),
-              inspector.getMaxVectorSize()
-          )
-          {
-            @Override
-            public double apply(double left, double right)
-            {
-              return Evals.asDouble(left == right);
-            }
-          }
-      );
-    }
     return makeBooleanProcessor(
         inspector,
         left,
@@ -275,75 +161,6 @@ public static <T> ExprVectorProcessor<T> notEqual(
       Expr right
   )
   {
-    if (!ExpressionProcessing.useStrictBooleans()) {
-      return makeComparisonProcessor(
-          inspector,
-          left,
-          right,
-          () -> new LongOutObjectsInFunctionVectorProcessor(
-              left.asVectorProcessor(inspector),
-              right.asVectorProcessor(inspector),
-              inspector.getMaxVectorSize(),
-              ExpressionType.STRING
-          )
-          {
-            @Nullable
-            @Override
-            Long processValue(@Nullable Object leftVal, @Nullable Object rightVal)
-            {
-              return Evals.asLong(!Objects.equals(leftVal, rightVal));
-            }
-          },
-          () -> new LongOutLongsInFunctionVectorValueProcessor(
-              left.asVectorProcessor(inspector),
-              right.asVectorProcessor(inspector),
-              inspector.getMaxVectorSize()
-          )
-          {
-            @Override
-            public long apply(long left, long right)
-            {
-              return Evals.asLong(left != right);
-            }
-          },
-          () -> new DoubleOutLongDoubleInFunctionVectorValueProcessor(
-              left.asVectorProcessor(inspector),
-              right.asVectorProcessor(inspector),
-              inspector.getMaxVectorSize()
-          )
-          {
-            @Override
-            public double apply(long left, double right)
-            {
-              return Evals.asDouble(left != right);
-            }
-          },
-          () -> new DoubleOutDoubleLongInFunctionVectorValueProcessor(
-              left.asVectorProcessor(inspector),
-              right.asVectorProcessor(inspector),
-              inspector.getMaxVectorSize()
-          )
-          {
-            @Override
-            public double apply(double left, long right)
-            {
-              return Evals.asDouble(left != right);
-            }
-          },
-          () -> new DoubleOutDoublesInFunctionVectorValueProcessor(
-              left.asVectorProcessor(inspector),
-              right.asVectorProcessor(inspector),
-              inspector.getMaxVectorSize()
-          )
-          {
-            @Override
-            public double apply(double left, double right)
-            {
-              return Evals.asDouble(left != right);
-            }
-          }
-      );
-    }
     return makeBooleanProcessor(
         inspector,
         left,
@@ -419,77 +236,6 @@ public static <T> ExprVectorProcessor<T> greaterThanOrEqual(
       Expr right
   )
   {
-    if (!ExpressionProcessing.useStrictBooleans()) {
-      return makeComparisonProcessor(
-          inspector,
-          left,
-          right,
-          () -> new LongOutObjectsInFunctionVectorProcessor(
-              left.asVectorProcessor(inspector),
-              right.asVectorProcessor(inspector),
-              inspector.getMaxVectorSize(),
-              ExpressionType.STRING
-          )
-          {
-            @Nullable
-            @Override
-            Long processValue(@Nullable Object leftVal, @Nullable Object rightVal)
-            {
-              return Evals.asLong(
-                  Comparators.<String>naturalNullsFirst().compare((String) leftVal, (String) rightVal) >= 0
-              );
-            }
-          },
-          () -> new LongOutLongsInFunctionVectorValueProcessor(
-              left.asVectorProcessor(inspector),
-              right.asVectorProcessor(inspector),
-              inspector.getMaxVectorSize()
-          )
-          {
-            @Override
-            public long apply(long left, long right)
-            {
-              return Evals.asLong(left >= right);
-            }
-          },
-          () -> new DoubleOutLongDoubleInFunctionVectorValueProcessor(
-              left.asVectorProcessor(inspector),
-              right.asVectorProcessor(inspector),
-              inspector.getMaxVectorSize()
-          )
-          {
-            @Override
-            public double apply(long left, double right)
-            {
-              return Evals.asDouble(Double.compare(left, right) >= 0);
-            }
-          },
-          () -> new DoubleOutDoubleLongInFunctionVectorValueProcessor(
-              left.asVectorProcessor(inspector),
-              right.asVectorProcessor(inspector),
-              inspector.getMaxVectorSize()
-          )
-          {
-            @Override
-            public double apply(double left, long right)
-            {
-              return Evals.asDouble(Double.compare(left, right) >= 0);
-            }
-          },
-          () -> new DoubleOutDoublesInFunctionVectorValueProcessor(
-              left.asVectorProcessor(inspector),
-              right.asVectorProcessor(inspector),
-              inspector.getMaxVectorSize()
-          )
-          {
-            @Override
-            public double apply(double left, double right)
-            {
-              return Evals.asDouble(Double.compare(left, right) >= 0);
-            }
-          }
-      );
-    }
     return makeBooleanProcessor(
         inspector,
         left,
@@ -567,77 +313,6 @@ public static <T> ExprVectorProcessor<T> greaterThan(
       Expr right
   )
   {
-    if (!ExpressionProcessing.useStrictBooleans()) {
-      return makeComparisonProcessor(
-          inspector,
-          left,
-          right,
-          () -> new LongOutObjectsInFunctionVectorProcessor(
-              left.asVectorProcessor(inspector),
-              right.asVectorProcessor(inspector),
-              inspector.getMaxVectorSize(),
-              ExpressionType.STRING
-          )
-          {
-            @Nullable
-            @Override
-            Long processValue(@Nullable Object leftVal, @Nullable Object rightVal)
-            {
-              return Evals.asLong(
-                  Comparators.<String>naturalNullsFirst().compare((String) leftVal, (String) rightVal) > 0
-              );
-            }
-          },
-          () -> new LongOutLongsInFunctionVectorValueProcessor(
-              left.asVectorProcessor(inspector),
-              right.asVectorProcessor(inspector),
-              inspector.getMaxVectorSize()
-          )
-          {
-            @Override
-            public long apply(long left, long right)
-            {
-              return Evals.asLong(left > right);
-            }
-          },
-          () -> new DoubleOutLongDoubleInFunctionVectorValueProcessor(
-              left.asVectorProcessor(inspector),
-              right.asVectorProcessor(inspector),
-              inspector.getMaxVectorSize()
-          )
-          {
-            @Override
-            public double apply(long left, double right)
-            {
-              return Evals.asDouble(Double.compare(left, right) > 0);
-            }
-          },
-          () -> new DoubleOutDoubleLongInFunctionVectorValueProcessor(
-              left.asVectorProcessor(inspector),
-              right.asVectorProcessor(inspector),
-              inspector.getMaxVectorSize()
-          )
-          {
-            @Override
-            public double apply(double left, long right)
-            {
-              return Evals.asDouble(Double.compare(left, right) > 0);
-            }
-          },
-          () -> new DoubleOutDoublesInFunctionVectorValueProcessor(
-              left.asVectorProcessor(inspector),
-              right.asVectorProcessor(inspector),
-              inspector.getMaxVectorSize()
-          )
-          {
-            @Override
-            public double apply(double left, double right)
-            {
-              return Evals.asDouble(Double.compare(left, right) > 0);
-            }
-          }
-      );
-    }
     return makeBooleanProcessor(
         inspector,
         left,
@@ -715,77 +390,6 @@ public static <T> ExprVectorProcessor<T> lessThanOrEqual(
       Expr right
   )
   {
-    if (!ExpressionProcessing.useStrictBooleans()) {
-      return makeComparisonProcessor(
-          inspector,
-          left,
-          right,
-          () -> new LongOutObjectsInFunctionVectorProcessor(
-              left.asVectorProcessor(inspector),
-              right.asVectorProcessor(inspector),
-              inspector.getMaxVectorSize(),
-              ExpressionType.STRING
-          )
-          {
-            @Nullable
-            @Override
-            Long processValue(@Nullable Object leftVal, @Nullable Object rightVal)
-            {
-              return Evals.asLong(
-                  Comparators.<String>naturalNullsFirst().compare((String) leftVal, (String) rightVal) <= 0
-              );
-            }
-          },
-          () -> new LongOutLongsInFunctionVectorValueProcessor(
-              left.asVectorProcessor(inspector),
-              right.asVectorProcessor(inspector),
-              inspector.getMaxVectorSize()
-          )
-          {
-            @Override
-            public long apply(long left, long right)
-            {
-              return Evals.asLong(left <= right);
-            }
-          },
-          () -> new DoubleOutLongDoubleInFunctionVectorValueProcessor(
-              left.asVectorProcessor(inspector),
-              right.asVectorProcessor(inspector),
-              inspector.getMaxVectorSize()
-          )
-          {
-            @Override
-            public double apply(long left, double right)
-            {
-              return Evals.asDouble(Double.compare(left, right) <= 0);
-            }
-          },
-          () -> new DoubleOutDoubleLongInFunctionVectorValueProcessor(
-              left.asVectorProcessor(inspector),
-              right.asVectorProcessor(inspector),
-              inspector.getMaxVectorSize()
-          )
-          {
-            @Override
-            public double apply(double left, long right)
-            {
-              return Evals.asDouble(Double.compare(left, right) <= 0);
-            }
-          },
-          () -> new DoubleOutDoublesInFunctionVectorValueProcessor(
-              left.asVectorProcessor(inspector),
-              right.asVectorProcessor(inspector),
-              inspector.getMaxVectorSize()
-          )
-          {
-            @Override
-            public double apply(double left, double right)
-            {
-              return Evals.asDouble(Double.compare(left, right) <= 0);
-            }
-          }
-      );
-    }
     return makeBooleanProcessor(
         inspector,
         left,
@@ -863,77 +467,6 @@ public static <T> ExprVectorProcessor<T> lessThan(
       Expr right
   )
   {
-    if (!ExpressionProcessing.useStrictBooleans()) {
-      return makeComparisonProcessor(
-          inspector,
-          left,
-          right,
-          () -> new LongOutObjectsInFunctionVectorProcessor(
-              left.asVectorProcessor(inspector),
-              right.asVectorProcessor(inspector),
-              inspector.getMaxVectorSize(),
-              ExpressionType.STRING
-          )
-          {
-            @Nullable
-            @Override
-            Long processValue(@Nullable Object leftVal, @Nullable Object rightVal)
-            {
-              return Evals.asLong(
-                  Comparators.<String>naturalNullsFirst().compare((String) leftVal, (String) rightVal) < 0
-              );
-            }
-          },
-          () -> new LongOutLongsInFunctionVectorValueProcessor(
-              left.asVectorProcessor(inspector),
-              right.asVectorProcessor(inspector),
-              inspector.getMaxVectorSize()
-          )
-          {
-            @Override
-            public long apply(long left, long right)
-            {
-              return Evals.asLong(left < right);
-            }
-          },
-          () -> new DoubleOutLongDoubleInFunctionVectorValueProcessor(
-              left.asVectorProcessor(inspector),
-              right.asVectorProcessor(inspector),
-              inspector.getMaxVectorSize()
-          )
-          {
-            @Override
-            public double apply(long left, double right)
-            {
-              return Evals.asDouble(Double.compare(left, right) < 0);
-            }
-          },
-          () -> new DoubleOutDoubleLongInFunctionVectorValueProcessor(
-              left.asVectorProcessor(inspector),
-              right.asVectorProcessor(inspector),
-              inspector.getMaxVectorSize()
-          )
-          {
-            @Override
-            public double apply(double left, long right)
-            {
-              return Evals.asDouble(Double.compare(left, right) < 0);
-            }
-          },
-          () -> new DoubleOutDoublesInFunctionVectorValueProcessor(
-              left.asVectorProcessor(inspector),
-              right.asVectorProcessor(inspector),
-              inspector.getMaxVectorSize()
-          )
-          {
-            @Override
-            public double apply(double left, double right)
-            {
-              return Evals.asDouble(Double.compare(left, right) < 0);
-            }
-          }
-      );
-    }
     return makeBooleanProcessor(
         inspector,
         left,
diff --git a/processing/src/main/java/org/apache/druid/math/expr/vector/VectorProcessors.java b/processing/src/main/java/org/apache/druid/math/expr/vector/VectorProcessors.java
index d5d3933b860b..1f5727b83616 100644
--- a/processing/src/main/java/org/apache/druid/math/expr/vector/VectorProcessors.java
+++ b/processing/src/main/java/org/apache/druid/math/expr/vector/VectorProcessors.java
@@ -25,7 +25,6 @@
 import org.apache.druid.math.expr.Evals;
 import org.apache.druid.math.expr.Expr;
 import org.apache.druid.math.expr.ExprType;
-import org.apache.druid.math.expr.ExpressionProcessing;
 import org.apache.druid.math.expr.ExpressionType;
 import org.apache.druid.math.expr.Exprs;
 import org.apache.druid.segment.column.Types;
@@ -658,25 +657,14 @@ public long apply(long input)
         }
       };
     } else if (Types.is(inputType, ExprType.DOUBLE)) {
-      if (!ExpressionProcessing.useStrictBooleans()) {
-        processor = new DoubleOutDoubleInFunctionVectorValueProcessor(expr.asVectorProcessor(inspector), maxVectorSize)
-        {
-          @Override
-          public double apply(double input)
-          {
-            return Evals.asDouble(!Evals.asBoolean(input));
-          }
-        };
-      } else {
-        processor = new LongOutDoubleInFunctionVectorValueProcessor(expr.asVectorProcessor(inspector), maxVectorSize)
+      processor = new LongOutDoubleInFunctionVectorValueProcessor(expr.asVectorProcessor(inspector), maxVectorSize)
+      {
+        @Override
+        public long apply(double input)
         {
-          @Override
-          public long apply(double input)
-          {
-            return Evals.asLong(!Evals.asBoolean(input));
-          }
-        };
-      }
+          return Evals.asLong(!Evals.asBoolean(input));
+        }
+      };
     }
     if (processor == null) {
       throw Exprs.cannotVectorize();
diff --git a/processing/src/main/java/org/apache/druid/segment/filter/NotFilter.java b/processing/src/main/java/org/apache/druid/segment/filter/NotFilter.java
index 3e89148e2ccc..e44cf2b57e44 100644
--- a/processing/src/main/java/org/apache/druid/segment/filter/NotFilter.java
+++ b/processing/src/main/java/org/apache/druid/segment/filter/NotFilter.java
@@ -21,7 +21,6 @@
 
 import org.apache.druid.common.config.NullHandling;
 import org.apache.druid.java.util.common.StringUtils;
-import org.apache.druid.math.expr.ExpressionProcessing;
 import org.apache.druid.query.BitmapResultFactory;
 import org.apache.druid.query.filter.ColumnIndexSelector;
 import org.apache.druid.query.filter.Filter;
@@ -45,11 +44,10 @@
 /**
  * Nice filter you have there... NOT!
  *
- * If {@link ExpressionProcessing#useStrictBooleans()} and {@link NullHandling#sqlCompatible()} are both true, this
- * filter inverts the {@code includeUnknown} flag to properly map Druids native two-valued logic (true, false) to SQL
- * three-valued logic (true, false, unknown). At the top level, this flag is always passed in as 'false', and is only
- * flipped by this filter. Other logical filters ({@link AndFilter} and {@link OrFilter}) propagate the value of
- * {@code includeUnknown} to their children.
+ * If {@link NullHandling#sqlCompatible()} is true, this filter inverts the {@code includeUnknown} flag to properly
+ * map Druids native two-valued logic (true, false) to SQL three-valued logic (true, false, unknown). At the top level,
+ * this flag is always passed in as 'false', and is only flipped by this filter. Other logical filters
+ * ({@link AndFilter} and {@link OrFilter}) propagate the value of {@code includeUnknown} to their children.
  *
  * For example, if the base filter is equality, by default value matchers and indexes only return true for the rows
  * that are equal to the value. When wrapped in a not filter, the not filter indicates that the equality matchers and
diff --git a/processing/src/test/java/org/apache/druid/math/expr/EvalTest.java b/processing/src/test/java/org/apache/druid/math/expr/EvalTest.java
index 2f68840955fa..ae515d13abfc 100644
--- a/processing/src/test/java/org/apache/druid/math/expr/EvalTest.java
+++ b/processing/src/test/java/org/apache/druid/math/expr/EvalTest.java
@@ -41,7 +41,6 @@
 import java.util.Map;
 
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
 
 /**
  */
@@ -84,93 +83,50 @@ public void testDoubleEval()
     assertEquals(2.0, evalDouble("\"x\"", bindings), 0.0001);
     assertEquals(304.0, evalDouble("300 + \"x\" * 2", bindings), 0.0001);
 
-    try {
-      ExpressionProcessing.initializeForStrictBooleansTests(false);
-      Assert.assertFalse(evalDouble("1.0 && 0.0", bindings) > 0.0);
-      Assert.assertTrue(evalDouble("1.0 && 2.0", bindings) > 0.0);
-
-      Assert.assertTrue(evalDouble("1.0 || 0.0", bindings) > 0.0);
-      Assert.assertFalse(evalDouble("0.0 || 0.0", bindings) > 0.0);
-
-      Assert.assertTrue(evalDouble("2.0 > 1.0", bindings) > 0.0);
-      Assert.assertTrue(evalDouble("2.0 >= 2.0", bindings) > 0.0);
-      Assert.assertTrue(evalDouble("1.0 < 2.0", bindings) > 0.0);
-      Assert.assertTrue(evalDouble("2.0 <= 2.0", bindings) > 0.0);
-      Assert.assertTrue(evalDouble("2.0 == 2.0", bindings) > 0.0);
-      Assert.assertTrue(evalDouble("2.0 != 1.0", bindings) > 0.0);
-
-      Assert.assertEquals(1L, evalLong("notdistinctfrom(2.0, 2.0)", bindings));
-      Assert.assertEquals(1L, evalLong("isdistinctfrom(2.0, 1.0)", bindings));
-      Assert.assertEquals(0L, evalLong("notdistinctfrom(2.0, 1.0)", bindings));
-      Assert.assertEquals(0L, evalLong("isdistinctfrom(2.0, 2.0)", bindings));
-
-      Assert.assertEquals(0L, evalLong("istrue(0.0)", bindings));
-      Assert.assertEquals(1L, evalLong("isfalse(0.0)", bindings));
-      Assert.assertEquals(1L, evalLong("nottrue(0.0)", bindings));
-      Assert.assertEquals(0L, evalLong("notfalse(0.0)", bindings));
-
-      Assert.assertEquals(1L, evalLong("istrue(1.0)", bindings));
-      Assert.assertEquals(0L, evalLong("isfalse(1.0)", bindings));
-      Assert.assertEquals(0L, evalLong("nottrue(1.0)", bindings));
-      Assert.assertEquals(1L, evalLong("notfalse(1.0)", bindings));
-
-      Assert.assertTrue(evalDouble("!-1.0", bindings) > 0.0);
-      Assert.assertTrue(evalDouble("!0.0", bindings) > 0.0);
-      Assert.assertFalse(evalDouble("!2.0", bindings) > 0.0);
-    }
-    finally {
-      ExpressionProcessing.initializeForTests();
-    }
-    try {
-      ExpressionProcessing.initializeForStrictBooleansTests(true);
-      Assert.assertEquals(0L, evalLong("1.0 && 0.0", bindings));
-      Assert.assertEquals(1L, evalLong("1.0 && 2.0", bindings));
-
-      Assert.assertEquals(1L, evalLong("1.0 || 0.0", bindings));
-      Assert.assertEquals(0L, evalLong("0.0 || 0.0", bindings));
-
-      Assert.assertEquals(1L, evalLong("2.0 > 1.0", bindings));
-      Assert.assertEquals(1L, evalLong("2.0 >= 2.0", bindings));
-      Assert.assertEquals(1L, evalLong("1.0 < 2.0", bindings));
-      Assert.assertEquals(1L, evalLong("2.0 <= 2.0", bindings));
-      Assert.assertEquals(1L, evalLong("2.0 == 2.0", bindings));
-      Assert.assertEquals(1L, evalLong("2.0 != 1.0", bindings));
-
-      Assert.assertEquals(1L, evalLong("notdistinctfrom(2.0, 2.0)", bindings));
-      Assert.assertEquals(1L, evalLong("isdistinctfrom(2.0, 1.0)", bindings));
-      Assert.assertEquals(0L, evalLong("notdistinctfrom(2.0, 1.0)", bindings));
-      Assert.assertEquals(0L, evalLong("isdistinctfrom(2.0, 2.0)", bindings));
-
-      Assert.assertEquals(0L, evalLong("istrue(0.0)", bindings));
-      Assert.assertEquals(1L, evalLong("isfalse(0.0)", bindings));
-      Assert.assertEquals(1L, evalLong("nottrue(0.0)", bindings));
-      Assert.assertEquals(0L, evalLong("notfalse(0.0)", bindings));
-
-      Assert.assertEquals(1L, evalLong("istrue(1.0)", bindings));
-      Assert.assertEquals(0L, evalLong("isfalse(1.0)", bindings));
-      Assert.assertEquals(0L, evalLong("nottrue(1.0)", bindings));
-      Assert.assertEquals(1L, evalLong("notfalse(1.0)", bindings));
-
-      Assert.assertEquals(1L, evalLong("!-1.0", bindings));
-      Assert.assertEquals(1L, evalLong("!0.0", bindings));
-      Assert.assertEquals(0L, evalLong("!2.0", bindings));
-
-      assertEquals(3.5, evalDouble("2.0 + 1.5", bindings), 0.0001);
-      assertEquals(0.5, evalDouble("2.0 - 1.5", bindings), 0.0001);
-      assertEquals(3.0, evalDouble("2.0 * 1.5", bindings), 0.0001);
-      assertEquals(4.0, evalDouble("2.0 / 0.5", bindings), 0.0001);
-      assertEquals(0.2, evalDouble("2.0 % 0.3", bindings), 0.0001);
-      assertEquals(8.0, evalDouble("2.0 ^ 3.0", bindings), 0.0001);
-      assertEquals(-1.5, evalDouble("-1.5", bindings), 0.0001);
-
-
-      assertEquals(2.0, evalDouble("sqrt(4.0)", bindings), 0.0001);
-      assertEquals(2.0, evalDouble("if(1.0, 2.0, 3.0)", bindings), 0.0001);
-      assertEquals(3.0, evalDouble("if(0.0, 2.0, 3.0)", bindings), 0.0001);
-    }
-    finally {
-      ExpressionProcessing.initializeForTests();
-    }
+    Assert.assertEquals(0L, evalLong("1.0 && 0.0", bindings));
+    Assert.assertEquals(1L, evalLong("1.0 && 2.0", bindings));
+
+    Assert.assertEquals(1L, evalLong("1.0 || 0.0", bindings));
+    Assert.assertEquals(0L, evalLong("0.0 || 0.0", bindings));
+
+    Assert.assertEquals(1L, evalLong("2.0 > 1.0", bindings));
+    Assert.assertEquals(1L, evalLong("2.0 >= 2.0", bindings));
+    Assert.assertEquals(1L, evalLong("1.0 < 2.0", bindings));
+    Assert.assertEquals(1L, evalLong("2.0 <= 2.0", bindings));
+    Assert.assertEquals(1L, evalLong("2.0 == 2.0", bindings));
+    Assert.assertEquals(1L, evalLong("2.0 != 1.0", bindings));
+
+    Assert.assertEquals(1L, evalLong("notdistinctfrom(2.0, 2.0)", bindings));
+    Assert.assertEquals(1L, evalLong("isdistinctfrom(2.0, 1.0)", bindings));
+    Assert.assertEquals(0L, evalLong("notdistinctfrom(2.0, 1.0)", bindings));
+    Assert.assertEquals(0L, evalLong("isdistinctfrom(2.0, 2.0)", bindings));
+
+    Assert.assertEquals(0L, evalLong("istrue(0.0)", bindings));
+    Assert.assertEquals(1L, evalLong("isfalse(0.0)", bindings));
+    Assert.assertEquals(1L, evalLong("nottrue(0.0)", bindings));
+    Assert.assertEquals(0L, evalLong("notfalse(0.0)", bindings));
+
+    Assert.assertEquals(1L, evalLong("istrue(1.0)", bindings));
+    Assert.assertEquals(0L, evalLong("isfalse(1.0)", bindings));
+    Assert.assertEquals(0L, evalLong("nottrue(1.0)", bindings));
+    Assert.assertEquals(1L, evalLong("notfalse(1.0)", bindings));
+
+    Assert.assertEquals(1L, evalLong("!-1.0", bindings));
+    Assert.assertEquals(1L, evalLong("!0.0", bindings));
+    Assert.assertEquals(0L, evalLong("!2.0", bindings));
+
+    assertEquals(3.5, evalDouble("2.0 + 1.5", bindings), 0.0001);
+    assertEquals(0.5, evalDouble("2.0 - 1.5", bindings), 0.0001);
+    assertEquals(3.0, evalDouble("2.0 * 1.5", bindings), 0.0001);
+    assertEquals(4.0, evalDouble("2.0 / 0.5", bindings), 0.0001);
+    assertEquals(0.2, evalDouble("2.0 % 0.3", bindings), 0.0001);
+    assertEquals(8.0, evalDouble("2.0 ^ 3.0", bindings), 0.0001);
+    assertEquals(-1.5, evalDouble("-1.5", bindings), 0.0001);
+
+
+    assertEquals(2.0, evalDouble("sqrt(4.0)", bindings), 0.0001);
+    assertEquals(2.0, evalDouble("if(1.0, 2.0, 3.0)", bindings), 0.0001);
+    assertEquals(3.0, evalDouble("if(0.0, 2.0, 3.0)", bindings), 0.0001);
   }
 
   @Test
@@ -934,56 +890,29 @@ public void testBooleanReturn()
         ImmutableMap.of("x", 100L, "y", 100L, "z", 100D, "w", 100D)
     );
 
-    try {
-      ExpressionProcessing.initializeForStrictBooleansTests(false);
-      ExprEval eval = Parser.parse("x==z", ExprMacroTable.nil()).eval(bindings);
-      Assert.assertTrue(eval.asBoolean());
-      assertEquals(ExpressionType.DOUBLE, eval.type());
+    ExprEval eval = Parser.parse("x==y", ExprMacroTable.nil()).eval(bindings);
+    Assert.assertTrue(eval.asBoolean());
+    assertEquals(ExpressionType.LONG, eval.type());
 
-      eval = Parser.parse("x!=z", ExprMacroTable.nil()).eval(bindings);
-      Assert.assertFalse(eval.asBoolean());
-      assertEquals(ExpressionType.DOUBLE, eval.type());
+    eval = Parser.parse("x!=y", ExprMacroTable.nil()).eval(bindings);
+    Assert.assertFalse(eval.asBoolean());
+    assertEquals(ExpressionType.LONG, eval.type());
 
-      eval = Parser.parse("z==w", ExprMacroTable.nil()).eval(bindings);
-      Assert.assertTrue(eval.asBoolean());
-      assertEquals(ExpressionType.DOUBLE, eval.type());
+    eval = Parser.parse("x==z", ExprMacroTable.nil()).eval(bindings);
+    Assert.assertTrue(eval.asBoolean());
+    assertEquals(ExpressionType.LONG, eval.type());
 
-      eval = Parser.parse("z!=w", ExprMacroTable.nil()).eval(bindings);
-      Assert.assertFalse(eval.asBoolean());
-      assertEquals(ExpressionType.DOUBLE, eval.type());
-    }
-    finally {
-      ExpressionProcessing.initializeForTests();
-    }
-    try {
-      ExpressionProcessing.initializeForStrictBooleansTests(true);
-      ExprEval eval = Parser.parse("x==y", ExprMacroTable.nil()).eval(bindings);
-      Assert.assertTrue(eval.asBoolean());
-      assertEquals(ExpressionType.LONG, eval.type());
-
-      eval = Parser.parse("x!=y", ExprMacroTable.nil()).eval(bindings);
-      Assert.assertFalse(eval.asBoolean());
-      assertEquals(ExpressionType.LONG, eval.type());
-
-      eval = Parser.parse("x==z", ExprMacroTable.nil()).eval(bindings);
-      Assert.assertTrue(eval.asBoolean());
-      assertEquals(ExpressionType.LONG, eval.type());
-
-      eval = Parser.parse("x!=z", ExprMacroTable.nil()).eval(bindings);
-      Assert.assertFalse(eval.asBoolean());
-      assertEquals(ExpressionType.LONG, eval.type());
-
-      eval = Parser.parse("z==w", ExprMacroTable.nil()).eval(bindings);
-      Assert.assertTrue(eval.asBoolean());
-      assertEquals(ExpressionType.LONG, eval.type());
-
-      eval = Parser.parse("z!=w", ExprMacroTable.nil()).eval(bindings);
-      Assert.assertFalse(eval.asBoolean());
-      assertEquals(ExpressionType.LONG, eval.type());
-    }
-    finally {
-      ExpressionProcessing.initializeForTests();
-    }
+    eval = Parser.parse("x!=z", ExprMacroTable.nil()).eval(bindings);
+    Assert.assertFalse(eval.asBoolean());
+    assertEquals(ExpressionType.LONG, eval.type());
+
+    eval = Parser.parse("z==w", ExprMacroTable.nil()).eval(bindings);
+    Assert.assertTrue(eval.asBoolean());
+    assertEquals(ExpressionType.LONG, eval.type());
+
+    eval = Parser.parse("z!=w", ExprMacroTable.nil()).eval(bindings);
+    Assert.assertFalse(eval.asBoolean());
+    assertEquals(ExpressionType.LONG, eval.type());
   }
 
   @Test
@@ -991,142 +920,60 @@ public void testLogicalOperators()
   {
     Expr.ObjectBinding bindings = InputBindings.nilBindings();
 
-    try {
-      ExpressionProcessing.initializeForStrictBooleansTests(true);
-      assertEquals(1L, eval("'true' && 'true'", bindings).value());
-      assertEquals(0L, eval("'true' && 'false'", bindings).value());
-      assertEquals(0L, eval("'false' && 'true'", bindings).value());
-      assertEquals(0L, eval("'troo' && 'true'", bindings).value());
-      assertEquals(0L, eval("'false' && 'false'", bindings).value());
-
-      assertEquals(1L, eval("'true' || 'true'", bindings).value());
-      assertEquals(1L, eval("'true' || 'false'", bindings).value());
-      assertEquals(1L, eval("'false' || 'true'", bindings).value());
-      assertEquals(1L, eval("'troo' || 'true'", bindings).value());
-      assertEquals(0L, eval("'false' || 'false'", bindings).value());
-
-      assertEquals(1L, eval("1 && 1", bindings).value());
-      assertEquals(1L, eval("100 && 11", bindings).value());
-      assertEquals(0L, eval("1 && 0", bindings).value());
-      assertEquals(0L, eval("0 && 1", bindings).value());
-      assertEquals(0L, eval("0 && 0", bindings).value());
-
-      assertEquals(1L, eval("1 || 1", bindings).value());
-      assertEquals(1L, eval("100 || 11", bindings).value());
-      assertEquals(1L, eval("1 || 0", bindings).value());
-      assertEquals(1L, eval("0 || 1", bindings).value());
-      assertEquals(1L, eval("111 || 0", bindings).value());
-      assertEquals(1L, eval("0 || 111", bindings).value());
-      assertEquals(0L, eval("0 || 0", bindings).value());
-
-      assertEquals(1L, eval("1.0 && 1.0", bindings).value());
-      assertEquals(1L, eval("0.100 && 1.1", bindings).value());
-      assertEquals(0L, eval("1.0 && 0.0", bindings).value());
-      assertEquals(0L, eval("0.0 && 1.0", bindings).value());
-      assertEquals(0L, eval("0.0 && 0.0", bindings).value());
-
-      assertEquals(1L, eval("1.0 || 1.0", bindings).value());
-      assertEquals(1L, eval("0.2 || 0.3", bindings).value());
-      assertEquals(1L, eval("1.0 || 0.0", bindings).value());
-      assertEquals(1L, eval("0.0 || 1.0", bindings).value());
-      assertEquals(1L, eval("1.11 || 0.0", bindings).value());
-      assertEquals(1L, eval("0.0 || 0.111", bindings).value());
-      assertEquals(0L, eval("0.0 || 0.0", bindings).value());
-
-      assertEquals(1L, eval("null || 1", bindings).value());
-      assertEquals(1L, eval("1 || null", bindings).value());
-      // in sql incompatible mode, null is false, so we return 0
-      assertEquals(NullHandling.defaultLongValue(), eval("null || 0", bindings).valueOrDefault());
-      assertEquals(NullHandling.defaultLongValue(), eval("0 || null", bindings).valueOrDefault());
-      assertEquals(NullHandling.defaultLongValue(), eval("null || null", bindings).valueOrDefault());
-
-      // in sql incompatible mode, null is false, so we return 0
-      assertEquals(NullHandling.defaultLongValue(), eval("null && 1", bindings).valueOrDefault());
-      assertEquals(NullHandling.defaultLongValue(), eval("1 && null", bindings).valueOrDefault());
-      assertEquals(NullHandling.defaultLongValue(), eval("null && null", bindings).valueOrDefault());
-      // if either side is false, output is false in both modes
-      assertEquals(0L, eval("null && 0", bindings).value());
-      assertEquals(0L, eval("0 && null", bindings).value());
-    }
-    finally {
-      // reset
-      ExpressionProcessing.initializeForTests();
-    }
-
-    try {
-      // turn on legacy insanity mode
-      ExpressionProcessing.initializeForStrictBooleansTests(false);
-
-      assertEquals("true", eval("'true' && 'true'", bindings).value());
-      assertEquals("false", eval("'true' && 'false'", bindings).value());
-      assertEquals("false", eval("'false' && 'true'", bindings).value());
-      assertEquals("troo", eval("'troo' && 'true'", bindings).value());
-      assertEquals("false", eval("'false' && 'false'", bindings).value());
-
-      assertEquals("true", eval("'true' || 'true'", bindings).value());
-      assertEquals("true", eval("'true' || 'false'", bindings).value());
-      assertEquals("true", eval("'false' || 'true'", bindings).value());
-      assertEquals("true", eval("'troo' || 'true'", bindings).value());
-      assertEquals("false", eval("'false' || 'false'", bindings).value());
-
-      assertEquals(1.0, eval("1.0 && 1.0", bindings).value());
-      assertEquals(1.1, eval("0.100 && 1.1", bindings).value());
-      assertEquals(0.0, eval("1.0 && 0.0", bindings).value());
-      assertEquals(0.0, eval("0.0 && 1.0", bindings).value());
-      assertEquals(0.0, eval("0.0 && 0.0", bindings).value());
-
-      assertEquals(1.0, eval("1.0 || 1.0", bindings).value());
-      assertEquals(0.2, eval("0.2 || 0.3", bindings).value());
-      assertEquals(1.0, eval("1.0 || 0.0", bindings).value());
-      assertEquals(1.0, eval("0.0 || 1.0", bindings).value());
-      assertEquals(1.11, eval("1.11 || 0.0", bindings).value());
-      assertEquals(0.111, eval("0.0 || 0.111", bindings).value());
-      assertEquals(0.0, eval("0.0 || 0.0", bindings).value());
-
-      assertEquals(1L, eval("1 && 1", bindings).value());
-      assertEquals(11L, eval("100 && 11", bindings).value());
-      assertEquals(0L, eval("1 && 0", bindings).value());
-      assertEquals(0L, eval("0 && 1", bindings).value());
-      assertEquals(0L, eval("0 && 0", bindings).value());
-
-      assertEquals(1L, eval("1 || 1", bindings).value());
-      assertEquals(100L, eval("100 || 11", bindings).value());
-      assertEquals(1L, eval("1 || 0", bindings).value());
-      assertEquals(1L, eval("0 || 1", bindings).value());
-      assertEquals(111L, eval("111 || 0", bindings).value());
-      assertEquals(111L, eval("0 || 111", bindings).value());
-      assertEquals(0L, eval("0 || 0", bindings).value());
-
-      assertEquals(1.0, eval("1.0 && 1.0", bindings).value());
-      assertEquals(1.1, eval("0.100 && 1.1", bindings).value());
-      assertEquals(0.0, eval("1.0 && 0.0", bindings).value());
-      assertEquals(0.0, eval("0.0 && 1.0", bindings).value());
-      assertEquals(0.0, eval("0.0 && 0.0", bindings).value());
-
-      assertEquals(1.0, eval("1.0 || 1.0", bindings).value());
-      assertEquals(0.2, eval("0.2 || 0.3", bindings).value());
-      assertEquals(1.0, eval("1.0 || 0.0", bindings).value());
-      assertEquals(1.0, eval("0.0 || 1.0", bindings).value());
-      assertEquals(1.11, eval("1.11 || 0.0", bindings).value());
-      assertEquals(0.111, eval("0.0 || 0.111", bindings).value());
-      assertEquals(0.0, eval("0.0 || 0.0", bindings).value());
-
-      assertEquals(1L, eval("null || 1", bindings).value());
-      assertEquals(1L, eval("1 || null", bindings).value());
-      assertEquals(0L, eval("null || 0", bindings).value());
-      Assert.assertNull(eval("0 || null", bindings).value());
-      Assert.assertNull(eval("null || null", bindings).value());
-
-      Assert.assertNull(eval("null && 1", bindings).value());
-      Assert.assertNull(eval("1 && null", bindings).value());
-      Assert.assertNull(eval("null && 0", bindings).value());
-      assertEquals(0L, eval("0 && null", bindings).value());
-      assertNull(eval("null && null", bindings).value());
-    }
-    finally {
-      // reset
-      ExpressionProcessing.initializeForTests();
-    }
+    assertEquals(1L, eval("'true' && 'true'", bindings).value());
+    assertEquals(0L, eval("'true' && 'false'", bindings).value());
+    assertEquals(0L, eval("'false' && 'true'", bindings).value());
+    assertEquals(0L, eval("'troo' && 'true'", bindings).value());
+    assertEquals(0L, eval("'false' && 'false'", bindings).value());
+
+    assertEquals(1L, eval("'true' || 'true'", bindings).value());
+    assertEquals(1L, eval("'true' || 'false'", bindings).value());
+    assertEquals(1L, eval("'false' || 'true'", bindings).value());
+    assertEquals(1L, eval("'troo' || 'true'", bindings).value());
+    assertEquals(0L, eval("'false' || 'false'", bindings).value());
+
+    assertEquals(1L, eval("1 && 1", bindings).value());
+    assertEquals(1L, eval("100 && 11", bindings).value());
+    assertEquals(0L, eval("1 && 0", bindings).value());
+    assertEquals(0L, eval("0 && 1", bindings).value());
+    assertEquals(0L, eval("0 && 0", bindings).value());
+
+    assertEquals(1L, eval("1 || 1", bindings).value());
+    assertEquals(1L, eval("100 || 11", bindings).value());
+    assertEquals(1L, eval("1 || 0", bindings).value());
+    assertEquals(1L, eval("0 || 1", bindings).value());
+    assertEquals(1L, eval("111 || 0", bindings).value());
+    assertEquals(1L, eval("0 || 111", bindings).value());
+    assertEquals(0L, eval("0 || 0", bindings).value());
+
+    assertEquals(1L, eval("1.0 && 1.0", bindings).value());
+    assertEquals(1L, eval("0.100 && 1.1", bindings).value());
+    assertEquals(0L, eval("1.0 && 0.0", bindings).value());
+    assertEquals(0L, eval("0.0 && 1.0", bindings).value());
+    assertEquals(0L, eval("0.0 && 0.0", bindings).value());
+
+    assertEquals(1L, eval("1.0 || 1.0", bindings).value());
+    assertEquals(1L, eval("0.2 || 0.3", bindings).value());
+    assertEquals(1L, eval("1.0 || 0.0", bindings).value());
+    assertEquals(1L, eval("0.0 || 1.0", bindings).value());
+    assertEquals(1L, eval("1.11 || 0.0", bindings).value());
+    assertEquals(1L, eval("0.0 || 0.111", bindings).value());
+    assertEquals(0L, eval("0.0 || 0.0", bindings).value());
+
+    assertEquals(1L, eval("null || 1", bindings).value());
+    assertEquals(1L, eval("1 || null", bindings).value());
+    // in sql incompatible mode, null is false, so we return 0
+    assertEquals(NullHandling.defaultLongValue(), eval("null || 0", bindings).valueOrDefault());
+    assertEquals(NullHandling.defaultLongValue(), eval("0 || null", bindings).valueOrDefault());
+    assertEquals(NullHandling.defaultLongValue(), eval("null || null", bindings).valueOrDefault());
+
+    // in sql incompatible mode, null is false, so we return 0
+    assertEquals(NullHandling.defaultLongValue(), eval("null && 1", bindings).valueOrDefault());
+    assertEquals(NullHandling.defaultLongValue(), eval("1 && null", bindings).valueOrDefault());
+    assertEquals(NullHandling.defaultLongValue(), eval("null && null", bindings).valueOrDefault());
+    // if either side is false, output is false in both modes
+    assertEquals(0L, eval("null && 0", bindings).value());
+    assertEquals(0L, eval("0 && null", bindings).value());
   }
 
   @Test
@@ -1143,86 +990,40 @@ public void testBooleanInputs()
     bindingsMap.put("b2", false);
     Expr.ObjectBinding bindings = InputBindings.forMap(bindingsMap);
 
-    try {
-      ExpressionProcessing.initializeForStrictBooleansTests(true);
-      assertEquals(1L, eval("s1 && s1", bindings).value());
-      assertEquals(0L, eval("s1 && s2", bindings).value());
-      assertEquals(0L, eval("s2 && s1", bindings).value());
-      assertEquals(0L, eval("s2 && s2", bindings).value());
-
-      assertEquals(1L, eval("s1 || s1", bindings).value());
-      assertEquals(1L, eval("s1 || s2", bindings).value());
-      assertEquals(1L, eval("s2 || s1", bindings).value());
-      assertEquals(0L, eval("s2 || s2", bindings).value());
-
-      assertEquals(1L, eval("l1 && l1", bindings).value());
-      assertEquals(0L, eval("l1 && l2", bindings).value());
-      assertEquals(0L, eval("l2 && l1", bindings).value());
-      assertEquals(0L, eval("l2 && l2", bindings).value());
-
-      assertEquals(1L, eval("b1 && b1", bindings).value());
-      assertEquals(0L, eval("b1 && b2", bindings).value());
-      assertEquals(0L, eval("b2 && b1", bindings).value());
-      assertEquals(0L, eval("b2 && b2", bindings).value());
-
-      assertEquals(1L, eval("d1 && d1", bindings).value());
-      assertEquals(0L, eval("d1 && d2", bindings).value());
-      assertEquals(0L, eval("d2 && d1", bindings).value());
-      assertEquals(0L, eval("d2 && d2", bindings).value());
-
-      assertEquals(1L, eval("b1", bindings).value());
-      assertEquals(1L, eval("if(b1,1,0)", bindings).value());
-      assertEquals(1L, eval("if(l1,1,0)", bindings).value());
-      assertEquals(1L, eval("if(d1,1,0)", bindings).value());
-      assertEquals(1L, eval("if(s1,1,0)", bindings).value());
-      assertEquals(0L, eval("if(b2,1,0)", bindings).value());
-      assertEquals(0L, eval("if(l2,1,0)", bindings).value());
-      assertEquals(0L, eval("if(d2,1,0)", bindings).value());
-      assertEquals(0L, eval("if(s2,1,0)", bindings).value());
-    }
-    finally {
-      // reset
-      ExpressionProcessing.initializeForTests();
-    }
-
-    try {
-      // turn on legacy insanity mode
-      ExpressionProcessing.initializeForStrictBooleansTests(false);
-
-      assertEquals("true", eval("s1 && s1", bindings).value());
-      assertEquals("false", eval("s1 && s2", bindings).value());
-      assertEquals("false", eval("s2 && s1", bindings).value());
-      assertEquals("false", eval("s2 && s2", bindings).value());
-
-      assertEquals("true", eval("b1 && b1", bindings).value());
-      assertEquals("false", eval("b1 && b2", bindings).value());
-      assertEquals("false", eval("b2 && b1", bindings).value());
-      assertEquals("false", eval("b2 && b2", bindings).value());
-
-      assertEquals(100L, eval("l1 && l1", bindings).value());
-      assertEquals(0L, eval("l1 && l2", bindings).value());
-      assertEquals(0L, eval("l2 && l1", bindings).value());
-      assertEquals(0L, eval("l2 && l2", bindings).value());
-
-      assertEquals(1.1, eval("d1 && d1", bindings).value());
-      assertEquals(0.0, eval("d1 && d2", bindings).value());
-      assertEquals(0.0, eval("d2 && d1", bindings).value());
-      assertEquals(0.0, eval("d2 && d2", bindings).value());
-
-      assertEquals("true", eval("b1", bindings).value());
-      assertEquals(1L, eval("if(b1,1,0)", bindings).value());
-      assertEquals(1L, eval("if(l1,1,0)", bindings).value());
-      assertEquals(1L, eval("if(d1,1,0)", bindings).value());
-      assertEquals(1L, eval("if(s1,1,0)", bindings).value());
-      assertEquals(0L, eval("if(b2,1,0)", bindings).value());
-      assertEquals(0L, eval("if(l2,1,0)", bindings).value());
-      assertEquals(0L, eval("if(d2,1,0)", bindings).value());
-      assertEquals(0L, eval("if(s2,1,0)", bindings).value());
-    }
-    finally {
-      // reset
-      ExpressionProcessing.initializeForTests();
-    }
+    assertEquals(1L, eval("s1 && s1", bindings).value());
+    assertEquals(0L, eval("s1 && s2", bindings).value());
+    assertEquals(0L, eval("s2 && s1", bindings).value());
+    assertEquals(0L, eval("s2 && s2", bindings).value());
+
+    assertEquals(1L, eval("s1 || s1", bindings).value());
+    assertEquals(1L, eval("s1 || s2", bindings).value());
+    assertEquals(1L, eval("s2 || s1", bindings).value());
+    assertEquals(0L, eval("s2 || s2", bindings).value());
+
+    assertEquals(1L, eval("l1 && l1", bindings).value());
+    assertEquals(0L, eval("l1 && l2", bindings).value());
+    assertEquals(0L, eval("l2 && l1", bindings).value());
+    assertEquals(0L, eval("l2 && l2", bindings).value());
+
+    assertEquals(1L, eval("b1 && b1", bindings).value());
+    assertEquals(0L, eval("b1 && b2", bindings).value());
+    assertEquals(0L, eval("b2 && b1", bindings).value());
+    assertEquals(0L, eval("b2 && b2", bindings).value());
+
+    assertEquals(1L, eval("d1 && d1", bindings).value());
+    assertEquals(0L, eval("d1 && d2", bindings).value());
+    assertEquals(0L, eval("d2 && d1", bindings).value());
+    assertEquals(0L, eval("d2 && d2", bindings).value());
+
+    assertEquals(1L, eval("b1", bindings).value());
+    assertEquals(1L, eval("if(b1,1,0)", bindings).value());
+    assertEquals(1L, eval("if(l1,1,0)", bindings).value());
+    assertEquals(1L, eval("if(d1,1,0)", bindings).value());
+    assertEquals(1L, eval("if(s1,1,0)", bindings).value());
+    assertEquals(0L, eval("if(b2,1,0)", bindings).value());
+    assertEquals(0L, eval("if(l2,1,0)", bindings).value());
+    assertEquals(0L, eval("if(d2,1,0)", bindings).value());
+    assertEquals(0L, eval("if(s2,1,0)", bindings).value());
   }
 
   @Test
@@ -1621,17 +1422,6 @@ public void testBestEffortOf()
     assertBestEffortOf(true, ExpressionType.LONG, 1L);
     assertBestEffortOf(Arrays.asList(true, false), ExpressionType.LONG_ARRAY, new Object[]{1L, 0L});
 
-    try {
-      // in non-strict boolean mode, they are strings
-      ExpressionProcessing.initializeForStrictBooleansTests(false);
-      assertBestEffortOf(true, ExpressionType.STRING, "true");
-      assertBestEffortOf(Arrays.asList(true, false), ExpressionType.STRING_ARRAY, new Object[]{"true", "false"});
-    }
-    finally {
-      // reset
-      ExpressionProcessing.initializeForTests();
-    }
-
     // doubles
     assertBestEffortOf(1.0, ExpressionType.DOUBLE, 1.0);
     assertBestEffortOf(1.0f, ExpressionType.DOUBLE, 1.0);
diff --git a/processing/src/test/java/org/apache/druid/math/expr/OutputTypeTest.java b/processing/src/test/java/org/apache/druid/math/expr/OutputTypeTest.java
index 4ab7c7be0ed3..088df4c9ef58 100644
--- a/processing/src/test/java/org/apache/druid/math/expr/OutputTypeTest.java
+++ b/processing/src/test/java/org/apache/druid/math/expr/OutputTypeTest.java
@@ -70,29 +70,12 @@ public void testUnaryOperators()
     assertOutputType("-y", inspector, ExpressionType.LONG);
     assertOutputType("-z", inspector, ExpressionType.DOUBLE);
 
-    try {
-      ExpressionProcessing.initializeForStrictBooleansTests(true);
-      assertOutputType("!'true'", inspector, ExpressionType.LONG);
-      assertOutputType("!1", inspector, ExpressionType.LONG);
-      assertOutputType("!x", inspector, ExpressionType.LONG);
-      assertOutputType("!y", inspector, ExpressionType.LONG);
-      assertOutputType("!1.1", inspector, ExpressionType.LONG);
-      assertOutputType("!z", inspector, ExpressionType.LONG);
-    }
-    finally {
-      // reset
-      ExpressionProcessing.initializeForTests();
-    }
-
-    try {
-      ExpressionProcessing.initializeForStrictBooleansTests(false);
-      assertOutputType("!1.1", inspector, ExpressionType.DOUBLE);
-      assertOutputType("!z", inspector, ExpressionType.DOUBLE);
-    }
-    finally {
-      // reset
-      ExpressionProcessing.initializeForTests();
-    }
+    assertOutputType("!'true'", inspector, ExpressionType.LONG);
+    assertOutputType("!1", inspector, ExpressionType.LONG);
+    assertOutputType("!x", inspector, ExpressionType.LONG);
+    assertOutputType("!y", inspector, ExpressionType.LONG);
+    assertOutputType("!1.1", inspector, ExpressionType.LONG);
+    assertOutputType("!z", inspector, ExpressionType.LONG);
   }
 
   @Test
@@ -126,61 +109,32 @@ public void testBinaryMathOperators()
     assertOutputType("z^z_", inspector, ExpressionType.DOUBLE);
     assertOutputType("z%z_", inspector, ExpressionType.DOUBLE);
 
-    try {
-      ExpressionProcessing.initializeForStrictBooleansTests(true);
-      assertOutputType("y>y_", inspector, ExpressionType.LONG);
-      assertOutputType("y_<y", inspector, ExpressionType.LONG);
-      assertOutputType("y_<=y", inspector, ExpressionType.LONG);
-      assertOutputType("y_>=y", inspector, ExpressionType.LONG);
-      assertOutputType("y_==y", inspector, ExpressionType.LONG);
-      assertOutputType("y_!=y", inspector, ExpressionType.LONG);
-      assertOutputType("y_ && y", inspector, ExpressionType.LONG);
-      assertOutputType("y_ || y", inspector, ExpressionType.LONG);
-
-      assertOutputType("z>y_", inspector, ExpressionType.LONG);
-      assertOutputType("z<y", inspector, ExpressionType.LONG);
-      assertOutputType("z<=y", inspector, ExpressionType.LONG);
-      assertOutputType("y>=z", inspector, ExpressionType.LONG);
-      assertOutputType("z==y", inspector, ExpressionType.LONG);
-      assertOutputType("z!=y", inspector, ExpressionType.LONG);
-      assertOutputType("z && y", inspector, ExpressionType.LONG);
-      assertOutputType("y || z", inspector, ExpressionType.LONG);
-
-      assertOutputType("z>z_", inspector, ExpressionType.LONG);
-      assertOutputType("z<z_", inspector, ExpressionType.LONG);
-      assertOutputType("z<=z_", inspector, ExpressionType.LONG);
-      assertOutputType("z_>=z", inspector, ExpressionType.LONG);
-      assertOutputType("z==z_", inspector, ExpressionType.LONG);
-      assertOutputType("z!=z_", inspector, ExpressionType.LONG);
-      assertOutputType("z && z_", inspector, ExpressionType.LONG);
-      assertOutputType("z_ || z", inspector, ExpressionType.LONG);
-    }
-    finally {
-      ExpressionProcessing.initializeForTests();
-    }
-    try {
-      ExpressionProcessing.initializeForStrictBooleansTests(false);
-      assertOutputType("z>y_", inspector, ExpressionType.DOUBLE);
-      assertOutputType("z<y", inspector, ExpressionType.DOUBLE);
-      assertOutputType("z<=y", inspector, ExpressionType.DOUBLE);
-      assertOutputType("y>=z", inspector, ExpressionType.DOUBLE);
-      assertOutputType("z==y", inspector, ExpressionType.DOUBLE);
-      assertOutputType("z!=y", inspector, ExpressionType.DOUBLE);
-      assertOutputType("z && y", inspector, ExpressionType.DOUBLE);
-      assertOutputType("y || z", inspector, ExpressionType.DOUBLE);
-
-      assertOutputType("z>z_", inspector, ExpressionType.DOUBLE);
-      assertOutputType("z<z_", inspector, ExpressionType.DOUBLE);
-      assertOutputType("z<=z_", inspector, ExpressionType.DOUBLE);
-      assertOutputType("z_>=z", inspector, ExpressionType.DOUBLE);
-      assertOutputType("z==z_", inspector, ExpressionType.DOUBLE);
-      assertOutputType("z!=z_", inspector, ExpressionType.DOUBLE);
-      assertOutputType("z && z_", inspector, ExpressionType.DOUBLE);
-      assertOutputType("z_ || z", inspector, ExpressionType.DOUBLE);
-    }
-    finally {
-      ExpressionProcessing.initializeForTests();
-    }
+    assertOutputType("y>y_", inspector, ExpressionType.LONG);
+    assertOutputType("y_<y", inspector, ExpressionType.LONG);
+    assertOutputType("y_<=y", inspector, ExpressionType.LONG);
+    assertOutputType("y_>=y", inspector, ExpressionType.LONG);
+    assertOutputType("y_==y", inspector, ExpressionType.LONG);
+    assertOutputType("y_!=y", inspector, ExpressionType.LONG);
+    assertOutputType("y_ && y", inspector, ExpressionType.LONG);
+    assertOutputType("y_ || y", inspector, ExpressionType.LONG);
+
+    assertOutputType("z>y_", inspector, ExpressionType.LONG);
+    assertOutputType("z<y", inspector, ExpressionType.LONG);
+    assertOutputType("z<=y", inspector, ExpressionType.LONG);
+    assertOutputType("y>=z", inspector, ExpressionType.LONG);
+    assertOutputType("z==y", inspector, ExpressionType.LONG);
+    assertOutputType("z!=y", inspector, ExpressionType.LONG);
+    assertOutputType("z && y", inspector, ExpressionType.LONG);
+    assertOutputType("y || z", inspector, ExpressionType.LONG);
+
+    assertOutputType("z>z_", inspector, ExpressionType.LONG);
+    assertOutputType("z<z_", inspector, ExpressionType.LONG);
+    assertOutputType("z<=z_", inspector, ExpressionType.LONG);
+    assertOutputType("z_>=z", inspector, ExpressionType.LONG);
+    assertOutputType("z==z_", inspector, ExpressionType.LONG);
+    assertOutputType("z!=z_", inspector, ExpressionType.LONG);
+    assertOutputType("z && z_", inspector, ExpressionType.LONG);
+    assertOutputType("z_ || z", inspector, ExpressionType.LONG);
     assertOutputType("1*(2 + 3.0)", inspector, ExpressionType.DOUBLE);
   }
 
diff --git a/processing/src/test/java/org/apache/druid/query/scan/NestedDataScanQueryTest.java b/processing/src/test/java/org/apache/druid/query/scan/NestedDataScanQueryTest.java
index b2c3d37d5892..ba1c1c5b9486 100644
--- a/processing/src/test/java/org/apache/druid/query/scan/NestedDataScanQueryTest.java
+++ b/processing/src/test/java/org/apache/druid/query/scan/NestedDataScanQueryTest.java
@@ -30,7 +30,6 @@
 import org.apache.druid.java.util.common.guava.Sequence;
 import org.apache.druid.java.util.common.io.Closer;
 import org.apache.druid.java.util.common.logger.Logger;
-import org.apache.druid.math.expr.ExpressionProcessing;
 import org.apache.druid.query.Druids;
 import org.apache.druid.query.NestedDataTestUtils;
 import org.apache.druid.query.Query;
@@ -668,76 +667,6 @@ public void testIngestAndScanSegmentsRealtimeSchemaDiscoveryArrayTypes() throws
     Assert.assertEquals(resultsSegments.get(0).getEvents().toString(), resultsRealtime.get(0).getEvents().toString());
   }
 
-  @Test
-  public void testIngestAndScanSegmentsRealtimeSchemaDiscoveryMoreArrayTypesNonStrictBooleans() throws Exception
-  {
-
-    try {
-      ExpressionProcessing.initializeForStrictBooleansTests(false);
-      Druids.ScanQueryBuilder builder = Druids.newScanQueryBuilder()
-                                              .dataSource("test_datasource")
-                                              .intervals(
-                                                  new MultipleIntervalSegmentSpec(
-                                                      Collections.singletonList(Intervals.ETERNITY)
-                                                  )
-                                              )
-                                              .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
-                                              .limit(100)
-                                              .context(ImmutableMap.of());
-      Query<ScanResultValue> scanQuery = builder.build();
-      final AggregatorFactory[] aggs = new AggregatorFactory[]{new CountAggregatorFactory("count")};
-      List<Segment> realtimeSegs = ImmutableList.of(
-          NestedDataTestUtils.createIncrementalIndex(
-              tempFolder,
-              NestedDataTestUtils.ARRAY_TYPES_DATA_FILE_2,
-              TestIndex.DEFAULT_JSON_INPUT_FORMAT,
-              NestedDataTestUtils.TIMESTAMP_SPEC,
-              NestedDataTestUtils.AUTO_DISCOVERY,
-              TransformSpec.NONE,
-              aggs,
-              Granularities.NONE,
-              true
-          )
-      );
-      List<Segment> segs = NestedDataTestUtils.createSegments(
-          tempFolder,
-          closer,
-          NestedDataTestUtils.ARRAY_TYPES_DATA_FILE_2,
-          TestIndex.DEFAULT_JSON_INPUT_FORMAT,
-          NestedDataTestUtils.TIMESTAMP_SPEC,
-          NestedDataTestUtils.AUTO_DISCOVERY,
-          TransformSpec.NONE,
-          aggs,
-          Granularities.NONE,
-          true,
-          IndexSpec.DEFAULT
-      );
-
-
-      final Sequence<ScanResultValue> seq = helper.runQueryOnSegmentsObjs(realtimeSegs, scanQuery);
-      final Sequence<ScanResultValue> seq2 = helper.runQueryOnSegmentsObjs(segs, scanQuery);
-
-      List<ScanResultValue> resultsRealtime = seq.toList();
-      List<ScanResultValue> resultsSegments = seq2.toList();
-      logResults(resultsSegments);
-      logResults(resultsRealtime);
-      Assert.assertEquals(1, resultsRealtime.size());
-      Assert.assertEquals(resultsRealtime.size(), resultsSegments.size());
-      Assert.assertEquals(
-          "["
-          + "[978652800000, [A, A], [null, null], [1, 1], [0.1, 0.1], [true, true], [null, null], {s_str1=[A, A], s_str2=[null, null], s_num_int=[1, 1], s_num_float=[0.1, 0.1], s_bool=[true, true], s_null=[null, null]}, 1], "
-          + "[978739200000, [A, A], [null, null], [1, 1], [0.1, 0.1], [true, true], [null, null], {s_str1=[A, A], s_str2=[null, null], s_num_int=[1, 1], s_num_float=[0.1, 0.1], s_bool=[true, true], s_null=[null, null]}, 1], "
-          + "[978825600000, [A, A], [null, null], [1, 1], [0.1, 0.1], [true, true], [null, null], {s_str1=[A, A], s_str2=[null, null], s_num_int=[1, 1], s_num_float=[0.1, 0.1], s_bool=[true, true], s_null=[null, null]}, 1], "
-          + "[978912000000, [A, A], [null, null], [1, 1], [0.1, 0.1], [true, true], [null, null], {s_str1=[A, A], s_str2=[null, null], s_num_int=[1, 1], s_num_float=[0.1, 0.1], s_bool=[true, true], s_null=[null, null]}, 1]]",
-          resultsSegments.get(0).getEvents().toString()
-      );
-      Assert.assertEquals(resultsSegments.get(0).getEvents().toString(), resultsRealtime.get(0).getEvents().toString());
-    }
-    finally {
-      ExpressionProcessing.initializeForTests();
-    }
-  }
-
   @Test
   public void testIngestAndScanSegmentsRealtimeSchemaDiscoveryMoreArrayTypesStrictBooleans() throws Exception
   {
diff --git a/processing/src/test/java/org/apache/druid/segment/filter/ExpressionFilterNonStrictBooleansTest.java b/processing/src/test/java/org/apache/druid/segment/filter/ExpressionFilterNonStrictBooleansTest.java
deleted file mode 100644
index 8b60360b6c16..000000000000
--- a/processing/src/test/java/org/apache/druid/segment/filter/ExpressionFilterNonStrictBooleansTest.java
+++ /dev/null
@@ -1,143 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.druid.segment.filter;
-
-import com.google.common.base.Function;
-import com.google.common.collect.ImmutableList;
-import org.apache.druid.common.config.NullHandling;
-import org.apache.druid.java.util.common.Pair;
-import org.apache.druid.math.expr.ExpressionProcessing;
-import org.apache.druid.query.filter.NotDimFilter;
-import org.apache.druid.segment.CursorFactory;
-import org.apache.druid.segment.IndexBuilder;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
-import java.io.Closeable;
-
-@RunWith(Parameterized.class)
-public class ExpressionFilterNonStrictBooleansTest extends ExpressionFilterTest
-{
-  public ExpressionFilterNonStrictBooleansTest(
-      String testName,
-      IndexBuilder indexBuilder,
-      Function<IndexBuilder, Pair<CursorFactory, Closeable>> finisher,
-      boolean cnf,
-      boolean optimize
-  )
-  {
-    super(testName, indexBuilder, finisher, cnf, optimize);
-  }
-
-  @Before
-  @Override
-  public void setup()
-  {
-    ExpressionProcessing.initializeForStrictBooleansTests(false);
-  }
-
-  @Override
-  @Test
-  public void testComplement()
-  {
-    if (NullHandling.sqlCompatible()) {
-      assertFilterMatches(edf("dim5 == 'a'"), ImmutableList.of("0"));
-      // non-strict mode is wild
-      assertFilterMatches(
-          NotDimFilter.of(edf("dim5 == 'a'")),
-          ImmutableList.of("1", "2", "3", "4", "5", "6", "7", "8", "9")
-      );
-      assertFilterMatches(
-          edf("dim5 == ''"), ImmutableList.of("4")
-      );
-      // non-strict mode!
-      assertFilterMatches(
-          NotDimFilter.of(edf("dim5 == ''")), ImmutableList.of("0", "1", "2", "3", "5", "6", "7", "8", "9")
-      );
-    } else {
-      assertFilterMatches(edf("dim5 == 'a'"), ImmutableList.of("0"));
-      assertFilterMatches(
-          NotDimFilter.of(edf("dim5 == 'a'")),
-          ImmutableList.of("1", "2", "3", "4", "5", "6", "7", "8", "9")
-      );
-    }
-  }
-
-  @Override
-  @Test
-  public void testMissingColumn()
-  {
-    if (NullHandling.replaceWithDefault()) {
-      assertFilterMatches(
-          edf("missing == ''"),
-          ImmutableList.of("0", "1", "2", "3", "4", "5", "6", "7", "8", "9")
-      );
-      assertFilterMatches(
-          edf("missing == otherMissing"),
-          ImmutableList.of("0", "1", "2", "3", "4", "5", "6", "7", "8", "9")
-      );
-    } else {
-      // AS per SQL standard null == null returns false.
-      assertFilterMatches(edf("missing == null"), ImmutableList.of());
-      // in non-strict mode, madness happens
-      assertFilterMatches(
-          NotDimFilter.of(edf("missing == null")),
-          ImmutableList.of("0", "1", "2", "3", "4", "5", "6", "7", "8", "9")
-      );
-      // also this madness doesn't do madness
-      assertFilterMatches(
-          edf("missing == otherMissing"),
-          ImmutableList.of()
-      );
-      assertFilterMatches(
-          NotDimFilter.of(edf("missing == otherMissing")),
-          ImmutableList.of("0", "1", "2", "3", "4", "5", "6", "7", "8", "9")
-      );
-    }
-    assertFilterMatches(edf("missing == '1'"), ImmutableList.of());
-    assertFilterMatches(edf("missing == 2"), ImmutableList.of());
-    if (NullHandling.replaceWithDefault()) {
-      // missing equivaluent to 0
-      assertFilterMatches(
-          edf("missing < '2'"),
-          ImmutableList.of("0", "1", "2", "3", "4", "5", "6", "7", "8", "9")
-      );
-      assertFilterMatches(
-          edf("missing < 2"),
-          ImmutableList.of("0", "1", "2", "3", "4", "5", "6", "7", "8", "9")
-      );
-      assertFilterMatches(
-          edf("missing < 2.0"),
-          ImmutableList.of("0", "1", "2", "3", "4", "5", "6", "7", "8", "9")
-      );
-    } else {
-      // missing equivalent to null
-      assertFilterMatches(edf("missing < '2'"), ImmutableList.of());
-      assertFilterMatches(edf("missing < 2"), ImmutableList.of());
-      assertFilterMatches(edf("missing < 2.0"), ImmutableList.of());
-    }
-    assertFilterMatches(edf("missing > '2'"), ImmutableList.of());
-    assertFilterMatches(edf("missing > 2"), ImmutableList.of());
-    assertFilterMatches(edf("missing > 2.0"), ImmutableList.of());
-    assertFilterMatchesSkipVectorize(edf("like(missing, '1%')"), ImmutableList.of());
-  }
-}
diff --git a/processing/src/test/java/org/apache/druid/segment/filter/ExpressionFilterTest.java b/processing/src/test/java/org/apache/druid/segment/filter/ExpressionFilterTest.java
index aa2d21ef9d33..9311a90b4e47 100644
--- a/processing/src/test/java/org/apache/druid/segment/filter/ExpressionFilterTest.java
+++ b/processing/src/test/java/org/apache/druid/segment/filter/ExpressionFilterTest.java
@@ -36,7 +36,6 @@
 import org.apache.druid.data.input.impl.TimestampSpec;
 import org.apache.druid.java.util.common.DateTimes;
 import org.apache.druid.java.util.common.Pair;
-import org.apache.druid.math.expr.ExpressionProcessing;
 import org.apache.druid.query.expression.TestExprMacroTable;
 import org.apache.druid.query.filter.ExpressionDimFilter;
 import org.apache.druid.query.filter.Filter;
@@ -46,10 +45,8 @@
 import org.apache.druid.segment.column.ColumnType;
 import org.apache.druid.segment.column.RowSignature;
 import org.apache.druid.segment.incremental.IncrementalIndexSchema;
-import org.junit.After;
 import org.junit.AfterClass;
 import org.junit.Assert;
-import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
@@ -126,22 +123,10 @@ public ExpressionFilterTest(
     );
   }
 
-  @Before
-  public void setup()
-  {
-    ExpressionProcessing.initializeForStrictBooleansTests(true);
-  }
-
-  @After
-  public void teardown()
-  {
-    ExpressionProcessing.initializeForTests();
-  }
-
   @AfterClass
   public static void tearDown() throws Exception
   {
-    BaseFilterTest.tearDown(ColumnComparisonFilterTest.class.getName());
+    BaseFilterTest.tearDown(ExpressionFilterTest.class.getName());
   }
 
   @Test
diff --git a/processing/src/test/java/org/apache/druid/segment/transform/TransformSpecTest.java b/processing/src/test/java/org/apache/druid/segment/transform/TransformSpecTest.java
index 3ed0a51bf039..90413b6ab023 100644
--- a/processing/src/test/java/org/apache/druid/segment/transform/TransformSpecTest.java
+++ b/processing/src/test/java/org/apache/druid/segment/transform/TransformSpecTest.java
@@ -30,7 +30,6 @@
 import org.apache.druid.data.input.impl.TimeAndDimsParseSpec;
 import org.apache.druid.data.input.impl.TimestampSpec;
 import org.apache.druid.java.util.common.DateTimes;
-import org.apache.druid.math.expr.ExpressionProcessing;
 import org.apache.druid.query.expression.TestExprMacroTable;
 import org.apache.druid.query.filter.AndDimFilter;
 import org.apache.druid.query.filter.SelectorDimFilter;
@@ -208,68 +207,31 @@ public void testTransformTimeFromTime()
   @Test
   public void testBoolTransforms()
   {
-    try {
-      ExpressionProcessing.initializeForStrictBooleansTests(true);
-      final TransformSpec transformSpec = new TransformSpec(
-          null,
-          ImmutableList.of(
-              new ExpressionTransform("truthy1", "bool", TestExprMacroTable.INSTANCE),
-              new ExpressionTransform("truthy2", "if(bool,1,0)", TestExprMacroTable.INSTANCE)
-          )
-      );
-
-      Assert.assertEquals(
-          ImmutableSet.of("bool"),
-          transformSpec.getRequiredColumns()
-      );
-
-      final InputRowParser<Map<String, Object>> parser = transformSpec.decorate(PARSER);
-      final InputRow row = parser.parseBatch(ROW1).get(0);
-
-      Assert.assertNotNull(row);
-      Assert.assertEquals(1L, row.getRaw("truthy1"));
-      Assert.assertEquals(1L, row.getRaw("truthy2"));
-
-      final InputRow row2 = parser.parseBatch(ROW2).get(0);
-
-      Assert.assertNotNull(row2);
-      Assert.assertEquals(0L, row2.getRaw("truthy1"));
-      Assert.assertEquals(0L, row2.getRaw("truthy2"));
-    }
-    finally {
-      ExpressionProcessing.initializeForTests();
-    }
-    try {
-      ExpressionProcessing.initializeForStrictBooleansTests(false);
-      final TransformSpec transformSpec = new TransformSpec(
-          null,
-          ImmutableList.of(
-              new ExpressionTransform("truthy1", "bool", TestExprMacroTable.INSTANCE),
-              new ExpressionTransform("truthy2", "if(bool,1,0)", TestExprMacroTable.INSTANCE)
-              )
-      );
-
-      Assert.assertEquals(
-          ImmutableSet.of("bool"),
-          transformSpec.getRequiredColumns()
-      );
-
-      final InputRowParser<Map<String, Object>> parser = transformSpec.decorate(PARSER);
-      final InputRow row = parser.parseBatch(ROW1).get(0);
-
-      Assert.assertNotNull(row);
-      Assert.assertEquals("true", row.getRaw("truthy1"));
-      Assert.assertEquals(1L, row.getRaw("truthy2"));
-
-      final InputRow row2 = parser.parseBatch(ROW2).get(0);
-
-      Assert.assertNotNull(row2);
-      Assert.assertEquals("false", row2.getRaw("truthy1"));
-      Assert.assertEquals(0L, row2.getRaw("truthy2"));
-    }
-    finally {
-      ExpressionProcessing.initializeForTests();
-    }
+    final TransformSpec transformSpec = new TransformSpec(
+        null,
+        ImmutableList.of(
+            new ExpressionTransform("truthy1", "bool", TestExprMacroTable.INSTANCE),
+            new ExpressionTransform("truthy2", "if(bool,1,0)", TestExprMacroTable.INSTANCE)
+        )
+    );
+
+    Assert.assertEquals(
+        ImmutableSet.of("bool"),
+        transformSpec.getRequiredColumns()
+    );
+
+    final InputRowParser<Map<String, Object>> parser = transformSpec.decorate(PARSER);
+    final InputRow row = parser.parseBatch(ROW1).get(0);
+
+    Assert.assertNotNull(row);
+    Assert.assertEquals(1L, row.getRaw("truthy1"));
+    Assert.assertEquals(1L, row.getRaw("truthy2"));
+
+    final InputRow row2 = parser.parseBatch(ROW2).get(0);
+
+    Assert.assertNotNull(row2);
+    Assert.assertEquals(0L, row2.getRaw("truthy1"));
+    Assert.assertEquals(0L, row2.getRaw("truthy2"));
   }
 
   @Test
diff --git a/sql/src/main/java/org/apache/druid/sql/calcite/rule/DruidLogicalValuesRule.java b/sql/src/main/java/org/apache/druid/sql/calcite/rule/DruidLogicalValuesRule.java
index 97fa5b86a6a1..c17e339e7854 100644
--- a/sql/src/main/java/org/apache/druid/sql/calcite/rule/DruidLogicalValuesRule.java
+++ b/sql/src/main/java/org/apache/druid/sql/calcite/rule/DruidLogicalValuesRule.java
@@ -27,7 +27,6 @@
 import org.apache.calcite.rex.RexLiteral;
 import org.apache.druid.common.config.NullHandling;
 import org.apache.druid.error.InvalidSqlInput;
-import org.apache.druid.math.expr.ExpressionProcessing;
 import org.apache.druid.query.InlineDataSource;
 import org.apache.druid.segment.column.RowSignature;
 import org.apache.druid.sql.calcite.planner.Calcites;
@@ -122,7 +121,7 @@ public static Object getValueFromLiteral(RexLiteral literal, PlannerContext plan
         }
         return ((Number) RexLiteral.value(literal)).longValue();
       case BOOLEAN:
-        if (ExpressionProcessing.useStrictBooleans() && NullHandling.sqlCompatible() && literal.isNull()) {
+        if (NullHandling.sqlCompatible() && literal.isNull()) {
           return null;
         }
         return literal.isAlwaysTrue() ? 1L : 0L;
diff --git a/sql/src/test/java/org/apache/druid/sql/calcite/rule/DruidLogicalValuesRuleTest.java b/sql/src/test/java/org/apache/druid/sql/calcite/rule/DruidLogicalValuesRuleTest.java
index 5a6db426d29b..f84c8455861f 100644
--- a/sql/src/test/java/org/apache/druid/sql/calcite/rule/DruidLogicalValuesRuleTest.java
+++ b/sql/src/test/java/org/apache/druid/sql/calcite/rule/DruidLogicalValuesRuleTest.java
@@ -31,7 +31,6 @@
 import org.apache.druid.common.config.NullHandling;
 import org.apache.druid.error.DruidExceptionMatcher;
 import org.apache.druid.java.util.common.DateTimes;
-import org.apache.druid.math.expr.ExpressionProcessing;
 import org.apache.druid.sql.calcite.planner.DruidTypeSystem;
 import org.apache.druid.sql.calcite.planner.PlannerContext;
 import org.apache.druid.testing.InitializedNullHandlingTest;
@@ -144,7 +143,7 @@ public void testGetValueFromNullBooleanLiteral()
     {
       RexLiteral literal = REX_BUILDER.makeLiteral(null, REX_BUILDER.getTypeFactory().createSqlType(SqlTypeName.BOOLEAN));
 
-      if (NullHandling.sqlCompatible() && ExpressionProcessing.useStrictBooleans()) {
+      if (NullHandling.sqlCompatible()) {
         final Object fromLiteral = DruidLogicalValuesRule.getValueFromLiteral(literal, DEFAULT_CONTEXT);
         Assert.assertNull(fromLiteral);
       } else {

From 9ff11731c8f0d6861bb0a6e9171c4809ec559ade Mon Sep 17 00:00:00 2001
From: George Shiqi Wu <george.wu@imply.io>
Date: Tue, 17 Dec 2024 22:49:24 -0500
Subject: [PATCH 46/56] Parallelize supervisor stop logic to make it run faster
 (#17535)

- Add new method `Supervisor.stopAsync`
- Implement `SeekableStreamSupervisor.stopAsync()` to use a shutdown executor
- Call `stopAsync` from `SupervisorManager`
---
 .../supervisor/SupervisorManager.java         | 21 +++++-
 .../supervisor/SeekableStreamSupervisor.java  | 14 ++++
 .../supervisor/SupervisorManagerTest.java     | 11 ++-
 .../SeekableStreamSupervisorStateTest.java    | 22 ++++++
 .../overlord/supervisor/Supervisor.java       | 18 +++++
 .../supervisor/StreamSupervisorTest.java      | 71 +++++++++++++++++++
 6 files changed, 152 insertions(+), 5 deletions(-)

diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/overlord/supervisor/SupervisorManager.java b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/supervisor/SupervisorManager.java
index 243c41e4b5d8..731ddcaa1362 100644
--- a/indexing-service/src/main/java/org/apache/druid/indexing/overlord/supervisor/SupervisorManager.java
+++ b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/supervisor/SupervisorManager.java
@@ -21,7 +21,9 @@
 
 import com.google.common.base.Optional;
 import com.google.common.base.Preconditions;
+import com.google.common.util.concurrent.ListenableFuture;
 import com.google.inject.Inject;
+import org.apache.druid.common.guava.FutureUtils;
 import org.apache.druid.error.DruidException;
 import org.apache.druid.indexing.common.TaskLockType;
 import org.apache.druid.indexing.common.task.Tasks;
@@ -39,10 +41,12 @@
 import org.apache.druid.segment.incremental.ParseExceptionReport;
 
 import javax.annotation.Nullable;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.Future;
 
 /**
  * Manages the creation and lifetime of {@link Supervisor}.
@@ -212,11 +216,12 @@ public void start()
   public void stop()
   {
     Preconditions.checkState(started, "SupervisorManager not started");
-
+    List<ListenableFuture<Void>> stopFutures = new ArrayList<>();
     synchronized (lock) {
+      log.info("Stopping [%d] supervisors", supervisors.keySet().size());
       for (String id : supervisors.keySet()) {
         try {
-          supervisors.get(id).lhs.stop(false);
+          stopFutures.add(supervisors.get(id).lhs.stopAsync());
           SupervisorTaskAutoScaler autoscaler = autoscalers.get(id);
           if (autoscaler != null) {
             autoscaler.stop();
@@ -226,6 +231,18 @@ public void stop()
           log.warn(e, "Caught exception while stopping supervisor [%s]", id);
         }
       }
+      log.info("Waiting for [%d] supervisors to shutdown", stopFutures.size());
+      try {
+        FutureUtils.coalesce(stopFutures).get();
+      }
+      catch (Exception e) {
+        log.warn(
+            e,
+            "Stopped [%d] out of [%d] supervisors. Remaining supervisors will be killed.",
+            stopFutures.stream().filter(Future::isDone).count(),
+            stopFutures.size()
+        );
+      }
       supervisors.clear();
       autoscalers.clear();
       started = false;
diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/seekablestream/supervisor/SeekableStreamSupervisor.java b/indexing-service/src/main/java/org/apache/druid/indexing/seekablestream/supervisor/SeekableStreamSupervisor.java
index 43b3ba895bb9..28e114fa2209 100644
--- a/indexing-service/src/main/java/org/apache/druid/indexing/seekablestream/supervisor/SeekableStreamSupervisor.java
+++ b/indexing-service/src/main/java/org/apache/druid/indexing/seekablestream/supervisor/SeekableStreamSupervisor.java
@@ -34,6 +34,7 @@
 import com.google.common.util.concurrent.AsyncFunction;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
+import com.google.common.util.concurrent.ListeningExecutorService;
 import com.google.common.util.concurrent.ListeningScheduledExecutorService;
 import com.google.common.util.concurrent.MoreExecutors;
 import it.unimi.dsi.fastutil.ints.Int2ObjectLinkedOpenHashMap;
@@ -1103,6 +1104,19 @@ public void stop(boolean stopGracefully)
     }
   }
 
+  @Override
+  public ListenableFuture<Void> stopAsync()
+  {
+    ListeningExecutorService shutdownExec = MoreExecutors.listeningDecorator(
+        Execs.singleThreaded("supervisor-shutdown-" + StringUtils.encodeForFormat(supervisorId) + "--%d")
+    );
+    return shutdownExec.submit(() -> {
+      stop(false);
+      shutdownExec.shutdown();
+      return null;
+    });
+  }
+
   @Override
   public void reset(@Nullable final DataSourceMetadata dataSourceMetadata)
   {
diff --git a/indexing-service/src/test/java/org/apache/druid/indexing/overlord/supervisor/SupervisorManagerTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/overlord/supervisor/SupervisorManagerTest.java
index 81153f238a4e..add6d4473dec 100644
--- a/indexing-service/src/test/java/org/apache/druid/indexing/overlord/supervisor/SupervisorManagerTest.java
+++ b/indexing-service/src/test/java/org/apache/druid/indexing/overlord/supervisor/SupervisorManagerTest.java
@@ -23,6 +23,7 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
+import com.google.common.util.concurrent.SettableFuture;
 import org.apache.druid.error.DruidException;
 import org.apache.druid.error.DruidExceptionMatcher;
 import org.apache.druid.indexing.common.TaskLockType;
@@ -130,7 +131,9 @@ public void testCreateUpdateAndRemoveSupervisor()
     verifyAll();
 
     resetAll();
-    supervisor3.stop(false);
+    SettableFuture<Void> stopFuture = SettableFuture.create();
+    stopFuture.set(null);
+    EasyMock.expect(supervisor3.stopAsync()).andReturn(stopFuture);
     replayAll();
 
     manager.stop();
@@ -361,7 +364,7 @@ public void testStopThrowsException()
 
     EasyMock.expect(metadataSupervisorManager.getLatest()).andReturn(existingSpecs);
     supervisor1.start();
-    supervisor1.stop(false);
+    supervisor1.stopAsync();
     EasyMock.expectLastCall().andThrow(new RuntimeException("RTE"));
     replayAll();
 
@@ -511,7 +514,9 @@ public void testCreateSuspendResumeAndStopSupervisor()
 
     // mock manager shutdown to ensure supervisor 3 stops
     resetAll();
-    supervisor3.stop(false);
+    SettableFuture<Void> stopFuture = SettableFuture.create();
+    stopFuture.set(null);
+    EasyMock.expect(supervisor3.stopAsync()).andReturn(stopFuture);
     replayAll();
 
     manager.stop();
diff --git a/indexing-service/src/test/java/org/apache/druid/indexing/seekablestream/supervisor/SeekableStreamSupervisorStateTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/seekablestream/supervisor/SeekableStreamSupervisorStateTest.java
index e5b26c337066..b1600d3ad549 100644
--- a/indexing-service/src/test/java/org/apache/druid/indexing/seekablestream/supervisor/SeekableStreamSupervisorStateTest.java
+++ b/indexing-service/src/test/java/org/apache/druid/indexing/seekablestream/supervisor/SeekableStreamSupervisorStateTest.java
@@ -1002,6 +1002,28 @@ public void testStopping()
     verifyAll();
   }
 
+  @Test
+  public void testStopGracefully() throws Exception
+  {
+    EasyMock.expect(spec.isSuspended()).andReturn(false).anyTimes();
+    EasyMock.expect(recordSupplier.getPartitionIds(STREAM)).andReturn(ImmutableSet.of(SHARD_ID)).anyTimes();
+    EasyMock.expect(taskStorage.getActiveTasksByDatasource(DATASOURCE)).andReturn(ImmutableList.of()).anyTimes();
+    EasyMock.expect(taskQueue.add(EasyMock.anyObject())).andReturn(true).anyTimes();
+
+    taskRunner.unregisterListener("testSupervisorId");
+    indexTaskClient.close();
+    recordSupplier.close();
+
+    replayAll();
+    SeekableStreamSupervisor supervisor = new TestSeekableStreamSupervisor();
+
+    supervisor.start();
+    supervisor.runInternal();
+    ListenableFuture<Void> stopFuture = supervisor.stopAsync();
+    stopFuture.get();
+    verifyAll();
+  }
+
   @Test
   public void testStoppingGracefully()
   {
diff --git a/server/src/main/java/org/apache/druid/indexing/overlord/supervisor/Supervisor.java b/server/src/main/java/org/apache/druid/indexing/overlord/supervisor/Supervisor.java
index 63c05be93ca1..c0106f648d03 100644
--- a/server/src/main/java/org/apache/druid/indexing/overlord/supervisor/Supervisor.java
+++ b/server/src/main/java/org/apache/druid/indexing/overlord/supervisor/Supervisor.java
@@ -21,6 +21,8 @@
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
+import com.google.common.util.concurrent.ListenableFuture;
+import com.google.common.util.concurrent.SettableFuture;
 import org.apache.druid.indexing.overlord.DataSourceMetadata;
 import org.apache.druid.segment.incremental.ParseExceptionReport;
 
@@ -44,6 +46,22 @@ public interface Supervisor
    */
   void stop(boolean stopGracefully);
 
+  /**
+   * Starts non-graceful shutdown of the supervisor and returns a future that completes when shutdown is complete.
+   */
+  default ListenableFuture<Void> stopAsync()
+  {
+    SettableFuture<Void> stopFuture = SettableFuture.create();
+    try {
+      stop(false);
+      stopFuture.set(null);
+    }
+    catch (Exception e) {
+      stopFuture.setException(e);
+    }
+    return stopFuture;
+  }
+
   SupervisorReport getStatus();
 
   SupervisorStateManager.State getState();
diff --git a/server/src/test/java/org/apache/druid/indexing/overlord/supervisor/StreamSupervisorTest.java b/server/src/test/java/org/apache/druid/indexing/overlord/supervisor/StreamSupervisorTest.java
index 287a13c34366..0912bca8f8b7 100644
--- a/server/src/test/java/org/apache/druid/indexing/overlord/supervisor/StreamSupervisorTest.java
+++ b/server/src/test/java/org/apache/druid/indexing/overlord/supervisor/StreamSupervisorTest.java
@@ -26,6 +26,7 @@
 import org.junit.Test;
 
 import javax.annotation.Nullable;
+import java.util.concurrent.Future;
 
 public class StreamSupervisorTest
 {
@@ -100,4 +101,74 @@ public int getActiveTaskGroupsCount()
         ex.getMessage()
     );
   }
+
+  @Test
+  public void testDefaultStopAsync()
+  {
+    // Create an instance of stream supervisor without overriding stopAsync().
+    final StreamSupervisor streamSupervisor = new StreamSupervisor()
+    {
+      private SupervisorStateManager.State state = SupervisorStateManager.BasicState.RUNNING;
+
+      @Override
+      public void start()
+      {
+
+      }
+
+      @Override
+      public void stop(boolean stopGracefully)
+      {
+        state = SupervisorStateManager.BasicState.STOPPING;
+      }
+
+      @Override
+      public SupervisorReport getStatus()
+      {
+        return null;
+      }
+
+      @Override
+      public SupervisorStateManager.State getState()
+      {
+        return state;
+      }
+
+      @Override
+      public void reset(@Nullable DataSourceMetadata dataSourceMetadata)
+      {
+
+      }
+
+      @Override
+      public void resetOffsets(DataSourceMetadata resetDataSourceMetadata)
+      {
+
+      }
+
+      @Override
+      public void checkpoint(int taskGroupId, DataSourceMetadata checkpointMetadata)
+      {
+
+      }
+
+      @Override
+      public LagStats computeLagStats()
+      {
+        return null;
+      }
+
+      @Override
+      public int getActiveTaskGroupsCount()
+      {
+        return 0;
+      }
+    };
+
+    Future<Void> stopAsyncFuture = streamSupervisor.stopAsync();
+    Assert.assertTrue(stopAsyncFuture.isDone());
+
+    // stop should be called by stopAsync
+    Assert.assertEquals(SupervisorStateManager.BasicState.STOPPING, streamSupervisor.getState());
+  }
 }

From d5eb94d0e0d9fcfba9321c42aab75f99d6a258e7 Mon Sep 17 00:00:00 2001
From: Rishabh Singh <6513075+findingrish@users.noreply.github.com>
Date: Wed, 18 Dec 2024 14:17:14 +0530
Subject: [PATCH 47/56] Restore Sink Metric Emission Behaviour: Emit them
 per-Sink instead of per-FireHydrant (#17170)

* Emit aggregate segment processing metrics per sink instead of firehydrant

* add docs

* minor change

* checkstyle

* Fix DefaultQueryMetricsTest

* Minor changes in SinkMetricsEmittingQueryRunner

* spotbugs

* Address review comments

* Use ImmutableSet and ImmutableMap

* Create a helper class for saving state of StubServiceEmitter

* Add SinkQuerySegmentWalkerBenchmark

* Create SegmentMetrics class for tracking segment metrics

---------

Co-authored-by: Akshat Jain <akjn11@gmail.com>
---
 .../SinkQuerySegmentWalkerBenchmark.java      | 156 ++++++++++++++
 .../druid/query/DefaultQueryMetrics.java      |  10 +-
 .../java/util/metrics/StubServiceEmitter.java |  40 +++-
 .../appenderator/SinkQuerySegmentWalker.java  | 202 +++++++++++++++++-
 .../appenderator/StreamAppenderatorTest.java  | 126 ++++++++---
 .../StreamAppenderatorTester.java             |  45 ++--
 .../server/audit/SQLAuditManagerTest.java     |  12 +-
 7 files changed, 523 insertions(+), 68 deletions(-)
 create mode 100644 benchmarks/src/test/java/org/apache/druid/benchmark/SinkQuerySegmentWalkerBenchmark.java

diff --git a/benchmarks/src/test/java/org/apache/druid/benchmark/SinkQuerySegmentWalkerBenchmark.java b/benchmarks/src/test/java/org/apache/druid/benchmark/SinkQuerySegmentWalkerBenchmark.java
new file mode 100644
index 000000000000..8342dd565ca1
--- /dev/null
+++ b/benchmarks/src/test/java/org/apache/druid/benchmark/SinkQuerySegmentWalkerBenchmark.java
@@ -0,0 +1,156 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.druid.benchmark;
+
+import com.google.common.base.Suppliers;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+import org.apache.druid.common.config.NullHandling;
+import org.apache.druid.data.input.MapBasedInputRow;
+import org.apache.druid.jackson.DefaultObjectMapper;
+import org.apache.druid.java.util.common.DateTimes;
+import org.apache.druid.java.util.common.FileUtils;
+import org.apache.druid.java.util.common.Intervals;
+import org.apache.druid.java.util.common.granularity.Granularities;
+import org.apache.druid.java.util.common.logger.Logger;
+import org.apache.druid.java.util.emitter.core.LoggingEmitter;
+import org.apache.druid.java.util.emitter.service.ServiceEmitter;
+import org.apache.druid.query.Druids;
+import org.apache.druid.query.QueryPlus;
+import org.apache.druid.query.Result;
+import org.apache.druid.query.aggregation.LongSumAggregatorFactory;
+import org.apache.druid.query.context.ResponseContext;
+import org.apache.druid.query.timeseries.TimeseriesQuery;
+import org.apache.druid.query.timeseries.TimeseriesResultValue;
+import org.apache.druid.segment.realtime.appenderator.Appenderator;
+import org.apache.druid.segment.realtime.appenderator.SegmentIdWithShardSpec;
+import org.apache.druid.segment.realtime.appenderator.StreamAppenderatorTester;
+import org.apache.druid.segment.realtime.sink.Committers;
+import org.apache.druid.timeline.partition.LinearShardSpec;
+import org.openjdk.jmh.annotations.Benchmark;
+import org.openjdk.jmh.annotations.BenchmarkMode;
+import org.openjdk.jmh.annotations.Fork;
+import org.openjdk.jmh.annotations.Level;
+import org.openjdk.jmh.annotations.Measurement;
+import org.openjdk.jmh.annotations.Mode;
+import org.openjdk.jmh.annotations.OutputTimeUnit;
+import org.openjdk.jmh.annotations.Param;
+import org.openjdk.jmh.annotations.Scope;
+import org.openjdk.jmh.annotations.Setup;
+import org.openjdk.jmh.annotations.State;
+import org.openjdk.jmh.annotations.TearDown;
+import org.openjdk.jmh.annotations.Warmup;
+import org.openjdk.jmh.infra.Blackhole;
+
+import java.io.File;
+import java.util.Arrays;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+
+@State(Scope.Benchmark)
+@Fork(value = 1)
+@Warmup(iterations = 3)
+@Measurement(iterations = 5)
+@BenchmarkMode(Mode.AverageTime)
+@OutputTimeUnit(TimeUnit.MILLISECONDS)
+public class SinkQuerySegmentWalkerBenchmark
+{
+  static {
+    NullHandling.initializeForTests();
+  }
+
+  @Param({"10", "50", "100", "200"})
+  private int numFireHydrants;
+
+  private final LoggingEmitter loggingEmitter = new LoggingEmitter(new Logger(LoggingEmitter.class), LoggingEmitter.Level.INFO, new DefaultObjectMapper());
+  private final ServiceEmitter serviceEmitter = new ServiceEmitter("test", "test", loggingEmitter);
+  private File cacheDir;
+
+  private Appenderator appenderator;
+
+  @Setup(Level.Trial)
+  public void setup() throws Exception
+  {
+    final String userConfiguredCacheDir = System.getProperty("druid.benchmark.cacheDir", System.getenv("DRUID_BENCHMARK_CACHE_DIR"));
+    cacheDir = new File(userConfiguredCacheDir);
+    final StreamAppenderatorTester tester =
+        new StreamAppenderatorTester.Builder().maxRowsInMemory(1)
+                                              .basePersistDirectory(cacheDir)
+                                              .withServiceEmitter(serviceEmitter)
+                                              .build();
+
+    appenderator = tester.getAppenderator();
+    appenderator.startJob();
+
+    final SegmentIdWithShardSpec segmentIdWithShardSpec = new SegmentIdWithShardSpec(
+        StreamAppenderatorTester.DATASOURCE,
+        Intervals.of("2000/2001"),
+        "A",
+        new LinearShardSpec(0)
+    );
+
+    for (int i = 0; i < numFireHydrants; i++) {
+      final MapBasedInputRow inputRow = new MapBasedInputRow(
+          DateTimes.of("2000").getMillis(),
+          ImmutableList.of("dim"),
+          ImmutableMap.of(
+              "dim",
+              "bar_" + i,
+              "met",
+              1
+          )
+      );
+      appenderator.add(segmentIdWithShardSpec, inputRow, Suppliers.ofInstance(Committers.nil()));
+    }
+  }
+
+  @TearDown(Level.Trial)
+  public void tearDown() throws Exception
+  {
+    appenderator.close();
+    FileUtils.deleteDirectory(cacheDir);
+  }
+
+  @Benchmark
+  @BenchmarkMode(Mode.AverageTime)
+  @OutputTimeUnit(TimeUnit.MILLISECONDS)
+  public void emitSinkMetrics(Blackhole blackhole) throws Exception
+  {
+    {
+      final TimeseriesQuery query1 = Druids.newTimeseriesQueryBuilder()
+                                           .dataSource(StreamAppenderatorTester.DATASOURCE)
+                                           .intervals(ImmutableList.of(Intervals.of("2000/2001")))
+                                           .aggregators(
+                                               Arrays.asList(
+                                                   new LongSumAggregatorFactory("count", "count"),
+                                                   new LongSumAggregatorFactory("met", "met")
+                                               )
+                                           )
+                                           .granularity(Granularities.DAY)
+                                           .build();
+
+      final List<Result<TimeseriesResultValue>> results =
+          QueryPlus.wrap(query1).run(appenderator, ResponseContext.createEmpty()).toList();
+      blackhole.consume(results);
+
+      serviceEmitter.flush();
+    }
+  }
+}
diff --git a/processing/src/main/java/org/apache/druid/query/DefaultQueryMetrics.java b/processing/src/main/java/org/apache/druid/query/DefaultQueryMetrics.java
index 1273aebc0198..9f349484153a 100644
--- a/processing/src/main/java/org/apache/druid/query/DefaultQueryMetrics.java
+++ b/processing/src/main/java/org/apache/druid/query/DefaultQueryMetrics.java
@@ -40,6 +40,10 @@
  */
 public class DefaultQueryMetrics<QueryType extends Query<?>> implements QueryMetrics<QueryType>
 {
+  public static final String QUERY_WAIT_TIME = "query/wait/time";
+  public static final String QUERY_SEGMENT_TIME = "query/segment/time";
+  public static final String QUERY_SEGMENT_AND_CACHE_TIME = "query/segmentAndCache/time";
+
   protected final ServiceMetricEvent.Builder builder = new ServiceMetricEvent.Builder();
   protected final Map<String, Number> metrics = new HashMap<>();
 
@@ -235,19 +239,19 @@ public QueryMetrics<QueryType> reportQueryBytes(long byteCount)
   @Override
   public QueryMetrics<QueryType> reportWaitTime(long timeNs)
   {
-    return reportMillisTimeMetric("query/wait/time", timeNs);
+    return reportMillisTimeMetric(QUERY_WAIT_TIME, timeNs);
   }
 
   @Override
   public QueryMetrics<QueryType> reportSegmentTime(long timeNs)
   {
-    return reportMillisTimeMetric("query/segment/time", timeNs);
+    return reportMillisTimeMetric(QUERY_SEGMENT_TIME, timeNs);
   }
 
   @Override
   public QueryMetrics<QueryType> reportSegmentAndCacheTime(long timeNs)
   {
-    return reportMillisTimeMetric("query/segmentAndCache/time", timeNs);
+    return reportMillisTimeMetric(QUERY_SEGMENT_AND_CACHE_TIME, timeNs);
   }
 
   @Override
diff --git a/processing/src/test/java/org/apache/druid/java/util/metrics/StubServiceEmitter.java b/processing/src/test/java/org/apache/druid/java/util/metrics/StubServiceEmitter.java
index e4a8b9403dd0..323d8cd308c9 100644
--- a/processing/src/test/java/org/apache/druid/java/util/metrics/StubServiceEmitter.java
+++ b/processing/src/test/java/org/apache/druid/java/util/metrics/StubServiceEmitter.java
@@ -38,7 +38,7 @@ public class StubServiceEmitter extends ServiceEmitter implements MetricsVerifie
 {
   private final List<Event> events = new ArrayList<>();
   private final List<AlertEvent> alertEvents = new ArrayList<>();
-  private final ConcurrentHashMap<String, List<ServiceMetricEvent>> metricEvents = new ConcurrentHashMap<>();
+  private final ConcurrentHashMap<String, List<ServiceMetricEventSnapshot>> metricEvents = new ConcurrentHashMap<>();
 
   public StubServiceEmitter()
   {
@@ -56,7 +56,7 @@ public void emit(Event event)
     if (event instanceof ServiceMetricEvent) {
       ServiceMetricEvent metricEvent = (ServiceMetricEvent) event;
       metricEvents.computeIfAbsent(metricEvent.getMetric(), name -> new ArrayList<>())
-                  .add(metricEvent);
+                  .add(new ServiceMetricEventSnapshot(metricEvent));
     } else if (event instanceof AlertEvent) {
       alertEvents.add((AlertEvent) event);
     }
@@ -76,7 +76,7 @@ public List<Event> getEvents()
    *
    * @return Map from metric name to list of events emitted for that metric.
    */
-  public Map<String, List<ServiceMetricEvent>> getMetricEvents()
+  public Map<String, List<ServiceMetricEventSnapshot>> getMetricEvents()
   {
     return metricEvents;
   }
@@ -96,18 +96,18 @@ public List<Number> getMetricValues(
   )
   {
     final List<Number> values = new ArrayList<>();
-    final List<ServiceMetricEvent> events =
+    final List<ServiceMetricEventSnapshot> events =
         metricEvents.getOrDefault(metricName, Collections.emptyList());
     final Map<String, Object> filters =
         dimensionFilters == null ? Collections.emptyMap() : dimensionFilters;
-    for (ServiceMetricEvent event : events) {
+    for (ServiceMetricEventSnapshot event : events) {
       final Map<String, Object> userDims = event.getUserDims();
       boolean match = filters.keySet().stream()
                              .map(d -> filters.get(d).equals(userDims.get(d)))
                              .reduce((a, b) -> a && b)
                              .orElse(true);
       if (match) {
-        values.add(event.getValue());
+        values.add(event.getMetricEvent().getValue());
       }
     }
 
@@ -131,4 +131,32 @@ public void flush()
   public void close()
   {
   }
+
+  /**
+   * Helper class to encapsulate a ServiceMetricEvent and its user dimensions.
+   * Since {@link StubServiceEmitter} doesn't actually emit metrics and saves the emitted metrics in-memory,
+   * this helper class saves a copy of {@link ServiceMetricEvent#userDims} of emitted metrics
+   * via {@link ServiceMetricEvent#getUserDims()} as it can get mutated.
+   */
+  public static class ServiceMetricEventSnapshot
+  {
+    private final ServiceMetricEvent metricEvent;
+    private final Map<String, Object> userDims;
+
+    public ServiceMetricEventSnapshot(ServiceMetricEvent metricEvent)
+    {
+      this.metricEvent = metricEvent;
+      this.userDims = metricEvent.getUserDims();
+    }
+
+    public ServiceMetricEvent getMetricEvent()
+    {
+      return metricEvent;
+    }
+
+    public Map<String, Object> getUserDims()
+    {
+      return userDims;
+    }
+  }
 }
diff --git a/server/src/main/java/org/apache/druid/segment/realtime/appenderator/SinkQuerySegmentWalker.java b/server/src/main/java/org/apache/druid/segment/realtime/appenderator/SinkQuerySegmentWalker.java
index 10c775aa0a30..c256e82c6d2d 100644
--- a/server/src/main/java/org/apache/druid/segment/realtime/appenderator/SinkQuerySegmentWalker.java
+++ b/server/src/main/java/org/apache/druid/segment/realtime/appenderator/SinkQuerySegmentWalker.java
@@ -22,6 +22,8 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Preconditions;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableSet;
 import org.apache.druid.client.CachingQueryRunner;
 import org.apache.druid.client.cache.Cache;
 import org.apache.druid.client.cache.CacheConfig;
@@ -30,18 +32,23 @@
 import org.apache.druid.java.util.common.ISE;
 import org.apache.druid.java.util.common.Pair;
 import org.apache.druid.java.util.common.guava.FunctionalIterable;
+import org.apache.druid.java.util.common.guava.LazySequence;
+import org.apache.druid.java.util.common.guava.Sequence;
+import org.apache.druid.java.util.common.guava.SequenceWrapper;
+import org.apache.druid.java.util.common.guava.Sequences;
 import org.apache.druid.java.util.emitter.EmittingLogger;
 import org.apache.druid.java.util.emitter.service.ServiceEmitter;
 import org.apache.druid.query.BySegmentQueryRunner;
 import org.apache.druid.query.CPUTimeMetricQueryRunner;
 import org.apache.druid.query.DataSource;
+import org.apache.druid.query.DefaultQueryMetrics;
 import org.apache.druid.query.DirectQueryProcessingPool;
 import org.apache.druid.query.FinalizeResultsQueryRunner;
-import org.apache.druid.query.MetricsEmittingQueryRunner;
 import org.apache.druid.query.NoopQueryRunner;
 import org.apache.druid.query.Query;
 import org.apache.druid.query.QueryDataSource;
 import org.apache.druid.query.QueryMetrics;
+import org.apache.druid.query.QueryPlus;
 import org.apache.druid.query.QueryProcessingPool;
 import org.apache.druid.query.QueryRunner;
 import org.apache.druid.query.QueryRunnerFactory;
@@ -52,6 +59,7 @@
 import org.apache.druid.query.ReportTimelineMissingSegmentQueryRunner;
 import org.apache.druid.query.SegmentDescriptor;
 import org.apache.druid.query.SinkQueryRunners;
+import org.apache.druid.query.context.ResponseContext;
 import org.apache.druid.query.planning.DataSourceAnalysis;
 import org.apache.druid.query.spec.SpecificSegmentQueryRunner;
 import org.apache.druid.query.spec.SpecificSegmentSpec;
@@ -69,6 +77,7 @@
 import org.apache.druid.utils.CloseableUtils;
 import org.joda.time.Interval;
 
+import javax.annotation.Nullable;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
@@ -76,8 +85,11 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.function.Function;
+import java.util.function.ObjLongConsumer;
 import java.util.stream.Collectors;
 
 /**
@@ -88,6 +100,19 @@ public class SinkQuerySegmentWalker implements QuerySegmentWalker
   private static final EmittingLogger log = new EmittingLogger(SinkQuerySegmentWalker.class);
   private static final String CONTEXT_SKIP_INCREMENTAL_SEGMENT = "skipIncrementalSegment";
 
+  private static final Set<String> SEGMENT_QUERY_METRIC = ImmutableSet.of(DefaultQueryMetrics.QUERY_SEGMENT_TIME);
+  private static final Set<String> SEGMENT_CACHE_AND_WAIT_METRICS = ImmutableSet.of(
+      DefaultQueryMetrics.QUERY_WAIT_TIME,
+      DefaultQueryMetrics.QUERY_SEGMENT_AND_CACHE_TIME
+  );
+
+  private static final Map<String, ObjLongConsumer<? super QueryMetrics<?>>> METRICS_TO_REPORT =
+      ImmutableMap.of(
+          DefaultQueryMetrics.QUERY_SEGMENT_TIME, QueryMetrics::reportSegmentTime,
+          DefaultQueryMetrics.QUERY_SEGMENT_AND_CACHE_TIME, QueryMetrics::reportSegmentAndCacheTime,
+          DefaultQueryMetrics.QUERY_WAIT_TIME, QueryMetrics::reportWaitTime
+      );
+
   private final String dataSource;
 
   // Maintain a timeline of ids and Sinks for all the segments including the base and upgraded versions
@@ -193,6 +218,7 @@ public <T> QueryRunner<T> getQueryRunnerForSegments(final Query<T> query, final
     final List<SinkSegmentReference> allSegmentReferences = new ArrayList<>();
     final Map<SegmentDescriptor, SegmentId> segmentIdMap = new HashMap<>();
     final LinkedHashMap<SegmentDescriptor, List<QueryRunner<T>>> allRunners = new LinkedHashMap<>();
+    final ConcurrentHashMap<String, SinkMetricsEmittingQueryRunner.SegmentMetrics> segmentMetricsAccumulator = new ConcurrentHashMap<>();
 
     try {
       for (final SegmentDescriptor descriptor : specs) {
@@ -231,12 +257,13 @@ public <T> QueryRunner<T> getQueryRunnerForSegments(final Query<T> query, final
               descriptor,
               sinkSegmentReferences.stream().map(
                   segmentReference -> {
-                    QueryRunner<T> runner = new MetricsEmittingQueryRunner<>(
+                    QueryRunner<T> runner = new SinkMetricsEmittingQueryRunner<>(
                         emitter,
                         factory.getToolchest(),
                         factory.createRunner(segmentReference.getSegment()),
-                        QueryMetrics::reportSegmentTime,
-                        queryMetrics -> queryMetrics.segment(sinkSegmentId.toString())
+                        segmentMetricsAccumulator,
+                        SEGMENT_QUERY_METRIC,
+                        sinkSegmentId.toString()
                     );
 
                     // 1) Only use caching if data is immutable
@@ -273,13 +300,14 @@ public <T> QueryRunner<T> getQueryRunnerForSegments(final Query<T> query, final
 
                     // Regardless of whether caching is enabled, do reportSegmentAndCacheTime outside the
                     // *possible* caching.
-                    runner = new MetricsEmittingQueryRunner<>(
+                    runner = new SinkMetricsEmittingQueryRunner<>(
                         emitter,
                         factory.getToolchest(),
                         runner,
-                        QueryMetrics::reportSegmentAndCacheTime,
-                        queryMetrics -> queryMetrics.segment(sinkSegmentId.toString())
-                    ).withWaitMeasuredFromNow();
+                        segmentMetricsAccumulator,
+                        SEGMENT_CACHE_AND_WAIT_METRICS,
+                        sinkSegmentId.toString()
+                    );
 
                     // Emit CPU time metrics.
                     runner = CPUTimeMetricQueryRunner.safeBuild(
@@ -344,7 +372,17 @@ public <T> QueryRunner<T> getQueryRunnerForSegments(final Query<T> query, final
       return new ResourceIdPopulatingQueryRunner<>(
           QueryRunnerHelper.makeClosingQueryRunner(
               CPUTimeMetricQueryRunner.safeBuild(
-                  new FinalizeResultsQueryRunner<>(toolChest.mergeResults(mergedRunner, true), toolChest),
+                  new SinkMetricsEmittingQueryRunner<>(
+                      emitter,
+                      toolChest,
+                      new FinalizeResultsQueryRunner<>(
+                          toolChest.mergeResults(mergedRunner, true),
+                          toolChest
+                      ),
+                      segmentMetricsAccumulator,
+                      Collections.emptySet(),
+                      null
+                  ),
                   toolChest,
                   emitter,
                   cpuTimeAccumulator,
@@ -415,7 +453,153 @@ public static String makeHydrantCacheIdentifier(final SegmentId segmentId, final
     // with subsegments (hydrants).
     return segmentId + "_H" + hydrantNumber;
   }
+  
+  /**
+   * This class is responsible for emitting query/segment/time, query/wait/time and query/segmentAndCache/Time metrics for a Sink.
+   * It accumulates query/segment/time and query/segmentAndCache/time metric for each FireHydrant at the level of Sink.
+   * query/wait/time metric is the time taken to process the first FireHydrant for the Sink.
+   * <p>
+   * This class operates in two distinct modes based on whether {@link SinkMetricsEmittingQueryRunner#segmentId} is null or non-null.
+   * When segmentId is non-null, it accumulates the metrics. When segmentId is null, it emits the accumulated metrics.
+   * <p>
+   * This class is derived from {@link org.apache.druid.query.MetricsEmittingQueryRunner}.
+   */
+  private static class SinkMetricsEmittingQueryRunner<T> implements QueryRunner<T>
+  {
+    private final ServiceEmitter emitter;
+    private final QueryToolChest<T, ? extends Query<T>> queryToolChest;
+    private final QueryRunner<T> queryRunner;
+    private final ConcurrentHashMap<String, SegmentMetrics> segmentMetricsAccumulator;
+    private final Set<String> metricsToCompute;
+    @Nullable
+    private final String segmentId;
+    private final long creationTimeNs;
+
+    private SinkMetricsEmittingQueryRunner(
+        ServiceEmitter emitter,
+        QueryToolChest<T, ? extends Query<T>> queryToolChest,
+        QueryRunner<T> queryRunner,
+        ConcurrentHashMap<String, SegmentMetrics> segmentMetricsAccumulator,
+        Set<String> metricsToCompute,
+        @Nullable String segmentId
+    )
+    {
+      this.emitter = emitter;
+      this.queryToolChest = queryToolChest;
+      this.queryRunner = queryRunner;
+      this.segmentMetricsAccumulator = segmentMetricsAccumulator;
+      this.metricsToCompute = metricsToCompute;
+      this.segmentId = segmentId;
+      this.creationTimeNs = System.nanoTime();
+    }
 
+    @Override
+    public Sequence<T> run(final QueryPlus<T> queryPlus, final ResponseContext responseContext)
+    {
+      QueryPlus<T> queryWithMetrics = queryPlus.withQueryMetrics(queryToolChest);
+      return Sequences.wrap(
+          // Use LazySequence because we want to account execution time of queryRunner.run() (it prepares the underlying
+          // Sequence) as part of the reported query time, i.e. we want to execute queryRunner.run() after
+          // `startTimeNs = System.nanoTime();`
+          new LazySequence<>(() -> queryRunner.run(queryWithMetrics, responseContext)),
+          new SequenceWrapper()
+          {
+            private long startTimeNs;
+
+            @Override
+            public void before()
+            {
+              startTimeNs = System.nanoTime();
+            }
+
+            @Override
+            public void after(boolean isDone, Throwable thrown)
+            {
+              if (segmentId != null) {
+                // accumulate metrics
+                final SegmentMetrics metrics = segmentMetricsAccumulator.computeIfAbsent(segmentId, id -> new SegmentMetrics());
+                if (metricsToCompute.contains(DefaultQueryMetrics.QUERY_WAIT_TIME)) {
+                  metrics.setWaitTime(startTimeNs - creationTimeNs);
+                }
+                if (metricsToCompute.contains(DefaultQueryMetrics.QUERY_SEGMENT_TIME)) {
+                  metrics.addSegmentTime(System.nanoTime() - startTimeNs);
+                }
+                if (metricsToCompute.contains(DefaultQueryMetrics.QUERY_SEGMENT_AND_CACHE_TIME)) {
+                  metrics.addSegmentAndCacheTime(System.nanoTime() - startTimeNs);
+                }
+              } else {
+                final QueryMetrics<?> queryMetrics = queryWithMetrics.getQueryMetrics();
+                // report accumulated metrics
+                for (Map.Entry<String, SegmentMetrics> segmentAndMetrics : segmentMetricsAccumulator.entrySet()) {
+                  queryMetrics.segment(segmentAndMetrics.getKey());
+
+                  for (Map.Entry<String, ObjLongConsumer<? super QueryMetrics<?>>> reportMetric : METRICS_TO_REPORT.entrySet()) {
+                    final String metricName = reportMetric.getKey();
+                    switch (metricName) {
+                      case DefaultQueryMetrics.QUERY_SEGMENT_TIME:
+                        reportMetric.getValue().accept(queryMetrics, segmentAndMetrics.getValue().getSegmentTime());
+                      case DefaultQueryMetrics.QUERY_WAIT_TIME:
+                        reportMetric.getValue().accept(queryMetrics, segmentAndMetrics.getValue().getWaitTime());
+                      case DefaultQueryMetrics.QUERY_SEGMENT_AND_CACHE_TIME:
+                        reportMetric.getValue().accept(queryMetrics, segmentAndMetrics.getValue().getSegmentAndCacheTime());
+                    }
+                  }
+
+                  try {
+                    queryMetrics.emit(emitter);
+                  }
+                  catch (Exception e) {
+                    // Query should not fail, because of emitter failure. Swallowing the exception.
+                    log.error(e, "Failed to emit metrics for segment[%s]", segmentAndMetrics.getKey());
+                  }
+                }
+              }
+            }
+          }
+      );
+    }
+
+    /**
+     * Class to track segment related metrics during query execution.
+     */
+    private static class SegmentMetrics
+    {
+      private final AtomicLong querySegmentTime = new AtomicLong(0);
+      private final AtomicLong queryWaitTime = new AtomicLong(0);
+      private final AtomicLong querySegmentAndCacheTime = new AtomicLong(0);
+
+      private void addSegmentTime(long time)
+      {
+        querySegmentTime.addAndGet(time);
+      }
+
+      private void setWaitTime(long time)
+      {
+        queryWaitTime.set(time);
+      }
+
+      private void addSegmentAndCacheTime(long time)
+      {
+        querySegmentAndCacheTime.addAndGet(time);
+      }
+
+      private long getSegmentTime()
+      {
+        return querySegmentTime.get();
+      }
+
+      private long getWaitTime()
+      {
+        return queryWaitTime.get();
+      }
+
+      private long getSegmentAndCacheTime()
+      {
+        return querySegmentAndCacheTime.get();
+      }
+    }
+  }
+  
   private static class SinkHolder implements Overshadowable<SinkHolder>
   {
     private final Sink sink;
diff --git a/server/src/test/java/org/apache/druid/segment/realtime/appenderator/StreamAppenderatorTest.java b/server/src/test/java/org/apache/druid/segment/realtime/appenderator/StreamAppenderatorTest.java
index f9c7445a60a1..b2ce7de967cb 100644
--- a/server/src/test/java/org/apache/druid/segment/realtime/appenderator/StreamAppenderatorTest.java
+++ b/server/src/test/java/org/apache/druid/segment/realtime/appenderator/StreamAppenderatorTest.java
@@ -34,6 +34,7 @@
 import org.apache.druid.java.util.common.Intervals;
 import org.apache.druid.java.util.common.Pair;
 import org.apache.druid.java.util.common.granularity.Granularities;
+import org.apache.druid.java.util.metrics.StubServiceEmitter;
 import org.apache.druid.metadata.PendingSegmentRecord;
 import org.apache.druid.query.Druids;
 import org.apache.druid.query.Order;
@@ -70,8 +71,10 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.ExecutionException;
@@ -1861,9 +1864,11 @@ public void testQueryByIntervals_withSegmentVersionUpgrades() throws Exception
   public void testQueryByIntervals() throws Exception
   {
     try (
+        final StubServiceEmitter serviceEmitter = new StubServiceEmitter();
         final StreamAppenderatorTester tester =
             new StreamAppenderatorTester.Builder().maxRowsInMemory(2)
                                                   .basePersistDirectory(temporaryFolder.newFolder())
+                                                  .withServiceEmitter(serviceEmitter)
                                                   .build()) {
       final Appenderator appenderator = tester.getAppenderator();
 
@@ -1902,36 +1907,18 @@ public void testQueryByIntervals() throws Exception
           results1
       );
 
-      // Query2: 2000/2002
-      final TimeseriesQuery query2 = Druids.newTimeseriesQueryBuilder()
-                                           .dataSource(StreamAppenderatorTester.DATASOURCE)
-                                           .intervals(ImmutableList.of(Intervals.of("2000/2002")))
-                                           .aggregators(
-                                               Arrays.asList(
-                                                   new LongSumAggregatorFactory("count", "count"),
-                                                   new LongSumAggregatorFactory("met", "met")
-                                               )
-                                           )
-                                           .granularity(Granularities.DAY)
-                                           .build();
-
-      final List<Result<TimeseriesResultValue>> results2 =
-          QueryPlus.wrap(query2).run(appenderator, ResponseContext.createEmpty()).toList();
-      Assert.assertEquals(
-          "query2",
-          ImmutableList.of(
-              new Result<>(
-                  DateTimes.of("2000"),
-                  new TimeseriesResultValue(ImmutableMap.of("count", 3L, "met", 7L))
-              ),
-              new Result<>(
-                  DateTimes.of("2001"),
-                  new TimeseriesResultValue(ImmutableMap.of("count", 4L, "met", 120L))
+      verifySinkMetrics(
+          serviceEmitter,
+          new HashSet<>(
+              Arrays.asList(
+                  IDENTIFIERS.get(0).asSegmentId().toString(),
+                  IDENTIFIERS.get(1).asSegmentId().toString()
               )
-          ),
-          results2
+          )
       );
 
+      serviceEmitter.flush();
+
       // Query3: 2000/2001T01
       final TimeseriesQuery query3 = Druids.newTimeseriesQueryBuilder()
                                            .dataSource(StreamAppenderatorTester.DATASOURCE)
@@ -1961,6 +1948,19 @@ public void testQueryByIntervals() throws Exception
           results3
       );
 
+      verifySinkMetrics(
+          serviceEmitter,
+          new HashSet<>(
+              Arrays.asList(
+                  IDENTIFIERS.get(0).asSegmentId().toString(),
+                  IDENTIFIERS.get(1).asSegmentId().toString(),
+                  IDENTIFIERS.get(2).asSegmentId().toString()
+              )
+          )
+      );
+
+      serviceEmitter.flush();
+
       // Query4: 2000/2001T01, 2001T03/2001T04
       final TimeseriesQuery query4 = Druids.newTimeseriesQueryBuilder()
                                            .dataSource(StreamAppenderatorTester.DATASOURCE)
@@ -1994,6 +1994,16 @@ public void testQueryByIntervals() throws Exception
           ),
           results4
       );
+      verifySinkMetrics(
+          serviceEmitter,
+          new HashSet<>(
+              Arrays.asList(
+                  IDENTIFIERS.get(0).asSegmentId().toString(),
+                  IDENTIFIERS.get(1).asSegmentId().toString(),
+                  IDENTIFIERS.get(2).asSegmentId().toString()
+              )
+          )
+      );
     }
   }
 
@@ -2001,9 +2011,11 @@ public void testQueryByIntervals() throws Exception
   public void testQueryBySegments() throws Exception
   {
     try (
+        StubServiceEmitter serviceEmitter = new StubServiceEmitter();
         final StreamAppenderatorTester tester =
             new StreamAppenderatorTester.Builder().maxRowsInMemory(2)
                                                   .basePersistDirectory(temporaryFolder.newFolder())
+                                                  .withServiceEmitter(serviceEmitter)
                                                   .build()) {
       final Appenderator appenderator = tester.getAppenderator();
 
@@ -2052,6 +2064,17 @@ public void testQueryBySegments() throws Exception
           results1
       );
 
+      verifySinkMetrics(
+          serviceEmitter,
+          new HashSet<>(
+              Collections.singletonList(
+                  IDENTIFIERS.get(2).asSegmentId().toString()
+              )
+          )
+      );
+
+      serviceEmitter.flush();
+
       // Query2: segment #2, partial
       final TimeseriesQuery query2 = Druids.newTimeseriesQueryBuilder()
                                            .dataSource(StreamAppenderatorTester.DATASOURCE)
@@ -2088,6 +2111,17 @@ public void testQueryBySegments() throws Exception
           results2
       );
 
+      verifySinkMetrics(
+          serviceEmitter,
+          new HashSet<>(
+              Collections.singletonList(
+                  IDENTIFIERS.get(2).asSegmentId().toString()
+              )
+          )
+      );
+
+      serviceEmitter.flush();
+
       // Query3: segment #2, two disjoint intervals
       final TimeseriesQuery query3 = Druids.newTimeseriesQueryBuilder()
                                            .dataSource(StreamAppenderatorTester.DATASOURCE)
@@ -2129,6 +2163,17 @@ public void testQueryBySegments() throws Exception
           results3
       );
 
+      verifySinkMetrics(
+          serviceEmitter,
+          new HashSet<>(
+              Collections.singletonList(
+                  IDENTIFIERS.get(2).asSegmentId().toString()
+              )
+          )
+      );
+
+      serviceEmitter.flush();
+
       final ScanQuery query4 = Druids.newScanQueryBuilder()
                                      .dataSource(StreamAppenderatorTester.DATASOURCE)
                                      .intervals(
@@ -2164,6 +2209,33 @@ public void testQueryBySegments() throws Exception
           new Object[]{DateTimes.of("2001T03").getMillis(), "foo", 1L, 64L},
           ((List<Object>) ((List<Object>) results4.get(1).getEvents()).get(0)).toArray()
       );
+
+      verifySinkMetrics(
+          serviceEmitter,
+          new HashSet<>(
+              Collections.singletonList(
+                  IDENTIFIERS.get(2).asSegmentId().toString()
+              )
+          )
+      );
+
+      serviceEmitter.flush();
+    }
+  }
+
+  private void verifySinkMetrics(StubServiceEmitter emitter, Set<String> segmentIds)
+  {
+    Map<String, List<StubServiceEmitter.ServiceMetricEventSnapshot>> events = emitter.getMetricEvents();
+    int segments = segmentIds.size();
+    Assert.assertEquals(4, events.size());
+    Assert.assertTrue(events.containsKey("query/cpu/time"));
+    Assert.assertEquals(segments, events.get("query/segment/time").size());
+    Assert.assertEquals(segments, events.get("query/segmentAndCache/time").size());
+    Assert.assertEquals(segments, events.get("query/wait/time").size());
+    for (String id : segmentIds) {
+      Assert.assertTrue(events.get("query/segment/time").stream().anyMatch(value -> value.getUserDims().containsValue(id)));
+      Assert.assertTrue(events.get("query/segmentAndCache/time").stream().anyMatch(value -> value.getUserDims().containsValue(id)));
+      Assert.assertTrue(events.get("query/wait/time").stream().anyMatch(value -> value.getUserDims().containsValue(id)));
     }
   }
 
diff --git a/server/src/test/java/org/apache/druid/segment/realtime/appenderator/StreamAppenderatorTester.java b/server/src/test/java/org/apache/druid/segment/realtime/appenderator/StreamAppenderatorTester.java
index c305ada342ae..88cd05376aef 100644
--- a/server/src/test/java/org/apache/druid/segment/realtime/appenderator/StreamAppenderatorTester.java
+++ b/server/src/test/java/org/apache/druid/segment/realtime/appenderator/StreamAppenderatorTester.java
@@ -109,7 +109,8 @@ public StreamAppenderatorTester(
       final RowIngestionMeters rowIngestionMeters,
       final boolean skipBytesInMemoryOverheadCheck,
       final DataSegmentAnnouncer announcer,
-      final CentralizedDatasourceSchemaConfig centralizedDatasourceSchemaConfig
+      final CentralizedDatasourceSchemaConfig centralizedDatasourceSchemaConfig,
+      final ServiceEmitter serviceEmitter
   )
   {
     objectMapper = new DefaultObjectMapper();
@@ -145,18 +146,18 @@ public StreamAppenderatorTester(
                        .withObjectMapper(objectMapper)
                        .build();
     tuningConfig = new TestAppenderatorConfig(
-      TuningConfig.DEFAULT_APPENDABLE_INDEX,
-      maxRowsInMemory,
-      maxSizeInBytes == 0L ? getDefaultMaxBytesInMemory() : maxSizeInBytes,
-      skipBytesInMemoryOverheadCheck,
-      IndexSpec.DEFAULT,
-      0,
-      false,
-      0L,
-      OffHeapMemorySegmentWriteOutMediumFactory.instance(),
-      IndexMerger.UNLIMITED_MAX_COLUMNS_TO_MERGE,
-      basePersistDirectory
-  );
+        TuningConfig.DEFAULT_APPENDABLE_INDEX,
+        maxRowsInMemory,
+        maxSizeInBytes == 0L ? getDefaultMaxBytesInMemory() : maxSizeInBytes,
+        skipBytesInMemoryOverheadCheck,
+        IndexSpec.DEFAULT,
+        0,
+        false,
+        0L,
+        OffHeapMemorySegmentWriteOutMediumFactory.instance(),
+        IndexMerger.UNLIMITED_MAX_COLUMNS_TO_MERGE,
+        basePersistDirectory
+    );
 
     metrics = new SegmentGenerationMetrics();
     queryExecutor = Execs.singleThreaded("queryExecutor(%d)");
@@ -174,11 +175,12 @@ public StreamAppenderatorTester(
         OffHeapMemorySegmentWriteOutMediumFactory.instance()
     );
 
-    emitter = new ServiceEmitter(
+    emitter = serviceEmitter == null ? new ServiceEmitter(
         "test",
         "test",
         new NoopEmitter()
-    );
+    ) : serviceEmitter;
+
     emitter.start();
     EmittingLogger.registerEmitter(emitter);
     dataSegmentPusher = new DataSegmentPusher()
@@ -350,6 +352,7 @@ public static class Builder
     private RowIngestionMeters rowIngestionMeters;
     private boolean skipBytesInMemoryOverheadCheck;
     private int delayInMilli = 0;
+    private ServiceEmitter serviceEmitter;
 
     public Builder maxRowsInMemory(final int maxRowsInMemory)
     {
@@ -393,6 +396,12 @@ public Builder withSegmentDropDelayInMilli(int delayInMilli)
       return this;
     }
 
+    public Builder withServiceEmitter(ServiceEmitter serviceEmitter)
+    {
+      this.serviceEmitter = serviceEmitter;
+      return this;
+    }
+
     public StreamAppenderatorTester build()
     {
       return new StreamAppenderatorTester(
@@ -404,7 +413,8 @@ public StreamAppenderatorTester build()
           rowIngestionMeters == null ? new SimpleRowIngestionMeters() : rowIngestionMeters,
           skipBytesInMemoryOverheadCheck,
           new NoopDataSegmentAnnouncer(),
-          CentralizedDatasourceSchemaConfig.create()
+          CentralizedDatasourceSchemaConfig.create(),
+          serviceEmitter
       );
     }
 
@@ -422,7 +432,8 @@ public StreamAppenderatorTester build(
           rowIngestionMeters == null ? new SimpleRowIngestionMeters() : rowIngestionMeters,
           skipBytesInMemoryOverheadCheck,
           dataSegmentAnnouncer,
-          config
+          config,
+          serviceEmitter
       );
     }
   }
diff --git a/server/src/test/java/org/apache/druid/server/audit/SQLAuditManagerTest.java b/server/src/test/java/org/apache/druid/server/audit/SQLAuditManagerTest.java
index a12722088159..f10248bf1e92 100644
--- a/server/src/test/java/org/apache/druid/server/audit/SQLAuditManagerTest.java
+++ b/server/src/test/java/org/apache/druid/server/audit/SQLAuditManagerTest.java
@@ -91,14 +91,14 @@ public void testAuditMetricEventWithPayload() throws IOException
     final AuditEntry entry = createAuditEntry("testKey", "testType", DateTimes.nowUtc());
     auditManager.doAudit(entry);
 
-    Map<String, List<ServiceMetricEvent>> metricEvents = serviceEmitter.getMetricEvents();
+    Map<String, List<StubServiceEmitter.ServiceMetricEventSnapshot>> metricEvents = serviceEmitter.getMetricEvents();
     Assert.assertEquals(1, metricEvents.size());
 
-    List<ServiceMetricEvent> auditMetricEvents = metricEvents.get("config/audit");
+    List<StubServiceEmitter.ServiceMetricEventSnapshot> auditMetricEvents = metricEvents.get("config/audit");
     Assert.assertNotNull(auditMetricEvents);
     Assert.assertEquals(1, auditMetricEvents.size());
 
-    ServiceMetricEvent metric = auditMetricEvents.get(0);
+    ServiceMetricEvent metric = auditMetricEvents.get(0).getMetricEvent();
 
     final AuditEntry dbEntry = lookupAuditEntryForKey("testKey");
     Assert.assertNotNull(dbEntry);
@@ -120,14 +120,14 @@ public void testCreateAuditEntry() throws IOException
     Assert.assertEquals(entry, dbEntry);
 
     // Verify emitted metrics
-    Map<String, List<ServiceMetricEvent>> metricEvents = serviceEmitter.getMetricEvents();
+    Map<String, List<StubServiceEmitter.ServiceMetricEventSnapshot>> metricEvents = serviceEmitter.getMetricEvents();
     Assert.assertEquals(1, metricEvents.size());
 
-    List<ServiceMetricEvent> auditMetricEvents = metricEvents.get("config/audit");
+    List<StubServiceEmitter.ServiceMetricEventSnapshot> auditMetricEvents = metricEvents.get("config/audit");
     Assert.assertNotNull(auditMetricEvents);
     Assert.assertEquals(1, auditMetricEvents.size());
 
-    ServiceMetricEvent metric = auditMetricEvents.get(0);
+    ServiceMetricEvent metric = auditMetricEvents.get(0).getMetricEvent();
     Assert.assertEquals(dbEntry.getKey(), metric.getUserDims().get("key"));
     Assert.assertEquals(dbEntry.getType(), metric.getUserDims().get("type"));
     Assert.assertNull(metric.getUserDims().get("payload"));

From 6fad11fe5752566ddda003f14958460e9892f844 Mon Sep 17 00:00:00 2001
From: Akshat Jain <akjn11@gmail.com>
Date: Wed, 18 Dec 2024 21:59:10 +0530
Subject: [PATCH 48/56] Revert "Add back `UnnecessaryFullyQualifiedName` rule
 in pmd ruleset (#17570)" (#17584)

This reverts commit cd6083fb9423260e46876bfb3f4527c3581a9cb9.
---
 codestyle/pmd-ruleset.xml                     |  1 -
 .../apache/druid/storage/aliyun/OssUtils.java |  2 +-
 .../druid/compressedbigdecimal/Utils.java     |  2 +-
 .../druid/k8s/overlord/common/PeonPhase.java  |  2 +-
 .../RabbitStreamSupervisorTuningConfig.java   |  4 +-
 .../datasketches/hll/HllSketchHolder.java     | 10 +--
 .../datasketches/theta/SketchHolder.java      | 20 +++---
 .../druid/security/basic/BasicAuthUtils.java  |  6 +-
 .../druid/catalog/CatalogException.java       |  2 +-
 .../storage/hdfs/HdfsStorageDruidModule.java  |  6 +-
 .../KafkaSupervisorTuningConfig.java          |  2 +-
 .../k8s/discovery/DefaultK8sApiClient.java    |  4 +-
 .../k8s/discovery/K8sDruidNodeAnnouncer.java  | 10 +--
 ...SegmentGeneratorFrameProcessorFactory.java |  4 +-
 .../druid/msq/querykit/QueryKitUtils.java     | 18 ++---
 .../org/apache/druid/msq/sql/MSQMode.java     |  6 +-
 .../org/apache/druid/storage/s3/S3Utils.java  |  4 +-
 .../druid/indexer/DeterminePartitionsJob.java |  2 +-
 .../indexer/HadoopDruidIndexerConfig.java     | 14 ++--
 .../druid/indexer/HadoopTuningConfig.java     |  4 +-
 .../org/apache/druid/indexer/JobHelper.java   | 10 +--
 .../indexer/hadoop/DatasourceInputFormat.java |  2 +-
 .../common/task/AbstractBatchIndexTask.java   |  4 +-
 .../indexing/common/task/HadoopIndexTask.java |  4 +-
 .../druid/indexing/common/task/IndexTask.java | 17 ++---
 .../indexing/common/task/IndexTaskUtils.java  |  4 +-
 .../parallel/LegacySinglePhaseSubTask.java    |  2 +-
 .../PartialDimensionCardinalityTask.java      |  3 +-
 .../PartialDimensionDistributionTask.java     |  3 +-
 .../parallel/PartialSegmentMergeTask.java     |  3 +-
 .../batch/parallel/SinglePhaseSubTask.java    |  6 +-
 .../indexing/input/DruidInputSource.java      |  4 +-
 .../overlord/QuotableWhiteSpaceSplitter.java  |  2 +-
 .../SeekableStreamIndexTaskTuningConfig.java  |  7 +-
 .../testing/tools/CliCustomNodeRole.java      |  8 +--
 .../apache/druid/cli/CliCustomNodeRole.java   |  8 +--
 .../AvroSchemaRegistryEventSerializer.java    |  2 +-
 ...ProtobufSchemaRegistryEventSerializer.java |  2 +-
 .../spatial/search/PolygonBound.java          |  2 +-
 .../druid/common/config/NullHandling.java     |  6 +-
 .../druid/common/guava/FutureUtils.java       |  6 +-
 .../apache/druid/common/utils/IdUtils.java    |  2 +-
 .../druid/data/input/impl/DimensionsSpec.java |  2 +-
 .../input/impl/DoubleDimensionSchema.java     |  2 +-
 .../data/input/impl/FloatDimensionSchema.java |  2 +-
 .../data/input/impl/LongDimensionSchema.java  |  2 +-
 .../input/impl/NewSpatialDimensionSchema.java |  2 +-
 .../input/impl/StringDimensionSchema.java     |  2 +-
 .../intset/ImmutableConciseSet.java           |  2 +-
 .../java/org/apache/druid/frame/Frame.java    |  4 +-
 .../apache/druid/frame/key/RowKeyReader.java  |  2 +-
 .../druid/frame/processor/OutputChannel.java  |  2 +-
 .../druid/frame/util/DurableStorageUtils.java |  2 +-
 .../druid/frame/write/FrameWriterUtils.java   |  2 +-
 .../druid/hll/HyperLogLogCollector.java       |  6 +-
 .../apache/druid/indexer/TaskLocation.java    |  2 +-
 .../DimensionRangePartitionsSpec.java         |  2 +-
 .../partitions/DynamicPartitionsSpec.java     |  2 +-
 .../partitions/HashedPartitionsSpec.java      |  2 +-
 .../apache/druid/java/util/common/Either.java |  2 +-
 .../java/util/common/HumanReadableBytes.java  |  2 +-
 .../druid/java/util/common/StringUtils.java   | 14 ++--
 .../common/granularity/Granularities.java     |  2 +-
 .../common/granularity/GranularityType.java   | 30 ++++----
 .../java/util/common/guava/Sequences.java     |  2 +-
 .../common/parsers/JSONPathFieldSpec.java     |  2 +-
 .../java/util/common/parsers/ParserUtils.java |  2 +-
 .../util/emitter/core/HttpPostEmitter.java    |  4 +-
 .../util/emitter/service/AlertBuilder.java    |  2 +-
 .../org/apache/druid/math/expr/Evals.java     |  6 +-
 .../org/apache/druid/math/expr/ExprEval.java  | 70 +++++++++----------
 .../druid/math/expr/ExprMacroTable.java       |  2 +-
 .../org/apache/druid/math/expr/ExprType.java  |  2 +-
 .../druid/math/expr/ExpressionType.java       |  2 +-
 .../math/expr/ExpressionTypeConversion.java   |  2 +-
 .../org/apache/druid/math/expr/Parser.java    |  2 +-
 .../apache/druid/query/JoinDataSource.java    |  2 +-
 .../query/aggregation/AggregatorUtil.java     |  4 +-
 .../any/StringAnyAggregatorFactory.java       |  2 +-
 .../first/StringFirstAggregatorFactory.java   |  2 +-
 .../post/ArithmeticPostAggregator.java        |  2 +-
 .../DataSourceMetadataQuery.java              |  2 +-
 .../druid/query/filter/InDimFilter.java       |  2 +-
 .../druid/query/groupby/GroupByQuery.java     |  2 +-
 .../druid/query/groupby/GroupingEngine.java   |  2 +-
 .../apache/druid/query/groupby/ResultRow.java |  2 +-
 .../epinephelinae/RowBasedGrouperHelper.java  |  2 +-
 .../groupby/orderby/OrderByColumnSpec.java    |  4 +-
 .../metadata/metadata/ColumnAnalysis.java     |  6 +-
 .../metadata/SegmentMetadataQuery.java        |  2 +-
 .../query/operator/WindowOperatorQuery.java   |  2 +-
 .../query/ordering/StringComparators.java     | 14 ++--
 .../MapOfColumnsRowsAndColumns.java           |  2 +-
 .../druid/query/search/SearchQuery.java       |  2 +-
 .../query/timeboundary/TimeBoundaryQuery.java |  2 +-
 .../query/timeseries/TimeseriesQuery.java     |  2 +-
 .../druid/query/topn/PooledTopNAlgorithm.java |  8 +--
 .../druid/segment/AutoTypeColumnIndexer.java  |  4 +-
 .../druid/segment/DimensionHandlerUtils.java  |  4 +-
 .../apache/druid/segment/IndexMergerV9.java   |  2 +-
 .../org/apache/druid/segment/IndexSpec.java   |  2 +-
 .../segment/NestedDataColumnIndexerV4.java    |  2 +-
 .../RowBasedColumnSelectorFactory.java        |  2 +-
 .../segment/column/ColumnCapabilities.java    |  4 +-
 .../column/ColumnCapabilitiesImpl.java        |  2 +-
 .../druid/segment/column/ColumnType.java      | 18 ++---
 .../druid/segment/column/ValueType.java       |  6 +-
 .../segment/data/CompressionFactory.java      |  2 +-
 .../segment/data/CompressionStrategy.java     |  4 +-
 .../druid/segment/data/FrontCodedIndexed.java |  6 +-
 .../apache/druid/segment/data/Indexed.java    |  2 +-
 .../apache/druid/segment/filter/Filters.java  |  4 +-
 .../druid/segment/filter/ValueMatchers.java   |  2 +-
 .../index/IndexedUtf8ValueIndexes.java        |  2 +-
 .../druid/segment/nested/FieldTypeInfo.java   |  2 +-
 .../NestedCommonFormatColumnSerializer.java   |  2 +-
 .../NestedFieldColumnIndexSupplier.java       |  6 +-
 .../ScalarDoubleColumnAndIndexSupplier.java   |  4 +-
 .../ScalarLongColumnAndIndexSupplier.java     |  4 +-
 .../DictionaryEncodedColumnPartSerde.java     |  2 +-
 ...ExpressionMultiValueDimensionSelector.java |  2 +-
 ...EvaluationExpressionDimensionSelector.java |  3 +-
 ...tionExpressionDimensionVectorSelector.java |  3 +-
 ...AsBrokerQueryComponentSupplierWrapper.java |  2 +-
 .../apache/druid/quidem/QuidemRecorder.java   |  6 +-
 .../druid/catalog/model/CatalogUtils.java     |  4 +-
 .../catalog/model/table/DatasourceDefn.java   |  2 +-
 .../discovery/DruidNodeDiscoveryProvider.java |  2 +-
 .../org/apache/druid/guice/DruidBinders.java  |  2 +-
 .../org/apache/druid/metadata/SortOrder.java  |  4 +-
 .../druid/rpc/guice/ServiceClientModule.java  |  2 +-
 .../server/compaction/CompactionStatus.java   | 24 +++----
 .../BroadcastDatasourceLoadingSpec.java       |  2 +-
 .../druid/server/coordination/ServerType.java |  6 +-
 .../balancer/SegmentToMoveCalculator.java     |  6 +-
 .../server/http/HostAndPortWithScheme.java    |  4 +-
 .../StandardResponseHeaderFilterHolder.java   |  2 +-
 .../lookup/cache/LookupLoadingSpec.java       |  2 +-
 .../druid/server/metrics/MonitorsConfig.java  |  4 +-
 .../server/security/AuthorizationUtils.java   |  4 +-
 .../plan/volcano/DruidVolcanoCost.java        |  8 +--
 .../aggregation/builtin/MaxSqlAggregator.java |  2 +-
 .../aggregation/builtin/MinSqlAggregator.java |  2 +-
 .../aggregation/builtin/SumSqlAggregator.java |  2 +-
 .../expression/DefaultOperandTypeChecker.java |  2 +-
 .../filtration/ConvertSelectorsToIns.java     |  6 +-
 .../calcite/planner/CalciteRulesManager.java  |  6 +-
 .../druid/sql/calcite/planner/Calcites.java   |  6 +-
 .../calcite/planner/DruidOperatorTable.java   |  2 +-
 .../sql/calcite/planner/DruidTypeSystem.java  | 28 ++++----
 .../sql/calcite/planner/PlannerConfig.java    |  2 +-
 .../druid/sql/calcite/rel/Grouping.java       |  2 +-
 .../apache/druid/sql/http/ObjectWriter.java   |  6 +-
 .../apache/druid/sql/http/SqlResource.java    |  2 +-
 154 files changed, 374 insertions(+), 362 deletions(-)

diff --git a/codestyle/pmd-ruleset.xml b/codestyle/pmd-ruleset.xml
index f10d4f3da197..7d7285d0a516 100644
--- a/codestyle/pmd-ruleset.xml
+++ b/codestyle/pmd-ruleset.xml
@@ -29,5 +29,4 @@ This ruleset defines the PMD rules for the Apache Druid project.
 
   <rule ref="category/java/codestyle.xml/UnnecessaryImport" />
   <rule ref="category/java/codestyle.xml/TooManyStaticImports" />
-  <rule ref="category/java/codestyle.xml/UnnecessaryFullyQualifiedName"/>
 </ruleset>
diff --git a/extensions-contrib/aliyun-oss-extensions/src/main/java/org/apache/druid/storage/aliyun/OssUtils.java b/extensions-contrib/aliyun-oss-extensions/src/main/java/org/apache/druid/storage/aliyun/OssUtils.java
index 60037389276a..fa1b656f0aa9 100644
--- a/extensions-contrib/aliyun-oss-extensions/src/main/java/org/apache/druid/storage/aliyun/OssUtils.java
+++ b/extensions-contrib/aliyun-oss-extensions/src/main/java/org/apache/druid/storage/aliyun/OssUtils.java
@@ -227,7 +227,7 @@ private static void deleteBucketKeys(
       throws Exception
   {
     DeleteObjectsRequest deleteRequest = new DeleteObjectsRequest(bucket).withKeys(keysToDelete);
-    retry(() -> {
+    OssUtils.retry(() -> {
       client.deleteObjects(deleteRequest);
       return null;
     });
diff --git a/extensions-contrib/compressed-bigdecimal/src/main/java/org/apache/druid/compressedbigdecimal/Utils.java b/extensions-contrib/compressed-bigdecimal/src/main/java/org/apache/druid/compressedbigdecimal/Utils.java
index b02765f92ccd..a214bfd057a8 100644
--- a/extensions-contrib/compressed-bigdecimal/src/main/java/org/apache/druid/compressedbigdecimal/Utils.java
+++ b/extensions-contrib/compressed-bigdecimal/src/main/java/org/apache/druid/compressedbigdecimal/Utils.java
@@ -128,7 +128,7 @@ public static CompressedBigDecimal objToCompressedBigDecimalWithScale(
       boolean strictNumberParse
   )
   {
-    CompressedBigDecimal compressedBigDecimal = objToCompressedBigDecimal(obj, strictNumberParse);
+    CompressedBigDecimal compressedBigDecimal = Utils.objToCompressedBigDecimal(obj, strictNumberParse);
 
     if (compressedBigDecimal != null) {
       return scaleIfNeeded(compressedBigDecimal, scale);
diff --git a/extensions-contrib/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/common/PeonPhase.java b/extensions-contrib/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/common/PeonPhase.java
index db155269d4fd..6efcd34872b8 100644
--- a/extensions-contrib/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/common/PeonPhase.java
+++ b/extensions-contrib/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/common/PeonPhase.java
@@ -34,7 +34,7 @@ public enum PeonPhase
   UNKNOWN("Unknown"),
   RUNNING("Running");
 
-  private static final Map<String, PeonPhase> PHASE_MAP = Arrays.stream(values())
+  private static final Map<String, PeonPhase> PHASE_MAP = Arrays.stream(PeonPhase.values())
                                                                 .collect(Collectors.toMap(
                                                                     PeonPhase::getPhase,
                                                                     Function.identity()
diff --git a/extensions-contrib/rabbit-stream-indexing-service/src/main/java/org/apache/druid/indexing/rabbitstream/supervisor/RabbitStreamSupervisorTuningConfig.java b/extensions-contrib/rabbit-stream-indexing-service/src/main/java/org/apache/druid/indexing/rabbitstream/supervisor/RabbitStreamSupervisorTuningConfig.java
index 6b8640144854..a2667026fffd 100644
--- a/extensions-contrib/rabbit-stream-indexing-service/src/main/java/org/apache/druid/indexing/rabbitstream/supervisor/RabbitStreamSupervisorTuningConfig.java
+++ b/extensions-contrib/rabbit-stream-indexing-service/src/main/java/org/apache/druid/indexing/rabbitstream/supervisor/RabbitStreamSupervisorTuningConfig.java
@@ -173,7 +173,9 @@ public Duration getShutdownTimeout()
   public Duration getRepartitionTransitionDuration()
   {
     // just return a default for now.
-    return SeekableStreamSupervisorTuningConfig.defaultDuration(null, DEFAULT_REPARTITION_TRANSITION_DURATION);
+    return SeekableStreamSupervisorTuningConfig.defaultDuration(
+        null,
+        SeekableStreamSupervisorTuningConfig.DEFAULT_REPARTITION_TRANSITION_DURATION);
   }
 
   @Override
diff --git a/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/hll/HllSketchHolder.java b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/hll/HllSketchHolder.java
index a79c4a5c4ab4..df0b884eaaec 100644
--- a/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/hll/HllSketchHolder.java
+++ b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/hll/HllSketchHolder.java
@@ -38,15 +38,15 @@ public static HllSketchHolder fromObj(Object obj)
     if (obj instanceof HllSketchHolder) {
       return (HllSketchHolder) obj;
     } else if (obj instanceof HllSketch) {
-      return of((HllSketch) obj);
+      return HllSketchHolder.of((HllSketch) obj);
     } else if (obj instanceof Union) {
-      return of((Union) obj);
+      return HllSketchHolder.of((Union) obj);
     } else if (obj instanceof byte[]) {
-      return of(HllSketch.heapify((byte[]) obj));
+      return HllSketchHolder.of(HllSketch.heapify((byte[]) obj));
     } else if (obj instanceof Memory) {
-      return of(HllSketch.wrap((Memory) obj));
+      return HllSketchHolder.of(HllSketch.wrap((Memory) obj));
     } else if (obj instanceof String) {
-      return of(HllSketch.heapify(StringUtils.decodeBase64(StringUtils.toUtf8((String) obj))));
+      return HllSketchHolder.of(HllSketch.heapify(StringUtils.decodeBase64(StringUtils.toUtf8((String) obj))));
     }
 
     throw new ISE("Object is not of a type[%s] that can be deserialized to sketch.", obj.getClass());
diff --git a/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/theta/SketchHolder.java b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/theta/SketchHolder.java
index ab8abaf34213..c9229042763a 100644
--- a/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/theta/SketchHolder.java
+++ b/extensions-core/datasketches/src/main/java/org/apache/druid/query/aggregation/datasketches/theta/SketchHolder.java
@@ -45,7 +45,7 @@
  */
 public class SketchHolder
 {
-  public static final SketchHolder EMPTY = of(
+  public static final SketchHolder EMPTY = SketchHolder.of(
       Sketches.updateSketchBuilder()
               .build()
               .compact(true, null)
@@ -195,7 +195,7 @@ public static SketchHolder combine(Object o1, Object o2, int nomEntries)
       Union union = (Union) SetOperation.builder().setNominalEntries(nomEntries).build(Family.UNION);
       holder1.updateUnion(union);
       holder2.updateUnion(union);
-      return of(union);
+      return SketchHolder.of(union);
     }
   }
 
@@ -208,15 +208,15 @@ void invalidateCache()
   public static SketchHolder deserialize(Object serializedSketch)
   {
     if (serializedSketch instanceof String) {
-      return of(deserializeFromBase64EncodedString((String) serializedSketch));
+      return SketchHolder.of(deserializeFromBase64EncodedString((String) serializedSketch));
     } else if (serializedSketch instanceof byte[]) {
-      return of(deserializeFromByteArray((byte[]) serializedSketch));
+      return SketchHolder.of(deserializeFromByteArray((byte[]) serializedSketch));
     } else if (serializedSketch instanceof SketchHolder) {
       return (SketchHolder) serializedSketch;
     } else if (serializedSketch instanceof Sketch
                || serializedSketch instanceof Union
                || serializedSketch instanceof Memory) {
-      return of(serializedSketch);
+      return SketchHolder.of(serializedSketch);
     }
 
     throw new ISE(
@@ -228,9 +228,9 @@ public static SketchHolder deserialize(Object serializedSketch)
   public static SketchHolder deserializeSafe(Object serializedSketch)
   {
     if (serializedSketch instanceof String) {
-      return of(deserializeFromBase64EncodedStringSafe((String) serializedSketch));
+      return SketchHolder.of(deserializeFromBase64EncodedStringSafe((String) serializedSketch));
     } else if (serializedSketch instanceof byte[]) {
-      return of(deserializeFromByteArraySafe((byte[]) serializedSketch));
+      return SketchHolder.of(deserializeFromByteArraySafe((byte[]) serializedSketch));
     }
 
     return deserialize(serializedSketch);
@@ -285,13 +285,13 @@ public static SketchHolder sketchSetOperation(Func func, int sketchSize, Object.
         for (Object o : holders) {
           ((SketchHolder) o).updateUnion(union);
         }
-        return of(union);
+        return SketchHolder.of(union);
       case INTERSECT:
         Intersection intersection = (Intersection) SetOperation.builder().setNominalEntries(sketchSize).build(Family.INTERSECTION);
         for (Object o : holders) {
           intersection.intersect(((SketchHolder) o).getSketch());
         }
-        return of(intersection.getResult(false, null));
+        return SketchHolder.of(intersection.getResult(false, null));
       case NOT:
         if (holders.length < 1) {
           throw new IllegalArgumentException("A-Not-B requires at least 1 sketch");
@@ -306,7 +306,7 @@ public static SketchHolder sketchSetOperation(Func func, int sketchSize, Object.
           AnotB anotb = (AnotB) SetOperation.builder().setNominalEntries(sketchSize).build(Family.A_NOT_B);
           result = anotb.aNotB(result, ((SketchHolder) holders[i]).getSketch());
         }
-        return of(result);
+        return SketchHolder.of(result);
       default:
         throw new IllegalArgumentException("Unknown sketch operation " + func);
     }
diff --git a/extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/BasicAuthUtils.java b/extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/BasicAuthUtils.java
index 03aec3954e5a..44948df4a6ad 100644
--- a/extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/BasicAuthUtils.java
+++ b/extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/BasicAuthUtils.java
@@ -160,7 +160,7 @@ public static Map<String, BasicAuthorizerUser> deserializeAuthorizerUserMap(
       userMap = new HashMap<>();
     } else {
       try {
-        userMap = objectMapper.readValue(userMapBytes, AUTHORIZER_USER_MAP_TYPE_REFERENCE);
+        userMap = objectMapper.readValue(userMapBytes, BasicAuthUtils.AUTHORIZER_USER_MAP_TYPE_REFERENCE);
       }
       catch (IOException ioe) {
         throw new RuntimeException("Couldn't deserialize authorizer userMap!", ioe);
@@ -189,7 +189,7 @@ public static Map<String, BasicAuthorizerGroupMapping> deserializeAuthorizerGrou
       groupMappingMap = new HashMap<>();
     } else {
       try {
-        groupMappingMap = objectMapper.readValue(groupMappingMapBytes, AUTHORIZER_GROUP_MAPPING_MAP_TYPE_REFERENCE);
+        groupMappingMap = objectMapper.readValue(groupMappingMapBytes, BasicAuthUtils.AUTHORIZER_GROUP_MAPPING_MAP_TYPE_REFERENCE);
       }
       catch (IOException ioe) {
         throw new RuntimeException("Couldn't deserialize authorizer groupMappingMap!", ioe);
@@ -218,7 +218,7 @@ public static Map<String, BasicAuthorizerRole> deserializeAuthorizerRoleMap(
       roleMap = new HashMap<>();
     } else {
       try {
-        roleMap = objectMapper.readValue(roleMapBytes, AUTHORIZER_ROLE_MAP_TYPE_REFERENCE);
+        roleMap = objectMapper.readValue(roleMapBytes, BasicAuthUtils.AUTHORIZER_ROLE_MAP_TYPE_REFERENCE);
       }
       catch (IOException ioe) {
         throw new RuntimeException("Couldn't deserialize authorizer roleMap!", ioe);
diff --git a/extensions-core/druid-catalog/src/main/java/org/apache/druid/catalog/CatalogException.java b/extensions-core/druid-catalog/src/main/java/org/apache/druid/catalog/CatalogException.java
index e7a7d63e1ecb..c09fe35a5a14 100644
--- a/extensions-core/druid-catalog/src/main/java/org/apache/druid/catalog/CatalogException.java
+++ b/extensions-core/druid-catalog/src/main/java/org/apache/druid/catalog/CatalogException.java
@@ -79,7 +79,7 @@ public CatalogException(
   public static CatalogException badRequest(String msg, Object...args)
   {
     return new CatalogException(
-        INVALID_ERROR,
+        CatalogException.INVALID_ERROR,
         Response.Status.BAD_REQUEST,
         msg,
         args
diff --git a/extensions-core/hdfs-storage/src/main/java/org/apache/druid/storage/hdfs/HdfsStorageDruidModule.java b/extensions-core/hdfs-storage/src/main/java/org/apache/druid/storage/hdfs/HdfsStorageDruidModule.java
index 159c247becc3..e2c79785fe4f 100644
--- a/extensions-core/hdfs-storage/src/main/java/org/apache/druid/storage/hdfs/HdfsStorageDruidModule.java
+++ b/extensions-core/hdfs-storage/src/main/java/org/apache/druid/storage/hdfs/HdfsStorageDruidModule.java
@@ -65,9 +65,9 @@ public List<? extends Module> getJacksonModules()
   {
     return Collections.singletonList(
         new SimpleModule().registerSubtypes(
-            new NamedType(HdfsLoadSpec.class, SCHEME),
-            new NamedType(HdfsInputSource.class, SCHEME),
-            new NamedType(HdfsInputSourceFactory.class, SCHEME)
+            new NamedType(HdfsLoadSpec.class, HdfsStorageDruidModule.SCHEME),
+            new NamedType(HdfsInputSource.class, HdfsStorageDruidModule.SCHEME),
+            new NamedType(HdfsInputSourceFactory.class, HdfsStorageDruidModule.SCHEME)
         )
     );
   }
diff --git a/extensions-core/kafka-indexing-service/src/main/java/org/apache/druid/indexing/kafka/supervisor/KafkaSupervisorTuningConfig.java b/extensions-core/kafka-indexing-service/src/main/java/org/apache/druid/indexing/kafka/supervisor/KafkaSupervisorTuningConfig.java
index 4186837bbb00..1e0b35874090 100644
--- a/extensions-core/kafka-indexing-service/src/main/java/org/apache/druid/indexing/kafka/supervisor/KafkaSupervisorTuningConfig.java
+++ b/extensions-core/kafka-indexing-service/src/main/java/org/apache/druid/indexing/kafka/supervisor/KafkaSupervisorTuningConfig.java
@@ -169,7 +169,7 @@ public Duration getRepartitionTransitionDuration()
     // just return a default for now.
     return SeekableStreamSupervisorTuningConfig.defaultDuration(
         null,
-        DEFAULT_REPARTITION_TRANSITION_DURATION
+        SeekableStreamSupervisorTuningConfig.DEFAULT_REPARTITION_TRANSITION_DURATION
     );
   }
 
diff --git a/extensions-core/kubernetes-extensions/src/main/java/org/apache/druid/k8s/discovery/DefaultK8sApiClient.java b/extensions-core/kubernetes-extensions/src/main/java/org/apache/druid/k8s/discovery/DefaultK8sApiClient.java
index 023605a28a92..03a1b6914a85 100644
--- a/extensions-core/kubernetes-extensions/src/main/java/org/apache/druid/k8s/discovery/DefaultK8sApiClient.java
+++ b/extensions-core/kubernetes-extensions/src/main/java/org/apache/druid/k8s/discovery/DefaultK8sApiClient.java
@@ -131,7 +131,7 @@ public boolean hasNext() throws SocketTimeoutException
           try {
             while (watch.hasNext()) {
               Watch.Response<V1Pod> item = watch.next();
-              if (item != null && item.type != null && !BOOKMARK.equals(item.type)) {
+              if (item != null && item.type != null && !item.type.equals(WatchResult.BOOKMARK)) {
                 DiscoveryDruidNodeAndResourceVersion result = null;
                 if (item.object != null) {
                   result = new DiscoveryDruidNodeAndResourceVersion(
@@ -150,7 +150,7 @@ public boolean hasNext() throws SocketTimeoutException
                     result
                 );
                 return true;
-              } else if (item != null && item.type != null && BOOKMARK.equals(item.type)) {
+              } else if (item != null && item.type != null && item.type.equals(WatchResult.BOOKMARK)) {
                 // Events with type BOOKMARK will only contain resourceVersion and no metadata. See
                 // Kubernetes API documentation for details.
                 LOGGER.debug("BOOKMARK event fired, no nothing, only update resourceVersion");
diff --git a/extensions-core/kubernetes-extensions/src/main/java/org/apache/druid/k8s/discovery/K8sDruidNodeAnnouncer.java b/extensions-core/kubernetes-extensions/src/main/java/org/apache/druid/k8s/discovery/K8sDruidNodeAnnouncer.java
index 184b766128f9..f47fcfc0c9aa 100644
--- a/extensions-core/kubernetes-extensions/src/main/java/org/apache/druid/k8s/discovery/K8sDruidNodeAnnouncer.java
+++ b/extensions-core/kubernetes-extensions/src/main/java/org/apache/druid/k8s/discovery/K8sDruidNodeAnnouncer.java
@@ -208,8 +208,8 @@ public static String getLabelSelectorForNodeRole(K8sDiscoveryConfig discoveryCon
         "%s=%s,%s=%s",
         getClusterIdentifierAnnouncementLabel(),
         discoveryConfig.getClusterIdentifier(),
-        getRoleAnnouncementLabel(nodeRole),
-        ANNOUNCEMENT_DONE
+        K8sDruidNodeAnnouncer.getRoleAnnouncementLabel(nodeRole),
+        K8sDruidNodeAnnouncer.ANNOUNCEMENT_DONE
     );
   }
 
@@ -219,9 +219,9 @@ public static String getLabelSelectorForNode(K8sDiscoveryConfig discoveryConfig,
         "%s=%s,%s=%s,%s=%s",
         getClusterIdentifierAnnouncementLabel(),
         discoveryConfig.getClusterIdentifier(),
-        getRoleAnnouncementLabel(nodeRole),
-        ANNOUNCEMENT_DONE,
-        getIdHashAnnouncementLabel(),
+        K8sDruidNodeAnnouncer.getRoleAnnouncementLabel(nodeRole),
+        K8sDruidNodeAnnouncer.ANNOUNCEMENT_DONE,
+        K8sDruidNodeAnnouncer.getIdHashAnnouncementLabel(),
         hashEncodeStringForLabelValue(node.getHostAndPortToUse())
     );
   }
diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/processor/SegmentGeneratorFrameProcessorFactory.java b/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/processor/SegmentGeneratorFrameProcessorFactory.java
index 428fed78cf45..3fa5654c2a55 100644
--- a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/processor/SegmentGeneratorFrameProcessorFactory.java
+++ b/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/processor/SegmentGeneratorFrameProcessorFactory.java
@@ -287,7 +287,7 @@ private static AppenderatorConfig makeAppenderatorConfig(
       @Override
       public AppendableIndexSpec getAppendableIndexSpec()
       {
-        return DEFAULT_APPENDABLE_INDEX;
+        return TuningConfig.DEFAULT_APPENDABLE_INDEX;
       }
 
       @Override
@@ -346,7 +346,7 @@ public int getMaxPendingPersists()
       @Override
       public boolean isSkipBytesInMemoryOverheadCheck()
       {
-        return DEFAULT_SKIP_BYTES_IN_MEMORY_OVERHEAD_CHECK;
+        return TuningConfig.DEFAULT_SKIP_BYTES_IN_MEMORY_OVERHEAD_CHECK;
       }
 
       @Override
diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/querykit/QueryKitUtils.java b/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/querykit/QueryKitUtils.java
index ea6b00a8c867..bc0c64c251a7 100644
--- a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/querykit/QueryKitUtils.java
+++ b/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/querykit/QueryKitUtils.java
@@ -111,7 +111,7 @@ public static ClusterBy clusterByWithSegmentGranularity(
       return clusterBy;
     } else {
       final List<KeyColumn> newColumns = new ArrayList<>(clusterBy.getColumns().size() + 1);
-      newColumns.add(new KeyColumn(SEGMENT_GRANULARITY_COLUMN, KeyOrder.ASCENDING));
+      newColumns.add(new KeyColumn(QueryKitUtils.SEGMENT_GRANULARITY_COLUMN, KeyOrder.ASCENDING));
       newColumns.addAll(clusterBy.getColumns());
       return new ClusterBy(newColumns, 1);
     }
@@ -123,10 +123,10 @@ public static ClusterBy clusterByWithSegmentGranularity(
    */
   public static void verifyRowSignature(final RowSignature signature)
   {
-    if (signature.contains(PARTITION_BOOST_COLUMN)) {
-      throw new MSQException(new ColumnNameRestrictedFault(PARTITION_BOOST_COLUMN));
-    } else if (signature.contains(SEGMENT_GRANULARITY_COLUMN)) {
-      throw new MSQException(new ColumnNameRestrictedFault(SEGMENT_GRANULARITY_COLUMN));
+    if (signature.contains(QueryKitUtils.PARTITION_BOOST_COLUMN)) {
+      throw new MSQException(new ColumnNameRestrictedFault(QueryKitUtils.PARTITION_BOOST_COLUMN));
+    } else if (signature.contains(QueryKitUtils.SEGMENT_GRANULARITY_COLUMN)) {
+      throw new MSQException(new ColumnNameRestrictedFault(QueryKitUtils.SEGMENT_GRANULARITY_COLUMN));
     }
   }
 
@@ -144,7 +144,7 @@ public static RowSignature signatureWithSegmentGranularity(
     } else {
       return RowSignature.builder()
                          .addAll(signature)
-                         .add(SEGMENT_GRANULARITY_COLUMN, ColumnType.LONG)
+                         .add(QueryKitUtils.SEGMENT_GRANULARITY_COLUMN, ColumnType.LONG)
                          .build();
     }
   }
@@ -194,8 +194,8 @@ public static RowSignature sortableSignature(
   public static VirtualColumn makeSegmentGranularityVirtualColumn(final ObjectMapper jsonMapper, final QueryContext queryContext)
   {
     final Granularity segmentGranularity =
-        getSegmentGranularityFromContext(jsonMapper, queryContext.asMap());
-    final String timeColumnName = queryContext.getString(CTX_TIME_COLUMN_NAME);
+        QueryKitUtils.getSegmentGranularityFromContext(jsonMapper, queryContext.asMap());
+    final String timeColumnName = queryContext.getString(QueryKitUtils.CTX_TIME_COLUMN_NAME);
 
     if (timeColumnName == null || Granularities.ALL.equals(segmentGranularity)) {
       return null;
@@ -213,7 +213,7 @@ public static VirtualColumn makeSegmentGranularityVirtualColumn(final ObjectMapp
     }
 
     return new ExpressionVirtualColumn(
-        SEGMENT_GRANULARITY_COLUMN,
+        QueryKitUtils.SEGMENT_GRANULARITY_COLUMN,
         StringUtils.format(
             "timestamp_floor(%s, %s)",
             CalciteSqlDialect.DEFAULT.quoteIdentifier(timeColumnName),
diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/sql/MSQMode.java b/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/sql/MSQMode.java
index 3685b876c93f..d2f017b04dd6 100644
--- a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/sql/MSQMode.java
+++ b/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/sql/MSQMode.java
@@ -50,7 +50,7 @@ public enum MSQMode
   @Nullable
   public static MSQMode fromString(String str)
   {
-    for (MSQMode msqMode : values()) {
+    for (MSQMode msqMode : MSQMode.values()) {
       if (msqMode.value.equalsIgnoreCase(str)) {
         return msqMode;
       }
@@ -66,12 +66,12 @@ public String toString()
 
   public static void populateDefaultQueryContext(final String modeStr, final Map<String, Object> originalQueryContext)
   {
-    MSQMode mode = fromString(modeStr);
+    MSQMode mode = MSQMode.fromString(modeStr);
     if (mode == null) {
       throw new ISE(
           "%s is an unknown multi stage query mode. Acceptable modes: %s",
           modeStr,
-          Arrays.stream(values()).map(m -> m.value).collect(Collectors.toList())
+          Arrays.stream(MSQMode.values()).map(m -> m.value).collect(Collectors.toList())
       );
     }
     log.debug("Populating default query context with %s for the %s multi stage query mode", mode.defaultQueryContext, mode);
diff --git a/extensions-core/s3-extensions/src/main/java/org/apache/druid/storage/s3/S3Utils.java b/extensions-core/s3-extensions/src/main/java/org/apache/druid/storage/s3/S3Utils.java
index 11bf1f613f02..b299d4f9dd80 100644
--- a/extensions-core/s3-extensions/src/main/java/org/apache/druid/storage/s3/S3Utils.java
+++ b/extensions-core/s3-extensions/src/main/java/org/apache/druid/storage/s3/S3Utils.java
@@ -327,7 +327,7 @@ public static void deleteBucketKeys(
       log.debug("Deleting keys from bucket: [%s], keys: [%s]", bucket, keys);
     }
     DeleteObjectsRequest deleteRequest = new DeleteObjectsRequest(bucket).withKeys(keysToDelete);
-    retryS3Operation(() -> {
+    S3Utils.retryS3Operation(() -> {
       s3Client.deleteObjects(deleteRequest);
       return null;
     }, retries);
@@ -353,7 +353,7 @@ static void uploadFileIfPossible(
     final PutObjectRequest putObjectRequest = new PutObjectRequest(bucket, key, file);
 
     if (!disableAcl) {
-      putObjectRequest.setAccessControlList(grantFullControlToBucketOwner(service, bucket));
+      putObjectRequest.setAccessControlList(S3Utils.grantFullControlToBucketOwner(service, bucket));
     }
     log.info("Pushing [%s] to bucket[%s] and key[%s].", file, bucket, key);
     service.putObject(putObjectRequest);
diff --git a/indexing-hadoop/src/main/java/org/apache/druid/indexer/DeterminePartitionsJob.java b/indexing-hadoop/src/main/java/org/apache/druid/indexer/DeterminePartitionsJob.java
index 82b04c5bb8aa..3efb6c5bec7e 100644
--- a/indexing-hadoop/src/main/java/org/apache/druid/indexer/DeterminePartitionsJob.java
+++ b/indexing-hadoop/src/main/java/org/apache/druid/indexer/DeterminePartitionsJob.java
@@ -956,7 +956,7 @@ public void close(TaskAttemptContext context)
     @Override
     public void checkOutputSpecs(JobContext job) throws IOException
     {
-      Path outDir = getOutputPath(job);
+      Path outDir = FileOutputFormat.getOutputPath(job);
       if (outDir == null) {
         throw new InvalidJobConfException("Output directory not set.");
       }
diff --git a/indexing-hadoop/src/main/java/org/apache/druid/indexer/HadoopDruidIndexerConfig.java b/indexing-hadoop/src/main/java/org/apache/druid/indexer/HadoopDruidIndexerConfig.java
index 2d46563c9056..bb830afd244f 100644
--- a/indexing-hadoop/src/main/java/org/apache/druid/indexer/HadoopDruidIndexerConfig.java
+++ b/indexing-hadoop/src/main/java/org/apache/druid/indexer/HadoopDruidIndexerConfig.java
@@ -148,13 +148,13 @@ private static HadoopDruidIndexerConfig fromMap(Map<String, Object> argSpec)
     // the Map<> intermediary
 
     if (argSpec.containsKey("spec")) {
-      return JSON_MAPPER.convertValue(
+      return HadoopDruidIndexerConfig.JSON_MAPPER.convertValue(
           argSpec,
           HadoopDruidIndexerConfig.class
       );
     }
     return new HadoopDruidIndexerConfig(
-        JSON_MAPPER.convertValue(
+        HadoopDruidIndexerConfig.JSON_MAPPER.convertValue(
             argSpec,
             HadoopIngestionSpec.class
         )
@@ -166,7 +166,7 @@ public static HadoopDruidIndexerConfig fromFile(File file)
   {
     try {
       return fromMap(
-          JSON_MAPPER.readValue(file, JacksonUtils.TYPE_REFERENCE_MAP_STRING_OBJECT)
+          HadoopDruidIndexerConfig.JSON_MAPPER.readValue(file, JacksonUtils.TYPE_REFERENCE_MAP_STRING_OBJECT)
       );
     }
     catch (IOException e) {
@@ -180,7 +180,7 @@ public static HadoopDruidIndexerConfig fromString(String str)
     // This is a map to try and prevent dependency screwbally-ness
     try {
       return fromMap(
-          JSON_MAPPER.readValue(str, JacksonUtils.TYPE_REFERENCE_MAP_STRING_OBJECT)
+          HadoopDruidIndexerConfig.JSON_MAPPER.readValue(str, JacksonUtils.TYPE_REFERENCE_MAP_STRING_OBJECT)
       );
     }
     catch (IOException e) {
@@ -197,7 +197,7 @@ public static HadoopDruidIndexerConfig fromDistributedFileSystem(String path)
       Reader reader = new InputStreamReader(fs.open(pt), StandardCharsets.UTF_8);
 
       return fromMap(
-          JSON_MAPPER.readValue(reader, JacksonUtils.TYPE_REFERENCE_MAP_STRING_OBJECT)
+          HadoopDruidIndexerConfig.JSON_MAPPER.readValue(reader, JacksonUtils.TYPE_REFERENCE_MAP_STRING_OBJECT)
       );
     }
     catch (Exception e) {
@@ -207,7 +207,7 @@ public static HadoopDruidIndexerConfig fromDistributedFileSystem(String path)
 
   public static HadoopDruidIndexerConfig fromConfiguration(Configuration conf)
   {
-    final HadoopDruidIndexerConfig retVal = fromString(conf.get(CONFIG_PROPERTY));
+    final HadoopDruidIndexerConfig retVal = fromString(conf.get(HadoopDruidIndexerConfig.CONFIG_PROPERTY));
     retVal.verify();
     return retVal;
   }
@@ -590,7 +590,7 @@ public void intoConfiguration(Job job)
     Configuration conf = job.getConfiguration();
 
     try {
-      conf.set(CONFIG_PROPERTY, JSON_MAPPER.writeValueAsString(this));
+      conf.set(HadoopDruidIndexerConfig.CONFIG_PROPERTY, HadoopDruidIndexerConfig.JSON_MAPPER.writeValueAsString(this));
     }
     catch (IOException e) {
       throw new RuntimeException(e);
diff --git a/indexing-hadoop/src/main/java/org/apache/druid/indexer/HadoopTuningConfig.java b/indexing-hadoop/src/main/java/org/apache/druid/indexer/HadoopTuningConfig.java
index dfc3a4c69355..9da6ead38cf1 100644
--- a/indexing-hadoop/src/main/java/org/apache/druid/indexer/HadoopTuningConfig.java
+++ b/indexing-hadoop/src/main/java/org/apache/druid/indexer/HadoopTuningConfig.java
@@ -188,9 +188,9 @@ public HadoopTuningConfig(
     this.ignoreInvalidRows = Configs.valueOrDefault(ignoreInvalidRows, false);
     this.maxParseExceptions = Configs.valueOrDefault(
         maxParseExceptions,
-        this.ignoreInvalidRows ? DEFAULT_MAX_PARSE_EXCEPTIONS : 0
+        this.ignoreInvalidRows ? TuningConfig.DEFAULT_MAX_PARSE_EXCEPTIONS : 0
     );
-    this.logParseExceptions = Configs.valueOrDefault(logParseExceptions, DEFAULT_LOG_PARSE_EXCEPTIONS);
+    this.logParseExceptions = Configs.valueOrDefault(logParseExceptions, TuningConfig.DEFAULT_LOG_PARSE_EXCEPTIONS);
     this.useYarnRMJobStatusFallback = Configs.valueOrDefault(useYarnRMJobStatusFallback, true);
 
     if (awaitSegmentAvailabilityTimeoutMillis == null || awaitSegmentAvailabilityTimeoutMillis < 0) {
diff --git a/indexing-hadoop/src/main/java/org/apache/druid/indexer/JobHelper.java b/indexing-hadoop/src/main/java/org/apache/druid/indexer/JobHelper.java
index ce042451d753..7639ba66b5f6 100644
--- a/indexing-hadoop/src/main/java/org/apache/druid/indexer/JobHelper.java
+++ b/indexing-hadoop/src/main/java/org/apache/druid/indexer/JobHelper.java
@@ -413,9 +413,9 @@ public static void maybeDeleteIntermediatePath(
     authenticate();
 
     HadoopDruidIndexerConfig config = HadoopDruidIndexerConfig.fromSpec(indexerSchema);
-    final Configuration configuration = injectSystemProperties(new Configuration(), config);
+    final Configuration configuration = JobHelper.injectSystemProperties(new Configuration(), config);
     config.addJobProperties(configuration);
-    injectDruidProperties(configuration, config);
+    JobHelper.injectDruidProperties(configuration, config);
     if (!config.getSchema().getTuningConfig().isLeaveIntermediate()) {
       if (jobSucceeded || config.getSchema().getTuningConfig().isCleanupOnFailure()) {
         Path workingPath = config.makeIntermediatePath();
@@ -619,7 +619,7 @@ public static Path makeTmpPath(
         prependFSIfNullScheme(fs, basePath),
         StringUtils.format(
             "./%s.%d",
-            dataSegmentPusher.makeIndexPathName(segmentTemplate, INDEX_ZIP),
+            dataSegmentPusher.makeIndexPathName(segmentTemplate, JobHelper.INDEX_ZIP),
             taskAttemptID.getId()
         )
     );
@@ -640,9 +640,9 @@ public static void renameIndexFilesForSegments(
   ) throws IOException
   {
     HadoopDruidIndexerConfig config = HadoopDruidIndexerConfig.fromSpec(indexerSchema);
-    final Configuration configuration = injectSystemProperties(new Configuration(), config);
+    final Configuration configuration = JobHelper.injectSystemProperties(new Configuration(), config);
     config.addJobProperties(configuration);
-    injectDruidProperties(configuration, config);
+    JobHelper.injectDruidProperties(configuration, config);
     for (DataSegmentAndIndexZipFilePath segmentAndIndexZipFilePath : segmentAndIndexZipFilePaths) {
       Path tmpPath = new Path(segmentAndIndexZipFilePath.getTmpIndexZipFilePath());
       Path finalIndexZipFilePath = new Path(segmentAndIndexZipFilePath.getFinalIndexZipFilePath());
diff --git a/indexing-hadoop/src/main/java/org/apache/druid/indexer/hadoop/DatasourceInputFormat.java b/indexing-hadoop/src/main/java/org/apache/druid/indexer/hadoop/DatasourceInputFormat.java
index 788b4987a38f..e6d39284c5af 100644
--- a/indexing-hadoop/src/main/java/org/apache/druid/indexer/hadoop/DatasourceInputFormat.java
+++ b/indexing-hadoop/src/main/java/org/apache/druid/indexer/hadoop/DatasourceInputFormat.java
@@ -160,7 +160,7 @@ protected FileStatus[] listStatus(JobConf job) throws IOException
         {
           // to avoid globbing which needs input path should be hadoop-compatible (':' is not acceptable in path, etc.)
           List<FileStatus> statusList = new ArrayList<>();
-          for (Path path : getInputPaths(job)) {
+          for (Path path : FileInputFormat.getInputPaths(job)) {
             // load spec in segment points specifically zip file itself
             statusList.add(path.getFileSystem(job).getFileStatus(path));
           }
diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/common/task/AbstractBatchIndexTask.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/AbstractBatchIndexTask.java
index 08c5accea335..185e6e014c69 100644
--- a/indexing-service/src/main/java/org/apache/druid/indexing/common/task/AbstractBatchIndexTask.java
+++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/AbstractBatchIndexTask.java
@@ -812,7 +812,7 @@ public static NonnullPair<Interval, String> findIntervalAndVersion(
         throw new ISE("Unspecified interval[%s] in granularitySpec[%s]", interval, granularitySpec);
       }
 
-      version = findVersion(versions, interval);
+      version = AbstractBatchIndexTask.findVersion(versions, interval);
       if (version == null) {
         throw new ISE("Cannot find a version for interval[%s]", interval);
       }
@@ -820,7 +820,7 @@ public static NonnullPair<Interval, String> findIntervalAndVersion(
       // We don't have explicit intervals. We can use the segment granularity to figure out what
       // interval we need, but we might not have already locked it.
       interval = granularitySpec.getSegmentGranularity().bucket(timestamp);
-      final String existingLockVersion = findVersion(versions, interval);
+      final String existingLockVersion = AbstractBatchIndexTask.findVersion(versions, interval);
       if (existingLockVersion == null) {
         if (ingestionSpec.getTuningConfig() instanceof ParallelIndexTuningConfig) {
           final int maxAllowedLockCount = ((ParallelIndexTuningConfig) ingestionSpec.getTuningConfig())
diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/common/task/HadoopIndexTask.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/HadoopIndexTask.java
index a8927d2fe1d3..319c1a7ab691 100644
--- a/indexing-service/src/main/java/org/apache/druid/indexing/common/task/HadoopIndexTask.java
+++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/HadoopIndexTask.java
@@ -535,7 +535,7 @@ private void killHadoopJob()
       String hadoopJobIdFile = getHadoopJobIdFileName();
 
       try {
-        ClassLoader loader = buildClassLoader(
+        ClassLoader loader = HadoopTask.buildClassLoader(
             getHadoopDependencyCoordinates(),
             taskConfig.getDefaultHadoopCoordinates()
         );
@@ -616,7 +616,7 @@ private void indexerGeneratorCleanupJob(
 
     final ClassLoader oldLoader = Thread.currentThread().getContextClassLoader();
     try {
-      ClassLoader loader = buildClassLoader(
+      ClassLoader loader = HadoopTask.buildClassLoader(
           getHadoopDependencyCoordinates(),
           taskConfig.getDefaultHadoopCoordinates()
       );
diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/common/task/IndexTask.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/IndexTask.java
index d745a8934315..9c114d3403f1 100644
--- a/indexing-service/src/main/java/org/apache/druid/indexing/common/task/IndexTask.java
+++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/IndexTask.java
@@ -81,6 +81,7 @@
 import org.apache.druid.segment.indexing.BatchIOConfig;
 import org.apache.druid.segment.indexing.DataSchema;
 import org.apache.druid.segment.indexing.IngestionSpec;
+import org.apache.druid.segment.indexing.TuningConfig;
 import org.apache.druid.segment.indexing.granularity.ArbitraryGranularitySpec;
 import org.apache.druid.segment.indexing.granularity.GranularitySpec;
 import org.apache.druid.segment.realtime.ChatHandler;
@@ -741,7 +742,7 @@ private Map<Interval, Optional<HyperLogLogCollector>> collectIntervalsAndShardSp
         Comparators.intervalsByStartThenEnd()
     );
     final Granularity queryGranularity = granularitySpec.getQueryGranularity();
-    try (final CloseableIterator<InputRow> inputRowIterator = inputSourceReader(
+    try (final CloseableIterator<InputRow> inputRowIterator = AbstractBatchIndexTask.inputSourceReader(
         tmpDir,
         ingestionSchema.getDataSchema(),
         inputSource,
@@ -1069,7 +1070,7 @@ public IndexIngestionSpec(
         throw new IAE("Cannot use parser and inputSource together. Try using inputFormat instead of parser.");
       }
 
-      IngestionMode ingestionMode = computeBatchIngestionMode(ioConfig);
+      IngestionMode ingestionMode = AbstractTask.computeBatchIngestionMode(ioConfig);
 
       if (ingestionMode == IngestionMode.REPLACE && dataSchema.getGranularitySpec()
                                                               .inputIntervals()
@@ -1132,8 +1133,8 @@ public IndexIOConfig(
     {
       this.inputSource = inputSource;
       this.inputFormat = inputFormat;
-      this.appendToExisting = appendToExisting == null ? DEFAULT_APPEND_EXISTING : appendToExisting;
-      this.dropExisting = dropExisting == null ? DEFAULT_DROP_EXISTING : dropExisting;
+      this.appendToExisting = appendToExisting == null ? BatchIOConfig.DEFAULT_APPEND_EXISTING : appendToExisting;
+      this.dropExisting = dropExisting == null ? BatchIOConfig.DEFAULT_DROP_EXISTING : dropExisting;
     }
 
     @Nullable
@@ -1366,7 +1367,7 @@ private IndexTuningConfig(
     )
     {
       this.appendableIndexSpec = appendableIndexSpec == null ? DEFAULT_APPENDABLE_INDEX : appendableIndexSpec;
-      this.maxRowsInMemory = maxRowsInMemory == null ? DEFAULT_MAX_ROWS_IN_MEMORY_BATCH : maxRowsInMemory;
+      this.maxRowsInMemory = maxRowsInMemory == null ? TuningConfig.DEFAULT_MAX_ROWS_IN_MEMORY_BATCH : maxRowsInMemory;
       // initializing this to 0, it will be lazily initialized to a value
       // @see #getMaxBytesInMemoryOrDefault()
       this.maxBytesInMemory = maxBytesInMemory == null ? 0 : maxBytesInMemory;
@@ -1394,14 +1395,14 @@ private IndexTuningConfig(
         this.maxSavedParseExceptions = maxSavedParseExceptions == null ? 0 : Math.min(1, maxSavedParseExceptions);
       } else {
         this.maxParseExceptions = maxParseExceptions == null
-                                  ? DEFAULT_MAX_PARSE_EXCEPTIONS
+                                  ? TuningConfig.DEFAULT_MAX_PARSE_EXCEPTIONS
                                   : maxParseExceptions;
         this.maxSavedParseExceptions = maxSavedParseExceptions == null
-                                       ? DEFAULT_MAX_SAVED_PARSE_EXCEPTIONS
+                                       ? TuningConfig.DEFAULT_MAX_SAVED_PARSE_EXCEPTIONS
                                        : maxSavedParseExceptions;
       }
       this.logParseExceptions = logParseExceptions == null
-                                ? DEFAULT_LOG_PARSE_EXCEPTIONS
+                                ? TuningConfig.DEFAULT_LOG_PARSE_EXCEPTIONS
                                 : logParseExceptions;
       if (awaitSegmentAvailabilityTimeoutMillis == null || awaitSegmentAvailabilityTimeoutMillis < 0) {
         this.awaitSegmentAvailabilityTimeoutMillis = DEFAULT_AWAIT_SEGMENT_AVAILABILITY_TIMEOUT_MILLIS;
diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/common/task/IndexTaskUtils.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/IndexTaskUtils.java
index 06a2da71f8aa..79a3e8993a8c 100644
--- a/indexing-service/src/main/java/org/apache/druid/indexing/common/task/IndexTaskUtils.java
+++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/IndexTaskUtils.java
@@ -138,12 +138,12 @@ public static void emitSegmentPublishMetrics(
   )
   {
     final ServiceMetricEvent.Builder metricBuilder = new ServiceMetricEvent.Builder();
-    setTaskDimensions(metricBuilder, task);
+    IndexTaskUtils.setTaskDimensions(metricBuilder, task);
 
     if (publishResult.isSuccess()) {
       toolbox.getEmitter().emit(metricBuilder.setMetric("segment/txn/success", 1));
       for (DataSegment segment : publishResult.getSegments()) {
-        setSegmentDimensions(metricBuilder, segment);
+        IndexTaskUtils.setSegmentDimensions(metricBuilder, segment);
         toolbox.getEmitter().emit(metricBuilder.setMetric("segment/added/bytes", segment.getSize()));
         toolbox.getEmitter().emit(SegmentMetadataEvent.create(segment, DateTimes.nowUtc()));
       }
diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/LegacySinglePhaseSubTask.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/LegacySinglePhaseSubTask.java
index 36853987a6dc..d2694c7afd92 100644
--- a/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/LegacySinglePhaseSubTask.java
+++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/LegacySinglePhaseSubTask.java
@@ -54,7 +54,7 @@ public LegacySinglePhaseSubTask(
   @Override
   public String getType()
   {
-    return OLD_TYPE_NAME;
+    return SinglePhaseSubTask.OLD_TYPE_NAME;
   }
 
 }
diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/PartialDimensionCardinalityTask.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/PartialDimensionCardinalityTask.java
index 67d97c62b815..d75304f38c08 100644
--- a/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/PartialDimensionCardinalityTask.java
+++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/PartialDimensionCardinalityTask.java
@@ -37,6 +37,7 @@
 import org.apache.druid.indexing.common.TaskToolbox;
 import org.apache.druid.indexing.common.actions.SurrogateTaskActionClient;
 import org.apache.druid.indexing.common.actions.TaskActionClient;
+import org.apache.druid.indexing.common.task.AbstractBatchIndexTask;
 import org.apache.druid.indexing.common.task.TaskResource;
 import org.apache.druid.java.util.common.granularity.Granularity;
 import org.apache.druid.java.util.common.parsers.CloseableIterator;
@@ -181,7 +182,7 @@ public TaskStatus runTask(TaskToolbox toolbox) throws Exception
         tuningConfig.getMaxSavedParseExceptions()
     );
     try (
-        final CloseableIterator<InputRow> inputRowIterator = inputSourceReader(
+        final CloseableIterator<InputRow> inputRowIterator = AbstractBatchIndexTask.inputSourceReader(
             toolbox.getIndexingTmpDir(),
             dataSchema,
             inputSource,
diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/PartialDimensionDistributionTask.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/PartialDimensionDistributionTask.java
index 089424377aa4..4bb395420b3f 100644
--- a/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/PartialDimensionDistributionTask.java
+++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/PartialDimensionDistributionTask.java
@@ -40,6 +40,7 @@
 import org.apache.druid.indexing.common.TaskToolbox;
 import org.apache.druid.indexing.common.actions.SurrogateTaskActionClient;
 import org.apache.druid.indexing.common.actions.TaskActionClient;
+import org.apache.druid.indexing.common.task.AbstractBatchIndexTask;
 import org.apache.druid.indexing.common.task.TaskResource;
 import org.apache.druid.indexing.common.task.batch.parallel.distribution.StringDistribution;
 import org.apache.druid.indexing.common.task.batch.parallel.distribution.StringSketch;
@@ -228,7 +229,7 @@ public TaskStatus runTask(TaskToolbox toolbox) throws Exception
         tuningConfig.getMaxSavedParseExceptions()
     );
     try (
-        final CloseableIterator<InputRow> inputRowIterator = inputSourceReader(
+        final CloseableIterator<InputRow> inputRowIterator = AbstractBatchIndexTask.inputSourceReader(
             toolbox.getIndexingTmpDir(),
             dataSchema,
             inputSource,
diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/PartialSegmentMergeTask.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/PartialSegmentMergeTask.java
index fa4122904c5d..17d9936c6851 100644
--- a/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/PartialSegmentMergeTask.java
+++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/PartialSegmentMergeTask.java
@@ -32,6 +32,7 @@
 import org.apache.druid.indexing.common.actions.LockListAction;
 import org.apache.druid.indexing.common.actions.SurrogateAction;
 import org.apache.druid.indexing.common.actions.TaskActionClient;
+import org.apache.druid.indexing.common.task.AbstractBatchIndexTask;
 import org.apache.druid.indexing.common.task.TaskResource;
 import org.apache.druid.java.util.common.FileUtils;
 import org.apache.druid.java.util.common.ISE;
@@ -292,7 +293,7 @@ private DataSegmentsWithSchemas mergeAndPushSegments(
                 getDataSource(),
                 interval,
                 Preconditions.checkNotNull(
-                    findVersion(intervalToVersion, interval),
+                    AbstractBatchIndexTask.findVersion(intervalToVersion, interval),
                     "version for interval[%s]",
                     interval
                 ),
diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/SinglePhaseSubTask.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/SinglePhaseSubTask.java
index db9dc26372c6..8d49a7f3dbe7 100644
--- a/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/SinglePhaseSubTask.java
+++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/SinglePhaseSubTask.java
@@ -38,6 +38,8 @@
 import org.apache.druid.indexing.common.actions.SurrogateTaskActionClient;
 import org.apache.druid.indexing.common.actions.TaskActionClient;
 import org.apache.druid.indexing.common.stats.TaskRealtimeMetricsMonitor;
+import org.apache.druid.indexing.common.task.AbstractBatchIndexTask;
+import org.apache.druid.indexing.common.task.AbstractTask;
 import org.apache.druid.indexing.common.task.BatchAppenderators;
 import org.apache.druid.indexing.common.task.IndexTask;
 import org.apache.druid.indexing.common.task.IndexTaskUtils;
@@ -163,7 +165,7 @@ public SinglePhaseSubTask(
         taskResource,
         ingestionSchema.getDataSchema().getDataSource(),
         context,
-        computeBatchIngestionMode(ingestionSchema.getIOConfig()),
+        AbstractTask.computeBatchIngestionMode(ingestionSchema.getIOConfig()),
         supervisorTaskId
     );
 
@@ -407,7 +409,7 @@ private DataSegmentsWithSchemas generateAndPushSegments(
     boolean exceptionOccurred = false;
     try (
         final BatchAppenderatorDriver driver = BatchAppenderators.newDriver(appenderator, toolbox, segmentAllocator);
-        final CloseableIterator<InputRow> inputRowIterator = inputSourceReader(
+        final CloseableIterator<InputRow> inputRowIterator = AbstractBatchIndexTask.inputSourceReader(
             tmpDir,
             dataSchema,
             inputSource,
diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/input/DruidInputSource.java b/indexing-service/src/main/java/org/apache/druid/indexing/input/DruidInputSource.java
index 8f83a63057c7..84c17f1a8fa0 100644
--- a/indexing-service/src/main/java/org/apache/druid/indexing/input/DruidInputSource.java
+++ b/indexing-service/src/main/java/org/apache/druid/indexing/input/DruidInputSource.java
@@ -397,7 +397,7 @@ public Stream<InputSplit<List<WindowedSegmentId>>> createSplits(
               coordinatorClient,
               dataSource,
               interval,
-              splitHintSpec == null ? DEFAULT_SPLIT_HINT_SPEC : splitHintSpec
+              splitHintSpec == null ? SplittableInputSource.DEFAULT_SPLIT_HINT_SPEC : splitHintSpec
           )
       );
     } else {
@@ -417,7 +417,7 @@ public int estimateNumSplits(InputFormat inputFormat, @Nullable SplitHintSpec sp
               coordinatorClient,
               dataSource,
               interval,
-              splitHintSpec == null ? DEFAULT_SPLIT_HINT_SPEC : splitHintSpec
+              splitHintSpec == null ? SplittableInputSource.DEFAULT_SPLIT_HINT_SPEC : splitHintSpec
           )
       );
     } else {
diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/overlord/QuotableWhiteSpaceSplitter.java b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/QuotableWhiteSpaceSplitter.java
index 49c8d1661502..88e11821abc7 100644
--- a/indexing-service/src/main/java/org/apache/druid/indexing/overlord/QuotableWhiteSpaceSplitter.java
+++ b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/QuotableWhiteSpaceSplitter.java
@@ -54,7 +54,7 @@ public boolean matches(char c)
             if (inQuotes) {
               return false;
             }
-            return breakingWhitespace().matches(c);
+            return CharMatcher.breakingWhitespace().matches(c);
           }
         }
     ).omitEmptyStrings().split(string).iterator();
diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/seekablestream/SeekableStreamIndexTaskTuningConfig.java b/indexing-service/src/main/java/org/apache/druid/indexing/seekablestream/SeekableStreamIndexTaskTuningConfig.java
index b802ffc044d5..309336e1d532 100644
--- a/indexing-service/src/main/java/org/apache/druid/indexing/seekablestream/SeekableStreamIndexTaskTuningConfig.java
+++ b/indexing-service/src/main/java/org/apache/druid/indexing/seekablestream/SeekableStreamIndexTaskTuningConfig.java
@@ -23,6 +23,7 @@
 import org.apache.druid.indexer.partitions.DynamicPartitionsSpec;
 import org.apache.druid.segment.IndexSpec;
 import org.apache.druid.segment.incremental.AppendableIndexSpec;
+import org.apache.druid.segment.indexing.TuningConfig;
 import org.apache.druid.segment.realtime.appenderator.AppenderatorConfig;
 import org.apache.druid.segment.writeout.SegmentWriteOutMediumFactory;
 import org.joda.time.Period;
@@ -130,14 +131,14 @@ public SeekableStreamIndexTaskTuningConfig(
       this.maxSavedParseExceptions = maxSavedParseExceptions == null ? 0 : Math.min(1, maxSavedParseExceptions);
     } else {
       this.maxParseExceptions = maxParseExceptions == null
-                                ? DEFAULT_MAX_PARSE_EXCEPTIONS
+                                ? TuningConfig.DEFAULT_MAX_PARSE_EXCEPTIONS
                                 : maxParseExceptions;
       this.maxSavedParseExceptions = maxSavedParseExceptions == null
-                                     ? DEFAULT_MAX_SAVED_PARSE_EXCEPTIONS
+                                     ? TuningConfig.DEFAULT_MAX_SAVED_PARSE_EXCEPTIONS
                                      : maxSavedParseExceptions;
     }
     this.logParseExceptions = logParseExceptions == null
-                              ? DEFAULT_LOG_PARSE_EXCEPTIONS
+                              ? TuningConfig.DEFAULT_LOG_PARSE_EXCEPTIONS
                               : logParseExceptions;
     this.numPersistThreads = numPersistThreads == null ?
                                 DEFAULT_NUM_PERSIST_THREADS : Math.max(numPersistThreads, DEFAULT_NUM_PERSIST_THREADS);
diff --git a/integration-tests-ex/tools/src/main/java/org/apache/druid/testing/tools/CliCustomNodeRole.java b/integration-tests-ex/tools/src/main/java/org/apache/druid/testing/tools/CliCustomNodeRole.java
index df5ef8827eb5..087cb24bec5d 100644
--- a/integration-tests-ex/tools/src/main/java/org/apache/druid/testing/tools/CliCustomNodeRole.java
+++ b/integration-tests-ex/tools/src/main/java/org/apache/druid/testing/tools/CliCustomNodeRole.java
@@ -66,7 +66,7 @@ public class CliCustomNodeRole extends ServerRunnable
   public static final String SERVICE_NAME = "custom-node-role";
   public static final int PORT = 9301;
   public static final int TLS_PORT = 9501;
-  public static final NodeRole NODE_ROLE = new NodeRole(SERVICE_NAME);
+  public static final NodeRole NODE_ROLE = new NodeRole(CliCustomNodeRole.SERVICE_NAME);
 
   public CliCustomNodeRole()
   {
@@ -85,9 +85,9 @@ protected List<? extends Module> getModules()
     return ImmutableList.of(
         binder -> {
           LOG.info("starting up custom node role");
-          binder.bindConstant().annotatedWith(Names.named("serviceName")).to(SERVICE_NAME);
-          binder.bindConstant().annotatedWith(Names.named("servicePort")).to(PORT);
-          binder.bindConstant().annotatedWith(Names.named("tlsServicePort")).to(TLS_PORT);
+          binder.bindConstant().annotatedWith(Names.named("serviceName")).to(CliCustomNodeRole.SERVICE_NAME);
+          binder.bindConstant().annotatedWith(Names.named("servicePort")).to(CliCustomNodeRole.PORT);
+          binder.bindConstant().annotatedWith(Names.named("tlsServicePort")).to(CliCustomNodeRole.TLS_PORT);
 
           binder.bind(JettyServerInitializer.class).to(CustomJettyServiceInitializer.class).in(LazySingleton.class);
           LifecycleModule.register(binder, Server.class);
diff --git a/integration-tests/src/main/java/org/apache/druid/cli/CliCustomNodeRole.java b/integration-tests/src/main/java/org/apache/druid/cli/CliCustomNodeRole.java
index eade6b9eda0e..e0e1605b3026 100644
--- a/integration-tests/src/main/java/org/apache/druid/cli/CliCustomNodeRole.java
+++ b/integration-tests/src/main/java/org/apache/druid/cli/CliCustomNodeRole.java
@@ -65,7 +65,7 @@ public class CliCustomNodeRole extends ServerRunnable
   public static final String SERVICE_NAME = "custom-node-role";
   public static final int PORT = 9301;
   public static final int TLS_PORT = 9501;
-  public static final NodeRole NODE_ROLE = new NodeRole(SERVICE_NAME);
+  public static final NodeRole NODE_ROLE = new NodeRole(CliCustomNodeRole.SERVICE_NAME);
 
   public CliCustomNodeRole()
   {
@@ -84,9 +84,9 @@ protected List<? extends Module> getModules()
     return ImmutableList.of(
         binder -> {
           LOG.info("starting up");
-          binder.bindConstant().annotatedWith(Names.named("serviceName")).to(SERVICE_NAME);
-          binder.bindConstant().annotatedWith(Names.named("servicePort")).to(PORT);
-          binder.bindConstant().annotatedWith(Names.named("tlsServicePort")).to(TLS_PORT);
+          binder.bindConstant().annotatedWith(Names.named("serviceName")).to(CliCustomNodeRole.SERVICE_NAME);
+          binder.bindConstant().annotatedWith(Names.named("servicePort")).to(CliCustomNodeRole.PORT);
+          binder.bindConstant().annotatedWith(Names.named("tlsServicePort")).to(CliCustomNodeRole.TLS_PORT);
 
           binder.bind(JettyServerInitializer.class).to(CustomJettyServiceInitializer.class).in(LazySingleton.class);
           LifecycleModule.register(binder, Server.class);
diff --git a/integration-tests/src/main/java/org/apache/druid/testing/utils/AvroSchemaRegistryEventSerializer.java b/integration-tests/src/main/java/org/apache/druid/testing/utils/AvroSchemaRegistryEventSerializer.java
index a5df23466ca6..dd1e82f82dfe 100644
--- a/integration-tests/src/main/java/org/apache/druid/testing/utils/AvroSchemaRegistryEventSerializer.java
+++ b/integration-tests/src/main/java/org/apache/druid/testing/utils/AvroSchemaRegistryEventSerializer.java
@@ -73,7 +73,7 @@ public void initialize(String topic)
     try {
       RetryUtils.retry(
           () -> {
-            schemaId = client.register(topic, SCHEMA);
+            schemaId = client.register(topic, AvroEventSerializer.SCHEMA);
             fromRegistry = client.getById(schemaId);
             return 0;
           },
diff --git a/integration-tests/src/main/java/org/apache/druid/testing/utils/ProtobufSchemaRegistryEventSerializer.java b/integration-tests/src/main/java/org/apache/druid/testing/utils/ProtobufSchemaRegistryEventSerializer.java
index f2a65ae95dfa..8d80b22af35d 100644
--- a/integration-tests/src/main/java/org/apache/druid/testing/utils/ProtobufSchemaRegistryEventSerializer.java
+++ b/integration-tests/src/main/java/org/apache/druid/testing/utils/ProtobufSchemaRegistryEventSerializer.java
@@ -68,7 +68,7 @@ public void initialize(String topic)
     try {
       RetryUtils.retry(
           () -> {
-            schemaId = client.register(topic, new ProtobufSchema(SCHEMA.newMessageBuilder("Wikipedia").getDescriptorForType()));
+            schemaId = client.register(topic, new ProtobufSchema(ProtobufEventSerializer.SCHEMA.newMessageBuilder("Wikipedia").getDescriptorForType()));
             return 0;
           },
           (e) -> true,
diff --git a/processing/src/main/java/org/apache/druid/collections/spatial/search/PolygonBound.java b/processing/src/main/java/org/apache/druid/collections/spatial/search/PolygonBound.java
index f8d14f81e3d6..1ef82732a4f2 100644
--- a/processing/src/main/java/org/apache/druid/collections/spatial/search/PolygonBound.java
+++ b/processing/src/main/java/org/apache/druid/collections/spatial/search/PolygonBound.java
@@ -101,7 +101,7 @@ public static PolygonBound from(
 
   public static PolygonBound from(float[] abscissa, float[] ordinate)
   {
-    return from(abscissa, ordinate, 0);
+    return PolygonBound.from(abscissa, ordinate, 0);
   }
 
   @JsonProperty
diff --git a/processing/src/main/java/org/apache/druid/common/config/NullHandling.java b/processing/src/main/java/org/apache/druid/common/config/NullHandling.java
index 578c64acbc56..da2871722240 100644
--- a/processing/src/main/java/org/apache/druid/common/config/NullHandling.java
+++ b/processing/src/main/java/org/apache/druid/common/config/NullHandling.java
@@ -128,7 +128,7 @@ public static boolean sqlCompatible()
    */
   public static boolean useThreeValueLogic()
   {
-    return sqlCompatible() &&
+    return NullHandling.sqlCompatible() &&
            INSTANCE.isUseThreeValueLogicForNativeFilters();
   }
 
@@ -266,7 +266,7 @@ public static boolean isNullOrEquivalent(@Nullable ByteBuffer buffer)
    */
   public static boolean mustCombineNullAndEmptyInDictionary(final Indexed<ByteBuffer> dictionaryUtf8)
   {
-    return replaceWithDefault()
+    return NullHandling.replaceWithDefault()
            && dictionaryUtf8.size() >= 2
            && isNullOrEquivalent(dictionaryUtf8.get(0))
            && isNullOrEquivalent(dictionaryUtf8.get(1));
@@ -283,7 +283,7 @@ && isNullOrEquivalent(dictionaryUtf8.get(0))
    */
   public static boolean mustReplaceFirstValueWithNullInDictionary(final Indexed<ByteBuffer> dictionaryUtf8)
   {
-    if (replaceWithDefault() && dictionaryUtf8.size() >= 1) {
+    if (NullHandling.replaceWithDefault() && dictionaryUtf8.size() >= 1) {
       final ByteBuffer firstValue = dictionaryUtf8.get(0);
       return firstValue != null && firstValue.remaining() == 0;
     }
diff --git a/processing/src/main/java/org/apache/druid/common/guava/FutureUtils.java b/processing/src/main/java/org/apache/druid/common/guava/FutureUtils.java
index 83a83b4f1a56..7f244ec7d356 100644
--- a/processing/src/main/java/org/apache/druid/common/guava/FutureUtils.java
+++ b/processing/src/main/java/org/apache/druid/common/guava/FutureUtils.java
@@ -73,7 +73,7 @@ public static <T> T get(final ListenableFuture<T> future, final boolean cancelIf
   public static <T> T getUnchecked(final ListenableFuture<T> future, final boolean cancelIfInterrupted)
   {
     try {
-      return get(future, cancelIfInterrupted);
+      return FutureUtils.get(future, cancelIfInterrupted);
     }
     catch (InterruptedException e) {
       Thread.currentThread().interrupt();
@@ -103,7 +103,7 @@ public static <T> T getUncheckedImmediately(final ListenableFuture<T> future)
   /**
    * Like {@link Futures#transform}, but works better with lambdas due to not having overloads.
    *
-   * One can write {@code transform(future, v -> ...)} instead of
+   * One can write {@code FutureUtils.transform(future, v -> ...)} instead of
    * {@code Futures.transform(future, (Function<? super T, ?>) v -> ...)}
    */
   public static <T, R> ListenableFuture<R> transform(final ListenableFuture<T> future, final Function<T, R> fn)
@@ -115,7 +115,7 @@ public static <T, R> ListenableFuture<R> transform(final ListenableFuture<T> fut
    * Like {@link Futures#transformAsync(ListenableFuture, AsyncFunction, java.util.concurrent.Executor)}, but works better with lambdas due to not having
    * overloads.
    *
-   * One can write {@code transformAsync(future, v -> ...)} instead of
+   * One can write {@code FutureUtils.transformAsync(future, v -> ...)} instead of
    * {@code Futures.transform(future, (Function<? super T, ?>) v -> ...)}
    */
   public static <T, R> ListenableFuture<R> transformAsync(final ListenableFuture<T> future, final AsyncFunction<T, R> fn)
diff --git a/processing/src/main/java/org/apache/druid/common/utils/IdUtils.java b/processing/src/main/java/org/apache/druid/common/utils/IdUtils.java
index ee769dfd89eb..88d4d0d413ba 100644
--- a/processing/src/main/java/org/apache/druid/common/utils/IdUtils.java
+++ b/processing/src/main/java/org/apache/druid/common/utils/IdUtils.java
@@ -100,7 +100,7 @@ public static String getRandomId()
 
   public static String getRandomIdWithPrefix(String prefix)
   {
-    return UNDERSCORE_JOINER.join(prefix, getRandomId());
+    return UNDERSCORE_JOINER.join(prefix, IdUtils.getRandomId());
   }
 
   public static String newTaskId(String typeName, String dataSource, @Nullable Interval interval)
diff --git a/processing/src/main/java/org/apache/druid/data/input/impl/DimensionsSpec.java b/processing/src/main/java/org/apache/druid/data/input/impl/DimensionsSpec.java
index a22f72ab9fb4..c13b69105ea2 100644
--- a/processing/src/main/java/org/apache/druid/data/input/impl/DimensionsSpec.java
+++ b/processing/src/main/java/org/apache/druid/data/input/impl/DimensionsSpec.java
@@ -139,7 +139,7 @@ private DimensionsSpec(
     }
 
     for (SpatialDimensionSchema spatialSchema : spatialDims) {
-      DimensionSchema newSchema = convertSpatialSchema(spatialSchema);
+      DimensionSchema newSchema = DimensionsSpec.convertSpatialSchema(spatialSchema);
       this.dimensions.add(newSchema);
       dimensionSchemaMap.put(newSchema.getName(), newSchema);
     }
diff --git a/processing/src/main/java/org/apache/druid/data/input/impl/DoubleDimensionSchema.java b/processing/src/main/java/org/apache/druid/data/input/impl/DoubleDimensionSchema.java
index 041907a09cea..2bde08122149 100644
--- a/processing/src/main/java/org/apache/druid/data/input/impl/DoubleDimensionSchema.java
+++ b/processing/src/main/java/org/apache/druid/data/input/impl/DoubleDimensionSchema.java
@@ -36,7 +36,7 @@ public DoubleDimensionSchema(@JsonProperty("name") String name)
   @Override
   public String getTypeName()
   {
-    return DOUBLE_TYPE_NAME;
+    return DimensionSchema.DOUBLE_TYPE_NAME;
   }
 
   @Override
diff --git a/processing/src/main/java/org/apache/druid/data/input/impl/FloatDimensionSchema.java b/processing/src/main/java/org/apache/druid/data/input/impl/FloatDimensionSchema.java
index ca7b3e2a4002..1a9d6e73fe39 100644
--- a/processing/src/main/java/org/apache/druid/data/input/impl/FloatDimensionSchema.java
+++ b/processing/src/main/java/org/apache/druid/data/input/impl/FloatDimensionSchema.java
@@ -39,7 +39,7 @@ public FloatDimensionSchema(
   @Override
   public String getTypeName()
   {
-    return FLOAT_TYPE_NAME;
+    return DimensionSchema.FLOAT_TYPE_NAME;
   }
 
   @Override
diff --git a/processing/src/main/java/org/apache/druid/data/input/impl/LongDimensionSchema.java b/processing/src/main/java/org/apache/druid/data/input/impl/LongDimensionSchema.java
index 3c9ee334ffb1..e8a90a7a4818 100644
--- a/processing/src/main/java/org/apache/druid/data/input/impl/LongDimensionSchema.java
+++ b/processing/src/main/java/org/apache/druid/data/input/impl/LongDimensionSchema.java
@@ -40,7 +40,7 @@ public LongDimensionSchema(
   @Override
   public String getTypeName()
   {
-    return LONG_TYPE_NAME;
+    return DimensionSchema.LONG_TYPE_NAME;
   }
 
   @Override
diff --git a/processing/src/main/java/org/apache/druid/data/input/impl/NewSpatialDimensionSchema.java b/processing/src/main/java/org/apache/druid/data/input/impl/NewSpatialDimensionSchema.java
index d46c7ca130a1..bd1fd8292aea 100644
--- a/processing/src/main/java/org/apache/druid/data/input/impl/NewSpatialDimensionSchema.java
+++ b/processing/src/main/java/org/apache/druid/data/input/impl/NewSpatialDimensionSchema.java
@@ -59,7 +59,7 @@ public List<String> getDims()
   @Override
   public String getTypeName()
   {
-    return SPATIAL_TYPE_NAME;
+    return DimensionSchema.SPATIAL_TYPE_NAME;
   }
 
   @Override
diff --git a/processing/src/main/java/org/apache/druid/data/input/impl/StringDimensionSchema.java b/processing/src/main/java/org/apache/druid/data/input/impl/StringDimensionSchema.java
index 117750396558..2af2fbbaac23 100644
--- a/processing/src/main/java/org/apache/druid/data/input/impl/StringDimensionSchema.java
+++ b/processing/src/main/java/org/apache/druid/data/input/impl/StringDimensionSchema.java
@@ -54,7 +54,7 @@ public StringDimensionSchema(String name)
   @Override
   public String getTypeName()
   {
-    return STRING_TYPE_NAME;
+    return DimensionSchema.STRING_TYPE_NAME;
   }
 
   @Override
diff --git a/processing/src/main/java/org/apache/druid/extendedset/intset/ImmutableConciseSet.java b/processing/src/main/java/org/apache/druid/extendedset/intset/ImmutableConciseSet.java
index 0d3ac643de66..b48bae6c0b2f 100755
--- a/processing/src/main/java/org/apache/druid/extendedset/intset/ImmutableConciseSet.java
+++ b/processing/src/main/java/org/apache/druid/extendedset/intset/ImmutableConciseSet.java
@@ -209,7 +209,7 @@ public static ImmutableConciseSet complement(ImmutableConciseSet set, int length
         }
       }
       ConciseSet newSet = new ConciseSet(words, false);
-      return newImmutableFromMutable(newSet);
+      return ImmutableConciseSet.newImmutableFromMutable(newSet);
     }
 
     IntList retVal = new IntList();
diff --git a/processing/src/main/java/org/apache/druid/frame/Frame.java b/processing/src/main/java/org/apache/druid/frame/Frame.java
index 49a9a2347d76..8185190a28da 100644
--- a/processing/src/main/java/org/apache/druid/frame/Frame.java
+++ b/processing/src/main/java/org/apache/druid/frame/Frame.java
@@ -240,12 +240,12 @@ public static Frame decompress(final Memory memory, final long position, final l
         );
       }
 
-      return wrap(dstBuffer);
+      return Frame.wrap(dstBuffer);
     } else {
       // Copy first, then decompress.
       final byte[] compressedFrame = new byte[compressedFrameLength];
       memory.getByteArray(frameStart, compressedFrame, 0, compressedFrameLength);
-      return wrap(LZ4_DECOMPRESSOR.decompress(compressedFrame, uncompressedFrameLength));
+      return Frame.wrap(LZ4_DECOMPRESSOR.decompress(compressedFrame, uncompressedFrameLength));
     }
   }
 
diff --git a/processing/src/main/java/org/apache/druid/frame/key/RowKeyReader.java b/processing/src/main/java/org/apache/druid/frame/key/RowKeyReader.java
index 69958187b86b..d26f248e8016 100644
--- a/processing/src/main/java/org/apache/druid/frame/key/RowKeyReader.java
+++ b/processing/src/main/java/org/apache/druid/frame/key/RowKeyReader.java
@@ -149,7 +149,7 @@ public RowKeyReader trimmedKeyReader(int trimmedFieldCount)
       newSignature.add(columnName, columnType);
     }
 
-    return create(newSignature.build());
+    return RowKeyReader.create(newSignature.build());
   }
 
   /**
diff --git a/processing/src/main/java/org/apache/druid/frame/processor/OutputChannel.java b/processing/src/main/java/org/apache/druid/frame/processor/OutputChannel.java
index 058450dd0631..e1377eddca35 100644
--- a/processing/src/main/java/org/apache/druid/frame/processor/OutputChannel.java
+++ b/processing/src/main/java/org/apache/druid/frame/processor/OutputChannel.java
@@ -243,7 +243,7 @@ public synchronized OutputChannel mapWritableChannel(final Function<WritableFram
    */
   public OutputChannel readOnly()
   {
-    return readOnly(readableChannelSupplier, partitionNumber);
+    return OutputChannel.readOnly(readableChannelSupplier, partitionNumber);
   }
 
   /**
diff --git a/processing/src/main/java/org/apache/druid/frame/util/DurableStorageUtils.java b/processing/src/main/java/org/apache/druid/frame/util/DurableStorageUtils.java
index 476b7f3f015d..168d96fc20ab 100644
--- a/processing/src/main/java/org/apache/druid/frame/util/DurableStorageUtils.java
+++ b/processing/src/main/java/org/apache/druid/frame/util/DurableStorageUtils.java
@@ -252,7 +252,7 @@ public static boolean isQueryResultFileActive(String path, Set<String> knownTask
     if (elements.size() < 2) {
       return false;
     }
-    if (!QUERY_RESULTS_DIR.equals(elements.get(0))) {
+    if (!DurableStorageUtils.QUERY_RESULTS_DIR.equals(elements.get(0))) {
       return false;
     }
     return knownTasks.contains(elements.get(1));
diff --git a/processing/src/main/java/org/apache/druid/frame/write/FrameWriterUtils.java b/processing/src/main/java/org/apache/druid/frame/write/FrameWriterUtils.java
index affa5a453cad..a480767f1113 100644
--- a/processing/src/main/java/org/apache/druid/frame/write/FrameWriterUtils.java
+++ b/processing/src/main/java/org/apache/druid/frame/write/FrameWriterUtils.java
@@ -318,7 +318,7 @@ private static ByteBuffer getUtf8ByteBufferFromStringSelector(
         return buf;
       }
     } else {
-      return getUtf8ByteBufferFromString(selector.lookupName(dictionaryId));
+      return FrameWriterUtils.getUtf8ByteBufferFromString(selector.lookupName(dictionaryId));
     }
   }
 
diff --git a/processing/src/main/java/org/apache/druid/hll/HyperLogLogCollector.java b/processing/src/main/java/org/apache/druid/hll/HyperLogLogCollector.java
index f8ef6acc152a..d285f1cd044e 100644
--- a/processing/src/main/java/org/apache/druid/hll/HyperLogLogCollector.java
+++ b/processing/src/main/java/org/apache/druid/hll/HyperLogLogCollector.java
@@ -394,7 +394,7 @@ public HyperLogLogCollector fold(@Nullable HyperLogLogCollector other)
         convertToDenseStorage();
       }
 
-      other = makeCollector(tmpBuffer);
+      other = HyperLogLogCollector.makeCollector(tmpBuffer);
     }
 
     final ByteBuffer otherBuffer = other.storageBuffer;
@@ -574,7 +574,7 @@ public boolean equals(Object o)
 
     final ByteBuffer denseStorageBuffer;
     if (storageBuffer.remaining() != getNumBytesForDenseStorage()) {
-      HyperLogLogCollector denseCollector = makeCollector(storageBuffer.duplicate());
+      HyperLogLogCollector denseCollector = HyperLogLogCollector.makeCollector(storageBuffer.duplicate());
       denseCollector.convertToDenseStorage();
       denseStorageBuffer = denseCollector.storageBuffer;
     } else {
@@ -582,7 +582,7 @@ public boolean equals(Object o)
     }
 
     if (otherBuffer.remaining() != getNumBytesForDenseStorage()) {
-      HyperLogLogCollector otherCollector = makeCollector(otherBuffer.duplicate());
+      HyperLogLogCollector otherCollector = HyperLogLogCollector.makeCollector(otherBuffer.duplicate());
       otherCollector.convertToDenseStorage();
       otherBuffer = otherCollector.storageBuffer;
     }
diff --git a/processing/src/main/java/org/apache/druid/indexer/TaskLocation.java b/processing/src/main/java/org/apache/druid/indexer/TaskLocation.java
index ed664775f4e7..2992814de457 100644
--- a/processing/src/main/java/org/apache/druid/indexer/TaskLocation.java
+++ b/processing/src/main/java/org/apache/druid/indexer/TaskLocation.java
@@ -60,7 +60,7 @@ public static TaskLocation create(String host, int port, int tlsPort, boolean is
 
   public static TaskLocation unknown()
   {
-    return UNKNOWN;
+    return TaskLocation.UNKNOWN;
   }
 
   @JsonCreator
diff --git a/processing/src/main/java/org/apache/druid/indexer/partitions/DimensionRangePartitionsSpec.java b/processing/src/main/java/org/apache/druid/indexer/partitions/DimensionRangePartitionsSpec.java
index 5b83a5feca0b..744f5c9e6815 100644
--- a/processing/src/main/java/org/apache/druid/indexer/partitions/DimensionRangePartitionsSpec.java
+++ b/processing/src/main/java/org/apache/druid/indexer/partitions/DimensionRangePartitionsSpec.java
@@ -125,7 +125,7 @@ public Integer getMaxRowsPerSegment()
     return resolvedMaxRowPerSegment;  // NOTE: This returns the *resolved* value
   }
 
-  @JsonProperty(MAX_ROWS_PER_SEGMENT)
+  @JsonProperty(PartitionsSpec.MAX_ROWS_PER_SEGMENT)
   protected Integer getMaxRowsPerSegmentForJson()
   {
     return maxRowsPerSegment;
diff --git a/processing/src/main/java/org/apache/druid/indexer/partitions/DynamicPartitionsSpec.java b/processing/src/main/java/org/apache/druid/indexer/partitions/DynamicPartitionsSpec.java
index bd60493bd791..2c5d294f3c1c 100644
--- a/processing/src/main/java/org/apache/druid/indexer/partitions/DynamicPartitionsSpec.java
+++ b/processing/src/main/java/org/apache/druid/indexer/partitions/DynamicPartitionsSpec.java
@@ -46,7 +46,7 @@ public class DynamicPartitionsSpec implements PartitionsSpec
 
   @JsonCreator
   public DynamicPartitionsSpec(
-      @JsonProperty(MAX_ROWS_PER_SEGMENT) @Nullable Integer maxRowsPerSegment,
+      @JsonProperty(PartitionsSpec.MAX_ROWS_PER_SEGMENT) @Nullable Integer maxRowsPerSegment,
       @JsonProperty("maxTotalRows") @Nullable Long maxTotalRows
   )
   {
diff --git a/processing/src/main/java/org/apache/druid/indexer/partitions/HashedPartitionsSpec.java b/processing/src/main/java/org/apache/druid/indexer/partitions/HashedPartitionsSpec.java
index 688d4a601379..c9561ac47dac 100644
--- a/processing/src/main/java/org/apache/druid/indexer/partitions/HashedPartitionsSpec.java
+++ b/processing/src/main/java/org/apache/druid/indexer/partitions/HashedPartitionsSpec.java
@@ -93,7 +93,7 @@ public HashedPartitionsSpec(
     // Supply default for targetRowsPerSegment if needed
     if (target.getValue() == null) {
       //noinspection VariableNotUsedInsideIf (false positive for this.numShards)
-      this.maxRowsPerSegment = (this.numShards == null ? DEFAULT_MAX_ROWS_PER_SEGMENT : null);
+      this.maxRowsPerSegment = (this.numShards == null ? PartitionsSpec.DEFAULT_MAX_ROWS_PER_SEGMENT : null);
     } else {
       this.maxRowsPerSegment = target.getValue();
     }
diff --git a/processing/src/main/java/org/apache/druid/java/util/common/Either.java b/processing/src/main/java/org/apache/druid/java/util/common/Either.java
index 342c06212dd1..5a2720d07481 100644
--- a/processing/src/main/java/org/apache/druid/java/util/common/Either.java
+++ b/processing/src/main/java/org/apache/druid/java/util/common/Either.java
@@ -111,7 +111,7 @@ public R valueOrThrow()
   public <T> Either<L, T> map(final Function<R, T> fn)
   {
     if (isValue()) {
-      return value(fn.apply(value));
+      return Either.value(fn.apply(value));
     } else {
       // Safe because the value is never going to be returned.
       //noinspection unchecked
diff --git a/processing/src/main/java/org/apache/druid/java/util/common/HumanReadableBytes.java b/processing/src/main/java/org/apache/druid/java/util/common/HumanReadableBytes.java
index f44e6c327a53..63e697cc9549 100644
--- a/processing/src/main/java/org/apache/druid/java/util/common/HumanReadableBytes.java
+++ b/processing/src/main/java/org/apache/druid/java/util/common/HumanReadableBytes.java
@@ -30,7 +30,7 @@ public class HumanReadableBytes
 
   public HumanReadableBytes(String bytes)
   {
-    this.bytes = parse(bytes);
+    this.bytes = HumanReadableBytes.parse(bytes);
   }
 
   public HumanReadableBytes(long bytes)
diff --git a/processing/src/main/java/org/apache/druid/java/util/common/StringUtils.java b/processing/src/main/java/org/apache/druid/java/util/common/StringUtils.java
index 282c436ebcde..d8ef9956d9bf 100644
--- a/processing/src/main/java/org/apache/druid/java/util/common/StringUtils.java
+++ b/processing/src/main/java/org/apache/druid/java/util/common/StringUtils.java
@@ -54,7 +54,7 @@ public class StringUtils
   private static final Base64.Decoder BASE64_DECODER = Base64.getDecoder();
 
   // should be used only for estimation
-  // returns the same result with fromUtf8(value).length for valid string values
+  // returns the same result with StringUtils.fromUtf8(value).length for valid string values
   // does not check validity of format and returns over-estimated result for invalid string (see UT)
   public static int estimatedBinaryLengthAsUTF8(String value)
   {
@@ -257,7 +257,7 @@ public static String fromUtf8(final ByteBuffer buffer, final int numBytes)
    */
   public static String fromUtf8(final ByteBuffer buffer)
   {
-    return fromUtf8(buffer, buffer.remaining());
+    return StringUtils.fromUtf8(buffer, buffer.remaining());
   }
 
   /**
@@ -273,7 +273,7 @@ public static String fromUtf8Nullable(@Nullable final ByteBuffer buffer)
     if (buffer == null) {
       return null;
     }
-    return fromUtf8(buffer, buffer.remaining());
+    return StringUtils.fromUtf8(buffer, buffer.remaining());
   }
 
   /**
@@ -390,7 +390,7 @@ public static String encodeForFormat(@Nullable final String s)
     if (s == null) {
       return null;
     } else {
-      return replaceChar(s, '%', "%%");
+      return StringUtils.replaceChar(s, '%', "%%");
     }
   }
 
@@ -422,7 +422,7 @@ public static String urlEncode(@Nullable String s)
     }
 
     try {
-      return replace(URLEncoder.encode(s, "UTF-8"), "+", "%20");
+      return StringUtils.replace(URLEncoder.encode(s, "UTF-8"), "+", "%20");
     }
     catch (UnsupportedEncodingException e) {
       throw new RuntimeException(e);
@@ -792,7 +792,7 @@ public static String chop(@Nullable final String s, final int maxBytes)
     } else {
       // Shorten firstValue to what could fit in maxBytes as UTF-8.
       final byte[] bytes = new byte[maxBytes];
-      final int len = toUtf8WithLimit(s, ByteBuffer.wrap(bytes));
+      final int len = StringUtils.toUtf8WithLimit(s, ByteBuffer.wrap(bytes));
       return new String(bytes, 0, len, StandardCharsets.UTF_8);
     }
   }
@@ -831,6 +831,6 @@ public static String getResource(Object ref, String resource)
    */
   public static String escapeSql(String str)
   {
-    return str == null ? null : replace(str, "'", "''");
+    return str == null ? null : StringUtils.replace(str, "'", "''");
   }
 }
diff --git a/processing/src/main/java/org/apache/druid/java/util/common/granularity/Granularities.java b/processing/src/main/java/org/apache/druid/java/util/common/granularity/Granularities.java
index 1ae9281e8ab7..08de0a364ec3 100644
--- a/processing/src/main/java/org/apache/druid/java/util/common/granularity/Granularities.java
+++ b/processing/src/main/java/org/apache/druid/java/util/common/granularity/Granularities.java
@@ -68,7 +68,7 @@ public class Granularities
 
   public static Granularity nullToAll(Granularity granularity)
   {
-    return granularity == null ? ALL : granularity;
+    return granularity == null ? Granularities.ALL : granularity;
   }
 
   /**
diff --git a/processing/src/main/java/org/apache/druid/java/util/common/granularity/GranularityType.java b/processing/src/main/java/org/apache/druid/java/util/common/granularity/GranularityType.java
index 26fe8e44f648..b4b78390605d 100644
--- a/processing/src/main/java/org/apache/druid/java/util/common/granularity/GranularityType.java
+++ b/processing/src/main/java/org/apache/druid/java/util/common/granularity/GranularityType.java
@@ -176,7 +176,7 @@ public DateTime getDateTime(Integer[] vals)
    */
   public static boolean isStandard(Granularity granularity)
   {
-    final GranularityType[] values = values();
+    final GranularityType[] values = GranularityType.values();
     for (GranularityType value : values) {
       if (value.getDefaultGranularity().equals(granularity)) {
         return true;
@@ -205,42 +205,42 @@ public static GranularityType fromPeriod(Period period)
 
     switch (index) {
       case 0:
-        return YEAR;
+        return GranularityType.YEAR;
       case 1:
         if (vals[index] == 3) {
-          return QUARTER;
+          return GranularityType.QUARTER;
         } else if (vals[index] == 1) {
-          return MONTH;
+          return GranularityType.MONTH;
         }
         break;
       case 2:
-        return WEEK;
+        return GranularityType.WEEK;
       case 3:
-        return DAY;
+        return GranularityType.DAY;
       case 4:
         if (vals[index] == 8) {
-          return EIGHT_HOUR;
+          return GranularityType.EIGHT_HOUR;
         } else if (vals[index] == 6) {
-          return SIX_HOUR;
+          return GranularityType.SIX_HOUR;
         } else if (vals[index] == 1) {
-          return HOUR;
+          return GranularityType.HOUR;
         }
         break;
       case 5:
         if (vals[index] == 30) {
-          return THIRTY_MINUTE;
+          return GranularityType.THIRTY_MINUTE;
         } else if (vals[index] == 15) {
-          return FIFTEEN_MINUTE;
+          return GranularityType.FIFTEEN_MINUTE;
         } else if (vals[index] == 10) {
-          return TEN_MINUTE;
+          return GranularityType.TEN_MINUTE;
         } else if (vals[index] == 5) {
-          return FIVE_MINUTE;
+          return GranularityType.FIVE_MINUTE;
         } else if (vals[index] == 1) {
-          return MINUTE;
+          return GranularityType.MINUTE;
         }
         break;
       case 6:
-        return SECOND;
+        return GranularityType.SECOND;
       default:
         break;
     }
diff --git a/processing/src/main/java/org/apache/druid/java/util/common/guava/Sequences.java b/processing/src/main/java/org/apache/druid/java/util/common/guava/Sequences.java
index 5b4cd7f2e6da..15f878af1304 100644
--- a/processing/src/main/java/org/apache/druid/java/util/common/guava/Sequences.java
+++ b/processing/src/main/java/org/apache/druid/java/util/common/guava/Sequences.java
@@ -56,7 +56,7 @@ public static <T> Sequence<T> concat(Sequence<T>... sequences)
 
   public static <T> Sequence<T> concat(Iterable<Sequence<T>> sequences)
   {
-    return concat(simple(sequences));
+    return concat(Sequences.simple(sequences));
   }
 
   public static <T> Sequence<T> concat(Sequence<? extends Sequence<T>> sequences)
diff --git a/processing/src/main/java/org/apache/druid/java/util/common/parsers/JSONPathFieldSpec.java b/processing/src/main/java/org/apache/druid/java/util/common/parsers/JSONPathFieldSpec.java
index 04e372f4f5d5..9ddde9b89700 100644
--- a/processing/src/main/java/org/apache/druid/java/util/common/parsers/JSONPathFieldSpec.java
+++ b/processing/src/main/java/org/apache/druid/java/util/common/parsers/JSONPathFieldSpec.java
@@ -103,7 +103,7 @@ public List<String> getNodes()
   @JsonCreator
   public static JSONPathFieldSpec fromString(String name)
   {
-    return createRootField(name);
+    return JSONPathFieldSpec.createRootField(name);
   }
 
   public static JSONPathFieldSpec createNestedField(String name, String expr)
diff --git a/processing/src/main/java/org/apache/druid/java/util/common/parsers/ParserUtils.java b/processing/src/main/java/org/apache/druid/java/util/common/parsers/ParserUtils.java
index fe86ae3035b7..18afba4491d9 100644
--- a/processing/src/main/java/org/apache/druid/java/util/common/parsers/ParserUtils.java
+++ b/processing/src/main/java/org/apache/druid/java/util/common/parsers/ParserUtils.java
@@ -76,7 +76,7 @@ public static Function<String, Object> getTransformationFunction(
       if (input.contains(listDelimiter)) {
         return StreamSupport.stream(listSplitter.split(input).spliterator(), false)
             .map(NullHandling::emptyToNullIfNeeded)
-            .map(value -> tryParseNumbers ? tryParseStringAsNumber(value) : value)
+            .map(value -> tryParseNumbers ? ParserUtils.tryParseStringAsNumber(value) : value)
             .collect(Collectors.toList());
       } else {
         return tryParseNumbers ?
diff --git a/processing/src/main/java/org/apache/druid/java/util/emitter/core/HttpPostEmitter.java b/processing/src/main/java/org/apache/druid/java/util/emitter/core/HttpPostEmitter.java
index 93ef6b1a1245..879aba3d8b70 100644
--- a/processing/src/main/java/org/apache/druid/java/util/emitter/core/HttpPostEmitter.java
+++ b/processing/src/main/java/org/apache/druid/java/util/emitter/core/HttpPostEmitter.java
@@ -524,7 +524,7 @@ public void run()
 
     private boolean needsToShutdown()
     {
-      boolean needsToShutdown = interrupted() || shuttingDown;
+      boolean needsToShutdown = Thread.interrupted() || shuttingDown;
       if (needsToShutdown) {
         Object lastBatch = concurrentBatch.getAndSet(null);
         if (lastBatch instanceof Batch) {
@@ -722,7 +722,7 @@ void sendBackoffDelay()
       final long backoffCheckDelayMillis = config.getMinHttpTimeoutMillis() / 5;
 
       try {
-        sleep(backoffCheckDelayMillis);
+        Thread.sleep(backoffCheckDelayMillis);
       }
       catch (InterruptedException ignored) {
         return;
diff --git a/processing/src/main/java/org/apache/druid/java/util/emitter/service/AlertBuilder.java b/processing/src/main/java/org/apache/druid/java/util/emitter/service/AlertBuilder.java
index c0c2b98b901f..352272d67bc4 100644
--- a/processing/src/main/java/org/apache/druid/java/util/emitter/service/AlertBuilder.java
+++ b/processing/src/main/java/org/apache/druid/java/util/emitter/service/AlertBuilder.java
@@ -46,7 +46,7 @@ public class AlertBuilder extends ServiceEventBuilder<AlertEvent>
 
   public static AlertBuilder create(String descriptionFormat, Object... objects)
   {
-    return createEmittable(null, descriptionFormat, objects);
+    return AlertBuilder.createEmittable(null, descriptionFormat, objects);
   }
 
   public static AlertBuilder createEmittable(ServiceEmitter emitter, String descriptionFormat, Object... objects)
diff --git a/processing/src/main/java/org/apache/druid/math/expr/Evals.java b/processing/src/main/java/org/apache/druid/math/expr/Evals.java
index 91a1dce688a4..0010679a8144 100644
--- a/processing/src/main/java/org/apache/druid/math/expr/Evals.java
+++ b/processing/src/main/java/org/apache/druid/math/expr/Evals.java
@@ -82,11 +82,11 @@ public static boolean objectAsBoolean(@Nullable Object val)
     if (val instanceof Boolean) {
       return (Boolean) val;
     } else if (val instanceof String) {
-      return asBoolean((String) val);
+      return Evals.asBoolean((String) val);
     } else if (val instanceof Long) {
-      return asBoolean((Long) val);
+      return Evals.asBoolean((Long) val);
     } else if (val instanceof Number) {
-      return asBoolean(((Number) val).doubleValue());
+      return Evals.asBoolean(((Number) val).doubleValue());
     }
     return false;
   }
diff --git a/processing/src/main/java/org/apache/druid/math/expr/ExprEval.java b/processing/src/main/java/org/apache/druid/math/expr/ExprEval.java
index 3c2e5630df47..f0d411a8e37d 100644
--- a/processing/src/main/java/org/apache/druid/math/expr/ExprEval.java
+++ b/processing/src/main/java/org/apache/druid/math/expr/ExprEval.java
@@ -166,14 +166,14 @@ public static NonnullPair<ExpressionType, Object[]> coerceListToArray(@Nullable
         Object[] array = new Object[val.size()];
         int i = 0;
         for (Object o : val) {
-          array[i++] = o != null ? ofType(ExpressionType.LONG, o).value() : null;
+          array[i++] = o != null ? ExprEval.ofType(ExpressionType.LONG, o).value() : null;
         }
         return new NonnullPair<>(ExpressionType.LONG_ARRAY, array);
       } else if (coercedType == Float.class || coercedType == Double.class) {
         Object[] array = new Object[val.size()];
         int i = 0;
         for (Object o : val) {
-          array[i++] = o != null ? ofType(ExpressionType.DOUBLE, o).value() : null;
+          array[i++] = o != null ? ExprEval.ofType(ExpressionType.DOUBLE, o).value() : null;
         }
         return new NonnullPair<>(ExpressionType.DOUBLE_ARRAY, array);
       } else if (coercedType == Object.class) {
@@ -184,7 +184,7 @@ public static NonnullPair<ExpressionType, Object[]> coerceListToArray(@Nullable
         ExpressionType elementType = null;
         for (Object o : val) {
           if (o != null) {
-            ExprEval<?> eval = bestEffortOf(o);
+            ExprEval<?> eval = ExprEval.bestEffortOf(o);
             elementType = ExpressionTypeConversion.leastRestrictiveType(elementType, eval.type());
             evals[i++] = eval;
           } else {
@@ -196,7 +196,7 @@ public static NonnullPair<ExpressionType, Object[]> coerceListToArray(@Nullable
           if (eval != null) {
             array[i++] = eval.castTo(elementType).value();
           } else {
-            array[i++] = ofType(elementType, null).value();
+            array[i++] = ExprEval.ofType(elementType, null).value();
           }
         }
         ExpressionType arrayType = elementType == null
@@ -208,7 +208,7 @@ public static NonnullPair<ExpressionType, Object[]> coerceListToArray(@Nullable
       Object[] array = new Object[val.size()];
       int i = 0;
       for (Object o : val) {
-        array[i++] = o != null ? ofType(ExpressionType.STRING, o).value() : null;
+        array[i++] = o != null ? ExprEval.ofType(ExpressionType.STRING, o).value() : null;
       }
       return new NonnullPair<>(ExpressionType.STRING_ARRAY, array);
     }
@@ -530,7 +530,7 @@ public static ExprEval ofType(@Nullable ExpressionType type, @Nullable Object va
           return ofLongBoolean((Boolean) value);
         }
         if (value instanceof String) {
-          return ofLong(computeNumber((String) value));
+          return ofLong(ExprEval.computeNumber((String) value));
         }
         return ofLong(null);
       case DOUBLE:
@@ -541,7 +541,7 @@ public static ExprEval ofType(@Nullable ExpressionType type, @Nullable Object va
           return ofDouble(Evals.asDouble((Boolean) value));
         }
         if (value instanceof String) {
-          return ofDouble(computeNumber((String) value));
+          return ofDouble(ExprEval.computeNumber((String) value));
         }
         return ofDouble(null);
       case COMPLEX:
@@ -576,7 +576,7 @@ public static ExprEval ofType(@Nullable ExpressionType type, @Nullable Object va
           Object[] array = new Object[theList.size()];
           int i = 0;
           for (Object o : theList) {
-            array[i++] = ofType(elementType, o).value();
+            array[i++] = ExprEval.ofType(elementType, o).value();
           }
           return ofArray(type, array);
         }
@@ -586,7 +586,7 @@ public static ExprEval ofType(@Nullable ExpressionType type, @Nullable Object va
           Object[] array = new Object[inputArray.length];
           int i = 0;
           for (Object o : inputArray) {
-            array[i++] = ofType(elementType, o).value();
+            array[i++] = ExprEval.ofType(elementType, o).value();
           }
           return ofArray(type, array);
         }
@@ -861,20 +861,20 @@ public final ExprEval castTo(ExpressionType castTo)
           return this;
         case LONG:
           if (value == null) {
-            return ofLong(null);
+            return ExprEval.ofLong(null);
           } else {
-            return of(asLong());
+            return ExprEval.of(asLong());
           }
         case STRING:
-          return of(asString());
+          return ExprEval.of(asString());
         case ARRAY:
           switch (castTo.getElementType().getType()) {
             case DOUBLE:
-              return ofDoubleArray(asArray());
+              return ExprEval.ofDoubleArray(asArray());
             case LONG:
-              return ofLongArray(value == null ? null : new Object[]{value.longValue()});
+              return ExprEval.ofLongArray(value == null ? null : new Object[]{value.longValue()});
             case STRING:
-              return ofStringArray(value == null ? null : new Object[]{value.toString()});
+              return ExprEval.ofStringArray(value == null ? null : new Object[]{value.toString()});
             default:
               ExpressionType elementType = (ExpressionType) castTo.getElementType();
               return new ArrayExprEval(castTo, new Object[]{castTo(elementType).value()});
@@ -942,25 +942,25 @@ public final ExprEval castTo(ExpressionType castTo)
       switch (castTo.getType()) {
         case DOUBLE:
           if (value == null) {
-            return ofDouble(null);
+            return ExprEval.ofDouble(null);
           } else {
-            return of(asDouble());
+            return ExprEval.of(asDouble());
           }
         case LONG:
           return this;
         case STRING:
-          return of(asString());
+          return ExprEval.of(asString());
         case ARRAY:
           if (value == null) {
             return new ArrayExprEval(castTo, null);
           }
           switch (castTo.getElementType().getType()) {
             case DOUBLE:
-              return ofDoubleArray(new Object[]{value.doubleValue()});
+              return ExprEval.ofDoubleArray(new Object[]{value.doubleValue()});
             case LONG:
-              return ofLongArray(asArray());
+              return ExprEval.ofLongArray(asArray());
             case STRING:
-              return ofStringArray(new Object[]{value.toString()});
+              return ExprEval.ofStringArray(new Object[]{value.toString()});
             default:
               ExpressionType elementType = (ExpressionType) castTo.getElementType();
               return new ArrayExprEval(castTo, new Object[]{castTo(elementType).value()});
@@ -1121,10 +1121,10 @@ public final ExprEval castTo(ExpressionType castTo)
     {
       switch (castTo.getType()) {
         case DOUBLE:
-          return ofDouble(computeNumber());
+          return ExprEval.ofDouble(computeNumber());
 
         case LONG:
-          return ofLong(computeNumber());
+          return ExprEval.ofLong(computeNumber());
 
         case STRING:
           return this;
@@ -1136,12 +1136,12 @@ public final ExprEval castTo(ExpressionType castTo)
           ExprType type = castTo.getElementType().getType();
           if (type == ExprType.DOUBLE) {
             final Number number = computeNumber();
-            return ofDoubleArray(new Object[]{number == null ? null : number.doubleValue()});
+            return ExprEval.ofDoubleArray(new Object[]{number == null ? null : number.doubleValue()});
           } else if (type == ExprType.LONG) {
             final Number number = computeNumber();
-            return ofLongArray(new Object[]{number == null ? null : number.longValue()});
+            return ExprEval.ofLongArray(new Object[]{number == null ? null : number.longValue()});
           } else if (type == ExprType.STRING) {
-            return ofStringArray(new Object[]{value});
+            return ExprEval.ofStringArray(new Object[]{value});
           }
 
           ExpressionType elementType = (ExpressionType) castTo.getElementType();
@@ -1306,7 +1306,7 @@ public ExprEval castTo(ExpressionType castTo)
         if (castTo.isArray()) {
           return new ArrayExprEval(castTo, null);
         }
-        return ofType(castTo, null);
+        return ExprEval.ofType(castTo, null);
       }
       if (type().equals(castTo)) {
         return this;
@@ -1314,26 +1314,26 @@ public ExprEval castTo(ExpressionType castTo)
       switch (castTo.getType()) {
         case STRING:
           if (value.length == 1) {
-            return of(asString());
+            return ExprEval.of(asString());
           }
           break;
         case LONG:
           if (value.length == 1) {
-            return isNumericNull() ? ofLong(null) : ofLong(asLong());
+            return isNumericNull() ? ExprEval.ofLong(null) : ExprEval.ofLong(asLong());
           }
           break;
         case DOUBLE:
           if (value.length == 1) {
-            return isNumericNull() ? ofDouble(null) : ofDouble(asDouble());
+            return isNumericNull() ? ExprEval.ofDouble(null) : ExprEval.ofDouble(asDouble());
           }
           break;
         case ARRAY:
           ExpressionType elementType = (ExpressionType) castTo.getElementType();
           Object[] cast = new Object[value.length];
           for (int i = 0; i < value.length; i++) {
-            cast[i] = ofType(elementType(), value[i]).castTo(elementType).value();
+            cast[i] = ExprEval.ofType(elementType(), value[i]).castTo(elementType).value();
           }
-          return ofArray(castTo, cast);
+          return ExprEval.ofArray(castTo, cast);
         case COMPLEX:
           if (ExpressionType.NESTED_DATA.equals(castTo)) {
             return new NestedDataExprEval(value);
@@ -1507,7 +1507,7 @@ private void computeNumber()
         } else if (val instanceof Boolean) {
           number = Evals.asLong((Boolean) val);
         } else if (val instanceof String) {
-          number = computeNumber((String) val);
+          number = ExprEval.computeNumber((String) val);
         }
       }
     }
@@ -1517,7 +1517,7 @@ private void computeNumber()
     public Object[] asArray()
     {
       Object val = StructuredData.unwrap(value);
-      ExprEval maybeArray = bestEffortOf(val);
+      ExprEval maybeArray = ExprEval.bestEffortOf(val);
       if (maybeArray.type().isPrimitive() || maybeArray.isArray()) {
         return maybeArray.asArray();
       }
@@ -1532,7 +1532,7 @@ public ExprEval castTo(ExpressionType castTo)
       }
 
       Object val = StructuredData.unwrap(value);
-      ExprEval bestEffortOf = bestEffortOf(val);
+      ExprEval bestEffortOf = ExprEval.bestEffortOf(val);
 
       if (bestEffortOf.type().isPrimitive() || bestEffortOf.type().isArray()) {
         return bestEffortOf.castTo(castTo);
diff --git a/processing/src/main/java/org/apache/druid/math/expr/ExprMacroTable.java b/processing/src/main/java/org/apache/druid/math/expr/ExprMacroTable.java
index 9aa1029898a1..40d8ba1112c4 100644
--- a/processing/src/main/java/org/apache/druid/math/expr/ExprMacroTable.java
+++ b/processing/src/main/java/org/apache/druid/math/expr/ExprMacroTable.java
@@ -159,7 +159,7 @@ public String stringify()
           macro.name(),
           args.size() == 1
           ? args.get(0).stringify()
-          : ARG_JOINER.join(args.stream().map(Expr::stringify).iterator())
+          : Expr.ARG_JOINER.join(args.stream().map(Expr::stringify).iterator())
       );
     }
 
diff --git a/processing/src/main/java/org/apache/druid/math/expr/ExprType.java b/processing/src/main/java/org/apache/druid/math/expr/ExprType.java
index 40da7469566f..9a9294cb404a 100644
--- a/processing/src/main/java/org/apache/druid/math/expr/ExprType.java
+++ b/processing/src/main/java/org/apache/druid/math/expr/ExprType.java
@@ -49,6 +49,6 @@ public boolean isPrimitive()
   @Override
   public boolean isArray()
   {
-    return this == ARRAY;
+    return this == ExprType.ARRAY;
   }
 }
diff --git a/processing/src/main/java/org/apache/druid/math/expr/ExpressionType.java b/processing/src/main/java/org/apache/druid/math/expr/ExpressionType.java
index 86d47d92cb26..42f322120978 100644
--- a/processing/src/main/java/org/apache/druid/math/expr/ExpressionType.java
+++ b/processing/src/main/java/org/apache/druid/math/expr/ExpressionType.java
@@ -54,7 +54,7 @@ public class ExpressionType extends BaseTypeSignature<ExprType>
   public static final ExpressionType DOUBLE_ARRAY =
       new ExpressionType(ExprType.ARRAY, null, DOUBLE);
   public static final ExpressionType NESTED_DATA =
-      fromColumnTypeStrict(ColumnType.NESTED_DATA);
+      ExpressionType.fromColumnTypeStrict(ColumnType.NESTED_DATA);
   public static final ExpressionType UNKNOWN_COMPLEX =
       new ExpressionType(ExprType.COMPLEX, null, null);
 
diff --git a/processing/src/main/java/org/apache/druid/math/expr/ExpressionTypeConversion.java b/processing/src/main/java/org/apache/druid/math/expr/ExpressionTypeConversion.java
index cffb2c002073..16ae50248307 100644
--- a/processing/src/main/java/org/apache/druid/math/expr/ExpressionTypeConversion.java
+++ b/processing/src/main/java/org/apache/druid/math/expr/ExpressionTypeConversion.java
@@ -241,7 +241,7 @@ public static ExpressionType leastRestrictiveType(@Nullable ExpressionType type,
   @Nullable
   public static ExpressionType integerMathFunction(@Nullable ExpressionType type, @Nullable ExpressionType other)
   {
-    final ExpressionType functionType = function(type, other);
+    final ExpressionType functionType = ExpressionTypeConversion.function(type, other);
     // any number is long
     return Types.isNumeric(functionType) ? ExpressionType.LONG : functionType;
   }
diff --git a/processing/src/main/java/org/apache/druid/math/expr/Parser.java b/processing/src/main/java/org/apache/druid/math/expr/Parser.java
index 80bd58ad4ecd..e92dd130b7ce 100644
--- a/processing/src/main/java/org/apache/druid/math/expr/Parser.java
+++ b/processing/src/main/java/org/apache/druid/math/expr/Parser.java
@@ -110,7 +110,7 @@ public static ApplyFunction getApplyFunction(String name)
    */
   public static Supplier<Expr> lazyParse(@Nullable String in, ExprMacroTable macroTable)
   {
-    return Suppliers.memoize(() -> in == null ? null : parse(in, macroTable));
+    return Suppliers.memoize(() -> in == null ? null : Parser.parse(in, macroTable));
   }
 
   /**
diff --git a/processing/src/main/java/org/apache/druid/query/JoinDataSource.java b/processing/src/main/java/org/apache/druid/query/JoinDataSource.java
index 440739e7e31c..2eb459cf8cc3 100644
--- a/processing/src/main/java/org/apache/druid/query/JoinDataSource.java
+++ b/processing/src/main/java/org/apache/druid/query/JoinDataSource.java
@@ -320,7 +320,7 @@ public DataSource withUpdatedDataSource(DataSource newSource)
     DimFilter joinBaseFilter = analysis.getJoinBaseTableFilter().orElse(null);
 
     for (final PreJoinableClause clause : analysis.getPreJoinableClauses()) {
-      current = create(
+      current = JoinDataSource.create(
           current,
           clause.getDataSource(),
           clause.getPrefix(),
diff --git a/processing/src/main/java/org/apache/druid/query/aggregation/AggregatorUtil.java b/processing/src/main/java/org/apache/druid/query/aggregation/AggregatorUtil.java
index c1cc0c5f523b..c4c9a7875ef0 100755
--- a/processing/src/main/java/org/apache/druid/query/aggregation/AggregatorUtil.java
+++ b/processing/src/main/java/org/apache/druid/query/aggregation/AggregatorUtil.java
@@ -219,7 +219,7 @@ public static Pair<List<AggregatorFactory>, List<PostAggregator>> condensedAggre
   )
   {
 
-    List<PostAggregator> condensedPostAggs = pruneDependentPostAgg(postAggList, metric);
+    List<PostAggregator> condensedPostAggs = AggregatorUtil.pruneDependentPostAgg(postAggList, metric);
     // calculate dependent aggregators for these postAgg
     Set<String> dependencySet = new HashSet<>();
     dependencySet.add(metric);
@@ -427,7 +427,7 @@ public static Supplier<byte[]> getSimpleAggregatorCacheKeySupplier(
       return ByteBuffer.allocate(2 + fieldNameBytes.length + expressionBytes.length)
                        .put(aggregatorType)
                        .put(fieldNameBytes)
-                       .put(STRING_SEPARATOR)
+                       .put(AggregatorUtil.STRING_SEPARATOR)
                        .put(expressionBytes)
                        .array();
     });
diff --git a/processing/src/main/java/org/apache/druid/query/aggregation/any/StringAnyAggregatorFactory.java b/processing/src/main/java/org/apache/druid/query/aggregation/any/StringAnyAggregatorFactory.java
index 286ac4d47b7a..418bb32f64eb 100644
--- a/processing/src/main/java/org/apache/druid/query/aggregation/any/StringAnyAggregatorFactory.java
+++ b/processing/src/main/java/org/apache/druid/query/aggregation/any/StringAnyAggregatorFactory.java
@@ -119,7 +119,7 @@ public boolean canVectorize(ColumnInspector columnInspector)
   @Override
   public Comparator getComparator()
   {
-    return VALUE_COMPARATOR;
+    return StringAnyAggregatorFactory.VALUE_COMPARATOR;
   }
 
   @Override
diff --git a/processing/src/main/java/org/apache/druid/query/aggregation/firstlast/first/StringFirstAggregatorFactory.java b/processing/src/main/java/org/apache/druid/query/aggregation/firstlast/first/StringFirstAggregatorFactory.java
index 80a4ca8ddce2..8ff45a27380b 100644
--- a/processing/src/main/java/org/apache/druid/query/aggregation/firstlast/first/StringFirstAggregatorFactory.java
+++ b/processing/src/main/java/org/apache/druid/query/aggregation/firstlast/first/StringFirstAggregatorFactory.java
@@ -150,7 +150,7 @@ public StringFirstAggregatorFactory(
     this.fieldName = fieldName;
     this.timeColumn = timeColumn == null ? ColumnHolder.TIME_COLUMN_NAME : timeColumn;
     this.maxStringBytes = maxStringBytes == null
-                          ? DEFAULT_MAX_STRING_SIZE
+                          ? StringFirstAggregatorFactory.DEFAULT_MAX_STRING_SIZE
                           : maxStringBytes;
   }
 
diff --git a/processing/src/main/java/org/apache/druid/query/aggregation/post/ArithmeticPostAggregator.java b/processing/src/main/java/org/apache/druid/query/aggregation/post/ArithmeticPostAggregator.java
index 2c343d7062f8..468be2b2a62b 100644
--- a/processing/src/main/java/org/apache/druid/query/aggregation/post/ArithmeticPostAggregator.java
+++ b/processing/src/main/java/org/apache/druid/query/aggregation/post/ArithmeticPostAggregator.java
@@ -265,7 +265,7 @@ public double compute(double lhs, double rhs)
     private static final Map<String, Ops> LOOKUP_MAP = new HashMap<>();
 
     static {
-      for (Ops op : values()) {
+      for (Ops op : Ops.values()) {
         LOOKUP_MAP.put(op.getFn(), op);
       }
     }
diff --git a/processing/src/main/java/org/apache/druid/query/datasourcemetadata/DataSourceMetadataQuery.java b/processing/src/main/java/org/apache/druid/query/datasourcemetadata/DataSourceMetadataQuery.java
index e5e6ead376dc..5c43c6445bc9 100644
--- a/processing/src/main/java/org/apache/druid/query/datasourcemetadata/DataSourceMetadataQuery.java
+++ b/processing/src/main/java/org/apache/druid/query/datasourcemetadata/DataSourceMetadataQuery.java
@@ -69,7 +69,7 @@ public DimFilter getFilter()
   @Override
   public String getType()
   {
-    return DATASOURCE_METADATA;
+    return Query.DATASOURCE_METADATA;
   }
 
   @Override
diff --git a/processing/src/main/java/org/apache/druid/query/filter/InDimFilter.java b/processing/src/main/java/org/apache/druid/query/filter/InDimFilter.java
index 36b4cb9b44b4..d678f4b53f12 100644
--- a/processing/src/main/java/org/apache/druid/query/filter/InDimFilter.java
+++ b/processing/src/main/java/org/apache/druid/query/filter/InDimFilter.java
@@ -789,7 +789,7 @@ public static ValuesSet create()
      */
     public static ValuesSet of(@Nullable final String value)
     {
-      final ValuesSet retVal = create();
+      final ValuesSet retVal = ValuesSet.create();
       retVal.add(NullHandling.emptyToNullIfNeeded(value));
       return retVal;
     }
diff --git a/processing/src/main/java/org/apache/druid/query/groupby/GroupByQuery.java b/processing/src/main/java/org/apache/druid/query/groupby/GroupByQuery.java
index 05416039be78..79282735f384 100644
--- a/processing/src/main/java/org/apache/druid/query/groupby/GroupByQuery.java
+++ b/processing/src/main/java/org/apache/druid/query/groupby/GroupByQuery.java
@@ -1196,7 +1196,7 @@ public Builder setContext(Map<String, Object> context)
 
     public Builder queryId(String queryId)
     {
-      context = computeOverriddenContext(context, ImmutableMap.of(QUERY_ID, queryId));
+      context = BaseQuery.computeOverriddenContext(context, ImmutableMap.of(BaseQuery.QUERY_ID, queryId));
       return this;
     }
 
diff --git a/processing/src/main/java/org/apache/druid/query/groupby/GroupingEngine.java b/processing/src/main/java/org/apache/druid/query/groupby/GroupingEngine.java
index f53c64a566ed..5dc995b55386 100644
--- a/processing/src/main/java/org/apache/druid/query/groupby/GroupingEngine.java
+++ b/processing/src/main/java/org/apache/druid/query/groupby/GroupingEngine.java
@@ -502,7 +502,7 @@ public Sequence<ResultRow> process(
     closer.register(bufferHolder);
     try {
       final String fudgeTimestampString = NullHandling.emptyToNullIfNeeded(
-          query.context().getString(CTX_KEY_FUDGE_TIMESTAMP)
+          query.context().getString(GroupingEngine.CTX_KEY_FUDGE_TIMESTAMP)
       );
 
       final DateTime fudgeTimestamp = fudgeTimestampString == null
diff --git a/processing/src/main/java/org/apache/druid/query/groupby/ResultRow.java b/processing/src/main/java/org/apache/druid/query/groupby/ResultRow.java
index 1232fc7c5916..977cba96034b 100644
--- a/processing/src/main/java/org/apache/druid/query/groupby/ResultRow.java
+++ b/processing/src/main/java/org/apache/druid/query/groupby/ResultRow.java
@@ -91,7 +91,7 @@ public static ResultRow create(final int size)
   public static ResultRow fromLegacyRow(Row row, final GroupByQuery query)
   {
     // Can't be sure if we'll get result rows with or without postaggregations, so be safe.
-    final ResultRow resultRow = create(query.getResultRowSizeWithPostAggregators());
+    final ResultRow resultRow = ResultRow.create(query.getResultRowSizeWithPostAggregators());
 
     int i = 0;
     if (query.getResultRowHasTimestamp()) {
diff --git a/processing/src/main/java/org/apache/druid/query/groupby/epinephelinae/RowBasedGrouperHelper.java b/processing/src/main/java/org/apache/druid/query/groupby/epinephelinae/RowBasedGrouperHelper.java
index 02e7fea12f54..96e4e9d24380 100644
--- a/processing/src/main/java/org/apache/druid/query/groupby/epinephelinae/RowBasedGrouperHelper.java
+++ b/processing/src/main/java/org/apache/druid/query/groupby/epinephelinae/RowBasedGrouperHelper.java
@@ -449,7 +449,7 @@ private static Predicate<ResultRow> getResultRowPredicate(final GroupByQuery que
     final ColumnSelectorFactory columnSelectorFactory =
         query.getVirtualColumns()
              .wrap(
-                 createResultRowBasedColumnSelectorFactory(
+                 RowBasedGrouperHelper.createResultRowBasedColumnSelectorFactory(
                      subquery,
                      rowSupplier,
                      RowSignature.Finalization.UNKNOWN
diff --git a/processing/src/main/java/org/apache/druid/query/groupby/orderby/OrderByColumnSpec.java b/processing/src/main/java/org/apache/druid/query/groupby/orderby/OrderByColumnSpec.java
index 67cfcfc16c7b..5dbe2abf94fc 100644
--- a/processing/src/main/java/org/apache/druid/query/groupby/orderby/OrderByColumnSpec.java
+++ b/processing/src/main/java/org/apache/druid/query/groupby/orderby/OrderByColumnSpec.java
@@ -55,7 +55,7 @@ public enum Direction
     private static final Map<String, Direction> STUPID_ENUM_MAP;
     static {
       final ImmutableMap.Builder<String, Direction> bob = ImmutableMap.builder();
-      for (Direction direction : values()) {
+      for (Direction direction : Direction.values()) {
         bob.put(direction.name(), direction);
       }
       STUPID_ENUM_MAP = bob.build();
@@ -75,7 +75,7 @@ public static Direction fromString(String name)
       Direction direction = STUPID_ENUM_MAP.get(upperName);
 
       if (direction == null) {
-        for (Direction dir : values()) {
+        for (Direction dir : Direction.values()) {
           if (dir.name().startsWith(upperName)) {
             if (direction != null) {
               throw new ISE("Ambiguous directions[%s] and [%s]", direction, dir);
diff --git a/processing/src/main/java/org/apache/druid/query/metadata/metadata/ColumnAnalysis.java b/processing/src/main/java/org/apache/druid/query/metadata/metadata/ColumnAnalysis.java
index b5df9e212a2e..131920177d38 100644
--- a/processing/src/main/java/org/apache/druid/query/metadata/metadata/ColumnAnalysis.java
+++ b/processing/src/main/java/org/apache/druid/query/metadata/metadata/ColumnAnalysis.java
@@ -151,7 +151,7 @@ public ColumnAnalysis fold(ColumnAnalysis rhs)
     }
 
     if (isError() && rhs.isError()) {
-      return errorMessage.equals(rhs.getErrorMessage()) ? this : error("multiple_errors");
+      return errorMessage.equals(rhs.getErrorMessage()) ? this : ColumnAnalysis.error("multiple_errors");
     } else if (isError()) {
       return this;
     } else if (rhs.isError()) {
@@ -159,13 +159,13 @@ public ColumnAnalysis fold(ColumnAnalysis rhs)
     }
 
     if (!Objects.equals(type, rhs.getType())) {
-      return error(
+      return ColumnAnalysis.error(
           StringUtils.format("cannot_merge_diff_types: [%s] and [%s]", type, rhs.getType())
       );
     }
 
     if (!Objects.equals(typeSignature, rhs.getTypeSignature())) {
-      return error(
+      return ColumnAnalysis.error(
           StringUtils.format(
               "cannot_merge_diff_types: [%s] and [%s]",
               typeSignature.asTypeString(),
diff --git a/processing/src/main/java/org/apache/druid/query/metadata/metadata/SegmentMetadataQuery.java b/processing/src/main/java/org/apache/druid/query/metadata/metadata/SegmentMetadataQuery.java
index 1e365ea4b516..f2d434bab8a5 100644
--- a/processing/src/main/java/org/apache/druid/query/metadata/metadata/SegmentMetadataQuery.java
+++ b/processing/src/main/java/org/apache/druid/query/metadata/metadata/SegmentMetadataQuery.java
@@ -164,7 +164,7 @@ public DimFilter getFilter()
   @Override
   public String getType()
   {
-    return SEGMENT_METADATA;
+    return Query.SEGMENT_METADATA;
   }
 
   @JsonProperty
diff --git a/processing/src/main/java/org/apache/druid/query/operator/WindowOperatorQuery.java b/processing/src/main/java/org/apache/druid/query/operator/WindowOperatorQuery.java
index 97d053491eba..79a8ebdb19d2 100644
--- a/processing/src/main/java/org/apache/druid/query/operator/WindowOperatorQuery.java
+++ b/processing/src/main/java/org/apache/druid/query/operator/WindowOperatorQuery.java
@@ -186,7 +186,7 @@ public DimFilter getFilter()
   @Override
   public String getType()
   {
-    return WINDOW_OPERATOR;
+    return Query.WINDOW_OPERATOR;
   }
 
 
diff --git a/processing/src/main/java/org/apache/druid/query/ordering/StringComparators.java b/processing/src/main/java/org/apache/druid/query/ordering/StringComparators.java
index eb44210d911d..650b259ed562 100644
--- a/processing/src/main/java/org/apache/druid/query/ordering/StringComparators.java
+++ b/processing/src/main/java/org/apache/druid/query/ordering/StringComparators.java
@@ -98,7 +98,7 @@ public int hashCode()
     @Override
     public String toString()
     {
-      return LEXICOGRAPHIC_NAME;
+      return StringComparators.LEXICOGRAPHIC_NAME;
     }
 
     @Override
@@ -286,7 +286,7 @@ public int hashCode()
     @Override
     public String toString()
     {
-      return ALPHANUMERIC_NAME;
+      return StringComparators.ALPHANUMERIC_NAME;
     }
 
     @Override
@@ -340,7 +340,7 @@ public int hashCode()
     @Override
     public String toString()
     {
-      return STRLEN_NAME;
+      return StringComparators.STRLEN_NAME;
     }
 
     @Override
@@ -404,7 +404,7 @@ public int compare(String o1, String o2)
 
       if (bd1 == null && bd2 == null) {
         // both Strings are unparseable, just compare lexicographically to have a well-defined ordering
-        return LEXICOGRAPHIC.compare(o1, o2);
+        return StringComparators.LEXICOGRAPHIC.compare(o1, o2);
       }
 
       if (bd1 == null) {
@@ -417,7 +417,7 @@ public int compare(String o1, String o2)
     @Override
     public String toString()
     {
-      return NUMERIC_NAME;
+      return StringComparators.NUMERIC_NAME;
     }
 
     @Override
@@ -469,7 +469,7 @@ public int compare(String o1, String o2)
     @Override
     public String toString()
     {
-      return VERSION_NAME;
+      return StringComparators.VERSION_NAME;
     }
 
     @Override
@@ -520,7 +520,7 @@ public int compare(String o1, String o2)
     @Override
     public String toString()
     {
-      return NATURAL_NAME;
+      return StringComparators.NATURAL_NAME;
     }
 
     @Override
diff --git a/processing/src/main/java/org/apache/druid/query/rowsandcols/MapOfColumnsRowsAndColumns.java b/processing/src/main/java/org/apache/druid/query/rowsandcols/MapOfColumnsRowsAndColumns.java
index 48e93f10e759..d6bc1026a98d 100644
--- a/processing/src/main/java/org/apache/druid/query/rowsandcols/MapOfColumnsRowsAndColumns.java
+++ b/processing/src/main/java/org/apache/druid/query/rowsandcols/MapOfColumnsRowsAndColumns.java
@@ -205,7 +205,7 @@ public Builder add(String name, Column col)
 
     public MapOfColumnsRowsAndColumns build()
     {
-      return fromMap(cols);
+      return MapOfColumnsRowsAndColumns.fromMap(cols);
     }
   }
 
diff --git a/processing/src/main/java/org/apache/druid/query/search/SearchQuery.java b/processing/src/main/java/org/apache/druid/query/search/SearchQuery.java
index 06ef3aa0a32b..aa10b6ab5790 100644
--- a/processing/src/main/java/org/apache/druid/query/search/SearchQuery.java
+++ b/processing/src/main/java/org/apache/druid/query/search/SearchQuery.java
@@ -94,7 +94,7 @@ public DimFilter getFilter()
   @Override
   public String getType()
   {
-    return SEARCH;
+    return Query.SEARCH;
   }
 
   @Override
diff --git a/processing/src/main/java/org/apache/druid/query/timeboundary/TimeBoundaryQuery.java b/processing/src/main/java/org/apache/druid/query/timeboundary/TimeBoundaryQuery.java
index 95913b77940b..47412f7d7d50 100644
--- a/processing/src/main/java/org/apache/druid/query/timeboundary/TimeBoundaryQuery.java
+++ b/processing/src/main/java/org/apache/druid/query/timeboundary/TimeBoundaryQuery.java
@@ -89,7 +89,7 @@ public DimFilter getFilter()
   @Override
   public String getType()
   {
-    return TIME_BOUNDARY;
+    return Query.TIME_BOUNDARY;
   }
 
   @JsonProperty
diff --git a/processing/src/main/java/org/apache/druid/query/timeseries/TimeseriesQuery.java b/processing/src/main/java/org/apache/druid/query/timeseries/TimeseriesQuery.java
index f85237c8be88..b2165cd5b704 100644
--- a/processing/src/main/java/org/apache/druid/query/timeseries/TimeseriesQuery.java
+++ b/processing/src/main/java/org/apache/druid/query/timeseries/TimeseriesQuery.java
@@ -120,7 +120,7 @@ public DimFilter getFilter()
   @Override
   public String getType()
   {
-    return TIMESERIES;
+    return Query.TIMESERIES;
   }
 
   @JsonProperty
diff --git a/processing/src/main/java/org/apache/druid/query/topn/PooledTopNAlgorithm.java b/processing/src/main/java/org/apache/druid/query/topn/PooledTopNAlgorithm.java
index f31b6c1e6560..e79ad59b0fca 100644
--- a/processing/src/main/java/org/apache/druid/query/topn/PooledTopNAlgorithm.java
+++ b/processing/src/main/java/org/apache/druid/query/topn/PooledTopNAlgorithm.java
@@ -81,28 +81,28 @@ public class PooledTopNAlgorithm
   @VisibleForTesting
   static void setSpecializeGeneric1AggPooledTopN(boolean value)
   {
-    SPECIALIZE_GENERIC_ONE_AGG_POOLED_TOPN = value;
+    PooledTopNAlgorithm.SPECIALIZE_GENERIC_ONE_AGG_POOLED_TOPN = value;
     computeSpecializedScanAndAggregateImplementations();
   }
 
   @VisibleForTesting
   static void setSpecializeGeneric2AggPooledTopN(boolean value)
   {
-    SPECIALIZE_GENERIC_TWO_AGG_POOLED_TOPN = value;
+    PooledTopNAlgorithm.SPECIALIZE_GENERIC_TWO_AGG_POOLED_TOPN = value;
     computeSpecializedScanAndAggregateImplementations();
   }
 
   @VisibleForTesting
   static void setSpecializeHistorical1SimpleDoubleAggPooledTopN(boolean value)
   {
-    SPECIALIZE_HISTORICAL_ONE_SIMPLE_DOUBLE_AGG_POOLED_TOPN = value;
+    PooledTopNAlgorithm.SPECIALIZE_HISTORICAL_ONE_SIMPLE_DOUBLE_AGG_POOLED_TOPN = value;
     computeSpecializedScanAndAggregateImplementations();
   }
 
   @VisibleForTesting
   static void setSpecializeHistoricalSingleValueDimSelector1SimpleDoubleAggPooledTopN(boolean value)
   {
-    SPECIALIZE_HISTORICAL_SINGLE_VALUE_DIM_SELECTOR_ONE_SIMPLE_DOUBLE_AGG_POOLED_TOPN = value;
+    PooledTopNAlgorithm.SPECIALIZE_HISTORICAL_SINGLE_VALUE_DIM_SELECTOR_ONE_SIMPLE_DOUBLE_AGG_POOLED_TOPN = value;
     computeSpecializedScanAndAggregateImplementations();
   }
 
diff --git a/processing/src/main/java/org/apache/druid/segment/AutoTypeColumnIndexer.java b/processing/src/main/java/org/apache/druid/segment/AutoTypeColumnIndexer.java
index 1953c887b953..dafd7dc96005 100644
--- a/processing/src/main/java/org/apache/druid/segment/AutoTypeColumnIndexer.java
+++ b/processing/src/main/java/org/apache/druid/segment/AutoTypeColumnIndexer.java
@@ -99,7 +99,7 @@ public ProcessedValue<?> processField(ArrayList<NestedPathPart> fieldPath, @Null
         ExprEval<?> eval = ExprEval.bestEffortOf(fieldValue);
         FieldIndexer fieldIndexer = fieldIndexers.get(fieldName);
         if (fieldIndexer == null) {
-          estimatedFieldKeySize += estimateStringSize(fieldName);
+          estimatedFieldKeySize += StructuredDataProcessor.estimateStringSize(fieldName);
           fieldIndexer = new FieldIndexer(globalDictionary);
           fieldIndexers.put(fieldName, fieldIndexer);
         }
@@ -120,7 +120,7 @@ public ProcessedValue<?> processArrayField(
         final String fieldName = NestedPathFinder.toNormalizedJsonPath(fieldPath);
         FieldIndexer fieldIndexer = fieldIndexers.get(fieldName);
         if (fieldIndexer == null) {
-          estimatedFieldKeySize += estimateStringSize(fieldName);
+          estimatedFieldKeySize += StructuredDataProcessor.estimateStringSize(fieldName);
           fieldIndexer = new FieldIndexer(globalDictionary);
           fieldIndexers.put(fieldName, fieldIndexer);
         }
diff --git a/processing/src/main/java/org/apache/druid/segment/DimensionHandlerUtils.java b/processing/src/main/java/org/apache/druid/segment/DimensionHandlerUtils.java
index 18e1334af44a..e129ceb41778 100644
--- a/processing/src/main/java/org/apache/druid/segment/DimensionHandlerUtils.java
+++ b/processing/src/main/java/org/apache/druid/segment/DimensionHandlerUtils.java
@@ -327,7 +327,7 @@ public static Long convertObjectToLong(
     } else if (valObj instanceof Boolean) {
       return Evals.asLong((Boolean) valObj);
     } else if (valObj instanceof String) {
-      Long ret = getExactLongFromDecimalString((String) valObj);
+      Long ret = DimensionHandlerUtils.getExactLongFromDecimalString((String) valObj);
       if (reportParseExceptions && ret == null) {
         final String message;
         if (objectKey != null) {
@@ -518,7 +518,7 @@ public static Object convertObjectToType(
       case ARRAY:
         return coerceToObjectArrayWithElementCoercionFunction(
             obj,
-            x -> convertObjectToType(x, type.getElementType(), reportParseExceptions, fieldName)
+            x -> DimensionHandlerUtils.convertObjectToType(x, type.getElementType(), reportParseExceptions, fieldName)
         );
       case COMPLEX:
         // Can't coerce complex objects, and we shouldn't need to. If in future selectors behave weirdly, or we need to
diff --git a/processing/src/main/java/org/apache/druid/segment/IndexMergerV9.java b/processing/src/main/java/org/apache/druid/segment/IndexMergerV9.java
index 2be3966b6509..7da89edaff75 100644
--- a/processing/src/main/java/org/apache/druid/segment/IndexMergerV9.java
+++ b/processing/src/main/java/org/apache/druid/segment/IndexMergerV9.java
@@ -1232,7 +1232,7 @@ private File multiphaseMerge(
 
     List<File> tempDirs = new ArrayList<>();
 
-    if (maxColumnsToMerge == UNLIMITED_MAX_COLUMNS_TO_MERGE) {
+    if (maxColumnsToMerge == IndexMerger.UNLIMITED_MAX_COLUMNS_TO_MERGE) {
       return merge(
           indexes,
           rollup,
diff --git a/processing/src/main/java/org/apache/druid/segment/IndexSpec.java b/processing/src/main/java/org/apache/druid/segment/IndexSpec.java
index fcf9677b0760..cf9527f43342 100644
--- a/processing/src/main/java/org/apache/druid/segment/IndexSpec.java
+++ b/processing/src/main/java/org/apache/druid/segment/IndexSpec.java
@@ -43,7 +43,7 @@
  */
 public class IndexSpec
 {
-  public static final IndexSpec DEFAULT = builder().build();
+  public static final IndexSpec DEFAULT = IndexSpec.builder().build();
 
   public static Builder builder()
   {
diff --git a/processing/src/main/java/org/apache/druid/segment/NestedDataColumnIndexerV4.java b/processing/src/main/java/org/apache/druid/segment/NestedDataColumnIndexerV4.java
index 1eef86db7d87..366f5d86278d 100644
--- a/processing/src/main/java/org/apache/druid/segment/NestedDataColumnIndexerV4.java
+++ b/processing/src/main/java/org/apache/druid/segment/NestedDataColumnIndexerV4.java
@@ -73,7 +73,7 @@ public ProcessedValue<?> processField(ArrayList<NestedPathPart> fieldPath, @Null
         ExprEval<?> eval = ExprEval.bestEffortOf(fieldValue);
         FieldIndexer fieldIndexer = fieldIndexers.get(fieldName);
         if (fieldIndexer == null) {
-          estimatedFieldKeySize += estimateStringSize(fieldName);
+          estimatedFieldKeySize += StructuredDataProcessor.estimateStringSize(fieldName);
           fieldIndexer = new FieldIndexer(globalDictionary);
           fieldIndexers.put(fieldName, fieldIndexer);
         }
diff --git a/processing/src/main/java/org/apache/druid/segment/RowBasedColumnSelectorFactory.java b/processing/src/main/java/org/apache/druid/segment/RowBasedColumnSelectorFactory.java
index 8fff2da8f869..035e036f153f 100644
--- a/processing/src/main/java/org/apache/druid/segment/RowBasedColumnSelectorFactory.java
+++ b/processing/src/main/java/org/apache/druid/segment/RowBasedColumnSelectorFactory.java
@@ -298,7 +298,7 @@ public void inspectRuntimeShape(RuntimeShapeInspector inspector)
         @Override
         public int getValueCardinality()
         {
-          return CARDINALITY_UNKNOWN;
+          return DimensionDictionarySelector.CARDINALITY_UNKNOWN;
         }
 
         @Override
diff --git a/processing/src/main/java/org/apache/druid/segment/column/ColumnCapabilities.java b/processing/src/main/java/org/apache/druid/segment/column/ColumnCapabilities.java
index 014dfe2227c1..59f0e18c0ae8 100644
--- a/processing/src/main/java/org/apache/druid/segment/column/ColumnCapabilities.java
+++ b/processing/src/main/java/org/apache/druid/segment/column/ColumnCapabilities.java
@@ -119,7 +119,7 @@ public boolean isUnknown()
 
     public Capable coerceUnknownToBoolean(boolean unknownIsTrue)
     {
-      return this == UNKNOWN ? of(unknownIsTrue) : this;
+      return this == UNKNOWN ? Capable.of(unknownIsTrue) : this;
     }
 
     public Capable and(Capable other)
@@ -146,7 +146,7 @@ public static Capable of(boolean bool)
     @JsonCreator
     public static Capable ofNullable(@Nullable Boolean bool)
     {
-      return bool == null ? UNKNOWN : of(bool);
+      return bool == null ? Capable.UNKNOWN : of(bool);
     }
 
     @JsonValue
diff --git a/processing/src/main/java/org/apache/druid/segment/column/ColumnCapabilitiesImpl.java b/processing/src/main/java/org/apache/druid/segment/column/ColumnCapabilitiesImpl.java
index 956352e1c288..f0b13a7115ea 100644
--- a/processing/src/main/java/org/apache/druid/segment/column/ColumnCapabilitiesImpl.java
+++ b/processing/src/main/java/org/apache/druid/segment/column/ColumnCapabilitiesImpl.java
@@ -110,7 +110,7 @@ public static ColumnCapabilitiesImpl snapshot(@Nullable final ColumnCapabilities
    */
   public static ColumnCapabilitiesImpl createDefault()
   {
-    return snapshot(new ColumnCapabilitiesImpl(), ALL_FALSE);
+    return ColumnCapabilitiesImpl.snapshot(new ColumnCapabilitiesImpl(), ALL_FALSE);
   }
 
   /**
diff --git a/processing/src/main/java/org/apache/druid/segment/column/ColumnType.java b/processing/src/main/java/org/apache/druid/segment/column/ColumnType.java
index 60da75855fc1..b670d8f4370f 100644
--- a/processing/src/main/java/org/apache/druid/segment/column/ColumnType.java
+++ b/processing/src/main/java/org/apache/druid/segment/column/ColumnType.java
@@ -179,8 +179,8 @@ public static ColumnType leastRestrictiveType(@Nullable ColumnType type, @Nullab
     }
     // if either is nested data, use nested data, otherwise error
     if (type.is(ValueType.COMPLEX) || other.is(ValueType.COMPLEX)) {
-      if (NESTED_DATA.equals(type) || NESTED_DATA.equals(other)) {
-        return NESTED_DATA;
+      if (ColumnType.NESTED_DATA.equals(type) || ColumnType.NESTED_DATA.equals(other)) {
+        return ColumnType.NESTED_DATA;
       }
       throw new Types.IncompatibleTypeException(type, other);
     }
@@ -198,14 +198,14 @@ public static ColumnType leastRestrictiveType(@Nullable ColumnType type, @Nullab
             (ColumnType) other.getElementType()
         );
 
-        return ofArray(commonElementType);
+        return ColumnType.ofArray(commonElementType);
       } else {
         commonElementType = leastRestrictiveType(
             (ColumnType) type.getElementType(),
             other
         );
       }
-      return ofArray(commonElementType);
+      return ColumnType.ofArray(commonElementType);
     }
     if (other.isArray()) {
       if (type.equals(type.getElementType())) {
@@ -217,22 +217,22 @@ public static ColumnType leastRestrictiveType(@Nullable ColumnType type, @Nullab
           type,
           (ColumnType) other.getElementType()
       );
-      return ofArray(commonElementType);
+      return ColumnType.ofArray(commonElementType);
     }
     // if either argument is a string, type becomes a string
     if (Types.is(type, ValueType.STRING) || Types.is(other, ValueType.STRING)) {
-      return STRING;
+      return ColumnType.STRING;
     }
 
     // all numbers win over longs
     if (Types.is(type, ValueType.LONG) && Types.isNullOr(other, ValueType.LONG)) {
-      return LONG;
+      return ColumnType.LONG;
     }
     // doubles win over floats
     if (Types.is(type, ValueType.FLOAT) && Types.isNullOr(other, ValueType.FLOAT)) {
-      return FLOAT;
+      return ColumnType.FLOAT;
     }
-    return DOUBLE;
+    return ColumnType.DOUBLE;
   }
 
 }
diff --git a/processing/src/main/java/org/apache/druid/segment/column/ValueType.java b/processing/src/main/java/org/apache/druid/segment/column/ValueType.java
index 083e87bf5fc9..6e114ec89955 100644
--- a/processing/src/main/java/org/apache/druid/segment/column/ValueType.java
+++ b/processing/src/main/java/org/apache/druid/segment/column/ValueType.java
@@ -128,7 +128,7 @@ public boolean isArray()
   @Override
   public boolean isPrimitive()
   {
-    return STRING.equals(this) || isNumeric(this);
+    return this.equals(ValueType.STRING) || isNumeric(this);
   }
 
   @Nullable
@@ -143,11 +143,11 @@ public static ValueType fromString(@Nullable String name)
 
   public static boolean isNumeric(ValueType type)
   {
-    return type == LONG || type == FLOAT || type == DOUBLE;
+    return type == ValueType.LONG || type == ValueType.FLOAT || type == ValueType.DOUBLE;
   }
 
   public static boolean isArray(ValueType type)
   {
-    return type == ARRAY;
+    return type == ValueType.ARRAY;
   }
 }
diff --git a/processing/src/main/java/org/apache/druid/segment/data/CompressionFactory.java b/processing/src/main/java/org/apache/druid/segment/data/CompressionFactory.java
index f2320f4bf097..55d4c2d1f883 100644
--- a/processing/src/main/java/org/apache/druid/segment/data/CompressionFactory.java
+++ b/processing/src/main/java/org/apache/druid/segment/data/CompressionFactory.java
@@ -203,7 +203,7 @@ public byte getId()
     static final Map<Byte, LongEncodingFormat> ID_MAP = new HashMap<>();
 
     static {
-      for (LongEncodingFormat format : values()) {
+      for (LongEncodingFormat format : LongEncodingFormat.values()) {
         ID_MAP.put(format.getId(), format);
       }
     }
diff --git a/processing/src/main/java/org/apache/druid/segment/data/CompressionStrategy.java b/processing/src/main/java/org/apache/druid/segment/data/CompressionStrategy.java
index 34eb269851a5..18ea27cc4044 100644
--- a/processing/src/main/java/org/apache/druid/segment/data/CompressionStrategy.java
+++ b/processing/src/main/java/org/apache/druid/segment/data/CompressionStrategy.java
@@ -158,7 +158,7 @@ public static CompressionStrategy fromString(String name)
   static final Map<Byte, CompressionStrategy> ID_MAP = new HashMap<>();
 
   static {
-    for (CompressionStrategy strategy : values()) {
+    for (CompressionStrategy strategy : CompressionStrategy.values()) {
       ID_MAP.put(strategy.getId(), strategy);
     }
   }
@@ -171,7 +171,7 @@ public static CompressionStrategy forId(byte id)
   // TODO remove this method and change all its callers to use all CompressionStrategy values when NONE type is supported by all types
   public static CompressionStrategy[] noNoneValues()
   {
-    return (CompressionStrategy[]) ArrayUtils.removeElement(values(), NONE);
+    return (CompressionStrategy[]) ArrayUtils.removeElement(CompressionStrategy.values(), NONE);
   }
 
   public interface Decompressor
diff --git a/processing/src/main/java/org/apache/druid/segment/data/FrontCodedIndexed.java b/processing/src/main/java/org/apache/druid/segment/data/FrontCodedIndexed.java
index 4adc39e87aaf..58231fd26029 100644
--- a/processing/src/main/java/org/apache/druid/segment/data/FrontCodedIndexed.java
+++ b/processing/src/main/java/org/apache/druid/segment/data/FrontCodedIndexed.java
@@ -83,12 +83,12 @@ public abstract class FrontCodedIndexed implements Indexed<ByteBuffer>
 
   public static byte validateVersion(byte version)
   {
-    if (version != V0 && version != V1) {
+    if (version != FrontCodedIndexed.V0 && version != FrontCodedIndexed.V1) {
       throw new IAE(
           "Unknown format version for FrontCodedIndexed [%s], must be [%s] or [%s]",
           version,
-          V0,
-          V1
+          FrontCodedIndexed.V0,
+          FrontCodedIndexed.V1
       );
     }
     return version;
diff --git a/processing/src/main/java/org/apache/druid/segment/data/Indexed.java b/processing/src/main/java/org/apache/druid/segment/data/Indexed.java
index a2fffd81cb8b..9c1b36720078 100644
--- a/processing/src/main/java/org/apache/druid/segment/data/Indexed.java
+++ b/processing/src/main/java/org/apache/druid/segment/data/Indexed.java
@@ -53,7 +53,7 @@ public int size()
       @Override
       public T get(int index)
       {
-        checkIndex(index, 0);
+        Indexed.checkIndex(index, 0);
         return null;
       }
 
diff --git a/processing/src/main/java/org/apache/druid/segment/filter/Filters.java b/processing/src/main/java/org/apache/druid/segment/filter/Filters.java
index 1d83e2eda11c..1c0893b4a052 100644
--- a/processing/src/main/java/org/apache/druid/segment/filter/Filters.java
+++ b/processing/src/main/java/org/apache/druid/segment/filter/Filters.java
@@ -164,7 +164,7 @@ public static Filter convertToCNFFromQueryContext(Query query, @Nullable Filter
     }
     boolean useCNF = query.context().getBoolean(QueryContexts.USE_FILTER_CNF_KEY, QueryContexts.DEFAULT_USE_FILTER_CNF);
     try {
-      return useCNF ? toCnf(filter) : filter;
+      return useCNF ? Filters.toCnf(filter) : filter;
     }
     catch (CNFFilterExplosionException cnfFilterExplosionException) {
       return filter; // cannot convert to CNF, return the filter as is
@@ -321,7 +321,7 @@ public static Optional<Filter> maybeOr(final List<Filter> filters)
    */
   public static List<Filter> toNormalizedOrClauses(Filter filter) throws CNFFilterExplosionException
   {
-    Filter normalizedFilter = toCnf(filter);
+    Filter normalizedFilter = Filters.toCnf(filter);
 
     // List of candidates for pushdown
     // CNF normalization will generate either
diff --git a/processing/src/main/java/org/apache/druid/segment/filter/ValueMatchers.java b/processing/src/main/java/org/apache/druid/segment/filter/ValueMatchers.java
index a543f56fa9fd..344fbbb70cbf 100644
--- a/processing/src/main/java/org/apache/druid/segment/filter/ValueMatchers.java
+++ b/processing/src/main/java/org/apache/druid/segment/filter/ValueMatchers.java
@@ -411,7 +411,7 @@ public void inspectRuntimeShape(RuntimeShapeInspector inspector)
       final int nullId = lookup.lookupId(null);
       if (nullId < 0) {
         // column doesn't have null value so no unknowns, can safely return always false matcher
-        return allFalse();
+        return ValueMatchers.allFalse();
       }
       if (multiValue) {
         return new ValueMatcher()
diff --git a/processing/src/main/java/org/apache/druid/segment/index/IndexedUtf8ValueIndexes.java b/processing/src/main/java/org/apache/druid/segment/index/IndexedUtf8ValueIndexes.java
index 4476d70f1126..a9819fd75cb3 100644
--- a/processing/src/main/java/org/apache/druid/segment/index/IndexedUtf8ValueIndexes.java
+++ b/processing/src/main/java/org/apache/druid/segment/index/IndexedUtf8ValueIndexes.java
@@ -241,7 +241,7 @@ public BitmapColumnIndex forSortedValues(@Nonnull List<?> sortedValues, TypeSign
       } else {
         tailSet = baseSet;
       }
-      if (tailSet.size() > SORTED_SCAN_RATIO_THRESHOLD * dictionary.size()) {
+      if (tailSet.size() > ValueSetIndexes.SORTED_SCAN_RATIO_THRESHOLD * dictionary.size()) {
         return ValueSetIndexes.buildBitmapColumnIndexFromSortedIteratorScan(
             bitmapFactory,
             ByteBufferUtils.utf8Comparator(),
diff --git a/processing/src/main/java/org/apache/druid/segment/nested/FieldTypeInfo.java b/processing/src/main/java/org/apache/druid/segment/nested/FieldTypeInfo.java
index 7750b8645449..b00af7a132f0 100644
--- a/processing/src/main/java/org/apache/druid/segment/nested/FieldTypeInfo.java
+++ b/processing/src/main/java/org/apache/druid/segment/nested/FieldTypeInfo.java
@@ -253,7 +253,7 @@ public void write(MutableTypeSet types) throws IOException
       byte typeByte = types.getByteValue();
       // adjust for empty array if needed
       if (types.hasUntypedArray()) {
-        Set<ColumnType> columnTypes = convertToSet(types.getByteValue());
+        Set<ColumnType> columnTypes = FieldTypeInfo.convertToSet(types.getByteValue());
         ColumnType leastRestrictive = null;
         for (ColumnType type : columnTypes) {
           leastRestrictive = ColumnType.leastRestrictiveType(leastRestrictive, type);
diff --git a/processing/src/main/java/org/apache/druid/segment/nested/NestedCommonFormatColumnSerializer.java b/processing/src/main/java/org/apache/druid/segment/nested/NestedCommonFormatColumnSerializer.java
index acaa9a32c12b..88b5c240e1b0 100644
--- a/processing/src/main/java/org/apache/druid/segment/nested/NestedCommonFormatColumnSerializer.java
+++ b/processing/src/main/java/org/apache/druid/segment/nested/NestedCommonFormatColumnSerializer.java
@@ -88,7 +88,7 @@ protected static void copyFromTempSmoosh(FileSmoosher smoosher, SmooshedFileMapp
 
   public static void writeV0Header(WritableByteChannel channel, ByteBuffer columnNameBuffer) throws IOException
   {
-    channel.write(ByteBuffer.wrap(new byte[]{V0}));
+    channel.write(ByteBuffer.wrap(new byte[]{NestedCommonFormatColumnSerializer.V0}));
     channel.write(columnNameBuffer);
   }
 
diff --git a/processing/src/main/java/org/apache/druid/segment/nested/NestedFieldColumnIndexSupplier.java b/processing/src/main/java/org/apache/druid/segment/nested/NestedFieldColumnIndexSupplier.java
index f32907595536..3947013274c5 100644
--- a/processing/src/main/java/org/apache/druid/segment/nested/NestedFieldColumnIndexSupplier.java
+++ b/processing/src/main/java/org/apache/druid/segment/nested/NestedFieldColumnIndexSupplier.java
@@ -1314,7 +1314,7 @@ public BitmapColumnIndex forValue(@Nullable String value)
         @Override
         public int estimatedComputeCost()
         {
-          return INDEX_COMPUTE_SCALE;
+          return NestedVariantIndexes.INDEX_COMPUTE_SCALE;
         }
 
         @Override
@@ -1357,10 +1357,10 @@ public BitmapColumnIndex forSortedValues(SortedSet<String> values)
         @Override
         public int estimatedComputeCost()
         {
-          if (values.size() >= Integer.MAX_VALUE / INDEX_COMPUTE_SCALE) {
+          if (values.size() >= Integer.MAX_VALUE / NestedVariantIndexes.INDEX_COMPUTE_SCALE) {
             return Integer.MAX_VALUE;
           }
-          return values.size() * INDEX_COMPUTE_SCALE;
+          return values.size() * NestedVariantIndexes.INDEX_COMPUTE_SCALE;
         }
 
         @Override
diff --git a/processing/src/main/java/org/apache/druid/segment/nested/ScalarDoubleColumnAndIndexSupplier.java b/processing/src/main/java/org/apache/druid/segment/nested/ScalarDoubleColumnAndIndexSupplier.java
index 4c52eb2810da..8d1dd4227730 100644
--- a/processing/src/main/java/org/apache/druid/segment/nested/ScalarDoubleColumnAndIndexSupplier.java
+++ b/processing/src/main/java/org/apache/druid/segment/nested/ScalarDoubleColumnAndIndexSupplier.java
@@ -323,7 +323,7 @@ public BitmapColumnIndex forSortedValues(@Nonnull List<?> sortedValues, TypeSign
         final List<Double> tailSet;
         final List<Double> baseSet = (List<Double>) sortedValues;
 
-        if (sortedValues.size() >= SIZE_WORTH_CHECKING_MIN) {
+        if (sortedValues.size() >= ValueSetIndexes.SIZE_WORTH_CHECKING_MIN) {
           final double minValueInColumn = dictionary.get(0) == null ? dictionary.get(1) : dictionary.get(0);
           final int position = Collections.binarySearch(
               sortedValues,
@@ -335,7 +335,7 @@ public BitmapColumnIndex forSortedValues(@Nonnull List<?> sortedValues, TypeSign
         } else {
           tailSet = baseSet;
         }
-        if (tailSet.size() > SORTED_SCAN_RATIO_THRESHOLD * dictionary.size()) {
+        if (tailSet.size() > ValueSetIndexes.SORTED_SCAN_RATIO_THRESHOLD * dictionary.size()) {
           return ValueSetIndexes.buildBitmapColumnIndexFromSortedIteratorScan(
               bitmapFactory,
               ColumnType.DOUBLE.getNullableStrategy(),
diff --git a/processing/src/main/java/org/apache/druid/segment/nested/ScalarLongColumnAndIndexSupplier.java b/processing/src/main/java/org/apache/druid/segment/nested/ScalarLongColumnAndIndexSupplier.java
index 1e572f6069ec..5a55a5f7c145 100644
--- a/processing/src/main/java/org/apache/druid/segment/nested/ScalarLongColumnAndIndexSupplier.java
+++ b/processing/src/main/java/org/apache/druid/segment/nested/ScalarLongColumnAndIndexSupplier.java
@@ -321,7 +321,7 @@ public BitmapColumnIndex forSortedValues(@Nonnull List<?> sortedValues, TypeSign
         final List<Long> tailSet;
         final List<Long> baseSet = (List<Long>) sortedValues;
 
-        if (sortedValues.size() >= SIZE_WORTH_CHECKING_MIN) {
+        if (sortedValues.size() >= ValueSetIndexes.SIZE_WORTH_CHECKING_MIN) {
           final long minValueInColumn = dictionary.get(0) == null ? dictionary.get(1) : dictionary.get(0);
           final int position = Collections.binarySearch(
               sortedValues,
@@ -332,7 +332,7 @@ public BitmapColumnIndex forSortedValues(@Nonnull List<?> sortedValues, TypeSign
         } else {
           tailSet = baseSet;
         }
-        if (tailSet.size() > SORTED_SCAN_RATIO_THRESHOLD * dictionary.size()) {
+        if (tailSet.size() > ValueSetIndexes.SORTED_SCAN_RATIO_THRESHOLD * dictionary.size()) {
           return ValueSetIndexes.buildBitmapColumnIndexFromSortedIteratorScan(
               bitmapFactory,
               ColumnType.LONG.getNullableStrategy(),
diff --git a/processing/src/main/java/org/apache/druid/segment/serde/DictionaryEncodedColumnPartSerde.java b/processing/src/main/java/org/apache/druid/segment/serde/DictionaryEncodedColumnPartSerde.java
index 536b562ebdaa..02e7f5b4d397 100644
--- a/processing/src/main/java/org/apache/druid/segment/serde/DictionaryEncodedColumnPartSerde.java
+++ b/processing/src/main/java/org/apache/druid/segment/serde/DictionaryEncodedColumnPartSerde.java
@@ -91,7 +91,7 @@ public enum VERSION
 
     public static VERSION fromByte(byte b)
     {
-      final VERSION[] values = values();
+      final VERSION[] values = VERSION.values();
       Preconditions.checkArgument(b < values.length, "Unsupported dictionary column version[%s]", b);
       return values[b];
     }
diff --git a/processing/src/main/java/org/apache/druid/segment/virtual/ExpressionMultiValueDimensionSelector.java b/processing/src/main/java/org/apache/druid/segment/virtual/ExpressionMultiValueDimensionSelector.java
index a9773551d2b6..dd70b3566e16 100644
--- a/processing/src/main/java/org/apache/druid/segment/virtual/ExpressionMultiValueDimensionSelector.java
+++ b/processing/src/main/java/org/apache/druid/segment/virtual/ExpressionMultiValueDimensionSelector.java
@@ -252,7 +252,7 @@ List<String> getArrayAsList(ExprEval evaluated)
     @Override
     String getArrayValue(ExprEval evaluated, int i)
     {
-      return extractionFn.apply(getArrayElement(evaluated, i));
+      return extractionFn.apply(ExpressionMultiValueDimensionSelector.getArrayElement(evaluated, i));
     }
 
     @Override
diff --git a/processing/src/main/java/org/apache/druid/segment/virtual/SingleStringInputDeferredEvaluationExpressionDimensionSelector.java b/processing/src/main/java/org/apache/druid/segment/virtual/SingleStringInputDeferredEvaluationExpressionDimensionSelector.java
index 88dc833a2503..b8a4e2d82f92 100644
--- a/processing/src/main/java/org/apache/druid/segment/virtual/SingleStringInputDeferredEvaluationExpressionDimensionSelector.java
+++ b/processing/src/main/java/org/apache/druid/segment/virtual/SingleStringInputDeferredEvaluationExpressionDimensionSelector.java
@@ -26,6 +26,7 @@
 import org.apache.druid.query.filter.DruidPredicateFactory;
 import org.apache.druid.query.filter.ValueMatcher;
 import org.apache.druid.query.monomorphicprocessing.RuntimeShapeInspector;
+import org.apache.druid.segment.DimensionDictionarySelector;
 import org.apache.druid.segment.DimensionSelector;
 import org.apache.druid.segment.DimensionSelectorUtils;
 import org.apache.druid.segment.IdLookup;
@@ -56,7 +57,7 @@ public SingleStringInputDeferredEvaluationExpressionDimensionSelector(
   )
   {
     // Verify selector has a working dictionary.
-    if (selector.getValueCardinality() == CARDINALITY_UNKNOWN
+    if (selector.getValueCardinality() == DimensionDictionarySelector.CARDINALITY_UNKNOWN
         || !selector.nameLookupPossibleInAdvance()) {
       throw new ISE("Selector of class[%s] does not have a dictionary, cannot use it.", selector.getClass().getName());
     }
diff --git a/processing/src/main/java/org/apache/druid/segment/virtual/SingleStringInputDeferredEvaluationExpressionDimensionVectorSelector.java b/processing/src/main/java/org/apache/druid/segment/virtual/SingleStringInputDeferredEvaluationExpressionDimensionVectorSelector.java
index 47586c753b54..5a1dd4955069 100644
--- a/processing/src/main/java/org/apache/druid/segment/virtual/SingleStringInputDeferredEvaluationExpressionDimensionVectorSelector.java
+++ b/processing/src/main/java/org/apache/druid/segment/virtual/SingleStringInputDeferredEvaluationExpressionDimensionVectorSelector.java
@@ -24,6 +24,7 @@
 import org.apache.druid.math.expr.Expr;
 import org.apache.druid.math.expr.ExpressionType;
 import org.apache.druid.math.expr.vector.ExprVectorProcessor;
+import org.apache.druid.segment.DimensionDictionarySelector;
 import org.apache.druid.segment.IdLookup;
 import org.apache.druid.segment.vector.SingleValueDimensionVectorSelector;
 
@@ -52,7 +53,7 @@ public SingleStringInputDeferredEvaluationExpressionDimensionVectorSelector(
   )
   {
     // Verify selector has a working dictionary.
-    if (selector.getValueCardinality() == CARDINALITY_UNKNOWN
+    if (selector.getValueCardinality() == DimensionDictionarySelector.CARDINALITY_UNKNOWN
         || !selector.nameLookupPossibleInAdvance()) {
       throw new ISE(
           "Selector of class[%s] does not have a dictionary, cannot use it.",
diff --git a/quidem-ut/src/main/java/org/apache/druid/quidem/ExposedAsBrokerQueryComponentSupplierWrapper.java b/quidem-ut/src/main/java/org/apache/druid/quidem/ExposedAsBrokerQueryComponentSupplierWrapper.java
index b564fbdc50b7..d1fa6a349ba4 100644
--- a/quidem-ut/src/main/java/org/apache/druid/quidem/ExposedAsBrokerQueryComponentSupplierWrapper.java
+++ b/quidem-ut/src/main/java/org/apache/druid/quidem/ExposedAsBrokerQueryComponentSupplierWrapper.java
@@ -123,7 +123,7 @@ public void configureGuice(CoreInjectorBuilder builder, List<Module> overrideMod
     installForServerModules(builder);
     builder.add(new QueryRunnerFactoryModule());
 
-    overrideModules.addAll(brokerModules());
+    overrideModules.addAll(ExposedAsBrokerQueryComponentSupplierWrapper.brokerModules());
     overrideModules.add(new BrokerTestModule());
     builder.add(QuidemCaptureModule.class);
   }
diff --git a/quidem-ut/src/main/java/org/apache/druid/quidem/QuidemRecorder.java b/quidem-ut/src/main/java/org/apache/druid/quidem/QuidemRecorder.java
index dc34b25697c4..d95de9f3f764 100644
--- a/quidem-ut/src/main/java/org/apache/druid/quidem/QuidemRecorder.java
+++ b/quidem-ut/src/main/java/org/apache/druid/quidem/QuidemRecorder.java
@@ -53,7 +53,7 @@ public QuidemRecorder(URI quidemURI, DruidHookDispatcher hookDispatcher, File fi
     printStream.println("#started " + new Date());
     printStream.println("!use " + quidemURI);
     printStream.println("!set outputformat mysql");
-    hookDispatcher.register(SQL, this);
+    hookDispatcher.register(DruidHook.SQL, this);
   }
 
   @Override
@@ -63,13 +63,13 @@ public synchronized void close()
       printStream.close();
       printStream = null;
     }
-    hookDispatcher.unregister(SQL, this);
+    hookDispatcher.unregister(DruidHook.SQL, this);
   }
 
   @Override
   public synchronized void invoke(HookKey<String> key, String query)
   {
-    if (SQL.equals(key)) {
+    if (DruidHook.SQL.equals(key)) {
       if (queries.contains(query)) {
         // ignore duplicate queries
         return;
diff --git a/server/src/main/java/org/apache/druid/catalog/model/CatalogUtils.java b/server/src/main/java/org/apache/druid/catalog/model/CatalogUtils.java
index 88cfcc1a587a..d0ac6c31e76b 100644
--- a/server/src/main/java/org/apache/druid/catalog/model/CatalogUtils.java
+++ b/server/src/main/java/org/apache/druid/catalog/model/CatalogUtils.java
@@ -203,7 +203,7 @@ public static <T> List<T> concatLists(
    */
   public static String getNonBlankString(Map<String, Object> args, String parameter)
   {
-    String value = getString(args, parameter);
+    String value = CatalogUtils.getString(args, parameter);
     if (value != null) {
       value = value.trim();
       if (value.isEmpty()) {
@@ -215,7 +215,7 @@ public static String getNonBlankString(Map<String, Object> args, String paramete
 
   public static List<String> getUriListArg(Map<String, Object> args, String parameter)
   {
-    String urisString = getString(args, parameter);
+    String urisString = CatalogUtils.getString(args, parameter);
     if (Strings.isNullOrEmpty(urisString)) {
       throw new IAE("One or more values are required for parameter %s", parameter);
     }
diff --git a/server/src/main/java/org/apache/druid/catalog/model/table/DatasourceDefn.java b/server/src/main/java/org/apache/druid/catalog/model/table/DatasourceDefn.java
index e349ffb7ede4..297188dd9cc1 100644
--- a/server/src/main/java/org/apache/druid/catalog/model/table/DatasourceDefn.java
+++ b/server/src/main/java/org/apache/druid/catalog/model/table/DatasourceDefn.java
@@ -158,7 +158,7 @@ protected void validateColumn(ColumnSpec spec)
 
   public static boolean isDatasource(String tableType)
   {
-    return TABLE_TYPE.equals(tableType);
+    return DatasourceDefn.TABLE_TYPE.equals(tableType);
   }
 
   public static boolean isDatasource(ResolvedTable table)
diff --git a/server/src/main/java/org/apache/druid/discovery/DruidNodeDiscoveryProvider.java b/server/src/main/java/org/apache/druid/discovery/DruidNodeDiscoveryProvider.java
index 42abbb23f2a0..44ce7ff98246 100644
--- a/server/src/main/java/org/apache/druid/discovery/DruidNodeDiscoveryProvider.java
+++ b/server/src/main/java/org/apache/druid/discovery/DruidNodeDiscoveryProvider.java
@@ -67,7 +67,7 @@ public DruidNodeDiscovery getForService(String serviceName)
         serviceName,
         service -> {
 
-          Set<NodeRole> nodeRolesToWatch = SERVICE_TO_NODE_TYPES.get(service);
+          Set<NodeRole> nodeRolesToWatch = DruidNodeDiscoveryProvider.SERVICE_TO_NODE_TYPES.get(service);
           if (nodeRolesToWatch == null) {
             throw new IAE("Unknown service [%s].", service);
           }
diff --git a/server/src/main/java/org/apache/druid/guice/DruidBinders.java b/server/src/main/java/org/apache/druid/guice/DruidBinders.java
index b243930d6191..fbec4f6219ff 100644
--- a/server/src/main/java/org/apache/druid/guice/DruidBinders.java
+++ b/server/src/main/java/org/apache/druid/guice/DruidBinders.java
@@ -75,7 +75,7 @@ public static class QueryLogicBinder
     public QueryLogicBinder(Binder binder)
     {
       this.binder = binder;
-      queryLogicMapBinder = queryLogicBinderType(binder);
+      queryLogicMapBinder = DruidBinders.queryLogicBinderType(binder);
     }
 
     QueryLogicBinder bindQueryLogic(
diff --git a/server/src/main/java/org/apache/druid/metadata/SortOrder.java b/server/src/main/java/org/apache/druid/metadata/SortOrder.java
index d7e0de4677d0..afabd0cde59a 100644
--- a/server/src/main/java/org/apache/druid/metadata/SortOrder.java
+++ b/server/src/main/java/org/apache/druid/metadata/SortOrder.java
@@ -53,14 +53,14 @@ public String toString()
   @JsonCreator
   public static SortOrder fromValue(String value)
   {
-    for (SortOrder b : values()) {
+    for (SortOrder b : SortOrder.values()) {
       if (String.valueOf(b.value).equalsIgnoreCase(String.valueOf(value))) {
         return b;
       }
     }
     throw InvalidInput.exception(StringUtils.format(
         "Unexpected value[%s] for SortOrder. Possible values are: %s",
-        value, Arrays.stream(values()).map(SortOrder::toString).collect(Collectors.toList())
+        value, Arrays.stream(SortOrder.values()).map(SortOrder::toString).collect(Collectors.toList())
     ));
   }
 }
diff --git a/server/src/main/java/org/apache/druid/rpc/guice/ServiceClientModule.java b/server/src/main/java/org/apache/druid/rpc/guice/ServiceClientModule.java
index 52b2e8379156..a0d9a5e3725c 100644
--- a/server/src/main/java/org/apache/druid/rpc/guice/ServiceClientModule.java
+++ b/server/src/main/java/org/apache/druid/rpc/guice/ServiceClientModule.java
@@ -139,7 +139,7 @@ public BrokerClient makeBrokerClient(
         clientFactory.makeClient(
             NodeRole.BROKER.getJsonName(),
             serviceLocator,
-            StandardRetryPolicy.builder().maxAttempts(CLIENT_MAX_ATTEMPTS).build()
+            StandardRetryPolicy.builder().maxAttempts(ServiceClientModule.CLIENT_MAX_ATTEMPTS).build()
         ),
         jsonMapper
     );
diff --git a/server/src/main/java/org/apache/druid/server/compaction/CompactionStatus.java b/server/src/main/java/org/apache/druid/server/compaction/CompactionStatus.java
index a2e6385b46f2..fd53ed38c257 100644
--- a/server/src/main/java/org/apache/druid/server/compaction/CompactionStatus.java
+++ b/server/src/main/java/org/apache/druid/server/compaction/CompactionStatus.java
@@ -140,7 +140,7 @@ private static <T> CompactionStatus configChanged(
       Function<T, String> stringFunction
   )
   {
-    return incomplete(
+    return CompactionStatus.incomplete(
         "'%s' mismatch: required[%s], current[%s]",
         field,
         target == null ? null : stringFunction.apply(target),
@@ -298,7 +298,7 @@ private Evaluator(
     private CompactionStatus segmentsHaveBeenCompactedAtLeastOnce()
     {
       if (lastCompactionState == null) {
-        return incomplete("not compacted yet");
+        return CompactionStatus.incomplete("not compacted yet");
       } else {
         return COMPLETE;
       }
@@ -312,7 +312,7 @@ private CompactionStatus allCandidatesHaveSameCompactionState()
       if (allHaveSameCompactionState) {
         return COMPLETE;
       } else {
-        return incomplete("segments have different last compaction states");
+        return CompactionStatus.incomplete("segments have different last compaction states");
       }
     }
 
@@ -322,7 +322,7 @@ private CompactionStatus partitionsSpecIsUpToDate()
       if (existingPartionsSpec instanceof DimensionRangePartitionsSpec) {
         existingPartionsSpec = getEffectiveRangePartitionsSpec((DimensionRangePartitionsSpec) existingPartionsSpec);
       }
-      return completeIfEqual(
+      return CompactionStatus.completeIfEqual(
           "partitionsSpec",
           findPartitionsSpecFromConfig(tuningConfig),
           existingPartionsSpec,
@@ -332,7 +332,7 @@ private CompactionStatus partitionsSpecIsUpToDate()
 
     private CompactionStatus indexSpecIsUpToDate()
     {
-      return completeIfEqual(
+      return CompactionStatus.completeIfEqual(
           "indexSpec",
           Configs.valueOrDefault(tuningConfig.getIndexSpec(), IndexSpec.DEFAULT),
           objectMapper.convertValue(lastCompactionState.getIndexSpec(), IndexSpec.class),
@@ -360,13 +360,13 @@ private CompactionStatus segmentGranularityIsUpToDate()
             segment -> !configuredSegmentGranularity.isAligned(segment.getInterval())
         );
         if (needsCompaction) {
-          return incomplete(
+          return CompactionStatus.incomplete(
               "segmentGranularity: segments do not align with target[%s]",
               asString(configuredSegmentGranularity)
           );
         }
       } else {
-        return configChanged(
+        return CompactionStatus.configChanged(
             "segmentGranularity",
             configuredSegmentGranularity,
             existingSegmentGranularity,
@@ -382,7 +382,7 @@ private CompactionStatus rollupIsUpToDate()
       if (configuredGranularitySpec == null) {
         return COMPLETE;
       } else {
-        return completeIfEqual(
+        return CompactionStatus.completeIfEqual(
             "rollup",
             configuredGranularitySpec.isRollup(),
             existingGranularitySpec == null ? null : existingGranularitySpec.isRollup(),
@@ -396,7 +396,7 @@ private CompactionStatus queryGranularityIsUpToDate()
       if (configuredGranularitySpec == null) {
         return COMPLETE;
       } else {
-        return completeIfEqual(
+        return CompactionStatus.completeIfEqual(
             "queryGranularity",
             configuredGranularitySpec.getQueryGranularity(),
             existingGranularitySpec == null ? null : existingGranularitySpec.getQueryGranularity(),
@@ -426,7 +426,7 @@ private CompactionStatus dimensionsSpecIsUpToDate()
             compactionConfig.getTuningConfig() == null ? null : compactionConfig.getTuningConfig().getPartitionsSpec()
         );
         {
-          return completeIfEqual(
+          return CompactionStatus.completeIfEqual(
               "dimensionsSpec",
               configuredDimensions,
               existingDimensions,
@@ -449,7 +449,7 @@ private CompactionStatus metricsSpecIsUpToDate()
             ? null : objectMapper.convertValue(metricSpecList, AggregatorFactory[].class);
 
       if (existingMetricsSpec == null || !Arrays.deepEquals(configuredMetricsSpec, existingMetricsSpec)) {
-        return configChanged(
+        return CompactionStatus.configChanged(
             "metricsSpec",
             configuredMetricsSpec,
             existingMetricsSpec,
@@ -470,7 +470,7 @@ private CompactionStatus transformSpecFilterIsUpToDate()
           lastCompactionState.getTransformSpec(),
           ClientCompactionTaskTransformSpec.class
       );
-      return completeIfEqual(
+      return CompactionStatus.completeIfEqual(
           "transformSpec filter",
           compactionConfig.getTransformSpec().getFilter(),
           existingTransformSpec == null ? null : existingTransformSpec.getFilter(),
diff --git a/server/src/main/java/org/apache/druid/server/coordination/BroadcastDatasourceLoadingSpec.java b/server/src/main/java/org/apache/druid/server/coordination/BroadcastDatasourceLoadingSpec.java
index 28d83adab5b9..3a11027311e6 100644
--- a/server/src/main/java/org/apache/druid/server/coordination/BroadcastDatasourceLoadingSpec.java
+++ b/server/src/main/java/org/apache/druid/server/coordination/BroadcastDatasourceLoadingSpec.java
@@ -134,7 +134,7 @@ public static BroadcastDatasourceLoadingSpec createFromContext(Map<String, Objec
       if (broadcastDatasourcesToLoad == null || broadcastDatasourcesToLoad.isEmpty()) {
         throw InvalidInput.exception("Set of broadcast datasources to load cannot be %s for mode[ONLY_REQUIRED].", broadcastDatasourcesToLoad);
       }
-      return loadOnly(new HashSet<>(broadcastDatasourcesToLoad));
+      return BroadcastDatasourceLoadingSpec.loadOnly(new HashSet<>(broadcastDatasourcesToLoad));
     } else {
       return defaultSpec;
     }
diff --git a/server/src/main/java/org/apache/druid/server/coordination/ServerType.java b/server/src/main/java/org/apache/druid/server/coordination/ServerType.java
index 829a662d1af4..59d6f6bcc61b 100644
--- a/server/src/main/java/org/apache/druid/server/coordination/ServerType.java
+++ b/server/src/main/java/org/apache/druid/server/coordination/ServerType.java
@@ -153,11 +153,11 @@ public static ServerType fromNodeRole(NodeRole nodeRole)
   {
     // this doesn't actually check that the NodeRole is a typical data node
     if (nodeRole.equals(NodeRole.HISTORICAL)) {
-      return HISTORICAL;
+      return ServerType.HISTORICAL;
     } else if (nodeRole.equals(NodeRole.BROKER)) {
-      return BROKER;
+      return ServerType.BROKER;
     } else {
-      return INDEXER_EXECUTOR;
+      return ServerType.INDEXER_EXECUTOR;
     }
   }
 
diff --git a/server/src/main/java/org/apache/druid/server/coordinator/balancer/SegmentToMoveCalculator.java b/server/src/main/java/org/apache/druid/server/coordinator/balancer/SegmentToMoveCalculator.java
index a84d63ebe76c..01c7da44c116 100644
--- a/server/src/main/java/org/apache/druid/server/coordinator/balancer/SegmentToMoveCalculator.java
+++ b/server/src/main/java/org/apache/druid/server/coordinator/balancer/SegmentToMoveCalculator.java
@@ -70,8 +70,10 @@ public static int computeNumSegmentsToMoveInTier(
     ).sum();
 
     // Move at least some segments to ensure that the cluster is always balancing itself
-    final int minSegmentsToMove = computeMinSegmentsToMoveInTier(totalSegments);
-    final int segmentsToMoveToFixDeviation = computeNumSegmentsToMoveToBalanceTier(tier, historicals);
+    final int minSegmentsToMove = SegmentToMoveCalculator
+        .computeMinSegmentsToMoveInTier(totalSegments);
+    final int segmentsToMoveToFixDeviation = SegmentToMoveCalculator
+        .computeNumSegmentsToMoveToBalanceTier(tier, historicals);
     log.info(
         "Need to move [%,d] segments in tier[%s] to attain balance. Allowed values are [min=%d, max=%d].",
         segmentsToMoveToFixDeviation, tier, minSegmentsToMove, maxSegmentsToMoveInTier
diff --git a/server/src/main/java/org/apache/druid/server/http/HostAndPortWithScheme.java b/server/src/main/java/org/apache/druid/server/http/HostAndPortWithScheme.java
index 6a76ebc89ff6..297e86f38984 100644
--- a/server/src/main/java/org/apache/druid/server/http/HostAndPortWithScheme.java
+++ b/server/src/main/java/org/apache/druid/server/http/HostAndPortWithScheme.java
@@ -47,12 +47,12 @@ public static HostAndPortWithScheme fromString(String hostPortMaybeSchemeString)
       if (colonIndex == -1) {
         throw new IAE("Invalid host with scheme string: [%s]", hostPortMaybeSchemeString);
       }
-      return fromString(
+      return HostAndPortWithScheme.fromString(
           hostPortMaybeSchemeString.substring(0, colonIndex),
           hostPortMaybeSchemeString.substring(colonIndex + 1)
       );
     }
-    return fromString("http", hostPortMaybeSchemeString);
+    return HostAndPortWithScheme.fromString("http", hostPortMaybeSchemeString);
   }
 
   public static HostAndPortWithScheme fromString(String scheme, String hostPortString)
diff --git a/server/src/main/java/org/apache/druid/server/initialization/jetty/StandardResponseHeaderFilterHolder.java b/server/src/main/java/org/apache/druid/server/initialization/jetty/StandardResponseHeaderFilterHolder.java
index b6d79e930f41..2f12ff2402c8 100644
--- a/server/src/main/java/org/apache/druid/server/initialization/jetty/StandardResponseHeaderFilterHolder.java
+++ b/server/src/main/java/org/apache/druid/server/initialization/jetty/StandardResponseHeaderFilterHolder.java
@@ -73,7 +73,7 @@ public static void deduplicateHeadersInProxyServlet(
       final Response serverResponse
   )
   {
-    for (final String headerName : STANDARD_HEADERS) {
+    for (final String headerName : StandardResponseHeaderFilterHolder.STANDARD_HEADERS) {
       if (serverResponse.getHeaders().containsKey(headerName) && proxyResponse.containsHeader(headerName)) {
         ((org.eclipse.jetty.server.Response) proxyResponse).getHttpFields().remove(headerName);
       }
diff --git a/server/src/main/java/org/apache/druid/server/lookup/cache/LookupLoadingSpec.java b/server/src/main/java/org/apache/druid/server/lookup/cache/LookupLoadingSpec.java
index 2d798e657ea0..4665bdd18cf4 100644
--- a/server/src/main/java/org/apache/druid/server/lookup/cache/LookupLoadingSpec.java
+++ b/server/src/main/java/org/apache/druid/server/lookup/cache/LookupLoadingSpec.java
@@ -127,7 +127,7 @@ public static LookupLoadingSpec createFromContext(Map<String, Object> context, L
       if (lookupsToLoad == null || lookupsToLoad.isEmpty()) {
         throw InvalidInput.exception("Set of lookups to load cannot be %s for mode[ONLY_REQUIRED].", lookupsToLoad);
       }
-      return loadOnly(new HashSet<>(lookupsToLoad));
+      return LookupLoadingSpec.loadOnly(new HashSet<>(lookupsToLoad));
     } else {
       return defaultSpec;
     }
diff --git a/server/src/main/java/org/apache/druid/server/metrics/MonitorsConfig.java b/server/src/main/java/org/apache/druid/server/metrics/MonitorsConfig.java
index fd06b3adb830..25e124c19837 100644
--- a/server/src/main/java/org/apache/druid/server/metrics/MonitorsConfig.java
+++ b/server/src/main/java/org/apache/druid/server/metrics/MonitorsConfig.java
@@ -95,8 +95,8 @@ public static Map<String, String[]> extractDimensions(Properties props, List<Str
   {
     Map<String, String[]> dimensionsMap = new HashMap<>();
     for (String property : props.stringPropertyNames()) {
-      if (property.startsWith(METRIC_DIMENSION_PREFIX)) {
-        String dimension = property.substring(METRIC_DIMENSION_PREFIX.length());
+      if (property.startsWith(MonitorsConfig.METRIC_DIMENSION_PREFIX)) {
+        String dimension = property.substring(MonitorsConfig.METRIC_DIMENSION_PREFIX.length());
         if (dimensions.contains(dimension)) {
           dimensionsMap.put(
               dimension,
diff --git a/server/src/main/java/org/apache/druid/server/security/AuthorizationUtils.java b/server/src/main/java/org/apache/druid/server/security/AuthorizationUtils.java
index af0ba920a85e..431819da8a42 100644
--- a/server/src/main/java/org/apache/druid/server/security/AuthorizationUtils.java
+++ b/server/src/main/java/org/apache/druid/server/security/AuthorizationUtils.java
@@ -404,7 +404,7 @@ public static <KeyType, ResType> Map<KeyType, List<ResType>> filterAuthorizedRes
       throw new ISE("Request already had authorization check.");
     }
 
-    final AuthenticationResult authenticationResult = authenticationResultFromRequest(request);
+    final AuthenticationResult authenticationResult = AuthorizationUtils.authenticationResultFromRequest(request);
 
     Map<KeyType, List<ResType>> filteredResources = new HashMap<>();
     for (Map.Entry<KeyType, List<ResType>> entry : unfilteredResources.entrySet()) {
@@ -413,7 +413,7 @@ public static <KeyType, ResType> Map<KeyType, List<ResType>> filterAuthorizedRes
       }
 
       final List<ResType> filteredList = Lists.newArrayList(
-          filterAuthorizedResources(
+          AuthorizationUtils.filterAuthorizedResources(
               authenticationResult,
               entry.getValue(),
               resourceActionGenerator,
diff --git a/sql/src/main/java/org/apache/calcite/plan/volcano/DruidVolcanoCost.java b/sql/src/main/java/org/apache/calcite/plan/volcano/DruidVolcanoCost.java
index af57df6f562c..c26fe21c6922 100644
--- a/sql/src/main/java/org/apache/calcite/plan/volcano/DruidVolcanoCost.java
+++ b/sql/src/main/java/org/apache/calcite/plan/volcano/DruidVolcanoCost.java
@@ -264,25 +264,25 @@ public RelOptCost makeCost(double dRows, double dCpu, double dIo)
     @Override
     public RelOptCost makeHugeCost()
     {
-      return HUGE;
+      return DruidVolcanoCost.HUGE;
     }
 
     @Override
     public RelOptCost makeInfiniteCost()
     {
-      return INFINITY;
+      return DruidVolcanoCost.INFINITY;
     }
 
     @Override
     public RelOptCost makeTinyCost()
     {
-      return TINY;
+      return DruidVolcanoCost.TINY;
     }
 
     @Override
     public RelOptCost makeZeroCost()
     {
-      return ZERO;
+      return DruidVolcanoCost.ZERO;
     }
   }
 }
diff --git a/sql/src/main/java/org/apache/druid/sql/calcite/aggregation/builtin/MaxSqlAggregator.java b/sql/src/main/java/org/apache/druid/sql/calcite/aggregation/builtin/MaxSqlAggregator.java
index eb8fbd502001..4f29b276a544 100644
--- a/sql/src/main/java/org/apache/druid/sql/calcite/aggregation/builtin/MaxSqlAggregator.java
+++ b/sql/src/main/java/org/apache/druid/sql/calcite/aggregation/builtin/MaxSqlAggregator.java
@@ -71,7 +71,7 @@ private static AggregatorFactory createMaxAggregatorFactory(
       default:
         // This error refers to the Druid type. But, we're in SQL validation.
         // It should refer to the SQL type.
-        throw badTypeException(fieldName, "MAX", aggregationType);
+        throw SimpleSqlAggregator.badTypeException(fieldName, "MAX", aggregationType);
     }
   }
 }
diff --git a/sql/src/main/java/org/apache/druid/sql/calcite/aggregation/builtin/MinSqlAggregator.java b/sql/src/main/java/org/apache/druid/sql/calcite/aggregation/builtin/MinSqlAggregator.java
index 4d83c64da526..93b87d376b52 100644
--- a/sql/src/main/java/org/apache/druid/sql/calcite/aggregation/builtin/MinSqlAggregator.java
+++ b/sql/src/main/java/org/apache/druid/sql/calcite/aggregation/builtin/MinSqlAggregator.java
@@ -66,7 +66,7 @@ private static AggregatorFactory createMinAggregatorFactory(
       case DOUBLE:
         return new DoubleMinAggregatorFactory(name, fieldName, null, macroTable);
       default:
-        throw badTypeException(fieldName, "MIN", aggregationType);
+        throw SimpleSqlAggregator.badTypeException(fieldName, "MIN", aggregationType);
     }
   }
 }
diff --git a/sql/src/main/java/org/apache/druid/sql/calcite/aggregation/builtin/SumSqlAggregator.java b/sql/src/main/java/org/apache/druid/sql/calcite/aggregation/builtin/SumSqlAggregator.java
index e7244f463860..29790ab7154a 100644
--- a/sql/src/main/java/org/apache/druid/sql/calcite/aggregation/builtin/SumSqlAggregator.java
+++ b/sql/src/main/java/org/apache/druid/sql/calcite/aggregation/builtin/SumSqlAggregator.java
@@ -80,7 +80,7 @@ static AggregatorFactory createSumAggregatorFactory(
       case DOUBLE:
         return new DoubleSumAggregatorFactory(name, fieldName, null, macroTable);
       default:
-        throw badTypeException(fieldName, "SUM", aggregationType);
+        throw SimpleSqlAggregator.badTypeException(fieldName, "SUM", aggregationType);
     }
   }
 }
diff --git a/sql/src/main/java/org/apache/druid/sql/calcite/expression/DefaultOperandTypeChecker.java b/sql/src/main/java/org/apache/druid/sql/calcite/expression/DefaultOperandTypeChecker.java
index 99a446c270c5..a52ce5707c14 100644
--- a/sql/src/main/java/org/apache/druid/sql/calcite/expression/DefaultOperandTypeChecker.java
+++ b/sql/src/main/java/org/apache/druid/sql/calcite/expression/DefaultOperandTypeChecker.java
@@ -243,7 +243,7 @@ public DefaultOperandTypeChecker build()
           operandNames,
           operandTypes,
           computedRequiredOperandCount,
-          buildNullableOperands(computedRequiredOperandCount, operandTypes.size(), notNullOperands),
+          DefaultOperandTypeChecker.buildNullableOperands(computedRequiredOperandCount, operandTypes.size(), notNullOperands),
           literalOperands
       );
     }
diff --git a/sql/src/main/java/org/apache/druid/sql/calcite/filtration/ConvertSelectorsToIns.java b/sql/src/main/java/org/apache/druid/sql/calcite/filtration/ConvertSelectorsToIns.java
index 5d58988dda54..413d75fbc6dc 100644
--- a/sql/src/main/java/org/apache/druid/sql/calcite/filtration/ConvertSelectorsToIns.java
+++ b/sql/src/main/java/org/apache/druid/sql/calcite/filtration/ConvertSelectorsToIns.java
@@ -149,7 +149,7 @@ public CollectSelectors(final List<DimFilter> orExprs, final RowSignature source
     @Override
     protected Pair<SelectorDimFilter, List<DimFilter>> getCollectibleComparison(DimFilter filter)
     {
-      return splitAnd(
+      return ConvertSelectorsToIns.splitAnd(
           filter,
           SelectorDimFilter.class,
 
@@ -217,7 +217,7 @@ public CollectEqualities(final List<DimFilter> orExprs)
     @Override
     protected Pair<EqualityFilter, List<DimFilter>> getCollectibleComparison(DimFilter filter)
     {
-      return splitAnd(
+      return ConvertSelectorsToIns.splitAnd(
           filter,
           EqualityFilter.class,
 
@@ -275,7 +275,7 @@ public CollectEqualitiesDefaultValueMode(final List<DimFilter> orExprs)
     @Override
     protected Pair<EqualityFilter, List<DimFilter>> getCollectibleComparison(DimFilter filter)
     {
-      return splitAnd(
+      return ConvertSelectorsToIns.splitAnd(
           filter,
           EqualityFilter.class,
 
diff --git a/sql/src/main/java/org/apache/druid/sql/calcite/planner/CalciteRulesManager.java b/sql/src/main/java/org/apache/druid/sql/calcite/planner/CalciteRulesManager.java
index 08a5df39d98c..f8b5cdabb769 100644
--- a/sql/src/main/java/org/apache/druid/sql/calcite/planner/CalciteRulesManager.java
+++ b/sql/src/main/java/org/apache/druid/sql/calcite/planner/CalciteRulesManager.java
@@ -278,7 +278,7 @@ public List<Program> programs(final PlannerContext plannerContext)
   private Program buildDecoupledLogicalOptimizationProgram(PlannerContext plannerContext)
   {
     final HepProgramBuilder builder = HepProgram.builder();
-    builder.addMatchLimit(HEP_DEFAULT_MATCH_LIMIT);
+    builder.addMatchLimit(CalciteRulesManager.HEP_DEFAULT_MATCH_LIMIT);
     builder.addRuleCollection(baseRuleSet(plannerContext));
     builder.addRuleInstance(CoreRules.UNION_MERGE);
     builder.addRuleInstance(JoinExtractFilterRule.Config.DEFAULT.toRule());
@@ -331,7 +331,7 @@ private Program sqlToRelWorkaroundProgram()
   private Program buildPreVolcanoManipulationProgram(final PlannerContext plannerContext)
   {
     final HepProgramBuilder builder = HepProgram.builder();
-    builder.addMatchLimit(HEP_DEFAULT_MATCH_LIMIT);
+    builder.addMatchLimit(CalciteRulesManager.HEP_DEFAULT_MATCH_LIMIT);
 
     // Apply FILTER_INTO_JOIN early, if using a join algorithm that requires subqueries anyway.
     if (plannerContext.getJoinAlgorithm().requiresSubquery()) {
@@ -351,7 +351,7 @@ private Program buildPreVolcanoManipulationProgram(final PlannerContext plannerC
   private Program buildReductionProgram(final PlannerContext plannerContext, final boolean isDruid)
   {
     final HepProgramBuilder builder = HepProgram.builder();
-    builder.addMatchLimit(HEP_DEFAULT_MATCH_LIMIT);
+    builder.addMatchLimit(CalciteRulesManager.HEP_DEFAULT_MATCH_LIMIT);
 
     if (isDruid) {
       // COALESCE rules must run before REDUCTION_RULES, since otherwise ReduceExpressionsRule#pushPredicateIntoCase may
diff --git a/sql/src/main/java/org/apache/druid/sql/calcite/planner/Calcites.java b/sql/src/main/java/org/apache/druid/sql/calcite/planner/Calcites.java
index 32e74887bf2d..6310b23543de 100644
--- a/sql/src/main/java/org/apache/druid/sql/calcite/planner/Calcites.java
+++ b/sql/src/main/java/org/apache/druid/sql/calcite/planner/Calcites.java
@@ -299,7 +299,7 @@ public static RelDataType createSqlTypeWithNullability(
       case VARCHAR:
         dataType = typeFactory.createTypeWithCharsetAndCollation(
             typeFactory.createSqlType(typeName),
-            defaultCharset(),
+            Calcites.defaultCharset(),
             SqlCollation.IMPLICIT
         );
         break;
@@ -566,7 +566,7 @@ public RelDataType inferReturnType(SqlOperatorBinding opBinding)
       if (SqlTypeUtil.isArray(type)) {
         return type;
       }
-      return createSqlArrayTypeWithNullability(
+      return Calcites.createSqlArrayTypeWithNullability(
           opBinding.getTypeFactory(),
           type.getSqlTypeName(),
           true
@@ -583,7 +583,7 @@ public RelDataType inferReturnType(SqlOperatorBinding opBinding)
       if (SqlTypeUtil.isArray(type)) {
         return type;
       }
-      return createSqlArrayTypeWithNullability(
+      return Calcites.createSqlArrayTypeWithNullability(
           opBinding.getTypeFactory(),
           type.getSqlTypeName(),
           true
diff --git a/sql/src/main/java/org/apache/druid/sql/calcite/planner/DruidOperatorTable.java b/sql/src/main/java/org/apache/druid/sql/calcite/planner/DruidOperatorTable.java
index 6d1cd1243e21..0fb1c9fb9ff0 100644
--- a/sql/src/main/java/org/apache/druid/sql/calcite/planner/DruidOperatorTable.java
+++ b/sql/src/main/java/org/apache/druid/sql/calcite/planner/DruidOperatorTable.java
@@ -558,7 +558,7 @@ public static boolean isFunctionSyntax(final SqlSyntax syntax)
 
   private static SqlSyntax normalizeSyntax(final SqlSyntax syntax)
   {
-    if (!isFunctionSyntax(syntax)) {
+    if (!DruidOperatorTable.isFunctionSyntax(syntax)) {
       return syntax;
     } else {
       return SqlSyntax.FUNCTION;
diff --git a/sql/src/main/java/org/apache/druid/sql/calcite/planner/DruidTypeSystem.java b/sql/src/main/java/org/apache/druid/sql/calcite/planner/DruidTypeSystem.java
index 1041269090d4..521291c3244d 100644
--- a/sql/src/main/java/org/apache/druid/sql/calcite/planner/DruidTypeSystem.java
+++ b/sql/src/main/java/org/apache/druid/sql/calcite/planner/DruidTypeSystem.java
@@ -28,7 +28,7 @@
 public class DruidTypeSystem implements RelDataTypeSystem
 {
   public static final DruidTypeSystem INSTANCE = new DruidTypeSystem();
-  public static final RelDataTypeFactory TYPE_FACTORY = new SqlTypeFactoryImpl(INSTANCE);
+  public static final RelDataTypeFactory TYPE_FACTORY = new SqlTypeFactoryImpl(DruidTypeSystem.INSTANCE);
 
   /**
    * Druid uses millisecond precision for timestamps internally. This is also the default at the SQL layer.
@@ -43,7 +43,7 @@ private DruidTypeSystem()
   @Override
   public int getMaxScale(final SqlTypeName typeName)
   {
-    return DEFAULT.getMaxScale(typeName);
+    return RelDataTypeSystem.DEFAULT.getMaxScale(typeName);
   }
 
   @Override
@@ -54,7 +54,7 @@ public int getDefaultPrecision(final SqlTypeName typeName)
       case TIMESTAMP_WITH_LOCAL_TIME_ZONE:
         return DEFAULT_TIMESTAMP_PRECISION;
       default:
-        return DEFAULT.getDefaultPrecision(typeName);
+        return RelDataTypeSystem.DEFAULT.getDefaultPrecision(typeName);
     }
   }
 
@@ -64,44 +64,44 @@ public int getMaxPrecision(final SqlTypeName typeName)
     if (typeName == SqlTypeName.TIME || typeName == SqlTypeName.TIMESTAMP) {
       return DEFAULT_TIMESTAMP_PRECISION;
     } else {
-      return DEFAULT.getMaxPrecision(typeName);
+      return RelDataTypeSystem.DEFAULT.getMaxPrecision(typeName);
     }
   }
 
   @Override
   public int getMaxNumericScale()
   {
-    return DEFAULT.getMaxNumericScale();
+    return RelDataTypeSystem.DEFAULT.getMaxNumericScale();
   }
 
   @Override
   public int getMaxNumericPrecision()
   {
-    return DEFAULT.getMaxNumericPrecision();
+    return RelDataTypeSystem.DEFAULT.getMaxNumericPrecision();
   }
 
   @Override
   public String getLiteral(final SqlTypeName typeName, final boolean isPrefix)
   {
-    return DEFAULT.getLiteral(typeName, isPrefix);
+    return RelDataTypeSystem.DEFAULT.getLiteral(typeName, isPrefix);
   }
 
   @Override
   public boolean isCaseSensitive(final SqlTypeName typeName)
   {
-    return DEFAULT.isCaseSensitive(typeName);
+    return RelDataTypeSystem.DEFAULT.isCaseSensitive(typeName);
   }
 
   @Override
   public boolean isAutoincrement(final SqlTypeName typeName)
   {
-    return DEFAULT.isAutoincrement(typeName);
+    return RelDataTypeSystem.DEFAULT.isAutoincrement(typeName);
   }
 
   @Override
   public int getNumTypeRadix(final SqlTypeName typeName)
   {
-    return DEFAULT.getNumTypeRadix(typeName);
+    return RelDataTypeSystem.DEFAULT.getNumTypeRadix(typeName);
   }
 
   @Override
@@ -132,25 +132,25 @@ public RelDataType deriveCovarType(
       final RelDataType arg1Type
   )
   {
-    return DEFAULT.deriveCovarType(typeFactory, arg0Type, arg1Type);
+    return RelDataTypeSystem.DEFAULT.deriveCovarType(typeFactory, arg0Type, arg1Type);
   }
 
   @Override
   public RelDataType deriveFractionalRankType(final RelDataTypeFactory typeFactory)
   {
-    return DEFAULT.deriveFractionalRankType(typeFactory);
+    return RelDataTypeSystem.DEFAULT.deriveFractionalRankType(typeFactory);
   }
 
   @Override
   public RelDataType deriveRankType(final RelDataTypeFactory typeFactory)
   {
-    return DEFAULT.deriveRankType(typeFactory);
+    return RelDataTypeSystem.DEFAULT.deriveRankType(typeFactory);
   }
 
   @Override
   public boolean isSchemaCaseSensitive()
   {
-    return DEFAULT.isSchemaCaseSensitive();
+    return RelDataTypeSystem.DEFAULT.isSchemaCaseSensitive();
   }
 
   @Override
diff --git a/sql/src/main/java/org/apache/druid/sql/calcite/planner/PlannerConfig.java b/sql/src/main/java/org/apache/druid/sql/calcite/planner/PlannerConfig.java
index dbc2be0b0910..589d68d43055 100644
--- a/sql/src/main/java/org/apache/druid/sql/calcite/planner/PlannerConfig.java
+++ b/sql/src/main/java/org/apache/druid/sql/calcite/planner/PlannerConfig.java
@@ -430,7 +430,7 @@ public Map<String, Object> getNonDefaultAsQueryContext()
       );
     }
 
-    PlannerConfig newConfig = builder().withOverrides(overrides).build();
+    PlannerConfig newConfig = PlannerConfig.builder().withOverrides(overrides).build();
     if (!equals(newConfig)) {
       throw DruidException.defensive(
           "Not all PlannerConfig options are not persistable as QueryContext keys!\nold: %s\nnew: %s",
diff --git a/sql/src/main/java/org/apache/druid/sql/calcite/rel/Grouping.java b/sql/src/main/java/org/apache/druid/sql/calcite/rel/Grouping.java
index dbdc79883da0..8bcf1544fc89 100644
--- a/sql/src/main/java/org/apache/druid/sql/calcite/rel/Grouping.java
+++ b/sql/src/main/java/org/apache/druid/sql/calcite/rel/Grouping.java
@@ -265,7 +265,7 @@ public Grouping applyProject(final PlannerContext plannerContext, final Project
       newSubtotals = subtotals;
     }
 
-    return create(
+    return Grouping.create(
         newDimensions,
         newSubtotals,
         newAggregations,
diff --git a/sql/src/main/java/org/apache/druid/sql/http/ObjectWriter.java b/sql/src/main/java/org/apache/druid/sql/http/ObjectWriter.java
index d4dbd674d862..27a027d0abd6 100644
--- a/sql/src/main/java/org/apache/druid/sql/http/ObjectWriter.java
+++ b/sql/src/main/java/org/apache/druid/sql/http/ObjectWriter.java
@@ -126,14 +126,14 @@ static void writeHeader(
 
         if (includeTypes) {
           jsonGenerator.writeStringField(
-              TYPE_HEADER_NAME,
+              ObjectWriter.TYPE_HEADER_NAME,
               signature.getColumnType(i).map(TypeSignature::asTypeString).orElse(null)
           );
         }
 
         if (includeSqlTypes) {
           jsonGenerator.writeStringField(
-              SQL_TYPE_HEADER_NAME,
+              ObjectWriter.SQL_TYPE_HEADER_NAME,
               rowType.getFieldList().get(i).getType().getSqlTypeName().getName()
           );
         }
@@ -162,7 +162,7 @@ static void writeHeader(
         jsonGenerator.writeStartObject();
 
         jsonGenerator.writeStringField(
-            TYPE_HEADER_NAME,
+            ObjectWriter.TYPE_HEADER_NAME,
             signature.getColumnType(i).map(TypeSignature::asTypeString).orElse(null)
         );
 
diff --git a/sql/src/main/java/org/apache/druid/sql/http/SqlResource.java b/sql/src/main/java/org/apache/druid/sql/http/SqlResource.java
index 9af6e15e0357..d957e7155b5e 100644
--- a/sql/src/main/java/org/apache/druid/sql/http/SqlResource.java
+++ b/sql/src/main/java/org/apache/druid/sql/http/SqlResource.java
@@ -211,7 +211,7 @@ public SqlResourceQueryResultPusher(
           jsonMapper,
           responseContextConfig,
           selfNode,
-          QUERY_METRIC_COUNTER,
+          SqlResource.QUERY_METRIC_COUNTER,
           sqlQueryId,
           MediaType.APPLICATION_JSON_TYPE,
           headers

From f7c2c0acdd2b98f13037d1a5e760535201b90351 Mon Sep 17 00:00:00 2001
From: Ashwin Tumma <ashwin.tumma23@gmail.com>
Date: Wed, 18 Dec 2024 19:33:28 -0800
Subject: [PATCH 49/56] Remove duplicate context from Request Logging (#17582)

* Remove duplicate context from Request Logging
* Update Unit Tests to read context
---------
Co-authored-by: Ashwin Tumma <ashwin.tumma@salesforce.com>
---
 .../main/java/org/apache/druid/sql/SqlExecutionReporter.java    | 1 -
 .../test/java/org/apache/druid/sql/http/SqlResourceTest.java    | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/sql/src/main/java/org/apache/druid/sql/SqlExecutionReporter.java b/sql/src/main/java/org/apache/druid/sql/SqlExecutionReporter.java
index f55f2f3f1233..f531144b5f05 100644
--- a/sql/src/main/java/org/apache/druid/sql/SqlExecutionReporter.java
+++ b/sql/src/main/java/org/apache/druid/sql/SqlExecutionReporter.java
@@ -133,7 +133,6 @@ public void emit()
         statsMap.put("identity", plannerContext.getAuthenticationResult().getIdentity());
         queryContext.put("nativeQueryIds", plannerContext.getNativeQueryIds().toString());
       }
-      statsMap.put("context", queryContext);
       if (e != null) {
         statsMap.put("exception", e.toString());
 
diff --git a/sql/src/test/java/org/apache/druid/sql/http/SqlResourceTest.java b/sql/src/test/java/org/apache/druid/sql/http/SqlResourceTest.java
index df1d94e6f206..128c012adb0e 100644
--- a/sql/src/test/java/org/apache/druid/sql/http/SqlResourceTest.java
+++ b/sql/src/test/java/org/apache/druid/sql/http/SqlResourceTest.java
@@ -1905,7 +1905,7 @@ private void checkSqlRequestLog(boolean success)
     Assert.assertEquals(1, testRequestLogger.getSqlQueryLogs().size());
 
     final Map<String, Object> stats = testRequestLogger.getSqlQueryLogs().get(0).getQueryStats().getStats();
-    final Map<String, Object> queryContext = (Map<String, Object>) stats.get("context");
+    final Map<String, Object> queryContext = (Map<String, Object>) testRequestLogger.getSqlQueryLogs().get(0).getSqlQueryContext();
     Assert.assertEquals(success, stats.get("success"));
     Assert.assertEquals(CalciteTests.REGULAR_USER_AUTH_RESULT.getIdentity(), stats.get("identity"));
     Assert.assertTrue(stats.containsKey("sqlQuery/time"));

From d9a58a7bbd8846b7010d7379efbae366499ec5d4 Mon Sep 17 00:00:00 2001
From: Kashif Faraz <kashif.faraz@gmail.com>
Date: Wed, 18 Dec 2024 19:35:00 -0800
Subject: [PATCH 50/56] Move segment update APIs from Coordinator to Overlord
 (#17545)

Summary of changes
---------------------
- Add `OverlordDataSourcesResource` with APIs to mark segments used/unused
- Add corresponding methods to `OverlordClient`
- Deprecate Coordinator APIs to update segments
- Use `OverlordClient` in `DataSourcesResource` so that Coordinator APIs internally
call the corresponding Overlord APIs
- If the API call fails, fall back to updating the metadata store directly
- Audit these actions only on the Overlord

Other minor changes
---------------------
- Do not perform null check on `OverlordClient` on the coordinator side `DataSourcesResource`.
`OverlordClient` is always non-null in production.
- Add new tests, fix existing ones
- Complete the implementation of `TestSegmentsMetadataManager`

New Overlord APIs
------------------
- Mark all segments of a datasource as unused:
`POST /druid/indexer/v1/datasources/{dataSourceName}`
- Mark all (non-overshadowed) segments of a datasource as used:
`DELETE /druid/indexer/v1/datasources/{dataSourceName}`
- Mark multiple segments as used
`POST /druid/indexer/v1/datasources/{dataSourceName}/markUsed`
- Mark multiple (non-overshadowed) segments as unused
`POST /druid/indexer/v1/datasources/{dataSourceName}/markUnused`
- Mark a single segment as used:
`POST /druid/indexer/v1/datasources/{dataSourceName}/segments/{segmentId}`
- Mark a single segment as unused:
`DELETE /druid/indexer/v1/datasources/{dataSourceName}/segments/{segmentId}`
---
 .../apache/druid/msq/exec/MSQTasksTest.java   |   2 +-
 .../msq/test/MSQTestControllerContext.java    |   2 +-
 .../test/MSQTestOverlordServiceClient.java    |   2 +-
 .../indexing/compact/LocalOverlordClient.java |  74 +-
 .../http/OverlordDataSourcesResource.java     | 285 +++++++
 .../indexing/common/TaskToolboxTest.java      |   2 +-
 .../druid/indexing/common/TestUtils.java      |   7 +-
 .../ClientCompactionTaskQuerySerdeTest.java   |   2 +-
 .../common/task/CompactionTaskRunTest.java    |   2 +-
 ...stractParallelIndexSupervisorTaskTest.java |   2 +-
 .../task/batch/parallel/TaskMonitorTest.java  |   2 +-
 .../SingleTaskBackgroundRunnerTest.java       |   2 +-
 .../indexing/overlord/TaskLifecycleTest.java  |   2 +-
 .../overlord/TestTaskToolboxFactory.java      |   2 +-
 .../http/OverlordDataSourcesResourceTest.java | 370 +++++++++
 .../SeekableStreamIndexTaskTestBase.java      |   2 +-
 .../worker/WorkerTaskMonitorTest.java         |   2 +-
 ...ntermediaryDataManagerAutoCleanupTest.java |   2 +-
 ...iaryDataManagerManualAddAndDeleteTest.java |   2 +-
 .../shuffle/ShuffleDataSegmentPusherTest.java |   2 +-
 .../worker/shuffle/ShuffleResourceTest.java   |   2 +-
 .../rpc}/indexing/NoopOverlordClient.java     |  52 +-
 .../druid/rpc/indexing/OverlordClient.java    |  54 ++
 .../rpc/indexing/OverlordClientImpl.java      | 108 +++
 .../rpc/indexing/SegmentUpdateResponse.java   |  82 ++
 .../compaction/CompactionRunSimulator.java    |  71 +-
 .../server/coordinator/DruidCoordinator.java  |  60 +-
 .../duty/MarkEternityTombstonesAsUnused.java  |   6 +-
 .../MarkOvershadowedSegmentsAsUnused.java     |   2 +-
 .../coordinator/duty/MetadataAction.java      |   2 +-
 .../server/coordinator/duty/RunRules.java     |   2 +-
 .../server/http/DataSourcesResource.java      | 259 ++++---
 .../server/http/SegmentsToUpdateFilter.java   |  90 +++
 .../rpc/indexing/OverlordClientImplTest.java  | 215 ++++++
 .../CompactionRunSimulatorTest.java           |   2 +-
 .../coordinator/BalanceSegmentsProfiler.java  |   3 +-
 .../coordinator/duty/CompactSegmentsTest.java |   9 +-
 .../duty/KillStalePendingSegmentsTest.java    |   2 +-
 .../duty/KillUnusedSegmentsTest.java          |   2 +-
 .../MarkEternityTombstonesAsUnusedTest.java   |   4 +-
 .../MarkOvershadowedSegmentsAsUnusedTest.java |   4 +-
 .../server/coordinator/duty/RunRulesTest.java |   2 +-
 .../CoordinatorSimulationBuilder.java         |  40 +-
 .../simulate/TestSegmentsMetadataManager.java | 102 ++-
 .../CoordinatorCompactionResourceTest.java    |   2 +-
 .../server/http/DataSourcesResourceTest.java  | 722 +++++++++---------
 .../org/apache/druid/cli/CliOverlord.java     |   2 +
 .../schema/DruidCalciteSchemaModuleTest.java  |   2 +-
 .../druid/sql/calcite/util/CalciteTests.java  |   2 +-
 .../apache/druid/sql/guice/SqlModuleTest.java |   2 +-
 50 files changed, 1979 insertions(+), 696 deletions(-)
 create mode 100644 indexing-service/src/main/java/org/apache/druid/indexing/overlord/http/OverlordDataSourcesResource.java
 create mode 100644 indexing-service/src/test/java/org/apache/druid/indexing/overlord/http/OverlordDataSourcesResourceTest.java
 rename server/src/{test/java/org/apache/druid/client => main/java/org/apache/druid/rpc}/indexing/NoopOverlordClient.java (73%)
 create mode 100644 server/src/main/java/org/apache/druid/rpc/indexing/SegmentUpdateResponse.java
 create mode 100644 server/src/main/java/org/apache/druid/server/http/SegmentsToUpdateFilter.java

diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/exec/MSQTasksTest.java b/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/exec/MSQTasksTest.java
index eec5e9d4ebe4..6c543f862532 100644
--- a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/exec/MSQTasksTest.java
+++ b/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/exec/MSQTasksTest.java
@@ -24,7 +24,6 @@
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.errorprone.annotations.concurrent.GuardedBy;
-import org.apache.druid.client.indexing.NoopOverlordClient;
 import org.apache.druid.client.indexing.TaskStatusResponse;
 import org.apache.druid.common.guava.FutureUtils;
 import org.apache.druid.indexer.RunnerTaskState;
@@ -48,6 +47,7 @@
 import org.apache.druid.msq.indexing.error.TooManyWorkersFault;
 import org.apache.druid.msq.indexing.error.UnknownFault;
 import org.apache.druid.msq.indexing.error.WorkerRpcFailedFault;
+import org.apache.druid.rpc.indexing.NoopOverlordClient;
 import org.apache.druid.segment.column.ColumnHolder;
 import org.apache.druid.utils.CollectionUtils;
 import org.junit.Assert;
diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/test/MSQTestControllerContext.java b/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/test/MSQTestControllerContext.java
index 22c7cff88477..86051bc4b380 100644
--- a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/test/MSQTestControllerContext.java
+++ b/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/test/MSQTestControllerContext.java
@@ -29,7 +29,6 @@
 import com.google.inject.Injector;
 import org.apache.druid.client.ImmutableSegmentLoadInfo;
 import org.apache.druid.client.coordinator.CoordinatorClient;
-import org.apache.druid.client.indexing.NoopOverlordClient;
 import org.apache.druid.client.indexing.TaskStatusResponse;
 import org.apache.druid.common.guava.FutureUtils;
 import org.apache.druid.indexer.RunnerTaskState;
@@ -67,6 +66,7 @@
 import org.apache.druid.msq.util.MultiStageQueryContext;
 import org.apache.druid.query.Query;
 import org.apache.druid.query.QueryContext;
+import org.apache.druid.rpc.indexing.NoopOverlordClient;
 import org.apache.druid.rpc.indexing.OverlordClient;
 import org.apache.druid.server.DruidNode;
 import org.mockito.ArgumentMatchers;
diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/test/MSQTestOverlordServiceClient.java b/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/test/MSQTestOverlordServiceClient.java
index b35c074fa060..590a086c8e43 100644
--- a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/test/MSQTestOverlordServiceClient.java
+++ b/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/test/MSQTestOverlordServiceClient.java
@@ -28,7 +28,6 @@
 import com.google.inject.Injector;
 import org.apache.calcite.sql.type.SqlTypeName;
 import org.apache.druid.client.ImmutableSegmentLoadInfo;
-import org.apache.druid.client.indexing.NoopOverlordClient;
 import org.apache.druid.client.indexing.TaskPayloadResponse;
 import org.apache.druid.client.indexing.TaskStatusResponse;
 import org.apache.druid.indexer.TaskStatus;
@@ -48,6 +47,7 @@
 import org.apache.druid.msq.indexing.report.MSQStatusReport;
 import org.apache.druid.msq.indexing.report.MSQTaskReport;
 import org.apache.druid.msq.indexing.report.MSQTaskReportPayload;
+import org.apache.druid.rpc.indexing.NoopOverlordClient;
 import org.joda.time.DateTime;
 
 import javax.annotation.Nullable;
diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/compact/LocalOverlordClient.java b/indexing-service/src/main/java/org/apache/druid/indexing/compact/LocalOverlordClient.java
index dcce2f4615ae..3f1427c7c34e 100644
--- a/indexing-service/src/main/java/org/apache/druid/indexing/compact/LocalOverlordClient.java
+++ b/indexing-service/src/main/java/org/apache/druid/indexing/compact/LocalOverlordClient.java
@@ -25,33 +25,25 @@
 import com.google.common.util.concurrent.ListenableFuture;
 import org.apache.druid.client.indexing.ClientCompactionTaskQuery;
 import org.apache.druid.client.indexing.IndexingTotalWorkerCapacityInfo;
-import org.apache.druid.client.indexing.IndexingWorkerInfo;
 import org.apache.druid.client.indexing.TaskPayloadResponse;
-import org.apache.druid.client.indexing.TaskStatusResponse;
 import org.apache.druid.error.DruidException;
 import org.apache.druid.indexer.TaskStatus;
 import org.apache.druid.indexer.TaskStatusPlus;
-import org.apache.druid.indexer.report.TaskReport;
 import org.apache.druid.indexing.common.task.CompactionTask;
 import org.apache.druid.indexing.overlord.TaskMaster;
 import org.apache.druid.indexing.overlord.TaskQueryTool;
 import org.apache.druid.indexing.overlord.TaskQueue;
 import org.apache.druid.indexing.overlord.http.TotalWorkerCapacityResponse;
-import org.apache.druid.indexing.overlord.supervisor.SupervisorStatus;
 import org.apache.druid.java.util.common.CloseableIterators;
 import org.apache.druid.java.util.common.concurrent.Execs;
 import org.apache.druid.java.util.common.logger.Logger;
 import org.apache.druid.java.util.common.parsers.CloseableIterator;
 import org.apache.druid.metadata.LockFilterPolicy;
-import org.apache.druid.rpc.ServiceRetryPolicy;
-import org.apache.druid.rpc.indexing.OverlordClient;
-import org.apache.druid.server.compaction.CompactionProgressResponse;
-import org.apache.druid.server.compaction.CompactionStatusResponse;
+import org.apache.druid.rpc.indexing.NoopOverlordClient;
 import org.joda.time.Interval;
 
 import javax.annotation.Nullable;
 import java.io.IOException;
-import java.net.URI;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -62,7 +54,7 @@
  * task related info. This client simply redirects all queries to the
  * {@link TaskQueryTool} and all updates to the {@link TaskQueue}.
  */
-class LocalOverlordClient implements OverlordClient
+class LocalOverlordClient extends NoopOverlordClient
 {
   private static final Logger log = new Logger(LocalOverlordClient.class);
 
@@ -199,66 +191,4 @@ private <U, V> V convertTask(Object taskPayload, Class<U> inputType, Class<V> ou
       );
     }
   }
-
-  // Unsupported methods as these are not used by the CompactionScheduler / CompactSegments duty
-
-  @Override
-  public ListenableFuture<URI> findCurrentLeader()
-  {
-    throw new UnsupportedOperationException();
-  }
-
-  @Override
-  public ListenableFuture<TaskStatusResponse> taskStatus(String taskId)
-  {
-    throw new UnsupportedOperationException();
-  }
-
-  @Override
-  public ListenableFuture<TaskReport.ReportMap> taskReportAsMap(String taskId)
-  {
-    throw new UnsupportedOperationException();
-  }
-
-  @Override
-  public ListenableFuture<CloseableIterator<SupervisorStatus>> supervisorStatuses()
-  {
-    throw new UnsupportedOperationException();
-  }
-
-  @Override
-  public ListenableFuture<Integer> killPendingSegments(String dataSource, Interval interval)
-  {
-    throw new UnsupportedOperationException();
-  }
-
-  @Override
-  public ListenableFuture<List<IndexingWorkerInfo>> getWorkers()
-  {
-    throw new UnsupportedOperationException();
-  }
-
-  @Override
-  public ListenableFuture<CompactionStatusResponse> getCompactionSnapshots(@Nullable String dataSource)
-  {
-    throw new UnsupportedOperationException();
-  }
-
-  @Override
-  public ListenableFuture<CompactionProgressResponse> getBytesAwaitingCompaction(String dataSource)
-  {
-    throw new UnsupportedOperationException();
-  }
-
-  @Override
-  public ListenableFuture<Boolean> isCompactionSupervisorEnabled()
-  {
-    throw new UnsupportedOperationException();
-  }
-
-  @Override
-  public OverlordClient withRetryPolicy(ServiceRetryPolicy retryPolicy)
-  {
-    return this;
-  }
 }
diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/overlord/http/OverlordDataSourcesResource.java b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/http/OverlordDataSourcesResource.java
new file mode 100644
index 000000000000..bf9ff43981cd
--- /dev/null
+++ b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/http/OverlordDataSourcesResource.java
@@ -0,0 +1,285 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.druid.indexing.overlord.http;
+
+import com.google.common.base.Throwables;
+import com.google.common.collect.ImmutableMap;
+import com.google.inject.Inject;
+import com.sun.jersey.spi.container.ResourceFilters;
+import org.apache.druid.audit.AuditEntry;
+import org.apache.druid.audit.AuditManager;
+import org.apache.druid.error.DruidException;
+import org.apache.druid.error.InvalidInput;
+import org.apache.druid.indexing.overlord.TaskMaster;
+import org.apache.druid.java.util.common.StringUtils;
+import org.apache.druid.java.util.common.logger.Logger;
+import org.apache.druid.metadata.SegmentsMetadataManager;
+import org.apache.druid.rpc.indexing.SegmentUpdateResponse;
+import org.apache.druid.server.http.SegmentsToUpdateFilter;
+import org.apache.druid.server.http.ServletResourceUtils;
+import org.apache.druid.server.http.security.DatasourceResourceFilter;
+import org.apache.druid.server.security.AuthorizationUtils;
+import org.apache.druid.timeline.SegmentId;
+import org.joda.time.Interval;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.ws.rs.Consumes;
+import javax.ws.rs.DELETE;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+/**
+ * Datasource APIs exposed by the Overlord to update segments.
+ * Some of these APIs are also exposed by the Coordinator, but they have been
+ * deprecated and the Overlord APIs must be used for all update operations.
+ */
+@Path("/druid/indexer/v1/datasources")
+public class OverlordDataSourcesResource
+{
+  private static final Logger log = new Logger(OverlordDataSourcesResource.class);
+
+  private final SegmentsMetadataManager segmentsMetadataManager;
+  private final TaskMaster taskMaster;
+  private final AuditManager auditManager;
+
+  @Inject
+  public OverlordDataSourcesResource(
+      TaskMaster taskMaster,
+      SegmentsMetadataManager segmentsMetadataManager,
+      AuditManager auditManager
+  )
+  {
+    this.taskMaster = taskMaster;
+    this.auditManager = auditManager;
+    this.segmentsMetadataManager = segmentsMetadataManager;
+  }
+
+  private interface SegmentUpdateOperation
+  {
+    int perform();
+  }
+
+  @POST
+  @Path("/{dataSourceName}")
+  @Consumes(MediaType.APPLICATION_JSON)
+  @ResourceFilters(DatasourceResourceFilter.class)
+  public Response markAllNonOvershadowedSegmentsAsUsed(
+      @PathParam("dataSourceName") final String dataSourceName,
+      @Context HttpServletRequest req
+  )
+  {
+    SegmentUpdateOperation operation = () -> segmentsMetadataManager
+        .markAsUsedAllNonOvershadowedSegmentsInDataSource(dataSourceName);
+    return performSegmentUpdate(dataSourceName, operation);
+  }
+
+  @DELETE
+  @Path("/{dataSourceName}")
+  @ResourceFilters(DatasourceResourceFilter.class)
+  @Produces(MediaType.APPLICATION_JSON)
+  public Response markAllSegmentsAsUnused(
+      @PathParam("dataSourceName") final String dataSourceName,
+      @Context HttpServletRequest req
+  )
+  {
+    SegmentUpdateOperation operation = () -> segmentsMetadataManager
+        .markAsUnusedAllSegmentsInDataSource(dataSourceName);
+    final Response response = performSegmentUpdate(dataSourceName, operation);
+
+    final int responseCode = response.getStatus();
+    if (responseCode >= 200 && responseCode < 300) {
+      auditMarkUnusedOperation(response.getEntity(), dataSourceName, req);
+    }
+
+    return response;
+  }
+
+  @POST
+  @Path("/{dataSourceName}/markUsed")
+  @Consumes(MediaType.APPLICATION_JSON)
+  @ResourceFilters(DatasourceResourceFilter.class)
+  public Response markNonOvershadowedSegmentsAsUsed(
+      @PathParam("dataSourceName") final String dataSourceName,
+      final SegmentsToUpdateFilter payload
+  )
+  {
+    if (payload == null || !payload.isValid()) {
+      return Response
+          .status(Response.Status.BAD_REQUEST)
+          .entity(SegmentsToUpdateFilter.INVALID_PAYLOAD_ERROR_MESSAGE)
+          .build();
+    } else {
+      SegmentUpdateOperation operation = () -> {
+        final Interval interval = payload.getInterval();
+        final List<String> versions = payload.getVersions();
+        if (interval != null) {
+          return segmentsMetadataManager.markAsUsedNonOvershadowedSegmentsInInterval(dataSourceName, interval, versions);
+        } else {
+          final Set<String> segmentIds = payload.getSegmentIds();
+          if (segmentIds == null || segmentIds.isEmpty()) {
+            return 0;
+          }
+
+          // Validate segmentIds
+          final List<String> invalidSegmentIds = new ArrayList<>();
+          for (String segmentId : segmentIds) {
+            if (SegmentId.iteratePossibleParsingsWithDataSource(dataSourceName, segmentId).isEmpty()) {
+              invalidSegmentIds.add(segmentId);
+            }
+          }
+          if (!invalidSegmentIds.isEmpty()) {
+            throw InvalidInput.exception("Could not parse invalid segment IDs[%s]", invalidSegmentIds);
+          }
+
+          return segmentsMetadataManager.markAsUsedNonOvershadowedSegments(dataSourceName, segmentIds);
+        }
+      };
+
+      return performSegmentUpdate(dataSourceName, operation);
+    }
+  }
+
+  @POST
+  @Path("/{dataSourceName}/markUnused")
+  @ResourceFilters(DatasourceResourceFilter.class)
+  @Produces(MediaType.APPLICATION_JSON)
+  @Consumes(MediaType.APPLICATION_JSON)
+  public Response markSegmentsAsUnused(
+      @PathParam("dataSourceName") final String dataSourceName,
+      final SegmentsToUpdateFilter payload,
+      @Context final HttpServletRequest req
+  )
+  {
+    if (payload == null || !payload.isValid()) {
+      return Response
+          .status(Response.Status.BAD_REQUEST)
+          .entity(SegmentsToUpdateFilter.INVALID_PAYLOAD_ERROR_MESSAGE)
+          .build();
+    } else {
+      SegmentUpdateOperation operation = () -> {
+        final Interval interval = payload.getInterval();
+        final List<String> versions = payload.getVersions();
+        final int numUpdatedSegments;
+        if (interval != null) {
+          numUpdatedSegments = segmentsMetadataManager.markAsUnusedSegmentsInInterval(dataSourceName, interval, versions);
+        } else {
+          final Set<SegmentId> segmentIds = payload.getSegmentIds()
+                                                   .stream()
+                                                   .map(id -> SegmentId.tryParse(dataSourceName, id))
+                                                   .filter(Objects::nonNull)
+                                                   .collect(Collectors.toSet());
+
+          // Filter out segmentIds that do not belong to this datasource
+          numUpdatedSegments = segmentsMetadataManager.markSegmentsAsUnused(
+              segmentIds.stream()
+                  .filter(segmentId -> segmentId.getDataSource().equals(dataSourceName))
+                  .collect(Collectors.toSet())
+          );
+        }
+        auditMarkUnusedOperation(payload, dataSourceName, req);
+        return numUpdatedSegments;
+      };
+      return performSegmentUpdate(dataSourceName, operation);
+    }
+  }
+
+  @POST
+  @Path("/{dataSourceName}/segments/{segmentId}")
+  @Consumes(MediaType.APPLICATION_JSON)
+  @ResourceFilters(DatasourceResourceFilter.class)
+  public Response markSegmentAsUsed(
+      @PathParam("dataSourceName") String dataSourceName,
+      @PathParam("segmentId") String segmentId
+  )
+  {
+    SegmentUpdateOperation operation =
+        () -> segmentsMetadataManager.markSegmentAsUsed(segmentId) ? 1 : 0;
+    return performSegmentUpdate(dataSourceName, operation);
+  }
+
+  @DELETE
+  @Path("/{dataSourceName}/segments/{segmentId}")
+  @ResourceFilters(DatasourceResourceFilter.class)
+  public Response markSegmentAsUnused(
+      @PathParam("dataSourceName") String dataSourceName,
+      @PathParam("segmentId") String segmentIdString
+  )
+  {
+    final SegmentId segmentId = SegmentId.tryParse(dataSourceName, segmentIdString);
+    if (segmentId == null) {
+      return Response.status(Response.Status.BAD_REQUEST).entity(
+          StringUtils.format("Could not parse Segment ID[%s] for DataSource[%s]", segmentIdString, dataSourceName)
+      ).build();
+    }
+
+    SegmentUpdateOperation operation =
+        () -> segmentsMetadataManager.markSegmentAsUnused(segmentId) ? 1 : 0;
+    return performSegmentUpdate(dataSourceName, operation);
+  }
+
+  private Response performSegmentUpdate(String dataSourceName, SegmentUpdateOperation operation)
+  {
+    if (!taskMaster.isHalfOrFullLeader()) {
+      return Response.status(Response.Status.SERVICE_UNAVAILABLE).entity("I am not leader").build();
+    }
+
+    try {
+      int numChangedSegments = operation.perform();
+      return Response.ok(new SegmentUpdateResponse(numChangedSegments)).build();
+    }
+    catch (DruidException e) {
+      return ServletResourceUtils.buildErrorResponseFrom(e);
+    }
+    catch (Exception e) {
+      log.error(e, "Error occurred while updating segments for datasource[%s]", dataSourceName);
+      return Response
+          .serverError()
+          .entity(ImmutableMap.of("error", "Server error", "message", Throwables.getRootCause(e).toString()))
+          .build();
+    }
+  }
+
+  private void auditMarkUnusedOperation(
+      Object auditPayload,
+      String dataSourceName,
+      HttpServletRequest request
+  )
+  {
+    auditManager.doAudit(
+        AuditEntry.builder()
+                  .key(dataSourceName)
+                  .type("segment.markUnused")
+                  .payload(auditPayload)
+                  .auditInfo(AuthorizationUtils.buildAuditInfo(request))
+                  .request(AuthorizationUtils.buildRequestInfo("overlord", request))
+                  .build()
+    );
+  }
+}
diff --git a/indexing-service/src/test/java/org/apache/druid/indexing/common/TaskToolboxTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/common/TaskToolboxTest.java
index 78cbb88c3cf4..25aa3c4a0899 100644
--- a/indexing-service/src/test/java/org/apache/druid/indexing/common/TaskToolboxTest.java
+++ b/indexing-service/src/test/java/org/apache/druid/indexing/common/TaskToolboxTest.java
@@ -24,7 +24,6 @@
 import org.apache.druid.client.cache.CacheConfig;
 import org.apache.druid.client.cache.CachePopulatorStats;
 import org.apache.druid.client.coordinator.NoopCoordinatorClient;
-import org.apache.druid.client.indexing.NoopOverlordClient;
 import org.apache.druid.indexing.common.actions.TaskActionClientFactory;
 import org.apache.druid.indexing.common.config.TaskConfig;
 import org.apache.druid.indexing.common.config.TaskConfigBuilder;
@@ -39,6 +38,7 @@
 import org.apache.druid.query.DruidProcessingConfigTest;
 import org.apache.druid.query.QueryProcessingPool;
 import org.apache.druid.query.QueryRunnerFactoryConglomerate;
+import org.apache.druid.rpc.indexing.NoopOverlordClient;
 import org.apache.druid.segment.IndexIO;
 import org.apache.druid.segment.IndexMergerV9;
 import org.apache.druid.segment.IndexMergerV9Factory;
diff --git a/indexing-service/src/test/java/org/apache/druid/indexing/common/TestUtils.java b/indexing-service/src/test/java/org/apache/druid/indexing/common/TestUtils.java
index ae5ba44f7f09..ea58e21d035f 100644
--- a/indexing-service/src/test/java/org/apache/druid/indexing/common/TestUtils.java
+++ b/indexing-service/src/test/java/org/apache/druid/indexing/common/TestUtils.java
@@ -25,19 +25,18 @@
 import com.fasterxml.jackson.databind.module.SimpleModule;
 import com.google.common.base.Stopwatch;
 import com.google.common.collect.ImmutableMap;
-import org.apache.druid.client.indexing.NoopOverlordClient;
 import org.apache.druid.data.input.impl.NoopInputFormat;
 import org.apache.druid.data.input.impl.NoopInputSource;
 import org.apache.druid.guice.DruidSecondaryModule;
 import org.apache.druid.indexing.common.stats.DropwizardRowIngestionMetersFactory;
 import org.apache.druid.indexing.common.task.TestAppenderatorsManager;
-import org.apache.druid.indexing.common.task.batch.parallel.ParallelIndexSupervisorTaskClientProvider;
 import org.apache.druid.jackson.DefaultObjectMapper;
 import org.apache.druid.java.util.common.ISE;
 import org.apache.druid.java.util.common.StringUtils;
 import org.apache.druid.java.util.common.logger.Logger;
 import org.apache.druid.math.expr.ExprMacroTable;
 import org.apache.druid.query.expression.LookupEnabledTestExprMacroTable;
+import org.apache.druid.rpc.indexing.NoopOverlordClient;
 import org.apache.druid.rpc.indexing.OverlordClient;
 import org.apache.druid.segment.IndexIO;
 import org.apache.druid.segment.IndexMergerV9;
@@ -63,10 +62,6 @@
 public class TestUtils
 {
   public static final OverlordClient OVERLORD_SERVICE_CLIENT = new NoopOverlordClient();
-  public static final ParallelIndexSupervisorTaskClientProvider TASK_CLIENT_PROVIDER =
-      (supervisorTaskId, httpTimeout, numRetries) -> {
-        throw new UnsupportedOperationException();
-      };
   public static final AppenderatorsManager APPENDERATORS_MANAGER = new TestAppenderatorsManager();
 
   private static final Logger log = new Logger(TestUtils.class);
diff --git a/indexing-service/src/test/java/org/apache/druid/indexing/common/task/ClientCompactionTaskQuerySerdeTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/ClientCompactionTaskQuerySerdeTest.java
index 55898357d663..a354cb20db28 100644
--- a/indexing-service/src/test/java/org/apache/druid/indexing/common/task/ClientCompactionTaskQuerySerdeTest.java
+++ b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/ClientCompactionTaskQuerySerdeTest.java
@@ -35,7 +35,6 @@
 import org.apache.druid.client.indexing.ClientCompactionTaskQueryTuningConfig;
 import org.apache.druid.client.indexing.ClientCompactionTaskTransformSpec;
 import org.apache.druid.client.indexing.ClientTaskQuery;
-import org.apache.druid.client.indexing.NoopOverlordClient;
 import org.apache.druid.data.input.SegmentsSplitHintSpec;
 import org.apache.druid.data.input.impl.DimensionsSpec;
 import org.apache.druid.guice.GuiceAnnotationIntrospector;
@@ -53,6 +52,7 @@
 import org.apache.druid.query.aggregation.AggregatorFactory;
 import org.apache.druid.query.aggregation.CountAggregatorFactory;
 import org.apache.druid.query.filter.SelectorDimFilter;
+import org.apache.druid.rpc.indexing.NoopOverlordClient;
 import org.apache.druid.rpc.indexing.OverlordClient;
 import org.apache.druid.segment.IndexSpec;
 import org.apache.druid.segment.TestIndex;
diff --git a/indexing-service/src/test/java/org/apache/druid/indexing/common/task/CompactionTaskRunTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/CompactionTaskRunTest.java
index a3fb807604fa..e6e9230439cc 100644
--- a/indexing-service/src/test/java/org/apache/druid/indexing/common/task/CompactionTaskRunTest.java
+++ b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/CompactionTaskRunTest.java
@@ -32,7 +32,6 @@
 import org.apache.druid.client.coordinator.NoopCoordinatorClient;
 import org.apache.druid.client.indexing.ClientCompactionTaskGranularitySpec;
 import org.apache.druid.client.indexing.ClientCompactionTaskTransformSpec;
-import org.apache.druid.client.indexing.NoopOverlordClient;
 import org.apache.druid.data.input.impl.CSVParseSpec;
 import org.apache.druid.data.input.impl.DimensionSchema;
 import org.apache.druid.data.input.impl.DimensionsSpec;
@@ -70,6 +69,7 @@
 import org.apache.druid.query.aggregation.LongSumAggregatorFactory;
 import org.apache.druid.query.dimension.DefaultDimensionSpec;
 import org.apache.druid.query.filter.SelectorDimFilter;
+import org.apache.druid.rpc.indexing.NoopOverlordClient;
 import org.apache.druid.rpc.indexing.OverlordClient;
 import org.apache.druid.segment.AutoTypeColumnSchema;
 import org.apache.druid.segment.ColumnSelectorFactory;
diff --git a/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/AbstractParallelIndexSupervisorTaskTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/AbstractParallelIndexSupervisorTaskTest.java
index d96a4d2a37e9..9dd6fe3f88a9 100644
--- a/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/AbstractParallelIndexSupervisorTaskTest.java
+++ b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/AbstractParallelIndexSupervisorTaskTest.java
@@ -33,7 +33,6 @@
 import org.apache.druid.client.ImmutableDruidDataSource;
 import org.apache.druid.client.coordinator.CoordinatorClient;
 import org.apache.druid.client.coordinator.NoopCoordinatorClient;
-import org.apache.druid.client.indexing.NoopOverlordClient;
 import org.apache.druid.client.indexing.TaskStatusResponse;
 import org.apache.druid.data.input.InputFormat;
 import org.apache.druid.data.input.MaxSizeSplitHintSpec;
@@ -83,6 +82,7 @@
 import org.apache.druid.query.aggregation.AggregatorFactory;
 import org.apache.druid.query.aggregation.LongSumAggregatorFactory;
 import org.apache.druid.query.expression.LookupEnabledTestExprMacroTable;
+import org.apache.druid.rpc.indexing.NoopOverlordClient;
 import org.apache.druid.segment.DataSegmentsWithSchemas;
 import org.apache.druid.segment.IndexIO;
 import org.apache.druid.segment.TestIndex;
diff --git a/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/TaskMonitorTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/TaskMonitorTest.java
index 4d04dbd86cd8..fdbb7bb0a526 100644
--- a/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/TaskMonitorTest.java
+++ b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/TaskMonitorTest.java
@@ -21,7 +21,6 @@
 
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
-import org.apache.druid.client.indexing.NoopOverlordClient;
 import org.apache.druid.client.indexing.TaskStatusResponse;
 import org.apache.druid.data.input.InputSplit;
 import org.apache.druid.indexer.RunnerTaskState;
@@ -35,6 +34,7 @@
 import org.apache.druid.java.util.common.DateTimes;
 import org.apache.druid.java.util.common.ISE;
 import org.apache.druid.java.util.common.concurrent.Execs;
+import org.apache.druid.rpc.indexing.NoopOverlordClient;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
diff --git a/indexing-service/src/test/java/org/apache/druid/indexing/overlord/SingleTaskBackgroundRunnerTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/overlord/SingleTaskBackgroundRunnerTest.java
index 3acf9ff6f0e5..5590ce608ec8 100644
--- a/indexing-service/src/test/java/org/apache/druid/indexing/overlord/SingleTaskBackgroundRunnerTest.java
+++ b/indexing-service/src/test/java/org/apache/druid/indexing/overlord/SingleTaskBackgroundRunnerTest.java
@@ -21,7 +21,6 @@
 
 import com.google.common.util.concurrent.ListenableFuture;
 import org.apache.druid.client.coordinator.NoopCoordinatorClient;
-import org.apache.druid.client.indexing.NoopOverlordClient;
 import org.apache.druid.indexer.TaskLocation;
 import org.apache.druid.indexer.TaskState;
 import org.apache.druid.indexer.TaskStatus;
@@ -45,6 +44,7 @@
 import org.apache.druid.query.QueryRunner;
 import org.apache.druid.query.scan.ScanResultValue;
 import org.apache.druid.query.spec.MultipleIntervalSegmentSpec;
+import org.apache.druid.rpc.indexing.NoopOverlordClient;
 import org.apache.druid.segment.TestIndex;
 import org.apache.druid.segment.join.NoopJoinableFactory;
 import org.apache.druid.segment.loading.NoopDataSegmentArchiver;
diff --git a/indexing-service/src/test/java/org/apache/druid/indexing/overlord/TaskLifecycleTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/overlord/TaskLifecycleTest.java
index eb1b8e891ecf..8400e27d2359 100644
--- a/indexing-service/src/test/java/org/apache/druid/indexing/overlord/TaskLifecycleTest.java
+++ b/indexing-service/src/test/java/org/apache/druid/indexing/overlord/TaskLifecycleTest.java
@@ -35,7 +35,6 @@
 import org.apache.druid.client.cache.CachePopulatorStats;
 import org.apache.druid.client.cache.MapCache;
 import org.apache.druid.client.coordinator.NoopCoordinatorClient;
-import org.apache.druid.client.indexing.NoopOverlordClient;
 import org.apache.druid.data.input.AbstractInputSource;
 import org.apache.druid.data.input.InputRow;
 import org.apache.druid.data.input.InputRowListPlusRawValues;
@@ -110,6 +109,7 @@
 import org.apache.druid.query.QueryRunnerFactoryConglomerate;
 import org.apache.druid.query.SegmentDescriptor;
 import org.apache.druid.query.aggregation.DoubleSumAggregatorFactory;
+import org.apache.druid.rpc.indexing.NoopOverlordClient;
 import org.apache.druid.segment.IndexIO;
 import org.apache.druid.segment.IndexMergerV9Factory;
 import org.apache.druid.segment.IndexSpec;
diff --git a/indexing-service/src/test/java/org/apache/druid/indexing/overlord/TestTaskToolboxFactory.java b/indexing-service/src/test/java/org/apache/druid/indexing/overlord/TestTaskToolboxFactory.java
index 19e4bd33fd8e..3f3081b0e69e 100644
--- a/indexing-service/src/test/java/org/apache/druid/indexing/overlord/TestTaskToolboxFactory.java
+++ b/indexing-service/src/test/java/org/apache/druid/indexing/overlord/TestTaskToolboxFactory.java
@@ -26,7 +26,6 @@
 import org.apache.druid.client.cache.CachePopulatorStats;
 import org.apache.druid.client.coordinator.CoordinatorClient;
 import org.apache.druid.client.coordinator.NoopCoordinatorClient;
-import org.apache.druid.client.indexing.NoopOverlordClient;
 import org.apache.druid.discovery.DataNodeService;
 import org.apache.druid.discovery.DruidNodeAnnouncer;
 import org.apache.druid.discovery.LookupNodeService;
@@ -44,6 +43,7 @@
 import org.apache.druid.java.util.metrics.MonitorScheduler;
 import org.apache.druid.query.QueryProcessingPool;
 import org.apache.druid.query.QueryRunnerFactoryConglomerate;
+import org.apache.druid.rpc.indexing.NoopOverlordClient;
 import org.apache.druid.rpc.indexing.OverlordClient;
 import org.apache.druid.segment.IndexIO;
 import org.apache.druid.segment.IndexMergerV9Factory;
diff --git a/indexing-service/src/test/java/org/apache/druid/indexing/overlord/http/OverlordDataSourcesResourceTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/overlord/http/OverlordDataSourcesResourceTest.java
new file mode 100644
index 000000000000..7bea4b2aec1b
--- /dev/null
+++ b/indexing-service/src/test/java/org/apache/druid/indexing/overlord/http/OverlordDataSourcesResourceTest.java
@@ -0,0 +1,370 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.druid.indexing.overlord.http;
+
+import com.google.common.collect.ImmutableSet;
+import org.apache.druid.audit.AuditManager;
+import org.apache.druid.client.ImmutableDruidDataSource;
+import org.apache.druid.indexing.overlord.TaskMaster;
+import org.apache.druid.java.util.common.Intervals;
+import org.apache.druid.java.util.common.granularity.Granularities;
+import org.apache.druid.rpc.indexing.SegmentUpdateResponse;
+import org.apache.druid.segment.TestDataSource;
+import org.apache.druid.server.coordinator.CreateDataSegments;
+import org.apache.druid.server.coordinator.simulate.TestSegmentsMetadataManager;
+import org.apache.druid.server.http.SegmentsToUpdateFilter;
+import org.apache.druid.server.security.AuthConfig;
+import org.apache.druid.timeline.DataSegment;
+import org.easymock.EasyMock;
+import org.joda.time.Interval;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.ws.rs.core.Response;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+public class OverlordDataSourcesResourceTest
+{
+  private static final String WIKI_SEGMENTS_START = "2024-01-01";
+  private static final List<DataSegment> WIKI_SEGMENTS_10X1D
+      = CreateDataSegments.ofDatasource(TestDataSource.WIKI)
+                          .forIntervals(10, Granularities.DAY)
+                          .startingAt(WIKI_SEGMENTS_START)
+                          .eachOfSizeInMb(500);
+
+  private TestSegmentsMetadataManager segmentsMetadataManager;
+
+  private OverlordDataSourcesResource dataSourcesResource;
+
+  @Before
+  public void setup()
+  {
+    AuditManager auditManager = EasyMock.createStrictMock(AuditManager.class);
+    segmentsMetadataManager = new TestSegmentsMetadataManager();
+
+    TaskMaster taskMaster = new TaskMaster(null, null);
+    dataSourcesResource = new OverlordDataSourcesResource(
+        taskMaster,
+        segmentsMetadataManager,
+        auditManager
+    );
+    taskMaster.becomeFullLeader();
+
+    WIKI_SEGMENTS_10X1D.forEach(segmentsMetadataManager::addSegment);
+  }
+
+  @Test
+  public void testMarkSegmentAsUnused()
+  {
+    Response response = dataSourcesResource.markSegmentAsUnused(
+        TestDataSource.WIKI,
+        WIKI_SEGMENTS_10X1D.get(0).getId().toString()
+    );
+    verifyNumSegmentsUpdated(1, response);
+  }
+
+  @Test
+  public void testMarkSegmentAsUnused_withInvalidSegmentId()
+  {
+    Response response = dataSourcesResource.markSegmentAsUnused(
+        TestDataSource.WIKI,
+        "someSegment"
+    );
+    Assert.assertEquals(400, response.getStatus());
+    Assert.assertEquals(
+        "Could not parse Segment ID[someSegment] for DataSource[wiki]",
+        response.getEntity()
+    );
+  }
+
+  @Test
+  public void testMarkAllSegmentsAsUnused()
+  {
+    Response response = dataSourcesResource.markAllSegmentsAsUnused(
+        TestDataSource.WIKI,
+        createHttpServletRequest()
+    );
+    verifyNumSegmentsUpdated(10, response);
+  }
+
+  @Test
+  public void testMarkSegmentsAsUnused_bySegmentIds()
+  {
+    final Set<String> segmentIdsToUpdate = ImmutableSet.of(
+        WIKI_SEGMENTS_10X1D.get(0).getId().toString(),
+        WIKI_SEGMENTS_10X1D.get(8).getId().toString()
+    );
+
+    Response response = dataSourcesResource.markSegmentsAsUnused(
+        TestDataSource.WIKI,
+        new SegmentsToUpdateFilter(null, segmentIdsToUpdate, null),
+        createHttpServletRequest()
+    );
+    verifyNumSegmentsUpdated(2, response);
+  }
+
+  @Test
+  public void testMarkSegmentsAsUnused_byInterval()
+  {
+    final Interval nonOverlappingInterval = Intervals.of("1000/2000");
+    Response response = dataSourcesResource.markSegmentsAsUnused(
+        TestDataSource.WIKI,
+        new SegmentsToUpdateFilter(nonOverlappingInterval, null, null),
+        createHttpServletRequest()
+    );
+    verifyNumSegmentsUpdated(0, response);
+
+    final Interval overlappingInterval3Days = Intervals.of(WIKI_SEGMENTS_START + "/P3D");
+    response = dataSourcesResource.markSegmentsAsUnused(
+        TestDataSource.WIKI,
+        new SegmentsToUpdateFilter(overlappingInterval3Days, null, null),
+        createHttpServletRequest()
+    );
+    verifyNumSegmentsUpdated(3, response);
+  }
+
+  @Test
+  public void testMarkSegmentsAsUnused_byIntervalAndVersion()
+  {
+    final Interval overlappingInterval3Days = Intervals.of(WIKI_SEGMENTS_START + "/P3D");
+    Response response = dataSourcesResource.markSegmentsAsUnused(
+        TestDataSource.WIKI,
+        new SegmentsToUpdateFilter(
+            overlappingInterval3Days,
+            null,
+            Collections.singletonList("invalidVersion")
+        ),
+        createHttpServletRequest()
+    );
+    verifyNumSegmentsUpdated(0, response);
+
+    final String wikiSegmentVersion = WIKI_SEGMENTS_10X1D.get(0).getVersion();
+    response = dataSourcesResource.markSegmentsAsUnused(
+        TestDataSource.WIKI,
+        new SegmentsToUpdateFilter(
+            overlappingInterval3Days,
+            null,
+            Collections.singletonList(wikiSegmentVersion)
+        ),
+        createHttpServletRequest()
+    );
+    verifyNumSegmentsUpdated(3, response);
+  }
+
+  @Test
+  public void testMarkSegmentAsUsed()
+  {
+    final DataSegment segment = WIKI_SEGMENTS_10X1D.get(0);
+    final String segmentId = segment.getId().toString();
+
+    // Verify that segment which is already "used" is not updated
+    Response response = dataSourcesResource.markSegmentAsUsed(TestDataSource.WIKI, segmentId);
+    verifyNumSegmentsUpdated(0, response);
+
+    // Mark segment as unused and then mark it as used
+    dataSourcesResource.markSegmentAsUnused(TestDataSource.WIKI, segmentId);
+    response = dataSourcesResource.markSegmentAsUsed(TestDataSource.WIKI, segmentId);
+    verifyNumSegmentsUpdated(1, response);
+  }
+
+  @Test
+  public void testMarkAllNonOvershadowedSegmentsAsUsed()
+  {
+    // Create higher version segments
+    final String version2 = WIKI_SEGMENTS_10X1D.get(0).getVersion() + "__2";
+    final List<DataSegment> wikiSegmentsV2 = WIKI_SEGMENTS_10X1D.stream().map(
+        segment -> DataSegment.builder(segment).version(version2).build()
+    ).collect(Collectors.toList());
+
+    wikiSegmentsV2.forEach(segmentsMetadataManager::addSegment);
+
+    // Mark all segments as unused
+    Response response = dataSourcesResource.markAllSegmentsAsUnused(
+        TestDataSource.WIKI,
+        createHttpServletRequest()
+    );
+    verifyNumSegmentsUpdated(20, response);
+
+    // Verify that only higher version segments are marked as used
+    response = dataSourcesResource.markAllNonOvershadowedSegmentsAsUsed(
+        TestDataSource.WIKI,
+        createHttpServletRequest()
+    );
+    verifyNumSegmentsUpdated(10, response);
+
+    final ImmutableDruidDataSource dataSource = segmentsMetadataManager
+        .getImmutableDataSourceWithUsedSegments(TestDataSource.WIKI);
+    Assert.assertNotNull(dataSource);
+
+    final Collection<DataSegment> usedSegments = dataSource.getSegments();
+    Assert.assertEquals(10, usedSegments.size());
+    for (DataSegment segment : usedSegments) {
+      Assert.assertEquals(version2, segment.getVersion());
+    }
+  }
+
+  @Test
+  public void testMarkNonOvershadowedSegmentsAsUsed_byInterval()
+  {
+    dataSourcesResource.markAllSegmentsAsUnused(TestDataSource.WIKI, createHttpServletRequest());
+
+    final Interval disjointInterval = Intervals.of("1000/2000");
+    Response response = dataSourcesResource.markNonOvershadowedSegmentsAsUsed(
+        TestDataSource.WIKI,
+        new SegmentsToUpdateFilter(disjointInterval, null, null)
+    );
+    verifyNumSegmentsUpdated(0, response);
+
+    final Interval overlappingInterval3Days = Intervals.of(WIKI_SEGMENTS_START + "/P3D");
+    response = dataSourcesResource.markNonOvershadowedSegmentsAsUsed(
+        TestDataSource.WIKI,
+        new SegmentsToUpdateFilter(overlappingInterval3Days, null, null)
+    );
+    verifyNumSegmentsUpdated(3, response);
+  }
+
+  @Test
+  public void testMarkNonOvershadowedSegmentsAsUsed_byIntervalAndVersion()
+  {
+    dataSourcesResource.markAllSegmentsAsUnused(TestDataSource.WIKI, createHttpServletRequest());
+
+    final Interval overlappingInterval4Days = Intervals.of(WIKI_SEGMENTS_START + "/P4D");
+    Response response = dataSourcesResource.markNonOvershadowedSegmentsAsUsed(
+        TestDataSource.WIKI,
+        new SegmentsToUpdateFilter(
+            overlappingInterval4Days,
+            null,
+            Collections.singletonList("invalidVersion")
+        )
+    );
+    verifyNumSegmentsUpdated(0, response);
+
+    final String wikiSegmentsVersion = WIKI_SEGMENTS_10X1D.get(0).getVersion();
+    response = dataSourcesResource.markNonOvershadowedSegmentsAsUsed(
+        TestDataSource.WIKI,
+        new SegmentsToUpdateFilter(
+            overlappingInterval4Days,
+            null,
+            Collections.singletonList(wikiSegmentsVersion)
+        )
+    );
+    verifyNumSegmentsUpdated(4, response);
+  }
+
+  @Test
+  public void testMarkNonOvershadowedSegmentsAsUsed_bySegmentIds()
+  {
+    dataSourcesResource.markAllSegmentsAsUnused(TestDataSource.WIKI, createHttpServletRequest());
+
+    final Set<String> segmentIdsToUpdate = ImmutableSet.of(
+        WIKI_SEGMENTS_10X1D.get(0).getId().toString(),
+        WIKI_SEGMENTS_10X1D.get(1).getId().toString()
+    );
+    Response response = dataSourcesResource.markNonOvershadowedSegmentsAsUsed(
+        TestDataSource.WIKI,
+        new SegmentsToUpdateFilter(null, segmentIdsToUpdate, null)
+    );
+    verifyNumSegmentsUpdated(2, response);
+  }
+
+  @Test
+  public void testMarkNonOvershadowedSegmentsAsUsed_withNullPayload_throwsBadRequestError()
+  {
+    final Response response
+        = dataSourcesResource.markNonOvershadowedSegmentsAsUsed(TestDataSource.WIKI, null);
+    Assert.assertEquals(400, response.getStatus());
+    Assert.assertEquals(
+        "Invalid request payload. Specify either 'interval' or 'segmentIds', but not both."
+        + " Optionally, include 'versions' only when 'interval' is provided.",
+        response.getEntity()
+    );
+  }
+
+  @Test
+  public void testMarkNonOvershadowedSegmentsAsUsed_withInvalidPayload_throwsBadRequestError()
+  {
+    final String segmentId = WIKI_SEGMENTS_10X1D.get(0).getId().toString();
+    final String expectedErrorMessage
+        = "Invalid request payload. Specify either 'interval' or 'segmentIds', but not both."
+          + " Optionally, include 'versions' only when 'interval' is provided.";
+
+    // Both interval and segmentIds are null
+    Response response = dataSourcesResource.markNonOvershadowedSegmentsAsUsed(
+        TestDataSource.WIKI,
+        new SegmentsToUpdateFilter(null, null, null)
+    );
+    Assert.assertEquals(400, response.getStatus());
+    Assert.assertEquals(expectedErrorMessage, response.getEntity());
+
+    // interval is null and segmentIds is empty
+    response = dataSourcesResource.markNonOvershadowedSegmentsAsUsed(
+        TestDataSource.WIKI,
+        new SegmentsToUpdateFilter(null, Collections.emptySet(), null)
+    );
+    Assert.assertEquals(400, response.getStatus());
+    Assert.assertEquals(expectedErrorMessage, response.getEntity());
+
+    // Both interval and segmentIds are specified
+    response = dataSourcesResource.markNonOvershadowedSegmentsAsUsed(
+        TestDataSource.WIKI,
+        new SegmentsToUpdateFilter(Intervals.of("1000/2000"), Collections.singleton(segmentId), null)
+    );
+    Assert.assertEquals(400, response.getStatus());
+    Assert.assertEquals(expectedErrorMessage, response.getEntity());
+
+    // versions are specified with segmentIds
+    response = dataSourcesResource.markNonOvershadowedSegmentsAsUsed(
+        TestDataSource.WIKI,
+        new SegmentsToUpdateFilter(null, Collections.singleton(segmentId), Collections.singletonList("v1"))
+    );
+    Assert.assertEquals(400, response.getStatus());
+    Assert.assertEquals(expectedErrorMessage, response.getEntity());
+  }
+
+  private void verifyNumSegmentsUpdated(int expectedUpdatedCount, Response response)
+  {
+    Assert.assertEquals(200, response.getStatus());
+    Assert.assertEquals(new SegmentUpdateResponse(expectedUpdatedCount), response.getEntity());
+  }
+
+  private static HttpServletRequest createHttpServletRequest()
+  {
+    final HttpServletRequest request = EasyMock.createStrictMock(HttpServletRequest.class);
+
+    EasyMock.expect(request.getHeader(AuditManager.X_DRUID_AUTHOR)).andReturn("author").anyTimes();
+    EasyMock.expect(request.getHeader(AuditManager.X_DRUID_COMMENT)).andReturn("comment").anyTimes();
+    EasyMock.expect(request.getAttribute(AuthConfig.DRUID_AUTHENTICATION_RESULT)).andReturn(null).anyTimes();
+    EasyMock.expect(request.getRemoteAddr()).andReturn("127.0.0.1").anyTimes();
+
+    EasyMock.expect(request.getMethod()).andReturn("POST").anyTimes();
+    EasyMock.expect(request.getRequestURI()).andReturn("/request/uri").anyTimes();
+    EasyMock.expect(request.getQueryString()).andReturn("query=string").anyTimes();
+
+    EasyMock.replay(request);
+
+    return request;
+  }
+}
diff --git a/indexing-service/src/test/java/org/apache/druid/indexing/seekablestream/SeekableStreamIndexTaskTestBase.java b/indexing-service/src/test/java/org/apache/druid/indexing/seekablestream/SeekableStreamIndexTaskTestBase.java
index 7a4fd7dadb3a..b815a48d71e6 100644
--- a/indexing-service/src/test/java/org/apache/druid/indexing/seekablestream/SeekableStreamIndexTaskTestBase.java
+++ b/indexing-service/src/test/java/org/apache/druid/indexing/seekablestream/SeekableStreamIndexTaskTestBase.java
@@ -34,7 +34,6 @@
 import org.apache.druid.client.cache.CachePopulatorStats;
 import org.apache.druid.client.cache.MapCache;
 import org.apache.druid.client.coordinator.NoopCoordinatorClient;
-import org.apache.druid.client.indexing.NoopOverlordClient;
 import org.apache.druid.common.config.NullHandling;
 import org.apache.druid.data.input.InputFormat;
 import org.apache.druid.data.input.impl.ByteEntity;
@@ -100,6 +99,7 @@
 import org.apache.druid.query.aggregation.LongSumAggregatorFactory;
 import org.apache.druid.query.timeseries.TimeseriesQuery;
 import org.apache.druid.query.timeseries.TimeseriesResultValue;
+import org.apache.druid.rpc.indexing.NoopOverlordClient;
 import org.apache.druid.segment.DimensionHandlerUtils;
 import org.apache.druid.segment.IndexIO;
 import org.apache.druid.segment.QueryableIndex;
diff --git a/indexing-service/src/test/java/org/apache/druid/indexing/worker/WorkerTaskMonitorTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/worker/WorkerTaskMonitorTest.java
index e1822505b977..c8a754625358 100644
--- a/indexing-service/src/test/java/org/apache/druid/indexing/worker/WorkerTaskMonitorTest.java
+++ b/indexing-service/src/test/java/org/apache/druid/indexing/worker/WorkerTaskMonitorTest.java
@@ -27,7 +27,6 @@
 import org.apache.curator.retry.ExponentialBackoffRetry;
 import org.apache.curator.test.TestingCluster;
 import org.apache.druid.client.coordinator.NoopCoordinatorClient;
-import org.apache.druid.client.indexing.NoopOverlordClient;
 import org.apache.druid.curator.PotentiallyGzippedCompressionProvider;
 import org.apache.druid.indexer.TaskState;
 import org.apache.druid.indexing.common.IndexingServiceCondition;
@@ -48,6 +47,7 @@
 import org.apache.druid.indexing.worker.config.WorkerConfig;
 import org.apache.druid.java.util.common.FileUtils;
 import org.apache.druid.java.util.common.StringUtils;
+import org.apache.druid.rpc.indexing.NoopOverlordClient;
 import org.apache.druid.rpc.indexing.OverlordClient;
 import org.apache.druid.segment.IndexIO;
 import org.apache.druid.segment.IndexMergerV9Factory;
diff --git a/indexing-service/src/test/java/org/apache/druid/indexing/worker/shuffle/LocalIntermediaryDataManagerAutoCleanupTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/worker/shuffle/LocalIntermediaryDataManagerAutoCleanupTest.java
index 5505160d989d..be07a3ef4858 100644
--- a/indexing-service/src/test/java/org/apache/druid/indexing/worker/shuffle/LocalIntermediaryDataManagerAutoCleanupTest.java
+++ b/indexing-service/src/test/java/org/apache/druid/indexing/worker/shuffle/LocalIntermediaryDataManagerAutoCleanupTest.java
@@ -24,13 +24,13 @@
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
 import org.apache.commons.io.FileUtils;
-import org.apache.druid.client.indexing.NoopOverlordClient;
 import org.apache.druid.indexer.TaskState;
 import org.apache.druid.indexer.TaskStatus;
 import org.apache.druid.indexing.common.config.TaskConfig;
 import org.apache.druid.indexing.common.config.TaskConfigBuilder;
 import org.apache.druid.indexing.worker.config.WorkerConfig;
 import org.apache.druid.java.util.common.Intervals;
+import org.apache.druid.rpc.indexing.NoopOverlordClient;
 import org.apache.druid.rpc.indexing.OverlordClient;
 import org.apache.druid.segment.loading.StorageLocationConfig;
 import org.apache.druid.timeline.DataSegment;
diff --git a/indexing-service/src/test/java/org/apache/druid/indexing/worker/shuffle/LocalIntermediaryDataManagerManualAddAndDeleteTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/worker/shuffle/LocalIntermediaryDataManagerManualAddAndDeleteTest.java
index cc14d4505e95..59f194350a0d 100644
--- a/indexing-service/src/test/java/org/apache/druid/indexing/worker/shuffle/LocalIntermediaryDataManagerManualAddAndDeleteTest.java
+++ b/indexing-service/src/test/java/org/apache/druid/indexing/worker/shuffle/LocalIntermediaryDataManagerManualAddAndDeleteTest.java
@@ -23,7 +23,6 @@
 import com.google.common.io.ByteSource;
 import com.google.common.primitives.Ints;
 import org.apache.commons.io.FileUtils;
-import org.apache.druid.client.indexing.NoopOverlordClient;
 import org.apache.druid.error.DruidException;
 import org.apache.druid.error.DruidExceptionMatcher;
 import org.apache.druid.indexing.common.config.TaskConfig;
@@ -31,6 +30,7 @@
 import org.apache.druid.indexing.worker.config.WorkerConfig;
 import org.apache.druid.java.util.common.Intervals;
 import org.apache.druid.java.util.common.StringUtils;
+import org.apache.druid.rpc.indexing.NoopOverlordClient;
 import org.apache.druid.rpc.indexing.OverlordClient;
 import org.apache.druid.segment.loading.StorageLocationConfig;
 import org.apache.druid.timeline.DataSegment;
diff --git a/indexing-service/src/test/java/org/apache/druid/indexing/worker/shuffle/ShuffleDataSegmentPusherTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/worker/shuffle/ShuffleDataSegmentPusherTest.java
index c8c9b7fe0665..70e734f1b224 100644
--- a/indexing-service/src/test/java/org/apache/druid/indexing/worker/shuffle/ShuffleDataSegmentPusherTest.java
+++ b/indexing-service/src/test/java/org/apache/druid/indexing/worker/shuffle/ShuffleDataSegmentPusherTest.java
@@ -28,7 +28,6 @@
 import com.google.common.primitives.Ints;
 import com.google.inject.Injector;
 import org.apache.commons.io.FileUtils;
-import org.apache.druid.client.indexing.NoopOverlordClient;
 import org.apache.druid.guice.GuiceAnnotationIntrospector;
 import org.apache.druid.guice.GuiceInjectableValues;
 import org.apache.druid.guice.GuiceInjectors;
@@ -37,6 +36,7 @@
 import org.apache.druid.indexing.worker.config.WorkerConfig;
 import org.apache.druid.jackson.DefaultObjectMapper;
 import org.apache.druid.java.util.common.Intervals;
+import org.apache.druid.rpc.indexing.NoopOverlordClient;
 import org.apache.druid.rpc.indexing.OverlordClient;
 import org.apache.druid.segment.loading.LoadSpec;
 import org.apache.druid.segment.loading.LocalDataSegmentPuller;
diff --git a/indexing-service/src/test/java/org/apache/druid/indexing/worker/shuffle/ShuffleResourceTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/worker/shuffle/ShuffleResourceTest.java
index 69d48417deee..159800b4d4ee 100644
--- a/indexing-service/src/test/java/org/apache/druid/indexing/worker/shuffle/ShuffleResourceTest.java
+++ b/indexing-service/src/test/java/org/apache/druid/indexing/worker/shuffle/ShuffleResourceTest.java
@@ -24,7 +24,6 @@
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
 import org.apache.commons.io.FileUtils;
-import org.apache.druid.client.indexing.NoopOverlordClient;
 import org.apache.druid.indexer.TaskState;
 import org.apache.druid.indexer.TaskStatus;
 import org.apache.druid.indexing.common.config.TaskConfig;
@@ -32,6 +31,7 @@
 import org.apache.druid.indexing.worker.config.WorkerConfig;
 import org.apache.druid.indexing.worker.shuffle.ShuffleMetrics.PerDatasourceShuffleMetrics;
 import org.apache.druid.java.util.common.Intervals;
+import org.apache.druid.rpc.indexing.NoopOverlordClient;
 import org.apache.druid.rpc.indexing.OverlordClient;
 import org.apache.druid.segment.loading.StorageLocationConfig;
 import org.apache.druid.timeline.DataSegment;
diff --git a/server/src/test/java/org/apache/druid/client/indexing/NoopOverlordClient.java b/server/src/main/java/org/apache/druid/rpc/indexing/NoopOverlordClient.java
similarity index 73%
rename from server/src/test/java/org/apache/druid/client/indexing/NoopOverlordClient.java
rename to server/src/main/java/org/apache/druid/rpc/indexing/NoopOverlordClient.java
index 8ccc32e435ce..7ccdcedb2bd3 100644
--- a/server/src/test/java/org/apache/druid/client/indexing/NoopOverlordClient.java
+++ b/server/src/main/java/org/apache/druid/rpc/indexing/NoopOverlordClient.java
@@ -17,9 +17,13 @@
  * under the License.
  */
 
-package org.apache.druid.client.indexing;
+package org.apache.druid.rpc.indexing;
 
 import com.google.common.util.concurrent.ListenableFuture;
+import org.apache.druid.client.indexing.IndexingTotalWorkerCapacityInfo;
+import org.apache.druid.client.indexing.IndexingWorkerInfo;
+import org.apache.druid.client.indexing.TaskPayloadResponse;
+import org.apache.druid.client.indexing.TaskStatusResponse;
 import org.apache.druid.indexer.TaskStatus;
 import org.apache.druid.indexer.TaskStatusPlus;
 import org.apache.druid.indexer.report.TaskReport;
@@ -27,9 +31,10 @@
 import org.apache.druid.java.util.common.parsers.CloseableIterator;
 import org.apache.druid.metadata.LockFilterPolicy;
 import org.apache.druid.rpc.ServiceRetryPolicy;
-import org.apache.druid.rpc.indexing.OverlordClient;
 import org.apache.druid.server.compaction.CompactionProgressResponse;
 import org.apache.druid.server.compaction.CompactionStatusResponse;
+import org.apache.druid.server.http.SegmentsToUpdateFilter;
+import org.apache.druid.timeline.SegmentId;
 import org.joda.time.Interval;
 
 import javax.annotation.Nullable;
@@ -38,6 +43,10 @@
 import java.util.Map;
 import java.util.Set;
 
+/**
+ * Implementation of {@link OverlordClient} that throws
+ * {@link UnsupportedOperationException} for every method.
+ */
 public class NoopOverlordClient implements OverlordClient
 {
   @Override
@@ -130,6 +139,45 @@ public ListenableFuture<CompactionStatusResponse> getCompactionSnapshots(@Nullab
     throw new UnsupportedOperationException();
   }
 
+  @Override
+  public ListenableFuture<SegmentUpdateResponse> markNonOvershadowedSegmentsAsUsed(String dataSource)
+  {
+    throw new UnsupportedOperationException();
+  }
+
+  @Override
+  public ListenableFuture<SegmentUpdateResponse> markNonOvershadowedSegmentsAsUsed(
+      String dataSource,
+      SegmentsToUpdateFilter filter
+  )
+  {
+    throw new UnsupportedOperationException();
+  }
+
+  @Override
+  public ListenableFuture<SegmentUpdateResponse> markSegmentAsUsed(SegmentId segmentId)
+  {
+    throw new UnsupportedOperationException();
+  }
+
+  @Override
+  public ListenableFuture<SegmentUpdateResponse> markSegmentsAsUnused(String dataSource)
+  {
+    throw new UnsupportedOperationException();
+  }
+
+  @Override
+  public ListenableFuture<SegmentUpdateResponse> markSegmentsAsUnused(String dataSource, SegmentsToUpdateFilter filter)
+  {
+    throw new UnsupportedOperationException();
+  }
+
+  @Override
+  public ListenableFuture<SegmentUpdateResponse> markSegmentAsUnused(SegmentId segmentId)
+  {
+    throw new UnsupportedOperationException();
+  }
+
   @Override
   public ListenableFuture<CompactionProgressResponse> getBytesAwaitingCompaction(String dataSource)
   {
diff --git a/server/src/main/java/org/apache/druid/rpc/indexing/OverlordClient.java b/server/src/main/java/org/apache/druid/rpc/indexing/OverlordClient.java
index fcc93d39c8de..b14c287e734f 100644
--- a/server/src/main/java/org/apache/druid/rpc/indexing/OverlordClient.java
+++ b/server/src/main/java/org/apache/druid/rpc/indexing/OverlordClient.java
@@ -37,6 +37,8 @@
 import org.apache.druid.rpc.ServiceRetryPolicy;
 import org.apache.druid.server.compaction.CompactionProgressResponse;
 import org.apache.druid.server.compaction.CompactionStatusResponse;
+import org.apache.druid.server.http.SegmentsToUpdateFilter;
+import org.apache.druid.timeline.SegmentId;
 import org.joda.time.DateTime;
 import org.joda.time.Interval;
 
@@ -239,6 +241,58 @@ ListenableFuture<Map<String, List<Interval>>> findLockedIntervals(
    */
   ListenableFuture<CompactionStatusResponse> getCompactionSnapshots(@Nullable String dataSource);
 
+  /**
+   * Marks all non-overshadowed segments of the datasource as used.
+   * <p>
+   * API: {@code POST /druid/indexer/v1/datasources/{dataSourceName}}
+   */
+  ListenableFuture<SegmentUpdateResponse> markNonOvershadowedSegmentsAsUsed(String dataSource);
+
+  /**
+   * Marks non-overshadowed segments that satisfy the given filter as used.
+   * <p>
+   * API: {@code POST /druid/indexer/v1/datasources/{dataSourceName}/markUsed}
+   *
+   * @param filter Must be non-null
+   */
+  ListenableFuture<SegmentUpdateResponse> markNonOvershadowedSegmentsAsUsed(
+      String dataSource,
+      SegmentsToUpdateFilter filter
+  );
+
+  /**
+   * Marks the given segment as used.
+   * <p>
+   * API: {@code POST /druid/indexer/v1/datasources/{dataSourceName}/segments/{segmentId}}
+   */
+  ListenableFuture<SegmentUpdateResponse> markSegmentAsUsed(SegmentId segmentId);
+
+  /**
+   * Marks all non-overshadowed segments of the datasource as unused.
+   * <p>
+   * API: {@code DELETE /druid/indexer/v1/datasources/{dataSourceName}}
+   */
+  ListenableFuture<SegmentUpdateResponse> markSegmentsAsUnused(String dataSource);
+
+  /**
+   * Marks non-overshadowed segments that satisfy the given filter as unused.
+   * <p>
+   * API: {@code POST /druid/indexer/v1/datasources/{dataSourceName}/markUnused}
+   *
+   * @param filter Must be non-null
+   */
+  ListenableFuture<SegmentUpdateResponse> markSegmentsAsUnused(
+      String dataSource,
+      SegmentsToUpdateFilter filter
+  );
+
+  /**
+   * Marks the given segment as unused.
+   * <p>
+   * API: {@code DELETE /druid/indexer/v1/datasources/{dataSourceName}/segments/{segmentId}}
+   */
+  ListenableFuture<SegmentUpdateResponse> markSegmentAsUnused(SegmentId segmentId);
+
   /**
    * Returns a copy of this client with a different retry policy.
    */
diff --git a/server/src/main/java/org/apache/druid/rpc/indexing/OverlordClientImpl.java b/server/src/main/java/org/apache/druid/rpc/indexing/OverlordClientImpl.java
index 76077a2fbddb..ba6a6e76d55f 100644
--- a/server/src/main/java/org/apache/druid/rpc/indexing/OverlordClientImpl.java
+++ b/server/src/main/java/org/apache/druid/rpc/indexing/OverlordClientImpl.java
@@ -47,6 +47,8 @@
 import org.apache.druid.rpc.ServiceRetryPolicy;
 import org.apache.druid.server.compaction.CompactionProgressResponse;
 import org.apache.druid.server.compaction.CompactionStatusResponse;
+import org.apache.druid.server.http.SegmentsToUpdateFilter;
+import org.apache.druid.timeline.SegmentId;
 import org.jboss.netty.handler.codec.http.HttpMethod;
 import org.joda.time.Interval;
 
@@ -335,6 +337,112 @@ public ListenableFuture<CompactionStatusResponse> getCompactionSnapshots(@Nullab
     );
   }
 
+  @Override
+  public ListenableFuture<SegmentUpdateResponse> markNonOvershadowedSegmentsAsUsed(String dataSource)
+  {
+    final String path = StringUtils.format(
+        "/druid/indexer/v1/datasources/%s",
+        StringUtils.urlEncode(dataSource)
+    );
+    return FutureUtils.transform(
+        client.asyncRequest(
+            new RequestBuilder(HttpMethod.POST, path),
+            new BytesFullResponseHandler()
+        ),
+        holder -> JacksonUtils.readValue(jsonMapper, holder.getContent(), SegmentUpdateResponse.class)
+    );
+  }
+
+  @Override
+  public ListenableFuture<SegmentUpdateResponse> markNonOvershadowedSegmentsAsUsed(
+      String dataSource,
+      SegmentsToUpdateFilter filter
+  )
+  {
+    final String path = StringUtils.format(
+        "/druid/indexer/v1/datasources/%s/markUsed",
+        StringUtils.urlEncode(dataSource)
+    );
+    return FutureUtils.transform(
+        client.asyncRequest(
+            new RequestBuilder(HttpMethod.POST, path)
+                .jsonContent(jsonMapper, filter),
+            new BytesFullResponseHandler()
+        ),
+        holder -> JacksonUtils.readValue(jsonMapper, holder.getContent(), SegmentUpdateResponse.class)
+    );
+  }
+
+  @Override
+  public ListenableFuture<SegmentUpdateResponse> markSegmentAsUsed(SegmentId segmentId)
+  {
+    final String path = StringUtils.format(
+        "/druid/indexer/v1/datasources/%s/segments/%s",
+        StringUtils.urlEncode(segmentId.getDataSource()),
+        StringUtils.urlEncode(segmentId.toString())
+    );
+    return FutureUtils.transform(
+        client.asyncRequest(
+            new RequestBuilder(HttpMethod.POST, path),
+            new BytesFullResponseHandler()
+        ),
+        holder -> JacksonUtils.readValue(jsonMapper, holder.getContent(), SegmentUpdateResponse.class)
+    );
+  }
+
+  @Override
+  public ListenableFuture<SegmentUpdateResponse> markSegmentsAsUnused(String dataSource)
+  {
+    final String path = StringUtils.format(
+        "/druid/indexer/v1/datasources/%s",
+        StringUtils.urlEncode(dataSource)
+    );
+    return FutureUtils.transform(
+        client.asyncRequest(
+            new RequestBuilder(HttpMethod.DELETE, path),
+            new BytesFullResponseHandler()
+        ),
+        holder -> JacksonUtils.readValue(jsonMapper, holder.getContent(), SegmentUpdateResponse.class)
+    );
+  }
+
+  @Override
+  public ListenableFuture<SegmentUpdateResponse> markSegmentsAsUnused(
+      String dataSource,
+      SegmentsToUpdateFilter filter
+  )
+  {
+    final String path = StringUtils.format(
+        "/druid/indexer/v1/datasources/%s/markUnused",
+        StringUtils.urlEncode(dataSource)
+    );
+    return FutureUtils.transform(
+        client.asyncRequest(
+            new RequestBuilder(HttpMethod.POST, path)
+                .jsonContent(jsonMapper, filter),
+            new BytesFullResponseHandler()
+        ),
+        holder -> JacksonUtils.readValue(jsonMapper, holder.getContent(), SegmentUpdateResponse.class)
+    );
+  }
+
+  @Override
+  public ListenableFuture<SegmentUpdateResponse> markSegmentAsUnused(SegmentId segmentId)
+  {
+    final String path = StringUtils.format(
+        "/druid/indexer/v1/datasources/%s/segments/%s",
+        StringUtils.urlEncode(segmentId.getDataSource()),
+        StringUtils.urlEncode(segmentId.toString())
+    );
+    return FutureUtils.transform(
+        client.asyncRequest(
+            new RequestBuilder(HttpMethod.DELETE, path),
+            new BytesFullResponseHandler()
+        ),
+        holder -> JacksonUtils.readValue(jsonMapper, holder.getContent(), SegmentUpdateResponse.class)
+    );
+  }
+
   @Override
   public ListenableFuture<CompactionProgressResponse> getBytesAwaitingCompaction(String dataSource)
   {
diff --git a/server/src/main/java/org/apache/druid/rpc/indexing/SegmentUpdateResponse.java b/server/src/main/java/org/apache/druid/rpc/indexing/SegmentUpdateResponse.java
new file mode 100644
index 000000000000..c326d3de8821
--- /dev/null
+++ b/server/src/main/java/org/apache/druid/rpc/indexing/SegmentUpdateResponse.java
@@ -0,0 +1,82 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.druid.rpc.indexing;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import java.util.Objects;
+
+public class SegmentUpdateResponse
+{
+  private final int numChangedSegments;
+  private final boolean segmentStateChanged;
+
+  @JsonCreator
+  public SegmentUpdateResponse(
+      @JsonProperty("numChangedSegments") int numChangedSegments
+  )
+  {
+    this.numChangedSegments = numChangedSegments;
+    this.segmentStateChanged = numChangedSegments > 0;
+  }
+
+  @JsonProperty
+  public int getNumChangedSegments()
+  {
+    return numChangedSegments;
+  }
+
+  /**
+   * This field is required for backward compatibility of responses of
+   * {@link org.apache.druid.server.http.DataSourcesResource#markSegmentAsUsed}
+   * and {@link org.apache.druid.server.http.DataSourcesResource#markSegmentAsUnused}
+   */
+  @JsonProperty
+  public boolean isSegmentStateChanged()
+  {
+    return segmentStateChanged;
+  }
+
+  @Override
+  public boolean equals(Object o)
+  {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    SegmentUpdateResponse response = (SegmentUpdateResponse) o;
+    return numChangedSegments == response.numChangedSegments;
+  }
+
+  @Override
+  public int hashCode()
+  {
+    return Objects.hashCode(numChangedSegments);
+  }
+
+  @Override
+  public String toString()
+  {
+    return "SegmentUpdateResponse{numChangedSegments=" + numChangedSegments + "}";
+  }
+}
diff --git a/server/src/main/java/org/apache/druid/server/compaction/CompactionRunSimulator.java b/server/src/main/java/org/apache/druid/server/compaction/CompactionRunSimulator.java
index db0a5f8c98c4..b74735e6aa3a 100644
--- a/server/src/main/java/org/apache/druid/server/compaction/CompactionRunSimulator.java
+++ b/server/src/main/java/org/apache/druid/server/compaction/CompactionRunSimulator.java
@@ -25,17 +25,13 @@
 import org.apache.druid.client.indexing.ClientCompactionTaskQuery;
 import org.apache.druid.client.indexing.ClientCompactionTaskQueryTuningConfig;
 import org.apache.druid.client.indexing.IndexingTotalWorkerCapacityInfo;
-import org.apache.druid.client.indexing.IndexingWorkerInfo;
 import org.apache.druid.client.indexing.TaskPayloadResponse;
-import org.apache.druid.client.indexing.TaskStatusResponse;
 import org.apache.druid.indexer.CompactionEngine;
 import org.apache.druid.indexer.TaskStatus;
 import org.apache.druid.indexer.TaskStatusPlus;
-import org.apache.druid.indexer.report.TaskReport;
-import org.apache.druid.indexing.overlord.supervisor.SupervisorStatus;
 import org.apache.druid.java.util.common.parsers.CloseableIterator;
 import org.apache.druid.metadata.LockFilterPolicy;
-import org.apache.druid.rpc.ServiceRetryPolicy;
+import org.apache.druid.rpc.indexing.NoopOverlordClient;
 import org.apache.druid.rpc.indexing.OverlordClient;
 import org.apache.druid.server.coordinator.ClusterCompactionConfig;
 import org.apache.druid.server.coordinator.DataSourceCompactionConfig;
@@ -45,7 +41,6 @@
 import org.joda.time.Interval;
 
 import javax.annotation.Nullable;
-import java.net.URI;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -192,7 +187,7 @@ private Object[] createRow(
   /**
    * Dummy overlord client that returns empty results for all APIs.
    */
-  private static class ReadOnlyOverlordClient implements OverlordClient
+  private static class ReadOnlyOverlordClient extends NoopOverlordClient
   {
     final OverlordClient delegate;
 
@@ -249,67 +244,5 @@ public ListenableFuture<Void> cancelTask(String taskId)
     {
       return Futures.immediateVoidFuture();
     }
-
-    // Unsupported methods as these are not used by the CompactionScheduler / CompactSegments duty
-
-    @Override
-    public ListenableFuture<URI> findCurrentLeader()
-    {
-      throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public ListenableFuture<TaskStatusResponse> taskStatus(String taskId)
-    {
-      throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public ListenableFuture<TaskReport.ReportMap> taskReportAsMap(String taskId)
-    {
-      throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public ListenableFuture<CloseableIterator<SupervisorStatus>> supervisorStatuses()
-    {
-      throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public ListenableFuture<Integer> killPendingSegments(String dataSource, Interval interval)
-    {
-      throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public ListenableFuture<List<IndexingWorkerInfo>> getWorkers()
-    {
-      throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public ListenableFuture<CompactionStatusResponse> getCompactionSnapshots(@Nullable String dataSource)
-    {
-      throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public ListenableFuture<CompactionProgressResponse> getBytesAwaitingCompaction(String dataSource)
-    {
-      throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public ListenableFuture<Boolean> isCompactionSupervisorEnabled()
-    {
-      throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public OverlordClient withRetryPolicy(ServiceRetryPolicy retryPolicy)
-    {
-      return this;
-    }
   }
 }
diff --git a/server/src/main/java/org/apache/druid/server/coordinator/DruidCoordinator.java b/server/src/main/java/org/apache/druid/server/coordinator/DruidCoordinator.java
index f8c29cd79849..0fd3956dfdd3 100644
--- a/server/src/main/java/org/apache/druid/server/coordinator/DruidCoordinator.java
+++ b/server/src/main/java/org/apache/druid/server/coordinator/DruidCoordinator.java
@@ -19,6 +19,7 @@
 
 package org.apache.druid.server.coordinator;
 
+import com.google.common.base.Throwables;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Sets;
 import com.google.errorprone.annotations.concurrent.GuardedBy;
@@ -33,6 +34,7 @@
 import org.apache.druid.client.ImmutableDruidDataSource;
 import org.apache.druid.client.ServerInventoryView;
 import org.apache.druid.client.coordinator.Coordinator;
+import org.apache.druid.common.guava.FutureUtils;
 import org.apache.druid.curator.discovery.ServiceAnnouncer;
 import org.apache.druid.discovery.DruidLeaderSelector;
 import org.apache.druid.guice.ManageLifecycle;
@@ -47,7 +49,9 @@
 import org.apache.druid.java.util.emitter.service.ServiceEmitter;
 import org.apache.druid.java.util.emitter.service.ServiceMetricEvent;
 import org.apache.druid.metadata.SegmentsMetadataManager;
+import org.apache.druid.rpc.HttpResponseException;
 import org.apache.druid.rpc.indexing.OverlordClient;
+import org.apache.druid.rpc.indexing.SegmentUpdateResponse;
 import org.apache.druid.segment.metadata.CentralizedDatasourceSchemaConfig;
 import org.apache.druid.segment.metadata.CoordinatorSegmentMetadataCache;
 import org.apache.druid.server.DruidNode;
@@ -89,9 +93,11 @@
 import org.apache.druid.server.coordinator.stats.Dimension;
 import org.apache.druid.server.coordinator.stats.RowKey;
 import org.apache.druid.server.coordinator.stats.Stats;
+import org.apache.druid.server.http.SegmentsToUpdateFilter;
 import org.apache.druid.server.lookup.cache.LookupCoordinatorManager;
 import org.apache.druid.timeline.DataSegment;
 import org.apache.druid.timeline.SegmentId;
+import org.jboss.netty.handler.codec.http.HttpResponseStatus;
 import org.joda.time.Duration;
 
 import javax.annotation.Nullable;
@@ -445,16 +451,14 @@ private void becomeLeader()
               config.getCoordinatorPeriod()
           )
       );
-      if (overlordClient != null) {
-        dutiesRunnables.add(
-            new DutiesRunnable(
-                makeIndexingServiceDuties(),
-                startingLeaderCounter,
-                INDEXING_SERVICE_DUTIES_DUTY_GROUP,
-                config.getCoordinatorIndexingPeriod()
-            )
-        );
-      }
+      dutiesRunnables.add(
+          new DutiesRunnable(
+              makeIndexingServiceDuties(),
+              startingLeaderCounter,
+              INDEXING_SERVICE_DUTIES_DUTY_GROUP,
+              config.getCoordinatorIndexingPeriod()
+          )
+      );
       dutiesRunnables.add(
           new DutiesRunnable(
               makeMetadataStoreManagementDuties(),
@@ -535,8 +539,7 @@ private void stopAllDutyGroups()
 
   private List<CoordinatorDuty> makeHistoricalManagementDuties()
   {
-    final MetadataAction.DeleteSegments deleteSegments
-        = segments -> metadataManager.segments().markSegmentsAsUnused(segments);
+    final MetadataAction.DeleteSegments deleteSegments = this::markSegmentsAsUnused;
     final MetadataAction.GetDatasourceRules getRules
         = dataSource -> metadataManager.rules().getRulesWithDefault(dataSource);
 
@@ -628,6 +631,39 @@ private List<CompactSegments> getCompactSegmentsDutyFromCustomGroups()
                            .collect(Collectors.toList());
   }
 
+  /**
+   * Makes an API call to Overlord to mark segments of a datasource as unused.
+   *
+   * @return Number of segments updated.
+   */
+  private int markSegmentsAsUnused(String datasource, Set<SegmentId> segmentIds)
+  {
+    try {
+      final Set<String> segmentIdsToUpdate
+          = segmentIds.stream().map(SegmentId::toString).collect(Collectors.toSet());
+      final SegmentsToUpdateFilter filter
+          = new SegmentsToUpdateFilter(null, segmentIdsToUpdate, null);
+      SegmentUpdateResponse response = FutureUtils.getUnchecked(
+          overlordClient.markSegmentsAsUnused(datasource, filter),
+          true
+      );
+      return response.getNumChangedSegments();
+    }
+    catch (Exception e) {
+      final Throwable rootCause = Throwables.getRootCause(e);
+      if (rootCause instanceof HttpResponseException) {
+        HttpResponseStatus status = ((HttpResponseException) rootCause).getResponse().getStatus();
+        if (status.getCode() == 404) {
+          log.info("Could not update segments via Overlord API. Updating metadata store directly.");
+          return metadataManager.segments().markSegmentsAsUnused(segmentIds);
+        }
+      }
+
+      log.error(e, "Could not mark segments as unused for datasource[%s].", datasource);
+      return 0;
+    }
+  }
+
   /**
    * Used by {@link CoordinatorDutyGroup} to check leadership and emit stats.
    */
diff --git a/server/src/main/java/org/apache/druid/server/coordinator/duty/MarkEternityTombstonesAsUnused.java b/server/src/main/java/org/apache/druid/server/coordinator/duty/MarkEternityTombstonesAsUnused.java
index 78704166ce9e..f332f11020c5 100644
--- a/server/src/main/java/org/apache/druid/server/coordinator/duty/MarkEternityTombstonesAsUnused.java
+++ b/server/src/main/java/org/apache/druid/server/coordinator/duty/MarkEternityTombstonesAsUnused.java
@@ -89,7 +89,7 @@ public DruidCoordinatorRuntimeParams run(final DruidCoordinatorRuntimeParams par
         dataSourcesSnapshot
     );
 
-    if (datasourceToNonOvershadowedEternityTombstones.size() == 0) {
+    if (datasourceToNonOvershadowedEternityTombstones.isEmpty()) {
       log.debug("No non-overshadowed eternity tombstones found.");
       return params;
     }
@@ -102,7 +102,7 @@ public DruidCoordinatorRuntimeParams run(final DruidCoordinatorRuntimeParams par
     datasourceToNonOvershadowedEternityTombstones.forEach((datasource, nonOvershadowedEternityTombstones) -> {
       final RowKey datasourceKey = RowKey.of(Dimension.DATASOURCE, datasource);
       stats.add(Stats.Segments.UNNEEDED_ETERNITY_TOMBSTONE, datasourceKey, nonOvershadowedEternityTombstones.size());
-      final int unusedCount = deleteHandler.markSegmentsAsUnused(nonOvershadowedEternityTombstones);
+      final int unusedCount = deleteHandler.markSegmentsAsUnused(datasource, nonOvershadowedEternityTombstones);
       log.info(
           "Successfully marked [%d] non-overshadowed eternity tombstones[%s] of datasource[%s] as unused.",
           unusedCount,
@@ -127,7 +127,7 @@ public DruidCoordinatorRuntimeParams run(final DruidCoordinatorRuntimeParams par
    * </p>
    *
    * @param dataSourcesSnapshot the datasources snapshot for segments timeline
-   * @return the set of non-overshadowed eternity tombstones grouped by datasource
+   * @return Map from datasource to set of non-overshadowed eternity tombstones
    */
   private Map<String, Set<SegmentId>> determineNonOvershadowedEternityTombstones(final DataSourcesSnapshot dataSourcesSnapshot)
   {
diff --git a/server/src/main/java/org/apache/druid/server/coordinator/duty/MarkOvershadowedSegmentsAsUnused.java b/server/src/main/java/org/apache/druid/server/coordinator/duty/MarkOvershadowedSegmentsAsUnused.java
index 9574df1b720b..596f9df7017f 100644
--- a/server/src/main/java/org/apache/druid/server/coordinator/duty/MarkOvershadowedSegmentsAsUnused.java
+++ b/server/src/main/java/org/apache/druid/server/coordinator/duty/MarkOvershadowedSegmentsAsUnused.java
@@ -119,7 +119,7 @@ public DruidCoordinatorRuntimeParams run(DruidCoordinatorRuntimeParams params)
           stats.add(Stats.Segments.OVERSHADOWED, datasourceKey, unusedSegments.size());
 
           final Stopwatch updateTime = Stopwatch.createStarted();
-          int updatedCount = deleteHandler.markSegmentsAsUnused(unusedSegments);
+          int updatedCount = deleteHandler.markSegmentsAsUnused(datasource, unusedSegments);
           log.info(
               "Marked [%d] segments of datasource[%s] as unused in [%,d]ms.",
               updatedCount, datasource, updateTime.millisElapsed()
diff --git a/server/src/main/java/org/apache/druid/server/coordinator/duty/MetadataAction.java b/server/src/main/java/org/apache/druid/server/coordinator/duty/MetadataAction.java
index f890298cb880..dd6e886a4bbd 100644
--- a/server/src/main/java/org/apache/druid/server/coordinator/duty/MetadataAction.java
+++ b/server/src/main/java/org/apache/druid/server/coordinator/duty/MetadataAction.java
@@ -34,7 +34,7 @@ public final class MetadataAction
   @FunctionalInterface
   public interface DeleteSegments
   {
-    int markSegmentsAsUnused(Set<SegmentId> segmentIds);
+    int markSegmentsAsUnused(String datasource, Set<SegmentId> segmentIds);
   }
 
   @FunctionalInterface
diff --git a/server/src/main/java/org/apache/druid/server/coordinator/duty/RunRules.java b/server/src/main/java/org/apache/druid/server/coordinator/duty/RunRules.java
index c2f8751f19ea..f51ea95673c2 100644
--- a/server/src/main/java/org/apache/druid/server/coordinator/duty/RunRules.java
+++ b/server/src/main/java/org/apache/druid/server/coordinator/duty/RunRules.java
@@ -125,7 +125,7 @@ private void processSegmentDeletes(
   {
     segmentAssigner.getSegmentsToDelete().forEach((datasource, segmentIds) -> {
       final Stopwatch stopwatch = Stopwatch.createStarted();
-      int numUpdatedSegments = deleteHandler.markSegmentsAsUnused(segmentIds);
+      int numUpdatedSegments = deleteHandler.markSegmentsAsUnused(datasource, segmentIds);
 
       RowKey rowKey = RowKey.of(Dimension.DATASOURCE, datasource);
       runStats.add(Stats.Segments.DELETED, rowKey, numUpdatedSegments);
diff --git a/server/src/main/java/org/apache/druid/server/http/DataSourcesResource.java b/server/src/main/java/org/apache/druid/server/http/DataSourcesResource.java
index 21bf0baa5bde..65d9b3025cd0 100644
--- a/server/src/main/java/org/apache/druid/server/http/DataSourcesResource.java
+++ b/server/src/main/java/org/apache/druid/server/http/DataSourcesResource.java
@@ -19,13 +19,11 @@
 
 package org.apache.druid.server.http;
 
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Optional;
 import com.google.common.base.Throwables;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Iterables;
+import com.google.common.util.concurrent.ListenableFuture;
 import com.google.inject.Inject;
 import com.sun.jersey.spi.container.ResourceFilters;
 import it.unimi.dsi.fastutil.objects.Object2LongMap;
@@ -53,7 +51,9 @@
 import org.apache.druid.metadata.SegmentsMetadataManager;
 import org.apache.druid.query.SegmentDescriptor;
 import org.apache.druid.query.TableDataSource;
+import org.apache.druid.rpc.HttpResponseException;
 import org.apache.druid.rpc.indexing.OverlordClient;
+import org.apache.druid.rpc.indexing.SegmentUpdateResponse;
 import org.apache.druid.server.coordination.DruidServerMetadata;
 import org.apache.druid.server.coordinator.DruidCoordinator;
 import org.apache.druid.server.coordinator.rules.LoadRule;
@@ -67,7 +67,7 @@
 import org.apache.druid.timeline.TimelineObjectHolder;
 import org.apache.druid.timeline.VersionedIntervalTimeline;
 import org.apache.druid.timeline.partition.PartitionChunk;
-import org.apache.druid.utils.CollectionUtils;
+import org.jboss.netty.handler.codec.http.HttpResponseStatus;
 import org.joda.time.DateTime;
 import org.joda.time.Interval;
 
@@ -122,7 +122,7 @@ public DataSourcesResource(
       CoordinatorServerView serverInventoryView,
       SegmentsMetadataManager segmentsMetadataManager,
       MetadataRuleManager metadataRuleManager,
-      @Nullable OverlordClient overlordClient,
+      OverlordClient overlordClient,
       AuthorizerMapper authorizerMapper,
       DruidCoordinator coordinator,
       AuditManager auditManager
@@ -189,17 +189,33 @@ private interface SegmentUpdateOperation
     int perform();
   }
 
+  private interface RemoteSegmentUpdateOperation
+  {
+    ListenableFuture<SegmentUpdateResponse> perform();
+  }
+
+  /**
+   * @deprecated Use {@code OverlordDataSourcesResource#markAllNonOvershadowedSegmentsAsUsed} instead.
+   */
+  @Deprecated
   @POST
   @Path("/{dataSourceName}")
   @Consumes(MediaType.APPLICATION_JSON)
   @ResourceFilters(DatasourceResourceFilter.class)
   public Response markAsUsedAllNonOvershadowedSegments(@PathParam("dataSourceName") final String dataSourceName)
   {
-    SegmentUpdateOperation operation = () -> segmentsMetadataManager
+    SegmentUpdateOperation metadataOperation = () -> segmentsMetadataManager
         .markAsUsedAllNonOvershadowedSegmentsInDataSource(dataSourceName);
-    return performSegmentUpdate(dataSourceName, operation);
+    RemoteSegmentUpdateOperation remoteOperation = () -> overlordClient
+        .markNonOvershadowedSegmentsAsUsed(dataSourceName);
+    return updateSegmentsViaOverlord(dataSourceName, remoteOperation)
+        .orUpdateMetadataIf404(metadataOperation);
   }
 
+  /**
+   * @deprecated Use {@code OverlordDataSourcesResource#markNonOvershadowedSegmentsAsUsed} instead.
+   */
+  @Deprecated
   @POST
   @Path("/{dataSourceName}/markUsed")
   @Produces(MediaType.APPLICATION_JSON)
@@ -215,7 +231,7 @@ public Response markAsUsedNonOvershadowedSegments(
           .entity(SegmentsToUpdateFilter.INVALID_PAYLOAD_ERROR_MESSAGE)
           .build();
     } else {
-      SegmentUpdateOperation operation = () -> {
+      SegmentUpdateOperation metadataOperation = () -> {
         final Interval interval = payload.getInterval();
         final List<String> versions = payload.getVersions();
         if (interval != null) {
@@ -241,10 +257,17 @@ public Response markAsUsedNonOvershadowedSegments(
         }
       };
 
-      return performSegmentUpdate(dataSourceName, operation);
+      RemoteSegmentUpdateOperation remoteOperation
+          = () -> overlordClient.markNonOvershadowedSegmentsAsUsed(dataSourceName, payload);
+      return updateSegmentsViaOverlord(dataSourceName, remoteOperation)
+          .orUpdateMetadataIf404(metadataOperation);
     }
   }
 
+  /**
+   * @deprecated Use {@code OverlordDataSourcesResource#markSegmentsAsUnused} instead.
+   */
+  @Deprecated
   @POST
   @Path("/{dataSourceName}/markUnused")
   @ResourceFilters(DatasourceResourceFilter.class)
@@ -262,7 +285,7 @@ public Response markSegmentsAsUnused(
           .entity(SegmentsToUpdateFilter.INVALID_PAYLOAD_ERROR_MESSAGE)
           .build();
     } else {
-      SegmentUpdateOperation operation = () -> {
+      SegmentUpdateOperation metadataOperation = () -> {
         final Interval interval = payload.getInterval();
         final List<String> versions = payload.getVersions();
         final int numUpdatedSegments;
@@ -294,7 +317,11 @@ public Response markSegmentsAsUnused(
         );
         return numUpdatedSegments;
       };
-      return performSegmentUpdate(dataSourceName, operation);
+
+      RemoteSegmentUpdateOperation remoteOperation
+          = () -> overlordClient.markSegmentsAsUnused(dataSourceName, payload);
+      return updateSegmentsViaOverlord(dataSourceName, remoteOperation)
+          .orUpdateMetadataIf404(metadataOperation);
     }
   }
 
@@ -308,7 +335,7 @@ private static Response performSegmentUpdate(String dataSourceName, SegmentUpdat
   {
     try {
       int numChangedSegments = operation.perform();
-      return Response.ok(ImmutableMap.of("numChangedSegments", numChangedSegments)).build();
+      return Response.ok(new SegmentUpdateResponse(numChangedSegments)).build();
     }
     catch (DruidException e) {
       return ServletResourceUtils.buildErrorResponseFrom(e);
@@ -317,17 +344,64 @@ private static Response performSegmentUpdate(String dataSourceName, SegmentUpdat
       log.error(e, "Error occurred while updating segments for datasource[%s]", dataSourceName);
       return Response
           .serverError()
-          .entity(ImmutableMap.of("error", "Exception occurred.", "message", Throwables.getRootCause(e).toString()))
+          .entity(ImmutableMap.of("error", "Server error", "message", Throwables.getRootCause(e).toString()))
           .build();
     }
   }
 
+  private static RemoteOrMetadataUpdate updateSegmentsViaOverlord(
+      String dataSourceName,
+      RemoteSegmentUpdateOperation operation
+  )
+  {
+    return new RemoteOrMetadataUpdate(dataSourceName, operation);
+  }
+
+  private static class RemoteOrMetadataUpdate
+  {
+    private final String dataSourceName;
+    private final RemoteSegmentUpdateOperation remoteOperation;
+
+    private RemoteOrMetadataUpdate(
+        String dataSourceName,
+        RemoteSegmentUpdateOperation remoteOperation
+    )
+    {
+      this.dataSourceName = dataSourceName;
+      this.remoteOperation = remoteOperation;
+    }
+
+    Response orUpdateMetadataIf404(SegmentUpdateOperation operation)
+    {
+      try {
+        SegmentUpdateResponse response = FutureUtils.getUnchecked(remoteOperation.perform(), true);
+        return Response.ok(response).build();
+      }
+      catch (DruidException e) {
+        return ServletResourceUtils.buildErrorResponseFrom(e);
+      }
+      catch (Exception e) {
+        final Throwable rootCause = Throwables.getRootCause(e);
+        if (rootCause instanceof HttpResponseException) {
+          HttpResponseStatus status = ((HttpResponseException) rootCause).getResponse().getStatus();
+          if (status.getCode() == 404) {
+            log.info("Could not update segments via Overlord API. Updating metadata store directly.");
+            return performSegmentUpdate(dataSourceName, operation);
+          }
+        }
+
+        log.error(e, "Error occurred while updating segments for datasource[%s]", dataSourceName);
+        return Response
+            .serverError()
+            .entity(ImmutableMap.of("error", "Unknown server error", "message", rootCause.toString()))
+            .build();
+      }
+    }
+  }
+
   /**
-   * When this method is removed, a new method needs to be introduced corresponding to
-   * the end point "DELETE /druid/coordinator/v1/datasources/{dataSourceName}" (with no query parameters).
-   * Ultimately we want to have no method with kill parameter -
-   * DELETE `{dataSourceName}` to mark all segments belonging to a data source as unused, and
-   * DELETE `{dataSourceName}/intervals/{interval}` to kill unused segments within an interval
+   * @deprecated Use {@code OverlordDataSourcesResource#markAllSegmentsAsUnused}
+   * or {@link #killUnusedSegmentsInInterval} instead.
    */
   @DELETE
   @Deprecated
@@ -341,31 +415,29 @@ public Response markAsUnusedAllSegmentsOrKillUnusedSegmentsInInterval(
       @Context HttpServletRequest req
   )
   {
-    if (overlordClient == null) {
-      return Response.ok(ImmutableMap.of("error", "no indexing service found")).build();
-    }
-
-    boolean killSegments = kill != null && Boolean.valueOf(kill);
-    if (killSegments) {
+    if (Boolean.parseBoolean(kill)) {
       return killUnusedSegmentsInInterval(dataSourceName, interval, req);
     } else {
-      SegmentUpdateOperation operation = () -> segmentsMetadataManager.markAsUnusedAllSegmentsInDataSource(dataSourceName);
-      final Response response = performSegmentUpdate(dataSourceName, operation);
-
-      final int responseCode = response.getStatus();
-      if (responseCode >= 200 && responseCode < 300) {
-        auditManager.doAudit(
-            AuditEntry.builder()
-                      .key(dataSourceName)
-                      .type("segment.markUnused")
-                      .payload(response.getEntity())
-                      .auditInfo(AuthorizationUtils.buildAuditInfo(req))
-                      .request(AuthorizationUtils.buildRequestInfo("coordinator", req))
-                      .build()
-        );
-      }
+      SegmentUpdateOperation metadataOperation = () -> {
+        int numUpdatedSegments = segmentsMetadataManager.markAsUnusedAllSegmentsInDataSource(dataSourceName);
+        if (numUpdatedSegments > 0) {
+          auditManager.doAudit(
+              AuditEntry.builder()
+                        .key(dataSourceName)
+                        .type("segment.markUnused")
+                        .payload(new SegmentUpdateResponse(numUpdatedSegments))
+                        .auditInfo(AuthorizationUtils.buildAuditInfo(req))
+                        .request(AuthorizationUtils.buildRequestInfo("coordinator", req))
+                        .build()
+          );
+        }
+        return numUpdatedSegments;
+      };
 
-      return response;
+      RemoteSegmentUpdateOperation remoteOperation
+          = () -> overlordClient.markSegmentsAsUnused(dataSourceName);
+      return updateSegmentsViaOverlord(dataSourceName, remoteOperation)
+          .orUpdateMetadataIf404(metadataOperation);
     }
   }
 
@@ -379,9 +451,6 @@ public Response killUnusedSegmentsInInterval(
       @Context final HttpServletRequest req
   )
   {
-    if (overlordClient == null) {
-      return Response.ok(ImmutableMap.of("error", "no indexing service found")).build();
-    }
     if (StringUtils.contains(interval, '_')) {
       log.warn("Use interval with '/', not '_': [%s] given", interval);
     }
@@ -696,6 +765,10 @@ public Response getServedSegment(
     return Response.noContent().build();
   }
 
+  /**
+   * @deprecated Use {@code OverlordDataSourcesResource#markSegmentAsUnused} instead.
+   */
+  @Deprecated
   @DELETE
   @Path("/{dataSourceName}/segments/{segmentId}")
   @ResourceFilters(DatasourceResourceFilter.class)
@@ -705,21 +778,54 @@ public Response markSegmentAsUnused(
   )
   {
     final SegmentId segmentId = SegmentId.tryParse(dataSourceName, segmentIdString);
-    final boolean segmentStateChanged = segmentId != null && segmentsMetadataManager.markSegmentAsUnused(segmentId);
-    return Response.ok(ImmutableMap.of("segmentStateChanged", segmentStateChanged)).build();
+    if (segmentId == null) {
+      return Response.status(Response.Status.BAD_REQUEST).entity(
+          org.apache.druid.java.util.common.StringUtils.format(
+              "Could not parse Segment ID[%s] for DataSource[%s]",
+              segmentIdString, dataSourceName
+          )
+      ).build();
+    }
+
+    SegmentUpdateOperation metadataOperation
+        = () -> segmentsMetadataManager.markSegmentAsUnused(segmentId) ? 1 : 0;
+    RemoteSegmentUpdateOperation remoteOperation
+        = () -> overlordClient.markSegmentAsUnused(segmentId);
+
+    return updateSegmentsViaOverlord(dataSourceName, remoteOperation)
+        .orUpdateMetadataIf404(metadataOperation);
   }
 
+  /**
+   * @deprecated Use {@code OverlordDataSourcesResource#markSegmentAsUsed} instead.
+   */
+  @Deprecated
   @POST
   @Path("/{dataSourceName}/segments/{segmentId}")
   @Consumes(MediaType.APPLICATION_JSON)
   @ResourceFilters(DatasourceResourceFilter.class)
   public Response markSegmentAsUsed(
       @PathParam("dataSourceName") String dataSourceName,
-      @PathParam("segmentId") String segmentId
+      @PathParam("segmentId") String segmentIdString
   )
   {
-    boolean segmentStateChanged = segmentsMetadataManager.markSegmentAsUsed(segmentId);
-    return Response.ok().entity(ImmutableMap.of("segmentStateChanged", segmentStateChanged)).build();
+    final SegmentId segmentId = SegmentId.tryParse(dataSourceName, segmentIdString);
+    if (segmentId == null) {
+      return Response.status(Response.Status.BAD_REQUEST).entity(
+          org.apache.druid.java.util.common.StringUtils.format(
+              "Could not parse Segment ID[%s] for DataSource[%s]",
+              segmentIdString, dataSourceName
+          )
+      ).build();
+    }
+
+    SegmentUpdateOperation metadataOperation
+        = () -> segmentsMetadataManager.markSegmentAsUsed(segmentIdString) ? 1 : 0;
+    RemoteSegmentUpdateOperation remoteOperation
+        = () -> overlordClient.markSegmentAsUsed(segmentId);
+
+    return updateSegmentsViaOverlord(dataSourceName, remoteOperation)
+        .orUpdateMetadataIf404(metadataOperation);
   }
 
   @GET
@@ -986,61 +1092,4 @@ static boolean isSegmentLoaded(Iterable<ImmutableSegmentLoadInfo> servedSegments
     return false;
   }
 
-  /**
-   * Either {@code interval} or {@code segmentIds} array must be specified, but not both.
-   * {@code versions} may be optionally specified only when {@code interval} is provided.
-   */
-  @VisibleForTesting
-  static class SegmentsToUpdateFilter
-  {
-    private final Interval interval;
-    private final Set<String> segmentIds;
-    private final List<String> versions;
-
-    private static final String INVALID_PAYLOAD_ERROR_MESSAGE = "Invalid request payload. Specify either 'interval' or 'segmentIds', but not both."
-                                                                + " Optionally, include 'versions' only when 'interval' is provided.";
-
-    @JsonCreator
-    public SegmentsToUpdateFilter(
-        @JsonProperty("interval") @Nullable Interval interval,
-        @JsonProperty("segmentIds") @Nullable Set<String> segmentIds,
-        @JsonProperty("versions") @Nullable List<String> versions
-    )
-    {
-      this.interval = interval;
-      this.segmentIds = segmentIds;
-      this.versions = versions;
-    }
-
-    @Nullable
-    @JsonProperty
-    public Interval getInterval()
-    {
-      return interval;
-    }
-
-    @Nullable
-    @JsonProperty
-    public Set<String> getSegmentIds()
-    {
-      return segmentIds;
-    }
-
-    @Nullable
-    @JsonProperty
-    public List<String> getVersions()
-    {
-      return versions;
-    }
-
-    private boolean isValid()
-    {
-      final boolean hasSegmentIds = !CollectionUtils.isNullOrEmpty(segmentIds);
-      if (interval == null) {
-        return hasSegmentIds && CollectionUtils.isNullOrEmpty(versions);
-      } else {
-        return !hasSegmentIds;
-      }
-    }
-  }
 }
diff --git a/server/src/main/java/org/apache/druid/server/http/SegmentsToUpdateFilter.java b/server/src/main/java/org/apache/druid/server/http/SegmentsToUpdateFilter.java
new file mode 100644
index 000000000000..9c8f17946182
--- /dev/null
+++ b/server/src/main/java/org/apache/druid/server/http/SegmentsToUpdateFilter.java
@@ -0,0 +1,90 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.druid.server.http;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import org.apache.druid.utils.CollectionUtils;
+import org.joda.time.Interval;
+
+import javax.annotation.Nullable;
+import java.util.List;
+import java.util.Set;
+
+/**
+ * Filter to identify segments that need to be updated via REST APIs.
+ */
+public class SegmentsToUpdateFilter
+{
+  private final Interval interval;
+  private final Set<String> segmentIds;
+  private final List<String> versions;
+
+  public static final String INVALID_PAYLOAD_ERROR_MESSAGE =
+      "Invalid request payload. Specify either 'interval' or 'segmentIds', but not both."
+      + " Optionally, include 'versions' only when 'interval' is provided.";
+
+  @JsonCreator
+  public SegmentsToUpdateFilter(
+      @JsonProperty("interval") @Nullable Interval interval,
+      @JsonProperty("segmentIds") @Nullable Set<String> segmentIds,
+      @JsonProperty("versions") @Nullable List<String> versions
+  )
+  {
+    this.interval = interval;
+    this.segmentIds = segmentIds;
+    this.versions = versions;
+  }
+
+  @Nullable
+  @JsonProperty
+  public Interval getInterval()
+  {
+    return interval;
+  }
+
+  @Nullable
+  @JsonProperty
+  public Set<String> getSegmentIds()
+  {
+    return segmentIds;
+  }
+
+  @Nullable
+  @JsonProperty
+  public List<String> getVersions()
+  {
+    return versions;
+  }
+
+  /**
+   * The filter is valid if either {@code interval} or {@code segmentIds} is specified, but not both.
+   * {@code versions} may be optionally specified only when {@code interval} is provided.
+   */
+  public boolean isValid()
+  {
+    final boolean hasSegmentIds = !CollectionUtils.isNullOrEmpty(segmentIds);
+    if (interval == null) {
+      return hasSegmentIds && CollectionUtils.isNullOrEmpty(versions);
+    } else {
+      return !hasSegmentIds;
+    }
+  }
+}
diff --git a/server/src/test/java/org/apache/druid/rpc/indexing/OverlordClientImplTest.java b/server/src/test/java/org/apache/druid/rpc/indexing/OverlordClientImplTest.java
index 1167d10502d7..7ef15c931176 100644
--- a/server/src/test/java/org/apache/druid/rpc/indexing/OverlordClientImplTest.java
+++ b/server/src/test/java/org/apache/druid/rpc/indexing/OverlordClientImplTest.java
@@ -47,9 +47,12 @@
 import org.apache.druid.rpc.HttpResponseException;
 import org.apache.druid.rpc.MockServiceClient;
 import org.apache.druid.rpc.RequestBuilder;
+import org.apache.druid.segment.TestDataSource;
 import org.apache.druid.server.compaction.CompactionProgressResponse;
 import org.apache.druid.server.compaction.CompactionStatusResponse;
 import org.apache.druid.server.coordinator.AutoCompactionSnapshot;
+import org.apache.druid.server.http.SegmentsToUpdateFilter;
+import org.apache.druid.timeline.DataSegment;
 import org.hamcrest.CoreMatchers;
 import org.hamcrest.MatcherAssert;
 import org.jboss.netty.handler.codec.http.DefaultHttpResponse;
@@ -531,4 +534,216 @@ public void test_getBytesAwaitingCompaction()
         overlordClient.getBytesAwaitingCompaction("ds1").get()
     );
   }
+
+  @Test
+  public void test_markSegmentAsUsed() throws Exception
+  {
+    final DataSegment wikiSegment = DataSegment.builder()
+                                               .dataSource(TestDataSource.WIKI)
+                                               .interval(Intervals.of("2024-12-01/P1D"))
+                                               .version("v1")
+                                               .size(100)
+                                               .build();
+
+    final String url = StringUtils.format(
+        "/druid/indexer/v1/datasources/%s/segments/%s",
+        TestDataSource.WIKI, StringUtils.urlEncode(wikiSegment.getId().toString())
+    );
+    serviceClient.expectAndRespond(
+        new RequestBuilder(HttpMethod.POST, url),
+        HttpResponseStatus.OK,
+        Collections.emptyMap(),
+        DefaultObjectMapper.INSTANCE.writeValueAsBytes(new SegmentUpdateResponse(1))
+    );
+
+    Assert.assertEquals(
+        new SegmentUpdateResponse(1),
+        overlordClient.markSegmentAsUsed(wikiSegment.getId()).get()
+    );
+  }
+
+  @Test
+  public void test_markSegmentAsUnused() throws Exception
+  {
+    final DataSegment wikiSegment = DataSegment.builder()
+                                               .dataSource(TestDataSource.WIKI)
+                                               .interval(Intervals.of("2024-12-01/P1D"))
+                                               .version("v1")
+                                               .size(100)
+                                               .build();
+
+    final String url = StringUtils.format(
+        "/druid/indexer/v1/datasources/%s/segments/%s",
+        TestDataSource.WIKI, StringUtils.urlEncode(wikiSegment.getId().toString())
+    );
+    serviceClient.expectAndRespond(
+        new RequestBuilder(HttpMethod.DELETE, url),
+        HttpResponseStatus.OK,
+        Collections.emptyMap(),
+        DefaultObjectMapper.INSTANCE.writeValueAsBytes(new SegmentUpdateResponse(1))
+    );
+
+    Assert.assertEquals(
+        new SegmentUpdateResponse(1),
+        overlordClient.markSegmentAsUnused(wikiSegment.getId()).get()
+    );
+  }
+
+  @Test
+  public void test_markNonOvershadowedSegmentsAsUsed_bySegmentIds() throws Exception
+  {
+    final DataSegment wikiSegment = DataSegment.builder()
+                                               .dataSource(TestDataSource.WIKI)
+                                               .interval(Intervals.of("2024-12-01/P1D"))
+                                               .version("v1")
+                                               .size(100)
+                                               .build();
+
+    final String url = StringUtils.format(
+        "/druid/indexer/v1/datasources/%s/markUsed",
+        TestDataSource.WIKI
+    );
+
+    final SegmentsToUpdateFilter segmentFilter = new SegmentsToUpdateFilter(
+        null,
+        Collections.singleton(wikiSegment.getId().toString()),
+        null
+    );
+    serviceClient.expectAndRespond(
+        new RequestBuilder(HttpMethod.POST, url)
+            .jsonContent(jsonMapper, segmentFilter),
+        HttpResponseStatus.OK,
+        Collections.emptyMap(),
+        DefaultObjectMapper.INSTANCE.writeValueAsBytes(new SegmentUpdateResponse(1))
+    );
+
+    Assert.assertEquals(
+        new SegmentUpdateResponse(1),
+        overlordClient.markNonOvershadowedSegmentsAsUsed(TestDataSource.WIKI, segmentFilter).get()
+    );
+  }
+
+  @Test
+  public void test_markSegmentsAsUnused_bySegmentIds() throws Exception
+  {
+    final DataSegment wikiSegment = DataSegment.builder()
+                                               .dataSource(TestDataSource.WIKI)
+                                               .interval(Intervals.of("2024-12-01/P1D"))
+                                               .version("v1")
+                                               .size(100)
+                                               .build();
+
+    final String url = StringUtils.format(
+        "/druid/indexer/v1/datasources/%s/markUnused",
+        TestDataSource.WIKI
+    );
+
+    final SegmentsToUpdateFilter segmentFilter = new SegmentsToUpdateFilter(
+        null,
+        Collections.singleton(wikiSegment.getId().toString()),
+        null
+    );
+    serviceClient.expectAndRespond(
+        new RequestBuilder(HttpMethod.POST, url)
+            .jsonContent(jsonMapper, segmentFilter),
+        HttpResponseStatus.OK,
+        Collections.emptyMap(),
+        DefaultObjectMapper.INSTANCE.writeValueAsBytes(new SegmentUpdateResponse(1))
+    );
+
+    Assert.assertEquals(
+        new SegmentUpdateResponse(1),
+        overlordClient.markSegmentsAsUnused(TestDataSource.WIKI, segmentFilter).get()
+    );
+  }
+
+  @Test
+  public void test_markNonOvershadowedSegmentsAsUsed_byInterval() throws Exception
+  {
+    final String url = StringUtils.format(
+        "/druid/indexer/v1/datasources/%s/markUsed",
+        TestDataSource.WIKI
+    );
+
+    final SegmentsToUpdateFilter segmentFilter
+        = new SegmentsToUpdateFilter(Intervals.of("2024/P1Y"), null, null);
+    serviceClient.expectAndRespond(
+        new RequestBuilder(HttpMethod.POST, url)
+            .jsonContent(jsonMapper, segmentFilter),
+        HttpResponseStatus.OK,
+        Collections.emptyMap(),
+        DefaultObjectMapper.INSTANCE.writeValueAsBytes(new SegmentUpdateResponse(3))
+    );
+
+    Assert.assertEquals(
+        new SegmentUpdateResponse(3),
+        overlordClient.markNonOvershadowedSegmentsAsUsed(TestDataSource.WIKI, segmentFilter).get()
+    );
+  }
+
+  @Test
+  public void test_markSegmentsAsUnused_byInterval() throws Exception
+  {
+    final String url = StringUtils.format(
+        "/druid/indexer/v1/datasources/%s/markUnused",
+        TestDataSource.WIKI
+    );
+
+    final SegmentsToUpdateFilter segmentFilter
+        = new SegmentsToUpdateFilter(Intervals.of("2024/P1Y"), null, null);
+    serviceClient.expectAndRespond(
+        new RequestBuilder(HttpMethod.POST, url)
+            .jsonContent(jsonMapper, segmentFilter),
+        HttpResponseStatus.OK,
+        Collections.emptyMap(),
+        DefaultObjectMapper.INSTANCE.writeValueAsBytes(new SegmentUpdateResponse(5))
+    );
+
+    Assert.assertEquals(
+        new SegmentUpdateResponse(5),
+        overlordClient.markSegmentsAsUnused(TestDataSource.WIKI, segmentFilter).get()
+    );
+  }
+
+  @Test
+  public void test_markNonOvershadowedSegmentsAsUsed_byDatasource() throws Exception
+  {
+    final String url = StringUtils.format(
+        "/druid/indexer/v1/datasources/%s",
+        TestDataSource.WIKI
+    );
+
+    serviceClient.expectAndRespond(
+        new RequestBuilder(HttpMethod.POST, url),
+        HttpResponseStatus.OK,
+        Collections.emptyMap(),
+        DefaultObjectMapper.INSTANCE.writeValueAsBytes(new SegmentUpdateResponse(10))
+    );
+
+    Assert.assertEquals(
+        new SegmentUpdateResponse(10),
+        overlordClient.markNonOvershadowedSegmentsAsUsed(TestDataSource.WIKI).get()
+    );
+  }
+
+  @Test
+  public void test_markSegmentsAsUnused_byDatasource() throws Exception
+  {
+    final String url = StringUtils.format(
+        "/druid/indexer/v1/datasources/%s",
+        TestDataSource.WIKI
+    );
+
+    serviceClient.expectAndRespond(
+        new RequestBuilder(HttpMethod.DELETE, url),
+        HttpResponseStatus.OK,
+        Collections.emptyMap(),
+        DefaultObjectMapper.INSTANCE.writeValueAsBytes(new SegmentUpdateResponse(11))
+    );
+
+    Assert.assertEquals(
+        new SegmentUpdateResponse(11),
+        overlordClient.markSegmentsAsUnused(TestDataSource.WIKI).get()
+    );
+  }
 }
diff --git a/server/src/test/java/org/apache/druid/server/compaction/CompactionRunSimulatorTest.java b/server/src/test/java/org/apache/druid/server/compaction/CompactionRunSimulatorTest.java
index 690a4bcfc7cb..2c65a8f147fb 100644
--- a/server/src/test/java/org/apache/druid/server/compaction/CompactionRunSimulatorTest.java
+++ b/server/src/test/java/org/apache/druid/server/compaction/CompactionRunSimulatorTest.java
@@ -22,7 +22,6 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
-import org.apache.druid.client.indexing.NoopOverlordClient;
 import org.apache.druid.client.indexing.TaskPayloadResponse;
 import org.apache.druid.indexer.CompactionEngine;
 import org.apache.druid.indexer.TaskStatus;
@@ -33,6 +32,7 @@
 import org.apache.druid.java.util.common.granularity.Granularities;
 import org.apache.druid.java.util.common.parsers.CloseableIterator;
 import org.apache.druid.metadata.LockFilterPolicy;
+import org.apache.druid.rpc.indexing.NoopOverlordClient;
 import org.apache.druid.server.coordinator.CreateDataSegments;
 import org.apache.druid.server.coordinator.DataSourceCompactionConfig;
 import org.apache.druid.server.coordinator.DruidCompactionConfig;
diff --git a/server/src/test/java/org/apache/druid/server/coordinator/BalanceSegmentsProfiler.java b/server/src/test/java/org/apache/druid/server/coordinator/BalanceSegmentsProfiler.java
index 5cc36f219784..505d27a55cef 100644
--- a/server/src/test/java/org/apache/druid/server/coordinator/BalanceSegmentsProfiler.java
+++ b/server/src/test/java/org/apache/druid/server/coordinator/BalanceSegmentsProfiler.java
@@ -47,7 +47,6 @@
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
-import java.util.Set;
 
 /**
  * TODO convert benchmarks to JMH
@@ -143,7 +142,7 @@ public void bigProfiler()
         .build();
 
     BalanceSegments tester = new BalanceSegments(Duration.standardMinutes(1));
-    RunRules runner = new RunRules(Set::size, manager::getRulesWithDefault);
+    RunRules runner = new RunRules((ds, set) -> set.size(), manager::getRulesWithDefault);
     watch.start();
     DruidCoordinatorRuntimeParams balanceParams = tester.run(params);
     DruidCoordinatorRuntimeParams assignParams = runner.run(params);
diff --git a/server/src/test/java/org/apache/druid/server/coordinator/duty/CompactSegmentsTest.java b/server/src/test/java/org/apache/druid/server/coordinator/duty/CompactSegmentsTest.java
index 882bb87a25a5..c2d5b14aaeaa 100644
--- a/server/src/test/java/org/apache/druid/server/coordinator/duty/CompactSegmentsTest.java
+++ b/server/src/test/java/org/apache/druid/server/coordinator/duty/CompactSegmentsTest.java
@@ -39,7 +39,6 @@
 import org.apache.druid.client.indexing.ClientMSQContext;
 import org.apache.druid.client.indexing.ClientTaskQuery;
 import org.apache.druid.client.indexing.IndexingTotalWorkerCapacityInfo;
-import org.apache.druid.client.indexing.NoopOverlordClient;
 import org.apache.druid.client.indexing.TaskPayloadResponse;
 import org.apache.druid.common.config.NullHandling;
 import org.apache.druid.data.input.impl.DimensionsSpec;
@@ -66,6 +65,7 @@
 import org.apache.druid.query.aggregation.AggregatorFactory;
 import org.apache.druid.query.aggregation.CountAggregatorFactory;
 import org.apache.druid.query.filter.SelectorDimFilter;
+import org.apache.druid.rpc.indexing.NoopOverlordClient;
 import org.apache.druid.rpc.indexing.OverlordClient;
 import org.apache.druid.segment.incremental.OnheapIncrementalIndex;
 import org.apache.druid.segment.indexing.BatchIOConfig;
@@ -105,7 +105,6 @@
 import org.mockito.Mockito;
 
 import javax.annotation.Nullable;
-import java.net.URI;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -2080,12 +2079,6 @@ private TestOverlordClient(ObjectMapper jsonMapper)
       this.jsonMapper = jsonMapper;
     }
 
-    @Override
-    public ListenableFuture<URI> findCurrentLeader()
-    {
-      throw new UnsupportedOperationException();
-    }
-
     @Override
     public ListenableFuture<Void> runTask(String taskId, Object taskObject)
     {
diff --git a/server/src/test/java/org/apache/druid/server/coordinator/duty/KillStalePendingSegmentsTest.java b/server/src/test/java/org/apache/druid/server/coordinator/duty/KillStalePendingSegmentsTest.java
index 4833abac41aa..e916244f36b2 100644
--- a/server/src/test/java/org/apache/druid/server/coordinator/duty/KillStalePendingSegmentsTest.java
+++ b/server/src/test/java/org/apache/druid/server/coordinator/duty/KillStalePendingSegmentsTest.java
@@ -21,7 +21,6 @@
 
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
-import org.apache.druid.client.indexing.NoopOverlordClient;
 import org.apache.druid.indexer.RunnerTaskState;
 import org.apache.druid.indexer.TaskLocation;
 import org.apache.druid.indexer.TaskState;
@@ -30,6 +29,7 @@
 import org.apache.druid.java.util.common.DateTimes;
 import org.apache.druid.java.util.common.Intervals;
 import org.apache.druid.java.util.common.parsers.CloseableIterator;
+import org.apache.druid.rpc.indexing.NoopOverlordClient;
 import org.apache.druid.segment.TestDataSource;
 import org.apache.druid.server.coordinator.CoordinatorDynamicConfig;
 import org.apache.druid.server.coordinator.DruidCoordinatorRuntimeParams;
diff --git a/server/src/test/java/org/apache/druid/server/coordinator/duty/KillUnusedSegmentsTest.java b/server/src/test/java/org/apache/druid/server/coordinator/duty/KillUnusedSegmentsTest.java
index ce65f30ede75..5c18616ab58e 100644
--- a/server/src/test/java/org/apache/druid/server/coordinator/duty/KillUnusedSegmentsTest.java
+++ b/server/src/test/java/org/apache/druid/server/coordinator/duty/KillUnusedSegmentsTest.java
@@ -27,7 +27,6 @@
 import org.apache.druid.client.indexing.IndexingTotalWorkerCapacityInfo;
 import org.apache.druid.client.indexing.IndexingWorker;
 import org.apache.druid.client.indexing.IndexingWorkerInfo;
-import org.apache.druid.client.indexing.NoopOverlordClient;
 import org.apache.druid.indexer.RunnerTaskState;
 import org.apache.druid.indexer.TaskLocation;
 import org.apache.druid.indexer.TaskState;
@@ -42,6 +41,7 @@
 import org.apache.druid.metadata.SqlSegmentsMetadataManager;
 import org.apache.druid.metadata.SqlSegmentsMetadataManagerTestBase;
 import org.apache.druid.metadata.TestDerbyConnector;
+import org.apache.druid.rpc.indexing.NoopOverlordClient;
 import org.apache.druid.segment.TestHelper;
 import org.apache.druid.segment.metadata.CentralizedDatasourceSchemaConfig;
 import org.apache.druid.server.coordinator.CoordinatorDynamicConfig;
diff --git a/server/src/test/java/org/apache/druid/server/coordinator/duty/MarkEternityTombstonesAsUnusedTest.java b/server/src/test/java/org/apache/druid/server/coordinator/duty/MarkEternityTombstonesAsUnusedTest.java
index 76a4bbbedd65..37fbe1447834 100644
--- a/server/src/test/java/org/apache/druid/server/coordinator/duty/MarkEternityTombstonesAsUnusedTest.java
+++ b/server/src/test/java/org/apache/druid/server/coordinator/duty/MarkEternityTombstonesAsUnusedTest.java
@@ -484,7 +484,9 @@ private void runEternityTombstonesDutyAndVerify(
       final ImmutableList<DataSegment> expectedUsedSegments
   )
   {
-    params = new MarkEternityTombstonesAsUnused(segmentsMetadataManager::markSegmentsAsUnused).run(params);
+    params = new MarkEternityTombstonesAsUnused(
+        (ds, segmentIds) -> segmentsMetadataManager.markSegmentsAsUnused(segmentIds)
+    ).run(params);
 
     final Set<DataSegment> actualUsedSegments = Sets.newHashSet(segmentsMetadataManager.iterateAllUsedSegments());
 
diff --git a/server/src/test/java/org/apache/druid/server/coordinator/duty/MarkOvershadowedSegmentsAsUnusedTest.java b/server/src/test/java/org/apache/druid/server/coordinator/duty/MarkOvershadowedSegmentsAsUnusedTest.java
index 43cad2391f25..a06f1d3c7322 100644
--- a/server/src/test/java/org/apache/druid/server/coordinator/duty/MarkOvershadowedSegmentsAsUnusedTest.java
+++ b/server/src/test/java/org/apache/druid/server/coordinator/duty/MarkOvershadowedSegmentsAsUnusedTest.java
@@ -111,7 +111,9 @@ public void testRun(String serverType)
     Assert.assertTrue(timeline.isOvershadowed(segmentV1));
 
     // Run the duty and verify that the overshadowed segments are marked unused
-    params = new MarkOvershadowedSegmentsAsUnused(segmentsMetadataManager::markSegmentsAsUnused).run(params);
+    params = new MarkOvershadowedSegmentsAsUnused(
+        (ds, segmentIds) -> segmentsMetadataManager.markSegmentsAsUnused(segmentIds)
+    ).run(params);
 
     Set<DataSegment> updatedUsedSegments = Sets.newHashSet(segmentsMetadataManager.iterateAllUsedSegments());
     Assert.assertEquals(1, updatedUsedSegments.size());
diff --git a/server/src/test/java/org/apache/druid/server/coordinator/duty/RunRulesTest.java b/server/src/test/java/org/apache/druid/server/coordinator/duty/RunRulesTest.java
index 774c0699b07b..f7e9ececc1ac 100644
--- a/server/src/test/java/org/apache/druid/server/coordinator/duty/RunRulesTest.java
+++ b/server/src/test/java/org/apache/druid/server/coordinator/duty/RunRulesTest.java
@@ -99,7 +99,7 @@ public void setUp()
     emitter = new StubServiceEmitter("coordinator", "host");
     EmittingLogger.registerEmitter(emitter);
     databaseRuleManager = EasyMock.createMock(MetadataRuleManager.class);
-    ruleRunner = new RunRules(Set::size, databaseRuleManager::getRulesWithDefault);
+    ruleRunner = new RunRules((ds, set) -> set.size(), databaseRuleManager::getRulesWithDefault);
     loadQueueManager = new SegmentLoadQueueManager(null, null);
     balancerExecutor = MoreExecutors.listeningDecorator(Execs.multiThreaded(1, "RunRulesTest-%d"));
   }
diff --git a/server/src/test/java/org/apache/druid/server/coordinator/simulate/CoordinatorSimulationBuilder.java b/server/src/test/java/org/apache/druid/server/coordinator/simulate/CoordinatorSimulationBuilder.java
index f82b89c68593..ddc360aa0124 100644
--- a/server/src/test/java/org/apache/druid/server/coordinator/simulate/CoordinatorSimulationBuilder.java
+++ b/server/src/test/java/org/apache/druid/server/coordinator/simulate/CoordinatorSimulationBuilder.java
@@ -22,6 +22,8 @@
 import com.fasterxml.jackson.databind.InjectableValues;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.base.Preconditions;
+import com.google.common.util.concurrent.Futures;
+import com.google.common.util.concurrent.ListenableFuture;
 import org.apache.druid.audit.AuditInfo;
 import org.apache.druid.client.DruidServer;
 import org.apache.druid.common.config.JacksonConfigManager;
@@ -36,6 +38,9 @@
 import org.apache.druid.java.util.http.client.HttpClient;
 import org.apache.druid.java.util.metrics.MetricsVerifier;
 import org.apache.druid.java.util.metrics.StubServiceEmitter;
+import org.apache.druid.metadata.SegmentsMetadataManager;
+import org.apache.druid.rpc.indexing.NoopOverlordClient;
+import org.apache.druid.rpc.indexing.SegmentUpdateResponse;
 import org.apache.druid.segment.metadata.CentralizedDatasourceSchemaConfig;
 import org.apache.druid.server.compaction.CompactionStatusTracker;
 import org.apache.druid.server.coordinator.CoordinatorConfigManager;
@@ -58,8 +63,10 @@
 import org.apache.druid.server.coordinator.loading.LoadQueueTaskMaster;
 import org.apache.druid.server.coordinator.loading.SegmentLoadQueueManager;
 import org.apache.druid.server.coordinator.rules.Rule;
+import org.apache.druid.server.http.SegmentsToUpdateFilter;
 import org.apache.druid.server.lookup.cache.LookupCoordinatorManager;
 import org.apache.druid.timeline.DataSegment;
+import org.apache.druid.timeline.SegmentId;
 import org.easymock.EasyMock;
 import org.joda.time.Duration;
 
@@ -67,8 +74,10 @@
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.atomic.AtomicBoolean;
@@ -201,7 +210,7 @@ public CoordinatorSimulation build()
         env.coordinatorInventoryView,
         env.serviceEmitter,
         env.executorFactory,
-        null,
+        new SimOverlordClient(env.metadataManager.segments()),
         env.loadQueueTaskMaster,
         env.loadQueueManager,
         new ServiceAnnouncer.Noop(),
@@ -610,4 +619,33 @@ private void tearDown()
     }
   }
 
+  private static class SimOverlordClient extends NoopOverlordClient
+  {
+    private final SegmentsMetadataManager segmentsMetadataManager;
+
+    private SimOverlordClient(SegmentsMetadataManager segmentsMetadataManager)
+    {
+      this.segmentsMetadataManager = segmentsMetadataManager;
+    }
+
+    @Override
+    public ListenableFuture<SegmentUpdateResponse> markSegmentsAsUnused(
+        String dataSource,
+        SegmentsToUpdateFilter filter
+    )
+    {
+      final Set<SegmentId> segmentsToUpdate = new HashSet<>();
+      if (filter.getSegmentIds() != null) {
+        for (String idString : filter.getSegmentIds()) {
+          SegmentId segmentId = SegmentId.tryParse(dataSource, idString);
+          if (segmentId != null) {
+            segmentsToUpdate.add(segmentId);
+          }
+        }
+      }
+      int numUpdatedSegments = segmentsMetadataManager.markSegmentsAsUnused(segmentsToUpdate);
+      return Futures.immediateFuture(new SegmentUpdateResponse(numUpdatedSegments));
+    }
+  }
+
 }
diff --git a/server/src/test/java/org/apache/druid/server/coordinator/simulate/TestSegmentsMetadataManager.java b/server/src/test/java/org/apache/druid/server/coordinator/simulate/TestSegmentsMetadataManager.java
index ad8294786e6d..7b32560f9338 100644
--- a/server/src/test/java/org/apache/druid/server/coordinator/simulate/TestSegmentsMetadataManager.java
+++ b/server/src/test/java/org/apache/druid/server/coordinator/simulate/TestSegmentsMetadataManager.java
@@ -20,6 +20,7 @@
 package org.apache.druid.server.coordinator.simulate;
 
 import com.google.common.base.Optional;
+import com.google.common.base.Predicates;
 import org.apache.druid.client.DataSourcesSnapshot;
 import org.apache.druid.client.ImmutableDruidDataSource;
 import org.apache.druid.metadata.SegmentsMetadataManager;
@@ -28,16 +29,21 @@
 import org.apache.druid.timeline.DataSegment;
 import org.apache.druid.timeline.Partitions;
 import org.apache.druid.timeline.SegmentId;
+import org.apache.druid.timeline.SegmentTimeline;
 import org.apache.druid.timeline.VersionedIntervalTimeline;
 import org.joda.time.DateTime;
 import org.joda.time.Interval;
 
 import javax.annotation.Nullable;
 import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
+import java.util.function.Predicate;
 import java.util.stream.Collectors;
 
 public class TestSegmentsMetadataManager implements SegmentsMetadataManager
@@ -52,14 +58,14 @@ public void addSegment(DataSegment segment)
   {
     allSegments.put(segment.getId().toString(), segment);
     usedSegments.put(segment.getId().toString(), segment);
-    snapshot = null;
+    invalidateDatasourcesSnapshot();
   }
 
   public void removeSegment(DataSegment segment)
   {
     allSegments.remove(segment.getId().toString());
     usedSegments.remove(segment.getId().toString());
-    snapshot = null;
+    invalidateDatasourcesSnapshot();
   }
 
   @Override
@@ -83,25 +89,31 @@ public boolean isPollingDatabasePeriodically()
   @Override
   public int markAsUsedAllNonOvershadowedSegmentsInDataSource(String dataSource)
   {
-    return 0;
+    return markNonOvershadowedSegmentsAsUsed(dataSource, Predicates.alwaysTrue());
   }
 
   @Override
   public int markAsUsedNonOvershadowedSegmentsInInterval(String dataSource, Interval interval, @Nullable List<String> versions)
   {
-    return 0;
+    final Set<String> allowedVersions = versions == null ? null : new HashSet<>(versions);
+    return markNonOvershadowedSegmentsAsUsed(
+        dataSource,
+        segment -> segment.getInterval().overlaps(interval)
+                   && (versions == null || allowedVersions.contains(segment.getVersion()))
+    );
   }
 
   @Override
   public int markAsUsedNonOvershadowedSegments(String dataSource, Set<String> segmentIds)
   {
-    return 0;
+    return markNonOvershadowedSegmentsAsUsed(dataSource, segment -> segmentIds.contains(segment.getId().toString()));
   }
 
   @Override
   public boolean markSegmentAsUsed(String segmentId)
   {
-    if (!allSegments.containsKey(segmentId)) {
+    if (!allSegments.containsKey(segmentId)
+        || usedSegments.containsKey(segmentId)) {
       return false;
     }
 
@@ -112,31 +124,26 @@ public boolean markSegmentAsUsed(String segmentId)
   @Override
   public int markAsUnusedAllSegmentsInDataSource(String dataSource)
   {
-    return 0;
+    return markSegmentsAsUnused(segment -> segment.getDataSource().equals(dataSource));
   }
 
   @Override
   public int markAsUnusedSegmentsInInterval(String dataSource, Interval interval, @Nullable List<String> versions)
   {
-    return 0;
+    final Set<String> eligibleVersions = versions == null ? null : new HashSet<>(versions);
+    return markSegmentsAsUnused(
+        segment -> segment.getDataSource().equals(dataSource)
+                   && segment.getInterval().overlaps(interval)
+                   && (eligibleVersions == null || eligibleVersions.contains(segment.getVersion()))
+    );
   }
 
   @Override
   public int markSegmentsAsUnused(Set<SegmentId> segmentIds)
   {
-    int numModifiedSegments = 0;
-
-    for (SegmentId segmentId : segmentIds) {
-      if (allSegments.containsKey(segmentId.toString())) {
-        usedSegments.remove(segmentId.toString());
-        ++numModifiedSegments;
-      }
-    }
-
-    if (numModifiedSegments > 0) {
-      snapshot = null;
-    }
-    return numModifiedSegments;
+    return markSegmentsAsUnused(
+        segment -> segmentIds.contains(segment.getId())
+    );
   }
 
   @Override
@@ -144,7 +151,7 @@ public boolean markSegmentAsUnused(SegmentId segmentId)
   {
     boolean updated = usedSegments.remove(segmentId.toString()) != null;
     if (updated) {
-      snapshot = null;
+      invalidateDatasourcesSnapshot();
     }
 
     return updated;
@@ -236,4 +243,55 @@ public void populateUsedFlagLastUpdatedAsync()
   public void stopAsyncUsedFlagLastUpdatedUpdate()
   {
   }
+
+  private int markNonOvershadowedSegmentsAsUsed(String dataSource, Predicate<DataSegment> isSegmentEligible)
+  {
+    // Build a timeline of all datasource segments
+    final Set<DataSegment> datasourceSegments = allSegments.values().stream().filter(
+        segment -> segment.getDataSource().equals(dataSource)
+    ).collect(Collectors.toSet());
+    final SegmentTimeline timeline = SegmentTimeline.forSegments(datasourceSegments);
+
+    // Find all unused segments which are not overshadowed
+    final Map<String, DataSegment> segmentsToUpdate = new HashMap<>();
+    datasourceSegments.forEach(segment -> {
+      final String segmentId = segment.getId().toString();
+      if (isSegmentEligible.test(segment)
+          && !usedSegments.containsKey(segmentId)
+          && !timeline.isOvershadowed(segment)) {
+        segmentsToUpdate.put(segmentId, segment);
+      }
+    });
+
+    if (segmentsToUpdate.isEmpty()) {
+      return 0;
+    } else {
+      usedSegments.putAll(segmentsToUpdate);
+      invalidateDatasourcesSnapshot();
+      return segmentsToUpdate.size();
+    }
+  }
+
+  private int markSegmentsAsUnused(Predicate<DataSegment> isSegmentEligible)
+  {
+    final Set<String> segmentIdsToMarkUnused
+        = usedSegments.values()
+                      .stream()
+                      .filter(isSegmentEligible::test)
+                      .map(segment -> segment.getId().toString())
+                      .collect(Collectors.toSet());
+
+    if (segmentIdsToMarkUnused.isEmpty()) {
+      return 0;
+    } else {
+      segmentIdsToMarkUnused.forEach(usedSegments::remove);
+      invalidateDatasourcesSnapshot();
+      return segmentIdsToMarkUnused.size();
+    }
+  }
+
+  private void invalidateDatasourcesSnapshot()
+  {
+    snapshot = null;
+  }
 }
diff --git a/server/src/test/java/org/apache/druid/server/http/CoordinatorCompactionResourceTest.java b/server/src/test/java/org/apache/druid/server/http/CoordinatorCompactionResourceTest.java
index 91b348b72f40..002fba124540 100644
--- a/server/src/test/java/org/apache/druid/server/http/CoordinatorCompactionResourceTest.java
+++ b/server/src/test/java/org/apache/druid/server/http/CoordinatorCompactionResourceTest.java
@@ -22,9 +22,9 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
-import org.apache.druid.client.indexing.NoopOverlordClient;
 import org.apache.druid.error.DruidExceptionMatcher;
 import org.apache.druid.error.ErrorResponse;
+import org.apache.druid.rpc.indexing.NoopOverlordClient;
 import org.apache.druid.rpc.indexing.OverlordClient;
 import org.apache.druid.server.compaction.CompactionStatistics;
 import org.apache.druid.server.compaction.CompactionStatusResponse;
diff --git a/server/src/test/java/org/apache/druid/server/http/DataSourcesResourceTest.java b/server/src/test/java/org/apache/druid/server/http/DataSourcesResourceTest.java
index 4d7939021491..67a1db8c31b7 100644
--- a/server/src/test/java/org/apache/druid/server/http/DataSourcesResourceTest.java
+++ b/server/src/test/java/org/apache/druid/server/http/DataSourcesResourceTest.java
@@ -30,6 +30,7 @@
 import com.google.common.util.concurrent.Futures;
 import it.unimi.dsi.fastutil.objects.Object2LongMap;
 import it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap;
+import org.apache.curator.shaded.com.google.common.base.Charsets;
 import org.apache.druid.audit.AuditManager;
 import org.apache.druid.client.CoordinatorServerView;
 import org.apache.druid.client.DruidDataSource;
@@ -40,11 +41,15 @@
 import org.apache.druid.error.DruidExceptionMatcher;
 import org.apache.druid.jackson.DefaultObjectMapper;
 import org.apache.druid.java.util.common.Intervals;
+import org.apache.druid.java.util.http.client.response.StringFullResponseHolder;
 import org.apache.druid.metadata.MetadataRuleManager;
 import org.apache.druid.metadata.SegmentsMetadataManager;
 import org.apache.druid.query.SegmentDescriptor;
 import org.apache.druid.query.TableDataSource;
+import org.apache.druid.rpc.HttpResponseException;
 import org.apache.druid.rpc.indexing.OverlordClient;
+import org.apache.druid.rpc.indexing.SegmentUpdateResponse;
+import org.apache.druid.segment.TestDataSource;
 import org.apache.druid.server.coordination.DruidServerMetadata;
 import org.apache.druid.server.coordination.ServerType;
 import org.apache.druid.server.coordinator.DruidCoordinator;
@@ -68,6 +73,9 @@
 import org.apache.druid.timeline.partition.NumberedShardSpec;
 import org.apache.druid.timeline.partition.PartitionHolder;
 import org.easymock.EasyMock;
+import org.jboss.netty.handler.codec.http.DefaultHttpResponse;
+import org.jboss.netty.handler.codec.http.HttpResponseStatus;
+import org.jboss.netty.handler.codec.http.HttpVersion;
 import org.joda.time.Interval;
 import org.junit.Assert;
 import org.junit.Before;
@@ -93,7 +101,10 @@ public class DataSourcesResourceTest
   private List<DataSegment> dataSegmentList;
   private HttpServletRequest request;
   private SegmentsMetadataManager segmentsMetadataManager;
+  private OverlordClient overlordClient;
   private AuditManager auditManager;
+  
+  private DataSourcesResource dataSourcesResource;
 
   @Before
   public void setUp()
@@ -105,7 +116,7 @@ public void setUp()
     dataSegmentList = new ArrayList<>();
     dataSegmentList.add(
         new DataSegment(
-            "datasource1",
+            TestDataSource.WIKI,
             Intervals.of("2010-01-01/P1D"),
             "v0",
             null,
@@ -118,7 +129,7 @@ public void setUp()
     );
     dataSegmentList.add(
         new DataSegment(
-            "datasource1",
+            TestDataSource.WIKI,
             Intervals.of("2010-01-22/P1D"),
             "v0",
             null,
@@ -131,7 +142,7 @@ public void setUp()
     );
     dataSegmentList.add(
         new DataSegment(
-            "datasource2",
+            TestDataSource.KOALA,
             Intervals.of("2010-01-01/P1D"),
             "v0",
             null,
@@ -144,12 +155,23 @@ public void setUp()
     );
     listDataSources = new ArrayList<>();
     listDataSources.add(
-        new DruidDataSource("datasource1", new HashMap<>()).addSegment(dataSegmentList.get(0))
+        new DruidDataSource(TestDataSource.WIKI, new HashMap<>()).addSegment(dataSegmentList.get(0))
     );
     listDataSources.add(
-        new DruidDataSource("datasource2", new HashMap<>()).addSegment(dataSegmentList.get(1))
+        new DruidDataSource(TestDataSource.KOALA, new HashMap<>()).addSegment(dataSegmentList.get(1))
     );
     segmentsMetadataManager = EasyMock.createMock(SegmentsMetadataManager.class);
+    overlordClient = EasyMock.createStrictMock(OverlordClient.class);
+    
+    dataSourcesResource = new DataSourcesResource(
+      inventoryView,
+      segmentsMetadataManager,
+      null,
+      overlordClient,
+      AuthTestUtils.TEST_AUTHORIZER_MAPPER,
+      null,
+      auditManager
+    );
   }
 
   @Test
@@ -186,7 +208,6 @@ public void testGetFullQueryableDataSources()
     EasyMock.expectLastCall().times(1);
 
     EasyMock.replay(inventoryView, server, request);
-    DataSourcesResource dataSourcesResource = createResource();
     Response response = dataSourcesResource.getQueryableDataSources("full", null, request);
     Set<ImmutableDruidDataSource> result = (Set<ImmutableDruidDataSource>) response.getEntity();
     Assert.assertEquals(200, response.getStatus());
@@ -200,8 +221,8 @@ public void testGetFullQueryableDataSources()
     List<String> result1 = (List<String>) response.getEntity();
     Assert.assertEquals(200, response.getStatus());
     Assert.assertEquals(2, result1.size());
-    Assert.assertTrue(result1.contains("datasource1"));
-    Assert.assertTrue(result1.contains("datasource2"));
+    Assert.assertTrue(result1.contains(TestDataSource.WIKI));
+    Assert.assertTrue(result1.contains(TestDataSource.KOALA));
     EasyMock.verify(inventoryView, server);
   }
 
@@ -249,7 +270,7 @@ public Authorizer getAuthorizer(String name)
           @Override
           public Access authorize(AuthenticationResult authenticationResult1, Resource resource, Action action)
           {
-            if (resource.getName().equals("datasource1")) {
+            if (resource.getName().equals(TestDataSource.WIKI)) {
               return new Access(true);
             } else {
               return new Access(false);
@@ -261,7 +282,7 @@ public Access authorize(AuthenticationResult authenticationResult1, Resource res
     };
 
     DataSourcesResource dataSourcesResource =
-        new DataSourcesResource(inventoryView, null, null, null, authMapper, null, auditManager);
+        new DataSourcesResource(inventoryView, null, null, overlordClient, authMapper, null, auditManager);
     Response response = dataSourcesResource.getQueryableDataSources("full", null, request);
     Set<ImmutableDruidDataSource> result = (Set<ImmutableDruidDataSource>) response.getEntity();
 
@@ -277,7 +298,7 @@ public Access authorize(AuthenticationResult authenticationResult1, Resource res
 
     Assert.assertEquals(200, response.getStatus());
     Assert.assertEquals(1, result1.size());
-    Assert.assertTrue(result1.contains("datasource1"));
+    Assert.assertTrue(result1.contains(TestDataSource.WIKI));
 
     EasyMock.verify(inventoryView, server, request);
   }
@@ -286,9 +307,9 @@ public Access authorize(AuthenticationResult authenticationResult1, Resource res
   public void testGetSimpleQueryableDataSources()
   {
     EasyMock.expect(server.getDataSources()).andReturn(listDataSources).atLeastOnce();
-    EasyMock.expect(server.getDataSource("datasource1")).andReturn(listDataSources.get(0)).atLeastOnce();
+    EasyMock.expect(server.getDataSource(TestDataSource.WIKI)).andReturn(listDataSources.get(0)).atLeastOnce();
     EasyMock.expect(server.getTier()).andReturn(null).atLeastOnce();
-    EasyMock.expect(server.getDataSource("datasource2")).andReturn(listDataSources.get(1)).atLeastOnce();
+    EasyMock.expect(server.getDataSource(TestDataSource.KOALA)).andReturn(listDataSources.get(1)).atLeastOnce();
     EasyMock.expect(inventoryView.getInventory()).andReturn(ImmutableList.of(server)).atLeastOnce();
     EasyMock.expect(request.getAttribute(AuthConfig.DRUID_ALLOW_UNSECURED_PATH)).andReturn(null).once();
     EasyMock.expect(request.getAttribute(AuthConfig.DRUID_AUTHORIZATION_CHECKED)).andReturn(null).once();
@@ -299,17 +320,15 @@ public void testGetSimpleQueryableDataSources()
     EasyMock.expectLastCall().times(1);
 
     EasyMock.replay(inventoryView, server, request);
-    DataSourcesResource dataSourcesResource = createResource();
     Response response = dataSourcesResource.getQueryableDataSources(null, "simple", request);
     Assert.assertEquals(200, response.getStatus());
     List<Map<String, Object>> results = (List<Map<String, Object>>) response.getEntity();
-    int index = 0;
+
+    Assert.assertEquals(2, results.size());
     for (Map<String, Object> entry : results) {
-      Assert.assertEquals(listDataSources.get(index).getName(), entry.get("name").toString());
       Assert.assertTrue(((Map) ((Map) entry.get("properties")).get("tiers")).containsKey(null));
       Assert.assertNotNull((((Map) entry.get("properties")).get("segments")));
       Assert.assertEquals(1, ((Map) ((Map) entry.get("properties")).get("segments")).get("count"));
-      index++;
     }
     EasyMock.verify(inventoryView, server);
   }
@@ -317,13 +336,12 @@ public void testGetSimpleQueryableDataSources()
   @Test
   public void testFullGetTheDataSource()
   {
-    DruidDataSource dataSource1 = new DruidDataSource("datasource1", new HashMap<>());
-    EasyMock.expect(server.getDataSource("datasource1")).andReturn(dataSource1).atLeastOnce();
+    DruidDataSource dataSource1 = new DruidDataSource(TestDataSource.WIKI, new HashMap<>());
+    EasyMock.expect(server.getDataSource(TestDataSource.WIKI)).andReturn(dataSource1).atLeastOnce();
     EasyMock.expect(inventoryView.getInventory()).andReturn(ImmutableList.of(server)).atLeastOnce();
 
     EasyMock.replay(inventoryView, server);
-    DataSourcesResource dataSourcesResource = createResource();
-    Response response = dataSourcesResource.getQueryableDataSource("datasource1", "full");
+    Response response = dataSourcesResource.getQueryableDataSource(TestDataSource.WIKI, "full");
     ImmutableDruidDataSource result = (ImmutableDruidDataSource) response.getEntity();
     Assert.assertEquals(200, response.getStatus());
     ImmutableDruidDataSourceTestUtils.assertEquals(dataSource1.toImmutableDruidDataSource(), result);
@@ -337,7 +355,6 @@ public void testNullGetTheDataSource()
     EasyMock.expect(inventoryView.getInventory()).andReturn(ImmutableList.of(server)).atLeastOnce();
 
     EasyMock.replay(inventoryView, server);
-    DataSourcesResource dataSourcesResource = createResource();
     Assert.assertEquals(204, dataSourcesResource.getQueryableDataSource("none", null).getStatus());
     EasyMock.verify(inventoryView, server);
   }
@@ -345,17 +362,16 @@ public void testNullGetTheDataSource()
   @Test
   public void testSimpleGetTheDataSource()
   {
-    DruidDataSource dataSource1 = new DruidDataSource("datasource1", new HashMap<>());
+    DruidDataSource dataSource1 = new DruidDataSource(TestDataSource.WIKI, new HashMap<>());
     dataSource1.addSegment(
         new DataSegment("datasegment1", Intervals.of("2010-01-01/P1D"), "", null, null, null, null, 0x9, 10)
     );
-    EasyMock.expect(server.getDataSource("datasource1")).andReturn(dataSource1).atLeastOnce();
+    EasyMock.expect(server.getDataSource(TestDataSource.WIKI)).andReturn(dataSource1).atLeastOnce();
     EasyMock.expect(server.getTier()).andReturn(null).atLeastOnce();
     EasyMock.expect(inventoryView.getInventory()).andReturn(ImmutableList.of(server)).atLeastOnce();
 
     EasyMock.replay(inventoryView, server);
-    DataSourcesResource dataSourcesResource = createResource();
-    Response response = dataSourcesResource.getQueryableDataSource("datasource1", null);
+    Response response = dataSourcesResource.getQueryableDataSource(TestDataSource.WIKI, null);
     Assert.assertEquals(200, response.getStatus());
     Map<String, Map<String, Object>> result = (Map<String, Map<String, Object>>) response.getEntity();
     Assert.assertEquals(1, ((Map) (result.get("tiers").get(null))).get("segmentCount"));
@@ -373,22 +389,21 @@ public void testSimpleGetTheDataSource()
   @Test
   public void testSimpleGetTheDataSourceManyTiers()
   {
-    EasyMock.expect(server.getDataSource("datasource1")).andReturn(listDataSources.get(0)).atLeastOnce();
+    EasyMock.expect(server.getDataSource(TestDataSource.WIKI)).andReturn(listDataSources.get(0)).atLeastOnce();
     EasyMock.expect(server.getTier()).andReturn("cold").atLeastOnce();
 
     DruidServer server2 = EasyMock.createStrictMock(DruidServer.class);
-    EasyMock.expect(server2.getDataSource("datasource1")).andReturn(listDataSources.get(1)).atLeastOnce();
+    EasyMock.expect(server2.getDataSource(TestDataSource.WIKI)).andReturn(listDataSources.get(1)).atLeastOnce();
     EasyMock.expect(server2.getTier()).andReturn("hot").atLeastOnce();
 
     DruidServer server3 = EasyMock.createStrictMock(DruidServer.class);
-    EasyMock.expect(server3.getDataSource("datasource1")).andReturn(listDataSources.get(1)).atLeastOnce();
+    EasyMock.expect(server3.getDataSource(TestDataSource.WIKI)).andReturn(listDataSources.get(1)).atLeastOnce();
     EasyMock.expect(server3.getTier()).andReturn("cold").atLeastOnce();
 
     EasyMock.expect(inventoryView.getInventory()).andReturn(ImmutableList.of(server, server2, server3)).atLeastOnce();
 
     EasyMock.replay(inventoryView, server, server2, server3);
-    DataSourcesResource dataSourcesResource = createResource();
-    Response response = dataSourcesResource.getQueryableDataSource("datasource1", null);
+    Response response = dataSourcesResource.getQueryableDataSource(TestDataSource.WIKI, null);
     Assert.assertEquals(200, response.getStatus());
     Map<String, Map<String, Object>> result = (Map<String, Map<String, Object>>) response.getEntity();
     Assert.assertEquals(2, ((Map) (result.get("tiers").get("cold"))).get("segmentCount"));
@@ -425,8 +440,7 @@ public void testSimpleGetTheDataSourceWithReplicatedSegments()
 
     EasyMock.replay(inventoryView);
 
-    DataSourcesResource dataSourcesResource = createResource();
-    Response response = dataSourcesResource.getQueryableDataSource("datasource1", null);
+    Response response = dataSourcesResource.getQueryableDataSource(TestDataSource.WIKI, null);
     Assert.assertEquals(200, response.getStatus());
     Map<String, Map<String, Object>> result1 = (Map<String, Map<String, Object>>) response.getEntity();
     Assert.assertEquals(2, ((Map) (result1.get("tiers").get("tier1"))).get("segmentCount"));
@@ -441,7 +455,7 @@ public void testSimpleGetTheDataSourceWithReplicatedSegments()
     Assert.assertEquals(30L, result1.get("segments").get("size"));
     Assert.assertEquals(60L, result1.get("segments").get("replicatedSize"));
 
-    response = dataSourcesResource.getQueryableDataSource("datasource2", null);
+    response = dataSourcesResource.getQueryableDataSource(TestDataSource.KOALA, null);
     Assert.assertEquals(200, response.getStatus());
     Map<String, Map<String, Object>> result2 = (Map<String, Map<String, Object>>) response.getEntity();
     Assert.assertEquals(1, ((Map) (result2.get("tiers").get("tier1"))).get("segmentCount"));
@@ -469,8 +483,6 @@ public void testGetSegmentDataSourceIntervals()
     List<Interval> expectedIntervals = new ArrayList<>();
     expectedIntervals.add(Intervals.of("2010-01-22T00:00:00.000Z/2010-01-23T00:00:00.000Z"));
     expectedIntervals.add(Intervals.of("2010-01-01T00:00:00.000Z/2010-01-02T00:00:00.000Z"));
-    DataSourcesResource dataSourcesResource = createResource();
-
     Response response = dataSourcesResource.getIntervalsWithServedSegmentsOrAllServedSegmentsPerIntervals(
         "invalidDataSource",
         null,
@@ -479,7 +491,7 @@ public void testGetSegmentDataSourceIntervals()
     Assert.assertNull(response.getEntity());
 
     response = dataSourcesResource.getIntervalsWithServedSegmentsOrAllServedSegmentsPerIntervals(
-        "datasource1",
+        TestDataSource.WIKI,
         null,
         null
     );
@@ -489,7 +501,7 @@ public void testGetSegmentDataSourceIntervals()
     Assert.assertEquals(expectedIntervals.get(1), actualIntervals.last());
 
     response = dataSourcesResource.getIntervalsWithServedSegmentsOrAllServedSegmentsPerIntervals(
-        "datasource1",
+        TestDataSource.WIKI,
         "simple",
         null
     );
@@ -501,7 +513,7 @@ public void testGetSegmentDataSourceIntervals()
     Assert.assertEquals(1, results.lastEntry().getValue().get(DataSourcesResource.SimpleProperties.count));
 
     response = dataSourcesResource.getIntervalsWithServedSegmentsOrAllServedSegmentsPerIntervals(
-        "datasource1",
+        TestDataSource.WIKI,
         null,
         "full"
     );
@@ -528,7 +540,6 @@ public void testGetServedSegmentsInIntervalInDataSource()
     EasyMock.expect(inventoryView.getInventory()).andReturn(ImmutableList.of(server)).atLeastOnce();
     EasyMock.replay(inventoryView);
 
-    DataSourcesResource dataSourcesResource = createResource();
     Response response = dataSourcesResource.getServedSegmentsInInterval(
         "invalidDataSource",
         "2010-01-01/P1D",
@@ -538,24 +549,24 @@ public void testGetServedSegmentsInIntervalInDataSource()
     Assert.assertNull(response.getEntity());
 
     response = dataSourcesResource.getServedSegmentsInInterval(
-        "datasource1",
+        TestDataSource.WIKI,
         "2010-03-01/P1D",
         null,
         null
     ); // interval not present in the datasource
     Assert.assertEquals(ImmutableSet.of(), response.getEntity());
 
-    response = dataSourcesResource.getServedSegmentsInInterval("datasource1", "2010-01-01/P1D", null, null);
+    response = dataSourcesResource.getServedSegmentsInInterval(TestDataSource.WIKI, "2010-01-01/P1D", null, null);
     Assert.assertEquals(ImmutableSet.of(dataSegmentList.get(0).getId()), response.getEntity());
 
-    response = dataSourcesResource.getServedSegmentsInInterval("datasource1", "2010-01-01/P1M", null, null);
+    response = dataSourcesResource.getServedSegmentsInInterval(TestDataSource.WIKI, "2010-01-01/P1M", null, null);
     Assert.assertEquals(
         ImmutableSet.of(dataSegmentList.get(1).getId(), dataSegmentList.get(0).getId()),
         response.getEntity()
     );
 
     response = dataSourcesResource.getServedSegmentsInInterval(
-        "datasource1",
+        TestDataSource.WIKI,
         "2010-01-01/P1M",
         "simple",
         null
@@ -572,7 +583,7 @@ public void testGetServedSegmentsInIntervalInDataSource()
       );
     }
 
-    response = dataSourcesResource.getServedSegmentsInInterval("datasource1", "2010-01-01/P1M", null, "full");
+    response = dataSourcesResource.getServedSegmentsInInterval(TestDataSource.WIKI, "2010-01-01/P1M", null, "full");
     Map<Interval, Map<SegmentId, Object>> results1 = ((Map<Interval, Map<SegmentId, Object>>) response.getEntity());
     i = 1;
     for (Map.Entry<Interval, Map<SegmentId, Object>> entry : results1.entrySet()) {
@@ -592,15 +603,12 @@ public void testKillSegmentsInIntervalInDataSource()
     String interval = "2010-01-01/P1D";
     Interval theInterval = Intervals.of(interval.replace('_', '/'));
 
-    OverlordClient overlordClient = EasyMock.createStrictMock(OverlordClient.class);
-    EasyMock.expect(overlordClient.runKillTask("api-issued", "datasource1", theInterval, null, null, null))
+    EasyMock.expect(overlordClient.runKillTask("api-issued", TestDataSource.WIKI, theInterval, null, null, null))
             .andReturn(Futures.immediateFuture("kill_task_1"));
     EasyMock.replay(overlordClient, server);
 
-    DataSourcesResource dataSourcesResource =
-        new DataSourcesResource(inventoryView, null, null, overlordClient, null, null, auditManager);
     prepareRequestForAudit();
-    Response response = dataSourcesResource.killUnusedSegmentsInInterval("datasource1", interval, request);
+    Response response = dataSourcesResource.killUnusedSegmentsInInterval(TestDataSource.WIKI, interval, request);
 
     Assert.assertEquals(200, response.getStatus());
     Assert.assertNull(response.getEntity());
@@ -610,12 +618,13 @@ public void testKillSegmentsInIntervalInDataSource()
   @Test
   public void testMarkAsUnusedAllSegmentsInDataSourceBadRequest()
   {
-    OverlordClient overlordClient = EasyMock.createStrictMock(OverlordClient.class);
-    EasyMock.replay(overlordClient, server);
-    DataSourcesResource dataSourcesResource =
-        new DataSourcesResource(inventoryView, null, null, overlordClient, null, null, auditManager);
     DruidExceptionMatcher.invalidInput().assertThrowsAndMatches(
-        () -> dataSourcesResource.markAsUnusedAllSegmentsOrKillUnusedSegmentsInInterval("datasource", "true", "???", request)
+        () -> dataSourcesResource.markAsUnusedAllSegmentsOrKillUnusedSegmentsInInterval(
+            "datasource",
+            "true",
+            "???",
+            request
+        )
     );
   }
 
@@ -624,15 +633,15 @@ public void testMarkAsUnusedAllSegmentsInDataSource()
   {
     prepareRequestForAudit();
 
-    OverlordClient overlordClient = EasyMock.createStrictMock(OverlordClient.class);
+    EasyMock.expect(overlordClient.markSegmentsAsUnused(TestDataSource.WIKI))
+            .andReturn(Futures.immediateFuture(new SegmentUpdateResponse(0))).once();
+
     EasyMock.replay(overlordClient, server);
-    DataSourcesResource dataSourcesResource =
-        new DataSourcesResource(inventoryView, segmentsMetadataManager, null, overlordClient, null, null, auditManager);
     Response response = dataSourcesResource
-        .markAsUnusedAllSegmentsOrKillUnusedSegmentsInInterval("datasource", null, null, request);
+        .markAsUnusedAllSegmentsOrKillUnusedSegmentsInInterval(TestDataSource.WIKI, null, null, request);
     Assert.assertEquals(200, response.getStatus());
 
-    EasyMock.verify(request);
+    EasyMock.verify(overlordClient, request);
   }
 
   @Test
@@ -645,29 +654,29 @@ public void testIsHandOffComplete()
         new DataSourcesResource(inventoryView, null, databaseRuleManager, null, null, null, auditManager);
 
     // test dropped
-    EasyMock.expect(databaseRuleManager.getRulesWithDefault("dataSource1"))
+    EasyMock.expect(databaseRuleManager.getRulesWithDefault(TestDataSource.WIKI))
             .andReturn(ImmutableList.of(loadRule, dropRule))
             .once();
     EasyMock.replay(databaseRuleManager);
 
     String interval1 = "2013-01-01T01:00:00Z/2013-01-01T02:00:00Z";
-    Response response1 = dataSourcesResource.isHandOffComplete("dataSource1", interval1, 1, "v1");
+    Response response1 = dataSourcesResource.isHandOffComplete(TestDataSource.WIKI, interval1, 1, "v1");
     Assert.assertTrue((boolean) response1.getEntity());
 
     EasyMock.verify(databaseRuleManager);
 
     // test isn't dropped and no timeline found
     EasyMock.reset(databaseRuleManager);
-    EasyMock.expect(databaseRuleManager.getRulesWithDefault("dataSource1"))
+    EasyMock.expect(databaseRuleManager.getRulesWithDefault(TestDataSource.WIKI))
             .andReturn(ImmutableList.of(loadRule, dropRule))
             .once();
-    EasyMock.expect(inventoryView.getTimeline(new TableDataSource("dataSource1")))
+    EasyMock.expect(inventoryView.getTimeline(new TableDataSource(TestDataSource.WIKI)))
             .andReturn(null)
             .once();
     EasyMock.replay(inventoryView, databaseRuleManager);
 
     String interval2 = "2013-01-02T01:00:00Z/2013-01-02T02:00:00Z";
-    Response response2 = dataSourcesResource.isHandOffComplete("dataSource1", interval2, 1, "v1");
+    Response response2 = dataSourcesResource.isHandOffComplete(TestDataSource.WIKI, interval2, 1, "v1");
     Assert.assertFalse((boolean) response2.getEntity());
 
     EasyMock.verify(inventoryView, databaseRuleManager);
@@ -690,15 +699,15 @@ public List<TimelineObjectHolder<String, SegmentLoadInfo>> lookupWithIncompleteP
       }
     };
     EasyMock.reset(inventoryView, databaseRuleManager);
-    EasyMock.expect(databaseRuleManager.getRulesWithDefault("dataSource1"))
+    EasyMock.expect(databaseRuleManager.getRulesWithDefault(TestDataSource.WIKI))
             .andReturn(ImmutableList.of(loadRule, dropRule))
             .once();
-    EasyMock.expect(inventoryView.getTimeline(new TableDataSource("dataSource1")))
+    EasyMock.expect(inventoryView.getTimeline(new TableDataSource(TestDataSource.WIKI)))
             .andReturn(timeline)
             .once();
     EasyMock.replay(inventoryView, databaseRuleManager);
 
-    Response response3 = dataSourcesResource.isHandOffComplete("dataSource1", interval3, 1, "v1");
+    Response response3 = dataSourcesResource.isHandOffComplete(TestDataSource.WIKI, interval3, 1, "v1");
     Assert.assertTrue((boolean) response3.getEntity());
 
     EasyMock.verify(inventoryView, databaseRuleManager);
@@ -708,179 +717,183 @@ public List<TimelineObjectHolder<String, SegmentLoadInfo>> lookupWithIncompleteP
   public void testMarkSegmentAsUsed()
   {
     DataSegment segment = dataSegmentList.get(0);
-    EasyMock.expect(segmentsMetadataManager.markSegmentAsUsed(segment.getId().toString())).andReturn(true).once();
-    EasyMock.replay(segmentsMetadataManager);
-
-    DataSourcesResource dataSourcesResource = createResource();
+    EasyMock.expect(overlordClient.markSegmentAsUsed(segment.getId()))
+            .andReturn(Futures.immediateFuture(new SegmentUpdateResponse(1))).once();
+    EasyMock.replay(overlordClient);
 
     Response response = dataSourcesResource.markSegmentAsUsed(segment.getDataSource(), segment.getId().toString());
     Assert.assertEquals(200, response.getStatus());
-    EasyMock.verify(segmentsMetadataManager);
+    EasyMock.verify(overlordClient);
   }
 
   @Test
-  public void testMarkSegmentAsUsedNoChange()
+  public void testMarkSegmentAsUsedWhenOverlordIsOnOldVersion()
   {
     DataSegment segment = dataSegmentList.get(0);
-    EasyMock.expect(segmentsMetadataManager.markSegmentAsUsed(segment.getId().toString())).andReturn(false).once();
+
+    final StringFullResponseHolder responseHolder = new StringFullResponseHolder(
+        new DefaultHttpResponse(HttpVersion.HTTP_1_1, HttpResponseStatus.NOT_FOUND),
+        Charsets.UTF_8
+    );
+    EasyMock.expect(overlordClient.markSegmentAsUsed(segment.getId()))
+            .andThrow(new RuntimeException(new HttpResponseException(responseHolder))).once();
+    EasyMock.replay(overlordClient);
+
+    EasyMock.expect(segmentsMetadataManager.markSegmentAsUsed(segment.getId().toString()))
+            .andReturn(true).once();
     EasyMock.replay(segmentsMetadataManager);
 
-    DataSourcesResource dataSourcesResource = createResource();
+    Response response = dataSourcesResource.markSegmentAsUsed(segment.getDataSource(), segment.getId().toString());
+    Assert.assertEquals(200, response.getStatus());
+    Assert.assertEquals(new SegmentUpdateResponse(1), response.getEntity());
+
+    EasyMock.verify(overlordClient, segmentsMetadataManager);
+  }
+
+  @Test
+  public void testMarkSegmentAsUsedNoChange()
+  {
+    DataSegment segment = dataSegmentList.get(0);
+    EasyMock.expect(overlordClient.markSegmentAsUsed(segment.getId()))
+            .andReturn(Futures.immediateFuture(new SegmentUpdateResponse(0))).once();
+    EasyMock.replay(overlordClient);
 
     Response response = dataSourcesResource.markSegmentAsUsed(segment.getDataSource(), segment.getId().toString());
     Assert.assertEquals(200, response.getStatus());
-    Assert.assertEquals(ImmutableMap.of("segmentStateChanged", false), response.getEntity());
-    EasyMock.verify(segmentsMetadataManager);
+    Assert.assertEquals(new SegmentUpdateResponse(0), response.getEntity());
+    EasyMock.verify(overlordClient);
   }
 
   @Test
   public void testMarkAsUsedNonOvershadowedSegmentsInterval()
   {
     Interval interval = Intervals.of("2010-01-22/P1D");
-    int numUpdatedSegments = segmentsMetadataManager.markAsUsedNonOvershadowedSegmentsInInterval(
-        EasyMock.eq("datasource1"), EasyMock.eq(interval), EasyMock.isNull()
-    );
-    EasyMock.expect(numUpdatedSegments).andReturn(3).once();
-    EasyMock.replay(segmentsMetadataManager, inventoryView, server);
+    SegmentsToUpdateFilter segmentFilter = new SegmentsToUpdateFilter(interval, null, null);
+
+    EasyMock.expect(overlordClient.markNonOvershadowedSegmentsAsUsed(TestDataSource.WIKI, segmentFilter))
+            .andReturn(Futures.immediateFuture(new SegmentUpdateResponse(3))).once();
+    EasyMock.replay(overlordClient, inventoryView, server);
 
-    DataSourcesResource dataSourcesResource = createResource();
     Response response = dataSourcesResource.markAsUsedNonOvershadowedSegments(
-        "datasource1",
-        new DataSourcesResource.SegmentsToUpdateFilter(interval, null, null)
+        TestDataSource.WIKI,
+        segmentFilter
     );
     Assert.assertEquals(200, response.getStatus());
-    EasyMock.verify(segmentsMetadataManager, inventoryView, server);
+    EasyMock.verify(overlordClient, inventoryView, server);
   }
 
   @Test
   public void testMarkAsUsedNonOvershadowedSegmentsIntervalWithVersions()
   {
     Interval interval = Intervals.of("2010-01-22/P1D");
+    SegmentsToUpdateFilter segmentFilter = new SegmentsToUpdateFilter(interval, null, ImmutableList.of("v0"));
 
-    int numUpdatedSegments = segmentsMetadataManager.markAsUsedNonOvershadowedSegmentsInInterval(
-        EasyMock.eq("datasource1"), EasyMock.eq(interval), EasyMock.eq(ImmutableList.of("v0"))
-    );
-    EasyMock.expect(numUpdatedSegments).andReturn(3).once();
-    EasyMock.replay(segmentsMetadataManager, inventoryView, server);
+    EasyMock.expect(overlordClient.markNonOvershadowedSegmentsAsUsed(TestDataSource.WIKI, segmentFilter))
+            .andReturn(Futures.immediateFuture(new SegmentUpdateResponse(3))).once();
+    EasyMock.replay(overlordClient, inventoryView, server);
 
-    DataSourcesResource dataSourcesResource = createResource();
     Response response = dataSourcesResource.markAsUsedNonOvershadowedSegments(
-        "datasource1",
-        new DataSourcesResource.SegmentsToUpdateFilter(interval, null, ImmutableList.of("v0"))
+        TestDataSource.WIKI,
+        segmentFilter
     );
     Assert.assertEquals(200, response.getStatus());
-    EasyMock.verify(segmentsMetadataManager, inventoryView, server);
+    EasyMock.verify(overlordClient, inventoryView, server);
   }
 
   @Test
   public void testMarkAsUsedNonOvershadowedSegmentsIntervalWithNonExistentVersion()
   {
     Interval interval = Intervals.of("2010-01-22/P1D");
+    SegmentsToUpdateFilter filter = new SegmentsToUpdateFilter(interval, null, ImmutableList.of("foo"));
 
-    int numUpdatedSegments = segmentsMetadataManager.markAsUsedNonOvershadowedSegmentsInInterval(
-        EasyMock.eq("datasource1"), EasyMock.eq(interval), EasyMock.eq(ImmutableList.of("foo"))
-    );
-    EasyMock.expect(numUpdatedSegments).andReturn(0).once();
-    EasyMock.replay(segmentsMetadataManager, inventoryView, server);
+    EasyMock.expect(overlordClient.markNonOvershadowedSegmentsAsUsed(TestDataSource.WIKI, filter))
+            .andReturn(Futures.immediateFuture(new SegmentUpdateResponse(0))).once();
+    EasyMock.replay(overlordClient, inventoryView, server);
 
-    DataSourcesResource dataSourcesResource = createResource();
     Response response = dataSourcesResource.markAsUsedNonOvershadowedSegments(
-        "datasource1",
-        new DataSourcesResource.SegmentsToUpdateFilter(interval, null, ImmutableList.of("foo"))
+        TestDataSource.WIKI,
+        filter
     );
     Assert.assertEquals(200, response.getStatus());
-    EasyMock.verify(segmentsMetadataManager, inventoryView, server);
+    EasyMock.verify(overlordClient, inventoryView, server);
   }
 
   @Test
   public void testMarkAsUsedNonOvershadowedSegmentsIntervalNoneUpdated()
   {
     Interval interval = Intervals.of("2010-01-22/P1D");
-    int numUpdatedSegments = segmentsMetadataManager.markAsUsedNonOvershadowedSegmentsInInterval(
-        EasyMock.eq("datasource1"), EasyMock.eq(interval), EasyMock.isNull()
-    );
-    EasyMock.expect(numUpdatedSegments).andReturn(0).once();
-    EasyMock.replay(segmentsMetadataManager, inventoryView, server);
-
-    DataSourcesResource dataSourcesResource = createResource();
+    final SegmentsToUpdateFilter segmentFilter = new SegmentsToUpdateFilter(interval, null, null);
+    EasyMock.expect(overlordClient.markNonOvershadowedSegmentsAsUsed(TestDataSource.WIKI, segmentFilter))
+            .andReturn(Futures.immediateFuture(new SegmentUpdateResponse(0))).once();
+    EasyMock.replay(overlordClient, inventoryView, server);
 
     Response response = dataSourcesResource.markAsUsedNonOvershadowedSegments(
-        "datasource1",
-        new DataSourcesResource.SegmentsToUpdateFilter(interval, null, null)
+        TestDataSource.WIKI,
+        segmentFilter
     );
-    Assert.assertEquals(ImmutableMap.of("numChangedSegments", 0), response.getEntity());
-    EasyMock.verify(segmentsMetadataManager, inventoryView, server);
+    Assert.assertEquals(new SegmentUpdateResponse(0), response.getEntity());
+    EasyMock.verify(overlordClient, inventoryView, server);
   }
 
   @Test
   public void testMarkAsUsedNonOvershadowedSegmentsSet()
   {
     Set<String> segmentIds = ImmutableSet.of(dataSegmentList.get(1).getId().toString());
-    int numUpdatedSegments = segmentsMetadataManager.markAsUsedNonOvershadowedSegments(
-        EasyMock.eq("datasource1"), EasyMock.eq(segmentIds)
-    );
-    EasyMock.expect(numUpdatedSegments).andReturn(3).once();
-    EasyMock.replay(segmentsMetadataManager, inventoryView, server);
+    SegmentsToUpdateFilter segmentFilter = new SegmentsToUpdateFilter(null, segmentIds, null);
 
-    DataSourcesResource dataSourcesResource = createResource();
+    EasyMock.expect(overlordClient.markNonOvershadowedSegmentsAsUsed(TestDataSource.WIKI, segmentFilter))
+            .andReturn(Futures.immediateFuture(new SegmentUpdateResponse(3))).once();
+    EasyMock.replay(overlordClient, inventoryView, server);
 
     Response response = dataSourcesResource.markAsUsedNonOvershadowedSegments(
-        "datasource1",
-        new DataSourcesResource.SegmentsToUpdateFilter(null, segmentIds, null)
+        TestDataSource.WIKI,
+        segmentFilter
     );
     Assert.assertEquals(200, response.getStatus());
-    EasyMock.verify(segmentsMetadataManager, inventoryView, server);
+    EasyMock.verify(overlordClient, inventoryView, server);
   }
 
   @Test
   public void testMarkAsUsedNonOvershadowedSegmentsIntervalException()
   {
     Interval interval = Intervals.of("2010-01-22/P1D");
-    int numUpdatedSegments = segmentsMetadataManager.markAsUsedNonOvershadowedSegmentsInInterval(
-        EasyMock.eq("datasource1"), EasyMock.eq(interval), EasyMock.isNull()
-    );
-    EasyMock.expect(numUpdatedSegments).andThrow(new RuntimeException("Error!")).once();
-    EasyMock.replay(segmentsMetadataManager, inventoryView, server);
-
-    DataSourcesResource dataSourcesResource = createResource();
+    SegmentsToUpdateFilter segmentFilter = new SegmentsToUpdateFilter(interval, null, null);
+    EasyMock.expect(overlordClient.markNonOvershadowedSegmentsAsUsed(TestDataSource.WIKI, segmentFilter))
+            .andThrow(new RuntimeException("Error!")).once();
+    EasyMock.replay(overlordClient, inventoryView, server);
 
     Response response = dataSourcesResource.markAsUsedNonOvershadowedSegments(
-        "datasource1",
-        new DataSourcesResource.SegmentsToUpdateFilter(interval, null, null)
+        TestDataSource.WIKI,
+        segmentFilter
     );
     Assert.assertEquals(500, response.getStatus());
-    EasyMock.verify(segmentsMetadataManager, inventoryView, server);
+    EasyMock.verify(overlordClient, inventoryView, server);
   }
 
   @Test
   public void testMarkAsUsedNonOvershadowedSegmentsNoDataSource()
   {
-    Interval interval = Intervals.of("2010-01-22/P1D");
-    int numUpdatedSegments = segmentsMetadataManager.markAsUsedNonOvershadowedSegmentsInInterval(
-        EasyMock.eq("datasource1"), EasyMock.eq(interval), EasyMock.isNull()
-    );
-    EasyMock.expect(numUpdatedSegments).andReturn(0).once();
-    EasyMock.replay(segmentsMetadataManager, inventoryView, server);
-
-    DataSourcesResource dataSourcesResource = createResource();
+    SegmentsToUpdateFilter segmentFilter =
+        new SegmentsToUpdateFilter(Intervals.of("2010-01-22/P1D"), null, null);
+    EasyMock.expect(overlordClient.markNonOvershadowedSegmentsAsUsed(TestDataSource.WIKI, segmentFilter))
+            .andReturn(Futures.immediateFuture(new SegmentUpdateResponse(0))).once();
+    EasyMock.replay(overlordClient, inventoryView, server);
 
     Response response = dataSourcesResource.markAsUsedNonOvershadowedSegments(
-        "datasource1",
-        new DataSourcesResource.SegmentsToUpdateFilter(Intervals.of("2010-01-22/P1D"), null, null)
+        TestDataSource.WIKI,
+        segmentFilter
     );
     Assert.assertEquals(200, response.getStatus());
-    Assert.assertEquals(ImmutableMap.of("numChangedSegments", 0), response.getEntity());
-    EasyMock.verify(segmentsMetadataManager);
+    Assert.assertEquals(new SegmentUpdateResponse(0), response.getEntity());
+    EasyMock.verify(overlordClient);
   }
 
   @Test
   public void testMarkAsUsedNonOvershadowedSegmentsWithNullIntervalAndSegmentIdsAndVersions()
   {
-    DataSourcesResource dataSourcesResource = createResource();
-
     Response response = dataSourcesResource.markAsUsedNonOvershadowedSegments(
-        "datasource1",
-        new DataSourcesResource.SegmentsToUpdateFilter(null, null, null)
+        TestDataSource.WIKI,
+        new SegmentsToUpdateFilter(null, null, null)
     );
     Assert.assertEquals(400, response.getStatus());
   }
@@ -888,39 +901,48 @@ public void testMarkAsUsedNonOvershadowedSegmentsWithNullIntervalAndSegmentIdsAn
   @Test
   public void testMarkAsUsedNonOvershadowedSegmentsWithNonNullIntervalAndEmptySegmentIds()
   {
-    DataSourcesResource dataSourcesResource = createResource();
+    final SegmentsToUpdateFilter segmentFilter
+        = new SegmentsToUpdateFilter(Intervals.of("2010-01-22/P1D"), ImmutableSet.of(), null);
+
+    EasyMock.expect(overlordClient.markNonOvershadowedSegmentsAsUsed(TestDataSource.WIKI, segmentFilter))
+            .andReturn(Futures.immediateFuture(new SegmentUpdateResponse(2))).once();
+    EasyMock.replay(overlordClient);
 
     Response response = dataSourcesResource.markAsUsedNonOvershadowedSegments(
-        "datasource1",
-        new DataSourcesResource.SegmentsToUpdateFilter(
-            Intervals.of("2010-01-22/P1D"), ImmutableSet.of(), null
-        )
+        TestDataSource.WIKI,
+        segmentFilter
     );
     Assert.assertEquals(200, response.getStatus());
-    Assert.assertEquals(ImmutableMap.of("numChangedSegments", 0), response.getEntity());
+    Assert.assertEquals(new SegmentUpdateResponse(2), response.getEntity());
+    EasyMock.verify(overlordClient);
   }
 
   @Test
   public void testMarkAsUsedNonOvershadowedSegmentsWithNonNullInterval()
   {
-    DataSourcesResource dataSourcesResource = createResource();
+    final SegmentsToUpdateFilter segmentFilter =
+        new SegmentsToUpdateFilter(Intervals.of("2010-01-22/P1D"), null, null);
+
+    EasyMock.expect(overlordClient.markNonOvershadowedSegmentsAsUsed(TestDataSource.WIKI, segmentFilter))
+            .andReturn(Futures.immediateFuture(new SegmentUpdateResponse(0))).once();
+    EasyMock.replay(overlordClient);
 
     Response response = dataSourcesResource.markAsUsedNonOvershadowedSegments(
-        "datasource1",
-        new DataSourcesResource.SegmentsToUpdateFilter(Intervals.of("2010-01-22/P1D"), null, null)
+        TestDataSource.WIKI,
+        segmentFilter
     );
     Assert.assertEquals(200, response.getStatus());
-    Assert.assertEquals(ImmutableMap.of("numChangedSegments", 0), response.getEntity());
+    Assert.assertEquals(new SegmentUpdateResponse(0), response.getEntity());
+
+    EasyMock.verify(overlordClient);
   }
 
   @Test
   public void testMarkAsUsedNonOvershadowedSegmentsWithNonNullIntervalAndSegmentIds()
   {
-    DataSourcesResource dataSourcesResource = createResource();
-
     Response response = dataSourcesResource.markAsUsedNonOvershadowedSegments(
-        "datasource1",
-        new DataSourcesResource.SegmentsToUpdateFilter(Intervals.of("2010-01-22/P1D"), ImmutableSet.of("segment1"), null)
+        TestDataSource.WIKI,
+        new SegmentsToUpdateFilter(Intervals.of("2010-01-22/P1D"), ImmutableSet.of("segment1"), null)
     );
     Assert.assertEquals(400, response.getStatus());
   }
@@ -928,11 +950,9 @@ public void testMarkAsUsedNonOvershadowedSegmentsWithNonNullIntervalAndSegmentId
   @Test
   public void testMarkAsUsedNonOvershadowedSegmentsWithNonNullIntervalAndSegmentIdsAndVersions()
   {
-    DataSourcesResource dataSourcesResource = createResource();
-
     Response response = dataSourcesResource.markAsUsedNonOvershadowedSegments(
-        "datasource1",
-        new DataSourcesResource.SegmentsToUpdateFilter(
+        TestDataSource.WIKI,
+        new SegmentsToUpdateFilter(
             Intervals.of("2020/2030"), ImmutableSet.of("seg1"), ImmutableList.of("v1", "v2")
         )
     );
@@ -942,11 +962,9 @@ public void testMarkAsUsedNonOvershadowedSegmentsWithNonNullIntervalAndSegmentId
   @Test
   public void testMarkAsUsedNonOvershadowedSegmentsWithEmptySegmentIds()
   {
-    DataSourcesResource dataSourcesResource = createResource();
-
     Response response = dataSourcesResource.markAsUsedNonOvershadowedSegments(
-        "datasource1",
-        new DataSourcesResource.SegmentsToUpdateFilter(null, ImmutableSet.of(), null)
+        TestDataSource.WIKI,
+        new SegmentsToUpdateFilter(null, ImmutableSet.of(), null)
     );
     Assert.assertEquals(400, response.getStatus());
   }
@@ -954,11 +972,9 @@ public void testMarkAsUsedNonOvershadowedSegmentsWithEmptySegmentIds()
   @Test
   public void testMarkAsUsedNonOvershadowedSegmentsWithEmptyVersions()
   {
-    DataSourcesResource dataSourcesResource = createResource();
-
     Response response = dataSourcesResource.markAsUsedNonOvershadowedSegments(
-        "datasource1",
-        new DataSourcesResource.SegmentsToUpdateFilter(null, null, ImmutableList.of())
+        TestDataSource.WIKI,
+        new SegmentsToUpdateFilter(null, null, ImmutableList.of())
     );
     Assert.assertEquals(400, response.getStatus());
   }
@@ -966,11 +982,9 @@ public void testMarkAsUsedNonOvershadowedSegmentsWithEmptyVersions()
   @Test
   public void testMarkAsUsedNonOvershadowedSegmentsWithNonNullVersions()
   {
-    DataSourcesResource dataSourcesResource = createResource();
-
     Response response = dataSourcesResource.markAsUsedNonOvershadowedSegments(
-        "datasource1",
-        new DataSourcesResource.SegmentsToUpdateFilter(null, null, ImmutableList.of("v1", "v2"))
+        TestDataSource.WIKI,
+        new SegmentsToUpdateFilter(null, null, ImmutableList.of("v1", "v2"))
     );
     Assert.assertEquals(400, response.getStatus());
   }
@@ -978,11 +992,9 @@ public void testMarkAsUsedNonOvershadowedSegmentsWithNonNullVersions()
   @Test
   public void testMarkAsUsedNonOvershadowedSegmentsWithNonNullSegmentIdsAndVersions()
   {
-    DataSourcesResource dataSourcesResource = createResource();
-
     Response response = dataSourcesResource.markAsUsedNonOvershadowedSegments(
-        "datasource1",
-        new DataSourcesResource.SegmentsToUpdateFilter(null, ImmutableSet.of("segment1"), ImmutableList.of("v1", "v2"))
+        TestDataSource.WIKI,
+        new SegmentsToUpdateFilter(null, ImmutableSet.of("segment1"), ImmutableList.of("v1", "v2"))
     );
     Assert.assertEquals(400, response.getStatus());
   }
@@ -990,27 +1002,39 @@ public void testMarkAsUsedNonOvershadowedSegmentsWithNonNullSegmentIdsAndVersion
   @Test
   public void testMarkAsUsedNonOvershadowedSegmentsWithNonNullIntervalAndVersions()
   {
-    DataSourcesResource dataSourcesResource = createResource();
-
+    SegmentsToUpdateFilter segmentFilter =
+        new SegmentsToUpdateFilter(Intervals.ETERNITY, null, ImmutableList.of("v1", "v2"));
+    
+    EasyMock.expect(overlordClient.markNonOvershadowedSegmentsAsUsed(TestDataSource.WIKI, segmentFilter))
+            .andReturn(Futures.immediateFuture(new SegmentUpdateResponse(2))).once();
+    EasyMock.replay(overlordClient);
+    
     Response response = dataSourcesResource.markAsUsedNonOvershadowedSegments(
-        "datasource1",
-        new DataSourcesResource.SegmentsToUpdateFilter(Intervals.ETERNITY, null, ImmutableList.of("v1", "v2"))
+        TestDataSource.WIKI,
+        segmentFilter
     );
     Assert.assertEquals(200, response.getStatus());
-    Assert.assertEquals(ImmutableMap.of("numChangedSegments", 0), response.getEntity());
+    Assert.assertEquals(new SegmentUpdateResponse(2), response.getEntity());
+    EasyMock.verify(overlordClient);
   }
 
   @Test
   public void testMarkAsUsedNonOvershadowedSegmentsWithNonNullIntervalAndEmptyVersions()
   {
-    DataSourcesResource dataSourcesResource = createResource();
+    final SegmentsToUpdateFilter segmentFilter =
+        new SegmentsToUpdateFilter(Intervals.ETERNITY, null, ImmutableList.of());
+    EasyMock.expect(overlordClient.markNonOvershadowedSegmentsAsUsed(TestDataSource.WIKI, segmentFilter))
+            .andReturn(Futures.immediateFuture(new SegmentUpdateResponse(5))).once();
+    EasyMock.replay(overlordClient);
 
     Response response = dataSourcesResource.markAsUsedNonOvershadowedSegments(
-        "datasource1",
-        new DataSourcesResource.SegmentsToUpdateFilter(Intervals.ETERNITY, null, ImmutableList.of())
+        TestDataSource.WIKI,
+        segmentFilter
     );
     Assert.assertEquals(200, response.getStatus());
-    Assert.assertEquals(ImmutableMap.of("numChangedSegments", 0), response.getEntity());
+    Assert.assertEquals(new SegmentUpdateResponse(5), response.getEntity());
+
+    EasyMock.verify(overlordClient);
   }
 
   @Test
@@ -1146,18 +1170,15 @@ public void testSegmentLoadChecksForInterval()
   @Test
   public void testMarkSegmentsAsUnused()
   {
-    final DruidDataSource dataSource1 = new DruidDataSource("datasource1", new HashMap<>());
+    final DruidDataSource dataSource1 = new DruidDataSource(TestDataSource.WIKI, new HashMap<>());
     final Set<SegmentId> segmentIds =
         dataSegmentList.stream()
                        .filter(segment -> segment.getDataSource().equals(dataSource1.getName()))
                        .map(DataSegment::getId)
                        .collect(Collectors.toSet());
 
-    EasyMock.expect(segmentsMetadataManager.markSegmentsAsUnused(segmentIds)).andReturn(1).once();
-    EasyMock.replay(segmentsMetadataManager, inventoryView, server);
-
-    final DataSourcesResource.SegmentsToUpdateFilter payload =
-        new DataSourcesResource.SegmentsToUpdateFilter(
+    final SegmentsToUpdateFilter payload =
+        new SegmentsToUpdateFilter(
             null,
             segmentIds.stream()
                       .map(SegmentId::toString)
@@ -1165,29 +1186,29 @@ public void testMarkSegmentsAsUnused()
             null
         );
 
-    DataSourcesResource dataSourcesResource = createResource();
+    EasyMock.expect(overlordClient.markSegmentsAsUnused(TestDataSource.WIKI, payload))
+            .andReturn(Futures.immediateFuture(new SegmentUpdateResponse(1))).once();
+    EasyMock.replay(overlordClient, inventoryView, server);
+
     prepareRequestForAudit();
-    Response response = dataSourcesResource.markSegmentsAsUnused("datasource1", payload, request);
+    Response response = dataSourcesResource.markSegmentsAsUnused(TestDataSource.WIKI, payload, request);
     Assert.assertEquals(200, response.getStatus());
-    Assert.assertEquals(ImmutableMap.of("numChangedSegments", 1), response.getEntity());
-    EasyMock.verify(segmentsMetadataManager, inventoryView, server);
+    Assert.assertEquals(new SegmentUpdateResponse(1), response.getEntity());
+    EasyMock.verify(overlordClient, inventoryView, server);
   }
 
   @Test
   public void testMarkSegmentsAsUnusedNoChanges()
   {
-    final DruidDataSource dataSource1 = new DruidDataSource("datasource1", new HashMap<>());
+    final DruidDataSource dataSource1 = new DruidDataSource(TestDataSource.WIKI, new HashMap<>());
     final Set<SegmentId> segmentIds =
         dataSegmentList.stream()
                        .filter(segment -> segment.getDataSource().equals(dataSource1.getName()))
                        .map(DataSegment::getId)
                        .collect(Collectors.toSet());
 
-    EasyMock.expect(segmentsMetadataManager.markSegmentsAsUnused(segmentIds)).andReturn(0).once();
-    EasyMock.replay(segmentsMetadataManager, inventoryView, server);
-
-    final DataSourcesResource.SegmentsToUpdateFilter payload =
-        new DataSourcesResource.SegmentsToUpdateFilter(
+    final SegmentsToUpdateFilter segmentFilter =
+        new SegmentsToUpdateFilter(
             null,
             segmentIds.stream()
                       .map(SegmentId::toString)
@@ -1195,31 +1216,29 @@ public void testMarkSegmentsAsUnusedNoChanges()
             null
         );
 
-    DataSourcesResource dataSourcesResource = createResource();
+    EasyMock.expect(overlordClient.markSegmentsAsUnused(TestDataSource.WIKI, segmentFilter))
+            .andReturn(Futures.immediateFuture(new SegmentUpdateResponse(0))).once();
+    EasyMock.replay(overlordClient, inventoryView, server);
+
     prepareRequestForAudit();
-    Response response = dataSourcesResource.markSegmentsAsUnused("datasource1", payload, request);
+    Response response = dataSourcesResource.markSegmentsAsUnused(TestDataSource.WIKI, segmentFilter, request);
     Assert.assertEquals(200, response.getStatus());
-    Assert.assertEquals(ImmutableMap.of("numChangedSegments", 0), response.getEntity());
-    EasyMock.verify(segmentsMetadataManager, inventoryView, server);
+    Assert.assertEquals(new SegmentUpdateResponse(0), response.getEntity());
+    EasyMock.verify(overlordClient, inventoryView, server);
   }
 
   @Test
   public void testMarkSegmentsAsUnusedException()
   {
-    final DruidDataSource dataSource1 = new DruidDataSource("datasource1", new HashMap<>());
+    final DruidDataSource dataSource1 = new DruidDataSource(TestDataSource.WIKI, new HashMap<>());
     final Set<SegmentId> segmentIds =
         dataSegmentList.stream()
                        .filter(segment -> segment.getDataSource().equals(dataSource1.getName()))
                        .map(DataSegment::getId)
                        .collect(Collectors.toSet());
 
-    EasyMock.expect(segmentsMetadataManager.markSegmentsAsUnused(segmentIds))
-            .andThrow(new RuntimeException("Exception occurred"))
-            .once();
-    EasyMock.replay(segmentsMetadataManager, inventoryView, server);
-
-    final DataSourcesResource.SegmentsToUpdateFilter payload =
-        new DataSourcesResource.SegmentsToUpdateFilter(
+    final SegmentsToUpdateFilter segmentFilter =
+        new SegmentsToUpdateFilter(
             null,
             segmentIds.stream()
                       .map(SegmentId::toString)
@@ -1227,127 +1246,123 @@ public void testMarkSegmentsAsUnusedException()
             null
         );
 
-    DataSourcesResource dataSourcesResource = createResource();
-    Response response = dataSourcesResource.markSegmentsAsUnused("datasource1", payload, request);
+    EasyMock.expect(overlordClient.markSegmentsAsUnused(TestDataSource.WIKI, segmentFilter))
+            .andThrow(new RuntimeException("Exception occurred"))
+            .once();
+    EasyMock.replay(overlordClient, inventoryView, server);
+
+    Response response = dataSourcesResource.markSegmentsAsUnused(TestDataSource.WIKI, segmentFilter, request);
     Assert.assertEquals(500, response.getStatus());
     Assert.assertNotNull(response.getEntity());
-    EasyMock.verify(segmentsMetadataManager, inventoryView, server);
+    EasyMock.verify(overlordClient, inventoryView, server);
   }
 
   @Test
   public void testMarkAsUnusedSegmentsInInterval()
   {
     final Interval theInterval = Intervals.of("2010-01-01/P1D");
+    final SegmentsToUpdateFilter segmentFilter =
+        new SegmentsToUpdateFilter(theInterval, null, null);
 
-    EasyMock.expect(segmentsMetadataManager.markAsUnusedSegmentsInInterval("datasource1", theInterval, null)).andReturn(1).once();
-    EasyMock.replay(segmentsMetadataManager, inventoryView, server);
-
-    final DataSourcesResource.SegmentsToUpdateFilter payload =
-        new DataSourcesResource.SegmentsToUpdateFilter(theInterval, null, null);
+    EasyMock.expect(overlordClient.markSegmentsAsUnused(TestDataSource.WIKI, segmentFilter))
+            .andReturn(Futures.immediateFuture(new SegmentUpdateResponse(1))).once();
+    EasyMock.replay(overlordClient, inventoryView, server);
 
-    DataSourcesResource dataSourcesResource = createResource();
     prepareRequestForAudit();
-    Response response = dataSourcesResource.markSegmentsAsUnused("datasource1", payload, request);
+    Response response = dataSourcesResource.markSegmentsAsUnused(TestDataSource.WIKI, segmentFilter, request);
     Assert.assertEquals(200, response.getStatus());
-    Assert.assertEquals(ImmutableMap.of("numChangedSegments", 1), response.getEntity());
-    EasyMock.verify(segmentsMetadataManager, inventoryView, server);
-    EasyMock.verify(segmentsMetadataManager, inventoryView, server);
+    Assert.assertEquals(new SegmentUpdateResponse(1), response.getEntity());
+    EasyMock.verify(overlordClient, inventoryView, server);
   }
 
   @Test
   public void testMarkAsUnusedSegmentsInIntervalNoChanges()
   {
     final Interval theInterval = Intervals.of("2010-01-01/P1D");
+    final SegmentsToUpdateFilter segmentFilter =
+        new SegmentsToUpdateFilter(theInterval, null, null);
 
-    EasyMock.expect(segmentsMetadataManager.markAsUnusedSegmentsInInterval("datasource1", theInterval, null)).andReturn(0).once();
-    EasyMock.replay(segmentsMetadataManager, inventoryView, server);
-
-    final DataSourcesResource.SegmentsToUpdateFilter payload =
-        new DataSourcesResource.SegmentsToUpdateFilter(theInterval, null, null);
+    EasyMock.expect(overlordClient.markSegmentsAsUnused(TestDataSource.WIKI, segmentFilter))
+            .andReturn(Futures.immediateFuture(new SegmentUpdateResponse(0))).once();
+    EasyMock.replay(overlordClient, inventoryView, server);
 
-    DataSourcesResource dataSourcesResource = createResource();
     prepareRequestForAudit();
-    Response response = dataSourcesResource.markSegmentsAsUnused("datasource1", payload, request);
+    Response response = dataSourcesResource.markSegmentsAsUnused(TestDataSource.WIKI, segmentFilter, request);
     Assert.assertEquals(200, response.getStatus());
-    Assert.assertEquals(ImmutableMap.of("numChangedSegments", 0), response.getEntity());
-    EasyMock.verify(segmentsMetadataManager, inventoryView, server);
+    Assert.assertEquals(new SegmentUpdateResponse(0), response.getEntity());
+    EasyMock.verify(overlordClient, inventoryView, server);
   }
 
   @Test
   public void testMarkAsUnusedSegmentsInIntervalException()
   {
     final Interval theInterval = Intervals.of("2010-01-01/P1D");
+    final SegmentsToUpdateFilter segmentFilter =
+        new SegmentsToUpdateFilter(theInterval, null, null);
 
-    EasyMock.expect(segmentsMetadataManager.markAsUnusedSegmentsInInterval("datasource1", theInterval, null))
+    EasyMock.expect(overlordClient.markSegmentsAsUnused(TestDataSource.WIKI, segmentFilter))
             .andThrow(new RuntimeException("Exception occurred"))
             .once();
-    EasyMock.replay(segmentsMetadataManager, inventoryView, server);
+    EasyMock.replay(overlordClient, inventoryView, server);
 
-    final DataSourcesResource.SegmentsToUpdateFilter payload =
-        new DataSourcesResource.SegmentsToUpdateFilter(theInterval, null, null);
-
-    DataSourcesResource dataSourcesResource = createResource();
-    Response response = dataSourcesResource.markSegmentsAsUnused("datasource1", payload, request);
+    Response response = dataSourcesResource.markSegmentsAsUnused(TestDataSource.WIKI, segmentFilter, request);
     Assert.assertEquals(500, response.getStatus());
     Assert.assertNotNull(response.getEntity());
-    EasyMock.verify(segmentsMetadataManager, inventoryView, server);
+    EasyMock.verify(overlordClient, inventoryView, server);
   }
 
   @Test
   public void testMarkAsUnusedSegmentsInIntervalNoDataSource()
   {
     final Interval theInterval = Intervals.of("2010-01-01/P1D");
-    EasyMock.expect(segmentsMetadataManager.markAsUnusedSegmentsInInterval("datasource1", theInterval, null))
-            .andReturn(0).once();
-    EasyMock.replay(segmentsMetadataManager, inventoryView, server);
+    final SegmentsToUpdateFilter segmentFilter =
+        new SegmentsToUpdateFilter(theInterval, null, null);
+    EasyMock.expect(overlordClient.markSegmentsAsUnused(TestDataSource.WIKI, segmentFilter))
+            .andReturn(Futures.immediateFuture(new SegmentUpdateResponse(0))).once();
+    EasyMock.replay(overlordClient, inventoryView, server);
 
-    final DataSourcesResource.SegmentsToUpdateFilter payload =
-        new DataSourcesResource.SegmentsToUpdateFilter(theInterval, null, null);
-    DataSourcesResource dataSourcesResource = createResource();
     prepareRequestForAudit();
 
-    Response response = dataSourcesResource.markSegmentsAsUnused("datasource1", payload, request);
+    Response response = dataSourcesResource.markSegmentsAsUnused(TestDataSource.WIKI, segmentFilter, request);
     Assert.assertEquals(200, response.getStatus());
-    Assert.assertEquals(ImmutableMap.of("numChangedSegments", 0), response.getEntity());
-    EasyMock.verify(segmentsMetadataManager);
+    Assert.assertEquals(new SegmentUpdateResponse(0), response.getEntity());
+    EasyMock.verify(overlordClient);
   }
 
   @Test
   public void testMarkAsUnusedSegmentsInIntervalWithVersions()
   {
     final Interval theInterval = Intervals.of("2010-01-01/P1D");
-    EasyMock.expect(segmentsMetadataManager.markAsUnusedSegmentsInInterval("datasource1", theInterval, ImmutableList.of("v1")))
-            .andReturn(2).once();
-    EasyMock.replay(segmentsMetadataManager, inventoryView, server);
+    final SegmentsToUpdateFilter segmentFilter =
+        new SegmentsToUpdateFilter(theInterval, null, ImmutableList.of("v1"));
+    EasyMock.expect(overlordClient.markSegmentsAsUnused(TestDataSource.WIKI, segmentFilter))
+            .andReturn(Futures.immediateFuture(new SegmentUpdateResponse(2))).once();
+    EasyMock.replay(overlordClient, inventoryView, server);
 
-    final DataSourcesResource.SegmentsToUpdateFilter payload =
-        new DataSourcesResource.SegmentsToUpdateFilter(theInterval, null, ImmutableList.of("v1"));
-    DataSourcesResource dataSourcesResource = createResource();
     prepareRequestForAudit();
 
-    Response response = dataSourcesResource.markSegmentsAsUnused("datasource1", payload, request);
+    Response response = dataSourcesResource.markSegmentsAsUnused(TestDataSource.WIKI, segmentFilter, request);
     Assert.assertEquals(200, response.getStatus());
-    Assert.assertEquals(ImmutableMap.of("numChangedSegments", 2), response.getEntity());
-    EasyMock.verify(segmentsMetadataManager);
+    Assert.assertEquals(new SegmentUpdateResponse(2), response.getEntity());
+    EasyMock.verify(overlordClient);
   }
 
   @Test
   public void testMarkAsUnusedSegmentsInIntervalWithNonExistentVersion()
   {
     final Interval theInterval = Intervals.of("2010-01-01/P1D");
-    EasyMock.expect(segmentsMetadataManager.markAsUnusedSegmentsInInterval("datasource1", theInterval, ImmutableList.of("foo")))
-            .andReturn(0).once();
-    EasyMock.replay(segmentsMetadataManager, inventoryView, server);
+    final SegmentsToUpdateFilter segmentFilter =
+        new SegmentsToUpdateFilter(theInterval, null, ImmutableList.of("foo"));
+    EasyMock.expect(overlordClient.markSegmentsAsUnused(TestDataSource.WIKI, segmentFilter))
+            .andReturn(Futures.immediateFuture(new SegmentUpdateResponse(0))).once();
+    EasyMock.replay(overlordClient, inventoryView, server);
 
-    final DataSourcesResource.SegmentsToUpdateFilter payload =
-        new DataSourcesResource.SegmentsToUpdateFilter(theInterval, null, ImmutableList.of("foo"));
-    DataSourcesResource dataSourcesResource = createResource();
     prepareRequestForAudit();
 
-    Response response = dataSourcesResource.markSegmentsAsUnused("datasource1", payload, request);
+    Response response = dataSourcesResource.markSegmentsAsUnused(TestDataSource.WIKI, segmentFilter, request);
     Assert.assertEquals(200, response.getStatus());
-    Assert.assertEquals(ImmutableMap.of("numChangedSegments", 0), response.getEntity());
-    EasyMock.verify(segmentsMetadataManager);
+    Assert.assertEquals(new SegmentUpdateResponse(0), response.getEntity());
+    EasyMock.verify(overlordClient);
   }
 
   @Test
@@ -1356,8 +1371,8 @@ public void testSegmentsToUpdateFilterSerde() throws JsonProcessingException
     final ObjectMapper mapper = new DefaultObjectMapper();
     final String payload = "{\"interval\":\"2023-01-01T00:00:00.000Z/2024-01-01T00:00:00.000Z\",\"segmentIds\":null,\"versions\":[\"v1\"]}";
 
-    final DataSourcesResource.SegmentsToUpdateFilter obj =
-        mapper.readValue(payload, DataSourcesResource.SegmentsToUpdateFilter.class);
+    final SegmentsToUpdateFilter obj =
+        mapper.readValue(payload, SegmentsToUpdateFilter.class);
     Assert.assertEquals(Intervals.of("2023/2024"), obj.getInterval());
     Assert.assertEquals(ImmutableList.of("v1"), obj.getVersions());
     Assert.assertNull(obj.getSegmentIds());
@@ -1368,9 +1383,7 @@ public void testSegmentsToUpdateFilterSerde() throws JsonProcessingException
   @Test
   public void testMarkSegmentsAsUnusedNullPayload()
   {
-    DataSourcesResource dataSourcesResource = createResource();
-
-    Response response = dataSourcesResource.markSegmentsAsUnused("datasource1", null, request);
+    Response response = dataSourcesResource.markSegmentsAsUnused(TestDataSource.WIKI, null, request);
     Assert.assertEquals(400, response.getStatus());
     Assert.assertNotNull(response.getEntity());
     Assert.assertEquals(
@@ -1383,12 +1396,10 @@ public void testMarkSegmentsAsUnusedNullPayload()
   @Test
   public void testMarkSegmentsAsUnusedWithNullIntervalAndSegmentIdsAndVersions()
   {
-    DataSourcesResource dataSourcesResource = createResource();
+    final SegmentsToUpdateFilter payload =
+        new SegmentsToUpdateFilter(null, null, null);
 
-    final DataSourcesResource.SegmentsToUpdateFilter payload =
-        new DataSourcesResource.SegmentsToUpdateFilter(null, null, null);
-
-    Response response = dataSourcesResource.markSegmentsAsUnused("datasource1", payload, request);
+    Response response = dataSourcesResource.markSegmentsAsUnused(TestDataSource.WIKI, payload, request);
     Assert.assertEquals(400, response.getStatus());
     Assert.assertNotNull(response.getEntity());
   }
@@ -1396,21 +1407,26 @@ public void testMarkSegmentsAsUnusedWithNullIntervalAndSegmentIdsAndVersions()
   @Test
   public void testMarkSegmentsAsUnusedWithNonNullIntervalAndEmptySegmentIds()
   {
-    DataSourcesResource dataSourcesResource = createResource();
     prepareRequestForAudit();
-    final DataSourcesResource.SegmentsToUpdateFilter payload =
-        new DataSourcesResource.SegmentsToUpdateFilter(Intervals.of("2010-01-01/P1D"), ImmutableSet.of(), null);
-    Response response = dataSourcesResource.markSegmentsAsUnused("datasource1", payload, request);
+    final SegmentsToUpdateFilter segmentFilter =
+        new SegmentsToUpdateFilter(Intervals.of("2010-01-01/P1D"), ImmutableSet.of(), null);
+
+    EasyMock.expect(overlordClient.markSegmentsAsUnused(TestDataSource.WIKI, segmentFilter))
+            .andReturn(Futures.immediateFuture(new SegmentUpdateResponse(0))).once();
+    EasyMock.replay(overlordClient);
+
+    Response response = dataSourcesResource.markSegmentsAsUnused(TestDataSource.WIKI, segmentFilter, request);
 
     Assert.assertEquals(200, response.getStatus());
-    Assert.assertEquals(ImmutableMap.of("numChangedSegments", 0), response.getEntity());
+    Assert.assertEquals(new SegmentUpdateResponse(0), response.getEntity());
+
+    EasyMock.verify(overlordClient);
   }
 
   @Test
   public void testGetDatasourceLoadstatusForceMetadataRefreshNull()
   {
-    DataSourcesResource dataSourcesResource = createResource();
-    Response response = dataSourcesResource.getDatasourceLoadstatus("datasource1", null, null, null, null, null);
+    Response response = dataSourcesResource.getDatasourceLoadstatus(TestDataSource.WIKI, null, null, null, null, null);
     Assert.assertEquals(400, response.getStatus());
   }
 
@@ -1419,21 +1435,16 @@ public void testGetDatasourceLoadstatusNoSegmentForInterval()
   {
     List<DataSegment> segments = ImmutableList.of();
     // Test when datasource fully loaded
-    EasyMock.expect(segmentsMetadataManager.iterateAllUsedNonOvershadowedSegmentsForDatasourceInterval(EasyMock.eq(
-        "datasource1"), EasyMock.anyObject(Interval.class), EasyMock.anyBoolean()))
-            .andReturn(Optional.of(segments)).once();
+    EasyMock.expect(
+        segmentsMetadataManager.iterateAllUsedNonOvershadowedSegmentsForDatasourceInterval(
+            EasyMock.eq(TestDataSource.WIKI),
+            EasyMock.anyObject(Interval.class),
+            EasyMock.anyBoolean()
+        )
+    ).andReturn(Optional.of(segments)).once();
     EasyMock.replay(segmentsMetadataManager);
 
-    DataSourcesResource dataSourcesResource = new DataSourcesResource(
-        inventoryView,
-        segmentsMetadataManager,
-        null,
-        null,
-        null,
-        null,
-        null
-    );
-    Response response = dataSourcesResource.getDatasourceLoadstatus("datasource1", true, null, null, null, null);
+    Response response = dataSourcesResource.getDatasourceLoadstatus(TestDataSource.WIKI, true, null, null, null, null);
     Assert.assertEquals(204, response.getStatus());
   }
 
@@ -1441,7 +1452,7 @@ public void testGetDatasourceLoadstatusNoSegmentForInterval()
   public void testGetDatasourceLoadstatusDefault()
   {
     DataSegment datasource1Segment1 = new DataSegment(
-        "datasource1",
+        TestDataSource.WIKI,
         Intervals.of("2010-01-01/P1D"),
         "",
         null,
@@ -1453,7 +1464,7 @@ public void testGetDatasourceLoadstatusDefault()
     );
 
     DataSegment datasource1Segment2 = new DataSegment(
-        "datasource1",
+        TestDataSource.WIKI,
         Intervals.of("2010-01-22/P1D"),
         "",
         null,
@@ -1464,7 +1475,7 @@ public void testGetDatasourceLoadstatusDefault()
         20
     );
     DataSegment datasource2Segment1 = new DataSegment(
-        "datasource2",
+        TestDataSource.KOALA,
         Intervals.of("2010-01-01/P1D"),
         "",
         null,
@@ -1485,34 +1496,32 @@ public void testGetDatasourceLoadstatusDefault()
     );
 
     // Test when datasource fully loaded
-    EasyMock.expect(segmentsMetadataManager.iterateAllUsedNonOvershadowedSegmentsForDatasourceInterval(EasyMock.eq("datasource1"), EasyMock.anyObject(Interval.class), EasyMock.anyBoolean()))
+    EasyMock.expect(segmentsMetadataManager.iterateAllUsedNonOvershadowedSegmentsForDatasourceInterval(EasyMock.eq(TestDataSource.WIKI), EasyMock.anyObject(Interval.class), EasyMock.anyBoolean()))
             .andReturn(Optional.of(segments)).once();
     EasyMock.expect(inventoryView.getLoadInfoForAllSegments()).andReturn(completedLoadInfoMap).once();
     EasyMock.replay(segmentsMetadataManager, inventoryView);
 
-    DataSourcesResource dataSourcesResource = createResource();
-    Response response = dataSourcesResource.getDatasourceLoadstatus("datasource1", true, null, null, null, null);
+    Response response = dataSourcesResource.getDatasourceLoadstatus(TestDataSource.WIKI, true, null, null, null, null);
     Assert.assertEquals(200, response.getStatus());
     Assert.assertNotNull(response.getEntity());
     Assert.assertEquals(1, ((Map) response.getEntity()).size());
-    Assert.assertTrue(((Map) response.getEntity()).containsKey("datasource1"));
-    Assert.assertEquals(100.0, ((Map) response.getEntity()).get("datasource1"));
+    Assert.assertTrue(((Map) response.getEntity()).containsKey(TestDataSource.WIKI));
+    Assert.assertEquals(100.0, ((Map) response.getEntity()).get(TestDataSource.WIKI));
     EasyMock.verify(segmentsMetadataManager, inventoryView);
     EasyMock.reset(segmentsMetadataManager, inventoryView);
 
     // Test when datasource half loaded
-    EasyMock.expect(segmentsMetadataManager.iterateAllUsedNonOvershadowedSegmentsForDatasourceInterval(EasyMock.eq("datasource1"), EasyMock.anyObject(Interval.class), EasyMock.anyBoolean()))
+    EasyMock.expect(segmentsMetadataManager.iterateAllUsedNonOvershadowedSegmentsForDatasourceInterval(EasyMock.eq(TestDataSource.WIKI), EasyMock.anyObject(Interval.class), EasyMock.anyBoolean()))
             .andReturn(Optional.of(segments)).once();
     EasyMock.expect(inventoryView.getLoadInfoForAllSegments()).andReturn(halfLoadedInfoMap).once();
     EasyMock.replay(segmentsMetadataManager, inventoryView);
 
-    dataSourcesResource = createResource();
-    response = dataSourcesResource.getDatasourceLoadstatus("datasource1", true, null, null, null, null);
+    response = dataSourcesResource.getDatasourceLoadstatus(TestDataSource.WIKI, true, null, null, null, null);
     Assert.assertEquals(200, response.getStatus());
     Assert.assertNotNull(response.getEntity());
     Assert.assertEquals(1, ((Map) response.getEntity()).size());
-    Assert.assertTrue(((Map) response.getEntity()).containsKey("datasource1"));
-    Assert.assertEquals(50.0, ((Map) response.getEntity()).get("datasource1"));
+    Assert.assertTrue(((Map) response.getEntity()).containsKey(TestDataSource.WIKI));
+    Assert.assertEquals(50.0, ((Map) response.getEntity()).get(TestDataSource.WIKI));
     EasyMock.verify(segmentsMetadataManager, inventoryView);
   }
 
@@ -1520,7 +1529,7 @@ public void testGetDatasourceLoadstatusDefault()
   public void testGetDatasourceLoadstatusSimple()
   {
     DataSegment datasource1Segment1 = new DataSegment(
-        "datasource1",
+        TestDataSource.WIKI,
         Intervals.of("2010-01-01/P1D"),
         "",
         null,
@@ -1532,7 +1541,7 @@ public void testGetDatasourceLoadstatusSimple()
     );
 
     DataSegment datasource1Segment2 = new DataSegment(
-        "datasource1",
+        TestDataSource.WIKI,
         Intervals.of("2010-01-22/P1D"),
         "",
         null,
@@ -1543,7 +1552,7 @@ public void testGetDatasourceLoadstatusSimple()
         20
     );
     DataSegment datasource2Segment1 = new DataSegment(
-        "datasource2",
+        TestDataSource.KOALA,
         Intervals.of("2010-01-01/P1D"),
         "",
         null,
@@ -1564,34 +1573,32 @@ public void testGetDatasourceLoadstatusSimple()
     );
 
     // Test when datasource fully loaded
-    EasyMock.expect(segmentsMetadataManager.iterateAllUsedNonOvershadowedSegmentsForDatasourceInterval(EasyMock.eq("datasource1"), EasyMock.anyObject(Interval.class), EasyMock.anyBoolean()))
+    EasyMock.expect(segmentsMetadataManager.iterateAllUsedNonOvershadowedSegmentsForDatasourceInterval(EasyMock.eq(TestDataSource.WIKI), EasyMock.anyObject(Interval.class), EasyMock.anyBoolean()))
             .andReturn(Optional.of(segments)).once();
     EasyMock.expect(inventoryView.getLoadInfoForAllSegments()).andReturn(completedLoadInfoMap).once();
     EasyMock.replay(segmentsMetadataManager, inventoryView);
 
-    DataSourcesResource dataSourcesResource = createResource();
-    Response response = dataSourcesResource.getDatasourceLoadstatus("datasource1", true, null, "simple", null, null);
+    Response response = dataSourcesResource.getDatasourceLoadstatus(TestDataSource.WIKI, true, null, "simple", null, null);
     Assert.assertEquals(200, response.getStatus());
     Assert.assertNotNull(response.getEntity());
     Assert.assertEquals(1, ((Map) response.getEntity()).size());
-    Assert.assertTrue(((Map) response.getEntity()).containsKey("datasource1"));
-    Assert.assertEquals(0, ((Map) response.getEntity()).get("datasource1"));
+    Assert.assertTrue(((Map) response.getEntity()).containsKey(TestDataSource.WIKI));
+    Assert.assertEquals(0, ((Map) response.getEntity()).get(TestDataSource.WIKI));
     EasyMock.verify(segmentsMetadataManager, inventoryView);
     EasyMock.reset(segmentsMetadataManager, inventoryView);
 
     // Test when datasource half loaded
-    EasyMock.expect(segmentsMetadataManager.iterateAllUsedNonOvershadowedSegmentsForDatasourceInterval(EasyMock.eq("datasource1"), EasyMock.anyObject(Interval.class), EasyMock.anyBoolean()))
+    EasyMock.expect(segmentsMetadataManager.iterateAllUsedNonOvershadowedSegmentsForDatasourceInterval(EasyMock.eq(TestDataSource.WIKI), EasyMock.anyObject(Interval.class), EasyMock.anyBoolean()))
             .andReturn(Optional.of(segments)).once();
     EasyMock.expect(inventoryView.getLoadInfoForAllSegments()).andReturn(halfLoadedInfoMap).once();
     EasyMock.replay(segmentsMetadataManager, inventoryView);
 
-    dataSourcesResource = createResource();
-    response = dataSourcesResource.getDatasourceLoadstatus("datasource1", true, null, "simple", null, null);
+    response = dataSourcesResource.getDatasourceLoadstatus(TestDataSource.WIKI, true, null, "simple", null, null);
     Assert.assertEquals(200, response.getStatus());
     Assert.assertNotNull(response.getEntity());
     Assert.assertEquals(1, ((Map) response.getEntity()).size());
-    Assert.assertTrue(((Map) response.getEntity()).containsKey("datasource1"));
-    Assert.assertEquals(1, ((Map) response.getEntity()).get("datasource1"));
+    Assert.assertTrue(((Map) response.getEntity()).containsKey(TestDataSource.WIKI));
+    Assert.assertEquals(1, ((Map) response.getEntity()).get(TestDataSource.WIKI));
     EasyMock.verify(segmentsMetadataManager, inventoryView);
   }
 
@@ -1599,7 +1606,7 @@ public void testGetDatasourceLoadstatusSimple()
   public void testGetDatasourceLoadstatusFull()
   {
     DataSegment datasource1Segment1 = new DataSegment(
-        "datasource1",
+        TestDataSource.WIKI,
         Intervals.of("2010-01-01/P1D"),
         "",
         null,
@@ -1611,7 +1618,7 @@ public void testGetDatasourceLoadstatusFull()
     );
 
     DataSegment datasource1Segment2 = new DataSegment(
-        "datasource1",
+        TestDataSource.WIKI,
         Intervals.of("2010-01-22/P1D"),
         "",
         null,
@@ -1625,14 +1632,14 @@ public void testGetDatasourceLoadstatusFull()
 
     final Map<String, Object2LongMap<String>> underReplicationCountsPerDataSourcePerTier = new HashMap<>();
     Object2LongMap<String> tier1 = new Object2LongOpenHashMap<>();
-    tier1.put("datasource1", 0L);
+    tier1.put(TestDataSource.WIKI, 0L);
     Object2LongMap<String> tier2 = new Object2LongOpenHashMap<>();
-    tier2.put("datasource1", 3L);
+    tier2.put(TestDataSource.WIKI, 3L);
     underReplicationCountsPerDataSourcePerTier.put("tier1", tier1);
     underReplicationCountsPerDataSourcePerTier.put("tier2", tier2);
 
     // Test when datasource fully loaded
-    EasyMock.expect(segmentsMetadataManager.iterateAllUsedNonOvershadowedSegmentsForDatasourceInterval(EasyMock.eq("datasource1"), EasyMock.anyObject(Interval.class), EasyMock.anyBoolean()))
+    EasyMock.expect(segmentsMetadataManager.iterateAllUsedNonOvershadowedSegmentsForDatasourceInterval(EasyMock.eq(TestDataSource.WIKI), EasyMock.anyObject(Interval.class), EasyMock.anyBoolean()))
             .andReturn(Optional.of(segments)).once();
     DruidCoordinator druidCoordinator = EasyMock.createMock(DruidCoordinator.class);
     EasyMock.expect(druidCoordinator.getTierToDatasourceToUnderReplicatedCount(segments, false))
@@ -1642,14 +1649,14 @@ public void testGetDatasourceLoadstatusFull()
 
     DataSourcesResource dataSourcesResource =
         new DataSourcesResource(null, segmentsMetadataManager, null, null, null, druidCoordinator, auditManager);
-    Response response = dataSourcesResource.getDatasourceLoadstatus("datasource1", true, null, null, "full", null);
+    Response response = dataSourcesResource.getDatasourceLoadstatus(TestDataSource.WIKI, true, null, null, "full", null);
     Assert.assertEquals(200, response.getStatus());
     Assert.assertNotNull(response.getEntity());
     Assert.assertEquals(2, ((Map) response.getEntity()).size());
     Assert.assertEquals(1, ((Map) ((Map) response.getEntity()).get("tier1")).size());
     Assert.assertEquals(1, ((Map) ((Map) response.getEntity()).get("tier2")).size());
-    Assert.assertEquals(0L, ((Map) ((Map) response.getEntity()).get("tier1")).get("datasource1"));
-    Assert.assertEquals(3L, ((Map) ((Map) response.getEntity()).get("tier2")).get("datasource1"));
+    Assert.assertEquals(0L, ((Map) ((Map) response.getEntity()).get("tier1")).get(TestDataSource.WIKI));
+    Assert.assertEquals(3L, ((Map) ((Map) response.getEntity()).get("tier2")).get(TestDataSource.WIKI));
     EasyMock.verify(segmentsMetadataManager);
   }
 
@@ -1657,7 +1664,7 @@ public void testGetDatasourceLoadstatusFull()
   public void testGetDatasourceLoadstatusFullAndComputeUsingClusterView()
   {
     DataSegment datasource1Segment1 = new DataSegment(
-        "datasource1",
+        TestDataSource.WIKI,
         Intervals.of("2010-01-01/P1D"),
         "",
         null,
@@ -1669,7 +1676,7 @@ public void testGetDatasourceLoadstatusFullAndComputeUsingClusterView()
     );
 
     DataSegment datasource1Segment2 = new DataSegment(
-        "datasource1",
+        TestDataSource.WIKI,
         Intervals.of("2010-01-22/P1D"),
         "",
         null,
@@ -1683,14 +1690,14 @@ public void testGetDatasourceLoadstatusFullAndComputeUsingClusterView()
 
     final Map<String, Object2LongMap<String>> underReplicationCountsPerDataSourcePerTier = new HashMap<>();
     Object2LongMap<String> tier1 = new Object2LongOpenHashMap<>();
-    tier1.put("datasource1", 0L);
+    tier1.put(TestDataSource.WIKI, 0L);
     Object2LongMap<String> tier2 = new Object2LongOpenHashMap<>();
-    tier2.put("datasource1", 3L);
+    tier2.put(TestDataSource.WIKI, 3L);
     underReplicationCountsPerDataSourcePerTier.put("tier1", tier1);
     underReplicationCountsPerDataSourcePerTier.put("tier2", tier2);
 
     // Test when datasource fully loaded
-    EasyMock.expect(segmentsMetadataManager.iterateAllUsedNonOvershadowedSegmentsForDatasourceInterval(EasyMock.eq("datasource1"), EasyMock.anyObject(Interval.class), EasyMock.anyBoolean()))
+    EasyMock.expect(segmentsMetadataManager.iterateAllUsedNonOvershadowedSegmentsForDatasourceInterval(EasyMock.eq(TestDataSource.WIKI), EasyMock.anyObject(Interval.class), EasyMock.anyBoolean()))
             .andReturn(Optional.of(segments)).once();
     DruidCoordinator druidCoordinator = EasyMock.createMock(DruidCoordinator.class);
     EasyMock.expect(druidCoordinator.getTierToDatasourceToUnderReplicatedCount(segments, true))
@@ -1700,14 +1707,14 @@ public void testGetDatasourceLoadstatusFullAndComputeUsingClusterView()
 
     DataSourcesResource dataSourcesResource =
         new DataSourcesResource(null, segmentsMetadataManager, null, null, null, druidCoordinator, auditManager);
-    Response response = dataSourcesResource.getDatasourceLoadstatus("datasource1", true, null, null, "full", "computeUsingClusterView");
+    Response response = dataSourcesResource.getDatasourceLoadstatus(TestDataSource.WIKI, true, null, null, "full", "computeUsingClusterView");
     Assert.assertEquals(200, response.getStatus());
     Assert.assertNotNull(response.getEntity());
     Assert.assertEquals(2, ((Map) response.getEntity()).size());
     Assert.assertEquals(1, ((Map) ((Map) response.getEntity()).get("tier1")).size());
     Assert.assertEquals(1, ((Map) ((Map) response.getEntity()).get("tier2")).size());
-    Assert.assertEquals(0L, ((Map) ((Map) response.getEntity()).get("tier1")).get("datasource1"));
-    Assert.assertEquals(3L, ((Map) ((Map) response.getEntity()).get("tier2")).get("datasource1"));
+    Assert.assertEquals(0L, ((Map) ((Map) response.getEntity()).get("tier1")).get(TestDataSource.WIKI));
+    Assert.assertEquals(3L, ((Map) ((Map) response.getEntity()).get("tier2")).get(TestDataSource.WIKI));
     EasyMock.verify(segmentsMetadataManager);
   }
 
@@ -1753,17 +1760,4 @@ private void prepareRequestForAudit()
 
     EasyMock.replay(request);
   }
-
-  private DataSourcesResource createResource()
-  {
-    return new DataSourcesResource(
-        inventoryView,
-        segmentsMetadataManager,
-        null,
-        null,
-        AuthTestUtils.TEST_AUTHORIZER_MAPPER,
-        null,
-        auditManager
-    );
-  }
 }
diff --git a/services/src/main/java/org/apache/druid/cli/CliOverlord.java b/services/src/main/java/org/apache/druid/cli/CliOverlord.java
index 52962ddf4c1e..67a36ed1ff54 100644
--- a/services/src/main/java/org/apache/druid/cli/CliOverlord.java
+++ b/services/src/main/java/org/apache/druid/cli/CliOverlord.java
@@ -95,6 +95,7 @@
 import org.apache.druid.indexing.overlord.hrtr.HttpRemoteTaskRunnerFactory;
 import org.apache.druid.indexing.overlord.hrtr.HttpRemoteTaskRunnerResource;
 import org.apache.druid.indexing.overlord.http.OverlordCompactionResource;
+import org.apache.druid.indexing.overlord.http.OverlordDataSourcesResource;
 import org.apache.druid.indexing.overlord.http.OverlordRedirectInfo;
 import org.apache.druid.indexing.overlord.http.OverlordResource;
 import org.apache.druid.indexing.overlord.sampler.SamplerModule;
@@ -299,6 +300,7 @@ public void configure(Binder binder)
             Jerseys.addResource(binder, SupervisorResource.class);
             Jerseys.addResource(binder, HttpRemoteTaskRunnerResource.class);
             Jerseys.addResource(binder, OverlordCompactionResource.class);
+            Jerseys.addResource(binder, OverlordDataSourcesResource.class);
 
 
             binder.bind(AppenderatorsManager.class)
diff --git a/sql/src/test/java/org/apache/druid/sql/calcite/schema/DruidCalciteSchemaModuleTest.java b/sql/src/test/java/org/apache/druid/sql/calcite/schema/DruidCalciteSchemaModuleTest.java
index c419d04d92cc..c865f6a854cd 100644
--- a/sql/src/test/java/org/apache/druid/sql/calcite/schema/DruidCalciteSchemaModuleTest.java
+++ b/sql/src/test/java/org/apache/druid/sql/calcite/schema/DruidCalciteSchemaModuleTest.java
@@ -34,7 +34,6 @@
 import org.apache.druid.client.coordinator.CoordinatorClient;
 import org.apache.druid.client.coordinator.NoopCoordinatorClient;
 import org.apache.druid.client.indexing.IndexingService;
-import org.apache.druid.client.indexing.NoopOverlordClient;
 import org.apache.druid.discovery.DruidLeaderClient;
 import org.apache.druid.discovery.DruidNodeDiscoveryProvider;
 import org.apache.druid.guice.LazySingleton;
@@ -43,6 +42,7 @@
 import org.apache.druid.java.util.emitter.service.ServiceEmitter;
 import org.apache.druid.query.lookup.LookupExtractorFactoryContainerProvider;
 import org.apache.druid.query.lookup.LookupReferencesManager;
+import org.apache.druid.rpc.indexing.NoopOverlordClient;
 import org.apache.druid.rpc.indexing.OverlordClient;
 import org.apache.druid.segment.join.JoinableFactory;
 import org.apache.druid.segment.join.MapJoinableFactory;
diff --git a/sql/src/test/java/org/apache/druid/sql/calcite/util/CalciteTests.java b/sql/src/test/java/org/apache/druid/sql/calcite/util/CalciteTests.java
index 04845efa1652..14f5729a747c 100644
--- a/sql/src/test/java/org/apache/druid/sql/calcite/util/CalciteTests.java
+++ b/sql/src/test/java/org/apache/druid/sql/calcite/util/CalciteTests.java
@@ -32,7 +32,6 @@
 import org.apache.druid.client.FilteredServerInventoryView;
 import org.apache.druid.client.ServerInventoryView;
 import org.apache.druid.client.ServerView;
-import org.apache.druid.client.indexing.NoopOverlordClient;
 import org.apache.druid.discovery.DiscoveryDruidNode;
 import org.apache.druid.discovery.DruidLeaderClient;
 import org.apache.druid.discovery.DruidNodeDiscovery;
@@ -53,6 +52,7 @@
 import org.apache.druid.math.expr.ExprMacroTable;
 import org.apache.druid.query.QueryRunnerFactoryConglomerate;
 import org.apache.druid.query.QuerySegmentWalker;
+import org.apache.druid.rpc.indexing.NoopOverlordClient;
 import org.apache.druid.rpc.indexing.OverlordClient;
 import org.apache.druid.segment.join.JoinableFactory;
 import org.apache.druid.segment.join.JoinableFactoryWrapper;
diff --git a/sql/src/test/java/org/apache/druid/sql/guice/SqlModuleTest.java b/sql/src/test/java/org/apache/druid/sql/guice/SqlModuleTest.java
index 3801ef2888b5..b4437045fe1a 100644
--- a/sql/src/test/java/org/apache/druid/sql/guice/SqlModuleTest.java
+++ b/sql/src/test/java/org/apache/druid/sql/guice/SqlModuleTest.java
@@ -33,7 +33,6 @@
 import org.apache.druid.client.coordinator.CoordinatorClient;
 import org.apache.druid.client.coordinator.NoopCoordinatorClient;
 import org.apache.druid.client.indexing.IndexingService;
-import org.apache.druid.client.indexing.NoopOverlordClient;
 import org.apache.druid.discovery.DruidLeaderClient;
 import org.apache.druid.discovery.DruidNodeDiscoveryProvider;
 import org.apache.druid.guice.DruidGuiceExtensions;
@@ -52,6 +51,7 @@
 import org.apache.druid.query.QuerySegmentWalker;
 import org.apache.druid.query.QueryToolChestWarehouse;
 import org.apache.druid.query.lookup.LookupExtractorFactoryContainerProvider;
+import org.apache.druid.rpc.indexing.NoopOverlordClient;
 import org.apache.druid.rpc.indexing.OverlordClient;
 import org.apache.druid.segment.join.JoinableFactory;
 import org.apache.druid.segment.loading.SegmentCacheManager;

From ca8f24edd3492b3e7b736d9d036c945304e6563a Mon Sep 17 00:00:00 2001
From: Akshat Jain <akjn11@gmail.com>
Date: Thu, 19 Dec 2024 09:08:20 +0530
Subject: [PATCH 51/56] Upgrade Guice to 5.1.0 (#17578)

* Move Guice to 5.1.0 and fix tests
* Fix checkstyle
* Revert overrideCurrentGuiceModules() and related changes
* Fix the tests
* Try using maven:3-openjdk-17-slim
* Try enabling debugging for mvn command
* Use maven:3.9 image
* Address review comment: Fix formatting
* Address review comment: Add brief javadoc for ExceptionMatcher
---------
Co-authored-by: imply-cheddar <86940447+imply-cheddar@users.noreply.github.com>
---
 benchmarks/pom.xml                            |   5 -
 distribution/docker/Dockerfile                |   2 +-
 .../aliyun-oss-extensions/pom.xml             |   5 -
 extensions-contrib/cassandra-storage/pom.xml  |   5 -
 .../cloudfiles-extensions/pom.xml             |   6 -
 extensions-contrib/grpc-query/pom.xml         |   5 -
 .../kubernetes-overlord-extensions/pom.xml    |   5 -
 .../materialized-view-selection/pom.xml       |   5 -
 .../moving-average-query/pom.xml              |   5 -
 .../sqlserver-metadata-storage/pom.xml        |   5 -
 extensions-core/azure-extensions/pom.xml      |   5 -
 extensions-core/google-extensions/pom.xml     |   5 -
 extensions-core/hdfs-storage/pom.xml          |   6 +-
 extensions-core/kubernetes-extensions/pom.xml |   5 -
 extensions-core/lookups-cached-global/pom.xml |   5 -
 extensions-core/multi-stage-query/pom.xml     |   5 -
 .../mysql-metadata-storage/pom.xml            |   5 -
 .../postgresql-metadata-storage/pom.xml       |   6 +-
 extensions-core/s3-extensions/pom.xml         |   5 -
 indexing-service/pom.xml                      |   6 +-
 integration-tests-ex/cases/pom.xml            |   5 -
 integration-tests/pom.xml                     |   6 +-
 licenses.yaml                                 |   6 +-
 pom.xml                                       |   7 +-
 processing/pom.xml                            |   6 +-
 .../util/emitter/service/ServiceEmitter.java  |   4 +-
 .../apache/druid/error/ExceptionMatcher.java  | 111 ++++++++++++++++++
 .../org/apache/druid/guice/PolyBindTest.java  |  40 +++----
 .../query/DruidProcessingConfigTest.java      |  16 +--
 quidem-ut/pom.xml                             |   4 -
 server/pom.xml                                |   6 +-
 .../druid/guice/StorageNodeModuleTest.java    |  74 +++++++-----
 .../druid/server/QuerySchedulerTest.java      |  37 +++---
 services/pom.xml                              |   6 +-
 sql/pom.xml                                   |   6 +-
 35 files changed, 208 insertions(+), 227 deletions(-)
 create mode 100644 processing/src/test/java/org/apache/druid/error/ExceptionMatcher.java

diff --git a/benchmarks/pom.xml b/benchmarks/pom.xml
index bd8c89b4d7f6..c578cfb10bef 100644
--- a/benchmarks/pom.xml
+++ b/benchmarks/pom.xml
@@ -61,11 +61,6 @@
       <groupId>org.easymock</groupId>
       <artifactId>easymock</artifactId>
     </dependency>
-    <dependency>
-      <groupId>com.google.inject.extensions</groupId>
-      <artifactId>guice-multibindings</artifactId>
-      <scope>provided</scope>
-    </dependency>
     <dependency>
       <groupId>org.apache.druid</groupId>
       <artifactId>druid-processing</artifactId>
diff --git a/distribution/docker/Dockerfile b/distribution/docker/Dockerfile
index 0ac517a29ba1..6b16ec2b94f3 100644
--- a/distribution/docker/Dockerfile
+++ b/distribution/docker/Dockerfile
@@ -23,7 +23,7 @@ ARG JDK_VERSION=17
 # This is because it's not able to build the distribution on arm64 due to dependency problem of web-console. See: https://github.com/apache/druid/issues/13012
 # Since only java jars are shipped in the final image, it's OK to build the distribution on x64.
 # Once the web-console dependency problem is resolved, we can remove the --platform directive.
-FROM --platform=linux/amd64 maven:3.8.4-openjdk-17-slim as builder
+FROM --platform=linux/amd64 maven:3.9 as builder
 
 # Rebuild from source in this stage
 # This can be unset if the tarball was already built outside of Docker
diff --git a/extensions-contrib/aliyun-oss-extensions/pom.xml b/extensions-contrib/aliyun-oss-extensions/pom.xml
index 82ee50eddf97..77c76c28806a 100644
--- a/extensions-contrib/aliyun-oss-extensions/pom.xml
+++ b/extensions-contrib/aliyun-oss-extensions/pom.xml
@@ -80,11 +80,6 @@
             <artifactId>jackson-core</artifactId>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>com.google.inject.extensions</groupId>
-            <artifactId>guice-multibindings</artifactId>
-            <scope>provided</scope>
-        </dependency>
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
diff --git a/extensions-contrib/cassandra-storage/pom.xml b/extensions-contrib/cassandra-storage/pom.xml
index 7b5fc2be1831..5a2504bd825c 100644
--- a/extensions-contrib/cassandra-storage/pom.xml
+++ b/extensions-contrib/cassandra-storage/pom.xml
@@ -174,11 +174,6 @@
             <artifactId>jackson-core</artifactId>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>com.google.inject.extensions</groupId>
-            <artifactId>guice-multibindings</artifactId>
-            <scope>provided</scope>
-        </dependency>
 
         <!-- Tests -->
         <dependency>
diff --git a/extensions-contrib/cloudfiles-extensions/pom.xml b/extensions-contrib/cloudfiles-extensions/pom.xml
index 0fd5018d1311..e5076e1d2284 100644
--- a/extensions-contrib/cloudfiles-extensions/pom.xml
+++ b/extensions-contrib/cloudfiles-extensions/pom.xml
@@ -56,12 +56,6 @@
             </exclusions>
             <!--$NO-MVN-MAN-VER$ -->
         </dependency>
-        <dependency>
-            <groupId>com.google.inject.extensions</groupId>
-            <artifactId>guice-multibindings</artifactId>
-            <scope>provided</scope>
-            <!--$NO-MVN-MAN-VER$ -->
-        </dependency>
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
diff --git a/extensions-contrib/grpc-query/pom.xml b/extensions-contrib/grpc-query/pom.xml
index e46f0c35fd2d..0eb714419373 100644
--- a/extensions-contrib/grpc-query/pom.xml
+++ b/extensions-contrib/grpc-query/pom.xml
@@ -96,11 +96,6 @@
       <artifactId>jackson-core</artifactId>
       <scope>provided</scope>
     </dependency>
-    <dependency>
-      <groupId>com.google.inject.extensions</groupId>
-      <artifactId>guice-multibindings</artifactId>
-      <scope>provided</scope>
-    </dependency>
     <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
diff --git a/extensions-contrib/kubernetes-overlord-extensions/pom.xml b/extensions-contrib/kubernetes-overlord-extensions/pom.xml
index 55f970fb9c39..1d63a351c598 100644
--- a/extensions-contrib/kubernetes-overlord-extensions/pom.xml
+++ b/extensions-contrib/kubernetes-overlord-extensions/pom.xml
@@ -212,11 +212,6 @@
       <artifactId>jackson-databind</artifactId>
       <scope>provided</scope>
     </dependency>
-    <dependency>
-      <groupId>com.google.inject.extensions</groupId>
-      <artifactId>guice-multibindings</artifactId>
-      <scope>provided</scope>
-    </dependency>
     <dependency>
       <groupId>joda-time</groupId>
       <artifactId>joda-time</artifactId>
diff --git a/extensions-contrib/materialized-view-selection/pom.xml b/extensions-contrib/materialized-view-selection/pom.xml
index 4e44bfde5c6c..1cc85426d2b6 100644
--- a/extensions-contrib/materialized-view-selection/pom.xml
+++ b/extensions-contrib/materialized-view-selection/pom.xml
@@ -84,11 +84,6 @@
             <artifactId>jackson-core</artifactId>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>com.google.inject.extensions</groupId>
-            <artifactId>guice-multibindings</artifactId>
-            <scope>provided</scope>
-        </dependency>
         <dependency>
             <groupId>org.jdbi</groupId>
             <artifactId>jdbi</artifactId>
diff --git a/extensions-contrib/moving-average-query/pom.xml b/extensions-contrib/moving-average-query/pom.xml
index 119296634566..d948bec36867 100644
--- a/extensions-contrib/moving-average-query/pom.xml
+++ b/extensions-contrib/moving-average-query/pom.xml
@@ -79,11 +79,6 @@
       <artifactId>jackson-core</artifactId>
       <scope>provided</scope>
     </dependency>
-    <dependency>
-      <groupId>com.google.inject.extensions</groupId>
-      <artifactId>guice-multibindings</artifactId>
-      <scope>provided</scope>
-    </dependency>
     <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
diff --git a/extensions-contrib/sqlserver-metadata-storage/pom.xml b/extensions-contrib/sqlserver-metadata-storage/pom.xml
index 1fd186f9dc84..37e39c3f5eae 100644
--- a/extensions-contrib/sqlserver-metadata-storage/pom.xml
+++ b/extensions-contrib/sqlserver-metadata-storage/pom.xml
@@ -67,11 +67,6 @@
             <artifactId>jackson-databind</artifactId>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>com.google.inject.extensions</groupId>
-            <artifactId>guice-multibindings</artifactId>
-            <scope>provided</scope>
-        </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-dbcp2</artifactId>
diff --git a/extensions-core/azure-extensions/pom.xml b/extensions-core/azure-extensions/pom.xml
index af36456bbe70..990913c0328d 100644
--- a/extensions-core/azure-extensions/pom.xml
+++ b/extensions-core/azure-extensions/pom.xml
@@ -111,11 +111,6 @@
             <artifactId>jackson-core</artifactId>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>com.google.inject.extensions</groupId>
-            <artifactId>guice-multibindings</artifactId>
-            <scope>provided</scope>
-        </dependency>
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
diff --git a/extensions-core/google-extensions/pom.xml b/extensions-core/google-extensions/pom.xml
index 39f89a2e5a53..e83a85f55535 100644
--- a/extensions-core/google-extensions/pom.xml
+++ b/extensions-core/google-extensions/pom.xml
@@ -82,11 +82,6 @@
             <artifactId>jackson-core</artifactId>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>com.google.inject.extensions</groupId>
-            <artifactId>guice-multibindings</artifactId>
-            <scope>provided</scope>
-        </dependency>
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
diff --git a/extensions-core/hdfs-storage/pom.xml b/extensions-core/hdfs-storage/pom.xml
index ac8f7878e5d6..881ba1884716 100644
--- a/extensions-core/hdfs-storage/pom.xml
+++ b/extensions-core/hdfs-storage/pom.xml
@@ -88,11 +88,7 @@
             <artifactId>jackson-core</artifactId>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>com.google.inject.extensions</groupId>
-            <artifactId>guice-multibindings</artifactId>
-            <scope>provided</scope>
-        </dependency>
+
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
diff --git a/extensions-core/kubernetes-extensions/pom.xml b/extensions-core/kubernetes-extensions/pom.xml
index 6ef180795e25..e9ca2cae0e35 100644
--- a/extensions-core/kubernetes-extensions/pom.xml
+++ b/extensions-core/kubernetes-extensions/pom.xml
@@ -109,11 +109,6 @@
       <artifactId>jackson-databind</artifactId>
       <scope>provided</scope>
     </dependency>
-    <dependency>
-      <groupId>com.google.inject.extensions</groupId>
-      <artifactId>guice-multibindings</artifactId>
-      <scope>provided</scope>
-    </dependency>
     <dependency>
       <groupId>joda-time</groupId>
       <artifactId>joda-time</artifactId>
diff --git a/extensions-core/lookups-cached-global/pom.xml b/extensions-core/lookups-cached-global/pom.xml
index 6fed0c9cb17b..287c6a0d89cf 100644
--- a/extensions-core/lookups-cached-global/pom.xml
+++ b/extensions-core/lookups-cached-global/pom.xml
@@ -84,11 +84,6 @@
       <artifactId>jackson-core</artifactId>
       <scope>provided</scope>
     </dependency>
-    <dependency>
-      <groupId>com.google.inject.extensions</groupId>
-      <artifactId>guice-multibindings</artifactId>
-      <scope>provided</scope>
-    </dependency>
     <dependency>
       <groupId>org.jdbi</groupId>
       <artifactId>jdbi</artifactId>
diff --git a/extensions-core/multi-stage-query/pom.xml b/extensions-core/multi-stage-query/pom.xml
index e2a7252908df..f80c4edaef83 100644
--- a/extensions-core/multi-stage-query/pom.xml
+++ b/extensions-core/multi-stage-query/pom.xml
@@ -71,11 +71,6 @@
             <artifactId>guice</artifactId>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>com.google.inject.extensions</groupId>
-            <artifactId>guice-multibindings</artifactId>
-            <scope>provided</scope>
-        </dependency>
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
diff --git a/extensions-core/mysql-metadata-storage/pom.xml b/extensions-core/mysql-metadata-storage/pom.xml
index 57f5ab4f12aa..103bb005f4ea 100644
--- a/extensions-core/mysql-metadata-storage/pom.xml
+++ b/extensions-core/mysql-metadata-storage/pom.xml
@@ -78,11 +78,6 @@
             <artifactId>jackson-databind</artifactId>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>com.google.inject.extensions</groupId>
-            <artifactId>guice-multibindings</artifactId>
-            <scope>provided</scope>
-        </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-dbcp2</artifactId>
diff --git a/extensions-core/postgresql-metadata-storage/pom.xml b/extensions-core/postgresql-metadata-storage/pom.xml
index 9c4159e36e81..fafd54869abb 100644
--- a/extensions-core/postgresql-metadata-storage/pom.xml
+++ b/extensions-core/postgresql-metadata-storage/pom.xml
@@ -76,11 +76,7 @@
             <artifactId>jackson-databind</artifactId>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>com.google.inject.extensions</groupId>
-            <artifactId>guice-multibindings</artifactId>
-            <scope>provided</scope>
-        </dependency>
+
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-dbcp2</artifactId>
diff --git a/extensions-core/s3-extensions/pom.xml b/extensions-core/s3-extensions/pom.xml
index cb9a03a5bae8..04df8b58f96f 100644
--- a/extensions-core/s3-extensions/pom.xml
+++ b/extensions-core/s3-extensions/pom.xml
@@ -87,11 +87,6 @@
       <artifactId>jackson-core</artifactId>
       <scope>provided</scope>
     </dependency>
-    <dependency>
-      <groupId>com.google.inject.extensions</groupId>
-      <artifactId>guice-multibindings</artifactId>
-      <scope>provided</scope>
-    </dependency>
     <dependency>
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-lang3</artifactId>
diff --git a/indexing-service/pom.xml b/indexing-service/pom.xml
index 412568ea88c9..dd28de400cc2 100644
--- a/indexing-service/pom.xml
+++ b/indexing-service/pom.xml
@@ -88,11 +88,7 @@
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.google.inject.extensions</groupId>
-            <artifactId>guice-multibindings</artifactId>
-            <scope>provided</scope>
-        </dependency>
+
         <dependency>
             <groupId>javax.ws.rs</groupId>
             <artifactId>jsr311-api</artifactId>
diff --git a/integration-tests-ex/cases/pom.xml b/integration-tests-ex/cases/pom.xml
index 94c42a0555b4..f6c260603277 100644
--- a/integration-tests-ex/cases/pom.xml
+++ b/integration-tests-ex/cases/pom.xml
@@ -83,11 +83,6 @@
             <groupId>com.google.inject</groupId>
             <artifactId>guice</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.google.inject.extensions</groupId>
-            <artifactId>guice-multibindings</artifactId>
-            <scope>provided</scope>
-        </dependency>
         <dependency>
             <groupId>org.apache.curator</groupId>
             <artifactId>curator-framework</artifactId>
diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml
index be57e12bf3dc..411ba0a2d250 100644
--- a/integration-tests/pom.xml
+++ b/integration-tests/pom.xml
@@ -278,11 +278,7 @@
             <groupId>com.google.inject</groupId>
             <artifactId>guice</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.google.inject.extensions</groupId>
-            <artifactId>guice-multibindings</artifactId>
-            <scope>provided</scope>
-        </dependency>
+
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
diff --git a/licenses.yaml b/licenses.yaml
index 8044beb12bab..86ca3df93b65 100644
--- a/licenses.yaml
+++ b/licenses.yaml
@@ -371,19 +371,15 @@ name: Guice
 license_category: binary
 module: java-core
 license_name: Apache License version 2.0
-version: 4.2.2
+version: 5.1.0
 libraries:
   - com.google.inject: guice
-  - com.google.inject.extensions: guice-multibindings
   - com.google.inject.extensions: guice-servlet
   - com.google.inject.extensions: guice-assistedinject
 notices:
   - guice: |
       Google Guice - Core Library
       Copyright 2006-2016 Google, Inc.
-  - guice-multibindings: |
-      Google Guice - Extensions - MultiBindings
-      Copyright 2006-2016 Google, Inc.
   - guice-servlet: |
       Google Guice - Extensions - Servlet
       Copyright 2006-2016 Google, Inc.
diff --git a/pom.xml b/pom.xml
index 3704542d0ce5..b5d2a25cd662 100644
--- a/pom.xml
+++ b/pom.xml
@@ -95,7 +95,7 @@
         <errorprone.version>2.35.1</errorprone.version>
         <fastutil.version>8.5.4</fastutil.version>
         <guava.version>32.0.1-jre</guava.version>
-        <guice.version>4.2.2</guice.version>
+        <guice.version>5.1.0</guice.version>
         <hamcrest.version>1.3</hamcrest.version>
         <jetty.version>9.4.56.v20240826</jetty.version>
         <jersey.version>1.19.4</jersey.version>
@@ -596,11 +596,6 @@
                 <artifactId>guice-servlet</artifactId>
                 <version>${guice.version}</version>
             </dependency>
-            <dependency>
-                <groupId>com.google.inject.extensions</groupId>
-                <artifactId>guice-multibindings</artifactId>
-                <version>${guice.version}</version>
-            </dependency>
             <dependency>
               <groupId>com.google.inject.extensions</groupId>
               <artifactId>guice-assistedinject</artifactId>
diff --git a/processing/pom.xml b/processing/pom.xml
index efcaf62c4b71..c3f758f32139 100644
--- a/processing/pom.xml
+++ b/processing/pom.xml
@@ -103,11 +103,7 @@
       <groupId>com.google.inject</groupId>
       <artifactId>guice</artifactId>
     </dependency>
-    <dependency>
-      <groupId>com.google.inject.extensions</groupId>
-      <artifactId>guice-multibindings</artifactId>
-      <scope>provided</scope>
-    </dependency>
+
     <dependency>
       <groupId>com.google.code.findbugs</groupId>
       <artifactId>jsr305</artifactId>
diff --git a/processing/src/main/java/org/apache/druid/java/util/emitter/service/ServiceEmitter.java b/processing/src/main/java/org/apache/druid/java/util/emitter/service/ServiceEmitter.java
index 17b3ac59db67..13593fd146fc 100644
--- a/processing/src/main/java/org/apache/druid/java/util/emitter/service/ServiceEmitter.java
+++ b/processing/src/main/java/org/apache/druid/java/util/emitter/service/ServiceEmitter.java
@@ -47,8 +47,8 @@ public ServiceEmitter(
   {
     this.serviceDimensions = ImmutableMap
         .<String, String>builder()
-        .put("service", Preconditions.checkNotNull(service))
-        .put("host", Preconditions.checkNotNull(host))
+        .put("service", Preconditions.checkNotNull(service, "service should be non-null"))
+        .put("host", Preconditions.checkNotNull(host, "host should be non-null"))
         .putAll(otherServiceDimensions)
         .build();
     this.emitter = emitter;
diff --git a/processing/src/test/java/org/apache/druid/error/ExceptionMatcher.java b/processing/src/test/java/org/apache/druid/error/ExceptionMatcher.java
new file mode 100644
index 000000000000..31195093254f
--- /dev/null
+++ b/processing/src/test/java/org/apache/druid/error/ExceptionMatcher.java
@@ -0,0 +1,111 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.druid.error;
+
+import org.apache.druid.matchers.DruidMatchers;
+import org.hamcrest.Description;
+import org.hamcrest.DiagnosingMatcher;
+import org.hamcrest.Matcher;
+import org.hamcrest.MatcherAssert;
+import org.hamcrest.Matchers;
+import org.hamcrest.core.AllOf;
+
+import java.util.ArrayList;
+
+/**
+ * A matcher for validating exceptions in unit tests, providing a fluent API for constructing matchers to allow
+ * matching of {@link Throwable} objects, such as verifying exception type, message content, and cause.
+ */
+public class ExceptionMatcher extends DiagnosingMatcher<Throwable>
+{
+
+  public static ExceptionMatcher of(Class<? extends Throwable> clazz)
+  {
+    return new ExceptionMatcher(clazz);
+  }
+
+  private final AllOf<Throwable> delegate;
+  private final ArrayList<Matcher<? super Throwable>> matcherList;
+  private final Class<? extends Throwable> clazz;
+
+  public ExceptionMatcher(Class<? extends Throwable> clazz)
+  {
+    this.clazz = clazz;
+
+    matcherList = new ArrayList<>();
+    delegate = new AllOf<>(matcherList);
+  }
+
+  public ExceptionMatcher expectMessageIs(String s)
+  {
+    return expectMessage(Matchers.equalTo(s));
+  }
+
+  public ExceptionMatcher expectMessageContains(String contains)
+  {
+    return expectMessage(Matchers.containsString(contains));
+  }
+
+  public ExceptionMatcher expectMessage(Matcher<String> messageMatcher)
+  {
+    matcherList.add(0, DruidMatchers.fn("message", Throwable::getMessage, messageMatcher));
+    return this;
+  }
+
+  public ExceptionMatcher expectCause(Matcher<Throwable> causeMatcher)
+  {
+    matcherList.add(0, DruidMatchers.fn("cause", Throwable::getCause, causeMatcher));
+    return this;
+  }
+
+  @Override
+  protected boolean matches(Object item, Description mismatchDescription)
+  {
+    return delegate.matches(item, mismatchDescription);
+  }
+
+  @Override
+  public void describeTo(Description description)
+  {
+    delegate.describeTo(description);
+  }
+
+  public <T> void assertThrowsAndMatches(ThrowingSupplier fn)
+  {
+    boolean thrown = false;
+    try {
+      fn.get();
+    }
+    catch (Throwable e) {
+      if (clazz.isInstance(e)) {
+        MatcherAssert.assertThat(e, this);
+        thrown = true;
+      } else {
+        throw new RuntimeException(e);
+      }
+    }
+    MatcherAssert.assertThat(thrown, Matchers.is(true));
+  }
+
+  public interface ThrowingSupplier
+  {
+    void get() throws Exception;
+  }
+}
diff --git a/processing/src/test/java/org/apache/druid/guice/PolyBindTest.java b/processing/src/test/java/org/apache/druid/guice/PolyBindTest.java
index 372d428458d6..41b46b9a7094 100644
--- a/processing/src/test/java/org/apache/druid/guice/PolyBindTest.java
+++ b/processing/src/test/java/org/apache/druid/guice/PolyBindTest.java
@@ -28,6 +28,7 @@
 import com.google.inject.ProvisionException;
 import com.google.inject.multibindings.MapBinder;
 import com.google.inject.name.Names;
+import org.apache.druid.error.ExceptionMatcher;
 import org.junit.Assert;
 import org.junit.Test;
 
@@ -106,22 +107,16 @@ public void configure(Binder binder)
     Assert.assertEquals("B", injector.getInstance(Gogo.class).go());
     Assert.assertEquals("A", injector.getInstance(Key.get(Gogo.class, Names.named("reverse"))).go());
     props.setProperty("billy", "c");
-    try {
-      Assert.assertEquals("A", injector.getInstance(Gogo.class).go());
-      Assert.fail(); // should never be reached
-    }
-    catch (Exception e) {
-      Assert.assertTrue(e instanceof ProvisionException);
-      Assert.assertTrue(e.getMessage().contains("Unknown provider [c] of Key[type=org.apache.druid.guice.PolyBindTest$Gogo"));
-    }
-    try {
-      Assert.assertEquals("B", injector.getInstance(Key.get(Gogo.class, Names.named("reverse"))).go());
-      Assert.fail(); // should never be reached
-    }
-    catch (Exception e) {
-      Assert.assertTrue(e instanceof ProvisionException);
-      Assert.assertTrue(e.getMessage().contains("Unknown provider [c] of Key[type=org.apache.druid.guice.PolyBindTest$Gogo"));
-    }
+
+    ExceptionMatcher
+        .of(ProvisionException.class)
+        .expectMessageContains("Unknown provider [c] of Key[type=PolyBindTest$Gogo")
+        .assertThrowsAndMatches(() -> injector.getInstance(Gogo.class).go());
+
+    ExceptionMatcher
+        .of(ProvisionException.class)
+        .expectMessageContains("Unknown provider [c] of Key[type=PolyBindTest$Gogo")
+        .assertThrowsAndMatches(() -> injector.getInstance(Key.get(Gogo.class, Names.named("reverse"))).go());
 
     // test default property value
     Assert.assertEquals("B", injector.getInstance(GogoSally.class).go());
@@ -130,14 +125,11 @@ public void configure(Binder binder)
     props.setProperty("sally", "b");
     Assert.assertEquals("B", injector.getInstance(GogoSally.class).go());
     props.setProperty("sally", "c");
-    try {
-      injector.getInstance(GogoSally.class).go();
-      Assert.fail(); // should never be reached
-    }
-    catch (Exception e) {
-      Assert.assertTrue(e instanceof ProvisionException);
-      Assert.assertTrue(e.getMessage().contains("Unknown provider [c] of Key[type=org.apache.druid.guice.PolyBindTest$GogoSally"));
-    }
+
+    ExceptionMatcher
+        .of(ProvisionException.class)
+        .expectMessageContains("Unknown provider [c] of Key[type=PolyBindTest$GogoSally")
+        .assertThrowsAndMatches(() -> injector.getInstance(GogoSally.class).go());
   }
 
   public interface Gogo
diff --git a/processing/src/test/java/org/apache/druid/query/DruidProcessingConfigTest.java b/processing/src/test/java/org/apache/druid/query/DruidProcessingConfigTest.java
index e19fbf755402..2be92dcd31ea 100644
--- a/processing/src/test/java/org/apache/druid/query/DruidProcessingConfigTest.java
+++ b/processing/src/test/java/org/apache/druid/query/DruidProcessingConfigTest.java
@@ -21,6 +21,7 @@
 
 import com.google.inject.Injector;
 import com.google.inject.ProvisionException;
+import org.apache.druid.error.ExceptionMatcher;
 import org.apache.druid.guice.JsonConfigProvider;
 import org.apache.druid.guice.StartupInjectorBuilder;
 import org.apache.druid.utils.JvmUtils;
@@ -133,14 +134,13 @@ public void testInvalidSizeBytes()
         HEAP_SIZE,
         props
     );
-    Throwable t = Assert.assertThrows(
-        ProvisionException.class,
-        () -> injector.getInstance(DruidProcessingConfig.class)
-    );
-    Assert.assertTrue(
-        t.getMessage()
-         .contains("Cannot construct instance of `org.apache.druid.java.util.common.HumanReadableBytes`, problem: Invalid format of number: -1. Negative value is not allowed.")
-    );
+
+    ExceptionMatcher
+        .of(ProvisionException.class)
+        .expectMessageContains(
+            "Cannot construct instance of `HumanReadableBytes`, problem: Invalid format of number: -1. Negative value is not allowed."
+        )
+        .assertThrowsAndMatches(() -> injector.getInstance(DruidProcessingConfig.class));
   }
 
   @Test
diff --git a/quidem-ut/pom.xml b/quidem-ut/pom.xml
index dd88d7fc84fa..6912ec4f2f4e 100644
--- a/quidem-ut/pom.xml
+++ b/quidem-ut/pom.xml
@@ -262,10 +262,6 @@
             <groupId>com.google.inject</groupId>
             <artifactId>guice</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.google.inject.extensions</groupId>
-            <artifactId>guice-multibindings</artifactId>
-        </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
diff --git a/server/pom.xml b/server/pom.xml
index 45ca282f836f..3a411ce703b1 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -107,11 +107,7 @@
             <groupId>com.sun.jersey</groupId>
             <artifactId>jersey-core</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.google.inject.extensions</groupId>
-            <artifactId>guice-multibindings</artifactId>
-            <scope>provided</scope>
-        </dependency>
+
         <dependency>
             <groupId>com.google.inject.extensions</groupId>
             <artifactId>guice-servlet</artifactId>
diff --git a/server/src/test/java/org/apache/druid/guice/StorageNodeModuleTest.java b/server/src/test/java/org/apache/druid/guice/StorageNodeModuleTest.java
index 082361a1c885..0f63572ed731 100644
--- a/server/src/test/java/org/apache/druid/guice/StorageNodeModuleTest.java
+++ b/server/src/test/java/org/apache/druid/guice/StorageNodeModuleTest.java
@@ -26,6 +26,7 @@
 import com.google.inject.name.Names;
 import com.google.inject.util.Modules;
 import org.apache.druid.discovery.DataNodeService;
+import org.apache.druid.error.ExceptionMatcher;
 import org.apache.druid.guice.annotations.Self;
 import org.apache.druid.initialization.Initialization;
 import org.apache.druid.query.DruidProcessingConfig;
@@ -36,11 +37,8 @@
 import org.apache.druid.server.coordination.ServerType;
 import org.junit.Assert;
 import org.junit.Before;
-import org.junit.Rule;
 import org.junit.Test;
-import org.junit.rules.ExpectedException;
 import org.junit.runner.RunWith;
-import org.mockito.Answers;
 import org.mockito.Mock;
 import org.mockito.Mockito;
 import org.mockito.junit.MockitoJUnitRunner;
@@ -52,12 +50,7 @@ public class StorageNodeModuleTest
 {
   private static final boolean INJECT_SERVER_TYPE_CONFIG = true;
 
-  @Rule
-  public ExpectedException exceptionRule = ExpectedException.none();
-
-  @Mock(answer = Answers.RETURNS_MOCKS)
   private DruidNode self;
-  @Mock(answer = Answers.RETURNS_MOCKS)
   private ServerTypeConfig serverTypeConfig;
   @Mock
   private DruidProcessingConfig druidProcessingConfig;
@@ -66,22 +59,23 @@ public class StorageNodeModuleTest
   @Mock
   private StorageLocationConfig storageLocation;
 
-  private Injector injector;
   private StorageNodeModule target;
 
   @Before
   public void setUp()
   {
+    self = new DruidNode("test", "test-host", true, 80, 443, false, true);
+    serverTypeConfig = new ServerTypeConfig(ServerType.HISTORICAL);
+
     Mockito.when(segmentLoaderConfig.getLocations()).thenReturn(Collections.singletonList(storageLocation));
 
     target = new StorageNodeModule();
-    injector = makeInjector(INJECT_SERVER_TYPE_CONFIG);
   }
 
   @Test
   public void testIsSegmentCacheConfiguredIsInjected()
   {
-    Boolean isSegmentCacheConfigured = injector.getInstance(
+    Boolean isSegmentCacheConfigured = injector().getInstance(
         Key.get(Boolean.class, Names.named(StorageNodeModule.IS_SEGMENT_CACHE_CONFIGURED))
     );
     Assert.assertNotNull(isSegmentCacheConfigured);
@@ -92,7 +86,7 @@ public void testIsSegmentCacheConfiguredIsInjected()
   public void testIsSegmentCacheConfiguredWithNoLocationsConfiguredIsInjected()
   {
     mockSegmentCacheNotConfigured();
-    Boolean isSegmentCacheConfigured = injector.getInstance(
+    Boolean isSegmentCacheConfigured = injector().getInstance(
         Key.get(Boolean.class, Names.named(StorageNodeModule.IS_SEGMENT_CACHE_CONFIGURED))
     );
     Assert.assertNotNull(isSegmentCacheConfigured);
@@ -102,27 +96,33 @@ public void testIsSegmentCacheConfiguredWithNoLocationsConfiguredIsInjected()
   @Test
   public void getDataNodeServiceWithNoServerTypeConfigShouldThrowProvisionException()
   {
-    exceptionRule.expect(ProvisionException.class);
-    exceptionRule.expectMessage("Must override the binding for ServerTypeConfig if you want a DataNodeService.");
-    injector = makeInjector(!INJECT_SERVER_TYPE_CONFIG);
-    injector.getInstance(DataNodeService.class);
+    Injector injector = makeInjector(!INJECT_SERVER_TYPE_CONFIG);
+
+    ExceptionMatcher
+        .of(ProvisionException.class)
+        .expectMessageContains("Must override the binding for ServerTypeConfig if you want a DataNodeService.")
+        .assertThrowsAndMatches(() -> injector.getInstance(DataNodeService.class));
   }
 
   @Test
   public void getDataNodeServiceWithNoSegmentCacheConfiguredThrowProvisionException()
   {
-    exceptionRule.expect(ProvisionException.class);
-    exceptionRule.expectMessage("druid.segmentCache.locations must be set on historicals.");
-    Mockito.doReturn(ServerType.HISTORICAL).when(serverTypeConfig).getServerType();
     mockSegmentCacheNotConfigured();
-    injector.getInstance(DataNodeService.class);
+
+    ExceptionMatcher
+        .of(ProvisionException.class)
+        .expectMessageContains("druid.segmentCache.locations must be set on historicals.")
+        .assertThrowsAndMatches(() -> injector().getInstance(DataNodeService.class));
   }
 
   @Test
   public void getDataNodeServiceIsInjectedAsSingleton()
   {
+    final Injector injector = injector();
+
     DataNodeService dataNodeService = injector.getInstance(DataNodeService.class);
     Assert.assertNotNull(dataNodeService);
+
     DataNodeService other = injector.getInstance(DataNodeService.class);
     Assert.assertSame(dataNodeService, other);
   }
@@ -130,7 +130,7 @@ public void getDataNodeServiceIsInjectedAsSingleton()
   @Test
   public void getDataNodeServiceIsInjectedAndDiscoverable()
   {
-    DataNodeService dataNodeService = injector.getInstance(DataNodeService.class);
+    DataNodeService dataNodeService = injector().getInstance(DataNodeService.class);
     Assert.assertNotNull(dataNodeService);
     Assert.assertTrue(dataNodeService.isDiscoverable());
   }
@@ -139,7 +139,8 @@ public void getDataNodeServiceIsInjectedAndDiscoverable()
   public void getDataNodeServiceWithSegmentCacheNotConfiguredIsInjectedAndDiscoverable()
   {
     mockSegmentCacheNotConfigured();
-    DataNodeService dataNodeService = injector.getInstance(DataNodeService.class);
+    serverTypeConfig = new ServerTypeConfig(ServerType.BROKER);
+    DataNodeService dataNodeService = injector().getInstance(DataNodeService.class);
     Assert.assertNotNull(dataNodeService);
     Assert.assertFalse(dataNodeService.isDiscoverable());
   }
@@ -147,8 +148,10 @@ public void getDataNodeServiceWithSegmentCacheNotConfiguredIsInjectedAndDiscover
   @Test
   public void testDruidServerMetadataIsInjectedAsSingleton()
   {
+    final Injector injector = injector();
     DruidServerMetadata druidServerMetadata = injector.getInstance(DruidServerMetadata.class);
     Assert.assertNotNull(druidServerMetadata);
+
     DruidServerMetadata other = injector.getInstance(DruidServerMetadata.class);
     Assert.assertSame(druidServerMetadata, other);
   }
@@ -156,10 +159,17 @@ public void testDruidServerMetadataIsInjectedAsSingleton()
   @Test
   public void testDruidServerMetadataWithNoServerTypeConfigShouldThrowProvisionException()
   {
-    exceptionRule.expect(ProvisionException.class);
-    exceptionRule.expectMessage("Must override the binding for ServerTypeConfig if you want a DruidServerMetadata.");
-    injector = makeInjector(!INJECT_SERVER_TYPE_CONFIG);
-    injector.getInstance(DruidServerMetadata.class);
+    Injector injector = makeInjector(!INJECT_SERVER_TYPE_CONFIG);
+
+    ExceptionMatcher
+        .of(ProvisionException.class)
+        .expectMessageContains("Must override the binding for ServerTypeConfig if you want a DruidServerMetadata.")
+        .assertThrowsAndMatches(() -> injector.getInstance(DruidServerMetadata.class));
+  }
+
+  private Injector injector()
+  {
+    return makeInjector(INJECT_SERVER_TYPE_CONFIG);
   }
 
   private Injector makeInjector(boolean withServerTypeConfig)
@@ -174,13 +184,13 @@ private Injector makeInjector(boolean withServerTypeConfig)
               binder.bind(DruidProcessingConfig.class).toInstance(druidProcessingConfig);
             },
             target).with(
-              (binder) -> {
-                binder.bind(SegmentLoaderConfig.class).toInstance(segmentLoaderConfig);
-                if (withServerTypeConfig) {
-                  binder.bind(ServerTypeConfig.class).toInstance(serverTypeConfig);
+                (binder) -> {
+                  binder.bind(SegmentLoaderConfig.class).toInstance(segmentLoaderConfig);
+                  if (withServerTypeConfig) {
+                    binder.bind(ServerTypeConfig.class).toInstance(serverTypeConfig);
+                  }
                 }
-              }
-                                                                )
+                )
         )));
   }
 
diff --git a/server/src/test/java/org/apache/druid/server/QuerySchedulerTest.java b/server/src/test/java/org/apache/druid/server/QuerySchedulerTest.java
index 40865155e55b..3ed5d5938bf6 100644
--- a/server/src/test/java/org/apache/druid/server/QuerySchedulerTest.java
+++ b/server/src/test/java/org/apache/druid/server/QuerySchedulerTest.java
@@ -31,6 +31,7 @@
 import com.google.inject.Key;
 import com.google.inject.ProvisionException;
 import org.apache.druid.client.SegmentServerSelector;
+import org.apache.druid.error.ExceptionMatcher;
 import org.apache.druid.guice.GuiceInjectors;
 import org.apache.druid.guice.JsonConfigProvider;
 import org.apache.druid.guice.JsonConfigurator;
@@ -68,6 +69,7 @@
 import org.apache.druid.server.scheduling.ManualQueryPrioritizationStrategy;
 import org.apache.druid.server.scheduling.NoQueryLaningStrategy;
 import org.easymock.EasyMock;
+import org.hamcrest.text.StringContainsInOrder;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
@@ -492,16 +494,14 @@ public void testMisConfigHiLo()
     final Properties properties = new Properties();
     properties.setProperty(propertyPrefix + ".laning.strategy", "hilo");
     provider.inject(properties, injector.getInstance(JsonConfigurator.class));
-    Throwable t = Assert.assertThrows(ProvisionException.class, () -> provider.get().get());
-    Assert.assertEquals(
-        "Unable to provision, see the following errors:\n"
-        + "\n"
-        + "1) Problem parsing object at prefix[druid.query.scheduler]: Cannot construct instance of `org.apache.druid.server.scheduling.HiLoQueryLaningStrategy`, problem: maxLowPercent must be set\n"
-        + " at [Source: UNKNOWN; line: -1, column: -1] (through reference chain: org.apache.druid.server.QuerySchedulerProvider[\"laning\"]).\n"
-        + "\n"
-        + "1 error",
-        t.getMessage()
-    );
+    ExceptionMatcher
+        .of(ProvisionException.class)
+        .expectMessage(
+            new StringContainsInOrder(List.of(
+                "Problem parsing object at prefix[druid.query.scheduler]:",
+                "problem: maxLowPercent must be set"
+            ))
+      );
   }
 
   @Test
@@ -550,15 +550,14 @@ public void testMisConfigThreshold()
     properties.setProperty(propertyPrefix + ".prioritization.strategy", "threshold");
     provider.inject(properties, injector.getInstance(JsonConfigurator.class));
     Throwable t = Assert.assertThrows(ProvisionException.class, () -> provider.get().get());
-    Assert.assertEquals(
-        "Unable to provision, see the following errors:\n"
-        + "\n"
-        + "1) Problem parsing object at prefix[druid.query.scheduler]: Cannot construct instance of `org.apache.druid.server.scheduling.ThresholdBasedQueryPrioritizationStrategy`, problem: periodThreshold, durationThreshold, segmentCountThreshold or segmentRangeThreshold must be set\n"
-        + " at [Source: UNKNOWN; line: -1, column: -1] (through reference chain: org.apache.druid.server.QuerySchedulerProvider[\"prioritization\"]).\n"
-        + "\n"
-        + "1 error",
-        t.getMessage()
-    );
+    ExceptionMatcher
+        .of(ProvisionException.class)
+        .expectMessage(
+            new StringContainsInOrder(List.of(
+                "Problem parsing object at prefix[druid.query.scheduler]:",
+                "problem: periodThreshold, durationThreshold, segmentCountThreshold or segmentRangeThreshold must be set"
+            ))
+      );
   }
 
 
diff --git a/services/pom.xml b/services/pom.xml
index 7b681a1e7e17..5f46dd40f6d2 100644
--- a/services/pom.xml
+++ b/services/pom.xml
@@ -157,11 +157,7 @@
             <groupId>com.sun.jersey</groupId>
             <artifactId>jersey-server</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.google.inject.extensions</groupId>
-            <artifactId>guice-multibindings</artifactId>
-            <scope>provided</scope>
-        </dependency>
+
         <dependency>
             <groupId>org.roaringbitmap</groupId>
             <artifactId>RoaringBitmap</artifactId>
diff --git a/sql/pom.xml b/sql/pom.xml
index 1c68ad0c0ed5..32d3131588db 100644
--- a/sql/pom.xml
+++ b/sql/pom.xml
@@ -128,11 +128,7 @@
       <groupId>com.opencsv</groupId>
       <artifactId>opencsv</artifactId>
     </dependency>
-    <dependency>
-      <groupId>com.google.inject.extensions</groupId>
-      <artifactId>guice-multibindings</artifactId>
-      <scope>provided</scope>
-    </dependency>
+
     <dependency>
       <groupId>javax.ws.rs</groupId>
       <artifactId>jsr311-api</artifactId>

From 78ce97ac959f0ac0c4069ae624a6fd0093124944 Mon Sep 17 00:00:00 2001
From: Andy Tsai <61856143+weishiuntsai@users.noreply.github.com>
Date: Wed, 18 Dec 2024 22:24:07 -0800
Subject: [PATCH 52/56] Adding remaining 6 sets of SQL tests in quidem (#17583)

This is the 2nd part of the PR https://github.com/apache/druid/pull/17548. It migrates the remaining 6 sets of SQL tests to quidem.  These 6 sets cover aggregation, array, json, mv, reduction, and other scalar functions.

These tests use the existing kttm dataset.  They aim to exercise SQL queries in a more comprehensive way:

Aggregation functions:
Each aggregation function is exercised in 1 query shape:
group by query
Each query covers all operators in the predicates of the having clause.
All queries are designed to return 7 rows.
Scalar functions:
Each scalar function is exercised in 3 different query shapes:
simple query
subquery
group by query
Each query covers all operators in the predicates of the where clause.
All queries are select count(*) queries.  They are designed to all return the same result for easy maintenance and debugging.

Update array and mv tests to use the language column

This PR updates the array and the mv tests to use the MV column "language" instead of constructing the data in the queries.
---
 .../qaSQL_aggr_general.iq                     | 1146 ++++++
 .../qaSQL_array.iq                            | 2848 ++++++++++++++
 .../qaSQL_json.iq                             | 1653 ++++++++
 .../org.apache.druid.quidem.QTest/qaSQL_mv.iq | 2746 +++++++++++++
 .../qaSQL_scalar_other.iq                     | 3490 +++++++++++++++++
 .../qaSQL_scalar_reduction.iq                 |  266 ++
 6 files changed, 12149 insertions(+)
 create mode 100644 quidem-ut/src/test/quidem/org.apache.druid.quidem.QTest/qaSQL_aggr_general.iq
 create mode 100644 quidem-ut/src/test/quidem/org.apache.druid.quidem.QTest/qaSQL_array.iq
 create mode 100644 quidem-ut/src/test/quidem/org.apache.druid.quidem.QTest/qaSQL_json.iq
 create mode 100644 quidem-ut/src/test/quidem/org.apache.druid.quidem.QTest/qaSQL_mv.iq
 create mode 100644 quidem-ut/src/test/quidem/org.apache.druid.quidem.QTest/qaSQL_scalar_other.iq
 create mode 100644 quidem-ut/src/test/quidem/org.apache.druid.quidem.QTest/qaSQL_scalar_reduction.iq

diff --git a/quidem-ut/src/test/quidem/org.apache.druid.quidem.QTest/qaSQL_aggr_general.iq b/quidem-ut/src/test/quidem/org.apache.druid.quidem.QTest/qaSQL_aggr_general.iq
new file mode 100644
index 000000000000..d05f8b7b8395
--- /dev/null
+++ b/quidem-ut/src/test/quidem/org.apache.druid.quidem.QTest/qaSQL_aggr_general.iq
@@ -0,0 +1,1146 @@
+!set useApproximateCountDistinct false
+!use druidtest:///?componentSupplier=KttmNestedComponentSupplier
+!set outputformat mysql
+SELECT count(DISTINCT time_floor(__time, 'PT1H')) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00';
++-----+
+| cnt |
++-----+
+|   7 |
++-----+
+(1 row)
+
+!ok
+
+#-------------------------------------------------------------------------
+# TEST_ID: A1: count_star
+#-------------------------------------------------------------------------
+SELECT time_floor(__time, 'PT1H') t,
+       count(*)+1 c
+FROM kttm_nested
+GROUP BY 1
+HAVING time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+AND (count(*)+1 IS NULL
+     OR (count(*)+1 = count(*)+1
+         AND count(*)+1 IS NOT DISTINCT
+         FROM count(*)+1
+         AND count(*)+1 <> count(*)
+         AND (count(*)+1 IS DISTINCT
+              FROM count(*))
+         AND count(*)+1 > count(*)
+         AND count(*)+1 >= count(*)
+         AND count(*)+1 < count(*)+2
+         AND count(*)+1 <= count(*)+2
+         AND (count(*)+1 <> count(*)) IS TRUE
+         AND (count(*)+1 = count(*)) IS NOT TRUE
+         AND (count(*)+1 = count(*)) IS FALSE
+         AND (count(*)+1 <> count(*)) IS NOT FALSE
+         AND count(*)+1 BETWEEN count(*) AND count(*)+2
+         AND count(*)+1 NOT BETWEEN count(*)+1 AND count(*)
+         AND count(*)+1 like '%'
+         AND count(*)+1 not like '__DOES_NOT_EXIST__%'
+         AND count(*)+1 IN (count(*),
+                            count(*)+1,
+                            count(*)+2)
+         AND count(*)+1 NOT IN (count(*),
+                                count(*)+2))) ;
++-------------------------+-------+
+| t                       | c     |
++-------------------------+-------+
+| 2019-08-25 00:00:00.000 | 13588 |
+| 2019-08-25 01:00:00.000 | 13442 |
+| 2019-08-25 02:00:00.000 | 15006 |
+| 2019-08-25 03:00:00.000 | 12879 |
+| 2019-08-25 04:00:00.000 |  9084 |
+| 2019-08-25 05:00:00.000 |  8057 |
+| 2019-08-25 06:00:00.000 |  6148 |
++-------------------------+-------+
+(7 rows)
+
+!ok
+
+#-------------------------------------------------------------------------
+# TEST_ID: A2: count_expr
+#-------------------------------------------------------------------------
+SELECT time_floor(__time, 'PT1H') t,
+       count(agent)+1 c
+FROM kttm_nested
+GROUP BY 1
+HAVING time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+AND (count(agent)+1 IS NULL
+     OR (count(agent)+1 = count(agent)+1
+         AND count(agent)+1 IS NOT DISTINCT
+         FROM count(agent)+1
+         AND count(agent)+1 <> count(agent)
+         AND (count(agent)+1 IS DISTINCT
+              FROM count(agent))
+         AND count(agent)+1 > count(agent)
+         AND count(agent)+1 >= count(agent)
+         AND count(agent)+1 < count(agent)+2
+         AND count(agent)+1 <= count(agent)+2
+         AND (count(agent)+1 <> count(agent)) IS TRUE
+         AND (count(agent)+1 = count(agent)) IS NOT TRUE
+         AND (count(agent)+1 = count(agent)) IS FALSE
+         AND (count(agent)+1 <> count(agent)) IS NOT FALSE
+         AND count(agent)+1 BETWEEN count(agent) AND count(agent)+2
+         AND count(agent)+1 NOT BETWEEN count(agent)+1 AND count(agent)
+         AND count(agent)+1 like '%'
+         AND count(agent)+1 not like '__DOES_NOT_EXIST__%'
+         AND count(agent)+1 IN (count(agent),
+                                count(agent)+1,
+                                count(agent)+2)
+         AND count(agent)+1 NOT IN (count(agent),
+                                    count(agent)+2))) ;
++-------------------------+-------+
+| t                       | c     |
++-------------------------+-------+
+| 2019-08-25 00:00:00.000 | 13588 |
+| 2019-08-25 01:00:00.000 | 13442 |
+| 2019-08-25 02:00:00.000 | 15006 |
+| 2019-08-25 03:00:00.000 | 12879 |
+| 2019-08-25 04:00:00.000 |  9084 |
+| 2019-08-25 05:00:00.000 |  8057 |
+| 2019-08-25 06:00:00.000 |  6148 |
++-------------------------+-------+
+(7 rows)
+
+!ok
+
+#-------------------------------------------------------------------------
+# TEST_ID: A3: count_distinct
+#-------------------------------------------------------------------------
+SELECT time_floor(__time, 'PT1H') t,
+       count(DISTINCT agent)+1 c
+FROM kttm_nested
+GROUP BY 1
+HAVING time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+AND (count(DISTINCT agent)+1 IS NULL
+     OR (count(DISTINCT agent)+1 = count(DISTINCT agent)+1
+         AND count(DISTINCT agent)+1 IS NOT DISTINCT
+         FROM count(DISTINCT agent)+1
+         AND count(DISTINCT agent)+1 <> count(DISTINCT agent)
+         AND (count(DISTINCT agent)+1 IS DISTINCT
+              FROM count(DISTINCT agent))
+         AND count(DISTINCT agent)+1 > count(DISTINCT agent)
+         AND count(DISTINCT agent)+1 >= count(DISTINCT agent)
+         AND count(DISTINCT agent)+1 < count(DISTINCT agent)+2
+         AND count(DISTINCT agent)+1 <= count(DISTINCT agent)+2
+         AND (count(DISTINCT agent)+1 <> count(DISTINCT agent)) IS TRUE
+         AND (count(DISTINCT agent)+1 = count(DISTINCT agent)) IS NOT TRUE
+         AND (count(DISTINCT agent)+1 = count(DISTINCT agent)) IS FALSE
+         AND (count(DISTINCT agent)+1 <> count(DISTINCT agent)) IS NOT FALSE
+         AND count(DISTINCT agent)+1 BETWEEN count(DISTINCT agent) AND count(DISTINCT agent)+2
+         AND count(DISTINCT agent)+1 NOT BETWEEN count(DISTINCT agent)+1 AND count(DISTINCT agent)
+         AND count(DISTINCT agent)+1 like '%'
+         AND count(DISTINCT agent)+1 not like '__DOES_NOT_EXIST__%'
+         AND count(DISTINCT agent)+1 IN (count(DISTINCT agent),
+                                         count(DISTINCT agent)+1,
+                                         count(DISTINCT agent)+2)
+         AND count(DISTINCT agent)+1 NOT IN (count(DISTINCT agent),
+                                             count(DISTINCT agent)+2))) ;
++-------------------------+-----+
+| t                       | c   |
++-------------------------+-----+
+| 2019-08-25 00:00:00.000 | 118 |
+| 2019-08-25 01:00:00.000 | 114 |
+| 2019-08-25 02:00:00.000 | 114 |
+| 2019-08-25 03:00:00.000 | 120 |
+| 2019-08-25 04:00:00.000 |  97 |
+| 2019-08-25 05:00:00.000 |  88 |
+| 2019-08-25 06:00:00.000 |  85 |
++-------------------------+-----+
+(7 rows)
+
+!ok
+
+#-------------------------------------------------------------------------
+# TEST_ID: A4: sum
+#-------------------------------------------------------------------------
+SELECT time_floor(__time, 'PT1H') t,
+       sum(session_length)+1 c
+FROM kttm_nested
+GROUP BY 1
+HAVING time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+AND (sum(session_length)+1 IS NULL
+     OR (sum(session_length)+1 = sum(session_length)+1
+         AND sum(session_length)+1 IS NOT DISTINCT
+         FROM sum(session_length)+1
+         AND sum(session_length)+1 <> sum(session_length)
+         AND (sum(session_length)+1 IS DISTINCT
+              FROM sum(session_length))
+         AND sum(session_length)+1 > sum(session_length)
+         AND sum(session_length)+1 >= sum(session_length)
+         AND sum(session_length)+1 < sum(session_length)+2
+         AND sum(session_length)+1 <= sum(session_length)+2
+         AND (sum(session_length)+1 <> sum(session_length)) IS TRUE
+         AND (sum(session_length)+1 = sum(session_length)) IS NOT TRUE
+         AND (sum(session_length)+1 = sum(session_length)) IS FALSE
+         AND (sum(session_length)+1 <> sum(session_length)) IS NOT FALSE
+         AND sum(session_length)+1 BETWEEN sum(session_length) AND sum(session_length)+2
+         AND sum(session_length)+1 NOT BETWEEN sum(session_length)+1 AND sum(session_length)
+         AND sum(session_length)+1 like '%'
+         AND sum(session_length)+1 not like '__DOES_NOT_EXIST__%'
+         AND sum(session_length)+1 IN (sum(session_length),
+                                       sum(session_length)+1,
+                                       sum(session_length)+2)
+         AND sum(session_length)+1 NOT IN (sum(session_length),
+                                           sum(session_length)+2))) ;
++-------------------------+------------+
+| t                       | c          |
++-------------------------+------------+
+| 2019-08-25 00:00:00.000 | 6285177784 |
+| 2019-08-25 01:00:00.000 | 1983213622 |
+| 2019-08-25 02:00:00.000 | 2149033768 |
+| 2019-08-25 03:00:00.000 | 2764093084 |
+| 2019-08-25 04:00:00.000 | 5181690410 |
+| 2019-08-25 05:00:00.000 | 2010439102 |
+| 2019-08-25 06:00:00.000 | 4873692912 |
++-------------------------+------------+
+(7 rows)
+
+!ok
+
+#-------------------------------------------------------------------------
+# TEST_ID: A5: min_numeric
+#-------------------------------------------------------------------------
+SELECT time_floor(__time, 'PT1H') t,
+       min(session_length)+1 c
+FROM kttm_nested
+GROUP BY 1
+HAVING time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+AND (min(session_length)+1 IS NULL
+     OR (min(session_length)+1 = min(session_length)+1
+         AND min(session_length)+1 IS NOT DISTINCT
+         FROM min(session_length)+1
+         AND min(session_length)+1 <> min(session_length)
+         AND (min(session_length)+1 IS DISTINCT
+              FROM min(session_length))
+         AND min(session_length)+1 > min(session_length)
+         AND min(session_length)+1 >= min(session_length)
+         AND min(session_length)+1 < min(session_length)+2
+         AND min(session_length)+1 <= min(session_length)+2
+         AND (min(session_length)+1 <> min(session_length)) IS TRUE
+         AND (min(session_length)+1 = min(session_length)) IS NOT TRUE
+         AND (min(session_length)+1 = min(session_length)) IS FALSE
+         AND (min(session_length)+1 <> min(session_length)) IS NOT FALSE
+         AND min(session_length)+1 BETWEEN min(session_length) AND min(session_length)+2
+         AND min(session_length)+1 NOT BETWEEN min(session_length)+1 AND min(session_length)
+         AND min(session_length)+1 like '%'
+         AND min(session_length)+1 not like '__DOES_NOT_EXIST__%'
+         AND min(session_length)+1 IN (min(session_length),
+                                       min(session_length)+1,
+                                       min(session_length)+2)
+         AND min(session_length)+1 NOT IN (min(session_length),
+                                           min(session_length)+2))) ;
++-------------------------+----+
+| t                       | c  |
++-------------------------+----+
+| 2019-08-25 00:00:00.000 | 16 |
+| 2019-08-25 01:00:00.000 | 21 |
+| 2019-08-25 02:00:00.000 | 15 |
+| 2019-08-25 03:00:00.000 |  5 |
+| 2019-08-25 04:00:00.000 |  4 |
+| 2019-08-25 05:00:00.000 | 16 |
+| 2019-08-25 06:00:00.000 | 16 |
++-------------------------+----+
+(7 rows)
+
+!ok
+
+#-------------------------------------------------------------------------
+# TEST_ID: A6: min_timestamp
+#-------------------------------------------------------------------------
+SELECT time_floor(__time, 'PT1H') t,
+       min(time_floor(__time, 'PT1H'))+interval '1' YEAR c
+FROM kttm_nested
+GROUP BY 1
+HAVING time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+AND (min(time_floor(__time, 'PT1H'))+interval '1' YEAR IS NULL
+     OR (min(time_floor(__time, 'PT1H'))+interval '1' YEAR = min(time_floor(__time, 'PT1H'))+interval '1' YEAR
+         AND min(time_floor(__time, 'PT1H'))+interval '1' YEAR IS NOT DISTINCT
+         FROM min(time_floor(__time, 'PT1H'))+interval '1' YEAR
+         AND min(time_floor(__time, 'PT1H'))+interval '1' YEAR <> min(time_floor(__time, 'PT1H'))
+         AND (min(time_floor(__time, 'PT1H'))+interval '1' YEAR IS DISTINCT
+              FROM min(time_floor(__time, 'PT1H')))
+         AND min(time_floor(__time, 'PT1H'))+interval '1' YEAR > min(time_floor(__time, 'PT1H'))
+         AND min(time_floor(__time, 'PT1H'))+interval '1' YEAR >= min(time_floor(__time, 'PT1H'))
+         AND min(time_floor(__time, 'PT1H'))+interval '1' YEAR < min(time_floor(__time, 'PT1H'))+interval '2' YEAR
+         AND min(time_floor(__time, 'PT1H'))+interval '1' YEAR <= min(time_floor(__time, 'PT1H'))+interval '2' YEAR
+         AND (min(time_floor(__time, 'PT1H'))+interval '1' YEAR <> min(time_floor(__time, 'PT1H'))) IS TRUE
+         AND (min(time_floor(__time, 'PT1H'))+interval '1' YEAR = min(time_floor(__time, 'PT1H'))) IS NOT TRUE
+         AND (min(time_floor(__time, 'PT1H'))+interval '1' YEAR = min(time_floor(__time, 'PT1H'))) IS FALSE
+         AND (min(time_floor(__time, 'PT1H'))+interval '1' YEAR <> min(time_floor(__time, 'PT1H'))) IS NOT FALSE
+         AND min(time_floor(__time, 'PT1H'))+interval '1' YEAR BETWEEN min(time_floor(__time, 'PT1H')) AND min(time_floor(__time, 'PT1H'))+interval '2' YEAR
+         AND min(time_floor(__time, 'PT1H'))+interval '1' YEAR NOT BETWEEN min(time_floor(__time, 'PT1H'))+interval '1' YEAR AND min(time_floor(__time, 'PT1H'))
+         AND min(time_floor(__time, 'PT1H'))+interval '1' YEAR like '%'
+         AND min(time_floor(__time, 'PT1H'))+interval '1' YEAR not like '__DOES_NOT_EXIST__%'
+         AND min(time_floor(__time, 'PT1H'))+interval '1' YEAR IN (min(time_floor(__time, 'PT1H')),
+                                                                   min(time_floor(__time, 'PT1H'))+interval '1' YEAR,
+                                                                   min(time_floor(__time, 'PT1H'))+interval '2' YEAR)
+         AND min(time_floor(__time, 'PT1H'))+interval '1' YEAR NOT IN (min(time_floor(__time, 'PT1H')),
+                                                                       min(time_floor(__time, 'PT1H'))+interval '2' YEAR))) ;
++-------------------------+-------------------------+
+| t                       | c                       |
++-------------------------+-------------------------+
+| 2019-08-25 00:00:00.000 | 2020-08-25 00:00:00.000 |
+| 2019-08-25 01:00:00.000 | 2020-08-25 01:00:00.000 |
+| 2019-08-25 02:00:00.000 | 2020-08-25 02:00:00.000 |
+| 2019-08-25 03:00:00.000 | 2020-08-25 03:00:00.000 |
+| 2019-08-25 04:00:00.000 | 2020-08-25 04:00:00.000 |
+| 2019-08-25 05:00:00.000 | 2020-08-25 05:00:00.000 |
+| 2019-08-25 06:00:00.000 | 2020-08-25 06:00:00.000 |
++-------------------------+-------------------------+
+(7 rows)
+
+!ok
+
+#-------------------------------------------------------------------------
+# TEST_ID: A7: max_numeric
+#-------------------------------------------------------------------------
+SELECT time_floor(__time, 'PT1H') t,
+       max(session_length)+1 c
+FROM kttm_nested
+GROUP BY 1
+HAVING time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+AND (max(session_length)+1 IS NULL
+     OR (max(session_length)+1 = max(session_length)+1
+         AND max(session_length)+1 IS NOT DISTINCT
+         FROM max(session_length)+1
+         AND max(session_length)+1 <> max(session_length)
+         AND (max(session_length)+1 IS DISTINCT
+              FROM max(session_length))
+         AND max(session_length)+1 > max(session_length)
+         AND max(session_length)+1 >= max(session_length)
+         AND max(session_length)+1 < max(session_length)+2
+         AND max(session_length)+1 <= max(session_length)+2
+         AND (max(session_length)+1 <> max(session_length)) IS TRUE
+         AND (max(session_length)+1 = max(session_length)) IS NOT TRUE
+         AND (max(session_length)+1 = max(session_length)) IS FALSE
+         AND (max(session_length)+1 <> max(session_length)) IS NOT FALSE
+         AND max(session_length)+1 BETWEEN max(session_length) AND max(session_length)+2
+         AND max(session_length)+1 NOT BETWEEN max(session_length)+1 AND max(session_length)
+         AND max(session_length)+1 like '%'
+         AND max(session_length)+1 not like '__DOES_NOT_EXIST__%'
+         AND max(session_length)+1 IN (max(session_length),
+                                       max(session_length)+1,
+                                       max(session_length)+2)
+         AND max(session_length)+1 NOT IN (max(session_length),
+                                           max(session_length)+2))) ;
++-------------------------+-----------+
+| t                       | c         |
++-------------------------+-----------+
+| 2019-08-25 00:00:00.000 | 160820137 |
+| 2019-08-25 01:00:00.000 |  85049999 |
+| 2019-08-25 02:00:00.000 | 133242163 |
+| 2019-08-25 03:00:00.000 | 169648384 |
+| 2019-08-25 04:00:00.000 | 189948466 |
+| 2019-08-25 05:00:00.000 | 740328869 |
+| 2019-08-25 06:00:00.000 | 679295139 |
++-------------------------+-----------+
+(7 rows)
+
+!ok
+
+#-------------------------------------------------------------------------
+# TEST_ID: A8: max_timestamp
+#-------------------------------------------------------------------------
+SELECT time_floor(__time, 'PT1H') t,
+       max(time_floor(__time, 'PT1H'))+interval '1' YEAR c
+FROM kttm_nested
+GROUP BY 1
+HAVING time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+AND (max(time_floor(__time, 'PT1H'))+interval '1' YEAR IS NULL
+     OR (max(time_floor(__time, 'PT1H'))+interval '1' YEAR = max(time_floor(__time, 'PT1H'))+interval '1' YEAR
+         AND max(time_floor(__time, 'PT1H'))+interval '1' YEAR IS NOT DISTINCT
+         FROM max(time_floor(__time, 'PT1H'))+interval '1' YEAR
+         AND max(time_floor(__time, 'PT1H'))+interval '1' YEAR <> max(time_floor(__time, 'PT1H'))
+         AND (max(time_floor(__time, 'PT1H'))+interval '1' YEAR IS DISTINCT
+              FROM max(time_floor(__time, 'PT1H')))
+         AND max(time_floor(__time, 'PT1H'))+interval '1' YEAR > max(time_floor(__time, 'PT1H'))
+         AND max(time_floor(__time, 'PT1H'))+interval '1' YEAR >= max(time_floor(__time, 'PT1H'))
+         AND max(time_floor(__time, 'PT1H'))+interval '1' YEAR < max(time_floor(__time, 'PT1H'))+interval '2' YEAR
+         AND max(time_floor(__time, 'PT1H'))+interval '1' YEAR <= max(time_floor(__time, 'PT1H'))+interval '2' YEAR
+         AND (max(time_floor(__time, 'PT1H'))+interval '1' YEAR <> max(time_floor(__time, 'PT1H'))) IS TRUE
+         AND (max(time_floor(__time, 'PT1H'))+interval '1' YEAR = max(time_floor(__time, 'PT1H'))) IS NOT TRUE
+         AND (max(time_floor(__time, 'PT1H'))+interval '1' YEAR = max(time_floor(__time, 'PT1H'))) IS FALSE
+         AND (max(time_floor(__time, 'PT1H'))+interval '1' YEAR <> max(time_floor(__time, 'PT1H'))) IS NOT FALSE
+         AND max(time_floor(__time, 'PT1H'))+interval '1' YEAR BETWEEN max(time_floor(__time, 'PT1H')) AND max(time_floor(__time, 'PT1H'))+interval '2' YEAR
+         AND max(time_floor(__time, 'PT1H'))+interval '1' YEAR NOT BETWEEN max(time_floor(__time, 'PT1H'))+interval '1' YEAR AND max(time_floor(__time, 'PT1H'))
+         AND max(time_floor(__time, 'PT1H'))+interval '1' YEAR like '%'
+         AND max(time_floor(__time, 'PT1H'))+interval '1' YEAR not like '__DOES_NOT_EXIST__%'
+         AND max(time_floor(__time, 'PT1H'))+interval '1' YEAR IN (max(time_floor(__time, 'PT1H')),
+                                                                   max(time_floor(__time, 'PT1H'))+interval '1' YEAR,
+                                                                   max(time_floor(__time, 'PT1H'))+interval '2' YEAR)
+         AND max(time_floor(__time, 'PT1H'))+interval '1' YEAR NOT IN (max(time_floor(__time, 'PT1H')),
+                                                                       max(time_floor(__time, 'PT1H'))+interval '2' YEAR))) ;
++-------------------------+-------------------------+
+| t                       | c                       |
++-------------------------+-------------------------+
+| 2019-08-25 00:00:00.000 | 2020-08-25 00:00:00.000 |
+| 2019-08-25 01:00:00.000 | 2020-08-25 01:00:00.000 |
+| 2019-08-25 02:00:00.000 | 2020-08-25 02:00:00.000 |
+| 2019-08-25 03:00:00.000 | 2020-08-25 03:00:00.000 |
+| 2019-08-25 04:00:00.000 | 2020-08-25 04:00:00.000 |
+| 2019-08-25 05:00:00.000 | 2020-08-25 05:00:00.000 |
+| 2019-08-25 06:00:00.000 | 2020-08-25 06:00:00.000 |
++-------------------------+-------------------------+
+(7 rows)
+
+!ok
+
+#-------------------------------------------------------------------------
+# TEST_ID: A9: avg
+#-------------------------------------------------------------------------
+SELECT time_floor(__time, 'PT1H') t,
+       cast(avg(session_length)+1 AS bigint) c
+FROM kttm_nested
+GROUP BY 1
+HAVING time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+AND (cast(avg(session_length)+1 AS bigint) IS NULL
+     OR (cast(avg(session_length)+1 AS bigint) = cast(avg(session_length)+1 AS bigint)
+         AND cast(avg(session_length)+1 AS bigint) IS NOT DISTINCT
+         FROM cast(avg(session_length)+1 AS bigint)
+         AND cast(avg(session_length)+1 AS bigint) <> cast(avg(session_length) AS bigint)
+         AND (cast(avg(session_length)+1 AS bigint) IS DISTINCT
+              FROM cast(avg(session_length) AS bigint))
+         AND cast(avg(session_length)+1 AS bigint) > cast(avg(session_length) AS bigint)
+         AND cast(avg(session_length)+1 AS bigint) >= cast(avg(session_length) AS bigint)
+         AND cast(avg(session_length)+1 AS bigint) < cast(avg(session_length)+2 AS bigint)
+         AND cast(avg(session_length)+1 AS bigint) <= cast(avg(session_length)+2 AS bigint)
+         AND (cast(avg(session_length)+1 AS bigint) <> cast(avg(session_length) AS bigint)) IS TRUE
+         AND (cast(avg(session_length)+1 AS bigint) = cast(avg(session_length) AS bigint)) IS NOT TRUE
+         AND (cast(avg(session_length)+1 AS bigint) = cast(avg(session_length) AS bigint)) IS FALSE
+         AND (cast(avg(session_length)+1 AS bigint) <> cast(avg(session_length) AS bigint)) IS NOT FALSE
+         AND cast(avg(session_length)+1 AS bigint) BETWEEN cast(avg(session_length) AS bigint) AND cast(avg(session_length)+2 AS bigint)
+         AND cast(avg(session_length)+1 AS bigint) NOT BETWEEN cast(avg(session_length)+1 AS bigint) AND cast(avg(session_length) AS bigint)
+         AND cast(avg(session_length)+1 AS bigint) like '%'
+         AND cast(avg(session_length)+1 AS bigint) not like '__DOES_NOT_EXIST__%'
+         AND cast(avg(session_length)+1 AS bigint) IN (cast(avg(session_length) AS bigint),
+                                                       cast(avg(session_length)+1 AS bigint),
+                                                       cast(avg(session_length)+2 AS bigint))
+         AND cast(avg(session_length)+1 AS bigint) NOT IN (cast(avg(session_length) AS bigint),
+                                                           cast(avg(session_length)+2 AS bigint)))) ;
++-------------------------+--------+
+| t                       | c      |
++-------------------------+--------+
+| 2019-08-25 00:00:00.000 | 462588 |
+| 2019-08-25 01:00:00.000 | 147550 |
+| 2019-08-25 02:00:00.000 | 143222 |
+| 2019-08-25 03:00:00.000 | 214637 |
+| 2019-08-25 04:00:00.000 | 570483 |
+| 2019-08-25 05:00:00.000 | 249558 |
+| 2019-08-25 06:00:00.000 | 792858 |
++-------------------------+--------+
+(7 rows)
+
+!ok
+
+#-------------------------------------------------------------------------
+# TEST_ID: A10: approx_count_distinct
+#-------------------------------------------------------------------------
+SELECT time_floor(__time, 'PT1H') t,
+       approx_count_distinct(client_ip)+1000 c
+FROM kttm_nested
+GROUP BY 1
+HAVING time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+AND (approx_count_distinct(client_ip)+1000 IS NULL
+     OR (approx_count_distinct(client_ip)+1000 = approx_count_distinct(client_ip)+1000
+         AND approx_count_distinct(client_ip)+1000 IS NOT DISTINCT
+         FROM approx_count_distinct(client_ip)+1000
+         AND approx_count_distinct(client_ip)+1000 <> approx_count_distinct(client_ip)
+         AND (approx_count_distinct(client_ip)+1000 IS DISTINCT
+              FROM approx_count_distinct(client_ip))
+         AND approx_count_distinct(client_ip)+1000 > approx_count_distinct(client_ip)
+         AND approx_count_distinct(client_ip)+1000 >= approx_count_distinct(client_ip)
+         AND approx_count_distinct(client_ip)+1000 < approx_count_distinct(client_ip)+2000
+         AND approx_count_distinct(client_ip)+1000 <= approx_count_distinct(client_ip)+2000
+         AND (approx_count_distinct(client_ip)+1000 <> approx_count_distinct(client_ip)) IS TRUE
+         AND (approx_count_distinct(client_ip)+1000 = approx_count_distinct(client_ip)) IS NOT TRUE
+         AND (approx_count_distinct(client_ip)+1000 = approx_count_distinct(client_ip)) IS FALSE
+         AND (approx_count_distinct(client_ip)+1000 <> approx_count_distinct(client_ip)) IS NOT FALSE
+         AND approx_count_distinct(client_ip)+1000 BETWEEN approx_count_distinct(client_ip) AND approx_count_distinct(client_ip)+2000
+         AND approx_count_distinct(client_ip)+1000 NOT BETWEEN approx_count_distinct(client_ip)+1000 AND approx_count_distinct(client_ip)
+         AND approx_count_distinct(client_ip)+1000 like '%'
+         AND approx_count_distinct(client_ip)+1000 not like '__DOES_NOT_EXIST__%'
+         AND approx_count_distinct(client_ip)+1000 IN (approx_count_distinct(client_ip),
+                                                       approx_count_distinct(client_ip)+1000,
+                                                       approx_count_distinct(client_ip)+2000)
+         AND approx_count_distinct(client_ip)+1000 NOT IN (approx_count_distinct(client_ip),
+                                                           approx_count_distinct(client_ip)+2000))) ;
++-------------------------+------+
+| t                       | c    |
++-------------------------+------+
+| 2019-08-25 00:00:00.000 | 1825 |
+| 2019-08-25 01:00:00.000 | 1870 |
+| 2019-08-25 02:00:00.000 | 1925 |
+| 2019-08-25 03:00:00.000 | 1727 |
+| 2019-08-25 04:00:00.000 | 1539 |
+| 2019-08-25 05:00:00.000 | 1500 |
+| 2019-08-25 06:00:00.000 | 1360 |
++-------------------------+------+
+(7 rows)
+
+!ok
+
+#-------------------------------------------------------------------------
+# TEST_ID: A11: approx_count_distinct_builtin
+#-------------------------------------------------------------------------
+SELECT time_floor(__time, 'PT1H') t,
+       approx_count_distinct_builtin(client_ip)+1000 c
+FROM kttm_nested
+GROUP BY 1
+HAVING time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+AND (approx_count_distinct_builtin(client_ip)+1000 IS NULL
+     OR (approx_count_distinct_builtin(client_ip)+1000 = approx_count_distinct_builtin(client_ip)+1000
+         AND approx_count_distinct_builtin(client_ip)+1000 IS NOT DISTINCT
+         FROM approx_count_distinct_builtin(client_ip)+1000
+         AND approx_count_distinct_builtin(client_ip)+1000 <> approx_count_distinct_builtin(client_ip)
+         AND (approx_count_distinct_builtin(client_ip)+1000 IS DISTINCT
+              FROM approx_count_distinct_builtin(client_ip))
+         AND approx_count_distinct_builtin(client_ip)+1000 > approx_count_distinct_builtin(client_ip)
+         AND approx_count_distinct_builtin(client_ip)+1000 >= approx_count_distinct_builtin(client_ip)
+         AND approx_count_distinct_builtin(client_ip)+1000 < approx_count_distinct_builtin(client_ip)+2000
+         AND approx_count_distinct_builtin(client_ip)+1000 <= approx_count_distinct_builtin(client_ip)+2000
+         AND (approx_count_distinct_builtin(client_ip)+1000 <> approx_count_distinct_builtin(client_ip)) IS TRUE
+         AND (approx_count_distinct_builtin(client_ip)+1000 = approx_count_distinct_builtin(client_ip)) IS NOT TRUE
+         AND (approx_count_distinct_builtin(client_ip)+1000 = approx_count_distinct_builtin(client_ip)) IS FALSE
+         AND (approx_count_distinct_builtin(client_ip)+1000 <> approx_count_distinct_builtin(client_ip)) IS NOT FALSE
+         AND approx_count_distinct_builtin(client_ip)+1000 BETWEEN approx_count_distinct_builtin(client_ip) AND approx_count_distinct_builtin(client_ip)+2000
+         AND approx_count_distinct_builtin(client_ip)+1000 NOT BETWEEN approx_count_distinct_builtin(client_ip)+1000 AND approx_count_distinct_builtin(client_ip)
+         AND approx_count_distinct_builtin(client_ip)+1000 like '%'
+         AND approx_count_distinct_builtin(client_ip)+1000 not like '__DOES_NOT_EXIST__%'
+         AND approx_count_distinct_builtin(client_ip)+1000 IN (approx_count_distinct_builtin(client_ip),
+                                                               approx_count_distinct_builtin(client_ip)+1000,
+                                                               approx_count_distinct_builtin(client_ip)+2000)
+         AND approx_count_distinct_builtin(client_ip)+1000 NOT IN (approx_count_distinct_builtin(client_ip),
+                                                                   approx_count_distinct_builtin(client_ip)+2000))) ;
++-------------------------+------+
+| t                       | c    |
++-------------------------+------+
+| 2019-08-25 00:00:00.000 | 1825 |
+| 2019-08-25 01:00:00.000 | 1870 |
+| 2019-08-25 02:00:00.000 | 1925 |
+| 2019-08-25 03:00:00.000 | 1727 |
+| 2019-08-25 04:00:00.000 | 1539 |
+| 2019-08-25 05:00:00.000 | 1500 |
+| 2019-08-25 06:00:00.000 | 1360 |
++-------------------------+------+
+(7 rows)
+
+!ok
+
+#-------------------------------------------------------------------------
+# TEST_ID: A20: earliest_scalar
+#-------------------------------------------------------------------------
+SELECT time_floor(__time, 'PT1H') t,
+       '1'||earliest(client_ip) c
+FROM kttm_nested
+GROUP BY 1
+HAVING time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+AND ('1'||earliest(client_ip) IS NULL
+     OR ('1'||earliest(client_ip) = 1||earliest(client_ip)
+         AND '1'||earliest(client_ip) IS NOT DISTINCT
+         FROM 1||earliest(client_ip)
+         AND '1'||earliest(client_ip) <> '0'||earliest(client_ip)
+         AND ('1'||earliest(client_ip) IS DISTINCT
+              FROM '0'||earliest(client_ip))
+         AND '1'||earliest(client_ip) > '0'||earliest(client_ip)
+         AND '1'||earliest(client_ip) >= '0'||earliest(client_ip)
+         AND '1'||earliest(client_ip) < 2||earliest(client_ip)
+         AND '1'||earliest(client_ip) <= 2||earliest(client_ip)
+         AND ('1'||earliest(client_ip) <> '0'||earliest(client_ip)) IS TRUE
+         AND ('1'||earliest(client_ip) = '0'||earliest(client_ip)) IS NOT TRUE
+         AND ('1'||earliest(client_ip) = '0'||earliest(client_ip)) IS FALSE
+         AND ('1'||earliest(client_ip) <> '0'||earliest(client_ip)) IS NOT FALSE
+         AND '1'||earliest(client_ip) BETWEEN '0'||earliest(client_ip) AND 2||earliest(client_ip)
+         AND '1'||earliest(client_ip) NOT BETWEEN '1'||earliest(client_ip) AND '0'||earliest(client_ip)
+         AND '1'||earliest(client_ip) like '%'
+         AND '1'||earliest(client_ip) not like '__DOES_NOT_EXIST__%'
+         AND '1'||earliest(client_ip) IN ('0'||earliest(client_ip),
+                                          1||earliest(client_ip),
+                                          2||earliest(client_ip))
+         AND '1'||earliest(client_ip) NOT IN ('0'||earliest(client_ip),
+                                              2||earliest(client_ip)))) ;
++-------------------------+-----------------+
+| t                       | c               |
++-------------------------+-----------------+
+| 2019-08-25 00:00:00.000 | 1181.13.41.82   |
+| 2019-08-25 01:00:00.000 | 199.253.86.170  |
+| 2019-08-25 02:00:00.000 | 1190.62.251.216 |
+| 2019-08-25 03:00:00.000 | 1184.96.197.148 |
+| 2019-08-25 04:00:00.000 | 1186.65.90.120  |
+| 2019-08-25 05:00:00.000 | 1174.45.230.138 |
+| 2019-08-25 06:00:00.000 | 149.178.15.174  |
++-------------------------+-----------------+
+(7 rows)
+
+!ok
+
+#-------------------------------------------------------------------------
+# TEST_ID: A21: earliest_complex
+#-------------------------------------------------------------------------
+SELECT time_floor(__time, 'PT1H') t,
+       '1'||json_value(earliest(agent), '$.type') c
+FROM kttm_nested
+GROUP BY 1
+HAVING time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+AND ('1'||json_value(earliest(agent), '$.type') IS NULL
+     OR ('1'||json_value(earliest(agent), '$.type') = 1||json_value(earliest(agent), '$.type')
+         AND '1'||json_value(earliest(agent), '$.type') IS NOT DISTINCT
+         FROM 1||json_value(earliest(agent), '$.type')
+         AND '1'||json_value(earliest(agent), '$.type') <> '0'||json_value(earliest(agent), '$.type')
+         AND ('1'||json_value(earliest(agent), '$.type') IS DISTINCT
+              FROM '0'||json_value(earliest(agent), '$.type'))
+         AND '1'||json_value(earliest(agent), '$.type') > '0'||json_value(earliest(agent), '$.type')
+         AND '1'||json_value(earliest(agent), '$.type') >= '0'||json_value(earliest(agent), '$.type')
+         AND '1'||json_value(earliest(agent), '$.type') < 2||json_value(earliest(agent), '$.type')
+         AND '1'||json_value(earliest(agent), '$.type') <= 2||json_value(earliest(agent), '$.type')
+         AND ('1'||json_value(earliest(agent), '$.type') <> '0'||json_value(earliest(agent), '$.type')) IS TRUE
+         AND ('1'||json_value(earliest(agent), '$.type') = '0'||json_value(earliest(agent), '$.type')) IS NOT TRUE
+         AND ('1'||json_value(earliest(agent), '$.type') = '0'||json_value(earliest(agent), '$.type')) IS FALSE
+         AND ('1'||json_value(earliest(agent), '$.type') <> '0'||json_value(earliest(agent), '$.type')) IS NOT FALSE
+         AND '1'||json_value(earliest(agent), '$.type') BETWEEN '0'||json_value(earliest(agent), '$.type') AND 2||json_value(earliest(agent), '$.type')
+         AND '1'||json_value(earliest(agent), '$.type') NOT BETWEEN '1'||json_value(earliest(agent), '$.type') AND '0'||json_value(earliest(agent), '$.type')
+         AND '1'||json_value(earliest(agent), '$.type') like '%'
+         AND '1'||json_value(earliest(agent), '$.type') not like '__DOES_NOT_EXIST__%'
+         AND '1'||json_value(earliest(agent), '$.type') IN ('0'||json_value(earliest(agent), '$.type'),
+                                                            1||json_value(earliest(agent), '$.type'),
+                                                            2||json_value(earliest(agent), '$.type'))
+         AND '1'||json_value(earliest(agent), '$.type') NOT IN ('0'||json_value(earliest(agent), '$.type'),
+                                                                2||json_value(earliest(agent), '$.type')))) ;
++-------------------------+---+
+| t                       | c |
++-------------------------+---+
+| 2019-08-25 00:00:00.000 |   |
+| 2019-08-25 01:00:00.000 |   |
+| 2019-08-25 02:00:00.000 |   |
+| 2019-08-25 03:00:00.000 |   |
+| 2019-08-25 04:00:00.000 |   |
+| 2019-08-25 05:00:00.000 |   |
+| 2019-08-25 06:00:00.000 |   |
++-------------------------+---+
+(7 rows)
+
+!ok
+
+#-------------------------------------------------------------------------
+# TEST_ID: A22: earliest_by_scalar
+#-------------------------------------------------------------------------
+SELECT time_floor(__time, 'PT1H') t,
+       '1'||earliest_by(client_ip, timestamp '2019-08-25 04:00:00') c
+FROM kttm_nested
+GROUP BY 1
+HAVING time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+AND ('1'||earliest_by(client_ip, timestamp '2019-08-25 04:00:00') IS NULL
+     OR ('1'||earliest_by(client_ip, timestamp '2019-08-25 04:00:00') = 1||earliest_by(client_ip, timestamp '2019-08-25 04:00:00')
+         AND '1'||earliest_by(client_ip, timestamp '2019-08-25 04:00:00') IS NOT DISTINCT
+         FROM 1||earliest_by(client_ip, timestamp '2019-08-25 04:00:00')
+         AND '1'||earliest_by(client_ip, timestamp '2019-08-25 04:00:00') <> '0'||earliest_by(client_ip, timestamp '2019-08-25 04:00:00')
+         AND ('1'||earliest_by(client_ip, timestamp '2019-08-25 04:00:00') IS DISTINCT
+              FROM '0'||earliest_by(client_ip, timestamp '2019-08-25 04:00:00'))
+         AND '1'||earliest_by(client_ip, timestamp '2019-08-25 04:00:00') > '0'||earliest_by(client_ip, timestamp '2019-08-25 04:00:00')
+         AND '1'||earliest_by(client_ip, timestamp '2019-08-25 04:00:00') >= '0'||earliest_by(client_ip, timestamp '2019-08-25 04:00:00')
+         AND '1'||earliest_by(client_ip, timestamp '2019-08-25 04:00:00') < 2||earliest_by(client_ip, timestamp '2019-08-25 04:00:00')
+         AND '1'||earliest_by(client_ip, timestamp '2019-08-25 04:00:00') <= 2||earliest_by(client_ip, timestamp '2019-08-25 04:00:00')
+         AND ('1'||earliest_by(client_ip, timestamp '2019-08-25 04:00:00') <> '0'||earliest_by(client_ip, timestamp '2019-08-25 04:00:00')) IS TRUE
+         AND ('1'||earliest_by(client_ip, timestamp '2019-08-25 04:00:00') = '0'||earliest_by(client_ip, timestamp '2019-08-25 04:00:00')) IS NOT TRUE
+         AND ('1'||earliest_by(client_ip, timestamp '2019-08-25 04:00:00') = '0'||earliest_by(client_ip, timestamp '2019-08-25 04:00:00')) IS FALSE
+         AND ('1'||earliest_by(client_ip, timestamp '2019-08-25 04:00:00') <> '0'||earliest_by(client_ip, timestamp '2019-08-25 04:00:00')) IS NOT FALSE
+         AND '1'||earliest_by(client_ip, timestamp '2019-08-25 04:00:00') BETWEEN '0'||earliest_by(client_ip, timestamp '2019-08-25 04:00:00') AND 2||earliest_by(client_ip, timestamp '2019-08-25 04:00:00')
+         AND '1'||earliest_by(client_ip, timestamp '2019-08-25 04:00:00') NOT BETWEEN '1'||earliest_by(client_ip, timestamp '2019-08-25 04:00:00') AND '0'||earliest_by(client_ip, timestamp '2019-08-25 04:00:00')
+         AND '1'||earliest_by(client_ip, timestamp '2019-08-25 04:00:00') like '%'
+         AND '1'||earliest_by(client_ip, timestamp '2019-08-25 04:00:00') not like '__DOES_NOT_EXIST__%'
+         AND '1'||earliest_by(client_ip, timestamp '2019-08-25 04:00:00') IN ('0'||earliest_by(client_ip, timestamp '2019-08-25 04:00:00'),
+                                                                              1||earliest_by(client_ip, timestamp '2019-08-25 04:00:00'),
+                                                                              2||earliest_by(client_ip, timestamp '2019-08-25 04:00:00'))
+         AND '1'||earliest_by(client_ip, timestamp '2019-08-25 04:00:00') NOT IN ('0'||earliest_by(client_ip, timestamp '2019-08-25 04:00:00'),
+                                                                                  2||earliest_by(client_ip, timestamp '2019-08-25 04:00:00')))) ;
++-------------------------+-----------------+
+| t                       | c               |
++-------------------------+-----------------+
+| 2019-08-25 00:00:00.000 | 1181.13.41.82   |
+| 2019-08-25 01:00:00.000 | 199.253.86.170  |
+| 2019-08-25 02:00:00.000 | 1190.62.251.216 |
+| 2019-08-25 03:00:00.000 | 1184.96.197.148 |
+| 2019-08-25 04:00:00.000 | 1186.65.90.120  |
+| 2019-08-25 05:00:00.000 | 1174.45.230.138 |
+| 2019-08-25 06:00:00.000 | 149.178.15.174  |
++-------------------------+-----------------+
+(7 rows)
+
+!ok
+
+#-------------------------------------------------------------------------
+# TEST_ID: A23: earliest_by_complex
+#-------------------------------------------------------------------------
+SELECT time_floor(__time, 'PT1H') t,
+       '1'||json_value(earliest_by(client_ip, timestamp '2019-08-25 04:00:00'), '$.type') c
+FROM kttm_nested
+GROUP BY 1
+HAVING time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+AND ('1'||json_value(earliest_by(client_ip, timestamp '2019-08-25 04:00:00'), '$.type') IS NULL
+     OR ('1'||json_value(earliest_by(client_ip, timestamp '2019-08-25 04:00:00'), '$.type') = 1||json_value(earliest_by(client_ip, timestamp '2019-08-25 04:00:00'), '$.type')
+         AND '1'||json_value(earliest_by(client_ip, timestamp '2019-08-25 04:00:00'), '$.type') IS NOT DISTINCT
+         FROM 1||json_value(earliest_by(client_ip, timestamp '2019-08-25 04:00:00'), '$.type')
+         AND '1'||json_value(earliest_by(client_ip, timestamp '2019-08-25 04:00:00'), '$.type') <> '0'||json_value(earliest_by(client_ip, timestamp '2019-08-25 04:00:00'), '$.type')
+         AND ('1'||json_value(earliest_by(client_ip, timestamp '2019-08-25 04:00:00'), '$.type') IS DISTINCT
+              FROM '0'||json_value(earliest_by(client_ip, timestamp '2019-08-25 04:00:00'), '$.type'))
+         AND '1'||json_value(earliest_by(client_ip, timestamp '2019-08-25 04:00:00'), '$.type') > '0'||json_value(earliest_by(client_ip, timestamp '2019-08-25 04:00:00'), '$.type')
+         AND '1'||json_value(earliest_by(client_ip, timestamp '2019-08-25 04:00:00'), '$.type') >= '0'||json_value(earliest_by(client_ip, timestamp '2019-08-25 04:00:00'), '$.type')
+         AND '1'||json_value(earliest_by(client_ip, timestamp '2019-08-25 04:00:00'), '$.type') < 2||json_value(earliest_by(client_ip, timestamp '2019-08-25 04:00:00'), '$.type')
+         AND '1'||json_value(earliest_by(client_ip, timestamp '2019-08-25 04:00:00'), '$.type') <= 2||json_value(earliest_by(client_ip, timestamp '2019-08-25 04:00:00'), '$.type')
+         AND ('1'||json_value(earliest_by(client_ip, timestamp '2019-08-25 04:00:00'), '$.type') <> '0'||json_value(earliest_by(client_ip, timestamp '2019-08-25 04:00:00'), '$.type')) IS TRUE
+         AND ('1'||json_value(earliest_by(client_ip, timestamp '2019-08-25 04:00:00'), '$.type') = '0'||json_value(earliest_by(client_ip, timestamp '2019-08-25 04:00:00'), '$.type')) IS NOT TRUE
+         AND ('1'||json_value(earliest_by(client_ip, timestamp '2019-08-25 04:00:00'), '$.type') = '0'||json_value(earliest_by(client_ip, timestamp '2019-08-25 04:00:00'), '$.type')) IS FALSE
+         AND ('1'||json_value(earliest_by(client_ip, timestamp '2019-08-25 04:00:00'), '$.type') <> '0'||json_value(earliest_by(client_ip, timestamp '2019-08-25 04:00:00'), '$.type')) IS NOT FALSE
+         AND '1'||json_value(earliest_by(client_ip, timestamp '2019-08-25 04:00:00'), '$.type') BETWEEN '0'||json_value(earliest_by(client_ip, timestamp '2019-08-25 04:00:00'), '$.type') AND 2||json_value(earliest_by(client_ip, timestamp '2019-08-25 04:00:00'), '$.type')
+         AND '1'||json_value(earliest_by(client_ip, timestamp '2019-08-25 04:00:00'), '$.type') NOT BETWEEN '1'||json_value(earliest_by(client_ip, timestamp '2019-08-25 04:00:00'), '$.type') AND '0'||json_value(earliest_by(client_ip, timestamp '2019-08-25 04:00:00'), '$.type')
+         AND '1'||json_value(earliest_by(client_ip, timestamp '2019-08-25 04:00:00'), '$.type') like '%'
+         AND '1'||json_value(earliest_by(client_ip, timestamp '2019-08-25 04:00:00'), '$.type') not like '__DOES_NOT_EXIST__%'
+         AND '1'||json_value(earliest_by(client_ip, timestamp '2019-08-25 04:00:00'), '$.type') IN ('0'||json_value(earliest_by(client_ip, timestamp '2019-08-25 04:00:00'), '$.type'),
+                                                                                                    1||json_value(earliest_by(client_ip, timestamp '2019-08-25 04:00:00'), '$.type'),
+                                                                                                    2||json_value(earliest_by(client_ip, timestamp '2019-08-25 04:00:00'), '$.type'))
+         AND '1'||json_value(earliest_by(client_ip, timestamp '2019-08-25 04:00:00'), '$.type') NOT IN ('0'||json_value(earliest_by(client_ip, timestamp '2019-08-25 04:00:00'), '$.type'),
+                                                                                                        2||json_value(earliest_by(client_ip, timestamp '2019-08-25 04:00:00'), '$.type')))) ;
++-------------------------+---+
+| t                       | c |
++-------------------------+---+
+| 2019-08-25 00:00:00.000 |   |
+| 2019-08-25 01:00:00.000 |   |
+| 2019-08-25 02:00:00.000 |   |
+| 2019-08-25 03:00:00.000 |   |
+| 2019-08-25 04:00:00.000 |   |
+| 2019-08-25 05:00:00.000 |   |
+| 2019-08-25 06:00:00.000 |   |
++-------------------------+---+
+(7 rows)
+
+!ok
+
+#-------------------------------------------------------------------------
+# TEST_ID: A24: latest_scalar
+#-------------------------------------------------------------------------
+SELECT time_floor(__time, 'PT1H') t,
+       '1'||latest(client_ip) c
+FROM kttm_nested
+GROUP BY 1
+HAVING time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+AND ('1'||latest(client_ip) IS NULL
+     OR ('1'||latest(client_ip) = 1||latest(client_ip)
+         AND '1'||latest(client_ip) IS NOT DISTINCT
+         FROM 1||latest(client_ip)
+         AND '1'||latest(client_ip) <> '0'||latest(client_ip)
+         AND ('1'||latest(client_ip) IS DISTINCT
+              FROM '0'||latest(client_ip))
+         AND '1'||latest(client_ip) > '0'||latest(client_ip)
+         AND '1'||latest(client_ip) >= '0'||latest(client_ip)
+         AND '1'||latest(client_ip) < 2||latest(client_ip)
+         AND '1'||latest(client_ip) <= 2||latest(client_ip)
+         AND ('1'||latest(client_ip) <> '0'||latest(client_ip)) IS TRUE
+         AND ('1'||latest(client_ip) = '0'||latest(client_ip)) IS NOT TRUE
+         AND ('1'||latest(client_ip) = '0'||latest(client_ip)) IS FALSE
+         AND ('1'||latest(client_ip) <> '0'||latest(client_ip)) IS NOT FALSE
+         AND '1'||latest(client_ip) BETWEEN '0'||latest(client_ip) AND 2||latest(client_ip)
+         AND '1'||latest(client_ip) NOT BETWEEN '1'||latest(client_ip) AND '0'||latest(client_ip)
+         AND '1'||latest(client_ip) like '%'
+         AND '1'||latest(client_ip) not like '__DOES_NOT_EXIST__%'
+         AND '1'||latest(client_ip) IN ('0'||latest(client_ip),
+                                        1||latest(client_ip),
+                                        2||latest(client_ip))
+         AND '1'||latest(client_ip) NOT IN ('0'||latest(client_ip),
+                                            2||latest(client_ip)))) ;
++-------------------------+-----------------+
+| t                       | c               |
++-------------------------+-----------------+
+| 2019-08-25 00:00:00.000 | 1162.225.88.161 |
+| 2019-08-25 01:00:00.000 | 168.7.15.214    |
+| 2019-08-25 02:00:00.000 | 1108.242.161.77 |
+| 2019-08-25 03:00:00.000 | 147.24.19.134   |
+| 2019-08-25 04:00:00.000 | 124.1.163.114   |
+| 2019-08-25 05:00:00.000 | 1172.58.139.180 |
+| 2019-08-25 06:00:00.000 | 192.35.126.102  |
++-------------------------+-----------------+
+(7 rows)
+
+!ok
+
+#-------------------------------------------------------------------------
+# TEST_ID: A25: latest_complex
+#-------------------------------------------------------------------------
+SELECT time_floor(__time, 'PT1H') t,
+       '1'||json_value(latest(agent), '$.type') c
+FROM kttm_nested
+GROUP BY 1
+HAVING time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+AND ('1'||json_value(latest(agent), '$.type') IS NULL
+     OR ('1'||json_value(latest(agent), '$.type') = 1||json_value(latest(agent), '$.type')
+         AND '1'||json_value(latest(agent), '$.type') IS NOT DISTINCT
+         FROM 1||json_value(latest(agent), '$.type')
+         AND '1'||json_value(latest(agent), '$.type') <> '0'||json_value(latest(agent), '$.type')
+         AND ('1'||json_value(latest(agent), '$.type') IS DISTINCT
+              FROM '0'||json_value(latest(agent), '$.type'))
+         AND '1'||json_value(latest(agent), '$.type') > '0'||json_value(latest(agent), '$.type')
+         AND '1'||json_value(latest(agent), '$.type') >= '0'||json_value(latest(agent), '$.type')
+         AND '1'||json_value(latest(agent), '$.type') < 2||json_value(latest(agent), '$.type')
+         AND '1'||json_value(latest(agent), '$.type') <= 2||json_value(latest(agent), '$.type')
+         AND ('1'||json_value(latest(agent), '$.type') <> '0'||json_value(latest(agent), '$.type')) IS TRUE
+         AND ('1'||json_value(latest(agent), '$.type') = '0'||json_value(latest(agent), '$.type')) IS NOT TRUE
+         AND ('1'||json_value(latest(agent), '$.type') = '0'||json_value(latest(agent), '$.type')) IS FALSE
+         AND ('1'||json_value(latest(agent), '$.type') <> '0'||json_value(latest(agent), '$.type')) IS NOT FALSE
+         AND '1'||json_value(latest(agent), '$.type') BETWEEN '0'||json_value(latest(agent), '$.type') AND 2||json_value(latest(agent), '$.type')
+         AND '1'||json_value(latest(agent), '$.type') NOT BETWEEN '1'||json_value(latest(agent), '$.type') AND '0'||json_value(latest(agent), '$.type')
+         AND '1'||json_value(latest(agent), '$.type') like '%'
+         AND '1'||json_value(latest(agent), '$.type') not like '__DOES_NOT_EXIST__%'
+         AND '1'||json_value(latest(agent), '$.type') IN ('0'||json_value(latest(agent), '$.type'),
+                                                          1||json_value(latest(agent), '$.type'),
+                                                          2||json_value(latest(agent), '$.type'))
+         AND '1'||json_value(latest(agent), '$.type') NOT IN ('0'||json_value(latest(agent), '$.type'),
+                                                              2||json_value(latest(agent), '$.type')))) ;
++-------------------------+---+
+| t                       | c |
++-------------------------+---+
+| 2019-08-25 00:00:00.000 |   |
+| 2019-08-25 01:00:00.000 |   |
+| 2019-08-25 02:00:00.000 |   |
+| 2019-08-25 03:00:00.000 |   |
+| 2019-08-25 04:00:00.000 |   |
+| 2019-08-25 05:00:00.000 |   |
+| 2019-08-25 06:00:00.000 |   |
++-------------------------+---+
+(7 rows)
+
+!ok
+
+#-------------------------------------------------------------------------
+# TEST_ID: A26: latest_by_scalar
+#-------------------------------------------------------------------------
+SELECT time_floor(__time, 'PT1H') t,
+       '1'||latest_by(client_ip, timestamp '2019-08-25 04:00:00') c
+FROM kttm_nested
+GROUP BY 1
+HAVING time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+AND ('1'||latest_by(client_ip, timestamp '2019-08-25 04:00:00') IS NULL
+     OR ('1'||latest_by(client_ip, timestamp '2019-08-25 04:00:00') = 1||latest_by(client_ip, timestamp '2019-08-25 04:00:00')
+         AND '1'||latest_by(client_ip, timestamp '2019-08-25 04:00:00') IS NOT DISTINCT
+         FROM 1||latest_by(client_ip, timestamp '2019-08-25 04:00:00')
+         AND '1'||latest_by(client_ip, timestamp '2019-08-25 04:00:00') <> '0'||latest_by(client_ip, timestamp '2019-08-25 04:00:00')
+         AND ('1'||latest_by(client_ip, timestamp '2019-08-25 04:00:00') IS DISTINCT
+              FROM '0'||latest_by(client_ip, timestamp '2019-08-25 04:00:00'))
+         AND '1'||latest_by(client_ip, timestamp '2019-08-25 04:00:00') > '0'||latest_by(client_ip, timestamp '2019-08-25 04:00:00')
+         AND '1'||latest_by(client_ip, timestamp '2019-08-25 04:00:00') >= '0'||latest_by(client_ip, timestamp '2019-08-25 04:00:00')
+         AND '1'||latest_by(client_ip, timestamp '2019-08-25 04:00:00') < 2||latest_by(client_ip, timestamp '2019-08-25 04:00:00')
+         AND '1'||latest_by(client_ip, timestamp '2019-08-25 04:00:00') <= 2||latest_by(client_ip, timestamp '2019-08-25 04:00:00')
+         AND ('1'||latest_by(client_ip, timestamp '2019-08-25 04:00:00') <> '0'||latest_by(client_ip, timestamp '2019-08-25 04:00:00')) IS TRUE
+         AND ('1'||latest_by(client_ip, timestamp '2019-08-25 04:00:00') = '0'||latest_by(client_ip, timestamp '2019-08-25 04:00:00')) IS NOT TRUE
+         AND ('1'||latest_by(client_ip, timestamp '2019-08-25 04:00:00') = '0'||latest_by(client_ip, timestamp '2019-08-25 04:00:00')) IS FALSE
+         AND ('1'||latest_by(client_ip, timestamp '2019-08-25 04:00:00') <> '0'||latest_by(client_ip, timestamp '2019-08-25 04:00:00')) IS NOT FALSE
+         AND '1'||latest_by(client_ip, timestamp '2019-08-25 04:00:00') BETWEEN '0'||latest_by(client_ip, timestamp '2019-08-25 04:00:00') AND 2||latest_by(client_ip, timestamp '2019-08-25 04:00:00')
+         AND '1'||latest_by(client_ip, timestamp '2019-08-25 04:00:00') NOT BETWEEN '1'||latest_by(client_ip, timestamp '2019-08-25 04:00:00') AND '0'||latest_by(client_ip, timestamp '2019-08-25 04:00:00')
+         AND '1'||latest_by(client_ip, timestamp '2019-08-25 04:00:00') like '%'
+         AND '1'||latest_by(client_ip, timestamp '2019-08-25 04:00:00') not like '__DOES_NOT_EXIST__%'
+         AND '1'||latest_by(client_ip, timestamp '2019-08-25 04:00:00') IN ('0'||latest_by(client_ip, timestamp '2019-08-25 04:00:00'),
+                                                                            1||latest_by(client_ip, timestamp '2019-08-25 04:00:00'),
+                                                                            2||latest_by(client_ip, timestamp '2019-08-25 04:00:00'))
+         AND '1'||latest_by(client_ip, timestamp '2019-08-25 04:00:00') NOT IN ('0'||latest_by(client_ip, timestamp '2019-08-25 04:00:00'),
+                                                                                2||latest_by(client_ip, timestamp '2019-08-25 04:00:00')))) ;
++-------------------------+-----------------+
+| t                       | c               |
++-------------------------+-----------------+
+| 2019-08-25 00:00:00.000 | 1162.225.88.161 |
+| 2019-08-25 01:00:00.000 | 168.7.15.214    |
+| 2019-08-25 02:00:00.000 | 1108.242.161.77 |
+| 2019-08-25 03:00:00.000 | 147.24.19.134   |
+| 2019-08-25 04:00:00.000 | 124.1.163.114   |
+| 2019-08-25 05:00:00.000 | 1172.58.139.180 |
+| 2019-08-25 06:00:00.000 | 192.35.126.102  |
++-------------------------+-----------------+
+(7 rows)
+
+!ok
+
+#-------------------------------------------------------------------------
+# TEST_ID: A27: latest_by_complex
+#-------------------------------------------------------------------------
+SELECT time_floor(__time, 'PT1H') t,
+       '1'||json_value(latest_by(client_ip, timestamp '2019-08-25 04:00:00'), '$.type') c
+FROM kttm_nested
+GROUP BY 1
+HAVING time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+AND ('1'||json_value(latest_by(client_ip, timestamp '2019-08-25 04:00:00'), '$.type') IS NULL
+     OR ('1'||json_value(latest_by(client_ip, timestamp '2019-08-25 04:00:00'), '$.type') = 1||json_value(latest_by(client_ip, timestamp '2019-08-25 04:00:00'), '$.type')
+         AND '1'||json_value(latest_by(client_ip, timestamp '2019-08-25 04:00:00'), '$.type') IS NOT DISTINCT
+         FROM 1||json_value(latest_by(client_ip, timestamp '2019-08-25 04:00:00'), '$.type')
+         AND '1'||json_value(latest_by(client_ip, timestamp '2019-08-25 04:00:00'), '$.type') <> '0'||json_value(latest_by(client_ip, timestamp '2019-08-25 04:00:00'), '$.type')
+         AND ('1'||json_value(latest_by(client_ip, timestamp '2019-08-25 04:00:00'), '$.type') IS DISTINCT
+              FROM '0'||json_value(latest_by(client_ip, timestamp '2019-08-25 04:00:00'), '$.type'))
+         AND '1'||json_value(latest_by(client_ip, timestamp '2019-08-25 04:00:00'), '$.type') > '0'||json_value(latest_by(client_ip, timestamp '2019-08-25 04:00:00'), '$.type')
+         AND '1'||json_value(latest_by(client_ip, timestamp '2019-08-25 04:00:00'), '$.type') >= '0'||json_value(latest_by(client_ip, timestamp '2019-08-25 04:00:00'), '$.type')
+         AND '1'||json_value(latest_by(client_ip, timestamp '2019-08-25 04:00:00'), '$.type') < 2||json_value(latest_by(client_ip, timestamp '2019-08-25 04:00:00'), '$.type')
+         AND '1'||json_value(latest_by(client_ip, timestamp '2019-08-25 04:00:00'), '$.type') <= 2||json_value(latest_by(client_ip, timestamp '2019-08-25 04:00:00'), '$.type')
+         AND ('1'||json_value(latest_by(client_ip, timestamp '2019-08-25 04:00:00'), '$.type') <> '0'||json_value(latest_by(client_ip, timestamp '2019-08-25 04:00:00'), '$.type')) IS TRUE
+         AND ('1'||json_value(latest_by(client_ip, timestamp '2019-08-25 04:00:00'), '$.type') = '0'||json_value(latest_by(client_ip, timestamp '2019-08-25 04:00:00'), '$.type')) IS NOT TRUE
+         AND ('1'||json_value(latest_by(client_ip, timestamp '2019-08-25 04:00:00'), '$.type') = '0'||json_value(latest_by(client_ip, timestamp '2019-08-25 04:00:00'), '$.type')) IS FALSE
+         AND ('1'||json_value(latest_by(client_ip, timestamp '2019-08-25 04:00:00'), '$.type') <> '0'||json_value(latest_by(client_ip, timestamp '2019-08-25 04:00:00'), '$.type')) IS NOT FALSE
+         AND '1'||json_value(latest_by(client_ip, timestamp '2019-08-25 04:00:00'), '$.type') BETWEEN '0'||json_value(latest_by(client_ip, timestamp '2019-08-25 04:00:00'), '$.type') AND 2||json_value(latest_by(client_ip, timestamp '2019-08-25 04:00:00'), '$.type')
+         AND '1'||json_value(latest_by(client_ip, timestamp '2019-08-25 04:00:00'), '$.type') NOT BETWEEN '1'||json_value(latest_by(client_ip, timestamp '2019-08-25 04:00:00'), '$.type') AND '0'||json_value(latest_by(client_ip, timestamp '2019-08-25 04:00:00'), '$.type')
+         AND '1'||json_value(latest_by(client_ip, timestamp '2019-08-25 04:00:00'), '$.type') like '%'
+         AND '1'||json_value(latest_by(client_ip, timestamp '2019-08-25 04:00:00'), '$.type') not like '__DOES_NOT_EXIST__%'
+         AND '1'||json_value(latest_by(client_ip, timestamp '2019-08-25 04:00:00'), '$.type') IN ('0'||json_value(latest_by(client_ip, timestamp '2019-08-25 04:00:00'), '$.type'),
+                                                                                                  1||json_value(latest_by(client_ip, timestamp '2019-08-25 04:00:00'), '$.type'),
+                                                                                                  2||json_value(latest_by(client_ip, timestamp '2019-08-25 04:00:00'), '$.type'))
+         AND '1'||json_value(latest_by(client_ip, timestamp '2019-08-25 04:00:00'), '$.type') NOT IN ('0'||json_value(latest_by(client_ip, timestamp '2019-08-25 04:00:00'), '$.type'),
+                                                                                                      2||json_value(latest_by(client_ip, timestamp '2019-08-25 04:00:00'), '$.type')))) ;
++-------------------------+---+
+| t                       | c |
++-------------------------+---+
+| 2019-08-25 00:00:00.000 |   |
+| 2019-08-25 01:00:00.000 |   |
+| 2019-08-25 02:00:00.000 |   |
+| 2019-08-25 03:00:00.000 |   |
+| 2019-08-25 04:00:00.000 |   |
+| 2019-08-25 05:00:00.000 |   |
+| 2019-08-25 06:00:00.000 |   |
++-------------------------+---+
+(7 rows)
+
+!ok
+
+#-------------------------------------------------------------------------
+# TEST_ID: A28: any_value_scalar
+#-------------------------------------------------------------------------
+SELECT time_floor(__time, 'PT1H') t,
+       '1'||any_value(client_ip) c
+FROM kttm_nested
+GROUP BY 1
+HAVING time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+AND ('1'||any_value(client_ip) IS NULL
+     OR ('1'||any_value(client_ip) = 1||any_value(client_ip)
+         AND '1'||any_value(client_ip) IS NOT DISTINCT
+         FROM 1||any_value(client_ip)
+         AND '1'||any_value(client_ip) <> '0'||any_value(client_ip)
+         AND ('1'||any_value(client_ip) IS DISTINCT
+              FROM '0'||any_value(client_ip))
+         AND '1'||any_value(client_ip) > '0'||any_value(client_ip)
+         AND '1'||any_value(client_ip) >= '0'||any_value(client_ip)
+         AND '1'||any_value(client_ip) < 2||any_value(client_ip)
+         AND '1'||any_value(client_ip) <= 2||any_value(client_ip)
+         AND ('1'||any_value(client_ip) <> '0'||any_value(client_ip)) IS TRUE
+         AND ('1'||any_value(client_ip) = '0'||any_value(client_ip)) IS NOT TRUE
+         AND ('1'||any_value(client_ip) = '0'||any_value(client_ip)) IS FALSE
+         AND ('1'||any_value(client_ip) <> '0'||any_value(client_ip)) IS NOT FALSE
+         AND '1'||any_value(client_ip) BETWEEN '0'||any_value(client_ip) AND 2||any_value(client_ip)
+         AND '1'||any_value(client_ip) NOT BETWEEN '1'||any_value(client_ip) AND '0'||any_value(client_ip)
+         AND '1'||any_value(client_ip) like '%'
+         AND '1'||any_value(client_ip) not like '__DOES_NOT_EXIST__%'
+         AND '1'||any_value(client_ip) IN ('0'||any_value(client_ip),
+                                           1||any_value(client_ip),
+                                           2||any_value(client_ip))
+         AND '1'||any_value(client_ip) NOT IN ('0'||any_value(client_ip),
+                                               2||any_value(client_ip)))) ;
++-------------------------+-----------------+
+| t                       | c               |
++-------------------------+-----------------+
+| 2019-08-25 00:00:00.000 | 1181.13.41.82   |
+| 2019-08-25 01:00:00.000 | 199.253.86.170  |
+| 2019-08-25 02:00:00.000 | 1190.62.251.216 |
+| 2019-08-25 03:00:00.000 | 1184.96.197.148 |
+| 2019-08-25 04:00:00.000 | 1186.65.90.120  |
+| 2019-08-25 05:00:00.000 | 1174.45.230.138 |
+| 2019-08-25 06:00:00.000 | 149.178.15.174  |
++-------------------------+-----------------+
+(7 rows)
+
+!ok
+
+#-------------------------------------------------------------------------
+# TEST_ID: A29: any_value_complex
+#-------------------------------------------------------------------------
+SELECT time_floor(__time, 'PT1H') t,
+       '1'||json_value(any_value(agent), '$.type') c
+FROM kttm_nested
+GROUP BY 1
+HAVING time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+AND ('1'||json_value(any_value(agent), '$.type') IS NULL
+     OR ('1'||json_value(any_value(agent), '$.type') = 1||json_value(any_value(agent), '$.type')
+         AND '1'||json_value(any_value(agent), '$.type') IS NOT DISTINCT
+         FROM 1||json_value(any_value(agent), '$.type')
+         AND '1'||json_value(any_value(agent), '$.type') <> '0'||json_value(any_value(agent), '$.type')
+         AND ('1'||json_value(any_value(agent), '$.type') IS DISTINCT
+              FROM '0'||json_value(any_value(agent), '$.type'))
+         AND '1'||json_value(any_value(agent), '$.type') > '0'||json_value(any_value(agent), '$.type')
+         AND '1'||json_value(any_value(agent), '$.type') >= '0'||json_value(any_value(agent), '$.type')
+         AND '1'||json_value(any_value(agent), '$.type') < 2||json_value(any_value(agent), '$.type')
+         AND '1'||json_value(any_value(agent), '$.type') <= 2||json_value(any_value(agent), '$.type')
+         AND ('1'||json_value(any_value(agent), '$.type') <> '0'||json_value(any_value(agent), '$.type')) IS TRUE
+         AND ('1'||json_value(any_value(agent), '$.type') = '0'||json_value(any_value(agent), '$.type')) IS NOT TRUE
+         AND ('1'||json_value(any_value(agent), '$.type') = '0'||json_value(any_value(agent), '$.type')) IS FALSE
+         AND ('1'||json_value(any_value(agent), '$.type') <> '0'||json_value(any_value(agent), '$.type')) IS NOT FALSE
+         AND '1'||json_value(any_value(agent), '$.type') BETWEEN '0'||json_value(any_value(agent), '$.type') AND 2||json_value(any_value(agent), '$.type')
+         AND '1'||json_value(any_value(agent), '$.type') NOT BETWEEN '1'||json_value(any_value(agent), '$.type') AND '0'||json_value(any_value(agent), '$.type')
+         AND '1'||json_value(any_value(agent), '$.type') like '%'
+         AND '1'||json_value(any_value(agent), '$.type') not like '__DOES_NOT_EXIST__%'
+         AND '1'||json_value(any_value(agent), '$.type') IN ('0'||json_value(any_value(agent), '$.type'),
+                                                             1||json_value(any_value(agent), '$.type'),
+                                                             2||json_value(any_value(agent), '$.type'))
+         AND '1'||json_value(any_value(agent), '$.type') NOT IN ('0'||json_value(any_value(agent), '$.type'),
+                                                                 2||json_value(any_value(agent), '$.type')))) ;
++-------------------------+---+
+| t                       | c |
++-------------------------+---+
+| 2019-08-25 00:00:00.000 |   |
+| 2019-08-25 01:00:00.000 |   |
+| 2019-08-25 02:00:00.000 |   |
+| 2019-08-25 03:00:00.000 |   |
+| 2019-08-25 04:00:00.000 |   |
+| 2019-08-25 05:00:00.000 |   |
+| 2019-08-25 06:00:00.000 |   |
++-------------------------+---+
+(7 rows)
+
+!ok
+
+#-------------------------------------------------------------------------
+# TEST_ID: A39: bit_and
+#-------------------------------------------------------------------------
+SELECT time_floor(__time, 'PT1H') t,
+       bit_and(session_length) c
+FROM kttm_nested
+GROUP BY 1
+HAVING time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+AND (bit_and(session_length) IS NULL
+     OR (bit_and(session_length) = bit_and(session_length)+0
+         AND bit_and(session_length) IS NOT DISTINCT
+         FROM bit_and(session_length)+0
+         AND bit_and(session_length) <> bit_and(session_length)-1
+         AND (bit_and(session_length) IS DISTINCT
+              FROM bit_and(session_length)-1)
+         AND bit_and(session_length) > bit_and(session_length)-1
+         AND bit_and(session_length) >= bit_and(session_length)-1
+         AND bit_and(session_length) < bit_and(session_length)+1
+         AND bit_and(session_length) <= bit_and(session_length)+1
+         AND (bit_and(session_length) <> bit_and(session_length)-1) IS TRUE
+         AND (bit_and(session_length) = bit_and(session_length)-1) IS NOT TRUE
+         AND (bit_and(session_length) = bit_and(session_length)-1) IS FALSE
+         AND (bit_and(session_length) <> bit_and(session_length)-1) IS NOT FALSE
+         AND bit_and(session_length) BETWEEN bit_and(session_length)-1 AND bit_and(session_length)+1
+         AND bit_and(session_length) NOT BETWEEN bit_and(session_length) AND bit_and(session_length)-1
+         AND bit_and(session_length) like '%'
+         AND bit_and(session_length) not like '__DOES_NOT_EXIST__%'
+         AND bit_and(session_length) IN (bit_and(session_length)-1,
+                                                                bit_and(session_length)+0,
+                                                                bit_and(session_length)+1)
+         AND bit_and(session_length) NOT IN (bit_and(session_length)-1,
+                                                                    bit_and(session_length)+1))) ;
++-------------------------+---+
+| t                       | c |
++-------------------------+---+
+| 2019-08-25 00:00:00.000 | 0 |
+| 2019-08-25 01:00:00.000 | 0 |
+| 2019-08-25 02:00:00.000 | 0 |
+| 2019-08-25 03:00:00.000 | 0 |
+| 2019-08-25 04:00:00.000 | 0 |
+| 2019-08-25 05:00:00.000 | 0 |
+| 2019-08-25 06:00:00.000 | 0 |
++-------------------------+---+
+(7 rows)
+
+!ok
+
+#-------------------------------------------------------------------------
+# TEST_ID: A40: bit_or
+#-------------------------------------------------------------------------
+SELECT time_floor(__time, 'PT1H') t,
+       bit_or(session_length) c
+FROM kttm_nested
+GROUP BY 1
+HAVING time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+AND (bit_or(session_length) IS NULL
+     OR (bit_or(session_length) = bit_or(session_length)+0
+         AND bit_or(session_length) IS NOT DISTINCT
+         FROM bit_or(session_length)+0
+         AND bit_or(session_length) <> bit_or(session_length)-1
+         AND (bit_or(session_length) IS DISTINCT
+              FROM bit_or(session_length)-1)
+         AND bit_or(session_length) > bit_or(session_length)-1
+         AND bit_or(session_length) >= bit_or(session_length)-1
+         AND bit_or(session_length) < bit_or(session_length)+1
+         AND bit_or(session_length) <= bit_or(session_length)+1
+         AND (bit_or(session_length) <> bit_or(session_length)-1) IS TRUE
+         AND (bit_or(session_length) = bit_or(session_length)-1) IS NOT TRUE
+         AND (bit_or(session_length) = bit_or(session_length)-1) IS FALSE
+         AND (bit_or(session_length) <> bit_or(session_length)-1) IS NOT FALSE
+         AND bit_or(session_length) BETWEEN bit_or(session_length)-1 AND bit_or(session_length)+1
+         AND bit_or(session_length) NOT BETWEEN bit_or(session_length) AND bit_or(session_length)-1
+         AND bit_or(session_length) like '%'
+         AND bit_or(session_length) not like '__DOES_NOT_EXIST__%'
+         AND bit_or(session_length) IN (bit_or(session_length)-1,
+                                                              bit_or(session_length)+0,
+                                                              bit_or(session_length)+1)
+         AND bit_or(session_length) NOT IN (bit_or(session_length)-1,
+                                                                  bit_or(session_length)+1))) ;
++-------------------------+-----------+
+| t                       | c         |
++-------------------------+-----------+
+| 2019-08-25 00:00:00.000 | 268435455 |
+| 2019-08-25 01:00:00.000 | 100663295 |
+| 2019-08-25 02:00:00.000 | 134217727 |
+| 2019-08-25 03:00:00.000 | 201326591 |
+| 2019-08-25 04:00:00.000 | 201326591 |
+| 2019-08-25 05:00:00.000 | 805306367 |
+| 2019-08-25 06:00:00.000 | 704643071 |
++-------------------------+-----------+
+(7 rows)
+
+!ok
+
+#-------------------------------------------------------------------------
+# TEST_ID: A41: bit_xor
+#-------------------------------------------------------------------------
+SELECT time_floor(__time, 'PT1H') t,
+       bit_xor(session_length) c
+FROM kttm_nested
+GROUP BY 1
+HAVING time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+AND (bit_xor(session_length) IS NULL
+     OR (bit_xor(session_length) = bit_xor(session_length)+0
+         AND bit_xor(session_length) IS NOT DISTINCT
+         FROM bit_xor(session_length)+0
+         AND bit_xor(session_length) <> bit_xor(session_length)-1
+         AND (bit_xor(session_length) IS DISTINCT
+              FROM bit_xor(session_length)-1)
+         AND bit_xor(session_length) > bit_xor(session_length)-1
+         AND bit_xor(session_length) >= bit_xor(session_length)-1
+         AND bit_xor(session_length) < bit_xor(session_length)+1
+         AND bit_xor(session_length) <= bit_xor(session_length)+1
+         AND (bit_xor(session_length) <> bit_xor(session_length)-1) IS TRUE
+         AND (bit_xor(session_length) = bit_xor(session_length)-1) IS NOT TRUE
+         AND (bit_xor(session_length) = bit_xor(session_length)-1) IS FALSE
+         AND (bit_xor(session_length) <> bit_xor(session_length)-1) IS NOT FALSE
+         AND bit_xor(session_length) BETWEEN bit_xor(session_length)-1 AND bit_xor(session_length)+1
+         AND bit_xor(session_length) NOT BETWEEN bit_xor(session_length) AND bit_xor(session_length)-1
+         AND bit_xor(session_length) like '%'
+         AND bit_xor(session_length) not like '__DOES_NOT_EXIST__%'
+         AND bit_xor(session_length) IN (bit_xor(session_length)-1,
+                                                                bit_xor(session_length)+0,
+                                                                bit_xor(session_length)+1)
+         AND bit_xor(session_length) NOT IN (bit_xor(session_length)-1,
+                                                                    bit_xor(session_length)+1))) ;
++-------------------------+-----------+
+| t                       | c         |
++-------------------------+-----------+
+| 2019-08-25 00:00:00.000 | 234315927 |
+| 2019-08-25 01:00:00.000 |  95944477 |
+| 2019-08-25 02:00:00.000 | 111843809 |
+| 2019-08-25 03:00:00.000 | 177632213 |
+| 2019-08-25 04:00:00.000 | 163411073 |
+| 2019-08-25 05:00:00.000 | 775476257 |
+| 2019-08-25 06:00:00.000 | 695627807 |
++-------------------------+-----------+
+(7 rows)
+
+!ok
+
+#-------------------------------------------------------------------------
+# Total query count 25
+#-------------------------------------------------------------------------
diff --git a/quidem-ut/src/test/quidem/org.apache.druid.quidem.QTest/qaSQL_array.iq b/quidem-ut/src/test/quidem/org.apache.druid.quidem.QTest/qaSQL_array.iq
new file mode 100644
index 000000000000..ef42b66ae9be
--- /dev/null
+++ b/quidem-ut/src/test/quidem/org.apache.druid.quidem.QTest/qaSQL_array.iq
@@ -0,0 +1,2848 @@
+!set useApproximateCountDistinct false
+!use druidtest:///?componentSupplier=KttmNestedComponentSupplier
+!set outputformat mysql
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00';
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+#-------------------------------------------------------------------------
+# TEST_ID: A1: array
+#-------------------------------------------------------------------------
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND (array_prepend('1', mv_to_array("language")) IS NULL
+       OR (array_prepend('1', mv_to_array("language")) = array_prepend('1', mv_to_array("language"))
+           AND array_prepend('1', mv_to_array("language")) IS NOT DISTINCT
+           FROM array_prepend('1', mv_to_array("language"))
+           AND array_prepend('1', mv_to_array("language")) <> array_prepend('0', mv_to_array("language"))
+           AND (array_prepend('1', mv_to_array("language")) IS DISTINCT
+                FROM array_prepend('0', mv_to_array("language")))
+           AND array_prepend('1', mv_to_array("language")) > array_prepend('0', mv_to_array("language"))
+           AND array_prepend('1', mv_to_array("language")) >= array_prepend('0', mv_to_array("language"))
+           AND array_prepend('1', mv_to_array("language")) < array_prepend('2', mv_to_array("language"))
+           AND array_prepend('1', mv_to_array("language")) <= array_prepend('2', mv_to_array("language"))
+           AND (array_prepend('1', mv_to_array("language")) <> array_prepend('0', mv_to_array("language"))) IS TRUE
+           AND (array_prepend('1', mv_to_array("language")) = array_prepend('0', mv_to_array("language"))) IS NOT TRUE
+           AND (array_prepend('1', mv_to_array("language")) = array_prepend('0', mv_to_array("language"))) IS FALSE
+           AND (array_prepend('1', mv_to_array("language")) <> array_prepend('0', mv_to_array("language"))) IS NOT FALSE
+           AND array_prepend('1', mv_to_array("language")) BETWEEN array_prepend('0', mv_to_array("language")) AND array_prepend('2', mv_to_array("language"))
+           AND array_prepend('1', mv_to_array("language")) NOT BETWEEN array_prepend('1', mv_to_array("language")) AND array_prepend('0', mv_to_array("language"))
+           AND array_prepend('1', mv_to_array("language")) IN (array_prepend('0', mv_to_array("language")),
+                                                               array_prepend('1', mv_to_array("language")),
+                                                               array_prepend('2', mv_to_array("language")))
+           AND array_prepend('1', mv_to_array("language")) NOT IN (array_prepend('0', mv_to_array("language")),
+                                                                   array_prepend('2', mv_to_array("language"))))) ;
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM
+  (SELECT __time, number, client_ip,
+                          array_prepend('1', mv_to_array("language")),
+                          count(*)
+   FROM kttm_nested
+   WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+     AND (array_prepend('1', mv_to_array("language")) IS NULL
+          OR (array_prepend('1', mv_to_array("language")) = array_prepend('1', mv_to_array("language"))
+              AND array_prepend('1', mv_to_array("language")) IS NOT DISTINCT
+              FROM array_prepend('1', mv_to_array("language"))
+              AND array_prepend('1', mv_to_array("language")) <> array_prepend('0', mv_to_array("language"))
+              AND (array_prepend('1', mv_to_array("language")) IS DISTINCT
+                   FROM array_prepend('0', mv_to_array("language")))
+              AND array_prepend('1', mv_to_array("language")) > array_prepend('0', mv_to_array("language"))
+              AND array_prepend('1', mv_to_array("language")) >= array_prepend('0', mv_to_array("language"))
+              AND array_prepend('1', mv_to_array("language")) < array_prepend('2', mv_to_array("language"))
+              AND array_prepend('1', mv_to_array("language")) <= array_prepend('2', mv_to_array("language"))
+              AND (array_prepend('1', mv_to_array("language")) <> array_prepend('0', mv_to_array("language"))) IS TRUE
+              AND (array_prepend('1', mv_to_array("language")) = array_prepend('0', mv_to_array("language"))) IS NOT TRUE
+              AND (array_prepend('1', mv_to_array("language")) = array_prepend('0', mv_to_array("language"))) IS FALSE
+              AND (array_prepend('1', mv_to_array("language")) <> array_prepend('0', mv_to_array("language"))) IS NOT FALSE
+              AND array_prepend('1', mv_to_array("language")) BETWEEN array_prepend('0', mv_to_array("language")) AND array_prepend('2', mv_to_array("language"))
+              AND array_prepend('1', mv_to_array("language")) NOT BETWEEN array_prepend('1', mv_to_array("language")) AND array_prepend('0', mv_to_array("language"))
+              AND array_prepend('1', mv_to_array("language")) IN (array_prepend('0', mv_to_array("language")),
+                                                                  array_prepend('1', mv_to_array("language")),
+                                                                  array_prepend('2', mv_to_array("language")))
+              AND array_prepend('1', mv_to_array("language")) NOT IN (array_prepend('0', mv_to_array("language")),
+                                                                      array_prepend('2', mv_to_array("language")))))
+   GROUP BY 1,
+            2,
+            3,
+            4);
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+#-------------------------------------------------------------------------
+# TEST_ID: A2: array_length
+#-------------------------------------------------------------------------
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND (array_length(mv_to_array("language")) IS NULL
+       OR (array_length(mv_to_array("language")) = array_length(mv_to_array("language"))+0
+           AND array_length(mv_to_array("language")) IS NOT DISTINCT
+           FROM array_length(mv_to_array("language"))+0
+           AND array_length(mv_to_array("language")) <> array_length(mv_to_array("language"))-1
+           AND (array_length(mv_to_array("language")) IS DISTINCT
+                FROM array_length(mv_to_array("language"))-1)
+           AND array_length(mv_to_array("language")) > array_length(mv_to_array("language"))-1
+           AND array_length(mv_to_array("language")) >= array_length(mv_to_array("language"))-1
+           AND array_length(mv_to_array("language")) < array_length(mv_to_array("language"))+1
+           AND array_length(mv_to_array("language")) <= array_length(mv_to_array("language"))+1
+           AND (array_length(mv_to_array("language")) <> array_length(mv_to_array("language"))-1) IS TRUE
+           AND (array_length(mv_to_array("language")) = array_length(mv_to_array("language"))-1) IS NOT TRUE
+           AND (array_length(mv_to_array("language")) = array_length(mv_to_array("language"))-1) IS FALSE
+           AND (array_length(mv_to_array("language")) <> array_length(mv_to_array("language"))-1) IS NOT FALSE
+           AND array_length(mv_to_array("language")) BETWEEN array_length(mv_to_array("language"))-1 AND array_length(mv_to_array("language"))+1
+           AND array_length(mv_to_array("language")) NOT BETWEEN array_length(mv_to_array("language")) AND array_length(mv_to_array("language"))-1
+           AND array_length(mv_to_array("language")) like '%'
+           AND array_length(mv_to_array("language")) not like '__DOES_NOT_EXIST__%'
+           AND array_length(mv_to_array("language")) IN (array_length(mv_to_array("language"))-1,
+                                                                                              array_length(mv_to_array("language"))+0,
+                                                                                              array_length(mv_to_array("language"))+1)
+           AND array_length(mv_to_array("language")) NOT IN (array_length(mv_to_array("language"))-1,
+                                                                                                  array_length(mv_to_array("language"))+1))) ;
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND (array_length(mv_to_array("language")) IS NULL
+       OR array_length(mv_to_array("language")) IN
+         (SELECT array_length(mv_to_array("language"))
+          FROM kttm_nested
+          WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+            AND (array_length(mv_to_array("language")) IS NULL
+                 OR (array_length(mv_to_array("language")) = array_length(mv_to_array("language"))+0
+                     AND array_length(mv_to_array("language")) IS NOT DISTINCT
+                     FROM array_length(mv_to_array("language"))+0
+                     AND array_length(mv_to_array("language")) <> array_length(mv_to_array("language"))-1
+                     AND (array_length(mv_to_array("language")) IS DISTINCT
+                          FROM array_length(mv_to_array("language"))-1)
+                     AND array_length(mv_to_array("language")) > array_length(mv_to_array("language"))-1
+                     AND array_length(mv_to_array("language")) >= array_length(mv_to_array("language"))-1
+                     AND array_length(mv_to_array("language")) < array_length(mv_to_array("language"))+1
+                     AND array_length(mv_to_array("language")) <= array_length(mv_to_array("language"))+1
+                     AND (array_length(mv_to_array("language")) <> array_length(mv_to_array("language"))-1) IS TRUE
+                     AND (array_length(mv_to_array("language")) = array_length(mv_to_array("language"))-1) IS NOT TRUE
+                     AND (array_length(mv_to_array("language")) = array_length(mv_to_array("language"))-1) IS FALSE
+                     AND (array_length(mv_to_array("language")) <> array_length(mv_to_array("language"))-1) IS NOT FALSE
+                     AND array_length(mv_to_array("language")) BETWEEN array_length(mv_to_array("language"))-1 AND array_length(mv_to_array("language"))+1
+                     AND array_length(mv_to_array("language")) NOT BETWEEN array_length(mv_to_array("language")) AND array_length(mv_to_array("language"))-1
+                     AND array_length(mv_to_array("language")) like '%'
+                     AND array_length(mv_to_array("language")) not like '__DOES_NOT_EXIST__%'
+                     AND array_length(mv_to_array("language")) IN (array_length(mv_to_array("language"))-1,
+                                                                                                        array_length(mv_to_array("language"))+0,
+                                                                                                        array_length(mv_to_array("language"))+1)
+                     AND array_length(mv_to_array("language")) NOT IN (array_length(mv_to_array("language"))-1,
+                                                                                                            array_length(mv_to_array("language"))+1)))));
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM
+  (SELECT __time, number, client_ip,
+                          array_length(mv_to_array("language")),
+                          count(*)
+   FROM kttm_nested
+   WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+     AND (array_length(mv_to_array("language")) IS NULL
+          OR (array_length(mv_to_array("language")) = array_length(mv_to_array("language"))+0
+              AND array_length(mv_to_array("language")) IS NOT DISTINCT
+              FROM array_length(mv_to_array("language"))+0
+              AND array_length(mv_to_array("language")) <> array_length(mv_to_array("language"))-1
+              AND (array_length(mv_to_array("language")) IS DISTINCT
+                   FROM array_length(mv_to_array("language"))-1)
+              AND array_length(mv_to_array("language")) > array_length(mv_to_array("language"))-1
+              AND array_length(mv_to_array("language")) >= array_length(mv_to_array("language"))-1
+              AND array_length(mv_to_array("language")) < array_length(mv_to_array("language"))+1
+              AND array_length(mv_to_array("language")) <= array_length(mv_to_array("language"))+1
+              AND (array_length(mv_to_array("language")) <> array_length(mv_to_array("language"))-1) IS TRUE
+              AND (array_length(mv_to_array("language")) = array_length(mv_to_array("language"))-1) IS NOT TRUE
+              AND (array_length(mv_to_array("language")) = array_length(mv_to_array("language"))-1) IS FALSE
+              AND (array_length(mv_to_array("language")) <> array_length(mv_to_array("language"))-1) IS NOT FALSE
+              AND array_length(mv_to_array("language")) BETWEEN array_length(mv_to_array("language"))-1 AND array_length(mv_to_array("language"))+1
+              AND array_length(mv_to_array("language")) NOT BETWEEN array_length(mv_to_array("language")) AND array_length(mv_to_array("language"))-1
+              AND array_length(mv_to_array("language")) like '%'
+              AND array_length(mv_to_array("language")) not like '__DOES_NOT_EXIST__%'
+              AND array_length(mv_to_array("language")) IN (array_length(mv_to_array("language"))-1,
+                                                                                                 array_length(mv_to_array("language"))+0,
+                                                                                                 array_length(mv_to_array("language"))+1)
+              AND array_length(mv_to_array("language")) NOT IN (array_length(mv_to_array("language"))-1,
+                                                                                                     array_length(mv_to_array("language"))+1)))
+   GROUP BY 1,
+            2,
+            3,
+            4);
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+#-------------------------------------------------------------------------
+# TEST_ID: A3: array_offset
+#-------------------------------------------------------------------------
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND ('1'||array_offset(mv_to_array("language"), 0) IS NULL
+       OR ('1'||array_offset(mv_to_array("language"), 0) = 1||array_offset(mv_to_array("language"), 0)
+           AND '1'||array_offset(mv_to_array("language"), 0) IS NOT DISTINCT
+           FROM 1||array_offset(mv_to_array("language"), 0)
+           AND '1'||array_offset(mv_to_array("language"), 0) <> 0||array_offset(mv_to_array("language"), 0)
+           AND ('1'||array_offset(mv_to_array("language"), 0) IS DISTINCT
+                FROM 0||array_offset(mv_to_array("language"), 0))
+           AND '1'||array_offset(mv_to_array("language"), 0) > 0||array_offset(mv_to_array("language"), 0)
+           AND '1'||array_offset(mv_to_array("language"), 0) >= 0||array_offset(mv_to_array("language"), 0)
+           AND '1'||array_offset(mv_to_array("language"), 0) < 2||array_offset(mv_to_array("language"), 0)
+           AND '1'||array_offset(mv_to_array("language"), 0) <= 2||array_offset(mv_to_array("language"), 0)
+           AND ('1'||array_offset(mv_to_array("language"), 0) <> 0||array_offset(mv_to_array("language"), 0)) IS TRUE
+           AND ('1'||array_offset(mv_to_array("language"), 0) = 0||array_offset(mv_to_array("language"), 0)) IS NOT TRUE
+           AND ('1'||array_offset(mv_to_array("language"), 0) = 0||array_offset(mv_to_array("language"), 0)) IS FALSE
+           AND ('1'||array_offset(mv_to_array("language"), 0) <> 0||array_offset(mv_to_array("language"), 0)) IS NOT FALSE
+           AND '1'||array_offset(mv_to_array("language"), 0) BETWEEN 0||array_offset(mv_to_array("language"), 0) AND 2||array_offset(mv_to_array("language"), 0)
+           AND '1'||array_offset(mv_to_array("language"), 0) NOT BETWEEN '1'||array_offset(mv_to_array("language"), 0) AND 0||array_offset(mv_to_array("language"), 0)
+           AND '1'||array_offset(mv_to_array("language"), 0) like '%'
+           AND '1'||array_offset(mv_to_array("language"), 0) not like '__DOES_NOT_EXIST__%'
+           AND '1'||array_offset(mv_to_array("language"), 0) IN (0||array_offset(mv_to_array("language"), 0),
+                                                                 1||array_offset(mv_to_array("language"), 0),
+                                                                 2||array_offset(mv_to_array("language"), 0))
+           AND '1'||array_offset(mv_to_array("language"), 0) NOT IN (0||array_offset(mv_to_array("language"), 0),
+                                                                     2||array_offset(mv_to_array("language"), 0)))) ;
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND ('1'||array_offset(mv_to_array("language"), 0) IS NULL
+       OR '1'||array_offset(mv_to_array("language"), 0) IN
+         (SELECT '1'||array_offset(mv_to_array("language"), 0)
+          FROM kttm_nested
+          WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+            AND ('1'||array_offset(mv_to_array("language"), 0) IS NULL
+                 OR ('1'||array_offset(mv_to_array("language"), 0) = 1||array_offset(mv_to_array("language"), 0)
+                     AND '1'||array_offset(mv_to_array("language"), 0) IS NOT DISTINCT
+                     FROM 1||array_offset(mv_to_array("language"), 0)
+                     AND '1'||array_offset(mv_to_array("language"), 0) <> 0||array_offset(mv_to_array("language"), 0)
+                     AND ('1'||array_offset(mv_to_array("language"), 0) IS DISTINCT
+                          FROM 0||array_offset(mv_to_array("language"), 0))
+                     AND '1'||array_offset(mv_to_array("language"), 0) > 0||array_offset(mv_to_array("language"), 0)
+                     AND '1'||array_offset(mv_to_array("language"), 0) >= 0||array_offset(mv_to_array("language"), 0)
+                     AND '1'||array_offset(mv_to_array("language"), 0) < 2||array_offset(mv_to_array("language"), 0)
+                     AND '1'||array_offset(mv_to_array("language"), 0) <= 2||array_offset(mv_to_array("language"), 0)
+                     AND ('1'||array_offset(mv_to_array("language"), 0) <> 0||array_offset(mv_to_array("language"), 0)) IS TRUE
+                     AND ('1'||array_offset(mv_to_array("language"), 0) = 0||array_offset(mv_to_array("language"), 0)) IS NOT TRUE
+                     AND ('1'||array_offset(mv_to_array("language"), 0) = 0||array_offset(mv_to_array("language"), 0)) IS FALSE
+                     AND ('1'||array_offset(mv_to_array("language"), 0) <> 0||array_offset(mv_to_array("language"), 0)) IS NOT FALSE
+                     AND '1'||array_offset(mv_to_array("language"), 0) BETWEEN 0||array_offset(mv_to_array("language"), 0) AND 2||array_offset(mv_to_array("language"), 0)
+                     AND '1'||array_offset(mv_to_array("language"), 0) NOT BETWEEN '1'||array_offset(mv_to_array("language"), 0) AND 0||array_offset(mv_to_array("language"), 0)
+                     AND '1'||array_offset(mv_to_array("language"), 0) like '%'
+                     AND '1'||array_offset(mv_to_array("language"), 0) not like '__DOES_NOT_EXIST__%'
+                     AND '1'||array_offset(mv_to_array("language"), 0) IN (0||array_offset(mv_to_array("language"), 0),
+                                                                           1||array_offset(mv_to_array("language"), 0),
+                                                                           2||array_offset(mv_to_array("language"), 0))
+                     AND '1'||array_offset(mv_to_array("language"), 0) NOT IN (0||array_offset(mv_to_array("language"), 0),
+                                                                               2||array_offset(mv_to_array("language"), 0))))));
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM
+  (SELECT __time, number, client_ip,
+                          '1'||array_offset(mv_to_array("language"), 0),
+                          count(*)
+   FROM kttm_nested
+   WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+     AND ('1'||array_offset(mv_to_array("language"), 0) IS NULL
+          OR ('1'||array_offset(mv_to_array("language"), 0) = 1||array_offset(mv_to_array("language"), 0)
+              AND '1'||array_offset(mv_to_array("language"), 0) IS NOT DISTINCT
+              FROM 1||array_offset(mv_to_array("language"), 0)
+              AND '1'||array_offset(mv_to_array("language"), 0) <> 0||array_offset(mv_to_array("language"), 0)
+              AND ('1'||array_offset(mv_to_array("language"), 0) IS DISTINCT
+                   FROM 0||array_offset(mv_to_array("language"), 0))
+              AND '1'||array_offset(mv_to_array("language"), 0) > 0||array_offset(mv_to_array("language"), 0)
+              AND '1'||array_offset(mv_to_array("language"), 0) >= 0||array_offset(mv_to_array("language"), 0)
+              AND '1'||array_offset(mv_to_array("language"), 0) < 2||array_offset(mv_to_array("language"), 0)
+              AND '1'||array_offset(mv_to_array("language"), 0) <= 2||array_offset(mv_to_array("language"), 0)
+              AND ('1'||array_offset(mv_to_array("language"), 0) <> 0||array_offset(mv_to_array("language"), 0)) IS TRUE
+              AND ('1'||array_offset(mv_to_array("language"), 0) = 0||array_offset(mv_to_array("language"), 0)) IS NOT TRUE
+              AND ('1'||array_offset(mv_to_array("language"), 0) = 0||array_offset(mv_to_array("language"), 0)) IS FALSE
+              AND ('1'||array_offset(mv_to_array("language"), 0) <> 0||array_offset(mv_to_array("language"), 0)) IS NOT FALSE
+              AND '1'||array_offset(mv_to_array("language"), 0) BETWEEN 0||array_offset(mv_to_array("language"), 0) AND 2||array_offset(mv_to_array("language"), 0)
+              AND '1'||array_offset(mv_to_array("language"), 0) NOT BETWEEN '1'||array_offset(mv_to_array("language"), 0) AND 0||array_offset(mv_to_array("language"), 0)
+              AND '1'||array_offset(mv_to_array("language"), 0) like '%'
+              AND '1'||array_offset(mv_to_array("language"), 0) not like '__DOES_NOT_EXIST__%'
+              AND '1'||array_offset(mv_to_array("language"), 0) IN (0||array_offset(mv_to_array("language"), 0),
+                                                                    1||array_offset(mv_to_array("language"), 0),
+                                                                    2||array_offset(mv_to_array("language"), 0))
+              AND '1'||array_offset(mv_to_array("language"), 0) NOT IN (0||array_offset(mv_to_array("language"), 0),
+                                                                        2||array_offset(mv_to_array("language"), 0))))
+   GROUP BY 1,
+            2,
+            3,
+            4);
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+#-------------------------------------------------------------------------
+# TEST_ID: A4: array_ordinal
+#-------------------------------------------------------------------------
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND ('1'||array_ordinal(mv_to_array("language"), 1) IS NULL
+       OR ('1'||array_ordinal(mv_to_array("language"), 1) = 1||array_ordinal(mv_to_array("language"), 1)
+           AND '1'||array_ordinal(mv_to_array("language"), 1) IS NOT DISTINCT
+           FROM 1||array_ordinal(mv_to_array("language"), 1)
+           AND '1'||array_ordinal(mv_to_array("language"), 1) <> 0||array_ordinal(mv_to_array("language"), 1)
+           AND ('1'||array_ordinal(mv_to_array("language"), 1) IS DISTINCT
+                FROM 0||array_ordinal(mv_to_array("language"), 1))
+           AND '1'||array_ordinal(mv_to_array("language"), 1) > 0||array_ordinal(mv_to_array("language"), 1)
+           AND '1'||array_ordinal(mv_to_array("language"), 1) >= 0||array_ordinal(mv_to_array("language"), 1)
+           AND '1'||array_ordinal(mv_to_array("language"), 1) < 2||array_ordinal(mv_to_array("language"), 1)
+           AND '1'||array_ordinal(mv_to_array("language"), 1) <= 2||array_ordinal(mv_to_array("language"), 1)
+           AND ('1'||array_ordinal(mv_to_array("language"), 1) <> 0||array_ordinal(mv_to_array("language"), 1)) IS TRUE
+           AND ('1'||array_ordinal(mv_to_array("language"), 1) = 0||array_ordinal(mv_to_array("language"), 1)) IS NOT TRUE
+           AND ('1'||array_ordinal(mv_to_array("language"), 1) = 0||array_ordinal(mv_to_array("language"), 1)) IS FALSE
+           AND ('1'||array_ordinal(mv_to_array("language"), 1) <> 0||array_ordinal(mv_to_array("language"), 1)) IS NOT FALSE
+           AND '1'||array_ordinal(mv_to_array("language"), 1) BETWEEN 0||array_ordinal(mv_to_array("language"), 1) AND 2||array_ordinal(mv_to_array("language"), 1)
+           AND '1'||array_ordinal(mv_to_array("language"), 1) NOT BETWEEN '1'||array_ordinal(mv_to_array("language"), 1) AND 0||array_ordinal(mv_to_array("language"), 1)
+           AND '1'||array_ordinal(mv_to_array("language"), 1) like '%'
+           AND '1'||array_ordinal(mv_to_array("language"), 1) not like '__DOES_NOT_EXIST__%'
+           AND '1'||array_ordinal(mv_to_array("language"), 1) IN (0||array_ordinal(mv_to_array("language"), 1),
+                                                                  1||array_ordinal(mv_to_array("language"), 1),
+                                                                  2||array_ordinal(mv_to_array("language"), 1))
+           AND '1'||array_ordinal(mv_to_array("language"), 1) NOT IN (0||array_ordinal(mv_to_array("language"), 1),
+                                                                      2||array_ordinal(mv_to_array("language"), 1)))) ;
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND ('1'||array_ordinal(mv_to_array("language"), 1) IS NULL
+       OR '1'||array_ordinal(mv_to_array("language"), 1) IN
+         (SELECT '1'||array_ordinal(mv_to_array("language"), 1)
+          FROM kttm_nested
+          WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+            AND ('1'||array_ordinal(mv_to_array("language"), 1) IS NULL
+                 OR ('1'||array_ordinal(mv_to_array("language"), 1) = 1||array_ordinal(mv_to_array("language"), 1)
+                     AND '1'||array_ordinal(mv_to_array("language"), 1) IS NOT DISTINCT
+                     FROM 1||array_ordinal(mv_to_array("language"), 1)
+                     AND '1'||array_ordinal(mv_to_array("language"), 1) <> 0||array_ordinal(mv_to_array("language"), 1)
+                     AND ('1'||array_ordinal(mv_to_array("language"), 1) IS DISTINCT
+                          FROM 0||array_ordinal(mv_to_array("language"), 1))
+                     AND '1'||array_ordinal(mv_to_array("language"), 1) > 0||array_ordinal(mv_to_array("language"), 1)
+                     AND '1'||array_ordinal(mv_to_array("language"), 1) >= 0||array_ordinal(mv_to_array("language"), 1)
+                     AND '1'||array_ordinal(mv_to_array("language"), 1) < 2||array_ordinal(mv_to_array("language"), 1)
+                     AND '1'||array_ordinal(mv_to_array("language"), 1) <= 2||array_ordinal(mv_to_array("language"), 1)
+                     AND ('1'||array_ordinal(mv_to_array("language"), 1) <> 0||array_ordinal(mv_to_array("language"), 1)) IS TRUE
+                     AND ('1'||array_ordinal(mv_to_array("language"), 1) = 0||array_ordinal(mv_to_array("language"), 1)) IS NOT TRUE
+                     AND ('1'||array_ordinal(mv_to_array("language"), 1) = 0||array_ordinal(mv_to_array("language"), 1)) IS FALSE
+                     AND ('1'||array_ordinal(mv_to_array("language"), 1) <> 0||array_ordinal(mv_to_array("language"), 1)) IS NOT FALSE
+                     AND '1'||array_ordinal(mv_to_array("language"), 1) BETWEEN 0||array_ordinal(mv_to_array("language"), 1) AND 2||array_ordinal(mv_to_array("language"), 1)
+                     AND '1'||array_ordinal(mv_to_array("language"), 1) NOT BETWEEN '1'||array_ordinal(mv_to_array("language"), 1) AND 0||array_ordinal(mv_to_array("language"), 1)
+                     AND '1'||array_ordinal(mv_to_array("language"), 1) like '%'
+                     AND '1'||array_ordinal(mv_to_array("language"), 1) not like '__DOES_NOT_EXIST__%'
+                     AND '1'||array_ordinal(mv_to_array("language"), 1) IN (0||array_ordinal(mv_to_array("language"), 1),
+                                                                            1||array_ordinal(mv_to_array("language"), 1),
+                                                                            2||array_ordinal(mv_to_array("language"), 1))
+                     AND '1'||array_ordinal(mv_to_array("language"), 1) NOT IN (0||array_ordinal(mv_to_array("language"), 1),
+                                                                                2||array_ordinal(mv_to_array("language"), 1))))));
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM
+  (SELECT __time, number, client_ip,
+                          '1'||array_ordinal(mv_to_array("language"), 1),
+                          count(*)
+   FROM kttm_nested
+   WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+     AND ('1'||array_ordinal(mv_to_array("language"), 1) IS NULL
+          OR ('1'||array_ordinal(mv_to_array("language"), 1) = 1||array_ordinal(mv_to_array("language"), 1)
+              AND '1'||array_ordinal(mv_to_array("language"), 1) IS NOT DISTINCT
+              FROM 1||array_ordinal(mv_to_array("language"), 1)
+              AND '1'||array_ordinal(mv_to_array("language"), 1) <> 0||array_ordinal(mv_to_array("language"), 1)
+              AND ('1'||array_ordinal(mv_to_array("language"), 1) IS DISTINCT
+                   FROM 0||array_ordinal(mv_to_array("language"), 1))
+              AND '1'||array_ordinal(mv_to_array("language"), 1) > 0||array_ordinal(mv_to_array("language"), 1)
+              AND '1'||array_ordinal(mv_to_array("language"), 1) >= 0||array_ordinal(mv_to_array("language"), 1)
+              AND '1'||array_ordinal(mv_to_array("language"), 1) < 2||array_ordinal(mv_to_array("language"), 1)
+              AND '1'||array_ordinal(mv_to_array("language"), 1) <= 2||array_ordinal(mv_to_array("language"), 1)
+              AND ('1'||array_ordinal(mv_to_array("language"), 1) <> 0||array_ordinal(mv_to_array("language"), 1)) IS TRUE
+              AND ('1'||array_ordinal(mv_to_array("language"), 1) = 0||array_ordinal(mv_to_array("language"), 1)) IS NOT TRUE
+              AND ('1'||array_ordinal(mv_to_array("language"), 1) = 0||array_ordinal(mv_to_array("language"), 1)) IS FALSE
+              AND ('1'||array_ordinal(mv_to_array("language"), 1) <> 0||array_ordinal(mv_to_array("language"), 1)) IS NOT FALSE
+              AND '1'||array_ordinal(mv_to_array("language"), 1) BETWEEN 0||array_ordinal(mv_to_array("language"), 1) AND 2||array_ordinal(mv_to_array("language"), 1)
+              AND '1'||array_ordinal(mv_to_array("language"), 1) NOT BETWEEN '1'||array_ordinal(mv_to_array("language"), 1) AND 0||array_ordinal(mv_to_array("language"), 1)
+              AND '1'||array_ordinal(mv_to_array("language"), 1) like '%'
+              AND '1'||array_ordinal(mv_to_array("language"), 1) not like '__DOES_NOT_EXIST__%'
+              AND '1'||array_ordinal(mv_to_array("language"), 1) IN (0||array_ordinal(mv_to_array("language"), 1),
+                                                                     1||array_ordinal(mv_to_array("language"), 1),
+                                                                     2||array_ordinal(mv_to_array("language"), 1))
+              AND '1'||array_ordinal(mv_to_array("language"), 1) NOT IN (0||array_ordinal(mv_to_array("language"), 1),
+                                                                         2||array_ordinal(mv_to_array("language"), 1))))
+   GROUP BY 1,
+            2,
+            3,
+            4);
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+#-------------------------------------------------------------------------
+# TEST_ID: A5: array_contains
+#-------------------------------------------------------------------------
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND (CASE
+           WHEN array_contains(mv_to_array("language"), mv_to_array("language")) THEN 1
+           ELSE 1
+       END IS NULL
+       OR (CASE
+               WHEN array_contains(mv_to_array("language"), mv_to_array("language")) THEN 1
+               ELSE 1
+           END = CASE
+                     WHEN array_contains(mv_to_array("language"), mv_to_array("language")) THEN 1
+                     ELSE 1
+                 END
+           AND CASE
+                   WHEN array_contains(mv_to_array("language"), mv_to_array("language")) THEN 1
+                   ELSE 1
+               END IS NOT DISTINCT
+           FROM CASE
+                    WHEN array_contains(mv_to_array("language"), mv_to_array("language")) THEN 1
+                    ELSE 1
+                END
+           AND CASE
+                   WHEN array_contains(mv_to_array("language"), mv_to_array("language")) THEN 1
+                   ELSE 1
+               END <> CASE
+                          WHEN array_contains(mv_to_array("language"), mv_to_array("language")) THEN 0
+                          ELSE 0
+                      END
+           AND (CASE
+                    WHEN array_contains(mv_to_array("language"), mv_to_array("language")) THEN 1
+                    ELSE 1
+                END IS DISTINCT
+                FROM CASE
+                         WHEN array_contains(mv_to_array("language"), mv_to_array("language")) THEN 0
+                         ELSE 0
+                     END)
+           AND CASE
+                   WHEN array_contains(mv_to_array("language"), mv_to_array("language")) THEN 1
+                   ELSE 1
+               END > CASE
+                         WHEN array_contains(mv_to_array("language"), mv_to_array("language")) THEN 0
+                         ELSE 0
+                     END
+           AND CASE
+                   WHEN array_contains(mv_to_array("language"), mv_to_array("language")) THEN 1
+                   ELSE 1
+               END >= CASE
+                          WHEN array_contains(mv_to_array("language"), mv_to_array("language")) THEN 0
+                          ELSE 0
+                      END
+           AND CASE
+                   WHEN array_contains(mv_to_array("language"), mv_to_array("language")) THEN 1
+                   ELSE 1
+               END < CASE
+                         WHEN array_contains(mv_to_array("language"), mv_to_array("language")) THEN 3
+                         ELSE 2
+                     END
+           AND CASE
+                   WHEN array_contains(mv_to_array("language"), mv_to_array("language")) THEN 1
+                   ELSE 1
+               END <= CASE
+                          WHEN array_contains(mv_to_array("language"), mv_to_array("language")) THEN 3
+                          ELSE 2
+                      END
+           AND (CASE
+                    WHEN array_contains(mv_to_array("language"), mv_to_array("language")) THEN 1
+                    ELSE 1
+                END <> CASE
+                           WHEN array_contains(mv_to_array("language"), mv_to_array("language")) THEN 0
+                           ELSE 0
+                       END) IS TRUE
+           AND (CASE
+                    WHEN array_contains(mv_to_array("language"), mv_to_array("language")) THEN 1
+                    ELSE 1
+                END = CASE
+                          WHEN array_contains(mv_to_array("language"), mv_to_array("language")) THEN 0
+                          ELSE 0
+                      END) IS NOT TRUE
+           AND (CASE
+                    WHEN array_contains(mv_to_array("language"), mv_to_array("language")) THEN 1
+                    ELSE 1
+                END = CASE
+                          WHEN array_contains(mv_to_array("language"), mv_to_array("language")) THEN 0
+                          ELSE 0
+                      END) IS FALSE
+           AND (CASE
+                    WHEN array_contains(mv_to_array("language"), mv_to_array("language")) THEN 1
+                    ELSE 1
+                END <> CASE
+                           WHEN array_contains(mv_to_array("language"), mv_to_array("language")) THEN 0
+                           ELSE 0
+                       END) IS NOT FALSE
+           AND CASE
+                   WHEN array_contains(mv_to_array("language"), mv_to_array("language")) THEN 1
+                   ELSE 1
+               END BETWEEN CASE
+                               WHEN array_contains(mv_to_array("language"), mv_to_array("language")) THEN 0
+                               ELSE 0
+                           END AND CASE
+                                       WHEN array_contains(mv_to_array("language"), mv_to_array("language")) THEN 3
+                                       ELSE 2
+                                   END
+           AND CASE
+                   WHEN array_contains(mv_to_array("language"), mv_to_array("language")) THEN 1
+                   ELSE 1
+               END NOT BETWEEN CASE
+                                   WHEN array_contains(mv_to_array("language"), mv_to_array("language")) THEN 1
+                                   ELSE 1
+                               END AND CASE
+                                           WHEN array_contains(mv_to_array("language"), mv_to_array("language")) THEN 0
+                                           ELSE 0
+                                       END
+           AND CASE
+                   WHEN array_contains(mv_to_array("language"), mv_to_array("language")) THEN 1
+                   ELSE 1
+               END like '%'
+           AND CASE
+                   WHEN array_contains(mv_to_array("language"), mv_to_array("language")) THEN 1
+                   ELSE 1
+               END not like '__DOES_NOT_EXIST__%'
+           AND CASE
+                   WHEN array_contains(mv_to_array("language"), mv_to_array("language")) THEN 1
+                   ELSE 1
+               END IN (CASE
+                           WHEN array_contains(mv_to_array("language"), mv_to_array("language")) THEN 0
+                           ELSE 0
+                       END,
+                       CASE
+                           WHEN array_contains(mv_to_array("language"), mv_to_array("language")) THEN 1
+                           ELSE 1
+                       END,
+                       CASE
+                           WHEN array_contains(mv_to_array("language"), mv_to_array("language")) THEN 3
+                           ELSE 2
+                       END)
+           AND CASE
+                   WHEN array_contains(mv_to_array("language"), mv_to_array("language")) THEN 1
+                   ELSE 1
+               END NOT IN (CASE
+                               WHEN array_contains(mv_to_array("language"), mv_to_array("language")) THEN 0
+                               ELSE 0
+                           END,
+                           CASE
+                               WHEN array_contains(mv_to_array("language"), mv_to_array("language")) THEN 3
+                               ELSE 2
+                           END))) ;
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND (CASE
+           WHEN array_contains(mv_to_array("language"), mv_to_array("language")) THEN 1
+           ELSE 1
+       END IS NULL
+       OR CASE
+              WHEN array_contains(mv_to_array("language"), mv_to_array("language")) THEN 1
+              ELSE 1
+          END IN
+         (SELECT CASE
+                     WHEN array_contains(mv_to_array("language"), mv_to_array("language")) THEN 1
+                     ELSE 1
+                 END
+          FROM kttm_nested
+          WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+            AND (CASE
+                     WHEN array_contains(mv_to_array("language"), mv_to_array("language")) THEN 1
+                     ELSE 1
+                 END IS NULL
+                 OR (CASE
+                         WHEN array_contains(mv_to_array("language"), mv_to_array("language")) THEN 1
+                         ELSE 1
+                     END = CASE
+                               WHEN array_contains(mv_to_array("language"), mv_to_array("language")) THEN 1
+                               ELSE 1
+                           END
+                     AND CASE
+                             WHEN array_contains(mv_to_array("language"), mv_to_array("language")) THEN 1
+                             ELSE 1
+                         END IS NOT DISTINCT
+                     FROM CASE
+                              WHEN array_contains(mv_to_array("language"), mv_to_array("language")) THEN 1
+                              ELSE 1
+                          END
+                     AND CASE
+                             WHEN array_contains(mv_to_array("language"), mv_to_array("language")) THEN 1
+                             ELSE 1
+                         END <> CASE
+                                    WHEN array_contains(mv_to_array("language"), mv_to_array("language")) THEN 0
+                                    ELSE 0
+                                END
+                     AND (CASE
+                              WHEN array_contains(mv_to_array("language"), mv_to_array("language")) THEN 1
+                              ELSE 1
+                          END IS DISTINCT
+                          FROM CASE
+                                   WHEN array_contains(mv_to_array("language"), mv_to_array("language")) THEN 0
+                                   ELSE 0
+                               END)
+                     AND CASE
+                             WHEN array_contains(mv_to_array("language"), mv_to_array("language")) THEN 1
+                             ELSE 1
+                         END > CASE
+                                   WHEN array_contains(mv_to_array("language"), mv_to_array("language")) THEN 0
+                                   ELSE 0
+                               END
+                     AND CASE
+                             WHEN array_contains(mv_to_array("language"), mv_to_array("language")) THEN 1
+                             ELSE 1
+                         END >= CASE
+                                    WHEN array_contains(mv_to_array("language"), mv_to_array("language")) THEN 0
+                                    ELSE 0
+                                END
+                     AND CASE
+                             WHEN array_contains(mv_to_array("language"), mv_to_array("language")) THEN 1
+                             ELSE 1
+                         END < CASE
+                                   WHEN array_contains(mv_to_array("language"), mv_to_array("language")) THEN 3
+                                   ELSE 2
+                               END
+                     AND CASE
+                             WHEN array_contains(mv_to_array("language"), mv_to_array("language")) THEN 1
+                             ELSE 1
+                         END <= CASE
+                                    WHEN array_contains(mv_to_array("language"), mv_to_array("language")) THEN 3
+                                    ELSE 2
+                                END
+                     AND (CASE
+                              WHEN array_contains(mv_to_array("language"), mv_to_array("language")) THEN 1
+                              ELSE 1
+                          END <> CASE
+                                     WHEN array_contains(mv_to_array("language"), mv_to_array("language")) THEN 0
+                                     ELSE 0
+                                 END) IS TRUE
+                     AND (CASE
+                              WHEN array_contains(mv_to_array("language"), mv_to_array("language")) THEN 1
+                              ELSE 1
+                          END = CASE
+                                    WHEN array_contains(mv_to_array("language"), mv_to_array("language")) THEN 0
+                                    ELSE 0
+                                END) IS NOT TRUE
+                     AND (CASE
+                              WHEN array_contains(mv_to_array("language"), mv_to_array("language")) THEN 1
+                              ELSE 1
+                          END = CASE
+                                    WHEN array_contains(mv_to_array("language"), mv_to_array("language")) THEN 0
+                                    ELSE 0
+                                END) IS FALSE
+                     AND (CASE
+                              WHEN array_contains(mv_to_array("language"), mv_to_array("language")) THEN 1
+                              ELSE 1
+                          END <> CASE
+                                     WHEN array_contains(mv_to_array("language"), mv_to_array("language")) THEN 0
+                                     ELSE 0
+                                 END) IS NOT FALSE
+                     AND CASE
+                             WHEN array_contains(mv_to_array("language"), mv_to_array("language")) THEN 1
+                             ELSE 1
+                         END BETWEEN CASE
+                                         WHEN array_contains(mv_to_array("language"), mv_to_array("language")) THEN 0
+                                         ELSE 0
+                                     END AND CASE
+                                                 WHEN array_contains(mv_to_array("language"), mv_to_array("language")) THEN 3
+                                                 ELSE 2
+                                             END
+                     AND CASE
+                             WHEN array_contains(mv_to_array("language"), mv_to_array("language")) THEN 1
+                             ELSE 1
+                         END NOT BETWEEN CASE
+                                             WHEN array_contains(mv_to_array("language"), mv_to_array("language")) THEN 1
+                                             ELSE 1
+                                         END AND CASE
+                                                     WHEN array_contains(mv_to_array("language"), mv_to_array("language")) THEN 0
+                                                     ELSE 0
+                                                 END
+                     AND CASE
+                             WHEN array_contains(mv_to_array("language"), mv_to_array("language")) THEN 1
+                             ELSE 1
+                         END like '%'
+                     AND CASE
+                             WHEN array_contains(mv_to_array("language"), mv_to_array("language")) THEN 1
+                             ELSE 1
+                         END not like '__DOES_NOT_EXIST__%'
+                     AND CASE
+                             WHEN array_contains(mv_to_array("language"), mv_to_array("language")) THEN 1
+                             ELSE 1
+                         END IN (CASE
+                                     WHEN array_contains(mv_to_array("language"), mv_to_array("language")) THEN 0
+                                     ELSE 0
+                                 END,
+                                 CASE
+                                     WHEN array_contains(mv_to_array("language"), mv_to_array("language")) THEN 1
+                                     ELSE 1
+                                 END,
+                                 CASE
+                                     WHEN array_contains(mv_to_array("language"), mv_to_array("language")) THEN 3
+                                     ELSE 2
+                                 END)
+                     AND CASE
+                             WHEN array_contains(mv_to_array("language"), mv_to_array("language")) THEN 1
+                             ELSE 1
+                         END NOT IN (CASE
+                                         WHEN array_contains(mv_to_array("language"), mv_to_array("language")) THEN 0
+                                         ELSE 0
+                                     END,
+                                     CASE
+                                         WHEN array_contains(mv_to_array("language"), mv_to_array("language")) THEN 3
+                                         ELSE 2
+                                     END)))));
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM
+  (SELECT __time, number, client_ip,
+                          CASE
+                              WHEN array_contains(mv_to_array("language"), mv_to_array("language")) THEN 1
+                              ELSE 1
+                          END,
+                          count(*)
+   FROM kttm_nested
+   WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+     AND (CASE
+              WHEN array_contains(mv_to_array("language"), mv_to_array("language")) THEN 1
+              ELSE 1
+          END IS NULL
+          OR (CASE
+                  WHEN array_contains(mv_to_array("language"), mv_to_array("language")) THEN 1
+                  ELSE 1
+              END = CASE
+                        WHEN array_contains(mv_to_array("language"), mv_to_array("language")) THEN 1
+                        ELSE 1
+                    END
+              AND CASE
+                      WHEN array_contains(mv_to_array("language"), mv_to_array("language")) THEN 1
+                      ELSE 1
+                  END IS NOT DISTINCT
+              FROM CASE
+                       WHEN array_contains(mv_to_array("language"), mv_to_array("language")) THEN 1
+                       ELSE 1
+                   END
+              AND CASE
+                      WHEN array_contains(mv_to_array("language"), mv_to_array("language")) THEN 1
+                      ELSE 1
+                  END <> CASE
+                             WHEN array_contains(mv_to_array("language"), mv_to_array("language")) THEN 0
+                             ELSE 0
+                         END
+              AND (CASE
+                       WHEN array_contains(mv_to_array("language"), mv_to_array("language")) THEN 1
+                       ELSE 1
+                   END IS DISTINCT
+                   FROM CASE
+                            WHEN array_contains(mv_to_array("language"), mv_to_array("language")) THEN 0
+                            ELSE 0
+                        END)
+              AND CASE
+                      WHEN array_contains(mv_to_array("language"), mv_to_array("language")) THEN 1
+                      ELSE 1
+                  END > CASE
+                            WHEN array_contains(mv_to_array("language"), mv_to_array("language")) THEN 0
+                            ELSE 0
+                        END
+              AND CASE
+                      WHEN array_contains(mv_to_array("language"), mv_to_array("language")) THEN 1
+                      ELSE 1
+                  END >= CASE
+                             WHEN array_contains(mv_to_array("language"), mv_to_array("language")) THEN 0
+                             ELSE 0
+                         END
+              AND CASE
+                      WHEN array_contains(mv_to_array("language"), mv_to_array("language")) THEN 1
+                      ELSE 1
+                  END < CASE
+                            WHEN array_contains(mv_to_array("language"), mv_to_array("language")) THEN 3
+                            ELSE 2
+                        END
+              AND CASE
+                      WHEN array_contains(mv_to_array("language"), mv_to_array("language")) THEN 1
+                      ELSE 1
+                  END <= CASE
+                             WHEN array_contains(mv_to_array("language"), mv_to_array("language")) THEN 3
+                             ELSE 2
+                         END
+              AND (CASE
+                       WHEN array_contains(mv_to_array("language"), mv_to_array("language")) THEN 1
+                       ELSE 1
+                   END <> CASE
+                              WHEN array_contains(mv_to_array("language"), mv_to_array("language")) THEN 0
+                              ELSE 0
+                          END) IS TRUE
+              AND (CASE
+                       WHEN array_contains(mv_to_array("language"), mv_to_array("language")) THEN 1
+                       ELSE 1
+                   END = CASE
+                             WHEN array_contains(mv_to_array("language"), mv_to_array("language")) THEN 0
+                             ELSE 0
+                         END) IS NOT TRUE
+              AND (CASE
+                       WHEN array_contains(mv_to_array("language"), mv_to_array("language")) THEN 1
+                       ELSE 1
+                   END = CASE
+                             WHEN array_contains(mv_to_array("language"), mv_to_array("language")) THEN 0
+                             ELSE 0
+                         END) IS FALSE
+              AND (CASE
+                       WHEN array_contains(mv_to_array("language"), mv_to_array("language")) THEN 1
+                       ELSE 1
+                   END <> CASE
+                              WHEN array_contains(mv_to_array("language"), mv_to_array("language")) THEN 0
+                              ELSE 0
+                          END) IS NOT FALSE
+              AND CASE
+                      WHEN array_contains(mv_to_array("language"), mv_to_array("language")) THEN 1
+                      ELSE 1
+                  END BETWEEN CASE
+                                  WHEN array_contains(mv_to_array("language"), mv_to_array("language")) THEN 0
+                                  ELSE 0
+                              END AND CASE
+                                          WHEN array_contains(mv_to_array("language"), mv_to_array("language")) THEN 3
+                                          ELSE 2
+                                      END
+              AND CASE
+                      WHEN array_contains(mv_to_array("language"), mv_to_array("language")) THEN 1
+                      ELSE 1
+                  END NOT BETWEEN CASE
+                                      WHEN array_contains(mv_to_array("language"), mv_to_array("language")) THEN 1
+                                      ELSE 1
+                                  END AND CASE
+                                              WHEN array_contains(mv_to_array("language"), mv_to_array("language")) THEN 0
+                                              ELSE 0
+                                          END
+              AND CASE
+                      WHEN array_contains(mv_to_array("language"), mv_to_array("language")) THEN 1
+                      ELSE 1
+                  END like '%'
+              AND CASE
+                      WHEN array_contains(mv_to_array("language"), mv_to_array("language")) THEN 1
+                      ELSE 1
+                  END not like '__DOES_NOT_EXIST__%'
+              AND CASE
+                      WHEN array_contains(mv_to_array("language"), mv_to_array("language")) THEN 1
+                      ELSE 1
+                  END IN (CASE
+                              WHEN array_contains(mv_to_array("language"), mv_to_array("language")) THEN 0
+                              ELSE 0
+                          END,
+                          CASE
+                              WHEN array_contains(mv_to_array("language"), mv_to_array("language")) THEN 1
+                              ELSE 1
+                          END,
+                          CASE
+                              WHEN array_contains(mv_to_array("language"), mv_to_array("language")) THEN 3
+                              ELSE 2
+                          END)
+              AND CASE
+                      WHEN array_contains(mv_to_array("language"), mv_to_array("language")) THEN 1
+                      ELSE 1
+                  END NOT IN (CASE
+                                  WHEN array_contains(mv_to_array("language"), mv_to_array("language")) THEN 0
+                                  ELSE 0
+                              END,
+                              CASE
+                                  WHEN array_contains(mv_to_array("language"), mv_to_array("language")) THEN 3
+                                  ELSE 2
+                              END)))
+   GROUP BY 1,
+            2,
+            3,
+            4);
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+#-------------------------------------------------------------------------
+# TEST_ID: A6: array_overlap
+#-------------------------------------------------------------------------
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND (CASE
+           WHEN array_overlap(mv_to_array("language"), mv_to_array("language")) THEN 1
+           ELSE 1
+       END IS NULL
+       OR (CASE
+               WHEN array_overlap(mv_to_array("language"), mv_to_array("language")) THEN 1
+               ELSE 1
+           END = CASE
+                     WHEN array_overlap(mv_to_array("language"), mv_to_array("language")) THEN 1
+                     ELSE 1
+                 END
+           AND CASE
+                   WHEN array_overlap(mv_to_array("language"), mv_to_array("language")) THEN 1
+                   ELSE 1
+               END IS NOT DISTINCT
+           FROM CASE
+                    WHEN array_overlap(mv_to_array("language"), mv_to_array("language")) THEN 1
+                    ELSE 1
+                END
+           AND CASE
+                   WHEN array_overlap(mv_to_array("language"), mv_to_array("language")) THEN 1
+                   ELSE 1
+               END <> CASE
+                          WHEN array_overlap(mv_to_array("language"), mv_to_array("language")) THEN 0
+                          ELSE 0
+                      END
+           AND (CASE
+                    WHEN array_overlap(mv_to_array("language"), mv_to_array("language")) THEN 1
+                    ELSE 1
+                END IS DISTINCT
+                FROM CASE
+                         WHEN array_overlap(mv_to_array("language"), mv_to_array("language")) THEN 0
+                         ELSE 0
+                     END)
+           AND CASE
+                   WHEN array_overlap(mv_to_array("language"), mv_to_array("language")) THEN 1
+                   ELSE 1
+               END > CASE
+                         WHEN array_overlap(mv_to_array("language"), mv_to_array("language")) THEN 0
+                         ELSE 0
+                     END
+           AND CASE
+                   WHEN array_overlap(mv_to_array("language"), mv_to_array("language")) THEN 1
+                   ELSE 1
+               END >= CASE
+                          WHEN array_overlap(mv_to_array("language"), mv_to_array("language")) THEN 0
+                          ELSE 0
+                      END
+           AND CASE
+                   WHEN array_overlap(mv_to_array("language"), mv_to_array("language")) THEN 1
+                   ELSE 1
+               END < CASE
+                         WHEN array_overlap(mv_to_array("language"), mv_to_array("language")) THEN 3
+                         ELSE 2
+                     END
+           AND CASE
+                   WHEN array_overlap(mv_to_array("language"), mv_to_array("language")) THEN 1
+                   ELSE 1
+               END <= CASE
+                          WHEN array_overlap(mv_to_array("language"), mv_to_array("language")) THEN 3
+                          ELSE 2
+                      END
+           AND (CASE
+                    WHEN array_overlap(mv_to_array("language"), mv_to_array("language")) THEN 1
+                    ELSE 1
+                END <> CASE
+                           WHEN array_overlap(mv_to_array("language"), mv_to_array("language")) THEN 0
+                           ELSE 0
+                       END) IS TRUE
+           AND (CASE
+                    WHEN array_overlap(mv_to_array("language"), mv_to_array("language")) THEN 1
+                    ELSE 1
+                END = CASE
+                          WHEN array_overlap(mv_to_array("language"), mv_to_array("language")) THEN 0
+                          ELSE 0
+                      END) IS NOT TRUE
+           AND (CASE
+                    WHEN array_overlap(mv_to_array("language"), mv_to_array("language")) THEN 1
+                    ELSE 1
+                END = CASE
+                          WHEN array_overlap(mv_to_array("language"), mv_to_array("language")) THEN 0
+                          ELSE 0
+                      END) IS FALSE
+           AND (CASE
+                    WHEN array_overlap(mv_to_array("language"), mv_to_array("language")) THEN 1
+                    ELSE 1
+                END <> CASE
+                           WHEN array_overlap(mv_to_array("language"), mv_to_array("language")) THEN 0
+                           ELSE 0
+                       END) IS NOT FALSE
+           AND CASE
+                   WHEN array_overlap(mv_to_array("language"), mv_to_array("language")) THEN 1
+                   ELSE 1
+               END BETWEEN CASE
+                               WHEN array_overlap(mv_to_array("language"), mv_to_array("language")) THEN 0
+                               ELSE 0
+                           END AND CASE
+                                       WHEN array_overlap(mv_to_array("language"), mv_to_array("language")) THEN 3
+                                       ELSE 2
+                                   END
+           AND CASE
+                   WHEN array_overlap(mv_to_array("language"), mv_to_array("language")) THEN 1
+                   ELSE 1
+               END NOT BETWEEN CASE
+                                   WHEN array_overlap(mv_to_array("language"), mv_to_array("language")) THEN 1
+                                   ELSE 1
+                               END AND CASE
+                                           WHEN array_overlap(mv_to_array("language"), mv_to_array("language")) THEN 0
+                                           ELSE 0
+                                       END
+           AND CASE
+                   WHEN array_overlap(mv_to_array("language"), mv_to_array("language")) THEN 1
+                   ELSE 1
+               END like '%'
+           AND CASE
+                   WHEN array_overlap(mv_to_array("language"), mv_to_array("language")) THEN 1
+                   ELSE 1
+               END not like '__DOES_NOT_EXIST__%'
+           AND CASE
+                   WHEN array_overlap(mv_to_array("language"), mv_to_array("language")) THEN 1
+                   ELSE 1
+               END IN (CASE
+                           WHEN array_overlap(mv_to_array("language"), mv_to_array("language")) THEN 0
+                           ELSE 0
+                       END,
+                       CASE
+                           WHEN array_overlap(mv_to_array("language"), mv_to_array("language")) THEN 1
+                           ELSE 1
+                       END,
+                       CASE
+                           WHEN array_overlap(mv_to_array("language"), mv_to_array("language")) THEN 3
+                           ELSE 2
+                       END)
+           AND CASE
+                   WHEN array_overlap(mv_to_array("language"), mv_to_array("language")) THEN 1
+                   ELSE 1
+               END NOT IN (CASE
+                               WHEN array_overlap(mv_to_array("language"), mv_to_array("language")) THEN 0
+                               ELSE 0
+                           END,
+                           CASE
+                               WHEN array_overlap(mv_to_array("language"), mv_to_array("language")) THEN 3
+                               ELSE 2
+                           END))) ;
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND (CASE
+           WHEN array_overlap(mv_to_array("language"), mv_to_array("language")) THEN 1
+           ELSE 1
+       END IS NULL
+       OR CASE
+              WHEN array_overlap(mv_to_array("language"), mv_to_array("language")) THEN 1
+              ELSE 1
+          END IN
+         (SELECT CASE
+                     WHEN array_overlap(mv_to_array("language"), mv_to_array("language")) THEN 1
+                     ELSE 1
+                 END
+          FROM kttm_nested
+          WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+            AND (CASE
+                     WHEN array_overlap(mv_to_array("language"), mv_to_array("language")) THEN 1
+                     ELSE 1
+                 END IS NULL
+                 OR (CASE
+                         WHEN array_overlap(mv_to_array("language"), mv_to_array("language")) THEN 1
+                         ELSE 1
+                     END = CASE
+                               WHEN array_overlap(mv_to_array("language"), mv_to_array("language")) THEN 1
+                               ELSE 1
+                           END
+                     AND CASE
+                             WHEN array_overlap(mv_to_array("language"), mv_to_array("language")) THEN 1
+                             ELSE 1
+                         END IS NOT DISTINCT
+                     FROM CASE
+                              WHEN array_overlap(mv_to_array("language"), mv_to_array("language")) THEN 1
+                              ELSE 1
+                          END
+                     AND CASE
+                             WHEN array_overlap(mv_to_array("language"), mv_to_array("language")) THEN 1
+                             ELSE 1
+                         END <> CASE
+                                    WHEN array_overlap(mv_to_array("language"), mv_to_array("language")) THEN 0
+                                    ELSE 0
+                                END
+                     AND (CASE
+                              WHEN array_overlap(mv_to_array("language"), mv_to_array("language")) THEN 1
+                              ELSE 1
+                          END IS DISTINCT
+                          FROM CASE
+                                   WHEN array_overlap(mv_to_array("language"), mv_to_array("language")) THEN 0
+                                   ELSE 0
+                               END)
+                     AND CASE
+                             WHEN array_overlap(mv_to_array("language"), mv_to_array("language")) THEN 1
+                             ELSE 1
+                         END > CASE
+                                   WHEN array_overlap(mv_to_array("language"), mv_to_array("language")) THEN 0
+                                   ELSE 0
+                               END
+                     AND CASE
+                             WHEN array_overlap(mv_to_array("language"), mv_to_array("language")) THEN 1
+                             ELSE 1
+                         END >= CASE
+                                    WHEN array_overlap(mv_to_array("language"), mv_to_array("language")) THEN 0
+                                    ELSE 0
+                                END
+                     AND CASE
+                             WHEN array_overlap(mv_to_array("language"), mv_to_array("language")) THEN 1
+                             ELSE 1
+                         END < CASE
+                                   WHEN array_overlap(mv_to_array("language"), mv_to_array("language")) THEN 3
+                                   ELSE 2
+                               END
+                     AND CASE
+                             WHEN array_overlap(mv_to_array("language"), mv_to_array("language")) THEN 1
+                             ELSE 1
+                         END <= CASE
+                                    WHEN array_overlap(mv_to_array("language"), mv_to_array("language")) THEN 3
+                                    ELSE 2
+                                END
+                     AND (CASE
+                              WHEN array_overlap(mv_to_array("language"), mv_to_array("language")) THEN 1
+                              ELSE 1
+                          END <> CASE
+                                     WHEN array_overlap(mv_to_array("language"), mv_to_array("language")) THEN 0
+                                     ELSE 0
+                                 END) IS TRUE
+                     AND (CASE
+                              WHEN array_overlap(mv_to_array("language"), mv_to_array("language")) THEN 1
+                              ELSE 1
+                          END = CASE
+                                    WHEN array_overlap(mv_to_array("language"), mv_to_array("language")) THEN 0
+                                    ELSE 0
+                                END) IS NOT TRUE
+                     AND (CASE
+                              WHEN array_overlap(mv_to_array("language"), mv_to_array("language")) THEN 1
+                              ELSE 1
+                          END = CASE
+                                    WHEN array_overlap(mv_to_array("language"), mv_to_array("language")) THEN 0
+                                    ELSE 0
+                                END) IS FALSE
+                     AND (CASE
+                              WHEN array_overlap(mv_to_array("language"), mv_to_array("language")) THEN 1
+                              ELSE 1
+                          END <> CASE
+                                     WHEN array_overlap(mv_to_array("language"), mv_to_array("language")) THEN 0
+                                     ELSE 0
+                                 END) IS NOT FALSE
+                     AND CASE
+                             WHEN array_overlap(mv_to_array("language"), mv_to_array("language")) THEN 1
+                             ELSE 1
+                         END BETWEEN CASE
+                                         WHEN array_overlap(mv_to_array("language"), mv_to_array("language")) THEN 0
+                                         ELSE 0
+                                     END AND CASE
+                                                 WHEN array_overlap(mv_to_array("language"), mv_to_array("language")) THEN 3
+                                                 ELSE 2
+                                             END
+                     AND CASE
+                             WHEN array_overlap(mv_to_array("language"), mv_to_array("language")) THEN 1
+                             ELSE 1
+                         END NOT BETWEEN CASE
+                                             WHEN array_overlap(mv_to_array("language"), mv_to_array("language")) THEN 1
+                                             ELSE 1
+                                         END AND CASE
+                                                     WHEN array_overlap(mv_to_array("language"), mv_to_array("language")) THEN 0
+                                                     ELSE 0
+                                                 END
+                     AND CASE
+                             WHEN array_overlap(mv_to_array("language"), mv_to_array("language")) THEN 1
+                             ELSE 1
+                         END like '%'
+                     AND CASE
+                             WHEN array_overlap(mv_to_array("language"), mv_to_array("language")) THEN 1
+                             ELSE 1
+                         END not like '__DOES_NOT_EXIST__%'
+                     AND CASE
+                             WHEN array_overlap(mv_to_array("language"), mv_to_array("language")) THEN 1
+                             ELSE 1
+                         END IN (CASE
+                                     WHEN array_overlap(mv_to_array("language"), mv_to_array("language")) THEN 0
+                                     ELSE 0
+                                 END,
+                                 CASE
+                                     WHEN array_overlap(mv_to_array("language"), mv_to_array("language")) THEN 1
+                                     ELSE 1
+                                 END,
+                                 CASE
+                                     WHEN array_overlap(mv_to_array("language"), mv_to_array("language")) THEN 3
+                                     ELSE 2
+                                 END)
+                     AND CASE
+                             WHEN array_overlap(mv_to_array("language"), mv_to_array("language")) THEN 1
+                             ELSE 1
+                         END NOT IN (CASE
+                                         WHEN array_overlap(mv_to_array("language"), mv_to_array("language")) THEN 0
+                                         ELSE 0
+                                     END,
+                                     CASE
+                                         WHEN array_overlap(mv_to_array("language"), mv_to_array("language")) THEN 3
+                                         ELSE 2
+                                     END)))));
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM
+  (SELECT __time, number, client_ip,
+                          CASE
+                              WHEN array_overlap(mv_to_array("language"), mv_to_array("language")) THEN 1
+                              ELSE 1
+                          END,
+                          count(*)
+   FROM kttm_nested
+   WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+     AND (CASE
+              WHEN array_overlap(mv_to_array("language"), mv_to_array("language")) THEN 1
+              ELSE 1
+          END IS NULL
+          OR (CASE
+                  WHEN array_overlap(mv_to_array("language"), mv_to_array("language")) THEN 1
+                  ELSE 1
+              END = CASE
+                        WHEN array_overlap(mv_to_array("language"), mv_to_array("language")) THEN 1
+                        ELSE 1
+                    END
+              AND CASE
+                      WHEN array_overlap(mv_to_array("language"), mv_to_array("language")) THEN 1
+                      ELSE 1
+                  END IS NOT DISTINCT
+              FROM CASE
+                       WHEN array_overlap(mv_to_array("language"), mv_to_array("language")) THEN 1
+                       ELSE 1
+                   END
+              AND CASE
+                      WHEN array_overlap(mv_to_array("language"), mv_to_array("language")) THEN 1
+                      ELSE 1
+                  END <> CASE
+                             WHEN array_overlap(mv_to_array("language"), mv_to_array("language")) THEN 0
+                             ELSE 0
+                         END
+              AND (CASE
+                       WHEN array_overlap(mv_to_array("language"), mv_to_array("language")) THEN 1
+                       ELSE 1
+                   END IS DISTINCT
+                   FROM CASE
+                            WHEN array_overlap(mv_to_array("language"), mv_to_array("language")) THEN 0
+                            ELSE 0
+                        END)
+              AND CASE
+                      WHEN array_overlap(mv_to_array("language"), mv_to_array("language")) THEN 1
+                      ELSE 1
+                  END > CASE
+                            WHEN array_overlap(mv_to_array("language"), mv_to_array("language")) THEN 0
+                            ELSE 0
+                        END
+              AND CASE
+                      WHEN array_overlap(mv_to_array("language"), mv_to_array("language")) THEN 1
+                      ELSE 1
+                  END >= CASE
+                             WHEN array_overlap(mv_to_array("language"), mv_to_array("language")) THEN 0
+                             ELSE 0
+                         END
+              AND CASE
+                      WHEN array_overlap(mv_to_array("language"), mv_to_array("language")) THEN 1
+                      ELSE 1
+                  END < CASE
+                            WHEN array_overlap(mv_to_array("language"), mv_to_array("language")) THEN 3
+                            ELSE 2
+                        END
+              AND CASE
+                      WHEN array_overlap(mv_to_array("language"), mv_to_array("language")) THEN 1
+                      ELSE 1
+                  END <= CASE
+                             WHEN array_overlap(mv_to_array("language"), mv_to_array("language")) THEN 3
+                             ELSE 2
+                         END
+              AND (CASE
+                       WHEN array_overlap(mv_to_array("language"), mv_to_array("language")) THEN 1
+                       ELSE 1
+                   END <> CASE
+                              WHEN array_overlap(mv_to_array("language"), mv_to_array("language")) THEN 0
+                              ELSE 0
+                          END) IS TRUE
+              AND (CASE
+                       WHEN array_overlap(mv_to_array("language"), mv_to_array("language")) THEN 1
+                       ELSE 1
+                   END = CASE
+                             WHEN array_overlap(mv_to_array("language"), mv_to_array("language")) THEN 0
+                             ELSE 0
+                         END) IS NOT TRUE
+              AND (CASE
+                       WHEN array_overlap(mv_to_array("language"), mv_to_array("language")) THEN 1
+                       ELSE 1
+                   END = CASE
+                             WHEN array_overlap(mv_to_array("language"), mv_to_array("language")) THEN 0
+                             ELSE 0
+                         END) IS FALSE
+              AND (CASE
+                       WHEN array_overlap(mv_to_array("language"), mv_to_array("language")) THEN 1
+                       ELSE 1
+                   END <> CASE
+                              WHEN array_overlap(mv_to_array("language"), mv_to_array("language")) THEN 0
+                              ELSE 0
+                          END) IS NOT FALSE
+              AND CASE
+                      WHEN array_overlap(mv_to_array("language"), mv_to_array("language")) THEN 1
+                      ELSE 1
+                  END BETWEEN CASE
+                                  WHEN array_overlap(mv_to_array("language"), mv_to_array("language")) THEN 0
+                                  ELSE 0
+                              END AND CASE
+                                          WHEN array_overlap(mv_to_array("language"), mv_to_array("language")) THEN 3
+                                          ELSE 2
+                                      END
+              AND CASE
+                      WHEN array_overlap(mv_to_array("language"), mv_to_array("language")) THEN 1
+                      ELSE 1
+                  END NOT BETWEEN CASE
+                                      WHEN array_overlap(mv_to_array("language"), mv_to_array("language")) THEN 1
+                                      ELSE 1
+                                  END AND CASE
+                                              WHEN array_overlap(mv_to_array("language"), mv_to_array("language")) THEN 0
+                                              ELSE 0
+                                          END
+              AND CASE
+                      WHEN array_overlap(mv_to_array("language"), mv_to_array("language")) THEN 1
+                      ELSE 1
+                  END like '%'
+              AND CASE
+                      WHEN array_overlap(mv_to_array("language"), mv_to_array("language")) THEN 1
+                      ELSE 1
+                  END not like '__DOES_NOT_EXIST__%'
+              AND CASE
+                      WHEN array_overlap(mv_to_array("language"), mv_to_array("language")) THEN 1
+                      ELSE 1
+                  END IN (CASE
+                              WHEN array_overlap(mv_to_array("language"), mv_to_array("language")) THEN 0
+                              ELSE 0
+                          END,
+                          CASE
+                              WHEN array_overlap(mv_to_array("language"), mv_to_array("language")) THEN 1
+                              ELSE 1
+                          END,
+                          CASE
+                              WHEN array_overlap(mv_to_array("language"), mv_to_array("language")) THEN 3
+                              ELSE 2
+                          END)
+              AND CASE
+                      WHEN array_overlap(mv_to_array("language"), mv_to_array("language")) THEN 1
+                      ELSE 1
+                  END NOT IN (CASE
+                                  WHEN array_overlap(mv_to_array("language"), mv_to_array("language")) THEN 0
+                                  ELSE 0
+                              END,
+                              CASE
+                                  WHEN array_overlap(mv_to_array("language"), mv_to_array("language")) THEN 3
+                                  ELSE 2
+                              END)))
+   GROUP BY 1,
+            2,
+            3,
+            4);
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+#-------------------------------------------------------------------------
+# TEST_ID: A7: scalar_in_array
+#-------------------------------------------------------------------------
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND (CASE
+           WHEN scalar_in_array('en-US', mv_to_array("language")) THEN 1
+           ELSE 1
+       END IS NULL
+       OR (CASE
+               WHEN scalar_in_array('en-US', mv_to_array("language")) THEN 1
+               ELSE 1
+           END = CASE
+                     WHEN scalar_in_array('en-US', mv_to_array("language")) THEN 1
+                     ELSE 1
+                 END
+           AND CASE
+                   WHEN scalar_in_array('en-US', mv_to_array("language")) THEN 1
+                   ELSE 1
+               END IS NOT DISTINCT
+           FROM CASE
+                    WHEN scalar_in_array('en-US', mv_to_array("language")) THEN 1
+                    ELSE 1
+                END
+           AND CASE
+                   WHEN scalar_in_array('en-US', mv_to_array("language")) THEN 1
+                   ELSE 1
+               END <> CASE
+                          WHEN scalar_in_array('en-US', mv_to_array("language")) THEN 0
+                          ELSE 0
+                      END
+           AND (CASE
+                    WHEN scalar_in_array('en-US', mv_to_array("language")) THEN 1
+                    ELSE 1
+                END IS DISTINCT
+                FROM CASE
+                         WHEN scalar_in_array('en-US', mv_to_array("language")) THEN 0
+                         ELSE 0
+                     END)
+           AND CASE
+                   WHEN scalar_in_array('en-US', mv_to_array("language")) THEN 1
+                   ELSE 1
+               END > CASE
+                         WHEN scalar_in_array('en-US', mv_to_array("language")) THEN 0
+                         ELSE 0
+                     END
+           AND CASE
+                   WHEN scalar_in_array('en-US', mv_to_array("language")) THEN 1
+                   ELSE 1
+               END >= CASE
+                          WHEN scalar_in_array('en-US', mv_to_array("language")) THEN 0
+                          ELSE 0
+                      END
+           AND CASE
+                   WHEN scalar_in_array('en-US', mv_to_array("language")) THEN 1
+                   ELSE 1
+               END < CASE
+                         WHEN scalar_in_array('en-US', mv_to_array("language")) THEN 3
+                         ELSE 2
+                     END
+           AND CASE
+                   WHEN scalar_in_array('en-US', mv_to_array("language")) THEN 1
+                   ELSE 1
+               END <= CASE
+                          WHEN scalar_in_array('en-US', mv_to_array("language")) THEN 3
+                          ELSE 2
+                      END
+           AND (CASE
+                    WHEN scalar_in_array('en-US', mv_to_array("language")) THEN 1
+                    ELSE 1
+                END <> CASE
+                           WHEN scalar_in_array('en-US', mv_to_array("language")) THEN 0
+                           ELSE 0
+                       END) IS TRUE
+           AND (CASE
+                    WHEN scalar_in_array('en-US', mv_to_array("language")) THEN 1
+                    ELSE 1
+                END = CASE
+                          WHEN scalar_in_array('en-US', mv_to_array("language")) THEN 0
+                          ELSE 0
+                      END) IS NOT TRUE
+           AND (CASE
+                    WHEN scalar_in_array('en-US', mv_to_array("language")) THEN 1
+                    ELSE 1
+                END = CASE
+                          WHEN scalar_in_array('en-US', mv_to_array("language")) THEN 0
+                          ELSE 0
+                      END) IS FALSE
+           AND (CASE
+                    WHEN scalar_in_array('en-US', mv_to_array("language")) THEN 1
+                    ELSE 1
+                END <> CASE
+                           WHEN scalar_in_array('en-US', mv_to_array("language")) THEN 0
+                           ELSE 0
+                       END) IS NOT FALSE
+           AND CASE
+                   WHEN scalar_in_array('en-US', mv_to_array("language")) THEN 1
+                   ELSE 1
+               END BETWEEN CASE
+                               WHEN scalar_in_array('en-US', mv_to_array("language")) THEN 0
+                               ELSE 0
+                           END AND CASE
+                                       WHEN scalar_in_array('en-US', mv_to_array("language")) THEN 3
+                                       ELSE 2
+                                   END
+           AND CASE
+                   WHEN scalar_in_array('en-US', mv_to_array("language")) THEN 1
+                   ELSE 1
+               END NOT BETWEEN CASE
+                                   WHEN scalar_in_array('en-US', mv_to_array("language")) THEN 1
+                                   ELSE 1
+                               END AND CASE
+                                           WHEN scalar_in_array('en-US', mv_to_array("language")) THEN 0
+                                           ELSE 0
+                                       END
+           AND CASE
+                   WHEN scalar_in_array('en-US', mv_to_array("language")) THEN 1
+                   ELSE 1
+               END like '%'
+           AND CASE
+                   WHEN scalar_in_array('en-US', mv_to_array("language")) THEN 1
+                   ELSE 1
+               END not like '__DOES_NOT_EXIST__%'
+           AND CASE
+                   WHEN scalar_in_array('en-US', mv_to_array("language")) THEN 1
+                   ELSE 1
+               END IN (CASE
+                           WHEN scalar_in_array('en-US', mv_to_array("language")) THEN 0
+                           ELSE 0
+                       END,
+                       CASE
+                           WHEN scalar_in_array('en-US', mv_to_array("language")) THEN 1
+                           ELSE 1
+                       END,
+                       CASE
+                           WHEN scalar_in_array('en-US', mv_to_array("language")) THEN 3
+                           ELSE 2
+                       END)
+           AND CASE
+                   WHEN scalar_in_array('en-US', mv_to_array("language")) THEN 1
+                   ELSE 1
+               END NOT IN (CASE
+                               WHEN scalar_in_array('en-US', mv_to_array("language")) THEN 0
+                               ELSE 0
+                           END,
+                           CASE
+                               WHEN scalar_in_array('en-US', mv_to_array("language")) THEN 3
+                               ELSE 2
+                           END))) ;
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND (CASE
+           WHEN scalar_in_array('en-US', mv_to_array("language")) THEN 1
+           ELSE 1
+       END IS NULL
+       OR CASE
+              WHEN scalar_in_array('en-US', mv_to_array("language")) THEN 1
+              ELSE 1
+          END IN
+         (SELECT CASE
+                     WHEN scalar_in_array('en-US', mv_to_array("language")) THEN 1
+                     ELSE 1
+                 END
+          FROM kttm_nested
+          WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+            AND (CASE
+                     WHEN scalar_in_array('en-US', mv_to_array("language")) THEN 1
+                     ELSE 1
+                 END IS NULL
+                 OR (CASE
+                         WHEN scalar_in_array('en-US', mv_to_array("language")) THEN 1
+                         ELSE 1
+                     END = CASE
+                               WHEN scalar_in_array('en-US', mv_to_array("language")) THEN 1
+                               ELSE 1
+                           END
+                     AND CASE
+                             WHEN scalar_in_array('en-US', mv_to_array("language")) THEN 1
+                             ELSE 1
+                         END IS NOT DISTINCT
+                     FROM CASE
+                              WHEN scalar_in_array('en-US', mv_to_array("language")) THEN 1
+                              ELSE 1
+                          END
+                     AND CASE
+                             WHEN scalar_in_array('en-US', mv_to_array("language")) THEN 1
+                             ELSE 1
+                         END <> CASE
+                                    WHEN scalar_in_array('en-US', mv_to_array("language")) THEN 0
+                                    ELSE 0
+                                END
+                     AND (CASE
+                              WHEN scalar_in_array('en-US', mv_to_array("language")) THEN 1
+                              ELSE 1
+                          END IS DISTINCT
+                          FROM CASE
+                                   WHEN scalar_in_array('en-US', mv_to_array("language")) THEN 0
+                                   ELSE 0
+                               END)
+                     AND CASE
+                             WHEN scalar_in_array('en-US', mv_to_array("language")) THEN 1
+                             ELSE 1
+                         END > CASE
+                                   WHEN scalar_in_array('en-US', mv_to_array("language")) THEN 0
+                                   ELSE 0
+                               END
+                     AND CASE
+                             WHEN scalar_in_array('en-US', mv_to_array("language")) THEN 1
+                             ELSE 1
+                         END >= CASE
+                                    WHEN scalar_in_array('en-US', mv_to_array("language")) THEN 0
+                                    ELSE 0
+                                END
+                     AND CASE
+                             WHEN scalar_in_array('en-US', mv_to_array("language")) THEN 1
+                             ELSE 1
+                         END < CASE
+                                   WHEN scalar_in_array('en-US', mv_to_array("language")) THEN 3
+                                   ELSE 2
+                               END
+                     AND CASE
+                             WHEN scalar_in_array('en-US', mv_to_array("language")) THEN 1
+                             ELSE 1
+                         END <= CASE
+                                    WHEN scalar_in_array('en-US', mv_to_array("language")) THEN 3
+                                    ELSE 2
+                                END
+                     AND (CASE
+                              WHEN scalar_in_array('en-US', mv_to_array("language")) THEN 1
+                              ELSE 1
+                          END <> CASE
+                                     WHEN scalar_in_array('en-US', mv_to_array("language")) THEN 0
+                                     ELSE 0
+                                 END) IS TRUE
+                     AND (CASE
+                              WHEN scalar_in_array('en-US', mv_to_array("language")) THEN 1
+                              ELSE 1
+                          END = CASE
+                                    WHEN scalar_in_array('en-US', mv_to_array("language")) THEN 0
+                                    ELSE 0
+                                END) IS NOT TRUE
+                     AND (CASE
+                              WHEN scalar_in_array('en-US', mv_to_array("language")) THEN 1
+                              ELSE 1
+                          END = CASE
+                                    WHEN scalar_in_array('en-US', mv_to_array("language")) THEN 0
+                                    ELSE 0
+                                END) IS FALSE
+                     AND (CASE
+                              WHEN scalar_in_array('en-US', mv_to_array("language")) THEN 1
+                              ELSE 1
+                          END <> CASE
+                                     WHEN scalar_in_array('en-US', mv_to_array("language")) THEN 0
+                                     ELSE 0
+                                 END) IS NOT FALSE
+                     AND CASE
+                             WHEN scalar_in_array('en-US', mv_to_array("language")) THEN 1
+                             ELSE 1
+                         END BETWEEN CASE
+                                         WHEN scalar_in_array('en-US', mv_to_array("language")) THEN 0
+                                         ELSE 0
+                                     END AND CASE
+                                                 WHEN scalar_in_array('en-US', mv_to_array("language")) THEN 3
+                                                 ELSE 2
+                                             END
+                     AND CASE
+                             WHEN scalar_in_array('en-US', mv_to_array("language")) THEN 1
+                             ELSE 1
+                         END NOT BETWEEN CASE
+                                             WHEN scalar_in_array('en-US', mv_to_array("language")) THEN 1
+                                             ELSE 1
+                                         END AND CASE
+                                                     WHEN scalar_in_array('en-US', mv_to_array("language")) THEN 0
+                                                     ELSE 0
+                                                 END
+                     AND CASE
+                             WHEN scalar_in_array('en-US', mv_to_array("language")) THEN 1
+                             ELSE 1
+                         END like '%'
+                     AND CASE
+                             WHEN scalar_in_array('en-US', mv_to_array("language")) THEN 1
+                             ELSE 1
+                         END not like '__DOES_NOT_EXIST__%'
+                     AND CASE
+                             WHEN scalar_in_array('en-US', mv_to_array("language")) THEN 1
+                             ELSE 1
+                         END IN (CASE
+                                     WHEN scalar_in_array('en-US', mv_to_array("language")) THEN 0
+                                     ELSE 0
+                                 END,
+                                 CASE
+                                     WHEN scalar_in_array('en-US', mv_to_array("language")) THEN 1
+                                     ELSE 1
+                                 END,
+                                 CASE
+                                     WHEN scalar_in_array('en-US', mv_to_array("language")) THEN 3
+                                     ELSE 2
+                                 END)
+                     AND CASE
+                             WHEN scalar_in_array('en-US', mv_to_array("language")) THEN 1
+                             ELSE 1
+                         END NOT IN (CASE
+                                         WHEN scalar_in_array('en-US', mv_to_array("language")) THEN 0
+                                         ELSE 0
+                                     END,
+                                     CASE
+                                         WHEN scalar_in_array('en-US', mv_to_array("language")) THEN 3
+                                         ELSE 2
+                                     END)))));
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM
+  (SELECT __time, number, client_ip,
+                          CASE
+                              WHEN scalar_in_array('en-US', mv_to_array("language")) THEN 1
+                              ELSE 1
+                          END,
+                          count(*)
+   FROM kttm_nested
+   WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+     AND (CASE
+              WHEN scalar_in_array('en-US', mv_to_array("language")) THEN 1
+              ELSE 1
+          END IS NULL
+          OR (CASE
+                  WHEN scalar_in_array('en-US', mv_to_array("language")) THEN 1
+                  ELSE 1
+              END = CASE
+                        WHEN scalar_in_array('en-US', mv_to_array("language")) THEN 1
+                        ELSE 1
+                    END
+              AND CASE
+                      WHEN scalar_in_array('en-US', mv_to_array("language")) THEN 1
+                      ELSE 1
+                  END IS NOT DISTINCT
+              FROM CASE
+                       WHEN scalar_in_array('en-US', mv_to_array("language")) THEN 1
+                       ELSE 1
+                   END
+              AND CASE
+                      WHEN scalar_in_array('en-US', mv_to_array("language")) THEN 1
+                      ELSE 1
+                  END <> CASE
+                             WHEN scalar_in_array('en-US', mv_to_array("language")) THEN 0
+                             ELSE 0
+                         END
+              AND (CASE
+                       WHEN scalar_in_array('en-US', mv_to_array("language")) THEN 1
+                       ELSE 1
+                   END IS DISTINCT
+                   FROM CASE
+                            WHEN scalar_in_array('en-US', mv_to_array("language")) THEN 0
+                            ELSE 0
+                        END)
+              AND CASE
+                      WHEN scalar_in_array('en-US', mv_to_array("language")) THEN 1
+                      ELSE 1
+                  END > CASE
+                            WHEN scalar_in_array('en-US', mv_to_array("language")) THEN 0
+                            ELSE 0
+                        END
+              AND CASE
+                      WHEN scalar_in_array('en-US', mv_to_array("language")) THEN 1
+                      ELSE 1
+                  END >= CASE
+                             WHEN scalar_in_array('en-US', mv_to_array("language")) THEN 0
+                             ELSE 0
+                         END
+              AND CASE
+                      WHEN scalar_in_array('en-US', mv_to_array("language")) THEN 1
+                      ELSE 1
+                  END < CASE
+                            WHEN scalar_in_array('en-US', mv_to_array("language")) THEN 3
+                            ELSE 2
+                        END
+              AND CASE
+                      WHEN scalar_in_array('en-US', mv_to_array("language")) THEN 1
+                      ELSE 1
+                  END <= CASE
+                             WHEN scalar_in_array('en-US', mv_to_array("language")) THEN 3
+                             ELSE 2
+                         END
+              AND (CASE
+                       WHEN scalar_in_array('en-US', mv_to_array("language")) THEN 1
+                       ELSE 1
+                   END <> CASE
+                              WHEN scalar_in_array('en-US', mv_to_array("language")) THEN 0
+                              ELSE 0
+                          END) IS TRUE
+              AND (CASE
+                       WHEN scalar_in_array('en-US', mv_to_array("language")) THEN 1
+                       ELSE 1
+                   END = CASE
+                             WHEN scalar_in_array('en-US', mv_to_array("language")) THEN 0
+                             ELSE 0
+                         END) IS NOT TRUE
+              AND (CASE
+                       WHEN scalar_in_array('en-US', mv_to_array("language")) THEN 1
+                       ELSE 1
+                   END = CASE
+                             WHEN scalar_in_array('en-US', mv_to_array("language")) THEN 0
+                             ELSE 0
+                         END) IS FALSE
+              AND (CASE
+                       WHEN scalar_in_array('en-US', mv_to_array("language")) THEN 1
+                       ELSE 1
+                   END <> CASE
+                              WHEN scalar_in_array('en-US', mv_to_array("language")) THEN 0
+                              ELSE 0
+                          END) IS NOT FALSE
+              AND CASE
+                      WHEN scalar_in_array('en-US', mv_to_array("language")) THEN 1
+                      ELSE 1
+                  END BETWEEN CASE
+                                  WHEN scalar_in_array('en-US', mv_to_array("language")) THEN 0
+                                  ELSE 0
+                              END AND CASE
+                                          WHEN scalar_in_array('en-US', mv_to_array("language")) THEN 3
+                                          ELSE 2
+                                      END
+              AND CASE
+                      WHEN scalar_in_array('en-US', mv_to_array("language")) THEN 1
+                      ELSE 1
+                  END NOT BETWEEN CASE
+                                      WHEN scalar_in_array('en-US', mv_to_array("language")) THEN 1
+                                      ELSE 1
+                                  END AND CASE
+                                              WHEN scalar_in_array('en-US', mv_to_array("language")) THEN 0
+                                              ELSE 0
+                                          END
+              AND CASE
+                      WHEN scalar_in_array('en-US', mv_to_array("language")) THEN 1
+                      ELSE 1
+                  END like '%'
+              AND CASE
+                      WHEN scalar_in_array('en-US', mv_to_array("language")) THEN 1
+                      ELSE 1
+                  END not like '__DOES_NOT_EXIST__%'
+              AND CASE
+                      WHEN scalar_in_array('en-US', mv_to_array("language")) THEN 1
+                      ELSE 1
+                  END IN (CASE
+                              WHEN scalar_in_array('en-US', mv_to_array("language")) THEN 0
+                              ELSE 0
+                          END,
+                          CASE
+                              WHEN scalar_in_array('en-US', mv_to_array("language")) THEN 1
+                              ELSE 1
+                          END,
+                          CASE
+                              WHEN scalar_in_array('en-US', mv_to_array("language")) THEN 3
+                              ELSE 2
+                          END)
+              AND CASE
+                      WHEN scalar_in_array('en-US', mv_to_array("language")) THEN 1
+                      ELSE 1
+                  END NOT IN (CASE
+                                  WHEN scalar_in_array('en-US', mv_to_array("language")) THEN 0
+                                  ELSE 0
+                              END,
+                              CASE
+                                  WHEN scalar_in_array('en-US', mv_to_array("language")) THEN 3
+                                  ELSE 2
+                              END)))
+   GROUP BY 1,
+            2,
+            3,
+            4);
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+#-------------------------------------------------------------------------
+# TEST_ID: A8: array_offset_of
+#-------------------------------------------------------------------------
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND (array_offset_of(mv_to_array("language"), array_offset(mv_to_array("language"), 0)) IS NULL
+       OR (array_offset_of(mv_to_array("language"), array_offset(mv_to_array("language"), 0)) = array_offset_of(mv_to_array("language"), array_offset(mv_to_array("language"), 0))+0
+           AND array_offset_of(mv_to_array("language"), array_offset(mv_to_array("language"), 0)) IS NOT DISTINCT
+           FROM array_offset_of(mv_to_array("language"), array_offset(mv_to_array("language"), 0))+0
+           AND array_offset_of(mv_to_array("language"), array_offset(mv_to_array("language"), 0)) <> array_offset_of(mv_to_array("language"), array_offset(mv_to_array("language"), 0))-1
+           AND (array_offset_of(mv_to_array("language"), array_offset(mv_to_array("language"), 0)) IS DISTINCT
+                FROM array_offset_of(mv_to_array("language"), array_offset(mv_to_array("language"), 0))-1)
+           AND array_offset_of(mv_to_array("language"), array_offset(mv_to_array("language"), 0)) > array_offset_of(mv_to_array("language"), array_offset(mv_to_array("language"), 0))-1
+           AND array_offset_of(mv_to_array("language"), array_offset(mv_to_array("language"), 0)) >= array_offset_of(mv_to_array("language"), array_offset(mv_to_array("language"), 0))-1
+           AND array_offset_of(mv_to_array("language"), array_offset(mv_to_array("language"), 0)) < array_offset_of(mv_to_array("language"), array_offset(mv_to_array("language"), 0))+1
+           AND array_offset_of(mv_to_array("language"), array_offset(mv_to_array("language"), 0)) <= array_offset_of(mv_to_array("language"), array_offset(mv_to_array("language"), 0))+1
+           AND (array_offset_of(mv_to_array("language"), array_offset(mv_to_array("language"), 0)) <> array_offset_of(mv_to_array("language"), array_offset(mv_to_array("language"), 0))-1) IS TRUE
+           AND (array_offset_of(mv_to_array("language"), array_offset(mv_to_array("language"), 0)) = array_offset_of(mv_to_array("language"), array_offset(mv_to_array("language"), 0))-1) IS NOT TRUE
+           AND (array_offset_of(mv_to_array("language"), array_offset(mv_to_array("language"), 0)) = array_offset_of(mv_to_array("language"), array_offset(mv_to_array("language"), 0))-1) IS FALSE
+           AND (array_offset_of(mv_to_array("language"), array_offset(mv_to_array("language"), 0)) <> array_offset_of(mv_to_array("language"), array_offset(mv_to_array("language"), 0))-1) IS NOT FALSE
+           AND array_offset_of(mv_to_array("language"), array_offset(mv_to_array("language"), 0)) BETWEEN array_offset_of(mv_to_array("language"), array_offset(mv_to_array("language"), 0))-1 AND array_offset_of(mv_to_array("language"), array_offset(mv_to_array("language"), 0))+1
+           AND array_offset_of(mv_to_array("language"), array_offset(mv_to_array("language"), 0)) NOT BETWEEN array_offset_of(mv_to_array("language"), array_offset(mv_to_array("language"), 0)) AND array_offset_of(mv_to_array("language"), array_offset(mv_to_array("language"), 0))-1
+           AND array_offset_of(mv_to_array("language"), array_offset(mv_to_array("language"), 0)) like '%'
+           AND array_offset_of(mv_to_array("language"), array_offset(mv_to_array("language"), 0)) not like '__DOES_NOT_EXIST__%'
+           AND array_offset_of(mv_to_array("language"), array_offset(mv_to_array("language"), 0)) IN (array_offset_of(mv_to_array("language"), array_offset(mv_to_array("language"), 0))-1,
+                                                                                                                                                                                        array_offset_of(mv_to_array("language"), array_offset(mv_to_array("language"), 0))+0,
+                                                                                                                                                                                        array_offset_of(mv_to_array("language"), array_offset(mv_to_array("language"), 0))+1)
+           AND array_offset_of(mv_to_array("language"), array_offset(mv_to_array("language"), 0)) NOT IN (array_offset_of(mv_to_array("language"), array_offset(mv_to_array("language"), 0))-1,
+                                                                                                                                                                                            array_offset_of(mv_to_array("language"), array_offset(mv_to_array("language"), 0))+1))) ;
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND (array_offset_of(mv_to_array("language"), array_offset(mv_to_array("language"), 0)) IS NULL
+       OR array_offset_of(mv_to_array("language"), array_offset(mv_to_array("language"), 0)) IN
+         (SELECT array_offset_of(mv_to_array("language"), array_offset(mv_to_array("language"), 0))
+          FROM kttm_nested
+          WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+            AND (array_offset_of(mv_to_array("language"), array_offset(mv_to_array("language"), 0)) IS NULL
+                 OR (array_offset_of(mv_to_array("language"), array_offset(mv_to_array("language"), 0)) = array_offset_of(mv_to_array("language"), array_offset(mv_to_array("language"), 0))+0
+                     AND array_offset_of(mv_to_array("language"), array_offset(mv_to_array("language"), 0)) IS NOT DISTINCT
+                     FROM array_offset_of(mv_to_array("language"), array_offset(mv_to_array("language"), 0))+0
+                     AND array_offset_of(mv_to_array("language"), array_offset(mv_to_array("language"), 0)) <> array_offset_of(mv_to_array("language"), array_offset(mv_to_array("language"), 0))-1
+                     AND (array_offset_of(mv_to_array("language"), array_offset(mv_to_array("language"), 0)) IS DISTINCT
+                          FROM array_offset_of(mv_to_array("language"), array_offset(mv_to_array("language"), 0))-1)
+                     AND array_offset_of(mv_to_array("language"), array_offset(mv_to_array("language"), 0)) > array_offset_of(mv_to_array("language"), array_offset(mv_to_array("language"), 0))-1
+                     AND array_offset_of(mv_to_array("language"), array_offset(mv_to_array("language"), 0)) >= array_offset_of(mv_to_array("language"), array_offset(mv_to_array("language"), 0))-1
+                     AND array_offset_of(mv_to_array("language"), array_offset(mv_to_array("language"), 0)) < array_offset_of(mv_to_array("language"), array_offset(mv_to_array("language"), 0))+1
+                     AND array_offset_of(mv_to_array("language"), array_offset(mv_to_array("language"), 0)) <= array_offset_of(mv_to_array("language"), array_offset(mv_to_array("language"), 0))+1
+                     AND (array_offset_of(mv_to_array("language"), array_offset(mv_to_array("language"), 0)) <> array_offset_of(mv_to_array("language"), array_offset(mv_to_array("language"), 0))-1) IS TRUE
+                     AND (array_offset_of(mv_to_array("language"), array_offset(mv_to_array("language"), 0)) = array_offset_of(mv_to_array("language"), array_offset(mv_to_array("language"), 0))-1) IS NOT TRUE
+                     AND (array_offset_of(mv_to_array("language"), array_offset(mv_to_array("language"), 0)) = array_offset_of(mv_to_array("language"), array_offset(mv_to_array("language"), 0))-1) IS FALSE
+                     AND (array_offset_of(mv_to_array("language"), array_offset(mv_to_array("language"), 0)) <> array_offset_of(mv_to_array("language"), array_offset(mv_to_array("language"), 0))-1) IS NOT FALSE
+                     AND array_offset_of(mv_to_array("language"), array_offset(mv_to_array("language"), 0)) BETWEEN array_offset_of(mv_to_array("language"), array_offset(mv_to_array("language"), 0))-1 AND array_offset_of(mv_to_array("language"), array_offset(mv_to_array("language"), 0))+1
+                     AND array_offset_of(mv_to_array("language"), array_offset(mv_to_array("language"), 0)) NOT BETWEEN array_offset_of(mv_to_array("language"), array_offset(mv_to_array("language"), 0)) AND array_offset_of(mv_to_array("language"), array_offset(mv_to_array("language"), 0))-1
+                     AND array_offset_of(mv_to_array("language"), array_offset(mv_to_array("language"), 0)) like '%'
+                     AND array_offset_of(mv_to_array("language"), array_offset(mv_to_array("language"), 0)) not like '__DOES_NOT_EXIST__%'
+                     AND array_offset_of(mv_to_array("language"), array_offset(mv_to_array("language"), 0)) IN (array_offset_of(mv_to_array("language"), array_offset(mv_to_array("language"), 0))-1,
+                                                                                                                                                                                                  array_offset_of(mv_to_array("language"), array_offset(mv_to_array("language"), 0))+0,
+                                                                                                                                                                                                  array_offset_of(mv_to_array("language"), array_offset(mv_to_array("language"), 0))+1)
+                     AND array_offset_of(mv_to_array("language"), array_offset(mv_to_array("language"), 0)) NOT IN (array_offset_of(mv_to_array("language"), array_offset(mv_to_array("language"), 0))-1,
+                                                                                                                                                                                                      array_offset_of(mv_to_array("language"), array_offset(mv_to_array("language"), 0))+1)))));
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM
+  (SELECT __time, number, client_ip,
+                          array_offset_of(mv_to_array("language"), array_offset(mv_to_array("language"), 0)),
+                          count(*)
+   FROM kttm_nested
+   WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+     AND (array_offset_of(mv_to_array("language"), array_offset(mv_to_array("language"), 0)) IS NULL
+          OR (array_offset_of(mv_to_array("language"), array_offset(mv_to_array("language"), 0)) = array_offset_of(mv_to_array("language"), array_offset(mv_to_array("language"), 0))+0
+              AND array_offset_of(mv_to_array("language"), array_offset(mv_to_array("language"), 0)) IS NOT DISTINCT
+              FROM array_offset_of(mv_to_array("language"), array_offset(mv_to_array("language"), 0))+0
+              AND array_offset_of(mv_to_array("language"), array_offset(mv_to_array("language"), 0)) <> array_offset_of(mv_to_array("language"), array_offset(mv_to_array("language"), 0))-1
+              AND (array_offset_of(mv_to_array("language"), array_offset(mv_to_array("language"), 0)) IS DISTINCT
+                   FROM array_offset_of(mv_to_array("language"), array_offset(mv_to_array("language"), 0))-1)
+              AND array_offset_of(mv_to_array("language"), array_offset(mv_to_array("language"), 0)) > array_offset_of(mv_to_array("language"), array_offset(mv_to_array("language"), 0))-1
+              AND array_offset_of(mv_to_array("language"), array_offset(mv_to_array("language"), 0)) >= array_offset_of(mv_to_array("language"), array_offset(mv_to_array("language"), 0))-1
+              AND array_offset_of(mv_to_array("language"), array_offset(mv_to_array("language"), 0)) < array_offset_of(mv_to_array("language"), array_offset(mv_to_array("language"), 0))+1
+              AND array_offset_of(mv_to_array("language"), array_offset(mv_to_array("language"), 0)) <= array_offset_of(mv_to_array("language"), array_offset(mv_to_array("language"), 0))+1
+              AND (array_offset_of(mv_to_array("language"), array_offset(mv_to_array("language"), 0)) <> array_offset_of(mv_to_array("language"), array_offset(mv_to_array("language"), 0))-1) IS TRUE
+              AND (array_offset_of(mv_to_array("language"), array_offset(mv_to_array("language"), 0)) = array_offset_of(mv_to_array("language"), array_offset(mv_to_array("language"), 0))-1) IS NOT TRUE
+              AND (array_offset_of(mv_to_array("language"), array_offset(mv_to_array("language"), 0)) = array_offset_of(mv_to_array("language"), array_offset(mv_to_array("language"), 0))-1) IS FALSE
+              AND (array_offset_of(mv_to_array("language"), array_offset(mv_to_array("language"), 0)) <> array_offset_of(mv_to_array("language"), array_offset(mv_to_array("language"), 0))-1) IS NOT FALSE
+              AND array_offset_of(mv_to_array("language"), array_offset(mv_to_array("language"), 0)) BETWEEN array_offset_of(mv_to_array("language"), array_offset(mv_to_array("language"), 0))-1 AND array_offset_of(mv_to_array("language"), array_offset(mv_to_array("language"), 0))+1
+              AND array_offset_of(mv_to_array("language"), array_offset(mv_to_array("language"), 0)) NOT BETWEEN array_offset_of(mv_to_array("language"), array_offset(mv_to_array("language"), 0)) AND array_offset_of(mv_to_array("language"), array_offset(mv_to_array("language"), 0))-1
+              AND array_offset_of(mv_to_array("language"), array_offset(mv_to_array("language"), 0)) like '%'
+              AND array_offset_of(mv_to_array("language"), array_offset(mv_to_array("language"), 0)) not like '__DOES_NOT_EXIST__%'
+              AND array_offset_of(mv_to_array("language"), array_offset(mv_to_array("language"), 0)) IN (array_offset_of(mv_to_array("language"), array_offset(mv_to_array("language"), 0))-1,
+                                                                                                                                                                                           array_offset_of(mv_to_array("language"), array_offset(mv_to_array("language"), 0))+0,
+                                                                                                                                                                                           array_offset_of(mv_to_array("language"), array_offset(mv_to_array("language"), 0))+1)
+              AND array_offset_of(mv_to_array("language"), array_offset(mv_to_array("language"), 0)) NOT IN (array_offset_of(mv_to_array("language"), array_offset(mv_to_array("language"), 0))-1,
+                                                                                                                                                                                               array_offset_of(mv_to_array("language"), array_offset(mv_to_array("language"), 0))+1)))
+   GROUP BY 1,
+            2,
+            3,
+            4);
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+#-------------------------------------------------------------------------
+# TEST_ID: A9: array_ordinal_of
+#-------------------------------------------------------------------------
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND (array_ordinal_of(mv_to_array("language"), array_ordinal(mv_to_array("language"), 1)) IS NULL
+       OR (array_ordinal_of(mv_to_array("language"), array_ordinal(mv_to_array("language"), 1)) = array_ordinal_of(mv_to_array("language"), array_ordinal(mv_to_array("language"), 1))+0
+           AND array_ordinal_of(mv_to_array("language"), array_ordinal(mv_to_array("language"), 1)) IS NOT DISTINCT
+           FROM array_ordinal_of(mv_to_array("language"), array_ordinal(mv_to_array("language"), 1))+0
+           AND array_ordinal_of(mv_to_array("language"), array_ordinal(mv_to_array("language"), 1)) <> array_ordinal_of(mv_to_array("language"), array_ordinal(mv_to_array("language"), 1))-1
+           AND (array_ordinal_of(mv_to_array("language"), array_ordinal(mv_to_array("language"), 1)) IS DISTINCT
+                FROM array_ordinal_of(mv_to_array("language"), array_ordinal(mv_to_array("language"), 1))-1)
+           AND array_ordinal_of(mv_to_array("language"), array_ordinal(mv_to_array("language"), 1)) > array_ordinal_of(mv_to_array("language"), array_ordinal(mv_to_array("language"), 1))-1
+           AND array_ordinal_of(mv_to_array("language"), array_ordinal(mv_to_array("language"), 1)) >= array_ordinal_of(mv_to_array("language"), array_ordinal(mv_to_array("language"), 1))-1
+           AND array_ordinal_of(mv_to_array("language"), array_ordinal(mv_to_array("language"), 1)) < array_ordinal_of(mv_to_array("language"), array_ordinal(mv_to_array("language"), 1))+1
+           AND array_ordinal_of(mv_to_array("language"), array_ordinal(mv_to_array("language"), 1)) <= array_ordinal_of(mv_to_array("language"), array_ordinal(mv_to_array("language"), 1))+1
+           AND (array_ordinal_of(mv_to_array("language"), array_ordinal(mv_to_array("language"), 1)) <> array_ordinal_of(mv_to_array("language"), array_ordinal(mv_to_array("language"), 1))-1) IS TRUE
+           AND (array_ordinal_of(mv_to_array("language"), array_ordinal(mv_to_array("language"), 1)) = array_ordinal_of(mv_to_array("language"), array_ordinal(mv_to_array("language"), 1))-1) IS NOT TRUE
+           AND (array_ordinal_of(mv_to_array("language"), array_ordinal(mv_to_array("language"), 1)) = array_ordinal_of(mv_to_array("language"), array_ordinal(mv_to_array("language"), 1))-1) IS FALSE
+           AND (array_ordinal_of(mv_to_array("language"), array_ordinal(mv_to_array("language"), 1)) <> array_ordinal_of(mv_to_array("language"), array_ordinal(mv_to_array("language"), 1))-1) IS NOT FALSE
+           AND array_ordinal_of(mv_to_array("language"), array_ordinal(mv_to_array("language"), 1)) BETWEEN array_ordinal_of(mv_to_array("language"), array_ordinal(mv_to_array("language"), 1))-1 AND array_ordinal_of(mv_to_array("language"), array_ordinal(mv_to_array("language"), 1))+1
+           AND array_ordinal_of(mv_to_array("language"), array_ordinal(mv_to_array("language"), 1)) NOT BETWEEN array_ordinal_of(mv_to_array("language"), array_ordinal(mv_to_array("language"), 1)) AND array_ordinal_of(mv_to_array("language"), array_ordinal(mv_to_array("language"), 1))-1
+           AND array_ordinal_of(mv_to_array("language"), array_ordinal(mv_to_array("language"), 1)) like '%'
+           AND array_ordinal_of(mv_to_array("language"), array_ordinal(mv_to_array("language"), 1)) not like '__DOES_NOT_EXIST__%'
+           AND array_ordinal_of(mv_to_array("language"), array_ordinal(mv_to_array("language"), 1)) IN (array_ordinal_of(mv_to_array("language"), array_ordinal(mv_to_array("language"), 1))-1,
+                                                                                                                                                                                            array_ordinal_of(mv_to_array("language"), array_ordinal(mv_to_array("language"), 1))+0,
+                                                                                                                                                                                            array_ordinal_of(mv_to_array("language"), array_ordinal(mv_to_array("language"), 1))+1)
+           AND array_ordinal_of(mv_to_array("language"), array_ordinal(mv_to_array("language"), 1)) NOT IN (array_ordinal_of(mv_to_array("language"), array_ordinal(mv_to_array("language"), 1))-1,
+                                                                                                                                                                                                array_ordinal_of(mv_to_array("language"), array_ordinal(mv_to_array("language"), 1))+1))) ;
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND (array_ordinal_of(mv_to_array("language"), array_ordinal(mv_to_array("language"), 1)) IS NULL
+       OR array_ordinal_of(mv_to_array("language"), array_ordinal(mv_to_array("language"), 1)) IN
+         (SELECT array_ordinal_of(mv_to_array("language"), array_ordinal(mv_to_array("language"), 1))
+          FROM kttm_nested
+          WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+            AND (array_ordinal_of(mv_to_array("language"), array_ordinal(mv_to_array("language"), 1)) IS NULL
+                 OR (array_ordinal_of(mv_to_array("language"), array_ordinal(mv_to_array("language"), 1)) = array_ordinal_of(mv_to_array("language"), array_ordinal(mv_to_array("language"), 1))+0
+                     AND array_ordinal_of(mv_to_array("language"), array_ordinal(mv_to_array("language"), 1)) IS NOT DISTINCT
+                     FROM array_ordinal_of(mv_to_array("language"), array_ordinal(mv_to_array("language"), 1))+0
+                     AND array_ordinal_of(mv_to_array("language"), array_ordinal(mv_to_array("language"), 1)) <> array_ordinal_of(mv_to_array("language"), array_ordinal(mv_to_array("language"), 1))-1
+                     AND (array_ordinal_of(mv_to_array("language"), array_ordinal(mv_to_array("language"), 1)) IS DISTINCT
+                          FROM array_ordinal_of(mv_to_array("language"), array_ordinal(mv_to_array("language"), 1))-1)
+                     AND array_ordinal_of(mv_to_array("language"), array_ordinal(mv_to_array("language"), 1)) > array_ordinal_of(mv_to_array("language"), array_ordinal(mv_to_array("language"), 1))-1
+                     AND array_ordinal_of(mv_to_array("language"), array_ordinal(mv_to_array("language"), 1)) >= array_ordinal_of(mv_to_array("language"), array_ordinal(mv_to_array("language"), 1))-1
+                     AND array_ordinal_of(mv_to_array("language"), array_ordinal(mv_to_array("language"), 1)) < array_ordinal_of(mv_to_array("language"), array_ordinal(mv_to_array("language"), 1))+1
+                     AND array_ordinal_of(mv_to_array("language"), array_ordinal(mv_to_array("language"), 1)) <= array_ordinal_of(mv_to_array("language"), array_ordinal(mv_to_array("language"), 1))+1
+                     AND (array_ordinal_of(mv_to_array("language"), array_ordinal(mv_to_array("language"), 1)) <> array_ordinal_of(mv_to_array("language"), array_ordinal(mv_to_array("language"), 1))-1) IS TRUE
+                     AND (array_ordinal_of(mv_to_array("language"), array_ordinal(mv_to_array("language"), 1)) = array_ordinal_of(mv_to_array("language"), array_ordinal(mv_to_array("language"), 1))-1) IS NOT TRUE
+                     AND (array_ordinal_of(mv_to_array("language"), array_ordinal(mv_to_array("language"), 1)) = array_ordinal_of(mv_to_array("language"), array_ordinal(mv_to_array("language"), 1))-1) IS FALSE
+                     AND (array_ordinal_of(mv_to_array("language"), array_ordinal(mv_to_array("language"), 1)) <> array_ordinal_of(mv_to_array("language"), array_ordinal(mv_to_array("language"), 1))-1) IS NOT FALSE
+                     AND array_ordinal_of(mv_to_array("language"), array_ordinal(mv_to_array("language"), 1)) BETWEEN array_ordinal_of(mv_to_array("language"), array_ordinal(mv_to_array("language"), 1))-1 AND array_ordinal_of(mv_to_array("language"), array_ordinal(mv_to_array("language"), 1))+1
+                     AND array_ordinal_of(mv_to_array("language"), array_ordinal(mv_to_array("language"), 1)) NOT BETWEEN array_ordinal_of(mv_to_array("language"), array_ordinal(mv_to_array("language"), 1)) AND array_ordinal_of(mv_to_array("language"), array_ordinal(mv_to_array("language"), 1))-1
+                     AND array_ordinal_of(mv_to_array("language"), array_ordinal(mv_to_array("language"), 1)) like '%'
+                     AND array_ordinal_of(mv_to_array("language"), array_ordinal(mv_to_array("language"), 1)) not like '__DOES_NOT_EXIST__%'
+                     AND array_ordinal_of(mv_to_array("language"), array_ordinal(mv_to_array("language"), 1)) IN (array_ordinal_of(mv_to_array("language"), array_ordinal(mv_to_array("language"), 1))-1,
+                                                                                                                                                                                                      array_ordinal_of(mv_to_array("language"), array_ordinal(mv_to_array("language"), 1))+0,
+                                                                                                                                                                                                      array_ordinal_of(mv_to_array("language"), array_ordinal(mv_to_array("language"), 1))+1)
+                     AND array_ordinal_of(mv_to_array("language"), array_ordinal(mv_to_array("language"), 1)) NOT IN (array_ordinal_of(mv_to_array("language"), array_ordinal(mv_to_array("language"), 1))-1,
+                                                                                                                                                                                                          array_ordinal_of(mv_to_array("language"), array_ordinal(mv_to_array("language"), 1))+1)))));
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM
+  (SELECT __time, number, client_ip,
+                          array_ordinal_of(mv_to_array("language"), array_ordinal(mv_to_array("language"), 1)),
+                          count(*)
+   FROM kttm_nested
+   WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+     AND (array_ordinal_of(mv_to_array("language"), array_ordinal(mv_to_array("language"), 1)) IS NULL
+          OR (array_ordinal_of(mv_to_array("language"), array_ordinal(mv_to_array("language"), 1)) = array_ordinal_of(mv_to_array("language"), array_ordinal(mv_to_array("language"), 1))+0
+              AND array_ordinal_of(mv_to_array("language"), array_ordinal(mv_to_array("language"), 1)) IS NOT DISTINCT
+              FROM array_ordinal_of(mv_to_array("language"), array_ordinal(mv_to_array("language"), 1))+0
+              AND array_ordinal_of(mv_to_array("language"), array_ordinal(mv_to_array("language"), 1)) <> array_ordinal_of(mv_to_array("language"), array_ordinal(mv_to_array("language"), 1))-1
+              AND (array_ordinal_of(mv_to_array("language"), array_ordinal(mv_to_array("language"), 1)) IS DISTINCT
+                   FROM array_ordinal_of(mv_to_array("language"), array_ordinal(mv_to_array("language"), 1))-1)
+              AND array_ordinal_of(mv_to_array("language"), array_ordinal(mv_to_array("language"), 1)) > array_ordinal_of(mv_to_array("language"), array_ordinal(mv_to_array("language"), 1))-1
+              AND array_ordinal_of(mv_to_array("language"), array_ordinal(mv_to_array("language"), 1)) >= array_ordinal_of(mv_to_array("language"), array_ordinal(mv_to_array("language"), 1))-1
+              AND array_ordinal_of(mv_to_array("language"), array_ordinal(mv_to_array("language"), 1)) < array_ordinal_of(mv_to_array("language"), array_ordinal(mv_to_array("language"), 1))+1
+              AND array_ordinal_of(mv_to_array("language"), array_ordinal(mv_to_array("language"), 1)) <= array_ordinal_of(mv_to_array("language"), array_ordinal(mv_to_array("language"), 1))+1
+              AND (array_ordinal_of(mv_to_array("language"), array_ordinal(mv_to_array("language"), 1)) <> array_ordinal_of(mv_to_array("language"), array_ordinal(mv_to_array("language"), 1))-1) IS TRUE
+              AND (array_ordinal_of(mv_to_array("language"), array_ordinal(mv_to_array("language"), 1)) = array_ordinal_of(mv_to_array("language"), array_ordinal(mv_to_array("language"), 1))-1) IS NOT TRUE
+              AND (array_ordinal_of(mv_to_array("language"), array_ordinal(mv_to_array("language"), 1)) = array_ordinal_of(mv_to_array("language"), array_ordinal(mv_to_array("language"), 1))-1) IS FALSE
+              AND (array_ordinal_of(mv_to_array("language"), array_ordinal(mv_to_array("language"), 1)) <> array_ordinal_of(mv_to_array("language"), array_ordinal(mv_to_array("language"), 1))-1) IS NOT FALSE
+              AND array_ordinal_of(mv_to_array("language"), array_ordinal(mv_to_array("language"), 1)) BETWEEN array_ordinal_of(mv_to_array("language"), array_ordinal(mv_to_array("language"), 1))-1 AND array_ordinal_of(mv_to_array("language"), array_ordinal(mv_to_array("language"), 1))+1
+              AND array_ordinal_of(mv_to_array("language"), array_ordinal(mv_to_array("language"), 1)) NOT BETWEEN array_ordinal_of(mv_to_array("language"), array_ordinal(mv_to_array("language"), 1)) AND array_ordinal_of(mv_to_array("language"), array_ordinal(mv_to_array("language"), 1))-1
+              AND array_ordinal_of(mv_to_array("language"), array_ordinal(mv_to_array("language"), 1)) like '%'
+              AND array_ordinal_of(mv_to_array("language"), array_ordinal(mv_to_array("language"), 1)) not like '__DOES_NOT_EXIST__%'
+              AND array_ordinal_of(mv_to_array("language"), array_ordinal(mv_to_array("language"), 1)) IN (array_ordinal_of(mv_to_array("language"), array_ordinal(mv_to_array("language"), 1))-1,
+                                                                                                                                                                                               array_ordinal_of(mv_to_array("language"), array_ordinal(mv_to_array("language"), 1))+0,
+                                                                                                                                                                                               array_ordinal_of(mv_to_array("language"), array_ordinal(mv_to_array("language"), 1))+1)
+              AND array_ordinal_of(mv_to_array("language"), array_ordinal(mv_to_array("language"), 1)) NOT IN (array_ordinal_of(mv_to_array("language"), array_ordinal(mv_to_array("language"), 1))-1,
+                                                                                                                                                                                                   array_ordinal_of(mv_to_array("language"), array_ordinal(mv_to_array("language"), 1))+1)))
+   GROUP BY 1,
+            2,
+            3,
+            4);
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+#-------------------------------------------------------------------------
+# TEST_ID: A10: array_prepend
+#-------------------------------------------------------------------------
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND (array_prepend('1', mv_to_array("language")) IS NULL
+       OR (array_prepend('1', mv_to_array("language")) = array_prepend('1', mv_to_array("language"))
+           AND array_prepend('1', mv_to_array("language")) IS NOT DISTINCT
+           FROM array_prepend('1', mv_to_array("language"))
+           AND array_prepend('1', mv_to_array("language")) <> array_prepend('0', mv_to_array("language"))
+           AND (array_prepend('1', mv_to_array("language")) IS DISTINCT
+                FROM array_prepend('0', mv_to_array("language")))
+           AND array_prepend('1', mv_to_array("language")) > array_prepend('0', mv_to_array("language"))
+           AND array_prepend('1', mv_to_array("language")) >= array_prepend('0', mv_to_array("language"))
+           AND array_prepend('1', mv_to_array("language")) < array_prepend('2', mv_to_array("language"))
+           AND array_prepend('1', mv_to_array("language")) <= array_prepend('2', mv_to_array("language"))
+           AND (array_prepend('1', mv_to_array("language")) <> array_prepend('0', mv_to_array("language"))) IS TRUE
+           AND (array_prepend('1', mv_to_array("language")) = array_prepend('0', mv_to_array("language"))) IS NOT TRUE
+           AND (array_prepend('1', mv_to_array("language")) = array_prepend('0', mv_to_array("language"))) IS FALSE
+           AND (array_prepend('1', mv_to_array("language")) <> array_prepend('0', mv_to_array("language"))) IS NOT FALSE
+           AND array_prepend('1', mv_to_array("language")) BETWEEN array_prepend('0', mv_to_array("language")) AND array_prepend('2', mv_to_array("language"))
+           AND array_prepend('1', mv_to_array("language")) NOT BETWEEN array_prepend('1', mv_to_array("language")) AND array_prepend('0', mv_to_array("language"))
+           AND array_prepend('1', mv_to_array("language")) IN (array_prepend('0', mv_to_array("language")),
+                                                               array_prepend('1', mv_to_array("language")),
+                                                               array_prepend('2', mv_to_array("language")))
+           AND array_prepend('1', mv_to_array("language")) NOT IN (array_prepend('0', mv_to_array("language")),
+                                                                   array_prepend('2', mv_to_array("language"))))) ;
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM
+  (SELECT __time, number, client_ip,
+                          array_prepend('1', mv_to_array("language")),
+                          count(*)
+   FROM kttm_nested
+   WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+     AND (array_prepend('1', mv_to_array("language")) IS NULL
+          OR (array_prepend('1', mv_to_array("language")) = array_prepend('1', mv_to_array("language"))
+              AND array_prepend('1', mv_to_array("language")) IS NOT DISTINCT
+              FROM array_prepend('1', mv_to_array("language"))
+              AND array_prepend('1', mv_to_array("language")) <> array_prepend('0', mv_to_array("language"))
+              AND (array_prepend('1', mv_to_array("language")) IS DISTINCT
+                   FROM array_prepend('0', mv_to_array("language")))
+              AND array_prepend('1', mv_to_array("language")) > array_prepend('0', mv_to_array("language"))
+              AND array_prepend('1', mv_to_array("language")) >= array_prepend('0', mv_to_array("language"))
+              AND array_prepend('1', mv_to_array("language")) < array_prepend('2', mv_to_array("language"))
+              AND array_prepend('1', mv_to_array("language")) <= array_prepend('2', mv_to_array("language"))
+              AND (array_prepend('1', mv_to_array("language")) <> array_prepend('0', mv_to_array("language"))) IS TRUE
+              AND (array_prepend('1', mv_to_array("language")) = array_prepend('0', mv_to_array("language"))) IS NOT TRUE
+              AND (array_prepend('1', mv_to_array("language")) = array_prepend('0', mv_to_array("language"))) IS FALSE
+              AND (array_prepend('1', mv_to_array("language")) <> array_prepend('0', mv_to_array("language"))) IS NOT FALSE
+              AND array_prepend('1', mv_to_array("language")) BETWEEN array_prepend('0', mv_to_array("language")) AND array_prepend('2', mv_to_array("language"))
+              AND array_prepend('1', mv_to_array("language")) NOT BETWEEN array_prepend('1', mv_to_array("language")) AND array_prepend('0', mv_to_array("language"))
+              AND array_prepend('1', mv_to_array("language")) IN (array_prepend('0', mv_to_array("language")),
+                                                                  array_prepend('1', mv_to_array("language")),
+                                                                  array_prepend('2', mv_to_array("language")))
+              AND array_prepend('1', mv_to_array("language")) NOT IN (array_prepend('0', mv_to_array("language")),
+                                                                      array_prepend('2', mv_to_array("language")))))
+   GROUP BY 1,
+            2,
+            3,
+            4);
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+#-------------------------------------------------------------------------
+# TEST_ID: A11: array_append
+#-------------------------------------------------------------------------
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND (array_prepend('1', array_append(mv_to_array("language"), 'A')) IS NULL
+       OR (array_prepend('1', array_append(mv_to_array("language"), 'A')) = array_prepend('1', array_append(mv_to_array("language"), 'A'))
+           AND array_prepend('1', array_append(mv_to_array("language"), 'A')) IS NOT DISTINCT
+           FROM array_prepend('1', array_append(mv_to_array("language"), 'A'))
+           AND array_prepend('1', array_append(mv_to_array("language"), 'A')) <> array_prepend('0', array_append(mv_to_array("language"), 'A'))
+           AND (array_prepend('1', array_append(mv_to_array("language"), 'A')) IS DISTINCT
+                FROM array_prepend('0', array_append(mv_to_array("language"), 'A')))
+           AND array_prepend('1', array_append(mv_to_array("language"), 'A')) > array_prepend('0', array_append(mv_to_array("language"), 'A'))
+           AND array_prepend('1', array_append(mv_to_array("language"), 'A')) >= array_prepend('0', array_append(mv_to_array("language"), 'A'))
+           AND array_prepend('1', array_append(mv_to_array("language"), 'A')) < array_prepend('2', array_append(mv_to_array("language"), 'A'))
+           AND array_prepend('1', array_append(mv_to_array("language"), 'A')) <= array_prepend('2', array_append(mv_to_array("language"), 'A'))
+           AND (array_prepend('1', array_append(mv_to_array("language"), 'A')) <> array_prepend('0', array_append(mv_to_array("language"), 'A'))) IS TRUE
+           AND (array_prepend('1', array_append(mv_to_array("language"), 'A')) = array_prepend('0', array_append(mv_to_array("language"), 'A'))) IS NOT TRUE
+           AND (array_prepend('1', array_append(mv_to_array("language"), 'A')) = array_prepend('0', array_append(mv_to_array("language"), 'A'))) IS FALSE
+           AND (array_prepend('1', array_append(mv_to_array("language"), 'A')) <> array_prepend('0', array_append(mv_to_array("language"), 'A'))) IS NOT FALSE
+           AND array_prepend('1', array_append(mv_to_array("language"), 'A')) BETWEEN array_prepend('0', array_append(mv_to_array("language"), 'A')) AND array_prepend('2', array_append(mv_to_array("language"), 'A'))
+           AND array_prepend('1', array_append(mv_to_array("language"), 'A')) NOT BETWEEN array_prepend('1', array_append(mv_to_array("language"), 'A')) AND array_prepend('0', array_append(mv_to_array("language"), 'A'))
+           AND array_prepend('1', array_append(mv_to_array("language"), 'A')) IN (array_prepend('0', array_append(mv_to_array("language"), 'A')),
+                                                                                  array_prepend('1', array_append(mv_to_array("language"), 'A')),
+                                                                                  array_prepend('2', array_append(mv_to_array("language"), 'A')))
+           AND array_prepend('1', array_append(mv_to_array("language"), 'A')) NOT IN (array_prepend('0', array_append(mv_to_array("language"), 'A')),
+                                                                                      array_prepend('2', array_append(mv_to_array("language"), 'A'))))) ;
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM
+  (SELECT __time, number, client_ip,
+                          array_prepend('1', array_append(mv_to_array("language"), 'A')),
+                          count(*)
+   FROM kttm_nested
+   WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+     AND (array_prepend('1', array_append(mv_to_array("language"), 'A')) IS NULL
+          OR (array_prepend('1', array_append(mv_to_array("language"), 'A')) = array_prepend('1', array_append(mv_to_array("language"), 'A'))
+              AND array_prepend('1', array_append(mv_to_array("language"), 'A')) IS NOT DISTINCT
+              FROM array_prepend('1', array_append(mv_to_array("language"), 'A'))
+              AND array_prepend('1', array_append(mv_to_array("language"), 'A')) <> array_prepend('0', array_append(mv_to_array("language"), 'A'))
+              AND (array_prepend('1', array_append(mv_to_array("language"), 'A')) IS DISTINCT
+                   FROM array_prepend('0', array_append(mv_to_array("language"), 'A')))
+              AND array_prepend('1', array_append(mv_to_array("language"), 'A')) > array_prepend('0', array_append(mv_to_array("language"), 'A'))
+              AND array_prepend('1', array_append(mv_to_array("language"), 'A')) >= array_prepend('0', array_append(mv_to_array("language"), 'A'))
+              AND array_prepend('1', array_append(mv_to_array("language"), 'A')) < array_prepend('2', array_append(mv_to_array("language"), 'A'))
+              AND array_prepend('1', array_append(mv_to_array("language"), 'A')) <= array_prepend('2', array_append(mv_to_array("language"), 'A'))
+              AND (array_prepend('1', array_append(mv_to_array("language"), 'A')) <> array_prepend('0', array_append(mv_to_array("language"), 'A'))) IS TRUE
+              AND (array_prepend('1', array_append(mv_to_array("language"), 'A')) = array_prepend('0', array_append(mv_to_array("language"), 'A'))) IS NOT TRUE
+              AND (array_prepend('1', array_append(mv_to_array("language"), 'A')) = array_prepend('0', array_append(mv_to_array("language"), 'A'))) IS FALSE
+              AND (array_prepend('1', array_append(mv_to_array("language"), 'A')) <> array_prepend('0', array_append(mv_to_array("language"), 'A'))) IS NOT FALSE
+              AND array_prepend('1', array_append(mv_to_array("language"), 'A')) BETWEEN array_prepend('0', array_append(mv_to_array("language"), 'A')) AND array_prepend('2', array_append(mv_to_array("language"), 'A'))
+              AND array_prepend('1', array_append(mv_to_array("language"), 'A')) NOT BETWEEN array_prepend('1', array_append(mv_to_array("language"), 'A')) AND array_prepend('0', array_append(mv_to_array("language"), 'A'))
+              AND array_prepend('1', array_append(mv_to_array("language"), 'A')) IN (array_prepend('0', array_append(mv_to_array("language"), 'A')),
+                                                                                     array_prepend('1', array_append(mv_to_array("language"), 'A')),
+                                                                                     array_prepend('2', array_append(mv_to_array("language"), 'A')))
+              AND array_prepend('1', array_append(mv_to_array("language"), 'A')) NOT IN (array_prepend('0', array_append(mv_to_array("language"), 'A')),
+                                                                                         array_prepend('2', array_append(mv_to_array("language"), 'A')))))
+   GROUP BY 1,
+            2,
+            3,
+            4);
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+#-------------------------------------------------------------------------
+# TEST_ID: A12: array_concat
+#-------------------------------------------------------------------------
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND (array_prepend('1', array_concat(mv_to_array("language"), mv_to_array("language"))) IS NULL
+       OR (array_prepend('1', array_concat(mv_to_array("language"), mv_to_array("language"))) = array_prepend('1', array_concat(mv_to_array("language"), mv_to_array("language")))
+           AND array_prepend('1', array_concat(mv_to_array("language"), mv_to_array("language"))) IS NOT DISTINCT
+           FROM array_prepend('1', array_concat(mv_to_array("language"), mv_to_array("language")))
+           AND array_prepend('1', array_concat(mv_to_array("language"), mv_to_array("language"))) <> array_prepend('0', array_concat(mv_to_array("language"), mv_to_array("language")))
+           AND (array_prepend('1', array_concat(mv_to_array("language"), mv_to_array("language"))) IS DISTINCT
+                FROM array_prepend('0', array_concat(mv_to_array("language"), mv_to_array("language"))))
+           AND array_prepend('1', array_concat(mv_to_array("language"), mv_to_array("language"))) > array_prepend('0', array_concat(mv_to_array("language"), mv_to_array("language")))
+           AND array_prepend('1', array_concat(mv_to_array("language"), mv_to_array("language"))) >= array_prepend('0', array_concat(mv_to_array("language"), mv_to_array("language")))
+           AND array_prepend('1', array_concat(mv_to_array("language"), mv_to_array("language"))) < array_prepend('2', array_concat(mv_to_array("language"), mv_to_array("language")))
+           AND array_prepend('1', array_concat(mv_to_array("language"), mv_to_array("language"))) <= array_prepend('2', array_concat(mv_to_array("language"), mv_to_array("language")))
+           AND (array_prepend('1', array_concat(mv_to_array("language"), mv_to_array("language"))) <> array_prepend('0', array_concat(mv_to_array("language"), mv_to_array("language")))) IS TRUE
+           AND (array_prepend('1', array_concat(mv_to_array("language"), mv_to_array("language"))) = array_prepend('0', array_concat(mv_to_array("language"), mv_to_array("language")))) IS NOT TRUE
+           AND (array_prepend('1', array_concat(mv_to_array("language"), mv_to_array("language"))) = array_prepend('0', array_concat(mv_to_array("language"), mv_to_array("language")))) IS FALSE
+           AND (array_prepend('1', array_concat(mv_to_array("language"), mv_to_array("language"))) <> array_prepend('0', array_concat(mv_to_array("language"), mv_to_array("language")))) IS NOT FALSE
+           AND array_prepend('1', array_concat(mv_to_array("language"), mv_to_array("language"))) BETWEEN array_prepend('0', array_concat(mv_to_array("language"), mv_to_array("language"))) AND array_prepend('2', array_concat(mv_to_array("language"), mv_to_array("language")))
+           AND array_prepend('1', array_concat(mv_to_array("language"), mv_to_array("language"))) NOT BETWEEN array_prepend('1', array_concat(mv_to_array("language"), mv_to_array("language"))) AND array_prepend('0', array_concat(mv_to_array("language"), mv_to_array("language")))
+           AND array_prepend('1', array_concat(mv_to_array("language"), mv_to_array("language"))) IN (array_prepend('0', array_concat(mv_to_array("language"), mv_to_array("language"))),
+                                                                                                      array_prepend('1', array_concat(mv_to_array("language"), mv_to_array("language"))),
+                                                                                                      array_prepend('2', array_concat(mv_to_array("language"), mv_to_array("language"))))
+           AND array_prepend('1', array_concat(mv_to_array("language"), mv_to_array("language"))) NOT IN (array_prepend('0', array_concat(mv_to_array("language"), mv_to_array("language"))),
+                                                                                                          array_prepend('2', array_concat(mv_to_array("language"), mv_to_array("language")))))) ;
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM
+  (SELECT __time, number, client_ip,
+                          array_prepend('1', array_concat(mv_to_array("language"), mv_to_array("language"))),
+                          count(*)
+   FROM kttm_nested
+   WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+     AND (array_prepend('1', array_concat(mv_to_array("language"), mv_to_array("language"))) IS NULL
+          OR (array_prepend('1', array_concat(mv_to_array("language"), mv_to_array("language"))) = array_prepend('1', array_concat(mv_to_array("language"), mv_to_array("language")))
+              AND array_prepend('1', array_concat(mv_to_array("language"), mv_to_array("language"))) IS NOT DISTINCT
+              FROM array_prepend('1', array_concat(mv_to_array("language"), mv_to_array("language")))
+              AND array_prepend('1', array_concat(mv_to_array("language"), mv_to_array("language"))) <> array_prepend('0', array_concat(mv_to_array("language"), mv_to_array("language")))
+              AND (array_prepend('1', array_concat(mv_to_array("language"), mv_to_array("language"))) IS DISTINCT
+                   FROM array_prepend('0', array_concat(mv_to_array("language"), mv_to_array("language"))))
+              AND array_prepend('1', array_concat(mv_to_array("language"), mv_to_array("language"))) > array_prepend('0', array_concat(mv_to_array("language"), mv_to_array("language")))
+              AND array_prepend('1', array_concat(mv_to_array("language"), mv_to_array("language"))) >= array_prepend('0', array_concat(mv_to_array("language"), mv_to_array("language")))
+              AND array_prepend('1', array_concat(mv_to_array("language"), mv_to_array("language"))) < array_prepend('2', array_concat(mv_to_array("language"), mv_to_array("language")))
+              AND array_prepend('1', array_concat(mv_to_array("language"), mv_to_array("language"))) <= array_prepend('2', array_concat(mv_to_array("language"), mv_to_array("language")))
+              AND (array_prepend('1', array_concat(mv_to_array("language"), mv_to_array("language"))) <> array_prepend('0', array_concat(mv_to_array("language"), mv_to_array("language")))) IS TRUE
+              AND (array_prepend('1', array_concat(mv_to_array("language"), mv_to_array("language"))) = array_prepend('0', array_concat(mv_to_array("language"), mv_to_array("language")))) IS NOT TRUE
+              AND (array_prepend('1', array_concat(mv_to_array("language"), mv_to_array("language"))) = array_prepend('0', array_concat(mv_to_array("language"), mv_to_array("language")))) IS FALSE
+              AND (array_prepend('1', array_concat(mv_to_array("language"), mv_to_array("language"))) <> array_prepend('0', array_concat(mv_to_array("language"), mv_to_array("language")))) IS NOT FALSE
+              AND array_prepend('1', array_concat(mv_to_array("language"), mv_to_array("language"))) BETWEEN array_prepend('0', array_concat(mv_to_array("language"), mv_to_array("language"))) AND array_prepend('2', array_concat(mv_to_array("language"), mv_to_array("language")))
+              AND array_prepend('1', array_concat(mv_to_array("language"), mv_to_array("language"))) NOT BETWEEN array_prepend('1', array_concat(mv_to_array("language"), mv_to_array("language"))) AND array_prepend('0', array_concat(mv_to_array("language"), mv_to_array("language")))
+              AND array_prepend('1', array_concat(mv_to_array("language"), mv_to_array("language"))) IN (array_prepend('0', array_concat(mv_to_array("language"), mv_to_array("language"))),
+                                                                                                         array_prepend('1', array_concat(mv_to_array("language"), mv_to_array("language"))),
+                                                                                                         array_prepend('2', array_concat(mv_to_array("language"), mv_to_array("language"))))
+              AND array_prepend('1', array_concat(mv_to_array("language"), mv_to_array("language"))) NOT IN (array_prepend('0', array_concat(mv_to_array("language"), mv_to_array("language"))),
+                                                                                                             array_prepend('2', array_concat(mv_to_array("language"), mv_to_array("language"))))))
+   GROUP BY 1,
+            2,
+            3,
+            4);
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+#-------------------------------------------------------------------------
+# TEST_ID: A13: array_slice
+#-------------------------------------------------------------------------
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND (array_prepend('1', array_slice(mv_to_array("language"), 0, 1)) IS NULL
+       OR (array_prepend('1', array_slice(mv_to_array("language"), 0, 1)) = array_prepend('1', array_slice(mv_to_array("language"), 0, 1))
+           AND array_prepend('1', array_slice(mv_to_array("language"), 0, 1)) IS NOT DISTINCT
+           FROM array_prepend('1', array_slice(mv_to_array("language"), 0, 1))
+           AND array_prepend('1', array_slice(mv_to_array("language"), 0, 1)) <> array_prepend('0', array_slice(mv_to_array("language"), 0, 1))
+           AND (array_prepend('1', array_slice(mv_to_array("language"), 0, 1)) IS DISTINCT
+                FROM array_prepend('0', array_slice(mv_to_array("language"), 0, 1)))
+           AND array_prepend('1', array_slice(mv_to_array("language"), 0, 1)) > array_prepend('0', array_slice(mv_to_array("language"), 0, 1))
+           AND array_prepend('1', array_slice(mv_to_array("language"), 0, 1)) >= array_prepend('0', array_slice(mv_to_array("language"), 0, 1))
+           AND array_prepend('1', array_slice(mv_to_array("language"), 0, 1)) < array_prepend('2', array_slice(mv_to_array("language"), 0, 1))
+           AND array_prepend('1', array_slice(mv_to_array("language"), 0, 1)) <= array_prepend('2', array_slice(mv_to_array("language"), 0, 1))
+           AND (array_prepend('1', array_slice(mv_to_array("language"), 0, 1)) <> array_prepend('0', array_slice(mv_to_array("language"), 0, 1))) IS TRUE
+           AND (array_prepend('1', array_slice(mv_to_array("language"), 0, 1)) = array_prepend('0', array_slice(mv_to_array("language"), 0, 1))) IS NOT TRUE
+           AND (array_prepend('1', array_slice(mv_to_array("language"), 0, 1)) = array_prepend('0', array_slice(mv_to_array("language"), 0, 1))) IS FALSE
+           AND (array_prepend('1', array_slice(mv_to_array("language"), 0, 1)) <> array_prepend('0', array_slice(mv_to_array("language"), 0, 1))) IS NOT FALSE
+           AND array_prepend('1', array_slice(mv_to_array("language"), 0, 1)) BETWEEN array_prepend('0', array_slice(mv_to_array("language"), 0, 1)) AND array_prepend('2', array_slice(mv_to_array("language"), 0, 1))
+           AND array_prepend('1', array_slice(mv_to_array("language"), 0, 1)) NOT BETWEEN array_prepend('1', array_slice(mv_to_array("language"), 0, 1)) AND array_prepend('0', array_slice(mv_to_array("language"), 0, 1))
+           AND array_prepend('1', array_slice(mv_to_array("language"), 0, 1)) IN (array_prepend('0', array_slice(mv_to_array("language"), 0, 1)),
+                                                                                  array_prepend('1', array_slice(mv_to_array("language"), 0, 1)),
+                                                                                  array_prepend('2', array_slice(mv_to_array("language"), 0, 1)))
+           AND array_prepend('1', array_slice(mv_to_array("language"), 0, 1)) NOT IN (array_prepend('0', array_slice(mv_to_array("language"), 0, 1)),
+                                                                                      array_prepend('2', array_slice(mv_to_array("language"), 0, 1))))) ;
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM
+  (SELECT __time, number, client_ip,
+                          array_prepend('1', array_slice(mv_to_array("language"), 0, 1)),
+                          count(*)
+   FROM kttm_nested
+   WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+     AND (array_prepend('1', array_slice(mv_to_array("language"), 0, 1)) IS NULL
+          OR (array_prepend('1', array_slice(mv_to_array("language"), 0, 1)) = array_prepend('1', array_slice(mv_to_array("language"), 0, 1))
+              AND array_prepend('1', array_slice(mv_to_array("language"), 0, 1)) IS NOT DISTINCT
+              FROM array_prepend('1', array_slice(mv_to_array("language"), 0, 1))
+              AND array_prepend('1', array_slice(mv_to_array("language"), 0, 1)) <> array_prepend('0', array_slice(mv_to_array("language"), 0, 1))
+              AND (array_prepend('1', array_slice(mv_to_array("language"), 0, 1)) IS DISTINCT
+                   FROM array_prepend('0', array_slice(mv_to_array("language"), 0, 1)))
+              AND array_prepend('1', array_slice(mv_to_array("language"), 0, 1)) > array_prepend('0', array_slice(mv_to_array("language"), 0, 1))
+              AND array_prepend('1', array_slice(mv_to_array("language"), 0, 1)) >= array_prepend('0', array_slice(mv_to_array("language"), 0, 1))
+              AND array_prepend('1', array_slice(mv_to_array("language"), 0, 1)) < array_prepend('2', array_slice(mv_to_array("language"), 0, 1))
+              AND array_prepend('1', array_slice(mv_to_array("language"), 0, 1)) <= array_prepend('2', array_slice(mv_to_array("language"), 0, 1))
+              AND (array_prepend('1', array_slice(mv_to_array("language"), 0, 1)) <> array_prepend('0', array_slice(mv_to_array("language"), 0, 1))) IS TRUE
+              AND (array_prepend('1', array_slice(mv_to_array("language"), 0, 1)) = array_prepend('0', array_slice(mv_to_array("language"), 0, 1))) IS NOT TRUE
+              AND (array_prepend('1', array_slice(mv_to_array("language"), 0, 1)) = array_prepend('0', array_slice(mv_to_array("language"), 0, 1))) IS FALSE
+              AND (array_prepend('1', array_slice(mv_to_array("language"), 0, 1)) <> array_prepend('0', array_slice(mv_to_array("language"), 0, 1))) IS NOT FALSE
+              AND array_prepend('1', array_slice(mv_to_array("language"), 0, 1)) BETWEEN array_prepend('0', array_slice(mv_to_array("language"), 0, 1)) AND array_prepend('2', array_slice(mv_to_array("language"), 0, 1))
+              AND array_prepend('1', array_slice(mv_to_array("language"), 0, 1)) NOT BETWEEN array_prepend('1', array_slice(mv_to_array("language"), 0, 1)) AND array_prepend('0', array_slice(mv_to_array("language"), 0, 1))
+              AND array_prepend('1', array_slice(mv_to_array("language"), 0, 1)) IN (array_prepend('0', array_slice(mv_to_array("language"), 0, 1)),
+                                                                                     array_prepend('1', array_slice(mv_to_array("language"), 0, 1)),
+                                                                                     array_prepend('2', array_slice(mv_to_array("language"), 0, 1)))
+              AND array_prepend('1', array_slice(mv_to_array("language"), 0, 1)) NOT IN (array_prepend('0', array_slice(mv_to_array("language"), 0, 1)),
+                                                                                         array_prepend('2', array_slice(mv_to_array("language"), 0, 1)))))
+   GROUP BY 1,
+            2,
+            3,
+            4);
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+#-------------------------------------------------------------------------
+# TEST_ID: A14: array_to_string
+#-------------------------------------------------------------------------
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND ('1'||array_to_string(mv_to_array("language"), '|') IS NULL
+       OR ('1'||array_to_string(mv_to_array("language"), '|') = 1||array_to_string(mv_to_array("language"), '|')
+           AND '1'||array_to_string(mv_to_array("language"), '|') IS NOT DISTINCT
+           FROM 1||array_to_string(mv_to_array("language"), '|')
+           AND '1'||array_to_string(mv_to_array("language"), '|') <> 0||array_to_string(mv_to_array("language"), '|')
+           AND ('1'||array_to_string(mv_to_array("language"), '|') IS DISTINCT
+                FROM 0||array_to_string(mv_to_array("language"), '|'))
+           AND '1'||array_to_string(mv_to_array("language"), '|') > 0||array_to_string(mv_to_array("language"), '|')
+           AND '1'||array_to_string(mv_to_array("language"), '|') >= 0||array_to_string(mv_to_array("language"), '|')
+           AND '1'||array_to_string(mv_to_array("language"), '|') < 2||array_to_string(mv_to_array("language"), '|')
+           AND '1'||array_to_string(mv_to_array("language"), '|') <= 2||array_to_string(mv_to_array("language"), '|')
+           AND ('1'||array_to_string(mv_to_array("language"), '|') <> 0||array_to_string(mv_to_array("language"), '|')) IS TRUE
+           AND ('1'||array_to_string(mv_to_array("language"), '|') = 0||array_to_string(mv_to_array("language"), '|')) IS NOT TRUE
+           AND ('1'||array_to_string(mv_to_array("language"), '|') = 0||array_to_string(mv_to_array("language"), '|')) IS FALSE
+           AND ('1'||array_to_string(mv_to_array("language"), '|') <> 0||array_to_string(mv_to_array("language"), '|')) IS NOT FALSE
+           AND '1'||array_to_string(mv_to_array("language"), '|') BETWEEN 0||array_to_string(mv_to_array("language"), '|') AND 2||array_to_string(mv_to_array("language"), '|')
+           AND '1'||array_to_string(mv_to_array("language"), '|') NOT BETWEEN '1'||array_to_string(mv_to_array("language"), '|') AND 0||array_to_string(mv_to_array("language"), '|')
+           AND '1'||array_to_string(mv_to_array("language"), '|') like '%'
+           AND '1'||array_to_string(mv_to_array("language"), '|') not like '__DOES_NOT_EXIST__%'
+           AND '1'||array_to_string(mv_to_array("language"), '|') IN (0||array_to_string(mv_to_array("language"), '|'),
+                                                                      1||array_to_string(mv_to_array("language"), '|'),
+                                                                      2||array_to_string(mv_to_array("language"), '|'))
+           AND '1'||array_to_string(mv_to_array("language"), '|') NOT IN (0||array_to_string(mv_to_array("language"), '|'),
+                                                                          2||array_to_string(mv_to_array("language"), '|')))) ;
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND ('1'||array_to_string(mv_to_array("language"), '|') IS NULL
+       OR '1'||array_to_string(mv_to_array("language"), '|') IN
+         (SELECT '1'||array_to_string(mv_to_array("language"), '|')
+          FROM kttm_nested
+          WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+            AND ('1'||array_to_string(mv_to_array("language"), '|') IS NULL
+                 OR ('1'||array_to_string(mv_to_array("language"), '|') = 1||array_to_string(mv_to_array("language"), '|')
+                     AND '1'||array_to_string(mv_to_array("language"), '|') IS NOT DISTINCT
+                     FROM 1||array_to_string(mv_to_array("language"), '|')
+                     AND '1'||array_to_string(mv_to_array("language"), '|') <> 0||array_to_string(mv_to_array("language"), '|')
+                     AND ('1'||array_to_string(mv_to_array("language"), '|') IS DISTINCT
+                          FROM 0||array_to_string(mv_to_array("language"), '|'))
+                     AND '1'||array_to_string(mv_to_array("language"), '|') > 0||array_to_string(mv_to_array("language"), '|')
+                     AND '1'||array_to_string(mv_to_array("language"), '|') >= 0||array_to_string(mv_to_array("language"), '|')
+                     AND '1'||array_to_string(mv_to_array("language"), '|') < 2||array_to_string(mv_to_array("language"), '|')
+                     AND '1'||array_to_string(mv_to_array("language"), '|') <= 2||array_to_string(mv_to_array("language"), '|')
+                     AND ('1'||array_to_string(mv_to_array("language"), '|') <> 0||array_to_string(mv_to_array("language"), '|')) IS TRUE
+                     AND ('1'||array_to_string(mv_to_array("language"), '|') = 0||array_to_string(mv_to_array("language"), '|')) IS NOT TRUE
+                     AND ('1'||array_to_string(mv_to_array("language"), '|') = 0||array_to_string(mv_to_array("language"), '|')) IS FALSE
+                     AND ('1'||array_to_string(mv_to_array("language"), '|') <> 0||array_to_string(mv_to_array("language"), '|')) IS NOT FALSE
+                     AND '1'||array_to_string(mv_to_array("language"), '|') BETWEEN 0||array_to_string(mv_to_array("language"), '|') AND 2||array_to_string(mv_to_array("language"), '|')
+                     AND '1'||array_to_string(mv_to_array("language"), '|') NOT BETWEEN '1'||array_to_string(mv_to_array("language"), '|') AND 0||array_to_string(mv_to_array("language"), '|')
+                     AND '1'||array_to_string(mv_to_array("language"), '|') like '%'
+                     AND '1'||array_to_string(mv_to_array("language"), '|') not like '__DOES_NOT_EXIST__%'
+                     AND '1'||array_to_string(mv_to_array("language"), '|') IN (0||array_to_string(mv_to_array("language"), '|'),
+                                                                                1||array_to_string(mv_to_array("language"), '|'),
+                                                                                2||array_to_string(mv_to_array("language"), '|'))
+                     AND '1'||array_to_string(mv_to_array("language"), '|') NOT IN (0||array_to_string(mv_to_array("language"), '|'),
+                                                                                    2||array_to_string(mv_to_array("language"), '|'))))));
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM
+  (SELECT __time, number, client_ip,
+                          '1'||array_to_string(mv_to_array("language"), '|'),
+                          count(*)
+   FROM kttm_nested
+   WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+     AND ('1'||array_to_string(mv_to_array("language"), '|') IS NULL
+          OR ('1'||array_to_string(mv_to_array("language"), '|') = 1||array_to_string(mv_to_array("language"), '|')
+              AND '1'||array_to_string(mv_to_array("language"), '|') IS NOT DISTINCT
+              FROM 1||array_to_string(mv_to_array("language"), '|')
+              AND '1'||array_to_string(mv_to_array("language"), '|') <> 0||array_to_string(mv_to_array("language"), '|')
+              AND ('1'||array_to_string(mv_to_array("language"), '|') IS DISTINCT
+                   FROM 0||array_to_string(mv_to_array("language"), '|'))
+              AND '1'||array_to_string(mv_to_array("language"), '|') > 0||array_to_string(mv_to_array("language"), '|')
+              AND '1'||array_to_string(mv_to_array("language"), '|') >= 0||array_to_string(mv_to_array("language"), '|')
+              AND '1'||array_to_string(mv_to_array("language"), '|') < 2||array_to_string(mv_to_array("language"), '|')
+              AND '1'||array_to_string(mv_to_array("language"), '|') <= 2||array_to_string(mv_to_array("language"), '|')
+              AND ('1'||array_to_string(mv_to_array("language"), '|') <> 0||array_to_string(mv_to_array("language"), '|')) IS TRUE
+              AND ('1'||array_to_string(mv_to_array("language"), '|') = 0||array_to_string(mv_to_array("language"), '|')) IS NOT TRUE
+              AND ('1'||array_to_string(mv_to_array("language"), '|') = 0||array_to_string(mv_to_array("language"), '|')) IS FALSE
+              AND ('1'||array_to_string(mv_to_array("language"), '|') <> 0||array_to_string(mv_to_array("language"), '|')) IS NOT FALSE
+              AND '1'||array_to_string(mv_to_array("language"), '|') BETWEEN 0||array_to_string(mv_to_array("language"), '|') AND 2||array_to_string(mv_to_array("language"), '|')
+              AND '1'||array_to_string(mv_to_array("language"), '|') NOT BETWEEN '1'||array_to_string(mv_to_array("language"), '|') AND 0||array_to_string(mv_to_array("language"), '|')
+              AND '1'||array_to_string(mv_to_array("language"), '|') like '%'
+              AND '1'||array_to_string(mv_to_array("language"), '|') not like '__DOES_NOT_EXIST__%'
+              AND '1'||array_to_string(mv_to_array("language"), '|') IN (0||array_to_string(mv_to_array("language"), '|'),
+                                                                         1||array_to_string(mv_to_array("language"), '|'),
+                                                                         2||array_to_string(mv_to_array("language"), '|'))
+              AND '1'||array_to_string(mv_to_array("language"), '|') NOT IN (0||array_to_string(mv_to_array("language"), '|'),
+                                                                             2||array_to_string(mv_to_array("language"), '|'))))
+   GROUP BY 1,
+            2,
+            3,
+            4);
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+#-------------------------------------------------------------------------
+# TEST_ID: A15: string_to_array
+#-------------------------------------------------------------------------
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND (array_prepend('1', string_to_array('A|B', '|')) IS NULL
+       OR (array_prepend('1', string_to_array('A|B', '|')) = array_prepend('1', string_to_array('A|B', '|'))
+           AND array_prepend('1', string_to_array('A|B', '|')) IS NOT DISTINCT
+           FROM array_prepend('1', string_to_array('A|B', '|'))
+           AND array_prepend('1', string_to_array('A|B', '|')) <> array_prepend('0', string_to_array('A|B', '|'))
+           AND (array_prepend('1', string_to_array('A|B', '|')) IS DISTINCT
+                FROM array_prepend('0', string_to_array('A|B', '|')))
+           AND array_prepend('1', string_to_array('A|B', '|')) > array_prepend('0', string_to_array('A|B', '|'))
+           AND array_prepend('1', string_to_array('A|B', '|')) >= array_prepend('0', string_to_array('A|B', '|'))
+           AND array_prepend('1', string_to_array('A|B', '|')) < array_prepend('2', string_to_array('A|B', '|'))
+           AND array_prepend('1', string_to_array('A|B', '|')) <= array_prepend('2', string_to_array('A|B', '|'))
+           AND (array_prepend('1', string_to_array('A|B', '|')) <> array_prepend('0', string_to_array('A|B', '|'))) IS TRUE
+           AND (array_prepend('1', string_to_array('A|B', '|')) = array_prepend('0', string_to_array('A|B', '|'))) IS NOT TRUE
+           AND (array_prepend('1', string_to_array('A|B', '|')) = array_prepend('0', string_to_array('A|B', '|'))) IS FALSE
+           AND (array_prepend('1', string_to_array('A|B', '|')) <> array_prepend('0', string_to_array('A|B', '|'))) IS NOT FALSE
+           AND array_prepend('1', string_to_array('A|B', '|')) BETWEEN array_prepend('0', string_to_array('A|B', '|')) AND array_prepend('2', string_to_array('A|B', '|'))
+           AND array_prepend('1', string_to_array('A|B', '|')) NOT BETWEEN array_prepend('1', string_to_array('A|B', '|')) AND array_prepend('0', string_to_array('A|B', '|'))
+           AND array_prepend('1', string_to_array('A|B', '|')) IN (array_prepend('0', string_to_array('A|B', '|')),
+                                                                   array_prepend('1', string_to_array('A|B', '|')),
+                                                                   array_prepend('2', string_to_array('A|B', '|')))
+           AND array_prepend('1', string_to_array('A|B', '|')) NOT IN (array_prepend('0', string_to_array('A|B', '|')),
+                                                                       array_prepend('2', string_to_array('A|B', '|'))))) ;
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM
+  (SELECT __time, number, client_ip,
+                          array_prepend('1', string_to_array('A|B', '|')),
+                          count(*)
+   FROM kttm_nested
+   WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+     AND (array_prepend('1', string_to_array('A|B', '|')) IS NULL
+          OR (array_prepend('1', string_to_array('A|B', '|')) = array_prepend('1', string_to_array('A|B', '|'))
+              AND array_prepend('1', string_to_array('A|B', '|')) IS NOT DISTINCT
+              FROM array_prepend('1', string_to_array('A|B', '|'))
+              AND array_prepend('1', string_to_array('A|B', '|')) <> array_prepend('0', string_to_array('A|B', '|'))
+              AND (array_prepend('1', string_to_array('A|B', '|')) IS DISTINCT
+                   FROM array_prepend('0', string_to_array('A|B', '|')))
+              AND array_prepend('1', string_to_array('A|B', '|')) > array_prepend('0', string_to_array('A|B', '|'))
+              AND array_prepend('1', string_to_array('A|B', '|')) >= array_prepend('0', string_to_array('A|B', '|'))
+              AND array_prepend('1', string_to_array('A|B', '|')) < array_prepend('2', string_to_array('A|B', '|'))
+              AND array_prepend('1', string_to_array('A|B', '|')) <= array_prepend('2', string_to_array('A|B', '|'))
+              AND (array_prepend('1', string_to_array('A|B', '|')) <> array_prepend('0', string_to_array('A|B', '|'))) IS TRUE
+              AND (array_prepend('1', string_to_array('A|B', '|')) = array_prepend('0', string_to_array('A|B', '|'))) IS NOT TRUE
+              AND (array_prepend('1', string_to_array('A|B', '|')) = array_prepend('0', string_to_array('A|B', '|'))) IS FALSE
+              AND (array_prepend('1', string_to_array('A|B', '|')) <> array_prepend('0', string_to_array('A|B', '|'))) IS NOT FALSE
+              AND array_prepend('1', string_to_array('A|B', '|')) BETWEEN array_prepend('0', string_to_array('A|B', '|')) AND array_prepend('2', string_to_array('A|B', '|'))
+              AND array_prepend('1', string_to_array('A|B', '|')) NOT BETWEEN array_prepend('1', string_to_array('A|B', '|')) AND array_prepend('0', string_to_array('A|B', '|'))
+              AND array_prepend('1', string_to_array('A|B', '|')) IN (array_prepend('0', string_to_array('A|B', '|')),
+                                                                      array_prepend('1', string_to_array('A|B', '|')),
+                                                                      array_prepend('2', string_to_array('A|B', '|')))
+              AND array_prepend('1', string_to_array('A|B', '|')) NOT IN (array_prepend('0', string_to_array('A|B', '|')),
+                                                                          array_prepend('2', string_to_array('A|B', '|')))))
+   GROUP BY 1,
+            2,
+            3,
+            4);
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+#-------------------------------------------------------------------------
+# TEST_ID: A16: array_to_mv
+#-------------------------------------------------------------------------
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND ('1'||mv_offset_of(array_to_mv(mv_to_array("language")), 0) IS NULL
+       OR ('1'||mv_offset_of(array_to_mv(mv_to_array("language")), 0) = 1||mv_offset_of(array_to_mv(mv_to_array("language")), 0)
+           AND '1'||mv_offset_of(array_to_mv(mv_to_array("language")), 0) IS NOT DISTINCT
+           FROM 1||mv_offset_of(array_to_mv(mv_to_array("language")), 0)
+           AND '1'||mv_offset_of(array_to_mv(mv_to_array("language")), 0) <> 0||mv_offset_of(array_to_mv(mv_to_array("language")), 0)
+           AND ('1'||mv_offset_of(array_to_mv(mv_to_array("language")), 0) IS DISTINCT
+                FROM 0||mv_offset_of(array_to_mv(mv_to_array("language")), 0))
+           AND '1'||mv_offset_of(array_to_mv(mv_to_array("language")), 0) > 0||mv_offset_of(array_to_mv(mv_to_array("language")), 0)
+           AND '1'||mv_offset_of(array_to_mv(mv_to_array("language")), 0) >= 0||mv_offset_of(array_to_mv(mv_to_array("language")), 0)
+           AND '1'||mv_offset_of(array_to_mv(mv_to_array("language")), 0) < 2||mv_offset_of(array_to_mv(mv_to_array("language")), 0)
+           AND '1'||mv_offset_of(array_to_mv(mv_to_array("language")), 0) <= 2||mv_offset_of(array_to_mv(mv_to_array("language")), 0)
+           AND ('1'||mv_offset_of(array_to_mv(mv_to_array("language")), 0) <> 0||mv_offset_of(array_to_mv(mv_to_array("language")), 0)) IS TRUE
+           AND ('1'||mv_offset_of(array_to_mv(mv_to_array("language")), 0) = 0||mv_offset_of(array_to_mv(mv_to_array("language")), 0)) IS NOT TRUE
+           AND ('1'||mv_offset_of(array_to_mv(mv_to_array("language")), 0) = 0||mv_offset_of(array_to_mv(mv_to_array("language")), 0)) IS FALSE
+           AND ('1'||mv_offset_of(array_to_mv(mv_to_array("language")), 0) <> 0||mv_offset_of(array_to_mv(mv_to_array("language")), 0)) IS NOT FALSE
+           AND '1'||mv_offset_of(array_to_mv(mv_to_array("language")), 0) BETWEEN 0||mv_offset_of(array_to_mv(mv_to_array("language")), 0) AND 2||mv_offset_of(array_to_mv(mv_to_array("language")), 0)
+           AND '1'||mv_offset_of(array_to_mv(mv_to_array("language")), 0) NOT BETWEEN '1'||mv_offset_of(array_to_mv(mv_to_array("language")), 0) AND 0||mv_offset_of(array_to_mv(mv_to_array("language")), 0)
+           AND '1'||mv_offset_of(array_to_mv(mv_to_array("language")), 0) like '%'
+           AND '1'||mv_offset_of(array_to_mv(mv_to_array("language")), 0) not like '__DOES_NOT_EXIST__%'
+           AND '1'||mv_offset_of(array_to_mv(mv_to_array("language")), 0) IN (0||mv_offset_of(array_to_mv(mv_to_array("language")), 0),
+                                                                              1||mv_offset_of(array_to_mv(mv_to_array("language")), 0),
+                                                                              2||mv_offset_of(array_to_mv(mv_to_array("language")), 0))
+           AND '1'||mv_offset_of(array_to_mv(mv_to_array("language")), 0) NOT IN (0||mv_offset_of(array_to_mv(mv_to_array("language")), 0),
+                                                                                  2||mv_offset_of(array_to_mv(mv_to_array("language")), 0)))) ;
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND ('1'||mv_offset_of(array_to_mv(mv_to_array("language")), 0) IS NULL
+       OR '1'||mv_offset_of(array_to_mv(mv_to_array("language")), 0) IN
+         (SELECT '1'||mv_offset_of(array_to_mv(mv_to_array("language")), 0)
+          FROM kttm_nested
+          WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+            AND ('1'||mv_offset_of(array_to_mv(mv_to_array("language")), 0) IS NULL
+                 OR ('1'||mv_offset_of(array_to_mv(mv_to_array("language")), 0) = 1||mv_offset_of(array_to_mv(mv_to_array("language")), 0)
+                     AND '1'||mv_offset_of(array_to_mv(mv_to_array("language")), 0) IS NOT DISTINCT
+                     FROM 1||mv_offset_of(array_to_mv(mv_to_array("language")), 0)
+                     AND '1'||mv_offset_of(array_to_mv(mv_to_array("language")), 0) <> 0||mv_offset_of(array_to_mv(mv_to_array("language")), 0)
+                     AND ('1'||mv_offset_of(array_to_mv(mv_to_array("language")), 0) IS DISTINCT
+                          FROM 0||mv_offset_of(array_to_mv(mv_to_array("language")), 0))
+                     AND '1'||mv_offset_of(array_to_mv(mv_to_array("language")), 0) > 0||mv_offset_of(array_to_mv(mv_to_array("language")), 0)
+                     AND '1'||mv_offset_of(array_to_mv(mv_to_array("language")), 0) >= 0||mv_offset_of(array_to_mv(mv_to_array("language")), 0)
+                     AND '1'||mv_offset_of(array_to_mv(mv_to_array("language")), 0) < 2||mv_offset_of(array_to_mv(mv_to_array("language")), 0)
+                     AND '1'||mv_offset_of(array_to_mv(mv_to_array("language")), 0) <= 2||mv_offset_of(array_to_mv(mv_to_array("language")), 0)
+                     AND ('1'||mv_offset_of(array_to_mv(mv_to_array("language")), 0) <> 0||mv_offset_of(array_to_mv(mv_to_array("language")), 0)) IS TRUE
+                     AND ('1'||mv_offset_of(array_to_mv(mv_to_array("language")), 0) = 0||mv_offset_of(array_to_mv(mv_to_array("language")), 0)) IS NOT TRUE
+                     AND ('1'||mv_offset_of(array_to_mv(mv_to_array("language")), 0) = 0||mv_offset_of(array_to_mv(mv_to_array("language")), 0)) IS FALSE
+                     AND ('1'||mv_offset_of(array_to_mv(mv_to_array("language")), 0) <> 0||mv_offset_of(array_to_mv(mv_to_array("language")), 0)) IS NOT FALSE
+                     AND '1'||mv_offset_of(array_to_mv(mv_to_array("language")), 0) BETWEEN 0||mv_offset_of(array_to_mv(mv_to_array("language")), 0) AND 2||mv_offset_of(array_to_mv(mv_to_array("language")), 0)
+                     AND '1'||mv_offset_of(array_to_mv(mv_to_array("language")), 0) NOT BETWEEN '1'||mv_offset_of(array_to_mv(mv_to_array("language")), 0) AND 0||mv_offset_of(array_to_mv(mv_to_array("language")), 0)
+                     AND '1'||mv_offset_of(array_to_mv(mv_to_array("language")), 0) like '%'
+                     AND '1'||mv_offset_of(array_to_mv(mv_to_array("language")), 0) not like '__DOES_NOT_EXIST__%'
+                     AND '1'||mv_offset_of(array_to_mv(mv_to_array("language")), 0) IN (0||mv_offset_of(array_to_mv(mv_to_array("language")), 0),
+                                                                                        1||mv_offset_of(array_to_mv(mv_to_array("language")), 0),
+                                                                                        2||mv_offset_of(array_to_mv(mv_to_array("language")), 0))
+                     AND '1'||mv_offset_of(array_to_mv(mv_to_array("language")), 0) NOT IN (0||mv_offset_of(array_to_mv(mv_to_array("language")), 0),
+                                                                                            2||mv_offset_of(array_to_mv(mv_to_array("language")), 0))))));
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM
+  (SELECT __time, number, client_ip,
+                          '1'||mv_offset_of(array_to_mv(mv_to_array("language")), 0),
+                          count(*)
+   FROM kttm_nested
+   WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+     AND ('1'||mv_offset_of(array_to_mv(mv_to_array("language")), 0) IS NULL
+          OR ('1'||mv_offset_of(array_to_mv(mv_to_array("language")), 0) = 1||mv_offset_of(array_to_mv(mv_to_array("language")), 0)
+              AND '1'||mv_offset_of(array_to_mv(mv_to_array("language")), 0) IS NOT DISTINCT
+              FROM 1||mv_offset_of(array_to_mv(mv_to_array("language")), 0)
+              AND '1'||mv_offset_of(array_to_mv(mv_to_array("language")), 0) <> 0||mv_offset_of(array_to_mv(mv_to_array("language")), 0)
+              AND ('1'||mv_offset_of(array_to_mv(mv_to_array("language")), 0) IS DISTINCT
+                   FROM 0||mv_offset_of(array_to_mv(mv_to_array("language")), 0))
+              AND '1'||mv_offset_of(array_to_mv(mv_to_array("language")), 0) > 0||mv_offset_of(array_to_mv(mv_to_array("language")), 0)
+              AND '1'||mv_offset_of(array_to_mv(mv_to_array("language")), 0) >= 0||mv_offset_of(array_to_mv(mv_to_array("language")), 0)
+              AND '1'||mv_offset_of(array_to_mv(mv_to_array("language")), 0) < 2||mv_offset_of(array_to_mv(mv_to_array("language")), 0)
+              AND '1'||mv_offset_of(array_to_mv(mv_to_array("language")), 0) <= 2||mv_offset_of(array_to_mv(mv_to_array("language")), 0)
+              AND ('1'||mv_offset_of(array_to_mv(mv_to_array("language")), 0) <> 0||mv_offset_of(array_to_mv(mv_to_array("language")), 0)) IS TRUE
+              AND ('1'||mv_offset_of(array_to_mv(mv_to_array("language")), 0) = 0||mv_offset_of(array_to_mv(mv_to_array("language")), 0)) IS NOT TRUE
+              AND ('1'||mv_offset_of(array_to_mv(mv_to_array("language")), 0) = 0||mv_offset_of(array_to_mv(mv_to_array("language")), 0)) IS FALSE
+              AND ('1'||mv_offset_of(array_to_mv(mv_to_array("language")), 0) <> 0||mv_offset_of(array_to_mv(mv_to_array("language")), 0)) IS NOT FALSE
+              AND '1'||mv_offset_of(array_to_mv(mv_to_array("language")), 0) BETWEEN 0||mv_offset_of(array_to_mv(mv_to_array("language")), 0) AND 2||mv_offset_of(array_to_mv(mv_to_array("language")), 0)
+              AND '1'||mv_offset_of(array_to_mv(mv_to_array("language")), 0) NOT BETWEEN '1'||mv_offset_of(array_to_mv(mv_to_array("language")), 0) AND 0||mv_offset_of(array_to_mv(mv_to_array("language")), 0)
+              AND '1'||mv_offset_of(array_to_mv(mv_to_array("language")), 0) like '%'
+              AND '1'||mv_offset_of(array_to_mv(mv_to_array("language")), 0) not like '__DOES_NOT_EXIST__%'
+              AND '1'||mv_offset_of(array_to_mv(mv_to_array("language")), 0) IN (0||mv_offset_of(array_to_mv(mv_to_array("language")), 0),
+                                                                                 1||mv_offset_of(array_to_mv(mv_to_array("language")), 0),
+                                                                                 2||mv_offset_of(array_to_mv(mv_to_array("language")), 0))
+              AND '1'||mv_offset_of(array_to_mv(mv_to_array("language")), 0) NOT IN (0||mv_offset_of(array_to_mv(mv_to_array("language")), 0),
+                                                                                     2||mv_offset_of(array_to_mv(mv_to_array("language")), 0))))
+   GROUP BY 1,
+            2,
+            3,
+            4);
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+#-------------------------------------------------------------------------
+# Total query count 43
+#-------------------------------------------------------------------------
diff --git a/quidem-ut/src/test/quidem/org.apache.druid.quidem.QTest/qaSQL_json.iq b/quidem-ut/src/test/quidem/org.apache.druid.quidem.QTest/qaSQL_json.iq
new file mode 100644
index 000000000000..c6deceeee5d7
--- /dev/null
+++ b/quidem-ut/src/test/quidem/org.apache.druid.quidem.QTest/qaSQL_json.iq
@@ -0,0 +1,1653 @@
+!set useApproximateCountDistinct false
+!use druidtest:///?componentSupplier=KttmNestedComponentSupplier
+!set outputformat mysql
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00';
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+#-------------------------------------------------------------------------
+# TEST_ID: A1: json_keys
+#-------------------------------------------------------------------------
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND (array_prepend('1', json_keys(agent, '$.')) IS NULL
+       OR (array_prepend('1', json_keys(agent, '$.')) = array_prepend('1', json_keys(agent, '$.'))
+           AND array_prepend('1', json_keys(agent, '$.')) IS NOT DISTINCT
+           FROM array_prepend('1', json_keys(agent, '$.'))
+           AND array_prepend('1', json_keys(agent, '$.')) <> array_prepend('0', json_keys(agent, '$.'))
+           AND (array_prepend('1', json_keys(agent, '$.')) IS DISTINCT
+                FROM array_prepend('0', json_keys(agent, '$.')))
+           AND array_prepend('1', json_keys(agent, '$.')) > array_prepend('0', json_keys(agent, '$.'))
+           AND array_prepend('1', json_keys(agent, '$.')) >= array_prepend('0', json_keys(agent, '$.'))
+           AND array_prepend('1', json_keys(agent, '$.')) < array_prepend('2', json_keys(agent, '$.'))
+           AND array_prepend('1', json_keys(agent, '$.')) <= array_prepend('2', json_keys(agent, '$.'))
+           AND (array_prepend('1', json_keys(agent, '$.')) <> array_prepend('0', json_keys(agent, '$.'))) IS TRUE
+           AND (array_prepend('1', json_keys(agent, '$.')) = array_prepend('0', json_keys(agent, '$.'))) IS NOT TRUE
+           AND (array_prepend('1', json_keys(agent, '$.')) = array_prepend('0', json_keys(agent, '$.'))) IS FALSE
+           AND (array_prepend('1', json_keys(agent, '$.')) <> array_prepend('0', json_keys(agent, '$.'))) IS NOT FALSE
+           AND array_prepend('1', json_keys(agent, '$.')) BETWEEN array_prepend('0', json_keys(agent, '$.')) AND array_prepend('2', json_keys(agent, '$.'))
+           AND array_prepend('1', json_keys(agent, '$.')) NOT BETWEEN array_prepend('1', json_keys(agent, '$.')) AND array_prepend('0', json_keys(agent, '$.'))
+           AND array_prepend('1', json_keys(agent, '$.')) IN (array_prepend('0', json_keys(agent, '$.')),
+                                                              array_prepend('1', json_keys(agent, '$.')),
+                                                              array_prepend('2', json_keys(agent, '$.')))
+           AND array_prepend('1', json_keys(agent, '$.')) NOT IN (array_prepend('0', json_keys(agent, '$.')),
+                                                                  array_prepend('2', json_keys(agent, '$.'))))) ;
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM
+  (SELECT __time, number, client_ip,
+                          array_prepend('1', json_keys(agent, '$.')),
+                          count(*)
+   FROM kttm_nested
+   WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+     AND (array_prepend('1', json_keys(agent, '$.')) IS NULL
+          OR (array_prepend('1', json_keys(agent, '$.')) = array_prepend('1', json_keys(agent, '$.'))
+              AND array_prepend('1', json_keys(agent, '$.')) IS NOT DISTINCT
+              FROM array_prepend('1', json_keys(agent, '$.'))
+              AND array_prepend('1', json_keys(agent, '$.')) <> array_prepend('0', json_keys(agent, '$.'))
+              AND (array_prepend('1', json_keys(agent, '$.')) IS DISTINCT
+                   FROM array_prepend('0', json_keys(agent, '$.')))
+              AND array_prepend('1', json_keys(agent, '$.')) > array_prepend('0', json_keys(agent, '$.'))
+              AND array_prepend('1', json_keys(agent, '$.')) >= array_prepend('0', json_keys(agent, '$.'))
+              AND array_prepend('1', json_keys(agent, '$.')) < array_prepend('2', json_keys(agent, '$.'))
+              AND array_prepend('1', json_keys(agent, '$.')) <= array_prepend('2', json_keys(agent, '$.'))
+              AND (array_prepend('1', json_keys(agent, '$.')) <> array_prepend('0', json_keys(agent, '$.'))) IS TRUE
+              AND (array_prepend('1', json_keys(agent, '$.')) = array_prepend('0', json_keys(agent, '$.'))) IS NOT TRUE
+              AND (array_prepend('1', json_keys(agent, '$.')) = array_prepend('0', json_keys(agent, '$.'))) IS FALSE
+              AND (array_prepend('1', json_keys(agent, '$.')) <> array_prepend('0', json_keys(agent, '$.'))) IS NOT FALSE
+              AND array_prepend('1', json_keys(agent, '$.')) BETWEEN array_prepend('0', json_keys(agent, '$.')) AND array_prepend('2', json_keys(agent, '$.'))
+              AND array_prepend('1', json_keys(agent, '$.')) NOT BETWEEN array_prepend('1', json_keys(agent, '$.')) AND array_prepend('0', json_keys(agent, '$.'))
+              AND array_prepend('1', json_keys(agent, '$.')) IN (array_prepend('0', json_keys(agent, '$.')),
+                                                                 array_prepend('1', json_keys(agent, '$.')),
+                                                                 array_prepend('2', json_keys(agent, '$.')))
+              AND array_prepend('1', json_keys(agent, '$.')) NOT IN (array_prepend('0', json_keys(agent, '$.')),
+                                                                     array_prepend('2', json_keys(agent, '$.')))))
+   GROUP BY 1,
+            2,
+            3,
+            4);
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+#-------------------------------------------------------------------------
+# TEST_ID: A2: json_object
+#-------------------------------------------------------------------------
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND ('1'||to_json_string(json_object(KEY 'c1' value number)) IS NULL
+       OR ('1'||to_json_string(json_object(KEY 'c1' value number)) = 1||to_json_string(json_object(KEY 'c1' value number))
+           AND '1'||to_json_string(json_object(KEY 'c1' value number)) IS NOT DISTINCT
+           FROM 1||to_json_string(json_object(KEY 'c1' value number))
+           AND '1'||to_json_string(json_object(KEY 'c1' value number)) <> '0'||to_json_string(json_object(KEY 'c1' value number))
+           AND ('1'||to_json_string(json_object(KEY 'c1' value number)) IS DISTINCT
+                FROM '0'||to_json_string(json_object(KEY 'c1' value number)))
+           AND '1'||to_json_string(json_object(KEY 'c1' value number)) > '0'||to_json_string(json_object(KEY 'c1' value number))
+           AND '1'||to_json_string(json_object(KEY 'c1' value number)) >= '0'||to_json_string(json_object(KEY 'c1' value number))
+           AND '1'||to_json_string(json_object(KEY 'c1' value number)) < 2||to_json_string(json_object(KEY 'c1' value number))
+           AND '1'||to_json_string(json_object(KEY 'c1' value number)) <= 2||to_json_string(json_object(KEY 'c1' value number))
+           AND ('1'||to_json_string(json_object(KEY 'c1' value number)) <> '0'||to_json_string(json_object(KEY 'c1' value number))) IS TRUE
+           AND ('1'||to_json_string(json_object(KEY 'c1' value number)) = '0'||to_json_string(json_object(KEY 'c1' value number))) IS NOT TRUE
+           AND ('1'||to_json_string(json_object(KEY 'c1' value number)) = '0'||to_json_string(json_object(KEY 'c1' value number))) IS FALSE
+           AND ('1'||to_json_string(json_object(KEY 'c1' value number)) <> '0'||to_json_string(json_object(KEY 'c1' value number))) IS NOT FALSE
+           AND '1'||to_json_string(json_object(KEY 'c1' value number)) BETWEEN '0'||to_json_string(json_object(KEY 'c1' value number)) AND 2||to_json_string(json_object(KEY 'c1' value number))
+           AND '1'||to_json_string(json_object(KEY 'c1' value number)) NOT BETWEEN '1'||to_json_string(json_object(KEY 'c1' value number)) AND '0'||to_json_string(json_object(KEY 'c1' value number))
+           AND '1'||to_json_string(json_object(KEY 'c1' value number)) like '%'
+           AND '1'||to_json_string(json_object(KEY 'c1' value number)) not like '__DOES_NOT_EXIST__%'
+           AND '1'||to_json_string(json_object(KEY 'c1' value number)) IN ('0'||to_json_string(json_object(KEY 'c1' value number)),
+                                                                           1||to_json_string(json_object(KEY 'c1' value number)),
+                                                                           2||to_json_string(json_object(KEY 'c1' value number)))
+           AND '1'||to_json_string(json_object(KEY 'c1' value number)) NOT IN ('0'||to_json_string(json_object(KEY 'c1' value number)),
+                                                                               2||to_json_string(json_object(KEY 'c1' value number))))) ;
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND ('1'||to_json_string(json_object(KEY 'c1' value number)) IS NULL
+       OR '1'||to_json_string(json_object(KEY 'c1' value number)) IN
+         (SELECT '1'||to_json_string(json_object(KEY 'c1' value number))
+          FROM kttm_nested
+          WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+            AND ('1'||to_json_string(json_object(KEY 'c1' value number)) IS NULL
+                 OR ('1'||to_json_string(json_object(KEY 'c1' value number)) = 1||to_json_string(json_object(KEY 'c1' value number))
+                     AND '1'||to_json_string(json_object(KEY 'c1' value number)) IS NOT DISTINCT
+                     FROM 1||to_json_string(json_object(KEY 'c1' value number))
+                     AND '1'||to_json_string(json_object(KEY 'c1' value number)) <> '0'||to_json_string(json_object(KEY 'c1' value number))
+                     AND ('1'||to_json_string(json_object(KEY 'c1' value number)) IS DISTINCT
+                          FROM '0'||to_json_string(json_object(KEY 'c1' value number)))
+                     AND '1'||to_json_string(json_object(KEY 'c1' value number)) > '0'||to_json_string(json_object(KEY 'c1' value number))
+                     AND '1'||to_json_string(json_object(KEY 'c1' value number)) >= '0'||to_json_string(json_object(KEY 'c1' value number))
+                     AND '1'||to_json_string(json_object(KEY 'c1' value number)) < 2||to_json_string(json_object(KEY 'c1' value number))
+                     AND '1'||to_json_string(json_object(KEY 'c1' value number)) <= 2||to_json_string(json_object(KEY 'c1' value number))
+                     AND ('1'||to_json_string(json_object(KEY 'c1' value number)) <> '0'||to_json_string(json_object(KEY 'c1' value number))) IS TRUE
+                     AND ('1'||to_json_string(json_object(KEY 'c1' value number)) = '0'||to_json_string(json_object(KEY 'c1' value number))) IS NOT TRUE
+                     AND ('1'||to_json_string(json_object(KEY 'c1' value number)) = '0'||to_json_string(json_object(KEY 'c1' value number))) IS FALSE
+                     AND ('1'||to_json_string(json_object(KEY 'c1' value number)) <> '0'||to_json_string(json_object(KEY 'c1' value number))) IS NOT FALSE
+                     AND '1'||to_json_string(json_object(KEY 'c1' value number)) BETWEEN '0'||to_json_string(json_object(KEY 'c1' value number)) AND 2||to_json_string(json_object(KEY 'c1' value number))
+                     AND '1'||to_json_string(json_object(KEY 'c1' value number)) NOT BETWEEN '1'||to_json_string(json_object(KEY 'c1' value number)) AND '0'||to_json_string(json_object(KEY 'c1' value number))
+                     AND '1'||to_json_string(json_object(KEY 'c1' value number)) like '%'
+                     AND '1'||to_json_string(json_object(KEY 'c1' value number)) not like '__DOES_NOT_EXIST__%'
+                     AND '1'||to_json_string(json_object(KEY 'c1' value number)) IN ('0'||to_json_string(json_object(KEY 'c1' value number)),
+                                                                                     1||to_json_string(json_object(KEY 'c1' value number)),
+                                                                                     2||to_json_string(json_object(KEY 'c1' value number)))
+                     AND '1'||to_json_string(json_object(KEY 'c1' value number)) NOT IN ('0'||to_json_string(json_object(KEY 'c1' value number)),
+                                                                                         2||to_json_string(json_object(KEY 'c1' value number)))))));
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM
+  (SELECT __time, number, client_ip,
+                          '1'||to_json_string(json_object(KEY 'c1' value number)),
+                          count(*)
+   FROM kttm_nested
+   WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+     AND ('1'||to_json_string(json_object(KEY 'c1' value number)) IS NULL
+          OR ('1'||to_json_string(json_object(KEY 'c1' value number)) = 1||to_json_string(json_object(KEY 'c1' value number))
+              AND '1'||to_json_string(json_object(KEY 'c1' value number)) IS NOT DISTINCT
+              FROM 1||to_json_string(json_object(KEY 'c1' value number))
+              AND '1'||to_json_string(json_object(KEY 'c1' value number)) <> '0'||to_json_string(json_object(KEY 'c1' value number))
+              AND ('1'||to_json_string(json_object(KEY 'c1' value number)) IS DISTINCT
+                   FROM '0'||to_json_string(json_object(KEY 'c1' value number)))
+              AND '1'||to_json_string(json_object(KEY 'c1' value number)) > '0'||to_json_string(json_object(KEY 'c1' value number))
+              AND '1'||to_json_string(json_object(KEY 'c1' value number)) >= '0'||to_json_string(json_object(KEY 'c1' value number))
+              AND '1'||to_json_string(json_object(KEY 'c1' value number)) < 2||to_json_string(json_object(KEY 'c1' value number))
+              AND '1'||to_json_string(json_object(KEY 'c1' value number)) <= 2||to_json_string(json_object(KEY 'c1' value number))
+              AND ('1'||to_json_string(json_object(KEY 'c1' value number)) <> '0'||to_json_string(json_object(KEY 'c1' value number))) IS TRUE
+              AND ('1'||to_json_string(json_object(KEY 'c1' value number)) = '0'||to_json_string(json_object(KEY 'c1' value number))) IS NOT TRUE
+              AND ('1'||to_json_string(json_object(KEY 'c1' value number)) = '0'||to_json_string(json_object(KEY 'c1' value number))) IS FALSE
+              AND ('1'||to_json_string(json_object(KEY 'c1' value number)) <> '0'||to_json_string(json_object(KEY 'c1' value number))) IS NOT FALSE
+              AND '1'||to_json_string(json_object(KEY 'c1' value number)) BETWEEN '0'||to_json_string(json_object(KEY 'c1' value number)) AND 2||to_json_string(json_object(KEY 'c1' value number))
+              AND '1'||to_json_string(json_object(KEY 'c1' value number)) NOT BETWEEN '1'||to_json_string(json_object(KEY 'c1' value number)) AND '0'||to_json_string(json_object(KEY 'c1' value number))
+              AND '1'||to_json_string(json_object(KEY 'c1' value number)) like '%'
+              AND '1'||to_json_string(json_object(KEY 'c1' value number)) not like '__DOES_NOT_EXIST__%'
+              AND '1'||to_json_string(json_object(KEY 'c1' value number)) IN ('0'||to_json_string(json_object(KEY 'c1' value number)),
+                                                                              1||to_json_string(json_object(KEY 'c1' value number)),
+                                                                              2||to_json_string(json_object(KEY 'c1' value number)))
+              AND '1'||to_json_string(json_object(KEY 'c1' value number)) NOT IN ('0'||to_json_string(json_object(KEY 'c1' value number)),
+                                                                                  2||to_json_string(json_object(KEY 'c1' value number)))))
+   GROUP BY 1,
+            2,
+            3,
+            4);
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+#-------------------------------------------------------------------------
+# TEST_ID: A3: json_paths
+#-------------------------------------------------------------------------
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND (array_prepend('1', json_paths(agent)) IS NULL
+       OR (array_prepend('1', json_paths(agent)) = array_prepend('1', json_paths(agent))
+           AND array_prepend('1', json_paths(agent)) IS NOT DISTINCT
+           FROM array_prepend('1', json_paths(agent))
+           AND array_prepend('1', json_paths(agent)) <> array_prepend('0', json_paths(agent))
+           AND (array_prepend('1', json_paths(agent)) IS DISTINCT
+                FROM array_prepend('0', json_paths(agent)))
+           AND array_prepend('1', json_paths(agent)) > array_prepend('0', json_paths(agent))
+           AND array_prepend('1', json_paths(agent)) >= array_prepend('0', json_paths(agent))
+           AND array_prepend('1', json_paths(agent)) < array_prepend('2', json_paths(agent))
+           AND array_prepend('1', json_paths(agent)) <= array_prepend('2', json_paths(agent))
+           AND (array_prepend('1', json_paths(agent)) <> array_prepend('0', json_paths(agent))) IS TRUE
+           AND (array_prepend('1', json_paths(agent)) = array_prepend('0', json_paths(agent))) IS NOT TRUE
+           AND (array_prepend('1', json_paths(agent)) = array_prepend('0', json_paths(agent))) IS FALSE
+           AND (array_prepend('1', json_paths(agent)) <> array_prepend('0', json_paths(agent))) IS NOT FALSE
+           AND array_prepend('1', json_paths(agent)) BETWEEN array_prepend('0', json_paths(agent)) AND array_prepend('2', json_paths(agent))
+           AND array_prepend('1', json_paths(agent)) NOT BETWEEN array_prepend('1', json_paths(agent)) AND array_prepend('0', json_paths(agent))
+           AND array_prepend('1', json_paths(agent)) IN (array_prepend('0', json_paths(agent)),
+                                                         array_prepend('1', json_paths(agent)),
+                                                         array_prepend('2', json_paths(agent)))
+           AND array_prepend('1', json_paths(agent)) NOT IN (array_prepend('0', json_paths(agent)),
+                                                             array_prepend('2', json_paths(agent))))) ;
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM
+  (SELECT __time, number, client_ip,
+                          array_prepend('1', json_paths(agent)),
+                          count(*)
+   FROM kttm_nested
+   WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+     AND (array_prepend('1', json_paths(agent)) IS NULL
+          OR (array_prepend('1', json_paths(agent)) = array_prepend('1', json_paths(agent))
+              AND array_prepend('1', json_paths(agent)) IS NOT DISTINCT
+              FROM array_prepend('1', json_paths(agent))
+              AND array_prepend('1', json_paths(agent)) <> array_prepend('0', json_paths(agent))
+              AND (array_prepend('1', json_paths(agent)) IS DISTINCT
+                   FROM array_prepend('0', json_paths(agent)))
+              AND array_prepend('1', json_paths(agent)) > array_prepend('0', json_paths(agent))
+              AND array_prepend('1', json_paths(agent)) >= array_prepend('0', json_paths(agent))
+              AND array_prepend('1', json_paths(agent)) < array_prepend('2', json_paths(agent))
+              AND array_prepend('1', json_paths(agent)) <= array_prepend('2', json_paths(agent))
+              AND (array_prepend('1', json_paths(agent)) <> array_prepend('0', json_paths(agent))) IS TRUE
+              AND (array_prepend('1', json_paths(agent)) = array_prepend('0', json_paths(agent))) IS NOT TRUE
+              AND (array_prepend('1', json_paths(agent)) = array_prepend('0', json_paths(agent))) IS FALSE
+              AND (array_prepend('1', json_paths(agent)) <> array_prepend('0', json_paths(agent))) IS NOT FALSE
+              AND array_prepend('1', json_paths(agent)) BETWEEN array_prepend('0', json_paths(agent)) AND array_prepend('2', json_paths(agent))
+              AND array_prepend('1', json_paths(agent)) NOT BETWEEN array_prepend('1', json_paths(agent)) AND array_prepend('0', json_paths(agent))
+              AND array_prepend('1', json_paths(agent)) IN (array_prepend('0', json_paths(agent)),
+                                                            array_prepend('1', json_paths(agent)),
+                                                            array_prepend('2', json_paths(agent)))
+              AND array_prepend('1', json_paths(agent)) NOT IN (array_prepend('0', json_paths(agent)),
+                                                                array_prepend('2', json_paths(agent)))))
+   GROUP BY 1,
+            2,
+            3,
+            4);
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+#-------------------------------------------------------------------------
+# TEST_ID: A4: json_query
+#-------------------------------------------------------------------------
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND ('1'||to_json_string(json_query(agent, '$.')) IS NULL
+       OR ('1'||to_json_string(json_query(agent, '$.')) = 1||to_json_string(json_query(agent, '$.'))
+           AND '1'||to_json_string(json_query(agent, '$.')) IS NOT DISTINCT
+           FROM 1||to_json_string(json_query(agent, '$.'))
+           AND '1'||to_json_string(json_query(agent, '$.')) <> '0'||to_json_string(json_query(agent, '$.'))
+           AND ('1'||to_json_string(json_query(agent, '$.')) IS DISTINCT
+                FROM '0'||to_json_string(json_query(agent, '$.')))
+           AND '1'||to_json_string(json_query(agent, '$.')) > '0'||to_json_string(json_query(agent, '$.'))
+           AND '1'||to_json_string(json_query(agent, '$.')) >= '0'||to_json_string(json_query(agent, '$.'))
+           AND '1'||to_json_string(json_query(agent, '$.')) < 2||to_json_string(json_query(agent, '$.'))
+           AND '1'||to_json_string(json_query(agent, '$.')) <= 2||to_json_string(json_query(agent, '$.'))
+           AND ('1'||to_json_string(json_query(agent, '$.')) <> '0'||to_json_string(json_query(agent, '$.'))) IS TRUE
+           AND ('1'||to_json_string(json_query(agent, '$.')) = '0'||to_json_string(json_query(agent, '$.'))) IS NOT TRUE
+           AND ('1'||to_json_string(json_query(agent, '$.')) = '0'||to_json_string(json_query(agent, '$.'))) IS FALSE
+           AND ('1'||to_json_string(json_query(agent, '$.')) <> '0'||to_json_string(json_query(agent, '$.'))) IS NOT FALSE
+           AND '1'||to_json_string(json_query(agent, '$.')) BETWEEN '0'||to_json_string(json_query(agent, '$.')) AND 2||to_json_string(json_query(agent, '$.'))
+           AND '1'||to_json_string(json_query(agent, '$.')) NOT BETWEEN '1'||to_json_string(json_query(agent, '$.')) AND '0'||to_json_string(json_query(agent, '$.'))
+           AND '1'||to_json_string(json_query(agent, '$.')) like '%'
+           AND '1'||to_json_string(json_query(agent, '$.')) not like '__DOES_NOT_EXIST__%'
+           AND '1'||to_json_string(json_query(agent, '$.')) IN ('0'||to_json_string(json_query(agent, '$.')),
+                                                                1||to_json_string(json_query(agent, '$.')),
+                                                                2||to_json_string(json_query(agent, '$.')))
+           AND '1'||to_json_string(json_query(agent, '$.')) NOT IN ('0'||to_json_string(json_query(agent, '$.')),
+                                                                    2||to_json_string(json_query(agent, '$.'))))) ;
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND ('1'||to_json_string(json_query(agent, '$.')) IS NULL
+       OR '1'||to_json_string(json_query(agent, '$.')) IN
+         (SELECT '1'||to_json_string(json_query(agent, '$.'))
+          FROM kttm_nested
+          WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+            AND ('1'||to_json_string(json_query(agent, '$.')) IS NULL
+                 OR ('1'||to_json_string(json_query(agent, '$.')) = 1||to_json_string(json_query(agent, '$.'))
+                     AND '1'||to_json_string(json_query(agent, '$.')) IS NOT DISTINCT
+                     FROM 1||to_json_string(json_query(agent, '$.'))
+                     AND '1'||to_json_string(json_query(agent, '$.')) <> '0'||to_json_string(json_query(agent, '$.'))
+                     AND ('1'||to_json_string(json_query(agent, '$.')) IS DISTINCT
+                          FROM '0'||to_json_string(json_query(agent, '$.')))
+                     AND '1'||to_json_string(json_query(agent, '$.')) > '0'||to_json_string(json_query(agent, '$.'))
+                     AND '1'||to_json_string(json_query(agent, '$.')) >= '0'||to_json_string(json_query(agent, '$.'))
+                     AND '1'||to_json_string(json_query(agent, '$.')) < 2||to_json_string(json_query(agent, '$.'))
+                     AND '1'||to_json_string(json_query(agent, '$.')) <= 2||to_json_string(json_query(agent, '$.'))
+                     AND ('1'||to_json_string(json_query(agent, '$.')) <> '0'||to_json_string(json_query(agent, '$.'))) IS TRUE
+                     AND ('1'||to_json_string(json_query(agent, '$.')) = '0'||to_json_string(json_query(agent, '$.'))) IS NOT TRUE
+                     AND ('1'||to_json_string(json_query(agent, '$.')) = '0'||to_json_string(json_query(agent, '$.'))) IS FALSE
+                     AND ('1'||to_json_string(json_query(agent, '$.')) <> '0'||to_json_string(json_query(agent, '$.'))) IS NOT FALSE
+                     AND '1'||to_json_string(json_query(agent, '$.')) BETWEEN '0'||to_json_string(json_query(agent, '$.')) AND 2||to_json_string(json_query(agent, '$.'))
+                     AND '1'||to_json_string(json_query(agent, '$.')) NOT BETWEEN '1'||to_json_string(json_query(agent, '$.')) AND '0'||to_json_string(json_query(agent, '$.'))
+                     AND '1'||to_json_string(json_query(agent, '$.')) like '%'
+                     AND '1'||to_json_string(json_query(agent, '$.')) not like '__DOES_NOT_EXIST__%'
+                     AND '1'||to_json_string(json_query(agent, '$.')) IN ('0'||to_json_string(json_query(agent, '$.')),
+                                                                          1||to_json_string(json_query(agent, '$.')),
+                                                                          2||to_json_string(json_query(agent, '$.')))
+                     AND '1'||to_json_string(json_query(agent, '$.')) NOT IN ('0'||to_json_string(json_query(agent, '$.')),
+                                                                              2||to_json_string(json_query(agent, '$.')))))));
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM
+  (SELECT __time, number, client_ip,
+                          '1'||to_json_string(json_query(agent, '$.')),
+                          count(*)
+   FROM kttm_nested
+   WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+     AND ('1'||to_json_string(json_query(agent, '$.')) IS NULL
+          OR ('1'||to_json_string(json_query(agent, '$.')) = 1||to_json_string(json_query(agent, '$.'))
+              AND '1'||to_json_string(json_query(agent, '$.')) IS NOT DISTINCT
+              FROM 1||to_json_string(json_query(agent, '$.'))
+              AND '1'||to_json_string(json_query(agent, '$.')) <> '0'||to_json_string(json_query(agent, '$.'))
+              AND ('1'||to_json_string(json_query(agent, '$.')) IS DISTINCT
+                   FROM '0'||to_json_string(json_query(agent, '$.')))
+              AND '1'||to_json_string(json_query(agent, '$.')) > '0'||to_json_string(json_query(agent, '$.'))
+              AND '1'||to_json_string(json_query(agent, '$.')) >= '0'||to_json_string(json_query(agent, '$.'))
+              AND '1'||to_json_string(json_query(agent, '$.')) < 2||to_json_string(json_query(agent, '$.'))
+              AND '1'||to_json_string(json_query(agent, '$.')) <= 2||to_json_string(json_query(agent, '$.'))
+              AND ('1'||to_json_string(json_query(agent, '$.')) <> '0'||to_json_string(json_query(agent, '$.'))) IS TRUE
+              AND ('1'||to_json_string(json_query(agent, '$.')) = '0'||to_json_string(json_query(agent, '$.'))) IS NOT TRUE
+              AND ('1'||to_json_string(json_query(agent, '$.')) = '0'||to_json_string(json_query(agent, '$.'))) IS FALSE
+              AND ('1'||to_json_string(json_query(agent, '$.')) <> '0'||to_json_string(json_query(agent, '$.'))) IS NOT FALSE
+              AND '1'||to_json_string(json_query(agent, '$.')) BETWEEN '0'||to_json_string(json_query(agent, '$.')) AND 2||to_json_string(json_query(agent, '$.'))
+              AND '1'||to_json_string(json_query(agent, '$.')) NOT BETWEEN '1'||to_json_string(json_query(agent, '$.')) AND '0'||to_json_string(json_query(agent, '$.'))
+              AND '1'||to_json_string(json_query(agent, '$.')) like '%'
+              AND '1'||to_json_string(json_query(agent, '$.')) not like '__DOES_NOT_EXIST__%'
+              AND '1'||to_json_string(json_query(agent, '$.')) IN ('0'||to_json_string(json_query(agent, '$.')),
+                                                                   1||to_json_string(json_query(agent, '$.')),
+                                                                   2||to_json_string(json_query(agent, '$.')))
+              AND '1'||to_json_string(json_query(agent, '$.')) NOT IN ('0'||to_json_string(json_query(agent, '$.')),
+                                                                       2||to_json_string(json_query(agent, '$.')))))
+   GROUP BY 1,
+            2,
+            3,
+            4);
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+#-------------------------------------------------------------------------
+# TEST_ID: A5: json_query_array
+#-------------------------------------------------------------------------
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND ('1'||to_json_string(json_query_array(array[client_ip, server_ip], '$.')) IS NULL
+       OR ('1'||to_json_string(json_query_array(array[client_ip, server_ip], '$.')) = 1||to_json_string(json_query_array(array[client_ip, server_ip], '$.'))
+           AND '1'||to_json_string(json_query_array(array[client_ip, server_ip], '$.')) IS NOT DISTINCT
+           FROM 1||to_json_string(json_query_array(array[client_ip, server_ip], '$.'))
+           AND '1'||to_json_string(json_query_array(array[client_ip, server_ip], '$.')) <> '0'||to_json_string(json_query_array(array[client_ip, server_ip], '$.'))
+           AND ('1'||to_json_string(json_query_array(array[client_ip, server_ip], '$.')) IS DISTINCT
+                FROM '0'||to_json_string(json_query_array(array[client_ip, server_ip], '$.')))
+           AND '1'||to_json_string(json_query_array(array[client_ip, server_ip], '$.')) > '0'||to_json_string(json_query_array(array[client_ip, server_ip], '$.'))
+           AND '1'||to_json_string(json_query_array(array[client_ip, server_ip], '$.')) >= '0'||to_json_string(json_query_array(array[client_ip, server_ip], '$.'))
+           AND '1'||to_json_string(json_query_array(array[client_ip, server_ip], '$.')) < 2||to_json_string(json_query_array(array[client_ip, server_ip], '$.'))
+           AND '1'||to_json_string(json_query_array(array[client_ip, server_ip], '$.')) <= 2||to_json_string(json_query_array(array[client_ip, server_ip], '$.'))
+           AND ('1'||to_json_string(json_query_array(array[client_ip, server_ip], '$.')) <> '0'||to_json_string(json_query_array(array[client_ip, server_ip], '$.'))) IS TRUE
+           AND ('1'||to_json_string(json_query_array(array[client_ip, server_ip], '$.')) = '0'||to_json_string(json_query_array(array[client_ip, server_ip], '$.'))) IS NOT TRUE
+           AND ('1'||to_json_string(json_query_array(array[client_ip, server_ip], '$.')) = '0'||to_json_string(json_query_array(array[client_ip, server_ip], '$.'))) IS FALSE
+           AND ('1'||to_json_string(json_query_array(array[client_ip, server_ip], '$.')) <> '0'||to_json_string(json_query_array(array[client_ip, server_ip], '$.'))) IS NOT FALSE
+           AND '1'||to_json_string(json_query_array(array[client_ip, server_ip], '$.')) BETWEEN '0'||to_json_string(json_query_array(array[client_ip, server_ip], '$.')) AND 2||to_json_string(json_query_array(array[client_ip, server_ip], '$.'))
+           AND '1'||to_json_string(json_query_array(array[client_ip, server_ip], '$.')) NOT BETWEEN '1'||to_json_string(json_query_array(array[client_ip, server_ip], '$.')) AND '0'||to_json_string(json_query_array(array[client_ip, server_ip], '$.'))
+           AND '1'||to_json_string(json_query_array(array[client_ip, server_ip], '$.')) like '%'
+           AND '1'||to_json_string(json_query_array(array[client_ip, server_ip], '$.')) not like '__DOES_NOT_EXIST__%'
+           AND '1'||to_json_string(json_query_array(array[client_ip, server_ip], '$.')) IN ('0'||to_json_string(json_query_array(array[client_ip, server_ip], '$.')),
+                                                                                            1||to_json_string(json_query_array(array[client_ip, server_ip], '$.')),
+                                                                                            2||to_json_string(json_query_array(array[client_ip, server_ip], '$.')))
+           AND '1'||to_json_string(json_query_array(array[client_ip, server_ip], '$.')) NOT IN ('0'||to_json_string(json_query_array(array[client_ip, server_ip], '$.')),
+                                                                                                2||to_json_string(json_query_array(array[client_ip, server_ip], '$.'))))) ;
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND ('1'||to_json_string(json_query_array(array[client_ip, server_ip], '$.')) IS NULL
+       OR '1'||to_json_string(json_query_array(array[client_ip, server_ip], '$.')) IN
+         (SELECT '1'||to_json_string(json_query_array(array[client_ip, server_ip], '$.'))
+          FROM kttm_nested
+          WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+            AND ('1'||to_json_string(json_query_array(array[client_ip, server_ip], '$.')) IS NULL
+                 OR ('1'||to_json_string(json_query_array(array[client_ip, server_ip], '$.')) = 1||to_json_string(json_query_array(array[client_ip, server_ip], '$.'))
+                     AND '1'||to_json_string(json_query_array(array[client_ip, server_ip], '$.')) IS NOT DISTINCT
+                     FROM 1||to_json_string(json_query_array(array[client_ip, server_ip], '$.'))
+                     AND '1'||to_json_string(json_query_array(array[client_ip, server_ip], '$.')) <> '0'||to_json_string(json_query_array(array[client_ip, server_ip], '$.'))
+                     AND ('1'||to_json_string(json_query_array(array[client_ip, server_ip], '$.')) IS DISTINCT
+                          FROM '0'||to_json_string(json_query_array(array[client_ip, server_ip], '$.')))
+                     AND '1'||to_json_string(json_query_array(array[client_ip, server_ip], '$.')) > '0'||to_json_string(json_query_array(array[client_ip, server_ip], '$.'))
+                     AND '1'||to_json_string(json_query_array(array[client_ip, server_ip], '$.')) >= '0'||to_json_string(json_query_array(array[client_ip, server_ip], '$.'))
+                     AND '1'||to_json_string(json_query_array(array[client_ip, server_ip], '$.')) < 2||to_json_string(json_query_array(array[client_ip, server_ip], '$.'))
+                     AND '1'||to_json_string(json_query_array(array[client_ip, server_ip], '$.')) <= 2||to_json_string(json_query_array(array[client_ip, server_ip], '$.'))
+                     AND ('1'||to_json_string(json_query_array(array[client_ip, server_ip], '$.')) <> '0'||to_json_string(json_query_array(array[client_ip, server_ip], '$.'))) IS TRUE
+                     AND ('1'||to_json_string(json_query_array(array[client_ip, server_ip], '$.')) = '0'||to_json_string(json_query_array(array[client_ip, server_ip], '$.'))) IS NOT TRUE
+                     AND ('1'||to_json_string(json_query_array(array[client_ip, server_ip], '$.')) = '0'||to_json_string(json_query_array(array[client_ip, server_ip], '$.'))) IS FALSE
+                     AND ('1'||to_json_string(json_query_array(array[client_ip, server_ip], '$.')) <> '0'||to_json_string(json_query_array(array[client_ip, server_ip], '$.'))) IS NOT FALSE
+                     AND '1'||to_json_string(json_query_array(array[client_ip, server_ip], '$.')) BETWEEN '0'||to_json_string(json_query_array(array[client_ip, server_ip], '$.')) AND 2||to_json_string(json_query_array(array[client_ip, server_ip], '$.'))
+                     AND '1'||to_json_string(json_query_array(array[client_ip, server_ip], '$.')) NOT BETWEEN '1'||to_json_string(json_query_array(array[client_ip, server_ip], '$.')) AND '0'||to_json_string(json_query_array(array[client_ip, server_ip], '$.'))
+                     AND '1'||to_json_string(json_query_array(array[client_ip, server_ip], '$.')) like '%'
+                     AND '1'||to_json_string(json_query_array(array[client_ip, server_ip], '$.')) not like '__DOES_NOT_EXIST__%'
+                     AND '1'||to_json_string(json_query_array(array[client_ip, server_ip], '$.')) IN ('0'||to_json_string(json_query_array(array[client_ip, server_ip], '$.')),
+                                                                                                      1||to_json_string(json_query_array(array[client_ip, server_ip], '$.')),
+                                                                                                      2||to_json_string(json_query_array(array[client_ip, server_ip], '$.')))
+                     AND '1'||to_json_string(json_query_array(array[client_ip, server_ip], '$.')) NOT IN ('0'||to_json_string(json_query_array(array[client_ip, server_ip], '$.')),
+                                                                                                          2||to_json_string(json_query_array(array[client_ip, server_ip], '$.')))))));
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM
+  (SELECT __time, number, client_ip,
+                          '1'||to_json_string(json_query_array(array[client_ip, server_ip], '$.')),
+                          count(*)
+   FROM kttm_nested
+   WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+     AND ('1'||to_json_string(json_query_array(array[client_ip, server_ip], '$.')) IS NULL
+          OR ('1'||to_json_string(json_query_array(array[client_ip, server_ip], '$.')) = 1||to_json_string(json_query_array(array[client_ip, server_ip], '$.'))
+              AND '1'||to_json_string(json_query_array(array[client_ip, server_ip], '$.')) IS NOT DISTINCT
+              FROM 1||to_json_string(json_query_array(array[client_ip, server_ip], '$.'))
+              AND '1'||to_json_string(json_query_array(array[client_ip, server_ip], '$.')) <> '0'||to_json_string(json_query_array(array[client_ip, server_ip], '$.'))
+              AND ('1'||to_json_string(json_query_array(array[client_ip, server_ip], '$.')) IS DISTINCT
+                   FROM '0'||to_json_string(json_query_array(array[client_ip, server_ip], '$.')))
+              AND '1'||to_json_string(json_query_array(array[client_ip, server_ip], '$.')) > '0'||to_json_string(json_query_array(array[client_ip, server_ip], '$.'))
+              AND '1'||to_json_string(json_query_array(array[client_ip, server_ip], '$.')) >= '0'||to_json_string(json_query_array(array[client_ip, server_ip], '$.'))
+              AND '1'||to_json_string(json_query_array(array[client_ip, server_ip], '$.')) < 2||to_json_string(json_query_array(array[client_ip, server_ip], '$.'))
+              AND '1'||to_json_string(json_query_array(array[client_ip, server_ip], '$.')) <= 2||to_json_string(json_query_array(array[client_ip, server_ip], '$.'))
+              AND ('1'||to_json_string(json_query_array(array[client_ip, server_ip], '$.')) <> '0'||to_json_string(json_query_array(array[client_ip, server_ip], '$.'))) IS TRUE
+              AND ('1'||to_json_string(json_query_array(array[client_ip, server_ip], '$.')) = '0'||to_json_string(json_query_array(array[client_ip, server_ip], '$.'))) IS NOT TRUE
+              AND ('1'||to_json_string(json_query_array(array[client_ip, server_ip], '$.')) = '0'||to_json_string(json_query_array(array[client_ip, server_ip], '$.'))) IS FALSE
+              AND ('1'||to_json_string(json_query_array(array[client_ip, server_ip], '$.')) <> '0'||to_json_string(json_query_array(array[client_ip, server_ip], '$.'))) IS NOT FALSE
+              AND '1'||to_json_string(json_query_array(array[client_ip, server_ip], '$.')) BETWEEN '0'||to_json_string(json_query_array(array[client_ip, server_ip], '$.')) AND 2||to_json_string(json_query_array(array[client_ip, server_ip], '$.'))
+              AND '1'||to_json_string(json_query_array(array[client_ip, server_ip], '$.')) NOT BETWEEN '1'||to_json_string(json_query_array(array[client_ip, server_ip], '$.')) AND '0'||to_json_string(json_query_array(array[client_ip, server_ip], '$.'))
+              AND '1'||to_json_string(json_query_array(array[client_ip, server_ip], '$.')) like '%'
+              AND '1'||to_json_string(json_query_array(array[client_ip, server_ip], '$.')) not like '__DOES_NOT_EXIST__%'
+              AND '1'||to_json_string(json_query_array(array[client_ip, server_ip], '$.')) IN ('0'||to_json_string(json_query_array(array[client_ip, server_ip], '$.')),
+                                                                                               1||to_json_string(json_query_array(array[client_ip, server_ip], '$.')),
+                                                                                               2||to_json_string(json_query_array(array[client_ip, server_ip], '$.')))
+              AND '1'||to_json_string(json_query_array(array[client_ip, server_ip], '$.')) NOT IN ('0'||to_json_string(json_query_array(array[client_ip, server_ip], '$.')),
+                                                                                                   2||to_json_string(json_query_array(array[client_ip, server_ip], '$.')))))
+   GROUP BY 1,
+            2,
+            3,
+            4);
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+#-------------------------------------------------------------------------
+# TEST_ID: A6: json_value
+#-------------------------------------------------------------------------
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND (('1'||json_value(agent, '$.type')) IS NULL
+       OR (('1'||json_value(agent, '$.type')) = (1||json_value(agent, '$.type'))
+           AND ('1'||json_value(agent, '$.type')) IS NOT DISTINCT
+           FROM (1||json_value(agent, '$.type'))
+           AND ('1'||json_value(agent, '$.type')) <> ('0'||json_value(agent, '$.type'))
+           AND (('1'||json_value(agent, '$.type')) IS DISTINCT
+                FROM ('0'||json_value(agent, '$.type')))
+           AND ('1'||json_value(agent, '$.type')) > ('0'||json_value(agent, '$.type'))
+           AND ('1'||json_value(agent, '$.type')) >= ('0'||json_value(agent, '$.type'))
+           AND ('1'||json_value(agent, '$.type')) < (2||json_value(agent, '$.type'))
+           AND ('1'||json_value(agent, '$.type')) <= (2||json_value(agent, '$.type'))
+           AND (('1'||json_value(agent, '$.type')) <> ('0'||json_value(agent, '$.type'))) IS TRUE
+           AND (('1'||json_value(agent, '$.type')) = ('0'||json_value(agent, '$.type'))) IS NOT TRUE
+           AND (('1'||json_value(agent, '$.type')) = ('0'||json_value(agent, '$.type'))) IS FALSE
+           AND (('1'||json_value(agent, '$.type')) <> ('0'||json_value(agent, '$.type'))) IS NOT FALSE
+           AND ('1'||json_value(agent, '$.type')) BETWEEN ('0'||json_value(agent, '$.type')) AND (2||json_value(agent, '$.type'))
+           AND ('1'||json_value(agent, '$.type')) NOT BETWEEN ('1'||json_value(agent, '$.type')) AND ('0'||json_value(agent, '$.type'))
+           AND ('1'||json_value(agent, '$.type')) like '%'
+           AND ('1'||json_value(agent, '$.type')) not like '__DOES_NOT_EXIST__%'
+           AND ('1'||json_value(agent, '$.type')) IN (('0'||json_value(agent, '$.type')), (1||json_value(agent, '$.type')), (2||json_value(agent, '$.type')))
+           AND ('1'||json_value(agent, '$.type')) NOT IN (('0'||json_value(agent, '$.type')), (2||json_value(agent, '$.type'))))) ;
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND (('1'||json_value(agent, '$.type')) IS NULL
+       OR ('1'||json_value(agent, '$.type')) IN
+         (SELECT ('1'||json_value(agent, '$.type'))
+          FROM kttm_nested
+          WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+            AND (('1'||json_value(agent, '$.type')) IS NULL
+                 OR (('1'||json_value(agent, '$.type')) = (1||json_value(agent, '$.type'))
+                     AND ('1'||json_value(agent, '$.type')) IS NOT DISTINCT
+                     FROM (1||json_value(agent, '$.type'))
+                     AND ('1'||json_value(agent, '$.type')) <> ('0'||json_value(agent, '$.type'))
+                     AND (('1'||json_value(agent, '$.type')) IS DISTINCT
+                          FROM ('0'||json_value(agent, '$.type')))
+                     AND ('1'||json_value(agent, '$.type')) > ('0'||json_value(agent, '$.type'))
+                     AND ('1'||json_value(agent, '$.type')) >= ('0'||json_value(agent, '$.type'))
+                     AND ('1'||json_value(agent, '$.type')) < (2||json_value(agent, '$.type'))
+                     AND ('1'||json_value(agent, '$.type')) <= (2||json_value(agent, '$.type'))
+                     AND (('1'||json_value(agent, '$.type')) <> ('0'||json_value(agent, '$.type'))) IS TRUE
+                     AND (('1'||json_value(agent, '$.type')) = ('0'||json_value(agent, '$.type'))) IS NOT TRUE
+                     AND (('1'||json_value(agent, '$.type')) = ('0'||json_value(agent, '$.type'))) IS FALSE
+                     AND (('1'||json_value(agent, '$.type')) <> ('0'||json_value(agent, '$.type'))) IS NOT FALSE
+                     AND ('1'||json_value(agent, '$.type')) BETWEEN ('0'||json_value(agent, '$.type')) AND (2||json_value(agent, '$.type'))
+                     AND ('1'||json_value(agent, '$.type')) NOT BETWEEN ('1'||json_value(agent, '$.type')) AND ('0'||json_value(agent, '$.type'))
+                     AND ('1'||json_value(agent, '$.type')) like '%'
+                     AND ('1'||json_value(agent, '$.type')) not like '__DOES_NOT_EXIST__%'
+                     AND ('1'||json_value(agent, '$.type')) IN (('0'||json_value(agent, '$.type')), (1||json_value(agent, '$.type')), (2||json_value(agent, '$.type')))
+                     AND ('1'||json_value(agent, '$.type')) NOT IN (('0'||json_value(agent, '$.type')), (2||json_value(agent, '$.type')))))));
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM
+  (SELECT __time, number, client_ip, ('1'||json_value(agent, '$.type')), count(*)
+   FROM kttm_nested
+   WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+     AND (('1'||json_value(agent, '$.type')) IS NULL
+          OR (('1'||json_value(agent, '$.type')) = (1||json_value(agent, '$.type'))
+              AND ('1'||json_value(agent, '$.type')) IS NOT DISTINCT
+              FROM (1||json_value(agent, '$.type'))
+              AND ('1'||json_value(agent, '$.type')) <> ('0'||json_value(agent, '$.type'))
+              AND (('1'||json_value(agent, '$.type')) IS DISTINCT
+                   FROM ('0'||json_value(agent, '$.type')))
+              AND ('1'||json_value(agent, '$.type')) > ('0'||json_value(agent, '$.type'))
+              AND ('1'||json_value(agent, '$.type')) >= ('0'||json_value(agent, '$.type'))
+              AND ('1'||json_value(agent, '$.type')) < (2||json_value(agent, '$.type'))
+              AND ('1'||json_value(agent, '$.type')) <= (2||json_value(agent, '$.type'))
+              AND (('1'||json_value(agent, '$.type')) <> ('0'||json_value(agent, '$.type'))) IS TRUE
+              AND (('1'||json_value(agent, '$.type')) = ('0'||json_value(agent, '$.type'))) IS NOT TRUE
+              AND (('1'||json_value(agent, '$.type')) = ('0'||json_value(agent, '$.type'))) IS FALSE
+              AND (('1'||json_value(agent, '$.type')) <> ('0'||json_value(agent, '$.type'))) IS NOT FALSE
+              AND ('1'||json_value(agent, '$.type')) BETWEEN ('0'||json_value(agent, '$.type')) AND (2||json_value(agent, '$.type'))
+              AND ('1'||json_value(agent, '$.type')) NOT BETWEEN ('1'||json_value(agent, '$.type')) AND ('0'||json_value(agent, '$.type'))
+              AND ('1'||json_value(agent, '$.type')) like '%'
+              AND ('1'||json_value(agent, '$.type')) not like '__DOES_NOT_EXIST__%'
+              AND ('1'||json_value(agent, '$.type')) IN (('0'||json_value(agent, '$.type')), (1||json_value(agent, '$.type')), (2||json_value(agent, '$.type')))
+              AND ('1'||json_value(agent, '$.type')) NOT IN (('0'||json_value(agent, '$.type')), (2||json_value(agent, '$.type')))))
+   GROUP BY 1,
+            2,
+            3,
+            4);
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+#-------------------------------------------------------------------------
+# TEST_ID: A7: json_value_returning_char
+#-------------------------------------------------------------------------
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND ('1'||json_value(event, '$.percentage' RETURNING char) IS NULL
+       OR ('1'||json_value(event, '$.percentage' RETURNING char) = 1||json_value(event, '$.percentage' RETURNING char)
+           AND '1'||json_value(event, '$.percentage' RETURNING char) IS NOT DISTINCT
+           FROM 1||json_value(event, '$.percentage' RETURNING char)
+           AND '1'||json_value(event, '$.percentage' RETURNING char) <> '0'||json_value(event, '$.percentage' RETURNING char)
+           AND ('1'||json_value(event, '$.percentage' RETURNING char) IS DISTINCT
+                FROM '0'||json_value(event, '$.percentage' RETURNING char))
+           AND '1'||json_value(event, '$.percentage' RETURNING char) > '0'||json_value(event, '$.percentage' RETURNING char)
+           AND '1'||json_value(event, '$.percentage' RETURNING char) >= '0'||json_value(event, '$.percentage' RETURNING char)
+           AND '1'||json_value(event, '$.percentage' RETURNING char) < 2||json_value(event, '$.percentage' RETURNING char)
+           AND '1'||json_value(event, '$.percentage' RETURNING char) <= 2||json_value(event, '$.percentage' RETURNING char)
+           AND ('1'||json_value(event, '$.percentage' RETURNING char) <> '0'||json_value(event, '$.percentage' RETURNING char)) IS TRUE
+           AND ('1'||json_value(event, '$.percentage' RETURNING char) = '0'||json_value(event, '$.percentage' RETURNING char)) IS NOT TRUE
+           AND ('1'||json_value(event, '$.percentage' RETURNING char) = '0'||json_value(event, '$.percentage' RETURNING char)) IS FALSE
+           AND ('1'||json_value(event, '$.percentage' RETURNING char) <> '0'||json_value(event, '$.percentage' RETURNING char)) IS NOT FALSE
+           AND '1'||json_value(event, '$.percentage' RETURNING char) BETWEEN '0'||json_value(event, '$.percentage' RETURNING char) AND 2||json_value(event, '$.percentage' RETURNING char)
+           AND '1'||json_value(event, '$.percentage' RETURNING char) NOT BETWEEN '1'||json_value(event, '$.percentage' RETURNING char) AND '0'||json_value(event, '$.percentage' RETURNING char)
+           AND '1'||json_value(event, '$.percentage' RETURNING char) like '%'
+           AND '1'||json_value(event, '$.percentage' RETURNING char) not like '__DOES_NOT_EXIST__%'
+           AND '1'||json_value(event, '$.percentage' RETURNING char) IN ('0'||json_value(event, '$.percentage' RETURNING char),
+                                                                         1||json_value(event, '$.percentage' RETURNING char),
+                                                                         2||json_value(event, '$.percentage' RETURNING char))
+           AND '1'||json_value(event, '$.percentage' RETURNING char) NOT IN ('0'||json_value(event, '$.percentage' RETURNING char),
+                                                                             2||json_value(event, '$.percentage' RETURNING char)))) ;
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND ('1'||json_value(event, '$.percentage' RETURNING char) IS NULL
+       OR '1'||json_value(event, '$.percentage' RETURNING char) IN
+         (SELECT '1'||json_value(event, '$.percentage' RETURNING char)
+          FROM kttm_nested
+          WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+            AND ('1'||json_value(event, '$.percentage' RETURNING char) IS NULL
+                 OR ('1'||json_value(event, '$.percentage' RETURNING char) = 1||json_value(event, '$.percentage' RETURNING char)
+                     AND '1'||json_value(event, '$.percentage' RETURNING char) IS NOT DISTINCT
+                     FROM 1||json_value(event, '$.percentage' RETURNING char)
+                     AND '1'||json_value(event, '$.percentage' RETURNING char) <> '0'||json_value(event, '$.percentage' RETURNING char)
+                     AND ('1'||json_value(event, '$.percentage' RETURNING char) IS DISTINCT
+                          FROM '0'||json_value(event, '$.percentage' RETURNING char))
+                     AND '1'||json_value(event, '$.percentage' RETURNING char) > '0'||json_value(event, '$.percentage' RETURNING char)
+                     AND '1'||json_value(event, '$.percentage' RETURNING char) >= '0'||json_value(event, '$.percentage' RETURNING char)
+                     AND '1'||json_value(event, '$.percentage' RETURNING char) < 2||json_value(event, '$.percentage' RETURNING char)
+                     AND '1'||json_value(event, '$.percentage' RETURNING char) <= 2||json_value(event, '$.percentage' RETURNING char)
+                     AND ('1'||json_value(event, '$.percentage' RETURNING char) <> '0'||json_value(event, '$.percentage' RETURNING char)) IS TRUE
+                     AND ('1'||json_value(event, '$.percentage' RETURNING char) = '0'||json_value(event, '$.percentage' RETURNING char)) IS NOT TRUE
+                     AND ('1'||json_value(event, '$.percentage' RETURNING char) = '0'||json_value(event, '$.percentage' RETURNING char)) IS FALSE
+                     AND ('1'||json_value(event, '$.percentage' RETURNING char) <> '0'||json_value(event, '$.percentage' RETURNING char)) IS NOT FALSE
+                     AND '1'||json_value(event, '$.percentage' RETURNING char) BETWEEN '0'||json_value(event, '$.percentage' RETURNING char) AND 2||json_value(event, '$.percentage' RETURNING char)
+                     AND '1'||json_value(event, '$.percentage' RETURNING char) NOT BETWEEN '1'||json_value(event, '$.percentage' RETURNING char) AND '0'||json_value(event, '$.percentage' RETURNING char)
+                     AND '1'||json_value(event, '$.percentage' RETURNING char) like '%'
+                     AND '1'||json_value(event, '$.percentage' RETURNING char) not like '__DOES_NOT_EXIST__%'
+                     AND '1'||json_value(event, '$.percentage' RETURNING char) IN ('0'||json_value(event, '$.percentage' RETURNING char),
+                                                                                   1||json_value(event, '$.percentage' RETURNING char),
+                                                                                   2||json_value(event, '$.percentage' RETURNING char))
+                     AND '1'||json_value(event, '$.percentage' RETURNING char) NOT IN ('0'||json_value(event, '$.percentage' RETURNING char),
+                                                                                       2||json_value(event, '$.percentage' RETURNING char))))));
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM
+  (SELECT __time, number, client_ip,
+                          '1'||json_value(event, '$.percentage' RETURNING char),
+                          count(*)
+   FROM kttm_nested
+   WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+     AND ('1'||json_value(event, '$.percentage' RETURNING char) IS NULL
+          OR ('1'||json_value(event, '$.percentage' RETURNING char) = 1||json_value(event, '$.percentage' RETURNING char)
+              AND '1'||json_value(event, '$.percentage' RETURNING char) IS NOT DISTINCT
+              FROM 1||json_value(event, '$.percentage' RETURNING char)
+              AND '1'||json_value(event, '$.percentage' RETURNING char) <> '0'||json_value(event, '$.percentage' RETURNING char)
+              AND ('1'||json_value(event, '$.percentage' RETURNING char) IS DISTINCT
+                   FROM '0'||json_value(event, '$.percentage' RETURNING char))
+              AND '1'||json_value(event, '$.percentage' RETURNING char) > '0'||json_value(event, '$.percentage' RETURNING char)
+              AND '1'||json_value(event, '$.percentage' RETURNING char) >= '0'||json_value(event, '$.percentage' RETURNING char)
+              AND '1'||json_value(event, '$.percentage' RETURNING char) < 2||json_value(event, '$.percentage' RETURNING char)
+              AND '1'||json_value(event, '$.percentage' RETURNING char) <= 2||json_value(event, '$.percentage' RETURNING char)
+              AND ('1'||json_value(event, '$.percentage' RETURNING char) <> '0'||json_value(event, '$.percentage' RETURNING char)) IS TRUE
+              AND ('1'||json_value(event, '$.percentage' RETURNING char) = '0'||json_value(event, '$.percentage' RETURNING char)) IS NOT TRUE
+              AND ('1'||json_value(event, '$.percentage' RETURNING char) = '0'||json_value(event, '$.percentage' RETURNING char)) IS FALSE
+              AND ('1'||json_value(event, '$.percentage' RETURNING char) <> '0'||json_value(event, '$.percentage' RETURNING char)) IS NOT FALSE
+              AND '1'||json_value(event, '$.percentage' RETURNING char) BETWEEN '0'||json_value(event, '$.percentage' RETURNING char) AND 2||json_value(event, '$.percentage' RETURNING char)
+              AND '1'||json_value(event, '$.percentage' RETURNING char) NOT BETWEEN '1'||json_value(event, '$.percentage' RETURNING char) AND '0'||json_value(event, '$.percentage' RETURNING char)
+              AND '1'||json_value(event, '$.percentage' RETURNING char) like '%'
+              AND '1'||json_value(event, '$.percentage' RETURNING char) not like '__DOES_NOT_EXIST__%'
+              AND '1'||json_value(event, '$.percentage' RETURNING char) IN ('0'||json_value(event, '$.percentage' RETURNING char),
+                                                                            1||json_value(event, '$.percentage' RETURNING char),
+                                                                            2||json_value(event, '$.percentage' RETURNING char))
+              AND '1'||json_value(event, '$.percentage' RETURNING char) NOT IN ('0'||json_value(event, '$.percentage' RETURNING char),
+                                                                                2||json_value(event, '$.percentage' RETURNING char))))
+   GROUP BY 1,
+            2,
+            3,
+            4);
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+#-------------------------------------------------------------------------
+# TEST_ID: A8: json_value_returning_varchar
+#-------------------------------------------------------------------------
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND ('1'||json_value(event, '$.percentage' RETURNING varchar) IS NULL
+       OR ('1'||json_value(event, '$.percentage' RETURNING varchar) = 1||json_value(event, '$.percentage' RETURNING varchar)
+           AND '1'||json_value(event, '$.percentage' RETURNING varchar) IS NOT DISTINCT
+           FROM 1||json_value(event, '$.percentage' RETURNING varchar)
+           AND '1'||json_value(event, '$.percentage' RETURNING varchar) <> '0'||json_value(event, '$.percentage' RETURNING varchar)
+           AND ('1'||json_value(event, '$.percentage' RETURNING varchar) IS DISTINCT
+                FROM '0'||json_value(event, '$.percentage' RETURNING varchar))
+           AND '1'||json_value(event, '$.percentage' RETURNING varchar) > '0'||json_value(event, '$.percentage' RETURNING varchar)
+           AND '1'||json_value(event, '$.percentage' RETURNING varchar) >= '0'||json_value(event, '$.percentage' RETURNING varchar)
+           AND '1'||json_value(event, '$.percentage' RETURNING varchar) < 2||json_value(event, '$.percentage' RETURNING varchar)
+           AND '1'||json_value(event, '$.percentage' RETURNING varchar) <= 2||json_value(event, '$.percentage' RETURNING varchar)
+           AND ('1'||json_value(event, '$.percentage' RETURNING varchar) <> '0'||json_value(event, '$.percentage' RETURNING varchar)) IS TRUE
+           AND ('1'||json_value(event, '$.percentage' RETURNING varchar) = '0'||json_value(event, '$.percentage' RETURNING varchar)) IS NOT TRUE
+           AND ('1'||json_value(event, '$.percentage' RETURNING varchar) = '0'||json_value(event, '$.percentage' RETURNING varchar)) IS FALSE
+           AND ('1'||json_value(event, '$.percentage' RETURNING varchar) <> '0'||json_value(event, '$.percentage' RETURNING varchar)) IS NOT FALSE
+           AND '1'||json_value(event, '$.percentage' RETURNING varchar) BETWEEN '0'||json_value(event, '$.percentage' RETURNING varchar) AND 2||json_value(event, '$.percentage' RETURNING varchar)
+           AND '1'||json_value(event, '$.percentage' RETURNING varchar) NOT BETWEEN '1'||json_value(event, '$.percentage' RETURNING varchar) AND '0'||json_value(event, '$.percentage' RETURNING varchar)
+           AND '1'||json_value(event, '$.percentage' RETURNING varchar) like '%'
+           AND '1'||json_value(event, '$.percentage' RETURNING varchar) not like '__DOES_NOT_EXIST__%'
+           AND '1'||json_value(event, '$.percentage' RETURNING varchar) IN ('0'||json_value(event, '$.percentage' RETURNING varchar),
+                                                                            1||json_value(event, '$.percentage' RETURNING varchar),
+                                                                            2||json_value(event, '$.percentage' RETURNING varchar))
+           AND '1'||json_value(event, '$.percentage' RETURNING varchar) NOT IN ('0'||json_value(event, '$.percentage' RETURNING varchar),
+                                                                                2||json_value(event, '$.percentage' RETURNING varchar)))) ;
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND ('1'||json_value(event, '$.percentage' RETURNING varchar) IS NULL
+       OR '1'||json_value(event, '$.percentage' RETURNING varchar) IN
+         (SELECT '1'||json_value(event, '$.percentage' RETURNING varchar)
+          FROM kttm_nested
+          WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+            AND ('1'||json_value(event, '$.percentage' RETURNING varchar) IS NULL
+                 OR ('1'||json_value(event, '$.percentage' RETURNING varchar) = 1||json_value(event, '$.percentage' RETURNING varchar)
+                     AND '1'||json_value(event, '$.percentage' RETURNING varchar) IS NOT DISTINCT
+                     FROM 1||json_value(event, '$.percentage' RETURNING varchar)
+                     AND '1'||json_value(event, '$.percentage' RETURNING varchar) <> '0'||json_value(event, '$.percentage' RETURNING varchar)
+                     AND ('1'||json_value(event, '$.percentage' RETURNING varchar) IS DISTINCT
+                          FROM '0'||json_value(event, '$.percentage' RETURNING varchar))
+                     AND '1'||json_value(event, '$.percentage' RETURNING varchar) > '0'||json_value(event, '$.percentage' RETURNING varchar)
+                     AND '1'||json_value(event, '$.percentage' RETURNING varchar) >= '0'||json_value(event, '$.percentage' RETURNING varchar)
+                     AND '1'||json_value(event, '$.percentage' RETURNING varchar) < 2||json_value(event, '$.percentage' RETURNING varchar)
+                     AND '1'||json_value(event, '$.percentage' RETURNING varchar) <= 2||json_value(event, '$.percentage' RETURNING varchar)
+                     AND ('1'||json_value(event, '$.percentage' RETURNING varchar) <> '0'||json_value(event, '$.percentage' RETURNING varchar)) IS TRUE
+                     AND ('1'||json_value(event, '$.percentage' RETURNING varchar) = '0'||json_value(event, '$.percentage' RETURNING varchar)) IS NOT TRUE
+                     AND ('1'||json_value(event, '$.percentage' RETURNING varchar) = '0'||json_value(event, '$.percentage' RETURNING varchar)) IS FALSE
+                     AND ('1'||json_value(event, '$.percentage' RETURNING varchar) <> '0'||json_value(event, '$.percentage' RETURNING varchar)) IS NOT FALSE
+                     AND '1'||json_value(event, '$.percentage' RETURNING varchar) BETWEEN '0'||json_value(event, '$.percentage' RETURNING varchar) AND 2||json_value(event, '$.percentage' RETURNING varchar)
+                     AND '1'||json_value(event, '$.percentage' RETURNING varchar) NOT BETWEEN '1'||json_value(event, '$.percentage' RETURNING varchar) AND '0'||json_value(event, '$.percentage' RETURNING varchar)
+                     AND '1'||json_value(event, '$.percentage' RETURNING varchar) like '%'
+                     AND '1'||json_value(event, '$.percentage' RETURNING varchar) not like '__DOES_NOT_EXIST__%'
+                     AND '1'||json_value(event, '$.percentage' RETURNING varchar) IN ('0'||json_value(event, '$.percentage' RETURNING varchar),
+                                                                                      1||json_value(event, '$.percentage' RETURNING varchar),
+                                                                                      2||json_value(event, '$.percentage' RETURNING varchar))
+                     AND '1'||json_value(event, '$.percentage' RETURNING varchar) NOT IN ('0'||json_value(event, '$.percentage' RETURNING varchar),
+                                                                                          2||json_value(event, '$.percentage' RETURNING varchar))))));
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM
+  (SELECT __time, number, client_ip,
+                          '1'||json_value(event, '$.percentage' RETURNING varchar),
+                          count(*)
+   FROM kttm_nested
+   WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+     AND ('1'||json_value(event, '$.percentage' RETURNING varchar) IS NULL
+          OR ('1'||json_value(event, '$.percentage' RETURNING varchar) = 1||json_value(event, '$.percentage' RETURNING varchar)
+              AND '1'||json_value(event, '$.percentage' RETURNING varchar) IS NOT DISTINCT
+              FROM 1||json_value(event, '$.percentage' RETURNING varchar)
+              AND '1'||json_value(event, '$.percentage' RETURNING varchar) <> '0'||json_value(event, '$.percentage' RETURNING varchar)
+              AND ('1'||json_value(event, '$.percentage' RETURNING varchar) IS DISTINCT
+                   FROM '0'||json_value(event, '$.percentage' RETURNING varchar))
+              AND '1'||json_value(event, '$.percentage' RETURNING varchar) > '0'||json_value(event, '$.percentage' RETURNING varchar)
+              AND '1'||json_value(event, '$.percentage' RETURNING varchar) >= '0'||json_value(event, '$.percentage' RETURNING varchar)
+              AND '1'||json_value(event, '$.percentage' RETURNING varchar) < 2||json_value(event, '$.percentage' RETURNING varchar)
+              AND '1'||json_value(event, '$.percentage' RETURNING varchar) <= 2||json_value(event, '$.percentage' RETURNING varchar)
+              AND ('1'||json_value(event, '$.percentage' RETURNING varchar) <> '0'||json_value(event, '$.percentage' RETURNING varchar)) IS TRUE
+              AND ('1'||json_value(event, '$.percentage' RETURNING varchar) = '0'||json_value(event, '$.percentage' RETURNING varchar)) IS NOT TRUE
+              AND ('1'||json_value(event, '$.percentage' RETURNING varchar) = '0'||json_value(event, '$.percentage' RETURNING varchar)) IS FALSE
+              AND ('1'||json_value(event, '$.percentage' RETURNING varchar) <> '0'||json_value(event, '$.percentage' RETURNING varchar)) IS NOT FALSE
+              AND '1'||json_value(event, '$.percentage' RETURNING varchar) BETWEEN '0'||json_value(event, '$.percentage' RETURNING varchar) AND 2||json_value(event, '$.percentage' RETURNING varchar)
+              AND '1'||json_value(event, '$.percentage' RETURNING varchar) NOT BETWEEN '1'||json_value(event, '$.percentage' RETURNING varchar) AND '0'||json_value(event, '$.percentage' RETURNING varchar)
+              AND '1'||json_value(event, '$.percentage' RETURNING varchar) like '%'
+              AND '1'||json_value(event, '$.percentage' RETURNING varchar) not like '__DOES_NOT_EXIST__%'
+              AND '1'||json_value(event, '$.percentage' RETURNING varchar) IN ('0'||json_value(event, '$.percentage' RETURNING varchar),
+                                                                               1||json_value(event, '$.percentage' RETURNING varchar),
+                                                                               2||json_value(event, '$.percentage' RETURNING varchar))
+              AND '1'||json_value(event, '$.percentage' RETURNING varchar) NOT IN ('0'||json_value(event, '$.percentage' RETURNING varchar),
+                                                                                   2||json_value(event, '$.percentage' RETURNING varchar))))
+   GROUP BY 1,
+            2,
+            3,
+            4);
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+#-------------------------------------------------------------------------
+# TEST_ID: A9: json_value_returning_bigint
+#-------------------------------------------------------------------------
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND (json_value(event, '$.percentage' RETURNING bigint)+1 IS NULL
+       OR (json_value(event, '$.percentage' RETURNING bigint)+1 = json_value(event, '$.percentage' RETURNING bigint)+1
+           AND json_value(event, '$.percentage' RETURNING bigint)+1 IS NOT DISTINCT
+           FROM json_value(event, '$.percentage' RETURNING bigint)+1
+           AND json_value(event, '$.percentage' RETURNING bigint)+1 <> json_value(event, '$.percentage' RETURNING bigint)
+           AND (json_value(event, '$.percentage' RETURNING bigint)+1 IS DISTINCT
+                FROM json_value(event, '$.percentage' RETURNING bigint))
+           AND json_value(event, '$.percentage' RETURNING bigint)+1 > json_value(event, '$.percentage' RETURNING bigint)
+           AND json_value(event, '$.percentage' RETURNING bigint)+1 >= json_value(event, '$.percentage' RETURNING bigint)
+           AND json_value(event, '$.percentage' RETURNING bigint)+1 < json_value(event, '$.percentage' RETURNING bigint)+2
+           AND json_value(event, '$.percentage' RETURNING bigint)+1 <= json_value(event, '$.percentage' RETURNING bigint)+2
+           AND (json_value(event, '$.percentage' RETURNING bigint)+1 <> json_value(event, '$.percentage' RETURNING bigint)) IS TRUE
+           AND (json_value(event, '$.percentage' RETURNING bigint)+1 = json_value(event, '$.percentage' RETURNING bigint)) IS NOT TRUE
+           AND (json_value(event, '$.percentage' RETURNING bigint)+1 = json_value(event, '$.percentage' RETURNING bigint)) IS FALSE
+           AND (json_value(event, '$.percentage' RETURNING bigint)+1 <> json_value(event, '$.percentage' RETURNING bigint)) IS NOT FALSE
+           AND json_value(event, '$.percentage' RETURNING bigint)+1 BETWEEN json_value(event, '$.percentage' RETURNING bigint) AND json_value(event, '$.percentage' RETURNING bigint)+2
+           AND json_value(event, '$.percentage' RETURNING bigint)+1 NOT BETWEEN json_value(event, '$.percentage' RETURNING bigint)+1 AND json_value(event, '$.percentage' RETURNING bigint)
+           AND json_value(event, '$.percentage' RETURNING bigint)+1 like '%'
+           AND json_value(event, '$.percentage' RETURNING bigint)+1 not like '__DOES_NOT_EXIST__%'
+           AND json_value(event, '$.percentage' RETURNING bigint)+1 IN (json_value(event, '$.percentage' RETURNING bigint),
+                                                                        json_value(event, '$.percentage' RETURNING bigint)+1,
+                                                                        json_value(event, '$.percentage' RETURNING bigint)+2)
+           AND json_value(event, '$.percentage' RETURNING bigint)+1 NOT IN (json_value(event, '$.percentage' RETURNING bigint),
+                                                                            json_value(event, '$.percentage' RETURNING bigint)+2))) ;
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND (json_value(event, '$.percentage' RETURNING bigint)+1 IS NULL
+       OR json_value(event, '$.percentage' RETURNING bigint)+1 IN
+         (SELECT json_value(event, '$.percentage' RETURNING bigint)+1
+          FROM kttm_nested
+          WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+            AND (json_value(event, '$.percentage' RETURNING bigint)+1 IS NULL
+                 OR (json_value(event, '$.percentage' RETURNING bigint)+1 = json_value(event, '$.percentage' RETURNING bigint)+1
+                     AND json_value(event, '$.percentage' RETURNING bigint)+1 IS NOT DISTINCT
+                     FROM json_value(event, '$.percentage' RETURNING bigint)+1
+                     AND json_value(event, '$.percentage' RETURNING bigint)+1 <> json_value(event, '$.percentage' RETURNING bigint)
+                     AND (json_value(event, '$.percentage' RETURNING bigint)+1 IS DISTINCT
+                          FROM json_value(event, '$.percentage' RETURNING bigint))
+                     AND json_value(event, '$.percentage' RETURNING bigint)+1 > json_value(event, '$.percentage' RETURNING bigint)
+                     AND json_value(event, '$.percentage' RETURNING bigint)+1 >= json_value(event, '$.percentage' RETURNING bigint)
+                     AND json_value(event, '$.percentage' RETURNING bigint)+1 < json_value(event, '$.percentage' RETURNING bigint)+2
+                     AND json_value(event, '$.percentage' RETURNING bigint)+1 <= json_value(event, '$.percentage' RETURNING bigint)+2
+                     AND (json_value(event, '$.percentage' RETURNING bigint)+1 <> json_value(event, '$.percentage' RETURNING bigint)) IS TRUE
+                     AND (json_value(event, '$.percentage' RETURNING bigint)+1 = json_value(event, '$.percentage' RETURNING bigint)) IS NOT TRUE
+                     AND (json_value(event, '$.percentage' RETURNING bigint)+1 = json_value(event, '$.percentage' RETURNING bigint)) IS FALSE
+                     AND (json_value(event, '$.percentage' RETURNING bigint)+1 <> json_value(event, '$.percentage' RETURNING bigint)) IS NOT FALSE
+                     AND json_value(event, '$.percentage' RETURNING bigint)+1 BETWEEN json_value(event, '$.percentage' RETURNING bigint) AND json_value(event, '$.percentage' RETURNING bigint)+2
+                     AND json_value(event, '$.percentage' RETURNING bigint)+1 NOT BETWEEN json_value(event, '$.percentage' RETURNING bigint)+1 AND json_value(event, '$.percentage' RETURNING bigint)
+                     AND json_value(event, '$.percentage' RETURNING bigint)+1 like '%'
+                     AND json_value(event, '$.percentage' RETURNING bigint)+1 not like '__DOES_NOT_EXIST__%'
+                     AND json_value(event, '$.percentage' RETURNING bigint)+1 IN (json_value(event, '$.percentage' RETURNING bigint),
+                                                                                  json_value(event, '$.percentage' RETURNING bigint)+1,
+                                                                                  json_value(event, '$.percentage' RETURNING bigint)+2)
+                     AND json_value(event, '$.percentage' RETURNING bigint)+1 NOT IN (json_value(event, '$.percentage' RETURNING bigint),
+                                                                                      json_value(event, '$.percentage' RETURNING bigint)+2)))));
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM
+  (SELECT __time, number, client_ip,
+                          json_value(event, '$.percentage' RETURNING bigint)+1,
+                          count(*)
+   FROM kttm_nested
+   WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+     AND (json_value(event, '$.percentage' RETURNING bigint)+1 IS NULL
+          OR (json_value(event, '$.percentage' RETURNING bigint)+1 = json_value(event, '$.percentage' RETURNING bigint)+1
+              AND json_value(event, '$.percentage' RETURNING bigint)+1 IS NOT DISTINCT
+              FROM json_value(event, '$.percentage' RETURNING bigint)+1
+              AND json_value(event, '$.percentage' RETURNING bigint)+1 <> json_value(event, '$.percentage' RETURNING bigint)
+              AND (json_value(event, '$.percentage' RETURNING bigint)+1 IS DISTINCT
+                   FROM json_value(event, '$.percentage' RETURNING bigint))
+              AND json_value(event, '$.percentage' RETURNING bigint)+1 > json_value(event, '$.percentage' RETURNING bigint)
+              AND json_value(event, '$.percentage' RETURNING bigint)+1 >= json_value(event, '$.percentage' RETURNING bigint)
+              AND json_value(event, '$.percentage' RETURNING bigint)+1 < json_value(event, '$.percentage' RETURNING bigint)+2
+              AND json_value(event, '$.percentage' RETURNING bigint)+1 <= json_value(event, '$.percentage' RETURNING bigint)+2
+              AND (json_value(event, '$.percentage' RETURNING bigint)+1 <> json_value(event, '$.percentage' RETURNING bigint)) IS TRUE
+              AND (json_value(event, '$.percentage' RETURNING bigint)+1 = json_value(event, '$.percentage' RETURNING bigint)) IS NOT TRUE
+              AND (json_value(event, '$.percentage' RETURNING bigint)+1 = json_value(event, '$.percentage' RETURNING bigint)) IS FALSE
+              AND (json_value(event, '$.percentage' RETURNING bigint)+1 <> json_value(event, '$.percentage' RETURNING bigint)) IS NOT FALSE
+              AND json_value(event, '$.percentage' RETURNING bigint)+1 BETWEEN json_value(event, '$.percentage' RETURNING bigint) AND json_value(event, '$.percentage' RETURNING bigint)+2
+              AND json_value(event, '$.percentage' RETURNING bigint)+1 NOT BETWEEN json_value(event, '$.percentage' RETURNING bigint)+1 AND json_value(event, '$.percentage' RETURNING bigint)
+              AND json_value(event, '$.percentage' RETURNING bigint)+1 like '%'
+              AND json_value(event, '$.percentage' RETURNING bigint)+1 not like '__DOES_NOT_EXIST__%'
+              AND json_value(event, '$.percentage' RETURNING bigint)+1 IN (json_value(event, '$.percentage' RETURNING bigint),
+                                                                           json_value(event, '$.percentage' RETURNING bigint)+1,
+                                                                           json_value(event, '$.percentage' RETURNING bigint)+2)
+              AND json_value(event, '$.percentage' RETURNING bigint)+1 NOT IN (json_value(event, '$.percentage' RETURNING bigint),
+                                                                               json_value(event, '$.percentage' RETURNING bigint)+2)))
+   GROUP BY 1,
+            2,
+            3,
+            4);
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+#-------------------------------------------------------------------------
+# TEST_ID: A10: json_value_returning_double
+#-------------------------------------------------------------------------
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND (json_value(event, '$.percentage' RETURNING DOUBLE)+1 IS NULL
+       OR (json_value(event, '$.percentage' RETURNING DOUBLE)+1 = json_value(event, '$.percentage' RETURNING DOUBLE)+1
+           AND json_value(event, '$.percentage' RETURNING DOUBLE)+1 IS NOT DISTINCT
+           FROM json_value(event, '$.percentage' RETURNING DOUBLE)+1
+           AND json_value(event, '$.percentage' RETURNING DOUBLE)+1 <> json_value(event, '$.percentage' RETURNING DOUBLE)
+           AND (json_value(event, '$.percentage' RETURNING DOUBLE)+1 IS DISTINCT
+                FROM json_value(event, '$.percentage' RETURNING DOUBLE))
+           AND json_value(event, '$.percentage' RETURNING DOUBLE)+1 > json_value(event, '$.percentage' RETURNING DOUBLE)
+           AND json_value(event, '$.percentage' RETURNING DOUBLE)+1 >= json_value(event, '$.percentage' RETURNING DOUBLE)
+           AND json_value(event, '$.percentage' RETURNING DOUBLE)+1 < json_value(event, '$.percentage' RETURNING DOUBLE)+2
+           AND json_value(event, '$.percentage' RETURNING DOUBLE)+1 <= json_value(event, '$.percentage' RETURNING DOUBLE)+2
+           AND (json_value(event, '$.percentage' RETURNING DOUBLE)+1 <> json_value(event, '$.percentage' RETURNING DOUBLE)) IS TRUE
+           AND (json_value(event, '$.percentage' RETURNING DOUBLE)+1 = json_value(event, '$.percentage' RETURNING DOUBLE)) IS NOT TRUE
+           AND (json_value(event, '$.percentage' RETURNING DOUBLE)+1 = json_value(event, '$.percentage' RETURNING DOUBLE)) IS FALSE
+           AND (json_value(event, '$.percentage' RETURNING DOUBLE)+1 <> json_value(event, '$.percentage' RETURNING DOUBLE)) IS NOT FALSE
+           AND json_value(event, '$.percentage' RETURNING DOUBLE)+1 BETWEEN json_value(event, '$.percentage' RETURNING DOUBLE) AND json_value(event, '$.percentage' RETURNING DOUBLE)+2
+           AND json_value(event, '$.percentage' RETURNING DOUBLE)+1 NOT BETWEEN json_value(event, '$.percentage' RETURNING DOUBLE)+1 AND json_value(event, '$.percentage' RETURNING DOUBLE)
+           AND json_value(event, '$.percentage' RETURNING DOUBLE)+1 like '%'
+           AND json_value(event, '$.percentage' RETURNING DOUBLE)+1 not like '__DOES_NOT_EXIST__%'
+           AND json_value(event, '$.percentage' RETURNING DOUBLE)+1 IN (json_value(event, '$.percentage' RETURNING DOUBLE),
+                                                                        json_value(event, '$.percentage' RETURNING DOUBLE)+1,
+                                                                        json_value(event, '$.percentage' RETURNING DOUBLE)+2)
+           AND json_value(event, '$.percentage' RETURNING DOUBLE)+1 NOT IN (json_value(event, '$.percentage' RETURNING DOUBLE),
+                                                                            json_value(event, '$.percentage' RETURNING DOUBLE)+2))) ;
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND (json_value(event, '$.percentage' RETURNING DOUBLE)+1 IS NULL
+       OR json_value(event, '$.percentage' RETURNING DOUBLE)+1 IN
+         (SELECT json_value(event, '$.percentage' RETURNING DOUBLE)+1
+          FROM kttm_nested
+          WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+            AND (json_value(event, '$.percentage' RETURNING DOUBLE)+1 IS NULL
+                 OR (json_value(event, '$.percentage' RETURNING DOUBLE)+1 = json_value(event, '$.percentage' RETURNING DOUBLE)+1
+                     AND json_value(event, '$.percentage' RETURNING DOUBLE)+1 IS NOT DISTINCT
+                     FROM json_value(event, '$.percentage' RETURNING DOUBLE)+1
+                     AND json_value(event, '$.percentage' RETURNING DOUBLE)+1 <> json_value(event, '$.percentage' RETURNING DOUBLE)
+                     AND (json_value(event, '$.percentage' RETURNING DOUBLE)+1 IS DISTINCT
+                          FROM json_value(event, '$.percentage' RETURNING DOUBLE))
+                     AND json_value(event, '$.percentage' RETURNING DOUBLE)+1 > json_value(event, '$.percentage' RETURNING DOUBLE)
+                     AND json_value(event, '$.percentage' RETURNING DOUBLE)+1 >= json_value(event, '$.percentage' RETURNING DOUBLE)
+                     AND json_value(event, '$.percentage' RETURNING DOUBLE)+1 < json_value(event, '$.percentage' RETURNING DOUBLE)+2
+                     AND json_value(event, '$.percentage' RETURNING DOUBLE)+1 <= json_value(event, '$.percentage' RETURNING DOUBLE)+2
+                     AND (json_value(event, '$.percentage' RETURNING DOUBLE)+1 <> json_value(event, '$.percentage' RETURNING DOUBLE)) IS TRUE
+                     AND (json_value(event, '$.percentage' RETURNING DOUBLE)+1 = json_value(event, '$.percentage' RETURNING DOUBLE)) IS NOT TRUE
+                     AND (json_value(event, '$.percentage' RETURNING DOUBLE)+1 = json_value(event, '$.percentage' RETURNING DOUBLE)) IS FALSE
+                     AND (json_value(event, '$.percentage' RETURNING DOUBLE)+1 <> json_value(event, '$.percentage' RETURNING DOUBLE)) IS NOT FALSE
+                     AND json_value(event, '$.percentage' RETURNING DOUBLE)+1 BETWEEN json_value(event, '$.percentage' RETURNING DOUBLE) AND json_value(event, '$.percentage' RETURNING DOUBLE)+2
+                     AND json_value(event, '$.percentage' RETURNING DOUBLE)+1 NOT BETWEEN json_value(event, '$.percentage' RETURNING DOUBLE)+1 AND json_value(event, '$.percentage' RETURNING DOUBLE)
+                     AND json_value(event, '$.percentage' RETURNING DOUBLE)+1 like '%'
+                     AND json_value(event, '$.percentage' RETURNING DOUBLE)+1 not like '__DOES_NOT_EXIST__%'
+                     AND json_value(event, '$.percentage' RETURNING DOUBLE)+1 IN (json_value(event, '$.percentage' RETURNING DOUBLE),
+                                                                                  json_value(event, '$.percentage' RETURNING DOUBLE)+1,
+                                                                                  json_value(event, '$.percentage' RETURNING DOUBLE)+2)
+                     AND json_value(event, '$.percentage' RETURNING DOUBLE)+1 NOT IN (json_value(event, '$.percentage' RETURNING DOUBLE),
+                                                                                      json_value(event, '$.percentage' RETURNING DOUBLE)+2)))));
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM
+  (SELECT __time, number, client_ip,
+                          json_value(event, '$.percentage' RETURNING DOUBLE)+1,
+                          count(*)
+   FROM kttm_nested
+   WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+     AND (json_value(event, '$.percentage' RETURNING DOUBLE)+1 IS NULL
+          OR (json_value(event, '$.percentage' RETURNING DOUBLE)+1 = json_value(event, '$.percentage' RETURNING DOUBLE)+1
+              AND json_value(event, '$.percentage' RETURNING DOUBLE)+1 IS NOT DISTINCT
+              FROM json_value(event, '$.percentage' RETURNING DOUBLE)+1
+              AND json_value(event, '$.percentage' RETURNING DOUBLE)+1 <> json_value(event, '$.percentage' RETURNING DOUBLE)
+              AND (json_value(event, '$.percentage' RETURNING DOUBLE)+1 IS DISTINCT
+                   FROM json_value(event, '$.percentage' RETURNING DOUBLE))
+              AND json_value(event, '$.percentage' RETURNING DOUBLE)+1 > json_value(event, '$.percentage' RETURNING DOUBLE)
+              AND json_value(event, '$.percentage' RETURNING DOUBLE)+1 >= json_value(event, '$.percentage' RETURNING DOUBLE)
+              AND json_value(event, '$.percentage' RETURNING DOUBLE)+1 < json_value(event, '$.percentage' RETURNING DOUBLE)+2
+              AND json_value(event, '$.percentage' RETURNING DOUBLE)+1 <= json_value(event, '$.percentage' RETURNING DOUBLE)+2
+              AND (json_value(event, '$.percentage' RETURNING DOUBLE)+1 <> json_value(event, '$.percentage' RETURNING DOUBLE)) IS TRUE
+              AND (json_value(event, '$.percentage' RETURNING DOUBLE)+1 = json_value(event, '$.percentage' RETURNING DOUBLE)) IS NOT TRUE
+              AND (json_value(event, '$.percentage' RETURNING DOUBLE)+1 = json_value(event, '$.percentage' RETURNING DOUBLE)) IS FALSE
+              AND (json_value(event, '$.percentage' RETURNING DOUBLE)+1 <> json_value(event, '$.percentage' RETURNING DOUBLE)) IS NOT FALSE
+              AND json_value(event, '$.percentage' RETURNING DOUBLE)+1 BETWEEN json_value(event, '$.percentage' RETURNING DOUBLE) AND json_value(event, '$.percentage' RETURNING DOUBLE)+2
+              AND json_value(event, '$.percentage' RETURNING DOUBLE)+1 NOT BETWEEN json_value(event, '$.percentage' RETURNING DOUBLE)+1 AND json_value(event, '$.percentage' RETURNING DOUBLE)
+              AND json_value(event, '$.percentage' RETURNING DOUBLE)+1 like '%'
+              AND json_value(event, '$.percentage' RETURNING DOUBLE)+1 not like '__DOES_NOT_EXIST__%'
+              AND json_value(event, '$.percentage' RETURNING DOUBLE)+1 IN (json_value(event, '$.percentage' RETURNING DOUBLE),
+                                                                           json_value(event, '$.percentage' RETURNING DOUBLE)+1,
+                                                                           json_value(event, '$.percentage' RETURNING DOUBLE)+2)
+              AND json_value(event, '$.percentage' RETURNING DOUBLE)+1 NOT IN (json_value(event, '$.percentage' RETURNING DOUBLE),
+                                                                               json_value(event, '$.percentage' RETURNING DOUBLE)+2)))
+   GROUP BY 1,
+            2,
+            3,
+            4);
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+#-------------------------------------------------------------------------
+# TEST_ID: A11: json_value_returning_timestamp
+#-------------------------------------------------------------------------
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND (json_value(event, '$.percentage' RETURNING timestamp)+interval '1' YEAR IS NULL
+       OR (json_value(event, '$.percentage' RETURNING timestamp)+interval '1' YEAR = json_value(event, '$.percentage' RETURNING timestamp)+interval '1' YEAR
+           AND json_value(event, '$.percentage' RETURNING timestamp)+interval '1' YEAR IS NOT DISTINCT
+           FROM json_value(event, '$.percentage' RETURNING timestamp)+interval '1' YEAR
+           AND json_value(event, '$.percentage' RETURNING timestamp)+interval '1' YEAR <> json_value(event, '$.percentage' RETURNING timestamp)
+           AND (json_value(event, '$.percentage' RETURNING timestamp)+interval '1' YEAR IS DISTINCT
+                FROM json_value(event, '$.percentage' RETURNING timestamp))
+           AND json_value(event, '$.percentage' RETURNING timestamp)+interval '1' YEAR > json_value(event, '$.percentage' RETURNING timestamp)
+           AND json_value(event, '$.percentage' RETURNING timestamp)+interval '1' YEAR >= json_value(event, '$.percentage' RETURNING timestamp)
+           AND json_value(event, '$.percentage' RETURNING timestamp)+interval '1' YEAR < json_value(event, '$.percentage' RETURNING timestamp)+interval '2' YEAR
+           AND json_value(event, '$.percentage' RETURNING timestamp)+interval '1' YEAR <= json_value(event, '$.percentage' RETURNING timestamp)+interval '2' YEAR
+           AND (json_value(event, '$.percentage' RETURNING timestamp)+interval '1' YEAR <> json_value(event, '$.percentage' RETURNING timestamp)) IS TRUE
+           AND (json_value(event, '$.percentage' RETURNING timestamp)+interval '1' YEAR = json_value(event, '$.percentage' RETURNING timestamp)) IS NOT TRUE
+           AND (json_value(event, '$.percentage' RETURNING timestamp)+interval '1' YEAR = json_value(event, '$.percentage' RETURNING timestamp)) IS FALSE
+           AND (json_value(event, '$.percentage' RETURNING timestamp)+interval '1' YEAR <> json_value(event, '$.percentage' RETURNING timestamp)) IS NOT FALSE
+           AND json_value(event, '$.percentage' RETURNING timestamp)+interval '1' YEAR BETWEEN json_value(event, '$.percentage' RETURNING timestamp) AND json_value(event, '$.percentage' RETURNING timestamp)+interval '2' YEAR
+           AND json_value(event, '$.percentage' RETURNING timestamp)+interval '1' YEAR NOT BETWEEN json_value(event, '$.percentage' RETURNING timestamp)+interval '1' YEAR AND json_value(event, '$.percentage' RETURNING timestamp)
+           AND json_value(event, '$.percentage' RETURNING timestamp)+interval '1' YEAR like '%'
+           AND json_value(event, '$.percentage' RETURNING timestamp)+interval '1' YEAR not like '__DOES_NOT_EXIST__%'
+           AND json_value(event, '$.percentage' RETURNING timestamp)+interval '1' YEAR IN (json_value(event, '$.percentage' RETURNING timestamp),
+                                                                                           json_value(event, '$.percentage' RETURNING timestamp)+interval '1' YEAR,
+                                                                                           json_value(event, '$.percentage' RETURNING timestamp)+interval '2' YEAR)
+           AND json_value(event, '$.percentage' RETURNING timestamp)+interval '1' YEAR NOT IN (json_value(event, '$.percentage' RETURNING timestamp),
+                                                                                               json_value(event, '$.percentage' RETURNING timestamp)+interval '2' YEAR))) ;
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND (json_value(event, '$.percentage' RETURNING timestamp)+interval '1' YEAR IS NULL
+       OR json_value(event, '$.percentage' RETURNING timestamp)+interval '1' YEAR IN
+         (SELECT json_value(event, '$.percentage' RETURNING timestamp)+interval '1' YEAR
+          FROM kttm_nested
+          WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+            AND (json_value(event, '$.percentage' RETURNING timestamp)+interval '1' YEAR IS NULL
+                 OR (json_value(event, '$.percentage' RETURNING timestamp)+interval '1' YEAR = json_value(event, '$.percentage' RETURNING timestamp)+interval '1' YEAR
+                     AND json_value(event, '$.percentage' RETURNING timestamp)+interval '1' YEAR IS NOT DISTINCT
+                     FROM json_value(event, '$.percentage' RETURNING timestamp)+interval '1' YEAR
+                     AND json_value(event, '$.percentage' RETURNING timestamp)+interval '1' YEAR <> json_value(event, '$.percentage' RETURNING timestamp)
+                     AND (json_value(event, '$.percentage' RETURNING timestamp)+interval '1' YEAR IS DISTINCT
+                          FROM json_value(event, '$.percentage' RETURNING timestamp))
+                     AND json_value(event, '$.percentage' RETURNING timestamp)+interval '1' YEAR > json_value(event, '$.percentage' RETURNING timestamp)
+                     AND json_value(event, '$.percentage' RETURNING timestamp)+interval '1' YEAR >= json_value(event, '$.percentage' RETURNING timestamp)
+                     AND json_value(event, '$.percentage' RETURNING timestamp)+interval '1' YEAR < json_value(event, '$.percentage' RETURNING timestamp)+interval '2' YEAR
+                     AND json_value(event, '$.percentage' RETURNING timestamp)+interval '1' YEAR <= json_value(event, '$.percentage' RETURNING timestamp)+interval '2' YEAR
+                     AND (json_value(event, '$.percentage' RETURNING timestamp)+interval '1' YEAR <> json_value(event, '$.percentage' RETURNING timestamp)) IS TRUE
+                     AND (json_value(event, '$.percentage' RETURNING timestamp)+interval '1' YEAR = json_value(event, '$.percentage' RETURNING timestamp)) IS NOT TRUE
+                     AND (json_value(event, '$.percentage' RETURNING timestamp)+interval '1' YEAR = json_value(event, '$.percentage' RETURNING timestamp)) IS FALSE
+                     AND (json_value(event, '$.percentage' RETURNING timestamp)+interval '1' YEAR <> json_value(event, '$.percentage' RETURNING timestamp)) IS NOT FALSE
+                     AND json_value(event, '$.percentage' RETURNING timestamp)+interval '1' YEAR BETWEEN json_value(event, '$.percentage' RETURNING timestamp) AND json_value(event, '$.percentage' RETURNING timestamp)+interval '2' YEAR
+                     AND json_value(event, '$.percentage' RETURNING timestamp)+interval '1' YEAR NOT BETWEEN json_value(event, '$.percentage' RETURNING timestamp)+interval '1' YEAR AND json_value(event, '$.percentage' RETURNING timestamp)
+                     AND json_value(event, '$.percentage' RETURNING timestamp)+interval '1' YEAR like '%'
+                     AND json_value(event, '$.percentage' RETURNING timestamp)+interval '1' YEAR not like '__DOES_NOT_EXIST__%'
+                     AND json_value(event, '$.percentage' RETURNING timestamp)+interval '1' YEAR IN (json_value(event, '$.percentage' RETURNING timestamp),
+                                                                                                     json_value(event, '$.percentage' RETURNING timestamp)+interval '1' YEAR,
+                                                                                                     json_value(event, '$.percentage' RETURNING timestamp)+interval '2' YEAR)
+                     AND json_value(event, '$.percentage' RETURNING timestamp)+interval '1' YEAR NOT IN (json_value(event, '$.percentage' RETURNING timestamp),
+                                                                                                         json_value(event, '$.percentage' RETURNING timestamp)+interval '2' YEAR)))));
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM
+  (SELECT __time, number, client_ip,
+                          json_value(event, '$.percentage' RETURNING timestamp)+interval '1' YEAR,
+                          count(*)
+   FROM kttm_nested
+   WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+     AND (json_value(event, '$.percentage' RETURNING timestamp)+interval '1' YEAR IS NULL
+          OR (json_value(event, '$.percentage' RETURNING timestamp)+interval '1' YEAR = json_value(event, '$.percentage' RETURNING timestamp)+interval '1' YEAR
+              AND json_value(event, '$.percentage' RETURNING timestamp)+interval '1' YEAR IS NOT DISTINCT
+              FROM json_value(event, '$.percentage' RETURNING timestamp)+interval '1' YEAR
+              AND json_value(event, '$.percentage' RETURNING timestamp)+interval '1' YEAR <> json_value(event, '$.percentage' RETURNING timestamp)
+              AND (json_value(event, '$.percentage' RETURNING timestamp)+interval '1' YEAR IS DISTINCT
+                   FROM json_value(event, '$.percentage' RETURNING timestamp))
+              AND json_value(event, '$.percentage' RETURNING timestamp)+interval '1' YEAR > json_value(event, '$.percentage' RETURNING timestamp)
+              AND json_value(event, '$.percentage' RETURNING timestamp)+interval '1' YEAR >= json_value(event, '$.percentage' RETURNING timestamp)
+              AND json_value(event, '$.percentage' RETURNING timestamp)+interval '1' YEAR < json_value(event, '$.percentage' RETURNING timestamp)+interval '2' YEAR
+              AND json_value(event, '$.percentage' RETURNING timestamp)+interval '1' YEAR <= json_value(event, '$.percentage' RETURNING timestamp)+interval '2' YEAR
+              AND (json_value(event, '$.percentage' RETURNING timestamp)+interval '1' YEAR <> json_value(event, '$.percentage' RETURNING timestamp)) IS TRUE
+              AND (json_value(event, '$.percentage' RETURNING timestamp)+interval '1' YEAR = json_value(event, '$.percentage' RETURNING timestamp)) IS NOT TRUE
+              AND (json_value(event, '$.percentage' RETURNING timestamp)+interval '1' YEAR = json_value(event, '$.percentage' RETURNING timestamp)) IS FALSE
+              AND (json_value(event, '$.percentage' RETURNING timestamp)+interval '1' YEAR <> json_value(event, '$.percentage' RETURNING timestamp)) IS NOT FALSE
+              AND json_value(event, '$.percentage' RETURNING timestamp)+interval '1' YEAR BETWEEN json_value(event, '$.percentage' RETURNING timestamp) AND json_value(event, '$.percentage' RETURNING timestamp)+interval '2' YEAR
+              AND json_value(event, '$.percentage' RETURNING timestamp)+interval '1' YEAR NOT BETWEEN json_value(event, '$.percentage' RETURNING timestamp)+interval '1' YEAR AND json_value(event, '$.percentage' RETURNING timestamp)
+              AND json_value(event, '$.percentage' RETURNING timestamp)+interval '1' YEAR like '%'
+              AND json_value(event, '$.percentage' RETURNING timestamp)+interval '1' YEAR not like '__DOES_NOT_EXIST__%'
+              AND json_value(event, '$.percentage' RETURNING timestamp)+interval '1' YEAR IN (json_value(event, '$.percentage' RETURNING timestamp),
+                                                                                              json_value(event, '$.percentage' RETURNING timestamp)+interval '1' YEAR,
+                                                                                              json_value(event, '$.percentage' RETURNING timestamp)+interval '2' YEAR)
+              AND json_value(event, '$.percentage' RETURNING timestamp)+interval '1' YEAR NOT IN (json_value(event, '$.percentage' RETURNING timestamp),
+                                                                                                  json_value(event, '$.percentage' RETURNING timestamp)+interval '2' YEAR)))
+   GROUP BY 1,
+            2,
+            3,
+            4);
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+#-------------------------------------------------------------------------
+# TEST_ID: A12: parse_json
+#-------------------------------------------------------------------------
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND ('1'||to_json_string(parse_json(to_json_string(agent))) IS NULL
+       OR ('1'||to_json_string(parse_json(to_json_string(agent))) = 1||to_json_string(parse_json(to_json_string(agent)))
+           AND '1'||to_json_string(parse_json(to_json_string(agent))) IS NOT DISTINCT
+           FROM 1||to_json_string(parse_json(to_json_string(agent)))
+           AND '1'||to_json_string(parse_json(to_json_string(agent))) <> '0'||to_json_string(parse_json(to_json_string(agent)))
+           AND ('1'||to_json_string(parse_json(to_json_string(agent))) IS DISTINCT
+                FROM '0'||to_json_string(parse_json(to_json_string(agent))))
+           AND '1'||to_json_string(parse_json(to_json_string(agent))) > '0'||to_json_string(parse_json(to_json_string(agent)))
+           AND '1'||to_json_string(parse_json(to_json_string(agent))) >= '0'||to_json_string(parse_json(to_json_string(agent)))
+           AND '1'||to_json_string(parse_json(to_json_string(agent))) < 2||to_json_string(parse_json(to_json_string(agent)))
+           AND '1'||to_json_string(parse_json(to_json_string(agent))) <= 2||to_json_string(parse_json(to_json_string(agent)))
+           AND ('1'||to_json_string(parse_json(to_json_string(agent))) <> '0'||to_json_string(parse_json(to_json_string(agent)))) IS TRUE
+           AND ('1'||to_json_string(parse_json(to_json_string(agent))) = '0'||to_json_string(parse_json(to_json_string(agent)))) IS NOT TRUE
+           AND ('1'||to_json_string(parse_json(to_json_string(agent))) = '0'||to_json_string(parse_json(to_json_string(agent)))) IS FALSE
+           AND ('1'||to_json_string(parse_json(to_json_string(agent))) <> '0'||to_json_string(parse_json(to_json_string(agent)))) IS NOT FALSE
+           AND '1'||to_json_string(parse_json(to_json_string(agent))) BETWEEN '0'||to_json_string(parse_json(to_json_string(agent))) AND 2||to_json_string(parse_json(to_json_string(agent)))
+           AND '1'||to_json_string(parse_json(to_json_string(agent))) NOT BETWEEN '1'||to_json_string(parse_json(to_json_string(agent))) AND '0'||to_json_string(parse_json(to_json_string(agent)))
+           AND '1'||to_json_string(parse_json(to_json_string(agent))) like '%'
+           AND '1'||to_json_string(parse_json(to_json_string(agent))) not like '__DOES_NOT_EXIST__%'
+           AND '1'||to_json_string(parse_json(to_json_string(agent))) IN ('0'||to_json_string(parse_json(to_json_string(agent))),
+                                                                          1||to_json_string(parse_json(to_json_string(agent))),
+                                                                          2||to_json_string(parse_json(to_json_string(agent))))
+           AND '1'||to_json_string(parse_json(to_json_string(agent))) NOT IN ('0'||to_json_string(parse_json(to_json_string(agent))),
+                                                                              2||to_json_string(parse_json(to_json_string(agent)))))) ;
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND ('1'||to_json_string(parse_json(to_json_string(agent))) IS NULL
+       OR '1'||to_json_string(parse_json(to_json_string(agent))) IN
+         (SELECT '1'||to_json_string(parse_json(to_json_string(agent)))
+          FROM kttm_nested
+          WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+            AND ('1'||to_json_string(parse_json(to_json_string(agent))) IS NULL
+                 OR ('1'||to_json_string(parse_json(to_json_string(agent))) = 1||to_json_string(parse_json(to_json_string(agent)))
+                     AND '1'||to_json_string(parse_json(to_json_string(agent))) IS NOT DISTINCT
+                     FROM 1||to_json_string(parse_json(to_json_string(agent)))
+                     AND '1'||to_json_string(parse_json(to_json_string(agent))) <> '0'||to_json_string(parse_json(to_json_string(agent)))
+                     AND ('1'||to_json_string(parse_json(to_json_string(agent))) IS DISTINCT
+                          FROM '0'||to_json_string(parse_json(to_json_string(agent))))
+                     AND '1'||to_json_string(parse_json(to_json_string(agent))) > '0'||to_json_string(parse_json(to_json_string(agent)))
+                     AND '1'||to_json_string(parse_json(to_json_string(agent))) >= '0'||to_json_string(parse_json(to_json_string(agent)))
+                     AND '1'||to_json_string(parse_json(to_json_string(agent))) < 2||to_json_string(parse_json(to_json_string(agent)))
+                     AND '1'||to_json_string(parse_json(to_json_string(agent))) <= 2||to_json_string(parse_json(to_json_string(agent)))
+                     AND ('1'||to_json_string(parse_json(to_json_string(agent))) <> '0'||to_json_string(parse_json(to_json_string(agent)))) IS TRUE
+                     AND ('1'||to_json_string(parse_json(to_json_string(agent))) = '0'||to_json_string(parse_json(to_json_string(agent)))) IS NOT TRUE
+                     AND ('1'||to_json_string(parse_json(to_json_string(agent))) = '0'||to_json_string(parse_json(to_json_string(agent)))) IS FALSE
+                     AND ('1'||to_json_string(parse_json(to_json_string(agent))) <> '0'||to_json_string(parse_json(to_json_string(agent)))) IS NOT FALSE
+                     AND '1'||to_json_string(parse_json(to_json_string(agent))) BETWEEN '0'||to_json_string(parse_json(to_json_string(agent))) AND 2||to_json_string(parse_json(to_json_string(agent)))
+                     AND '1'||to_json_string(parse_json(to_json_string(agent))) NOT BETWEEN '1'||to_json_string(parse_json(to_json_string(agent))) AND '0'||to_json_string(parse_json(to_json_string(agent)))
+                     AND '1'||to_json_string(parse_json(to_json_string(agent))) like '%'
+                     AND '1'||to_json_string(parse_json(to_json_string(agent))) not like '__DOES_NOT_EXIST__%'
+                     AND '1'||to_json_string(parse_json(to_json_string(agent))) IN ('0'||to_json_string(parse_json(to_json_string(agent))),
+                                                                                    1||to_json_string(parse_json(to_json_string(agent))),
+                                                                                    2||to_json_string(parse_json(to_json_string(agent))))
+                     AND '1'||to_json_string(parse_json(to_json_string(agent))) NOT IN ('0'||to_json_string(parse_json(to_json_string(agent))),
+                                                                                        2||to_json_string(parse_json(to_json_string(agent))))))));
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM
+  (SELECT __time, number, client_ip,
+                          '1'||to_json_string(parse_json(to_json_string(agent))),
+                          count(*)
+   FROM kttm_nested
+   WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+     AND ('1'||to_json_string(parse_json(to_json_string(agent))) IS NULL
+          OR ('1'||to_json_string(parse_json(to_json_string(agent))) = 1||to_json_string(parse_json(to_json_string(agent)))
+              AND '1'||to_json_string(parse_json(to_json_string(agent))) IS NOT DISTINCT
+              FROM 1||to_json_string(parse_json(to_json_string(agent)))
+              AND '1'||to_json_string(parse_json(to_json_string(agent))) <> '0'||to_json_string(parse_json(to_json_string(agent)))
+              AND ('1'||to_json_string(parse_json(to_json_string(agent))) IS DISTINCT
+                   FROM '0'||to_json_string(parse_json(to_json_string(agent))))
+              AND '1'||to_json_string(parse_json(to_json_string(agent))) > '0'||to_json_string(parse_json(to_json_string(agent)))
+              AND '1'||to_json_string(parse_json(to_json_string(agent))) >= '0'||to_json_string(parse_json(to_json_string(agent)))
+              AND '1'||to_json_string(parse_json(to_json_string(agent))) < 2||to_json_string(parse_json(to_json_string(agent)))
+              AND '1'||to_json_string(parse_json(to_json_string(agent))) <= 2||to_json_string(parse_json(to_json_string(agent)))
+              AND ('1'||to_json_string(parse_json(to_json_string(agent))) <> '0'||to_json_string(parse_json(to_json_string(agent)))) IS TRUE
+              AND ('1'||to_json_string(parse_json(to_json_string(agent))) = '0'||to_json_string(parse_json(to_json_string(agent)))) IS NOT TRUE
+              AND ('1'||to_json_string(parse_json(to_json_string(agent))) = '0'||to_json_string(parse_json(to_json_string(agent)))) IS FALSE
+              AND ('1'||to_json_string(parse_json(to_json_string(agent))) <> '0'||to_json_string(parse_json(to_json_string(agent)))) IS NOT FALSE
+              AND '1'||to_json_string(parse_json(to_json_string(agent))) BETWEEN '0'||to_json_string(parse_json(to_json_string(agent))) AND 2||to_json_string(parse_json(to_json_string(agent)))
+              AND '1'||to_json_string(parse_json(to_json_string(agent))) NOT BETWEEN '1'||to_json_string(parse_json(to_json_string(agent))) AND '0'||to_json_string(parse_json(to_json_string(agent)))
+              AND '1'||to_json_string(parse_json(to_json_string(agent))) like '%'
+              AND '1'||to_json_string(parse_json(to_json_string(agent))) not like '__DOES_NOT_EXIST__%'
+              AND '1'||to_json_string(parse_json(to_json_string(agent))) IN ('0'||to_json_string(parse_json(to_json_string(agent))),
+                                                                             1||to_json_string(parse_json(to_json_string(agent))),
+                                                                             2||to_json_string(parse_json(to_json_string(agent))))
+              AND '1'||to_json_string(parse_json(to_json_string(agent))) NOT IN ('0'||to_json_string(parse_json(to_json_string(agent))),
+                                                                                 2||to_json_string(parse_json(to_json_string(agent))))))
+   GROUP BY 1,
+            2,
+            3,
+            4);
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+#-------------------------------------------------------------------------
+# TEST_ID: A13: try_parse_json
+#-------------------------------------------------------------------------
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND ('1'||to_json_string(try_parse_json(to_json_string(agent))) IS NULL
+       OR ('1'||to_json_string(try_parse_json(to_json_string(agent))) = 1||to_json_string(try_parse_json(to_json_string(agent)))
+           AND '1'||to_json_string(try_parse_json(to_json_string(agent))) IS NOT DISTINCT
+           FROM 1||to_json_string(try_parse_json(to_json_string(agent)))
+           AND '1'||to_json_string(try_parse_json(to_json_string(agent))) <> '0'||to_json_string(try_parse_json(to_json_string(agent)))
+           AND ('1'||to_json_string(try_parse_json(to_json_string(agent))) IS DISTINCT
+                FROM '0'||to_json_string(try_parse_json(to_json_string(agent))))
+           AND '1'||to_json_string(try_parse_json(to_json_string(agent))) > '0'||to_json_string(try_parse_json(to_json_string(agent)))
+           AND '1'||to_json_string(try_parse_json(to_json_string(agent))) >= '0'||to_json_string(try_parse_json(to_json_string(agent)))
+           AND '1'||to_json_string(try_parse_json(to_json_string(agent))) < 2||to_json_string(try_parse_json(to_json_string(agent)))
+           AND '1'||to_json_string(try_parse_json(to_json_string(agent))) <= 2||to_json_string(try_parse_json(to_json_string(agent)))
+           AND ('1'||to_json_string(try_parse_json(to_json_string(agent))) <> '0'||to_json_string(try_parse_json(to_json_string(agent)))) IS TRUE
+           AND ('1'||to_json_string(try_parse_json(to_json_string(agent))) = '0'||to_json_string(try_parse_json(to_json_string(agent)))) IS NOT TRUE
+           AND ('1'||to_json_string(try_parse_json(to_json_string(agent))) = '0'||to_json_string(try_parse_json(to_json_string(agent)))) IS FALSE
+           AND ('1'||to_json_string(try_parse_json(to_json_string(agent))) <> '0'||to_json_string(try_parse_json(to_json_string(agent)))) IS NOT FALSE
+           AND '1'||to_json_string(try_parse_json(to_json_string(agent))) BETWEEN '0'||to_json_string(try_parse_json(to_json_string(agent))) AND 2||to_json_string(try_parse_json(to_json_string(agent)))
+           AND '1'||to_json_string(try_parse_json(to_json_string(agent))) NOT BETWEEN '1'||to_json_string(try_parse_json(to_json_string(agent))) AND '0'||to_json_string(try_parse_json(to_json_string(agent)))
+           AND '1'||to_json_string(try_parse_json(to_json_string(agent))) like '%'
+           AND '1'||to_json_string(try_parse_json(to_json_string(agent))) not like '__DOES_NOT_EXIST__%'
+           AND '1'||to_json_string(try_parse_json(to_json_string(agent))) IN ('0'||to_json_string(try_parse_json(to_json_string(agent))),
+                                                                              1||to_json_string(try_parse_json(to_json_string(agent))),
+                                                                              2||to_json_string(try_parse_json(to_json_string(agent))))
+           AND '1'||to_json_string(try_parse_json(to_json_string(agent))) NOT IN ('0'||to_json_string(try_parse_json(to_json_string(agent))),
+                                                                                  2||to_json_string(try_parse_json(to_json_string(agent)))))) ;
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND ('1'||to_json_string(try_parse_json(to_json_string(agent))) IS NULL
+       OR '1'||to_json_string(try_parse_json(to_json_string(agent))) IN
+         (SELECT '1'||to_json_string(try_parse_json(to_json_string(agent)))
+          FROM kttm_nested
+          WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+            AND ('1'||to_json_string(try_parse_json(to_json_string(agent))) IS NULL
+                 OR ('1'||to_json_string(try_parse_json(to_json_string(agent))) = 1||to_json_string(try_parse_json(to_json_string(agent)))
+                     AND '1'||to_json_string(try_parse_json(to_json_string(agent))) IS NOT DISTINCT
+                     FROM 1||to_json_string(try_parse_json(to_json_string(agent)))
+                     AND '1'||to_json_string(try_parse_json(to_json_string(agent))) <> '0'||to_json_string(try_parse_json(to_json_string(agent)))
+                     AND ('1'||to_json_string(try_parse_json(to_json_string(agent))) IS DISTINCT
+                          FROM '0'||to_json_string(try_parse_json(to_json_string(agent))))
+                     AND '1'||to_json_string(try_parse_json(to_json_string(agent))) > '0'||to_json_string(try_parse_json(to_json_string(agent)))
+                     AND '1'||to_json_string(try_parse_json(to_json_string(agent))) >= '0'||to_json_string(try_parse_json(to_json_string(agent)))
+                     AND '1'||to_json_string(try_parse_json(to_json_string(agent))) < 2||to_json_string(try_parse_json(to_json_string(agent)))
+                     AND '1'||to_json_string(try_parse_json(to_json_string(agent))) <= 2||to_json_string(try_parse_json(to_json_string(agent)))
+                     AND ('1'||to_json_string(try_parse_json(to_json_string(agent))) <> '0'||to_json_string(try_parse_json(to_json_string(agent)))) IS TRUE
+                     AND ('1'||to_json_string(try_parse_json(to_json_string(agent))) = '0'||to_json_string(try_parse_json(to_json_string(agent)))) IS NOT TRUE
+                     AND ('1'||to_json_string(try_parse_json(to_json_string(agent))) = '0'||to_json_string(try_parse_json(to_json_string(agent)))) IS FALSE
+                     AND ('1'||to_json_string(try_parse_json(to_json_string(agent))) <> '0'||to_json_string(try_parse_json(to_json_string(agent)))) IS NOT FALSE
+                     AND '1'||to_json_string(try_parse_json(to_json_string(agent))) BETWEEN '0'||to_json_string(try_parse_json(to_json_string(agent))) AND 2||to_json_string(try_parse_json(to_json_string(agent)))
+                     AND '1'||to_json_string(try_parse_json(to_json_string(agent))) NOT BETWEEN '1'||to_json_string(try_parse_json(to_json_string(agent))) AND '0'||to_json_string(try_parse_json(to_json_string(agent)))
+                     AND '1'||to_json_string(try_parse_json(to_json_string(agent))) like '%'
+                     AND '1'||to_json_string(try_parse_json(to_json_string(agent))) not like '__DOES_NOT_EXIST__%'
+                     AND '1'||to_json_string(try_parse_json(to_json_string(agent))) IN ('0'||to_json_string(try_parse_json(to_json_string(agent))),
+                                                                                        1||to_json_string(try_parse_json(to_json_string(agent))),
+                                                                                        2||to_json_string(try_parse_json(to_json_string(agent))))
+                     AND '1'||to_json_string(try_parse_json(to_json_string(agent))) NOT IN ('0'||to_json_string(try_parse_json(to_json_string(agent))),
+                                                                                            2||to_json_string(try_parse_json(to_json_string(agent))))))));
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM
+  (SELECT __time, number, client_ip,
+                          '1'||to_json_string(try_parse_json(to_json_string(agent))),
+                          count(*)
+   FROM kttm_nested
+   WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+     AND ('1'||to_json_string(try_parse_json(to_json_string(agent))) IS NULL
+          OR ('1'||to_json_string(try_parse_json(to_json_string(agent))) = 1||to_json_string(try_parse_json(to_json_string(agent)))
+              AND '1'||to_json_string(try_parse_json(to_json_string(agent))) IS NOT DISTINCT
+              FROM 1||to_json_string(try_parse_json(to_json_string(agent)))
+              AND '1'||to_json_string(try_parse_json(to_json_string(agent))) <> '0'||to_json_string(try_parse_json(to_json_string(agent)))
+              AND ('1'||to_json_string(try_parse_json(to_json_string(agent))) IS DISTINCT
+                   FROM '0'||to_json_string(try_parse_json(to_json_string(agent))))
+              AND '1'||to_json_string(try_parse_json(to_json_string(agent))) > '0'||to_json_string(try_parse_json(to_json_string(agent)))
+              AND '1'||to_json_string(try_parse_json(to_json_string(agent))) >= '0'||to_json_string(try_parse_json(to_json_string(agent)))
+              AND '1'||to_json_string(try_parse_json(to_json_string(agent))) < 2||to_json_string(try_parse_json(to_json_string(agent)))
+              AND '1'||to_json_string(try_parse_json(to_json_string(agent))) <= 2||to_json_string(try_parse_json(to_json_string(agent)))
+              AND ('1'||to_json_string(try_parse_json(to_json_string(agent))) <> '0'||to_json_string(try_parse_json(to_json_string(agent)))) IS TRUE
+              AND ('1'||to_json_string(try_parse_json(to_json_string(agent))) = '0'||to_json_string(try_parse_json(to_json_string(agent)))) IS NOT TRUE
+              AND ('1'||to_json_string(try_parse_json(to_json_string(agent))) = '0'||to_json_string(try_parse_json(to_json_string(agent)))) IS FALSE
+              AND ('1'||to_json_string(try_parse_json(to_json_string(agent))) <> '0'||to_json_string(try_parse_json(to_json_string(agent)))) IS NOT FALSE
+              AND '1'||to_json_string(try_parse_json(to_json_string(agent))) BETWEEN '0'||to_json_string(try_parse_json(to_json_string(agent))) AND 2||to_json_string(try_parse_json(to_json_string(agent)))
+              AND '1'||to_json_string(try_parse_json(to_json_string(agent))) NOT BETWEEN '1'||to_json_string(try_parse_json(to_json_string(agent))) AND '0'||to_json_string(try_parse_json(to_json_string(agent)))
+              AND '1'||to_json_string(try_parse_json(to_json_string(agent))) like '%'
+              AND '1'||to_json_string(try_parse_json(to_json_string(agent))) not like '__DOES_NOT_EXIST__%'
+              AND '1'||to_json_string(try_parse_json(to_json_string(agent))) IN ('0'||to_json_string(try_parse_json(to_json_string(agent))),
+                                                                                 1||to_json_string(try_parse_json(to_json_string(agent))),
+                                                                                 2||to_json_string(try_parse_json(to_json_string(agent))))
+              AND '1'||to_json_string(try_parse_json(to_json_string(agent))) NOT IN ('0'||to_json_string(try_parse_json(to_json_string(agent))),
+                                                                                     2||to_json_string(try_parse_json(to_json_string(agent))))))
+   GROUP BY 1,
+            2,
+            3,
+            4);
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+#-------------------------------------------------------------------------
+# TEST_ID: A14: to_json_string
+#-------------------------------------------------------------------------
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND ('1'||to_json_string(agent) IS NULL
+       OR ('1'||to_json_string(agent) = 1||to_json_string(agent)
+           AND '1'||to_json_string(agent) IS NOT DISTINCT
+           FROM 1||to_json_string(agent)
+           AND '1'||to_json_string(agent) <> '0'||to_json_string(agent)
+           AND ('1'||to_json_string(agent) IS DISTINCT
+                FROM '0'||to_json_string(agent))
+           AND '1'||to_json_string(agent) > '0'||to_json_string(agent)
+           AND '1'||to_json_string(agent) >= '0'||to_json_string(agent)
+           AND '1'||to_json_string(agent) < 2||to_json_string(agent)
+           AND '1'||to_json_string(agent) <= 2||to_json_string(agent)
+           AND ('1'||to_json_string(agent) <> '0'||to_json_string(agent)) IS TRUE
+           AND ('1'||to_json_string(agent) = '0'||to_json_string(agent)) IS NOT TRUE
+           AND ('1'||to_json_string(agent) = '0'||to_json_string(agent)) IS FALSE
+           AND ('1'||to_json_string(agent) <> '0'||to_json_string(agent)) IS NOT FALSE
+           AND '1'||to_json_string(agent) BETWEEN '0'||to_json_string(agent) AND 2||to_json_string(agent)
+           AND '1'||to_json_string(agent) NOT BETWEEN '1'||to_json_string(agent) AND '0'||to_json_string(agent)
+           AND '1'||to_json_string(agent) like '%'
+           AND '1'||to_json_string(agent) not like '__DOES_NOT_EXIST__%'
+           AND '1'||to_json_string(agent) IN ('0'||to_json_string(agent),
+                                              1||to_json_string(agent),
+                                              2||to_json_string(agent))
+           AND '1'||to_json_string(agent) NOT IN ('0'||to_json_string(agent),
+                                                  2||to_json_string(agent)))) ;
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND ('1'||to_json_string(agent) IS NULL
+       OR '1'||to_json_string(agent) IN
+         (SELECT '1'||to_json_string(agent)
+          FROM kttm_nested
+          WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+            AND ('1'||to_json_string(agent) IS NULL
+                 OR ('1'||to_json_string(agent) = 1||to_json_string(agent)
+                     AND '1'||to_json_string(agent) IS NOT DISTINCT
+                     FROM 1||to_json_string(agent)
+                     AND '1'||to_json_string(agent) <> '0'||to_json_string(agent)
+                     AND ('1'||to_json_string(agent) IS DISTINCT
+                          FROM '0'||to_json_string(agent))
+                     AND '1'||to_json_string(agent) > '0'||to_json_string(agent)
+                     AND '1'||to_json_string(agent) >= '0'||to_json_string(agent)
+                     AND '1'||to_json_string(agent) < 2||to_json_string(agent)
+                     AND '1'||to_json_string(agent) <= 2||to_json_string(agent)
+                     AND ('1'||to_json_string(agent) <> '0'||to_json_string(agent)) IS TRUE
+                     AND ('1'||to_json_string(agent) = '0'||to_json_string(agent)) IS NOT TRUE
+                     AND ('1'||to_json_string(agent) = '0'||to_json_string(agent)) IS FALSE
+                     AND ('1'||to_json_string(agent) <> '0'||to_json_string(agent)) IS NOT FALSE
+                     AND '1'||to_json_string(agent) BETWEEN '0'||to_json_string(agent) AND 2||to_json_string(agent)
+                     AND '1'||to_json_string(agent) NOT BETWEEN '1'||to_json_string(agent) AND '0'||to_json_string(agent)
+                     AND '1'||to_json_string(agent) like '%'
+                     AND '1'||to_json_string(agent) not like '__DOES_NOT_EXIST__%'
+                     AND '1'||to_json_string(agent) IN ('0'||to_json_string(agent),
+                                                        1||to_json_string(agent),
+                                                        2||to_json_string(agent))
+                     AND '1'||to_json_string(agent) NOT IN ('0'||to_json_string(agent),
+                                                            2||to_json_string(agent))))));
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM
+  (SELECT __time, number, client_ip,
+                          '1'||to_json_string(agent),
+                          count(*)
+   FROM kttm_nested
+   WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+     AND ('1'||to_json_string(agent) IS NULL
+          OR ('1'||to_json_string(agent) = 1||to_json_string(agent)
+              AND '1'||to_json_string(agent) IS NOT DISTINCT
+              FROM 1||to_json_string(agent)
+              AND '1'||to_json_string(agent) <> '0'||to_json_string(agent)
+              AND ('1'||to_json_string(agent) IS DISTINCT
+                   FROM '0'||to_json_string(agent))
+              AND '1'||to_json_string(agent) > '0'||to_json_string(agent)
+              AND '1'||to_json_string(agent) >= '0'||to_json_string(agent)
+              AND '1'||to_json_string(agent) < 2||to_json_string(agent)
+              AND '1'||to_json_string(agent) <= 2||to_json_string(agent)
+              AND ('1'||to_json_string(agent) <> '0'||to_json_string(agent)) IS TRUE
+              AND ('1'||to_json_string(agent) = '0'||to_json_string(agent)) IS NOT TRUE
+              AND ('1'||to_json_string(agent) = '0'||to_json_string(agent)) IS FALSE
+              AND ('1'||to_json_string(agent) <> '0'||to_json_string(agent)) IS NOT FALSE
+              AND '1'||to_json_string(agent) BETWEEN '0'||to_json_string(agent) AND 2||to_json_string(agent)
+              AND '1'||to_json_string(agent) NOT BETWEEN '1'||to_json_string(agent) AND '0'||to_json_string(agent)
+              AND '1'||to_json_string(agent) like '%'
+              AND '1'||to_json_string(agent) not like '__DOES_NOT_EXIST__%'
+              AND '1'||to_json_string(agent) IN ('0'||to_json_string(agent),
+                                                 1||to_json_string(agent),
+                                                 2||to_json_string(agent))
+              AND '1'||to_json_string(agent) NOT IN ('0'||to_json_string(agent),
+                                                     2||to_json_string(agent))))
+   GROUP BY 1,
+            2,
+            3,
+            4);
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+#-------------------------------------------------------------------------
+# Total query count 41
+#-------------------------------------------------------------------------
diff --git a/quidem-ut/src/test/quidem/org.apache.druid.quidem.QTest/qaSQL_mv.iq b/quidem-ut/src/test/quidem/org.apache.druid.quidem.QTest/qaSQL_mv.iq
new file mode 100644
index 000000000000..575c64c57f5e
--- /dev/null
+++ b/quidem-ut/src/test/quidem/org.apache.druid.quidem.QTest/qaSQL_mv.iq
@@ -0,0 +1,2746 @@
+!set useApproximateCountDistinct false
+!use druidtest:///?componentSupplier=KttmNestedComponentSupplier
+!set outputformat mysql
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00';
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+#-------------------------------------------------------------------------
+# TEST_ID: A1: mv_filter_only
+#-------------------------------------------------------------------------
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND ('1'||mv_to_string(mv_filter_only("language", mv_to_array("language")), ',') IS NULL
+       OR ('1'||mv_to_string(mv_filter_only("language", mv_to_array("language")), ',') = 1||mv_to_string(mv_filter_only("language", mv_to_array("language")), ',')
+           AND '1'||mv_to_string(mv_filter_only("language", mv_to_array("language")), ',') IS NOT DISTINCT
+           FROM 1||mv_to_string(mv_filter_only("language", mv_to_array("language")), ',')
+           AND '1'||mv_to_string(mv_filter_only("language", mv_to_array("language")), ',') <> '0'||mv_to_string(mv_filter_only("language", mv_to_array("language")), ',')
+           AND ('1'||mv_to_string(mv_filter_only("language", mv_to_array("language")), ',') IS DISTINCT
+                FROM '0'||mv_to_string(mv_filter_only("language", mv_to_array("language")), ','))
+           AND '1'||mv_to_string(mv_filter_only("language", mv_to_array("language")), ',') > '0'||mv_to_string(mv_filter_only("language", mv_to_array("language")), ',')
+           AND '1'||mv_to_string(mv_filter_only("language", mv_to_array("language")), ',') >= '0'||mv_to_string(mv_filter_only("language", mv_to_array("language")), ',')
+           AND '1'||mv_to_string(mv_filter_only("language", mv_to_array("language")), ',') < 2||mv_to_string(mv_filter_only("language", mv_to_array("language")), ',')
+           AND '1'||mv_to_string(mv_filter_only("language", mv_to_array("language")), ',') <= 2||mv_to_string(mv_filter_only("language", mv_to_array("language")), ',')
+           AND ('1'||mv_to_string(mv_filter_only("language", mv_to_array("language")), ',') <> '0'||mv_to_string(mv_filter_only("language", mv_to_array("language")), ',')) IS TRUE
+           AND ('1'||mv_to_string(mv_filter_only("language", mv_to_array("language")), ',') = '0'||mv_to_string(mv_filter_only("language", mv_to_array("language")), ',')) IS NOT TRUE
+           AND ('1'||mv_to_string(mv_filter_only("language", mv_to_array("language")), ',') = '0'||mv_to_string(mv_filter_only("language", mv_to_array("language")), ',')) IS FALSE
+           AND ('1'||mv_to_string(mv_filter_only("language", mv_to_array("language")), ',') <> '0'||mv_to_string(mv_filter_only("language", mv_to_array("language")), ',')) IS NOT FALSE
+           AND '1'||mv_to_string(mv_filter_only("language", mv_to_array("language")), ',') BETWEEN '0'||mv_to_string(mv_filter_only("language", mv_to_array("language")), ',') AND 2||mv_to_string(mv_filter_only("language", mv_to_array("language")), ',')
+           AND '1'||mv_to_string(mv_filter_only("language", mv_to_array("language")), ',') NOT BETWEEN '1'||mv_to_string(mv_filter_only("language", mv_to_array("language")), ',') AND '0'||mv_to_string(mv_filter_only("language", mv_to_array("language")), ',')
+           AND '1'||mv_to_string(mv_filter_only("language", mv_to_array("language")), ',') like '%'
+           AND '1'||mv_to_string(mv_filter_only("language", mv_to_array("language")), ',') not like '__DOES_NOT_EXIST__%'
+           AND '1'||mv_to_string(mv_filter_only("language", mv_to_array("language")), ',') IN ('0'||mv_to_string(mv_filter_only("language", mv_to_array("language")), ','),
+                                                                                               1||mv_to_string(mv_filter_only("language", mv_to_array("language")), ','),
+                                                                                               2||mv_to_string(mv_filter_only("language", mv_to_array("language")), ','))
+           AND '1'||mv_to_string(mv_filter_only("language", mv_to_array("language")), ',') NOT IN ('0'||mv_to_string(mv_filter_only("language", mv_to_array("language")), ','),
+                                                                                                   2||mv_to_string(mv_filter_only("language", mv_to_array("language")), ',')))) ;
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND ('1'||mv_to_string(mv_filter_only("language", mv_to_array("language")), ',') IS NULL
+       OR '1'||mv_to_string(mv_filter_only("language", mv_to_array("language")), ',') IN
+         (SELECT '1'||mv_to_string(mv_filter_only("language", mv_to_array("language")), ',')
+          FROM kttm_nested
+          WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+            AND ('1'||mv_to_string(mv_filter_only("language", mv_to_array("language")), ',') IS NULL
+                 OR ('1'||mv_to_string(mv_filter_only("language", mv_to_array("language")), ',') = 1||mv_to_string(mv_filter_only("language", mv_to_array("language")), ',')
+                     AND '1'||mv_to_string(mv_filter_only("language", mv_to_array("language")), ',') IS NOT DISTINCT
+                     FROM 1||mv_to_string(mv_filter_only("language", mv_to_array("language")), ',')
+                     AND '1'||mv_to_string(mv_filter_only("language", mv_to_array("language")), ',') <> '0'||mv_to_string(mv_filter_only("language", mv_to_array("language")), ',')
+                     AND ('1'||mv_to_string(mv_filter_only("language", mv_to_array("language")), ',') IS DISTINCT
+                          FROM '0'||mv_to_string(mv_filter_only("language", mv_to_array("language")), ','))
+                     AND '1'||mv_to_string(mv_filter_only("language", mv_to_array("language")), ',') > '0'||mv_to_string(mv_filter_only("language", mv_to_array("language")), ',')
+                     AND '1'||mv_to_string(mv_filter_only("language", mv_to_array("language")), ',') >= '0'||mv_to_string(mv_filter_only("language", mv_to_array("language")), ',')
+                     AND '1'||mv_to_string(mv_filter_only("language", mv_to_array("language")), ',') < 2||mv_to_string(mv_filter_only("language", mv_to_array("language")), ',')
+                     AND '1'||mv_to_string(mv_filter_only("language", mv_to_array("language")), ',') <= 2||mv_to_string(mv_filter_only("language", mv_to_array("language")), ',')
+                     AND ('1'||mv_to_string(mv_filter_only("language", mv_to_array("language")), ',') <> '0'||mv_to_string(mv_filter_only("language", mv_to_array("language")), ',')) IS TRUE
+                     AND ('1'||mv_to_string(mv_filter_only("language", mv_to_array("language")), ',') = '0'||mv_to_string(mv_filter_only("language", mv_to_array("language")), ',')) IS NOT TRUE
+                     AND ('1'||mv_to_string(mv_filter_only("language", mv_to_array("language")), ',') = '0'||mv_to_string(mv_filter_only("language", mv_to_array("language")), ',')) IS FALSE
+                     AND ('1'||mv_to_string(mv_filter_only("language", mv_to_array("language")), ',') <> '0'||mv_to_string(mv_filter_only("language", mv_to_array("language")), ',')) IS NOT FALSE
+                     AND '1'||mv_to_string(mv_filter_only("language", mv_to_array("language")), ',') BETWEEN '0'||mv_to_string(mv_filter_only("language", mv_to_array("language")), ',') AND 2||mv_to_string(mv_filter_only("language", mv_to_array("language")), ',')
+                     AND '1'||mv_to_string(mv_filter_only("language", mv_to_array("language")), ',') NOT BETWEEN '1'||mv_to_string(mv_filter_only("language", mv_to_array("language")), ',') AND '0'||mv_to_string(mv_filter_only("language", mv_to_array("language")), ',')
+                     AND '1'||mv_to_string(mv_filter_only("language", mv_to_array("language")), ',') like '%'
+                     AND '1'||mv_to_string(mv_filter_only("language", mv_to_array("language")), ',') not like '__DOES_NOT_EXIST__%'
+                     AND '1'||mv_to_string(mv_filter_only("language", mv_to_array("language")), ',') IN ('0'||mv_to_string(mv_filter_only("language", mv_to_array("language")), ','),
+                                                                                                         1||mv_to_string(mv_filter_only("language", mv_to_array("language")), ','),
+                                                                                                         2||mv_to_string(mv_filter_only("language", mv_to_array("language")), ','))
+                     AND '1'||mv_to_string(mv_filter_only("language", mv_to_array("language")), ',') NOT IN ('0'||mv_to_string(mv_filter_only("language", mv_to_array("language")), ','),
+                                                                                                             2||mv_to_string(mv_filter_only("language", mv_to_array("language")), ','))))));
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM
+  (SELECT __time, number, client_ip,
+                          '1'||mv_to_string(mv_filter_only("language", mv_to_array("language")), ','),
+                          count(*)
+   FROM kttm_nested
+   WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+     AND ('1'||mv_to_string(mv_filter_only("language", mv_to_array("language")), ',') IS NULL
+          OR ('1'||mv_to_string(mv_filter_only("language", mv_to_array("language")), ',') = 1||mv_to_string(mv_filter_only("language", mv_to_array("language")), ',')
+              AND '1'||mv_to_string(mv_filter_only("language", mv_to_array("language")), ',') IS NOT DISTINCT
+              FROM 1||mv_to_string(mv_filter_only("language", mv_to_array("language")), ',')
+              AND '1'||mv_to_string(mv_filter_only("language", mv_to_array("language")), ',') <> '0'||mv_to_string(mv_filter_only("language", mv_to_array("language")), ',')
+              AND ('1'||mv_to_string(mv_filter_only("language", mv_to_array("language")), ',') IS DISTINCT
+                   FROM '0'||mv_to_string(mv_filter_only("language", mv_to_array("language")), ','))
+              AND '1'||mv_to_string(mv_filter_only("language", mv_to_array("language")), ',') > '0'||mv_to_string(mv_filter_only("language", mv_to_array("language")), ',')
+              AND '1'||mv_to_string(mv_filter_only("language", mv_to_array("language")), ',') >= '0'||mv_to_string(mv_filter_only("language", mv_to_array("language")), ',')
+              AND '1'||mv_to_string(mv_filter_only("language", mv_to_array("language")), ',') < 2||mv_to_string(mv_filter_only("language", mv_to_array("language")), ',')
+              AND '1'||mv_to_string(mv_filter_only("language", mv_to_array("language")), ',') <= 2||mv_to_string(mv_filter_only("language", mv_to_array("language")), ',')
+              AND ('1'||mv_to_string(mv_filter_only("language", mv_to_array("language")), ',') <> '0'||mv_to_string(mv_filter_only("language", mv_to_array("language")), ',')) IS TRUE
+              AND ('1'||mv_to_string(mv_filter_only("language", mv_to_array("language")), ',') = '0'||mv_to_string(mv_filter_only("language", mv_to_array("language")), ',')) IS NOT TRUE
+              AND ('1'||mv_to_string(mv_filter_only("language", mv_to_array("language")), ',') = '0'||mv_to_string(mv_filter_only("language", mv_to_array("language")), ',')) IS FALSE
+              AND ('1'||mv_to_string(mv_filter_only("language", mv_to_array("language")), ',') <> '0'||mv_to_string(mv_filter_only("language", mv_to_array("language")), ',')) IS NOT FALSE
+              AND '1'||mv_to_string(mv_filter_only("language", mv_to_array("language")), ',') BETWEEN '0'||mv_to_string(mv_filter_only("language", mv_to_array("language")), ',') AND 2||mv_to_string(mv_filter_only("language", mv_to_array("language")), ',')
+              AND '1'||mv_to_string(mv_filter_only("language", mv_to_array("language")), ',') NOT BETWEEN '1'||mv_to_string(mv_filter_only("language", mv_to_array("language")), ',') AND '0'||mv_to_string(mv_filter_only("language", mv_to_array("language")), ',')
+              AND '1'||mv_to_string(mv_filter_only("language", mv_to_array("language")), ',') like '%'
+              AND '1'||mv_to_string(mv_filter_only("language", mv_to_array("language")), ',') not like '__DOES_NOT_EXIST__%'
+              AND '1'||mv_to_string(mv_filter_only("language", mv_to_array("language")), ',') IN ('0'||mv_to_string(mv_filter_only("language", mv_to_array("language")), ','),
+                                                                                                  1||mv_to_string(mv_filter_only("language", mv_to_array("language")), ','),
+                                                                                                  2||mv_to_string(mv_filter_only("language", mv_to_array("language")), ','))
+              AND '1'||mv_to_string(mv_filter_only("language", mv_to_array("language")), ',') NOT IN ('0'||mv_to_string(mv_filter_only("language", mv_to_array("language")), ','),
+                                                                                                      2||mv_to_string(mv_filter_only("language", mv_to_array("language")), ','))))
+   GROUP BY 1,
+            2,
+            3,
+            4);
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+#-------------------------------------------------------------------------
+# TEST_ID: A2: mv_filter_none
+#-------------------------------------------------------------------------
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND ('1'||mv_to_string(mv_filter_none("language", mv_to_array("language")), ',') IS NULL
+       OR ('1'||mv_to_string(mv_filter_none("language", mv_to_array("language")), ',') = 1||mv_to_string(mv_filter_none("language", mv_to_array("language")), ',')
+           AND '1'||mv_to_string(mv_filter_none("language", mv_to_array("language")), ',') IS NOT DISTINCT
+           FROM 1||mv_to_string(mv_filter_none("language", mv_to_array("language")), ',')
+           AND '1'||mv_to_string(mv_filter_none("language", mv_to_array("language")), ',') <> '0'||mv_to_string(mv_filter_none("language", mv_to_array("language")), ',')
+           AND ('1'||mv_to_string(mv_filter_none("language", mv_to_array("language")), ',') IS DISTINCT
+                FROM '0'||mv_to_string(mv_filter_none("language", mv_to_array("language")), ','))
+           AND '1'||mv_to_string(mv_filter_none("language", mv_to_array("language")), ',') > '0'||mv_to_string(mv_filter_none("language", mv_to_array("language")), ',')
+           AND '1'||mv_to_string(mv_filter_none("language", mv_to_array("language")), ',') >= '0'||mv_to_string(mv_filter_none("language", mv_to_array("language")), ',')
+           AND '1'||mv_to_string(mv_filter_none("language", mv_to_array("language")), ',') < 2||mv_to_string(mv_filter_none("language", mv_to_array("language")), ',')
+           AND '1'||mv_to_string(mv_filter_none("language", mv_to_array("language")), ',') <= 2||mv_to_string(mv_filter_none("language", mv_to_array("language")), ',')
+           AND ('1'||mv_to_string(mv_filter_none("language", mv_to_array("language")), ',') <> '0'||mv_to_string(mv_filter_none("language", mv_to_array("language")), ',')) IS TRUE
+           AND ('1'||mv_to_string(mv_filter_none("language", mv_to_array("language")), ',') = '0'||mv_to_string(mv_filter_none("language", mv_to_array("language")), ',')) IS NOT TRUE
+           AND ('1'||mv_to_string(mv_filter_none("language", mv_to_array("language")), ',') = '0'||mv_to_string(mv_filter_none("language", mv_to_array("language")), ',')) IS FALSE
+           AND ('1'||mv_to_string(mv_filter_none("language", mv_to_array("language")), ',') <> '0'||mv_to_string(mv_filter_none("language", mv_to_array("language")), ',')) IS NOT FALSE
+           AND '1'||mv_to_string(mv_filter_none("language", mv_to_array("language")), ',') BETWEEN '0'||mv_to_string(mv_filter_none("language", mv_to_array("language")), ',') AND 2||mv_to_string(mv_filter_none("language", mv_to_array("language")), ',')
+           AND '1'||mv_to_string(mv_filter_none("language", mv_to_array("language")), ',') NOT BETWEEN '1'||mv_to_string(mv_filter_none("language", mv_to_array("language")), ',') AND '0'||mv_to_string(mv_filter_none("language", mv_to_array("language")), ',')
+           AND '1'||mv_to_string(mv_filter_none("language", mv_to_array("language")), ',') like '%'
+           AND '1'||mv_to_string(mv_filter_none("language", mv_to_array("language")), ',') not like '__DOES_NOT_EXIST__%'
+           AND '1'||mv_to_string(mv_filter_none("language", mv_to_array("language")), ',') IN ('0'||mv_to_string(mv_filter_none("language", mv_to_array("language")), ','),
+                                                                                               1||mv_to_string(mv_filter_none("language", mv_to_array("language")), ','),
+                                                                                               2||mv_to_string(mv_filter_none("language", mv_to_array("language")), ','))
+           AND '1'||mv_to_string(mv_filter_none("language", mv_to_array("language")), ',') NOT IN ('0'||mv_to_string(mv_filter_none("language", mv_to_array("language")), ','),
+                                                                                                   2||mv_to_string(mv_filter_none("language", mv_to_array("language")), ',')))) ;
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND ('1'||mv_to_string(mv_filter_none("language", mv_to_array("language")), ',') IS NULL
+       OR '1'||mv_to_string(mv_filter_none("language", mv_to_array("language")), ',') IN
+         (SELECT '1'||mv_to_string(mv_filter_none("language", mv_to_array("language")), ',')
+          FROM kttm_nested
+          WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+            AND ('1'||mv_to_string(mv_filter_none("language", mv_to_array("language")), ',') IS NULL
+                 OR ('1'||mv_to_string(mv_filter_none("language", mv_to_array("language")), ',') = 1||mv_to_string(mv_filter_none("language", mv_to_array("language")), ',')
+                     AND '1'||mv_to_string(mv_filter_none("language", mv_to_array("language")), ',') IS NOT DISTINCT
+                     FROM 1||mv_to_string(mv_filter_none("language", mv_to_array("language")), ',')
+                     AND '1'||mv_to_string(mv_filter_none("language", mv_to_array("language")), ',') <> '0'||mv_to_string(mv_filter_none("language", mv_to_array("language")), ',')
+                     AND ('1'||mv_to_string(mv_filter_none("language", mv_to_array("language")), ',') IS DISTINCT
+                          FROM '0'||mv_to_string(mv_filter_none("language", mv_to_array("language")), ','))
+                     AND '1'||mv_to_string(mv_filter_none("language", mv_to_array("language")), ',') > '0'||mv_to_string(mv_filter_none("language", mv_to_array("language")), ',')
+                     AND '1'||mv_to_string(mv_filter_none("language", mv_to_array("language")), ',') >= '0'||mv_to_string(mv_filter_none("language", mv_to_array("language")), ',')
+                     AND '1'||mv_to_string(mv_filter_none("language", mv_to_array("language")), ',') < 2||mv_to_string(mv_filter_none("language", mv_to_array("language")), ',')
+                     AND '1'||mv_to_string(mv_filter_none("language", mv_to_array("language")), ',') <= 2||mv_to_string(mv_filter_none("language", mv_to_array("language")), ',')
+                     AND ('1'||mv_to_string(mv_filter_none("language", mv_to_array("language")), ',') <> '0'||mv_to_string(mv_filter_none("language", mv_to_array("language")), ',')) IS TRUE
+                     AND ('1'||mv_to_string(mv_filter_none("language", mv_to_array("language")), ',') = '0'||mv_to_string(mv_filter_none("language", mv_to_array("language")), ',')) IS NOT TRUE
+                     AND ('1'||mv_to_string(mv_filter_none("language", mv_to_array("language")), ',') = '0'||mv_to_string(mv_filter_none("language", mv_to_array("language")), ',')) IS FALSE
+                     AND ('1'||mv_to_string(mv_filter_none("language", mv_to_array("language")), ',') <> '0'||mv_to_string(mv_filter_none("language", mv_to_array("language")), ',')) IS NOT FALSE
+                     AND '1'||mv_to_string(mv_filter_none("language", mv_to_array("language")), ',') BETWEEN '0'||mv_to_string(mv_filter_none("language", mv_to_array("language")), ',') AND 2||mv_to_string(mv_filter_none("language", mv_to_array("language")), ',')
+                     AND '1'||mv_to_string(mv_filter_none("language", mv_to_array("language")), ',') NOT BETWEEN '1'||mv_to_string(mv_filter_none("language", mv_to_array("language")), ',') AND '0'||mv_to_string(mv_filter_none("language", mv_to_array("language")), ',')
+                     AND '1'||mv_to_string(mv_filter_none("language", mv_to_array("language")), ',') like '%'
+                     AND '1'||mv_to_string(mv_filter_none("language", mv_to_array("language")), ',') not like '__DOES_NOT_EXIST__%'
+                     AND '1'||mv_to_string(mv_filter_none("language", mv_to_array("language")), ',') IN ('0'||mv_to_string(mv_filter_none("language", mv_to_array("language")), ','),
+                                                                                                         1||mv_to_string(mv_filter_none("language", mv_to_array("language")), ','),
+                                                                                                         2||mv_to_string(mv_filter_none("language", mv_to_array("language")), ','))
+                     AND '1'||mv_to_string(mv_filter_none("language", mv_to_array("language")), ',') NOT IN ('0'||mv_to_string(mv_filter_none("language", mv_to_array("language")), ','),
+                                                                                                             2||mv_to_string(mv_filter_none("language", mv_to_array("language")), ','))))));
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM
+  (SELECT __time, number, client_ip,
+                          '1'||mv_to_string(mv_filter_none("language", mv_to_array("language")), ','),
+                          count(*)
+   FROM kttm_nested
+   WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+     AND ('1'||mv_to_string(mv_filter_none("language", mv_to_array("language")), ',') IS NULL
+          OR ('1'||mv_to_string(mv_filter_none("language", mv_to_array("language")), ',') = 1||mv_to_string(mv_filter_none("language", mv_to_array("language")), ',')
+              AND '1'||mv_to_string(mv_filter_none("language", mv_to_array("language")), ',') IS NOT DISTINCT
+              FROM 1||mv_to_string(mv_filter_none("language", mv_to_array("language")), ',')
+              AND '1'||mv_to_string(mv_filter_none("language", mv_to_array("language")), ',') <> '0'||mv_to_string(mv_filter_none("language", mv_to_array("language")), ',')
+              AND ('1'||mv_to_string(mv_filter_none("language", mv_to_array("language")), ',') IS DISTINCT
+                   FROM '0'||mv_to_string(mv_filter_none("language", mv_to_array("language")), ','))
+              AND '1'||mv_to_string(mv_filter_none("language", mv_to_array("language")), ',') > '0'||mv_to_string(mv_filter_none("language", mv_to_array("language")), ',')
+              AND '1'||mv_to_string(mv_filter_none("language", mv_to_array("language")), ',') >= '0'||mv_to_string(mv_filter_none("language", mv_to_array("language")), ',')
+              AND '1'||mv_to_string(mv_filter_none("language", mv_to_array("language")), ',') < 2||mv_to_string(mv_filter_none("language", mv_to_array("language")), ',')
+              AND '1'||mv_to_string(mv_filter_none("language", mv_to_array("language")), ',') <= 2||mv_to_string(mv_filter_none("language", mv_to_array("language")), ',')
+              AND ('1'||mv_to_string(mv_filter_none("language", mv_to_array("language")), ',') <> '0'||mv_to_string(mv_filter_none("language", mv_to_array("language")), ',')) IS TRUE
+              AND ('1'||mv_to_string(mv_filter_none("language", mv_to_array("language")), ',') = '0'||mv_to_string(mv_filter_none("language", mv_to_array("language")), ',')) IS NOT TRUE
+              AND ('1'||mv_to_string(mv_filter_none("language", mv_to_array("language")), ',') = '0'||mv_to_string(mv_filter_none("language", mv_to_array("language")), ',')) IS FALSE
+              AND ('1'||mv_to_string(mv_filter_none("language", mv_to_array("language")), ',') <> '0'||mv_to_string(mv_filter_none("language", mv_to_array("language")), ',')) IS NOT FALSE
+              AND '1'||mv_to_string(mv_filter_none("language", mv_to_array("language")), ',') BETWEEN '0'||mv_to_string(mv_filter_none("language", mv_to_array("language")), ',') AND 2||mv_to_string(mv_filter_none("language", mv_to_array("language")), ',')
+              AND '1'||mv_to_string(mv_filter_none("language", mv_to_array("language")), ',') NOT BETWEEN '1'||mv_to_string(mv_filter_none("language", mv_to_array("language")), ',') AND '0'||mv_to_string(mv_filter_none("language", mv_to_array("language")), ',')
+              AND '1'||mv_to_string(mv_filter_none("language", mv_to_array("language")), ',') like '%'
+              AND '1'||mv_to_string(mv_filter_none("language", mv_to_array("language")), ',') not like '__DOES_NOT_EXIST__%'
+              AND '1'||mv_to_string(mv_filter_none("language", mv_to_array("language")), ',') IN ('0'||mv_to_string(mv_filter_none("language", mv_to_array("language")), ','),
+                                                                                                  1||mv_to_string(mv_filter_none("language", mv_to_array("language")), ','),
+                                                                                                  2||mv_to_string(mv_filter_none("language", mv_to_array("language")), ','))
+              AND '1'||mv_to_string(mv_filter_none("language", mv_to_array("language")), ',') NOT IN ('0'||mv_to_string(mv_filter_none("language", mv_to_array("language")), ','),
+                                                                                                      2||mv_to_string(mv_filter_none("language", mv_to_array("language")), ','))))
+   GROUP BY 1,
+            2,
+            3,
+            4);
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+#-------------------------------------------------------------------------
+# TEST_ID: A3: mv_length
+#-------------------------------------------------------------------------
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND (mv_length("language")+1 IS NULL
+       OR (mv_length("language")+1 = mv_length("language")+1
+           AND mv_length("language")+1 IS NOT DISTINCT
+           FROM mv_length("language")+1
+           AND mv_length("language")+1 <> mv_length("language")+0
+           AND (mv_length("language")+1 IS DISTINCT
+                FROM mv_length("language")+0)
+           AND mv_length("language")+1 > mv_length("language")+0
+           AND mv_length("language")+1 >= mv_length("language")+0
+           AND mv_length("language")+1 < mv_length("language")+2
+           AND mv_length("language")+1 <= mv_length("language")+2
+           AND (mv_length("language")+1 <> mv_length("language")+0) IS TRUE
+           AND (mv_length("language")+1 = mv_length("language")+0) IS NOT TRUE
+           AND (mv_length("language")+1 = mv_length("language")+0) IS FALSE
+           AND (mv_length("language")+1 <> mv_length("language")+0) IS NOT FALSE
+           AND mv_length("language")+1 BETWEEN mv_length("language")+0 AND mv_length("language")+2
+           AND mv_length("language")+1 NOT BETWEEN mv_length("language")+1 AND mv_length("language")+0
+           AND mv_length("language")+1 like '%'
+           AND mv_length("language")+1 not like '__DOES_NOT_EXIST__%'
+           AND mv_length("language")+1 IN (mv_length("language")+0,
+                                           mv_length("language")+1,
+                                           mv_length("language")+2)
+           AND mv_length("language")+1 NOT IN (mv_length("language")+0,
+                                               mv_length("language")+2))) ;
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND (mv_length("language")+1 IS NULL
+       OR mv_length("language")+1 IN
+         (SELECT mv_length("language")+1
+          FROM kttm_nested
+          WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+            AND (mv_length("language")+1 IS NULL
+                 OR (mv_length("language")+1 = mv_length("language")+1
+                     AND mv_length("language")+1 IS NOT DISTINCT
+                     FROM mv_length("language")+1
+                     AND mv_length("language")+1 <> mv_length("language")+0
+                     AND (mv_length("language")+1 IS DISTINCT
+                          FROM mv_length("language")+0)
+                     AND mv_length("language")+1 > mv_length("language")+0
+                     AND mv_length("language")+1 >= mv_length("language")+0
+                     AND mv_length("language")+1 < mv_length("language")+2
+                     AND mv_length("language")+1 <= mv_length("language")+2
+                     AND (mv_length("language")+1 <> mv_length("language")+0) IS TRUE
+                     AND (mv_length("language")+1 = mv_length("language")+0) IS NOT TRUE
+                     AND (mv_length("language")+1 = mv_length("language")+0) IS FALSE
+                     AND (mv_length("language")+1 <> mv_length("language")+0) IS NOT FALSE
+                     AND mv_length("language")+1 BETWEEN mv_length("language")+0 AND mv_length("language")+2
+                     AND mv_length("language")+1 NOT BETWEEN mv_length("language")+1 AND mv_length("language")+0
+                     AND mv_length("language")+1 like '%'
+                     AND mv_length("language")+1 not like '__DOES_NOT_EXIST__%'
+                     AND mv_length("language")+1 IN (mv_length("language")+0,
+                                                     mv_length("language")+1,
+                                                     mv_length("language")+2)
+                     AND mv_length("language")+1 NOT IN (mv_length("language")+0,
+                                                         mv_length("language")+2)))));
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM
+  (SELECT __time, number, client_ip,
+                          mv_length("language")+1,
+                          count(*)
+   FROM kttm_nested
+   WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+     AND (mv_length("language")+1 IS NULL
+          OR (mv_length("language")+1 = mv_length("language")+1
+              AND mv_length("language")+1 IS NOT DISTINCT
+              FROM mv_length("language")+1
+              AND mv_length("language")+1 <> mv_length("language")+0
+              AND (mv_length("language")+1 IS DISTINCT
+                   FROM mv_length("language")+0)
+              AND mv_length("language")+1 > mv_length("language")+0
+              AND mv_length("language")+1 >= mv_length("language")+0
+              AND mv_length("language")+1 < mv_length("language")+2
+              AND mv_length("language")+1 <= mv_length("language")+2
+              AND (mv_length("language")+1 <> mv_length("language")+0) IS TRUE
+              AND (mv_length("language")+1 = mv_length("language")+0) IS NOT TRUE
+              AND (mv_length("language")+1 = mv_length("language")+0) IS FALSE
+              AND (mv_length("language")+1 <> mv_length("language")+0) IS NOT FALSE
+              AND mv_length("language")+1 BETWEEN mv_length("language")+0 AND mv_length("language")+2
+              AND mv_length("language")+1 NOT BETWEEN mv_length("language")+1 AND mv_length("language")+0
+              AND mv_length("language")+1 like '%'
+              AND mv_length("language")+1 not like '__DOES_NOT_EXIST__%'
+              AND mv_length("language")+1 IN (mv_length("language")+0,
+                                              mv_length("language")+1,
+                                              mv_length("language")+2)
+              AND mv_length("language")+1 NOT IN (mv_length("language")+0,
+                                                  mv_length("language")+2)))
+   GROUP BY 1,
+            2,
+            3,
+            4);
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+#-------------------------------------------------------------------------
+# TEST_ID: A4: mv_offset
+#-------------------------------------------------------------------------
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND ('1'||mv_offset("language", 0) IS NULL
+       OR ('1'||mv_offset("language", 0) = 1||mv_offset("language", 0)
+           AND '1'||mv_offset("language", 0) IS NOT DISTINCT
+           FROM 1||mv_offset("language", 0)
+           AND '1'||mv_offset("language", 0) <> '0'||mv_offset("language", 0)
+           AND ('1'||mv_offset("language", 0) IS DISTINCT
+                FROM '0'||mv_offset("language", 0))
+           AND '1'||mv_offset("language", 0) > '0'||mv_offset("language", 0)
+           AND '1'||mv_offset("language", 0) >= '0'||mv_offset("language", 0)
+           AND '1'||mv_offset("language", 0) < 2||mv_offset("language", 0)
+           AND '1'||mv_offset("language", 0) <= 2||mv_offset("language", 0)
+           AND ('1'||mv_offset("language", 0) <> '0'||mv_offset("language", 0)) IS TRUE
+           AND ('1'||mv_offset("language", 0) = '0'||mv_offset("language", 0)) IS NOT TRUE
+           AND ('1'||mv_offset("language", 0) = '0'||mv_offset("language", 0)) IS FALSE
+           AND ('1'||mv_offset("language", 0) <> '0'||mv_offset("language", 0)) IS NOT FALSE
+           AND '1'||mv_offset("language", 0) BETWEEN '0'||mv_offset("language", 0) AND 2||mv_offset("language", 0)
+           AND '1'||mv_offset("language", 0) NOT BETWEEN '1'||mv_offset("language", 0) AND '0'||mv_offset("language", 0)
+           AND '1'||mv_offset("language", 0) like '%'
+           AND '1'||mv_offset("language", 0) not like '__DOES_NOT_EXIST__%'
+           AND '1'||mv_offset("language", 0) IN ('0'||mv_offset("language", 0),
+                                                 1||mv_offset("language", 0),
+                                                 2||mv_offset("language", 0))
+           AND '1'||mv_offset("language", 0) NOT IN ('0'||mv_offset("language", 0),
+                                                     2||mv_offset("language", 0)))) ;
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND ('1'||mv_offset("language", 0) IS NULL
+       OR '1'||mv_offset("language", 0) IN
+         (SELECT '1'||mv_offset("language", 0)
+          FROM kttm_nested
+          WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+            AND ('1'||mv_offset("language", 0) IS NULL
+                 OR ('1'||mv_offset("language", 0) = 1||mv_offset("language", 0)
+                     AND '1'||mv_offset("language", 0) IS NOT DISTINCT
+                     FROM 1||mv_offset("language", 0)
+                     AND '1'||mv_offset("language", 0) <> '0'||mv_offset("language", 0)
+                     AND ('1'||mv_offset("language", 0) IS DISTINCT
+                          FROM '0'||mv_offset("language", 0))
+                     AND '1'||mv_offset("language", 0) > '0'||mv_offset("language", 0)
+                     AND '1'||mv_offset("language", 0) >= '0'||mv_offset("language", 0)
+                     AND '1'||mv_offset("language", 0) < 2||mv_offset("language", 0)
+                     AND '1'||mv_offset("language", 0) <= 2||mv_offset("language", 0)
+                     AND ('1'||mv_offset("language", 0) <> '0'||mv_offset("language", 0)) IS TRUE
+                     AND ('1'||mv_offset("language", 0) = '0'||mv_offset("language", 0)) IS NOT TRUE
+                     AND ('1'||mv_offset("language", 0) = '0'||mv_offset("language", 0)) IS FALSE
+                     AND ('1'||mv_offset("language", 0) <> '0'||mv_offset("language", 0)) IS NOT FALSE
+                     AND '1'||mv_offset("language", 0) BETWEEN '0'||mv_offset("language", 0) AND 2||mv_offset("language", 0)
+                     AND '1'||mv_offset("language", 0) NOT BETWEEN '1'||mv_offset("language", 0) AND '0'||mv_offset("language", 0)
+                     AND '1'||mv_offset("language", 0) like '%'
+                     AND '1'||mv_offset("language", 0) not like '__DOES_NOT_EXIST__%'
+                     AND '1'||mv_offset("language", 0) IN ('0'||mv_offset("language", 0),
+                                                           1||mv_offset("language", 0),
+                                                           2||mv_offset("language", 0))
+                     AND '1'||mv_offset("language", 0) NOT IN ('0'||mv_offset("language", 0),
+                                                               2||mv_offset("language", 0))))));
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM
+  (SELECT __time, number, client_ip,
+                          '1'||mv_offset("language", 0),
+                          count(*)
+   FROM kttm_nested
+   WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+     AND ('1'||mv_offset("language", 0) IS NULL
+          OR ('1'||mv_offset("language", 0) = 1||mv_offset("language", 0)
+              AND '1'||mv_offset("language", 0) IS NOT DISTINCT
+              FROM 1||mv_offset("language", 0)
+              AND '1'||mv_offset("language", 0) <> '0'||mv_offset("language", 0)
+              AND ('1'||mv_offset("language", 0) IS DISTINCT
+                   FROM '0'||mv_offset("language", 0))
+              AND '1'||mv_offset("language", 0) > '0'||mv_offset("language", 0)
+              AND '1'||mv_offset("language", 0) >= '0'||mv_offset("language", 0)
+              AND '1'||mv_offset("language", 0) < 2||mv_offset("language", 0)
+              AND '1'||mv_offset("language", 0) <= 2||mv_offset("language", 0)
+              AND ('1'||mv_offset("language", 0) <> '0'||mv_offset("language", 0)) IS TRUE
+              AND ('1'||mv_offset("language", 0) = '0'||mv_offset("language", 0)) IS NOT TRUE
+              AND ('1'||mv_offset("language", 0) = '0'||mv_offset("language", 0)) IS FALSE
+              AND ('1'||mv_offset("language", 0) <> '0'||mv_offset("language", 0)) IS NOT FALSE
+              AND '1'||mv_offset("language", 0) BETWEEN '0'||mv_offset("language", 0) AND 2||mv_offset("language", 0)
+              AND '1'||mv_offset("language", 0) NOT BETWEEN '1'||mv_offset("language", 0) AND '0'||mv_offset("language", 0)
+              AND '1'||mv_offset("language", 0) like '%'
+              AND '1'||mv_offset("language", 0) not like '__DOES_NOT_EXIST__%'
+              AND '1'||mv_offset("language", 0) IN ('0'||mv_offset("language", 0),
+                                                    1||mv_offset("language", 0),
+                                                    2||mv_offset("language", 0))
+              AND '1'||mv_offset("language", 0) NOT IN ('0'||mv_offset("language", 0),
+                                                        2||mv_offset("language", 0))))
+   GROUP BY 1,
+            2,
+            3,
+            4);
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+#-------------------------------------------------------------------------
+# TEST_ID: A5: mv_ordinal
+#-------------------------------------------------------------------------
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND ('1'||mv_ordinal("language", 1) IS NULL
+       OR ('1'||mv_ordinal("language", 1) = 1||mv_ordinal("language", 1)
+           AND '1'||mv_ordinal("language", 1) IS NOT DISTINCT
+           FROM 1||mv_ordinal("language", 1)
+           AND '1'||mv_ordinal("language", 1) <> '0'||mv_ordinal("language", 1)
+           AND ('1'||mv_ordinal("language", 1) IS DISTINCT
+                FROM '0'||mv_ordinal("language", 1))
+           AND '1'||mv_ordinal("language", 1) > '0'||mv_ordinal("language", 1)
+           AND '1'||mv_ordinal("language", 1) >= '0'||mv_ordinal("language", 1)
+           AND '1'||mv_ordinal("language", 1) < 2||mv_ordinal("language", 1)
+           AND '1'||mv_ordinal("language", 1) <= 2||mv_ordinal("language", 1)
+           AND ('1'||mv_ordinal("language", 1) <> '0'||mv_ordinal("language", 1)) IS TRUE
+           AND ('1'||mv_ordinal("language", 1) = '0'||mv_ordinal("language", 1)) IS NOT TRUE
+           AND ('1'||mv_ordinal("language", 1) = '0'||mv_ordinal("language", 1)) IS FALSE
+           AND ('1'||mv_ordinal("language", 1) <> '0'||mv_ordinal("language", 1)) IS NOT FALSE
+           AND '1'||mv_ordinal("language", 1) BETWEEN '0'||mv_ordinal("language", 1) AND 2||mv_ordinal("language", 1)
+           AND '1'||mv_ordinal("language", 1) NOT BETWEEN '1'||mv_ordinal("language", 1) AND '0'||mv_ordinal("language", 1)
+           AND '1'||mv_ordinal("language", 1) like '%'
+           AND '1'||mv_ordinal("language", 1) not like '__DOES_NOT_EXIST__%'
+           AND '1'||mv_ordinal("language", 1) IN ('0'||mv_ordinal("language", 1),
+                                                  1||mv_ordinal("language", 1),
+                                                  2||mv_ordinal("language", 1))
+           AND '1'||mv_ordinal("language", 1) NOT IN ('0'||mv_ordinal("language", 1),
+                                                      2||mv_ordinal("language", 1)))) ;
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND ('1'||mv_ordinal("language", 1) IS NULL
+       OR '1'||mv_ordinal("language", 1) IN
+         (SELECT '1'||mv_ordinal("language", 1)
+          FROM kttm_nested
+          WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+            AND ('1'||mv_ordinal("language", 1) IS NULL
+                 OR ('1'||mv_ordinal("language", 1) = 1||mv_ordinal("language", 1)
+                     AND '1'||mv_ordinal("language", 1) IS NOT DISTINCT
+                     FROM 1||mv_ordinal("language", 1)
+                     AND '1'||mv_ordinal("language", 1) <> '0'||mv_ordinal("language", 1)
+                     AND ('1'||mv_ordinal("language", 1) IS DISTINCT
+                          FROM '0'||mv_ordinal("language", 1))
+                     AND '1'||mv_ordinal("language", 1) > '0'||mv_ordinal("language", 1)
+                     AND '1'||mv_ordinal("language", 1) >= '0'||mv_ordinal("language", 1)
+                     AND '1'||mv_ordinal("language", 1) < 2||mv_ordinal("language", 1)
+                     AND '1'||mv_ordinal("language", 1) <= 2||mv_ordinal("language", 1)
+                     AND ('1'||mv_ordinal("language", 1) <> '0'||mv_ordinal("language", 1)) IS TRUE
+                     AND ('1'||mv_ordinal("language", 1) = '0'||mv_ordinal("language", 1)) IS NOT TRUE
+                     AND ('1'||mv_ordinal("language", 1) = '0'||mv_ordinal("language", 1)) IS FALSE
+                     AND ('1'||mv_ordinal("language", 1) <> '0'||mv_ordinal("language", 1)) IS NOT FALSE
+                     AND '1'||mv_ordinal("language", 1) BETWEEN '0'||mv_ordinal("language", 1) AND 2||mv_ordinal("language", 1)
+                     AND '1'||mv_ordinal("language", 1) NOT BETWEEN '1'||mv_ordinal("language", 1) AND '0'||mv_ordinal("language", 1)
+                     AND '1'||mv_ordinal("language", 1) like '%'
+                     AND '1'||mv_ordinal("language", 1) not like '__DOES_NOT_EXIST__%'
+                     AND '1'||mv_ordinal("language", 1) IN ('0'||mv_ordinal("language", 1),
+                                                            1||mv_ordinal("language", 1),
+                                                            2||mv_ordinal("language", 1))
+                     AND '1'||mv_ordinal("language", 1) NOT IN ('0'||mv_ordinal("language", 1),
+                                                                2||mv_ordinal("language", 1))))));
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM
+  (SELECT __time, number, client_ip,
+                          '1'||mv_ordinal("language", 1),
+                          count(*)
+   FROM kttm_nested
+   WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+     AND ('1'||mv_ordinal("language", 1) IS NULL
+          OR ('1'||mv_ordinal("language", 1) = 1||mv_ordinal("language", 1)
+              AND '1'||mv_ordinal("language", 1) IS NOT DISTINCT
+              FROM 1||mv_ordinal("language", 1)
+              AND '1'||mv_ordinal("language", 1) <> '0'||mv_ordinal("language", 1)
+              AND ('1'||mv_ordinal("language", 1) IS DISTINCT
+                   FROM '0'||mv_ordinal("language", 1))
+              AND '1'||mv_ordinal("language", 1) > '0'||mv_ordinal("language", 1)
+              AND '1'||mv_ordinal("language", 1) >= '0'||mv_ordinal("language", 1)
+              AND '1'||mv_ordinal("language", 1) < 2||mv_ordinal("language", 1)
+              AND '1'||mv_ordinal("language", 1) <= 2||mv_ordinal("language", 1)
+              AND ('1'||mv_ordinal("language", 1) <> '0'||mv_ordinal("language", 1)) IS TRUE
+              AND ('1'||mv_ordinal("language", 1) = '0'||mv_ordinal("language", 1)) IS NOT TRUE
+              AND ('1'||mv_ordinal("language", 1) = '0'||mv_ordinal("language", 1)) IS FALSE
+              AND ('1'||mv_ordinal("language", 1) <> '0'||mv_ordinal("language", 1)) IS NOT FALSE
+              AND '1'||mv_ordinal("language", 1) BETWEEN '0'||mv_ordinal("language", 1) AND 2||mv_ordinal("language", 1)
+              AND '1'||mv_ordinal("language", 1) NOT BETWEEN '1'||mv_ordinal("language", 1) AND '0'||mv_ordinal("language", 1)
+              AND '1'||mv_ordinal("language", 1) like '%'
+              AND '1'||mv_ordinal("language", 1) not like '__DOES_NOT_EXIST__%'
+              AND '1'||mv_ordinal("language", 1) IN ('0'||mv_ordinal("language", 1),
+                                                     1||mv_ordinal("language", 1),
+                                                     2||mv_ordinal("language", 1))
+              AND '1'||mv_ordinal("language", 1) NOT IN ('0'||mv_ordinal("language", 1),
+                                                         2||mv_ordinal("language", 1))))
+   GROUP BY 1,
+            2,
+            3,
+            4);
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+#-------------------------------------------------------------------------
+# TEST_ID: A6: mv_contains
+#-------------------------------------------------------------------------
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND (CASE
+           WHEN mv_contains("language", "language") THEN 20
+           ELSE 2
+       END IS NULL
+       OR (CASE
+               WHEN mv_contains("language", "language") THEN 20
+               ELSE 2
+           END = CASE
+                     WHEN mv_contains("language", "language") THEN 20
+                     ELSE 2
+                 END
+           AND CASE
+                   WHEN mv_contains("language", "language") THEN 20
+                   ELSE 2
+               END IS NOT DISTINCT
+           FROM CASE
+                    WHEN mv_contains("language", "language") THEN 20
+                    ELSE 2
+                END
+           AND CASE
+                   WHEN mv_contains("language", "language") THEN 20
+                   ELSE 2
+               END <> CASE
+                          WHEN mv_contains("language", "language") THEN 10
+                          ELSE 1
+                      END
+           AND (CASE
+                    WHEN mv_contains("language", "language") THEN 20
+                    ELSE 2
+                END IS DISTINCT
+                FROM CASE
+                         WHEN mv_contains("language", "language") THEN 10
+                         ELSE 1
+                     END)
+           AND CASE
+                   WHEN mv_contains("language", "language") THEN 20
+                   ELSE 2
+               END > CASE
+                         WHEN mv_contains("language", "language") THEN 10
+                         ELSE 1
+                     END
+           AND CASE
+                   WHEN mv_contains("language", "language") THEN 20
+                   ELSE 2
+               END >= CASE
+                          WHEN mv_contains("language", "language") THEN 10
+                          ELSE 1
+                      END
+           AND CASE
+                   WHEN mv_contains("language", "language") THEN 20
+                   ELSE 2
+               END < CASE
+                         WHEN mv_contains("language", "language") THEN 30
+                         ELSE 3
+                     END
+           AND CASE
+                   WHEN mv_contains("language", "language") THEN 20
+                   ELSE 2
+               END <= CASE
+                          WHEN mv_contains("language", "language") THEN 30
+                          ELSE 3
+                      END
+           AND (CASE
+                    WHEN mv_contains("language", "language") THEN 20
+                    ELSE 2
+                END <> CASE
+                           WHEN mv_contains("language", "language") THEN 10
+                           ELSE 1
+                       END) IS TRUE
+           AND (CASE
+                    WHEN mv_contains("language", "language") THEN 20
+                    ELSE 2
+                END = CASE
+                          WHEN mv_contains("language", "language") THEN 10
+                          ELSE 1
+                      END) IS NOT TRUE
+           AND (CASE
+                    WHEN mv_contains("language", "language") THEN 20
+                    ELSE 2
+                END = CASE
+                          WHEN mv_contains("language", "language") THEN 10
+                          ELSE 1
+                      END) IS FALSE
+           AND (CASE
+                    WHEN mv_contains("language", "language") THEN 20
+                    ELSE 2
+                END <> CASE
+                           WHEN mv_contains("language", "language") THEN 10
+                           ELSE 1
+                       END) IS NOT FALSE
+           AND CASE
+                   WHEN mv_contains("language", "language") THEN 20
+                   ELSE 2
+               END BETWEEN CASE
+                               WHEN mv_contains("language", "language") THEN 10
+                               ELSE 1
+                           END AND CASE
+                                       WHEN mv_contains("language", "language") THEN 30
+                                       ELSE 3
+                                   END
+           AND CASE
+                   WHEN mv_contains("language", "language") THEN 20
+                   ELSE 2
+               END NOT BETWEEN CASE
+                                   WHEN mv_contains("language", "language") THEN 20
+                                   ELSE 2
+                               END AND CASE
+                                           WHEN mv_contains("language", "language") THEN 10
+                                           ELSE 1
+                                       END
+           AND CASE
+                   WHEN mv_contains("language", "language") THEN 20
+                   ELSE 2
+               END like '%'
+           AND CASE
+                   WHEN mv_contains("language", "language") THEN 20
+                   ELSE 2
+               END not like '__DOES_NOT_EXIST__%'
+           AND CASE
+                   WHEN mv_contains("language", "language") THEN 20
+                   ELSE 2
+               END IN (CASE
+                           WHEN mv_contains("language", "language") THEN 10
+                           ELSE 1
+                       END,
+                       CASE
+                           WHEN mv_contains("language", "language") THEN 20
+                           ELSE 2
+                       END,
+                       CASE
+                           WHEN mv_contains("language", "language") THEN 30
+                           ELSE 3
+                       END)
+           AND CASE
+                   WHEN mv_contains("language", "language") THEN 20
+                   ELSE 2
+               END NOT IN (CASE
+                               WHEN mv_contains("language", "language") THEN 10
+                               ELSE 1
+                           END,
+                           CASE
+                               WHEN mv_contains("language", "language") THEN 30
+                               ELSE 3
+                           END))) ;
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND (CASE
+           WHEN mv_contains("language", "language") THEN 20
+           ELSE 2
+       END IS NULL
+       OR CASE
+              WHEN mv_contains("language", "language") THEN 20
+              ELSE 2
+          END IN
+         (SELECT CASE
+                     WHEN mv_contains("language", "language") THEN 20
+                     ELSE 2
+                 END
+          FROM kttm_nested
+          WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+            AND (CASE
+                     WHEN mv_contains("language", "language") THEN 20
+                     ELSE 2
+                 END IS NULL
+                 OR (CASE
+                         WHEN mv_contains("language", "language") THEN 20
+                         ELSE 2
+                     END = CASE
+                               WHEN mv_contains("language", "language") THEN 20
+                               ELSE 2
+                           END
+                     AND CASE
+                             WHEN mv_contains("language", "language") THEN 20
+                             ELSE 2
+                         END IS NOT DISTINCT
+                     FROM CASE
+                              WHEN mv_contains("language", "language") THEN 20
+                              ELSE 2
+                          END
+                     AND CASE
+                             WHEN mv_contains("language", "language") THEN 20
+                             ELSE 2
+                         END <> CASE
+                                    WHEN mv_contains("language", "language") THEN 10
+                                    ELSE 1
+                                END
+                     AND (CASE
+                              WHEN mv_contains("language", "language") THEN 20
+                              ELSE 2
+                          END IS DISTINCT
+                          FROM CASE
+                                   WHEN mv_contains("language", "language") THEN 10
+                                   ELSE 1
+                               END)
+                     AND CASE
+                             WHEN mv_contains("language", "language") THEN 20
+                             ELSE 2
+                         END > CASE
+                                   WHEN mv_contains("language", "language") THEN 10
+                                   ELSE 1
+                               END
+                     AND CASE
+                             WHEN mv_contains("language", "language") THEN 20
+                             ELSE 2
+                         END >= CASE
+                                    WHEN mv_contains("language", "language") THEN 10
+                                    ELSE 1
+                                END
+                     AND CASE
+                             WHEN mv_contains("language", "language") THEN 20
+                             ELSE 2
+                         END < CASE
+                                   WHEN mv_contains("language", "language") THEN 30
+                                   ELSE 3
+                               END
+                     AND CASE
+                             WHEN mv_contains("language", "language") THEN 20
+                             ELSE 2
+                         END <= CASE
+                                    WHEN mv_contains("language", "language") THEN 30
+                                    ELSE 3
+                                END
+                     AND (CASE
+                              WHEN mv_contains("language", "language") THEN 20
+                              ELSE 2
+                          END <> CASE
+                                     WHEN mv_contains("language", "language") THEN 10
+                                     ELSE 1
+                                 END) IS TRUE
+                     AND (CASE
+                              WHEN mv_contains("language", "language") THEN 20
+                              ELSE 2
+                          END = CASE
+                                    WHEN mv_contains("language", "language") THEN 10
+                                    ELSE 1
+                                END) IS NOT TRUE
+                     AND (CASE
+                              WHEN mv_contains("language", "language") THEN 20
+                              ELSE 2
+                          END = CASE
+                                    WHEN mv_contains("language", "language") THEN 10
+                                    ELSE 1
+                                END) IS FALSE
+                     AND (CASE
+                              WHEN mv_contains("language", "language") THEN 20
+                              ELSE 2
+                          END <> CASE
+                                     WHEN mv_contains("language", "language") THEN 10
+                                     ELSE 1
+                                 END) IS NOT FALSE
+                     AND CASE
+                             WHEN mv_contains("language", "language") THEN 20
+                             ELSE 2
+                         END BETWEEN CASE
+                                         WHEN mv_contains("language", "language") THEN 10
+                                         ELSE 1
+                                     END AND CASE
+                                                 WHEN mv_contains("language", "language") THEN 30
+                                                 ELSE 3
+                                             END
+                     AND CASE
+                             WHEN mv_contains("language", "language") THEN 20
+                             ELSE 2
+                         END NOT BETWEEN CASE
+                                             WHEN mv_contains("language", "language") THEN 20
+                                             ELSE 2
+                                         END AND CASE
+                                                     WHEN mv_contains("language", "language") THEN 10
+                                                     ELSE 1
+                                                 END
+                     AND CASE
+                             WHEN mv_contains("language", "language") THEN 20
+                             ELSE 2
+                         END like '%'
+                     AND CASE
+                             WHEN mv_contains("language", "language") THEN 20
+                             ELSE 2
+                         END not like '__DOES_NOT_EXIST__%'
+                     AND CASE
+                             WHEN mv_contains("language", "language") THEN 20
+                             ELSE 2
+                         END IN (CASE
+                                     WHEN mv_contains("language", "language") THEN 10
+                                     ELSE 1
+                                 END,
+                                 CASE
+                                     WHEN mv_contains("language", "language") THEN 20
+                                     ELSE 2
+                                 END,
+                                 CASE
+                                     WHEN mv_contains("language", "language") THEN 30
+                                     ELSE 3
+                                 END)
+                     AND CASE
+                             WHEN mv_contains("language", "language") THEN 20
+                             ELSE 2
+                         END NOT IN (CASE
+                                         WHEN mv_contains("language", "language") THEN 10
+                                         ELSE 1
+                                     END,
+                                     CASE
+                                         WHEN mv_contains("language", "language") THEN 30
+                                         ELSE 3
+                                     END)))));
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM
+  (SELECT __time, number, client_ip,
+                          CASE
+                              WHEN mv_contains("language", "language") THEN 20
+                              ELSE 2
+                          END,
+                          count(*)
+   FROM kttm_nested
+   WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+     AND (CASE
+              WHEN mv_contains("language", "language") THEN 20
+              ELSE 2
+          END IS NULL
+          OR (CASE
+                  WHEN mv_contains("language", "language") THEN 20
+                  ELSE 2
+              END = CASE
+                        WHEN mv_contains("language", "language") THEN 20
+                        ELSE 2
+                    END
+              AND CASE
+                      WHEN mv_contains("language", "language") THEN 20
+                      ELSE 2
+                  END IS NOT DISTINCT
+              FROM CASE
+                       WHEN mv_contains("language", "language") THEN 20
+                       ELSE 2
+                   END
+              AND CASE
+                      WHEN mv_contains("language", "language") THEN 20
+                      ELSE 2
+                  END <> CASE
+                             WHEN mv_contains("language", "language") THEN 10
+                             ELSE 1
+                         END
+              AND (CASE
+                       WHEN mv_contains("language", "language") THEN 20
+                       ELSE 2
+                   END IS DISTINCT
+                   FROM CASE
+                            WHEN mv_contains("language", "language") THEN 10
+                            ELSE 1
+                        END)
+              AND CASE
+                      WHEN mv_contains("language", "language") THEN 20
+                      ELSE 2
+                  END > CASE
+                            WHEN mv_contains("language", "language") THEN 10
+                            ELSE 1
+                        END
+              AND CASE
+                      WHEN mv_contains("language", "language") THEN 20
+                      ELSE 2
+                  END >= CASE
+                             WHEN mv_contains("language", "language") THEN 10
+                             ELSE 1
+                         END
+              AND CASE
+                      WHEN mv_contains("language", "language") THEN 20
+                      ELSE 2
+                  END < CASE
+                            WHEN mv_contains("language", "language") THEN 30
+                            ELSE 3
+                        END
+              AND CASE
+                      WHEN mv_contains("language", "language") THEN 20
+                      ELSE 2
+                  END <= CASE
+                             WHEN mv_contains("language", "language") THEN 30
+                             ELSE 3
+                         END
+              AND (CASE
+                       WHEN mv_contains("language", "language") THEN 20
+                       ELSE 2
+                   END <> CASE
+                              WHEN mv_contains("language", "language") THEN 10
+                              ELSE 1
+                          END) IS TRUE
+              AND (CASE
+                       WHEN mv_contains("language", "language") THEN 20
+                       ELSE 2
+                   END = CASE
+                             WHEN mv_contains("language", "language") THEN 10
+                             ELSE 1
+                         END) IS NOT TRUE
+              AND (CASE
+                       WHEN mv_contains("language", "language") THEN 20
+                       ELSE 2
+                   END = CASE
+                             WHEN mv_contains("language", "language") THEN 10
+                             ELSE 1
+                         END) IS FALSE
+              AND (CASE
+                       WHEN mv_contains("language", "language") THEN 20
+                       ELSE 2
+                   END <> CASE
+                              WHEN mv_contains("language", "language") THEN 10
+                              ELSE 1
+                          END) IS NOT FALSE
+              AND CASE
+                      WHEN mv_contains("language", "language") THEN 20
+                      ELSE 2
+                  END BETWEEN CASE
+                                  WHEN mv_contains("language", "language") THEN 10
+                                  ELSE 1
+                              END AND CASE
+                                          WHEN mv_contains("language", "language") THEN 30
+                                          ELSE 3
+                                      END
+              AND CASE
+                      WHEN mv_contains("language", "language") THEN 20
+                      ELSE 2
+                  END NOT BETWEEN CASE
+                                      WHEN mv_contains("language", "language") THEN 20
+                                      ELSE 2
+                                  END AND CASE
+                                              WHEN mv_contains("language", "language") THEN 10
+                                              ELSE 1
+                                          END
+              AND CASE
+                      WHEN mv_contains("language", "language") THEN 20
+                      ELSE 2
+                  END like '%'
+              AND CASE
+                      WHEN mv_contains("language", "language") THEN 20
+                      ELSE 2
+                  END not like '__DOES_NOT_EXIST__%'
+              AND CASE
+                      WHEN mv_contains("language", "language") THEN 20
+                      ELSE 2
+                  END IN (CASE
+                              WHEN mv_contains("language", "language") THEN 10
+                              ELSE 1
+                          END,
+                          CASE
+                              WHEN mv_contains("language", "language") THEN 20
+                              ELSE 2
+                          END,
+                          CASE
+                              WHEN mv_contains("language", "language") THEN 30
+                              ELSE 3
+                          END)
+              AND CASE
+                      WHEN mv_contains("language", "language") THEN 20
+                      ELSE 2
+                  END NOT IN (CASE
+                                  WHEN mv_contains("language", "language") THEN 10
+                                  ELSE 1
+                              END,
+                              CASE
+                                  WHEN mv_contains("language", "language") THEN 30
+                                  ELSE 3
+                              END)))
+   GROUP BY 1,
+            2,
+            3,
+            4);
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+#-------------------------------------------------------------------------
+# TEST_ID: A7: mv_overlap
+#-------------------------------------------------------------------------
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND (CASE
+           WHEN mv_overlap("language", "language") THEN 20
+           ELSE 2
+       END IS NULL
+       OR (CASE
+               WHEN mv_overlap("language", "language") THEN 20
+               ELSE 2
+           END = CASE
+                     WHEN mv_overlap("language", "language") THEN 20
+                     ELSE 2
+                 END
+           AND CASE
+                   WHEN mv_overlap("language", "language") THEN 20
+                   ELSE 2
+               END IS NOT DISTINCT
+           FROM CASE
+                    WHEN mv_overlap("language", "language") THEN 20
+                    ELSE 2
+                END
+           AND CASE
+                   WHEN mv_overlap("language", "language") THEN 20
+                   ELSE 2
+               END <> CASE
+                          WHEN mv_overlap("language", "language") THEN 10
+                          ELSE 1
+                      END
+           AND (CASE
+                    WHEN mv_overlap("language", "language") THEN 20
+                    ELSE 2
+                END IS DISTINCT
+                FROM CASE
+                         WHEN mv_overlap("language", "language") THEN 10
+                         ELSE 1
+                     END)
+           AND CASE
+                   WHEN mv_overlap("language", "language") THEN 20
+                   ELSE 2
+               END > CASE
+                         WHEN mv_overlap("language", "language") THEN 10
+                         ELSE 1
+                     END
+           AND CASE
+                   WHEN mv_overlap("language", "language") THEN 20
+                   ELSE 2
+               END >= CASE
+                          WHEN mv_overlap("language", "language") THEN 10
+                          ELSE 1
+                      END
+           AND CASE
+                   WHEN mv_overlap("language", "language") THEN 20
+                   ELSE 2
+               END < CASE
+                         WHEN mv_overlap("language", "language") THEN 30
+                         ELSE 3
+                     END
+           AND CASE
+                   WHEN mv_overlap("language", "language") THEN 20
+                   ELSE 2
+               END <= CASE
+                          WHEN mv_overlap("language", "language") THEN 30
+                          ELSE 3
+                      END
+           AND (CASE
+                    WHEN mv_overlap("language", "language") THEN 20
+                    ELSE 2
+                END <> CASE
+                           WHEN mv_overlap("language", "language") THEN 10
+                           ELSE 1
+                       END) IS TRUE
+           AND (CASE
+                    WHEN mv_overlap("language", "language") THEN 20
+                    ELSE 2
+                END = CASE
+                          WHEN mv_overlap("language", "language") THEN 10
+                          ELSE 1
+                      END) IS NOT TRUE
+           AND (CASE
+                    WHEN mv_overlap("language", "language") THEN 20
+                    ELSE 2
+                END = CASE
+                          WHEN mv_overlap("language", "language") THEN 10
+                          ELSE 1
+                      END) IS FALSE
+           AND (CASE
+                    WHEN mv_overlap("language", "language") THEN 20
+                    ELSE 2
+                END <> CASE
+                           WHEN mv_overlap("language", "language") THEN 10
+                           ELSE 1
+                       END) IS NOT FALSE
+           AND CASE
+                   WHEN mv_overlap("language", "language") THEN 20
+                   ELSE 2
+               END BETWEEN CASE
+                               WHEN mv_overlap("language", "language") THEN 10
+                               ELSE 1
+                           END AND CASE
+                                       WHEN mv_overlap("language", "language") THEN 30
+                                       ELSE 3
+                                   END
+           AND CASE
+                   WHEN mv_overlap("language", "language") THEN 20
+                   ELSE 2
+               END NOT BETWEEN CASE
+                                   WHEN mv_overlap("language", "language") THEN 20
+                                   ELSE 2
+                               END AND CASE
+                                           WHEN mv_overlap("language", "language") THEN 10
+                                           ELSE 1
+                                       END
+           AND CASE
+                   WHEN mv_overlap("language", "language") THEN 20
+                   ELSE 2
+               END like '%'
+           AND CASE
+                   WHEN mv_overlap("language", "language") THEN 20
+                   ELSE 2
+               END not like '__DOES_NOT_EXIST__%'
+           AND CASE
+                   WHEN mv_overlap("language", "language") THEN 20
+                   ELSE 2
+               END IN (CASE
+                           WHEN mv_overlap("language", "language") THEN 10
+                           ELSE 1
+                       END,
+                       CASE
+                           WHEN mv_overlap("language", "language") THEN 20
+                           ELSE 2
+                       END,
+                       CASE
+                           WHEN mv_overlap("language", "language") THEN 30
+                           ELSE 3
+                       END)
+           AND CASE
+                   WHEN mv_overlap("language", "language") THEN 20
+                   ELSE 2
+               END NOT IN (CASE
+                               WHEN mv_overlap("language", "language") THEN 10
+                               ELSE 1
+                           END,
+                           CASE
+                               WHEN mv_overlap("language", "language") THEN 30
+                               ELSE 3
+                           END))) ;
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND (CASE
+           WHEN mv_overlap("language", "language") THEN 20
+           ELSE 2
+       END IS NULL
+       OR CASE
+              WHEN mv_overlap("language", "language") THEN 20
+              ELSE 2
+          END IN
+         (SELECT CASE
+                     WHEN mv_overlap("language", "language") THEN 20
+                     ELSE 2
+                 END
+          FROM kttm_nested
+          WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+            AND (CASE
+                     WHEN mv_overlap("language", "language") THEN 20
+                     ELSE 2
+                 END IS NULL
+                 OR (CASE
+                         WHEN mv_overlap("language", "language") THEN 20
+                         ELSE 2
+                     END = CASE
+                               WHEN mv_overlap("language", "language") THEN 20
+                               ELSE 2
+                           END
+                     AND CASE
+                             WHEN mv_overlap("language", "language") THEN 20
+                             ELSE 2
+                         END IS NOT DISTINCT
+                     FROM CASE
+                              WHEN mv_overlap("language", "language") THEN 20
+                              ELSE 2
+                          END
+                     AND CASE
+                             WHEN mv_overlap("language", "language") THEN 20
+                             ELSE 2
+                         END <> CASE
+                                    WHEN mv_overlap("language", "language") THEN 10
+                                    ELSE 1
+                                END
+                     AND (CASE
+                              WHEN mv_overlap("language", "language") THEN 20
+                              ELSE 2
+                          END IS DISTINCT
+                          FROM CASE
+                                   WHEN mv_overlap("language", "language") THEN 10
+                                   ELSE 1
+                               END)
+                     AND CASE
+                             WHEN mv_overlap("language", "language") THEN 20
+                             ELSE 2
+                         END > CASE
+                                   WHEN mv_overlap("language", "language") THEN 10
+                                   ELSE 1
+                               END
+                     AND CASE
+                             WHEN mv_overlap("language", "language") THEN 20
+                             ELSE 2
+                         END >= CASE
+                                    WHEN mv_overlap("language", "language") THEN 10
+                                    ELSE 1
+                                END
+                     AND CASE
+                             WHEN mv_overlap("language", "language") THEN 20
+                             ELSE 2
+                         END < CASE
+                                   WHEN mv_overlap("language", "language") THEN 30
+                                   ELSE 3
+                               END
+                     AND CASE
+                             WHEN mv_overlap("language", "language") THEN 20
+                             ELSE 2
+                         END <= CASE
+                                    WHEN mv_overlap("language", "language") THEN 30
+                                    ELSE 3
+                                END
+                     AND (CASE
+                              WHEN mv_overlap("language", "language") THEN 20
+                              ELSE 2
+                          END <> CASE
+                                     WHEN mv_overlap("language", "language") THEN 10
+                                     ELSE 1
+                                 END) IS TRUE
+                     AND (CASE
+                              WHEN mv_overlap("language", "language") THEN 20
+                              ELSE 2
+                          END = CASE
+                                    WHEN mv_overlap("language", "language") THEN 10
+                                    ELSE 1
+                                END) IS NOT TRUE
+                     AND (CASE
+                              WHEN mv_overlap("language", "language") THEN 20
+                              ELSE 2
+                          END = CASE
+                                    WHEN mv_overlap("language", "language") THEN 10
+                                    ELSE 1
+                                END) IS FALSE
+                     AND (CASE
+                              WHEN mv_overlap("language", "language") THEN 20
+                              ELSE 2
+                          END <> CASE
+                                     WHEN mv_overlap("language", "language") THEN 10
+                                     ELSE 1
+                                 END) IS NOT FALSE
+                     AND CASE
+                             WHEN mv_overlap("language", "language") THEN 20
+                             ELSE 2
+                         END BETWEEN CASE
+                                         WHEN mv_overlap("language", "language") THEN 10
+                                         ELSE 1
+                                     END AND CASE
+                                                 WHEN mv_overlap("language", "language") THEN 30
+                                                 ELSE 3
+                                             END
+                     AND CASE
+                             WHEN mv_overlap("language", "language") THEN 20
+                             ELSE 2
+                         END NOT BETWEEN CASE
+                                             WHEN mv_overlap("language", "language") THEN 20
+                                             ELSE 2
+                                         END AND CASE
+                                                     WHEN mv_overlap("language", "language") THEN 10
+                                                     ELSE 1
+                                                 END
+                     AND CASE
+                             WHEN mv_overlap("language", "language") THEN 20
+                             ELSE 2
+                         END like '%'
+                     AND CASE
+                             WHEN mv_overlap("language", "language") THEN 20
+                             ELSE 2
+                         END not like '__DOES_NOT_EXIST__%'
+                     AND CASE
+                             WHEN mv_overlap("language", "language") THEN 20
+                             ELSE 2
+                         END IN (CASE
+                                     WHEN mv_overlap("language", "language") THEN 10
+                                     ELSE 1
+                                 END,
+                                 CASE
+                                     WHEN mv_overlap("language", "language") THEN 20
+                                     ELSE 2
+                                 END,
+                                 CASE
+                                     WHEN mv_overlap("language", "language") THEN 30
+                                     ELSE 3
+                                 END)
+                     AND CASE
+                             WHEN mv_overlap("language", "language") THEN 20
+                             ELSE 2
+                         END NOT IN (CASE
+                                         WHEN mv_overlap("language", "language") THEN 10
+                                         ELSE 1
+                                     END,
+                                     CASE
+                                         WHEN mv_overlap("language", "language") THEN 30
+                                         ELSE 3
+                                     END)))));
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM
+  (SELECT __time, number, client_ip,
+                          CASE
+                              WHEN mv_overlap("language", "language") THEN 20
+                              ELSE 2
+                          END,
+                          count(*)
+   FROM kttm_nested
+   WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+     AND (CASE
+              WHEN mv_overlap("language", "language") THEN 20
+              ELSE 2
+          END IS NULL
+          OR (CASE
+                  WHEN mv_overlap("language", "language") THEN 20
+                  ELSE 2
+              END = CASE
+                        WHEN mv_overlap("language", "language") THEN 20
+                        ELSE 2
+                    END
+              AND CASE
+                      WHEN mv_overlap("language", "language") THEN 20
+                      ELSE 2
+                  END IS NOT DISTINCT
+              FROM CASE
+                       WHEN mv_overlap("language", "language") THEN 20
+                       ELSE 2
+                   END
+              AND CASE
+                      WHEN mv_overlap("language", "language") THEN 20
+                      ELSE 2
+                  END <> CASE
+                             WHEN mv_overlap("language", "language") THEN 10
+                             ELSE 1
+                         END
+              AND (CASE
+                       WHEN mv_overlap("language", "language") THEN 20
+                       ELSE 2
+                   END IS DISTINCT
+                   FROM CASE
+                            WHEN mv_overlap("language", "language") THEN 10
+                            ELSE 1
+                        END)
+              AND CASE
+                      WHEN mv_overlap("language", "language") THEN 20
+                      ELSE 2
+                  END > CASE
+                            WHEN mv_overlap("language", "language") THEN 10
+                            ELSE 1
+                        END
+              AND CASE
+                      WHEN mv_overlap("language", "language") THEN 20
+                      ELSE 2
+                  END >= CASE
+                             WHEN mv_overlap("language", "language") THEN 10
+                             ELSE 1
+                         END
+              AND CASE
+                      WHEN mv_overlap("language", "language") THEN 20
+                      ELSE 2
+                  END < CASE
+                            WHEN mv_overlap("language", "language") THEN 30
+                            ELSE 3
+                        END
+              AND CASE
+                      WHEN mv_overlap("language", "language") THEN 20
+                      ELSE 2
+                  END <= CASE
+                             WHEN mv_overlap("language", "language") THEN 30
+                             ELSE 3
+                         END
+              AND (CASE
+                       WHEN mv_overlap("language", "language") THEN 20
+                       ELSE 2
+                   END <> CASE
+                              WHEN mv_overlap("language", "language") THEN 10
+                              ELSE 1
+                          END) IS TRUE
+              AND (CASE
+                       WHEN mv_overlap("language", "language") THEN 20
+                       ELSE 2
+                   END = CASE
+                             WHEN mv_overlap("language", "language") THEN 10
+                             ELSE 1
+                         END) IS NOT TRUE
+              AND (CASE
+                       WHEN mv_overlap("language", "language") THEN 20
+                       ELSE 2
+                   END = CASE
+                             WHEN mv_overlap("language", "language") THEN 10
+                             ELSE 1
+                         END) IS FALSE
+              AND (CASE
+                       WHEN mv_overlap("language", "language") THEN 20
+                       ELSE 2
+                   END <> CASE
+                              WHEN mv_overlap("language", "language") THEN 10
+                              ELSE 1
+                          END) IS NOT FALSE
+              AND CASE
+                      WHEN mv_overlap("language", "language") THEN 20
+                      ELSE 2
+                  END BETWEEN CASE
+                                  WHEN mv_overlap("language", "language") THEN 10
+                                  ELSE 1
+                              END AND CASE
+                                          WHEN mv_overlap("language", "language") THEN 30
+                                          ELSE 3
+                                      END
+              AND CASE
+                      WHEN mv_overlap("language", "language") THEN 20
+                      ELSE 2
+                  END NOT BETWEEN CASE
+                                      WHEN mv_overlap("language", "language") THEN 20
+                                      ELSE 2
+                                  END AND CASE
+                                              WHEN mv_overlap("language", "language") THEN 10
+                                              ELSE 1
+                                          END
+              AND CASE
+                      WHEN mv_overlap("language", "language") THEN 20
+                      ELSE 2
+                  END like '%'
+              AND CASE
+                      WHEN mv_overlap("language", "language") THEN 20
+                      ELSE 2
+                  END not like '__DOES_NOT_EXIST__%'
+              AND CASE
+                      WHEN mv_overlap("language", "language") THEN 20
+                      ELSE 2
+                  END IN (CASE
+                              WHEN mv_overlap("language", "language") THEN 10
+                              ELSE 1
+                          END,
+                          CASE
+                              WHEN mv_overlap("language", "language") THEN 20
+                              ELSE 2
+                          END,
+                          CASE
+                              WHEN mv_overlap("language", "language") THEN 30
+                              ELSE 3
+                          END)
+              AND CASE
+                      WHEN mv_overlap("language", "language") THEN 20
+                      ELSE 2
+                  END NOT IN (CASE
+                                  WHEN mv_overlap("language", "language") THEN 10
+                                  ELSE 1
+                              END,
+                              CASE
+                                  WHEN mv_overlap("language", "language") THEN 30
+                                  ELSE 3
+                              END)))
+   GROUP BY 1,
+            2,
+            3,
+            4);
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+#-------------------------------------------------------------------------
+# TEST_ID: A8: mv_offset_of
+#-------------------------------------------------------------------------
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND (mv_offset_of("language", client_ip) IS NULL
+       OR (mv_offset_of("language", client_ip) = mv_offset_of("language", client_ip)+0
+           AND mv_offset_of("language", client_ip) IS NOT DISTINCT
+           FROM mv_offset_of("language", client_ip)+0
+           AND mv_offset_of("language", client_ip) <> mv_offset_of("language", client_ip)-1
+           AND (mv_offset_of("language", client_ip) IS DISTINCT
+                FROM mv_offset_of("language", client_ip)-1)
+           AND mv_offset_of("language", client_ip) > mv_offset_of("language", client_ip)-1
+           AND mv_offset_of("language", client_ip) >= mv_offset_of("language", client_ip)-1
+           AND mv_offset_of("language", client_ip) < mv_offset_of("language", client_ip)+1
+           AND mv_offset_of("language", client_ip) <= mv_offset_of("language", client_ip)+1
+           AND (mv_offset_of("language", client_ip) <> mv_offset_of("language", client_ip)-1) IS TRUE
+           AND (mv_offset_of("language", client_ip) = mv_offset_of("language", client_ip)-1) IS NOT TRUE
+           AND (mv_offset_of("language", client_ip) = mv_offset_of("language", client_ip)-1) IS FALSE
+           AND (mv_offset_of("language", client_ip) <> mv_offset_of("language", client_ip)-1) IS NOT FALSE
+           AND mv_offset_of("language", client_ip) BETWEEN mv_offset_of("language", client_ip)-1 AND mv_offset_of("language", client_ip)+1
+           AND mv_offset_of("language", client_ip) NOT BETWEEN mv_offset_of("language", client_ip) AND mv_offset_of("language", client_ip)-1
+           AND mv_offset_of("language", client_ip) like '%'
+           AND mv_offset_of("language", client_ip) not like '__DOES_NOT_EXIST__%'
+           AND mv_offset_of("language", client_ip) IN (mv_offset_of("language", client_ip)-1,
+                                                                                          mv_offset_of("language", client_ip)+0,
+                                                                                          mv_offset_of("language", client_ip)+1)
+           AND mv_offset_of("language", client_ip) NOT IN (mv_offset_of("language", client_ip)-1,
+                                                                                              mv_offset_of("language", client_ip)+1))) ;
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND (mv_offset_of("language", client_ip) IS NULL
+       OR mv_offset_of("language", client_ip) IN
+         (SELECT mv_offset_of("language", client_ip)
+          FROM kttm_nested
+          WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+            AND (mv_offset_of("language", client_ip) IS NULL
+                 OR (mv_offset_of("language", client_ip) = mv_offset_of("language", client_ip)+0
+                     AND mv_offset_of("language", client_ip) IS NOT DISTINCT
+                     FROM mv_offset_of("language", client_ip)+0
+                     AND mv_offset_of("language", client_ip) <> mv_offset_of("language", client_ip)-1
+                     AND (mv_offset_of("language", client_ip) IS DISTINCT
+                          FROM mv_offset_of("language", client_ip)-1)
+                     AND mv_offset_of("language", client_ip) > mv_offset_of("language", client_ip)-1
+                     AND mv_offset_of("language", client_ip) >= mv_offset_of("language", client_ip)-1
+                     AND mv_offset_of("language", client_ip) < mv_offset_of("language", client_ip)+1
+                     AND mv_offset_of("language", client_ip) <= mv_offset_of("language", client_ip)+1
+                     AND (mv_offset_of("language", client_ip) <> mv_offset_of("language", client_ip)-1) IS TRUE
+                     AND (mv_offset_of("language", client_ip) = mv_offset_of("language", client_ip)-1) IS NOT TRUE
+                     AND (mv_offset_of("language", client_ip) = mv_offset_of("language", client_ip)-1) IS FALSE
+                     AND (mv_offset_of("language", client_ip) <> mv_offset_of("language", client_ip)-1) IS NOT FALSE
+                     AND mv_offset_of("language", client_ip) BETWEEN mv_offset_of("language", client_ip)-1 AND mv_offset_of("language", client_ip)+1
+                     AND mv_offset_of("language", client_ip) NOT BETWEEN mv_offset_of("language", client_ip) AND mv_offset_of("language", client_ip)-1
+                     AND mv_offset_of("language", client_ip) like '%'
+                     AND mv_offset_of("language", client_ip) not like '__DOES_NOT_EXIST__%'
+                     AND mv_offset_of("language", client_ip) IN (mv_offset_of("language", client_ip)-1,
+                                                                                                    mv_offset_of("language", client_ip)+0,
+                                                                                                    mv_offset_of("language", client_ip)+1)
+                     AND mv_offset_of("language", client_ip) NOT IN (mv_offset_of("language", client_ip)-1,
+                                                                                                        mv_offset_of("language", client_ip)+1)))));
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM
+  (SELECT __time, number, client_ip,
+                          mv_offset_of("language", client_ip),
+                          count(*)
+   FROM kttm_nested
+   WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+     AND (mv_offset_of("language", client_ip) IS NULL
+          OR (mv_offset_of("language", client_ip) = mv_offset_of("language", client_ip)+0
+              AND mv_offset_of("language", client_ip) IS NOT DISTINCT
+              FROM mv_offset_of("language", client_ip)+0
+              AND mv_offset_of("language", client_ip) <> mv_offset_of("language", client_ip)-1
+              AND (mv_offset_of("language", client_ip) IS DISTINCT
+                   FROM mv_offset_of("language", client_ip)-1)
+              AND mv_offset_of("language", client_ip) > mv_offset_of("language", client_ip)-1
+              AND mv_offset_of("language", client_ip) >= mv_offset_of("language", client_ip)-1
+              AND mv_offset_of("language", client_ip) < mv_offset_of("language", client_ip)+1
+              AND mv_offset_of("language", client_ip) <= mv_offset_of("language", client_ip)+1
+              AND (mv_offset_of("language", client_ip) <> mv_offset_of("language", client_ip)-1) IS TRUE
+              AND (mv_offset_of("language", client_ip) = mv_offset_of("language", client_ip)-1) IS NOT TRUE
+              AND (mv_offset_of("language", client_ip) = mv_offset_of("language", client_ip)-1) IS FALSE
+              AND (mv_offset_of("language", client_ip) <> mv_offset_of("language", client_ip)-1) IS NOT FALSE
+              AND mv_offset_of("language", client_ip) BETWEEN mv_offset_of("language", client_ip)-1 AND mv_offset_of("language", client_ip)+1
+              AND mv_offset_of("language", client_ip) NOT BETWEEN mv_offset_of("language", client_ip) AND mv_offset_of("language", client_ip)-1
+              AND mv_offset_of("language", client_ip) like '%'
+              AND mv_offset_of("language", client_ip) not like '__DOES_NOT_EXIST__%'
+              AND mv_offset_of("language", client_ip) IN (mv_offset_of("language", client_ip)-1,
+                                                                                             mv_offset_of("language", client_ip)+0,
+                                                                                             mv_offset_of("language", client_ip)+1)
+              AND mv_offset_of("language", client_ip) NOT IN (mv_offset_of("language", client_ip)-1,
+                                                                                                 mv_offset_of("language", client_ip)+1)))
+   GROUP BY 1,
+            2,
+            3,
+            4);
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+#-------------------------------------------------------------------------
+# TEST_ID: A9: mv_ordinal_of
+#-------------------------------------------------------------------------
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND (mv_ordinal_of("language", client_ip) IS NULL
+       OR (mv_ordinal_of("language", client_ip) = mv_ordinal_of("language", client_ip)+0
+           AND mv_ordinal_of("language", client_ip) IS NOT DISTINCT
+           FROM mv_ordinal_of("language", client_ip)+0
+           AND mv_ordinal_of("language", client_ip) <> mv_ordinal_of("language", client_ip)-1
+           AND (mv_ordinal_of("language", client_ip) IS DISTINCT
+                FROM mv_ordinal_of("language", client_ip)-1)
+           AND mv_ordinal_of("language", client_ip) > mv_ordinal_of("language", client_ip)-1
+           AND mv_ordinal_of("language", client_ip) >= mv_ordinal_of("language", client_ip)-1
+           AND mv_ordinal_of("language", client_ip) < mv_ordinal_of("language", client_ip)+1
+           AND mv_ordinal_of("language", client_ip) <= mv_ordinal_of("language", client_ip)+1
+           AND (mv_ordinal_of("language", client_ip) <> mv_ordinal_of("language", client_ip)-1) IS TRUE
+           AND (mv_ordinal_of("language", client_ip) = mv_ordinal_of("language", client_ip)-1) IS NOT TRUE
+           AND (mv_ordinal_of("language", client_ip) = mv_ordinal_of("language", client_ip)-1) IS FALSE
+           AND (mv_ordinal_of("language", client_ip) <> mv_ordinal_of("language", client_ip)-1) IS NOT FALSE
+           AND mv_ordinal_of("language", client_ip) BETWEEN mv_ordinal_of("language", client_ip)-1 AND mv_ordinal_of("language", client_ip)+1
+           AND mv_ordinal_of("language", client_ip) NOT BETWEEN mv_ordinal_of("language", client_ip) AND mv_ordinal_of("language", client_ip)-1
+           AND mv_ordinal_of("language", client_ip) like '%'
+           AND mv_ordinal_of("language", client_ip) not like '__DOES_NOT_EXIST__%'
+           AND mv_ordinal_of("language", client_ip) IN (mv_ordinal_of("language", client_ip)-1,
+                                                                                            mv_ordinal_of("language", client_ip)+0,
+                                                                                            mv_ordinal_of("language", client_ip)+1)
+           AND mv_ordinal_of("language", client_ip) NOT IN (mv_ordinal_of("language", client_ip)-1,
+                                                                                                mv_ordinal_of("language", client_ip)+1))) ;
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND (mv_ordinal_of("language", client_ip) IS NULL
+       OR mv_ordinal_of("language", client_ip) IN
+         (SELECT mv_ordinal_of("language", client_ip)
+          FROM kttm_nested
+          WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+            AND (mv_ordinal_of("language", client_ip) IS NULL
+                 OR (mv_ordinal_of("language", client_ip) = mv_ordinal_of("language", client_ip)+0
+                     AND mv_ordinal_of("language", client_ip) IS NOT DISTINCT
+                     FROM mv_ordinal_of("language", client_ip)+0
+                     AND mv_ordinal_of("language", client_ip) <> mv_ordinal_of("language", client_ip)-1
+                     AND (mv_ordinal_of("language", client_ip) IS DISTINCT
+                          FROM mv_ordinal_of("language", client_ip)-1)
+                     AND mv_ordinal_of("language", client_ip) > mv_ordinal_of("language", client_ip)-1
+                     AND mv_ordinal_of("language", client_ip) >= mv_ordinal_of("language", client_ip)-1
+                     AND mv_ordinal_of("language", client_ip) < mv_ordinal_of("language", client_ip)+1
+                     AND mv_ordinal_of("language", client_ip) <= mv_ordinal_of("language", client_ip)+1
+                     AND (mv_ordinal_of("language", client_ip) <> mv_ordinal_of("language", client_ip)-1) IS TRUE
+                     AND (mv_ordinal_of("language", client_ip) = mv_ordinal_of("language", client_ip)-1) IS NOT TRUE
+                     AND (mv_ordinal_of("language", client_ip) = mv_ordinal_of("language", client_ip)-1) IS FALSE
+                     AND (mv_ordinal_of("language", client_ip) <> mv_ordinal_of("language", client_ip)-1) IS NOT FALSE
+                     AND mv_ordinal_of("language", client_ip) BETWEEN mv_ordinal_of("language", client_ip)-1 AND mv_ordinal_of("language", client_ip)+1
+                     AND mv_ordinal_of("language", client_ip) NOT BETWEEN mv_ordinal_of("language", client_ip) AND mv_ordinal_of("language", client_ip)-1
+                     AND mv_ordinal_of("language", client_ip) like '%'
+                     AND mv_ordinal_of("language", client_ip) not like '__DOES_NOT_EXIST__%'
+                     AND mv_ordinal_of("language", client_ip) IN (mv_ordinal_of("language", client_ip)-1,
+                                                                                                      mv_ordinal_of("language", client_ip)+0,
+                                                                                                      mv_ordinal_of("language", client_ip)+1)
+                     AND mv_ordinal_of("language", client_ip) NOT IN (mv_ordinal_of("language", client_ip)-1,
+                                                                                                          mv_ordinal_of("language", client_ip)+1)))));
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM
+  (SELECT __time, number, client_ip,
+                          mv_ordinal_of("language", client_ip),
+                          count(*)
+   FROM kttm_nested
+   WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+     AND (mv_ordinal_of("language", client_ip) IS NULL
+          OR (mv_ordinal_of("language", client_ip) = mv_ordinal_of("language", client_ip)+0
+              AND mv_ordinal_of("language", client_ip) IS NOT DISTINCT
+              FROM mv_ordinal_of("language", client_ip)+0
+              AND mv_ordinal_of("language", client_ip) <> mv_ordinal_of("language", client_ip)-1
+              AND (mv_ordinal_of("language", client_ip) IS DISTINCT
+                   FROM mv_ordinal_of("language", client_ip)-1)
+              AND mv_ordinal_of("language", client_ip) > mv_ordinal_of("language", client_ip)-1
+              AND mv_ordinal_of("language", client_ip) >= mv_ordinal_of("language", client_ip)-1
+              AND mv_ordinal_of("language", client_ip) < mv_ordinal_of("language", client_ip)+1
+              AND mv_ordinal_of("language", client_ip) <= mv_ordinal_of("language", client_ip)+1
+              AND (mv_ordinal_of("language", client_ip) <> mv_ordinal_of("language", client_ip)-1) IS TRUE
+              AND (mv_ordinal_of("language", client_ip) = mv_ordinal_of("language", client_ip)-1) IS NOT TRUE
+              AND (mv_ordinal_of("language", client_ip) = mv_ordinal_of("language", client_ip)-1) IS FALSE
+              AND (mv_ordinal_of("language", client_ip) <> mv_ordinal_of("language", client_ip)-1) IS NOT FALSE
+              AND mv_ordinal_of("language", client_ip) BETWEEN mv_ordinal_of("language", client_ip)-1 AND mv_ordinal_of("language", client_ip)+1
+              AND mv_ordinal_of("language", client_ip) NOT BETWEEN mv_ordinal_of("language", client_ip) AND mv_ordinal_of("language", client_ip)-1
+              AND mv_ordinal_of("language", client_ip) like '%'
+              AND mv_ordinal_of("language", client_ip) not like '__DOES_NOT_EXIST__%'
+              AND mv_ordinal_of("language", client_ip) IN (mv_ordinal_of("language", client_ip)-1,
+                                                                                               mv_ordinal_of("language", client_ip)+0,
+                                                                                               mv_ordinal_of("language", client_ip)+1)
+              AND mv_ordinal_of("language", client_ip) NOT IN (mv_ordinal_of("language", client_ip)-1,
+                                                                                                   mv_ordinal_of("language", client_ip)+1)))
+   GROUP BY 1,
+            2,
+            3,
+            4);
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+#-------------------------------------------------------------------------
+# TEST_ID: A10: mv_prepend
+#-------------------------------------------------------------------------
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND ('1'||mv_to_string(mv_prepend('1', "language"), ',') IS NULL
+       OR ('1'||mv_to_string(mv_prepend('1', "language"), ',') = 1||mv_to_string(mv_prepend('1', "language"), ',')
+           AND '1'||mv_to_string(mv_prepend('1', "language"), ',') IS NOT DISTINCT
+           FROM 1||mv_to_string(mv_prepend('1', "language"), ',')
+           AND '1'||mv_to_string(mv_prepend('1', "language"), ',') <> '0'||mv_to_string(mv_prepend('0', "language"), ',')
+           AND ('1'||mv_to_string(mv_prepend('1', "language"), ',') IS DISTINCT
+                FROM '0'||mv_to_string(mv_prepend('0', "language"), ','))
+           AND '1'||mv_to_string(mv_prepend('1', "language"), ',') > '0'||mv_to_string(mv_prepend('0', "language"), ',')
+           AND '1'||mv_to_string(mv_prepend('1', "language"), ',') >= '0'||mv_to_string(mv_prepend('0', "language"), ',')
+           AND '1'||mv_to_string(mv_prepend('1', "language"), ',') < 2||mv_to_string(mv_prepend('2', "language"), ',')
+           AND '1'||mv_to_string(mv_prepend('1', "language"), ',') <= 2||mv_to_string(mv_prepend('2', "language"), ',')
+           AND ('1'||mv_to_string(mv_prepend('1', "language"), ',') <> '0'||mv_to_string(mv_prepend('0', "language"), ',')) IS TRUE
+           AND ('1'||mv_to_string(mv_prepend('1', "language"), ',') = '0'||mv_to_string(mv_prepend('0', "language"), ',')) IS NOT TRUE
+           AND ('1'||mv_to_string(mv_prepend('1', "language"), ',') = '0'||mv_to_string(mv_prepend('0', "language"), ',')) IS FALSE
+           AND ('1'||mv_to_string(mv_prepend('1', "language"), ',') <> '0'||mv_to_string(mv_prepend('0', "language"), ',')) IS NOT FALSE
+           AND '1'||mv_to_string(mv_prepend('1', "language"), ',') BETWEEN '0'||mv_to_string(mv_prepend('0', "language"), ',') AND 2||mv_to_string(mv_prepend('2', "language"), ',')
+           AND '1'||mv_to_string(mv_prepend('1', "language"), ',') NOT BETWEEN '1'||mv_to_string(mv_prepend('1', "language"), ',') AND '0'||mv_to_string(mv_prepend('0', "language"), ',')
+           AND '1'||mv_to_string(mv_prepend('1', "language"), ',') like '%'
+           AND '1'||mv_to_string(mv_prepend('1', "language"), ',') not like '__DOES_NOT_EXIST__%'
+           AND '1'||mv_to_string(mv_prepend('1', "language"), ',') IN ('0'||mv_to_string(mv_prepend('0', "language"), ','),
+                                                                       1||mv_to_string(mv_prepend('1', "language"), ','),
+                                                                       2||mv_to_string(mv_prepend('2', "language"), ','))
+           AND '1'||mv_to_string(mv_prepend('1', "language"), ',') NOT IN ('0'||mv_to_string(mv_prepend('0', "language"), ','),
+                                                                           2||mv_to_string(mv_prepend('2', "language"), ',')))) ;
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND ('1'||mv_to_string(mv_prepend('1', "language"), ',') IS NULL
+       OR '1'||mv_to_string(mv_prepend('1', "language"), ',') IN
+         (SELECT '1'||mv_to_string(mv_prepend('1', "language"), ',')
+          FROM kttm_nested
+          WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+            AND ('1'||mv_to_string(mv_prepend('1', "language"), ',') IS NULL
+                 OR ('1'||mv_to_string(mv_prepend('1', "language"), ',') = 1||mv_to_string(mv_prepend('1', "language"), ',')
+                     AND '1'||mv_to_string(mv_prepend('1', "language"), ',') IS NOT DISTINCT
+                     FROM 1||mv_to_string(mv_prepend('1', "language"), ',')
+                     AND '1'||mv_to_string(mv_prepend('1', "language"), ',') <> '0'||mv_to_string(mv_prepend('0', "language"), ',')
+                     AND ('1'||mv_to_string(mv_prepend('1', "language"), ',') IS DISTINCT
+                          FROM '0'||mv_to_string(mv_prepend('0', "language"), ','))
+                     AND '1'||mv_to_string(mv_prepend('1', "language"), ',') > '0'||mv_to_string(mv_prepend('0', "language"), ',')
+                     AND '1'||mv_to_string(mv_prepend('1', "language"), ',') >= '0'||mv_to_string(mv_prepend('0', "language"), ',')
+                     AND '1'||mv_to_string(mv_prepend('1', "language"), ',') < 2||mv_to_string(mv_prepend('2', "language"), ',')
+                     AND '1'||mv_to_string(mv_prepend('1', "language"), ',') <= 2||mv_to_string(mv_prepend('2', "language"), ',')
+                     AND ('1'||mv_to_string(mv_prepend('1', "language"), ',') <> '0'||mv_to_string(mv_prepend('0', "language"), ',')) IS TRUE
+                     AND ('1'||mv_to_string(mv_prepend('1', "language"), ',') = '0'||mv_to_string(mv_prepend('0', "language"), ',')) IS NOT TRUE
+                     AND ('1'||mv_to_string(mv_prepend('1', "language"), ',') = '0'||mv_to_string(mv_prepend('0', "language"), ',')) IS FALSE
+                     AND ('1'||mv_to_string(mv_prepend('1', "language"), ',') <> '0'||mv_to_string(mv_prepend('0', "language"), ',')) IS NOT FALSE
+                     AND '1'||mv_to_string(mv_prepend('1', "language"), ',') BETWEEN '0'||mv_to_string(mv_prepend('0', "language"), ',') AND 2||mv_to_string(mv_prepend('2', "language"), ',')
+                     AND '1'||mv_to_string(mv_prepend('1', "language"), ',') NOT BETWEEN '1'||mv_to_string(mv_prepend('1', "language"), ',') AND '0'||mv_to_string(mv_prepend('0', "language"), ',')
+                     AND '1'||mv_to_string(mv_prepend('1', "language"), ',') like '%'
+                     AND '1'||mv_to_string(mv_prepend('1', "language"), ',') not like '__DOES_NOT_EXIST__%'
+                     AND '1'||mv_to_string(mv_prepend('1', "language"), ',') IN ('0'||mv_to_string(mv_prepend('0', "language"), ','),
+                                                                                 1||mv_to_string(mv_prepend('1', "language"), ','),
+                                                                                 2||mv_to_string(mv_prepend('2', "language"), ','))
+                     AND '1'||mv_to_string(mv_prepend('1', "language"), ',') NOT IN ('0'||mv_to_string(mv_prepend('0', "language"), ','),
+                                                                                     2||mv_to_string(mv_prepend('2', "language"), ','))))));
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM
+  (SELECT __time, number, client_ip,
+                          '1'||mv_to_string(mv_prepend('1', "language"), ','),
+                          count(*)
+   FROM kttm_nested
+   WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+     AND ('1'||mv_to_string(mv_prepend('1', "language"), ',') IS NULL
+          OR ('1'||mv_to_string(mv_prepend('1', "language"), ',') = 1||mv_to_string(mv_prepend('1', "language"), ',')
+              AND '1'||mv_to_string(mv_prepend('1', "language"), ',') IS NOT DISTINCT
+              FROM 1||mv_to_string(mv_prepend('1', "language"), ',')
+              AND '1'||mv_to_string(mv_prepend('1', "language"), ',') <> '0'||mv_to_string(mv_prepend('0', "language"), ',')
+              AND ('1'||mv_to_string(mv_prepend('1', "language"), ',') IS DISTINCT
+                   FROM '0'||mv_to_string(mv_prepend('0', "language"), ','))
+              AND '1'||mv_to_string(mv_prepend('1', "language"), ',') > '0'||mv_to_string(mv_prepend('0', "language"), ',')
+              AND '1'||mv_to_string(mv_prepend('1', "language"), ',') >= '0'||mv_to_string(mv_prepend('0', "language"), ',')
+              AND '1'||mv_to_string(mv_prepend('1', "language"), ',') < 2||mv_to_string(mv_prepend('2', "language"), ',')
+              AND '1'||mv_to_string(mv_prepend('1', "language"), ',') <= 2||mv_to_string(mv_prepend('2', "language"), ',')
+              AND ('1'||mv_to_string(mv_prepend('1', "language"), ',') <> '0'||mv_to_string(mv_prepend('0', "language"), ',')) IS TRUE
+              AND ('1'||mv_to_string(mv_prepend('1', "language"), ',') = '0'||mv_to_string(mv_prepend('0', "language"), ',')) IS NOT TRUE
+              AND ('1'||mv_to_string(mv_prepend('1', "language"), ',') = '0'||mv_to_string(mv_prepend('0', "language"), ',')) IS FALSE
+              AND ('1'||mv_to_string(mv_prepend('1', "language"), ',') <> '0'||mv_to_string(mv_prepend('0', "language"), ',')) IS NOT FALSE
+              AND '1'||mv_to_string(mv_prepend('1', "language"), ',') BETWEEN '0'||mv_to_string(mv_prepend('0', "language"), ',') AND 2||mv_to_string(mv_prepend('2', "language"), ',')
+              AND '1'||mv_to_string(mv_prepend('1', "language"), ',') NOT BETWEEN '1'||mv_to_string(mv_prepend('1', "language"), ',') AND '0'||mv_to_string(mv_prepend('0', "language"), ',')
+              AND '1'||mv_to_string(mv_prepend('1', "language"), ',') like '%'
+              AND '1'||mv_to_string(mv_prepend('1', "language"), ',') not like '__DOES_NOT_EXIST__%'
+              AND '1'||mv_to_string(mv_prepend('1', "language"), ',') IN ('0'||mv_to_string(mv_prepend('0', "language"), ','),
+                                                                          1||mv_to_string(mv_prepend('1', "language"), ','),
+                                                                          2||mv_to_string(mv_prepend('2', "language"), ','))
+              AND '1'||mv_to_string(mv_prepend('1', "language"), ',') NOT IN ('0'||mv_to_string(mv_prepend('0', "language"), ','),
+                                                                              2||mv_to_string(mv_prepend('2', "language"), ','))))
+   GROUP BY 1,
+            2,
+            3,
+            4);
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+#-------------------------------------------------------------------------
+# TEST_ID: A11: mv_append
+#-------------------------------------------------------------------------
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND ('1'||mv_to_string(mv_append("language", 'A'), ',') IS NULL
+       OR ('1'||mv_to_string(mv_append("language", 'A'), ',') = 1||mv_to_string(mv_append("language", 'A'), ',')
+           AND '1'||mv_to_string(mv_append("language", 'A'), ',') IS NOT DISTINCT
+           FROM 1||mv_to_string(mv_append("language", 'A'), ',')
+           AND '1'||mv_to_string(mv_append("language", 'A'), ',') <> '0'||mv_to_string(mv_append("language", 'A'), ',')
+           AND ('1'||mv_to_string(mv_append("language", 'A'), ',') IS DISTINCT
+                FROM '0'||mv_to_string(mv_append("language", 'A'), ','))
+           AND '1'||mv_to_string(mv_append("language", 'A'), ',') > '0'||mv_to_string(mv_append("language", 'A'), ',')
+           AND '1'||mv_to_string(mv_append("language", 'A'), ',') >= '0'||mv_to_string(mv_append("language", 'A'), ',')
+           AND '1'||mv_to_string(mv_append("language", 'A'), ',') < 2||mv_to_string(mv_append("language", 'A'), ',')
+           AND '1'||mv_to_string(mv_append("language", 'A'), ',') <= 2||mv_to_string(mv_append("language", 'A'), ',')
+           AND ('1'||mv_to_string(mv_append("language", 'A'), ',') <> '0'||mv_to_string(mv_append("language", 'A'), ',')) IS TRUE
+           AND ('1'||mv_to_string(mv_append("language", 'A'), ',') = '0'||mv_to_string(mv_append("language", 'A'), ',')) IS NOT TRUE
+           AND ('1'||mv_to_string(mv_append("language", 'A'), ',') = '0'||mv_to_string(mv_append("language", 'A'), ',')) IS FALSE
+           AND ('1'||mv_to_string(mv_append("language", 'A'), ',') <> '0'||mv_to_string(mv_append("language", 'A'), ',')) IS NOT FALSE
+           AND '1'||mv_to_string(mv_append("language", 'A'), ',') BETWEEN '0'||mv_to_string(mv_append("language", 'A'), ',') AND 2||mv_to_string(mv_append("language", 'A'), ',')
+           AND '1'||mv_to_string(mv_append("language", 'A'), ',') NOT BETWEEN '1'||mv_to_string(mv_append("language", 'A'), ',') AND '0'||mv_to_string(mv_append("language", 'A'), ',')
+           AND '1'||mv_to_string(mv_append("language", 'A'), ',') like '%'
+           AND '1'||mv_to_string(mv_append("language", 'A'), ',') not like '__DOES_NOT_EXIST__%'
+           AND '1'||mv_to_string(mv_append("language", 'A'), ',') IN ('0'||mv_to_string(mv_append("language", 'A'), ','),
+                                                                      1||mv_to_string(mv_append("language", 'A'), ','),
+                                                                      2||mv_to_string(mv_append("language", 'A'), ','))
+           AND '1'||mv_to_string(mv_append("language", 'A'), ',') NOT IN ('0'||mv_to_string(mv_append("language", 'A'), ','),
+                                                                          2||mv_to_string(mv_append("language", 'A'), ',')))) ;
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND ('1'||mv_to_string(mv_append("language", 'A'), ',') IS NULL
+       OR '1'||mv_to_string(mv_append("language", 'A'), ',') IN
+         (SELECT '1'||mv_to_string(mv_append("language", 'A'), ',')
+          FROM kttm_nested
+          WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+            AND ('1'||mv_to_string(mv_append("language", 'A'), ',') IS NULL
+                 OR ('1'||mv_to_string(mv_append("language", 'A'), ',') = 1||mv_to_string(mv_append("language", 'A'), ',')
+                     AND '1'||mv_to_string(mv_append("language", 'A'), ',') IS NOT DISTINCT
+                     FROM 1||mv_to_string(mv_append("language", 'A'), ',')
+                     AND '1'||mv_to_string(mv_append("language", 'A'), ',') <> '0'||mv_to_string(mv_append("language", 'A'), ',')
+                     AND ('1'||mv_to_string(mv_append("language", 'A'), ',') IS DISTINCT
+                          FROM '0'||mv_to_string(mv_append("language", 'A'), ','))
+                     AND '1'||mv_to_string(mv_append("language", 'A'), ',') > '0'||mv_to_string(mv_append("language", 'A'), ',')
+                     AND '1'||mv_to_string(mv_append("language", 'A'), ',') >= '0'||mv_to_string(mv_append("language", 'A'), ',')
+                     AND '1'||mv_to_string(mv_append("language", 'A'), ',') < 2||mv_to_string(mv_append("language", 'A'), ',')
+                     AND '1'||mv_to_string(mv_append("language", 'A'), ',') <= 2||mv_to_string(mv_append("language", 'A'), ',')
+                     AND ('1'||mv_to_string(mv_append("language", 'A'), ',') <> '0'||mv_to_string(mv_append("language", 'A'), ',')) IS TRUE
+                     AND ('1'||mv_to_string(mv_append("language", 'A'), ',') = '0'||mv_to_string(mv_append("language", 'A'), ',')) IS NOT TRUE
+                     AND ('1'||mv_to_string(mv_append("language", 'A'), ',') = '0'||mv_to_string(mv_append("language", 'A'), ',')) IS FALSE
+                     AND ('1'||mv_to_string(mv_append("language", 'A'), ',') <> '0'||mv_to_string(mv_append("language", 'A'), ',')) IS NOT FALSE
+                     AND '1'||mv_to_string(mv_append("language", 'A'), ',') BETWEEN '0'||mv_to_string(mv_append("language", 'A'), ',') AND 2||mv_to_string(mv_append("language", 'A'), ',')
+                     AND '1'||mv_to_string(mv_append("language", 'A'), ',') NOT BETWEEN '1'||mv_to_string(mv_append("language", 'A'), ',') AND '0'||mv_to_string(mv_append("language", 'A'), ',')
+                     AND '1'||mv_to_string(mv_append("language", 'A'), ',') like '%'
+                     AND '1'||mv_to_string(mv_append("language", 'A'), ',') not like '__DOES_NOT_EXIST__%'
+                     AND '1'||mv_to_string(mv_append("language", 'A'), ',') IN ('0'||mv_to_string(mv_append("language", 'A'), ','),
+                                                                                1||mv_to_string(mv_append("language", 'A'), ','),
+                                                                                2||mv_to_string(mv_append("language", 'A'), ','))
+                     AND '1'||mv_to_string(mv_append("language", 'A'), ',') NOT IN ('0'||mv_to_string(mv_append("language", 'A'), ','),
+                                                                                    2||mv_to_string(mv_append("language", 'A'), ','))))));
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM
+  (SELECT __time, number, client_ip,
+                          '1'||mv_to_string(mv_append("language", 'A'), ','),
+                          count(*)
+   FROM kttm_nested
+   WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+     AND ('1'||mv_to_string(mv_append("language", 'A'), ',') IS NULL
+          OR ('1'||mv_to_string(mv_append("language", 'A'), ',') = 1||mv_to_string(mv_append("language", 'A'), ',')
+              AND '1'||mv_to_string(mv_append("language", 'A'), ',') IS NOT DISTINCT
+              FROM 1||mv_to_string(mv_append("language", 'A'), ',')
+              AND '1'||mv_to_string(mv_append("language", 'A'), ',') <> '0'||mv_to_string(mv_append("language", 'A'), ',')
+              AND ('1'||mv_to_string(mv_append("language", 'A'), ',') IS DISTINCT
+                   FROM '0'||mv_to_string(mv_append("language", 'A'), ','))
+              AND '1'||mv_to_string(mv_append("language", 'A'), ',') > '0'||mv_to_string(mv_append("language", 'A'), ',')
+              AND '1'||mv_to_string(mv_append("language", 'A'), ',') >= '0'||mv_to_string(mv_append("language", 'A'), ',')
+              AND '1'||mv_to_string(mv_append("language", 'A'), ',') < 2||mv_to_string(mv_append("language", 'A'), ',')
+              AND '1'||mv_to_string(mv_append("language", 'A'), ',') <= 2||mv_to_string(mv_append("language", 'A'), ',')
+              AND ('1'||mv_to_string(mv_append("language", 'A'), ',') <> '0'||mv_to_string(mv_append("language", 'A'), ',')) IS TRUE
+              AND ('1'||mv_to_string(mv_append("language", 'A'), ',') = '0'||mv_to_string(mv_append("language", 'A'), ',')) IS NOT TRUE
+              AND ('1'||mv_to_string(mv_append("language", 'A'), ',') = '0'||mv_to_string(mv_append("language", 'A'), ',')) IS FALSE
+              AND ('1'||mv_to_string(mv_append("language", 'A'), ',') <> '0'||mv_to_string(mv_append("language", 'A'), ',')) IS NOT FALSE
+              AND '1'||mv_to_string(mv_append("language", 'A'), ',') BETWEEN '0'||mv_to_string(mv_append("language", 'A'), ',') AND 2||mv_to_string(mv_append("language", 'A'), ',')
+              AND '1'||mv_to_string(mv_append("language", 'A'), ',') NOT BETWEEN '1'||mv_to_string(mv_append("language", 'A'), ',') AND '0'||mv_to_string(mv_append("language", 'A'), ',')
+              AND '1'||mv_to_string(mv_append("language", 'A'), ',') like '%'
+              AND '1'||mv_to_string(mv_append("language", 'A'), ',') not like '__DOES_NOT_EXIST__%'
+              AND '1'||mv_to_string(mv_append("language", 'A'), ',') IN ('0'||mv_to_string(mv_append("language", 'A'), ','),
+                                                                         1||mv_to_string(mv_append("language", 'A'), ','),
+                                                                         2||mv_to_string(mv_append("language", 'A'), ','))
+              AND '1'||mv_to_string(mv_append("language", 'A'), ',') NOT IN ('0'||mv_to_string(mv_append("language", 'A'), ','),
+                                                                             2||mv_to_string(mv_append("language", 'A'), ','))))
+   GROUP BY 1,
+            2,
+            3,
+            4);
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+#-------------------------------------------------------------------------
+# TEST_ID: A12: mv_concat
+#-------------------------------------------------------------------------
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND ('1'||mv_to_string(mv_concat("language", "language"), ',') IS NULL
+       OR ('1'||mv_to_string(mv_concat("language", "language"), ',') = 1||mv_to_string(mv_concat("language", "language"), ',')
+           AND '1'||mv_to_string(mv_concat("language", "language"), ',') IS NOT DISTINCT
+           FROM 1||mv_to_string(mv_concat("language", "language"), ',')
+           AND '1'||mv_to_string(mv_concat("language", "language"), ',') <> '0'||mv_to_string(mv_concat("language", "language"), ',')
+           AND ('1'||mv_to_string(mv_concat("language", "language"), ',') IS DISTINCT
+                FROM '0'||mv_to_string(mv_concat("language", "language"), ','))
+           AND '1'||mv_to_string(mv_concat("language", "language"), ',') > '0'||mv_to_string(mv_concat("language", "language"), ',')
+           AND '1'||mv_to_string(mv_concat("language", "language"), ',') >= '0'||mv_to_string(mv_concat("language", "language"), ',')
+           AND '1'||mv_to_string(mv_concat("language", "language"), ',') < 2||mv_to_string(mv_concat("language", "language"), ',')
+           AND '1'||mv_to_string(mv_concat("language", "language"), ',') <= 2||mv_to_string(mv_concat("language", "language"), ',')
+           AND ('1'||mv_to_string(mv_concat("language", "language"), ',') <> '0'||mv_to_string(mv_concat("language", "language"), ',')) IS TRUE
+           AND ('1'||mv_to_string(mv_concat("language", "language"), ',') = '0'||mv_to_string(mv_concat("language", "language"), ',')) IS NOT TRUE
+           AND ('1'||mv_to_string(mv_concat("language", "language"), ',') = '0'||mv_to_string(mv_concat("language", "language"), ',')) IS FALSE
+           AND ('1'||mv_to_string(mv_concat("language", "language"), ',') <> '0'||mv_to_string(mv_concat("language", "language"), ',')) IS NOT FALSE
+           AND '1'||mv_to_string(mv_concat("language", "language"), ',') BETWEEN '0'||mv_to_string(mv_concat("language", "language"), ',') AND 2||mv_to_string(mv_concat("language", "language"), ',')
+           AND '1'||mv_to_string(mv_concat("language", "language"), ',') NOT BETWEEN '1'||mv_to_string(mv_concat("language", "language"), ',') AND '0'||mv_to_string(mv_concat("language", "language"), ',')
+           AND '1'||mv_to_string(mv_concat("language", "language"), ',') like '%'
+           AND '1'||mv_to_string(mv_concat("language", "language"), ',') not like '__DOES_NOT_EXIST__%'
+           AND '1'||mv_to_string(mv_concat("language", "language"), ',') IN ('0'||mv_to_string(mv_concat("language", "language"), ','),
+                                                                             1||mv_to_string(mv_concat("language", "language"), ','),
+                                                                             2||mv_to_string(mv_concat("language", "language"), ','))
+           AND '1'||mv_to_string(mv_concat("language", "language"), ',') NOT IN ('0'||mv_to_string(mv_concat("language", "language"), ','),
+                                                                                 2||mv_to_string(mv_concat("language", "language"), ',')))) ;
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND ('1'||mv_to_string(mv_concat("language", "language"), ',') IS NULL
+       OR '1'||mv_to_string(mv_concat("language", "language"), ',') IN
+         (SELECT '1'||mv_to_string(mv_concat("language", "language"), ',')
+          FROM kttm_nested
+          WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+            AND ('1'||mv_to_string(mv_concat("language", "language"), ',') IS NULL
+                 OR ('1'||mv_to_string(mv_concat("language", "language"), ',') = 1||mv_to_string(mv_concat("language", "language"), ',')
+                     AND '1'||mv_to_string(mv_concat("language", "language"), ',') IS NOT DISTINCT
+                     FROM 1||mv_to_string(mv_concat("language", "language"), ',')
+                     AND '1'||mv_to_string(mv_concat("language", "language"), ',') <> '0'||mv_to_string(mv_concat("language", "language"), ',')
+                     AND ('1'||mv_to_string(mv_concat("language", "language"), ',') IS DISTINCT
+                          FROM '0'||mv_to_string(mv_concat("language", "language"), ','))
+                     AND '1'||mv_to_string(mv_concat("language", "language"), ',') > '0'||mv_to_string(mv_concat("language", "language"), ',')
+                     AND '1'||mv_to_string(mv_concat("language", "language"), ',') >= '0'||mv_to_string(mv_concat("language", "language"), ',')
+                     AND '1'||mv_to_string(mv_concat("language", "language"), ',') < 2||mv_to_string(mv_concat("language", "language"), ',')
+                     AND '1'||mv_to_string(mv_concat("language", "language"), ',') <= 2||mv_to_string(mv_concat("language", "language"), ',')
+                     AND ('1'||mv_to_string(mv_concat("language", "language"), ',') <> '0'||mv_to_string(mv_concat("language", "language"), ',')) IS TRUE
+                     AND ('1'||mv_to_string(mv_concat("language", "language"), ',') = '0'||mv_to_string(mv_concat("language", "language"), ',')) IS NOT TRUE
+                     AND ('1'||mv_to_string(mv_concat("language", "language"), ',') = '0'||mv_to_string(mv_concat("language", "language"), ',')) IS FALSE
+                     AND ('1'||mv_to_string(mv_concat("language", "language"), ',') <> '0'||mv_to_string(mv_concat("language", "language"), ',')) IS NOT FALSE
+                     AND '1'||mv_to_string(mv_concat("language", "language"), ',') BETWEEN '0'||mv_to_string(mv_concat("language", "language"), ',') AND 2||mv_to_string(mv_concat("language", "language"), ',')
+                     AND '1'||mv_to_string(mv_concat("language", "language"), ',') NOT BETWEEN '1'||mv_to_string(mv_concat("language", "language"), ',') AND '0'||mv_to_string(mv_concat("language", "language"), ',')
+                     AND '1'||mv_to_string(mv_concat("language", "language"), ',') like '%'
+                     AND '1'||mv_to_string(mv_concat("language", "language"), ',') not like '__DOES_NOT_EXIST__%'
+                     AND '1'||mv_to_string(mv_concat("language", "language"), ',') IN ('0'||mv_to_string(mv_concat("language", "language"), ','),
+                                                                                       1||mv_to_string(mv_concat("language", "language"), ','),
+                                                                                       2||mv_to_string(mv_concat("language", "language"), ','))
+                     AND '1'||mv_to_string(mv_concat("language", "language"), ',') NOT IN ('0'||mv_to_string(mv_concat("language", "language"), ','),
+                                                                                           2||mv_to_string(mv_concat("language", "language"), ','))))));
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM
+  (SELECT __time, number, client_ip,
+                          '1'||mv_to_string(mv_concat("language", "language"), ','),
+                          count(*)
+   FROM kttm_nested
+   WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+     AND ('1'||mv_to_string(mv_concat("language", "language"), ',') IS NULL
+          OR ('1'||mv_to_string(mv_concat("language", "language"), ',') = 1||mv_to_string(mv_concat("language", "language"), ',')
+              AND '1'||mv_to_string(mv_concat("language", "language"), ',') IS NOT DISTINCT
+              FROM 1||mv_to_string(mv_concat("language", "language"), ',')
+              AND '1'||mv_to_string(mv_concat("language", "language"), ',') <> '0'||mv_to_string(mv_concat("language", "language"), ',')
+              AND ('1'||mv_to_string(mv_concat("language", "language"), ',') IS DISTINCT
+                   FROM '0'||mv_to_string(mv_concat("language", "language"), ','))
+              AND '1'||mv_to_string(mv_concat("language", "language"), ',') > '0'||mv_to_string(mv_concat("language", "language"), ',')
+              AND '1'||mv_to_string(mv_concat("language", "language"), ',') >= '0'||mv_to_string(mv_concat("language", "language"), ',')
+              AND '1'||mv_to_string(mv_concat("language", "language"), ',') < 2||mv_to_string(mv_concat("language", "language"), ',')
+              AND '1'||mv_to_string(mv_concat("language", "language"), ',') <= 2||mv_to_string(mv_concat("language", "language"), ',')
+              AND ('1'||mv_to_string(mv_concat("language", "language"), ',') <> '0'||mv_to_string(mv_concat("language", "language"), ',')) IS TRUE
+              AND ('1'||mv_to_string(mv_concat("language", "language"), ',') = '0'||mv_to_string(mv_concat("language", "language"), ',')) IS NOT TRUE
+              AND ('1'||mv_to_string(mv_concat("language", "language"), ',') = '0'||mv_to_string(mv_concat("language", "language"), ',')) IS FALSE
+              AND ('1'||mv_to_string(mv_concat("language", "language"), ',') <> '0'||mv_to_string(mv_concat("language", "language"), ',')) IS NOT FALSE
+              AND '1'||mv_to_string(mv_concat("language", "language"), ',') BETWEEN '0'||mv_to_string(mv_concat("language", "language"), ',') AND 2||mv_to_string(mv_concat("language", "language"), ',')
+              AND '1'||mv_to_string(mv_concat("language", "language"), ',') NOT BETWEEN '1'||mv_to_string(mv_concat("language", "language"), ',') AND '0'||mv_to_string(mv_concat("language", "language"), ',')
+              AND '1'||mv_to_string(mv_concat("language", "language"), ',') like '%'
+              AND '1'||mv_to_string(mv_concat("language", "language"), ',') not like '__DOES_NOT_EXIST__%'
+              AND '1'||mv_to_string(mv_concat("language", "language"), ',') IN ('0'||mv_to_string(mv_concat("language", "language"), ','),
+                                                                                1||mv_to_string(mv_concat("language", "language"), ','),
+                                                                                2||mv_to_string(mv_concat("language", "language"), ','))
+              AND '1'||mv_to_string(mv_concat("language", "language"), ',') NOT IN ('0'||mv_to_string(mv_concat("language", "language"), ','),
+                                                                                    2||mv_to_string(mv_concat("language", "language"), ','))))
+   GROUP BY 1,
+            2,
+            3,
+            4);
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+#-------------------------------------------------------------------------
+# TEST_ID: A13: mv_slice
+#-------------------------------------------------------------------------
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND ('1'||mv_to_string(mv_slice("language", 0, 1), ',') IS NULL
+       OR ('1'||mv_to_string(mv_slice("language", 0, 1), ',') = 1||mv_to_string(mv_slice("language", 0, 1), ',')
+           AND '1'||mv_to_string(mv_slice("language", 0, 1), ',') IS NOT DISTINCT
+           FROM 1||mv_to_string(mv_slice("language", 0, 1), ',')
+           AND '1'||mv_to_string(mv_slice("language", 0, 1), ',') <> '0'||mv_to_string(mv_slice("language", 0, 1), ',')
+           AND ('1'||mv_to_string(mv_slice("language", 0, 1), ',') IS DISTINCT
+                FROM '0'||mv_to_string(mv_slice("language", 0, 1), ','))
+           AND '1'||mv_to_string(mv_slice("language", 0, 1), ',') > '0'||mv_to_string(mv_slice("language", 0, 1), ',')
+           AND '1'||mv_to_string(mv_slice("language", 0, 1), ',') >= '0'||mv_to_string(mv_slice("language", 0, 1), ',')
+           AND '1'||mv_to_string(mv_slice("language", 0, 1), ',') < 2||mv_to_string(mv_slice("language", 0, 1), ',')
+           AND '1'||mv_to_string(mv_slice("language", 0, 1), ',') <= 2||mv_to_string(mv_slice("language", 0, 1), ',')
+           AND ('1'||mv_to_string(mv_slice("language", 0, 1), ',') <> '0'||mv_to_string(mv_slice("language", 0, 1), ',')) IS TRUE
+           AND ('1'||mv_to_string(mv_slice("language", 0, 1), ',') = '0'||mv_to_string(mv_slice("language", 0, 1), ',')) IS NOT TRUE
+           AND ('1'||mv_to_string(mv_slice("language", 0, 1), ',') = '0'||mv_to_string(mv_slice("language", 0, 1), ',')) IS FALSE
+           AND ('1'||mv_to_string(mv_slice("language", 0, 1), ',') <> '0'||mv_to_string(mv_slice("language", 0, 1), ',')) IS NOT FALSE
+           AND '1'||mv_to_string(mv_slice("language", 0, 1), ',') BETWEEN '0'||mv_to_string(mv_slice("language", 0, 1), ',') AND 2||mv_to_string(mv_slice("language", 0, 1), ',')
+           AND '1'||mv_to_string(mv_slice("language", 0, 1), ',') NOT BETWEEN '1'||mv_to_string(mv_slice("language", 0, 1), ',') AND '0'||mv_to_string(mv_slice("language", 0, 1), ',')
+           AND '1'||mv_to_string(mv_slice("language", 0, 1), ',') like '%'
+           AND '1'||mv_to_string(mv_slice("language", 0, 1), ',') not like '__DOES_NOT_EXIST__%'
+           AND '1'||mv_to_string(mv_slice("language", 0, 1), ',') IN ('0'||mv_to_string(mv_slice("language", 0, 1), ','),
+                                                                      1||mv_to_string(mv_slice("language", 0, 1), ','),
+                                                                      2||mv_to_string(mv_slice("language", 0, 1), ','))
+           AND '1'||mv_to_string(mv_slice("language", 0, 1), ',') NOT IN ('0'||mv_to_string(mv_slice("language", 0, 1), ','),
+                                                                          2||mv_to_string(mv_slice("language", 0, 1), ',')))) ;
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND ('1'||mv_to_string(mv_slice("language", 0, 1), ',') IS NULL
+       OR '1'||mv_to_string(mv_slice("language", 0, 1), ',') IN
+         (SELECT '1'||mv_to_string(mv_slice("language", 0, 1), ',')
+          FROM kttm_nested
+          WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+            AND ('1'||mv_to_string(mv_slice("language", 0, 1), ',') IS NULL
+                 OR ('1'||mv_to_string(mv_slice("language", 0, 1), ',') = 1||mv_to_string(mv_slice("language", 0, 1), ',')
+                     AND '1'||mv_to_string(mv_slice("language", 0, 1), ',') IS NOT DISTINCT
+                     FROM 1||mv_to_string(mv_slice("language", 0, 1), ',')
+                     AND '1'||mv_to_string(mv_slice("language", 0, 1), ',') <> '0'||mv_to_string(mv_slice("language", 0, 1), ',')
+                     AND ('1'||mv_to_string(mv_slice("language", 0, 1), ',') IS DISTINCT
+                          FROM '0'||mv_to_string(mv_slice("language", 0, 1), ','))
+                     AND '1'||mv_to_string(mv_slice("language", 0, 1), ',') > '0'||mv_to_string(mv_slice("language", 0, 1), ',')
+                     AND '1'||mv_to_string(mv_slice("language", 0, 1), ',') >= '0'||mv_to_string(mv_slice("language", 0, 1), ',')
+                     AND '1'||mv_to_string(mv_slice("language", 0, 1), ',') < 2||mv_to_string(mv_slice("language", 0, 1), ',')
+                     AND '1'||mv_to_string(mv_slice("language", 0, 1), ',') <= 2||mv_to_string(mv_slice("language", 0, 1), ',')
+                     AND ('1'||mv_to_string(mv_slice("language", 0, 1), ',') <> '0'||mv_to_string(mv_slice("language", 0, 1), ',')) IS TRUE
+                     AND ('1'||mv_to_string(mv_slice("language", 0, 1), ',') = '0'||mv_to_string(mv_slice("language", 0, 1), ',')) IS NOT TRUE
+                     AND ('1'||mv_to_string(mv_slice("language", 0, 1), ',') = '0'||mv_to_string(mv_slice("language", 0, 1), ',')) IS FALSE
+                     AND ('1'||mv_to_string(mv_slice("language", 0, 1), ',') <> '0'||mv_to_string(mv_slice("language", 0, 1), ',')) IS NOT FALSE
+                     AND '1'||mv_to_string(mv_slice("language", 0, 1), ',') BETWEEN '0'||mv_to_string(mv_slice("language", 0, 1), ',') AND 2||mv_to_string(mv_slice("language", 0, 1), ',')
+                     AND '1'||mv_to_string(mv_slice("language", 0, 1), ',') NOT BETWEEN '1'||mv_to_string(mv_slice("language", 0, 1), ',') AND '0'||mv_to_string(mv_slice("language", 0, 1), ',')
+                     AND '1'||mv_to_string(mv_slice("language", 0, 1), ',') like '%'
+                     AND '1'||mv_to_string(mv_slice("language", 0, 1), ',') not like '__DOES_NOT_EXIST__%'
+                     AND '1'||mv_to_string(mv_slice("language", 0, 1), ',') IN ('0'||mv_to_string(mv_slice("language", 0, 1), ','),
+                                                                                1||mv_to_string(mv_slice("language", 0, 1), ','),
+                                                                                2||mv_to_string(mv_slice("language", 0, 1), ','))
+                     AND '1'||mv_to_string(mv_slice("language", 0, 1), ',') NOT IN ('0'||mv_to_string(mv_slice("language", 0, 1), ','),
+                                                                                    2||mv_to_string(mv_slice("language", 0, 1), ','))))));
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM
+  (SELECT __time, number, client_ip,
+                          '1'||mv_to_string(mv_slice("language", 0, 1), ','),
+                          count(*)
+   FROM kttm_nested
+   WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+     AND ('1'||mv_to_string(mv_slice("language", 0, 1), ',') IS NULL
+          OR ('1'||mv_to_string(mv_slice("language", 0, 1), ',') = 1||mv_to_string(mv_slice("language", 0, 1), ',')
+              AND '1'||mv_to_string(mv_slice("language", 0, 1), ',') IS NOT DISTINCT
+              FROM 1||mv_to_string(mv_slice("language", 0, 1), ',')
+              AND '1'||mv_to_string(mv_slice("language", 0, 1), ',') <> '0'||mv_to_string(mv_slice("language", 0, 1), ',')
+              AND ('1'||mv_to_string(mv_slice("language", 0, 1), ',') IS DISTINCT
+                   FROM '0'||mv_to_string(mv_slice("language", 0, 1), ','))
+              AND '1'||mv_to_string(mv_slice("language", 0, 1), ',') > '0'||mv_to_string(mv_slice("language", 0, 1), ',')
+              AND '1'||mv_to_string(mv_slice("language", 0, 1), ',') >= '0'||mv_to_string(mv_slice("language", 0, 1), ',')
+              AND '1'||mv_to_string(mv_slice("language", 0, 1), ',') < 2||mv_to_string(mv_slice("language", 0, 1), ',')
+              AND '1'||mv_to_string(mv_slice("language", 0, 1), ',') <= 2||mv_to_string(mv_slice("language", 0, 1), ',')
+              AND ('1'||mv_to_string(mv_slice("language", 0, 1), ',') <> '0'||mv_to_string(mv_slice("language", 0, 1), ',')) IS TRUE
+              AND ('1'||mv_to_string(mv_slice("language", 0, 1), ',') = '0'||mv_to_string(mv_slice("language", 0, 1), ',')) IS NOT TRUE
+              AND ('1'||mv_to_string(mv_slice("language", 0, 1), ',') = '0'||mv_to_string(mv_slice("language", 0, 1), ',')) IS FALSE
+              AND ('1'||mv_to_string(mv_slice("language", 0, 1), ',') <> '0'||mv_to_string(mv_slice("language", 0, 1), ',')) IS NOT FALSE
+              AND '1'||mv_to_string(mv_slice("language", 0, 1), ',') BETWEEN '0'||mv_to_string(mv_slice("language", 0, 1), ',') AND 2||mv_to_string(mv_slice("language", 0, 1), ',')
+              AND '1'||mv_to_string(mv_slice("language", 0, 1), ',') NOT BETWEEN '1'||mv_to_string(mv_slice("language", 0, 1), ',') AND '0'||mv_to_string(mv_slice("language", 0, 1), ',')
+              AND '1'||mv_to_string(mv_slice("language", 0, 1), ',') like '%'
+              AND '1'||mv_to_string(mv_slice("language", 0, 1), ',') not like '__DOES_NOT_EXIST__%'
+              AND '1'||mv_to_string(mv_slice("language", 0, 1), ',') IN ('0'||mv_to_string(mv_slice("language", 0, 1), ','),
+                                                                         1||mv_to_string(mv_slice("language", 0, 1), ','),
+                                                                         2||mv_to_string(mv_slice("language", 0, 1), ','))
+              AND '1'||mv_to_string(mv_slice("language", 0, 1), ',') NOT IN ('0'||mv_to_string(mv_slice("language", 0, 1), ','),
+                                                                             2||mv_to_string(mv_slice("language", 0, 1), ','))))
+   GROUP BY 1,
+            2,
+            3,
+            4);
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+#-------------------------------------------------------------------------
+# TEST_ID: A14: mv_to_string
+#-------------------------------------------------------------------------
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND ('1'||mv_to_string("language", ',') IS NULL
+       OR ('1'||mv_to_string("language", ',') = 1||mv_to_string("language", ',')
+           AND '1'||mv_to_string("language", ',') IS NOT DISTINCT
+           FROM 1||mv_to_string("language", ',')
+           AND '1'||mv_to_string("language", ',') <> 0||mv_to_string("language", ',')
+           AND ('1'||mv_to_string("language", ',') IS DISTINCT
+                FROM 0||mv_to_string("language", ','))
+           AND '1'||mv_to_string("language", ',') > 0||mv_to_string("language", ',')
+           AND '1'||mv_to_string("language", ',') >= 0||mv_to_string("language", ',')
+           AND '1'||mv_to_string("language", ',') < 2||mv_to_string("language", ',')
+           AND '1'||mv_to_string("language", ',') <= 2||mv_to_string("language", ',')
+           AND ('1'||mv_to_string("language", ',') <> 0||mv_to_string("language", ',')) IS TRUE
+           AND ('1'||mv_to_string("language", ',') = 0||mv_to_string("language", ',')) IS NOT TRUE
+           AND ('1'||mv_to_string("language", ',') = 0||mv_to_string("language", ',')) IS FALSE
+           AND ('1'||mv_to_string("language", ',') <> 0||mv_to_string("language", ',')) IS NOT FALSE
+           AND '1'||mv_to_string("language", ',') BETWEEN 0||mv_to_string("language", ',') AND 2||mv_to_string("language", ',')
+           AND '1'||mv_to_string("language", ',') NOT BETWEEN '1'||mv_to_string("language", ',') AND 0||mv_to_string("language", ',')
+           AND '1'||mv_to_string("language", ',') like '%'
+           AND '1'||mv_to_string("language", ',') not like '__DOES_NOT_EXIST__%'
+           AND '1'||mv_to_string("language", ',') IN (0||mv_to_string("language", ','),
+                                                      1||mv_to_string("language", ','),
+                                                      2||mv_to_string("language", ','))
+           AND '1'||mv_to_string("language", ',') NOT IN (0||mv_to_string("language", ','),
+                                                          2||mv_to_string("language", ',')))) ;
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND ('1'||mv_to_string("language", ',') IS NULL
+       OR '1'||mv_to_string("language", ',') IN
+         (SELECT '1'||mv_to_string("language", ',')
+          FROM kttm_nested
+          WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+            AND ('1'||mv_to_string("language", ',') IS NULL
+                 OR ('1'||mv_to_string("language", ',') = 1||mv_to_string("language", ',')
+                     AND '1'||mv_to_string("language", ',') IS NOT DISTINCT
+                     FROM 1||mv_to_string("language", ',')
+                     AND '1'||mv_to_string("language", ',') <> 0||mv_to_string("language", ',')
+                     AND ('1'||mv_to_string("language", ',') IS DISTINCT
+                          FROM 0||mv_to_string("language", ','))
+                     AND '1'||mv_to_string("language", ',') > 0||mv_to_string("language", ',')
+                     AND '1'||mv_to_string("language", ',') >= 0||mv_to_string("language", ',')
+                     AND '1'||mv_to_string("language", ',') < 2||mv_to_string("language", ',')
+                     AND '1'||mv_to_string("language", ',') <= 2||mv_to_string("language", ',')
+                     AND ('1'||mv_to_string("language", ',') <> 0||mv_to_string("language", ',')) IS TRUE
+                     AND ('1'||mv_to_string("language", ',') = 0||mv_to_string("language", ',')) IS NOT TRUE
+                     AND ('1'||mv_to_string("language", ',') = 0||mv_to_string("language", ',')) IS FALSE
+                     AND ('1'||mv_to_string("language", ',') <> 0||mv_to_string("language", ',')) IS NOT FALSE
+                     AND '1'||mv_to_string("language", ',') BETWEEN 0||mv_to_string("language", ',') AND 2||mv_to_string("language", ',')
+                     AND '1'||mv_to_string("language", ',') NOT BETWEEN '1'||mv_to_string("language", ',') AND 0||mv_to_string("language", ',')
+                     AND '1'||mv_to_string("language", ',') like '%'
+                     AND '1'||mv_to_string("language", ',') not like '__DOES_NOT_EXIST__%'
+                     AND '1'||mv_to_string("language", ',') IN (0||mv_to_string("language", ','),
+                                                                1||mv_to_string("language", ','),
+                                                                2||mv_to_string("language", ','))
+                     AND '1'||mv_to_string("language", ',') NOT IN (0||mv_to_string("language", ','),
+                                                                    2||mv_to_string("language", ','))))));
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM
+  (SELECT __time, number, client_ip,
+                          '1'||mv_to_string("language", ','),
+                          count(*)
+   FROM kttm_nested
+   WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+     AND ('1'||mv_to_string("language", ',') IS NULL
+          OR ('1'||mv_to_string("language", ',') = 1||mv_to_string("language", ',')
+              AND '1'||mv_to_string("language", ',') IS NOT DISTINCT
+              FROM 1||mv_to_string("language", ',')
+              AND '1'||mv_to_string("language", ',') <> 0||mv_to_string("language", ',')
+              AND ('1'||mv_to_string("language", ',') IS DISTINCT
+                   FROM 0||mv_to_string("language", ','))
+              AND '1'||mv_to_string("language", ',') > 0||mv_to_string("language", ',')
+              AND '1'||mv_to_string("language", ',') >= 0||mv_to_string("language", ',')
+              AND '1'||mv_to_string("language", ',') < 2||mv_to_string("language", ',')
+              AND '1'||mv_to_string("language", ',') <= 2||mv_to_string("language", ',')
+              AND ('1'||mv_to_string("language", ',') <> 0||mv_to_string("language", ',')) IS TRUE
+              AND ('1'||mv_to_string("language", ',') = 0||mv_to_string("language", ',')) IS NOT TRUE
+              AND ('1'||mv_to_string("language", ',') = 0||mv_to_string("language", ',')) IS FALSE
+              AND ('1'||mv_to_string("language", ',') <> 0||mv_to_string("language", ',')) IS NOT FALSE
+              AND '1'||mv_to_string("language", ',') BETWEEN 0||mv_to_string("language", ',') AND 2||mv_to_string("language", ',')
+              AND '1'||mv_to_string("language", ',') NOT BETWEEN '1'||mv_to_string("language", ',') AND 0||mv_to_string("language", ',')
+              AND '1'||mv_to_string("language", ',') like '%'
+              AND '1'||mv_to_string("language", ',') not like '__DOES_NOT_EXIST__%'
+              AND '1'||mv_to_string("language", ',') IN (0||mv_to_string("language", ','),
+                                                         1||mv_to_string("language", ','),
+                                                         2||mv_to_string("language", ','))
+              AND '1'||mv_to_string("language", ',') NOT IN (0||mv_to_string("language", ','),
+                                                             2||mv_to_string("language", ','))))
+   GROUP BY 1,
+            2,
+            3,
+            4);
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+#-------------------------------------------------------------------------
+# TEST_ID: A15: string_to_mv
+#-------------------------------------------------------------------------
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND ('1'||string_to_mv('A|B', '|') IS NULL
+       OR ('1'||string_to_mv('A|B', '|') = '1'||string_to_mv('A|B', '|')
+           AND '1'||string_to_mv('A|B', '|') IS NOT DISTINCT
+           FROM '1'||string_to_mv('A|B', '|')
+           AND '1'||string_to_mv('A|B', '|') <> '0'||string_to_mv('A|B', '|')
+           AND ('1'||string_to_mv('A|B', '|') IS DISTINCT
+                FROM '0'||string_to_mv('A|B', '|'))
+           AND '1'||string_to_mv('A|B', '|') > '0'||string_to_mv('A|B', '|')
+           AND '1'||string_to_mv('A|B', '|') >= '0'||string_to_mv('A|B', '|')
+           AND '1'||string_to_mv('A|B', '|') < '2'||string_to_mv('A|B', '|')
+           AND '1'||string_to_mv('A|B', '|') <= '2'||string_to_mv('A|B', '|')
+           AND ('1'||string_to_mv('A|B', '|') <> '0'||string_to_mv('A|B', '|')) IS TRUE
+           AND ('1'||string_to_mv('A|B', '|') = '0'||string_to_mv('A|B', '|')) IS NOT TRUE
+           AND ('1'||string_to_mv('A|B', '|') = '0'||string_to_mv('A|B', '|')) IS FALSE
+           AND ('1'||string_to_mv('A|B', '|') <> '0'||string_to_mv('A|B', '|')) IS NOT FALSE
+           AND '1'||string_to_mv('A|B', '|') BETWEEN '0'||string_to_mv('A|B', '|') AND '2'||string_to_mv('A|B', '|')
+           AND '1'||string_to_mv('A|B', '|') NOT BETWEEN '1'||string_to_mv('A|B', '|') AND '0'||string_to_mv('A|B', '|')
+           AND '1'||string_to_mv('A|B', '|') like '%'
+           AND '1'||string_to_mv('A|B', '|') not like '__DOES_NOT_EXIST__%'
+           AND '1'||string_to_mv('A|B', '|') IN ('0'||string_to_mv('A|B', '|'),
+                                                 '1'||string_to_mv('A|B', '|'),
+                                                 '2'||string_to_mv('A|B', '|'))
+           AND '1'||string_to_mv('A|B', '|') NOT IN ('0'||string_to_mv('A|B', '|'),
+                                                     '2'||string_to_mv('A|B', '|')))) ;
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND ('1'||string_to_mv('A|B', '|') IS NULL
+       OR '1'||string_to_mv('A|B', '|') IN
+         (SELECT '1'||string_to_mv('A|B', '|')
+          FROM kttm_nested
+          WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+            AND ('1'||string_to_mv('A|B', '|') IS NULL
+                 OR ('1'||string_to_mv('A|B', '|') = '1'||string_to_mv('A|B', '|')
+                     AND '1'||string_to_mv('A|B', '|') IS NOT DISTINCT
+                     FROM '1'||string_to_mv('A|B', '|')
+                     AND '1'||string_to_mv('A|B', '|') <> '0'||string_to_mv('A|B', '|')
+                     AND ('1'||string_to_mv('A|B', '|') IS DISTINCT
+                          FROM '0'||string_to_mv('A|B', '|'))
+                     AND '1'||string_to_mv('A|B', '|') > '0'||string_to_mv('A|B', '|')
+                     AND '1'||string_to_mv('A|B', '|') >= '0'||string_to_mv('A|B', '|')
+                     AND '1'||string_to_mv('A|B', '|') < '2'||string_to_mv('A|B', '|')
+                     AND '1'||string_to_mv('A|B', '|') <= '2'||string_to_mv('A|B', '|')
+                     AND ('1'||string_to_mv('A|B', '|') <> '0'||string_to_mv('A|B', '|')) IS TRUE
+                     AND ('1'||string_to_mv('A|B', '|') = '0'||string_to_mv('A|B', '|')) IS NOT TRUE
+                     AND ('1'||string_to_mv('A|B', '|') = '0'||string_to_mv('A|B', '|')) IS FALSE
+                     AND ('1'||string_to_mv('A|B', '|') <> '0'||string_to_mv('A|B', '|')) IS NOT FALSE
+                     AND '1'||string_to_mv('A|B', '|') BETWEEN '0'||string_to_mv('A|B', '|') AND '2'||string_to_mv('A|B', '|')
+                     AND '1'||string_to_mv('A|B', '|') NOT BETWEEN '1'||string_to_mv('A|B', '|') AND '0'||string_to_mv('A|B', '|')
+                     AND '1'||string_to_mv('A|B', '|') like '%'
+                     AND '1'||string_to_mv('A|B', '|') not like '__DOES_NOT_EXIST__%'
+                     AND '1'||string_to_mv('A|B', '|') IN ('0'||string_to_mv('A|B', '|'),
+                                                           '1'||string_to_mv('A|B', '|'),
+                                                           '2'||string_to_mv('A|B', '|'))
+                     AND '1'||string_to_mv('A|B', '|') NOT IN ('0'||string_to_mv('A|B', '|'),
+                                                               '2'||string_to_mv('A|B', '|'))))));
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM
+  (SELECT __time, number, client_ip,
+                          '1'||string_to_mv('A|B', '|'),
+                          count(*)
+   FROM kttm_nested
+   WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+     AND ('1'||string_to_mv('A|B', '|') IS NULL
+          OR ('1'||string_to_mv('A|B', '|') = '1'||string_to_mv('A|B', '|')
+              AND '1'||string_to_mv('A|B', '|') IS NOT DISTINCT
+              FROM '1'||string_to_mv('A|B', '|')
+              AND '1'||string_to_mv('A|B', '|') <> '0'||string_to_mv('A|B', '|')
+              AND ('1'||string_to_mv('A|B', '|') IS DISTINCT
+                   FROM '0'||string_to_mv('A|B', '|'))
+              AND '1'||string_to_mv('A|B', '|') > '0'||string_to_mv('A|B', '|')
+              AND '1'||string_to_mv('A|B', '|') >= '0'||string_to_mv('A|B', '|')
+              AND '1'||string_to_mv('A|B', '|') < '2'||string_to_mv('A|B', '|')
+              AND '1'||string_to_mv('A|B', '|') <= '2'||string_to_mv('A|B', '|')
+              AND ('1'||string_to_mv('A|B', '|') <> '0'||string_to_mv('A|B', '|')) IS TRUE
+              AND ('1'||string_to_mv('A|B', '|') = '0'||string_to_mv('A|B', '|')) IS NOT TRUE
+              AND ('1'||string_to_mv('A|B', '|') = '0'||string_to_mv('A|B', '|')) IS FALSE
+              AND ('1'||string_to_mv('A|B', '|') <> '0'||string_to_mv('A|B', '|')) IS NOT FALSE
+              AND '1'||string_to_mv('A|B', '|') BETWEEN '0'||string_to_mv('A|B', '|') AND '2'||string_to_mv('A|B', '|')
+              AND '1'||string_to_mv('A|B', '|') NOT BETWEEN '1'||string_to_mv('A|B', '|') AND '0'||string_to_mv('A|B', '|')
+              AND '1'||string_to_mv('A|B', '|') like '%'
+              AND '1'||string_to_mv('A|B', '|') not like '__DOES_NOT_EXIST__%'
+              AND '1'||string_to_mv('A|B', '|') IN ('0'||string_to_mv('A|B', '|'),
+                                                    '1'||string_to_mv('A|B', '|'),
+                                                    '2'||string_to_mv('A|B', '|'))
+              AND '1'||string_to_mv('A|B', '|') NOT IN ('0'||string_to_mv('A|B', '|'),
+                                                        '2'||string_to_mv('A|B', '|'))))
+   GROUP BY 1,
+            2,
+            3,
+            4);
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+#-------------------------------------------------------------------------
+# TEST_ID: A16: mv_to_array
+#-------------------------------------------------------------------------
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND ('1'||array_offset(mv_to_array("language"), 0) IS NULL
+       OR ('1'||array_offset(mv_to_array("language"), 0) = 1||array_offset(mv_to_array("language"), 0)
+           AND '1'||array_offset(mv_to_array("language"), 0) IS NOT DISTINCT
+           FROM 1||array_offset(mv_to_array("language"), 0)
+           AND '1'||array_offset(mv_to_array("language"), 0) <> 0||array_offset(mv_to_array("language"), 0)
+           AND ('1'||array_offset(mv_to_array("language"), 0) IS DISTINCT
+                FROM 0||array_offset(mv_to_array("language"), 0))
+           AND '1'||array_offset(mv_to_array("language"), 0) > 0||array_offset(mv_to_array("language"), 0)
+           AND '1'||array_offset(mv_to_array("language"), 0) >= 0||array_offset(mv_to_array("language"), 0)
+           AND '1'||array_offset(mv_to_array("language"), 0) < 2||array_offset(mv_to_array("language"), 0)
+           AND '1'||array_offset(mv_to_array("language"), 0) <= 2||array_offset(mv_to_array("language"), 0)
+           AND ('1'||array_offset(mv_to_array("language"), 0) <> 0||array_offset(mv_to_array("language"), 0)) IS TRUE
+           AND ('1'||array_offset(mv_to_array("language"), 0) = 0||array_offset(mv_to_array("language"), 0)) IS NOT TRUE
+           AND ('1'||array_offset(mv_to_array("language"), 0) = 0||array_offset(mv_to_array("language"), 0)) IS FALSE
+           AND ('1'||array_offset(mv_to_array("language"), 0) <> 0||array_offset(mv_to_array("language"), 0)) IS NOT FALSE
+           AND '1'||array_offset(mv_to_array("language"), 0) BETWEEN 0||array_offset(mv_to_array("language"), 0) AND 2||array_offset(mv_to_array("language"), 0)
+           AND '1'||array_offset(mv_to_array("language"), 0) NOT BETWEEN '1'||array_offset(mv_to_array("language"), 0) AND 0||array_offset(mv_to_array("language"), 0)
+           AND '1'||array_offset(mv_to_array("language"), 0) like '%'
+           AND '1'||array_offset(mv_to_array("language"), 0) not like '__DOES_NOT_EXIST__%'
+           AND '1'||array_offset(mv_to_array("language"), 0) IN (0||array_offset(mv_to_array("language"), 0),
+                                                                 1||array_offset(mv_to_array("language"), 0),
+                                                                 2||array_offset(mv_to_array("language"), 0))
+           AND '1'||array_offset(mv_to_array("language"), 0) NOT IN (0||array_offset(mv_to_array("language"), 0),
+                                                                     2||array_offset(mv_to_array("language"), 0)))) ;
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND ('1'||array_offset(mv_to_array("language"), 0) IS NULL
+       OR '1'||array_offset(mv_to_array("language"), 0) IN
+         (SELECT '1'||array_offset(mv_to_array("language"), 0)
+          FROM kttm_nested
+          WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+            AND ('1'||array_offset(mv_to_array("language"), 0) IS NULL
+                 OR ('1'||array_offset(mv_to_array("language"), 0) = 1||array_offset(mv_to_array("language"), 0)
+                     AND '1'||array_offset(mv_to_array("language"), 0) IS NOT DISTINCT
+                     FROM 1||array_offset(mv_to_array("language"), 0)
+                     AND '1'||array_offset(mv_to_array("language"), 0) <> 0||array_offset(mv_to_array("language"), 0)
+                     AND ('1'||array_offset(mv_to_array("language"), 0) IS DISTINCT
+                          FROM 0||array_offset(mv_to_array("language"), 0))
+                     AND '1'||array_offset(mv_to_array("language"), 0) > 0||array_offset(mv_to_array("language"), 0)
+                     AND '1'||array_offset(mv_to_array("language"), 0) >= 0||array_offset(mv_to_array("language"), 0)
+                     AND '1'||array_offset(mv_to_array("language"), 0) < 2||array_offset(mv_to_array("language"), 0)
+                     AND '1'||array_offset(mv_to_array("language"), 0) <= 2||array_offset(mv_to_array("language"), 0)
+                     AND ('1'||array_offset(mv_to_array("language"), 0) <> 0||array_offset(mv_to_array("language"), 0)) IS TRUE
+                     AND ('1'||array_offset(mv_to_array("language"), 0) = 0||array_offset(mv_to_array("language"), 0)) IS NOT TRUE
+                     AND ('1'||array_offset(mv_to_array("language"), 0) = 0||array_offset(mv_to_array("language"), 0)) IS FALSE
+                     AND ('1'||array_offset(mv_to_array("language"), 0) <> 0||array_offset(mv_to_array("language"), 0)) IS NOT FALSE
+                     AND '1'||array_offset(mv_to_array("language"), 0) BETWEEN 0||array_offset(mv_to_array("language"), 0) AND 2||array_offset(mv_to_array("language"), 0)
+                     AND '1'||array_offset(mv_to_array("language"), 0) NOT BETWEEN '1'||array_offset(mv_to_array("language"), 0) AND 0||array_offset(mv_to_array("language"), 0)
+                     AND '1'||array_offset(mv_to_array("language"), 0) like '%'
+                     AND '1'||array_offset(mv_to_array("language"), 0) not like '__DOES_NOT_EXIST__%'
+                     AND '1'||array_offset(mv_to_array("language"), 0) IN (0||array_offset(mv_to_array("language"), 0),
+                                                                           1||array_offset(mv_to_array("language"), 0),
+                                                                           2||array_offset(mv_to_array("language"), 0))
+                     AND '1'||array_offset(mv_to_array("language"), 0) NOT IN (0||array_offset(mv_to_array("language"), 0),
+                                                                               2||array_offset(mv_to_array("language"), 0))))));
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM
+  (SELECT __time, number, client_ip,
+                          '1'||array_offset(mv_to_array("language"), 0),
+                          count(*)
+   FROM kttm_nested
+   WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+     AND ('1'||array_offset(mv_to_array("language"), 0) IS NULL
+          OR ('1'||array_offset(mv_to_array("language"), 0) = 1||array_offset(mv_to_array("language"), 0)
+              AND '1'||array_offset(mv_to_array("language"), 0) IS NOT DISTINCT
+              FROM 1||array_offset(mv_to_array("language"), 0)
+              AND '1'||array_offset(mv_to_array("language"), 0) <> 0||array_offset(mv_to_array("language"), 0)
+              AND ('1'||array_offset(mv_to_array("language"), 0) IS DISTINCT
+                   FROM 0||array_offset(mv_to_array("language"), 0))
+              AND '1'||array_offset(mv_to_array("language"), 0) > 0||array_offset(mv_to_array("language"), 0)
+              AND '1'||array_offset(mv_to_array("language"), 0) >= 0||array_offset(mv_to_array("language"), 0)
+              AND '1'||array_offset(mv_to_array("language"), 0) < 2||array_offset(mv_to_array("language"), 0)
+              AND '1'||array_offset(mv_to_array("language"), 0) <= 2||array_offset(mv_to_array("language"), 0)
+              AND ('1'||array_offset(mv_to_array("language"), 0) <> 0||array_offset(mv_to_array("language"), 0)) IS TRUE
+              AND ('1'||array_offset(mv_to_array("language"), 0) = 0||array_offset(mv_to_array("language"), 0)) IS NOT TRUE
+              AND ('1'||array_offset(mv_to_array("language"), 0) = 0||array_offset(mv_to_array("language"), 0)) IS FALSE
+              AND ('1'||array_offset(mv_to_array("language"), 0) <> 0||array_offset(mv_to_array("language"), 0)) IS NOT FALSE
+              AND '1'||array_offset(mv_to_array("language"), 0) BETWEEN 0||array_offset(mv_to_array("language"), 0) AND 2||array_offset(mv_to_array("language"), 0)
+              AND '1'||array_offset(mv_to_array("language"), 0) NOT BETWEEN '1'||array_offset(mv_to_array("language"), 0) AND 0||array_offset(mv_to_array("language"), 0)
+              AND '1'||array_offset(mv_to_array("language"), 0) like '%'
+              AND '1'||array_offset(mv_to_array("language"), 0) not like '__DOES_NOT_EXIST__%'
+              AND '1'||array_offset(mv_to_array("language"), 0) IN (0||array_offset(mv_to_array("language"), 0),
+                                                                    1||array_offset(mv_to_array("language"), 0),
+                                                                    2||array_offset(mv_to_array("language"), 0))
+              AND '1'||array_offset(mv_to_array("language"), 0) NOT IN (0||array_offset(mv_to_array("language"), 0),
+                                                                        2||array_offset(mv_to_array("language"), 0))))
+   GROUP BY 1,
+            2,
+            3,
+            4);
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+#-------------------------------------------------------------------------
+# Total query count 49
+#-------------------------------------------------------------------------
diff --git a/quidem-ut/src/test/quidem/org.apache.druid.quidem.QTest/qaSQL_scalar_other.iq b/quidem-ut/src/test/quidem/org.apache.druid.quidem.QTest/qaSQL_scalar_other.iq
new file mode 100644
index 000000000000..4a0b95616020
--- /dev/null
+++ b/quidem-ut/src/test/quidem/org.apache.druid.quidem.QTest/qaSQL_scalar_other.iq
@@ -0,0 +1,3490 @@
+!set useApproximateCountDistinct false
+!use druidtest:///?componentSupplier=KttmNestedComponentSupplier
+!set outputformat mysql
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00';
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+#-------------------------------------------------------------------------
+# TEST_ID: A1: case_scalar
+#-------------------------------------------------------------------------
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND ('1'||(CASE client_ip
+                 WHEN server_ip THEN session_length
+                 ELSE session_length+1
+             END) IS NULL
+       OR ('1'||(CASE client_ip
+                     WHEN server_ip THEN session_length
+                     ELSE session_length+1
+                 END) = 1||(CASE client_ip
+                                WHEN server_ip THEN session_length
+                                ELSE session_length+1
+                            END)
+           AND '1'||(CASE client_ip
+                         WHEN server_ip THEN session_length
+                         ELSE session_length+1
+                     END) IS NOT DISTINCT
+           FROM 1||(CASE client_ip
+                        WHEN server_ip THEN session_length
+                        ELSE session_length+1
+                    END)
+           AND '1'||(CASE client_ip
+                         WHEN server_ip THEN session_length
+                         ELSE session_length+1
+                     END) <> '0'||(CASE client_ip
+                                       WHEN server_ip THEN session_length
+                                       ELSE session_length+1
+                                   END)
+           AND ('1'||(CASE client_ip
+                          WHEN server_ip THEN session_length
+                          ELSE session_length+1
+                      END) IS DISTINCT
+                FROM '0'||(CASE client_ip
+                               WHEN server_ip THEN session_length
+                               ELSE session_length+1
+                           END))
+           AND '1'||(CASE client_ip
+                         WHEN server_ip THEN session_length
+                         ELSE session_length+1
+                     END) > '0'||(CASE client_ip
+                                      WHEN server_ip THEN session_length
+                                      ELSE session_length+1
+                                  END)
+           AND '1'||(CASE client_ip
+                         WHEN server_ip THEN session_length
+                         ELSE session_length+1
+                     END) >= '0'||(CASE client_ip
+                                       WHEN server_ip THEN session_length
+                                       ELSE session_length+1
+                                   END)
+           AND '1'||(CASE client_ip
+                         WHEN server_ip THEN session_length
+                         ELSE session_length+1
+                     END) < 2||(CASE client_ip
+                                    WHEN server_ip THEN session_length
+                                    ELSE session_length+1
+                                END)
+           AND '1'||(CASE client_ip
+                         WHEN server_ip THEN session_length
+                         ELSE session_length+1
+                     END) <= 2||(CASE client_ip
+                                     WHEN server_ip THEN session_length
+                                     ELSE session_length+1
+                                 END)
+           AND ('1'||(CASE client_ip
+                          WHEN server_ip THEN session_length
+                          ELSE session_length+1
+                      END) <> '0'||(CASE client_ip
+                                        WHEN server_ip THEN session_length
+                                        ELSE session_length+1
+                                    END)) IS TRUE
+           AND ('1'||(CASE client_ip
+                          WHEN server_ip THEN session_length
+                          ELSE session_length+1
+                      END) = '0'||(CASE client_ip
+                                       WHEN server_ip THEN session_length
+                                       ELSE session_length+1
+                                   END)) IS NOT TRUE
+           AND ('1'||(CASE client_ip
+                          WHEN server_ip THEN session_length
+                          ELSE session_length+1
+                      END) = '0'||(CASE client_ip
+                                       WHEN server_ip THEN session_length
+                                       ELSE session_length+1
+                                   END)) IS FALSE
+           AND ('1'||(CASE client_ip
+                          WHEN server_ip THEN session_length
+                          ELSE session_length+1
+                      END) <> '0'||(CASE client_ip
+                                        WHEN server_ip THEN session_length
+                                        ELSE session_length+1
+                                    END)) IS NOT FALSE
+           AND '1'||(CASE client_ip
+                         WHEN server_ip THEN session_length
+                         ELSE session_length+1
+                     END) BETWEEN '0'||(CASE client_ip
+                                            WHEN server_ip THEN session_length
+                                            ELSE session_length+1
+                                        END) AND 2||(CASE client_ip
+                                                         WHEN server_ip THEN session_length
+                                                         ELSE session_length+1
+                                                     END)
+           AND '1'||(CASE client_ip
+                         WHEN server_ip THEN session_length
+                         ELSE session_length+1
+                     END) NOT BETWEEN '1'||(CASE client_ip
+                                                WHEN server_ip THEN session_length
+                                                ELSE session_length+1
+                                            END) AND '0'||(CASE client_ip
+                                                               WHEN server_ip THEN session_length
+                                                               ELSE session_length+1
+                                                           END)
+           AND '1'||(CASE client_ip
+                         WHEN server_ip THEN session_length
+                         ELSE session_length+1
+                     END) like '%'
+           AND '1'||(CASE client_ip
+                         WHEN server_ip THEN session_length
+                         ELSE session_length+1
+                     END) not like '__DOES_NOT_EXIST__%'
+           AND '1'||(CASE client_ip
+                         WHEN server_ip THEN session_length
+                         ELSE session_length+1
+                     END) IN ('0'||(CASE client_ip
+                                        WHEN server_ip THEN session_length
+                                        ELSE session_length+1
+                                    END),
+                              1||(CASE client_ip
+                                      WHEN server_ip THEN session_length
+                                      ELSE session_length+1
+                                  END),
+                              2||(CASE client_ip
+                                      WHEN server_ip THEN session_length
+                                      ELSE session_length+1
+                                  END))
+           AND '1'||(CASE client_ip
+                         WHEN server_ip THEN session_length
+                         ELSE session_length+1
+                     END) NOT IN ('0'||(CASE client_ip
+                                            WHEN server_ip THEN session_length
+                                            ELSE session_length+1
+                                        END),
+                                  2||(CASE client_ip
+                                          WHEN server_ip THEN session_length
+                                          ELSE session_length+1
+                                      END)))) ;
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND ('1'||(CASE client_ip
+                 WHEN server_ip THEN session_length
+                 ELSE session_length+1
+             END) IS NULL
+       OR '1'||(CASE client_ip
+                    WHEN server_ip THEN session_length
+                    ELSE session_length+1
+                END) IN
+         (SELECT '1'||(CASE client_ip
+                           WHEN server_ip THEN session_length
+                           ELSE session_length+1
+                       END)
+          FROM kttm_nested
+          WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+            AND ('1'||(CASE client_ip
+                           WHEN server_ip THEN session_length
+                           ELSE session_length+1
+                       END) IS NULL
+                 OR ('1'||(CASE client_ip
+                               WHEN server_ip THEN session_length
+                               ELSE session_length+1
+                           END) = 1||(CASE client_ip
+                                          WHEN server_ip THEN session_length
+                                          ELSE session_length+1
+                                      END)
+                     AND '1'||(CASE client_ip
+                                   WHEN server_ip THEN session_length
+                                   ELSE session_length+1
+                               END) IS NOT DISTINCT
+                     FROM 1||(CASE client_ip
+                                  WHEN server_ip THEN session_length
+                                  ELSE session_length+1
+                              END)
+                     AND '1'||(CASE client_ip
+                                   WHEN server_ip THEN session_length
+                                   ELSE session_length+1
+                               END) <> '0'||(CASE client_ip
+                                                 WHEN server_ip THEN session_length
+                                                 ELSE session_length+1
+                                             END)
+                     AND ('1'||(CASE client_ip
+                                    WHEN server_ip THEN session_length
+                                    ELSE session_length+1
+                                END) IS DISTINCT
+                          FROM '0'||(CASE client_ip
+                                         WHEN server_ip THEN session_length
+                                         ELSE session_length+1
+                                     END))
+                     AND '1'||(CASE client_ip
+                                   WHEN server_ip THEN session_length
+                                   ELSE session_length+1
+                               END) > '0'||(CASE client_ip
+                                                WHEN server_ip THEN session_length
+                                                ELSE session_length+1
+                                            END)
+                     AND '1'||(CASE client_ip
+                                   WHEN server_ip THEN session_length
+                                   ELSE session_length+1
+                               END) >= '0'||(CASE client_ip
+                                                 WHEN server_ip THEN session_length
+                                                 ELSE session_length+1
+                                             END)
+                     AND '1'||(CASE client_ip
+                                   WHEN server_ip THEN session_length
+                                   ELSE session_length+1
+                               END) < 2||(CASE client_ip
+                                              WHEN server_ip THEN session_length
+                                              ELSE session_length+1
+                                          END)
+                     AND '1'||(CASE client_ip
+                                   WHEN server_ip THEN session_length
+                                   ELSE session_length+1
+                               END) <= 2||(CASE client_ip
+                                               WHEN server_ip THEN session_length
+                                               ELSE session_length+1
+                                           END)
+                     AND ('1'||(CASE client_ip
+                                    WHEN server_ip THEN session_length
+                                    ELSE session_length+1
+                                END) <> '0'||(CASE client_ip
+                                                  WHEN server_ip THEN session_length
+                                                  ELSE session_length+1
+                                              END)) IS TRUE
+                     AND ('1'||(CASE client_ip
+                                    WHEN server_ip THEN session_length
+                                    ELSE session_length+1
+                                END) = '0'||(CASE client_ip
+                                                 WHEN server_ip THEN session_length
+                                                 ELSE session_length+1
+                                             END)) IS NOT TRUE
+                     AND ('1'||(CASE client_ip
+                                    WHEN server_ip THEN session_length
+                                    ELSE session_length+1
+                                END) = '0'||(CASE client_ip
+                                                 WHEN server_ip THEN session_length
+                                                 ELSE session_length+1
+                                             END)) IS FALSE
+                     AND ('1'||(CASE client_ip
+                                    WHEN server_ip THEN session_length
+                                    ELSE session_length+1
+                                END) <> '0'||(CASE client_ip
+                                                  WHEN server_ip THEN session_length
+                                                  ELSE session_length+1
+                                              END)) IS NOT FALSE
+                     AND '1'||(CASE client_ip
+                                   WHEN server_ip THEN session_length
+                                   ELSE session_length+1
+                               END) BETWEEN '0'||(CASE client_ip
+                                                      WHEN server_ip THEN session_length
+                                                      ELSE session_length+1
+                                                  END) AND 2||(CASE client_ip
+                                                                   WHEN server_ip THEN session_length
+                                                                   ELSE session_length+1
+                                                               END)
+                     AND '1'||(CASE client_ip
+                                   WHEN server_ip THEN session_length
+                                   ELSE session_length+1
+                               END) NOT BETWEEN '1'||(CASE client_ip
+                                                          WHEN server_ip THEN session_length
+                                                          ELSE session_length+1
+                                                      END) AND '0'||(CASE client_ip
+                                                                         WHEN server_ip THEN session_length
+                                                                         ELSE session_length+1
+                                                                     END)
+                     AND '1'||(CASE client_ip
+                                   WHEN server_ip THEN session_length
+                                   ELSE session_length+1
+                               END) like '%'
+                     AND '1'||(CASE client_ip
+                                   WHEN server_ip THEN session_length
+                                   ELSE session_length+1
+                               END) not like '__DOES_NOT_EXIST__%'
+                     AND '1'||(CASE client_ip
+                                   WHEN server_ip THEN session_length
+                                   ELSE session_length+1
+                               END) IN ('0'||(CASE client_ip
+                                                  WHEN server_ip THEN session_length
+                                                  ELSE session_length+1
+                                              END),
+                                        1||(CASE client_ip
+                                                WHEN server_ip THEN session_length
+                                                ELSE session_length+1
+                                            END),
+                                        2||(CASE client_ip
+                                                WHEN server_ip THEN session_length
+                                                ELSE session_length+1
+                                            END))
+                     AND '1'||(CASE client_ip
+                                   WHEN server_ip THEN session_length
+                                   ELSE session_length+1
+                               END) NOT IN ('0'||(CASE client_ip
+                                                      WHEN server_ip THEN session_length
+                                                      ELSE session_length+1
+                                                  END),
+                                            2||(CASE client_ip
+                                                    WHEN server_ip THEN session_length
+                                                    ELSE session_length+1
+                                                END))))));
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM
+  (SELECT __time, number, client_ip,
+                          '1'||(CASE client_ip
+                                    WHEN server_ip THEN session_length
+                                    ELSE session_length+1
+                                END),
+                          count(*)
+   FROM kttm_nested
+   WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+     AND ('1'||(CASE client_ip
+                    WHEN server_ip THEN session_length
+                    ELSE session_length+1
+                END) IS NULL
+          OR ('1'||(CASE client_ip
+                        WHEN server_ip THEN session_length
+                        ELSE session_length+1
+                    END) = 1||(CASE client_ip
+                                   WHEN server_ip THEN session_length
+                                   ELSE session_length+1
+                               END)
+              AND '1'||(CASE client_ip
+                            WHEN server_ip THEN session_length
+                            ELSE session_length+1
+                        END) IS NOT DISTINCT
+              FROM 1||(CASE client_ip
+                           WHEN server_ip THEN session_length
+                           ELSE session_length+1
+                       END)
+              AND '1'||(CASE client_ip
+                            WHEN server_ip THEN session_length
+                            ELSE session_length+1
+                        END) <> '0'||(CASE client_ip
+                                          WHEN server_ip THEN session_length
+                                          ELSE session_length+1
+                                      END)
+              AND ('1'||(CASE client_ip
+                             WHEN server_ip THEN session_length
+                             ELSE session_length+1
+                         END) IS DISTINCT
+                   FROM '0'||(CASE client_ip
+                                  WHEN server_ip THEN session_length
+                                  ELSE session_length+1
+                              END))
+              AND '1'||(CASE client_ip
+                            WHEN server_ip THEN session_length
+                            ELSE session_length+1
+                        END) > '0'||(CASE client_ip
+                                         WHEN server_ip THEN session_length
+                                         ELSE session_length+1
+                                     END)
+              AND '1'||(CASE client_ip
+                            WHEN server_ip THEN session_length
+                            ELSE session_length+1
+                        END) >= '0'||(CASE client_ip
+                                          WHEN server_ip THEN session_length
+                                          ELSE session_length+1
+                                      END)
+              AND '1'||(CASE client_ip
+                            WHEN server_ip THEN session_length
+                            ELSE session_length+1
+                        END) < 2||(CASE client_ip
+                                       WHEN server_ip THEN session_length
+                                       ELSE session_length+1
+                                   END)
+              AND '1'||(CASE client_ip
+                            WHEN server_ip THEN session_length
+                            ELSE session_length+1
+                        END) <= 2||(CASE client_ip
+                                        WHEN server_ip THEN session_length
+                                        ELSE session_length+1
+                                    END)
+              AND ('1'||(CASE client_ip
+                             WHEN server_ip THEN session_length
+                             ELSE session_length+1
+                         END) <> '0'||(CASE client_ip
+                                           WHEN server_ip THEN session_length
+                                           ELSE session_length+1
+                                       END)) IS TRUE
+              AND ('1'||(CASE client_ip
+                             WHEN server_ip THEN session_length
+                             ELSE session_length+1
+                         END) = '0'||(CASE client_ip
+                                          WHEN server_ip THEN session_length
+                                          ELSE session_length+1
+                                      END)) IS NOT TRUE
+              AND ('1'||(CASE client_ip
+                             WHEN server_ip THEN session_length
+                             ELSE session_length+1
+                         END) = '0'||(CASE client_ip
+                                          WHEN server_ip THEN session_length
+                                          ELSE session_length+1
+                                      END)) IS FALSE
+              AND ('1'||(CASE client_ip
+                             WHEN server_ip THEN session_length
+                             ELSE session_length+1
+                         END) <> '0'||(CASE client_ip
+                                           WHEN server_ip THEN session_length
+                                           ELSE session_length+1
+                                       END)) IS NOT FALSE
+              AND '1'||(CASE client_ip
+                            WHEN server_ip THEN session_length
+                            ELSE session_length+1
+                        END) BETWEEN '0'||(CASE client_ip
+                                               WHEN server_ip THEN session_length
+                                               ELSE session_length+1
+                                           END) AND 2||(CASE client_ip
+                                                            WHEN server_ip THEN session_length
+                                                            ELSE session_length+1
+                                                        END)
+              AND '1'||(CASE client_ip
+                            WHEN server_ip THEN session_length
+                            ELSE session_length+1
+                        END) NOT BETWEEN '1'||(CASE client_ip
+                                                   WHEN server_ip THEN session_length
+                                                   ELSE session_length+1
+                                               END) AND '0'||(CASE client_ip
+                                                                  WHEN server_ip THEN session_length
+                                                                  ELSE session_length+1
+                                                              END)
+              AND '1'||(CASE client_ip
+                            WHEN server_ip THEN session_length
+                            ELSE session_length+1
+                        END) like '%'
+              AND '1'||(CASE client_ip
+                            WHEN server_ip THEN session_length
+                            ELSE session_length+1
+                        END) not like '__DOES_NOT_EXIST__%'
+              AND '1'||(CASE client_ip
+                            WHEN server_ip THEN session_length
+                            ELSE session_length+1
+                        END) IN ('0'||(CASE client_ip
+                                           WHEN server_ip THEN session_length
+                                           ELSE session_length+1
+                                       END),
+                                 1||(CASE client_ip
+                                         WHEN server_ip THEN session_length
+                                         ELSE session_length+1
+                                     END),
+                                 2||(CASE client_ip
+                                         WHEN server_ip THEN session_length
+                                         ELSE session_length+1
+                                     END))
+              AND '1'||(CASE client_ip
+                            WHEN server_ip THEN session_length
+                            ELSE session_length+1
+                        END) NOT IN ('0'||(CASE client_ip
+                                               WHEN server_ip THEN session_length
+                                               ELSE session_length+1
+                                           END),
+                                     2||(CASE client_ip
+                                             WHEN server_ip THEN session_length
+                                             ELSE session_length+1
+                                         END))))
+   GROUP BY 1,
+            2,
+            3,
+            4);
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+#-------------------------------------------------------------------------
+# TEST_ID: A2: case_complex
+#-------------------------------------------------------------------------
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND ('1'||(CASE session_length
+                 WHEN session_length+1 THEN json_value(agent, '$.browser')
+                 ELSE json_value(agent, '$.browser_version')
+             END) IS NULL
+       OR ('1'||(CASE session_length
+                     WHEN session_length+1 THEN json_value(agent, '$.browser')
+                     ELSE json_value(agent, '$.browser_version')
+                 END) = 1||(CASE session_length
+                                WHEN session_length+1 THEN json_value(agent, '$.browser')
+                                ELSE json_value(agent, '$.browser_version')
+                            END)
+           AND '1'||(CASE session_length
+                         WHEN session_length+1 THEN json_value(agent, '$.browser')
+                         ELSE json_value(agent, '$.browser_version')
+                     END) IS NOT DISTINCT
+           FROM 1||(CASE session_length
+                        WHEN session_length+1 THEN json_value(agent, '$.browser')
+                        ELSE json_value(agent, '$.browser_version')
+                    END)
+           AND '1'||(CASE session_length
+                         WHEN session_length+1 THEN json_value(agent, '$.browser')
+                         ELSE json_value(agent, '$.browser_version')
+                     END) <> '0'||(CASE session_length
+                                       WHEN session_length+1 THEN json_value(agent, '$.browser')
+                                       ELSE json_value(agent, '$.browser_version')
+                                   END)
+           AND ('1'||(CASE session_length
+                          WHEN session_length+1 THEN json_value(agent, '$.browser')
+                          ELSE json_value(agent, '$.browser_version')
+                      END) IS DISTINCT
+                FROM '0'||(CASE session_length
+                               WHEN session_length+1 THEN json_value(agent, '$.browser')
+                               ELSE json_value(agent, '$.browser_version')
+                           END))
+           AND '1'||(CASE session_length
+                         WHEN session_length+1 THEN json_value(agent, '$.browser')
+                         ELSE json_value(agent, '$.browser_version')
+                     END) > '0'||(CASE session_length
+                                      WHEN session_length+1 THEN json_value(agent, '$.browser')
+                                      ELSE json_value(agent, '$.browser_version')
+                                  END)
+           AND '1'||(CASE session_length
+                         WHEN session_length+1 THEN json_value(agent, '$.browser')
+                         ELSE json_value(agent, '$.browser_version')
+                     END) >= '0'||(CASE session_length
+                                       WHEN session_length+1 THEN json_value(agent, '$.browser')
+                                       ELSE json_value(agent, '$.browser_version')
+                                   END)
+           AND '1'||(CASE session_length
+                         WHEN session_length+1 THEN json_value(agent, '$.browser')
+                         ELSE json_value(agent, '$.browser_version')
+                     END) < 2||(CASE session_length
+                                    WHEN session_length+1 THEN json_value(agent, '$.browser')
+                                    ELSE json_value(agent, '$.browser_version')
+                                END)
+           AND '1'||(CASE session_length
+                         WHEN session_length+1 THEN json_value(agent, '$.browser')
+                         ELSE json_value(agent, '$.browser_version')
+                     END) <= 2||(CASE session_length
+                                     WHEN session_length+1 THEN json_value(agent, '$.browser')
+                                     ELSE json_value(agent, '$.browser_version')
+                                 END)
+           AND ('1'||(CASE session_length
+                          WHEN session_length+1 THEN json_value(agent, '$.browser')
+                          ELSE json_value(agent, '$.browser_version')
+                      END) <> '0'||(CASE session_length
+                                        WHEN session_length+1 THEN json_value(agent, '$.browser')
+                                        ELSE json_value(agent, '$.browser_version')
+                                    END)) IS TRUE
+           AND ('1'||(CASE session_length
+                          WHEN session_length+1 THEN json_value(agent, '$.browser')
+                          ELSE json_value(agent, '$.browser_version')
+                      END) = '0'||(CASE session_length
+                                       WHEN session_length+1 THEN json_value(agent, '$.browser')
+                                       ELSE json_value(agent, '$.browser_version')
+                                   END)) IS NOT TRUE
+           AND ('1'||(CASE session_length
+                          WHEN session_length+1 THEN json_value(agent, '$.browser')
+                          ELSE json_value(agent, '$.browser_version')
+                      END) = '0'||(CASE session_length
+                                       WHEN session_length+1 THEN json_value(agent, '$.browser')
+                                       ELSE json_value(agent, '$.browser_version')
+                                   END)) IS FALSE
+           AND ('1'||(CASE session_length
+                          WHEN session_length+1 THEN json_value(agent, '$.browser')
+                          ELSE json_value(agent, '$.browser_version')
+                      END) <> '0'||(CASE session_length
+                                        WHEN session_length+1 THEN json_value(agent, '$.browser')
+                                        ELSE json_value(agent, '$.browser_version')
+                                    END)) IS NOT FALSE
+           AND '1'||(CASE session_length
+                         WHEN session_length+1 THEN json_value(agent, '$.browser')
+                         ELSE json_value(agent, '$.browser_version')
+                     END) BETWEEN '0'||(CASE session_length
+                                            WHEN session_length+1 THEN json_value(agent, '$.browser')
+                                            ELSE json_value(agent, '$.browser_version')
+                                        END) AND 2||(CASE session_length
+                                                         WHEN session_length+1 THEN json_value(agent, '$.browser')
+                                                         ELSE json_value(agent, '$.browser_version')
+                                                     END)
+           AND '1'||(CASE session_length
+                         WHEN session_length+1 THEN json_value(agent, '$.browser')
+                         ELSE json_value(agent, '$.browser_version')
+                     END) NOT BETWEEN '1'||(CASE session_length
+                                                WHEN session_length+1 THEN json_value(agent, '$.browser')
+                                                ELSE json_value(agent, '$.browser_version')
+                                            END) AND '0'||(CASE session_length
+                                                               WHEN session_length+1 THEN json_value(agent, '$.browser')
+                                                               ELSE json_value(agent, '$.browser_version')
+                                                           END)
+           AND '1'||(CASE session_length
+                         WHEN session_length+1 THEN json_value(agent, '$.browser')
+                         ELSE json_value(agent, '$.browser_version')
+                     END) like '%'
+           AND '1'||(CASE session_length
+                         WHEN session_length+1 THEN json_value(agent, '$.browser')
+                         ELSE json_value(agent, '$.browser_version')
+                     END) not like '__DOES_NOT_EXIST__%'
+           AND '1'||(CASE session_length
+                         WHEN session_length+1 THEN json_value(agent, '$.browser')
+                         ELSE json_value(agent, '$.browser_version')
+                     END) IN ('0'||(CASE session_length
+                                        WHEN session_length+1 THEN json_value(agent, '$.browser')
+                                        ELSE json_value(agent, '$.browser_version')
+                                    END),
+                              1||(CASE session_length
+                                      WHEN session_length+1 THEN json_value(agent, '$.browser')
+                                      ELSE json_value(agent, '$.browser_version')
+                                  END),
+                              2||(CASE session_length
+                                      WHEN session_length+1 THEN json_value(agent, '$.browser')
+                                      ELSE json_value(agent, '$.browser_version')
+                                  END))
+           AND '1'||(CASE session_length
+                         WHEN session_length+1 THEN json_value(agent, '$.browser')
+                         ELSE json_value(agent, '$.browser_version')
+                     END) NOT IN ('0'||(CASE session_length
+                                            WHEN session_length+1 THEN json_value(agent, '$.browser')
+                                            ELSE json_value(agent, '$.browser_version')
+                                        END),
+                                  2||(CASE session_length
+                                          WHEN session_length+1 THEN json_value(agent, '$.browser')
+                                          ELSE json_value(agent, '$.browser_version')
+                                      END)))) ;
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND ('1'||(CASE session_length
+                 WHEN session_length+1 THEN json_value(agent, '$.browser')
+                 ELSE json_value(agent, '$.browser_version')
+             END) IS NULL
+       OR '1'||(CASE session_length
+                    WHEN session_length+1 THEN json_value(agent, '$.browser')
+                    ELSE json_value(agent, '$.browser_version')
+                END) IN
+         (SELECT '1'||(CASE session_length
+                           WHEN session_length+1 THEN json_value(agent, '$.browser')
+                           ELSE json_value(agent, '$.browser_version')
+                       END)
+          FROM kttm_nested
+          WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+            AND ('1'||(CASE session_length
+                           WHEN session_length+1 THEN json_value(agent, '$.browser')
+                           ELSE json_value(agent, '$.browser_version')
+                       END) IS NULL
+                 OR ('1'||(CASE session_length
+                               WHEN session_length+1 THEN json_value(agent, '$.browser')
+                               ELSE json_value(agent, '$.browser_version')
+                           END) = 1||(CASE session_length
+                                          WHEN session_length+1 THEN json_value(agent, '$.browser')
+                                          ELSE json_value(agent, '$.browser_version')
+                                      END)
+                     AND '1'||(CASE session_length
+                                   WHEN session_length+1 THEN json_value(agent, '$.browser')
+                                   ELSE json_value(agent, '$.browser_version')
+                               END) IS NOT DISTINCT
+                     FROM 1||(CASE session_length
+                                  WHEN session_length+1 THEN json_value(agent, '$.browser')
+                                  ELSE json_value(agent, '$.browser_version')
+                              END)
+                     AND '1'||(CASE session_length
+                                   WHEN session_length+1 THEN json_value(agent, '$.browser')
+                                   ELSE json_value(agent, '$.browser_version')
+                               END) <> '0'||(CASE session_length
+                                                 WHEN session_length+1 THEN json_value(agent, '$.browser')
+                                                 ELSE json_value(agent, '$.browser_version')
+                                             END)
+                     AND ('1'||(CASE session_length
+                                    WHEN session_length+1 THEN json_value(agent, '$.browser')
+                                    ELSE json_value(agent, '$.browser_version')
+                                END) IS DISTINCT
+                          FROM '0'||(CASE session_length
+                                         WHEN session_length+1 THEN json_value(agent, '$.browser')
+                                         ELSE json_value(agent, '$.browser_version')
+                                     END))
+                     AND '1'||(CASE session_length
+                                   WHEN session_length+1 THEN json_value(agent, '$.browser')
+                                   ELSE json_value(agent, '$.browser_version')
+                               END) > '0'||(CASE session_length
+                                                WHEN session_length+1 THEN json_value(agent, '$.browser')
+                                                ELSE json_value(agent, '$.browser_version')
+                                            END)
+                     AND '1'||(CASE session_length
+                                   WHEN session_length+1 THEN json_value(agent, '$.browser')
+                                   ELSE json_value(agent, '$.browser_version')
+                               END) >= '0'||(CASE session_length
+                                                 WHEN session_length+1 THEN json_value(agent, '$.browser')
+                                                 ELSE json_value(agent, '$.browser_version')
+                                             END)
+                     AND '1'||(CASE session_length
+                                   WHEN session_length+1 THEN json_value(agent, '$.browser')
+                                   ELSE json_value(agent, '$.browser_version')
+                               END) < 2||(CASE session_length
+                                              WHEN session_length+1 THEN json_value(agent, '$.browser')
+                                              ELSE json_value(agent, '$.browser_version')
+                                          END)
+                     AND '1'||(CASE session_length
+                                   WHEN session_length+1 THEN json_value(agent, '$.browser')
+                                   ELSE json_value(agent, '$.browser_version')
+                               END) <= 2||(CASE session_length
+                                               WHEN session_length+1 THEN json_value(agent, '$.browser')
+                                               ELSE json_value(agent, '$.browser_version')
+                                           END)
+                     AND ('1'||(CASE session_length
+                                    WHEN session_length+1 THEN json_value(agent, '$.browser')
+                                    ELSE json_value(agent, '$.browser_version')
+                                END) <> '0'||(CASE session_length
+                                                  WHEN session_length+1 THEN json_value(agent, '$.browser')
+                                                  ELSE json_value(agent, '$.browser_version')
+                                              END)) IS TRUE
+                     AND ('1'||(CASE session_length
+                                    WHEN session_length+1 THEN json_value(agent, '$.browser')
+                                    ELSE json_value(agent, '$.browser_version')
+                                END) = '0'||(CASE session_length
+                                                 WHEN session_length+1 THEN json_value(agent, '$.browser')
+                                                 ELSE json_value(agent, '$.browser_version')
+                                             END)) IS NOT TRUE
+                     AND ('1'||(CASE session_length
+                                    WHEN session_length+1 THEN json_value(agent, '$.browser')
+                                    ELSE json_value(agent, '$.browser_version')
+                                END) = '0'||(CASE session_length
+                                                 WHEN session_length+1 THEN json_value(agent, '$.browser')
+                                                 ELSE json_value(agent, '$.browser_version')
+                                             END)) IS FALSE
+                     AND ('1'||(CASE session_length
+                                    WHEN session_length+1 THEN json_value(agent, '$.browser')
+                                    ELSE json_value(agent, '$.browser_version')
+                                END) <> '0'||(CASE session_length
+                                                  WHEN session_length+1 THEN json_value(agent, '$.browser')
+                                                  ELSE json_value(agent, '$.browser_version')
+                                              END)) IS NOT FALSE
+                     AND '1'||(CASE session_length
+                                   WHEN session_length+1 THEN json_value(agent, '$.browser')
+                                   ELSE json_value(agent, '$.browser_version')
+                               END) BETWEEN '0'||(CASE session_length
+                                                      WHEN session_length+1 THEN json_value(agent, '$.browser')
+                                                      ELSE json_value(agent, '$.browser_version')
+                                                  END) AND 2||(CASE session_length
+                                                                   WHEN session_length+1 THEN json_value(agent, '$.browser')
+                                                                   ELSE json_value(agent, '$.browser_version')
+                                                               END)
+                     AND '1'||(CASE session_length
+                                   WHEN session_length+1 THEN json_value(agent, '$.browser')
+                                   ELSE json_value(agent, '$.browser_version')
+                               END) NOT BETWEEN '1'||(CASE session_length
+                                                          WHEN session_length+1 THEN json_value(agent, '$.browser')
+                                                          ELSE json_value(agent, '$.browser_version')
+                                                      END) AND '0'||(CASE session_length
+                                                                         WHEN session_length+1 THEN json_value(agent, '$.browser')
+                                                                         ELSE json_value(agent, '$.browser_version')
+                                                                     END)
+                     AND '1'||(CASE session_length
+                                   WHEN session_length+1 THEN json_value(agent, '$.browser')
+                                   ELSE json_value(agent, '$.browser_version')
+                               END) like '%'
+                     AND '1'||(CASE session_length
+                                   WHEN session_length+1 THEN json_value(agent, '$.browser')
+                                   ELSE json_value(agent, '$.browser_version')
+                               END) not like '__DOES_NOT_EXIST__%'
+                     AND '1'||(CASE session_length
+                                   WHEN session_length+1 THEN json_value(agent, '$.browser')
+                                   ELSE json_value(agent, '$.browser_version')
+                               END) IN ('0'||(CASE session_length
+                                                  WHEN session_length+1 THEN json_value(agent, '$.browser')
+                                                  ELSE json_value(agent, '$.browser_version')
+                                              END),
+                                        1||(CASE session_length
+                                                WHEN session_length+1 THEN json_value(agent, '$.browser')
+                                                ELSE json_value(agent, '$.browser_version')
+                                            END),
+                                        2||(CASE session_length
+                                                WHEN session_length+1 THEN json_value(agent, '$.browser')
+                                                ELSE json_value(agent, '$.browser_version')
+                                            END))
+                     AND '1'||(CASE session_length
+                                   WHEN session_length+1 THEN json_value(agent, '$.browser')
+                                   ELSE json_value(agent, '$.browser_version')
+                               END) NOT IN ('0'||(CASE session_length
+                                                      WHEN session_length+1 THEN json_value(agent, '$.browser')
+                                                      ELSE json_value(agent, '$.browser_version')
+                                                  END),
+                                            2||(CASE session_length
+                                                    WHEN session_length+1 THEN json_value(agent, '$.browser')
+                                                    ELSE json_value(agent, '$.browser_version')
+                                                END))))));
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM
+  (SELECT __time, number, client_ip,
+                          '1'||(CASE session_length
+                                    WHEN session_length+1 THEN json_value(agent, '$.browser')
+                                    ELSE json_value(agent, '$.browser_version')
+                                END),
+                          count(*)
+   FROM kttm_nested
+   WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+     AND ('1'||(CASE session_length
+                    WHEN session_length+1 THEN json_value(agent, '$.browser')
+                    ELSE json_value(agent, '$.browser_version')
+                END) IS NULL
+          OR ('1'||(CASE session_length
+                        WHEN session_length+1 THEN json_value(agent, '$.browser')
+                        ELSE json_value(agent, '$.browser_version')
+                    END) = 1||(CASE session_length
+                                   WHEN session_length+1 THEN json_value(agent, '$.browser')
+                                   ELSE json_value(agent, '$.browser_version')
+                               END)
+              AND '1'||(CASE session_length
+                            WHEN session_length+1 THEN json_value(agent, '$.browser')
+                            ELSE json_value(agent, '$.browser_version')
+                        END) IS NOT DISTINCT
+              FROM 1||(CASE session_length
+                           WHEN session_length+1 THEN json_value(agent, '$.browser')
+                           ELSE json_value(agent, '$.browser_version')
+                       END)
+              AND '1'||(CASE session_length
+                            WHEN session_length+1 THEN json_value(agent, '$.browser')
+                            ELSE json_value(agent, '$.browser_version')
+                        END) <> '0'||(CASE session_length
+                                          WHEN session_length+1 THEN json_value(agent, '$.browser')
+                                          ELSE json_value(agent, '$.browser_version')
+                                      END)
+              AND ('1'||(CASE session_length
+                             WHEN session_length+1 THEN json_value(agent, '$.browser')
+                             ELSE json_value(agent, '$.browser_version')
+                         END) IS DISTINCT
+                   FROM '0'||(CASE session_length
+                                  WHEN session_length+1 THEN json_value(agent, '$.browser')
+                                  ELSE json_value(agent, '$.browser_version')
+                              END))
+              AND '1'||(CASE session_length
+                            WHEN session_length+1 THEN json_value(agent, '$.browser')
+                            ELSE json_value(agent, '$.browser_version')
+                        END) > '0'||(CASE session_length
+                                         WHEN session_length+1 THEN json_value(agent, '$.browser')
+                                         ELSE json_value(agent, '$.browser_version')
+                                     END)
+              AND '1'||(CASE session_length
+                            WHEN session_length+1 THEN json_value(agent, '$.browser')
+                            ELSE json_value(agent, '$.browser_version')
+                        END) >= '0'||(CASE session_length
+                                          WHEN session_length+1 THEN json_value(agent, '$.browser')
+                                          ELSE json_value(agent, '$.browser_version')
+                                      END)
+              AND '1'||(CASE session_length
+                            WHEN session_length+1 THEN json_value(agent, '$.browser')
+                            ELSE json_value(agent, '$.browser_version')
+                        END) < 2||(CASE session_length
+                                       WHEN session_length+1 THEN json_value(agent, '$.browser')
+                                       ELSE json_value(agent, '$.browser_version')
+                                   END)
+              AND '1'||(CASE session_length
+                            WHEN session_length+1 THEN json_value(agent, '$.browser')
+                            ELSE json_value(agent, '$.browser_version')
+                        END) <= 2||(CASE session_length
+                                        WHEN session_length+1 THEN json_value(agent, '$.browser')
+                                        ELSE json_value(agent, '$.browser_version')
+                                    END)
+              AND ('1'||(CASE session_length
+                             WHEN session_length+1 THEN json_value(agent, '$.browser')
+                             ELSE json_value(agent, '$.browser_version')
+                         END) <> '0'||(CASE session_length
+                                           WHEN session_length+1 THEN json_value(agent, '$.browser')
+                                           ELSE json_value(agent, '$.browser_version')
+                                       END)) IS TRUE
+              AND ('1'||(CASE session_length
+                             WHEN session_length+1 THEN json_value(agent, '$.browser')
+                             ELSE json_value(agent, '$.browser_version')
+                         END) = '0'||(CASE session_length
+                                          WHEN session_length+1 THEN json_value(agent, '$.browser')
+                                          ELSE json_value(agent, '$.browser_version')
+                                      END)) IS NOT TRUE
+              AND ('1'||(CASE session_length
+                             WHEN session_length+1 THEN json_value(agent, '$.browser')
+                             ELSE json_value(agent, '$.browser_version')
+                         END) = '0'||(CASE session_length
+                                          WHEN session_length+1 THEN json_value(agent, '$.browser')
+                                          ELSE json_value(agent, '$.browser_version')
+                                      END)) IS FALSE
+              AND ('1'||(CASE session_length
+                             WHEN session_length+1 THEN json_value(agent, '$.browser')
+                             ELSE json_value(agent, '$.browser_version')
+                         END) <> '0'||(CASE session_length
+                                           WHEN session_length+1 THEN json_value(agent, '$.browser')
+                                           ELSE json_value(agent, '$.browser_version')
+                                       END)) IS NOT FALSE
+              AND '1'||(CASE session_length
+                            WHEN session_length+1 THEN json_value(agent, '$.browser')
+                            ELSE json_value(agent, '$.browser_version')
+                        END) BETWEEN '0'||(CASE session_length
+                                               WHEN session_length+1 THEN json_value(agent, '$.browser')
+                                               ELSE json_value(agent, '$.browser_version')
+                                           END) AND 2||(CASE session_length
+                                                            WHEN session_length+1 THEN json_value(agent, '$.browser')
+                                                            ELSE json_value(agent, '$.browser_version')
+                                                        END)
+              AND '1'||(CASE session_length
+                            WHEN session_length+1 THEN json_value(agent, '$.browser')
+                            ELSE json_value(agent, '$.browser_version')
+                        END) NOT BETWEEN '1'||(CASE session_length
+                                                   WHEN session_length+1 THEN json_value(agent, '$.browser')
+                                                   ELSE json_value(agent, '$.browser_version')
+                                               END) AND '0'||(CASE session_length
+                                                                  WHEN session_length+1 THEN json_value(agent, '$.browser')
+                                                                  ELSE json_value(agent, '$.browser_version')
+                                                              END)
+              AND '1'||(CASE session_length
+                            WHEN session_length+1 THEN json_value(agent, '$.browser')
+                            ELSE json_value(agent, '$.browser_version')
+                        END) like '%'
+              AND '1'||(CASE session_length
+                            WHEN session_length+1 THEN json_value(agent, '$.browser')
+                            ELSE json_value(agent, '$.browser_version')
+                        END) not like '__DOES_NOT_EXIST__%'
+              AND '1'||(CASE session_length
+                            WHEN session_length+1 THEN json_value(agent, '$.browser')
+                            ELSE json_value(agent, '$.browser_version')
+                        END) IN ('0'||(CASE session_length
+                                           WHEN session_length+1 THEN json_value(agent, '$.browser')
+                                           ELSE json_value(agent, '$.browser_version')
+                                       END),
+                                 1||(CASE session_length
+                                         WHEN session_length+1 THEN json_value(agent, '$.browser')
+                                         ELSE json_value(agent, '$.browser_version')
+                                     END),
+                                 2||(CASE session_length
+                                         WHEN session_length+1 THEN json_value(agent, '$.browser')
+                                         ELSE json_value(agent, '$.browser_version')
+                                     END))
+              AND '1'||(CASE session_length
+                            WHEN session_length+1 THEN json_value(agent, '$.browser')
+                            ELSE json_value(agent, '$.browser_version')
+                        END) NOT IN ('0'||(CASE session_length
+                                               WHEN session_length+1 THEN json_value(agent, '$.browser')
+                                               ELSE json_value(agent, '$.browser_version')
+                                           END),
+                                     2||(CASE session_length
+                                             WHEN session_length+1 THEN json_value(agent, '$.browser')
+                                             ELSE json_value(agent, '$.browser_version')
+                                         END))))
+   GROUP BY 1,
+            2,
+            3,
+            4);
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+#-------------------------------------------------------------------------
+# TEST_ID: A3: case_searched_scalar
+#-------------------------------------------------------------------------
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND ('1'||cast(CASE
+                     WHEN client_ip=server_ip THEN session_length
+                     ELSE session_length+1
+                 END AS char) IS NULL
+       OR ('1'||cast(CASE
+                         WHEN client_ip=server_ip THEN session_length
+                         ELSE session_length+1
+                     END AS char) = 1||cast(CASE
+                                                WHEN client_ip=server_ip THEN session_length
+                                                ELSE session_length+1
+                                            END AS char)
+           AND '1'||cast(CASE
+                             WHEN client_ip=server_ip THEN session_length
+                             ELSE session_length+1
+                         END AS char) IS NOT DISTINCT
+           FROM 1||cast(CASE
+                            WHEN client_ip=server_ip THEN session_length
+                            ELSE session_length+1
+                        END AS char)
+           AND '1'||cast(CASE
+                             WHEN client_ip=server_ip THEN session_length
+                             ELSE session_length+1
+                         END AS char) <> '0'||cast(CASE
+                                                       WHEN client_ip=server_ip THEN session_length
+                                                       ELSE session_length+1
+                                                   END AS char)
+           AND ('1'||cast(CASE
+                              WHEN client_ip=server_ip THEN session_length
+                              ELSE session_length+1
+                          END AS char) IS DISTINCT
+                FROM '0'||cast(CASE
+                                   WHEN client_ip=server_ip THEN session_length
+                                   ELSE session_length+1
+                               END AS char))
+           AND '1'||cast(CASE
+                             WHEN client_ip=server_ip THEN session_length
+                             ELSE session_length+1
+                         END AS char) > '0'||cast(CASE
+                                                      WHEN client_ip=server_ip THEN session_length
+                                                      ELSE session_length+1
+                                                  END AS char)
+           AND '1'||cast(CASE
+                             WHEN client_ip=server_ip THEN session_length
+                             ELSE session_length+1
+                         END AS char) >= '0'||cast(CASE
+                                                       WHEN client_ip=server_ip THEN session_length
+                                                       ELSE session_length+1
+                                                   END AS char)
+           AND '1'||cast(CASE
+                             WHEN client_ip=server_ip THEN session_length
+                             ELSE session_length+1
+                         END AS char) < 2||cast(CASE
+                                                    WHEN client_ip=server_ip THEN session_length
+                                                    ELSE session_length+1
+                                                END AS char)
+           AND '1'||cast(CASE
+                             WHEN client_ip=server_ip THEN session_length
+                             ELSE session_length+1
+                         END AS char) <= 2||cast(CASE
+                                                     WHEN client_ip=server_ip THEN session_length
+                                                     ELSE session_length+1
+                                                 END AS char)
+           AND ('1'||cast(CASE
+                              WHEN client_ip=server_ip THEN session_length
+                              ELSE session_length+1
+                          END AS char) <> '0'||cast(CASE
+                                                        WHEN client_ip=server_ip THEN session_length
+                                                        ELSE session_length+1
+                                                    END AS char)) IS TRUE
+           AND ('1'||cast(CASE
+                              WHEN client_ip=server_ip THEN session_length
+                              ELSE session_length+1
+                          END AS char) = '0'||cast(CASE
+                                                       WHEN client_ip=server_ip THEN session_length
+                                                       ELSE session_length+1
+                                                   END AS char)) IS NOT TRUE
+           AND ('1'||cast(CASE
+                              WHEN client_ip=server_ip THEN session_length
+                              ELSE session_length+1
+                          END AS char) = '0'||cast(CASE
+                                                       WHEN client_ip=server_ip THEN session_length
+                                                       ELSE session_length+1
+                                                   END AS char)) IS FALSE
+           AND ('1'||cast(CASE
+                              WHEN client_ip=server_ip THEN session_length
+                              ELSE session_length+1
+                          END AS char) <> '0'||cast(CASE
+                                                        WHEN client_ip=server_ip THEN session_length
+                                                        ELSE session_length+1
+                                                    END AS char)) IS NOT FALSE
+           AND '1'||cast(CASE
+                             WHEN client_ip=server_ip THEN session_length
+                             ELSE session_length+1
+                         END AS char) BETWEEN '0'||cast(CASE
+                                                            WHEN client_ip=server_ip THEN session_length
+                                                            ELSE session_length+1
+                                                        END AS char) AND 2||cast(CASE
+                                                                                     WHEN client_ip=server_ip THEN session_length
+                                                                                     ELSE session_length+1
+                                                                                 END AS char)
+           AND '1'||cast(CASE
+                             WHEN client_ip=server_ip THEN session_length
+                             ELSE session_length+1
+                         END AS char) NOT BETWEEN '1'||cast(CASE
+                                                                WHEN client_ip=server_ip THEN session_length
+                                                                ELSE session_length+1
+                                                            END AS char) AND '0'||cast(CASE
+                                                                                           WHEN client_ip=server_ip THEN session_length
+                                                                                           ELSE session_length+1
+                                                                                       END AS char)
+           AND '1'||cast(CASE
+                             WHEN client_ip=server_ip THEN session_length
+                             ELSE session_length+1
+                         END AS char) like '%'
+           AND '1'||cast(CASE
+                             WHEN client_ip=server_ip THEN session_length
+                             ELSE session_length+1
+                         END AS char) not like '__DOES_NOT_EXIST__%'
+           AND '1'||cast(CASE
+                             WHEN client_ip=server_ip THEN session_length
+                             ELSE session_length+1
+                         END AS char) IN ('0'||cast(CASE
+                                                        WHEN client_ip=server_ip THEN session_length
+                                                        ELSE session_length+1
+                                                    END AS char),
+                                          1||cast(CASE
+                                                      WHEN client_ip=server_ip THEN session_length
+                                                      ELSE session_length+1
+                                                  END AS char),
+                                          2||cast(CASE
+                                                      WHEN client_ip=server_ip THEN session_length
+                                                      ELSE session_length+1
+                                                  END AS char))
+           AND '1'||cast(CASE
+                             WHEN client_ip=server_ip THEN session_length
+                             ELSE session_length+1
+                         END AS char) NOT IN ('0'||cast(CASE
+                                                            WHEN client_ip=server_ip THEN session_length
+                                                            ELSE session_length+1
+                                                        END AS char),
+                                              2||cast(CASE
+                                                          WHEN client_ip=server_ip THEN session_length
+                                                          ELSE session_length+1
+                                                      END AS char)))) ;
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND ('1'||cast(CASE
+                     WHEN client_ip=server_ip THEN session_length
+                     ELSE session_length+1
+                 END AS char) IS NULL
+       OR '1'||cast(CASE
+                        WHEN client_ip=server_ip THEN session_length
+                        ELSE session_length+1
+                    END AS char) IN
+         (SELECT '1'||cast(CASE
+                               WHEN client_ip=server_ip THEN session_length
+                               ELSE session_length+1
+                           END AS char)
+          FROM kttm_nested
+          WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+            AND ('1'||cast(CASE
+                               WHEN client_ip=server_ip THEN session_length
+                               ELSE session_length+1
+                           END AS char) IS NULL
+                 OR ('1'||cast(CASE
+                                   WHEN client_ip=server_ip THEN session_length
+                                   ELSE session_length+1
+                               END AS char) = 1||cast(CASE
+                                                          WHEN client_ip=server_ip THEN session_length
+                                                          ELSE session_length+1
+                                                      END AS char)
+                     AND '1'||cast(CASE
+                                       WHEN client_ip=server_ip THEN session_length
+                                       ELSE session_length+1
+                                   END AS char) IS NOT DISTINCT
+                     FROM 1||cast(CASE
+                                      WHEN client_ip=server_ip THEN session_length
+                                      ELSE session_length+1
+                                  END AS char)
+                     AND '1'||cast(CASE
+                                       WHEN client_ip=server_ip THEN session_length
+                                       ELSE session_length+1
+                                   END AS char) <> '0'||cast(CASE
+                                                                 WHEN client_ip=server_ip THEN session_length
+                                                                 ELSE session_length+1
+                                                             END AS char)
+                     AND ('1'||cast(CASE
+                                        WHEN client_ip=server_ip THEN session_length
+                                        ELSE session_length+1
+                                    END AS char) IS DISTINCT
+                          FROM '0'||cast(CASE
+                                             WHEN client_ip=server_ip THEN session_length
+                                             ELSE session_length+1
+                                         END AS char))
+                     AND '1'||cast(CASE
+                                       WHEN client_ip=server_ip THEN session_length
+                                       ELSE session_length+1
+                                   END AS char) > '0'||cast(CASE
+                                                                WHEN client_ip=server_ip THEN session_length
+                                                                ELSE session_length+1
+                                                            END AS char)
+                     AND '1'||cast(CASE
+                                       WHEN client_ip=server_ip THEN session_length
+                                       ELSE session_length+1
+                                   END AS char) >= '0'||cast(CASE
+                                                                 WHEN client_ip=server_ip THEN session_length
+                                                                 ELSE session_length+1
+                                                             END AS char)
+                     AND '1'||cast(CASE
+                                       WHEN client_ip=server_ip THEN session_length
+                                       ELSE session_length+1
+                                   END AS char) < 2||cast(CASE
+                                                              WHEN client_ip=server_ip THEN session_length
+                                                              ELSE session_length+1
+                                                          END AS char)
+                     AND '1'||cast(CASE
+                                       WHEN client_ip=server_ip THEN session_length
+                                       ELSE session_length+1
+                                   END AS char) <= 2||cast(CASE
+                                                               WHEN client_ip=server_ip THEN session_length
+                                                               ELSE session_length+1
+                                                           END AS char)
+                     AND ('1'||cast(CASE
+                                        WHEN client_ip=server_ip THEN session_length
+                                        ELSE session_length+1
+                                    END AS char) <> '0'||cast(CASE
+                                                                  WHEN client_ip=server_ip THEN session_length
+                                                                  ELSE session_length+1
+                                                              END AS char)) IS TRUE
+                     AND ('1'||cast(CASE
+                                        WHEN client_ip=server_ip THEN session_length
+                                        ELSE session_length+1
+                                    END AS char) = '0'||cast(CASE
+                                                                 WHEN client_ip=server_ip THEN session_length
+                                                                 ELSE session_length+1
+                                                             END AS char)) IS NOT TRUE
+                     AND ('1'||cast(CASE
+                                        WHEN client_ip=server_ip THEN session_length
+                                        ELSE session_length+1
+                                    END AS char) = '0'||cast(CASE
+                                                                 WHEN client_ip=server_ip THEN session_length
+                                                                 ELSE session_length+1
+                                                             END AS char)) IS FALSE
+                     AND ('1'||cast(CASE
+                                        WHEN client_ip=server_ip THEN session_length
+                                        ELSE session_length+1
+                                    END AS char) <> '0'||cast(CASE
+                                                                  WHEN client_ip=server_ip THEN session_length
+                                                                  ELSE session_length+1
+                                                              END AS char)) IS NOT FALSE
+                     AND '1'||cast(CASE
+                                       WHEN client_ip=server_ip THEN session_length
+                                       ELSE session_length+1
+                                   END AS char) BETWEEN '0'||cast(CASE
+                                                                      WHEN client_ip=server_ip THEN session_length
+                                                                      ELSE session_length+1
+                                                                  END AS char) AND 2||cast(CASE
+                                                                                               WHEN client_ip=server_ip THEN session_length
+                                                                                               ELSE session_length+1
+                                                                                           END AS char)
+                     AND '1'||cast(CASE
+                                       WHEN client_ip=server_ip THEN session_length
+                                       ELSE session_length+1
+                                   END AS char) NOT BETWEEN '1'||cast(CASE
+                                                                          WHEN client_ip=server_ip THEN session_length
+                                                                          ELSE session_length+1
+                                                                      END AS char) AND '0'||cast(CASE
+                                                                                                     WHEN client_ip=server_ip THEN session_length
+                                                                                                     ELSE session_length+1
+                                                                                                 END AS char)
+                     AND '1'||cast(CASE
+                                       WHEN client_ip=server_ip THEN session_length
+                                       ELSE session_length+1
+                                   END AS char) like '%'
+                     AND '1'||cast(CASE
+                                       WHEN client_ip=server_ip THEN session_length
+                                       ELSE session_length+1
+                                   END AS char) not like '__DOES_NOT_EXIST__%'
+                     AND '1'||cast(CASE
+                                       WHEN client_ip=server_ip THEN session_length
+                                       ELSE session_length+1
+                                   END AS char) IN ('0'||cast(CASE
+                                                                  WHEN client_ip=server_ip THEN session_length
+                                                                  ELSE session_length+1
+                                                              END AS char),
+                                                    1||cast(CASE
+                                                                WHEN client_ip=server_ip THEN session_length
+                                                                ELSE session_length+1
+                                                            END AS char),
+                                                    2||cast(CASE
+                                                                WHEN client_ip=server_ip THEN session_length
+                                                                ELSE session_length+1
+                                                            END AS char))
+                     AND '1'||cast(CASE
+                                       WHEN client_ip=server_ip THEN session_length
+                                       ELSE session_length+1
+                                   END AS char) NOT IN ('0'||cast(CASE
+                                                                      WHEN client_ip=server_ip THEN session_length
+                                                                      ELSE session_length+1
+                                                                  END AS char),
+                                                        2||cast(CASE
+                                                                    WHEN client_ip=server_ip THEN session_length
+                                                                    ELSE session_length+1
+                                                                END AS char))))));
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM
+  (SELECT __time, number, client_ip,
+                          '1'||cast(CASE
+                                        WHEN client_ip=server_ip THEN session_length
+                                        ELSE session_length+1
+                                    END AS char),
+                          count(*)
+   FROM kttm_nested
+   WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+     AND ('1'||cast(CASE
+                        WHEN client_ip=server_ip THEN session_length
+                        ELSE session_length+1
+                    END AS char) IS NULL
+          OR ('1'||cast(CASE
+                            WHEN client_ip=server_ip THEN session_length
+                            ELSE session_length+1
+                        END AS char) = 1||cast(CASE
+                                                   WHEN client_ip=server_ip THEN session_length
+                                                   ELSE session_length+1
+                                               END AS char)
+              AND '1'||cast(CASE
+                                WHEN client_ip=server_ip THEN session_length
+                                ELSE session_length+1
+                            END AS char) IS NOT DISTINCT
+              FROM 1||cast(CASE
+                               WHEN client_ip=server_ip THEN session_length
+                               ELSE session_length+1
+                           END AS char)
+              AND '1'||cast(CASE
+                                WHEN client_ip=server_ip THEN session_length
+                                ELSE session_length+1
+                            END AS char) <> '0'||cast(CASE
+                                                          WHEN client_ip=server_ip THEN session_length
+                                                          ELSE session_length+1
+                                                      END AS char)
+              AND ('1'||cast(CASE
+                                 WHEN client_ip=server_ip THEN session_length
+                                 ELSE session_length+1
+                             END AS char) IS DISTINCT
+                   FROM '0'||cast(CASE
+                                      WHEN client_ip=server_ip THEN session_length
+                                      ELSE session_length+1
+                                  END AS char))
+              AND '1'||cast(CASE
+                                WHEN client_ip=server_ip THEN session_length
+                                ELSE session_length+1
+                            END AS char) > '0'||cast(CASE
+                                                         WHEN client_ip=server_ip THEN session_length
+                                                         ELSE session_length+1
+                                                     END AS char)
+              AND '1'||cast(CASE
+                                WHEN client_ip=server_ip THEN session_length
+                                ELSE session_length+1
+                            END AS char) >= '0'||cast(CASE
+                                                          WHEN client_ip=server_ip THEN session_length
+                                                          ELSE session_length+1
+                                                      END AS char)
+              AND '1'||cast(CASE
+                                WHEN client_ip=server_ip THEN session_length
+                                ELSE session_length+1
+                            END AS char) < 2||cast(CASE
+                                                       WHEN client_ip=server_ip THEN session_length
+                                                       ELSE session_length+1
+                                                   END AS char)
+              AND '1'||cast(CASE
+                                WHEN client_ip=server_ip THEN session_length
+                                ELSE session_length+1
+                            END AS char) <= 2||cast(CASE
+                                                        WHEN client_ip=server_ip THEN session_length
+                                                        ELSE session_length+1
+                                                    END AS char)
+              AND ('1'||cast(CASE
+                                 WHEN client_ip=server_ip THEN session_length
+                                 ELSE session_length+1
+                             END AS char) <> '0'||cast(CASE
+                                                           WHEN client_ip=server_ip THEN session_length
+                                                           ELSE session_length+1
+                                                       END AS char)) IS TRUE
+              AND ('1'||cast(CASE
+                                 WHEN client_ip=server_ip THEN session_length
+                                 ELSE session_length+1
+                             END AS char) = '0'||cast(CASE
+                                                          WHEN client_ip=server_ip THEN session_length
+                                                          ELSE session_length+1
+                                                      END AS char)) IS NOT TRUE
+              AND ('1'||cast(CASE
+                                 WHEN client_ip=server_ip THEN session_length
+                                 ELSE session_length+1
+                             END AS char) = '0'||cast(CASE
+                                                          WHEN client_ip=server_ip THEN session_length
+                                                          ELSE session_length+1
+                                                      END AS char)) IS FALSE
+              AND ('1'||cast(CASE
+                                 WHEN client_ip=server_ip THEN session_length
+                                 ELSE session_length+1
+                             END AS char) <> '0'||cast(CASE
+                                                           WHEN client_ip=server_ip THEN session_length
+                                                           ELSE session_length+1
+                                                       END AS char)) IS NOT FALSE
+              AND '1'||cast(CASE
+                                WHEN client_ip=server_ip THEN session_length
+                                ELSE session_length+1
+                            END AS char) BETWEEN '0'||cast(CASE
+                                                               WHEN client_ip=server_ip THEN session_length
+                                                               ELSE session_length+1
+                                                           END AS char) AND 2||cast(CASE
+                                                                                        WHEN client_ip=server_ip THEN session_length
+                                                                                        ELSE session_length+1
+                                                                                    END AS char)
+              AND '1'||cast(CASE
+                                WHEN client_ip=server_ip THEN session_length
+                                ELSE session_length+1
+                            END AS char) NOT BETWEEN '1'||cast(CASE
+                                                                   WHEN client_ip=server_ip THEN session_length
+                                                                   ELSE session_length+1
+                                                               END AS char) AND '0'||cast(CASE
+                                                                                              WHEN client_ip=server_ip THEN session_length
+                                                                                              ELSE session_length+1
+                                                                                          END AS char)
+              AND '1'||cast(CASE
+                                WHEN client_ip=server_ip THEN session_length
+                                ELSE session_length+1
+                            END AS char) like '%'
+              AND '1'||cast(CASE
+                                WHEN client_ip=server_ip THEN session_length
+                                ELSE session_length+1
+                            END AS char) not like '__DOES_NOT_EXIST__%'
+              AND '1'||cast(CASE
+                                WHEN client_ip=server_ip THEN session_length
+                                ELSE session_length+1
+                            END AS char) IN ('0'||cast(CASE
+                                                           WHEN client_ip=server_ip THEN session_length
+                                                           ELSE session_length+1
+                                                       END AS char),
+                                             1||cast(CASE
+                                                         WHEN client_ip=server_ip THEN session_length
+                                                         ELSE session_length+1
+                                                     END AS char),
+                                             2||cast(CASE
+                                                         WHEN client_ip=server_ip THEN session_length
+                                                         ELSE session_length+1
+                                                     END AS char))
+              AND '1'||cast(CASE
+                                WHEN client_ip=server_ip THEN session_length
+                                ELSE session_length+1
+                            END AS char) NOT IN ('0'||cast(CASE
+                                                               WHEN client_ip=server_ip THEN session_length
+                                                               ELSE session_length+1
+                                                           END AS char),
+                                                 2||cast(CASE
+                                                             WHEN client_ip=server_ip THEN session_length
+                                                             ELSE session_length+1
+                                                         END AS char))))
+   GROUP BY 1,
+            2,
+            3,
+            4);
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+#-------------------------------------------------------------------------
+# TEST_ID: A4: case_searched_complex
+#-------------------------------------------------------------------------
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND ('1'||(CASE
+                 WHEN json_value(agent, '$.browser')=json_value(agent, '$.browser_version') THEN json_value(agent, '$.browser')
+                 ELSE json_value(agent, '$.browser_version')
+             END) IS NULL
+       OR ('1'||(CASE
+                     WHEN json_value(agent, '$.browser')=json_value(agent, '$.browser_version') THEN json_value(agent, '$.browser')
+                     ELSE json_value(agent, '$.browser_version')
+                 END) = 1||(CASE
+                                WHEN json_value(agent, '$.browser')=json_value(agent, '$.browser_version') THEN json_value(agent, '$.browser')
+                                ELSE json_value(agent, '$.browser_version')
+                            END)
+           AND '1'||(CASE
+                         WHEN json_value(agent, '$.browser')=json_value(agent, '$.browser_version') THEN json_value(agent, '$.browser')
+                         ELSE json_value(agent, '$.browser_version')
+                     END) IS NOT DISTINCT
+           FROM 1||(CASE
+                        WHEN json_value(agent, '$.browser')=json_value(agent, '$.browser_version') THEN json_value(agent, '$.browser')
+                        ELSE json_value(agent, '$.browser_version')
+                    END)
+           AND '1'||(CASE
+                         WHEN json_value(agent, '$.browser')=json_value(agent, '$.browser_version') THEN json_value(agent, '$.browser')
+                         ELSE json_value(agent, '$.browser_version')
+                     END) <> '0'||(CASE
+                                       WHEN json_value(agent, '$.browser')=json_value(agent, '$.browser_version') THEN json_value(agent, '$.browser')
+                                       ELSE json_value(agent, '$.browser_version')
+                                   END)
+           AND ('1'||(CASE
+                          WHEN json_value(agent, '$.browser')=json_value(agent, '$.browser_version') THEN json_value(agent, '$.browser')
+                          ELSE json_value(agent, '$.browser_version')
+                      END) IS DISTINCT
+                FROM '0'||(CASE
+                               WHEN json_value(agent, '$.browser')=json_value(agent, '$.browser_version') THEN json_value(agent, '$.browser')
+                               ELSE json_value(agent, '$.browser_version')
+                           END))
+           AND '1'||(CASE
+                         WHEN json_value(agent, '$.browser')=json_value(agent, '$.browser_version') THEN json_value(agent, '$.browser')
+                         ELSE json_value(agent, '$.browser_version')
+                     END) > '0'||(CASE
+                                      WHEN json_value(agent, '$.browser')=json_value(agent, '$.browser_version') THEN json_value(agent, '$.browser')
+                                      ELSE json_value(agent, '$.browser_version')
+                                  END)
+           AND '1'||(CASE
+                         WHEN json_value(agent, '$.browser')=json_value(agent, '$.browser_version') THEN json_value(agent, '$.browser')
+                         ELSE json_value(agent, '$.browser_version')
+                     END) >= '0'||(CASE
+                                       WHEN json_value(agent, '$.browser')=json_value(agent, '$.browser_version') THEN json_value(agent, '$.browser')
+                                       ELSE json_value(agent, '$.browser_version')
+                                   END)
+           AND '1'||(CASE
+                         WHEN json_value(agent, '$.browser')=json_value(agent, '$.browser_version') THEN json_value(agent, '$.browser')
+                         ELSE json_value(agent, '$.browser_version')
+                     END) < 2||(CASE
+                                    WHEN json_value(agent, '$.browser')=json_value(agent, '$.browser_version') THEN json_value(agent, '$.browser')
+                                    ELSE json_value(agent, '$.browser_version')
+                                END)
+           AND '1'||(CASE
+                         WHEN json_value(agent, '$.browser')=json_value(agent, '$.browser_version') THEN json_value(agent, '$.browser')
+                         ELSE json_value(agent, '$.browser_version')
+                     END) <= 2||(CASE
+                                     WHEN json_value(agent, '$.browser')=json_value(agent, '$.browser_version') THEN json_value(agent, '$.browser')
+                                     ELSE json_value(agent, '$.browser_version')
+                                 END)
+           AND ('1'||(CASE
+                          WHEN json_value(agent, '$.browser')=json_value(agent, '$.browser_version') THEN json_value(agent, '$.browser')
+                          ELSE json_value(agent, '$.browser_version')
+                      END) <> '0'||(CASE
+                                        WHEN json_value(agent, '$.browser')=json_value(agent, '$.browser_version') THEN json_value(agent, '$.browser')
+                                        ELSE json_value(agent, '$.browser_version')
+                                    END)) IS TRUE
+           AND ('1'||(CASE
+                          WHEN json_value(agent, '$.browser')=json_value(agent, '$.browser_version') THEN json_value(agent, '$.browser')
+                          ELSE json_value(agent, '$.browser_version')
+                      END) = '0'||(CASE
+                                       WHEN json_value(agent, '$.browser')=json_value(agent, '$.browser_version') THEN json_value(agent, '$.browser')
+                                       ELSE json_value(agent, '$.browser_version')
+                                   END)) IS NOT TRUE
+           AND ('1'||(CASE
+                          WHEN json_value(agent, '$.browser')=json_value(agent, '$.browser_version') THEN json_value(agent, '$.browser')
+                          ELSE json_value(agent, '$.browser_version')
+                      END) = '0'||(CASE
+                                       WHEN json_value(agent, '$.browser')=json_value(agent, '$.browser_version') THEN json_value(agent, '$.browser')
+                                       ELSE json_value(agent, '$.browser_version')
+                                   END)) IS FALSE
+           AND ('1'||(CASE
+                          WHEN json_value(agent, '$.browser')=json_value(agent, '$.browser_version') THEN json_value(agent, '$.browser')
+                          ELSE json_value(agent, '$.browser_version')
+                      END) <> '0'||(CASE
+                                        WHEN json_value(agent, '$.browser')=json_value(agent, '$.browser_version') THEN json_value(agent, '$.browser')
+                                        ELSE json_value(agent, '$.browser_version')
+                                    END)) IS NOT FALSE
+           AND '1'||(CASE
+                         WHEN json_value(agent, '$.browser')=json_value(agent, '$.browser_version') THEN json_value(agent, '$.browser')
+                         ELSE json_value(agent, '$.browser_version')
+                     END) BETWEEN '0'||(CASE
+                                            WHEN json_value(agent, '$.browser')=json_value(agent, '$.browser_version') THEN json_value(agent, '$.browser')
+                                            ELSE json_value(agent, '$.browser_version')
+                                        END) AND 2||(CASE
+                                                         WHEN json_value(agent, '$.browser')=json_value(agent, '$.browser_version') THEN json_value(agent, '$.browser')
+                                                         ELSE json_value(agent, '$.browser_version')
+                                                     END)
+           AND '1'||(CASE
+                         WHEN json_value(agent, '$.browser')=json_value(agent, '$.browser_version') THEN json_value(agent, '$.browser')
+                         ELSE json_value(agent, '$.browser_version')
+                     END) NOT BETWEEN '1'||(CASE
+                                                WHEN json_value(agent, '$.browser')=json_value(agent, '$.browser_version') THEN json_value(agent, '$.browser')
+                                                ELSE json_value(agent, '$.browser_version')
+                                            END) AND '0'||(CASE
+                                                               WHEN json_value(agent, '$.browser')=json_value(agent, '$.browser_version') THEN json_value(agent, '$.browser')
+                                                               ELSE json_value(agent, '$.browser_version')
+                                                           END)
+           AND '1'||(CASE
+                         WHEN json_value(agent, '$.browser')=json_value(agent, '$.browser_version') THEN json_value(agent, '$.browser')
+                         ELSE json_value(agent, '$.browser_version')
+                     END) like '%'
+           AND '1'||(CASE
+                         WHEN json_value(agent, '$.browser')=json_value(agent, '$.browser_version') THEN json_value(agent, '$.browser')
+                         ELSE json_value(agent, '$.browser_version')
+                     END) not like '__DOES_NOT_EXIST__%'
+           AND '1'||(CASE
+                         WHEN json_value(agent, '$.browser')=json_value(agent, '$.browser_version') THEN json_value(agent, '$.browser')
+                         ELSE json_value(agent, '$.browser_version')
+                     END) IN ('0'||(CASE
+                                        WHEN json_value(agent, '$.browser')=json_value(agent, '$.browser_version') THEN json_value(agent, '$.browser')
+                                        ELSE json_value(agent, '$.browser_version')
+                                    END),
+                              1||(CASE
+                                      WHEN json_value(agent, '$.browser')=json_value(agent, '$.browser_version') THEN json_value(agent, '$.browser')
+                                      ELSE json_value(agent, '$.browser_version')
+                                  END),
+                              2||(CASE
+                                      WHEN json_value(agent, '$.browser')=json_value(agent, '$.browser_version') THEN json_value(agent, '$.browser')
+                                      ELSE json_value(agent, '$.browser_version')
+                                  END))
+           AND '1'||(CASE
+                         WHEN json_value(agent, '$.browser')=json_value(agent, '$.browser_version') THEN json_value(agent, '$.browser')
+                         ELSE json_value(agent, '$.browser_version')
+                     END) NOT IN ('0'||(CASE
+                                            WHEN json_value(agent, '$.browser')=json_value(agent, '$.browser_version') THEN json_value(agent, '$.browser')
+                                            ELSE json_value(agent, '$.browser_version')
+                                        END),
+                                  2||(CASE
+                                          WHEN json_value(agent, '$.browser')=json_value(agent, '$.browser_version') THEN json_value(agent, '$.browser')
+                                          ELSE json_value(agent, '$.browser_version')
+                                      END)))) ;
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND ('1'||(CASE
+                 WHEN json_value(agent, '$.browser')=json_value(agent, '$.browser_version') THEN json_value(agent, '$.browser')
+                 ELSE json_value(agent, '$.browser_version')
+             END) IS NULL
+       OR '1'||(CASE
+                    WHEN json_value(agent, '$.browser')=json_value(agent, '$.browser_version') THEN json_value(agent, '$.browser')
+                    ELSE json_value(agent, '$.browser_version')
+                END) IN
+         (SELECT '1'||(CASE
+                           WHEN json_value(agent, '$.browser')=json_value(agent, '$.browser_version') THEN json_value(agent, '$.browser')
+                           ELSE json_value(agent, '$.browser_version')
+                       END)
+          FROM kttm_nested
+          WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+            AND ('1'||(CASE
+                           WHEN json_value(agent, '$.browser')=json_value(agent, '$.browser_version') THEN json_value(agent, '$.browser')
+                           ELSE json_value(agent, '$.browser_version')
+                       END) IS NULL
+                 OR ('1'||(CASE
+                               WHEN json_value(agent, '$.browser')=json_value(agent, '$.browser_version') THEN json_value(agent, '$.browser')
+                               ELSE json_value(agent, '$.browser_version')
+                           END) = 1||(CASE
+                                          WHEN json_value(agent, '$.browser')=json_value(agent, '$.browser_version') THEN json_value(agent, '$.browser')
+                                          ELSE json_value(agent, '$.browser_version')
+                                      END)
+                     AND '1'||(CASE
+                                   WHEN json_value(agent, '$.browser')=json_value(agent, '$.browser_version') THEN json_value(agent, '$.browser')
+                                   ELSE json_value(agent, '$.browser_version')
+                               END) IS NOT DISTINCT
+                     FROM 1||(CASE
+                                  WHEN json_value(agent, '$.browser')=json_value(agent, '$.browser_version') THEN json_value(agent, '$.browser')
+                                  ELSE json_value(agent, '$.browser_version')
+                              END)
+                     AND '1'||(CASE
+                                   WHEN json_value(agent, '$.browser')=json_value(agent, '$.browser_version') THEN json_value(agent, '$.browser')
+                                   ELSE json_value(agent, '$.browser_version')
+                               END) <> '0'||(CASE
+                                                 WHEN json_value(agent, '$.browser')=json_value(agent, '$.browser_version') THEN json_value(agent, '$.browser')
+                                                 ELSE json_value(agent, '$.browser_version')
+                                             END)
+                     AND ('1'||(CASE
+                                    WHEN json_value(agent, '$.browser')=json_value(agent, '$.browser_version') THEN json_value(agent, '$.browser')
+                                    ELSE json_value(agent, '$.browser_version')
+                                END) IS DISTINCT
+                          FROM '0'||(CASE
+                                         WHEN json_value(agent, '$.browser')=json_value(agent, '$.browser_version') THEN json_value(agent, '$.browser')
+                                         ELSE json_value(agent, '$.browser_version')
+                                     END))
+                     AND '1'||(CASE
+                                   WHEN json_value(agent, '$.browser')=json_value(agent, '$.browser_version') THEN json_value(agent, '$.browser')
+                                   ELSE json_value(agent, '$.browser_version')
+                               END) > '0'||(CASE
+                                                WHEN json_value(agent, '$.browser')=json_value(agent, '$.browser_version') THEN json_value(agent, '$.browser')
+                                                ELSE json_value(agent, '$.browser_version')
+                                            END)
+                     AND '1'||(CASE
+                                   WHEN json_value(agent, '$.browser')=json_value(agent, '$.browser_version') THEN json_value(agent, '$.browser')
+                                   ELSE json_value(agent, '$.browser_version')
+                               END) >= '0'||(CASE
+                                                 WHEN json_value(agent, '$.browser')=json_value(agent, '$.browser_version') THEN json_value(agent, '$.browser')
+                                                 ELSE json_value(agent, '$.browser_version')
+                                             END)
+                     AND '1'||(CASE
+                                   WHEN json_value(agent, '$.browser')=json_value(agent, '$.browser_version') THEN json_value(agent, '$.browser')
+                                   ELSE json_value(agent, '$.browser_version')
+                               END) < 2||(CASE
+                                              WHEN json_value(agent, '$.browser')=json_value(agent, '$.browser_version') THEN json_value(agent, '$.browser')
+                                              ELSE json_value(agent, '$.browser_version')
+                                          END)
+                     AND '1'||(CASE
+                                   WHEN json_value(agent, '$.browser')=json_value(agent, '$.browser_version') THEN json_value(agent, '$.browser')
+                                   ELSE json_value(agent, '$.browser_version')
+                               END) <= 2||(CASE
+                                               WHEN json_value(agent, '$.browser')=json_value(agent, '$.browser_version') THEN json_value(agent, '$.browser')
+                                               ELSE json_value(agent, '$.browser_version')
+                                           END)
+                     AND ('1'||(CASE
+                                    WHEN json_value(agent, '$.browser')=json_value(agent, '$.browser_version') THEN json_value(agent, '$.browser')
+                                    ELSE json_value(agent, '$.browser_version')
+                                END) <> '0'||(CASE
+                                                  WHEN json_value(agent, '$.browser')=json_value(agent, '$.browser_version') THEN json_value(agent, '$.browser')
+                                                  ELSE json_value(agent, '$.browser_version')
+                                              END)) IS TRUE
+                     AND ('1'||(CASE
+                                    WHEN json_value(agent, '$.browser')=json_value(agent, '$.browser_version') THEN json_value(agent, '$.browser')
+                                    ELSE json_value(agent, '$.browser_version')
+                                END) = '0'||(CASE
+                                                 WHEN json_value(agent, '$.browser')=json_value(agent, '$.browser_version') THEN json_value(agent, '$.browser')
+                                                 ELSE json_value(agent, '$.browser_version')
+                                             END)) IS NOT TRUE
+                     AND ('1'||(CASE
+                                    WHEN json_value(agent, '$.browser')=json_value(agent, '$.browser_version') THEN json_value(agent, '$.browser')
+                                    ELSE json_value(agent, '$.browser_version')
+                                END) = '0'||(CASE
+                                                 WHEN json_value(agent, '$.browser')=json_value(agent, '$.browser_version') THEN json_value(agent, '$.browser')
+                                                 ELSE json_value(agent, '$.browser_version')
+                                             END)) IS FALSE
+                     AND ('1'||(CASE
+                                    WHEN json_value(agent, '$.browser')=json_value(agent, '$.browser_version') THEN json_value(agent, '$.browser')
+                                    ELSE json_value(agent, '$.browser_version')
+                                END) <> '0'||(CASE
+                                                  WHEN json_value(agent, '$.browser')=json_value(agent, '$.browser_version') THEN json_value(agent, '$.browser')
+                                                  ELSE json_value(agent, '$.browser_version')
+                                              END)) IS NOT FALSE
+                     AND '1'||(CASE
+                                   WHEN json_value(agent, '$.browser')=json_value(agent, '$.browser_version') THEN json_value(agent, '$.browser')
+                                   ELSE json_value(agent, '$.browser_version')
+                               END) BETWEEN '0'||(CASE
+                                                      WHEN json_value(agent, '$.browser')=json_value(agent, '$.browser_version') THEN json_value(agent, '$.browser')
+                                                      ELSE json_value(agent, '$.browser_version')
+                                                  END) AND 2||(CASE
+                                                                   WHEN json_value(agent, '$.browser')=json_value(agent, '$.browser_version') THEN json_value(agent, '$.browser')
+                                                                   ELSE json_value(agent, '$.browser_version')
+                                                               END)
+                     AND '1'||(CASE
+                                   WHEN json_value(agent, '$.browser')=json_value(agent, '$.browser_version') THEN json_value(agent, '$.browser')
+                                   ELSE json_value(agent, '$.browser_version')
+                               END) NOT BETWEEN '1'||(CASE
+                                                          WHEN json_value(agent, '$.browser')=json_value(agent, '$.browser_version') THEN json_value(agent, '$.browser')
+                                                          ELSE json_value(agent, '$.browser_version')
+                                                      END) AND '0'||(CASE
+                                                                         WHEN json_value(agent, '$.browser')=json_value(agent, '$.browser_version') THEN json_value(agent, '$.browser')
+                                                                         ELSE json_value(agent, '$.browser_version')
+                                                                     END)
+                     AND '1'||(CASE
+                                   WHEN json_value(agent, '$.browser')=json_value(agent, '$.browser_version') THEN json_value(agent, '$.browser')
+                                   ELSE json_value(agent, '$.browser_version')
+                               END) like '%'
+                     AND '1'||(CASE
+                                   WHEN json_value(agent, '$.browser')=json_value(agent, '$.browser_version') THEN json_value(agent, '$.browser')
+                                   ELSE json_value(agent, '$.browser_version')
+                               END) not like '__DOES_NOT_EXIST__%'
+                     AND '1'||(CASE
+                                   WHEN json_value(agent, '$.browser')=json_value(agent, '$.browser_version') THEN json_value(agent, '$.browser')
+                                   ELSE json_value(agent, '$.browser_version')
+                               END) IN ('0'||(CASE
+                                                  WHEN json_value(agent, '$.browser')=json_value(agent, '$.browser_version') THEN json_value(agent, '$.browser')
+                                                  ELSE json_value(agent, '$.browser_version')
+                                              END),
+                                        1||(CASE
+                                                WHEN json_value(agent, '$.browser')=json_value(agent, '$.browser_version') THEN json_value(agent, '$.browser')
+                                                ELSE json_value(agent, '$.browser_version')
+                                            END),
+                                        2||(CASE
+                                                WHEN json_value(agent, '$.browser')=json_value(agent, '$.browser_version') THEN json_value(agent, '$.browser')
+                                                ELSE json_value(agent, '$.browser_version')
+                                            END))
+                     AND '1'||(CASE
+                                   WHEN json_value(agent, '$.browser')=json_value(agent, '$.browser_version') THEN json_value(agent, '$.browser')
+                                   ELSE json_value(agent, '$.browser_version')
+                               END) NOT IN ('0'||(CASE
+                                                      WHEN json_value(agent, '$.browser')=json_value(agent, '$.browser_version') THEN json_value(agent, '$.browser')
+                                                      ELSE json_value(agent, '$.browser_version')
+                                                  END),
+                                            2||(CASE
+                                                    WHEN json_value(agent, '$.browser')=json_value(agent, '$.browser_version') THEN json_value(agent, '$.browser')
+                                                    ELSE json_value(agent, '$.browser_version')
+                                                END))))));
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM
+  (SELECT __time, number, client_ip,
+                          '1'||(CASE
+                                    WHEN json_value(agent, '$.browser')=json_value(agent, '$.browser_version') THEN json_value(agent, '$.browser')
+                                    ELSE json_value(agent, '$.browser_version')
+                                END),
+                          count(*)
+   FROM kttm_nested
+   WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+     AND ('1'||(CASE
+                    WHEN json_value(agent, '$.browser')=json_value(agent, '$.browser_version') THEN json_value(agent, '$.browser')
+                    ELSE json_value(agent, '$.browser_version')
+                END) IS NULL
+          OR ('1'||(CASE
+                        WHEN json_value(agent, '$.browser')=json_value(agent, '$.browser_version') THEN json_value(agent, '$.browser')
+                        ELSE json_value(agent, '$.browser_version')
+                    END) = 1||(CASE
+                                   WHEN json_value(agent, '$.browser')=json_value(agent, '$.browser_version') THEN json_value(agent, '$.browser')
+                                   ELSE json_value(agent, '$.browser_version')
+                               END)
+              AND '1'||(CASE
+                            WHEN json_value(agent, '$.browser')=json_value(agent, '$.browser_version') THEN json_value(agent, '$.browser')
+                            ELSE json_value(agent, '$.browser_version')
+                        END) IS NOT DISTINCT
+              FROM 1||(CASE
+                           WHEN json_value(agent, '$.browser')=json_value(agent, '$.browser_version') THEN json_value(agent, '$.browser')
+                           ELSE json_value(agent, '$.browser_version')
+                       END)
+              AND '1'||(CASE
+                            WHEN json_value(agent, '$.browser')=json_value(agent, '$.browser_version') THEN json_value(agent, '$.browser')
+                            ELSE json_value(agent, '$.browser_version')
+                        END) <> '0'||(CASE
+                                          WHEN json_value(agent, '$.browser')=json_value(agent, '$.browser_version') THEN json_value(agent, '$.browser')
+                                          ELSE json_value(agent, '$.browser_version')
+                                      END)
+              AND ('1'||(CASE
+                             WHEN json_value(agent, '$.browser')=json_value(agent, '$.browser_version') THEN json_value(agent, '$.browser')
+                             ELSE json_value(agent, '$.browser_version')
+                         END) IS DISTINCT
+                   FROM '0'||(CASE
+                                  WHEN json_value(agent, '$.browser')=json_value(agent, '$.browser_version') THEN json_value(agent, '$.browser')
+                                  ELSE json_value(agent, '$.browser_version')
+                              END))
+              AND '1'||(CASE
+                            WHEN json_value(agent, '$.browser')=json_value(agent, '$.browser_version') THEN json_value(agent, '$.browser')
+                            ELSE json_value(agent, '$.browser_version')
+                        END) > '0'||(CASE
+                                         WHEN json_value(agent, '$.browser')=json_value(agent, '$.browser_version') THEN json_value(agent, '$.browser')
+                                         ELSE json_value(agent, '$.browser_version')
+                                     END)
+              AND '1'||(CASE
+                            WHEN json_value(agent, '$.browser')=json_value(agent, '$.browser_version') THEN json_value(agent, '$.browser')
+                            ELSE json_value(agent, '$.browser_version')
+                        END) >= '0'||(CASE
+                                          WHEN json_value(agent, '$.browser')=json_value(agent, '$.browser_version') THEN json_value(agent, '$.browser')
+                                          ELSE json_value(agent, '$.browser_version')
+                                      END)
+              AND '1'||(CASE
+                            WHEN json_value(agent, '$.browser')=json_value(agent, '$.browser_version') THEN json_value(agent, '$.browser')
+                            ELSE json_value(agent, '$.browser_version')
+                        END) < 2||(CASE
+                                       WHEN json_value(agent, '$.browser')=json_value(agent, '$.browser_version') THEN json_value(agent, '$.browser')
+                                       ELSE json_value(agent, '$.browser_version')
+                                   END)
+              AND '1'||(CASE
+                            WHEN json_value(agent, '$.browser')=json_value(agent, '$.browser_version') THEN json_value(agent, '$.browser')
+                            ELSE json_value(agent, '$.browser_version')
+                        END) <= 2||(CASE
+                                        WHEN json_value(agent, '$.browser')=json_value(agent, '$.browser_version') THEN json_value(agent, '$.browser')
+                                        ELSE json_value(agent, '$.browser_version')
+                                    END)
+              AND ('1'||(CASE
+                             WHEN json_value(agent, '$.browser')=json_value(agent, '$.browser_version') THEN json_value(agent, '$.browser')
+                             ELSE json_value(agent, '$.browser_version')
+                         END) <> '0'||(CASE
+                                           WHEN json_value(agent, '$.browser')=json_value(agent, '$.browser_version') THEN json_value(agent, '$.browser')
+                                           ELSE json_value(agent, '$.browser_version')
+                                       END)) IS TRUE
+              AND ('1'||(CASE
+                             WHEN json_value(agent, '$.browser')=json_value(agent, '$.browser_version') THEN json_value(agent, '$.browser')
+                             ELSE json_value(agent, '$.browser_version')
+                         END) = '0'||(CASE
+                                          WHEN json_value(agent, '$.browser')=json_value(agent, '$.browser_version') THEN json_value(agent, '$.browser')
+                                          ELSE json_value(agent, '$.browser_version')
+                                      END)) IS NOT TRUE
+              AND ('1'||(CASE
+                             WHEN json_value(agent, '$.browser')=json_value(agent, '$.browser_version') THEN json_value(agent, '$.browser')
+                             ELSE json_value(agent, '$.browser_version')
+                         END) = '0'||(CASE
+                                          WHEN json_value(agent, '$.browser')=json_value(agent, '$.browser_version') THEN json_value(agent, '$.browser')
+                                          ELSE json_value(agent, '$.browser_version')
+                                      END)) IS FALSE
+              AND ('1'||(CASE
+                             WHEN json_value(agent, '$.browser')=json_value(agent, '$.browser_version') THEN json_value(agent, '$.browser')
+                             ELSE json_value(agent, '$.browser_version')
+                         END) <> '0'||(CASE
+                                           WHEN json_value(agent, '$.browser')=json_value(agent, '$.browser_version') THEN json_value(agent, '$.browser')
+                                           ELSE json_value(agent, '$.browser_version')
+                                       END)) IS NOT FALSE
+              AND '1'||(CASE
+                            WHEN json_value(agent, '$.browser')=json_value(agent, '$.browser_version') THEN json_value(agent, '$.browser')
+                            ELSE json_value(agent, '$.browser_version')
+                        END) BETWEEN '0'||(CASE
+                                               WHEN json_value(agent, '$.browser')=json_value(agent, '$.browser_version') THEN json_value(agent, '$.browser')
+                                               ELSE json_value(agent, '$.browser_version')
+                                           END) AND 2||(CASE
+                                                            WHEN json_value(agent, '$.browser')=json_value(agent, '$.browser_version') THEN json_value(agent, '$.browser')
+                                                            ELSE json_value(agent, '$.browser_version')
+                                                        END)
+              AND '1'||(CASE
+                            WHEN json_value(agent, '$.browser')=json_value(agent, '$.browser_version') THEN json_value(agent, '$.browser')
+                            ELSE json_value(agent, '$.browser_version')
+                        END) NOT BETWEEN '1'||(CASE
+                                                   WHEN json_value(agent, '$.browser')=json_value(agent, '$.browser_version') THEN json_value(agent, '$.browser')
+                                                   ELSE json_value(agent, '$.browser_version')
+                                               END) AND '0'||(CASE
+                                                                  WHEN json_value(agent, '$.browser')=json_value(agent, '$.browser_version') THEN json_value(agent, '$.browser')
+                                                                  ELSE json_value(agent, '$.browser_version')
+                                                              END)
+              AND '1'||(CASE
+                            WHEN json_value(agent, '$.browser')=json_value(agent, '$.browser_version') THEN json_value(agent, '$.browser')
+                            ELSE json_value(agent, '$.browser_version')
+                        END) like '%'
+              AND '1'||(CASE
+                            WHEN json_value(agent, '$.browser')=json_value(agent, '$.browser_version') THEN json_value(agent, '$.browser')
+                            ELSE json_value(agent, '$.browser_version')
+                        END) not like '__DOES_NOT_EXIST__%'
+              AND '1'||(CASE
+                            WHEN json_value(agent, '$.browser')=json_value(agent, '$.browser_version') THEN json_value(agent, '$.browser')
+                            ELSE json_value(agent, '$.browser_version')
+                        END) IN ('0'||(CASE
+                                           WHEN json_value(agent, '$.browser')=json_value(agent, '$.browser_version') THEN json_value(agent, '$.browser')
+                                           ELSE json_value(agent, '$.browser_version')
+                                       END),
+                                 1||(CASE
+                                         WHEN json_value(agent, '$.browser')=json_value(agent, '$.browser_version') THEN json_value(agent, '$.browser')
+                                         ELSE json_value(agent, '$.browser_version')
+                                     END),
+                                 2||(CASE
+                                         WHEN json_value(agent, '$.browser')=json_value(agent, '$.browser_version') THEN json_value(agent, '$.browser')
+                                         ELSE json_value(agent, '$.browser_version')
+                                     END))
+              AND '1'||(CASE
+                            WHEN json_value(agent, '$.browser')=json_value(agent, '$.browser_version') THEN json_value(agent, '$.browser')
+                            ELSE json_value(agent, '$.browser_version')
+                        END) NOT IN ('0'||(CASE
+                                               WHEN json_value(agent, '$.browser')=json_value(agent, '$.browser_version') THEN json_value(agent, '$.browser')
+                                               ELSE json_value(agent, '$.browser_version')
+                                           END),
+                                     2||(CASE
+                                             WHEN json_value(agent, '$.browser')=json_value(agent, '$.browser_version') THEN json_value(agent, '$.browser')
+                                             ELSE json_value(agent, '$.browser_version')
+                                         END))))
+   GROUP BY 1,
+            2,
+            3,
+            4);
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+#-------------------------------------------------------------------------
+# TEST_ID: A5: cast_as_char
+#-------------------------------------------------------------------------
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND ('1'||cast(session_length AS char) IS NULL
+       OR ('1'||cast(session_length AS char) = 1||cast(session_length AS char)
+           AND '1'||cast(session_length AS char) IS NOT DISTINCT
+           FROM 1||cast(session_length AS char)
+           AND '1'||cast(session_length AS char) <> '0'||cast(session_length AS char)
+           AND ('1'||cast(session_length AS char) IS DISTINCT
+                FROM '0'||cast(session_length AS char))
+           AND '1'||cast(session_length AS char) > '0'||cast(session_length AS char)
+           AND '1'||cast(session_length AS char) >= '0'||cast(session_length AS char)
+           AND '1'||cast(session_length AS char) < 2||cast(session_length AS char)
+           AND '1'||cast(session_length AS char) <= 2||cast(session_length AS char)
+           AND ('1'||cast(session_length AS char) <> '0'||cast(session_length AS char)) IS TRUE
+           AND ('1'||cast(session_length AS char) = '0'||cast(session_length AS char)) IS NOT TRUE
+           AND ('1'||cast(session_length AS char) = '0'||cast(session_length AS char)) IS FALSE
+           AND ('1'||cast(session_length AS char) <> '0'||cast(session_length AS char)) IS NOT FALSE
+           AND '1'||cast(session_length AS char) BETWEEN '0'||cast(session_length AS char) AND 2||cast(session_length AS char)
+           AND '1'||cast(session_length AS char) NOT BETWEEN '1'||cast(session_length AS char) AND '0'||cast(session_length AS char)
+           AND '1'||cast(session_length AS char) like '%'
+           AND '1'||cast(session_length AS char) not like '__DOES_NOT_EXIST__%'
+           AND '1'||cast(session_length AS char) IN ('0'||cast(session_length AS char),
+                                                     1||cast(session_length AS char),
+                                                     2||cast(session_length AS char))
+           AND '1'||cast(session_length AS char) NOT IN ('0'||cast(session_length AS char),
+                                                         2||cast(session_length AS char)))) ;
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND ('1'||cast(session_length AS char) IS NULL
+       OR '1'||cast(session_length AS char) IN
+         (SELECT '1'||cast(session_length AS char)
+          FROM kttm_nested
+          WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+            AND ('1'||cast(session_length AS char) IS NULL
+                 OR ('1'||cast(session_length AS char) = 1||cast(session_length AS char)
+                     AND '1'||cast(session_length AS char) IS NOT DISTINCT
+                     FROM 1||cast(session_length AS char)
+                     AND '1'||cast(session_length AS char) <> '0'||cast(session_length AS char)
+                     AND ('1'||cast(session_length AS char) IS DISTINCT
+                          FROM '0'||cast(session_length AS char))
+                     AND '1'||cast(session_length AS char) > '0'||cast(session_length AS char)
+                     AND '1'||cast(session_length AS char) >= '0'||cast(session_length AS char)
+                     AND '1'||cast(session_length AS char) < 2||cast(session_length AS char)
+                     AND '1'||cast(session_length AS char) <= 2||cast(session_length AS char)
+                     AND ('1'||cast(session_length AS char) <> '0'||cast(session_length AS char)) IS TRUE
+                     AND ('1'||cast(session_length AS char) = '0'||cast(session_length AS char)) IS NOT TRUE
+                     AND ('1'||cast(session_length AS char) = '0'||cast(session_length AS char)) IS FALSE
+                     AND ('1'||cast(session_length AS char) <> '0'||cast(session_length AS char)) IS NOT FALSE
+                     AND '1'||cast(session_length AS char) BETWEEN '0'||cast(session_length AS char) AND 2||cast(session_length AS char)
+                     AND '1'||cast(session_length AS char) NOT BETWEEN '1'||cast(session_length AS char) AND '0'||cast(session_length AS char)
+                     AND '1'||cast(session_length AS char) like '%'
+                     AND '1'||cast(session_length AS char) not like '__DOES_NOT_EXIST__%'
+                     AND '1'||cast(session_length AS char) IN ('0'||cast(session_length AS char),
+                                                               1||cast(session_length AS char),
+                                                               2||cast(session_length AS char))
+                     AND '1'||cast(session_length AS char) NOT IN ('0'||cast(session_length AS char),
+                                                                   2||cast(session_length AS char))))));
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM
+  (SELECT __time, number, client_ip,
+                          '1'||cast(session_length AS char),
+                          count(*)
+   FROM kttm_nested
+   WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+     AND ('1'||cast(session_length AS char) IS NULL
+          OR ('1'||cast(session_length AS char) = 1||cast(session_length AS char)
+              AND '1'||cast(session_length AS char) IS NOT DISTINCT
+              FROM 1||cast(session_length AS char)
+              AND '1'||cast(session_length AS char) <> '0'||cast(session_length AS char)
+              AND ('1'||cast(session_length AS char) IS DISTINCT
+                   FROM '0'||cast(session_length AS char))
+              AND '1'||cast(session_length AS char) > '0'||cast(session_length AS char)
+              AND '1'||cast(session_length AS char) >= '0'||cast(session_length AS char)
+              AND '1'||cast(session_length AS char) < 2||cast(session_length AS char)
+              AND '1'||cast(session_length AS char) <= 2||cast(session_length AS char)
+              AND ('1'||cast(session_length AS char) <> '0'||cast(session_length AS char)) IS TRUE
+              AND ('1'||cast(session_length AS char) = '0'||cast(session_length AS char)) IS NOT TRUE
+              AND ('1'||cast(session_length AS char) = '0'||cast(session_length AS char)) IS FALSE
+              AND ('1'||cast(session_length AS char) <> '0'||cast(session_length AS char)) IS NOT FALSE
+              AND '1'||cast(session_length AS char) BETWEEN '0'||cast(session_length AS char) AND 2||cast(session_length AS char)
+              AND '1'||cast(session_length AS char) NOT BETWEEN '1'||cast(session_length AS char) AND '0'||cast(session_length AS char)
+              AND '1'||cast(session_length AS char) like '%'
+              AND '1'||cast(session_length AS char) not like '__DOES_NOT_EXIST__%'
+              AND '1'||cast(session_length AS char) IN ('0'||cast(session_length AS char),
+                                                        1||cast(session_length AS char),
+                                                        2||cast(session_length AS char))
+              AND '1'||cast(session_length AS char) NOT IN ('0'||cast(session_length AS char),
+                                                            2||cast(session_length AS char))))
+   GROUP BY 1,
+            2,
+            3,
+            4);
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+#-------------------------------------------------------------------------
+# TEST_ID: A6: cast_as_bigint
+#-------------------------------------------------------------------------
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND (cast(ltrim("session", 'S') AS bigint)+1 IS NULL
+       OR (cast(ltrim("session", 'S') AS bigint)+1 = cast(ltrim("session", 'S') AS bigint)+1
+           AND cast(ltrim("session", 'S') AS bigint)+1 IS NOT DISTINCT
+           FROM cast(ltrim("session", 'S') AS bigint)+1
+           AND cast(ltrim("session", 'S') AS bigint)+1 <> cast(ltrim("session", 'S') AS bigint)
+           AND (cast(ltrim("session", 'S') AS bigint)+1 IS DISTINCT
+                FROM cast(ltrim("session", 'S') AS bigint))
+           AND cast(ltrim("session", 'S') AS bigint)+1 > cast(ltrim("session", 'S') AS bigint)
+           AND cast(ltrim("session", 'S') AS bigint)+1 >= cast(ltrim("session", 'S') AS bigint)
+           AND cast(ltrim("session", 'S') AS bigint)+1 < cast(ltrim("session", 'S') AS bigint)+2
+           AND cast(ltrim("session", 'S') AS bigint)+1 <= cast(ltrim("session", 'S') AS bigint)+2
+           AND (cast(ltrim("session", 'S') AS bigint)+1 <> cast(ltrim("session", 'S') AS bigint)) IS TRUE
+           AND (cast(ltrim("session", 'S') AS bigint)+1 = cast(ltrim("session", 'S') AS bigint)) IS NOT TRUE
+           AND (cast(ltrim("session", 'S') AS bigint)+1 = cast(ltrim("session", 'S') AS bigint)) IS FALSE
+           AND (cast(ltrim("session", 'S') AS bigint)+1 <> cast(ltrim("session", 'S') AS bigint)) IS NOT FALSE
+           AND cast(ltrim("session", 'S') AS bigint)+1 BETWEEN cast(ltrim("session", 'S') AS bigint) AND cast(ltrim("session", 'S') AS bigint)+2
+           AND cast(ltrim("session", 'S') AS bigint)+1 NOT BETWEEN cast(ltrim("session", 'S') AS bigint)+1 AND cast(ltrim("session", 'S') AS bigint)
+           AND cast(ltrim("session", 'S') AS bigint)+1 like '%'
+           AND cast(ltrim("session", 'S') AS bigint)+1 not like '__DOES_NOT_EXIST__%'
+           AND cast(ltrim("session", 'S') AS bigint)+1 IN (cast(ltrim("session", 'S') AS bigint),
+                                                           cast(ltrim("session", 'S') AS bigint)+1,
+                                                           cast(ltrim("session", 'S') AS bigint)+2)
+           AND cast(ltrim("session", 'S') AS bigint)+1 NOT IN (cast(ltrim("session", 'S') AS bigint),
+                                                               cast(ltrim("session", 'S') AS bigint)+2))) ;
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND (cast(ltrim("session", 'S') AS bigint)+1 IS NULL
+       OR cast(ltrim("session", 'S') AS bigint)+1 IN
+         (SELECT cast(ltrim("session", 'S') AS bigint)+1
+          FROM kttm_nested
+          WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+            AND (cast(ltrim("session", 'S') AS bigint)+1 IS NULL
+                 OR (cast(ltrim("session", 'S') AS bigint)+1 = cast(ltrim("session", 'S') AS bigint)+1
+                     AND cast(ltrim("session", 'S') AS bigint)+1 IS NOT DISTINCT
+                     FROM cast(ltrim("session", 'S') AS bigint)+1
+                     AND cast(ltrim("session", 'S') AS bigint)+1 <> cast(ltrim("session", 'S') AS bigint)
+                     AND (cast(ltrim("session", 'S') AS bigint)+1 IS DISTINCT
+                          FROM cast(ltrim("session", 'S') AS bigint))
+                     AND cast(ltrim("session", 'S') AS bigint)+1 > cast(ltrim("session", 'S') AS bigint)
+                     AND cast(ltrim("session", 'S') AS bigint)+1 >= cast(ltrim("session", 'S') AS bigint)
+                     AND cast(ltrim("session", 'S') AS bigint)+1 < cast(ltrim("session", 'S') AS bigint)+2
+                     AND cast(ltrim("session", 'S') AS bigint)+1 <= cast(ltrim("session", 'S') AS bigint)+2
+                     AND (cast(ltrim("session", 'S') AS bigint)+1 <> cast(ltrim("session", 'S') AS bigint)) IS TRUE
+                     AND (cast(ltrim("session", 'S') AS bigint)+1 = cast(ltrim("session", 'S') AS bigint)) IS NOT TRUE
+                     AND (cast(ltrim("session", 'S') AS bigint)+1 = cast(ltrim("session", 'S') AS bigint)) IS FALSE
+                     AND (cast(ltrim("session", 'S') AS bigint)+1 <> cast(ltrim("session", 'S') AS bigint)) IS NOT FALSE
+                     AND cast(ltrim("session", 'S') AS bigint)+1 BETWEEN cast(ltrim("session", 'S') AS bigint) AND cast(ltrim("session", 'S') AS bigint)+2
+                     AND cast(ltrim("session", 'S') AS bigint)+1 NOT BETWEEN cast(ltrim("session", 'S') AS bigint)+1 AND cast(ltrim("session", 'S') AS bigint)
+                     AND cast(ltrim("session", 'S') AS bigint)+1 like '%'
+                     AND cast(ltrim("session", 'S') AS bigint)+1 not like '__DOES_NOT_EXIST__%'
+                     AND cast(ltrim("session", 'S') AS bigint)+1 IN (cast(ltrim("session", 'S') AS bigint),
+                                                                     cast(ltrim("session", 'S') AS bigint)+1,
+                                                                     cast(ltrim("session", 'S') AS bigint)+2)
+                     AND cast(ltrim("session", 'S') AS bigint)+1 NOT IN (cast(ltrim("session", 'S') AS bigint),
+                                                                         cast(ltrim("session", 'S') AS bigint)+2)))));
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM
+  (SELECT __time, number, client_ip,
+                          cast(ltrim("session", 'S') AS bigint)+1,
+                          count(*)
+   FROM kttm_nested
+   WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+     AND (cast(ltrim("session", 'S') AS bigint)+1 IS NULL
+          OR (cast(ltrim("session", 'S') AS bigint)+1 = cast(ltrim("session", 'S') AS bigint)+1
+              AND cast(ltrim("session", 'S') AS bigint)+1 IS NOT DISTINCT
+              FROM cast(ltrim("session", 'S') AS bigint)+1
+              AND cast(ltrim("session", 'S') AS bigint)+1 <> cast(ltrim("session", 'S') AS bigint)
+              AND (cast(ltrim("session", 'S') AS bigint)+1 IS DISTINCT
+                   FROM cast(ltrim("session", 'S') AS bigint))
+              AND cast(ltrim("session", 'S') AS bigint)+1 > cast(ltrim("session", 'S') AS bigint)
+              AND cast(ltrim("session", 'S') AS bigint)+1 >= cast(ltrim("session", 'S') AS bigint)
+              AND cast(ltrim("session", 'S') AS bigint)+1 < cast(ltrim("session", 'S') AS bigint)+2
+              AND cast(ltrim("session", 'S') AS bigint)+1 <= cast(ltrim("session", 'S') AS bigint)+2
+              AND (cast(ltrim("session", 'S') AS bigint)+1 <> cast(ltrim("session", 'S') AS bigint)) IS TRUE
+              AND (cast(ltrim("session", 'S') AS bigint)+1 = cast(ltrim("session", 'S') AS bigint)) IS NOT TRUE
+              AND (cast(ltrim("session", 'S') AS bigint)+1 = cast(ltrim("session", 'S') AS bigint)) IS FALSE
+              AND (cast(ltrim("session", 'S') AS bigint)+1 <> cast(ltrim("session", 'S') AS bigint)) IS NOT FALSE
+              AND cast(ltrim("session", 'S') AS bigint)+1 BETWEEN cast(ltrim("session", 'S') AS bigint) AND cast(ltrim("session", 'S') AS bigint)+2
+              AND cast(ltrim("session", 'S') AS bigint)+1 NOT BETWEEN cast(ltrim("session", 'S') AS bigint)+1 AND cast(ltrim("session", 'S') AS bigint)
+              AND cast(ltrim("session", 'S') AS bigint)+1 like '%'
+              AND cast(ltrim("session", 'S') AS bigint)+1 not like '__DOES_NOT_EXIST__%'
+              AND cast(ltrim("session", 'S') AS bigint)+1 IN (cast(ltrim("session", 'S') AS bigint),
+                                                              cast(ltrim("session", 'S') AS bigint)+1,
+                                                              cast(ltrim("session", 'S') AS bigint)+2)
+              AND cast(ltrim("session", 'S') AS bigint)+1 NOT IN (cast(ltrim("session", 'S') AS bigint),
+                                                                  cast(ltrim("session", 'S') AS bigint)+2)))
+   GROUP BY 1,
+            2,
+            3,
+            4);
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+#-------------------------------------------------------------------------
+# TEST_ID: A7: cast_as_float
+#-------------------------------------------------------------------------
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND (floor(cast(ltrim("session", 'S') AS float))+1 IS NULL
+       OR (floor(cast(ltrim("session", 'S') AS float))+1 = floor(cast(ltrim("session", 'S') AS float))+1
+           AND floor(cast(ltrim("session", 'S') AS float))+1 IS NOT DISTINCT
+           FROM floor(cast(ltrim("session", 'S') AS float))+1
+           AND floor(cast(ltrim("session", 'S') AS float))+1 <> floor(cast(ltrim("session", 'S') AS float))
+           AND (floor(cast(ltrim("session", 'S') AS float))+1 IS DISTINCT
+                FROM floor(cast(ltrim("session", 'S') AS float)))
+           AND floor(cast(ltrim("session", 'S') AS float))+1 > floor(cast(ltrim("session", 'S') AS float))
+           AND floor(cast(ltrim("session", 'S') AS float))+1 >= floor(cast(ltrim("session", 'S') AS float))
+           AND floor(cast(ltrim("session", 'S') AS float))+1 < floor(cast(ltrim("session", 'S') AS float))+2
+           AND floor(cast(ltrim("session", 'S') AS float))+1 <= floor(cast(ltrim("session", 'S') AS float))+2
+           AND (floor(cast(ltrim("session", 'S') AS float))+1 <> floor(cast(ltrim("session", 'S') AS float))) IS TRUE
+           AND (floor(cast(ltrim("session", 'S') AS float))+1 = floor(cast(ltrim("session", 'S') AS float))) IS NOT TRUE
+           AND (floor(cast(ltrim("session", 'S') AS float))+1 = floor(cast(ltrim("session", 'S') AS float))) IS FALSE
+           AND (floor(cast(ltrim("session", 'S') AS float))+1 <> floor(cast(ltrim("session", 'S') AS float))) IS NOT FALSE
+           AND floor(cast(ltrim("session", 'S') AS float))+1 BETWEEN floor(cast(ltrim("session", 'S') AS float)) AND floor(cast(ltrim("session", 'S') AS float))+2
+           AND floor(cast(ltrim("session", 'S') AS float))+1 NOT BETWEEN floor(cast(ltrim("session", 'S') AS float))+1 AND floor(cast(ltrim("session", 'S') AS float))
+           AND floor(cast(ltrim("session", 'S') AS float))+1 like '%'
+           AND floor(cast(ltrim("session", 'S') AS float))+1 not like '__DOES_NOT_EXIST__%'
+           AND floor(cast(ltrim("session", 'S') AS float))+1 IN (floor(cast(ltrim("session", 'S') AS float)),
+                                                                 floor(cast(ltrim("session", 'S') AS float))+1,
+                                                                 floor(cast(ltrim("session", 'S') AS float))+2)
+           AND floor(cast(ltrim("session", 'S') AS float))+1 NOT IN (floor(cast(ltrim("session", 'S') AS float)),
+                                                                     floor(cast(ltrim("session", 'S') AS float))+2))) ;
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND (floor(cast(ltrim("session", 'S') AS float))+1 IS NULL
+       OR floor(cast(ltrim("session", 'S') AS float))+1 IN
+         (SELECT floor(cast(ltrim("session", 'S') AS float))+1
+          FROM kttm_nested
+          WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+            AND (floor(cast(ltrim("session", 'S') AS float))+1 IS NULL
+                 OR (floor(cast(ltrim("session", 'S') AS float))+1 = floor(cast(ltrim("session", 'S') AS float))+1
+                     AND floor(cast(ltrim("session", 'S') AS float))+1 IS NOT DISTINCT
+                     FROM floor(cast(ltrim("session", 'S') AS float))+1
+                     AND floor(cast(ltrim("session", 'S') AS float))+1 <> floor(cast(ltrim("session", 'S') AS float))
+                     AND (floor(cast(ltrim("session", 'S') AS float))+1 IS DISTINCT
+                          FROM floor(cast(ltrim("session", 'S') AS float)))
+                     AND floor(cast(ltrim("session", 'S') AS float))+1 > floor(cast(ltrim("session", 'S') AS float))
+                     AND floor(cast(ltrim("session", 'S') AS float))+1 >= floor(cast(ltrim("session", 'S') AS float))
+                     AND floor(cast(ltrim("session", 'S') AS float))+1 < floor(cast(ltrim("session", 'S') AS float))+2
+                     AND floor(cast(ltrim("session", 'S') AS float))+1 <= floor(cast(ltrim("session", 'S') AS float))+2
+                     AND (floor(cast(ltrim("session", 'S') AS float))+1 <> floor(cast(ltrim("session", 'S') AS float))) IS TRUE
+                     AND (floor(cast(ltrim("session", 'S') AS float))+1 = floor(cast(ltrim("session", 'S') AS float))) IS NOT TRUE
+                     AND (floor(cast(ltrim("session", 'S') AS float))+1 = floor(cast(ltrim("session", 'S') AS float))) IS FALSE
+                     AND (floor(cast(ltrim("session", 'S') AS float))+1 <> floor(cast(ltrim("session", 'S') AS float))) IS NOT FALSE
+                     AND floor(cast(ltrim("session", 'S') AS float))+1 BETWEEN floor(cast(ltrim("session", 'S') AS float)) AND floor(cast(ltrim("session", 'S') AS float))+2
+                     AND floor(cast(ltrim("session", 'S') AS float))+1 NOT BETWEEN floor(cast(ltrim("session", 'S') AS float))+1 AND floor(cast(ltrim("session", 'S') AS float))
+                     AND floor(cast(ltrim("session", 'S') AS float))+1 like '%'
+                     AND floor(cast(ltrim("session", 'S') AS float))+1 not like '__DOES_NOT_EXIST__%'
+                     AND floor(cast(ltrim("session", 'S') AS float))+1 IN (floor(cast(ltrim("session", 'S') AS float)),
+                                                                           floor(cast(ltrim("session", 'S') AS float))+1,
+                                                                           floor(cast(ltrim("session", 'S') AS float))+2)
+                     AND floor(cast(ltrim("session", 'S') AS float))+1 NOT IN (floor(cast(ltrim("session", 'S') AS float)),
+                                                                               floor(cast(ltrim("session", 'S') AS float))+2)))));
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM
+  (SELECT __time, number, client_ip,
+                          floor(cast(ltrim("session", 'S') AS float))+1,
+                          count(*)
+   FROM kttm_nested
+   WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+     AND (floor(cast(ltrim("session", 'S') AS float))+1 IS NULL
+          OR (floor(cast(ltrim("session", 'S') AS float))+1 = floor(cast(ltrim("session", 'S') AS float))+1
+              AND floor(cast(ltrim("session", 'S') AS float))+1 IS NOT DISTINCT
+              FROM floor(cast(ltrim("session", 'S') AS float))+1
+              AND floor(cast(ltrim("session", 'S') AS float))+1 <> floor(cast(ltrim("session", 'S') AS float))
+              AND (floor(cast(ltrim("session", 'S') AS float))+1 IS DISTINCT
+                   FROM floor(cast(ltrim("session", 'S') AS float)))
+              AND floor(cast(ltrim("session", 'S') AS float))+1 > floor(cast(ltrim("session", 'S') AS float))
+              AND floor(cast(ltrim("session", 'S') AS float))+1 >= floor(cast(ltrim("session", 'S') AS float))
+              AND floor(cast(ltrim("session", 'S') AS float))+1 < floor(cast(ltrim("session", 'S') AS float))+2
+              AND floor(cast(ltrim("session", 'S') AS float))+1 <= floor(cast(ltrim("session", 'S') AS float))+2
+              AND (floor(cast(ltrim("session", 'S') AS float))+1 <> floor(cast(ltrim("session", 'S') AS float))) IS TRUE
+              AND (floor(cast(ltrim("session", 'S') AS float))+1 = floor(cast(ltrim("session", 'S') AS float))) IS NOT TRUE
+              AND (floor(cast(ltrim("session", 'S') AS float))+1 = floor(cast(ltrim("session", 'S') AS float))) IS FALSE
+              AND (floor(cast(ltrim("session", 'S') AS float))+1 <> floor(cast(ltrim("session", 'S') AS float))) IS NOT FALSE
+              AND floor(cast(ltrim("session", 'S') AS float))+1 BETWEEN floor(cast(ltrim("session", 'S') AS float)) AND floor(cast(ltrim("session", 'S') AS float))+2
+              AND floor(cast(ltrim("session", 'S') AS float))+1 NOT BETWEEN floor(cast(ltrim("session", 'S') AS float))+1 AND floor(cast(ltrim("session", 'S') AS float))
+              AND floor(cast(ltrim("session", 'S') AS float))+1 like '%'
+              AND floor(cast(ltrim("session", 'S') AS float))+1 not like '__DOES_NOT_EXIST__%'
+              AND floor(cast(ltrim("session", 'S') AS float))+1 IN (floor(cast(ltrim("session", 'S') AS float)),
+                                                                    floor(cast(ltrim("session", 'S') AS float))+1,
+                                                                    floor(cast(ltrim("session", 'S') AS float))+2)
+              AND floor(cast(ltrim("session", 'S') AS float))+1 NOT IN (floor(cast(ltrim("session", 'S') AS float)),
+                                                                        floor(cast(ltrim("session", 'S') AS float))+2)))
+   GROUP BY 1,
+            2,
+            3,
+            4);
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+#-------------------------------------------------------------------------
+# TEST_ID: A8: cast_as_double
+#-------------------------------------------------------------------------
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND (floor(cast(ltrim("session", 'S') AS DOUBLE))+1 IS NULL
+       OR (floor(cast(ltrim("session", 'S') AS DOUBLE))+1 = floor(cast(ltrim("session", 'S') AS DOUBLE))+1
+           AND floor(cast(ltrim("session", 'S') AS DOUBLE))+1 IS NOT DISTINCT
+           FROM floor(cast(ltrim("session", 'S') AS DOUBLE))+1
+           AND floor(cast(ltrim("session", 'S') AS DOUBLE))+1 <> floor(cast(ltrim("session", 'S') AS DOUBLE))
+           AND (floor(cast(ltrim("session", 'S') AS DOUBLE))+1 IS DISTINCT
+                FROM floor(cast(ltrim("session", 'S') AS DOUBLE)))
+           AND floor(cast(ltrim("session", 'S') AS DOUBLE))+1 > floor(cast(ltrim("session", 'S') AS DOUBLE))
+           AND floor(cast(ltrim("session", 'S') AS DOUBLE))+1 >= floor(cast(ltrim("session", 'S') AS DOUBLE))
+           AND floor(cast(ltrim("session", 'S') AS DOUBLE))+1 < floor(cast(ltrim("session", 'S') AS DOUBLE))+2
+           AND floor(cast(ltrim("session", 'S') AS DOUBLE))+1 <= floor(cast(ltrim("session", 'S') AS DOUBLE))+2
+           AND (floor(cast(ltrim("session", 'S') AS DOUBLE))+1 <> floor(cast(ltrim("session", 'S') AS DOUBLE))) IS TRUE
+           AND (floor(cast(ltrim("session", 'S') AS DOUBLE))+1 = floor(cast(ltrim("session", 'S') AS DOUBLE))) IS NOT TRUE
+           AND (floor(cast(ltrim("session", 'S') AS DOUBLE))+1 = floor(cast(ltrim("session", 'S') AS DOUBLE))) IS FALSE
+           AND (floor(cast(ltrim("session", 'S') AS DOUBLE))+1 <> floor(cast(ltrim("session", 'S') AS DOUBLE))) IS NOT FALSE
+           AND floor(cast(ltrim("session", 'S') AS DOUBLE))+1 BETWEEN floor(cast(ltrim("session", 'S') AS DOUBLE)) AND floor(cast(ltrim("session", 'S') AS DOUBLE))+2
+           AND floor(cast(ltrim("session", 'S') AS DOUBLE))+1 NOT BETWEEN floor(cast(ltrim("session", 'S') AS DOUBLE))+1 AND floor(cast(ltrim("session", 'S') AS DOUBLE))
+           AND floor(cast(ltrim("session", 'S') AS DOUBLE))+1 like '%'
+           AND floor(cast(ltrim("session", 'S') AS DOUBLE))+1 not like '__DOES_NOT_EXIST__%'
+           AND floor(cast(ltrim("session", 'S') AS DOUBLE))+1 IN (floor(cast(ltrim("session", 'S') AS DOUBLE)),
+                                                                  floor(cast(ltrim("session", 'S') AS DOUBLE))+1,
+                                                                  floor(cast(ltrim("session", 'S') AS DOUBLE))+2)
+           AND floor(cast(ltrim("session", 'S') AS DOUBLE))+1 NOT IN (floor(cast(ltrim("session", 'S') AS DOUBLE)),
+                                                                      floor(cast(ltrim("session", 'S') AS DOUBLE))+2))) ;
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND (floor(cast(ltrim("session", 'S') AS DOUBLE))+1 IS NULL
+       OR floor(cast(ltrim("session", 'S') AS DOUBLE))+1 IN
+         (SELECT floor(cast(ltrim("session", 'S') AS DOUBLE))+1
+          FROM kttm_nested
+          WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+            AND (floor(cast(ltrim("session", 'S') AS DOUBLE))+1 IS NULL
+                 OR (floor(cast(ltrim("session", 'S') AS DOUBLE))+1 = floor(cast(ltrim("session", 'S') AS DOUBLE))+1
+                     AND floor(cast(ltrim("session", 'S') AS DOUBLE))+1 IS NOT DISTINCT
+                     FROM floor(cast(ltrim("session", 'S') AS DOUBLE))+1
+                     AND floor(cast(ltrim("session", 'S') AS DOUBLE))+1 <> floor(cast(ltrim("session", 'S') AS DOUBLE))
+                     AND (floor(cast(ltrim("session", 'S') AS DOUBLE))+1 IS DISTINCT
+                          FROM floor(cast(ltrim("session", 'S') AS DOUBLE)))
+                     AND floor(cast(ltrim("session", 'S') AS DOUBLE))+1 > floor(cast(ltrim("session", 'S') AS DOUBLE))
+                     AND floor(cast(ltrim("session", 'S') AS DOUBLE))+1 >= floor(cast(ltrim("session", 'S') AS DOUBLE))
+                     AND floor(cast(ltrim("session", 'S') AS DOUBLE))+1 < floor(cast(ltrim("session", 'S') AS DOUBLE))+2
+                     AND floor(cast(ltrim("session", 'S') AS DOUBLE))+1 <= floor(cast(ltrim("session", 'S') AS DOUBLE))+2
+                     AND (floor(cast(ltrim("session", 'S') AS DOUBLE))+1 <> floor(cast(ltrim("session", 'S') AS DOUBLE))) IS TRUE
+                     AND (floor(cast(ltrim("session", 'S') AS DOUBLE))+1 = floor(cast(ltrim("session", 'S') AS DOUBLE))) IS NOT TRUE
+                     AND (floor(cast(ltrim("session", 'S') AS DOUBLE))+1 = floor(cast(ltrim("session", 'S') AS DOUBLE))) IS FALSE
+                     AND (floor(cast(ltrim("session", 'S') AS DOUBLE))+1 <> floor(cast(ltrim("session", 'S') AS DOUBLE))) IS NOT FALSE
+                     AND floor(cast(ltrim("session", 'S') AS DOUBLE))+1 BETWEEN floor(cast(ltrim("session", 'S') AS DOUBLE)) AND floor(cast(ltrim("session", 'S') AS DOUBLE))+2
+                     AND floor(cast(ltrim("session", 'S') AS DOUBLE))+1 NOT BETWEEN floor(cast(ltrim("session", 'S') AS DOUBLE))+1 AND floor(cast(ltrim("session", 'S') AS DOUBLE))
+                     AND floor(cast(ltrim("session", 'S') AS DOUBLE))+1 like '%'
+                     AND floor(cast(ltrim("session", 'S') AS DOUBLE))+1 not like '__DOES_NOT_EXIST__%'
+                     AND floor(cast(ltrim("session", 'S') AS DOUBLE))+1 IN (floor(cast(ltrim("session", 'S') AS DOUBLE)),
+                                                                            floor(cast(ltrim("session", 'S') AS DOUBLE))+1,
+                                                                            floor(cast(ltrim("session", 'S') AS DOUBLE))+2)
+                     AND floor(cast(ltrim("session", 'S') AS DOUBLE))+1 NOT IN (floor(cast(ltrim("session", 'S') AS DOUBLE)),
+                                                                                floor(cast(ltrim("session", 'S') AS DOUBLE))+2)))));
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM
+  (SELECT __time, number, client_ip,
+                          floor(cast(ltrim("session", 'S') AS DOUBLE))+1,
+                          count(*)
+   FROM kttm_nested
+   WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+     AND (floor(cast(ltrim("session", 'S') AS DOUBLE))+1 IS NULL
+          OR (floor(cast(ltrim("session", 'S') AS DOUBLE))+1 = floor(cast(ltrim("session", 'S') AS DOUBLE))+1
+              AND floor(cast(ltrim("session", 'S') AS DOUBLE))+1 IS NOT DISTINCT
+              FROM floor(cast(ltrim("session", 'S') AS DOUBLE))+1
+              AND floor(cast(ltrim("session", 'S') AS DOUBLE))+1 <> floor(cast(ltrim("session", 'S') AS DOUBLE))
+              AND (floor(cast(ltrim("session", 'S') AS DOUBLE))+1 IS DISTINCT
+                   FROM floor(cast(ltrim("session", 'S') AS DOUBLE)))
+              AND floor(cast(ltrim("session", 'S') AS DOUBLE))+1 > floor(cast(ltrim("session", 'S') AS DOUBLE))
+              AND floor(cast(ltrim("session", 'S') AS DOUBLE))+1 >= floor(cast(ltrim("session", 'S') AS DOUBLE))
+              AND floor(cast(ltrim("session", 'S') AS DOUBLE))+1 < floor(cast(ltrim("session", 'S') AS DOUBLE))+2
+              AND floor(cast(ltrim("session", 'S') AS DOUBLE))+1 <= floor(cast(ltrim("session", 'S') AS DOUBLE))+2
+              AND (floor(cast(ltrim("session", 'S') AS DOUBLE))+1 <> floor(cast(ltrim("session", 'S') AS DOUBLE))) IS TRUE
+              AND (floor(cast(ltrim("session", 'S') AS DOUBLE))+1 = floor(cast(ltrim("session", 'S') AS DOUBLE))) IS NOT TRUE
+              AND (floor(cast(ltrim("session", 'S') AS DOUBLE))+1 = floor(cast(ltrim("session", 'S') AS DOUBLE))) IS FALSE
+              AND (floor(cast(ltrim("session", 'S') AS DOUBLE))+1 <> floor(cast(ltrim("session", 'S') AS DOUBLE))) IS NOT FALSE
+              AND floor(cast(ltrim("session", 'S') AS DOUBLE))+1 BETWEEN floor(cast(ltrim("session", 'S') AS DOUBLE)) AND floor(cast(ltrim("session", 'S') AS DOUBLE))+2
+              AND floor(cast(ltrim("session", 'S') AS DOUBLE))+1 NOT BETWEEN floor(cast(ltrim("session", 'S') AS DOUBLE))+1 AND floor(cast(ltrim("session", 'S') AS DOUBLE))
+              AND floor(cast(ltrim("session", 'S') AS DOUBLE))+1 like '%'
+              AND floor(cast(ltrim("session", 'S') AS DOUBLE))+1 not like '__DOES_NOT_EXIST__%'
+              AND floor(cast(ltrim("session", 'S') AS DOUBLE))+1 IN (floor(cast(ltrim("session", 'S') AS DOUBLE)),
+                                                                     floor(cast(ltrim("session", 'S') AS DOUBLE))+1,
+                                                                     floor(cast(ltrim("session", 'S') AS DOUBLE))+2)
+              AND floor(cast(ltrim("session", 'S') AS DOUBLE))+1 NOT IN (floor(cast(ltrim("session", 'S') AS DOUBLE)),
+                                                                         floor(cast(ltrim("session", 'S') AS DOUBLE))+2)))
+   GROUP BY 1,
+            2,
+            3,
+            4);
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+#-------------------------------------------------------------------------
+# TEST_ID: A9: cast_as_boolean
+#-------------------------------------------------------------------------
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND ('1'||cast(cast(ltrim("session", 'S') AS boolean) AS char) IS NULL
+       OR ('1'||cast(cast(ltrim("session", 'S') AS boolean) AS char) = 1||cast(cast(ltrim("session", 'S') AS boolean) AS char)
+           AND '1'||cast(cast(ltrim("session", 'S') AS boolean) AS char) IS NOT DISTINCT
+           FROM 1||cast(cast(ltrim("session", 'S') AS boolean) AS char)
+           AND '1'||cast(cast(ltrim("session", 'S') AS boolean) AS char) <> '0'||cast(cast(ltrim("session", 'S') AS boolean) AS char)
+           AND ('1'||cast(cast(ltrim("session", 'S') AS boolean) AS char) IS DISTINCT
+                FROM '0'||cast(cast(ltrim("session", 'S') AS boolean) AS char))
+           AND '1'||cast(cast(ltrim("session", 'S') AS boolean) AS char) > '0'||cast(cast(ltrim("session", 'S') AS boolean) AS char)
+           AND '1'||cast(cast(ltrim("session", 'S') AS boolean) AS char) >= '0'||cast(cast(ltrim("session", 'S') AS boolean) AS char)
+           AND '1'||cast(cast(ltrim("session", 'S') AS boolean) AS char) < 2||cast(cast(ltrim("session", 'S') AS boolean) AS char)
+           AND '1'||cast(cast(ltrim("session", 'S') AS boolean) AS char) <= 2||cast(cast(ltrim("session", 'S') AS boolean) AS char)
+           AND ('1'||cast(cast(ltrim("session", 'S') AS boolean) AS char) <> '0'||cast(cast(ltrim("session", 'S') AS boolean) AS char)) IS TRUE
+           AND ('1'||cast(cast(ltrim("session", 'S') AS boolean) AS char) = '0'||cast(cast(ltrim("session", 'S') AS boolean) AS char)) IS NOT TRUE
+           AND ('1'||cast(cast(ltrim("session", 'S') AS boolean) AS char) = '0'||cast(cast(ltrim("session", 'S') AS boolean) AS char)) IS FALSE
+           AND ('1'||cast(cast(ltrim("session", 'S') AS boolean) AS char) <> '0'||cast(cast(ltrim("session", 'S') AS boolean) AS char)) IS NOT FALSE
+           AND '1'||cast(cast(ltrim("session", 'S') AS boolean) AS char) BETWEEN '0'||cast(cast(ltrim("session", 'S') AS boolean) AS char) AND 2||cast(cast(ltrim("session", 'S') AS boolean) AS char)
+           AND '1'||cast(cast(ltrim("session", 'S') AS boolean) AS char) NOT BETWEEN '1'||cast(cast(ltrim("session", 'S') AS boolean) AS char) AND '0'||cast(cast(ltrim("session", 'S') AS boolean) AS char)
+           AND '1'||cast(cast(ltrim("session", 'S') AS boolean) AS char) like '%'
+           AND '1'||cast(cast(ltrim("session", 'S') AS boolean) AS char) not like '__DOES_NOT_EXIST__%'
+           AND '1'||cast(cast(ltrim("session", 'S') AS boolean) AS char) IN ('0'||cast(cast(ltrim("session", 'S') AS boolean) AS char),
+                                                                             1||cast(cast(ltrim("session", 'S') AS boolean) AS char),
+                                                                             2||cast(cast(ltrim("session", 'S') AS boolean) AS char))
+           AND '1'||cast(cast(ltrim("session", 'S') AS boolean) AS char) NOT IN ('0'||cast(cast(ltrim("session", 'S') AS boolean) AS char),
+                                                                                 2||cast(cast(ltrim("session", 'S') AS boolean) AS char)))) ;
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND ('1'||cast(cast(ltrim("session", 'S') AS boolean) AS char) IS NULL
+       OR '1'||cast(cast(ltrim("session", 'S') AS boolean) AS char) IN
+         (SELECT '1'||cast(cast(ltrim("session", 'S') AS boolean) AS char)
+          FROM kttm_nested
+          WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+            AND ('1'||cast(cast(ltrim("session", 'S') AS boolean) AS char) IS NULL
+                 OR ('1'||cast(cast(ltrim("session", 'S') AS boolean) AS char) = 1||cast(cast(ltrim("session", 'S') AS boolean) AS char)
+                     AND '1'||cast(cast(ltrim("session", 'S') AS boolean) AS char) IS NOT DISTINCT
+                     FROM 1||cast(cast(ltrim("session", 'S') AS boolean) AS char)
+                     AND '1'||cast(cast(ltrim("session", 'S') AS boolean) AS char) <> '0'||cast(cast(ltrim("session", 'S') AS boolean) AS char)
+                     AND ('1'||cast(cast(ltrim("session", 'S') AS boolean) AS char) IS DISTINCT
+                          FROM '0'||cast(cast(ltrim("session", 'S') AS boolean) AS char))
+                     AND '1'||cast(cast(ltrim("session", 'S') AS boolean) AS char) > '0'||cast(cast(ltrim("session", 'S') AS boolean) AS char)
+                     AND '1'||cast(cast(ltrim("session", 'S') AS boolean) AS char) >= '0'||cast(cast(ltrim("session", 'S') AS boolean) AS char)
+                     AND '1'||cast(cast(ltrim("session", 'S') AS boolean) AS char) < 2||cast(cast(ltrim("session", 'S') AS boolean) AS char)
+                     AND '1'||cast(cast(ltrim("session", 'S') AS boolean) AS char) <= 2||cast(cast(ltrim("session", 'S') AS boolean) AS char)
+                     AND ('1'||cast(cast(ltrim("session", 'S') AS boolean) AS char) <> '0'||cast(cast(ltrim("session", 'S') AS boolean) AS char)) IS TRUE
+                     AND ('1'||cast(cast(ltrim("session", 'S') AS boolean) AS char) = '0'||cast(cast(ltrim("session", 'S') AS boolean) AS char)) IS NOT TRUE
+                     AND ('1'||cast(cast(ltrim("session", 'S') AS boolean) AS char) = '0'||cast(cast(ltrim("session", 'S') AS boolean) AS char)) IS FALSE
+                     AND ('1'||cast(cast(ltrim("session", 'S') AS boolean) AS char) <> '0'||cast(cast(ltrim("session", 'S') AS boolean) AS char)) IS NOT FALSE
+                     AND '1'||cast(cast(ltrim("session", 'S') AS boolean) AS char) BETWEEN '0'||cast(cast(ltrim("session", 'S') AS boolean) AS char) AND 2||cast(cast(ltrim("session", 'S') AS boolean) AS char)
+                     AND '1'||cast(cast(ltrim("session", 'S') AS boolean) AS char) NOT BETWEEN '1'||cast(cast(ltrim("session", 'S') AS boolean) AS char) AND '0'||cast(cast(ltrim("session", 'S') AS boolean) AS char)
+                     AND '1'||cast(cast(ltrim("session", 'S') AS boolean) AS char) like '%'
+                     AND '1'||cast(cast(ltrim("session", 'S') AS boolean) AS char) not like '__DOES_NOT_EXIST__%'
+                     AND '1'||cast(cast(ltrim("session", 'S') AS boolean) AS char) IN ('0'||cast(cast(ltrim("session", 'S') AS boolean) AS char),
+                                                                                       1||cast(cast(ltrim("session", 'S') AS boolean) AS char),
+                                                                                       2||cast(cast(ltrim("session", 'S') AS boolean) AS char))
+                     AND '1'||cast(cast(ltrim("session", 'S') AS boolean) AS char) NOT IN ('0'||cast(cast(ltrim("session", 'S') AS boolean) AS char),
+                                                                                           2||cast(cast(ltrim("session", 'S') AS boolean) AS char))))));
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM
+  (SELECT __time, number, client_ip,
+                          '1'||cast(cast(ltrim("session", 'S') AS boolean) AS char),
+                          count(*)
+   FROM kttm_nested
+   WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+     AND ('1'||cast(cast(ltrim("session", 'S') AS boolean) AS char) IS NULL
+          OR ('1'||cast(cast(ltrim("session", 'S') AS boolean) AS char) = 1||cast(cast(ltrim("session", 'S') AS boolean) AS char)
+              AND '1'||cast(cast(ltrim("session", 'S') AS boolean) AS char) IS NOT DISTINCT
+              FROM 1||cast(cast(ltrim("session", 'S') AS boolean) AS char)
+              AND '1'||cast(cast(ltrim("session", 'S') AS boolean) AS char) <> '0'||cast(cast(ltrim("session", 'S') AS boolean) AS char)
+              AND ('1'||cast(cast(ltrim("session", 'S') AS boolean) AS char) IS DISTINCT
+                   FROM '0'||cast(cast(ltrim("session", 'S') AS boolean) AS char))
+              AND '1'||cast(cast(ltrim("session", 'S') AS boolean) AS char) > '0'||cast(cast(ltrim("session", 'S') AS boolean) AS char)
+              AND '1'||cast(cast(ltrim("session", 'S') AS boolean) AS char) >= '0'||cast(cast(ltrim("session", 'S') AS boolean) AS char)
+              AND '1'||cast(cast(ltrim("session", 'S') AS boolean) AS char) < 2||cast(cast(ltrim("session", 'S') AS boolean) AS char)
+              AND '1'||cast(cast(ltrim("session", 'S') AS boolean) AS char) <= 2||cast(cast(ltrim("session", 'S') AS boolean) AS char)
+              AND ('1'||cast(cast(ltrim("session", 'S') AS boolean) AS char) <> '0'||cast(cast(ltrim("session", 'S') AS boolean) AS char)) IS TRUE
+              AND ('1'||cast(cast(ltrim("session", 'S') AS boolean) AS char) = '0'||cast(cast(ltrim("session", 'S') AS boolean) AS char)) IS NOT TRUE
+              AND ('1'||cast(cast(ltrim("session", 'S') AS boolean) AS char) = '0'||cast(cast(ltrim("session", 'S') AS boolean) AS char)) IS FALSE
+              AND ('1'||cast(cast(ltrim("session", 'S') AS boolean) AS char) <> '0'||cast(cast(ltrim("session", 'S') AS boolean) AS char)) IS NOT FALSE
+              AND '1'||cast(cast(ltrim("session", 'S') AS boolean) AS char) BETWEEN '0'||cast(cast(ltrim("session", 'S') AS boolean) AS char) AND 2||cast(cast(ltrim("session", 'S') AS boolean) AS char)
+              AND '1'||cast(cast(ltrim("session", 'S') AS boolean) AS char) NOT BETWEEN '1'||cast(cast(ltrim("session", 'S') AS boolean) AS char) AND '0'||cast(cast(ltrim("session", 'S') AS boolean) AS char)
+              AND '1'||cast(cast(ltrim("session", 'S') AS boolean) AS char) like '%'
+              AND '1'||cast(cast(ltrim("session", 'S') AS boolean) AS char) not like '__DOES_NOT_EXIST__%'
+              AND '1'||cast(cast(ltrim("session", 'S') AS boolean) AS char) IN ('0'||cast(cast(ltrim("session", 'S') AS boolean) AS char),
+                                                                                1||cast(cast(ltrim("session", 'S') AS boolean) AS char),
+                                                                                2||cast(cast(ltrim("session", 'S') AS boolean) AS char))
+              AND '1'||cast(cast(ltrim("session", 'S') AS boolean) AS char) NOT IN ('0'||cast(cast(ltrim("session", 'S') AS boolean) AS char),
+                                                                                    2||cast(cast(ltrim("session", 'S') AS boolean) AS char))))
+   GROUP BY 1,
+            2,
+            3,
+            4);
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+#-------------------------------------------------------------------------
+# TEST_ID: A10: cast_as_timestamp
+#-------------------------------------------------------------------------
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND (cast(session_length AS timestamp) IS NULL
+       OR (cast(session_length AS timestamp) = cast(session_length AS timestamp)
+           AND cast(session_length AS timestamp) IS NOT DISTINCT
+           FROM cast(session_length AS timestamp)
+           AND cast(session_length AS timestamp) <> cast(session_length AS timestamp) - interval '2' YEAR
+           AND (cast(session_length AS timestamp) IS DISTINCT
+                FROM cast(session_length AS timestamp) - interval '2' YEAR)
+           AND cast(session_length AS timestamp) > cast(session_length AS timestamp) - interval '2' YEAR
+           AND cast(session_length AS timestamp) >= cast(session_length AS timestamp) - interval '2' YEAR
+           AND cast(session_length AS timestamp) < cast(session_length AS timestamp) + interval '2' YEAR
+           AND cast(session_length AS timestamp) <= cast(session_length AS timestamp) + interval '2' YEAR
+           AND (cast(session_length AS timestamp) <> cast(session_length AS timestamp) - interval '2' YEAR) IS TRUE
+           AND (cast(session_length AS timestamp) = cast(session_length AS timestamp) - interval '2' YEAR) IS NOT TRUE
+           AND (cast(session_length AS timestamp) = cast(session_length AS timestamp) - interval '2' YEAR) IS FALSE
+           AND (cast(session_length AS timestamp) <> cast(session_length AS timestamp) - interval '2' YEAR) IS NOT FALSE
+           AND cast(session_length AS timestamp) BETWEEN cast(session_length AS timestamp) - interval '2' YEAR AND cast(session_length AS timestamp) + interval '2' YEAR
+           AND cast(session_length AS timestamp) NOT BETWEEN cast(session_length AS timestamp) AND cast(session_length AS timestamp) - interval '2' YEAR
+           AND cast(session_length AS timestamp) like '%'
+           AND cast(session_length AS timestamp) not like '__DOES_NOT_EXIST__%'
+           AND cast(session_length AS timestamp) IN (cast(session_length AS timestamp) - interval '2' YEAR,
+                                                     cast(session_length AS timestamp),
+                                                     cast(session_length AS timestamp) + interval '2' YEAR)
+           AND cast(session_length AS timestamp) NOT IN (cast(session_length AS timestamp) - interval '2' YEAR,
+                                                         cast(session_length AS timestamp) + interval '2' YEAR))) ;
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND (cast(session_length AS timestamp) IS NULL
+       OR cast(session_length AS timestamp) IN
+         (SELECT cast(session_length AS timestamp)
+          FROM kttm_nested
+          WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+            AND (cast(session_length AS timestamp) IS NULL
+                 OR (cast(session_length AS timestamp) = cast(session_length AS timestamp)
+                     AND cast(session_length AS timestamp) IS NOT DISTINCT
+                     FROM cast(session_length AS timestamp)
+                     AND cast(session_length AS timestamp) <> cast(session_length AS timestamp) - interval '2' YEAR
+                     AND (cast(session_length AS timestamp) IS DISTINCT
+                          FROM cast(session_length AS timestamp) - interval '2' YEAR)
+                     AND cast(session_length AS timestamp) > cast(session_length AS timestamp) - interval '2' YEAR
+                     AND cast(session_length AS timestamp) >= cast(session_length AS timestamp) - interval '2' YEAR
+                     AND cast(session_length AS timestamp) < cast(session_length AS timestamp) + interval '2' YEAR
+                     AND cast(session_length AS timestamp) <= cast(session_length AS timestamp) + interval '2' YEAR
+                     AND (cast(session_length AS timestamp) <> cast(session_length AS timestamp) - interval '2' YEAR) IS TRUE
+                     AND (cast(session_length AS timestamp) = cast(session_length AS timestamp) - interval '2' YEAR) IS NOT TRUE
+                     AND (cast(session_length AS timestamp) = cast(session_length AS timestamp) - interval '2' YEAR) IS FALSE
+                     AND (cast(session_length AS timestamp) <> cast(session_length AS timestamp) - interval '2' YEAR) IS NOT FALSE
+                     AND cast(session_length AS timestamp) BETWEEN cast(session_length AS timestamp) - interval '2' YEAR AND cast(session_length AS timestamp) + interval '2' YEAR
+                     AND cast(session_length AS timestamp) NOT BETWEEN cast(session_length AS timestamp) AND cast(session_length AS timestamp) - interval '2' YEAR
+                     AND cast(session_length AS timestamp) like '%'
+                     AND cast(session_length AS timestamp) not like '__DOES_NOT_EXIST__%'
+                     AND cast(session_length AS timestamp) IN (cast(session_length AS timestamp) - interval '2' YEAR,
+                                                               cast(session_length AS timestamp),
+                                                               cast(session_length AS timestamp) + interval '2' YEAR)
+                     AND cast(session_length AS timestamp) NOT IN (cast(session_length AS timestamp) - interval '2' YEAR,
+                                                                   cast(session_length AS timestamp) + interval '2' YEAR)))));
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM
+  (SELECT __time, number, client_ip,
+                          cast(session_length AS timestamp),
+                          count(*)
+   FROM kttm_nested
+   WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+     AND (cast(session_length AS timestamp) IS NULL
+          OR (cast(session_length AS timestamp) = cast(session_length AS timestamp)
+              AND cast(session_length AS timestamp) IS NOT DISTINCT
+              FROM cast(session_length AS timestamp)
+              AND cast(session_length AS timestamp) <> cast(session_length AS timestamp) - interval '2' YEAR
+              AND (cast(session_length AS timestamp) IS DISTINCT
+                   FROM cast(session_length AS timestamp) - interval '2' YEAR)
+              AND cast(session_length AS timestamp) > cast(session_length AS timestamp) - interval '2' YEAR
+              AND cast(session_length AS timestamp) >= cast(session_length AS timestamp) - interval '2' YEAR
+              AND cast(session_length AS timestamp) < cast(session_length AS timestamp) + interval '2' YEAR
+              AND cast(session_length AS timestamp) <= cast(session_length AS timestamp) + interval '2' YEAR
+              AND (cast(session_length AS timestamp) <> cast(session_length AS timestamp) - interval '2' YEAR) IS TRUE
+              AND (cast(session_length AS timestamp) = cast(session_length AS timestamp) - interval '2' YEAR) IS NOT TRUE
+              AND (cast(session_length AS timestamp) = cast(session_length AS timestamp) - interval '2' YEAR) IS FALSE
+              AND (cast(session_length AS timestamp) <> cast(session_length AS timestamp) - interval '2' YEAR) IS NOT FALSE
+              AND cast(session_length AS timestamp) BETWEEN cast(session_length AS timestamp) - interval '2' YEAR AND cast(session_length AS timestamp) + interval '2' YEAR
+              AND cast(session_length AS timestamp) NOT BETWEEN cast(session_length AS timestamp) AND cast(session_length AS timestamp) - interval '2' YEAR
+              AND cast(session_length AS timestamp) like '%'
+              AND cast(session_length AS timestamp) not like '__DOES_NOT_EXIST__%'
+              AND cast(session_length AS timestamp) IN (cast(session_length AS timestamp) - interval '2' YEAR,
+                                                        cast(session_length AS timestamp),
+                                                        cast(session_length AS timestamp) + interval '2' YEAR)
+              AND cast(session_length AS timestamp) NOT IN (cast(session_length AS timestamp) - interval '2' YEAR,
+                                                            cast(session_length AS timestamp) + interval '2' YEAR)))
+   GROUP BY 1,
+            2,
+            3,
+            4);
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+#-------------------------------------------------------------------------
+# TEST_ID: A11: coalesce_scalar
+#-------------------------------------------------------------------------
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND ('1'||coalesce(client_ip, server_ip) IS NULL
+       OR ('1'||coalesce(client_ip, server_ip) = 1||coalesce(client_ip, server_ip)
+           AND '1'||coalesce(client_ip, server_ip) IS NOT DISTINCT
+           FROM 1||coalesce(client_ip, server_ip)
+           AND '1'||coalesce(client_ip, server_ip) <> '0'||coalesce(client_ip, server_ip)
+           AND ('1'||coalesce(client_ip, server_ip) IS DISTINCT
+                FROM '0'||coalesce(client_ip, server_ip))
+           AND '1'||coalesce(client_ip, server_ip) > '0'||coalesce(client_ip, server_ip)
+           AND '1'||coalesce(client_ip, server_ip) >= '0'||coalesce(client_ip, server_ip)
+           AND '1'||coalesce(client_ip, server_ip) < 2||coalesce(client_ip, server_ip)
+           AND '1'||coalesce(client_ip, server_ip) <= 2||coalesce(client_ip, server_ip)
+           AND ('1'||coalesce(client_ip, server_ip) <> '0'||coalesce(client_ip, server_ip)) IS TRUE
+           AND ('1'||coalesce(client_ip, server_ip) = '0'||coalesce(client_ip, server_ip)) IS NOT TRUE
+           AND ('1'||coalesce(client_ip, server_ip) = '0'||coalesce(client_ip, server_ip)) IS FALSE
+           AND ('1'||coalesce(client_ip, server_ip) <> '0'||coalesce(client_ip, server_ip)) IS NOT FALSE
+           AND '1'||coalesce(client_ip, server_ip) BETWEEN '0'||coalesce(client_ip, server_ip) AND 2||coalesce(client_ip, server_ip)
+           AND '1'||coalesce(client_ip, server_ip) NOT BETWEEN '1'||coalesce(client_ip, server_ip) AND '0'||coalesce(client_ip, server_ip)
+           AND '1'||coalesce(client_ip, server_ip) like '%'
+           AND '1'||coalesce(client_ip, server_ip) not like '__DOES_NOT_EXIST__%'
+           AND '1'||coalesce(client_ip, server_ip) IN ('0'||coalesce(client_ip, server_ip),
+                                                       1||coalesce(client_ip, server_ip),
+                                                       2||coalesce(client_ip, server_ip))
+           AND '1'||coalesce(client_ip, server_ip) NOT IN ('0'||coalesce(client_ip, server_ip),
+                                                           2||coalesce(client_ip, server_ip)))) ;
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND ('1'||coalesce(client_ip, server_ip) IS NULL
+       OR '1'||coalesce(client_ip, server_ip) IN
+         (SELECT '1'||coalesce(client_ip, server_ip)
+          FROM kttm_nested
+          WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+            AND ('1'||coalesce(client_ip, server_ip) IS NULL
+                 OR ('1'||coalesce(client_ip, server_ip) = 1||coalesce(client_ip, server_ip)
+                     AND '1'||coalesce(client_ip, server_ip) IS NOT DISTINCT
+                     FROM 1||coalesce(client_ip, server_ip)
+                     AND '1'||coalesce(client_ip, server_ip) <> '0'||coalesce(client_ip, server_ip)
+                     AND ('1'||coalesce(client_ip, server_ip) IS DISTINCT
+                          FROM '0'||coalesce(client_ip, server_ip))
+                     AND '1'||coalesce(client_ip, server_ip) > '0'||coalesce(client_ip, server_ip)
+                     AND '1'||coalesce(client_ip, server_ip) >= '0'||coalesce(client_ip, server_ip)
+                     AND '1'||coalesce(client_ip, server_ip) < 2||coalesce(client_ip, server_ip)
+                     AND '1'||coalesce(client_ip, server_ip) <= 2||coalesce(client_ip, server_ip)
+                     AND ('1'||coalesce(client_ip, server_ip) <> '0'||coalesce(client_ip, server_ip)) IS TRUE
+                     AND ('1'||coalesce(client_ip, server_ip) = '0'||coalesce(client_ip, server_ip)) IS NOT TRUE
+                     AND ('1'||coalesce(client_ip, server_ip) = '0'||coalesce(client_ip, server_ip)) IS FALSE
+                     AND ('1'||coalesce(client_ip, server_ip) <> '0'||coalesce(client_ip, server_ip)) IS NOT FALSE
+                     AND '1'||coalesce(client_ip, server_ip) BETWEEN '0'||coalesce(client_ip, server_ip) AND 2||coalesce(client_ip, server_ip)
+                     AND '1'||coalesce(client_ip, server_ip) NOT BETWEEN '1'||coalesce(client_ip, server_ip) AND '0'||coalesce(client_ip, server_ip)
+                     AND '1'||coalesce(client_ip, server_ip) like '%'
+                     AND '1'||coalesce(client_ip, server_ip) not like '__DOES_NOT_EXIST__%'
+                     AND '1'||coalesce(client_ip, server_ip) IN ('0'||coalesce(client_ip, server_ip),
+                                                                 1||coalesce(client_ip, server_ip),
+                                                                 2||coalesce(client_ip, server_ip))
+                     AND '1'||coalesce(client_ip, server_ip) NOT IN ('0'||coalesce(client_ip, server_ip),
+                                                                     2||coalesce(client_ip, server_ip))))));
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM
+  (SELECT __time, number, client_ip,
+                          '1'||coalesce(client_ip, server_ip),
+                          count(*)
+   FROM kttm_nested
+   WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+     AND ('1'||coalesce(client_ip, server_ip) IS NULL
+          OR ('1'||coalesce(client_ip, server_ip) = 1||coalesce(client_ip, server_ip)
+              AND '1'||coalesce(client_ip, server_ip) IS NOT DISTINCT
+              FROM 1||coalesce(client_ip, server_ip)
+              AND '1'||coalesce(client_ip, server_ip) <> '0'||coalesce(client_ip, server_ip)
+              AND ('1'||coalesce(client_ip, server_ip) IS DISTINCT
+                   FROM '0'||coalesce(client_ip, server_ip))
+              AND '1'||coalesce(client_ip, server_ip) > '0'||coalesce(client_ip, server_ip)
+              AND '1'||coalesce(client_ip, server_ip) >= '0'||coalesce(client_ip, server_ip)
+              AND '1'||coalesce(client_ip, server_ip) < 2||coalesce(client_ip, server_ip)
+              AND '1'||coalesce(client_ip, server_ip) <= 2||coalesce(client_ip, server_ip)
+              AND ('1'||coalesce(client_ip, server_ip) <> '0'||coalesce(client_ip, server_ip)) IS TRUE
+              AND ('1'||coalesce(client_ip, server_ip) = '0'||coalesce(client_ip, server_ip)) IS NOT TRUE
+              AND ('1'||coalesce(client_ip, server_ip) = '0'||coalesce(client_ip, server_ip)) IS FALSE
+              AND ('1'||coalesce(client_ip, server_ip) <> '0'||coalesce(client_ip, server_ip)) IS NOT FALSE
+              AND '1'||coalesce(client_ip, server_ip) BETWEEN '0'||coalesce(client_ip, server_ip) AND 2||coalesce(client_ip, server_ip)
+              AND '1'||coalesce(client_ip, server_ip) NOT BETWEEN '1'||coalesce(client_ip, server_ip) AND '0'||coalesce(client_ip, server_ip)
+              AND '1'||coalesce(client_ip, server_ip) like '%'
+              AND '1'||coalesce(client_ip, server_ip) not like '__DOES_NOT_EXIST__%'
+              AND '1'||coalesce(client_ip, server_ip) IN ('0'||coalesce(client_ip, server_ip),
+                                                          1||coalesce(client_ip, server_ip),
+                                                          2||coalesce(client_ip, server_ip))
+              AND '1'||coalesce(client_ip, server_ip) NOT IN ('0'||coalesce(client_ip, server_ip),
+                                                              2||coalesce(client_ip, server_ip))))
+   GROUP BY 1,
+            2,
+            3,
+            4);
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+#-------------------------------------------------------------------------
+# TEST_ID: A12: coalesce_complex
+#-------------------------------------------------------------------------
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND ('1'||to_json_string(coalesce(event, agent)) IS NULL
+       OR ('1'||to_json_string(coalesce(event, agent)) = 1||to_json_string(coalesce(event, agent))
+           AND '1'||to_json_string(coalesce(event, agent)) IS NOT DISTINCT
+           FROM 1||to_json_string(coalesce(event, agent))
+           AND '1'||to_json_string(coalesce(event, agent)) <> '0'||to_json_string(coalesce(event, agent))
+           AND ('1'||to_json_string(coalesce(event, agent)) IS DISTINCT
+                FROM '0'||to_json_string(coalesce(event, agent)))
+           AND '1'||to_json_string(coalesce(event, agent)) > '0'||to_json_string(coalesce(event, agent))
+           AND '1'||to_json_string(coalesce(event, agent)) >= '0'||to_json_string(coalesce(event, agent))
+           AND '1'||to_json_string(coalesce(event, agent)) < 2||to_json_string(coalesce(event, agent))
+           AND '1'||to_json_string(coalesce(event, agent)) <= 2||to_json_string(coalesce(event, agent))
+           AND ('1'||to_json_string(coalesce(event, agent)) <> '0'||to_json_string(coalesce(event, agent))) IS TRUE
+           AND ('1'||to_json_string(coalesce(event, agent)) = '0'||to_json_string(coalesce(event, agent))) IS NOT TRUE
+           AND ('1'||to_json_string(coalesce(event, agent)) = '0'||to_json_string(coalesce(event, agent))) IS FALSE
+           AND ('1'||to_json_string(coalesce(event, agent)) <> '0'||to_json_string(coalesce(event, agent))) IS NOT FALSE
+           AND '1'||to_json_string(coalesce(event, agent)) BETWEEN '0'||to_json_string(coalesce(event, agent)) AND 2||to_json_string(coalesce(event, agent))
+           AND '1'||to_json_string(coalesce(event, agent)) NOT BETWEEN '1'||to_json_string(coalesce(event, agent)) AND '0'||to_json_string(coalesce(event, agent))
+           AND '1'||to_json_string(coalesce(event, agent)) like '%'
+           AND '1'||to_json_string(coalesce(event, agent)) not like '__DOES_NOT_EXIST__%'
+           AND '1'||to_json_string(coalesce(event, agent)) IN ('0'||to_json_string(coalesce(event, agent)),
+                                                               1||to_json_string(coalesce(event, agent)),
+                                                               2||to_json_string(coalesce(event, agent)))
+           AND '1'||to_json_string(coalesce(event, agent)) NOT IN ('0'||to_json_string(coalesce(event, agent)),
+                                                                   2||to_json_string(coalesce(event, agent))))) ;
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND ('1'||to_json_string(coalesce(event, agent)) IS NULL
+       OR '1'||to_json_string(coalesce(event, agent)) IN
+         (SELECT '1'||to_json_string(coalesce(event, agent))
+          FROM kttm_nested
+          WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+            AND ('1'||to_json_string(coalesce(event, agent)) IS NULL
+                 OR ('1'||to_json_string(coalesce(event, agent)) = 1||to_json_string(coalesce(event, agent))
+                     AND '1'||to_json_string(coalesce(event, agent)) IS NOT DISTINCT
+                     FROM 1||to_json_string(coalesce(event, agent))
+                     AND '1'||to_json_string(coalesce(event, agent)) <> '0'||to_json_string(coalesce(event, agent))
+                     AND ('1'||to_json_string(coalesce(event, agent)) IS DISTINCT
+                          FROM '0'||to_json_string(coalesce(event, agent)))
+                     AND '1'||to_json_string(coalesce(event, agent)) > '0'||to_json_string(coalesce(event, agent))
+                     AND '1'||to_json_string(coalesce(event, agent)) >= '0'||to_json_string(coalesce(event, agent))
+                     AND '1'||to_json_string(coalesce(event, agent)) < 2||to_json_string(coalesce(event, agent))
+                     AND '1'||to_json_string(coalesce(event, agent)) <= 2||to_json_string(coalesce(event, agent))
+                     AND ('1'||to_json_string(coalesce(event, agent)) <> '0'||to_json_string(coalesce(event, agent))) IS TRUE
+                     AND ('1'||to_json_string(coalesce(event, agent)) = '0'||to_json_string(coalesce(event, agent))) IS NOT TRUE
+                     AND ('1'||to_json_string(coalesce(event, agent)) = '0'||to_json_string(coalesce(event, agent))) IS FALSE
+                     AND ('1'||to_json_string(coalesce(event, agent)) <> '0'||to_json_string(coalesce(event, agent))) IS NOT FALSE
+                     AND '1'||to_json_string(coalesce(event, agent)) BETWEEN '0'||to_json_string(coalesce(event, agent)) AND 2||to_json_string(coalesce(event, agent))
+                     AND '1'||to_json_string(coalesce(event, agent)) NOT BETWEEN '1'||to_json_string(coalesce(event, agent)) AND '0'||to_json_string(coalesce(event, agent))
+                     AND '1'||to_json_string(coalesce(event, agent)) like '%'
+                     AND '1'||to_json_string(coalesce(event, agent)) not like '__DOES_NOT_EXIST__%'
+                     AND '1'||to_json_string(coalesce(event, agent)) IN ('0'||to_json_string(coalesce(event, agent)),
+                                                                         1||to_json_string(coalesce(event, agent)),
+                                                                         2||to_json_string(coalesce(event, agent)))
+                     AND '1'||to_json_string(coalesce(event, agent)) NOT IN ('0'||to_json_string(coalesce(event, agent)),
+                                                                             2||to_json_string(coalesce(event, agent)))))));
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM
+  (SELECT __time, number, client_ip,
+                          '1'||to_json_string(coalesce(event, agent)),
+                          count(*)
+   FROM kttm_nested
+   WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+     AND ('1'||to_json_string(coalesce(event, agent)) IS NULL
+          OR ('1'||to_json_string(coalesce(event, agent)) = 1||to_json_string(coalesce(event, agent))
+              AND '1'||to_json_string(coalesce(event, agent)) IS NOT DISTINCT
+              FROM 1||to_json_string(coalesce(event, agent))
+              AND '1'||to_json_string(coalesce(event, agent)) <> '0'||to_json_string(coalesce(event, agent))
+              AND ('1'||to_json_string(coalesce(event, agent)) IS DISTINCT
+                   FROM '0'||to_json_string(coalesce(event, agent)))
+              AND '1'||to_json_string(coalesce(event, agent)) > '0'||to_json_string(coalesce(event, agent))
+              AND '1'||to_json_string(coalesce(event, agent)) >= '0'||to_json_string(coalesce(event, agent))
+              AND '1'||to_json_string(coalesce(event, agent)) < 2||to_json_string(coalesce(event, agent))
+              AND '1'||to_json_string(coalesce(event, agent)) <= 2||to_json_string(coalesce(event, agent))
+              AND ('1'||to_json_string(coalesce(event, agent)) <> '0'||to_json_string(coalesce(event, agent))) IS TRUE
+              AND ('1'||to_json_string(coalesce(event, agent)) = '0'||to_json_string(coalesce(event, agent))) IS NOT TRUE
+              AND ('1'||to_json_string(coalesce(event, agent)) = '0'||to_json_string(coalesce(event, agent))) IS FALSE
+              AND ('1'||to_json_string(coalesce(event, agent)) <> '0'||to_json_string(coalesce(event, agent))) IS NOT FALSE
+              AND '1'||to_json_string(coalesce(event, agent)) BETWEEN '0'||to_json_string(coalesce(event, agent)) AND 2||to_json_string(coalesce(event, agent))
+              AND '1'||to_json_string(coalesce(event, agent)) NOT BETWEEN '1'||to_json_string(coalesce(event, agent)) AND '0'||to_json_string(coalesce(event, agent))
+              AND '1'||to_json_string(coalesce(event, agent)) like '%'
+              AND '1'||to_json_string(coalesce(event, agent)) not like '__DOES_NOT_EXIST__%'
+              AND '1'||to_json_string(coalesce(event, agent)) IN ('0'||to_json_string(coalesce(event, agent)),
+                                                                  1||to_json_string(coalesce(event, agent)),
+                                                                  2||to_json_string(coalesce(event, agent)))
+              AND '1'||to_json_string(coalesce(event, agent)) NOT IN ('0'||to_json_string(coalesce(event, agent)),
+                                                                      2||to_json_string(coalesce(event, agent)))))
+   GROUP BY 1,
+            2,
+            3,
+            4);
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+#-------------------------------------------------------------------------
+# TEST_ID: A13: nullif_scalar
+#-------------------------------------------------------------------------
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND ('1'||nullif(client_ip, server_ip) IS NULL
+       OR ('1'||nullif(client_ip, server_ip) = 1||nullif(client_ip, server_ip)
+           AND '1'||nullif(client_ip, server_ip) IS NOT DISTINCT
+           FROM 1||nullif(client_ip, server_ip)
+           AND '1'||nullif(client_ip, server_ip) <> '0'||nullif(client_ip, server_ip)
+           AND ('1'||nullif(client_ip, server_ip) IS DISTINCT
+                FROM '0'||nullif(client_ip, server_ip))
+           AND '1'||nullif(client_ip, server_ip) > '0'||nullif(client_ip, server_ip)
+           AND '1'||nullif(client_ip, server_ip) >= '0'||nullif(client_ip, server_ip)
+           AND '1'||nullif(client_ip, server_ip) < 2||nullif(client_ip, server_ip)
+           AND '1'||nullif(client_ip, server_ip) <= 2||nullif(client_ip, server_ip)
+           AND ('1'||nullif(client_ip, server_ip) <> '0'||nullif(client_ip, server_ip)) IS TRUE
+           AND ('1'||nullif(client_ip, server_ip) = '0'||nullif(client_ip, server_ip)) IS NOT TRUE
+           AND ('1'||nullif(client_ip, server_ip) = '0'||nullif(client_ip, server_ip)) IS FALSE
+           AND ('1'||nullif(client_ip, server_ip) <> '0'||nullif(client_ip, server_ip)) IS NOT FALSE
+           AND '1'||nullif(client_ip, server_ip) BETWEEN '0'||nullif(client_ip, server_ip) AND 2||nullif(client_ip, server_ip)
+           AND '1'||nullif(client_ip, server_ip) NOT BETWEEN '1'||nullif(client_ip, server_ip) AND '0'||nullif(client_ip, server_ip)
+           AND '1'||nullif(client_ip, server_ip) like '%'
+           AND '1'||nullif(client_ip, server_ip) not like '__DOES_NOT_EXIST__%'
+           AND '1'||nullif(client_ip, server_ip) IN ('0'||nullif(client_ip, server_ip),
+                                                     1||nullif(client_ip, server_ip),
+                                                     2||nullif(client_ip, server_ip))
+           AND '1'||nullif(client_ip, server_ip) NOT IN ('0'||nullif(client_ip, server_ip),
+                                                         2||nullif(client_ip, server_ip)))) ;
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND ('1'||nullif(client_ip, server_ip) IS NULL
+       OR '1'||nullif(client_ip, server_ip) IN
+         (SELECT '1'||nullif(client_ip, server_ip)
+          FROM kttm_nested
+          WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+            AND ('1'||nullif(client_ip, server_ip) IS NULL
+                 OR ('1'||nullif(client_ip, server_ip) = 1||nullif(client_ip, server_ip)
+                     AND '1'||nullif(client_ip, server_ip) IS NOT DISTINCT
+                     FROM 1||nullif(client_ip, server_ip)
+                     AND '1'||nullif(client_ip, server_ip) <> '0'||nullif(client_ip, server_ip)
+                     AND ('1'||nullif(client_ip, server_ip) IS DISTINCT
+                          FROM '0'||nullif(client_ip, server_ip))
+                     AND '1'||nullif(client_ip, server_ip) > '0'||nullif(client_ip, server_ip)
+                     AND '1'||nullif(client_ip, server_ip) >= '0'||nullif(client_ip, server_ip)
+                     AND '1'||nullif(client_ip, server_ip) < 2||nullif(client_ip, server_ip)
+                     AND '1'||nullif(client_ip, server_ip) <= 2||nullif(client_ip, server_ip)
+                     AND ('1'||nullif(client_ip, server_ip) <> '0'||nullif(client_ip, server_ip)) IS TRUE
+                     AND ('1'||nullif(client_ip, server_ip) = '0'||nullif(client_ip, server_ip)) IS NOT TRUE
+                     AND ('1'||nullif(client_ip, server_ip) = '0'||nullif(client_ip, server_ip)) IS FALSE
+                     AND ('1'||nullif(client_ip, server_ip) <> '0'||nullif(client_ip, server_ip)) IS NOT FALSE
+                     AND '1'||nullif(client_ip, server_ip) BETWEEN '0'||nullif(client_ip, server_ip) AND 2||nullif(client_ip, server_ip)
+                     AND '1'||nullif(client_ip, server_ip) NOT BETWEEN '1'||nullif(client_ip, server_ip) AND '0'||nullif(client_ip, server_ip)
+                     AND '1'||nullif(client_ip, server_ip) like '%'
+                     AND '1'||nullif(client_ip, server_ip) not like '__DOES_NOT_EXIST__%'
+                     AND '1'||nullif(client_ip, server_ip) IN ('0'||nullif(client_ip, server_ip),
+                                                               1||nullif(client_ip, server_ip),
+                                                               2||nullif(client_ip, server_ip))
+                     AND '1'||nullif(client_ip, server_ip) NOT IN ('0'||nullif(client_ip, server_ip),
+                                                                   2||nullif(client_ip, server_ip))))));
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM
+  (SELECT __time, number, client_ip,
+                          '1'||nullif(client_ip, server_ip),
+                          count(*)
+   FROM kttm_nested
+   WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+     AND ('1'||nullif(client_ip, server_ip) IS NULL
+          OR ('1'||nullif(client_ip, server_ip) = 1||nullif(client_ip, server_ip)
+              AND '1'||nullif(client_ip, server_ip) IS NOT DISTINCT
+              FROM 1||nullif(client_ip, server_ip)
+              AND '1'||nullif(client_ip, server_ip) <> '0'||nullif(client_ip, server_ip)
+              AND ('1'||nullif(client_ip, server_ip) IS DISTINCT
+                   FROM '0'||nullif(client_ip, server_ip))
+              AND '1'||nullif(client_ip, server_ip) > '0'||nullif(client_ip, server_ip)
+              AND '1'||nullif(client_ip, server_ip) >= '0'||nullif(client_ip, server_ip)
+              AND '1'||nullif(client_ip, server_ip) < 2||nullif(client_ip, server_ip)
+              AND '1'||nullif(client_ip, server_ip) <= 2||nullif(client_ip, server_ip)
+              AND ('1'||nullif(client_ip, server_ip) <> '0'||nullif(client_ip, server_ip)) IS TRUE
+              AND ('1'||nullif(client_ip, server_ip) = '0'||nullif(client_ip, server_ip)) IS NOT TRUE
+              AND ('1'||nullif(client_ip, server_ip) = '0'||nullif(client_ip, server_ip)) IS FALSE
+              AND ('1'||nullif(client_ip, server_ip) <> '0'||nullif(client_ip, server_ip)) IS NOT FALSE
+              AND '1'||nullif(client_ip, server_ip) BETWEEN '0'||nullif(client_ip, server_ip) AND 2||nullif(client_ip, server_ip)
+              AND '1'||nullif(client_ip, server_ip) NOT BETWEEN '1'||nullif(client_ip, server_ip) AND '0'||nullif(client_ip, server_ip)
+              AND '1'||nullif(client_ip, server_ip) like '%'
+              AND '1'||nullif(client_ip, server_ip) not like '__DOES_NOT_EXIST__%'
+              AND '1'||nullif(client_ip, server_ip) IN ('0'||nullif(client_ip, server_ip),
+                                                        1||nullif(client_ip, server_ip),
+                                                        2||nullif(client_ip, server_ip))
+              AND '1'||nullif(client_ip, server_ip) NOT IN ('0'||nullif(client_ip, server_ip),
+                                                            2||nullif(client_ip, server_ip))))
+   GROUP BY 1,
+            2,
+            3,
+            4);
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+#-------------------------------------------------------------------------
+# TEST_ID: A14: nullif_complex
+#-------------------------------------------------------------------------
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND ('1'||to_json_string(nullif(event, agent)) IS NULL
+       OR ('1'||to_json_string(nullif(event, agent)) = 1||to_json_string(nullif(event, agent))
+           AND '1'||to_json_string(nullif(event, agent)) IS NOT DISTINCT
+           FROM 1||to_json_string(nullif(event, agent))
+           AND '1'||to_json_string(nullif(event, agent)) <> '0'||to_json_string(nullif(event, agent))
+           AND ('1'||to_json_string(nullif(event, agent)) IS DISTINCT
+                FROM '0'||to_json_string(nullif(event, agent)))
+           AND '1'||to_json_string(nullif(event, agent)) > '0'||to_json_string(nullif(event, agent))
+           AND '1'||to_json_string(nullif(event, agent)) >= '0'||to_json_string(nullif(event, agent))
+           AND '1'||to_json_string(nullif(event, agent)) < 2||to_json_string(nullif(event, agent))
+           AND '1'||to_json_string(nullif(event, agent)) <= 2||to_json_string(nullif(event, agent))
+           AND ('1'||to_json_string(nullif(event, agent)) <> '0'||to_json_string(nullif(event, agent))) IS TRUE
+           AND ('1'||to_json_string(nullif(event, agent)) = '0'||to_json_string(nullif(event, agent))) IS NOT TRUE
+           AND ('1'||to_json_string(nullif(event, agent)) = '0'||to_json_string(nullif(event, agent))) IS FALSE
+           AND ('1'||to_json_string(nullif(event, agent)) <> '0'||to_json_string(nullif(event, agent))) IS NOT FALSE
+           AND '1'||to_json_string(nullif(event, agent)) BETWEEN '0'||to_json_string(nullif(event, agent)) AND 2||to_json_string(nullif(event, agent))
+           AND '1'||to_json_string(nullif(event, agent)) NOT BETWEEN '1'||to_json_string(nullif(event, agent)) AND '0'||to_json_string(nullif(event, agent))
+           AND '1'||to_json_string(nullif(event, agent)) like '%'
+           AND '1'||to_json_string(nullif(event, agent)) not like '__DOES_NOT_EXIST__%'
+           AND '1'||to_json_string(nullif(event, agent)) IN ('0'||to_json_string(nullif(event, agent)),
+                                                             1||to_json_string(nullif(event, agent)),
+                                                             2||to_json_string(nullif(event, agent)))
+           AND '1'||to_json_string(nullif(event, agent)) NOT IN ('0'||to_json_string(nullif(event, agent)),
+                                                                 2||to_json_string(nullif(event, agent))))) ;
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND ('1'||to_json_string(nullif(event, agent)) IS NULL
+       OR '1'||to_json_string(nullif(event, agent)) IN
+         (SELECT '1'||to_json_string(nullif(event, agent))
+          FROM kttm_nested
+          WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+            AND ('1'||to_json_string(nullif(event, agent)) IS NULL
+                 OR ('1'||to_json_string(nullif(event, agent)) = 1||to_json_string(nullif(event, agent))
+                     AND '1'||to_json_string(nullif(event, agent)) IS NOT DISTINCT
+                     FROM 1||to_json_string(nullif(event, agent))
+                     AND '1'||to_json_string(nullif(event, agent)) <> '0'||to_json_string(nullif(event, agent))
+                     AND ('1'||to_json_string(nullif(event, agent)) IS DISTINCT
+                          FROM '0'||to_json_string(nullif(event, agent)))
+                     AND '1'||to_json_string(nullif(event, agent)) > '0'||to_json_string(nullif(event, agent))
+                     AND '1'||to_json_string(nullif(event, agent)) >= '0'||to_json_string(nullif(event, agent))
+                     AND '1'||to_json_string(nullif(event, agent)) < 2||to_json_string(nullif(event, agent))
+                     AND '1'||to_json_string(nullif(event, agent)) <= 2||to_json_string(nullif(event, agent))
+                     AND ('1'||to_json_string(nullif(event, agent)) <> '0'||to_json_string(nullif(event, agent))) IS TRUE
+                     AND ('1'||to_json_string(nullif(event, agent)) = '0'||to_json_string(nullif(event, agent))) IS NOT TRUE
+                     AND ('1'||to_json_string(nullif(event, agent)) = '0'||to_json_string(nullif(event, agent))) IS FALSE
+                     AND ('1'||to_json_string(nullif(event, agent)) <> '0'||to_json_string(nullif(event, agent))) IS NOT FALSE
+                     AND '1'||to_json_string(nullif(event, agent)) BETWEEN '0'||to_json_string(nullif(event, agent)) AND 2||to_json_string(nullif(event, agent))
+                     AND '1'||to_json_string(nullif(event, agent)) NOT BETWEEN '1'||to_json_string(nullif(event, agent)) AND '0'||to_json_string(nullif(event, agent))
+                     AND '1'||to_json_string(nullif(event, agent)) like '%'
+                     AND '1'||to_json_string(nullif(event, agent)) not like '__DOES_NOT_EXIST__%'
+                     AND '1'||to_json_string(nullif(event, agent)) IN ('0'||to_json_string(nullif(event, agent)),
+                                                                       1||to_json_string(nullif(event, agent)),
+                                                                       2||to_json_string(nullif(event, agent)))
+                     AND '1'||to_json_string(nullif(event, agent)) NOT IN ('0'||to_json_string(nullif(event, agent)),
+                                                                           2||to_json_string(nullif(event, agent)))))));
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM
+  (SELECT __time, number, client_ip,
+                          '1'||to_json_string(nullif(event, agent)),
+                          count(*)
+   FROM kttm_nested
+   WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+     AND ('1'||to_json_string(nullif(event, agent)) IS NULL
+          OR ('1'||to_json_string(nullif(event, agent)) = 1||to_json_string(nullif(event, agent))
+              AND '1'||to_json_string(nullif(event, agent)) IS NOT DISTINCT
+              FROM 1||to_json_string(nullif(event, agent))
+              AND '1'||to_json_string(nullif(event, agent)) <> '0'||to_json_string(nullif(event, agent))
+              AND ('1'||to_json_string(nullif(event, agent)) IS DISTINCT
+                   FROM '0'||to_json_string(nullif(event, agent)))
+              AND '1'||to_json_string(nullif(event, agent)) > '0'||to_json_string(nullif(event, agent))
+              AND '1'||to_json_string(nullif(event, agent)) >= '0'||to_json_string(nullif(event, agent))
+              AND '1'||to_json_string(nullif(event, agent)) < 2||to_json_string(nullif(event, agent))
+              AND '1'||to_json_string(nullif(event, agent)) <= 2||to_json_string(nullif(event, agent))
+              AND ('1'||to_json_string(nullif(event, agent)) <> '0'||to_json_string(nullif(event, agent))) IS TRUE
+              AND ('1'||to_json_string(nullif(event, agent)) = '0'||to_json_string(nullif(event, agent))) IS NOT TRUE
+              AND ('1'||to_json_string(nullif(event, agent)) = '0'||to_json_string(nullif(event, agent))) IS FALSE
+              AND ('1'||to_json_string(nullif(event, agent)) <> '0'||to_json_string(nullif(event, agent))) IS NOT FALSE
+              AND '1'||to_json_string(nullif(event, agent)) BETWEEN '0'||to_json_string(nullif(event, agent)) AND 2||to_json_string(nullif(event, agent))
+              AND '1'||to_json_string(nullif(event, agent)) NOT BETWEEN '1'||to_json_string(nullif(event, agent)) AND '0'||to_json_string(nullif(event, agent))
+              AND '1'||to_json_string(nullif(event, agent)) like '%'
+              AND '1'||to_json_string(nullif(event, agent)) not like '__DOES_NOT_EXIST__%'
+              AND '1'||to_json_string(nullif(event, agent)) IN ('0'||to_json_string(nullif(event, agent)),
+                                                                1||to_json_string(nullif(event, agent)),
+                                                                2||to_json_string(nullif(event, agent)))
+              AND '1'||to_json_string(nullif(event, agent)) NOT IN ('0'||to_json_string(nullif(event, agent)),
+                                                                    2||to_json_string(nullif(event, agent)))))
+   GROUP BY 1,
+            2,
+            3,
+            4);
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+#-------------------------------------------------------------------------
+# TEST_ID: A15: nvl_scalar
+#-------------------------------------------------------------------------
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND ('1'||nvl(client_ip, server_ip) IS NULL
+       OR ('1'||nvl(client_ip, server_ip) = 1||nvl(client_ip, server_ip)
+           AND '1'||nvl(client_ip, server_ip) IS NOT DISTINCT
+           FROM 1||nvl(client_ip, server_ip)
+           AND '1'||nvl(client_ip, server_ip) <> '0'||nvl(client_ip, server_ip)
+           AND ('1'||nvl(client_ip, server_ip) IS DISTINCT
+                FROM '0'||nvl(client_ip, server_ip))
+           AND '1'||nvl(client_ip, server_ip) > '0'||nvl(client_ip, server_ip)
+           AND '1'||nvl(client_ip, server_ip) >= '0'||nvl(client_ip, server_ip)
+           AND '1'||nvl(client_ip, server_ip) < 2||nvl(client_ip, server_ip)
+           AND '1'||nvl(client_ip, server_ip) <= 2||nvl(client_ip, server_ip)
+           AND ('1'||nvl(client_ip, server_ip) <> '0'||nvl(client_ip, server_ip)) IS TRUE
+           AND ('1'||nvl(client_ip, server_ip) = '0'||nvl(client_ip, server_ip)) IS NOT TRUE
+           AND ('1'||nvl(client_ip, server_ip) = '0'||nvl(client_ip, server_ip)) IS FALSE
+           AND ('1'||nvl(client_ip, server_ip) <> '0'||nvl(client_ip, server_ip)) IS NOT FALSE
+           AND '1'||nvl(client_ip, server_ip) BETWEEN '0'||nvl(client_ip, server_ip) AND 2||nvl(client_ip, server_ip)
+           AND '1'||nvl(client_ip, server_ip) NOT BETWEEN '1'||nvl(client_ip, server_ip) AND '0'||nvl(client_ip, server_ip)
+           AND '1'||nvl(client_ip, server_ip) like '%'
+           AND '1'||nvl(client_ip, server_ip) not like '__DOES_NOT_EXIST__%'
+           AND '1'||nvl(client_ip, server_ip) IN ('0'||nvl(client_ip, server_ip),
+                                                  1||nvl(client_ip, server_ip),
+                                                  2||nvl(client_ip, server_ip))
+           AND '1'||nvl(client_ip, server_ip) NOT IN ('0'||nvl(client_ip, server_ip),
+                                                      2||nvl(client_ip, server_ip)))) ;
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND ('1'||nvl(client_ip, server_ip) IS NULL
+       OR '1'||nvl(client_ip, server_ip) IN
+         (SELECT '1'||nvl(client_ip, server_ip)
+          FROM kttm_nested
+          WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+            AND ('1'||nvl(client_ip, server_ip) IS NULL
+                 OR ('1'||nvl(client_ip, server_ip) = 1||nvl(client_ip, server_ip)
+                     AND '1'||nvl(client_ip, server_ip) IS NOT DISTINCT
+                     FROM 1||nvl(client_ip, server_ip)
+                     AND '1'||nvl(client_ip, server_ip) <> '0'||nvl(client_ip, server_ip)
+                     AND ('1'||nvl(client_ip, server_ip) IS DISTINCT
+                          FROM '0'||nvl(client_ip, server_ip))
+                     AND '1'||nvl(client_ip, server_ip) > '0'||nvl(client_ip, server_ip)
+                     AND '1'||nvl(client_ip, server_ip) >= '0'||nvl(client_ip, server_ip)
+                     AND '1'||nvl(client_ip, server_ip) < 2||nvl(client_ip, server_ip)
+                     AND '1'||nvl(client_ip, server_ip) <= 2||nvl(client_ip, server_ip)
+                     AND ('1'||nvl(client_ip, server_ip) <> '0'||nvl(client_ip, server_ip)) IS TRUE
+                     AND ('1'||nvl(client_ip, server_ip) = '0'||nvl(client_ip, server_ip)) IS NOT TRUE
+                     AND ('1'||nvl(client_ip, server_ip) = '0'||nvl(client_ip, server_ip)) IS FALSE
+                     AND ('1'||nvl(client_ip, server_ip) <> '0'||nvl(client_ip, server_ip)) IS NOT FALSE
+                     AND '1'||nvl(client_ip, server_ip) BETWEEN '0'||nvl(client_ip, server_ip) AND 2||nvl(client_ip, server_ip)
+                     AND '1'||nvl(client_ip, server_ip) NOT BETWEEN '1'||nvl(client_ip, server_ip) AND '0'||nvl(client_ip, server_ip)
+                     AND '1'||nvl(client_ip, server_ip) like '%'
+                     AND '1'||nvl(client_ip, server_ip) not like '__DOES_NOT_EXIST__%'
+                     AND '1'||nvl(client_ip, server_ip) IN ('0'||nvl(client_ip, server_ip),
+                                                            1||nvl(client_ip, server_ip),
+                                                            2||nvl(client_ip, server_ip))
+                     AND '1'||nvl(client_ip, server_ip) NOT IN ('0'||nvl(client_ip, server_ip),
+                                                                2||nvl(client_ip, server_ip))))));
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM
+  (SELECT __time, number, client_ip,
+                          '1'||nvl(client_ip, server_ip),
+                          count(*)
+   FROM kttm_nested
+   WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+     AND ('1'||nvl(client_ip, server_ip) IS NULL
+          OR ('1'||nvl(client_ip, server_ip) = 1||nvl(client_ip, server_ip)
+              AND '1'||nvl(client_ip, server_ip) IS NOT DISTINCT
+              FROM 1||nvl(client_ip, server_ip)
+              AND '1'||nvl(client_ip, server_ip) <> '0'||nvl(client_ip, server_ip)
+              AND ('1'||nvl(client_ip, server_ip) IS DISTINCT
+                   FROM '0'||nvl(client_ip, server_ip))
+              AND '1'||nvl(client_ip, server_ip) > '0'||nvl(client_ip, server_ip)
+              AND '1'||nvl(client_ip, server_ip) >= '0'||nvl(client_ip, server_ip)
+              AND '1'||nvl(client_ip, server_ip) < 2||nvl(client_ip, server_ip)
+              AND '1'||nvl(client_ip, server_ip) <= 2||nvl(client_ip, server_ip)
+              AND ('1'||nvl(client_ip, server_ip) <> '0'||nvl(client_ip, server_ip)) IS TRUE
+              AND ('1'||nvl(client_ip, server_ip) = '0'||nvl(client_ip, server_ip)) IS NOT TRUE
+              AND ('1'||nvl(client_ip, server_ip) = '0'||nvl(client_ip, server_ip)) IS FALSE
+              AND ('1'||nvl(client_ip, server_ip) <> '0'||nvl(client_ip, server_ip)) IS NOT FALSE
+              AND '1'||nvl(client_ip, server_ip) BETWEEN '0'||nvl(client_ip, server_ip) AND 2||nvl(client_ip, server_ip)
+              AND '1'||nvl(client_ip, server_ip) NOT BETWEEN '1'||nvl(client_ip, server_ip) AND '0'||nvl(client_ip, server_ip)
+              AND '1'||nvl(client_ip, server_ip) like '%'
+              AND '1'||nvl(client_ip, server_ip) not like '__DOES_NOT_EXIST__%'
+              AND '1'||nvl(client_ip, server_ip) IN ('0'||nvl(client_ip, server_ip),
+                                                     1||nvl(client_ip, server_ip),
+                                                     2||nvl(client_ip, server_ip))
+              AND '1'||nvl(client_ip, server_ip) NOT IN ('0'||nvl(client_ip, server_ip),
+                                                         2||nvl(client_ip, server_ip))))
+   GROUP BY 1,
+            2,
+            3,
+            4);
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+#-------------------------------------------------------------------------
+# TEST_ID: A16: nvl_complex
+#-------------------------------------------------------------------------
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND ('1'||to_json_string(nvl(event, agent)) IS NULL
+       OR ('1'||to_json_string(nvl(event, agent)) = 1||to_json_string(nvl(event, agent))
+           AND '1'||to_json_string(nvl(event, agent)) IS NOT DISTINCT
+           FROM 1||to_json_string(nvl(event, agent))
+           AND '1'||to_json_string(nvl(event, agent)) <> '0'||to_json_string(nvl(event, agent))
+           AND ('1'||to_json_string(nvl(event, agent)) IS DISTINCT
+                FROM '0'||to_json_string(nvl(event, agent)))
+           AND '1'||to_json_string(nvl(event, agent)) > '0'||to_json_string(nvl(event, agent))
+           AND '1'||to_json_string(nvl(event, agent)) >= '0'||to_json_string(nvl(event, agent))
+           AND '1'||to_json_string(nvl(event, agent)) < 2||to_json_string(nvl(event, agent))
+           AND '1'||to_json_string(nvl(event, agent)) <= 2||to_json_string(nvl(event, agent))
+           AND ('1'||to_json_string(nvl(event, agent)) <> '0'||to_json_string(nvl(event, agent))) IS TRUE
+           AND ('1'||to_json_string(nvl(event, agent)) = '0'||to_json_string(nvl(event, agent))) IS NOT TRUE
+           AND ('1'||to_json_string(nvl(event, agent)) = '0'||to_json_string(nvl(event, agent))) IS FALSE
+           AND ('1'||to_json_string(nvl(event, agent)) <> '0'||to_json_string(nvl(event, agent))) IS NOT FALSE
+           AND '1'||to_json_string(nvl(event, agent)) BETWEEN '0'||to_json_string(nvl(event, agent)) AND 2||to_json_string(nvl(event, agent))
+           AND '1'||to_json_string(nvl(event, agent)) NOT BETWEEN '1'||to_json_string(nvl(event, agent)) AND '0'||to_json_string(nvl(event, agent))
+           AND '1'||to_json_string(nvl(event, agent)) like '%'
+           AND '1'||to_json_string(nvl(event, agent)) not like '__DOES_NOT_EXIST__%'
+           AND '1'||to_json_string(nvl(event, agent)) IN ('0'||to_json_string(nvl(event, agent)),
+                                                          1||to_json_string(nvl(event, agent)),
+                                                          2||to_json_string(nvl(event, agent)))
+           AND '1'||to_json_string(nvl(event, agent)) NOT IN ('0'||to_json_string(nvl(event, agent)),
+                                                              2||to_json_string(nvl(event, agent))))) ;
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND ('1'||to_json_string(nvl(event, agent)) IS NULL
+       OR '1'||to_json_string(nvl(event, agent)) IN
+         (SELECT '1'||to_json_string(nvl(event, agent))
+          FROM kttm_nested
+          WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+            AND ('1'||to_json_string(nvl(event, agent)) IS NULL
+                 OR ('1'||to_json_string(nvl(event, agent)) = 1||to_json_string(nvl(event, agent))
+                     AND '1'||to_json_string(nvl(event, agent)) IS NOT DISTINCT
+                     FROM 1||to_json_string(nvl(event, agent))
+                     AND '1'||to_json_string(nvl(event, agent)) <> '0'||to_json_string(nvl(event, agent))
+                     AND ('1'||to_json_string(nvl(event, agent)) IS DISTINCT
+                          FROM '0'||to_json_string(nvl(event, agent)))
+                     AND '1'||to_json_string(nvl(event, agent)) > '0'||to_json_string(nvl(event, agent))
+                     AND '1'||to_json_string(nvl(event, agent)) >= '0'||to_json_string(nvl(event, agent))
+                     AND '1'||to_json_string(nvl(event, agent)) < 2||to_json_string(nvl(event, agent))
+                     AND '1'||to_json_string(nvl(event, agent)) <= 2||to_json_string(nvl(event, agent))
+                     AND ('1'||to_json_string(nvl(event, agent)) <> '0'||to_json_string(nvl(event, agent))) IS TRUE
+                     AND ('1'||to_json_string(nvl(event, agent)) = '0'||to_json_string(nvl(event, agent))) IS NOT TRUE
+                     AND ('1'||to_json_string(nvl(event, agent)) = '0'||to_json_string(nvl(event, agent))) IS FALSE
+                     AND ('1'||to_json_string(nvl(event, agent)) <> '0'||to_json_string(nvl(event, agent))) IS NOT FALSE
+                     AND '1'||to_json_string(nvl(event, agent)) BETWEEN '0'||to_json_string(nvl(event, agent)) AND 2||to_json_string(nvl(event, agent))
+                     AND '1'||to_json_string(nvl(event, agent)) NOT BETWEEN '1'||to_json_string(nvl(event, agent)) AND '0'||to_json_string(nvl(event, agent))
+                     AND '1'||to_json_string(nvl(event, agent)) like '%'
+                     AND '1'||to_json_string(nvl(event, agent)) not like '__DOES_NOT_EXIST__%'
+                     AND '1'||to_json_string(nvl(event, agent)) IN ('0'||to_json_string(nvl(event, agent)),
+                                                                    1||to_json_string(nvl(event, agent)),
+                                                                    2||to_json_string(nvl(event, agent)))
+                     AND '1'||to_json_string(nvl(event, agent)) NOT IN ('0'||to_json_string(nvl(event, agent)),
+                                                                        2||to_json_string(nvl(event, agent)))))));
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM
+  (SELECT __time, number, client_ip,
+                          '1'||to_json_string(nvl(event, agent)),
+                          count(*)
+   FROM kttm_nested
+   WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+     AND ('1'||to_json_string(nvl(event, agent)) IS NULL
+          OR ('1'||to_json_string(nvl(event, agent)) = 1||to_json_string(nvl(event, agent))
+              AND '1'||to_json_string(nvl(event, agent)) IS NOT DISTINCT
+              FROM 1||to_json_string(nvl(event, agent))
+              AND '1'||to_json_string(nvl(event, agent)) <> '0'||to_json_string(nvl(event, agent))
+              AND ('1'||to_json_string(nvl(event, agent)) IS DISTINCT
+                   FROM '0'||to_json_string(nvl(event, agent)))
+              AND '1'||to_json_string(nvl(event, agent)) > '0'||to_json_string(nvl(event, agent))
+              AND '1'||to_json_string(nvl(event, agent)) >= '0'||to_json_string(nvl(event, agent))
+              AND '1'||to_json_string(nvl(event, agent)) < 2||to_json_string(nvl(event, agent))
+              AND '1'||to_json_string(nvl(event, agent)) <= 2||to_json_string(nvl(event, agent))
+              AND ('1'||to_json_string(nvl(event, agent)) <> '0'||to_json_string(nvl(event, agent))) IS TRUE
+              AND ('1'||to_json_string(nvl(event, agent)) = '0'||to_json_string(nvl(event, agent))) IS NOT TRUE
+              AND ('1'||to_json_string(nvl(event, agent)) = '0'||to_json_string(nvl(event, agent))) IS FALSE
+              AND ('1'||to_json_string(nvl(event, agent)) <> '0'||to_json_string(nvl(event, agent))) IS NOT FALSE
+              AND '1'||to_json_string(nvl(event, agent)) BETWEEN '0'||to_json_string(nvl(event, agent)) AND 2||to_json_string(nvl(event, agent))
+              AND '1'||to_json_string(nvl(event, agent)) NOT BETWEEN '1'||to_json_string(nvl(event, agent)) AND '0'||to_json_string(nvl(event, agent))
+              AND '1'||to_json_string(nvl(event, agent)) like '%'
+              AND '1'||to_json_string(nvl(event, agent)) not like '__DOES_NOT_EXIST__%'
+              AND '1'||to_json_string(nvl(event, agent)) IN ('0'||to_json_string(nvl(event, agent)),
+                                                             1||to_json_string(nvl(event, agent)),
+                                                             2||to_json_string(nvl(event, agent)))
+              AND '1'||to_json_string(nvl(event, agent)) NOT IN ('0'||to_json_string(nvl(event, agent)),
+                                                                 2||to_json_string(nvl(event, agent)))))
+   GROUP BY 1,
+            2,
+            3,
+            4);
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+#-------------------------------------------------------------------------
+# Total query count 49
+#-------------------------------------------------------------------------
diff --git a/quidem-ut/src/test/quidem/org.apache.druid.quidem.QTest/qaSQL_scalar_reduction.iq b/quidem-ut/src/test/quidem/org.apache.druid.quidem.QTest/qaSQL_scalar_reduction.iq
new file mode 100644
index 000000000000..2b39782d6b7b
--- /dev/null
+++ b/quidem-ut/src/test/quidem/org.apache.druid.quidem.QTest/qaSQL_scalar_reduction.iq
@@ -0,0 +1,266 @@
+!set useApproximateCountDistinct false
+!use druidtest:///?componentSupplier=KttmNestedComponentSupplier
+!set outputformat mysql
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00';
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+#-------------------------------------------------------------------------
+# TEST_ID: A1: greatest
+#-------------------------------------------------------------------------
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND ('1'||greatest(session_length, 1, NULL) IS NULL
+       OR ('1'||greatest(session_length, 1, NULL) = 1||greatest(session_length, 1, NULL)
+           AND '1'||greatest(session_length, 1, NULL) IS NOT DISTINCT
+           FROM 1||greatest(session_length, 1, NULL)
+           AND '1'||greatest(session_length, 1, NULL) <> '0'||greatest(session_length, 1, NULL)
+           AND ('1'||greatest(session_length, 1, NULL) IS DISTINCT
+                FROM '0'||greatest(session_length, 1, NULL))
+           AND '1'||greatest(session_length, 1, NULL) > '0'||greatest(session_length, 1, NULL)
+           AND '1'||greatest(session_length, 1, NULL) >= '0'||greatest(session_length, 1, NULL)
+           AND '1'||greatest(session_length, 1, NULL) < 2||greatest(session_length, 1, NULL)
+           AND '1'||greatest(session_length, 1, NULL) <= 2||greatest(session_length, 1, NULL)
+           AND ('1'||greatest(session_length, 1, NULL) <> '0'||greatest(session_length, 1, NULL)) IS TRUE
+           AND ('1'||greatest(session_length, 1, NULL) = '0'||greatest(session_length, 1, NULL)) IS NOT TRUE
+           AND ('1'||greatest(session_length, 1, NULL) = '0'||greatest(session_length, 1, NULL)) IS FALSE
+           AND ('1'||greatest(session_length, 1, NULL) <> '0'||greatest(session_length, 1, NULL)) IS NOT FALSE
+           AND '1'||greatest(session_length, 1, NULL) BETWEEN '0'||greatest(session_length, 1, NULL) AND 2||greatest(session_length, 1, NULL)
+           AND '1'||greatest(session_length, 1, NULL) NOT BETWEEN '1'||greatest(session_length, 1, NULL) AND '0'||greatest(session_length, 1, NULL)
+           AND '1'||greatest(session_length, 1, NULL) like '%'
+           AND '1'||greatest(session_length, 1, NULL) not like '__DOES_NOT_EXIST__%'
+           AND '1'||greatest(session_length, 1, NULL) IN ('0'||greatest(session_length, 1, NULL),
+                                                          1||greatest(session_length, 1, NULL),
+                                                          2||greatest(session_length, 1, NULL))
+           AND '1'||greatest(session_length, 1, NULL) NOT IN ('0'||greatest(session_length, 1, NULL),
+                                                              2||greatest(session_length, 1, NULL)))) ;
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND ('1'||greatest(session_length, 1, NULL) IS NULL
+       OR '1'||greatest(session_length, 1, NULL) IN
+         (SELECT '1'||greatest(session_length, 1, NULL)
+          FROM kttm_nested
+          WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+            AND ('1'||greatest(session_length, 1, NULL) IS NULL
+                 OR ('1'||greatest(session_length, 1, NULL) = 1||greatest(session_length, 1, NULL)
+                     AND '1'||greatest(session_length, 1, NULL) IS NOT DISTINCT
+                     FROM 1||greatest(session_length, 1, NULL)
+                     AND '1'||greatest(session_length, 1, NULL) <> '0'||greatest(session_length, 1, NULL)
+                     AND ('1'||greatest(session_length, 1, NULL) IS DISTINCT
+                          FROM '0'||greatest(session_length, 1, NULL))
+                     AND '1'||greatest(session_length, 1, NULL) > '0'||greatest(session_length, 1, NULL)
+                     AND '1'||greatest(session_length, 1, NULL) >= '0'||greatest(session_length, 1, NULL)
+                     AND '1'||greatest(session_length, 1, NULL) < 2||greatest(session_length, 1, NULL)
+                     AND '1'||greatest(session_length, 1, NULL) <= 2||greatest(session_length, 1, NULL)
+                     AND ('1'||greatest(session_length, 1, NULL) <> '0'||greatest(session_length, 1, NULL)) IS TRUE
+                     AND ('1'||greatest(session_length, 1, NULL) = '0'||greatest(session_length, 1, NULL)) IS NOT TRUE
+                     AND ('1'||greatest(session_length, 1, NULL) = '0'||greatest(session_length, 1, NULL)) IS FALSE
+                     AND ('1'||greatest(session_length, 1, NULL) <> '0'||greatest(session_length, 1, NULL)) IS NOT FALSE
+                     AND '1'||greatest(session_length, 1, NULL) BETWEEN '0'||greatest(session_length, 1, NULL) AND 2||greatest(session_length, 1, NULL)
+                     AND '1'||greatest(session_length, 1, NULL) NOT BETWEEN '1'||greatest(session_length, 1, NULL) AND '0'||greatest(session_length, 1, NULL)
+                     AND '1'||greatest(session_length, 1, NULL) like '%'
+                     AND '1'||greatest(session_length, 1, NULL) not like '__DOES_NOT_EXIST__%'
+                     AND '1'||greatest(session_length, 1, NULL) IN ('0'||greatest(session_length, 1, NULL),
+                                                                    1||greatest(session_length, 1, NULL),
+                                                                    2||greatest(session_length, 1, NULL))
+                     AND '1'||greatest(session_length, 1, NULL) NOT IN ('0'||greatest(session_length, 1, NULL),
+                                                                        2||greatest(session_length, 1, NULL))))));
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM
+  (SELECT __time, number, client_ip,
+                          '1'||greatest(session_length, 1, NULL),
+                          count(*)
+   FROM kttm_nested
+   WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+     AND ('1'||greatest(session_length, 1, NULL) IS NULL
+          OR ('1'||greatest(session_length, 1, NULL) = 1||greatest(session_length, 1, NULL)
+              AND '1'||greatest(session_length, 1, NULL) IS NOT DISTINCT
+              FROM 1||greatest(session_length, 1, NULL)
+              AND '1'||greatest(session_length, 1, NULL) <> '0'||greatest(session_length, 1, NULL)
+              AND ('1'||greatest(session_length, 1, NULL) IS DISTINCT
+                   FROM '0'||greatest(session_length, 1, NULL))
+              AND '1'||greatest(session_length, 1, NULL) > '0'||greatest(session_length, 1, NULL)
+              AND '1'||greatest(session_length, 1, NULL) >= '0'||greatest(session_length, 1, NULL)
+              AND '1'||greatest(session_length, 1, NULL) < 2||greatest(session_length, 1, NULL)
+              AND '1'||greatest(session_length, 1, NULL) <= 2||greatest(session_length, 1, NULL)
+              AND ('1'||greatest(session_length, 1, NULL) <> '0'||greatest(session_length, 1, NULL)) IS TRUE
+              AND ('1'||greatest(session_length, 1, NULL) = '0'||greatest(session_length, 1, NULL)) IS NOT TRUE
+              AND ('1'||greatest(session_length, 1, NULL) = '0'||greatest(session_length, 1, NULL)) IS FALSE
+              AND ('1'||greatest(session_length, 1, NULL) <> '0'||greatest(session_length, 1, NULL)) IS NOT FALSE
+              AND '1'||greatest(session_length, 1, NULL) BETWEEN '0'||greatest(session_length, 1, NULL) AND 2||greatest(session_length, 1, NULL)
+              AND '1'||greatest(session_length, 1, NULL) NOT BETWEEN '1'||greatest(session_length, 1, NULL) AND '0'||greatest(session_length, 1, NULL)
+              AND '1'||greatest(session_length, 1, NULL) like '%'
+              AND '1'||greatest(session_length, 1, NULL) not like '__DOES_NOT_EXIST__%'
+              AND '1'||greatest(session_length, 1, NULL) IN ('0'||greatest(session_length, 1, NULL),
+                                                             1||greatest(session_length, 1, NULL),
+                                                             2||greatest(session_length, 1, NULL))
+              AND '1'||greatest(session_length, 1, NULL) NOT IN ('0'||greatest(session_length, 1, NULL),
+                                                                 2||greatest(session_length, 1, NULL))))
+   GROUP BY 1,
+            2,
+            3,
+            4);
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+#-------------------------------------------------------------------------
+# TEST_ID: A2: least
+#-------------------------------------------------------------------------
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND ('1'||least(loaded_image, '1', NULL) IS NULL
+       OR ('1'||least(loaded_image, '1', NULL) = 1||least(loaded_image, '1', NULL)
+           AND '1'||least(loaded_image, '1', NULL) IS NOT DISTINCT
+           FROM 1||least(loaded_image, '1', NULL)
+           AND '1'||least(loaded_image, '1', NULL) <> '0'||least(loaded_image, '1', NULL)
+           AND ('1'||least(loaded_image, '1', NULL) IS DISTINCT
+                FROM '0'||least(loaded_image, '1', NULL))
+           AND '1'||least(loaded_image, '1', NULL) > '0'||least(loaded_image, '1', NULL)
+           AND '1'||least(loaded_image, '1', NULL) >= '0'||least(loaded_image, '1', NULL)
+           AND '1'||least(loaded_image, '1', NULL) < 2||least(loaded_image, '1', NULL)
+           AND '1'||least(loaded_image, '1', NULL) <= 2||least(loaded_image, '1', NULL)
+           AND ('1'||least(loaded_image, '1', NULL) <> '0'||least(loaded_image, '1', NULL)) IS TRUE
+           AND ('1'||least(loaded_image, '1', NULL) = '0'||least(loaded_image, '1', NULL)) IS NOT TRUE
+           AND ('1'||least(loaded_image, '1', NULL) = '0'||least(loaded_image, '1', NULL)) IS FALSE
+           AND ('1'||least(loaded_image, '1', NULL) <> '0'||least(loaded_image, '1', NULL)) IS NOT FALSE
+           AND '1'||least(loaded_image, '1', NULL) BETWEEN '0'||least(loaded_image, '1', NULL) AND 2||least(loaded_image, '1', NULL)
+           AND '1'||least(loaded_image, '1', NULL) NOT BETWEEN '1'||least(loaded_image, '1', NULL) AND '0'||least(loaded_image, '1', NULL)
+           AND '1'||least(loaded_image, '1', NULL) like '%'
+           AND '1'||least(loaded_image, '1', NULL) not like '__DOES_NOT_EXIST__%'
+           AND '1'||least(loaded_image, '1', NULL) IN ('0'||least(loaded_image, '1', NULL),
+                                                       1||least(loaded_image, '1', NULL),
+                                                       2||least(loaded_image, '1', NULL))
+           AND '1'||least(loaded_image, '1', NULL) NOT IN ('0'||least(loaded_image, '1', NULL),
+                                                           2||least(loaded_image, '1', NULL)))) ;
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM kttm_nested
+WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+  AND ('1'||least(loaded_image, '1', NULL) IS NULL
+       OR '1'||least(loaded_image, '1', NULL) IN
+         (SELECT '1'||least(loaded_image, '1', NULL)
+          FROM kttm_nested
+          WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+            AND ('1'||least(loaded_image, '1', NULL) IS NULL
+                 OR ('1'||least(loaded_image, '1', NULL) = 1||least(loaded_image, '1', NULL)
+                     AND '1'||least(loaded_image, '1', NULL) IS NOT DISTINCT
+                     FROM 1||least(loaded_image, '1', NULL)
+                     AND '1'||least(loaded_image, '1', NULL) <> '0'||least(loaded_image, '1', NULL)
+                     AND ('1'||least(loaded_image, '1', NULL) IS DISTINCT
+                          FROM '0'||least(loaded_image, '1', NULL))
+                     AND '1'||least(loaded_image, '1', NULL) > '0'||least(loaded_image, '1', NULL)
+                     AND '1'||least(loaded_image, '1', NULL) >= '0'||least(loaded_image, '1', NULL)
+                     AND '1'||least(loaded_image, '1', NULL) < 2||least(loaded_image, '1', NULL)
+                     AND '1'||least(loaded_image, '1', NULL) <= 2||least(loaded_image, '1', NULL)
+                     AND ('1'||least(loaded_image, '1', NULL) <> '0'||least(loaded_image, '1', NULL)) IS TRUE
+                     AND ('1'||least(loaded_image, '1', NULL) = '0'||least(loaded_image, '1', NULL)) IS NOT TRUE
+                     AND ('1'||least(loaded_image, '1', NULL) = '0'||least(loaded_image, '1', NULL)) IS FALSE
+                     AND ('1'||least(loaded_image, '1', NULL) <> '0'||least(loaded_image, '1', NULL)) IS NOT FALSE
+                     AND '1'||least(loaded_image, '1', NULL) BETWEEN '0'||least(loaded_image, '1', NULL) AND 2||least(loaded_image, '1', NULL)
+                     AND '1'||least(loaded_image, '1', NULL) NOT BETWEEN '1'||least(loaded_image, '1', NULL) AND '0'||least(loaded_image, '1', NULL)
+                     AND '1'||least(loaded_image, '1', NULL) like '%'
+                     AND '1'||least(loaded_image, '1', NULL) not like '__DOES_NOT_EXIST__%'
+                     AND '1'||least(loaded_image, '1', NULL) IN ('0'||least(loaded_image, '1', NULL),
+                                                                 1||least(loaded_image, '1', NULL),
+                                                                 2||least(loaded_image, '1', NULL))
+                     AND '1'||least(loaded_image, '1', NULL) NOT IN ('0'||least(loaded_image, '1', NULL),
+                                                                     2||least(loaded_image, '1', NULL))))));
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+SELECT count(*) cnt
+FROM
+  (SELECT __time, number, client_ip,
+                          '1'||least(loaded_image, '1', NULL),
+                          count(*)
+   FROM kttm_nested
+   WHERE time_floor(__time, 'PT1H') BETWEEN timestamp '2019-08-25 00:00:00' AND timestamp '2019-08-25 06:00:00'
+     AND ('1'||least(loaded_image, '1', NULL) IS NULL
+          OR ('1'||least(loaded_image, '1', NULL) = 1||least(loaded_image, '1', NULL)
+              AND '1'||least(loaded_image, '1', NULL) IS NOT DISTINCT
+              FROM 1||least(loaded_image, '1', NULL)
+              AND '1'||least(loaded_image, '1', NULL) <> '0'||least(loaded_image, '1', NULL)
+              AND ('1'||least(loaded_image, '1', NULL) IS DISTINCT
+                   FROM '0'||least(loaded_image, '1', NULL))
+              AND '1'||least(loaded_image, '1', NULL) > '0'||least(loaded_image, '1', NULL)
+              AND '1'||least(loaded_image, '1', NULL) >= '0'||least(loaded_image, '1', NULL)
+              AND '1'||least(loaded_image, '1', NULL) < 2||least(loaded_image, '1', NULL)
+              AND '1'||least(loaded_image, '1', NULL) <= 2||least(loaded_image, '1', NULL)
+              AND ('1'||least(loaded_image, '1', NULL) <> '0'||least(loaded_image, '1', NULL)) IS TRUE
+              AND ('1'||least(loaded_image, '1', NULL) = '0'||least(loaded_image, '1', NULL)) IS NOT TRUE
+              AND ('1'||least(loaded_image, '1', NULL) = '0'||least(loaded_image, '1', NULL)) IS FALSE
+              AND ('1'||least(loaded_image, '1', NULL) <> '0'||least(loaded_image, '1', NULL)) IS NOT FALSE
+              AND '1'||least(loaded_image, '1', NULL) BETWEEN '0'||least(loaded_image, '1', NULL) AND 2||least(loaded_image, '1', NULL)
+              AND '1'||least(loaded_image, '1', NULL) NOT BETWEEN '1'||least(loaded_image, '1', NULL) AND '0'||least(loaded_image, '1', NULL)
+              AND '1'||least(loaded_image, '1', NULL) like '%'
+              AND '1'||least(loaded_image, '1', NULL) not like '__DOES_NOT_EXIST__%'
+              AND '1'||least(loaded_image, '1', NULL) IN ('0'||least(loaded_image, '1', NULL),
+                                                          1||least(loaded_image, '1', NULL),
+                                                          2||least(loaded_image, '1', NULL))
+              AND '1'||least(loaded_image, '1', NULL) NOT IN ('0'||least(loaded_image, '1', NULL),
+                                                              2||least(loaded_image, '1', NULL))))
+   GROUP BY 1,
+            2,
+            3,
+            4);
++-------+
+| cnt   |
++-------+
+| 78197 |
++-------+
+(1 row)
+
+!ok
+
+#-------------------------------------------------------------------------
+# Total query count 7
+#-------------------------------------------------------------------------

From bf6b0fd9f9950695b5ed6cc522f9a8d9999d50ad Mon Sep 17 00:00:00 2001
From: Abhishek Agarwal <1477457+abhishekagarwal87@users.noreply.github.com>
Date: Thu, 19 Dec 2024 16:33:58 +0530
Subject: [PATCH 53/56] Speed up builds in few places (#17591)

---
 .github/workflows/static-checks.yml | 2 +-
 it.sh                               | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/static-checks.yml b/.github/workflows/static-checks.yml
index 778a79db7618..6a149a46a6d3 100644
--- a/.github/workflows/static-checks.yml
+++ b/.github/workflows/static-checks.yml
@@ -71,7 +71,7 @@ jobs:
         if: ${{ matrix.java == '17' }}
         # errorprone requires JDK 11+
         # Strict compilation requires more than 2 GB
-        run: ${MVN} clean -DstrictCompile compile test-compile --fail-at-end ${MAVEN_SKIP} ${MAVEN_SKIP_TESTS}
+        run: ${MVN} clean -DstrictCompile compile test-compile --fail-at-end ${MAVEN_SKIP} ${MAVEN_SKIP_TESTS} -T1C
 
       - name: maven install
         if: ${{ matrix.java == '17' }}
diff --git a/it.sh b/it.sh
index 12519c24b54d..cf9e02e2b2cc 100755
--- a/it.sh
+++ b/it.sh
@@ -229,7 +229,7 @@ case $CMD in
     usage
     ;;
   "ci" )
-    mvn -q clean install dependency:go-offline -P dist $MAVEN_IGNORE
+    mvn -q clean install dependency:go-offline -P dist $MAVEN_IGNORE -T1C
     ;;
   "build" )
     mvn -B clean install -P dist $MAVEN_IGNORE -T1.0C $*

From 4648a41cab55b2ac4d28e1f471c92da2402d68cb Mon Sep 17 00:00:00 2001
From: Charles Smith <techdocsmith@gmail.com>
Date: Thu, 19 Dec 2024 12:49:56 -0800
Subject: [PATCH 54/56] [Docs] Adds tutorial and stepwise instructions for
 EXTERN (#17501)

* draft tutorial on extern:

* updated draft

* updates

* add sidebar, fix reference wording

* update reference

* final updates to reference

* update

* add cloud info to tutorial

* fix conflict

* fix link

* Update docs/multi-stage-query/reference.md

Co-authored-by: Katya Macedo  <38017980+ektravel@users.noreply.github.com>

* Update docs/multi-stage-query/reference.md

Co-authored-by: Katya Macedo  <38017980+ektravel@users.noreply.github.com>

* Apply suggestions from code review

Co-authored-by: Katya Macedo  <38017980+ektravel@users.noreply.github.com>

* Apply suggestions from code review

Co-authored-by: Katya Macedo  <38017980+ektravel@users.noreply.github.com>

* fixes

* make hyperlink to console

* Update docs/multi-stage-query/reference.md

Co-authored-by: Katya Macedo  <38017980+ektravel@users.noreply.github.com>

* Apply suggestions from code review

Co-authored-by: Katya Macedo  <38017980+ektravel@users.noreply.github.com>

* fix typos

---------

Co-authored-by: Katya Macedo <38017980+ektravel@users.noreply.github.com>
---
 docs/multi-stage-query/reference.md | 103 +++++++-------
 docs/multi-stage-query/security.md  |   3 +
 docs/tutorials/tutorial-extern.md   | 206 ++++++++++++++++++++++++++++
 website/sidebars.json               |   3 +-
 4 files changed, 265 insertions(+), 50 deletions(-)
 create mode 100644 docs/tutorials/tutorial-extern.md

diff --git a/docs/multi-stage-query/reference.md b/docs/multi-stage-query/reference.md
index 6facbaedcb3d..d34ba1bdd4e3 100644
--- a/docs/multi-stage-query/reference.md
+++ b/docs/multi-stage-query/reference.md
@@ -72,9 +72,8 @@ FROM TABLE(
    `name` and a `type`. The type can be `string`, `long`, `double`, or `float`. This row signature is
    used to map the external data into the SQL layer.
 
-Variation 2, with the input schema expressed in SQL using an `EXTEND` clause. (See the next
-section for more detail on `EXTEND`). This format also uses named arguments to make the
-SQL a bit easier to read:
+Variation 2, with the input schema expressed in SQL using an `EXTEND` clause. See the next
+section for more detail on `EXTEND`. This format also uses named arguments to make the SQL easier to read:
 
 ```sql
 SELECT
@@ -95,12 +94,12 @@ For more information, see [Read external data with EXTERN](concepts.md#read-exte
 
 #### `EXTERN` to export to a destination
 
-`EXTERN` can be used to specify a destination where you want to export data to.
-This variation of EXTERN requires one argument, the details of the destination as specified below.
-This variation additionally requires an `AS` clause to specify the format of the exported rows.
+You can use `EXTERN` to specify a destination to export data.
+This variation of `EXTERN` accepts the details of the destination as the only argument and requires an `AS` clause to specify the format of the exported rows.
+
+When you export data, Druid creates metadata files in a subdirectory named `_symlink_format_manifest`.
+Within the `_symlink_format_manifest/manifest` directory, the `manifest` file lists absolute paths to exported files using the symlink manifest format. For example:
 
-While exporting data, some metadata files will also be created at the destination in addition to the data. These files will be created in a directory `_symlink_format_manifest`.
-- `_symlink_format_manifest/manifest`: Lists the files which were created as part of the export. The file is in the symlink manifest format, and consists of a list of absolute paths to the files created.
 ```text
 s3://export-bucket/export/query-6564a32f-2194-423a-912e-eead470a37c4-worker2-partition2.csv
 s3://export-bucket/export/query-6564a32f-2194-423a-912e-eead470a37c4-worker1-partition1.csv
@@ -112,8 +111,8 @@ s3://export-bucket/export/query-6564a32f-2194-423a-912e-eead470a37c4-worker0-par
 Keep the following in mind when using EXTERN to export rows:
 - Only INSERT statements are supported.
 - Only `CSV` format is supported as an export format.
-- Partitioning (`PARTITIONED BY`) and clustering (`CLUSTERED BY`) aren't supported with export statements.
-- You can export to Amazon S3 or local storage.
+- Partitioning (`PARTITIONED BY`) and clustering (`CLUSTERED BY`) aren't supported with EXTERN statements.
+- You can export to Amazon S3, Google GCS, or local storage.
 - The destination provided should contain no other files or directories.
 
 When you export data, use the `rowsPerPage` context parameter to restrict the size of exported files.
@@ -128,10 +127,14 @@ SELECT
 FROM <table>
 ```
 
-##### S3
+##### S3 - Amazon S3
+
+To export results to S3, pass the `s3()` function as an argument to the `EXTERN` function.
+Export to S3 requires the `druid-s3-extensions` extension.
+For a list of S3 permissions the MSQ task engine requires to perform export, see [Permissions for durable storage](./security.md#s3).
 
-Export results to S3 by passing the function `s3()` as an argument to the `EXTERN` function. Note that this requires the `druid-s3-extensions`.
-The `s3()` function is a Druid function that configures the connection. Arguments for `s3()` should be passed as named parameters with the value in single quotes like the following example:
+The `s3()` function configures the connection to AWS.
+Pass all arguments for `s3()` as named parameters with their values enclosed in single quotes. For example:
 
 ```sql
 INSERT INTO
@@ -146,25 +149,26 @@ FROM <table>
 
 Supported arguments for the function:
 
-| Parameter   | Required | Description                                                                                                                                                                                                                                                                    | Default |
-|-------------|----------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------|
-| `bucket`    | Yes      | The S3 bucket to which the files are exported to. The bucket and prefix combination should be whitelisted in `druid.export.storage.s3.allowedExportPaths`.                                                                                                                     | n/a     |
-| `prefix`    | Yes      | Path where the exported files would be created. The export query expects the destination to be empty. If the location includes other files, then the query will fail. The bucket and prefix combination should be whitelisted in `druid.export.storage.s3.allowedExportPaths`. | n/a     |
+| Parameter | Required | Description | Default |
+|---|---|---|---|
+| `bucket` | Yes  | S3 bucket destination for exported files. You must add the bucket and prefix combination to the `druid.export.storage.s3.allowedExportPaths` allow list. | n/a |
+| `prefix` | Yes  | Destination path in the bucket to create exported files. The export query expects the destination path to be empty. If the location includes other files, the query will fail. You must add the bucket and prefix combination to the `druid.export.storage.s3.allowedExportPaths` allow list. | n/a |
 
-The following runtime parameters must be configured to export into an S3 destination:
+Configure the following runtime parameters to export to an S3 destination:
 
-| Runtime Parameter                            | Required | Description                                                                                                                                                                                                                          | Default |
-|----------------------------------------------|----------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-----|
-| `druid.export.storage.s3.allowedExportPaths` | Yes      | An array of S3 prefixes that are whitelisted as export destinations. Export queries fail if the export destination does not match any of the configured prefixes. Example: `[\"s3://bucket1/export/\", \"s3://bucket2/export/\"]`    | n/a |
-| `druid.export.storage.s3.tempLocalDir`       | No       | Directory used on the local storage of the worker to store temporary files required while uploading the data. Uses the task temporary directory by default.                                                                          | n/a |
-| `druid.export.storage.s3.maxRetry`           | No       | Defines the max number times to attempt S3 API calls to avoid failures due to transient errors.                                                                                                                                      | 10  |
-| `druid.export.storage.s3.chunkSize`          | No       | Defines the size of each chunk to temporarily store in `tempDir`. The chunk size must be between 5 MiB and 5 GiB. A large chunk size reduces the API calls to S3, however it requires more disk space to store the temporary chunks. | 100MiB |
+| Runtime parameter | Required | Description | Default |
+|---|---|---|---|
+| `druid.export.storage.s3.allowedExportPaths` | Yes | Array of S3 prefixes allowed as export destinations. Export queries fail if the export destination does not match any of the configured prefixes. For example: `[\"s3://bucket1/export/\", \"s3://bucket2/export/\"]` | n/a |
+| `druid.export.storage.s3.tempLocalDir` | No | Directory for local storage where the worker stores temporary files before uploading the data to S3. | n/a |
+| `druid.export.storage.s3.maxRetry` | No | Maximum number of  attempts for S3 API calls to avoid failures due to transient errors. | 10 |
+| `druid.export.storage.s3.chunkSize` | No | Individual chunk size to store temporarily in `tempDir`. Large chunk sizes reduce the number of API calls to S3, but require more disk space to store temporary chunks. | 100MiB |
 
+##### GOOGLE - Google Cloud Storage
 
-##### GS
+To export query results to Google Cloud Storage (GCS), pass the `google()` function as an argument to the `EXTERN` function.
+Export to GCS requires the `druid-google-extensions` extension.
 
-Export results to GCS by passing the function `google()` as an argument to the `EXTERN` function. Note that this requires the `druid-google-extensions`.
-The `google()` function is a Druid function that configures the connection. Arguments for `google()` should be passed as named parameters with the value in single quotes like the following example:
+The `google()` function configures the connection to GCS. Pass the arguments for `google()` as named parameters with their values enclosed in single quotes. For example:
 
 ```sql
 INSERT INTO
@@ -179,29 +183,30 @@ FROM <table>
 
 Supported arguments for the function:
 
-| Parameter   | Required | Description                                                                                                                                                                                                                                                                        | Default |
-|-------------|----------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------|
-| `bucket`    | Yes      | The GS bucket to which the files are exported to. The bucket and prefix combination should be whitelisted in `druid.export.storage.google.allowedExportPaths`.                                                                                                                     | n/a     |
-| `prefix`    | Yes      | Path where the exported files would be created. The export query expects the destination to be empty. If the location includes other files, then the query will fail. The bucket and prefix combination should be whitelisted in `druid.export.storage.google.allowedExportPaths`. | n/a     |
+| Parameter   | Required | Description | Default |
+|---|---|---|---|
+| `bucket`    | Yes | GCS bucket destination for exported files. You must add the bucket and prefix combination to the `druid.export.storage.google.allowedExportPaths` allow list. | n/a |
+| `prefix` | Yes  | Destination path in the bucket to create exported files. The export query expects the destination path to be empty. If the location includes other files, the query will fail. You must add the bucket and prefix combination to the `druid.export.storage.google.allowedExportPaths` allow list. | n/a |
 
-The following runtime parameters must be configured to export into a GCS destination:
+Configure the following runtime parameters to export query results to a GCS destination:
 
-| Runtime Parameter                                | Required | Description                                                                                                                                                                                                                   | Default |
-|--------------------------------------------------|----------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------|
-| `druid.export.storage.google.allowedExportPaths` | Yes      | An array of GS prefixes that are allowed as export destinations. Export queries fail if the export destination does not match any of the configured prefixes. Example: `[\"gs://bucket1/export/\", \"gs://bucket2/export/\"]` | n/a     |
-| `druid.export.storage.google.tempLocalDir`       | No       | Directory used on the local storage of the worker to store temporary files required while uploading the data. Uses the task temporary directory by default.                                                                   | n/a     |
-| `druid.export.storage.google.maxRetry`           | No       | Defines the max number times to attempt GS API calls to avoid failures due to transient errors.                                                                                                                               | 10      |
-| `druid.export.storage.google.chunkSize`          | No       | Defines the size of each chunk to temporarily store in `tempDir`. A large chunk size reduces the API calls to GS; however, it requires more disk space to store the temporary chunks.                                         | 4MiB    |
+| Runtime parameter | Required | Description | Default |
+|---|---|---|---|
+| `druid.export.storage.google.allowedExportPaths` | Yes | Array of GCS prefixes allowed as export destinations. Export queries fail if the export destination does not match any of the configured prefixes. For example: `[\"gs://bucket1/export/\", \"gs://bucket2/export/\"]` | n/a     |
+| `druid.export.storage.google.tempLocalDir` | No | Directory for local storage where the worker stores temporary files before uploading the data to GCS. | n/a |
+| `druid.export.storage.google.maxRetry` | No |  Maximum number of attempts for GCS API calls to avoid failures due to transient errors. | 10 |
+| `druid.export.storage.google.chunkSize` | No | Individual chunk size to store temporarily in `tempDir`. Large chunk sizes reduce the number of API calls to GS, but require more disk space to store temporary chunks. | 4 MiB |
 
-##### LOCAL
 
-You can export to the local storage, which exports the results to the filesystem of the MSQ worker.
+##### LOCAL - local file storage
+
+You can export queries to local storage. This process writes the results to the filesystem on the MSQ worker.
 This is useful in a single node setup or for testing but is not suitable for production use cases.
 
-Export results to local storage by passing the function `LOCAL()` as an argument for the `EXTERN FUNCTION`.
-To use local storage as an export destination, the runtime property `druid.export.storage.baseDir` must be configured on the Indexer/Middle Manager.
-This value must be set to an absolute path on the local machine. Exporting data will be allowed to paths which match the prefix set by this value.
-Arguments to `LOCAL()` should be passed as named parameters with the value in single quotes in the following example:
+To export results to local storage, pass the `LOCAL()` function as an argument to the EXTERN function.
+You must configure the runtime property `druid.export.storage.baseDir` as an absolute path on the Indexer or Middle Manager to use local storage as an export destination.
+You can export data to paths that match this value as a prefix.
+Pass all arguments to `LOCAL()` as named parameters with values enclosed in single quotes. For example:
 
 ```sql
 INSERT INTO
@@ -214,13 +219,13 @@ SELECT
 FROM <table>
 ```
 
-Supported arguments to the function:
+Supported arguments for the function:
 
-| Parameter   | Required | Description                                                                                                                                                                                                                                              | Default |
-|-------------|--------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| --|
-| `exportPath`  | Yes | Absolute path to a subdirectory of `druid.export.storage.baseDir` used as the destination to export the results to. The export query expects the destination to be empty. If the location includes other files or directories, then the query will fail. | n/a |
+| Parameter | Required | Description | Default |
+|---|---|---|---|
+| `exportPath`  | Yes | Absolute path to a subdirectory of `druid.export.storage.baseDir` where Druid exports the query results. The destination must be empty. If the location includes other files or directories, the query will fail. | n/a |
 
-For more information, see [Read external data with EXTERN](concepts.md#write-to-an-external-destination-with-extern).
+For more information, see [Export external data with EXTERN](concepts.md#write-to-an-external-destination-with-extern).
 
 ### `INSERT`
 
diff --git a/docs/multi-stage-query/security.md b/docs/multi-stage-query/security.md
index 2aed00ab851f..d98695ebedce 100644
--- a/docs/multi-stage-query/security.md
+++ b/docs/multi-stage-query/security.md
@@ -81,3 +81,6 @@ The MSQ task engine needs the following permissions for pushing, fetching, and r
 - `Microsoft.Storage/storageAccounts/blobServices/containers/blobs/write` to write files in durable storage.
 - `Microsoft.Storage/storageAccounts/blobServices/containers/blobs/add/action` to create files in durable storage.
 - `Microsoft.Storage/storageAccounts/blobServices/containers/blobs/delete` to delete files when they're no longer needed.
+
+<!--TBD GCS-->
+
diff --git a/docs/tutorials/tutorial-extern.md b/docs/tutorials/tutorial-extern.md
new file mode 100644
index 000000000000..d44dd19a1542
--- /dev/null
+++ b/docs/tutorials/tutorial-extern.md
@@ -0,0 +1,206 @@
+---
+id: tutorial-extern
+title: Export query results
+sidebar_label: Export results
+description: How to use EXTERN to export query results.
+---
+
+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one
+  ~ or more contributor license agreements.  See the NOTICE file
+  ~ distributed with this work for additional information
+  ~ regarding copyright ownership.  The ASF licenses this file
+  ~ to you under the Apache License, Version 2.0 (the
+  ~ "License"); you may not use this file except in compliance
+  ~ with the License.  You may obtain a copy of the License at
+  ~
+  ~   http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing,
+  ~ software distributed under the License is distributed on an
+  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~ KIND, either express or implied.  See the License for the
+  ~ specific language governing permissions and limitations
+  ~ under the License.
+  -->
+
+import Tabs from '@theme/Tabs';
+import TabItem from '@theme/TabItem';
+
+This tutorial demonstrates how to use the Apache Druid&circledR; SQL [EXTERN](../multi-stage-query/reference.md#extern-function) function to export data.
+
+## Prerequisites
+
+Before you follow the steps in this tutorial, download Druid as described in the [Local quickstart](index.md).
+Don't start Druid, you'll do that as part of the tutorial.
+
+You should be familiar with ingesting and querying data in Druid.
+If you haven't already, go through the [Query data](../tutorials/tutorial-query.md) tutorial first.
+
+## Export query results to the local file system
+
+This example demonstrates how to configure Druid to export data to the local file system.
+While you can use this approach to learn about EXTERN syntax for exporting data, it's not suitable for production scenarios.
+
+### Configure Druid local export directory 
+
+The following commands set the base path for the Druid exports to `/tmp/druid/`.
+If the account running Druid doesn't have access to `/tmp/druid/`, change the path.
+For example: `/Users/Example/druid`.
+If you change the path in this step, use the updated path in all subsequent steps.
+
+From the root of the Druid distribution, run the following:
+
+```bash
+export export_path="/tmp/druid"
+sed -i -e $'$a\\\n\\\n\\\n#\\\n###Local export\\\n#\\\ndruid.export.storage.baseDir='$export_path' conf/druid/auto/_common/common.runtime.properties
+```
+
+This adds the following section to the Druid `common.runtime.properties` configuration file located in `conf/druid/auto/_common`:
+
+```
+#
+###Local export
+#
+druid.export.storage.baseDir=/tmp/druid/
+```
+
+### Start Druid and load sample data
+
+1. From the root of the Druid distribution, launch Druid as follows:
+
+     ```bash
+    ./bin/start-druid
+     ```
+1. After Druid starts, open [http://localhost:8888/](http://localhost:8888/) in your browser to access the Web Console.
+1. From the [Query view](http://localhost:8888/unified-console.html#workbench), run the following command to load the Wikipedia example data set:
+     ```sql
+     REPLACE INTO "wikipedia" OVERWRITE ALL
+     WITH "ext" AS (
+       SELECT *
+       FROM TABLE(
+         EXTERN(
+           '{"type":"http","uris":["https://druid.apache.org/data/wikipedia.json.gz"]}',
+           '{"type":"json"}'
+         )
+       ) EXTEND ("isRobot" VARCHAR, "channel" VARCHAR, "timestamp" VARCHAR, "flags" VARCHAR, "isUnpatrolled" VARCHAR, "page" VARCHAR, "diffUrl" VARCHAR, "added" BIGINT, "comment" VARCHAR, "commentLength" BIGINT, "isNew" VARCHAR, "isMinor" VARCHAR, "delta" BIGINT, "isAnonymous" VARCHAR, "user" VARCHAR, "deltaBucket" BIGINT, "deleted" BIGINT, "namespace" VARCHAR, "cityName" VARCHAR, "countryName" VARCHAR, "regionIsoCode" VARCHAR, "metroCode" BIGINT, "countryIsoCode" VARCHAR, "regionName" VARCHAR)
+     )
+     SELECT
+       TIME_PARSE("timestamp") AS "__time",
+       "isRobot",
+       "channel",
+       "flags",
+       "isUnpatrolled",
+       "page",
+       "diffUrl",
+       "added",
+       "comment",
+       "commentLength",
+       "isNew",
+       "isMinor",
+       "delta",
+       "isAnonymous",
+       "user",
+       "deltaBucket",
+       "deleted",
+       "namespace",
+       "cityName",
+       "countryName",
+       "regionIsoCode",
+       "metroCode",
+       "countryIsoCode",
+       "regionName"
+     FROM "ext"
+     PARTITIONED BY DAY
+     ```
+
+### Query to export data
+
+Open a new tab and run the following query to export query results to the path:
+`/tmp/druid/wiki_example`.
+The path must be a subdirectory of the `druid.export.storage.baseDir`.
+
+
+```sql
+INSERT INTO
+  EXTERN(
+    local(exportPath => '/tmp/druid/wiki_example')
+        )
+AS CSV
+SELECT "channel",
+  SUM("delta") AS "changes"
+FROM "wikipedia"
+GROUP BY 1
+LIMIT 10
+```
+
+Druid exports the results of the query to the `/tmp/druid/wiki_example` directory.
+Run the following command to list the contents of 
+
+```bash
+ls /tmp/druid/wiki_example
+```
+
+The results are a CSV file export of the data and a directory.
+
+## Export query results to cloud storage
+
+The steps to export to cloud storage are similar to exporting to the local file system.
+Druid supports Amazon S3 or Google Cloud Storage (GCS) as cloud storage destinations.
+
+1. Enable the extension for your cloud storage destination. See [Loading core extensions](../configuration/extensions.md#loading-core-extensions).
+   - **Amazon S3**: `druid-s3-extensions`
+   - **GCS**: `google-extensions`
+  See [Loading core extensions](../configuration/extensions.md#loading-core-extensions) for more information.
+1. Configure the additional properties for your cloud storage destination. Replace `{CLOUD}` with `s3` or `google` accordingly:
+   - `druid.export.storage.{CLOUD}.tempLocalDir`:  Local temporary directory where the query engine stages files to export.
+   - `druid.export.storage.{CLOUD}.allowedExportPaths`: S3 or GS prefixes allowed as Druid export locations. For example `[\"s3://bucket1/export/\",\"s3://bucket2/export/\"]` or `[\"gs://bucket1/export/\", \"gs://bucket2/export/\"]`.
+   - `druid.export.storage.{CLOUD}.maxRetry`: Maximum number of times to attempt cloud API calls to avoid failures from transient errors.
+   - `druid.export.storage.s3.chunkSize`: Maximum size of individual data chunks to store in the temporary directory.
+1. Verify the instance role has the correct permissions to the bucket and folders: read, write, create, and delete. See [Permissions for durable storage](../multi-stage-query/security.md#permissions-for-durable-storage).
+1. Use the query syntax for your cloud storage type. For example:
+
+   <Tabs>
+
+   <TabItem value="1" label="S3">
+
+    ```sql
+    INSERT INTO
+    EXTERN(
+      s3(bucket => 'your_bucket', prefix => 'prefix/to/files'))
+    AS CSV
+    SELECT "channel",
+    SUM("delta") AS "changes"
+    FROM "wikipedia"
+    GROUP BY 1
+    LIMIT 10
+    ```
+
+  </TabItem>
+
+   <TabItem value="2" label="GCS">
+
+   ```sql
+   INSERT INTO
+   EXTERN
+    google(bucket => 'your_bucket', prefix => 'prefix/to/files')
+   AS CSV
+   SELECT "channel",
+   SUM("delta") AS "changes"
+   FROM "wikipedia"
+   GROUP BY 1
+   LIMIT 10
+   ``` 
+
+   </TabItem>
+
+   </Tabs>
+
+1. When querying, use the `rowsPerPage` query context parameter to restrict the output file size. While it's possible to add a very large LIMIT at the end of your query to force Druid to create a single file, we don't recommend this technique.
+
+## Learn more
+
+See the following topics for more information:
+
+* [Export to a destination](../multi-stage-query/reference.md#extern-to-export-to-a-destination) for a reference of the EXTERN.
+* [SQL-based ingestion security](../multi-stage-query/security.md/#permissions-for-durable-storage) for cloud permission requirements for MSQ.
diff --git a/website/sidebars.json b/website/sidebars.json
index e53040063188..b7cf66750388 100644
--- a/website/sidebars.json
+++ b/website/sidebars.json
@@ -38,7 +38,8 @@
           "tutorials/tutorial-sql-query-view",
           "tutorials/tutorial-unnest-arrays",
           "tutorials/tutorial-query-deep-storage",
-          "tutorials/tutorial-latest-by"]
+          "tutorials/tutorial-latest-by",
+          "tutorials/tutorial-extern"]
       },
     "tutorials/tutorial-sketches-theta",
     "tutorials/tutorial-jdbc",

From b79382fa4d3adf5994990b89331348a7b53e3258 Mon Sep 17 00:00:00 2001
From: Charles Smith <techdocsmith@gmail.com>
Date: Fri, 20 Dec 2024 10:22:50 -0800
Subject: [PATCH 55/56] [Docs] Updates the years in the compaction example
 (#17366)

* Updates the years in the compaction example

* update
---
 docs/data-management/compaction.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/data-management/compaction.md b/docs/data-management/compaction.md
index 91ebf0d521ef..51bf7ee86427 100644
--- a/docs/data-management/compaction.md
+++ b/docs/data-management/compaction.md
@@ -78,7 +78,7 @@ Unless you modify the segment granularity in [`granularitySpec`](manual-compacti
 
 If segments have different segment granularities before compaction but there is some overlap in interval, Druid attempts find start and end of the overlapping interval and uses the closest segment granularity level for the compacted segment.
 
-For example consider two overlapping segments: segment "A" for the interval 01/01/2021-01/02/2021 with day granularity and segment "B" for the interval 01/01/2021-02/01/2021. Druid attempts to combine and compact the overlapped segments. In this example, the earliest start time for the two segments is 01/01/2020 and the latest end time of the two segments is 02/01/2020. Druid compacts the segments together even though they have different segment granularity. Druid uses month segment granularity for the newly compacted segment even though segment A's original segment granularity was DAY.
+For example consider two overlapping segments: segment "A" for the interval 01/01/2020-01/02/2020 with day granularity and segment "B" for the interval 01/01/2020-02/01/2020. Druid attempts to combine and compact the overlapped segments. In this example, the earliest start time for the two segments is 01/01/2020 and the latest end time of the two segments is 02/01/2020. Druid compacts the segments together even though they have different segment granularity. Druid uses month segment granularity for the newly compacted segment even though segment A's original segment granularity was day granularity.
 
 ### Query granularity handling
 

From 09840ad6626649d33ae525335be221b3b9ee4ad7 Mon Sep 17 00:00:00 2001
From: Kashif Faraz <kashif.faraz@gmail.com>
Date: Mon, 6 Jan 2025 10:52:26 +0530
Subject: [PATCH 56/56] Docs: Add details of cost balancer strategy (#17595)

Fixes #17530
---
 docs/configuration/index.md |  2 +-
 docs/design/coordinator.md  | 14 +++++++++++---
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/docs/configuration/index.md b/docs/configuration/index.md
index 75ffab25a605..26601c6db40f 100644
--- a/docs/configuration/index.md
+++ b/docs/configuration/index.md
@@ -896,7 +896,7 @@ These Coordinator static configurations can be defined in the `coordinator/runti
 |`druid.coordinator.kill.ignoreDurationToRetain`|A way to override `druid.coordinator.kill.durationToRetain` and tell the coordinator that you do not care about the end date of unused segment intervals when it comes to killing them. If true, the coordinator considers all unused segments as eligible to be killed.|false|
 |`druid.coordinator.kill.bufferPeriod`|The amount of time that a segment must be unused before it is able to be permanently removed from metadata and deep storage. This can serve as a buffer period to prevent data loss if data ends up being needed after being marked unused.|`P30D`|
 |`druid.coordinator.kill.maxSegments`|The number of unused segments to kill per kill task. This number must be greater than 0. This only applies when `druid.coordinator.kill.on=true`.|100|
-|`druid.coordinator.balancer.strategy`|Specify the type of balancing strategy for the Coordinator to use to distribute segments among the Historical services. `diskNormalized` weights the costs according to the servers' disk usage ratios - there are known issues with this strategy distributing segments unevenly across the cluster. `random` distributes segments among services randomly.|`cost`|
+|`druid.coordinator.balancer.strategy`|The [balancing strategy](../design/coordinator.md#balancing-segments-in-a-tier) used by the Coordinator to distribute segments among the Historical servers in a tier. The `cost` strategy distributes segments by minimizing a cost function, `diskNormalized` weights these costs with the disk usage ratios of the servers and `random` distributes segments randomly.|`cost`|
 |`druid.coordinator.loadqueuepeon.http.repeatDelay`|The start and repeat delay (in milliseconds) for the load queue peon, which manages the load/drop queue of segments for any server.|1 minute|
 |`druid.coordinator.loadqueuepeon.http.batchSize`|Number of segment load/drop requests to batch in one HTTP request. Note that it must be smaller than `druid.segmentCache.numLoadingThreads` config on Historical service.|1|
 |`druid.coordinator.asOverlord.enabled`|Boolean value for whether this Coordinator service should act like an Overlord as well. This configuration allows users to simplify a Druid cluster by not having to deploy any standalone Overlord services. If set to true, then Overlord console is available at `http://coordinator-host:port/console.html` and be sure to set `druid.coordinator.asOverlord.overlordService` also.|false|
diff --git a/docs/design/coordinator.md b/docs/design/coordinator.md
index 9cb2279d4976..bc4c5ebc1cba 100644
--- a/docs/design/coordinator.md
+++ b/docs/design/coordinator.md
@@ -79,11 +79,19 @@ On each run, the Coordinator determines and cleans up unneeded eternity tombston
 
 ## Segment availability
 
-If a Historical service restarts or becomes unavailable for any reason, the Coordinator will notice a service has gone missing and treat all segments served by that service as being dropped. Given a sufficient period of time, the segments may be reassigned to other Historical services in the cluster. However, each segment that is dropped is not immediately forgotten. Instead, there is a transitional data structure that stores all dropped segments with an associated lifetime. The lifetime represents a period of time in which the Coordinator will not reassign a dropped segment. Hence, if a Historical service becomes unavailable and available again within a short period of time, the Historical service will start up and serve segments from its cache without any those segments being reassigned across the cluster.
+If a Historical service restarts or becomes unavailable for any reason, the Coordinator notices that a service has gone missing and treats all segments served by that service as being dropped. The segments are then reassigned to other Historical services in the cluster. However, each segment that is dropped is not immediately forgotten. Instead, there is a transitional data structure that stores all dropped segments with an associated lifetime. The lifetime represents a period of time in which the Coordinator will not reassign a dropped segment. Hence, if a Historical service becomes unavailable and available again within a short period of time, the Historical service will start up and serve segments from its cache without any of those segments being reassigned across the cluster.
 
-## Balancing segment load
+## Balancing segments in a tier
 
-To ensure an even distribution of segments across Historical services in the cluster, the Coordinator service will find the total size of all segments being served by every Historical service each time the Coordinator runs. For every Historical service tier in the cluster, the Coordinator service will determine the Historical service with the highest utilization and the Historical service with the lowest utilization. The percent difference in utilization between the two services is computed, and if the result exceeds a certain threshold, a number of segments will be moved from the highest utilized service to the lowest utilized service. There is a configurable limit on the number of segments that can be moved from one service to another each time the Coordinator runs. Segments to be moved are selected at random and only moved if the resulting utilization calculation indicates the percentage difference between the highest and lowest servers has decreased.
+Druid queries perform optimally when segments are distributed evenly across Historical services. An ideal distribution would ensure that all Historicals participate equally in the query load thus avoiding hot-spots in the system. To some extent, this can be achieved by keeping multiple replicas of a segment in a cluster.
+But in a tier with several Historicals (or a low replication factor), segment replication is not sufficient to attain balance.
+Thus, the Coordinator constantly monitors the set of segments present on each Historical in a tier and employs one of the following strategies to identify segments that may be moved from one Historical to another to retain balance.
+
+- `cost` (default): For a given segment in a tier, this strategy picks the server with the minimum "cost" of placing that segment. The cost is a function of the data interval of the segment and the data intervals of all the segments already present on the candidate server. In essence, this strategy tries to avoid placing segments with adjacent or overlapping data intervals on the same server. This is based on the premise that adjacent-interval segments are more likely to be used together in a query and placing them on the same server may lead to skewed CPU usages of Historicals.
+- `diskNormalized`: A derivative of the `cost` strategy that weights the cost of placing a segment on a server with the disk usage ratio of the server. There are known issues with this strategy and is not recommended for a production cluster.
+- `random`: Distributes segments randomly across servers. This is an experimental strategy and is not recommended for a production cluster.
+
+All of the above strategies prioritize moving segments from the Historical with the least available disk space.
 
 ## Automatic compaction