Skip to content

Commit cc23cd9

Browse files
henribhenrib
authored
Merge branch 'apache:master' into HIVE-29112 
2 parents 62ca967 + 30cdb88 commit cc23cd9

File tree

18 files changed

+1451
-1037
lines changed

18 files changed

+1451
-1037
lines changed

‎beeline/src/java/org/apache/hive/beeline/TableOutputFormat.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,14 +122,14 @@ ColorBuffer getOutputString(Rows rows, Rows.Row row, String delim) {
122122

123123
if (row.isMeta) {
124124
v = beeLine.getColorBuffer().center(row.values[i], row.sizes[i]);
125-
if (rows.isPrimaryKey(i)) {
125+
if (beeLine.getOpts().getColor() && rows.isPrimaryKey(i)) {
126126
buf.cyan(v.getMono());
127127
} else {
128128
buf.bold(v.getMono());
129129
}
130130
} else {
131131
v = beeLine.getColorBuffer().pad(row.values[i], row.sizes[i]);
132-
if (rows.isPrimaryKey(i)) {
132+
if (beeLine.getOpts().getColor() && rows.isPrimaryKey(i)) {
133133
buf.cyan(v.getMono());
134134
} else {
135135
buf.append(v.getMono());

‎itests/hive-blobstore/pom.xml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -288,10 +288,6 @@
288288
<groupId>com.fasterxml.jackson.core</groupId>
289289
<artifactId>jackson-databind</artifactId>
290290
</dependency>
291-
<dependency>
292-
<groupId>org.apache.calcite.avatica</groupId>
293-
<artifactId>avatica-core</artifactId>
294-
</dependency>
295291
<dependency>
296292
<groupId>org.apache.curator</groupId>
297293
<artifactId>curator-client</artifactId>

‎itests/qtest-druid/pom.xml

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
<!-- dependencies are always listed in sorted order by groupId, artifactId -->
3131
<properties>
3232
<hive.path.to.root>../..</hive.path.to.root>
33-
<druid.avatica.version>1.15.0</druid.avatica.version>
3433
<druid.curator.version>4.0.0</druid.curator.version>
3534
<druid.jersey.version>1.19.3</druid.jersey.version>
3635
<druid.jetty.version>9.4.57.v20241219</druid.jetty.version>
@@ -163,26 +162,6 @@
163162
<artifactId>curator-recipes</artifactId>
164163
<version>${druid.curator.version}</version>
165164
</dependency>
166-
<dependency>
167-
<groupId>org.apache.calcite.avatica</groupId>
168-
<artifactId>avatica</artifactId>
169-
<version>${avatica.version}</version>
170-
</dependency>
171-
<dependency>
172-
<groupId>org.apache.calcite.avatica</groupId>
173-
<artifactId>avatica-core</artifactId>
174-
<version>${avatica.version}</version>
175-
</dependency>
176-
<dependency>
177-
<groupId>org.apache.calcite.avatica</groupId>
178-
<artifactId>avatica-metrics</artifactId>
179-
<version>${avatica.version}</version>
180-
</dependency>
181-
<dependency>
182-
<groupId>org.apache.calcite.avatica</groupId>
183-
<artifactId>avatica-server</artifactId>
184-
<version>${avatica.version}</version>
185-
</dependency>
186165
<dependency>
187166
<groupId>com.sun.jersey</groupId>
188167
<artifactId>jersey-bundle</artifactId>

‎pom.xml

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,6 @@
111111
<!-- Make sure to sync it with standalone-metastore/pom.xml -->
112112
<antlr4.version>4.9.3</antlr4.version>
113113
<apache-directory-server.version>2.0.0-M24</apache-directory-server.version>
114-
<avatica.version>1.23.0</avatica.version>
115114
<avro.version>1.12.0</avro.version>
116115
<bcprov-jdk18on.version>1.78</bcprov-jdk18on.version>
117116
<calcite.version>1.33.0</calcite.version>
@@ -548,26 +547,6 @@
548547
<artifactId>accumulo-trace</artifactId>
549548
<version>${accumulo.version}</version>
550549
</dependency>
551-
<dependency>
552-
<groupId>org.apache.calcite.avatica</groupId>
553-
<artifactId>avatica</artifactId>
554-
<version>${avatica.version}</version>
555-
</dependency>
556-
<dependency>
557-
<groupId>org.apache.calcite.avatica</groupId>
558-
<artifactId>avatica-core</artifactId>
559-
<version>${avatica.version}</version>
560-
</dependency>
561-
<dependency>
562-
<groupId>org.apache.calcite.avatica</groupId>
563-
<artifactId>avatica-metrics</artifactId>
564-
<version>${avatica.version}</version>
565-
</dependency>
566-
<dependency>
567-
<groupId>org.apache.calcite.avatica</groupId>
568-
<artifactId>avatica-server</artifactId>
569-
<version>${avatica.version}</version>
570-
</dependency>
571550
<dependency>
572551
<groupId>org.apache.avro</groupId>
573552
<artifactId>avro</artifactId>

‎ql/pom.xml

Lines changed: 1 addition & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -481,55 +481,18 @@
481481
<groupId>org.yaml</groupId>
482482
<artifactId>snakeyaml</artifactId>
483483
</exclusion>
484-
<exclusion>
485-
<groupId>org.apache.calcite.avatica</groupId>
486-
<artifactId>avatica-core</artifactId>
487-
</exclusion>
488484
</exclusions>
489485
</dependency>
490486
<dependency>
491487
<groupId>org.apache.calcite</groupId>
492488
<artifactId>calcite-druid</artifactId>
493489
<exclusions>
494-
<exclusion>
495-
<groupId>org.apache.calcite.avatica</groupId>
496-
<artifactId>avatica-core</artifactId>
497-
</exclusion>
498490
<exclusion>
499491
<groupId>org.yaml</groupId>
500492
<artifactId>snakeyaml</artifactId>
501493
</exclusion>
502494
</exclusions>
503495
</dependency>
504-
<dependency>
505-
<groupId>org.apache.calcite.avatica</groupId>
506-
<artifactId>avatica</artifactId>
507-
<exclusions>
508-
<exclusion>
509-
<groupId>org.apache.calcite.avatica</groupId>
510-
<artifactId>avatica-core</artifactId>
511-
</exclusion>
512-
<!-- hsqldb interferes with the use of derby as the default db
513-
in hive's use of datanucleus.
514-
-->
515-
<exclusion>
516-
<groupId>org.hsqldb</groupId>
517-
<artifactId>hsqldb</artifactId>
518-
</exclusion>
519-
<exclusion>
520-
<groupId>com.fasterxml.jackson.core</groupId>
521-
<artifactId>jackson-databind</artifactId>
522-
</exclusion>
523-
<exclusion>
524-
<groupId>com.fasterxml.jackson.core</groupId>
525-
<artifactId>jackson-annotations</artifactId>
526-
</exclusion>
527-
<exclusion>
528-
<groupId>com.fasterxml.jackson.core</groupId>
529-
<artifactId>jackson-core</artifactId>
530-
</exclusion>
531-
</exclusions>
532-
</dependency>
533496
<dependency>
534497
<groupId>com.google.guava</groupId>
535498
<artifactId>guava</artifactId>
@@ -1127,7 +1090,7 @@
11271090
<include>com.zaxxer:HikariCP</include>
11281091
<include>org.apache.datasketches:*</include>
11291092
<include>org.apache.calcite:*</include>
1130-
<include>org.apache.calcite.avatica:avatica</include>
1093+
<include>org.apache.calcite.avatica:*</include>
11311094
<include>com.esri.geometry:esri-geometry-api</include>
11321095
<include>org.roaringbitmap:RoaringBitmap</include>
11331096
<include>com.github.luben:zstd-jni</include>
@@ -1136,15 +1099,6 @@
11361099
</includes>
11371100
</artifactSet>
11381101
<filters>
1139-
<filter>
1140-
<artifact>org.apache.calcite.avatica:avatica</artifact>
1141-
<excludes>
1142-
<!-- Exclude Avatica bundled SLF4J, because Hive manages its own SLF4J version. -->
1143-
<exclude>org/slf4j/**</exclude>
1144-
<exclude>META-INF/maven/org.slf4j/**</exclude>
1145-
<exclude>META-INF/licenses/slf4j*/**</exclude>
1146-
</excludes>
1147-
</filter>
11481102
<filter>
11491103
<artifact>*:*</artifact>
11501104
<excludes>

0 commit comments

Comments
 (0)