diff --git a/extensions-core/datasketches/src/test/java/org/apache/druid/query/aggregation/datasketches/hll/sql/HllSketchSqlAggregatorTest.java b/extensions-core/datasketches/src/test/java/org/apache/druid/query/aggregation/datasketches/hll/sql/HllSketchSqlAggregatorTest.java index 911a77d3a408..a5957e53e156 100644 --- a/extensions-core/datasketches/src/test/java/org/apache/druid/query/aggregation/datasketches/hll/sql/HllSketchSqlAggregatorTest.java +++ b/extensions-core/datasketches/src/test/java/org/apache/druid/query/aggregation/datasketches/hll/sql/HllSketchSqlAggregatorTest.java @@ -94,13 +94,21 @@ public class HllSketchSqlAggregatorTest extends CalciteTestBase { private static final String DATA_SOURCE = "foo"; private static final boolean ROUND = true; - - private static QueryRunnerFactoryConglomerate conglomerate; - private static Closer resourceCloser; - private static AuthenticationResult authenticationResult = CalciteTests.REGULAR_USER_AUTH_RESULT; private static final Map QUERY_CONTEXT_DEFAULT = ImmutableMap.of( PlannerContext.CTX_SQL_QUERY_ID, "dummy" ); + private static QueryRunnerFactoryConglomerate conglomerate; + private static Closer resourceCloser; + private static AuthenticationResult authenticationResult = CalciteTests.REGULAR_USER_AUTH_RESULT; + + @Rule + public TemporaryFolder temporaryFolder = new TemporaryFolder(); + + @Rule + public QueryLogHook queryLogHook = QueryLogHook.create(TestHelper.JSON_MAPPER); + + private SpecificSegmentsQuerySegmentWalker walker; + private SqlLifecycleFactory sqlLifecycleFactory; @BeforeClass public static void setUpClass() @@ -115,15 +123,6 @@ public static void tearDownClass() throws IOException resourceCloser.close(); } - @Rule - public TemporaryFolder temporaryFolder = new TemporaryFolder(); - - @Rule - public QueryLogHook queryLogHook = QueryLogHook.create(TestHelper.JSON_MAPPER); - - private SpecificSegmentsQuerySegmentWalker walker; - private SqlLifecycleFactory sqlLifecycleFactory; - @Before public void setUp() throws Exception { @@ -488,7 +487,6 @@ public void testHllSketchPostAggs() throws Exception + " Log Config K : 12\n" + " Hll Target : HLL_4\n" + " Current Mode : LIST\n" - + " Memory : false\n" + " LB : 2.0\n" + " Estimate : 2.000000004967054\n" + " UB : 2.000099863468538\n" @@ -498,7 +496,6 @@ public void testHllSketchPostAggs() throws Exception + " LOG CONFIG K : 12\n" + " HLL TARGET : HLL_4\n" + " CURRENT MODE : LIST\n" - + " MEMORY : FALSE\n" + " LB : 2.0\n" + " ESTIMATE : 2.000000004967054\n" + " UB : 2.000099863468538\n" @@ -632,7 +629,6 @@ public void testtHllSketchPostAggsPostSort() throws Exception + " Log Config K : 12\n" + " Hll Target : HLL_4\n" + " Current Mode : LIST\n" - + " Memory : false\n" + " LB : 2.0\n" + " Estimate : 2.000000004967054\n" + " UB : 2.000099863468538\n" diff --git a/licenses.yaml b/licenses.yaml index 219b35faf924..7039abb5c791 100644 --- a/licenses.yaml +++ b/licenses.yaml @@ -3211,7 +3211,7 @@ name: DataSketches license_category: binary module: java-core license_name: Apache License version 2.0 -version: 1.2.0-incubating +version: 1.1.0-incubating libraries: - org.apache.datasketches: datasketches-java diff --git a/pom.xml b/pom.xml index a4ad23155938..ab04b20248bf 100644 --- a/pom.xml +++ b/pom.xml @@ -81,7 +81,8 @@ 1.15.0 1.9.2 1.21.0 - 1.2.0-incubating + 1.1.0-incubating + 1.2.0-incubating 10.14.2.0 4.0.0 16.0.1 @@ -1010,7 +1011,7 @@ org.apache.datasketches datasketches-memory - ${datasketches.version} + ${datasketches.memory.version} org.apache.calcite