From b18c772bf69cbdadf5da911a71131bb84ce720af Mon Sep 17 00:00:00 2001
From: Marko Grujic <markoog@gmail.com>
Date: Mon, 25 Nov 2024 10:09:26 +0100
Subject: [PATCH] Add a MinIO-based Iceberg test

---
 ...a992f3e7-7f29-497a-976f-3456cf41ee20.parquet | Bin 0 -> 1037 bytes
 ...ac-bb31-4b25-a67a-8e5bbe2fb5d4.metadata.json |   1 +
 ...ec-944b-432d-a44f-78b5ec95aae2.metadata.json |   1 +
 ...a992f3e7-7f29-497a-976f-3456cf41ee20-m0.avro | Bin 0 -> 4319 bytes
 ...-0-a992f3e7-7f29-497a-976f-3456cf41ee20.avro | Bin 0 -> 1804 bytes
 tests/data/iceberg/iceberg_catalog.db           | Bin 0 -> 20480 bytes
 tests/statements/query.rs                       |  12 +++++++++---
 7 files changed, 11 insertions(+), 3 deletions(-)
 create mode 100644 tests/data/iceberg/default.db/iceberg_table/data/00000-0-a992f3e7-7f29-497a-976f-3456cf41ee20.parquet
 create mode 100644 tests/data/iceberg/default.db/iceberg_table/metadata/00000-6e75fdac-bb31-4b25-a67a-8e5bbe2fb5d4.metadata.json
 create mode 100644 tests/data/iceberg/default.db/iceberg_table/metadata/00001-f394d7ec-944b-432d-a44f-78b5ec95aae2.metadata.json
 create mode 100644 tests/data/iceberg/default.db/iceberg_table/metadata/a992f3e7-7f29-497a-976f-3456cf41ee20-m0.avro
 create mode 100644 tests/data/iceberg/default.db/iceberg_table/metadata/snap-1285208930498918146-0-a992f3e7-7f29-497a-976f-3456cf41ee20.avro
 create mode 100644 tests/data/iceberg/iceberg_catalog.db

