Skip to content

merge druid-core, extendedset, and druid-hll into druid-processing to simplify everything #13698

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.

Sign up for GitHub

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

Merged
clintropolis merged 13 commits into from
Feb 17, 2023
Merged

merge druid-core, extendedset, and druid-hll into druid-processing to simplify everything #13698

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
6dc70af
merge druid-core, extendedset, and druid-hll into druid-processing to…
clintropolis Jan 20, 2023
a8ec2e0
fix poms and license stuff
clintropolis Jan 21, 2023
98bdd19
everything passes locally, why not on ci? :(
clintropolis Jan 23, 2023
23571f2
more heap?
clintropolis Jan 24, 2023
b2b22fa
Merge remote-tracking branch 'upstream/master' into i-cant-take-it-an…
clintropolis Jan 24, 2023
bfeecf4
fix merge
clintropolis Jan 24, 2023
0cac846
lighter buffers
clintropolis Jan 24, 2023
768e8ce
Revert "lighter buffers"
clintropolis Jan 25, 2023
74242c1
mockito is evil
clintropolis Jan 25, 2023
710afa0
Merge remote-tracking branch 'upstream/master' into i-cant-take-it-an…
clintropolis Feb 10, 2023
f7580d1
allow reset of JvmUtils RuntimeInfo if tests used static injection to…
clintropolis Feb 10, 2023
4b0e1cb
Merge remote-tracking branch 'upstream/master' into i-cant-take-it-an…
clintropolis Feb 17, 2023
2b23de7
more juice
clintropolis Feb 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion .github/scripts/unit_tests_script.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ set -e
unset _JAVA_OPTIONS

# Set MAVEN_OPTS for Surefire launcher.
MAVEN_OPTS='-Xmx2048m' ${MVN} test -pl ${MAVEN_PROJECTS} \
MAVEN_OPTS='-Xmx2500m' ${MVN} test -pl ${MAVEN_PROJECTS} \
${MAVEN_SKIP} -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/reusable-unit-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ env:
MVN: mvn -B
MAVEN_SKIP: -P skip-static-checks -Dweb.console.skip=true -Dmaven.javadoc.skip=true
MAVEN_SKIP_TESTS: -P skip-tests
MAVEN_OPTS: -Xmx3000m
MAVEN_OPTS: -Xmx3500m
FORCE_COLOR: 2
SEGMENT_DOWNLOAD_TIMEOUT_MINS: 5

Expand Down
1 change: 0 additions & 1 deletion .idea/scopes/UnusedInspectionsScope.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 6 additions & 6 deletions LICENSE
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,13 +253,13 @@ SOURCE/JAVA-CORE
This product contains modified portions of the Guava library,
copyright The Guava Authors (https://github.com/google/guava).
Closer class:
* core/src/main/java/org/apache/druid/java/util/common/io/Closer.java
* processing/src/main/java/org/apache/druid/java/util/common/io/Closer.java
Splitter.splitToList() method:
* core/src/main/java/org/apache/druid/java/util/common/parsers/DelimitedParser.java
* processing/src/main/java/org/apache/druid/java/util/common/parsers/DelimitedParser.java
DirectExecutorService class:
* core/src/main/java/org/apache/druid/java/util/common/concurrent/DirectExecutorService.java
* processing/src/main/java/org/apache/druid/java/util/common/concurrent/DirectExecutorService.java
CartesianList class:
* core/src/main/java/org/apache/druid/math/expr/CartesianList.java
* processing/src/main/java/org/apache/druid/math/expr/CartesianList.java

This product contains modified versions of the Dockerfile, scripts, and related configuration files
used for building SequenceIQ's Hadoop Docker image, copyright SequenceIQ, Inc. (https://github.com/sequenceiq/hadoop-docker/)
Expand All @@ -270,14 +270,14 @@ SOURCE/JAVA-CORE
* extensions-core/histogram/src/main/java/org/apache/druid/query/aggregation/histogram/FixedBucketsHistogram.java

This product contains ByteBuffer unmapping code adapted from Apache Kafka
* core/src/main/java/org/apache/druid/java/util/common/ByteBufferUtils.java
* processing/src/main/java/org/apache/druid/java/util/common/ByteBufferUtils.java

This product contains s3 directory place holder check code adapted from JetS3t (https://bitbucket.org/jmurty/jets3t/wiki/Home).
* extensions-core/s3-extensions/src/main/java/org/apache/druid/storage/s3/S3Utils.java
* extensions-contrib/aliyun-oss-extensions/src/main/java/org/apache/druid/storage/aliyun/OssObjectSummaryIterator.java

This product contains lpad and rpad methods adapted from Apache Flink.
* core/src/main/java/org/apache/druid/java/util/common/StringUtils.java
* processing/src/main/java/org/apache/druid/java/util/common/StringUtils.java


MIT License
Expand Down
16 changes: 0 additions & 16 deletions benchmarks/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,21 +67,11 @@
<artifactId>druid-sql</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>org.apache.druid</groupId>
<artifactId>druid-core</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>org.apache.druid.extensions</groupId>
<artifactId>druid-datasketches</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>org.apache.druid</groupId>
<artifactId>extendedset</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>org.apache.druid.extensions</groupId>
<artifactId>druid-histogram</artifactId>
Expand All @@ -92,12 +82,6 @@
<artifactId>druid-stats</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>org.apache.druid</groupId>
<artifactId>druid-core</artifactId>
<version>${project.parent.version}</version>
<type>test-jar</type>
</dependency>
<dependency>
<groupId>org.apache.druid</groupId>
<artifactId>druid-processing</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion cloud/aws-common/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
<dependencies>
<dependency>
<groupId>org.apache.druid</groupId>
<artifactId>druid-core</artifactId>
<artifactId>druid-processing</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion cloud/gcp-common/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
<dependencies>
<dependency>
<groupId>org.apache.druid</groupId>
<artifactId>druid-core</artifactId>
<artifactId>druid-processing</artifactId>
<version>${project.parent.version}</version>
<scope>provided</scope>
</dependency>
Expand Down
Loading