code review changes

apache · Oct 25, 2024 · f1a3795 · f1a3795
1 parent 18a7c8a
commit f1a3795
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 11 deletions.
diff --git a/csharp/src/Drivers/Apache/Hive2/HiveServer2Connection.cs b/csharp/src/Drivers/Apache/Hive2/HiveServer2Connection.cs
@@ -98,7 +98,7 @@ internal async Task OpenAsync()
 
         internal abstract SchemaParser SchemaParser { get; }
 
-        internal abstract IArrowArrayStream NewReader<T>(T statement, Schema schema, CancellationToken cancellationToken = default) where T : HiveServer2Statement;
+        internal abstract IArrowArrayStream NewReader<T>(T statement, Schema schema) where T : HiveServer2Statement;
 
         public override IArrowArrayStream GetObjects(GetObjectsDepth depth, string? catalogPattern, string? dbSchemaPattern, string? tableNamePattern, IReadOnlyList<string>? tableTypes, string? columnNamePattern)
         {

diff --git a/csharp/src/Drivers/Apache/Hive2/HiveServer2Reader.cs b/csharp/src/Drivers/Apache/Hive2/HiveServer2Reader.cs
@@ -67,8 +67,7 @@ internal class HiveServer2Reader : IArrowArrayStream
         public HiveServer2Reader(
             HiveServer2Statement statement,
             Schema schema,
-            DataTypeConversion dataTypeConversion,
-            CancellationToken _ = default)
+            DataTypeConversion dataTypeConversion)
         {
             _statement = statement;
             Schema = schema;
@@ -89,7 +88,7 @@ public HiveServer2Reader(
             TFetchResultsResp response = await FetchNext(_statement, cancellationToken);
 
             int columnCount = GetColumnCount(response);
-            int rowCount = GetRowCount(response, columnCount); ;
+            int rowCount = GetRowCount(response, columnCount);
             if ((_statement.BatchSize > 0 && rowCount < _statement.BatchSize) || rowCount == 0)
             {
                 // This is the last batch

diff --git a/csharp/src/Drivers/Apache/Impala/ImpalaConnection.cs b/csharp/src/Drivers/Apache/Impala/ImpalaConnection.cs
@@ -87,6 +87,6 @@ public override IArrowArrayStream GetTableTypes()
 
         internal override SchemaParser SchemaParser { get; } = new HiveServer2SchemaParser();
 
-        internal override IArrowArrayStream NewReader<T>(T statement, Schema schema, CancellationToken cancellationToken = default) => new HiveServer2Reader(statement, schema, dataTypeConversion: DataTypeConversion, cancellationToken);
+        internal override IArrowArrayStream NewReader<T>(T statement, Schema schema) => new HiveServer2Reader(statement, schema, dataTypeConversion: DataTypeConversion);
     }
 }
diff --git a/csharp/src/Drivers/Apache/Spark/SparkDatabricksConnection.cs b/csharp/src/Drivers/Apache/Spark/SparkDatabricksConnection.cs
@@ -30,7 +30,7 @@ public SparkDatabricksConnection(IReadOnlyDictionary<string, string> properties)
         {
         }
 
-        internal override IArrowArrayStream NewReader<T>(T statement, Schema schema, CancellationToken cancellationToken = default) => new SparkDatabricksReader(statement, schema);
+        internal override IArrowArrayStream NewReader<T>(T statement, Schema schema) => new SparkDatabricksReader(statement, schema);
 
         internal override SchemaParser SchemaParser => new SparkDatabricksSchemaParser();
 

diff --git a/csharp/src/Drivers/Apache/Spark/SparkHttpConnection.cs b/csharp/src/Drivers/Apache/Spark/SparkHttpConnection.cs
@@ -129,7 +129,7 @@ protected override void ValidateOptions()
             }
         }
 
-        internal override IArrowArrayStream NewReader<T>(T statement, Schema schema, CancellationToken cancellationToken = default) => new HiveServer2Reader(statement, schema, dataTypeConversion: statement.Connection.DataTypeConversion, cancellationToken);
+        internal override IArrowArrayStream NewReader<T>(T statement, Schema schema) => new HiveServer2Reader(statement, schema, dataTypeConversion: statement.Connection.DataTypeConversion);
 
         protected override Task<TTransport> CreateTransportAsync()
         {

diff --git a/csharp/test/Drivers/Apache/Impala/ImpalaTestEnvironment.cs b/csharp/test/Drivers/Apache/Impala/ImpalaTestEnvironment.cs
@@ -73,6 +73,7 @@ public override Dictionary<string, string> GetDriverParameters(ApacheTestConfigu
 
         public override string GetInsertStatement(string tableName, string columnName, string? value) =>
             string.Format("INSERT INTO {0} ({1}) SELECT {2};", tableName, columnName, value ?? "NULL");
+
         public override SampleDataBuilder GetSampleDataBuilder() => throw new NotImplementedException();
     }
 }
diff --git a/csharp/test/Drivers/Apache/Spark/ClientTests.cs b/csharp/test/Drivers/Apache/Spark/ClientTests.cs
@@ -25,7 +25,7 @@
 namespace Apache.Arrow.Adbc.Tests.Drivers.Apache.Spark
 {
     /// <summary>
-    /// Class for testing the ADBC Client using the BigQuery ADBC driver.
+    /// Class for testing the ADBC Client using the Spark ADBC driver.
     /// </summary>
     /// <remarks>
     /// Tests are ordered to ensure data is created for the other
@@ -72,7 +72,6 @@ public void CanClientExecuteUpdate()
                         affectedRows,  // DELETE
                     ];
 
-
                 Tests.ClientTests.CanClientExecuteUpdate(adbcConnection, TestConfiguration, queries, expectedResults);
             }
         }
@@ -149,7 +148,6 @@ public void VerifySchemaTablesWithNoConstraints()
             }
         }
 
-
         [SkippableFact]
         public void VerifySchemaTables()
         {

diff --git a/csharp/test/Drivers/Apache/Spark/DriverTests.cs b/csharp/test/Drivers/Apache/Spark/DriverTests.cs
@@ -31,7 +31,7 @@
 namespace Apache.Arrow.Adbc.Tests.Drivers.Apache.Spark
 {
     /// <summary>
-    /// Class for testing the Snowflake ADBC driver connection tests.
+    /// Class for testing the Spark ADBC driver connection tests.
     /// </summary>
     /// <remarks>
     /// Tests are ordered to ensure data is created for the other