Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[submodule "csharp/arrow-adbc"]
path = csharp/arrow-adbc
url = git@github.com:apache/arrow-adbc.git
[submodule "csharp/hiveserver2"]
path = csharp/hiveserver2
url = git@github.com:adbc-drivers/hiveserver2.git
1 change: 0 additions & 1 deletion csharp/arrow-adbc
Submodule arrow-adbc deleted from 514e13
1 change: 1 addition & 0 deletions csharp/hiveserver2
Submodule hiveserver2 added at edab9f
2 changes: 1 addition & 1 deletion csharp/src/AdbcDrivers.Databricks.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@
</Content>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\arrow-adbc\csharp\src\Drivers\Apache\Apache.Arrow.Adbc.Drivers.Apache.csproj" />
<ProjectReference Include="..\hiveserver2\csharp\src\AdbcDrivers.HiveServer2.csproj" />
</ItemGroup>
</Project>
8 changes: 4 additions & 4 deletions csharp/src/DatabricksConnection.cs
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,10 @@
using AdbcDrivers.Databricks.Reader;
using Apache.Arrow;
using Apache.Arrow.Adbc;
using Apache.Arrow.Adbc.Drivers.Apache;
using Apache.Arrow.Adbc.Drivers.Apache.Hive2;
using Apache.Arrow.Adbc.Drivers.Apache.Hive2.Client;
using Apache.Arrow.Adbc.Drivers.Apache.Spark;
using AdbcDrivers.HiveServer2;
using AdbcDrivers.HiveServer2.Hive2;
using AdbcDrivers.HiveServer2.Spark;
using AdbcDrivers.HiveServer2.Thrift;
using Apache.Arrow.Adbc.Tracing;
using Apache.Arrow.Ipc;
using Apache.Hive.Service.Rpc.Thrift;
Expand Down
4 changes: 2 additions & 2 deletions csharp/src/DatabricksDatabase.cs
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@
using System.Linq;
using AdbcDrivers.Databricks.StatementExecution;
using Apache.Arrow.Adbc;
using Apache.Arrow.Adbc.Drivers.Apache;
using Apache.Arrow.Adbc.Drivers.Apache.Spark;
using AdbcDrivers.HiveServer2;
using AdbcDrivers.HiveServer2.Spark;

