Rename Variant assemblies to Scalars

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"
     ]
   }

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

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

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>

src/Apache.Arrow.Operations/Json/VariantJsonConverter.cs

@@ -17,7 +17,7 @@
 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
 {

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
 {

src/Apache.Arrow.Operations/Json/VariantJsonWriter.cs

@@ -21,7 +21,7 @@
 #endif
 using System.Text;
 using System.Text.Json;
-using Apache.Arrow.Variant;
+using Apache.Arrow.Scalars.Variant;
 
 namespace Apache.Arrow.Operations.Json
 {

src/Apache.Arrow.Variant/Properties/AssemblyInfo.cs → 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")]

src/Apache.Arrow.Variant/VariantArrayReader.cs → 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.

src/Apache.Arrow.Variant/VariantBasicType.cs → 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.

src/Apache.Arrow.Variant/VariantBuilder.cs → 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,

src/Apache.Arrow.Variant/VariantEncodingHelper.cs → 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.

src/Apache.Arrow.Variant/VariantMetadata.cs → 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

src/Apache.Arrow.Variant/VariantMetadataBuilder.cs → src/Apache.Arrow.Scalars/Variant/VariantMetadataBuilder.cs

@@ -17,7 +17,7 @@
 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

src/Apache.Arrow.Variant/VariantObjectReader.cs → 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

src/Apache.Arrow.Variant/VariantPrimitiveType.cs → 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

src/Apache.Arrow.Variant/VariantReader.cs → src/Apache.Arrow.Scalars/Variant/VariantReader.cs

@@ -20,7 +20,7 @@
 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

src/Apache.Arrow.Variant/VariantValue.cs → src/Apache.Arrow.Scalars/Variant/VariantValue.cs

@@ -20,7 +20,7 @@
 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.

src/Apache.Arrow.Variant/VariantValueWriter.cs → src/Apache.Arrow.Scalars/Variant/VariantValueWriter.cs

@@ -21,7 +21,7 @@
 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

test/Apache.Arrow.Operations.Tests/Json/VariantDecimalJsonTests.cs

@@ -17,7 +17,7 @@
 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

test/Apache.Arrow.Operations.Tests/Json/VariantJsonTests.cs

@@ -18,7 +18,7 @@
 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

test/Apache.Arrow.Variant.Tests/Apache.Arrow.Variant.Tests.csproj → 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>
 

test/Apache.Arrow.Variant.Tests/ParquetTestingVectorTests.cs → test/Apache.Arrow.Scalars.Tests/ParquetTestingVectorTests.cs

@@ -18,9 +18,10 @@
 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

test/Apache.Arrow.Variant.Tests/TestVectors.cs → 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.

test/Apache.Arrow.Variant.Tests/VariantBuilderTests.cs → 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
     {

test/Apache.Arrow.Variant.Tests/VariantEncodingHelperTests.cs → 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
     {

test/Apache.Arrow.Variant.Tests/VariantMetadataTests.cs → 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
     {

test/Apache.Arrow.Variant.Tests/VariantReaderArrayTests.cs → 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
     {

test/Apache.Arrow.Variant.Tests/VariantReaderObjectTests.cs → 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
     {

test/Apache.Arrow.Variant.Tests/VariantReaderPrimitiveTests.cs → 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
     {

test/Apache.Arrow.Variant.Tests/VariantRoundTripTests.cs → 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
     {

test/Apache.Arrow.Variant.Tests/VariantSqlDecimalTests.cs → 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
     {

test/Apache.Arrow.Variant.Tests/VariantValueTests.cs → 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
     {

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

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>
 

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

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

test/Apache.Arrow.Variant.Benchmarks/EncodingBenchmarks.cs

@@ -18,6 +18,7 @@
 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

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

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