You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@druid.apache.org by cw...@apache.org on 2020/04/24 23:17:22 UTC
[druid] branch 0.18.1 updated: revert datasketches-java version to
1.1.0-incubating until new version is released (#9751) (#9771)
This is an automated email from the ASF dual-hosted git repository.
cwylie pushed a commit to branch 0.18.1
in repository https://gitbox.apache.org/repos/asf/druid.git
The following commit(s) were added to refs/heads/0.18.1 by this push:
new b8e4b52 revert datasketches-java version to 1.1.0-incubating until new version is released (#9751) (#9771)
b8e4b52 is described below
commit b8e4b52b27ebfdd0b0b7bfa7e69f395e36a58ad5
Author: Clint Wylie <cw...@apache.org>
AuthorDate: Fri Apr 24 16:17:10 2020 -0700
revert datasketches-java version to 1.1.0-incubating until new version is released (#9751) (#9771)
* revert datasketches-java version to 1.1.0-incubating until fix is in place
* fix tests
* checkstyle
---
.../hll/sql/HllSketchSqlAggregatorTest.java | 28 ++++++++++------------
licenses.yaml | 2 +-
pom.xml | 5 ++--
3 files changed, 16 insertions(+), 19 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 911a77d..a5957e53 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<String, Object> 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 class HllSketchSqlAggregatorTest extends CalciteTestBase
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 class HllSketchSqlAggregatorTest extends CalciteTestBase
+ " 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 class HllSketchSqlAggregatorTest extends CalciteTestBase
+ " 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 class HllSketchSqlAggregatorTest extends CalciteTestBase
+ " 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 219b35f..7039abb 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 a4ad231..ab04b20 100644
--- a/pom.xml
+++ b/pom.xml
@@ -81,7 +81,8 @@
<avatica.version>1.15.0</avatica.version>
<avro.version>1.9.2</avro.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>
<dropwizard.metrics.version>4.0.0</dropwizard.metrics.version>
<guava.version>16.0.1</guava.version>
@@ -1010,7 +1011,7 @@
<dependency>
<groupId>org.apache.datasketches</groupId>
<artifactId>datasketches-memory</artifactId>
- <version>${datasketches.version}</version>
+ <version>${datasketches.memory.version}</version>
</dependency>
<dependency>
<groupId>org.apache.calcite</groupId>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@druid.apache.org
For additional commands, e-mail: commits-help@druid.apache.org