Skip to content

Commit 5bdd3ac

Browse files
committed
Revert "feat(plugin-pinot): Upgrade Pinot version to 1.3.0 & move off of presto-pinot-driver (prestodb#25785)"
This reverts commit 267f823.
1 parent 7e97e8c commit 5bdd3ac

File tree

9 files changed

+292
-272
lines changed

9 files changed

+292
-272
lines changed

pom.xml

Lines changed: 20 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -58,15 +58,15 @@
5858
<dep.joda.version>2.13.1</dep.joda.version>
5959
<dep.tempto.version>1.55</dep.tempto.version>
6060
<dep.testng.version>7.5</dep.testng.version>
61-
<dep.lucene.version>9.12.0</dep.lucene.version>
61+
<dep.lucene.version>8.11.3</dep.lucene.version>
6262
<dep.assertj-core.version>3.8.0</dep.assertj-core.version>
6363
<dep.parquet.version>1.13.1</dep.parquet.version>
6464
<dep.asm.version>9.7.1</dep.asm.version>
6565
<dep.gcs.version>1.9.17</dep.gcs.version>
6666
<dep.alluxio.version>313</dep.alluxio.version>
6767
<dep.slf4j.version>2.0.16</dep.slf4j.version>
6868
<dep.kafka.version>3.9.1</dep.kafka.version>
69-
<dep.pinot.version>1.3.0</dep.pinot.version>
69+
<dep.pinot.version>0.11.0</dep.pinot.version>
7070
<dep.druid.version>30.0.1</dep.druid.version>
7171
<dep.jaxb.version>2.3.1</dep.jaxb.version>
7272
<dep.jaxb.runtime.version>4.0.5</dep.jaxb.runtime.version>
@@ -80,7 +80,7 @@
8080
<dep.jackson.version>2.15.4</dep.jackson.version>
8181
<dep.j2objc.version>3.0.0</dep.j2objc.version>
8282
<dep.avro.version>1.11.4</dep.avro.version>
83-
<dep.commons.compress.version>1.27.1</dep.commons.compress.version>
83+
<dep.commons.compress.version>1.26.2</dep.commons.compress.version>
8484
<dep.protobuf-java.version>4.29.0</dep.protobuf-java.version>
8585
<dep.jetty.version>12.0.18</dep.jetty.version>
8686
<dep.netty.version>4.1.128.Final</dep.netty.version>
@@ -108,14 +108,8 @@
108108
<air.test.jvmsize>4g</air.test.jvmsize>
109109
<grpc.version>1.75.0</grpc.version>
110110
<air.javadoc.lint>-missing</air.javadoc.lint>
111-
<dep.commons.codec.version>1.17.2</dep.commons.codec.version>
111+
<dep.commons.codec.version>1.17.1</dep.commons.codec.version>
112112
<aws.sdk.version>2.32.9</aws.sdk.version>
113-
<dep.jts.version>1.19.0</dep.jts.version>
114-
115-
<dep.fastutil.version>8.5.2</dep.fastutil.version>
116-
<dep.datasketches-memory.version>2.2.0</dep.datasketches-memory.version>
117-
<dep.datasketches-java.version>5.0.1</dep.datasketches-java.version>
118-
119113
<release.autoPublish>true</release.autoPublish>
120114
</properties>
121115

@@ -416,7 +410,7 @@
416410
<dependency>
417411
<groupId>commons-io</groupId>
418412
<artifactId>commons-io</artifactId>
419-
<version>2.18.0</version>
413+
<version>2.16.1</version>
420414
</dependency>
421415

422416
<dependency>
@@ -1492,7 +1486,7 @@
14921486
<dependency>
14931487
<groupId>it.unimi.dsi</groupId>
14941488
<artifactId>fastutil</artifactId>
1495-
<version>${dep.fastutil.version}</version>
1489+
<version>8.5.2</version>
14961490
</dependency>
14971491

14981492
<dependency>
@@ -2137,24 +2131,6 @@
21372131
<version>9.6.3-4</version>
21382132
</dependency>
21392133

