feat(): add support for DateOnly and TimeOnly opensearch-project#680 (o…

…pensearch-project#734) * feat(): add .net6 and .net8 to core project and get it to compile opensearch-project#680 Signed-off-by: Joe Feser <joseph.feser@gmail.com> * feat(): add support for DateOnly and TimeOnly from .net 6 opensearch-project#680 Signed-off-by: Joe Feser <joseph.feser@gmail.com> * PR Comments Signed-off-by: Joe Feser <joseph.feser@gmail.com> * PR Comments Signed-off-by: Joe Feser <joseph.feser@gmail.com> * modified the added section of changelog.md Signed-off-by: Joe Feser <joseph.feser@gmail.com> * Fix compilation/indentation error Signed-off-by: Thomas Farr <tsfarr@amazon.com> * Fix code conventions unit test Signed-off-by: Thomas Farr <tsfarr@amazon.com> * Fix remaining `#if`s Signed-off-by: Thomas Farr <tsfarr@amazon.com> * Fix changelog ordering Signed-off-by: Thomas Farr <tsfarr@amazon.com> * Fix CI errors Signed-off-by: Thomas Farr <tsfarr@amazon.com> --------- Signed-off-by: Joe Feser <joseph.feser@gmail.com> Signed-off-by: Thomas Farr <tsfarr@amazon.com> Co-authored-by: Thomas Farr <tsfarr@amazon.com> (cherry picked from commit f3bae74)
Xtansia · Jul 31, 2024 · 6a34350 · 6a34350
1 parent 1f276e9
commit 6a34350
Show file tree

Hide file tree

Showing 32 changed files with 235 additions and 135 deletions.
diff --git a/.github/workflows/build_deploy_docs.yml b/.github/workflows/build_deploy_docs.yml
@@ -17,6 +17,7 @@ jobs:
           dotnet-version: |
             5.0.x
             6.0.x
+            8.0.x
 
       - uses: actions/cache@v4
         with:

diff --git a/.github/workflows/code-gen.yml b/.github/workflows/code-gen.yml
@@ -11,11 +11,12 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Setup .NET SDK
-        uses: actions/setup-dotnet@v3
+        uses: actions/setup-dotnet@v4
         with:
           dotnet-version: |
             5.0.x
             6.0.x
+            8.0.x
 
       - name: Cache Nuget Packages
         uses: actions/cache@v3

diff --git a/.github/workflows/compile.yml b/.github/workflows/compile.yml
@@ -13,6 +13,7 @@ jobs:
         dotnet-version: |
           5.0.x
           6.0.x
+          8.0.x
     - uses: actions/cache@v4
       with:
         path: ~/.nuget/packages

diff --git a/.github/workflows/integration-yaml-tests.yml b/.github/workflows/integration-yaml-tests.yml
@@ -35,6 +35,7 @@ jobs:
           dotnet-version: |
             5.0.x
             6.0.x
+            8.0.x
 
       - uses: actions/cache@v4
         with:
@@ -96,6 +97,7 @@ jobs:
           dotnet-version: |
             5.0.x
             6.0.x
+            8.0.x
 
       - uses: actions/cache@v4
         with:

diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
@@ -39,6 +39,7 @@ jobs:
           dotnet-version: |
             5.0.x
             6.0.x
+            8.0.x
 
       - uses: actions/cache@v4
         with:
@@ -86,6 +87,7 @@ jobs:
           dotnet-version: |
             5.0.x
             6.0.x
+            8.0.x
 
       - uses: actions/cache@v4
         with:

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -13,6 +13,7 @@ jobs:
         dotnet-version: |
           5.0.x
           6.0.x
+          8.0.x
     - uses: actions/cache@v4
       with:
         path: ~/.nuget/packages

diff --git a/.github/workflows/test-jobs.yml b/.github/workflows/test-jobs.yml
@@ -29,6 +29,7 @@ jobs:
           dotnet-version: |
             5.0.x
             6.0.x
+            8.0.x
       - uses: actions/cache@v4
         with:
           path: ~/.nuget/packages
@@ -67,6 +68,7 @@ jobs:
           dotnet-version: |
             5.0.x
             6.0.x
