Revert "[Storage] Support Parquet in Quick query (#15539)" (#15568)

blueww · dingmeng-xue · web-flow · commit 05c85c289ab6 · 2021-07-28T12:34:43.000+08:00
This reverts commit 862d3c4. Co-authored-by: Dingmeng Xue <dixue@microsoft.com>
diff --git a/src/Storage/Storage.Management.Test/Storage.Management.Test.csproj b/src/Storage/Storage.Management.Test/Storage.Management.Test.csproj
@@ -11,10 +11,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Azure.Storage.Blobs" Version="12.10.0-beta.2" />
-    <PackageReference Include="Azure.Storage.Files.DataLake" Version="12.8.0-beta.2" />
-    <PackageReference Include="Azure.Storage.Files.Shares" Version="12.8.0-beta.2" />
-    <PackageReference Include="Azure.Storage.Queues" Version="12.8.0-beta.2" />
+    <PackageReference Include="Azure.Storage.Blobs" Version="12.8.0" />
+    <PackageReference Include="Azure.Storage.Files.DataLake" Version="12.6.0" />
+    <PackageReference Include="Azure.Storage.Files.Shares" Version="12.6.0" />
+    <PackageReference Include="Azure.Storage.Queues" Version="12.6.0" />
     <PackageReference Include="Microsoft.Azure.Management.Storage" Version="22.0.0" />
   </ItemGroup>
 
diff --git a/src/Storage/Storage.Management/ChangeLog.md b/src/Storage/Storage.Management/ChangeLog.md
@@ -22,9 +22,6 @@
     -  `Enable-AzStorageBlobLastAccessTimeTracking`
     -  `Disable-AzStorageBlobLastAccessTimeTracking`
     -  `Add-AzStorageAccountManagementPolicyAction`
-* Supported Parquet as input text config in blob quick query
-    -  `New-AzStorageBlobQueryConfig`
-    -  `Get-AzStorageBlobQueryResult`
 * Made `Get-AzDataLakeGen2ChildItem` list all datalake gen2 items by default, instead of needing user to list chunk by chunk.
 * Fixed BlobProperties is empty issue when using sas without prefix '?' [#15460]
 * Fixed synchronously copy small blob failure [#15548]
diff --git a/src/Storage/Storage.Management/help/Get-AzStorageBlobQueryResult.md b/src/Storage/Storage.Management/help/Get-AzStorageBlobQueryResult.md
@@ -51,9 +51,9 @@ The **Get-AzStorageBlobQueryResult** cmdlet applies a simple Structured Query La
 
 ### Example 1: Query a blob
 ```powershell
-PS C:\> $inputconfig = New-AzStorageBlobQueryConfig -AsParquet
+PS C:\> $inputconfig = New-AzStorageBlobQueryConfig -AsCsv -HasHeader
 
-PS C:\> $outputconfig = New-AzStorageBlobQueryConfig -AsCsv -HasHeader
+PS C:\> $outputconfig = New-AzStorageBlobQueryConfig -AsJson
 
 PS C:\> $queryString = "SELECT * FROM BlobStorage WHERE Name = 'a'"
 
@@ -387,7 +387,7 @@ Accept wildcard characters: False
 ```
 
 ### CommonParameters
-This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable, -InformationAction, -InformationVariable, -OutVariable, -OutBuffer, -PipelineVariable, -Verbose, -WarningAction, and -WarningVariable. For more information, see [about_CommonParameters](http://go.microsoft.com/fwlink/?LinkID=113216).
+This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable, -InformationAction, -InformationVariable, -OutVariable, -OutBuffer, -PipelineVariable, -Verbose, -WarningAction, and -WarningVariable. For more information, see about_CommonParameters (http://go.microsoft.com/fwlink/?LinkID=113216).
 
 ## INPUTS
 
diff --git a/src/Storage/Storage.Management/help/New-AzStorageBlobQueryConfig.md b/src/Storage/Storage.Management/help/New-AzStorageBlobQueryConfig.md
@@ -23,11 +23,6 @@ New-AzStorageBlobQueryConfig [-AsCsv] [-RecordSeparator <String>] [-ColumnSepara
 New-AzStorageBlobQueryConfig [-AsJson] [-RecordSeparator <String>] [-AsJob] [<CommonParameters>]
 ```
 
-### Parquet
-```
-New-AzStorageBlobQueryConfig [-AsParquet] [-AsJob] [<CommonParameters>]
-```
-
 ## DESCRIPTION
 The **New-AzStorageBlobQueryConfig** cmdlet creates a blob query configuration object, which can be used in Get-AzStorageBlobQueryResult.
 
@@ -99,21 +94,6 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
-### -AsParquet
-Indicate to create a Blob Query Configuration for Parquet.
-
-```yaml
-Type: System.Management.Automation.SwitchParameter
-Parameter Sets: Parquet
-Aliases:
-
-Required: True
-Position: 0
-Default value: None
-Accept pipeline input: False
-Accept wildcard characters: False
-```
-
 ### -ColumnSeparator
 Optional.
 The string used to separate columns.
@@ -184,7 +164,7 @@ The string used to separate records.
 
 ```yaml
 Type: System.String
-Parameter Sets: Csv, Json
+Parameter Sets: (All)
 Aliases:
 
 Required: False
@@ -195,7 +175,7 @@ Accept wildcard characters: False
 ```
 
 ### CommonParameters
-This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable, -InformationAction, -InformationVariable, -OutVariable, -OutBuffer, -PipelineVariable, -Verbose, -WarningAction, and -WarningVariable. For more information, see [about_CommonParameters](http://go.microsoft.com/fwlink/?LinkID=113216).
+This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable, -InformationAction, -InformationVariable, -OutVariable, -OutBuffer, -PipelineVariable, -Verbose, -WarningAction, and -WarningVariable. For more information, see about_CommonParameters (http://go.microsoft.com/fwlink/?LinkID=113216).
 
 ## INPUTS
 
diff --git a/src/Storage/Storage/Blob/Cmdlet/NewAzStorageBlobQueryConfig .cs b/src/Storage/Storage/Blob/Cmdlet/NewAzStorageBlobQueryConfig .cs
@@ -32,12 +32,7 @@ public class NewAzStorageBlobQueryConfigCommand : AzureDataCmdlet
         /// </summary>
         private const string JsonParameterSet = "Json";
 
-        /// <summary>
-        /// Parquet parameter set name
-        /// </summary>
-        private const string ParquetParameterSet = "Parquet"; 
-
-         [Parameter(Mandatory = true,
+        [Parameter(Mandatory = true,
             Position = 0,
             HelpMessage = "Indicate to create a Blob Query Configuration for CSV.", 
             ParameterSetName = CsvParameterSet)]
@@ -46,18 +41,11 @@ public class NewAzStorageBlobQueryConfigCommand : AzureDataCmdlet
 
         [Parameter(Mandatory = true,
             Position = 0,
-            HelpMessage = "Indicate to create a Blob Query Configuration for Json.",
+            HelpMessage = "Indicate to create a Blob Query Configuration for Json.", 
             ParameterSetName = JsonParameterSet)]
         [ValidateNotNullOrEmpty]
         public SwitchParameter AsJson { get; set; }
 
-        [Parameter(Mandatory = true,
-            Position = 0,
-            HelpMessage = "Indicate to create a Blob Query Configuration for Parquet.",
-            ParameterSetName = ParquetParameterSet)]
-        [ValidateNotNullOrEmpty]
-        public SwitchParameter AsParquet { get; set; }
-
         [Parameter(Mandatory = false, HelpMessage = "Optional. The string used to separate records.", ParameterSetName = CsvParameterSet)]
         [Parameter(Mandatory = false, HelpMessage = "Optional. The string used to separate records.", ParameterSetName = JsonParameterSet)]
         public string RecordSeparator { get; set; }
@@ -126,7 +114,7 @@ public override void ExecuteCmdlet()
                 };
                 WriteObject(queryConfig);
             }
-            else if (this.AsCsv.IsPresent) // Csv
+            else // Csv
             {
                 PSBlobQueryTextConfiguration queryConfig = new PSBlobQueryCsvTextConfiguration()
                 {
@@ -139,14 +127,6 @@ public override void ExecuteCmdlet()
                 };
                 WriteObject(queryConfig);
             }
-            else // Parquet
-            {
-                PSBlobQueryParquetTextOptions queryConfig = new PSBlobQueryParquetTextOptions()
-                {
-                    Type = BlobQueryConfigType.Parquet
-                };
-                WriteObject(queryConfig);
-            }
         }
     }
 }
diff --git a/src/Storage/Storage/Common/BlobQueryTextConfiguration.cs b/src/Storage/Storage/Common/BlobQueryTextConfiguration.cs
@@ -23,8 +23,7 @@ namespace Microsoft.WindowsAzure.Commands.Common.Storage.ResourceModel
     public enum BlobQueryConfigType
     {
         Csv,
-        Json,
-        Parquet
+        Json
     }
 
     /// <summary>
@@ -33,6 +32,7 @@ public enum BlobQueryConfigType
     public abstract class PSBlobQueryTextConfiguration
     {
         public BlobQueryConfigType Type { get; set; }
+        public string RecordSeparator { get; set; }
 
         public BlobQueryTextOptions ParseBlobQueryTextConfiguration()
         {
@@ -48,18 +48,14 @@ public BlobQueryTextOptions ParseBlobQueryTextConfiguration()
                     HasHeaders = csvconfig.HasHeaders
                 };
             }
-            else if (this.Type == BlobQueryConfigType.Json)  //json
+            else //json
             {
                 PSBlobQueryJsonTextConfiguration jsonconfig = (PSBlobQueryJsonTextConfiguration)this;
                 return new BlobQueryJsonTextOptions()
                 {
                     RecordSeparator = jsonconfig.RecordSeparator
                 };
             }
-            else //Parquet
-            {
-                return new BlobQueryParquetTextOptions();
-            }
         }
     }
 
@@ -68,7 +64,6 @@ public BlobQueryTextOptions ParseBlobQueryTextConfiguration()
     /// </summary>
     public class PSBlobQueryJsonTextConfiguration : PSBlobQueryTextConfiguration
     {
-        public string RecordSeparator { get; set; }
         public PSBlobQueryJsonTextConfiguration() { }
 
         public PSBlobQueryJsonTextConfiguration(BlobQueryJsonTextOptions config)
@@ -91,7 +86,6 @@ public BlobQueryJsonTextOptions ParseBlobQueryJsonTextConfiguration()
     /// </summary>
     public class PSBlobQueryCsvTextConfiguration : PSBlobQueryTextConfiguration
     {
-        public string RecordSeparator { get; set; }
         public string ColumnSeparator { get; set; }
         public char? QuotationCharacter { get; set; }
         public char? EscapeCharacter { get; set; }
@@ -123,28 +117,6 @@ public BlobQueryCsvTextOptions ParseBlobQueryCsvTextConfiguration()
         }
     }
 
-
-    /// <summary>
-    ///  Wrapper Class for BlobQueryParquetTextOptions
-    /// </summary>
-    public class PSBlobQueryParquetTextOptions : PSBlobQueryTextConfiguration
-    {
-        public PSBlobQueryParquetTextOptions()
-        {
-            this.Type = BlobQueryConfigType.Parquet;
-        }
-
-        public PSBlobQueryParquetTextOptions(BlobQueryParquetTextOptions config)
-        {
-            this.Type = BlobQueryConfigType.Parquet;
-        }
-
-        public BlobQueryParquetTextOptions ParseBlobQueryParquetTextOptions()
-        {
-            return new BlobQueryParquetTextOptions();
-        }
-    }
-
     /// <summary>
     /// Wrapper of BlobQueryError
     /// </summary>
diff --git a/src/Storage/Storage/Storage.csproj b/src/Storage/Storage/Storage.csproj
@@ -12,10 +12,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Azure.Storage.Blobs" Version="12.10.0-beta.2" />
-    <PackageReference Include="Azure.Storage.Files.DataLake" Version="12.8.0-beta.2" />
-    <PackageReference Include="Azure.Storage.Files.Shares" Version="12.8.0-beta.2" />
-    <PackageReference Include="Azure.Storage.Queues" Version="12.8.0-beta.2" />
+    <PackageReference Include="Azure.Storage.Blobs" Version="12.8.0" />
+    <PackageReference Include="Azure.Storage.Files.DataLake" Version="12.6.0" />
+    <PackageReference Include="Azure.Storage.Files.Shares" Version="12.6.0" />
+    <PackageReference Include="Azure.Storage.Queues" Version="12.6.0" />
     <PackageReference Include="Microsoft.Azure.Cosmos.Table" Version="1.0.8" />
     <PackageReference Include="System.Security.Permissions" Version="4.5.0" />
     <PackageReference Include="Microsoft.Azure.Storage.Blob" Version="11.2.2" />
diff --git a/tools/StaticAnalysis/Exceptions/Az.Storage/BreakingChangeIssues.csv b/tools/StaticAnalysis/Exceptions/Az.Storage/BreakingChangeIssues.csv
@@ -12,6 +12,3 @@
 "Az.Storage","Microsoft.WindowsAzure.Commands.Storage.File.Cmdlet.SetAzureStorageFileContent","Set-AzStorageFileContent","0","1050","The parameter set '__AllParameterSets' for cmdlet 'Set-AzStorageFileContent' has been removed.","Add parameter set '__AllParameterSets' back to cmdlet 'Set-AzStorageFileContent'."
 "Az.Storage","Microsoft.Azure.Commands.Management.Storage.NewAzureStorageAccountCommand","New-AzStorageAccount","0","2040","The validation set for parameter 'DefaultSharePermission' for cmdlet 'New-AzStorageAccount' no longer contains the value 'StorageFileDataSmbShareOwner'.","Add 'StorageFileDataSmbShareOwner' back to the validation set for 'DefaultSharePermission'."
 "Az.Storage","Microsoft.Azure.Commands.Management.Storage.SetAzureStorageAccountCommand","Set-AzStorageAccount","0","2040","The validation set for parameter 'DefaultSharePermission' for cmdlet 'Set-AzStorageAccount' no longer contains the value 'StorageFileDataSmbShareOwner'.","Add 'StorageFileDataSmbShareOwner' back to the validation set for 'DefaultSharePermission'."
-"Az.Storage","Microsoft.WindowsAzure.Commands.Storage.Blob.GetStorageAzureBlobQueryResultCommand","Get-AzStorageBlobQueryResult","0","3010","The property 'RecordSeparator' of type 'Microsoft.WindowsAzure.Commands.Common.Storage.ResourceModel.PSBlobQueryTextConfiguration' has been removed.","Add the property 'RecordSeparator' back to type 'Microsoft.WindowsAzure.Commands.Common.Storage.ResourceModel.PSBlobQueryTextConfiguration'."
-"Az.Storage","Microsoft.WindowsAzure.Commands.Storage.Blob.GetStorageAzureBlobQueryResultCommand","Get-AzStorageBlobQueryResult","0","3010","The property 'RecordSeparator' of type 'Microsoft.WindowsAzure.Commands.Common.Storage.ResourceModel.PSBlobQueryTextConfiguration' has been removed.","Add the property 'RecordSeparator' back to type 'Microsoft.WindowsAzure.Commands.Common.Storage.ResourceModel.PSBlobQueryTextConfiguration'."
-"Az.Storage","Microsoft.Azure.Commands.Management.Storage.NewAzStorageBlobQueryConfigCommand","New-AzStorageBlobQueryConfig","0","3010","The property 'RecordSeparator' of type 'Microsoft.WindowsAzure.Commands.Common.Storage.ResourceModel.PSBlobQueryTextConfiguration' has been removed.","Add the property 'RecordSeparator' back to type 'Microsoft.WindowsAzure.Commands.Common.Storage.ResourceModel.PSBlobQueryTextConfiguration'."

Original file line number	Diff line number	Diff line change
`@@ -23,8 +23,7 @@ namespace Microsoft.WindowsAzure.Commands.Common.Storage.ResourceModel`
`23`	`23`	`public enum BlobQueryConfigType`
`24`	`24`	`{`
`25`	`25`	`Csv,`
`26`		`- Json,`
`27`		`- Parquet`
	`26`	`+ Json`
`28`	`27`	`}`
`29`	`28`
`30`	`29`	`/// <summary>`
`@@ -33,6 +32,7 @@ public enum BlobQueryConfigType`
`33`	`32`	`public abstract class PSBlobQueryTextConfiguration`
`34`	`33`	`{`
`35`	`34`	`public BlobQueryConfigType Type { get; set; }`
	`35`	`+ public string RecordSeparator { get; set; }`
`36`	`36`
`37`	`37`	`public BlobQueryTextOptions ParseBlobQueryTextConfiguration()`
`38`	`38`	`{`
`@@ -48,18 +48,14 @@ public BlobQueryTextOptions ParseBlobQueryTextConfiguration()`
`48`	`48`	`HasHeaders = csvconfig.HasHeaders`
`49`	`49`	`};`
`50`	`50`	`}`
`51`		`- else if (this.Type == BlobQueryConfigType.Json) //json`
	`51`	`+ else //json`
`52`	`52`	`{`
`53`	`53`	`PSBlobQueryJsonTextConfiguration jsonconfig = (PSBlobQueryJsonTextConfiguration)this;`
`54`	`54`	`return new BlobQueryJsonTextOptions()`
`55`	`55`	`{`
`56`	`56`	`RecordSeparator = jsonconfig.RecordSeparator`
`57`	`57`	`};`
`58`	`58`	`}`
`59`		`- else //Parquet`
`60`		`- {`
`61`		`- return new BlobQueryParquetTextOptions();`
`62`		`- }`
`63`	`59`	`}`
`64`	`60`	`}`
`65`	`61`
`@@ -68,7 +64,6 @@ public BlobQueryTextOptions ParseBlobQueryTextConfiguration()`
`68`	`64`	`/// </summary>`
`69`	`65`	`public class PSBlobQueryJsonTextConfiguration : PSBlobQueryTextConfiguration`
`70`	`66`	`{`
`71`		`- public string RecordSeparator { get; set; }`
`72`	`67`	`public PSBlobQueryJsonTextConfiguration() { }`
`73`	`68`
`74`	`69`	`public PSBlobQueryJsonTextConfiguration(BlobQueryJsonTextOptions config)`
`@@ -91,7 +86,6 @@ public BlobQueryJsonTextOptions ParseBlobQueryJsonTextConfiguration()`
`91`	`86`	`/// </summary>`
`92`	`87`	`public class PSBlobQueryCsvTextConfiguration : PSBlobQueryTextConfiguration`
`93`	`88`	`{`
`94`		`- public string RecordSeparator { get; set; }`
`95`	`89`	`public string ColumnSeparator { get; set; }`
`96`	`90`	`public char? QuotationCharacter { get; set; }`
`97`	`91`	`public char? EscapeCharacter { get; set; }`
`@@ -123,28 +117,6 @@ public BlobQueryCsvTextOptions ParseBlobQueryCsvTextConfiguration()`
`123`	`117`	`}`
`124`	`118`	`}`
`125`	`119`
`126`		`-`
`127`		`- /// <summary>`
`128`		`- /// Wrapper Class for BlobQueryParquetTextOptions`
`129`		`- /// </summary>`
`130`		`- public class PSBlobQueryParquetTextOptions : PSBlobQueryTextConfiguration`
`131`		`- {`
`132`		`- public PSBlobQueryParquetTextOptions()`
`133`		`- {`
`134`		`- this.Type = BlobQueryConfigType.Parquet;`
`135`		`- }`
`136`		`-`
`137`		`- public PSBlobQueryParquetTextOptions(BlobQueryParquetTextOptions config)`
`138`		`- {`
`139`		`- this.Type = BlobQueryConfigType.Parquet;`
`140`		`- }`
`141`		`-`
`142`		`- public BlobQueryParquetTextOptions ParseBlobQueryParquetTextOptions()`
`143`		`- {`
`144`		`- return new BlobQueryParquetTextOptions();`
`145`		`- }`
`146`		`- }`
`147`		`-`
`148`	`120`	`/// <summary>`
`149`	`121`	`/// Wrapper of BlobQueryError`
`150`	`122`	`/// </summary>`