v4 WIP, merges, fixes,

.github/workflows/build.yml

@@ -7,13 +7,17 @@ on:
       - 'master'
       - 'dev'
       - 'release/*'
+      - 'support/*'
+      - 'hotfix/*'
     tags: 
       - 'v*'
   pull_request:
     branches:
       - 'master'
       - 'dev'
       - 'release/*'
+      - 'support/*'
+      - 'hotfix/*'
 
 jobs:
   build:
@@ -40,18 +44,17 @@ jobs:
     - name: Setup dotnet
       uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: | 
-          5.0.x
+        dotnet-version: |
           6.0.x
-          7.0.x
+          8.0.x
 
     - name: Install GitVersion
-      uses: gittools/actions/gitversion/setup@v0.9.9
+      uses: gittools/actions/gitversion/setup@v3.0.3
       with:
-        versionSpec: '5.x'
+        versionSpec: '6.0.x'
 
     - name: Determine Version
-      uses: gittools/actions/gitversion/execute@v0.9.9
+      uses: gittools/actions/gitversion/execute@v3.0.3
 
     - name: Install dependencies
       run: dotnet restore ${{ env.Solution_File }}
@@ -60,10 +63,10 @@ jobs:
       run: dotnet build ${{ env.Solution_File }} --configuration ${{ env.Configuration }} --no-restore
 
     - name: Test
-      run: dotnet test "${{ env.Test_Proj }}" --no-build --verbosity normal --results-directory ${{ github.workspace }}/_TestResults  --logger "trx;logfilename=tests.trx"
+      run: dotnet test "${{ env.Test_Proj }}" --no-build --verbosity normal --results-directory ${{ github.workspace }}/_TestResults  --logger "trx;logfilename=tests.trx" --filter "TestCategory!~Benchmarks"
 
     - name: Upload test results
-      uses: actions/upload-artifact@v2  # upload test results
+      uses: actions/upload-artifact@v4  # upload test results
       if: success() || failure()        # run this step even if previous step failed
       with:
         name: examine-test-results
@@ -85,7 +88,7 @@ jobs:
           --output=${{ github.workspace }}/_NugetOutput
 
     - name: Upload artifacts
-      uses: actions/upload-artifact@v2  # upload nuget
+      uses: actions/upload-artifact@v4  # upload nuget
       if: success()
       with:
         name: examine-nuget-${{ env.GitVersion_SemVer }}

.github/workflows/docfx-gh-pages.yml

@@ -4,6 +4,9 @@ on:
   # Runs on pushes targeting the default branch
   push:
     branches: ["feature/docfx"]
+  pull_request:
+    branches:
+      - 'feature/docfx'
 
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:

.github/workflows/test-report.yml

@@ -8,7 +8,7 @@ jobs:
   report:
     runs-on: ubuntu-latest
     steps:
-    - uses: dorny/test-reporter@v1.4.2
+    - uses: dorny/test-reporter@v1
       with:
         artifact: examine-test-results    # artifact name
         name: Publish Tests               # Name of the check run which will be created

GitVersion.yml → GitVersion.yml.bak

@@ -17,16 +17,5 @@ commit-message-incrementing: Enabled
 commit-date-format: 'yyyy-MM-dd'
 ignore:
   sha: []
-  commits-before: 2020-12-21T00:00:00
-merge-message-formats: {}
-branches:
-  main:
-    regex: ^master(\-0\.x)?$|^main(\-0\.x)?$
-    source-branches: []
-  develop:
-    regex: ^dev(elop)?(ment)?(\-0\.x)?$
-    source-branches:
-    - main
-  release:
-    mode: ContinuousDeployment
-    source-branches: ['develop']
+  commits-before: 2021-01-01T00:00:00
+merge-message-formats: {}

docs/articles/indexing.md

