Merge pull request #23 from urishapira/dev

reverted cslschema changes

LinuxPackage.nuspec

@@ -2,14 +2,14 @@
 <package >
   <metadata>
     <id>pq2json_linux</id>
-    <version>0.1.15</version>
+    <version>0.1.16</version>
     <authors>Evgeney Ryzhyk</authors>
     <owners>Evgeney Ryzhyk</owners>
     <license type="expression">MIT</license>
     <projectUrl>https://github.com/Azure/azure-kusto-parquet-conv</projectUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <description>Parquet to JSON (line delimited) converter tool.</description>
-    <releaseNotes>Updated cslschema handling of Int32, JSON and Decimal types.</releaseNotes>
+    <releaseNotes>Reverted cslschema changes for handling of Int32, JSON and Decimal types.</releaseNotes>
     <copyright>Copyright 2020</copyright>
     <tags></tags>
     <dependencies></dependencies>

Package.nuspec

@@ -2,14 +2,14 @@
 <package >
   <metadata>
     <id>pq2json</id>
-    <version>0.1.15</version>
+    <version>0.1.16</version>
     <authors>Evgeney Ryzhyk</authors>
     <owners>Evgeney Ryzhyk</owners>
     <license type="expression">MIT</license>
     <projectUrl>https://github.com/Azure/azure-kusto-parquet-conv</projectUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <description>Parquet to JSON (line delimited) converter tool.</description>
-    <releaseNotes>Updated cslschema handling of Int32, JSON and Decimal types.</releaseNotes>
+    <releaseNotes>Reverted cslschema changes for handling of Int32, JSON and Decimal types.</releaseNotes>
     <copyright>Copyright 2020</copyright>
     <tags></tags>
     <dependencies></dependencies>

pq2json/src/schema.rs

@@ -81,19 +81,19 @@ fn field_csl_schema(field_type: &Type) -> (&str, &str) {
             let csl_type = match physical_type {
                 PhysicalType::BOOLEAN => "bool",
                 PhysicalType::BYTE_ARRAY => match basic_info.logical_type() {
-                    LogicalType::UTF8 | LogicalType::ENUM => "string",
-                    LogicalType::DECIMAL => "decimal",
+                    LogicalType::UTF8 | LogicalType::ENUM | LogicalType::JSON => "string",
+                    LogicalType::DECIMAL => "real",
                     _ => "dynamic",
                 },
                 PhysicalType::FIXED_LEN_BYTE_ARRAY => match basic_info.logical_type() {
-                    LogicalType::DECIMAL => "decimal",
+                    LogicalType::DECIMAL => "real",
                     _ => "dynamic",
                 },
                 PhysicalType::DOUBLE | PhysicalType::FLOAT => "real",
                 PhysicalType::INT32 => match basic_info.logical_type() {
                     LogicalType::DATE => "datetime",
                     LogicalType::DECIMAL => "real",
-                    _ => "int",
+                    _ => "long",
                 },
                 PhysicalType::INT64 => match basic_info.logical_type() {
                     LogicalType::TIMESTAMP_MILLIS | LogicalType::TIMESTAMP_MICROS => "datetime",