Merge pull request #541 from wes-johnson/develop

[#61] Optimized protobuf DataSet definition

Author: wes-johnson

specification/src/main/asciidoc/chapters/Sparkplug_6_Payloads.adoc

@@ -213,33 +213,23 @@ message Payload {
 
     message DataSet {
 
-        message DataSetValue {
-
-            oneof value {
-                uint32 int_value                        = 1;
-                uint64 long_value                       = 2;
-                float  float_value                      = 3;
-                double double_value                     = 4;
-                bool   boolean_value                    = 5;
-                string string_value                     = 6;
-                DataSetValueExtension extension_value   = 7;
-            }
-
-            message DataSetValueExtension {
-                extensions  1 to max;
-            }
-        }
-
-        message Row {
-            repeated DataSetValue elements  = 1;
-            extensions                      2 to max;   // For third party extensions
+        message Column {
+            optional string name = 1;
+            optional uint32 type = 2;
+
+            // Only one type of repeated value shall be used per Column
+            repeated uint32 int_values       = 3 [packed=true];
+            repeated uint64 long_values      = 4 [packed=true];
+            repeated float  float_values     = 5 [packed=true];
+            repeated double double_values    = 6 [packed=true];
+            repeated bool   boolean_values   = 7 [packed=true];
+            repeated string string_values    = 8 [packed=false];
+
+            extensions                       9 to max;
         }
 
-        optional uint64   num_of_columns    = 1;
-        repeated string   columns           = 2;
-        repeated uint32   types             = 3;
-        repeated Row      rows              = 4;
-        extensions                          5 to max;   // For third party extensions
+        repeated Column columns              = 1;
+        extensions                           2 to max;
     }
 
     message PropertyValue {