2140-
<dependency>
2141-
<groupId>org.apache.pinot</groupId>
2142-
<artifactId>pinot-spi</artifactId>
2143-
<version>${dep.pinot.version}</version>
2144-
</dependency>
2145-
2146-
<dependency>
2147-
<groupId>org.apache.pinot</groupId>
2148-
<artifactId>pinot-common</artifactId>
2149-
<version>${dep.pinot.version}</version>
2150-
</dependency>
2151-
2152-
<dependency>
2153-
<groupId>org.apache.pinot</groupId>
2154-
<artifactId>pinot-core</artifactId>
2155-
<version>${dep.pinot.version}</version>
2156-
</dependency>
2157-
21582134
<dependency>
21592135
<groupId>org.apache.kafka</groupId>
21602136
<artifactId>kafka_2.12</artifactId>
@@ -2303,16 +2279,22 @@
23032279
<version>${dep.kafka.version}</version>
23042280
</dependency>
23052281

2282+
<dependency>
2283+
<groupId>org.apache.pinot</groupId>
2284+
<artifactId>presto-pinot-driver</artifactId>
2285+
<version>${dep.pinot.version}</version>
2286+
</dependency>
2287+
23062288
<dependency>
23072289
<groupId>org.xerial.snappy</groupId>
23082290
<artifactId>snappy-java</artifactId>
2309-
<version>1.1.10.7</version>
2291+
<version>1.1.10.4</version>
23102292
</dependency>
23112293

23122294
<dependency>
23132295
<groupId>com.github.luben</groupId>
23142296
<artifactId>zstd-jni</artifactId>
2315-
<version>1.5.6-9</version>
2297+
<version>1.5.2-3</version>
23162298
</dependency>
23172299

23182300
<dependency>
@@ -2481,7 +2463,7 @@
24812463

24822464
<dependency>
24832465
<groupId>org.apache.lucene</groupId>
2484-
<artifactId>lucene-analysis-common</artifactId>
2466+
<artifactId>lucene-analyzers-common</artifactId>
24852467
<version>${dep.lucene.version}</version>
24862468
</dependency>
24872469

@@ -2494,13 +2476,13 @@
24942476
<dependency>
24952477
<groupId>org.locationtech.jts</groupId>
24962478
<artifactId>jts-core</artifactId>
2497-
<version>${dep.jts.version}</version>
2479+
<version>1.19.0</version>
24982480
</dependency>
24992481

25002482
<dependency>
25012483
<groupId>org.locationtech.jts.io</groupId>
25022484
<artifactId>jts-io-common</artifactId>
2503-
<version>${dep.jts.version}</version>
2485+
<version>1.19.0</version>
25042486
<exclusions>
25052487
<exclusion>
25062488
<groupId>junit</groupId>
@@ -2569,7 +2551,7 @@
25692551
<dependency>
25702552
<groupId>com.clearspring.analytics</groupId>
25712553
<artifactId>stream</artifactId>
2572-
<version>2.9.8</version>
2554+
<version>2.9.5</version>
25732555
</dependency>
25742556

25752557
<dependency>
@@ -2629,13 +2611,13 @@
26292611
<dependency>
26302612
<groupId>org.apache.datasketches</groupId>
26312613
<artifactId>datasketches-memory</artifactId>
2632-
<version>${dep.datasketches-memory.version}</version>
2614+
<version>2.2.0</version>
26332615
</dependency>
26342616

26352617
<dependency>
26362618
<groupId>org.apache.datasketches</groupId>
26372619
<artifactId>datasketches-java</artifactId>
2638-
<version>${dep.datasketches-java.version}</version>
2620+
<version>5.0.1</version>
26392621
</dependency>
26402622

26412623
<dependency>

presto-elasticsearch/pom.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
<dep.elasticsearch.version>7.17.27</dep.elasticsearch.version>
1717
<dep.log4j.version>2.24.3</dep.log4j.version>
1818
<air.check.skip-modernizer>true</air.check.skip-modernizer>
19-
<dep.lucene.version>8.11.3</dep.lucene.version>
2019
</properties>
2120

2221
<dependencies>

presto-main-base/pom.xml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
<air.main.basedir>${project.parent.basedir}</air.main.basedir>
1616
<project.build.targetJdk>8</project.build.targetJdk>
1717
<air.check.skip-modernizer>true</air.check.skip-modernizer>
18-
<dep.lucene.version>8.11.3</dep.lucene.version>
1918
</properties>
2019

2120
<dependencies>
@@ -307,7 +306,6 @@
307306
<dependency>
308307
<groupId>org.apache.lucene</groupId>
309308
<artifactId>lucene-analyzers-common</artifactId>
310-
<version>${dep.lucene.version}</version>
311309
</dependency>
312310

313311
<dependency>

0 commit comments

Comments
 (0)