+            8.0.x
       - uses: actions/cache@v4
         with:
           path: ~/.nuget/packages

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,7 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 ## [Unreleased]
 ### Added
 - Added support for `MinScore` on `ScriptScoreQuery` ([#624](https://github.com/opensearch-project/opensearch-net/pull/624))
+- Added support for serializing the `DateOnly` and `TimeOnly` types ([#734](https://github.com/opensearch-project/opensearch-net/pull/734))
 
 ### Dependencies
 - Bumps `AWSSDK.Core` from 3.7.204.12 to 3.7.400
@@ -179,4 +180,4 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 [1.6.0]: https://github.com/opensearch-project/opensearch-net/compare/v1.5.0...v1.6.0
 [1.5.0]: https://github.com/opensearch-project/opensearch-net/compare/v1.4.0...v1.5.0
 [1.4.0]: https://github.com/opensearch-project/opensearch-net/compare/v1.3.0...v1.4.0
-[1.3.0]: https://github.com/opensearch-project/opensearch-net/compare/v1.2.0...v1.3.0
+[1.3.0]: https://github.com/opensearch-project/opensearch-net/compare/v1.2.0...v1.3.0
diff --git a/build/scripts/Targets.fs b/build/scripts/Targets.fs
@@ -38,16 +38,16 @@ open Fake.IO.Globbing.Operators
 
 module Main =
 
-    let private target name action = Targets.Target(name, Action(action)) 
+    let private target name action = Targets.Target(name, Action(action))
     let private skip name = printfn "SKIPPED target '%s' evaluated not to run" name |> ignore
-    let private conditional name optional action = target name (if optional then action else (fun _ -> skip name)) 
+    let private conditional name optional action = target name (if optional then action else (fun _ -> skip name))
     let private command name (dependencies: IEnumerable<string>) action = Targets.Target(name, dependencies, Action(action))
-    let private conditionalCommand name dependencies optional action = command name dependencies (if optional then action else (fun _ -> skip name)) 
-    
+    let private conditionalCommand name dependencies optional action = command name dependencies (if optional then action else (fun _ -> skip name))
+
     /// <summary>Sets command line environments indicating we are building from the command line</summary>
     let setCommandLineEnvVars () =
         Environment.setEnvironVar"OSC_COMMAND_LINE_BUILD" "1"
-        
+
         let sourceDir = Paths.TestsSource("Tests.Configuration");
         let defaultYaml = Path.Combine(sourceDir, "tests.default.yaml");
         let userYaml = Path.Combine(sourceDir, "tests.yaml");
@@ -56,59 +56,60 @@ module Main =
         | (true, _) -> Environment.setEnvironVar "OSC_YAML_FILE" (Path.GetFullPath(userYaml))
         | (_, true) -> Environment.setEnvironVar "OSC_YAML_FILE" (Path.GetFullPath(defaultYaml))
         | _ -> failwithf "Expected to find a tests.default.yaml or tests.yaml in %s" sourceDir
-        
-          
-    let [<EntryPoint>] main args = 
+
+
+    let [<EntryPoint>] main args =
         async {
             do! Async.SwitchToThreadPool ()
-            
+
             setCommandLineEnvVars ()
-            
+
             let parsed = Commandline.parse (args |> Array.toList)
-            
+
             let buildVersions = Versioning.BuildVersioning parsed
             let artifactsVersion = Versioning.ArtifactsVersion buildVersions
             Versioning.Validate parsed.Target buildVersions
-            
+
             let isCanary = parsed.Target = "canary";
-            
+
             Tests.SetTestEnvironmentVariables parsed
-            
+
             let testChain = ["clean"; "version"; "restore"; "full-build"; ]
             let buildChain = ["test"; "inherit-doc" ]
             let releaseChain =
-                [ 
+                [
                     "build";
                     "nuget-pack";
-                    "nuget-pack-versioned";
+                    // "nuget-pack-versioned";
                     "validate-artifacts";
                     "generate-release-notes"
                 ]
             let canaryChain = [ "version"; "release"; "test-nuget-package";]
-            
-            // the following are expected to be called as targets directly        
-            conditional "clean" (parsed.ReleaseBuild || parsed.Target = "clean") <| fun _ -> Build.Clean parsed 
+
+            // the following are expected to be called as targets directly
+            conditional "clean" (parsed.ReleaseBuild || parsed.Target = "clean") <| fun _ -> Build.Clean parsed
             target "version" <| fun _ -> printfn "Artifacts Version: %O" artifactsVersion
-            
-            target "restore" Build.Restore 
+
+            target "restore" Build.Restore
             target "full-build" <| fun _ -> Build.Compile parsed artifactsVersion
 
             //TEST
             conditionalCommand "test" testChain (not parsed.SkipTests && not isCanary) <| fun _ -> Tests.RunUnitTests parsed
 
             target "inherit-doc" <| InheritDoc.PatchInheritDocs
-            
+
             //BUILD
             command "build" buildChain <| fun _ -> printfn "STARTING BUILD"
 
             target "nuget-pack" <| fun _ -> Build.Pack artifactsVersion
 
-            conditional "nuget-pack-versioned" (isCanary) <| fun _ -> Build.VersionedPack artifactsVersion
+            // TODO: Re-enable once assembly-rewriter supports .NET 8.0
+            // conditional "nuget-pack-versioned" (isCanary) <| fun _ -> Build.VersionedPack artifactsVersion
 
             conditional "generate-release-notes" (not isCanary)  <| fun _ -> ReleaseNotes.GenerateNotes buildVersions
-            
+
             target "validate-artifacts" <| fun _ -> Versioning.ValidateArtifacts artifactsVersion
-            
+
             //RELEASE
             command "release" releaseChain <| fun _ ->
                 let outputPath = match parsed.CommandArguments with | Commandline.SetVersion c -> c.OutputLocation | _ -> None
@@ -124,15 +125,15 @@ module Main =
                     printfn "Finished Release Build %O, output copied to: %s" artifactsVersion path
 
             conditional "test-nuget-package" (not parsed.SkipTests) <| fun _ -> Tests.RunReleaseUnitTests artifactsVersion parsed
-            
+
             //CANARY
             command "canary" canaryChain  <| fun _ -> printfn "Finished Release Build %O" artifactsVersion
 
             // ADDITIONAL COMMANDS
-            
+
             command "cluster" [ "restore"; "full-build" ] <| fun _ ->
                 ReposTooling.LaunchCluster parsed
-            
+
             command "codegen" [ ] <| fun _ ->
                 ReposTooling.GenerateApi parsed.RemainingArguments
 
@@ -145,5 +146,5 @@ module Main =
 
             do! Targets.RunTargetsAndExitAsync([parsed.Target], (fun e -> e.GetType() = typeof<ProcExecException>)) |> Async.AwaitTask
         } |> Async.RunSynchronously
-        
+
         0
diff --git a/dotnet-tools.json b/dotnet-tools.json
@@ -3,28 +3,28 @@
   "isRoot": true,
   "tools": {
     "assembly-rewriter": {
-      "version": "0.12.0",
+      "version": "0.13.0",
       "commands": [
         "assembly-rewriter"
       ]
     },
     "assembly-differ": {
-      "version": "0.13.0",
+      "version": "0.15.0",
       "commands": [
         "assembly-differ"
       ]
     },
     "nupkg-validator": {
-      "version": "0.4.0",
+      "version": "0.6.0",
       "commands": [
         "nupkg-validator"
       ]
     },
     "release-notes": {
-      "version": "0.3.1",
+      "version": "0.6.0",
       "commands": [
         "release-notes"
       ]
     }
   }
-}
+}
diff --git a/global.json b/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "6.0.403",
+    "version": "8.0.107",
     "rollForward": "latestFeature",
     "allowPrerelease": false
   },

diff --git a/src/OpenSearch.Net/Configuration/RequestMetaData.cs b/src/OpenSearch.Net/Configuration/RequestMetaData.cs
@@ -46,7 +46,7 @@ internal bool TryAddMetaData (string key, string value)
 		{
 			_metaDataItems ??= new Dictionary<string, string>();
 
-#if NETSTANDARD2_1
+#if NETSTANDARD2_1 || NET6_0_OR_GREATER
 			return _metaDataItems.TryAdd(key, value);
 #else
 			if (_metaDataItems.ContainsKey(key))
@@ -55,7 +55,7 @@ internal bool TryAddMetaData (string key, string value)
 			_metaDataItems.Add(key, value);
 			return true;
 #endif
-		}		
+		}
 
 		public IReadOnlyDictionary<string, string> Items => _metaDataItems ?? EmptyReadOnly<string, string>.Dictionary;
 	}

