[druid] branch 0.20.0 updated: [Backport] Fix UI datasources view edit action compaction #10459 (#10465)
This is an automated email from the ASF dual-hosted git repository.
ccaominh pushed a commit to branch 0.20.0
in repository https://gitbox.apache.org/repos/asf/druid.git
The following commit(s) were added to refs/heads/0.20.0 by this push:
new bb2e210 [Backport] Fix UI datasources view edit action compaction
#10459 (#10465)
bb2e210 is described below
commit bb2e2108bf4cd56c2af5e456ee21bacdcab59e7b
Author: Chi Cao Minh
AuthorDate: Fri Oct 2 14:12:10 2020 -0700
[Backport] Fix UI datasources view edit action compaction #10459 (#10465)
* Web console reindexing E2E test (#10453)
Add an E2E test for the web console workflow of reindexing a Druid
datasource to change the secondary partitioning type. The new test
changes dynamic to single dim partitions since the autocompaction test
already does dynamic to hashed partitions.
Also, run the web console E2E tests in parallel to reduce CI time and
change naming convention for test datasources to make it easier to map
them to the corresponding test run.
Main changes:
1) web-consolee2e-tests/reindexing.spec.ts
- new E2E test
2) web-console/e2e-tests/component/load-data/data-connector/reindex.ts
- new data loader connector for druid input source
3) web-console/e2e-tests/component/load-data/config/partition.ts
- move partition spec definitions from compaction.ts
- add new single dim partition spec definition
* Fix UI datasources view edit action compaction (#10459)
Restore the web console's ability to view a datasource's compaction
configuration via the "action" menu. Refactoring done in
https://github.com/apache/druid/pull/10438 introduced a regression that
always caused the default compaction configuration to be shown via the
"action" menu instead.
Regression test is added in e2e-tests/auto-compaction.spec.ts.
---
web-console/e2e-tests/auto-compaction.spec.ts | 36 ++---
.../e2e-tests/component/datasources/compaction.ts | 41 +-
.../e2e-tests/component/datasources/overview.ts| 40 --
.../component/load-data/config/partition.ts| 135 ++
.../load-data/data-connector/data-connector.ts | 9 ++
.../load-data/data-connector/local-file.ts | 33 +++--
.../data-connector/{local-file.ts => reindex.ts} | 39 +++---
.../e2e-tests/component/load-data/data-loader.ts | 66 -
web-console/e2e-tests/component/query/overview.ts | 15 +-
.../{tutorial-batch.spec.ts => reindexing.spec.ts} | 154 ++---
web-console/e2e-tests/tutorial-batch.spec.ts | 22 +--
web-console/e2e-tests/util/druid.ts| 23 ++-
web-console/e2e-tests/util/playwright.ts | 66 +
web-console/package.json | 2 +-
.../src/views/datasource-view/datasource-view.tsx | 4 +-
15 files changed, 442 insertions(+), 243 deletions(-)
diff --git a/web-console/e2e-tests/auto-compaction.spec.ts
b/web-console/e2e-tests/auto-compaction.spec.ts
index edcf6a8..68cd00b 100644
--- a/web-console/e2e-tests/auto-compaction.spec.ts
+++ b/web-console/e2e-tests/auto-compaction.spec.ts
@@ -17,19 +17,18 @@
*/
import axios from 'axios';
-import { execSync } from 'child_process';
import path from 'path';
import * as playwright from 'playwright-core';
-import { v4 as uuid } from 'uuid';
import { CompactionConfig } from './component/datasources/compaction';
-import { CompactionHashPartitionsSpec } from
'./component/datasources/compaction';
import { Datasource } from './component/datasources/datasource';
import { DatasourcesOverview } from './component/datasources/overview';
+import { HashedPartitionsSpec } from './component/load-data/config/partition';
import { saveScreenshotIfError } from './util/debug';
import { COORDINATOR_URL } from './util/druid';
-import { DRUID_DIR } from './util/druid';
+import { DRUID_EXAMPLES_QUICKSTART_TUTORIAL_DIR } from './util/druid';
import { UNIFIED_CONSOLE_URL } from './util/druid';
+import { runIndexTask } from './util/druid';
import { createBrowserNormal as createBrowser } from './util/playwright';
import { createPage } from './util/playwright';
import { retryIfJestAssertionError } from './util/retry';
@@ -57,17 +56,18 @@ describe('Auto-compaction', () => {
});
it('Compacts segments from dynamic to hash partitions', async () => {
-const datasourceName = uuid();
+const testName = 'autocompaction-dynamic-to-hash-';
+const datasourceName = testName + new Date().toISOString();
loadInitialData(datasourceName);
-await saveScreenshotIfError('auto-compaction-', page, async () => {
+await saveScreenshotIfError(testName, page, async () => {
const uncompactedNumSegment = 3;
const numRow = 1412;
await validateDatasourceStatus(page, datasourceName,
uncompactedNumSegment, numRow);
[druid] branch master updated: Fix the offset setting in GoogleStorage#get (#10449)
This is an automated email from the ASF dual-hosted git repository.
ccaominh pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/druid.git
The following commit(s) were added to refs/heads/master by this push:
new d057c51 Fix the offset setting in GoogleStorage#get (#10449)
d057c51 is described below
commit d057c5149fe5a20c98f3e60af9189e4a1f7ad9ce
Author: Abhishek Agarwal <1477457+abhishekagarwa...@users.noreply.github.com>
AuthorDate: Thu Oct 1 21:08:58 2020 +0530
Fix the offset setting in GoogleStorage#get (#10449)
* Fix the offset in get of GCP object
* upgrade compute dependency
* fix version
* review comments
* missed
---
extensions-contrib/gce-extensions/pom.xml | 2 +-
extensions-core/google-extensions/pom.xml | 4 -
.../apache/druid/storage/google/GoogleStorage.java | 8 +-
.../druid/storage/google/GoogleTaskLogs.java | 5 +-
.../druid/storage/google/GoogleStorageTest.java| 90 ++
.../druid/storage/google/GoogleTaskLogsTest.java | 23 +++---
.../druid/storage/google/GoogleTestUtils.java | 10 +++
licenses.yaml | 8 +-
pom.xml| 5 +-
9 files changed, 126 insertions(+), 29 deletions(-)
diff --git a/extensions-contrib/gce-extensions/pom.xml
b/extensions-contrib/gce-extensions/pom.xml
index 0d05bfc..db64e27 100644
--- a/extensions-contrib/gce-extensions/pom.xml
+++ b/extensions-contrib/gce-extensions/pom.xml
@@ -88,7 +88,7 @@
com.google.apis
google-api-services-compute
- v1-rev214-1.25.0
+ ${com.google.apis.compute.version}
compile
diff --git a/extensions-core/google-extensions/pom.xml
b/extensions-core/google-extensions/pom.xml
index 2105153..b14e916 100644
--- a/extensions-core/google-extensions/pom.xml
+++ b/extensions-core/google-extensions/pom.xml
@@ -33,10 +33,6 @@
../../pom.xml
-
-
v1-rev158-${com.google.apis.client.version}
-
-
org.apache.druid
diff --git
a/extensions-core/google-extensions/src/main/java/org/apache/druid/storage/google/GoogleStorage.java
b/extensions-core/google-extensions/src/main/java/org/apache/druid/storage/google/GoogleStorage.java
index ee57966..5a63183 100644
---
a/extensions-core/google-extensions/src/main/java/org/apache/druid/storage/google/GoogleStorage.java
+++
b/extensions-core/google-extensions/src/main/java/org/apache/druid/storage/google/GoogleStorage.java
@@ -51,11 +51,9 @@ public class GoogleStorage
public InputStream get(final String bucket, final String path, long start)
throws IOException
{
final Get get = storage.objects().get(bucket, path);
-if (start > 0) {
- get.getMediaHttpDownloader().setBytesDownloaded(start);
-}
-get.getMediaHttpDownloader().setDirectDownloadEnabled(false);
-return get.executeMediaAsInputStream();
+InputStream inputStream = get.executeMediaAsInputStream();
+inputStream.skip(start);
+return inputStream;
}
public void delete(final String bucket, final String path) throws IOException
diff --git
a/extensions-core/google-extensions/src/main/java/org/apache/druid/storage/google/GoogleTaskLogs.java
b/extensions-core/google-extensions/src/main/java/org/apache/druid/storage/google/GoogleTaskLogs.java
index 1b3c531..d6d9ff5 100644
---
a/extensions-core/google-extensions/src/main/java/org/apache/druid/storage/google/GoogleTaskLogs.java
+++
b/extensions-core/google-extensions/src/main/java/org/apache/druid/storage/google/GoogleTaskLogs.java
@@ -142,10 +142,7 @@ public class GoogleTaskLogs implements TaskLogs
start = 0;
}
-InputStream stream = new GoogleByteSource(storage,
config.getBucket(), taskKey).openStream();
-stream.skip(start);
-
-return stream;
+return new GoogleByteSource(storage, config.getBucket(),
taskKey).openStream(start);
}
catch (Exception e) {
throw new IOException(e);
diff --git
a/extensions-core/google-extensions/src/test/java/org/apache/druid/storage/google/GoogleStorageTest.java
b/extensions-core/google-extensions/src/test/java/org/apache/druid/storage/google/GoogleStorageTest.java
new file mode 100644
index 000..c915748
--- /dev/null
+++
b/extensions-core/google-extensions/src/test/java/org/apache/druid/storage/google/GoogleStorageTest.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. Yo
[druid] branch master updated: Ignore CVEs from htrace and ambari transitive deps (#10353)
This is an automated email from the ASF dual-hosted git repository.
ccaominh pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/druid.git
The following commit(s) were added to refs/heads/master by this push:
new 176b715 Ignore CVEs from htrace and ambari transitive deps (#10353)
176b715 is described below
commit 176b7156249fdcd2a148c9d825f1f828df44709a
Author: Chi Cao Minh
AuthorDate: Fri Sep 4 15:22:26 2020 -0700
Ignore CVEs from htrace and ambari transitive deps (#10353)
* Ignore CVEs from htrace and ambari transitive deps
htrace CVEs are suppressed for now as addressing them requires updating
the hadoop version.
ambari CVEs are suppressed for now since ambari is updated to the latest
version and is no longer actively maintained.
* Fix compilation issue from ambari upgrade
* Add missing test coverage
---
extensions-contrib/ambari-metrics-emitter/pom.xml | 2 +-
.../ambari/metrics/AmbariMetricsEmitter.java | 18 +++
.../ambari/metrics/AmbariMetricsEmitterTest.java | 4 ++
owasp-dependency-check-suppressions.xml| 60 --
4 files changed, 79 insertions(+), 5 deletions(-)
diff --git a/extensions-contrib/ambari-metrics-emitter/pom.xml
b/extensions-contrib/ambari-metrics-emitter/pom.xml
index 27b4b67..7e48add 100644
--- a/extensions-contrib/ambari-metrics-emitter/pom.xml
+++ b/extensions-contrib/ambari-metrics-emitter/pom.xml
@@ -51,7 +51,7 @@
org.apache.ambari
ambari-metrics-common
- 2.6.1.0.0
+ 2.7.0.0.0
org.codehaus.jackson
diff --git
a/extensions-contrib/ambari-metrics-emitter/src/main/java/org/apache/druid/emitter/ambari/metrics/AmbariMetricsEmitter.java
b/extensions-contrib/ambari-metrics-emitter/src/main/java/org/apache/druid/emitter/ambari/metrics/AmbariMetricsEmitter.java
index 6b4bbd5..905b6cf 100644
---
a/extensions-contrib/ambari-metrics-emitter/src/main/java/org/apache/druid/emitter/ambari/metrics/AmbariMetricsEmitter.java
+++
b/extensions-contrib/ambari-metrics-emitter/src/main/java/org/apache/druid/emitter/ambari/metrics/AmbariMetricsEmitter.java
@@ -185,6 +185,24 @@ public class AmbariMetricsEmitter extends
AbstractTimelineMetricsSink implements
return config.getHostname();
}
+ @Override
+ protected boolean isHostInMemoryAggregationEnabled()
+ {
+return false;
+ }
+
+ @Override
+ protected int getHostInMemoryAggregationPort()
+ {
+return 0; // since host in-memory aggregation is disabled, this return
value is unimportant
+ }
+
+ @Override
+ protected String getHostInMemoryAggregationProtocol()
+ {
+return ""; // since host in-memory aggregation is disabled, this return
value is unimportant
+ }
+
private class ConsumerRunnable implements Runnable
{
@Override
diff --git
a/extensions-contrib/ambari-metrics-emitter/src/test/java/org/apache/druid/emitter/ambari/metrics/AmbariMetricsEmitterTest.java
b/extensions-contrib/ambari-metrics-emitter/src/test/java/org/apache/druid/emitter/ambari/metrics/AmbariMetricsEmitterTest.java
index 9903554..9a01413 100644
---
a/extensions-contrib/ambari-metrics-emitter/src/test/java/org/apache/druid/emitter/ambari/metrics/AmbariMetricsEmitterTest.java
+++
b/extensions-contrib/ambari-metrics-emitter/src/test/java/org/apache/druid/emitter/ambari/metrics/AmbariMetricsEmitterTest.java
@@ -66,5 +66,9 @@ public class AmbariMetricsEmitterTest
Assert.assertEquals("hostname", emitter.getHostname());
Assert.assertNull(emitter.getZookeeperQuorum());
Assert.assertEquals(Collections.singleton("hostname"),
emitter.getConfiguredCollectorHosts());
+
+Assert.assertFalse(emitter.isHostInMemoryAggregationEnabled());
+Assert.assertEquals(0, emitter.getHostInMemoryAggregationPort());
+Assert.assertEquals("", emitter.getHostInMemoryAggregationProtocol());
}
}
diff --git a/owasp-dependency-check-suppressions.xml
b/owasp-dependency-check-suppressions.xml
index 304606e..998e5c6 100644
--- a/owasp-dependency-check-suppressions.xml
+++ b/owasp-dependency-check-suppressions.xml
@@ -147,7 +147,7 @@
CVE-2019-17195
-
+
@@ -157,6 +157,28 @@
CVE-2019-0205
+
+
+^pkg:maven/org\.yaml/snakeyaml@1.6$
+CVE-2017-18640
+
+
+
+^pkg:maven/com\.fasterxml\.jackson\.core/jackson\-annotations@2.4.0$
+10
+
+
+
+^pkg:maven/com\.fasterxml\.jackson\.core/jackson\-core@2.4.0$
+10
+
+
-^pkg:maven/com\.fasterxml\.jackson\.core/jackson\-databind@2.9.10$
-10
+^pkg:maven/com\.fasterxml\.jackson\.core/jackson\-.*@2.9.10$
+10
+ ^pkg:maven/io\.netty/netty@3.10.5.Final$
+ CVE-2019-16869
+ CVE-2019-20444
+ CVE-2019-20445
+
+
+
+
+ ^pkg:maven/org\.apache\.hadoop/hadoop\-annotations@.*$
+ CVE-2015-1776
[druid] branch master updated: Add DimFilter.toOptimizedFilter(), ensure that join filter pre-analysis operates on optimized filters (#10056)
This is an automated email from the ASF dual-hosted git repository.
ccaominh pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/druid.git
The following commit(s) were added to refs/heads/master by this push:
new ed981ef Add DimFilter.toOptimizedFilter(), ensure that join filter
pre-analysis operates on optimized filters (#10056)
ed981ef is described below
commit ed981ef88e1005d1b1e5235da4995b18288d6bf9
Author: Jonathan Wei
AuthorDate: Wed Jul 1 22:26:17 2020 -0700
Add DimFilter.toOptimizedFilter(), ensure that join filter pre-analysis
operates on optimized filters (#10056)
* Ensure that join filter pre-analysis operates on optimized filters, add
DimFilter.toOptimizedFilter
* Remove aggressive equality check that was used for testing
* Use Suppliers.memoize
* Checkstyle
---
.../apache/druid/query/filter/BloomDimFilter.java | 2 +-
.../filter/AbstractOptimizableDimFilter.java} | 35 -
.../apache/druid/query/filter/AndDimFilter.java| 2 +-
.../apache/druid/query/filter/BoundDimFilter.java | 2 +-
.../query/filter/ColumnComparisonDimFilter.java| 2 +-
.../org/apache/druid/query/filter/DimFilter.java | 12
.../druid/query/filter/ExpressionDimFilter.java| 2 +-
.../druid/query/filter/ExtractionDimFilter.java| 2 +-
.../apache/druid/query/filter/FalseDimFilter.java | 2 +-
.../org/apache/druid/query/filter/InDimFilter.java | 2 +-
.../druid/query/filter/IntervalDimFilter.java | 2 +-
.../druid/query/filter/JavaScriptDimFilter.java| 2 +-
.../apache/druid/query/filter/LikeDimFilter.java | 2 +-
.../apache/druid/query/filter/NotDimFilter.java| 2 +-
.../org/apache/druid/query/filter/OrDimFilter.java | 2 +-
.../apache/druid/query/filter/RegexDimFilter.java | 2 +-
.../druid/query/filter/SearchQueryDimFilter.java | 2 +-
.../druid/query/filter/SelectorDimFilter.java | 2 +-
.../druid/query/filter/SpatialDimFilter.java | 2 +-
.../apache/druid/query/filter/TrueDimFilter.java | 2 +-
.../query/groupby/GroupByQueryQueryToolChest.java | 10 +--
.../org/apache/druid/query/scan/ScanQuery.java | 5 --
.../druid/query/scan/ScanQueryQueryToolChest.java | 5 --
.../org/apache/druid/query/search/SearchQuery.java | 5 --
.../query/search/SearchQueryQueryToolChest.java| 5 --
.../timeseries/TimeseriesQueryQueryToolChest.java | 5 --
.../org/apache/druid/query/topn/TopNQuery.java | 5 --
.../druid/query/topn/TopNQueryQueryToolChest.java | 12 ++--
.../org/apache/druid/segment/filter/Filters.java | 2 +-
.../druid/query/filter/FalseDimFilterTest.java | 5 +-
.../druid/query/filter/TrueDimFilterTest.java | 5 +-
.../apache/druid/sql/calcite/CalciteQueryTest.java | 82 ++
32 files changed, 143 insertions(+), 86 deletions(-)
diff --git
a/extensions-core/druid-bloom-filter/src/main/java/org/apache/druid/query/filter/BloomDimFilter.java
b/extensions-core/druid-bloom-filter/src/main/java/org/apache/druid/query/filter/BloomDimFilter.java
index 6918269..a22fec7 100644
---
a/extensions-core/druid-bloom-filter/src/main/java/org/apache/druid/query/filter/BloomDimFilter.java
+++
b/extensions-core/druid-bloom-filter/src/main/java/org/apache/druid/query/filter/BloomDimFilter.java
@@ -38,7 +38,7 @@ import java.util.Set;
/**
*/
-public class BloomDimFilter implements DimFilter
+public class BloomDimFilter extends AbstractOptimizableDimFilter implements
DimFilter
{
private final String dimension;
diff --git
a/processing/src/test/java/org/apache/druid/query/filter/TrueDimFilterTest.java
b/processing/src/main/java/org/apache/druid/query/filter/AbstractOptimizableDimFilter.java
similarity index 53%
copy from
processing/src/test/java/org/apache/druid/query/filter/TrueDimFilterTest.java
copy to
processing/src/main/java/org/apache/druid/query/filter/AbstractOptimizableDimFilter.java
index 3c88382..24d32d3 100644
---
a/processing/src/test/java/org/apache/druid/query/filter/TrueDimFilterTest.java
+++
b/processing/src/main/java/org/apache/druid/query/filter/AbstractOptimizableDimFilter.java
@@ -19,29 +19,24 @@
package org.apache.druid.query.filter;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import nl.jqno.equalsverifier.EqualsVerifier;
-import org.apache.druid.jackson.DefaultObjectMapper;
-import org.junit.Assert;
-import org.junit.Test;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.google.common.base.Supplier;
+import com.google.common.base.Suppliers;
-import java.io.IOException;
-
-public class TrueDimFilterTest
+/**
+ * Base class for DimFilters that support optimization. This abstract class
provides a default implementation of
+ * toOptimizedFilter that relies on the existing optimize() and toFilter()
methods. It uses a memoized supplier.
+ */
+abstract class AbstractOptimizableDimFilter implements DimFilter
{
- @Test
- public void testSerde() throws
[druid] branch master updated (3e92cdf -> 477335a)
This is an automated email from the ASF dual-hosted git repository. ccaominh pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/druid.git. from 3e92cdf Revert "Fix UnknownTypeComplexColumn#makeVectorObjectSelector" (#10121) add 477335a update links datasketches.github.io to datasketches.apache.org (#10107) No new revisions were added by this update. Summary of changes: docs/development/extensions-core/datasketches-extension.md | 2 +- docs/development/extensions-core/datasketches-hll.md | 2 +- docs/development/extensions-core/datasketches-quantiles.md | 4 ++-- docs/development/extensions-core/datasketches-theta.md | 4 ++-- docs/development/extensions-core/datasketches-tuple.md | 4 ++-- docs/development/extensions.md | 8 docs/querying/aggregations.md| 12 ++-- extensions-core/datasketches/README.md | 2 +- extensions-core/datasketches/pom.xml | 2 +- .../query/aggregation/datasketches/hll/HllSketchModule.java | 2 +- .../datasketches/tuple/ArrayOfDoublesSketchModule.java | 2 +- .../ArrayOfDoublesSketchToQuantilesSketchPostAggregator.java | 2 +- web-console/src/utils/ingestion-spec.tsx | 4 ++-- 13 files changed, 25 insertions(+), 25 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@druid.apache.org For additional commands, e-mail: commits-h...@druid.apache.org
[druid] branch master updated (fc55598 -> c01fd56)
This is an automated email from the ASF dual-hosted git repository. ccaominh pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/druid.git. from fc55598 Remove payload field from table sys.segment (#9883) add c01fd56 Web console: allow link overrides for docs, and more (#10100) No new revisions were added by this update. Summary of changes: web-console/lib/keywords.js| 2 +- .../__snapshots__/header-bar.spec.tsx.snap | 2 +- .../src/components/header-bar/header-bar.tsx | 49 +-- .../src/dialogs/about-dialog/about-dialog.tsx | 15 ++-- .../compaction-dialog/compaction-dialog.tsx| 8 +- ...coordinator-dynamic-config-dialog.spec.tsx.snap | 2 +- .../coordinator-dynamic-config-dialog.tsx | 8 +- web-console/src/dialogs/index.ts | 1 + .../overload-dynamic-config-dialog.spec.tsx.snap | 2 +- .../overlord-dynamic-config-dialog.tsx | 6 +- .../__snapshots__/retention-dialog.spec.tsx.snap | 2 +- .../dialogs/retention-dialog/retention-dialog.tsx | 8 +- web-console/src/entry.ts | 7 ++ web-console/src/links.ts | 94 ++ web-console/src/utils/ingestion-spec.tsx | 72 ++--- web-console/src/variables.ts | 31 --- .../src/views/load-data-view/load-data-view.tsx| 80 +- .../src/views/query-view/run-button/run-button.tsx | 4 +- 18 files changed, 197 insertions(+), 196 deletions(-) create mode 100644 web-console/src/links.ts delete mode 100644 web-console/src/variables.ts - To unsubscribe, e-mail: commits-unsubscr...@druid.apache.org For additional commands, e-mail: commits-h...@druid.apache.org
[druid] branch master updated (8ef3598 -> 33a37d8)
This is an automated email from the ASF dual-hosted git repository. ccaominh pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/druid.git. from 8ef3598 Move shardSpec tests to core (#10079) add 33a37d8 Fix native batch range partition segment sizing (#10089) No new revisions were added by this update. Summary of changes: .../parallel/PartialDimensionDistributionTask.java | 138 ++--- .../batch/parallel/distribution/TimeDimTuple.java | 86 - .../parallel/distribution/TimeDimTupleFactory.java | 47 --- .../parallel/distribution/TimeDimTupleFunnel.java | 38 -- .../PartialDimensionDistributionTaskTest.java | 11 +- ...ngePartitionMultiPhaseParallelIndexingTest.java | 10 +- .../distribution/TimeDimTupleFactoryTest.java | 66 -- .../distribution/TimeDimTupleFunnelTest.java | 37 -- .../parallel/distribution/TimeDimTupleTest.java| 71 --- 9 files changed, 83 insertions(+), 421 deletions(-) delete mode 100644 indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/distribution/TimeDimTuple.java delete mode 100644 indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/distribution/TimeDimTupleFactory.java delete mode 100644 indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/distribution/TimeDimTupleFunnel.java delete mode 100644 indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/distribution/TimeDimTupleFactoryTest.java delete mode 100644 indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/distribution/TimeDimTupleFunnelTest.java delete mode 100644 indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/distribution/TimeDimTupleTest.java - To unsubscribe, e-mail: commits-unsubscr...@druid.apache.org For additional commands, e-mail: commits-h...@druid.apache.org
[druid] branch master updated (5d35f3e -> 67669b4)
This is an automated email from the ASF dual-hosted git repository. ccaominh pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/druid.git. from 5d35f3e Remove colocated datasources from web console for broadcast indexed tables (#10018) add 67669b4 Fix CVE-2020-13602 (#10024) No new revisions were added by this update. Summary of changes: licenses.yaml | 6 +++--- pom.xml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@druid.apache.org For additional commands, e-mail: commits-h...@druid.apache.org
[druid] branch master updated (c6d2b94 -> 369ed25)
This is an automated email from the ASF dual-hosted git repository. ccaominh pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/druid.git. from c6d2b94 Add instruction for code coverage checks (#9995) add 369ed25 Remove duplicate parameters from test (#10022) No new revisions were added by this update. Summary of changes: .../coordinator/rules/BroadcastDistributionRuleSerdeTest.java | 6 -- 1 file changed, 6 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@druid.apache.org For additional commands, e-mail: commits-h...@druid.apache.org
[druid] branch master updated (9738a03 -> e72f490)
This is an automated email from the ASF dual-hosted git repository. ccaominh pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/druid.git. from 9738a03 Fix groupBy with literal in subquery grouping (#9986) add e72f490 Integration Tests. Small fixes for CI. (#9988) No new revisions were added by this update. Summary of changes: integration-tests/build_run_cluster.sh | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@druid.apache.org For additional commands, e-mail: commits-h...@druid.apache.org
[druid] branch master updated (4ecf190 -> 3d513b0)
This is an automated email from the ASF dual-hosted git repository. ccaominh pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/druid.git. from 4ecf190 fix nullhandling exceptions related to test ordering (#9964) add 3d513b0 Adjust code coverage check (#9969) No new revisions were added by this update. Summary of changes: .travis.yml | 8 ++-- 1 file changed, 6 insertions(+), 2 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@druid.apache.org For additional commands, e-mail: commits-h...@druid.apache.org
[druid] branch master updated (c690d10 -> 56a9cad)
This is an automated email from the ASF dual-hosted git repository.
ccaominh pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/druid.git.
from c690d10 support customized factory.json via IndexSpec for segment
persist (#9957)
add 56a9cad Integration Tests. (#9854)
No new revisions were added by this update.
Summary of changes:
integration-tests/README.md| 28 ++-
.../{stop_cluster.sh => build_run_cluster.sh} | 31 ++-
integration-tests/docker/docker-compose.base.yml | 271 +
.../docker/docker-compose.druid-hadoop.yml | 21 +-
.../docker/docker-compose.override-env.yml | 195 +++
integration-tests/docker/docker-compose.yml| 173 +
.../environment-configs/override-examples/s3 | 2 +-
integration-tests/pom.xml | 26 +-
integration-tests/run_cluster.sh | 247 ---
integration-tests/script/copy_hadoop_resources.sh | 44
integration-tests/script/copy_resources.sh | 80 ++
.../script/docker_build_containers.sh | 44
integration-tests/script/docker_run_cluster.sh | 55 +
integration-tests/stop_cluster.sh | 7 +-
14 files changed, 938 insertions(+), 286 deletions(-)
copy integration-tests/{stop_cluster.sh => build_run_cluster.sh} (54%)
create mode 100644 integration-tests/docker/docker-compose.base.yml
copy examples/bin/broker.sh =>
integration-tests/docker/docker-compose.druid-hadoop.yml (77%)
create mode 100644 integration-tests/docker/docker-compose.override-env.yml
create mode 100644 integration-tests/docker/docker-compose.yml
delete mode 100755 integration-tests/run_cluster.sh
create mode 100755 integration-tests/script/copy_hadoop_resources.sh
create mode 100755 integration-tests/script/copy_resources.sh
create mode 100755 integration-tests/script/docker_build_containers.sh
create mode 100755 integration-tests/script/docker_run_cluster.sh
-
To unsubscribe, e-mail: commits-unsubscr...@druid.apache.org
For additional commands, e-mail: commits-h...@druid.apache.org
[druid] branch master updated (acfcfd3 -> 821c5d5)
This is an automated email from the ASF dual-hosted git repository. ccaominh pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/druid.git. from acfcfd3 fix unsafe concurrent access in StreamAppenderatorDriver (#9943) add 821c5d5 Prevent JOIN reducing to a JOIN with constant in the ON condition (#9941) No new revisions were added by this update. Summary of changes: .../apache/druid/sql/calcite/planner/Rules.java| 10 +- .../apache/druid/sql/calcite/CalciteQueryTest.java | 347 - 2 files changed, 354 insertions(+), 3 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@druid.apache.org For additional commands, e-mail: commits-h...@druid.apache.org
[druid] branch master updated: Querying doc refresh tutorial (#9879)
This is an automated email from the ASF dual-hosted git repository. ccaominh pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/druid.git The following commit(s) were added to refs/heads/master by this push: new a33705f Querying doc refresh tutorial (#9879) a33705f is described below commit a33705f0e3a74e30be4e247335253ca7b8d9327b Author: sthetland AuthorDate: Fri May 29 14:32:21 2020 -0700 Querying doc refresh tutorial (#9879) * Update tutorial-query.md * First full pass complete * Smoothing over, a bit * link and spell checking * Update querying.md * Review comments; screenshot fixes * Making ports consistent, pending confirmation Switching to the Router port, to make this be consistent with the tutorial ports, but can switch back here and there if it should be 8082 instead. * Resizing screenshot * Update querying.md * Review feedback incorporated. --- docs/assets/native-queries-01.png | Bin 0 -> 259507 bytes docs/assets/tutorial-query-01.png | Bin 152011 -> 81402 bytes docs/assets/tutorial-query-02.png | Bin 144750 -> 155423 bytes docs/assets/tutorial-query-03.png | Bin 141293 -> 197392 bytes docs/assets/tutorial-query-035.png | Bin 0 -> 256043 bytes docs/assets/tutorial-query-04.png | Bin 66423 -> 250861 bytes docs/assets/tutorial-query-06.png | Bin 82211 -> 208088 bytes docs/assets/tutorial-query-07.png | Bin 78633 -> 260071 bytes docs/assets/tutorial-query-08.png | Bin 0 -> 297253 bytes docs/querying/querying.md | 9 +- docs/tutorials/tutorial-query.md | 311 + 11 files changed, 147 insertions(+), 173 deletions(-) diff --git a/docs/assets/native-queries-01.png b/docs/assets/native-queries-01.png new file mode 100644 index 000..27fd29b Binary files /dev/null and b/docs/assets/native-queries-01.png differ diff --git a/docs/assets/tutorial-query-01.png b/docs/assets/tutorial-query-01.png index 8884d9b..371d35d 100644 Binary files a/docs/assets/tutorial-query-01.png and b/docs/assets/tutorial-query-01.png differ diff --git a/docs/assets/tutorial-query-02.png b/docs/assets/tutorial-query-02.png index cf407e3..f459bd6 100644 Binary files a/docs/assets/tutorial-query-02.png and b/docs/assets/tutorial-query-02.png differ diff --git a/docs/assets/tutorial-query-03.png b/docs/assets/tutorial-query-03.png index c3b599c..29443ed 100644 Binary files a/docs/assets/tutorial-query-03.png and b/docs/assets/tutorial-query-03.png differ diff --git a/docs/assets/tutorial-query-035.png b/docs/assets/tutorial-query-035.png new file mode 100644 index 000..f22db18 Binary files /dev/null and b/docs/assets/tutorial-query-035.png differ diff --git a/docs/assets/tutorial-query-04.png b/docs/assets/tutorial-query-04.png index 3f800a6..9cfef34 100644 Binary files a/docs/assets/tutorial-query-04.png and b/docs/assets/tutorial-query-04.png differ diff --git a/docs/assets/tutorial-query-06.png b/docs/assets/tutorial-query-06.png index 60b4e1a..7056056 100644 Binary files a/docs/assets/tutorial-query-06.png and b/docs/assets/tutorial-query-06.png differ diff --git a/docs/assets/tutorial-query-07.png b/docs/assets/tutorial-query-07.png index d2e5a85..5997ba2 100644 Binary files a/docs/assets/tutorial-query-07.png and b/docs/assets/tutorial-query-07.png differ diff --git a/docs/assets/tutorial-query-08.png b/docs/assets/tutorial-query-08.png new file mode 100644 index 000..32aa5d4 Binary files /dev/null and b/docs/assets/tutorial-query-08.png differ diff --git a/docs/querying/querying.md b/docs/querying/querying.md index 5a3e99a..82d91a7 100644 --- a/docs/querying/querying.md +++ b/docs/querying/querying.md @@ -35,6 +35,13 @@ posted like this: curl -X POST ':/druid/v2/?pretty' -H 'Content-Type:application/json' -H 'Accept:application/json' -d @ ``` +> Replace `:` with the appropriate address and port for your system. For example, if running the quickstart configuration, replace `:` with localhost:. + +You can also enter them directly in the Druid console's Query view. Simply pasting a native query into the console switches the editor into JSON mode. + + + + Druid's native query language is JSON over HTTP, although many members of the community have contributed different [client libraries](/libraries.html) in other languages to query Druid. @@ -44,7 +51,7 @@ The Content-Type/Accept Headers can also take 'application/x-jackson-smile'. curl -X POST ':/druid/v2/?pretty' -H 'Content-Type:application/json' -H 'Accept:application/x-jackson-smile' -d @ ``` -Note: If Accept header is not provided, it defaults to value of 'Content-Type' header. +> If the Accept header is not provided, it defaults to the value of 'Content-Type' header. Druid's native query is r
[druid] branch master updated: Add parameterized Calcite tests for join queries (#9923)
This is an automated email from the ASF dual-hosted git repository.
ccaominh pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/druid.git
The following commit(s) were added to refs/heads/master by this push:
new cbd587d Add parameterized Calcite tests for join queries (#9923)
cbd587d is described below
commit cbd587dbd64ea7e5b1a316d19752786f01e50dec
Author: Suneet Saldanha <44787917+sunee...@users.noreply.github.com>
AuthorDate: Thu May 28 19:10:26 2020 -0700
Add parameterized Calcite tests for join queries (#9923)
* Add parameterized Calcite tests for join queries
* new tests
* review comments
---
sql/pom.xml| 5 +
.../druid/sql/calcite/BaseCalciteQueryTest.java| 14 +-
.../apache/druid/sql/calcite/CalciteQueryTest.java | 369 -
3 files changed, 296 insertions(+), 92 deletions(-)
diff --git a/sql/pom.xml b/sql/pom.xml
index ef8d3f7..cd1c12e 100644
--- a/sql/pom.xml
+++ b/sql/pom.xml
@@ -185,6 +185,11 @@
test
+ pl.pragmatists
+ JUnitParams
+ test
+
+
org.apache.calcite
calcite-core
test-jar
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 4fc1e8e..39800c1 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
@@ -102,11 +102,19 @@ import java.util.stream.Collectors;
public class BaseCalciteQueryTest extends CalciteTestBase
{
- public static final String NULL_STRING = NullHandling.defaultStringValue();
- public static final Float NULL_FLOAT = NullHandling.defaultFloatValue();
- public static final Long NULL_LONG = NullHandling.defaultLongValue();
+ public static String NULL_STRING;
+ public static Float NULL_FLOAT;
+ public static Long NULL_LONG;
public static final String HLLC_STRING =
VersionOneHyperLogLogCollector.class.getName();
+ @BeforeClass
+ public static void setupNullValues()
+ {
+NULL_STRING = NullHandling.defaultStringValue();
+NULL_FLOAT = NullHandling.defaultFloatValue();
+NULL_LONG = NullHandling.defaultLongValue();
+ }
+
public static final Logger log = new Logger(BaseCalciteQueryTest.class);
public static final PlannerConfig PLANNER_CONFIG_DEFAULT = new
PlannerConfig();
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 81cf68d..8033045 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
@@ -22,8 +22,11 @@ package org.apache.druid.sql.calcite;
import com.google.common.base.Joiner;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
+import junitparams.JUnitParamsRunner;
+import junitparams.Parameters;
import org.apache.calcite.runtime.CalciteContextException;
import org.apache.calcite.tools.ValidationException;
+import org.apache.druid.annotations.UsedByJUnitParamsRunner;
import org.apache.druid.common.config.NullHandling;
import org.apache.druid.java.util.common.DateTimes;
import org.apache.druid.java.util.common.IAE;
@@ -105,6 +108,7 @@ import org.junit.Assert;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.internal.matchers.ThrowableMessageMatcher;
+import org.junit.runner.RunWith;
import java.util.ArrayList;
import java.util.Collections;
@@ -112,6 +116,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
+@RunWith(JUnitParamsRunner.class)
public class CalciteQueryTest extends BaseCalciteQueryTest
{
private final boolean useDefault = NullHandling.replaceWithDefault();
@@ -6510,7 +6515,8 @@ public class CalciteQueryTest extends BaseCalciteQueryTest
}
@Test
- public void testTopNFilterJoin() throws Exception
+ @Parameters(source = QueryContextForJoinProvider.class)
+ public void testTopNFilterJoin(Map queryContext) throws
Exception
{
// Cannot vectorize JOIN operator.
cannotVectorize();
@@ -6530,6 +6536,7 @@ public class CalciteQueryTest extends BaseCalciteQueryTest
+ ") t2 ON (t1.dim2 = t2.dim2)\n"
+ "GROUP BY t1.dim1\n"
+ "ORDER BY 1\n",
+queryContext,
ImmutableList.of(
GroupByQuery.builder()
.setDataSource(
@@ -6571,7 +6578,7 @@ public class CalciteQueryTest extends BaseCalciteQueryTest
Integer.MAX_VALUE
)
)
-.setContext(QUERY_CONTEXT_DEFAULT)
+.setContext(queryContext)
.build()
),
[druid] branch master updated: Make it easier for devs to add CalciteQueryTests (#9922)
This is an automated email from the ASF dual-hosted git repository.
ccaominh pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/druid.git
The following commit(s) were added to refs/heads/master by this push:
new b5dfa53 Make it easier for devs to add CalciteQueryTests (#9922)
b5dfa53 is described below
commit b5dfa5322b2611eb7626dbe8c4023f4946ea46f9
Author: Suneet Saldanha <44787917+sunee...@users.noreply.github.com>
AuthorDate: Wed May 27 13:03:53 2020 -0700
Make it easier for devs to add CalciteQueryTests (#9922)
* Add ingestion specs for CalciteQueryTests
This PR introduces ingestion specs that can be used for local testing
so that CalciteQueryTests can be built on a druid cluster.
* Add README
* Update sql/src/test/resources/calcite/tests/README.md
---
.../druid/sql/calcite/util/CalciteTests.java | 348 ++---
sql/src/test/resources/calcite/tests/README.md | 7 +
sql/src/test/resources/calcite/tests/foo.json | 53
sql/src/test/resources/calcite/tests/foo2.json | 47 +++
sql/src/test/resources/calcite/tests/foo4.json | 52 +++
sql/src/test/resources/calcite/tests/lookyloo.json | 6 +
sql/src/test/resources/calcite/tests/numFoo.json | 79 +
7 files changed, 413 insertions(+), 179 deletions(-)
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 0874281..588d5ad 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
@@ -124,6 +124,7 @@ import java.util.Map;
import java.util.Set;
import java.util.concurrent.Executor;
import java.util.function.BooleanSupplier;
+import java.util.stream.Collectors;
/**
* Utility functions for Calcite tests.
@@ -309,189 +310,178 @@ public class CalciteTests
.withRollup(false)
.build();
- public static final List ROWS1 = ImmutableList.of(
- createRow(
- ImmutableMap.builder()
- .put("t", "2000-01-01")
- .put("m1", "1.0")
- .put("m2", "1.0")
- .put("dim1", "")
- .put("dim2", ImmutableList.of("a"))
- .put("dim3", ImmutableList.of("a", "b"))
- .build()
- ),
- createRow(
- ImmutableMap.builder()
- .put("t", "2000-01-02")
- .put("m1", "2.0")
- .put("m2", "2.0")
- .put("dim1", "10.1")
- .put("dim2", ImmutableList.of())
- .put("dim3", ImmutableList.of("b", "c"))
- .build()
- ),
- createRow(
- ImmutableMap.builder()
- .put("t", "2000-01-03")
- .put("m1", "3.0")
- .put("m2", "3.0")
- .put("dim1", "2")
- .put("dim2", ImmutableList.of(""))
- .put("dim3", ImmutableList.of("d"))
- .build()
- ),
- createRow(
- ImmutableMap.builder()
- .put("t", "2001-01-01")
- .put("m1", "4.0")
- .put("m2", "4.0")
- .put("dim1", "1")
- .put("dim2", ImmutableList.of("a"))
- .put("dim3", ImmutableList.of(""))
- .build()
- ),
- createRow(
- ImmutableMap.builder()
- .put("t", "2001-01-02")
- .put("m1", "5.0")
- .put("m2", "5.0")
- .put("dim1", "def")
- .put("dim2", ImmutableList.of("abc"))
- .put("dim3", ImmutableList.of())
- .build()
- ),
- createRow(
- ImmutableMap.builder()
- .put("t", "2001-01-03")
- .put("m1", "6.0")
- .put("m2", "6.0")
- .put("dim1", "abc")
- .build()
- )
+ public static final List> RAW_ROWS1 =
ImmutableList.of(
+ ImmutableMap.builder()
+ .put("t", "2000-01-01")
+ .put("m1", "1.0")
+ .put("m2", "1.0")
+ .put("dim1", "")
+ .put("dim2", ImmutableList.of("a&quo
[druid] branch master updated (fd6fffc -> 6130a83)
This is an automated email from the ASF dual-hosted git repository. ccaominh pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/druid.git. from fd6fffc Suppress CVEs for openstack-keystone (#9903) add 6130a83 Update doc on tmp dir (java.io.tmpdir) best practice (#9910) No new revisions were added by this update. Summary of changes: docs/configuration/index.md | 2 +- docs/operations/basic-cluster-tuning.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@druid.apache.org For additional commands, e-mail: commits-h...@druid.apache.org
[druid] branch master updated (132a1c9 -> fd6fffc)
This is an automated email from the ASF dual-hosted git repository. ccaominh pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/druid.git. from 132a1c9 Re-order and document format detection in web console (#9887) add fd6fffc Suppress CVEs for openstack-keystone (#9903) No new revisions were added by this update. Summary of changes: owasp-dependency-check-suppressions.xml | 3 +++ 1 file changed, 3 insertions(+) - To unsubscribe, e-mail: commits-unsubscr...@druid.apache.org For additional commands, e-mail: commits-h...@druid.apache.org
[druid] branch master updated (ca5e66d -> b91d500)
This is an automated email from the ASF dual-hosted git repository. ccaominh pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/druid.git. from ca5e66d Fixed the Copyright year of Druid (#9859) add b91d500 add some details to the build doc (#9885) No new revisions were added by this update. Summary of changes: dev/intellij-setup.md | 16 +++- docs/development/build.md | 3 +++ website/.spelling | 4 +++- 3 files changed, 21 insertions(+), 2 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@druid.apache.org For additional commands, e-mail: commits-h...@druid.apache.org
[druid] branch master updated: Fix deleting a data node tier causes load rules to display incorrectly (#9891)
This is an automated email from the ASF dual-hosted git repository. ccaominh pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/druid.git The following commit(s) were added to refs/heads/master by this push: new f470bcd Fix deleting a data node tier causes load rules to display incorrectly (#9891) f470bcd is described below commit f470bcd11fbf1be98e364a7acbb20757d91e6e0b Author: Maytas Monsereenusorn <52679095+mayt...@users.noreply.github.com> AuthorDate: Wed May 20 13:49:28 2020 -1000 Fix deleting a data node tier causes load rules to display incorrectly (#9891) * Fix Deleting a data node tier causes load rules to malfunction & display incorrectly * add tests * fix style --- .../__snapshots__/rule-editor.spec.tsx.snap| 1322 +++- .../components/rule-editor/rule-editor.spec.tsx| 62 +- .../src/components/rule-editor/rule-editor.tsx |5 +- 3 files changed, 1386 insertions(+), 3 deletions(-) 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 e1e7c49..43d59de 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 @@ -1,6 +1,6 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`rule editor matches snapshot 1`] = ` +exports[`rule editor matches snapshot no tier in rule 1`] = ` @@ -213,3 +213,1323 @@ exports[`rule editor matches snapshot 1`] = ` `; + +exports[`rule editor matches snapshot with existing tier and non existing tier in rule 1`] = ` + + + + +loadByInterval(2010-01-01/2015-01-01) + + + + +caret-down + + + + + + + + + + +trash + + + + + + + + + + + + + + + +loadForever + + +loadByInterval + + +loadByPeriod + + +dropForever + + +dropByInterval + + +dropByPeriod + + +dropBeforeByPeriod + + +broadcastForever + + +broadcastByInterval + + +broadcastByPeriod + + + + + + double-caret-vertical + + + + + + + + + + + + + + + + + Replicants: + + + + + + + + + + + + chevron-up + + + + + + + + + + chevron-down + + + + + + + + + + Tier: + + + + + +nonexist + + +test2 + + +test3 + + + + + + double-caret-vertical + + + + + + + + + + trash + + + + + + + + + +
[druid] branch master updated (427239f -> 2050f2b)
This is an automated email from the ASF dual-hosted git repository. ccaominh pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/druid.git. from 427239f Enforce code coverage (#9863) add 2050f2b fix docs error: google to azure and hdfs to http (#9881) No new revisions were added by this update. Summary of changes: docs/ingestion/native-batch.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@druid.apache.org For additional commands, e-mail: commits-h...@druid.apache.org
[druid] branch master updated: Enforce code coverage (#9863)
This is an automated email from the ASF dual-hosted git repository.
ccaominh pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/druid.git
The following commit(s) were added to refs/heads/master by this push:
new 427239f Enforce code coverage (#9863)
427239f is described below
commit 427239f4518cfd4642389e55e20f0cb19813e0d9
Author: Chi Cao Minh
AuthorDate: Wed May 20 09:31:37 2020 -0700
Enforce code coverage (#9863)
* Enforce code coverage
Add an automated way of checking if new code has adequate unit tests,
since merging code coverage reports and check coverage thresholds via
coveralls or codecov is unreliable.
The following minimum unit test code coverage is now enforced:
- 80% functions
- 65% branch
- 65% line
Branch and line coverage thresholds are slightly lower for now as they
are harder to achieve.
After the code coverage check looks reliable, the thresholds can be
increased later if needed.
* Add comments
---
.travis.yml| 103 +
benchmarks/pom.xml | 7
pom.xml| 2 +-
3 files changed, 65 insertions(+), 47 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 6a50891..6dd1adf 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -81,8 +81,7 @@ jobs:
- distribution/bin/generate-license-dependency-reports.py . target
--clean-maven-artifact-transfer --parallel 2
- distribution/bin/check-licenses.py licenses.yaml
target/license-reports
-- _strict
- name: "(openjdk8) strict compilation"
+- name: "(openjdk8) strict compilation"
install: skip
# Strict compilation requires more than 2 GB
script: >
@@ -136,20 +135,52 @@ jobs:
- _processing_module
name: "(openjdk8) processing module test"
- env: _env
+ env:
- MAVEN_PROJECTS='processing'
- before_script: _java_test
+ before_script:
+- export DRUID_USE_DEFAULT_VALUE_FOR_NULL=true
+ script:
- unset _JAVA_OPTIONS
- script: _java_test
# Set MAVEN_OPTS for Surefire launcher. Skip remoteresources to avoid
intermittent connection timeouts when
# resolving the SIGAR dependency.
- >
MAVEN_OPTS='-Xmx800m' ${MVN} test -pl ${MAVEN_PROJECTS}
- ${MAVEN_SKIP} -Dremoteresources.skip=true
+ ${MAVEN_SKIP} -Dremoteresources.skip=true
-Ddruid.generic.useDefaultValueForNull=${DRUID_USE_DEFAULT_VALUE_FOR_NULL}
- sh -c "dmesg | egrep -i '(oom|out of memory|kill process|killed).*'
-C 1 || exit 0"
- free -m
- after_success: _java_unit_test_coverage
- ${MVN} -pl ${MAVEN_PROJECTS} jacoco:report
+# Add merge target branch to determine diff (see
https://github.com/travis-ci/travis-ci/issues/6069)
+- echo "TRAVIS_BRANCH=${TRAVIS_BRANCH}" # for debugging
+- git remote set-branches --add origin ${TRAVIS_BRANCH} && git fetch
+# Determine the modified files that match the maven projects being
tested. We use maven project lists that
+# either exclude (starts with "!") or include (does not start with
"!"), so both cases need to be handled.
+- all_files="$(git diff --name-only origin/${TRAVIS_BRANCH}...HEAD |
grep "\.java$" || [[ $? == 1 ]])"
+- for f in ${all_files}; do echo $f; done # for debugging
+- >
+ if [[ "${MAVEN_PROJECTS}" = \!* ]]; then
+ regex="${MAVEN_PROJECTS:1}";
+ regex="^${regex//,\!/\\|^}";
+ project_files="$(echo "${all_files}" | grep -v "${regex}" || [[ $?
== 1 ]])";
+ else
+ regex="^${MAVEN_PROJECTS//,/\\|^}";
+ project_files="$(echo "${all_files}" | grep "${regex}" || [[ $? == 1
]])";
+ fi
+- for f in ${project_files}; do echo $f; done # for debugging
+# Check diff code coverage for the maven projects being tested (retry
install in case of network error)
+- >
+ if [ -n "${project_files}" ]; then
+ travis_retry npm install @connectis/diff-test-coverage@1.5.3
+ && git diff origin/${TRAVIS_BRANCH}...HEAD -- ${project_files}
+ | node_modules/.bin/diff-test-coverage
+ --coverage "**/target/site/jacoco/jacoco.xml"
+ --type jacoco
+ --line-coverage 65
+ --branch-coverage 65
+ --function-coverage 80
+ --
+ || { printf "\nDiff code coverage check failed. To view coverage
report, run 'mvn clean test jacoco:report' and open
'target/site/jacoco/index.html'\n" && false; }
+ fi
+ after_success:
# retry in case of network er
[druid] branch master updated (d38d77c -> 41cf826)
This is an automated email from the ASF dual-hosted git repository. ccaominh pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/druid.git. from d38d77c Add back FieldMayBeFinal inspection (#9865) add 41cf826 Console E2E test docs (#9864) No new revisions were added by this update. Summary of changes: web-console/README.md | 38 +++--- 1 file changed, 35 insertions(+), 3 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@druid.apache.org For additional commands, e-mail: commits-h...@druid.apache.org
[druid] branch master updated: Add equivalent test coverage for all RHS join impls (#9831)
This is an automated email from the ASF dual-hosted git repository.
ccaominh pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/druid.git
The following commit(s) were added to refs/heads/master by this push:
new accd710 Add equivalent test coverage for all RHS join impls (#9831)
accd710 is described below
commit accd710115efea87120d58f01b08342065d6ae5f
Author: Maytas Monsereenusorn <52679095+mayt...@users.noreply.github.com>
AuthorDate: Wed May 6 13:10:41 2020 -1000
Add equivalent test coverage for all RHS join impls (#9831)
* Add equivalent test coverage for all RHS join impls
* address comments
---
.../join/HashJoinSegmentStorageAdapterTest.java| 606 -
.../druid/segment/join/JoinFilterAnalyzerTest.java | 419 ++
.../segment/join/table/LookupJoinMatcherTest.java | 169 ++
3 files changed, 1177 insertions(+), 17 deletions(-)
diff --git
a/processing/src/test/java/org/apache/druid/segment/join/HashJoinSegmentStorageAdapterTest.java
b/processing/src/test/java/org/apache/druid/segment/join/HashJoinSegmentStorageAdapterTest.java
index a9b02e2..b7e9a58 100644
---
a/processing/src/test/java/org/apache/druid/segment/join/HashJoinSegmentStorageAdapterTest.java
+++
b/processing/src/test/java/org/apache/druid/segment/join/HashJoinSegmentStorageAdapterTest.java
@@ -365,6 +365,74 @@ public class HashJoinSegmentStorageAdapterTest extends
BaseHashJoinSegmentStorag
}
@Test
+ public void test_makeCursors_factToCountryLeftUsingLookup()
+ {
+List joinableClauses =
ImmutableList.of(factToCountryNameUsingIsoCodeLookup(JoinType.LEFT));
+
+JoinFilterPreAnalysis preAnalysis =
JoinFilterAnalyzer.computeJoinFilterPreAnalysis(
+joinableClauses,
+VirtualColumns.EMPTY,
+null,
+true,
+true,
+true,
+QueryContexts.DEFAULT_ENABLE_JOIN_FILTER_REWRITE_MAX_SIZE
+);
+
+JoinTestHelper.verifyCursors(
+new HashJoinSegmentStorageAdapter(
+factSegment.asStorageAdapter(),
+joinableClauses,
+preAnalysis
+).makeCursors(
+null,
+Intervals.ETERNITY,
+VirtualColumns.EMPTY,
+Granularities.ALL,
+false,
+null
+),
+ImmutableList.of(
+"page",
+"countryIsoCode",
+FACT_TO_COUNTRY_ON_ISO_CODE_PREFIX + "k",
+FACT_TO_COUNTRY_ON_ISO_CODE_PREFIX + "v"
+),
+ImmutableList.of(
+new Object[]{"Talk:Oswald Tilghman", null, null, null},
+new Object[]{"Rallicula", null, null, null},
+new Object[]{"Peremptory norm", "AU", "AU", "Australia"},
+new Object[]{"Apamea abruzzorum", null, null, null},
+new Object[]{"Atractus flammigerus", null, null, null},
+new Object[]{"Agama mossambica", null, null, null},
+new Object[]{"Mathis Bolly", "MX", "MX", "Mexico"},
+new Object[]{"유희왕 GX", "KR", "KR", "Republic of Korea"},
+new Object[]{"青野武", "JP", "JP", "Japan"},
+new Object[]{"Golpe de Estado en Chile de 1973", "CL", "CL",
"Chile"},
+new Object[]{"President of India", "US", "US", "United States"},
+new Object[]{"Diskussion:Sebastian Schulz", "DE", "DE", "Germany"},
+new Object[]{"Saison 9 de Secret Story", "FR", "FR", "France"},
+new Object[]{"Glasgow", "GB", "GB", "United Kingdom"},
+new Object[]{"Didier Leclair", "CA", "CA", "Canada"},
+new Object[]{"Les Argonautes", "CA", "CA", "Canada"},
+new Object[]{"Otjiwarongo Airport", "US", "US", "United States"},
+new Object[]{"Sarah Michelle Gellar", "CA", "CA", "Canada"},
+new Object[]{"DirecTV", "US", "US", "United States"},
+new Object[]{"Carlo Curti", "US", "US", "United States"},
+new Object[]{"Giusy Ferreri discography", "IT", "IT", "Italy"},
+new Object[]{"Roma-Bangkok", "IT", "IT", "Italy"},
+new Object[]{"Wendigo", "SV"
[druid] branch master updated (b8f7128 -> 8328d91)
This is an automated email from the ASF dual-hosted git repository.
ccaominh pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/druid.git.
from b8f7128 Revert "remove ServerDiscoverySelector from DruidLeaderClient
(#9481)" (#9702)
add 8328d91 Add missing integration tests for the compaction by the
coordinator (#9644)
No new revisions were added by this update.
Summary of changes:
docs/operations/api-reference.md | 9 +
.../docker/environment-configs/coordinator | 1 +
.../docker/environment-configs/middlemanager | 1 +
.../clients/CompactionResourceTestClient.java | 178 +++
.../clients/CoordinatorResourceTestClient.java | 23 ++
.../coordinator/duty/ITAutoCompactionTest.java | 350 +
.../druid/server/coordinator/DruidCoordinator.java | 18 +-
...oricalResource.java => CompactionResource.java} | 49 +--
.../druid/server/http/CoordinatorResource.java | 16 -
.../http/security/SecurityResourceFilterTest.java | 4 +-
.../java/org/apache/druid/cli/CliCoordinator.java | 2 +
11 files changed, 613 insertions(+), 38 deletions(-)
create mode 100644
integration-tests/src/main/java/org/apache/druid/testing/clients/CompactionResourceTestClient.java
create mode 100644
integration-tests/src/test/java/org/apache/druid/tests/coordinator/duty/ITAutoCompactionTest.java
copy
server/src/main/java/org/apache/druid/server/http/{HistoricalResource.java =>
CompactionResource.java} (51%)
-
To unsubscribe, e-mail: commits-unsubscr...@druid.apache.org
For additional commands, e-mail: commits-h...@druid.apache.org
[druid] branch master updated (0ff926b -> cbbfd63)
This is an automated email from the ASF dual-hosted git repository. ccaominh pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/druid.git. from 0ff926b fix issue with group by limit pushdown for extractionFn, expressions, joins, etc (#9662) add cbbfd63 Add 0.18.0 to .backportrc.json to facilitate backport. (#9661) No new revisions were added by this update. Summary of changes: .backportrc.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) - To unsubscribe, e-mail: commits-unsubscr...@druid.apache.org For additional commands, e-mail: commits-h...@druid.apache.org
[druid] branch master updated: IntelliJ inspections cleanup (#9339)
This is an automated email from the ASF dual-hosted git repository.
ccaominh pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/druid.git
The following commit(s) were added to refs/heads/master by this push:
new 1ced3b3 IntelliJ inspections cleanup (#9339)
1ced3b3 is described below
commit 1ced3b33fb1642ee71e542940e4e2a4840e7a48c
Author: Suneet Saldanha <44787917+sunee...@users.noreply.github.com>
AuthorDate: Fri Apr 10 10:04:40 2020 -0700
IntelliJ inspections cleanup (#9339)
* IntelliJ inspections cleanup
* Standard Charset object can be used
* Redundant Collection.addAll() call
* String literal concatenation missing whitespace
* Statement with empty body
* Redundant Collection operation
* StringBuilder can be replaced with String
* Type parameter hides visible type
* fix warnings in test code
* more test fixes
* remove string concatenation inspection error
* fix extra curly brace
* cleanup AzureTestUtils
* fix charsets for RangerAdminClient
* review comments
---
.idea/inspectionProfiles/Druid.xml | 9 +-
.../druid/benchmark/query/GroupByBenchmark.java| 2 +-
.../druid/benchmark/query/SearchBenchmark.java | 2 +-
.../druid/benchmark/query/TimeseriesBenchmark.java | 2 +-
.../druid/benchmark/query/TopNBenchmark.java | 2 +-
.../query/timecompare/TimeCompareBenchmark.java| 4 +-
.../java/util/http/client/JankyServersTest.java| 1 +
.../io/AppendableByteArrayInputStreamTest.java | 1 +
.../emitter/graphite/WhiteListBasedConverter.java | 3 +-
.../apache/druid/storage/azure/AzureTestUtils.java | 3 +-
.../hll/HllSketchUnionPostAggregator.java | 4 +-
.../datasketches/theta/SketchAggregationTest.java | 4 +-
.../theta/SketchAggregationWithSimpleDataTest.java | 4 +-
.../theta/oldapi/OldApiSketchAggregationTest.java | 4 +-
.../ranger/authorizer/RangerAdminClientImpl.java | 3 +-
.../histogram/FixedBucketsHistogramTest.java | 35 --
.../druid/storage/s3/S3DataSegmentPullerTest.java | 5 +-
.../java/org/apache/druid/indexer/JobHelper.java | 18 +-
.../druid/indexer/IndexGeneratorJobTest.java | 555 ++---
...PendingTaskBasedWorkerProvisioningStrategy.java | 2 +-
.../supervisor/SeekableStreamSupervisor.java | 4 +-
.../druid/tests/indexer/AbstractIndexerTest.java | 3 +-
.../druid/query/groupby/having/AndHavingSpec.java | 8 +-
.../query/groupby/having/EqualToHavingSpec.java| 10 +-
.../groupby/having/GreaterThanHavingSpec.java | 10 +-
.../query/groupby/having/LessThanHavingSpec.java | 10 +-
.../druid/query/groupby/having/NotHavingSpec.java | 8 +-
.../druid/query/groupby/having/OrHavingSpec.java | 8 +-
.../druid/query/search/CursorOnlyStrategy.java | 11 +-
.../ByteBufferMinMaxOffsetHeapTest.java| 6 +-
.../org/apache/druid/client/DirectDruidClient.java | 2 +-
.../org/apache/druid/server/QueryResourceTest.java | 21 +-
.../org/apache/druid/cli/CliHadoopIndexer.java | 13 +-
.../java/org/apache/druid/cli/ExportMetadata.java | 48 +-
34 files changed, 389 insertions(+), 436 deletions(-)
diff --git a/.idea/inspectionProfiles/Druid.xml
b/.idea/inspectionProfiles/Druid.xml
index a266eb9..4025da7 100644
--- a/.idea/inspectionProfiles/Druid.xml
+++ b/.idea/inspectionProfiles/Druid.xml
@@ -20,12 +20,14 @@
+
+
@@ -45,7 +47,7 @@
-
+
@@ -153,6 +155,7 @@
+
@@ -384,6 +387,7 @@
+
@@ -415,6 +419,7 @@
+
@@ -470,4 +475,4 @@
-
\ No newline at end of file
+
diff --git
a/benchmarks/src/test/java/org/apache/druid/benchmark/query/GroupByBenchmark.java
b/benchmarks/src/test/java/org/apache/druid/benchmark/query/GroupByBenchmark.java
index b1f910b..02107f0 100644
---
a/benchmarks/src/test/java/org/apache/druid/benchmark/query/GroupByBenchmark.java
+++
b/benchmarks/src/test/java/org/apache/druid/benchmark/query/GroupByBenchmark.java
@@ -735,7 +735,7 @@ public class GroupByBenchmark
{
List> runners = new ArrayList<>();
for (int i = 0; i < numSegments; i++) {
- String segmentName = "qIndex" + i;
+ String segmentName = "qIndex " + i;
QueryRunner runner = QueryBenchmarkUtil.makeQueryRunner(
factory,
SegmentId.dummy(segmentName),
diff --git
a/benchmarks/src/test/java/org/apache/druid/benchmark/query/SearchBenchmark.java
b/benchmarks/src/test/java/org/apache/druid/benchmark/query/SearchBenchmark.java
index 64746c7..06320c3 100644
---
a/benchmarks/src/test/java/org/apache/druid/benchmark/query/SearchBenchmark.java
+++
b/benchmarks/src/test
[druid] branch master updated: Suppress LGTM warnings about stack trace exposure (#9631)
This is an automated email from the ASF dual-hosted git repository. ccaominh pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/druid.git The following commit(s) were added to refs/heads/master by this push: new 9888268 Suppress LGTM warnings about stack trace exposure (#9631) 9888268 is described below commit 9888268000d0b983e19f9888af9d576a49d7e5f5 Author: Suneet Saldanha <44787917+sunee...@users.noreply.github.com> AuthorDate: Thu Apr 9 17:31:03 2020 -0700 Suppress LGTM warnings about stack trace exposure (#9631) Since Druid is an open source project, these warnings are not concerning as the information it may potentially leak is already available in the open. --- .lgtm.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.lgtm.yml b/.lgtm.yml index 12e1171..abcba17 100644 --- a/.lgtm.yml +++ b/.lgtm.yml @@ -13,6 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. +queries: + # Exclude stack trace exposure warnings because this project is open source. + - exclude: java/stack-trace-exposure extraction: java: index: - To unsubscribe, e-mail: commits-unsubscr...@druid.apache.org For additional commands, e-mail: commits-h...@druid.apache.org
[druid] branch master updated (a6790ff -> ab5ac7f)
This is an automated email from the ASF dual-hosted git repository. ccaominh pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/druid.git. from a6790ff More optimize CNF conversion of filters (#9634) add ab5ac7f Document possible vulnerabilities for the druid-ranger-security (#9649) No new revisions were added by this update. Summary of changes: .../extensions-core/druid-ranger-security.md | 10 +++ owasp-dependency-check-suppressions.xml| 32 ++ website/.spelling | 5 +++- 3 files changed, 46 insertions(+), 1 deletion(-) - To unsubscribe, e-mail: commits-unsubscr...@druid.apache.org For additional commands, e-mail: commits-h...@druid.apache.org
[druid] branch master updated (d267b1c -> 73a6baa)
This is an automated email from the ASF dual-hosted git repository.
ccaominh pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/druid.git.
from d267b1c check paths used for shuffle intermediary data manager get
and delete (#9630)
add 73a6baa change hadoop inputSource IT to use parallel batch ingestion
(#9616)
No new revisions were added by this update.
Summary of changes:
...Test.java => AbstractHdfsInputSourceParallelIndexTest.java} | 10 --
...impleIndexTest.java => ITHdfsToAzureParallelIndexTest.java} | 2 +-
...sSimpleIndexTest.java => ITHdfsToGcsParallelIndexTest.java} | 2 +-
...SimpleIndexTest.java => ITHdfsToHdfsParallelIndexTest.java} | 2 +-
...S3SimpleIndexTest.java => ITHdfsToS3ParallelIndexTest.java} | 2 +-
5 files changed, 12 insertions(+), 6 deletions(-)
rename
integration-tests/src/test/java/org/apache/druid/tests/indexer/{AbstractHdfsInputSourceSimpleIndexTest.java
=> AbstractHdfsInputSourceParallelIndexTest.java} (89%)
rename
integration-tests/src/test/java/org/apache/druid/tests/indexer/{ITHdfsToAzureSimpleIndexTest.java
=> ITHdfsToAzureParallelIndexTest.java} (95%)
rename
integration-tests/src/test/java/org/apache/druid/tests/indexer/{ITHdfsToGcsSimpleIndexTest.java
=> ITHdfsToGcsParallelIndexTest.java} (95%)
rename
integration-tests/src/test/java/org/apache/druid/tests/indexer/{ITHdfsToHdfsSimpleIndexTest.java
=> ITHdfsToHdfsParallelIndexTest.java} (94%)
rename
integration-tests/src/test/java/org/apache/druid/tests/indexer/{ITHdfsToS3SimpleIndexTest.java
=> ITHdfsToS3ParallelIndexTest.java} (95%)
-
To unsubscribe, e-mail: commits-unsubscr...@druid.apache.org
For additional commands, e-mail: commits-h...@druid.apache.org
[druid] branch master updated: DruidInputSource can add new dimensions during re-ingestion (#9590)
This is an automated email from the ASF dual-hosted git repository.
ccaominh pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/druid.git
The following commit(s) were added to refs/heads/master by this push:
new af3337d DruidInputSource can add new dimensions during re-ingestion
(#9590)
af3337d is described below
commit af3337dac8091d7499a86014de125b26ed90fbdc
Author: Suneet Saldanha <44787917+sunee...@users.noreply.github.com>
AuthorDate: Thu Apr 2 17:32:31 2020 -0700
DruidInputSource can add new dimensions during re-ingestion (#9590)
* WIP integration tests
* Add integration test for ingestion with transformSpec
* WIP almost working tests
* Add ignored tests
* checkstyle stuff
* remove newPage from index task ingestion spec
* more test cleanup
* still not quite working
* Actually disable the tests
* working tests
* fix codestyle
* dont use junit in integration tests
* actually fix the bug
* fix checkstyle
* bring index tests closer to reindex tests
---
examples/quickstart/tutorial/transform-index.json | 2 +-
.../indexing/common/ReingestionTimelineUtils.java | 32 ++
.../firehose/IngestSegmentFirehoseFactory.java | 17 +--
.../druid/indexing/input/DruidInputSource.java | 16 +--
.../druid/tests/indexer/ITTransformTest.java | 115 +
.../wikipedia_index_queries_with_transform.json| 62 +++
...edia_index_task_with_inputsource_transform.json | 103 ++
.../wikipedia_index_task_with_transform.json | 103 ++
...ex_druid_input_source_task_with_transforms.json | 106 +++
.../wikipedia_reindex_queries_with_transforms.json | 80 ++
.../wikipedia_reindex_task_with_transforms.json| 108 +++
11 files changed, 720 insertions(+), 24 deletions(-)
diff --git a/examples/quickstart/tutorial/transform-index.json
b/examples/quickstart/tutorial/transform-index.json
index bf605fc..caebb9f 100644
--- a/examples/quickstart/tutorial/transform-index.json
+++ b/examples/quickstart/tutorial/transform-index.json
@@ -55,7 +55,7 @@
"baseDir" : "quickstart/tutorial",
"filter" : "transform-data.json"
},
- "inpuFormat" : {
+ "inputFormat" : {
"type" : "json"
},
"appendToExisting" : false
diff --git
a/indexing-service/src/main/java/org/apache/druid/indexing/common/ReingestionTimelineUtils.java
b/indexing-service/src/main/java/org/apache/druid/indexing/common/ReingestionTimelineUtils.java
index 1f4820f..bd9d214 100644
---
a/indexing-service/src/main/java/org/apache/druid/indexing/common/ReingestionTimelineUtils.java
+++
b/indexing-service/src/main/java/org/apache/druid/indexing/common/ReingestionTimelineUtils.java
@@ -22,11 +22,13 @@ package org.apache.druid.indexing.common;
import com.google.common.collect.BiMap;
import com.google.common.collect.HashBiMap;
import com.google.common.collect.Lists;
+import org.apache.druid.data.input.impl.DimensionsSpec;
import org.apache.druid.timeline.DataSegment;
import org.apache.druid.timeline.TimelineObjectHolder;
import org.apache.druid.timeline.partition.PartitionChunk;
import javax.annotation.Nullable;
+import javax.validation.constraints.NotNull;
import java.util.List;
import java.util.Set;
import java.util.stream.Collectors;
@@ -101,4 +103,34 @@ public class ReingestionTimelineUtils
.mapToObj(orderedMetrics::get)
.collect(Collectors.toList());
}
+
+ /**
+ * Utility function to get dimensions that should be ingested. The preferred
order is
+ * - Explicit dimensions if they are provided.
+ * - Custom dimensions are provided in the inputSpec.
+ * - Calculate dimensions from the timeline but exclude any dimension
exclusions.
+ *
+ * @param explicitDimensions sent as part of the re-ingestion InputSource.
+ * @param dimensionsSpec from the provided ingestion spec.
+ * @param timeLineSegments for the datasource that is being read.
+ * @return
+ */
+ public static List getDimensionsToReingest(
+ @Nullable List explicitDimensions,
+ @NotNull DimensionsSpec dimensionsSpec,
+ @NotNull List>
timeLineSegments)
+ {
+final List dims;
+if (explicitDimensions != null) {
+ dims = explicitDimensions;
+} else if (dimensionsSpec.hasCustomDimensions()) {
+ dims = dimensionsSpec.getDimensionNames();
+} else {
+ dims = ReingestionTimelineUtils.getUniqueDimensions(
+ timeLineSegments,
+ dimensionsSpec.getDimensionExclusions()
+ );
+}
+return dims;
+ }
}
diff --git
a/indexing-service/src/main/java/org/apache/druid/indexing/firehose/IngestSegmentFirehoseFactory.java
b/indexi
[druid] branch master updated (55c08e0 -> e6e2836)
This is an automated email from the ASF dual-hosted git repository. ccaominh pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/druid.git. from 55c08e0 DruidSegmentReader should work if timestamp is specified as a dimension (#9530) add e6e2836 Instructions to run integration tests against quickstart (#9560) No new revisions were added by this update. Summary of changes: integration-tests/README.md| 23 +--- .../java/org/apache/druid/tests/TestNGGroup.java | 68 -- .../druid/tests/indexer/ITCompactionTaskTest.java | 2 +- .../apache/druid/tests/indexer/ITIndexerTest.java | 2 +- 4 files changed, 66 insertions(+), 29 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@druid.apache.org For additional commands, e-mail: commits-h...@druid.apache.org
[druid] branch master updated (3f52194 -> 55c08e0)
This is an automated email from the ASF dual-hosted git repository.
ccaominh pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/druid.git.
from 3f52194 S3 ingestion spec should not uses the default credentials
provider chain when environment value password provider is misconfigured.
(#9552)
add 55c08e0 DruidSegmentReader should work if timestamp is specified as a
dimension (#9530)
No new revisions were added by this update.
Summary of changes:
.../druid/indexing/input/DruidSegmentReader.java | 28 ---
integration-tests/README.md| 37 +-
integration-tests/quickstart-it.json | 16 ++
.../druid/tests/indexer/ITCompactionTaskTest.java | 34 +
.../apache/druid/tests/indexer/ITIndexerTest.java | 53 +++-
...wikipedia_reindex_druid_input_source_task.json} | 58 +++---
...on => wikipedia_with_timestamp_index_task.json} | 3 +-
7 files changed, 176 insertions(+), 53 deletions(-)
create mode 100644 integration-tests/quickstart-it.json
copy integration-tests/src/test/resources/indexer/{wikipedia_reindex_task.json
=> wikipedia_reindex_druid_input_source_task.json} (57%)
copy integration-tests/src/test/resources/indexer/{wikipedia_index_task.json
=> wikipedia_with_timestamp_index_task.json} (97%)
-
To unsubscribe, e-mail: commits-unsubscr...@druid.apache.org
For additional commands, e-mail: commits-h...@druid.apache.org
[druid] branch master updated (1ef25a4 -> 3b536ee)
This is an automated email from the ASF dual-hosted git repository. ccaominh pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/druid.git. from 1ef25a4 Broker: Add ability to inline subqueries. (#9533) add 3b536ee Web console: expose props for S3 (#9432) No new revisions were added by this update. Summary of changes: .../__snapshots__/auto-form.spec.tsx.snap | 3 + web-console/src/components/auto-form/auto-form.tsx | 39 .../suggestible-input/suggestible-input.tsx| 16 +++- .../__snapshots__/compaction-dialog.spec.tsx.snap | 4 + web-console/src/utils/ingestion-spec.tsx | 104 - .../src/views/load-data-view/load-data-view.tsx| 23 - 6 files changed, 161 insertions(+), 28 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@druid.apache.org For additional commands, e-mail: commits-h...@druid.apache.org
[druid] branch master updated: Update to mysql connector 5.1.48 (#9514)
This is an automated email from the ASF dual-hosted git repository.
ccaominh pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/druid.git
The following commit(s) were added to refs/heads/master by this push:
new e7b3dd9 Update to mysql connector 5.1.48 (#9514)
e7b3dd9 is described below
commit e7b3dd9cd1c8a95855ee672e2fcbfe1b895ccc37
Author: Chi Cao Minh
AuthorDate: Mon Mar 16 10:38:31 2020 -0700
Update to mysql connector 5.1.48 (#9514)
---
distribution/docker/Dockerfile.mysql | 8
docs/development/extensions-core/mysql.md | 2 +-
extensions-core/mysql-metadata-storage/pom.xml| 2 +-
.../org/apache/druid/metadata/storage/mysql/MySQLConnector.java | 2 +-
pom.xml | 1 +
5 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/distribution/docker/Dockerfile.mysql
b/distribution/docker/Dockerfile.mysql
index bba0721..9845a0d 100644
--- a/distribution/docker/Dockerfile.mysql
+++ b/distribution/docker/Dockerfile.mysql
@@ -22,10 +22,10 @@ FROM $DRUID_RELEASE
WORKDIR /opt/druid/extensions/mysql-metadata-storage
-ARG
MYSQL_URL=https://repo1.maven.org/maven2/mysql/mysql-connector-java/5.1.38/mysql-connector-java-5.1.38.jar
-ARG MYSQL_JAR=mysql-connector-java-5.1.38.jar
-#
https://repo1.maven.org/maven2/mysql/mysql-connector-java/5.1.38/mysql-connector-java-5.1.38.jar.sha1
-ARG MYSQL_SHA=dbbd7cd309ce167ec8367de4e41c63c2c8593cc5
+ARG
MYSQL_URL=https://repo1.maven.org/maven2/mysql/mysql-connector-java/5.1.48/mysql-connector-java-5.1.48.jar
+ARG MYSQL_JAR=mysql-connector-java-5.1.48.jar
+#
https://repo1.maven.org/maven2/mysql/mysql-connector-java/5.1.48/mysql-connector-java-5.1.48.jar.sha1
+ARG MYSQL_SHA=9140be77aafa5050bf4bb936d560cbacb5a6b5c1
RUN wget -q ${MYSQL_URL} \
&& echo "${MYSQL_SHA} ${MYSQL_JAR}" | sha1sum -c \
diff --git a/docs/development/extensions-core/mysql.md
b/docs/development/extensions-core/mysql.md
index 01e05bc..f39e93c 100644
--- a/docs/development/extensions-core/mysql.md
+++ b/docs/development/extensions-core/mysql.md
@@ -34,7 +34,7 @@ This extension uses Oracle's MySQL JDBC driver which is not
included in the Drui
installed separately. There are a few ways to obtain this library:
- It can be downloaded from the MySQL site at:
https://dev.mysql.com/downloads/connector/j/
-- It can be fetched from Maven Central at:
https://repo1.maven.org/maven2/mysql/mysql-connector-java/5.1.38/mysql-connector-java-5.1.38.jar
+- It can be fetched from Maven Central at:
https://repo1.maven.org/maven2/mysql/mysql-connector-java/5.1.48/mysql-connector-java-5.1.48.jar
- It may be available through your package manager, e.g. as `libmysql-java` on
APT for a Debian-based OS
This should fetch a JAR file named similar to
'mysql-connector-java-x.x.xx.jar'.
diff --git a/extensions-core/mysql-metadata-storage/pom.xml
b/extensions-core/mysql-metadata-storage/pom.xml
index a4bcb12..994f1f4 100644
--- a/extensions-core/mysql-metadata-storage/pom.xml
+++ b/extensions-core/mysql-metadata-storage/pom.xml
@@ -50,7 +50,7 @@
mysql
mysql-connector-java
-5.1.38
+${mysql.version}
provided
diff --git
a/extensions-core/mysql-metadata-storage/src/main/java/org/apache/druid/metadata/storage/mysql/MySQLConnector.java
b/extensions-core/mysql-metadata-storage/src/main/java/org/apache/druid/metadata/storage/mysql/MySQLConnector.java
index 938af4a..f7fc37d 100644
---
a/extensions-core/mysql-metadata-storage/src/main/java/org/apache/druid/metadata/storage/mysql/MySQLConnector.java
+++
b/extensions-core/mysql-metadata-storage/src/main/java/org/apache/druid/metadata/storage/mysql/MySQLConnector.java
@@ -65,7 +65,7 @@ public class MySQLConnector extends SQLMetadataConnector
catch (ClassNotFoundException e) {
throw new ISE(e, "Could not find %s on the classpath. The MySQL
Connector library is not included in the Druid "
+ "distribution but is required to use MySQL. Please
download a compatible library (for example "
- + "'mysql-connector-java-5.1.38.jar') and place it under
'extensions/mysql-metadata-storage/'. See "
+ + "'mysql-connector-java-5.1.48.jar') and place it under
'extensions/mysql-metadata-storage/'. See "
+ "https://druid.apache.org/downloads for more details.",
MYSQL_JDBC_DRIVER_CLASS_NAME
);
diff --git a/pom.xml b/pom.xml
index a4c3cf9..49252e0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -93,6 +93,7 @@
2.10.2
1.9.13
2.8.2
+5.1.48
3.10.6.Final
1.3.1
-
To unsubscribe, e-mail: commits-unsubscr...@druid.apache.org
For additional commands, e-mail: commits-h...@druid.apache.org
[druid] branch master updated (69af760 -> 100d587)
This is an automated email from the ASF dual-hosted git repository. ccaominh pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/druid.git. from 69af760 add manual laning strategy, integration test (#9492) add 100d587 Suppress CWE-400 for node-sass:4.13.1 (#9517) No new revisions were added by this update. Summary of changes: owasp-dependency-check-suppressions.xml | 12 1 file changed, 12 insertions(+) - To unsubscribe, e-mail: commits-unsubscr...@druid.apache.org For additional commands, e-mail: commits-h...@druid.apache.org
[druid] branch master updated (ddc6f87 -> 6b02991)
This is an automated email from the ASF dual-hosted git repository.
ccaominh pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/druid.git.
from ddc6f87 Web console: standardize the spec format (#9477)
add 6b02991 Match GREATEST/LEAST function behavior to other DBs (#9488)
No new revisions were added by this update.
Summary of changes:
.../java/org/apache/druid/math/expr/Function.java | 174 +++-
.../org/apache/druid/math/expr/FunctionTest.java | 146 +--
docs/misc/math-expr.md | 16 +
docs/querying/sql.md | 18 +-
.../aggregation/builtin/GreatestSqlAggregator.java | 136 ---
.../aggregation/builtin/LeastSqlAggregator.java| 136 ---
...ersion.java => GreatestOperatorConversion.java} | 22 +-
...onversion.java => LeastOperatorConversion.java} | 22 +-
.../builtin/ReductionOperatorConversionHelper.java | 76
.../sql/calcite/planner/DruidOperatorTable.java| 13 +-
.../apache/druid/sql/calcite/CalciteQueryTest.java | 444 -
.../calcite/expression/ExpressionTestHelper.java | 5 +
.../calcite/expression/GreatestExpressionTest.java | 261
.../calcite/expression/LeastExpressionTest.java| 261
14 files changed, 933 insertions(+), 797 deletions(-)
delete mode 100644
sql/src/main/java/org/apache/druid/sql/calcite/aggregation/builtin/GreatestSqlAggregator.java
delete mode 100644
sql/src/main/java/org/apache/druid/sql/calcite/aggregation/builtin/LeastSqlAggregator.java
copy
sql/src/main/java/org/apache/druid/sql/calcite/expression/builtin/{IPv4AddressParseOperatorConversion.java
=> GreatestOperatorConversion.java} (63%)
copy
sql/src/main/java/org/apache/druid/sql/calcite/expression/builtin/{IPv4AddressParseOperatorConversion.java
=> LeastOperatorConversion.java} (63%)
create mode 100644
sql/src/main/java/org/apache/druid/sql/calcite/expression/builtin/ReductionOperatorConversionHelper.java
create mode 100644
sql/src/test/java/org/apache/druid/sql/calcite/expression/GreatestExpressionTest.java
create mode 100644
sql/src/test/java/org/apache/druid/sql/calcite/expression/LeastExpressionTest.java
-
To unsubscribe, e-mail: commits-unsubscr...@druid.apache.org
For additional commands, e-mail: commits-h...@druid.apache.org
[druid] branch master updated (9231f2a -> e9888f4)
This is an automated email from the ASF dual-hosted git repository. ccaominh pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/druid.git. from 9231f2a Integration test compile with Java 8 and run with Java 8 and 11 (#9491) add e9888f4 Modify check java version script to indicate experimental support for Java 11 (#9455) No new revisions were added by this update. Summary of changes: docs/tutorials/cluster.md | 4 ++-- docs/tutorials/index.md | 4 ++-- examples/bin/verify-java | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@druid.apache.org For additional commands, e-mail: commits-h...@druid.apache.org
[druid] branch master updated (4f08589 -> 9231f2a)
This is an automated email from the ASF dual-hosted git repository. ccaominh pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/druid.git. from 4f08589 Ability to directly query row-based datasources. (#9502) add 9231f2a Integration test compile with Java 8 and run with Java 8 and 11 (#9491) No new revisions were added by this update. Summary of changes: .travis.yml | 60 ++-- 1 file changed, 14 insertions(+), 46 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@druid.apache.org For additional commands, e-mail: commits-h...@druid.apache.org
[druid] branch master updated (9466ac7 -> 4ed83f6)
This is an automated email from the ASF dual-hosted git repository. ccaominh pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/druid.git. from 9466ac7 Skip empty files for local, hdfs, and cloud input sources (#9450) add 4ed83f6 Fix superbatch merge last partition boundaries (#9448) No new revisions were added by this update. Summary of changes: .../parallel/ParallelIndexSupervisorTask.java | 39 -- .../parallel/ParallelIndexSupervisorTaskTest.java | 147 + 2 files changed, 174 insertions(+), 12 deletions(-) create mode 100644 indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/ParallelIndexSupervisorTaskTest.java - To unsubscribe, e-mail: commits-unsubscr...@druid.apache.org For additional commands, e-mail: commits-h...@druid.apache.org
[druid] branch master updated (0638117 -> 5d05b40)
This is an automated email from the ASF dual-hosted git repository. ccaominh pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/druid.git. from 0638117 #8690 use utc interval when create pedding segments (#9142) add 5d05b40 Remove druid incubating references (#9405) No new revisions were added by this update. Summary of changes: owasp-dependency-check-suppressions.xml | 11 ++- 1 file changed, 2 insertions(+), 9 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@druid.apache.org For additional commands, e-mail: commits-h...@druid.apache.org
[druid] branch master updated (30c24df -> 3f848e6)
This is an automated email from the ASF dual-hosted git repository. ccaominh pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/druid.git. from 30c24df Add config option for namespacePrefix (#9372) add 3f848e6 Suppress CVE-2020-8840 for htrace-core-4.0.1 (#9379) No new revisions were added by this update. Summary of changes: owasp-dependency-check-suppressions.xml | 1 + 1 file changed, 1 insertion(+) - To unsubscribe, e-mail: commits-unsubscr...@druid.apache.org For additional commands, e-mail: commits-h...@druid.apache.org
[druid] branch master updated (b408a6d -> 26eeba6)
This is an automated email from the ASF dual-hosted git repository. ccaominh pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/druid.git. from b408a6d sql support for dynamic parameters (#6974) add 26eeba6 Make java version check work on all shells (#9376) No new revisions were added by this update. Summary of changes: examples/bin/java-util | 2 +- examples/bin/verify-java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@druid.apache.org For additional commands, e-mail: commits-h...@druid.apache.org
[druid] branch master updated (b1f3813 -> 31528bc)
This is an automated email from the ASF dual-hosted git repository.
ccaominh pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/druid.git.
from b1f3813 Fix timestamp extract fn to match postgreSQL (#9337)
add 31528bc Integration tests for JDK 11 (#9249)
No new revisions were added by this update.
Summary of changes:
.travis.yml| 101 ---
integration-tests/common_run_cluster.sh| 108 +
.../docker-base}/README.md | 13 +--
integration-tests/docker-base/jdk11/Dockerfile | 62
.../docker-base/{ => jdk8}/Dockerfile | 6 +-
integration-tests/docker-base/setup.sh | 3 -
integration-tests/docker/Dockerfile| 11 ++-
integration-tests/docker/kafka.conf| 1 -
integration-tests/docker/middlemanager.conf| 2 +-
.../docker/router-custom-check-tls.conf| 1 -
.../docker/router-no-client-auth-tls.conf | 1 -
.../docker/router-permissive-tls.conf | 1 -
integration-tests/docker/supervisord.conf | 1 +
integration-tests/pom.xml | 5 +-
integration-tests/run_cluster.sh | 97 --
...ter.sh => run_cluster_using_java_runtime_11.sh} | 19 ++--
...ster.sh => run_cluster_using_java_runtime_8.sh} | 19 ++--
17 files changed, 312 insertions(+), 139 deletions(-)
create mode 100755 integration-tests/common_run_cluster.sh
copy {website => integration-tests/docker-base}/README.md (69%)
create mode 100644 integration-tests/docker-base/jdk11/Dockerfile
rename integration-tests/docker-base/{ => jdk8}/Dockerfile (87%)
delete mode 100755 integration-tests/run_cluster.sh
copy integration-tests/{stop_cluster.sh =>
run_cluster_using_java_runtime_11.sh} (69%)
copy integration-tests/{stop_cluster.sh =>
run_cluster_using_java_runtime_8.sh} (69%)
-
To unsubscribe, e-mail: commits-unsubscr...@druid.apache.org
For additional commands, e-mail: commits-h...@druid.apache.org
[druid] branch master updated (c30579e -> b1f3813)
This is an automated email from the ASF dual-hosted git repository. ccaominh pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/druid.git. from c30579e ANY Aggregator should not skip null values implementation (#9317) add b1f3813 Fix timestamp extract fn to match postgreSQL (#9337) No new revisions were added by this update. Summary of changes: .idea/inspectionProfiles/Druid.xml | 1 + .../expression/TimestampExtractExprMacro.java | 6 +- .../expression/TimestampExtractExprMacroTest.java | 102 + .../coordinator/CachingCostBalancerStrategy.java | 2 + .../apache/druid/sql/calcite/CalciteQueryTest.java | 4 +- 5 files changed, 110 insertions(+), 5 deletions(-) create mode 100644 processing/src/test/java/org/apache/druid/query/expression/TimestampExtractExprMacroTest.java - To unsubscribe, e-mail: commits-unsubscr...@druid.apache.org For additional commands, e-mail: commits-h...@druid.apache.org
[druid] branch master updated (ebd199d -> a5c49cc)
This is an automated email from the ASF dual-hosted git repository. ccaominh pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/druid.git. from ebd199d docs: extensions-core: mysql: fix MySQL connector library Maven Central URL (#9344) add a5c49cc Change security vulnerability scan to cron job (#9340) No new revisions were added by this update. Summary of changes: .travis.yml | 58 +++--- pom.xml | 15 ++- 2 files changed, 53 insertions(+), 20 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@druid.apache.org For additional commands, e-mail: commits-h...@druid.apache.org
[druid] branch master updated (6b44d4a -> 07a91f9)
This is an automated email from the ASF dual-hosted git repository. ccaominh pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/druid.git. from 6b44d4a Add getRightEquiConditionKeys to JoinConditionAnalysis (#9287) add 07a91f9 Fix early return from YieldingSequenceBase#accumulate. (#9293) No new revisions were added by this update. Summary of changes: .../java/util/common/guava/LimitedSequence.java| 10 ++- .../util/common/guava/YieldingSequenceBase.java| 3 + .../util/common/guava/LimitedSequenceTest.java | 77 ++ .../java/util/common/guava/SequenceTestHelper.java | 4 +- 4 files changed, 74 insertions(+), 20 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@druid.apache.org For additional commands, e-mail: commits-h...@druid.apache.org
[druid] branch master updated (14253c6 -> 0ccfe5c)
This is an automated email from the ASF dual-hosted git repository.
ccaominh pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/druid.git.
from 14253c6 removed AsyncQueryRunner since was only used by removed
interval chunking stuff (#9252)
add 0ccfe5c Expose JoinableFactory through Guice Bindings (#9271)
No new revisions were added by this update.
Summary of changes:
.../org/apache/druid/concurrent/LifecycleLock.java | 2 +-
.../MapDataSourceJoinableFactoryWarehouse.java | 34
.../MapDataSourceJoinableFactoryWarehouseTest.java | 82 ++
.../apache/druid/segment/join/NoopDataSource.java} | 41 +
.../java/org/apache/druid/guice/DruidBinders.java | 11 +++
.../apache/druid/guice/JoinableFactoryModule.java | 60 +
.../apache/druid/guice/JavaScriptModuleTest.java | 15 +---
.../druid/guice/JoinableFactoryModuleTest.java | 97 ++
.../java/org/apache/druid/cli/CliHistorical.java | 5 +-
.../main/java/org/apache/druid/cli/CliIndexer.java | 5 +-
.../main/java/org/apache/druid/cli/CliPeon.java| 5 +-
11 files changed, 300 insertions(+), 57 deletions(-)
rename
server/src/main/java/org/apache/druid/segment/join/DefaultJoinableFactory.java
=>
processing/src/main/java/org/apache/druid/segment/join/MapDataSourceJoinableFactoryWarehouse.java
(50%)
create mode 100644
processing/src/test/java/org/apache/druid/segment/join/MapDataSourceJoinableFactoryWarehouseTest.java
copy
processing/src/{main/java/org/apache/druid/query/aggregation/NoopAggregator.java
=> test/java/org/apache/druid/segment/join/NoopDataSource.java} (62%)
create mode 100644
server/src/main/java/org/apache/druid/guice/JoinableFactoryModule.java
create mode 100644
server/src/test/java/org/apache/druid/guice/JoinableFactoryModuleTest.java
-
To unsubscribe, e-mail: commits-unsubscr...@druid.apache.org
For additional commands, e-mail: commits-h...@druid.apache.org
