Bump schema-ddl to 0.27.0-M1 (#1370)

snowplow · Dec 17, 2024 · a9ee384 · a9ee384
1 parent 1433ee2
commit a9ee384
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 21 deletions.
diff --git a/...common-transformer-stream/src/test/resources/processing-spec/4/output/good/parquet/schema b/...common-transformer-stream/src/test/resources/processing-spec/4/output/good/parquet/schema
@@ -242,12 +242,12 @@ message snowplow {
   optional group contexts_com_snowplowanalytics_snowplow_client_session_1 (LIST) {
     repeated group list {
       required group element {
-        optional binary first_event_id (UTF8);
         optional binary previous_session_id (UTF8);
         required binary session_id (UTF8);
         required int32 session_index;
         required binary storage_mechanism (UTF8);
         required binary user_id (UTF8);
+        optional binary first_event_id (UTF8);
       }
     }
   }
@@ -373,9 +373,9 @@ message snowplow {
         required binary element (UTF8);
       }
     }
-    optional binary element_content (UTF8);
     optional binary element_id (UTF8);
     optional binary element_target (UTF8);
     required binary target_url (UTF8);
+    optional binary element_content (UTF8);
   }
 }
diff --git a/...common-transformer-stream/src/test/resources/processing-spec/5/output/good/parquet/schema b/...common-transformer-stream/src/test/resources/processing-spec/5/output/good/parquet/schema
@@ -242,12 +242,12 @@ message snowplow {
   optional group contexts_com_snowplowanalytics_snowplow_client_session_1 (LIST) {
     repeated group list {
       required group element {
-        optional binary first_event_id (STRING);
         optional binary previous_session_id (STRING);
         required binary session_id (STRING);
         required int32 session_index;
         required binary storage_mechanism (STRING);
         required binary user_id (STRING);
+        optional binary first_event_id (STRING);
       }
     }
   }
@@ -293,21 +293,21 @@ message snowplow {
           optional binary d_field (STRING);
         }
         required int64 b_field;
-        optional boolean c_field;
         optional double d_field;
         optional binary e_field (JSON);
-        optional binary f_field (JSON);
         optional binary g_field (STRING);
         optional int64 h_field (TIMESTAMP(MICROS,true));
         optional group i_field (LIST) {
           repeated group list {
             required group element {
-              optional binary b_field (STRING);
               optional int64 c_field;
               optional binary d_field (STRING);
+              optional binary b_field (STRING);
             }
           }
         }
+        optional boolean c_field;
+        optional binary f_field (JSON);
         optional group j_field {
           optional binary union (JSON);
         }
@@ -380,9 +380,9 @@ message snowplow {
         required binary element (STRING);
       }
     }
-    optional binary element_content (STRING);
     optional binary element_id (STRING);
     optional binary element_target (STRING);
     required binary target_url (STRING);
+    optional binary element_content (STRING);
   }
 }
