From 59b86d7c636d65e5694f00f0aadb0b8dffb565f5 Mon Sep 17 00:00:00 2001 From: Clint Wylie Date: Wed, 22 Apr 2020 22:42:41 -0700 Subject: [PATCH 1/3] revert datasketches-java version to 1.1.0-incubating until fix is in place --- licenses.yaml | 2 +- pom.xml | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/licenses.yaml b/licenses.yaml index a23bb4eaf4d3..97b22725a366 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 6c98e55ff6e6..24c24b7cbf6c 100644 --- a/pom.xml +++ b/pom.xml @@ -84,7 +84,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 @@ -1014,7 +1015,7 @@ org.apache.datasketches datasketches-memory - ${datasketches.version} + ${datasketches.memory.version} org.apache.calcite From 00ec46bd15df781ef8bbd711595efbd892378070 Mon Sep 17 00:00:00 2001 From: Clint Wylie Date: Thu, 23 Apr 2020 14:22:21 -0700 Subject: [PATCH 2/3] fix tests --- .../hll/sql/HllSketchSqlAggregatorTest.java | 51 +++++++++---------- 1 file changed, 24 insertions(+), 27 deletions(-) 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..bf89218bc93a 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 @@ -485,25 +485,23 @@ public void testHllSketchPostAggs() throws Exception "\"AgEHDAMIBgC1EYgH1mlHBwsKPwu5SK8MIiUxB7iZVwU=\"", 2L, "### HLL SKETCH SUMMARY: \n" - + " 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" - + " OutOfOrder Flag: false\n" - + " Coupon Count : 2\n", + + " Log Config K : 12\n" + + " Hll Target : HLL_4\n" + + " Current Mode : LIST\n" + + " LB : 2.0\n" + + " Estimate : 2.000000004967054\n" + + " UB : 2.000099863468538\n" + + " OutOfOrder Flag: false\n" + + " Coupon Count : 2\n", "### HLL SKETCH SUMMARY: \n" - + " 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" - + " OUTOFORDER FLAG: FALSE\n" - + " COUPON COUNT : 2\n", + + " LOG CONFIG K : 12\n" + + " HLL TARGET : HLL_4\n" + + " CURRENT MODE : LIST\n" + + " LB : 2.0\n" + + " ESTIMATE : 2.000000004967054\n" + + " UB : 2.000099863468538\n" + + " OUTOFORDER FLAG: FALSE\n" + + " COUPON COUNT : 2\n", 2.0 } ); @@ -629,15 +627,14 @@ public void testtHllSketchPostAggsPostSort() throws Exception new Object[]{ 2.000000004967054d, "### HLL SKETCH SUMMARY: \n" - + " 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" - + " OutOfOrder Flag: false\n" - + " Coupon Count : 2\n" + + " Log Config K : 12\n" + + " Hll Target : HLL_4\n" + + " Current Mode : LIST\n" + + " LB : 2.0\n" + + " Estimate : 2.000000004967054\n" + + " UB : 2.000099863468538\n" + + " OutOfOrder Flag: false\n" + + " Coupon Count : 2\n" } ); From 034f5c1f6c7155f9136db9a2fc0fd911a6657948 Mon Sep 17 00:00:00 2001 From: Clint Wylie Date: Thu, 23 Apr 2020 20:44:46 -0700 Subject: [PATCH 3/3] checkstyle --- .../hll/sql/HllSketchSqlAggregatorTest.java | 73 +++++++++---------- 1 file changed, 36 insertions(+), 37 deletions(-) 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 bf89218bc93a..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 { @@ -485,23 +484,23 @@ public void testHllSketchPostAggs() throws Exception "\"AgEHDAMIBgC1EYgH1mlHBwsKPwu5SK8MIiUxB7iZVwU=\"", 2L, "### HLL SKETCH SUMMARY: \n" - + " Log Config K : 12\n" - + " Hll Target : HLL_4\n" - + " Current Mode : LIST\n" - + " LB : 2.0\n" - + " Estimate : 2.000000004967054\n" - + " UB : 2.000099863468538\n" - + " OutOfOrder Flag: false\n" - + " Coupon Count : 2\n", + + " Log Config K : 12\n" + + " Hll Target : HLL_4\n" + + " Current Mode : LIST\n" + + " LB : 2.0\n" + + " Estimate : 2.000000004967054\n" + + " UB : 2.000099863468538\n" + + " OutOfOrder Flag: false\n" + + " Coupon Count : 2\n", "### HLL SKETCH SUMMARY: \n" - + " LOG CONFIG K : 12\n" - + " HLL TARGET : HLL_4\n" - + " CURRENT MODE : LIST\n" - + " LB : 2.0\n" - + " ESTIMATE : 2.000000004967054\n" - + " UB : 2.000099863468538\n" - + " OUTOFORDER FLAG: FALSE\n" - + " COUPON COUNT : 2\n", + + " LOG CONFIG K : 12\n" + + " HLL TARGET : HLL_4\n" + + " CURRENT MODE : LIST\n" + + " LB : 2.0\n" + + " ESTIMATE : 2.000000004967054\n" + + " UB : 2.000099863468538\n" + + " OUTOFORDER FLAG: FALSE\n" + + " COUPON COUNT : 2\n", 2.0 } ); @@ -627,14 +626,14 @@ public void testtHllSketchPostAggsPostSort() throws Exception new Object[]{ 2.000000004967054d, "### HLL SKETCH SUMMARY: \n" - + " Log Config K : 12\n" - + " Hll Target : HLL_4\n" - + " Current Mode : LIST\n" - + " LB : 2.0\n" - + " Estimate : 2.000000004967054\n" - + " UB : 2.000099863468538\n" - + " OutOfOrder Flag: false\n" - + " Coupon Count : 2\n" + + " Log Config K : 12\n" + + " Hll Target : HLL_4\n" + + " Current Mode : LIST\n" + + " LB : 2.0\n" + + " Estimate : 2.000000004967054\n" + + " UB : 2.000099863468538\n" + + " OutOfOrder Flag: false\n" + + " Coupon Count : 2\n" } );