DruidInputSource can add new dimensions during re-ingestion #9590
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,115 @@ | ||
| /* | ||
| * 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. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
|
|
||
| package org.apache.druid.tests.indexer; | ||
|
|
||
| import org.apache.druid.testing.guice.DruidTestModuleFactory; | ||
| import org.apache.druid.tests.TestNGGroup; | ||
| import org.testng.annotations.Guice; | ||
| import org.testng.annotations.Test; | ||
|
|
||
| import java.io.Closeable; | ||
| import java.io.IOException; | ||
|
|
||
| @Test(groups = {TestNGGroup.BATCH_INDEX, TestNGGroup.QUICKSTART_COMPATIBLE}) | ||
| @Guice(moduleFactory = DruidTestModuleFactory.class) | ||
| public class ITTransformTest extends AbstractITBatchIndexTest | ||
| { | ||
| private static final String INDEX_TASK_WITH_FIREHOSE = "/indexer/wikipedia_index_task_with_transform.json"; | ||
| private static final String INDEX_TASK_WITH_INPUT_SOURCE = "/indexer/wikipedia_index_task_with_inputsource_transform.json"; | ||
| private static final String INDEX_QUERIES_RESOURCE = "/indexer/wikipedia_index_queries_with_transform.json"; | ||
| private static final String INDEX_DATASOURCE = "wikipedia_index_test"; | ||
|
|
||
| private static final String REINDEX_TASK = "/indexer/wikipedia_reindex_task_with_transforms.json"; | ||
| private static final String REINDEX_TASK_WITH_DRUID_INPUT_SOURCE = "/indexer/wikipedia_reindex_druid_input_source_task_with_transforms.json"; | ||
| private static final String REINDEX_QUERIES_RESOURCE = "/indexer/wikipedia_reindex_queries_with_transforms.json"; | ||
| private static final String REINDEX_DATASOURCE = "wikipedia_reindex_test"; | ||
|
|
||
| @Test | ||
| public void testIndexAndReIndexWithTransformSpec() throws IOException | ||
| { | ||
| final String reindexDatasourceWithDruidInputSource = REINDEX_DATASOURCE + "-druidInputSource"; | ||
|
|
||
| try ( | ||
| final Closeable ignored1 = unloader(INDEX_DATASOURCE + config.getExtraDatasourceNameSuffix()); | ||
| final Closeable ignored2 = unloader(reindexDatasourceWithDruidInputSource + config.getExtraDatasourceNameSuffix()) | ||
| ) { | ||
| doIndexTest( | ||
| INDEX_DATASOURCE, | ||
| INDEX_TASK_WITH_INPUT_SOURCE, | ||
| INDEX_QUERIES_RESOURCE, | ||
| false, | ||
| true, | ||
| true | ||
| ); | ||
| doReindexTest( | ||
| INDEX_DATASOURCE, | ||
| reindexDatasourceWithDruidInputSource, | ||
| REINDEX_TASK_WITH_DRUID_INPUT_SOURCE, | ||
| REINDEX_QUERIES_RESOURCE | ||
| ); | ||
| } | ||
| } | ||
|
|
||
| @Test(enabled = false) | ||
| public void testIndexAndReIndexUsingIngestSegmentWithTransforms() throws IOException | ||
| { | ||
| // TODO: re-instate this test when https://github.com/apache/druid/issues/9591 is fixed | ||
| // Move the re-index step into testIndexAndReIndexWithTransformSpec for faster tests! | ||
| final String reindexDatasource = REINDEX_DATASOURCE + "-testIndexData"; | ||
| try ( | ||
| final Closeable ignored1 = unloader(INDEX_DATASOURCE + config.getExtraDatasourceNameSuffix()); | ||
| final Closeable ignored2 = unloader(reindexDatasource + config.getExtraDatasourceNameSuffix()) | ||
| ) { | ||
| doIndexTest( | ||
| INDEX_DATASOURCE, | ||
| INDEX_TASK_WITH_INPUT_SOURCE, | ||
| INDEX_QUERIES_RESOURCE, | ||
| false, | ||
| true, | ||
| true | ||
| ); | ||
| doReindexTest( | ||
| INDEX_DATASOURCE, | ||
| reindexDatasource, | ||
| REINDEX_TASK, | ||
| REINDEX_QUERIES_RESOURCE | ||
| ); | ||
| } | ||
| } | ||
|
|
||
| @Test(enabled = false) | ||
| public void testIndexWithFirehoseAndTransforms() throws IOException | ||
| { | ||
| // TODO: re-instate this test when https://github.com/apache/druid/issues/9589 is fixed | ||
| final String indexDatasource = INDEX_DATASOURCE + "-firehose"; | ||
| try ( | ||
| final Closeable ignored1 = unloader(indexDatasource + config.getExtraDatasourceNameSuffix()); | ||
| ) { | ||
| doIndexTest( | ||
| indexDatasource, | ||
| INDEX_TASK_WITH_FIREHOSE, | ||
| INDEX_QUERIES_RESOURCE, | ||
| false, | ||
| true, | ||
| true | ||
| ); | ||
| } | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,62 @@ | ||
| [ | ||
| { | ||
| "description":"having spec on post aggregation", | ||
| "query":{ | ||
| "queryType":"groupBy", | ||
| "dataSource":"%%DATASOURCE%%", | ||
| "granularity":"day", | ||
| "dimensions":[ | ||
| "page", | ||
| "city" | ||
| ], | ||
| "filter":{ | ||
| "type":"selector", | ||
| "dimension":"language", | ||
| "value":"language-zh" | ||
| }, | ||
| "aggregations":[ | ||
| { | ||
| "type":"count", | ||
| "name":"rows" | ||
| }, | ||
| { | ||
| "type":"longSum", | ||
| "fieldName":"triple-added", | ||
| "name":"added_count" | ||
| }, | ||
| { | ||
| "type":"longSum", | ||
| "fieldName":"delta", | ||
| "name":"delta_sum" | ||
| } | ||
| ], | ||
| "postAggregations": [ | ||
| { | ||
| "type":"arithmetic", | ||
| "name":"added_count_times_ten", | ||
| "fn":"*", | ||
| "fields":[ | ||
| {"type":"fieldAccess", "name":"added_count", "fieldName":"added_count"}, | ||
| {"type":"constant", "name":"const", "value":10} | ||
| ] | ||
| } | ||
| ], | ||
| "having":{"type":"greaterThan", "aggregation":"added_count_times_ten", "value":9000}, | ||
| "intervals":[ | ||
| "2013-08-31T00:00/2013-09-01T00:00" | ||
| ] | ||
| }, | ||
| "expectedResults":[ { | ||
| "version" : "v1", | ||
| "timestamp" : "2013-08-31T00:00:00.000Z", | ||
| "event" : { | ||
| "added_count_times_ten" : 27150.0, | ||
| "page" : "Crimson Typhoon", | ||
| "city" : "Taiyuan", | ||
| "added_count" : 2715, | ||
| "delta_sum" : 900, | ||
| "rows" : 1 | ||
| } | ||
| } ] | ||
| } | ||
| ] |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,103 @@ | ||
| { | ||
| "type" : "index", | ||
| "spec" : { | ||
| "dataSchema" : { | ||
| "dataSource" : "%%DATASOURCE%%", | ||
| "timestampSpec": { | ||
| "column": "timestamp" | ||
| }, | ||
| "metricsSpec": [ | ||
| { | ||
| "type": "count", | ||
| "name": "count" | ||
| }, | ||
| { | ||
| "type": "doubleSum", | ||
| "name": "added", | ||
| "fieldName": "added" | ||
| }, | ||
| { | ||
| "type": "doubleSum", | ||
| "name": "triple-added", | ||
| "fieldName": "triple-added" | ||
| }, | ||
| { | ||
| "type": "doubleSum", | ||
| "name": "deleted", | ||
| "fieldName": "deleted" | ||
| }, | ||
| { | ||
| "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": { | ||
| "segmentGranularity": "DAY", | ||
| "queryGranularity": "second", | ||
| "intervals" : [ "2013-08-31/2013-09-02" ] | ||
| }, | ||
| "dimensionsSpec": { | ||
| "dimensions": [ | ||
| "page", | ||
| {"type": "string", "name": "language", "createBitmapIndex": false}, | ||
| "user", | ||
| "unpatrolled", | ||
| "robot", | ||
| "anonymous", | ||
| "namespace", | ||
| "continent", | ||
| "country", | ||
| "region", | ||
| "city" | ||
| ] | ||
| }, | ||
| "transformSpec": { | ||
| "transforms": [ | ||
| { | ||
| "type": "expression", | ||
| "name": "language", | ||
| "expression": "concat('language-', language)" | ||
| }, | ||
| { | ||
| "type": "expression", | ||
| "name": "triple-added", | ||
| "expression": "added * 3" | ||
| } | ||
| ] | ||
| } | ||
| }, | ||
| "ioConfig" : { | ||
| "type" : "index", | ||
| "inputSource" : { | ||
| "type" : "local", | ||
| "baseDir" : "/resources/data/batch_index", | ||
| "filter" : "wikipedia_index_data*" | ||
| }, | ||
| "inputFormat" : { | ||
| "type" : "json" | ||
| }, | ||
| "appendToExisting" : false | ||
| }, | ||
| "tuningConfig" : { | ||
| "type" : "index", | ||
| "maxRowsPerSegment" : 5000000, | ||
| "maxRowsInMemory" : 25000 | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Good catch!