Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id A6DE0200C50 for ; Fri, 24 Mar 2017 12:47:51 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id A5973160B82; Fri, 24 Mar 2017 11:47:51 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id C2438160B9C for ; Fri, 24 Mar 2017 12:47:50 +0100 (CET) Received: (qmail 10423 invoked by uid 500); 24 Mar 2017 11:47:49 -0000 Mailing-List: contact commits-help@lucenenet.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: lucene-net-dev@lucenenet.apache.org Delivered-To: mailing list commits@lucenenet.apache.org Received: (qmail 10292 invoked by uid 99); 24 Mar 2017 11:47:49 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 24 Mar 2017 11:47:49 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 97970DFE34; Fri, 24 Mar 2017 11:47:49 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: nightowl888@apache.org To: commits@lucenenet.apache.org Date: Fri, 24 Mar 2017 11:47:52 -0000 Message-Id: <852c9855411147d3954ee1f7ed8be952@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [4/7] lucenenet git commit: Lucene.Net.Core.Search.SearcherLifetimeManager: Fixed math to calculate seconds correctly archived-at: Fri, 24 Mar 2017 11:47:51 -0000 Lucene.Net.Core.Search.SearcherLifetimeManager: Fixed math to calculate seconds correctly Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/d284bd03 Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/d284bd03 Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/d284bd03 Branch: refs/heads/api-work Commit: d284bd03b031306f1c7d7409c5f521caab0fe323 Parents: 0d4619a Author: Shad Storhaug Authored: Fri Mar 24 18:13:47 2017 +0700 Committer: Shad Storhaug Committed: Fri Mar 24 18:13:47 2017 +0700 ---------------------------------------------------------------------- .../Search/SearcherLifetimeManager.cs | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/lucenenet/blob/d284bd03/src/Lucene.Net.Core/Search/SearcherLifetimeManager.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Core/Search/SearcherLifetimeManager.cs b/src/Lucene.Net.Core/Search/SearcherLifetimeManager.cs index c6e6f07..4f0e2cd 100644 --- a/src/Lucene.Net.Core/Search/SearcherLifetimeManager.cs +++ b/src/Lucene.Net.Core/Search/SearcherLifetimeManager.cs @@ -95,7 +95,10 @@ namespace Lucene.Net.Search public class SearcherLifetimeManager : IDisposable { - internal const double NANOS_PER_SEC = 1000000000.0; + // LUCENENET specific - adjust scale to account for the fact that we + // are using milliseconds instead of nanoseconds in .NET. + private const double MILLISECONDS_PER_SECOND = 1000; + //internal const double NANOS_PER_SEC = 1000000000.0; private sealed class SearcherTracker : IComparable, IDisposable { @@ -108,9 +111,11 @@ namespace Lucene.Net.Search Searcher = searcher; Version = ((DirectoryReader)searcher.IndexReader).Version; searcher.IndexReader.IncRef(); - // Use nanoTime not currentTimeMillis since it [in - // theory] reduces risk from clock shift - RecordTimeSec = DateTime.Now.ToFileTime() / 100.0d / NANOS_PER_SEC; + //// Use nanoTime not currentTimeMillis since it [in + //// theory] reduces risk from clock shift + //RecordTimeSec = DateTime.Now.ToFileTime() / 100.0d / NANOS_PER_SEC; + // LUCENENET specific - adjust calculation for milliseconds + RecordTimeSec = Environment.TickCount / MILLISECONDS_PER_SECOND; } // Newer searchers are sort before older ones: @@ -268,7 +273,9 @@ namespace Lucene.Net.Search var trackers = _searchers.Values.ToList(); trackers.Sort(); var lastRecordTimeSec = 0.0; - var now = DateTime.Now.ToFileTime() / 100.0d / NANOS_PER_SEC; + //var now = DateTime.Now.ToFileTime() / 100.0d / NANOS_PER_SEC; + // LUCENENET specific - adjust calculation for milliseconds + double now = Environment.TickCount / MILLISECONDS_PER_SECOND; foreach (var tracker in trackers) { double ageSec;