diff --git a/tests/data/iceberg/default.db/iceberg_table/data/00000-0-a992f3e7-7f29-497a-976f-3456cf41ee20.parquet b/tests/data/iceberg/default.db/iceberg_table/data/00000-0-a992f3e7-7f29-497a-976f-3456cf41ee20.parquet
new file mode 100644
index 0000000000000000000000000000000000000000..c4415ca59ff85e91457e7cb31a78f7f97c9c5d95
GIT binary patch
literal 1037
zcmb_cJ#W)M7(RbA@{l1yoMj_RHAAfoX-gxyLWov6hq_9kYHZ04%4Sm6MRDrjG&Nyk
z<0mjNFd|lV#K6GBkLaIZK;nJx(n1ho>PdI+*K^N3@9FFw3%96BZQ6c9HA-#~()_gf
z({8*bL?VR9Fcp|8OiBQ8rv*!c)@aQ#RLmMG;&jsdBZ35HQSSnSa!H(Tl0{|HCAEfW
zD5G>v>$;}Dlk_i=6Fb`fn9LTaBUHxI8(=_&N_S~*N$u(np|UtjQS5nDte`n9(-bA1
z6tnVg@!O=S0M1ac2$*HPA5@Fh7kXDNl6;nO#qTBktK@uFoJ-kSCis_3^Px+O+H`oD
zjuWav4{L-sA3-y9@CET2aaGF#1-fQhX6r_;%DI6)^v|-cIhy`PxlM>^8FdzhNBsw)
zE#s}SiDRC5jIjVFj>n8u%*&Y1SjIXT&v^hiM6bhG7cInB79w<^0t1QIK?$Vy(TjkD
zF`rX&JdZI4SzM0C{`9yXq06`OrTYr^^G!Tvdsv_2!ad*fqTG+eIM^PH^ZeO<c#`ym
ze8BHtx8ij%5IQTNANEHK@{7?C`YH^0lJkq=BQ!}nb{D5!^$#|<z6XK-E%gvx(Mb@*
z2Voq=(b0G?8T4O{p0@Lmpw1YO!+FEStzmXg+%yO5>=47AB;|`)dcHoKOxBaKEGqjV
cEvL_mGkeS3xVO<ZTk!7i>3xLnss}%UUjxa|<p2Nx

literal 0
HcmV?d00001

diff --git a/tests/data/iceberg/default.db/iceberg_table/metadata/00000-6e75fdac-bb31-4b25-a67a-8e5bbe2fb5d4.metadata.json b/tests/data/iceberg/default.db/iceberg_table/metadata/00000-6e75fdac-bb31-4b25-a67a-8e5bbe2fb5d4.metadata.json
new file mode 100644
index 00000000..0a32a46f
--- /dev/null
+++ b/tests/data/iceberg/default.db/iceberg_table/metadata/00000-6e75fdac-bb31-4b25-a67a-8e5bbe2fb5d4.metadata.json
@@ -0,0 +1 @@
+{"location":"s3://seafowl-test-bucket/test-data/iceberg/default.db/iceberg_table","table-uuid":"16ebf585-ea7d-407a-b273-1c6d3ccb3375","last-updated-ms":1732524826682,"last-column-id":2,"schemas":[{"type":"struct","fields":[{"id":1,"name":"key","type":"int","required":true},{"id":2,"name":"value","type":"string","required":true}],"schema-id":0,"identifier-field-ids":[]}],"current-schema-id":0,"partition-specs":[{"spec-id":0,"fields":[]}],"default-spec-id":0,"last-partition-id":999,"properties":{},"snapshots":[],"snapshot-log":[],"metadata-log":[],"sort-orders":[{"order-id":0,"fields":[]}],"default-sort-order-id":0,"refs":{},"format-version":2,"last-sequence-number":0}
\ No newline at end of file
diff --git a/tests/data/iceberg/default.db/iceberg_table/metadata/00001-f394d7ec-944b-432d-a44f-78b5ec95aae2.metadata.json b/tests/data/iceberg/default.db/iceberg_table/metadata/00001-f394d7ec-944b-432d-a44f-78b5ec95aae2.metadata.json
new file mode 100644
index 00000000..9fb90b35
--- /dev/null
+++ b/tests/data/iceberg/default.db/iceberg_table/metadata/00001-f394d7ec-944b-432d-a44f-78b5ec95aae2.metadata.json
@@ -0,0 +1 @@
+{"location":"s3://seafowl-test-bucket/test-data/iceberg/default.db/iceberg_table","table-uuid":"16ebf585-ea7d-407a-b273-1c6d3ccb3375","last-updated-ms":1732524832199,"last-column-id":2,"schemas":[{"type":"struct","fields":[{"id":1,"name":"key","type":"int","required":true},{"id":2,"name":"value","type":"string","required":true}],"schema-id":0,"identifier-field-ids":[]}],"current-schema-id":0,"partition-specs":[{"spec-id":0,"fields":[]}],"default-spec-id":0,"last-partition-id":999,"properties":{},"current-snapshot-id":1285208930498918146,"snapshots":[{"snapshot-id":1285208930498918146,"sequence-number":1,"timestamp-ms":1732524832199,"manifest-list":"s3://seafowl-test-bucket/test-data/iceberg/default.db/iceberg_table/metadata/snap-1285208930498918146-0-a992f3e7-7f29-497a-976f-3456cf41ee20.avro","summary":{"operation":"append","added-files-size":"1037","added-data-files":"1","added-records":"4","total-data-files":"1","total-delete-files":"0","total-records":"4","total-files-size":"1037","total-position-deletes":"0","total-equality-deletes":"0"},"schema-id":0}],"snapshot-log":[{"snapshot-id":1285208930498918146,"timestamp-ms":1732524832199}],"metadata-log":[],"sort-orders":[{"order-id":0,"fields":[]}],"default-sort-order-id":0,"refs":{"main":{"snapshot-id":1285208930498918146,"type":"branch"}},"format-version":2,"last-sequence-number":1}
\ No newline at end of file
diff --git a/tests/data/iceberg/default.db/iceberg_table/metadata/a992f3e7-7f29-497a-976f-3456cf41ee20-m0.avro b/tests/data/iceberg/default.db/iceberg_table/metadata/a992f3e7-7f29-497a-976f-3456cf41ee20-m0.avro
new file mode 100644
index 0000000000000000000000000000000000000000..b3b21096537f3e87125143de2616531bd9000859
GIT binary patch
literal 4319
zcmb`K&2QsG6u{FEp&V8f2gGR)BXf-#e{`EBD<L86R$2+lesoV&WKHaGYifJUc-$(x
z$^nTp;>>|R0Eq(!&PW^(M=snD5(h5)2}nr1HxoN{(hY5zs%mY|%zJNs?_=J4GWm38
z_g?OwvxNT9er?EU#*C4XOHugJ=ow+e;vhFhr>~7DFh+LINNIvIF4z=?=hLGU=L+^&
z5eWv<U^Scd^b)69a!KQYEf#@}C_P(UH|`nQ9uqZMJy6V28G$9jROY~Uv}ioLpHU$r
z8S&K2Gv;?r$42uD%xqitLoO03%}XY7nA&!BeV$4X*$t?q@6k)a_q4(<AC>?JY{usz
zFnXjyK!AbXJOMsb7I`(QEF~69)<B4XL}oowTanT%Kj+eeO_f6RGJCP?)JTgs#_^Z~
znlU^CETly&jS<12rbyt;QlEKgkxZCa66<a%HjHBC<!fc{Zz>y!d#GT^SZ5*drY@K}
zaY>Nv)@)N=K!)50e#Q~#B{~=gI&wtN_dUXekADcn4gg*9o1&3XdA_X3s=K?4<x1B_
z+@~0r<mK}x<SLTq<md%aQO25aq2z0$Ry5Qi12a-(OQm6>-BjtZqU**Uz@RMCK-iXp
z+bIb@E%T9}qlqlCnDz9wDVflm1q6`DbB3&S<`T@@CK8=`p3e&`EAs@L=ZaMeYn>zu
z?Z+w&2oH&tkdsI&L&i-Nih3TsVqTPblc{9OxolhYI8xcTP;|m2jS0#iC<E1K8IAPx
zd0Zr^hci~CAA+=bt*DZI5&2XI3gs2bh-3-WI;bOMVOi9r(g_!~J@77V`><k#D{93`
zmFh}enG|Iyg}ET0VfnmJFP4=1Z>%|-jnVZnKZ|@CpQwX_7zxdc*%(<h3KxFRS@<!{
z&_$XKi2@=y{31}r65=C>@{6XsltDTmR#6T?_V!Q?0i|Qz0p;-aC>?9tC{^zCATa&7
z2%v7L!-LQ?AjkB$$rg_lZyjK}R_N{?tB#F;oy`F|_6C5R?Eyw!MDc<c#tPLiC#C6H
znC@Vk(dr%oOn10BO!u&1{f!de9c~jQb}m>CATBl4s%q;B(Zn0`D<-@NaEBHUNY)FI
z^I)53odb;1L8au@HPty-kM`PA#~EyotztzKt0u%E%iaues|S;V)zrO1HFf@{nqCXh
z-C{XatgeFyhpLw_NwLwXf@I#LxV6Tus+fkhbqqoJrlaw3>WgWn+C~shO7Ub8^GVZ%
zc@{^~<6)RHxsnKOt(U9RFFJ^-xnMC%;2KmKjh$85Z|K%)?K%DeO^|c~O;Bk^BjDiz
zL1D%eE<CFi-Y`{{EIhcKg-3XIg$^Sp1$Lg$X9P?#kwhsYf?tu+LhRqF=Kyp{xF$ez
zm+vh>=K`3E0Fr0*61RWdDXDs`bsm562zu2_upDo=a7^c*0<I#U0xv4iDMz_7MYmLC
z$0wlaR=z1eBs7gemP-%Bh^aAqS6ym-9x%U)=T&R=?E4SC`m6Z7>wk04`r*gF+uy#`
zZh!InpTGS2-M_!R-)gn~*~#5ezn?Q2@~hZ{hFF@D!oOg$ubwf?`;pI}TA%gj@w*pH
z%1@pOgua?(;g4yVbU1WEmkrE8=nT#M;eeXM!9i%c`wtHMaNlOkvG(S7uHB~}K7aP|
z@k#gVciNryPdlBTcUth!?R4>9tJ7+=)%y;Z+UbV85PBG2-<DS##@k(ZS>ES={1G{!

literal 0
HcmV?d00001

diff --git a/tests/data/iceberg/default.db/iceberg_table/metadata/snap-1285208930498918146-0-a992f3e7-7f29-497a-976f-3456cf41ee20.avro b/tests/data/iceberg/default.db/iceberg_table/metadata/snap-1285208930498918146-0-a992f3e7-7f29-497a-976f-3456cf41ee20.avro
new file mode 100644
index 0000000000000000000000000000000000000000..ad51d6947d71fdb6e805758038e2051f98caa00d
GIT binary patch
literal 1804
zcmb7FJ#W-N5WTockrF|JkYx~69Dm%WQ_vtGkPrwERfMeddYoHg@0#6pj#G3U|AL+h
zD50aKOaUDY5)yr=k=VUEUp8^#gwEQX_ukCgnepS~<=VzoK~X8jOu8h!9fYHP=#QeV
z--||3FbaBuTP5N^rE7$(KVlSa2zXTi#o*GaNPt_x^^EZXNp~N(AdFh!RkY99mcU~u
z(8p^Bj+~a@Y}*b8%y{Z-+D=9wPlY<$IdCW{=C=i+Bm*Ji63Ou@NM)zO`o6DFHII;-
z&|MvpGOURoGK{2>wx2(JU{8n~+xMQ?bA51ToAwzRIndoRR02aKXG-G)S~((#)`>+4
zI98d}rPNu52A)uP5{?;_%F)xHVAuw#-HsP-H^6-Z+|0NjD%a(EoyRa}Wk6{PX<RqK
zSv7YrfzL<|BF3z0mhblre8V$%O@vgB9k(%<9yAzI$U&+S+6YVw8UzamIGdbPKwv(4
z^9fcJv@o<=SXa<OV0ze0Vb!<dbo=;5@9j9W%5xQQJg|s!G}Rd8VWF47au`SIh)5{(
z1RqDYkGJlAM5s`0I9FNhfSNHfnjm2;2Sl60vw*7`6+GV{OLU;~SuTfF6;4g_LS3ei
zp(>XuU9Em%sB<;}9w(|b8{-@pOUK}yN)XNktW{Z_%W5o{OR#F8dPVZSKXPWX3$*uO
z8W$i@iX>`SWf=XR;;a3vC&`&znJ;<FQo!rl)Xx2He-7W@Ir>aL{oWWq`SsR%XC1AH
z?zZO%KpC6luJTQ~Nrm@7dh>6cp+_*N-^i}Fe50*2sgGibk{rCc77s;Hm~~<34zn<F
yd(jZN(QuHt-Cloyvt9rY`flNG>CC>|?Q|^b&5xg74?q0<e$(o7*406$k>x*AoIcqA

literal 0
HcmV?d00001

diff --git a/tests/data/iceberg/iceberg_catalog.db b/tests/data/iceberg/iceberg_catalog.db
new file mode 100644
index 0000000000000000000000000000000000000000..698e7e35993886e4069fde74290a88c257c52cc9
GIT binary patch
literal 20480
zcmeI&J#W)M7zglkoAf1W8<0Q&mEkrLDUS1EH!TbhDoY?j3!xNsvd;Dyxpm_Z+ofHj
zek;BN3rlCj(l5Zs#m-ABnouE@NdJ=)pY6x-<@dzHJ<j`gO*iD!@w>+?q&0GfND_HY
zDIp|1c!^cq=EQqy(C@FLEB#5`G$|c^Th0C=sg(<|7G=M#T&z8s6pZ~4fB*y_009U<
z00Izz00jO`p!aNkF{kU&xfC+f<F3U`-u+~>*)b0~%;H9;>vwoJba^oCSZceaH}-V8
z*Lcy?>9k0i&n#OkWS*Z~h3+?6+b<ifd{xs5bZ2*u?tExAi!`%58pGs}!Qjq}BYt*^
zs1xQzd=ytHm&@0$__p=xO`~-{U+V`ne|3;WIvPxoUcG1`Q}~!#$Q|htaoaXO4L*Bf
zqG+%v^y6(~8ii4rb~N4FmKJk`f^^=vmYR5Dl#FC+?neIP*zLjN_;Kn-P=91*95^}V
zn1{?3c{V&>NV<M|6dJqt6Wr<Y6W5Od;})?~QZpV+{EIEp@eYxmr*jLr-NN6}6Q2@{
z6OwGti+gIRe_ySNm$deshy@J-5P$##AOHafKmY;|fB*y_Fk1q>ytH(8{c$hX%LO%?
zJ1p|TVL>99|JI%;O2C=pfAQpy2cc|6))5btxZj`LD}#7taC*r$hr5jUBb4FPUJ=EX
zaz%D(TdG~>mb|5^rmWVgw#-!3k?WhL#;q-lF<vbV&nX=SemnTzgDA@zyskMmvt-k(
zRb<tyYBJlXGkKG1rpc?0soCoFL1aW`rR)zP7BmPz00Izz00bZa0SG_<0uX=z1ZG%Z
zJuQkM%Qsg-;^+U_pF}KZ5P$##AOHafKmY;|fB*y_009Whw7>&NlmH&yAC&<3sT+hr
x*o}Dd{Qr_<FK7A-V(<`v00bZa0SG_<0uX=z1Rwwb2qXgc`Za*@-vE*tz;7ovmQDZw

literal 0
HcmV?d00001

diff --git a/tests/statements/query.rs b/tests/statements/query.rs
index 8a0f357b..67c3ac77 100644
--- a/tests/statements/query.rs
+++ b/tests/statements/query.rs
@@ -370,7 +370,6 @@ async fn test_delta_tables() {
     assert_batches_eq!(expected, &results);
 }
 
-#[ignore]
 #[tokio::test]
 async fn test_iceberg_tables() {
     let (context, _) = make_context_with_pg(ObjectStoreType::InMemory).await;
@@ -379,14 +378,21 @@ async fn test_iceberg_tables() {
         .plan_query(
             "CREATE EXTERNAL TABLE test_iceberg \
             STORED AS ICEBERG \
-            LOCATION 'tests/data/iceberg/tables/default.db/iceberg_table/metadata/00001-f18ddde7-9d9d-40e0-9778-d346b5bb7393.metadata.json'",
+            LOCATION 's3://seafowl-test-bucket/test-data/iceberg/default.db/iceberg_table/metadata/00001-f394d7ec-944b-432d-a44f-78b5ec95aae2.metadata.json' \
+            OPTIONS (\
+                's3.access-key-id' 'minioadmin', \
+                's3.secret-access-key' 'minioadmin', \
+                's3.endpoint' 'http://127.0.0.1:9000', \
+                'allow_http' 'true', \
+                's3.region' 'us-east-1'\
+            )",
         )
         .await
         .unwrap();
 
     // The order gets randomized so we need to enforce it
     let plan = context
-        .plan_query("SELECT * FROM staging.test_iceberg")
+        .plan_query("SELECT * FROM staging.test_iceberg ORDER BY key")
         .await
         .unwrap();
     let results = context.collect(plan).await.unwrap();