Skip to content

Commit cbbdc82

Browse files
spenesspenes
committed
Bump schema-ddl to 0.27.0 (#1370)
1 parent 1433ee2 commit cbbdc82

File tree

6 files changed

+21
-21
lines changed

6 files changed

+21
-21
lines changed

‎modules/common-transformer-stream/src/test/resources/processing-spec/4/output/good/parquet/schema

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -242,12 +242,12 @@ message snowplow {
242242
optional group contexts_com_snowplowanalytics_snowplow_client_session_1 (LIST) {
243243
repeated group list {
244244
required group element {
245-
optional binary first_event_id (UTF8);
246245
optional binary previous_session_id (UTF8);
247246
required binary session_id (UTF8);
248247
required int32 session_index;
249248
required binary storage_mechanism (UTF8);
250249
required binary user_id (UTF8);
250+
optional binary first_event_id (UTF8);
251251
}
252252
}
253253
}
@@ -373,9 +373,9 @@ message snowplow {
373373
required binary element (UTF8);
374374
}
375375
}
376-
optional binary element_content (UTF8);
377376
optional binary element_id (UTF8);
378377
optional binary element_target (UTF8);
379378
required binary target_url (UTF8);
379+
optional binary element_content (UTF8);
380380
}
381381
}

‎modules/common-transformer-stream/src/test/resources/processing-spec/5/output/good/parquet/schema

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -242,12 +242,12 @@ message snowplow {
242242
optional group contexts_com_snowplowanalytics_snowplow_client_session_1 (LIST) {
243243
repeated group list {
244244
required group element {
245-
optional binary first_event_id (STRING);
246245
optional binary previous_session_id (STRING);
247246
required binary session_id (STRING);
248247
required int32 session_index;
249248
required binary storage_mechanism (STRING);
250249
required binary user_id (STRING);
250+
optional binary first_event_id (STRING);
251251
}
252252
}
253253
}
@@ -293,21 +293,21 @@ message snowplow {
293293
optional binary d_field (STRING);
294294
}
295295
required int64 b_field;
296-
optional boolean c_field;
297296
optional double d_field;
298297
optional binary e_field (JSON);
299-
optional binary f_field (JSON);
300298
optional binary g_field (STRING);
301299
optional int64 h_field (TIMESTAMP(MICROS,true));
302300
optional group i_field (LIST) {
303301
repeated group list {
304302
required group element {
305-
optional binary b_field (STRING);
306303
optional int64 c_field;
307304
optional binary d_field (STRING);
305+
optional binary b_field (STRING);
308306
}
309307
}
310308
}
309+
optional boolean c_field;
310+
optional binary f_field (JSON);
311311
optional group j_field {
312312
optional binary union (JSON);
313313
}
@@ -380,9 +380,9 @@ message snowplow {
380380
required binary element (STRING);
381381
}
382382
}
383-
optional binary element_content (STRING);
384383
optional binary element_id (STRING);
385384
optional binary element_target (STRING);
386385
required binary target_url (STRING);
386+
optional binary element_content (STRING);
387387
}
388388
}