namespace AdbcDrivers.Databricks
{
Expand Down
2 changes: 1 addition & 1 deletion csharp/src/DatabricksParameters.cs
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
* limitations under the License.
*/

using Apache.Arrow.Adbc.Drivers.Apache.Spark;
using AdbcDrivers.HiveServer2.Spark;

namespace AdbcDrivers.Databricks
{
Expand Down
5 changes: 3 additions & 2 deletions csharp/src/DatabricksSchemaParser.cs
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,9 @@
using System;
using System.IO;
using Apache.Arrow;
using Apache.Arrow.Adbc.Drivers.Apache;
using Apache.Arrow.Adbc.Drivers.Apache.Hive2;
using AdbcDrivers.HiveServer2;
using AdbcDrivers.HiveServer2.Hive2;
using AdbcDrivers.HiveServer2.Thrift;
using Apache.Arrow.Ipc;
using Apache.Arrow.Types;
using Apache.Hive.Service.Rpc.Thrift;
Expand Down
6 changes: 3 additions & 3 deletions csharp/src/DatabricksStatement.cs
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@
using AdbcDrivers.Databricks.Result;
using Apache.Arrow;
using Apache.Arrow.Adbc;
using Apache.Arrow.Adbc.Drivers.Apache;
using Apache.Arrow.Adbc.Drivers.Apache.Hive2;
using Apache.Arrow.Adbc.Drivers.Apache.Spark;
using AdbcDrivers.HiveServer2;
using AdbcDrivers.HiveServer2.Hive2;
using AdbcDrivers.HiveServer2.Spark;
using Apache.Arrow.Adbc.Tracing;
using Apache.Arrow.Types;
using Apache.Hive.Service.Rpc.Thrift;
Expand Down
4 changes: 2 additions & 2 deletions csharp/src/FeatureFlagCache.cs
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
using System.Net.Http;
using System.Threading;
using System.Threading.Tasks;
using Apache.Arrow.Adbc.Drivers.Apache;
using Apache.Arrow.Adbc.Drivers.Apache.Spark;
using AdbcDrivers.HiveServer2;
using AdbcDrivers.HiveServer2.Spark;
using Microsoft.Extensions.Caching.Memory;

namespace AdbcDrivers.Databricks
Expand Down
2 changes: 1 addition & 1 deletion csharp/src/FeatureFlagContext.cs
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
using System.Text.Json;
using System.Threading;
using System.Threading.Tasks;
using Apache.Arrow.Adbc.Drivers.Apache;
using AdbcDrivers.HiveServer2;
using Apache.Arrow.Adbc.Tracing;

namespace AdbcDrivers.Databricks
Expand Down
4 changes: 2 additions & 2 deletions csharp/src/Http/HttpClientFactory.cs
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
using System;
using System.Collections.Generic;
using System.Net.Http;
using Apache.Arrow.Adbc.Drivers.Apache;
using Apache.Arrow.Adbc.Drivers.Apache.Hive2;
using AdbcDrivers.HiveServer2;
using AdbcDrivers.HiveServer2.Hive2;

namespace AdbcDrivers.Databricks.Http
{
Expand Down
2 changes: 1 addition & 1 deletion csharp/src/Http/HttpHandlerFactory.cs
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
using System.Collections.Generic;
using System.Net.Http;
using AdbcDrivers.Databricks.Auth;
using Apache.Arrow.Adbc.Drivers.Apache.Spark;
using AdbcDrivers.HiveServer2.Spark;
using Apache.Arrow.Adbc.Tracing;

namespace AdbcDrivers.Databricks.Http
Expand Down
2 changes: 1 addition & 1 deletion csharp/src/Reader/CloudFetch/CloudFetchReaderFactory.cs
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
using System.Net.Http;
using AdbcDrivers.Databricks.StatementExecution;
using Apache.Arrow;
using Apache.Arrow.Adbc.Drivers.Apache.Hive2;
using AdbcDrivers.HiveServer2.Hive2;
using Apache.Arrow.Adbc.Tracing;
using Apache.Hive.Service.Rpc.Thrift;
using Microsoft.IO;
Expand Down
2 changes: 1 addition & 1 deletion csharp/src/Reader/CloudFetch/ThriftResultFetcher.cs
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
using System.Diagnostics;
using System.Threading;
using System.Threading.Tasks;
using Apache.Arrow.Adbc.Drivers.Apache.Hive2;
using AdbcDrivers.HiveServer2.Hive2;
using Apache.Arrow.Adbc.Tracing;
using Apache.Hive.Service.Rpc.Thrift;

Expand Down
2 changes: 1 addition & 1 deletion csharp/src/Reader/DatabricksCompositeReader.cs
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
using System.Threading.Tasks;
using AdbcDrivers.Databricks.Reader.CloudFetch;
using Apache.Arrow;
using Apache.Arrow.Adbc.Drivers.Apache.Hive2;
using AdbcDrivers.HiveServer2.Hive2;
using Apache.Arrow.Adbc.Tracing;
using Apache.Hive.Service.Rpc.Thrift;

Expand Down
4 changes: 2 additions & 2 deletions csharp/src/Reader/DatabricksOperationStatusPoller.cs
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@
using System;
using System.Threading;
using System.Threading.Tasks;
using Apache.Arrow.Adbc.Drivers.Apache;
using Apache.Arrow.Adbc.Drivers.Apache.Hive2;
using AdbcDrivers.HiveServer2;
using AdbcDrivers.HiveServer2.Hive2;
using Apache.Hive.Service.Rpc.Thrift;

namespace AdbcDrivers.Databricks.Reader
Expand Down
2 changes: 1 addition & 1 deletion csharp/src/Reader/DatabricksReader.cs
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
using System.Threading.Tasks;
using Apache.Arrow;
using Apache.Arrow.Adbc;
using Apache.Arrow.Adbc.Drivers.Apache.Hive2;
using AdbcDrivers.HiveServer2.Hive2;
using Apache.Arrow.Adbc.Tracing;
using Apache.Arrow.Ipc;
using Apache.Hive.Service.Rpc.Thrift;
Expand Down
2 changes: 1 addition & 1 deletion csharp/src/Result/DescTableExtendedResult.cs
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
using System.Collections.Generic;
using System.Text.Json.Serialization;
using System.Text.RegularExpressions;
using static Apache.Arrow.Adbc.Drivers.Apache.Hive2.HiveServer2Connection;
using static AdbcDrivers.HiveServer2.Hive2.HiveServer2Connection;

namespace AdbcDrivers.Databricks.Result
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
using AdbcDrivers.Databricks.Http;
using Apache.Arrow;
using Apache.Arrow.Adbc;
using Apache.Arrow.Adbc.Drivers.Apache.Spark;
using AdbcDrivers.HiveServer2.Spark;
using Apache.Arrow.Adbc.Tracing;
using Apache.Arrow.Ipc;

Expand Down
4 changes: 2 additions & 2 deletions csharp/test/AdbcDrivers.Databricks.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\arrow-adbc\csharp\test\Apache.Arrow.Adbc.Tests\Apache.Arrow.Adbc.Testing.csproj" />
<ProjectReference Include="..\arrow-adbc\csharp\test\Drivers\Apache\Apache.Arrow.Adbc.Tests.Drivers.Apache.csproj" />
<ProjectReference Include="..\hiveserver2\csharp\arrow-adbc\csharp\test\Apache.Arrow.Adbc.Tests\Apache.Arrow.Adbc.Testing.csproj" />
<ProjectReference Include="..\hiveserver2\csharp\test\AdbcDrivers.Tests.HiveServer2.csproj" />
<ProjectReference Include="..\src\AdbcDrivers.Databricks.csproj" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion csharp/test/E2E/ClientTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
*/

using System.Collections.Generic;
using Apache.Arrow.Adbc.Tests.Drivers.Apache.Common;
using AdbcDrivers.Tests.HiveServer2.Common;
using Xunit.Abstractions;

namespace AdbcDrivers.Databricks.Tests
Expand Down
2 changes: 1 addition & 1 deletion csharp/test/E2E/CloudFetch/CloudFetchDownloaderTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
using System.Threading.Tasks;
using AdbcDrivers.Databricks.Reader.CloudFetch;
using Apache.Arrow.Adbc;
using Apache.Arrow.Adbc.Drivers.Apache.Hive2;
using AdbcDrivers.HiveServer2.Hive2;
using Apache.Arrow.Adbc.Tracing;
using Apache.Hive.Service.Rpc.Thrift;
using Moq;
Expand Down
2 changes: 1 addition & 1 deletion csharp/test/E2E/CloudFetch/CloudFetchResultFetcherTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
using System.Threading;
using System.Threading.Tasks;
using AdbcDrivers.Databricks.Reader.CloudFetch;
using Apache.Arrow.Adbc.Drivers.Apache.Hive2;
using AdbcDrivers.HiveServer2.Hive2;
using Apache.Hive.Service.Rpc.Thrift;
using Moq;
using Xunit;
Expand Down
2 changes: 1 addition & 1 deletion csharp/test/E2E/ComplexTypesValueTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
* limitations under the License.
*/

using Apache.Arrow.Adbc.Tests.Drivers.Apache.Common;
using AdbcDrivers.Tests.HiveServer2.Common;
using Xunit.Abstractions;

namespace AdbcDrivers.Databricks.Tests
Expand Down
6 changes: 3 additions & 3 deletions csharp/test/E2E/DatabricksConnectionTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@
using System.Threading.Tasks;
using Apache.Arrow;
using Apache.Arrow.Adbc;
using Apache.Arrow.Adbc.Drivers.Apache;
using Apache.Arrow.Adbc.Drivers.Apache.Hive2;
using Apache.Arrow.Adbc.Drivers.Apache.Spark;
using AdbcDrivers.HiveServer2;
using AdbcDrivers.HiveServer2.Hive2;
using AdbcDrivers.HiveServer2.Spark;
using Apache.Arrow.Adbc.Tests;
using Apache.Hive.Service.Rpc.Thrift;
using Thrift.Transport;
Expand Down
2 changes: 1 addition & 1 deletion csharp/test/E2E/DatabricksTestConfiguration.cs
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
*/

using System.Text.Json.Serialization;
using Apache.Arrow.Adbc.Tests.Drivers.Apache.Spark;
using AdbcDrivers.Tests.HiveServer2.Spark;

namespace AdbcDrivers.Databricks.Tests
{
Expand Down
10 changes: 5 additions & 5 deletions csharp/test/E2E/DatabricksTestEnvironment.cs
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,12 @@
using System.Data.SqlTypes;
using System.Text;
using Apache.Arrow.Adbc;
using Apache.Arrow.Adbc.Drivers.Apache;
using Apache.Arrow.Adbc.Drivers.Apache.Hive2;
using Apache.Arrow.Adbc.Drivers.Apache.Spark;
using AdbcDrivers.HiveServer2;
using AdbcDrivers.HiveServer2.Hive2;
using AdbcDrivers.HiveServer2.Spark;
using Apache.Arrow.Adbc.Tests;
using Apache.Arrow.Adbc.Tests.Drivers.Apache;
using Apache.Arrow.Adbc.Tests.Drivers.Apache.Common;
using AdbcDrivers.Tests.HiveServer2;
using AdbcDrivers.Tests.HiveServer2.Common;
using Apache.Arrow.Types;

namespace AdbcDrivers.Databricks.Tests
Expand Down
2 changes: 1 addition & 1 deletion csharp/test/E2E/DateTimeValueTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
using System;
using System.Globalization;
using System.Threading.Tasks;
using Apache.Arrow.Adbc.Tests.Drivers.Apache.Common;
using AdbcDrivers.Tests.HiveServer2.Common;
using Xunit;
using Xunit.Abstractions;

Expand Down
4 changes: 2 additions & 2 deletions csharp/test/E2E/DriverTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@
using System.Collections.Generic;
using System.Threading.Tasks;
using Apache.Arrow.Adbc;
using Apache.Arrow.Adbc.Drivers.Apache.Spark;
using Apache.Arrow.Adbc.Tests.Drivers.Apache.Common;
using AdbcDrivers.HiveServer2.Spark;
using AdbcDrivers.Tests.HiveServer2.Common;
using Xunit;
using Xunit.Abstractions;
using Metadata = Apache.Arrow.Adbc.Tests.Metadata;
Expand Down
2 changes: 1 addition & 1 deletion csharp/test/E2E/NumericValueTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
*/

using System.Threading.Tasks;
using Apache.Arrow.Adbc.Tests.Drivers.Apache.Common;
using AdbcDrivers.Tests.HiveServer2.Common;
using Xunit;
using Xunit.Abstractions;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
using System;
using System.Collections.Generic;
using Apache.Arrow.Adbc;
using Apache.Arrow.Adbc.Drivers.Apache.Spark;
using AdbcDrivers.HiveServer2.Spark;
using Apache.Arrow.Adbc.Tests;
using Xunit;
using Xunit.Abstractions;
Expand Down
4 changes: 2 additions & 2 deletions csharp/test/E2E/StatementTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@
using System.Threading.Tasks;
using Apache.Arrow;
using Apache.Arrow.Adbc;
using Apache.Arrow.Adbc.Drivers.Apache;
using Apache.Arrow.Adbc.Tests.Drivers.Apache.Common;
using AdbcDrivers.HiveServer2;
using AdbcDrivers.Tests.HiveServer2.Common;
using Apache.Arrow.Types;
using Xunit;
using Xunit.Abstractions;
Expand Down
2 changes: 1 addition & 1 deletion csharp/test/E2E/StringValueTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
*/

using System.Threading.Tasks;
using Apache.Arrow.Adbc.Tests.Drivers.Apache.Common;
using AdbcDrivers.Tests.HiveServer2.Common;
using Xunit;
using Xunit.Abstractions;

Expand Down
2 changes: 1 addition & 1 deletion csharp/test/E2E/TelemetryTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
* limitations under the License.
*/

using Apache.Arrow.Adbc.Tests.Drivers.Apache.Common;
using AdbcDrivers.Tests.HiveServer2.Common;
using Xunit.Abstractions;

namespace AdbcDrivers.Databricks.Tests
Expand Down
2 changes: 1 addition & 1 deletion csharp/test/Unit/DatabricksCompositeReaderUnitTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
using System.Threading.Tasks;
using AdbcDrivers.Databricks.Reader;
using Apache.Arrow;
using Apache.Arrow.Adbc.Drivers.Apache.Hive2;
using AdbcDrivers.HiveServer2.Hive2;
using Apache.Arrow.Adbc.Tracing;
using Apache.Arrow.Types;
using Apache.Hive.Service.Rpc.Thrift;
Expand Down
2 changes: 1 addition & 1 deletion csharp/test/Unit/DatabricksConfigurationTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
using System.Collections.Generic;
using System.IO;
using System.Text.Json;
using Apache.Arrow.Adbc.Drivers.Apache.Spark;
using AdbcDrivers.HiveServer2.Spark;
using Xunit;

namespace AdbcDrivers.Databricks.Tests
Expand Down
2 changes: 1 addition & 1 deletion csharp/test/Unit/DatabricksConnectionUnitTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
using System.Collections.Generic;
using Apache.Arrow;
using Apache.Arrow.Adbc;
using Apache.Arrow.Adbc.Drivers.Apache.Spark;
using AdbcDrivers.HiveServer2.Spark;
using Apache.Arrow.Ipc;
using Apache.Arrow.Types;
using AdbcDrivers.Databricks;
Expand Down
2 changes: 1 addition & 1 deletion csharp/test/Unit/DatabricksOperationStatusPollerTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
using System.Threading;
using System.Threading.Tasks;
using AdbcDrivers.Databricks.Reader;
using Apache.Arrow.Adbc.Drivers.Apache.Hive2;
using AdbcDrivers.HiveServer2.Hive2;
using Apache.Hive.Service.Rpc.Thrift;
using Moq;
using Xunit;
Expand Down
2 changes: 1 addition & 1 deletion csharp/test/Unit/DatabricksStatementUnitTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
using System;
using System.Collections.Generic;
using System.Reflection;
using Apache.Arrow.Adbc.Drivers.Apache.Spark;
using AdbcDrivers.HiveServer2.Spark;
using AdbcDrivers.Databricks;
using Xunit;

Expand Down
2 changes: 1 addition & 1 deletion csharp/test/Unit/Result/DescTableExtendedResultTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
using System.Text.Json;
using AdbcDrivers.Databricks.Result;
using Xunit;
using static Apache.Arrow.Adbc.Drivers.Apache.Hive2.HiveServer2Connection;
using static AdbcDrivers.HiveServer2.Hive2.HiveServer2Connection;

namespace AdbcDrivers.Databricks.Tests.Unit.Result
{
Expand Down
Loading
Loading