-
Notifications
You must be signed in to change notification settings - Fork 3.8k
Add embedded test for object-storage-encoding format for nested field #18818
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Changes from 18 commits
868cf2f
3ee90cc
fc63ca0
f2eb056
4d1d6e8
299766b
1deaef6
fb1de07
e79b5c7
4c20bde
2eceaa9
2aca113
09bdf30
170d354
1eaace7
0786920
285204c
11b1f5b
1d44512
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
| @@ -0,0 +1,130 @@ | ||||||
| /* | ||||||
| * 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.testing.embedded.indexing; | ||||||
|
|
||||||
| import org.apache.druid.indexing.common.task.TaskBuilder; | ||||||
| import org.apache.druid.java.util.common.StringUtils; | ||||||
| import org.apache.druid.segment.IndexSpec; | ||||||
| import org.apache.druid.segment.nested.NestedCommonFormatColumnFormatSpec; | ||||||
| import org.apache.druid.segment.nested.ObjectStorageEncoding; | ||||||
| import org.apache.druid.testing.embedded.EmbeddedBroker; | ||||||
| import org.apache.druid.testing.embedded.EmbeddedClusterApis; | ||||||
| import org.apache.druid.testing.embedded.EmbeddedCoordinator; | ||||||
| import org.apache.druid.testing.embedded.EmbeddedDruidCluster; | ||||||
| import org.apache.druid.testing.embedded.EmbeddedHistorical; | ||||||
| import org.apache.druid.testing.embedded.EmbeddedIndexer; | ||||||
| import org.apache.druid.testing.embedded.EmbeddedOverlord; | ||||||
| import org.apache.druid.testing.embedded.EmbeddedRouter; | ||||||
| import org.apache.druid.testing.embedded.junit5.EmbeddedClusterTestBase; | ||||||
| import org.junit.jupiter.api.Assertions; | ||||||
| import org.junit.jupiter.api.BeforeAll; | ||||||
| import org.junit.jupiter.api.Test; | ||||||
|
|
||||||
| /** | ||||||
| * Embedded tests for nested data, ingested in different {@link NestedCommonFormatColumnFormatSpec}. | ||||||
| */ | ||||||
| public class NestedDataFormatsTest extends EmbeddedClusterTestBase | ||||||
| { | ||||||
| private final EmbeddedBroker broker = new EmbeddedBroker(); | ||||||
| private final EmbeddedOverlord overlord = new EmbeddedOverlord(); | ||||||
| private final EmbeddedCoordinator coordinator = new EmbeddedCoordinator(); | ||||||
|
|
||||||
| private final String datasourceWithDefaultFormat = EmbeddedClusterApis.createTestDatasourceName(); | ||||||
|
|
||||||
| @Override | ||||||
| protected EmbeddedDruidCluster createCluster() | ||||||
| { | ||||||
| return EmbeddedDruidCluster.withEmbeddedDerbyAndZookeeper() | ||||||
| .useLatchableEmitter() | ||||||
| .useDefaultTimeoutForLatchableEmitter(60) | ||||||
| .addServer(overlord) | ||||||
| .addServer(coordinator) | ||||||
| .addServer(new EmbeddedIndexer()) | ||||||
| .addServer(new EmbeddedHistorical()) | ||||||
| .addServer(broker) | ||||||
| .addServer(new EmbeddedRouter()); | ||||||
| } | ||||||
|
|
||||||
| @BeforeAll | ||||||
| protected void ingestWithDefaultFormat() | ||||||
| { | ||||||
| final TaskBuilder.IndexParallel indexTask = | ||||||
| TaskBuilder.ofTypeIndexParallel() | ||||||
| .dataSource(datasourceWithDefaultFormat) | ||||||
| .timestampColumn("timestamp") | ||||||
| .jsonInputFormat() | ||||||
| .inputSource(Resources.HttpData.kttmNested1Day()) | ||||||
| .schemaDiscovery(); | ||||||
|
|
||||||
| final String taskId = EmbeddedClusterApis.newTaskId(datasourceWithDefaultFormat); | ||||||
| cluster.callApi().runTask(indexTask.withId(taskId), overlord); | ||||||
| cluster.callApi().waitForAllSegmentsToBeAvailable(datasourceWithDefaultFormat, coordinator, broker); | ||||||
| } | ||||||
|
|
||||||
| @Test | ||||||
| public void test_objectStorageEncoding() | ||||||
| { | ||||||
| // Ingest kttm data with skipping smile raw json format, comparing diff with defaultFormat | ||||||
| NestedCommonFormatColumnFormatSpec spec = | ||||||
| NestedCommonFormatColumnFormatSpec.builder().setObjectStorageEncoding(ObjectStorageEncoding.NONE).build(); | ||||||
| final TaskBuilder.IndexParallel indexTask = | ||||||
| TaskBuilder.ofTypeIndexParallel() | ||||||
| .dataSource(dataSource) | ||||||
| .timestampColumn("timestamp") | ||||||
| .jsonInputFormat() | ||||||
| .inputSource(Resources.HttpData.kttmNested1Day()) | ||||||
| .schemaDiscovery() | ||||||
| .tuningConfig(t -> t.withIndexSpec(IndexSpec.builder().withAutoColumnFormatSpec(spec).build())); | ||||||
| final String taskId = EmbeddedClusterApis.newTaskId(dataSource); | ||||||
| cluster.callApi().runTask(indexTask.withId(taskId), overlord); | ||||||
| cluster.callApi().waitForAllSegmentsToBeAvailable(dataSource, coordinator, broker); | ||||||
|
|
||||||
| // Test ingesting with skipping raw json smile format works, same row count, with ~20% storage saving | ||||||
| final String metadata = "select sum(num_rows), sum(size) from sys.segments where datasource = '%s' group by datasource"; | ||||||
|
||||||
| final String metadata = "select sum(num_rows), sum(size) from sys.segments where datasource = '%s' group by datasource"; | |
| final String metadataSql = "select sum(num_rows), sum(size) from sys.segments where datasource = '%s'"; |
Outdated
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.
Please try to break the SQL string into multiple lines.
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.
Let's consider updating the checkstyle version in that case.
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.
only later version of checkstyle support the """ style (java 15+), and had to exclude this file since the error thrown was parsing error. in the later version of checkstyle a bunch of other things failed as well, so prefer to make checkstyle a separate pr besides this one.
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.
Okay, thanks for the details.
I think you can also use // CHECKSTYLE.OFF to turn off checkstyle without having to exclude the entire file in pom. e.g. see StringUtils class.
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.
it still complains about error, i think parsing was before style check
Failed to execute goal org.apache.maven.plugins:maven-checkstyle-plugin:3.0.0:checkstyle (default-cli) on project druid-embedded-tests: An error has occurred in Checkstyle report generation.: Failed during checkstyle configuration: Exception was thrown while processing /Users/cecemei/codespace/bitmap/embedded-tests/src/test/java/org/apache/druid/testing/embedded/indexing/NestedDataFormatsTest.java: IllegalStateException occurred while parsing file /Users/cecemei/codespace/bitmap/embedded-tests/src/test/java/org/apache/druid/testing/embedded/indexing/NestedDataFormatsTest.java. /Users/cecemei/codespace/bitmap/embedded-tests/src/test/java/org/apache/druid/testing/embedded/indexing/NestedDataFormatsTest.java:118:5: unexpected token: Assertions -> [Help 1]
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.
I see, thanks for checking. Let's just exclude it in the pom until we upgrade the checkstyle version in the follow up PR.
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -70,7 +70,7 @@ | |
| </scm> | ||
|
|
||
| <properties> | ||
| <java.version>11</java.version> | ||
| <java.version>17</java.version> | ||
| <maven.compiler.release>${java.version}</maven.compiler.release> | ||
| <project.build.resourceEncoding>UTF-8</project.build.resourceEncoding> | ||
| <aether.version>0.9.0.M2</aether.version> | ||
|
|
@@ -1572,7 +1572,7 @@ | |
| <consoleOutput>true</consoleOutput> | ||
| <failsOnError>true</failsOnError> | ||
| <excludes> | ||
| *com/fasterxml/jackson/databind/* | ||
| *com/fasterxml/jackson/databind/*,**/NestedDataFormatsTest.java | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Why is the new test excluded from checkstyle?
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. parsing error |
||
| </excludes> | ||
| </configuration> | ||
| <dependencies> | ||
|
|
||
Uh oh!
There was an error while loading. Please reload this page.