This is an automated email from the ASF dual-hosted git repository.
CurtHagenlocher pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/arrow-dotnet.git
The following commit(s) were added to refs/heads/main by this push:
new 61c3ff1 Rename `Variant` assemblies to `Scalars` (#323)
61c3ff1 is described below
commit 61c3ff1cf3539d87563b3189c2d866f4e2bd8016
Author: Curt Hagenlocher <[email protected]>
AuthorDate: Tue Apr 21 18:27:26 2026 -0700
Rename `Variant` assemblies to `Scalars` (#323)
## What's Changed
- Renames `Apache.Arrow.Variant` project and assembly to
`Apache.Arrow.Scalars`
- Renames `Apache.Arrow.Variant.Tests` project and assembly to
`Apache.Arrow.Scalars.Tests`
- Moves Variant-related types into the `Apache.Arrow.Scalars.Variant`
namespace
---------
Co-authored-by: Copilot <[email protected]>
---
Apache.Arrow.Tests.slnf | 2 +-
Apache.Arrow.sln | 5 ++---
dev/release/verify_rc.sh | 4 ++--
src/Apache.Arrow.Operations/Apache.Arrow.Operations.csproj | 2 +-
src/Apache.Arrow.Operations/Json/VariantJsonConverter.cs | 2 +-
src/Apache.Arrow.Operations/Json/VariantJsonReader.cs | 2 +-
src/Apache.Arrow.Operations/Json/VariantJsonWriter.cs | 2 +-
.../Apache.Arrow.Scalars.csproj} | 0
.../Properties/AssemblyInfo.cs | 2 +-
.../Variant}/VariantArrayReader.cs | 2 +-
.../Variant}/VariantBasicType.cs | 2 +-
.../Variant}/VariantBuilder.cs | 2 +-
.../Variant}/VariantEncodingHelper.cs | 2 +-
.../Variant}/VariantMetadata.cs | 2 +-
.../Variant}/VariantMetadataBuilder.cs | 2 +-
.../Variant}/VariantObjectReader.cs | 2 +-
.../Variant}/VariantPrimitiveType.cs | 2 +-
.../Variant}/VariantReader.cs | 2 +-
.../Variant}/VariantValue.cs | 2 +-
.../Variant}/VariantValueWriter.cs | 2 +-
test/Apache.Arrow.Operations.Tests/Json/VariantDecimalJsonTests.cs | 2 +-
test/Apache.Arrow.Operations.Tests/Json/VariantJsonTests.cs | 2 +-
.../Apache.Arrow.Scalars.Tests.csproj} | 2 +-
.../ParquetTestingVectorTests.cs | 3 ++-
.../TestVectors.cs | 3 +--
.../VariantBuilderTests.cs | 3 ++-
.../VariantEncodingHelperTests.cs | 3 ++-
.../VariantMetadataTests.cs | 3 ++-
.../VariantReaderArrayTests.cs | 3 ++-
.../VariantReaderObjectTests.cs | 3 ++-
.../VariantReaderPrimitiveTests.cs | 3 ++-
.../VariantRoundTripTests.cs | 3 ++-
.../VariantSqlDecimalTests.cs | 3 ++-
.../VariantValueTests.cs | 3 ++-
test/Apache.Arrow.Variant.Benchmarks/AccessBenchmarks.cs | 1 +
.../Apache.Arrow.Variant.Benchmarks.csproj | 2 +-
test/Apache.Arrow.Variant.Benchmarks/ArrayBenchmarks.cs | 1 +
test/Apache.Arrow.Variant.Benchmarks/CreationBenchmarks.cs | 1 +
test/Apache.Arrow.Variant.Benchmarks/EncodingBenchmarks.cs | 1 +
test/Apache.Arrow.Variant.Benchmarks/EqualityBenchmarks.cs | 1 +
test/Apache.Arrow.Variant.Benchmarks/MixedWorkloadBenchmarks.cs | 1 +
test/Apache.Arrow.Variant.Benchmarks/StructVariantValue.cs | 2 ++
42 files changed, 54 insertions(+), 38 deletions(-)
diff --git a/Apache.Arrow.Tests.slnf b/Apache.Arrow.Tests.slnf
index 0b16c89..90bf9bd 100644
--- a/Apache.Arrow.Tests.slnf
+++ b/Apache.Arrow.Tests.slnf
@@ -7,7 +7,7 @@
"test\\Apache.Arrow.Flight.Tests\\Apache.Arrow.Flight.Tests.csproj",
"test\\Apache.Arrow.Flight.TestWeb\\Apache.Arrow.Flight.TestWeb.csproj",
"test\\Apache.Arrow.Tests\\Apache.Arrow.Tests.csproj",
- "test\\Apache.Arrow.Variant.Tests\\Apache.Arrow.Variant.Tests.csproj",
+ "test\\Apache.Arrow.Scalars.Tests\\Apache.Arrow.Scalars.Tests.csproj",
"test\\Apache.Arrow.Operations.Tests\\Apache.Arrow.Operations.Tests.csproj"
]
}
diff --git a/Apache.Arrow.sln b/Apache.Arrow.sln
index 105eb0c..26bd326 100644
--- a/Apache.Arrow.sln
+++ b/Apache.Arrow.sln
@@ -1,4 +1,3 @@
-
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.29926.136
@@ -29,9 +28,9 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") =
"Apache.Arrow.Flight.Integra
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") =
"Apache.Arrow.IntegrationTest",
"test\Apache.Arrow.IntegrationTest\Apache.Arrow.IntegrationTest.csproj",
"{E8264B7F-B680-4A55-939B-85DB628164BB}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Apache.Arrow.Variant",
"src\Apache.Arrow.Variant\Apache.Arrow.Variant.csproj",
"{EE364C9A-CB88-4DCE-9209-6ACBB8E6934F}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Apache.Arrow.Scalars",
"src\Apache.Arrow.Scalars\Apache.Arrow.Scalars.csproj",
"{EE364C9A-CB88-4DCE-9209-6ACBB8E6934F}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") =
"Apache.Arrow.Variant.Tests",
"test\Apache.Arrow.Variant.Tests\Apache.Arrow.Variant.Tests.csproj",
"{0C495233-010C-45F8-BAB2-D9CD0B7B9861}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") =
"Apache.Arrow.Scalars.Tests",
"test\Apache.Arrow.Scalars.Tests\Apache.Arrow.Scalars.Tests.csproj",
"{0C495233-010C-45F8-BAB2-D9CD0B7B9861}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") =
"Apache.Arrow.Variant.Benchmarks",
"test\Apache.Arrow.Variant.Benchmarks\Apache.Arrow.Variant.Benchmarks.csproj",
"{F3A8B7C6-D5E4-4321-9ABC-DEF012345678}"
EndProject
diff --git a/dev/release/verify_rc.sh b/dev/release/verify_rc.sh
index 8fcad5e..2c5ad9a 100755
--- a/dev/release/verify_rc.sh
+++ b/dev/release/verify_rc.sh
@@ -184,8 +184,8 @@ test_binary_distribution() {
reference_package "Apache.Arrow.Compression" "Apache.Arrow.Compression.Tests"
reference_package "Apache.Arrow.Flight.Sql" "Apache.Arrow.Flight.Sql.Tests"
"Apache.Arrow.Flight.TestWeb"
reference_package "Apache.Arrow.Flight.AspNetCore"
"Apache.Arrow.Flight.TestWeb"
- reference_package "Apache.Arrow.Operations" "Apache.Arrow.Operations.Tests"
"Apache.Arrow.Variant.Tests"
- reference_package "Apache.Arrow.Variant" "Apache.Arrow.Variant.Tests"
+ reference_package "Apache.Arrow.Operations" "Apache.Arrow.Operations.Tests"
"Apache.Arrow.Scalars.Tests"
+ reference_package "Apache.Arrow.Scalars" "Apache.Arrow.Scalars.Tests"
# Move src directory to ensure we are only testing against built packages
mv src src.backup
diff --git a/src/Apache.Arrow.Operations/Apache.Arrow.Operations.csproj
b/src/Apache.Arrow.Operations/Apache.Arrow.Operations.csproj
index 8cc1c4c..f715802 100644
--- a/src/Apache.Arrow.Operations/Apache.Arrow.Operations.csproj
+++ b/src/Apache.Arrow.Operations/Apache.Arrow.Operations.csproj
@@ -18,7 +18,7 @@
</ItemGroup>
<ItemGroup>
- <ProjectReference
Include="..\Apache.Arrow.Variant\Apache.Arrow.Variant.csproj" />
+ <ProjectReference
Include="..\Apache.Arrow.Scalars\Apache.Arrow.Scalars.csproj" />
</ItemGroup>
</Project>
diff --git a/src/Apache.Arrow.Operations/Json/VariantJsonConverter.cs
b/src/Apache.Arrow.Operations/Json/VariantJsonConverter.cs
index b1806a5..8a4c2bf 100644
--- a/src/Apache.Arrow.Operations/Json/VariantJsonConverter.cs
+++ b/src/Apache.Arrow.Operations/Json/VariantJsonConverter.cs
@@ -17,7 +17,7 @@ using System;
using System.Collections.Generic;
using System.Text.Json;
using System.Text.Json.Serialization;
-using Apache.Arrow.Variant;
+using Apache.Arrow.Scalars.Variant;
namespace Apache.Arrow.Operations.Json
{
diff --git a/src/Apache.Arrow.Operations/Json/VariantJsonReader.cs
b/src/Apache.Arrow.Operations/Json/VariantJsonReader.cs
index 9585008..5f8ada4 100644
--- a/src/Apache.Arrow.Operations/Json/VariantJsonReader.cs
+++ b/src/Apache.Arrow.Operations/Json/VariantJsonReader.cs
@@ -16,7 +16,7 @@
using System;
using System.Text;
using System.Text.Json;
-using Apache.Arrow.Variant;
+using Apache.Arrow.Scalars.Variant;
namespace Apache.Arrow.Operations.Json
{
diff --git a/src/Apache.Arrow.Operations/Json/VariantJsonWriter.cs
b/src/Apache.Arrow.Operations/Json/VariantJsonWriter.cs
index 2f9e216..56144a9 100644
--- a/src/Apache.Arrow.Operations/Json/VariantJsonWriter.cs
+++ b/src/Apache.Arrow.Operations/Json/VariantJsonWriter.cs
@@ -21,7 +21,7 @@ using System.IO;
#endif
using System.Text;
using System.Text.Json;
-using Apache.Arrow.Variant;
+using Apache.Arrow.Scalars.Variant;
namespace Apache.Arrow.Operations.Json
{
diff --git a/src/Apache.Arrow.Variant/Apache.Arrow.Variant.csproj
b/src/Apache.Arrow.Scalars/Apache.Arrow.Scalars.csproj
similarity index 100%
rename from src/Apache.Arrow.Variant/Apache.Arrow.Variant.csproj
rename to src/Apache.Arrow.Scalars/Apache.Arrow.Scalars.csproj
diff --git a/src/Apache.Arrow.Variant/Properties/AssemblyInfo.cs
b/src/Apache.Arrow.Scalars/Properties/AssemblyInfo.cs
similarity index 96%
rename from src/Apache.Arrow.Variant/Properties/AssemblyInfo.cs
rename to src/Apache.Arrow.Scalars/Properties/AssemblyInfo.cs
index 6386c23..24ce123 100644
--- a/src/Apache.Arrow.Variant/Properties/AssemblyInfo.cs
+++ b/src/Apache.Arrow.Scalars/Properties/AssemblyInfo.cs
@@ -15,5 +15,5 @@
using System.Runtime.CompilerServices;
-[assembly: InternalsVisibleTo("Apache.Arrow.Variant.Tests,
PublicKey=0024000004800000940000000602000000240000525341310004000001000100e504183f6d470d6b67b6d19212be3e1f598f70c246a120194bc38130101d0c1853e4a0f2232cb12e37a7a90e707aabd38511dac4f25fcb0d691b2aa265900bf42de7f70468fc997551a40e1e0679b605aa2088a4a69e07c117e988f5b1738c570ee66997fba02485e7856a49eca5fd0706d09899b8312577cbb9034599fc92d4")]
+[assembly: InternalsVisibleTo("Apache.Arrow.Scalars.Tests,
PublicKey=0024000004800000940000000602000000240000525341310004000001000100e504183f6d470d6b67b6d19212be3e1f598f70c246a120194bc38130101d0c1853e4a0f2232cb12e37a7a90e707aabd38511dac4f25fcb0d691b2aa265900bf42de7f70468fc997551a40e1e0679b605aa2088a4a69e07c117e988f5b1738c570ee66997fba02485e7856a49eca5fd0706d09899b8312577cbb9034599fc92d4")]
[assembly: InternalsVisibleTo("Apache.Arrow.Operations,
PublicKey=0024000004800000940000000602000000240000525341310004000001000100e504183f6d470d6b67b6d19212be3e1f598f70c246a120194bc38130101d0c1853e4a0f2232cb12e37a7a90e707aabd38511dac4f25fcb0d691b2aa265900bf42de7f70468fc997551a40e1e0679b605aa2088a4a69e07c117e988f5b1738c570ee66997fba02485e7856a49eca5fd0706d09899b8312577cbb9034599fc92d4")]
diff --git a/src/Apache.Arrow.Variant/VariantArrayReader.cs
b/src/Apache.Arrow.Scalars/Variant/VariantArrayReader.cs
similarity index 98%
rename from src/Apache.Arrow.Variant/VariantArrayReader.cs
rename to src/Apache.Arrow.Scalars/Variant/VariantArrayReader.cs
index 901e710..a26e463 100644
--- a/src/Apache.Arrow.Variant/VariantArrayReader.cs
+++ b/src/Apache.Arrow.Scalars/Variant/VariantArrayReader.cs
@@ -15,7 +15,7 @@
using System;
-namespace Apache.Arrow.Variant
+namespace Apache.Arrow.Scalars.Variant
{
/// <summary>
/// Zero-copy reader for a variant array value.
diff --git a/src/Apache.Arrow.Variant/VariantBasicType.cs
b/src/Apache.Arrow.Scalars/Variant/VariantBasicType.cs
similarity index 96%
rename from src/Apache.Arrow.Variant/VariantBasicType.cs
rename to src/Apache.Arrow.Scalars/Variant/VariantBasicType.cs
index 73b1a09..ca01a4c 100644
--- a/src/Apache.Arrow.Variant/VariantBasicType.cs
+++ b/src/Apache.Arrow.Scalars/Variant/VariantBasicType.cs
@@ -13,7 +13,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-namespace Apache.Arrow.Variant
+namespace Apache.Arrow.Scalars.Variant
{
/// <summary>
/// The basic type stored in the lowest 2 bits of a variant value header
byte.
diff --git a/src/Apache.Arrow.Variant/VariantBuilder.cs
b/src/Apache.Arrow.Scalars/Variant/VariantBuilder.cs
similarity index 99%
rename from src/Apache.Arrow.Variant/VariantBuilder.cs
rename to src/Apache.Arrow.Scalars/Variant/VariantBuilder.cs
index 9e40120..d5b8337 100644
--- a/src/Apache.Arrow.Variant/VariantBuilder.cs
+++ b/src/Apache.Arrow.Scalars/Variant/VariantBuilder.cs
@@ -16,7 +16,7 @@
using System;
using System.Collections.Generic;
-namespace Apache.Arrow.Variant
+namespace Apache.Arrow.Scalars.Variant
{
/// <summary>
/// Encodes a <see cref="VariantValue"/> into the binary variant format,
diff --git a/src/Apache.Arrow.Variant/VariantEncodingHelper.cs
b/src/Apache.Arrow.Scalars/Variant/VariantEncodingHelper.cs
similarity index 99%
rename from src/Apache.Arrow.Variant/VariantEncodingHelper.cs
rename to src/Apache.Arrow.Scalars/Variant/VariantEncodingHelper.cs
index 9c10b2f..6975bfb 100644
--- a/src/Apache.Arrow.Variant/VariantEncodingHelper.cs
+++ b/src/Apache.Arrow.Scalars/Variant/VariantEncodingHelper.cs
@@ -16,7 +16,7 @@
using System;
using System.Buffers.Binary;
-namespace Apache.Arrow.Variant
+namespace Apache.Arrow.Scalars.Variant
{
/// <summary>
/// Internal helpers for reading and writing variant binary encoding.
diff --git a/src/Apache.Arrow.Variant/VariantMetadata.cs
b/src/Apache.Arrow.Scalars/Variant/VariantMetadata.cs
similarity index 99%
rename from src/Apache.Arrow.Variant/VariantMetadata.cs
rename to src/Apache.Arrow.Scalars/Variant/VariantMetadata.cs
index 73d8415..1e43377 100644
--- a/src/Apache.Arrow.Variant/VariantMetadata.cs
+++ b/src/Apache.Arrow.Scalars/Variant/VariantMetadata.cs
@@ -16,7 +16,7 @@
using System;
using System.Text;
-namespace Apache.Arrow.Variant
+namespace Apache.Arrow.Scalars.Variant
{
/// <summary>
/// Zero-copy reader for variant metadata: a header byte followed by a
string
diff --git a/src/Apache.Arrow.Variant/VariantMetadataBuilder.cs
b/src/Apache.Arrow.Scalars/Variant/VariantMetadataBuilder.cs
similarity index 99%
rename from src/Apache.Arrow.Variant/VariantMetadataBuilder.cs
rename to src/Apache.Arrow.Scalars/Variant/VariantMetadataBuilder.cs
index acc756a..9e06fea 100644
--- a/src/Apache.Arrow.Variant/VariantMetadataBuilder.cs
+++ b/src/Apache.Arrow.Scalars/Variant/VariantMetadataBuilder.cs
@@ -17,7 +17,7 @@ using System;
using System.Collections.Generic;
using System.Text;
-namespace Apache.Arrow.Variant
+namespace Apache.Arrow.Scalars.Variant
{
/// <summary>
/// Collects unique field names and builds the sorted binary metadata
diff --git a/src/Apache.Arrow.Variant/VariantObjectReader.cs
b/src/Apache.Arrow.Scalars/Variant/VariantObjectReader.cs
similarity index 99%
rename from src/Apache.Arrow.Variant/VariantObjectReader.cs
rename to src/Apache.Arrow.Scalars/Variant/VariantObjectReader.cs
index 43693c6..fc87bb7 100644
--- a/src/Apache.Arrow.Variant/VariantObjectReader.cs
+++ b/src/Apache.Arrow.Scalars/Variant/VariantObjectReader.cs
@@ -16,7 +16,7 @@
using System;
using System.Text;
-namespace Apache.Arrow.Variant
+namespace Apache.Arrow.Scalars.Variant
{
/// <summary>
/// Zero-copy reader for a variant object value. Provides access to field
diff --git a/src/Apache.Arrow.Variant/VariantPrimitiveType.cs
b/src/Apache.Arrow.Scalars/Variant/VariantPrimitiveType.cs
similarity index 97%
rename from src/Apache.Arrow.Variant/VariantPrimitiveType.cs
rename to src/Apache.Arrow.Scalars/Variant/VariantPrimitiveType.cs
index 8b367de..8772b07 100644
--- a/src/Apache.Arrow.Variant/VariantPrimitiveType.cs
+++ b/src/Apache.Arrow.Scalars/Variant/VariantPrimitiveType.cs
@@ -13,7 +13,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-namespace Apache.Arrow.Variant
+namespace Apache.Arrow.Scalars.Variant
{
/// <summary>
/// Primitive type IDs stored in bits 2-7 of the value header byte
diff --git a/src/Apache.Arrow.Variant/VariantReader.cs
b/src/Apache.Arrow.Scalars/Variant/VariantReader.cs
similarity index 99%
rename from src/Apache.Arrow.Variant/VariantReader.cs
rename to src/Apache.Arrow.Scalars/Variant/VariantReader.cs
index 24c9926..56d9df1 100644
--- a/src/Apache.Arrow.Variant/VariantReader.cs
+++ b/src/Apache.Arrow.Scalars/Variant/VariantReader.cs
@@ -20,7 +20,7 @@ using System.Data.SqlTypes;
using System.Runtime.CompilerServices;
using System.Text;
-namespace Apache.Arrow.Variant
+namespace Apache.Arrow.Scalars.Variant
{
/// <summary>
/// Zero-copy reader for a single variant value. Provides type inspection
diff --git a/src/Apache.Arrow.Variant/VariantValue.cs
b/src/Apache.Arrow.Scalars/Variant/VariantValue.cs
similarity index 99%
rename from src/Apache.Arrow.Variant/VariantValue.cs
rename to src/Apache.Arrow.Scalars/Variant/VariantValue.cs
index b368874..d16b104 100644
--- a/src/Apache.Arrow.Variant/VariantValue.cs
+++ b/src/Apache.Arrow.Scalars/Variant/VariantValue.cs
@@ -20,7 +20,7 @@ using System.Globalization;
using System.Linq;
using System.Runtime.CompilerServices;
-namespace Apache.Arrow.Variant
+namespace Apache.Arrow.Scalars.Variant
{
/// <summary>
/// Represents a materialized variant value as a discriminated union.
diff --git a/src/Apache.Arrow.Variant/VariantValueWriter.cs
b/src/Apache.Arrow.Scalars/Variant/VariantValueWriter.cs
similarity index 99%
rename from src/Apache.Arrow.Variant/VariantValueWriter.cs
rename to src/Apache.Arrow.Scalars/Variant/VariantValueWriter.cs
index f5b9498..dc54aa5 100644
--- a/src/Apache.Arrow.Variant/VariantValueWriter.cs
+++ b/src/Apache.Arrow.Scalars/Variant/VariantValueWriter.cs
@@ -21,7 +21,7 @@ using System.Data.SqlTypes;
using System.IO;
using System.Text;
-namespace Apache.Arrow.Variant
+namespace Apache.Arrow.Scalars.Variant
{
/// <summary>
/// Streams variant value bytes directly from primitive calls, without
diff --git a/test/Apache.Arrow.Operations.Tests/Json/VariantDecimalJsonTests.cs
b/test/Apache.Arrow.Operations.Tests/Json/VariantDecimalJsonTests.cs
index c65d120..866f8b2 100644
--- a/test/Apache.Arrow.Operations.Tests/Json/VariantDecimalJsonTests.cs
+++ b/test/Apache.Arrow.Operations.Tests/Json/VariantDecimalJsonTests.cs
@@ -17,7 +17,7 @@ using System.Collections.Generic;
using System.Data.SqlTypes;
using System.Text.Json;
using Apache.Arrow.Operations.Json;
-using Apache.Arrow.Variant;
+using Apache.Arrow.Scalars.Variant;
using Xunit;
namespace Apache.Arrow.Operations.Tests
diff --git a/test/Apache.Arrow.Operations.Tests/Json/VariantJsonTests.cs
b/test/Apache.Arrow.Operations.Tests/Json/VariantJsonTests.cs
index 65a26dc..1e230bd 100644
--- a/test/Apache.Arrow.Operations.Tests/Json/VariantJsonTests.cs
+++ b/test/Apache.Arrow.Operations.Tests/Json/VariantJsonTests.cs
@@ -18,7 +18,7 @@ using System.Collections.Generic;
using System.Data.SqlTypes;
using System.Text.Json;
using Apache.Arrow.Operations.Json;
-using Apache.Arrow.Variant;
+using Apache.Arrow.Scalars.Variant;
using Xunit;
namespace Apache.Arrow.Operations.Tests
diff --git a/test/Apache.Arrow.Variant.Tests/Apache.Arrow.Variant.Tests.csproj
b/test/Apache.Arrow.Scalars.Tests/Apache.Arrow.Scalars.Tests.csproj
similarity index 92%
rename from test/Apache.Arrow.Variant.Tests/Apache.Arrow.Variant.Tests.csproj
rename to test/Apache.Arrow.Scalars.Tests/Apache.Arrow.Scalars.Tests.csproj
index 4471cfd..ca1208e 100644
--- a/test/Apache.Arrow.Variant.Tests/Apache.Arrow.Variant.Tests.csproj
+++ b/test/Apache.Arrow.Scalars.Tests/Apache.Arrow.Scalars.Tests.csproj
@@ -28,7 +28,7 @@
</ItemGroup>
<ItemGroup>
- <ProjectReference
Include="..\..\src\Apache.Arrow.Variant\Apache.Arrow.Variant.csproj" />
+ <ProjectReference
Include="..\..\src\Apache.Arrow.Scalars\Apache.Arrow.Scalars.csproj" />
<ProjectReference
Include="..\..\src\Apache.Arrow.Operations\Apache.Arrow.Operations.csproj" />
</ItemGroup>
diff --git a/test/Apache.Arrow.Variant.Tests/ParquetTestingVectorTests.cs
b/test/Apache.Arrow.Scalars.Tests/ParquetTestingVectorTests.cs
similarity index 99%
rename from test/Apache.Arrow.Variant.Tests/ParquetTestingVectorTests.cs
rename to test/Apache.Arrow.Scalars.Tests/ParquetTestingVectorTests.cs
index d81559e..a3c6ee3 100644
--- a/test/Apache.Arrow.Variant.Tests/ParquetTestingVectorTests.cs
+++ b/test/Apache.Arrow.Scalars.Tests/ParquetTestingVectorTests.cs
@@ -18,9 +18,10 @@ using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Text.Json;
+using Apache.Arrow.Scalars.Variant;
using Xunit;
-namespace Apache.Arrow.Variant.Tests
+namespace Apache.Arrow.Scalars.Tests
{
/// <summary>
/// Cross-implementation conformance tests using binary test vectors from
diff --git a/test/Apache.Arrow.Variant.Tests/TestVectors.cs
b/test/Apache.Arrow.Scalars.Tests/TestVectors.cs
similarity index 99%
rename from test/Apache.Arrow.Variant.Tests/TestVectors.cs
rename to test/Apache.Arrow.Scalars.Tests/TestVectors.cs
index 8a4e08e..3c81622 100644
--- a/test/Apache.Arrow.Variant.Tests/TestVectors.cs
+++ b/test/Apache.Arrow.Scalars.Tests/TestVectors.cs
@@ -14,9 +14,8 @@
// limitations under the License.
using System;
-using System.Collections.Generic;
-namespace Apache.Arrow.Variant.Tests
+namespace Apache.Arrow.Scalars.Tests
{
/// <summary>
/// Hand-crafted binary test vectors for the variant encoding.
diff --git a/test/Apache.Arrow.Variant.Tests/VariantBuilderTests.cs
b/test/Apache.Arrow.Scalars.Tests/VariantBuilderTests.cs
similarity index 99%
rename from test/Apache.Arrow.Variant.Tests/VariantBuilderTests.cs
rename to test/Apache.Arrow.Scalars.Tests/VariantBuilderTests.cs
index c85d879..2282859 100644
--- a/test/Apache.Arrow.Variant.Tests/VariantBuilderTests.cs
+++ b/test/Apache.Arrow.Scalars.Tests/VariantBuilderTests.cs
@@ -15,9 +15,10 @@
using System;
using System.Collections.Generic;
+using Apache.Arrow.Scalars.Variant;
using Xunit;
-namespace Apache.Arrow.Variant.Tests
+namespace Apache.Arrow.Scalars.Tests
{
public class VariantBuilderTests
{
diff --git a/test/Apache.Arrow.Variant.Tests/VariantEncodingHelperTests.cs
b/test/Apache.Arrow.Scalars.Tests/VariantEncodingHelperTests.cs
similarity index 99%
rename from test/Apache.Arrow.Variant.Tests/VariantEncodingHelperTests.cs
rename to test/Apache.Arrow.Scalars.Tests/VariantEncodingHelperTests.cs
index c121d74..f95bbf2 100644
--- a/test/Apache.Arrow.Variant.Tests/VariantEncodingHelperTests.cs
+++ b/test/Apache.Arrow.Scalars.Tests/VariantEncodingHelperTests.cs
@@ -14,9 +14,10 @@
// limitations under the License.
using System;
+using Apache.Arrow.Scalars.Variant;
using Xunit;
-namespace Apache.Arrow.Variant.Tests
+namespace Apache.Arrow.Scalars.Tests
{
public class VariantEncodingHelperTests
{
diff --git a/test/Apache.Arrow.Variant.Tests/VariantMetadataTests.cs
b/test/Apache.Arrow.Scalars.Tests/VariantMetadataTests.cs
similarity index 99%
rename from test/Apache.Arrow.Variant.Tests/VariantMetadataTests.cs
rename to test/Apache.Arrow.Scalars.Tests/VariantMetadataTests.cs
index 4d7e555..c9d03ae 100644
--- a/test/Apache.Arrow.Variant.Tests/VariantMetadataTests.cs
+++ b/test/Apache.Arrow.Scalars.Tests/VariantMetadataTests.cs
@@ -15,9 +15,10 @@
using System;
using System.Text;
+using Apache.Arrow.Scalars.Variant;
using Xunit;
-namespace Apache.Arrow.Variant.Tests
+namespace Apache.Arrow.Scalars.Tests
{
public class VariantMetadataTests
{
diff --git a/test/Apache.Arrow.Variant.Tests/VariantReaderArrayTests.cs
b/test/Apache.Arrow.Scalars.Tests/VariantReaderArrayTests.cs
similarity index 98%
rename from test/Apache.Arrow.Variant.Tests/VariantReaderArrayTests.cs
rename to test/Apache.Arrow.Scalars.Tests/VariantReaderArrayTests.cs
index 25bf235..7e4bf9d 100644
--- a/test/Apache.Arrow.Variant.Tests/VariantReaderArrayTests.cs
+++ b/test/Apache.Arrow.Scalars.Tests/VariantReaderArrayTests.cs
@@ -14,9 +14,10 @@
// limitations under the License.
using System;
+using Apache.Arrow.Scalars.Variant;
using Xunit;
-namespace Apache.Arrow.Variant.Tests
+namespace Apache.Arrow.Scalars.Tests
{
public class VariantReaderArrayTests
{
diff --git a/test/Apache.Arrow.Variant.Tests/VariantReaderObjectTests.cs
b/test/Apache.Arrow.Scalars.Tests/VariantReaderObjectTests.cs
similarity index 98%
rename from test/Apache.Arrow.Variant.Tests/VariantReaderObjectTests.cs
rename to test/Apache.Arrow.Scalars.Tests/VariantReaderObjectTests.cs
index de9e3f2..10d72ef 100644
--- a/test/Apache.Arrow.Variant.Tests/VariantReaderObjectTests.cs
+++ b/test/Apache.Arrow.Scalars.Tests/VariantReaderObjectTests.cs
@@ -15,9 +15,10 @@
using System;
using System.Text;
+using Apache.Arrow.Scalars.Variant;
using Xunit;
-namespace Apache.Arrow.Variant.Tests
+namespace Apache.Arrow.Scalars.Tests
{
public class VariantReaderObjectTests
{
diff --git a/test/Apache.Arrow.Variant.Tests/VariantReaderPrimitiveTests.cs
b/test/Apache.Arrow.Scalars.Tests/VariantReaderPrimitiveTests.cs
similarity index 99%
rename from test/Apache.Arrow.Variant.Tests/VariantReaderPrimitiveTests.cs
rename to test/Apache.Arrow.Scalars.Tests/VariantReaderPrimitiveTests.cs
index 917633e..a40a7fe 100644
--- a/test/Apache.Arrow.Variant.Tests/VariantReaderPrimitiveTests.cs
+++ b/test/Apache.Arrow.Scalars.Tests/VariantReaderPrimitiveTests.cs
@@ -14,9 +14,10 @@
// limitations under the License.
using System;
+using Apache.Arrow.Scalars.Variant;
using Xunit;
-namespace Apache.Arrow.Variant.Tests
+namespace Apache.Arrow.Scalars.Tests
{
public class VariantReaderPrimitiveTests
{
diff --git a/test/Apache.Arrow.Variant.Tests/VariantRoundTripTests.cs
b/test/Apache.Arrow.Scalars.Tests/VariantRoundTripTests.cs
similarity index 99%
rename from test/Apache.Arrow.Variant.Tests/VariantRoundTripTests.cs
rename to test/Apache.Arrow.Scalars.Tests/VariantRoundTripTests.cs
index 00d37a0..5100460 100644
--- a/test/Apache.Arrow.Variant.Tests/VariantRoundTripTests.cs
+++ b/test/Apache.Arrow.Scalars.Tests/VariantRoundTripTests.cs
@@ -15,9 +15,10 @@
using System;
using System.Collections.Generic;
+using Apache.Arrow.Scalars.Variant;
using Xunit;
-namespace Apache.Arrow.Variant.Tests
+namespace Apache.Arrow.Scalars.Tests
{
public class VariantRoundTripTests
{
diff --git a/test/Apache.Arrow.Variant.Tests/VariantSqlDecimalTests.cs
b/test/Apache.Arrow.Scalars.Tests/VariantSqlDecimalTests.cs
similarity index 99%
rename from test/Apache.Arrow.Variant.Tests/VariantSqlDecimalTests.cs
rename to test/Apache.Arrow.Scalars.Tests/VariantSqlDecimalTests.cs
index ce81ec4..a0be0e9 100644
--- a/test/Apache.Arrow.Variant.Tests/VariantSqlDecimalTests.cs
+++ b/test/Apache.Arrow.Scalars.Tests/VariantSqlDecimalTests.cs
@@ -16,9 +16,10 @@
using System;
using System.Collections.Generic;
using System.Data.SqlTypes;
+using Apache.Arrow.Scalars.Variant;
using Xunit;
-namespace Apache.Arrow.Variant.Tests
+namespace Apache.Arrow.Scalars.Tests
{
public class VariantSqlDecimalTests
{
diff --git a/test/Apache.Arrow.Variant.Tests/VariantValueTests.cs
b/test/Apache.Arrow.Scalars.Tests/VariantValueTests.cs
similarity index 99%
rename from test/Apache.Arrow.Variant.Tests/VariantValueTests.cs
rename to test/Apache.Arrow.Scalars.Tests/VariantValueTests.cs
index 4d9506c..e5187dc 100644
--- a/test/Apache.Arrow.Variant.Tests/VariantValueTests.cs
+++ b/test/Apache.Arrow.Scalars.Tests/VariantValueTests.cs
@@ -16,9 +16,10 @@
using System;
using System.Collections.Generic;
using System.Data.SqlTypes;
+using Apache.Arrow.Scalars.Variant;
using Xunit;
-namespace Apache.Arrow.Variant.Tests
+namespace Apache.Arrow.Scalars.Tests
{
public class VariantValueTests
{
diff --git a/test/Apache.Arrow.Variant.Benchmarks/AccessBenchmarks.cs
b/test/Apache.Arrow.Variant.Benchmarks/AccessBenchmarks.cs
index 64c2ad5..28330ea 100644
--- a/test/Apache.Arrow.Variant.Benchmarks/AccessBenchmarks.cs
+++ b/test/Apache.Arrow.Variant.Benchmarks/AccessBenchmarks.cs
@@ -13,6 +13,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
+using Apache.Arrow.Scalars.Variant;
using BenchmarkDotNet.Attributes;
namespace Apache.Arrow.Variant.Benchmarks
diff --git
a/test/Apache.Arrow.Variant.Benchmarks/Apache.Arrow.Variant.Benchmarks.csproj
b/test/Apache.Arrow.Variant.Benchmarks/Apache.Arrow.Variant.Benchmarks.csproj
index 1108a2e..6f0f798 100644
---
a/test/Apache.Arrow.Variant.Benchmarks/Apache.Arrow.Variant.Benchmarks.csproj
+++
b/test/Apache.Arrow.Variant.Benchmarks/Apache.Arrow.Variant.Benchmarks.csproj
@@ -10,7 +10,7 @@
</ItemGroup>
<ItemGroup>
- <ProjectReference
Include="..\..\src\Apache.Arrow.Variant\Apache.Arrow.Variant.csproj" />
+ <ProjectReference
Include="..\..\src\Apache.Arrow.Scalars\Apache.Arrow.Scalars.csproj" />
<ProjectReference
Include="..\..\src\Apache.Arrow.Operations\Apache.Arrow.Operations.csproj" />
</ItemGroup>
diff --git a/test/Apache.Arrow.Variant.Benchmarks/ArrayBenchmarks.cs
b/test/Apache.Arrow.Variant.Benchmarks/ArrayBenchmarks.cs
index bf7e5c1..7aad767 100644
--- a/test/Apache.Arrow.Variant.Benchmarks/ArrayBenchmarks.cs
+++ b/test/Apache.Arrow.Variant.Benchmarks/ArrayBenchmarks.cs
@@ -13,6 +13,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
+using Apache.Arrow.Scalars.Variant;
using BenchmarkDotNet.Attributes;
namespace Apache.Arrow.Variant.Benchmarks
diff --git a/test/Apache.Arrow.Variant.Benchmarks/CreationBenchmarks.cs
b/test/Apache.Arrow.Variant.Benchmarks/CreationBenchmarks.cs
index c320e8e..5cace76 100644
--- a/test/Apache.Arrow.Variant.Benchmarks/CreationBenchmarks.cs
+++ b/test/Apache.Arrow.Variant.Benchmarks/CreationBenchmarks.cs
@@ -13,6 +13,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
+using Apache.Arrow.Scalars.Variant;
using BenchmarkDotNet.Attributes;
namespace Apache.Arrow.Variant.Benchmarks
diff --git a/test/Apache.Arrow.Variant.Benchmarks/EncodingBenchmarks.cs
b/test/Apache.Arrow.Variant.Benchmarks/EncodingBenchmarks.cs
index 7451355..b90e21f 100644
--- a/test/Apache.Arrow.Variant.Benchmarks/EncodingBenchmarks.cs
+++ b/test/Apache.Arrow.Variant.Benchmarks/EncodingBenchmarks.cs
@@ -18,6 +18,7 @@ using System.Collections.Generic;
using System.Text;
using System.Text.Json;
using Apache.Arrow.Operations.Json;
+using Apache.Arrow.Scalars.Variant;
using BenchmarkDotNet.Attributes;
namespace Apache.Arrow.Variant.Benchmarks
diff --git a/test/Apache.Arrow.Variant.Benchmarks/EqualityBenchmarks.cs
b/test/Apache.Arrow.Variant.Benchmarks/EqualityBenchmarks.cs
index 417b146..6f420fe 100644
--- a/test/Apache.Arrow.Variant.Benchmarks/EqualityBenchmarks.cs
+++ b/test/Apache.Arrow.Variant.Benchmarks/EqualityBenchmarks.cs
@@ -13,6 +13,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
+using Apache.Arrow.Scalars.Variant;
using BenchmarkDotNet.Attributes;
namespace Apache.Arrow.Variant.Benchmarks
diff --git a/test/Apache.Arrow.Variant.Benchmarks/MixedWorkloadBenchmarks.cs
b/test/Apache.Arrow.Variant.Benchmarks/MixedWorkloadBenchmarks.cs
index 447f5b0..47a0b46 100644
--- a/test/Apache.Arrow.Variant.Benchmarks/MixedWorkloadBenchmarks.cs
+++ b/test/Apache.Arrow.Variant.Benchmarks/MixedWorkloadBenchmarks.cs
@@ -14,6 +14,7 @@
// limitations under the License.
using System.Collections.Generic;
+using Apache.Arrow.Scalars.Variant;
using BenchmarkDotNet.Attributes;
namespace Apache.Arrow.Variant.Benchmarks
diff --git a/test/Apache.Arrow.Variant.Benchmarks/StructVariantValue.cs
b/test/Apache.Arrow.Variant.Benchmarks/StructVariantValue.cs
index 57c1788..21ae1b4 100644
--- a/test/Apache.Arrow.Variant.Benchmarks/StructVariantValue.cs
+++ b/test/Apache.Arrow.Variant.Benchmarks/StructVariantValue.cs
@@ -16,6 +16,8 @@
using System;
using System.Collections.Generic;
+using Apache.Arrow.Scalars.Variant;
+
namespace Apache.Arrow.Variant.Benchmarks
{
/// <summary>