diff --git a/src/OpenSearch.Net/Connection/HandlerTracking/RequestDataHttpClientFactory.cs b/src/OpenSearch.Net/Connection/HandlerTracking/RequestDataHttpClientFactory.cs
@@ -113,7 +113,7 @@ private HttpMessageHandler CreateHandler(int key, RequestData requestData)
 		{
 			if (requestData == null) throw new ArgumentNullException(nameof(requestData));
 
-			#if NETSTANDARD2_1
+			#if NETSTANDARD2_1 || NET6_0_OR_GREATER
 			var entry = _activeHandlers.GetOrAdd(key, (k, r) => _entryFactory(k, r), requestData).Value;
 			#else
 			var entry = _activeHandlers.GetOrAdd(key, (k) => _entryFactory(k, requestData)).Value;

diff --git a/src/OpenSearch.Net/Connection/MetaData/RuntimeVersionInfo.cs b/src/OpenSearch.Net/Connection/MetaData/RuntimeVersionInfo.cs
@@ -124,7 +124,11 @@ private static string GetNetCoreVersion()
 
 		private static bool TryGetVersionFromAssemblyPath(Assembly assembly, out string runtimeVersion)
 		{
+#if NET6_0_OR_GREATER
+			var assemblyPath = assembly.Location.Split(new[] { '/', '\\' }, StringSplitOptions.RemoveEmptyEntries);
+#else
 			var assemblyPath = assembly.CodeBase.Split(new[] { '/', '\\' }, StringSplitOptions.RemoveEmptyEntries);
+#endif
 			var netCoreAppIndex = Array.IndexOf(assemblyPath, "Microsoft.NETCore.App");
 			if (netCoreAppIndex > 0 && netCoreAppIndex < assemblyPath.Length - 2)
 			{

diff --git a/src/OpenSearch.Net/ConnectionPool/SniffingConnectionPool.cs b/src/OpenSearch.Net/ConnectionPool/SniffingConnectionPool.cs
@@ -81,7 +81,7 @@ public override void Reseed(IEnumerable<Node> nodes)
 			{
 				_readerWriter.EnterWriteLock();
 				var sortedNodes = SortNodes(nodesArray)
-					.DistinctBy(n => n.Uri)
+					.DistinctByInternal(n => n.Uri)
 					.ToList();
 
 				InternalNodes = sortedNodes;

diff --git a/src/OpenSearch.Net/ConnectionPool/StaticConnectionPool.cs b/src/OpenSearch.Net/ConnectionPool/StaticConnectionPool.cs
@@ -82,7 +82,7 @@ private void Initialize(IEnumerable<Node> nodes, IDateTimeProvider dateTimeProvi
 			}
 
 			InternalNodes = SortNodes(nodesProvided)
-				.DistinctBy(n => n.Uri)
+				.DistinctByInternal(n => n.Uri)
 				.ToList();
 			LastUpdate = DateTimeProvider.Now();
 		}

diff --git a/src/OpenSearch.Net/Extensions/UtilExtensions.cs b/src/OpenSearch.Net/Extensions/UtilExtensions.cs
@@ -90,7 +90,7 @@ internal static void ThrowIfNull<T>(this T value, string name) where T : class
 
 		internal static bool IsNullOrEmpty(this string value) => string.IsNullOrEmpty(value);
 
-		internal static IEnumerable<T> DistinctBy<T, TKey>(this IEnumerable<T> items, Func<T, TKey> property) =>
+		internal static IEnumerable<T> DistinctByInternal<T, TKey>(this IEnumerable<T> items, Func<T, TKey> property) =>
 			items.GroupBy(property).Select(x => x.First());
 
 		internal static string ToTimeUnit(this TimeSpan timeSpan)

diff --git a/src/OpenSearch.Net/OpenSearch.Net.csproj b/src/OpenSearch.Net/OpenSearch.Net.csproj
@@ -13,12 +13,14 @@
   <PropertyGroup>
     <IsPackable>true</IsPackable>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
-    <TargetFrameworks>netstandard2.0;netstandard2.1;net461</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;netstandard2.1;net461;net6.0;net8.0</TargetFrameworks>
 
     <CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
 
   </PropertyGroup>
+
+
   <ItemGroup>
     <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
     <PackageReference Include="System.Buffers" Version="4.5.1" />

diff --git a/src/OpenSearch.Net/Providers/RecyclableMemoryStream.cs b/src/OpenSearch.Net/Providers/RecyclableMemoryStream.cs
@@ -565,7 +565,7 @@ public int SafeRead(byte[] buffer, int offset, int count, ref int streamPosition
 			return amountRead;
 		}
 
-#if NETCOREAPP2_1 || NETSTANDARD2_1
+#if NETCOREAPP2_1_OR_GREATER || NETSTANDARD2_1
         /// <summary>
         /// Reads from the current position into the provided buffer
         /// </summary>
@@ -649,7 +649,7 @@ public override void Write(byte[] buffer, int offset, int count)
 			_length = Math.Max(_position, _length);
 		}
 
-#if NETCOREAPP2_1 || NETSTANDARD2_1
+#if NETCOREAPP2_1_OR_GREATER || NETSTANDARD2_1
         /// <summary>
         /// Writes the buffer to the stream
         /// </summary>
@@ -866,7 +866,7 @@ private int InternalRead(byte[] buffer, int offset, int count, int fromPosition)
 			return amountToCopy;
 		}
 
-#if NETCOREAPP2_1 || NETSTANDARD2_1
+#if NETCOREAPP2_1_OR_GREATER || NETSTANDARD2_1
         private int InternalRead(Span<byte> buffer, int fromPosition)
         {
             if (_length - fromPosition <= 0) return 0;

diff --git a/src/OpenSearch.Net/Providers/RecyclableMemoryStreamManager-Events.cs b/src/OpenSearch.Net/Providers/RecyclableMemoryStreamManager-Events.cs
@@ -70,7 +70,7 @@ public EventCounter(string blocks, RecyclableMemoryStreamManager.Events eventsWr
 		public void WriteMetric(long v) { }
 	}
 #endif
-#if !NETSTANDARD2_1
+#if !NETSTANDARD2_1 && !NET6_0_OR_GREATER
 	internal class PollingCounter : IDisposable
 	{
 		// ReSharper disable UnusedParameter.Local