You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucenenet.apache.org by ni...@apache.org on 2025/09/26 03:01:52 UTC

(lucenenet) branch master updated: Added Lucene.Net.CodeAnalysis.Dev package reference (#1190)

This is an automated email from the ASF dual-hosted git repository.

nightowl888 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/lucenenet.git


The following commit(s) were added to refs/heads/master by this push:
     new 2067df79b Added Lucene.Net.CodeAnalysis.Dev package reference (#1190)
2067df79b is described below

commit 2067df79b8146134b57eeba7e871b98d62c3c214
Author: Shad Storhaug <sh...@shadstorhaug.com>
AuthorDate: Fri Sep 26 10:01:47 2025 +0700

    Added Lucene.Net.CodeAnalysis.Dev package reference (#1190)
    
    * Directory.Build.targets: Added global reference to Lucene.Net.CodeAnalysis.Dev to enable development analyzers
    
    * SWEEP: Fixed LuceneDev1001 build warnings
---
 .build/dependencies.props                                      |  1 +
 Directory.Build.targets                                        | 10 ++++++++++
 src/Lucene.Net.Benchmark/ByTask/Tasks/AnalyzerFactoryTask.cs   |  4 ++--
 src/Lucene.Net.Benchmark/ByTask/Utils/Algorithm.cs             |  2 +-
 src/Lucene.Net.Benchmark/ByTask/Utils/Config.cs                |  2 +-
 .../Flexible/Core/Nodes/BoostQueryNode.cs                      |  2 +-
 src/Lucene.Net/Index/CheckIndex.cs                             |  4 ++--
 src/Lucene.Net/Index/DocumentsWriterPerThread.cs               |  2 +-
 src/Lucene.Net/Index/LogMergePolicy.cs                         |  2 +-
 src/Lucene.Net/Index/TieredMergePolicy.cs                      | 10 +++++-----
 src/Lucene.Net/Search/ControlledRealTimeReopenThread.cs        |  2 +-
 src/Lucene.Net/Search/FieldCache.cs                            |  2 +-
 12 files changed, 27 insertions(+), 16 deletions(-)

diff --git a/.build/dependencies.props b/.build/dependencies.props
index 6f646bb05..38ce5e72f 100644
--- a/.build/dependencies.props
+++ b/.build/dependencies.props
@@ -40,6 +40,7 @@
     <!-- J2N will break binary compatibility in 3.0.0 to fix the APIs of collection types -->
     <J2NPackageVersion>[2.2.0-alpha-0021, 3.0.0)</J2NPackageVersion>
     <LiquidTestReportsMarkdownPackageVersion>1.0.9</LiquidTestReportsMarkdownPackageVersion>
+    <LuceneNetCodeAnalysisDevPackageVersion>1.0.0-alpha.6</LuceneNetCodeAnalysisDevPackageVersion>
     <MicrosoftAspNetCoreHttpAbstractionsPackageVersion>2.3.0</MicrosoftAspNetCoreHttpAbstractionsPackageVersion>
     <MicrosoftAspNetCoreTestHostPackageVersion>8.0.19</MicrosoftAspNetCoreTestHostPackageVersion>
     <MicrosoftCodeAnalysisAnalyzersPackageVersion>2.9.8</MicrosoftCodeAnalysisAnalyzersPackageVersion>
diff --git a/Directory.Build.targets b/Directory.Build.targets
index efbd8089f..962bb3638 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -24,6 +24,12 @@
 
   <PropertyGroup Label="Warnings to be Disabled in Solution">
     <NoWarn Label="Legacy serialization support APIs are obsolete">$(NoWarn);SYSLIB0051</NoWarn>
+
+    <!-- These are noisy, but may be helpful during Lucene upgrades or optimization -->
+    <NoWarn Label="Floating point types should not be compared for exact equality">$(NoWarn);LuceneDev1000</NoWarn>
+    <NoWarn Label="Floating point type arithmetic needs to be checked on x86 in .NET Framework and may require extra casting">$(NoWarn);LuceneDev1002</NoWarn>
+    <NoWarn Label="Java array parameters can sometimes be replaced with .NET out or ref parameters">$(NoWarn);LuceneDev1003</NoWarn>
+    <NoWarn Label="Return array may be able to be replaced with out values">$(NoWarn);LuceneDev1004</NoWarn>
   </PropertyGroup>
 
   <PropertyGroup Label="Solution-level Publish to Project-specific Directory">
@@ -222,6 +228,10 @@
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="$(MicrosoftSourceLinkGitHubPackageReferenceVersion)" PrivateAssets="All"/>
   </ItemGroup>
 
+  <ItemGroup>
+    <PackageReference Include="Lucene.Net.CodeAnalysis.Dev" Version="$(LuceneNetCodeAnalysisDevPackageVersion)" PrivateAssets="All" />
+  </ItemGroup>
+
   <Import Project=".build/release.targets" Condition="Exists('.build/release.targets')" />
 
 </Project>
diff --git a/src/Lucene.Net.Benchmark/ByTask/Tasks/AnalyzerFactoryTask.cs b/src/Lucene.Net.Benchmark/ByTask/Tasks/AnalyzerFactoryTask.cs
index 506031af5..c7d13efc3 100644
--- a/src/Lucene.Net.Benchmark/ByTask/Tasks/AnalyzerFactoryTask.cs
+++ b/src/Lucene.Net.Benchmark/ByTask/Tasks/AnalyzerFactoryTask.cs
@@ -155,7 +155,7 @@ public override void SetParams(string @params)
                                     {
                                         case StreamTokenizer.TokenType_Number:
                                             {
-                                                argValue = stok.NumberValue.ToString(CultureInfo.InvariantCulture);
+                                                argValue = J2N.Numerics.Double.ToString(stok.NumberValue, CultureInfo.InvariantCulture);
                                                 // Drop the ".0" from numbers, for integer arguments
                                                 argValue = TRAILING_DOT_ZERO_PATTERN.Replace(argValue, "", 1);
                                                 // Intentional fallthrough
@@ -440,7 +440,7 @@ private void CreateAnalysisPipelineComponent(StreamTokenizer stok, Type clazz)
                                 {
                                     case StreamTokenizer.TokenType_Number:
                                         {
-                                            argValue = stok.NumberValue.ToString(CultureInfo.InvariantCulture);
+                                            argValue = J2N.Numerics.Double.ToString(stok.NumberValue, CultureInfo.InvariantCulture);
                                             // Drop the ".0" from numbers, for integer arguments
                                             argValue = TRAILING_DOT_ZERO_PATTERN.Replace(argValue, "", 1);
                                             // Intentional fall-through
diff --git a/src/Lucene.Net.Benchmark/ByTask/Utils/Algorithm.cs b/src/Lucene.Net.Benchmark/ByTask/Utils/Algorithm.cs
index d0949892c..4c65f3b17 100644
--- a/src/Lucene.Net.Benchmark/ByTask/Utils/Algorithm.cs
+++ b/src/Lucene.Net.Benchmark/ByTask/Utils/Algorithm.cs
@@ -116,7 +116,7 @@ public Algorithm(PerfRunData runData)
                                     {
                                         case StreamTokenizer.TokenType_Number:
                                             {
-                                                @params.Append(stok.NumberValue.ToString(CultureInfo.InvariantCulture));
+                                                @params.Append(J2N.Numerics.Double.ToString(stok.NumberValue, CultureInfo.InvariantCulture));
                                                 break;
                                             }
                                         case StreamTokenizer.TokenType_Word:
diff --git a/src/Lucene.Net.Benchmark/ByTask/Utils/Config.cs b/src/Lucene.Net.Benchmark/ByTask/Utils/Config.cs
index 9814016e1..ee4a92815 100644
--- a/src/Lucene.Net.Benchmark/ByTask/Utils/Config.cs
+++ b/src/Lucene.Net.Benchmark/ByTask/Utils/Config.cs
@@ -269,7 +269,7 @@ public virtual double Get(string name, double dflt)
             // done if not by round
             if (!props.TryGetValue(name, out string sval))
             {
-                sval = dflt.ToString(CultureInfo.InvariantCulture);
+                sval = J2N.Numerics.Double.ToString(dflt, CultureInfo.InvariantCulture);
             }
             if (sval.IndexOf(':') < 0)
             {
diff --git a/src/Lucene.Net.QueryParser/Flexible/Core/Nodes/BoostQueryNode.cs b/src/Lucene.Net.QueryParser/Flexible/Core/Nodes/BoostQueryNode.cs
index 0ad755ccb..d19039606 100644
--- a/src/Lucene.Net.QueryParser/Flexible/Core/Nodes/BoostQueryNode.cs
+++ b/src/Lucene.Net.QueryParser/Flexible/Core/Nodes/BoostQueryNode.cs
@@ -83,7 +83,7 @@ private string GetValueString()
             if (f == (long)f)
                 return "" + (long)f;
             else
-                return "" + f.ToString("0.0#######"); // LUCENENET TODO: Culture
+                return "" + J2N.Numerics.Single.ToString(f, "0.0#######"); // LUCENENET TODO: Culture
         }
 
         public override string ToString()
diff --git a/src/Lucene.Net/Index/CheckIndex.cs b/src/Lucene.Net/Index/CheckIndex.cs
index 0a4a6ca64..1a4a42dcf 100644
--- a/src/Lucene.Net/Index/CheckIndex.cs
+++ b/src/Lucene.Net/Index/CheckIndex.cs
@@ -717,7 +717,7 @@ public virtual Status DoCheckIndex(IList<string> onlySegments)
 #pragma warning restore 612, 618
                     {
                         // don't print size in bytes if its a 3.0 segment with shared docstores
-                        Msg(infoStream, "    size (MB)=" + segInfoStat.SizeMB.ToString(nf));
+                        Msg(infoStream, "    size (MB)=" + J2N.Numerics.Double.ToString(segInfoStat.SizeMB, nf));
                     }
                     IDictionary<string, string> diagnostics = info.Info.Diagnostics;
                     segInfoStat.Diagnostics = diagnostics;
@@ -2269,7 +2269,7 @@ public static Status.TermVectorStatus TestTermVectors(AtomicReader reader, TextW
                     }
                 }
                 float vectorAvg = status.DocCount == 0 ? 0 : status.TotVectors / (float)status.DocCount;
-                Msg(infoStream, "OK [" + status.TotVectors + " total vector count; avg " + vectorAvg.ToString(CultureInfo.InvariantCulture.NumberFormat) + " term/freq vector fields per doc]");
+                Msg(infoStream, "OK [" + status.TotVectors + " total vector count; avg " + J2N.Numerics.Single.ToString(vectorAvg, NumberFormatInfo.InvariantInfo) + " term/freq vector fields per doc]");
             }
             catch (Exception e) when (e.IsThrowable())
             {
diff --git a/src/Lucene.Net/Index/DocumentsWriterPerThread.cs b/src/Lucene.Net/Index/DocumentsWriterPerThread.cs
index ed068ee40..c33c761ed 100644
--- a/src/Lucene.Net/Index/DocumentsWriterPerThread.cs
+++ b/src/Lucene.Net/Index/DocumentsWriterPerThread.cs
@@ -571,7 +571,7 @@ internal virtual FlushedSegment Flush()
                 if (infoStream.IsEnabled("DWPT"))
                 {
                     double newSegmentSize = segmentInfoPerCommit.GetSizeInBytes() / 1024.0 / 1024.0;
-                    infoStream.Message("DWPT", "flushed: segment=" + segmentInfo.Name + " ramUsed=" + startMBUsed.ToString(nf) + " MB" + " newFlushedSize(includes docstores)=" + newSegmentSize.ToString(nf) + " MB" + " docs/MB=" + (flushState.SegmentInfo.DocCount / newSegmentSize).ToString(nf));
+                    infoStream.Message("DWPT", "flushed: segment=" + segmentInfo.Name + " ramUsed=" + J2N.Numerics.Double.ToString(startMBUsed, nf) + " MB" + " newFlushedSize(includes docstores)=" + J2N.Numerics.Double.ToString(newSegmentSize, nf) + " MB" + " docs/MB=" + J2N.Numerics.Double.ToString((flushState.SegmentInfo.DocCount / newSegmentSize), nf));
                 }
 
                 if (Debugging.AssertsEnabled) Debugging.Assert(segmentInfo != null);
diff --git a/src/Lucene.Net/Index/LogMergePolicy.cs b/src/Lucene.Net/Index/LogMergePolicy.cs
index db1475c25..6618c0f9b 100644
--- a/src/Lucene.Net/Index/LogMergePolicy.cs
+++ b/src/Lucene.Net/Index/LogMergePolicy.cs
@@ -660,7 +660,7 @@ public override MergeSpecification FindMerges(MergeTrigger mergeTrigger, Segment
                 }
                 if (IsVerbose)
                 {
-                    Message("  level " + levelBottom.ToString("0.0") + " to " + maxLevel.ToString("0.0") + ": " + (1 + upto - start) + " segments");
+                    Message("  level " + J2N.Numerics.Single.ToString(levelBottom) + " to " + J2N.Numerics.Single.ToString(maxLevel) + ": " + (1 + upto - start) + " segments");
                 }
 
                 // Finally, record all merges that are viable at this level:
diff --git a/src/Lucene.Net/Index/TieredMergePolicy.cs b/src/Lucene.Net/Index/TieredMergePolicy.cs
index fd3ddcc8a..c1a3bf4a1 100644
--- a/src/Lucene.Net/Index/TieredMergePolicy.cs
+++ b/src/Lucene.Net/Index/TieredMergePolicy.cs
@@ -152,7 +152,7 @@ public virtual double MaxMergedSegmentMB
             {
                 if (value < 0.0)
                 {
-                    throw new ArgumentOutOfRangeException(nameof(MaxMergedSegmentMB), "maxMergedSegmentMB must be >=0 (got " + value.ToString("0.0") + ")"); // LUCENENET specific - changed from IllegalArgumentException to ArgumentOutOfRangeException (.NET convention)
+                    throw new ArgumentOutOfRangeException(nameof(MaxMergedSegmentMB), "maxMergedSegmentMB must be >=0 (got " + J2N.Numerics.Double.ToString(value) + ")"); // LUCENENET specific - changed from IllegalArgumentException to ArgumentOutOfRangeException (.NET convention)
                 }
                 value *= 1024 * 1024;
                 maxMergedSegmentBytes = (value > long.MaxValue) ? long.MaxValue : (long)value;
@@ -175,7 +175,7 @@ public virtual double ReclaimDeletesWeight
             {
                 if (value < 0.0)
                 {
-                    throw new ArgumentOutOfRangeException(nameof(ReclaimDeletesWeight), "reclaimDeletesWeight must be >= 0.0 (got " + value.ToString("0.0") + ")"); // LUCENENET specific - changed from IllegalArgumentException to ArgumentOutOfRangeException (.NET convention)
+                    throw new ArgumentOutOfRangeException(nameof(ReclaimDeletesWeight), "reclaimDeletesWeight must be >= 0.0 (got " + J2N.Numerics.Double.ToString(value) + ")"); // LUCENENET specific - changed from IllegalArgumentException to ArgumentOutOfRangeException (.NET convention)
                 }
                 reclaimDeletesWeight = value;
             }
@@ -195,7 +195,7 @@ public virtual double FloorSegmentMB
             {
                 if (value <= 0.0)
                 {
-                    throw new ArgumentOutOfRangeException(nameof(FloorSegmentMB), "floorSegmentMB must be >= 0.0 (got " + value.ToString("0.0") + ")"); // LUCENENET specific - changed from IllegalArgumentException to ArgumentOutOfRangeException (.NET convention)
+                    throw new ArgumentOutOfRangeException(nameof(FloorSegmentMB), "floorSegmentMB must be >= 0.0 (got " + J2N.Numerics.Double.ToString(value) + ")"); // LUCENENET specific - changed from IllegalArgumentException to ArgumentOutOfRangeException (.NET convention)
                 }
                 value *= 1024 * 1024;
                 floorSegmentBytes = (value > long.MaxValue) ? long.MaxValue : (long)value;
@@ -214,7 +214,7 @@ public virtual double ForceMergeDeletesPctAllowed
             {
                 if (value < 0.0 || value > 100.0)
                 {
-                    throw new ArgumentOutOfRangeException(nameof(ForceMergeDeletesPctAllowed), "forceMergeDeletesPctAllowed must be between 0.0 and 100.0 inclusive (got " + value.ToString("0.0") + ")"); // LUCENENET specific - changed from IllegalArgumentException to ArgumentOutOfRangeException (.NET convention)
+                    throw new ArgumentOutOfRangeException(nameof(ForceMergeDeletesPctAllowed), "forceMergeDeletesPctAllowed must be between 0.0 and 100.0 inclusive (got " + J2N.Numerics.Double.ToString(value) + ")"); // LUCENENET specific - changed from IllegalArgumentException to ArgumentOutOfRangeException (.NET convention)
                 }
                 forceMergeDeletesPctAllowed = value;
             }
@@ -237,7 +237,7 @@ public virtual double SegmentsPerTier
             {
                 if (value < 2.0)
                 {
-                    throw new ArgumentOutOfRangeException(nameof(SegmentsPerTier), "segmentsPerTier must be >= 2.0 (got " + value.ToString("0.0") + ")"); // LUCENENET specific - changed from IllegalArgumentException to ArgumentOutOfRangeException (.NET convention)
+                    throw new ArgumentOutOfRangeException(nameof(SegmentsPerTier), "segmentsPerTier must be >= 2.0 (got " + J2N.Numerics.Double.ToString(value) + ")"); // LUCENENET specific - changed from IllegalArgumentException to ArgumentOutOfRangeException (.NET convention)
                 }
                 segsPerTier = value;
             }
diff --git a/src/Lucene.Net/Search/ControlledRealTimeReopenThread.cs b/src/Lucene.Net/Search/ControlledRealTimeReopenThread.cs
index d9b17a937..ccf82f32d 100644
--- a/src/Lucene.Net/Search/ControlledRealTimeReopenThread.cs
+++ b/src/Lucene.Net/Search/ControlledRealTimeReopenThread.cs
@@ -83,7 +83,7 @@ public ControlledRealTimeReopenThread(TrackingIndexWriter writer, ReferenceManag
         {
             if (targetMaxStaleSec < targetMinStaleSec)
             {
-                throw new ArgumentException("targetMaxScaleSec (= " + targetMaxStaleSec.ToString("0.0") + ") < targetMinStaleSec (=" + targetMinStaleSec.ToString("0.0") + ")");
+                throw new ArgumentException("targetMaxScaleSec (= " + J2N.Numerics.Double.ToString(targetMaxStaleSec) + ") < targetMinStaleSec (=" + J2N.Numerics.Double.ToString(targetMinStaleSec) + ")");
             }
 
             this.writer = writer;
diff --git a/src/Lucene.Net/Search/FieldCache.cs b/src/Lucene.Net/Search/FieldCache.cs
index 38f39dca1..d4c043f6e 100644
--- a/src/Lucene.Net/Search/FieldCache.cs
+++ b/src/Lucene.Net/Search/FieldCache.cs
@@ -1127,7 +1127,7 @@ public override int GetHashCode()
 
             public override string ToString()
             {
-                return Value.ToString();
+                return J2N.Numerics.Single.ToString(Value);
             }
         }
     }