Skip to content

Commit 40e8003

Browse files
author
gtret
committed
address comments + change to 1.9
1 parent 64fe1b9 commit 40e8003

File tree

8 files changed

+53
-48
lines changed

8 files changed

+53
-48
lines changed

‎gradle.properties‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@ elasticsearch.version=5.4.1
3131

3232
hive_version=1.2.1
3333

34-
iceberg_version=1.1.0
35-
iceberg_spark_version=3.3
36-
iceberg_scala_version=2.12
34+
iceberg_version=1.9.2
35+
iceberg_spark_version=3.5
36+
iceberg_scala_version=2.13
3737

3838
org.gradle.jvmargs=-Xmx1g
3939

‎metacat-app/dependencies.lock‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -517,11 +517,11 @@
517517
],
518518
"locked": "5.2.3"
519519
},
520-
"org.apache.iceberg:iceberg-spark-runtime-3.3_2.12": {
520+
"org.apache.iceberg:iceberg-spark-runtime-3.5_2.13": {
521521
"firstLevelTransitive": [
522522
"com.netflix.metacat:metacat-connector-hive"
523523
],
524-
"locked": "1.1.0"
524+
"locked": "1.9.2"
525525
},
526526
"org.apache.logging.log4j:log4j-core": {
527527
"firstLevelTransitive": [
@@ -995,11 +995,11 @@
995995
],
996996
"locked": "5.2.3"
997997
},
998-
"org.apache.iceberg:iceberg-spark-runtime-3.3_2.12": {
998+
"org.apache.iceberg:iceberg-spark-runtime-3.5_2.13": {
999999
"firstLevelTransitive": [
10001000
"com.netflix.metacat:metacat-connector-hive"
10011001
],
1002-
"locked": "1.1.0"
1002+
"locked": "1.9.2"
10031003
},
10041004
"org.apache.logging.log4j:log4j-core": {
10051005
"firstLevelTransitive": [
@@ -1719,11 +1719,11 @@
17191719
],
17201720
"locked": "5.2.3"
17211721
},
1722-
"org.apache.iceberg:iceberg-spark-runtime-3.3_2.12": {
1722+
"org.apache.iceberg:iceberg-spark-runtime-3.5_2.13": {
17231723
"firstLevelTransitive": [
17241724
"com.netflix.metacat:metacat-connector-hive"
17251725
],
1726-
"locked": "1.1.0"
1726+
"locked": "1.9.2"
17271727
},
17281728
"org.apache.logging.log4j:log4j-core": {
17291729
"firstLevelTransitive": [

‎metacat-connector-hive/dependencies.lock‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,8 @@
7777
"org.apache.hive:hive-metastore": {
7878
"locked": "1.2.1"
7979
},
80-
"org.apache.iceberg:iceberg-spark-runtime-3.3_2.12": {
81-
"locked": "1.1.0"
80+
"org.apache.iceberg:iceberg-spark-runtime-3.5_2.13": {
81+
"locked": "1.9.2"
8282
},
8383
"org.apache.tomcat:tomcat-jdbc": {
8484
"firstLevelTransitive": [
@@ -205,8 +205,8 @@
205205
"org.apache.hive:hive-metastore": {
206206
"locked": "1.2.1"
207207
},
208-
"org.apache.iceberg:iceberg-spark-runtime-3.3_2.12": {
209-
"locked": "1.1.0"
208+
"org.apache.iceberg:iceberg-spark-runtime-3.5_2.13": {
209+
"locked": "1.9.2"
210210
},
211211
"org.apache.tomcat:tomcat-jdbc": {
212212
"firstLevelTransitive": [
@@ -357,8 +357,8 @@
357357
"org.apache.hive:hive-metastore": {
358358
"locked": "1.2.1"
359359
},
360-
"org.apache.iceberg:iceberg-spark-runtime-3.3_2.12": {
361-
"locked": "1.1.0"
360+
"org.apache.iceberg:iceberg-spark-runtime-3.5_2.13": {
361+
"locked": "1.9.2"
362362
},
363363
"org.apache.tomcat:tomcat-jdbc": {
364364
"firstLevelTransitive": [
@@ -513,8 +513,8 @@
513513
"org.apache.hive:hive-metastore": {
514514
"locked": "1.2.1"
515515
},
516-
"org.apache.iceberg:iceberg-spark-runtime-3.3_2.12": {
517-
"locked": "1.1.0"
516+
"org.apache.iceberg:iceberg-spark-runtime-3.5_2.13": {
517+
"locked": "1.9.2"
518518
},
519519
"org.apache.tomcat:tomcat-jdbc": {
520520
"firstLevelTransitive": [

‎metacat-connector-hive/src/test/groovy/com/netflix/metacat/connector/hive/iceberg/IcebergVersionValidationSpec.groovy‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,12 @@
1616

1717
package com.netflix.metacat.connector.hive.iceberg
1818

19-
import org.apache.iceberg.*
19+
import org.apache.iceberg.BaseMetastoreTableOperations
20+
import org.apache.iceberg.ScanSummary
21+
import org.apache.iceberg.Schema
22+
import org.apache.iceberg.UpdateSchema
23+
import org.apache.iceberg.TableMetadata
24+
import org.apache.iceberg.TableMetadataParser
2025
import org.apache.iceberg.types.Types
2126
import spock.lang.Specification
2227

@@ -63,8 +68,8 @@ class IcebergVersionValidationSpec extends Specification {
6368
schema != null
6469
schema.columns().size() == 3
6570
schema.findField("name").doc() == "Test comment"
66-
schema.findField("id").isRequired() == true
67-
schema.findField("name").isOptional() == true
71+
schema.findField("id").isRequired()
72+
schema.findField("name").isOptional()
6873
}
6974

7075
def "test TableMetadataParser API exists"() {

‎metacat-connector-polaris/dependencies.lock‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -109,11 +109,11 @@
109109
],
110110
"locked": "1.2.1"
111111
},
112-
"org.apache.iceberg:iceberg-spark-runtime-3.3_2.12": {
112+
"org.apache.iceberg:iceberg-spark-runtime-3.5_2.13": {
113113
"firstLevelTransitive": [
114114
"com.netflix.metacat:metacat-connector-hive"
115115
],
116-
"locked": "1.1.0"
116+
"locked": "1.9.2"
117117
},
118118
"org.apache.tomcat:tomcat-jdbc": {
119119
"firstLevelTransitive": [
@@ -284,11 +284,11 @@
284284
],
285285
"locked": "1.2.1"
286286
},
287-
"org.apache.iceberg:iceberg-spark-runtime-3.3_2.12": {
287+
"org.apache.iceberg:iceberg-spark-runtime-3.5_2.13": {
288288
"firstLevelTransitive": [
289289
"com.netflix.metacat:metacat-connector-hive"
290290
],
291-
"locked": "1.1.0"
291+
"locked": "1.9.2"
292292
},
293293
"org.apache.tomcat:tomcat-jdbc": {
294294
"firstLevelTransitive": [
@@ -490,11 +490,11 @@
490490
],
491491
"locked": "1.2.1"
492492
},
493-
"org.apache.iceberg:iceberg-spark-runtime-3.3_2.12": {
493+
"org.apache.iceberg:iceberg-spark-runtime-3.5_2.13": {
494494
"firstLevelTransitive": [
495495
"com.netflix.metacat:metacat-connector-hive"
496496
],
497-
"locked": "1.1.0"
497+
"locked": "1.9.2"
498498
},
499499
"org.apache.tomcat:tomcat-jdbc": {
500500
"firstLevelTransitive": [
@@ -709,11 +709,11 @@
709709
],
710710
"locked": "1.2.1"
711711
},
712-
"org.apache.iceberg:iceberg-spark-runtime-3.3_2.12": {
712+
"org.apache.iceberg:iceberg-spark-runtime-3.5_2.13": {
713713
"firstLevelTransitive": [
714714
"com.netflix.metacat:metacat-connector-hive"
715715
],
716-
"locked": "1.1.0"
716+
"locked": "1.9.2"
717717
},
718718
"org.apache.tomcat:tomcat-jdbc": {
719719
"firstLevelTransitive": [
@@ -903,11 +903,11 @@
903903
],
904904
"locked": "1.2.1"
905905
},
906-
"org.apache.iceberg:iceberg-spark-runtime-3.3_2.12": {
906+
"org.apache.iceberg:iceberg-spark-runtime-3.5_2.13": {
907907
"firstLevelTransitive": [
908908
"com.netflix.metacat:metacat-connector-hive"
909909
],
910-
"locked": "1.1.0"
910+
"locked": "1.9.2"
911911
},
912912
"org.apache.tomcat:tomcat-jdbc": {
913913
"firstLevelTransitive": [
@@ -1109,11 +1109,11 @@
11091109
],
11101110
"locked": "1.2.1"
11111111
},
1112-
"org.apache.iceberg:iceberg-spark-runtime-3.3_2.12": {
1112+
"org.apache.iceberg:iceberg-spark-runtime-3.5_2.13": {
11131113
"firstLevelTransitive": [
11141114
"com.netflix.metacat:metacat-connector-hive"
11151115
],
1116-
"locked": "1.1.0"
1116+
"locked": "1.9.2"
11171117
},
11181118
"org.apache.tomcat:tomcat-jdbc": {
11191119
"firstLevelTransitive": [

‎metacat-functional-tests/dependencies.lock‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -174,11 +174,11 @@
174174
],
175175
"locked": "1.2.1"
176176
},
177-
"org.apache.iceberg:iceberg-spark-runtime-3.3_2.12": {
177+
"org.apache.iceberg:iceberg-spark-runtime-3.5_2.13": {
178178
"firstLevelTransitive": [
179179
"com.netflix.metacat:metacat-connector-hive"
180180
],
181-
"locked": "1.1.0"
181+
"locked": "1.9.2"
182182
},
183183
"org.apache.tomcat:tomcat-jdbc": {
184184
"firstLevelTransitive": [
@@ -414,11 +414,11 @@
414414
],
415415
"locked": "1.2.1"
416416
},
417-
"org.apache.iceberg:iceberg-spark-runtime-3.3_2.12": {
417+
"org.apache.iceberg:iceberg-spark-runtime-3.5_2.13": {
418418
"firstLevelTransitive": [
419419
"com.netflix.metacat:metacat-connector-hive"
420420
],
421-
"locked": "1.1.0"
421+
"locked": "1.9.2"
422422
},
423423
"org.apache.tomcat:tomcat-jdbc": {
424424
"firstLevelTransitive": [
@@ -650,11 +650,11 @@
650650
],
651651
"locked": "1.2.1"
652652
},
653-
"org.apache.iceberg:iceberg-spark-runtime-3.3_2.12": {
653+
"org.apache.iceberg:iceberg-spark-runtime-3.5_2.13": {
654654
"firstLevelTransitive": [
655655
"com.netflix.metacat:metacat-connector-hive"
656656
],
657-
"locked": "1.1.0"
657+
"locked": "1.9.2"
658658
},
659659
"org.apache.tomcat:tomcat-jdbc": {
660660
"firstLevelTransitive": [
@@ -852,11 +852,11 @@
852852
],
853853
"locked": "1.2.1"
854854
},
855-
"org.apache.iceberg:iceberg-spark-runtime-3.3_2.12": {
855+
"org.apache.iceberg:iceberg-spark-runtime-3.5_2.13": {
856856
"firstLevelTransitive": [
857857
"com.netflix.metacat:metacat-connector-hive"
858858
],
859-
"locked": "1.1.0"
859+
"locked": "1.9.2"
860860
},
861861
"org.apache.tomcat:tomcat-jdbc": {
862862
"firstLevelTransitive": [

‎metacat-main/dependencies.lock‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -441,11 +441,11 @@
441441
],
442442
"locked": "5.2.3"
443443
},
444-
"org.apache.iceberg:iceberg-spark-runtime-3.3_2.12": {
444+
"org.apache.iceberg:iceberg-spark-runtime-3.5_2.13": {
445445
"firstLevelTransitive": [
446446
"com.netflix.metacat:metacat-connector-hive"
447447
],
448-
"locked": "1.1.0"
448+
"locked": "1.9.2"
449449
},
450450
"org.apache.logging.log4j:log4j-core": {
451451
"locked": "2.21.1"
@@ -1086,11 +1086,11 @@
10861086
],
10871087
"locked": "5.2.3"
10881088
},
1089-
"org.apache.iceberg:iceberg-spark-runtime-3.3_2.12": {
1089+
"org.apache.iceberg:iceberg-spark-runtime-3.5_2.13": {
10901090
"firstLevelTransitive": [
10911091
"com.netflix.metacat:metacat-connector-hive"
10921092
],
1093-
"locked": "1.1.0"
1093+
"locked": "1.9.2"
10941094
},
10951095
"org.apache.logging.log4j:log4j-core": {
10961096
"locked": "2.21.1"

‎metacat-war/dependencies.lock‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -523,11 +523,11 @@
523523
],
524524
"locked": "5.2.3"
525525
},
526-
"org.apache.iceberg:iceberg-spark-runtime-3.3_2.12": {
526+
"org.apache.iceberg:iceberg-spark-runtime-3.5_2.13": {
527527
"firstLevelTransitive": [
528528
"com.netflix.metacat:metacat-connector-hive"
529529
],
530-
"locked": "1.1.0"
530+
"locked": "1.9.2"
531531
},
532532
"org.apache.logging.log4j:log4j-core": {
533533
"firstLevelTransitive": [
@@ -1250,11 +1250,11 @@
12501250
],
12511251
"locked": "5.2.3"
12521252
},
1253-
"org.apache.iceberg:iceberg-spark-runtime-3.3_2.12": {
1253+
"org.apache.iceberg:iceberg-spark-runtime-3.5_2.13": {
12541254
"firstLevelTransitive": [
12551255
"com.netflix.metacat:metacat-connector-hive"
12561256
],
1257-
"locked": "1.1.0"
1257+
"locked": "1.9.2"
12581258
},
12591259
"org.apache.logging.log4j:log4j-core": {
12601260
"firstLevelTransitive": [

0 commit comments

Comments
 (0)