@@ -115,9 +115,10 @@ myIndex.IndexItem(new ValueSet(
 Be default all indexing is done asynchronously. If you need to run indexing synchronously you should create a synchronous scope. This is for instance a necessary step for unit tests.
 
 ```cs
-using (myIndex.ProcessNonAsync())
+using (var luceneIndex = (LuceneIndex)myIndex)
+using (var syncIndexContext = luceneIndex.WithThreadingMode(IndexThreadingMode.Synchronous))
 {
-    myIndex.IndexItem(new ValueSet(
+    luceneIndex.IndexItem(new ValueSet(
         "SKU987",
         "Product",             
         new Dictionary<string, object>()
@@ -251,4 +252,4 @@ private void IndexCommited(object sender, EventArgs e)
 {
     // Triggered when the index is commited
 }
-```
+```

docs/articles/searching.md

@@ -132,7 +132,7 @@ query.Field("nodeTypeAlias", "CWS_Home".Boost(20));
 var results = query.Execute();
 ```
 
-This will boost the term `CWS_Home` and make enteries with `nodeTypeAlias:CWS_Home` score higher in the results.
+This will boost the term `CWS_Home` and make entries with `nodeTypeAlias:CWS_Home` score higher in the results.
 
 ## Proximity
 

docs/docs-v1-v2/searching.md

@@ -124,7 +124,7 @@ query.Field("nodeTypeAlias", "CWS_Home".Boost(20));
 var results = query.Execute();
 ```
 
-This will boost the term `CWS_Home` and make enteries with `nodeTypeAlias:CWS_Home` score higher in the results.
+This will boost the term `CWS_Home` and make entries with `nodeTypeAlias:CWS_Home` score higher in the results.
 
 ## Proximity
 
@@ -248,4 +248,4 @@ var query = searcher.CreateQuery();
 var query = (LuceneSearchQuery)query.NativeQuery("hello:world").And(); // Make query ready for extending
 query.LuceneQuery(NumericRangeQuery.NewInt64Range("numTest", 4, 5, true, true)); // Add the raw lucene query
 var results = query.Execute();
-```
+```

src/Directory.Build.props

@@ -6,11 +6,16 @@
     <EmbedUntrackedSources>true</EmbedUntrackedSources>
     <IncludeSymbols>true</IncludeSymbols>
     <SymbolPackageFormat>snupkg</SymbolPackageFormat>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+    <NoWarn>NU5104</NoWarn>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All"/>
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All"/>
   </ItemGroup>
   <PropertyGroup>
+
+    <SuppressNETCoreSdkPreviewMessage>true</SuppressNETCoreSdkPreviewMessage>
+
     <PackageProjectUrl>https://github.com/Shazwazza/Examine</PackageProjectUrl>
     <RepositoryUrl>https://github.com/Shazwazza/Examine</RepositoryUrl>
     <RepositoryType>git</RepositoryType>
@@ -19,14 +24,12 @@
     <Authors>shandem</Authors>
     <PackageIcon>logo-round-small.png</PackageIcon>
     <PackageLicenseExpression>MS-PL</PackageLicenseExpression>
-    <VersionPrefix>2.0.0</VersionPrefix>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(MSBuildProjectName)' != 'Examine.Web.Demo' AND '$(MSBuildProjectName)' != 'Examine.Test'">
-    <TargetFrameworks>net6.0;netstandard2.1;netstandard2.0</TargetFrameworks>
+    <VersionPrefix>4.0.0</VersionPrefix>
   </PropertyGroup>
 
-  <!-- Disable the nullable warnings when compiling for .NET Standard 2.0 -->
-  <PropertyGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
-    <NoWarn>$(NoWarn);nullable</NoWarn>
+  <PropertyGroup>
+    <TargetFrameworks>net6.0;net8.0;</TargetFrameworks>
+    <LangVersion>latest</LangVersion>
+    <Nullable>enable</Nullable>
   </PropertyGroup>
 </Project>

src/Examine.Benchmarks/ConcurrentAcquireBenchmarks.cs

@@ -0,0 +1,143 @@
+using System.Diagnostics;
+using BenchmarkDotNet.Attributes;
+using BenchmarkDotNet.Jobs;
+using Lucene.Net.Analysis;
+using Lucene.Net.Analysis.Standard;
+using Lucene.Net.Index;
+using Lucene.Net.Search;
+using Lucene.Net.Store;
+using Lucene.Net.Util;
+using Microsoft.Extensions.Logging;
+
+namespace Examine.Benchmarks
+{
+    [MediumRunJob(RuntimeMoniker.Net80)]
+    [ThreadingDiagnoser]
+    [MemoryDiagnoser]
+    public class ConcurrentAcquireBenchmarks : ExamineBaseTest
+    {
+        private readonly StandardAnalyzer _analyzer = new StandardAnalyzer(LuceneInfo.CurrentVersion);
+        private string? _tempBasePath;
+        private FSDirectory? _indexDir;
+        private IndexWriter? _writer;
+        private SearcherManager? _searcherManager;
+
+        [GlobalSetup]
+        public override void Setup()
+        {
+            base.Setup();
+
+            _tempBasePath = Path.Combine(Path.GetTempPath(), "ExamineTests");
+
+            // indexer for lucene
+            InitializeAndIndexItems(_tempBasePath, _analyzer, out var indexDir);
+            _indexDir = FSDirectory.Open(indexDir);
+            var writerConfig = new IndexWriterConfig(LuceneVersion.LUCENE_48, _analyzer);
+            //writerConfig.SetMaxBufferedDocs(1000);
+            //writerConfig.SetReaderTermsIndexDivisor(4);
+            //writerConfig.SetOpenMode(OpenMode.APPEND);
+            //writerConfig.SetReaderPooling(true);
+            //writerConfig.SetCodec(new Lucene46Codec());
+            _writer = new IndexWriter(_indexDir, writerConfig);
+            var trackingWriter = new TrackingIndexWriter(_writer);
+            _searcherManager = new SearcherManager(trackingWriter.IndexWriter, applyAllDeletes: true, new SearcherFactory());
+        }
+
+        [GlobalCleanup]
+        public override void TearDown()
+        {
+            _searcherManager?.Dispose();
+            _writer?.Dispose();
+            _indexDir?.Dispose();
+
+            base.TearDown();
+
+            System.IO.Directory.Delete(_tempBasePath!, true);
+        }
+
+        [Params(1, 15, 30, 100)]
+        public int ThreadCount { get; set; }
+
+        [Benchmark(Baseline = true)]
+        public async Task SimpleMultiThreadLoop()
+        {
+            var tasks = new List<Task>();
+
+            for (var i = 0; i < ThreadCount; i++)
+            {
+                tasks.Add(new Task(() => Debug.Write(i)));
+            }
+
+            foreach (var task in tasks)
+            {
+                task.Start();
+            }
+
+            await Task.WhenAll(tasks);
+        }
+
+        [Benchmark]
+        public async Task TestAcquireThreadContention()
+        {
+            var tasks = new List<Task>();
+
+            for (var i = 0; i < ThreadCount; i++)
+            {
+                tasks.Add(new Task(() =>
+                {
+                    var searcher = _searcherManager!.Acquire();
+                    try
+                    {
+                        if (searcher.IndexReader.RefCount > (ThreadCount + 1))
+                        {
+                            Console.WriteLine(searcher.IndexReader.RefCount);
+                        }
+                    }
+                    finally
+                    {
+                        _searcherManager.Release(searcher);
+                    }
+                }));
+            }
+
+            foreach (var task in tasks)
+            {
+                task.Start();
+            }
+
+            await Task.WhenAll(tasks);
+        }
+
+#if RELEASE
+        protected override ILoggerFactory CreateLoggerFactory()
+            => Microsoft.Extensions.Logging.LoggerFactory.Create(builder => builder.AddConsole().SetMinimumLevel(LogLevel.Information));
+#endif
+        private void InitializeAndIndexItems(
+            string tempBasePath,
+            Analyzer analyzer,
+            out DirectoryInfo indexDir)
+        {
+            var tempPath = Path.Combine(tempBasePath, Guid.NewGuid().ToString());
+            System.IO.Directory.CreateDirectory(tempPath);
+            indexDir = new DirectoryInfo(tempPath);
+            using var luceneDirectory = FSDirectory.Open(indexDir);
+            using var luceneTaxonomyDir = FSDirectory.Open(Path.Combine(tempPath, "Taxonomy"));
+            using var indexer = GetTestIndex(luceneDirectory, luceneTaxonomyDir, analyzer);
+
+            var random = new Random();
+            var valueSets = new List<ValueSet>();
+
+            for (var i = 0; i < 1000; i++)
+            {
+                valueSets.Add(ValueSet.FromObject(Guid.NewGuid().ToString(), "content",
+                    new
+                    {
+                        nodeName = "location " + i,
+                        bodyText = Enumerable.Range(0, random.Next(10, 100)).Select(x => Guid.NewGuid().ToString())
+                    }));
+            }
+
+            indexer.IndexItems(valueSets);
+        }
+    }
+}