This is an automated email from the ASF dual-hosted git repository.
jonwei 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 887cecf Simplify ITHttpInputSourceTest to mitigate flakiness (#11751)
887cecf is described below
commit 887cecf29e8b813029911fb05745764cce155c94
Author: Agustin Gonzalez <agustin.gonza...@imply.io>
AuthorDate: Tue Oct 12 09:51:27 2021 -0700
Simplify ITHttpInputSourceTest to mitigate flakiness (#11751)
* Increment retry count to add more time for tests to pass
* Re-enable ITHttpInputSourceTest
* Restore original count
* This test is about input source, hash partitioning takes longer and not
required thus changing to dynamic
* Further simplify by removing sketches
---
.../druid/tests/indexer/ITHttpInputSourceTest.java | 2 -
.../wikipedia_http_inputsource_queries.json | 87 +++++-----------------
.../indexer/wikipedia_http_inputsource_task.json | 18 +----
3 files changed, 19 insertions(+), 88 deletions(-)
diff --git
a/integration-tests/src/test/java/org/apache/druid/tests/indexer/ITHttpInputSourceTest.java
b/integration-tests/src/test/java/org/apache/druid/tests/indexer/ITHttpInputSourceTest.java
index c72f080..bb0d7c5 100644
---
a/integration-tests/src/test/java/org/apache/druid/tests/indexer/ITHttpInputSourceTest.java
+++
b/integration-tests/src/test/java/org/apache/druid/tests/indexer/ITHttpInputSourceTest.java
@@ -36,8 +36,6 @@ public class ITHttpInputSourceTest extends
AbstractITBatchIndexTest
private static final String INDEX_TASK =
"/indexer/wikipedia_http_inputsource_task.json";
private static final String INDEX_QUERIES_RESOURCE =
"/indexer/wikipedia_http_inputsource_queries.json";
- // Ignore while we debug...
- @Test(enabled = false)
public void doTest() throws IOException
{
final String indexDatasource = "wikipedia_http_inputsource_test_" +
UUID.randomUUID();
diff --git
a/integration-tests/src/test/resources/indexer/wikipedia_http_inputsource_queries.json
b/integration-tests/src/test/resources/indexer/wikipedia_http_inputsource_queries.json
index 11496c2..f0cbb1c 100644
---
a/integration-tests/src/test/resources/indexer/wikipedia_http_inputsource_queries.json
+++
b/integration-tests/src/test/resources/indexer/wikipedia_http_inputsource_queries.json
@@ -16,82 +16,31 @@
]
},
{
- "description": "timeseries, datasketch aggs, all",
+ "description": "simple aggr",
"query":{
- "queryType" : "timeseries",
- "dataSource": "%%DATASOURCE%%",
- "granularity":"day",
- "intervals":[
- "2016-06-27/P1D"
- ],
- "filter":null,
- "aggregations":[
+ "queryType" : "topN",
+ "dataSource" : "%%DATASOURCE%%",
+ "intervals" : ["2016-06-27/2016-06-28"],
+ "granularity" : "all",
+ "dimension" : "page",
+ "metric" : "count",
+ "threshold" : 3,
+ "aggregations" : [
{
- "type": "HLLSketchMerge",
- "name": "approxCountHLL",
- "fieldName": "HLLSketchBuild",
- "lgK": 12,
- "tgtHllType": "HLL_4",
- "round": true
- },
- {
- "type":"thetaSketch",
- "name":"approxCountTheta",
- "fieldName":"thetaSketch",
- "size":16384,
- "shouldFinalize":true,
- "isInputThetaSketch":false,
- "errorBoundsStdDev":null
- },
- {
- "type":"quantilesDoublesSketch",
- "name":"quantilesSketch",
- "fieldName":"quantilesDoublesSketch",
- "k":128
+ "type" : "count",
+ "name" : "count"
}
]
},
"expectedResults":[
{
- "timestamp" : "2016-06-27T00:00:00.000Z",
- "result" : {
- "quantilesSketch":48866,
- "approxCountTheta":7862.0,
- "approxCountHLL":7961
- }
- }
- ]
- },
- {
- "description": "timeseries, stringFirst/stringLast aggs, all",
- "query":{
- "queryType" : "timeseries",
- "dataSource": "%%DATASOURCE%%",
- "granularity":"day",
- "intervals":[
- "2016-06-27/P1D"
- ],
- "filter":null,
- "aggregations":[
- {
- "type": "stringFirst",
- "name": "first_user",
- "fieldName": "user"
- },
- {
- "type":"stringLast",
- "name":"last_user",
- "fieldName":"user"
- }
- ]
- },
- "expectedResults":[
- {
- "timestamp" : "2016-06-27T00:00:00.000Z",
- "result" : {
- "first_user":"Lsjbot",
- "last_user":"EmausBot"
- }
+ "timestamp" : "2016-06-27T00:00:11.000Z",
+ "result" :
+ [
+ {"count":58,"page":"Copa América Centenario"},
+ {"count":32,"page":"User:Cyde/List of candidates for
speedy deletion/Subpage"},
+ {"count":32,"page":"Wikipedia:Administrators'
noticeboard/Incidents"}
+ ]
}
]
}
diff --git
a/integration-tests/src/test/resources/indexer/wikipedia_http_inputsource_task.json
b/integration-tests/src/test/resources/indexer/wikipedia_http_inputsource_task.json
index 6038327..0ac4e05 100644
---
a/integration-tests/src/test/resources/indexer/wikipedia_http_inputsource_task.json
+++
b/integration-tests/src/test/resources/indexer/wikipedia_http_inputsource_task.json
@@ -41,21 +41,6 @@
"type": "doubleSum",
"name": "delta",
"fieldName": "delta"
- },
- {
- "name": "thetaSketch",
- "type": "thetaSketch",
- "fieldName": "user"
- },
- {
- "name": "quantilesDoublesSketch",
- "type": "quantilesDoublesSketch",
- "fieldName": "delta"
- },
- {
- "name": "HLLSketchBuild",
- "type": "HLLSketchBuild",
- "fieldName": "user"
}
],
"granularitySpec": {
@@ -78,9 +63,8 @@
"type": "index_parallel",
"maxNumConcurrentSubTasks": 10,
"partitionsSpec": {
- "type": "hashed"
+ "type": "dynamic"
},
- "forceGuaranteedRollup": true,
"splitHintSpec": {
"type": "maxSize",
"maxNumFiles": 1
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@druid.apache.org
For additional commands, e-mail: commits-h...@druid.apache.org