‎modules/common-transformer-stream/src/test/resources/processing-spec/6/output/good/parquet/schema

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -242,12 +242,12 @@ message snowplow {
242242
optional group contexts_com_snowplowanalytics_snowplow_client_session_1 (LIST) {
243243
repeated group list {
244244
required group element {
245-
optional binary first_event_id (STRING);
246245
optional binary previous_session_id (STRING);
247246
required binary session_id (STRING);
248247
required int32 session_index;
249248
required binary storage_mechanism (STRING);
250249
required binary user_id (STRING);
250+
optional binary first_event_id (STRING);
251251
}
252252
}
253253
}
@@ -325,21 +325,21 @@ message snowplow {
325325
optional binary d_field (STRING);
326326
}
327327
required int64 b_field;
328-
optional boolean c_field;
329328
optional double d_field;
330329
optional binary e_field (JSON);
331-
optional binary f_field (JSON);
332330
optional binary g_field (STRING);
333331
optional int64 h_field (TIMESTAMP(MICROS,true));
334332
optional group i_field (LIST) {
335333
repeated group list {
336334
required group element {
337-
optional binary b_field (STRING);
338335
optional int64 c_field;
339336
optional binary d_field (STRING);
337+
optional binary b_field (STRING);
340338
}
341339
}
342340
}
341+
optional boolean c_field;
342+
optional binary f_field (JSON);
343343
optional group j_field {
344344
optional binary union (JSON);
345345
}

‎modules/common/src/test/scala/com.snowplowanalytics.snowplow.rdbloader.common/ParquetFieldsProviderSpec.scala

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -316,7 +316,6 @@ object ParquetFieldsProviderSpec {
316316
Required
317317
),
318318
Field("b_field", Type.Long, Required),
319-
Field("c_field", Type.Boolean, Nullable),
320319
Field("d_field", Type.Double, Nullable),
321320
Field("e_field", Type.Json, Nullable),
322321
Field("g_field", Type.String, Nullable),
@@ -333,7 +332,8 @@ object ParquetFieldsProviderSpec {
333332
Required
334333
),
335334
Nullable
336-
)
335+
),
336+
Field("c_field", Type.Boolean, Nullable)
337337
)
338338
)
339339
val schema110 = Type.Struct(
@@ -359,10 +359,8 @@ object ParquetFieldsProviderSpec {
359359
Required
360360
),
361361
Field("b_field", Type.Long, Required),
362-
Field("c_field", Type.Boolean, Nullable),
363362
Field("d_field", Type.Double, Nullable),
364363
Field("e_field", Type.Json, Nullable),
365-
Field("f_field", Type.Json, Nullable),
366364
Field("g_field", Type.String, Nullable),
367365
Field("h_field", Type.Timestamp, Nullable),
368366
Field(
@@ -377,7 +375,9 @@ object ParquetFieldsProviderSpec {
377375
Required
378376
),
379377
Nullable
380-
)
378+
),
379+
Field("c_field", Type.Boolean, Nullable),
380+
Field("f_field", Type.Json, Nullable)
381381
)
382382
)
383383

@@ -393,8 +393,8 @@ object ParquetFieldsProviderSpec {
393393
val brokenSchema101 = Type.Struct(fields = NonEmptyVector.of(Field("b_field", Type.String, Nullable)))
394394
val brokenSchema110 = Type.Struct(fields =
395395
NonEmptyVector.of(
396-
Field("a_field", Type.Long, Nullable),
397-
Field("b_field", Type.Long, Nullable)
396+
Field("b_field", Type.Long, Nullable),
397+
Field("a_field", Type.Long, Nullable)
398398
)
399399
)
400400
val brokenSchema111 = Type.Struct(fields = NonEmptyVector.of(Field("a_field", Type.String, Nullable)))

‎modules/transformer-batch/src/test/resources/widerow/parquet/parquet-output-schema

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -242,12 +242,12 @@ message spark_schema {
242242
optional group contexts_com_snowplowanalytics_snowplow_client_session_1 (LIST) {
243243
repeated group list {
244244
required group element {
245-
optional binary first_event_id (UTF8);
246245
optional binary previous_session_id (UTF8);
247246
required binary session_id (UTF8);
248247
required int32 session_index;
249248
required binary storage_mechanism (UTF8);
250249
required binary user_id (UTF8);
250+
optional binary first_event_id (UTF8);
251251
}
252252
}
253253
}
@@ -380,9 +380,9 @@ message spark_schema {
380380
required binary element (UTF8);
381381
}
382382
}
383-
optional binary element_content (UTF8);
384383
optional binary element_id (UTF8);
385384
optional binary element_target (UTF8);
386385
required binary target_url (UTF8);
386+
optional binary element_content (UTF8);
387387
}
388388
}

‎project/Dependencies.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ object Dependencies {
4545

4646
val spark = "3.3.1"
4747
val eventsManifest = "0.4.0"
48-
val schemaDdl = "0.25.0"
48+
val schemaDdl = "0.27.0"
4949
val jacksonModule = "2.17.2" // Override incompatible version in spark runtime
5050
val jacksonDatabind = "2.17.2"
5151
val jacksonMapper = "1.9.14-atlassian-6" // Fix CVE

0 commit comments

Comments
 (0)