diff --git a/...common-transformer-stream/src/test/resources/processing-spec/6/output/good/parquet/schema b/...common-transformer-stream/src/test/resources/processing-spec/6/output/good/parquet/schema
@@ -242,12 +242,12 @@ message snowplow {
   optional group contexts_com_snowplowanalytics_snowplow_client_session_1 (LIST) {
     repeated group list {
       required group element {
-        optional binary first_event_id (STRING);
         optional binary previous_session_id (STRING);
         required binary session_id (STRING);
         required int32 session_index;
         required binary storage_mechanism (STRING);
         required binary user_id (STRING);
+        optional binary first_event_id (STRING);
       }
     }
   }
@@ -325,21 +325,21 @@ message snowplow {
       optional binary d_field (STRING);
     }
     required int64 b_field;
-    optional boolean c_field;
     optional double d_field;
     optional binary e_field (JSON);
-    optional binary f_field (JSON);
     optional binary g_field (STRING);
     optional int64 h_field (TIMESTAMP(MICROS,true));
     optional group i_field (LIST) {
       repeated group list {
         required group element {
-          optional binary b_field (STRING);
           optional int64 c_field;
           optional binary d_field (STRING);
+          optional binary b_field (STRING);
         }
       }
     }
+    optional boolean c_field;
+    optional binary f_field (JSON);
     optional group j_field {
       optional binary union (JSON);
     }

diff --git a/...est/scala/com.snowplowanalytics.snowplow.rdbloader.common/ParquetFieldsProviderSpec.scala b/...est/scala/com.snowplowanalytics.snowplow.rdbloader.common/ParquetFieldsProviderSpec.scala
@@ -316,7 +316,6 @@ object ParquetFieldsProviderSpec {
           Required
         ),
         Field("b_field", Type.Long, Required),
-        Field("c_field", Type.Boolean, Nullable),
         Field("d_field", Type.Double, Nullable),
         Field("e_field", Type.Json, Nullable),
         Field("g_field", Type.String, Nullable),
@@ -333,7 +332,8 @@ object ParquetFieldsProviderSpec {
             Required
           ),
           Nullable
-        )
+        ),
+        Field("c_field", Type.Boolean, Nullable)
       )
     )
     val schema110 = Type.Struct(
@@ -359,10 +359,8 @@ object ParquetFieldsProviderSpec {
           Required
         ),
         Field("b_field", Type.Long, Required),
-        Field("c_field", Type.Boolean, Nullable),
         Field("d_field", Type.Double, Nullable),
         Field("e_field", Type.Json, Nullable),
-        Field("f_field", Type.Json, Nullable),
         Field("g_field", Type.String, Nullable),
         Field("h_field", Type.Timestamp, Nullable),
         Field(
@@ -377,7 +375,9 @@ object ParquetFieldsProviderSpec {
             Required
           ),
           Nullable
-        )
+        ),
+        Field("c_field", Type.Boolean, Nullable),
+        Field("f_field", Type.Json, Nullable)
       )
     )
 
@@ -393,8 +393,8 @@ object ParquetFieldsProviderSpec {
     val brokenSchema101 = Type.Struct(fields = NonEmptyVector.of(Field("b_field", Type.String, Nullable)))
     val brokenSchema110 = Type.Struct(fields =
       NonEmptyVector.of(
-        Field("a_field", Type.Long, Nullable),
-        Field("b_field", Type.Long, Nullable)
+        Field("b_field", Type.Long, Nullable),
+        Field("a_field", Type.Long, Nullable)
       )
     )
     val brokenSchema111 = Type.Struct(fields = NonEmptyVector.of(Field("a_field", Type.String, Nullable)))

diff --git a/modules/transformer-batch/src/test/resources/widerow/parquet/parquet-output-schema b/modules/transformer-batch/src/test/resources/widerow/parquet/parquet-output-schema
@@ -242,12 +242,12 @@ message spark_schema {
   optional group contexts_com_snowplowanalytics_snowplow_client_session_1 (LIST) {
     repeated group list {
       required group element {
-        optional binary first_event_id (UTF8);
         optional binary previous_session_id (UTF8);
         required binary session_id (UTF8);
         required int32 session_index;
         required binary storage_mechanism (UTF8);
         required binary user_id (UTF8);
+        optional binary first_event_id (UTF8);
       }
     }
   }
@@ -380,9 +380,9 @@ message spark_schema {
         required binary element (UTF8);
       }
     }
-    optional binary element_content (UTF8);
     optional binary element_id (UTF8);
     optional binary element_target (UTF8);
     required binary target_url (UTF8);
+    optional binary element_content (UTF8);
   }
 }
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -45,7 +45,7 @@ object Dependencies {
 
     val spark           = "3.3.1"
     val eventsManifest  = "0.4.0"
-    val schemaDdl       = "0.25.0"
+    val schemaDdl       = "0.27.0-M1"
     val jacksonModule   = "2.17.2" // Override incompatible version in spark runtime
     val jacksonDatabind = "2.17.2"
     val jacksonMapper   = "1.9.14-atlassian-6" // Fix CVE