Apache
/
druid
mirror of https://github.com/apache/druid.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

revert datasketches-java version to 1.1.0-incubating until new version is released (#9751) 

* revert datasketches-java version to 1.1.0-incubating until fix is in place

* fix tests

* checkstyle
This commit is contained in:
Clint Wylie 2020-04-24 12:52:12 -07:00 committed by GitHub
parent 7fa72fbf15
commit fc5383cd00
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
extensions-core/datasketches/src/test/java/org/apache/druid/query/aggregation/datasketches/hll/sql/HllSketchSqlAggregatorTest.java
View File

@ -94,13 +94,21 @@ public class HllSketchSqlAggregatorTest extends CalciteTestBase
{ {
private static final String DATA_SOURCE = "foo"; private static final String DATA_SOURCE = "foo";
private static final boolean ROUND = true; 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<String, Object> QUERY_CONTEXT_DEFAULT = ImmutableMap.of( private static final Map<String, Object> QUERY_CONTEXT_DEFAULT = ImmutableMap.of(
PlannerContext.CTX_SQL_QUERY_ID, "dummy" 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 @BeforeClass
public static void setUpClass() public static void setUpClass()
@ -115,15 +123,6 @@ public class HllSketchSqlAggregatorTest extends CalciteTestBase
resourceCloser.close(); resourceCloser.close();
} }
@Rule
public TemporaryFolder temporaryFolder = new TemporaryFolder();
@Rule
public QueryLogHook queryLogHook = QueryLogHook.create(TestHelper.JSON_MAPPER);
private SpecificSegmentsQuerySegmentWalker walker;
private SqlLifecycleFactory sqlLifecycleFactory;
@Before @Before
public void setUp() throws Exception public void setUp() throws Exception
{ {
@ -488,7 +487,6 @@ public class HllSketchSqlAggregatorTest extends CalciteTestBase
+ " Log Config K : 12\n" + " Log Config K : 12\n"
+ " Hll Target : HLL_4\n" + " Hll Target : HLL_4\n"
+ " Current Mode : LIST\n" + " Current Mode : LIST\n"
+ " Memory : false\n"
+ " LB : 2.0\n" + " LB : 2.0\n"
+ " Estimate : 2.000000004967054\n" + " Estimate : 2.000000004967054\n"
+ " UB : 2.000099863468538\n" + " UB : 2.000099863468538\n"
@ -498,7 +496,6 @@ public class HllSketchSqlAggregatorTest extends CalciteTestBase
+ " LOG CONFIG K : 12\n" + " LOG CONFIG K : 12\n"
+ " HLL TARGET : HLL_4\n" + " HLL TARGET : HLL_4\n"
+ " CURRENT MODE : LIST\n" + " CURRENT MODE : LIST\n"
+ " MEMORY : FALSE\n"
+ " LB : 2.0\n" + " LB : 2.0\n"
+ " ESTIMATE : 2.000000004967054\n" + " ESTIMATE : 2.000000004967054\n"
+ " UB : 2.000099863468538\n" + " UB : 2.000099863468538\n"
@ -632,7 +629,6 @@ public class HllSketchSqlAggregatorTest extends CalciteTestBase
+ " Log Config K : 12\n" + " Log Config K : 12\n"
+ " Hll Target : HLL_4\n" + " Hll Target : HLL_4\n"
+ " Current Mode : LIST\n" + " Current Mode : LIST\n"
+ " Memory : false\n"
+ " LB : 2.0\n" + " LB : 2.0\n"
+ " Estimate : 2.000000004967054\n" + " Estimate : 2.000000004967054\n"
+ " UB : 2.000099863468538\n" + " UB : 2.000099863468538\n"

2
licenses.yaml
View File

@ -3211,7 +3211,7 @@ name: DataSketches
license_category: binary license_category: binary
module: java-core module: java-core
license_name: Apache License version 2.0 license_name: Apache License version 2.0
version: 1.2.0-incubating version: 1.1.0-incubating
libraries: libraries:
- org.apache.datasketches: datasketches-java - org.apache.datasketches: datasketches-java

5
pom.xml
View File

@ -84,7 +84,8 @@
<avatica.version>1.15.0</avatica.version> <avatica.version>1.15.0</avatica.version>
<avro.version>1.9.2</avro.version> <avro.version>1.9.2</avro.version>
<calcite.version>1.21.0</calcite.version> <calcite.version>1.21.0</calcite.version>
<datasketches.version>1.2.0-incubating</datasketches.version> <datasketches.version>1.1.0-incubating</datasketches.version>
<datasketches.memory.version>1.2.0-incubating</datasketches.memory.version>
<derby.version>10.14.2.0</derby.version> <derby.version>10.14.2.0</derby.version>
<dropwizard.metrics.version>4.0.0</dropwizard.metrics.version> <dropwizard.metrics.version>4.0.0</dropwizard.metrics.version>
<guava.version>16.0.1</guava.version> <guava.version>16.0.1</guava.version>
@ -1014,7 +1015,7 @@
<dependency> <dependency>
<groupId>org.apache.datasketches</groupId> <groupId>org.apache.datasketches</groupId>
<artifactId>datasketches-memory</artifactId> <artifactId>datasketches-memory</artifactId>
<version>${datasketches.version}</version> <version>${datasketches.memory.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.calcite</groupId> <groupId>org.apache.calcite</groupId>