You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucenenet.apache.org by sy...@apache.org on 2015/05/09 20:46:25 UTC
[1/6] lucenenet git commit: don't perform logic in Debug.Assert
Repository: lucenenet
Updated Branches:
refs/heads/master 95f358e9a -> 37c400392
don't perform logic in Debug.Assert
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/e7381c08
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/e7381c08
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/e7381c08
Branch: refs/heads/master
Commit: e7381c089e15bf363bcc2e962aa15604c139726e
Parents: 792dbad
Author: Laimonas Simutis <la...@gmail.com>
Authored: Fri May 8 14:42:05 2015 -0400
Committer: Laimonas Simutis <la...@gmail.com>
Committed: Fri May 8 14:42:05 2015 -0400
----------------------------------------------------------------------
src/Lucene.Net.Core/Index/DocumentsWriterStallControl.cs | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/e7381c08/src/Lucene.Net.Core/Index/DocumentsWriterStallControl.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Index/DocumentsWriterStallControl.cs b/src/Lucene.Net.Core/Index/DocumentsWriterStallControl.cs
index 0ee948c..6423cdf 100644
--- a/src/Lucene.Net.Core/Index/DocumentsWriterStallControl.cs
+++ b/src/Lucene.Net.Core/Index/DocumentsWriterStallControl.cs
@@ -81,9 +81,13 @@ namespace Lucene.Net.Index
// don't loop here, higher level logic will re-stall!
try
{
- Debug.Assert(IncWaiters());
+ // make sure not to run IncWaiters / DecrWaiters id Debug.Assert as that gets
+ // removed at compile time if built in Release mode
+ var result = IncWaiters();
+ Debug.Assert(result);
Monitor.Wait(this);
- Debug.Assert(DecrWaiters());
+ result = DecrWaiters();
+ Debug.Assert(result);
}
catch (ThreadInterruptedException e)
{
[2/6] lucenenet git commit: fix spelling mistake
Posted by sy...@apache.org.
fix spelling mistake
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/4eab349b
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/4eab349b
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/4eab349b
Branch: refs/heads/master
Commit: 4eab349bbbe456873d79b6c0e3442be51bdca3c6
Parents: e7381c0
Author: Laimonas Simutis <la...@gmail.com>
Authored: Fri May 8 14:43:25 2015 -0400
Committer: Laimonas Simutis <la...@gmail.com>
Committed: Fri May 8 14:43:25 2015 -0400
----------------------------------------------------------------------
src/Lucene.Net.Core/Index/DocumentsWriterStallControl.cs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/4eab349b/src/Lucene.Net.Core/Index/DocumentsWriterStallControl.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Index/DocumentsWriterStallControl.cs b/src/Lucene.Net.Core/Index/DocumentsWriterStallControl.cs
index 6423cdf..f154d02 100644
--- a/src/Lucene.Net.Core/Index/DocumentsWriterStallControl.cs
+++ b/src/Lucene.Net.Core/Index/DocumentsWriterStallControl.cs
@@ -81,7 +81,7 @@ namespace Lucene.Net.Index
// don't loop here, higher level logic will re-stall!
try
{
- // make sure not to run IncWaiters / DecrWaiters id Debug.Assert as that gets
+ // make sure not to run IncWaiters / DecrWaiters in Debug.Assert as that gets
// removed at compile time if built in Release mode
var result = IncWaiters();
Debug.Assert(result);
[3/6] lucenenet git commit: check tokenstream implementation outside
of debug.assert
Posted by sy...@apache.org.
check tokenstream implementation outside of debug.assert
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/40ea94e7
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/40ea94e7
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/40ea94e7
Branch: refs/heads/master
Commit: 40ea94e794705d6f56d17d6f0fedf131752bd922
Parents: 4eab349
Author: Laimonas Simutis <la...@gmail.com>
Authored: Fri May 8 15:39:54 2015 -0400
Committer: Laimonas Simutis <la...@gmail.com>
Committed: Fri May 8 15:39:54 2015 -0400
----------------------------------------------------------------------
src/Lucene.Net.Core/Analysis/TokenStream.cs | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/40ea94e7/src/Lucene.Net.Core/Analysis/TokenStream.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Analysis/TokenStream.cs b/src/Lucene.Net.Core/Analysis/TokenStream.cs
index 5f2aebb..795d0b6 100644
--- a/src/Lucene.Net.Core/Analysis/TokenStream.cs
+++ b/src/Lucene.Net.Core/Analysis/TokenStream.cs
@@ -91,7 +91,7 @@ namespace Lucene.Net.Analysis
/// </summary>
protected TokenStream()
{
- Debug.Assert(AssertFinal());
+ AssertFinal();
}
/// <summary>
@@ -100,7 +100,7 @@ namespace Lucene.Net.Analysis
protected TokenStream(AttributeSource input)
: base(input)
{
- Debug.Assert(AssertFinal());
+ AssertFinal();
}
/// <summary>
@@ -109,7 +109,7 @@ namespace Lucene.Net.Analysis
protected TokenStream(AttributeFactory factory)
: base(factory)
{
- Debug.Assert(AssertFinal());
+ AssertFinal();
}
private bool AssertFinal()
[5/6] lucenenet git commit: remove indexwriter debug.assert side
effects
Posted by sy...@apache.org.
remove indexwriter debug.assert side effects
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/085519ac
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/085519ac
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/085519ac
Branch: refs/heads/master
Commit: 085519ac92f459d207a96fe5246275bb00ffd755
Parents: 185e3e1
Author: Laimonas Simutis <la...@gmail.com>
Authored: Fri May 8 16:53:34 2015 -0400
Committer: Laimonas Simutis <la...@gmail.com>
Committed: Fri May 8 16:53:34 2015 -0400
----------------------------------------------------------------------
src/Lucene.Net.Core/Index/IndexWriter.cs | 34 +++++++++++++++++----------
1 file changed, 22 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/085519ac/src/Lucene.Net.Core/Index/IndexWriter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Index/IndexWriter.cs b/src/Lucene.Net.Core/Index/IndexWriter.cs
index 4fce66b..1067ab5 100644
--- a/src/Lucene.Net.Core/Index/IndexWriter.cs
+++ b/src/Lucene.Net.Core/Index/IndexWriter.cs
@@ -2576,8 +2576,8 @@ namespace Lucene.Net.Index
infoStream.Message("IW", "rollback: infos=" + SegString(segmentInfos.Segments));
}
- var result = TestPoint("rollback before checkpoint");
- Debug.Assert(result);
+ var tpResult = TestPoint("rollback before checkpoint");
+ Debug.Assert(tpResult);
// Ask deleter to locate unreferenced files & remove
// them:
@@ -3557,7 +3557,8 @@ namespace Lucene.Net.Index
}
DoBeforeFlush();
- Debug.Assert(TestPoint("startDoFlush"));
+ var tpResult = TestPoint("startDoFlush");
+ Debug.Assert(tpResult);
SegmentInfos toCommit = null;
bool anySegmentsFlushed = false;
@@ -3863,7 +3864,8 @@ namespace Lucene.Net.Index
}
DoBeforeFlush();
- Debug.Assert(TestPoint("startDoFlush"));
+ var tpResult = TestPoint("startDoFlush");
+ Debug.Assert(tpResult);
bool success = false;
try
{
@@ -4103,7 +4105,8 @@ namespace Lucene.Net.Index
{
lock (this)
{
- Debug.Assert(TestPoint("startCommitMergeDeletes"));
+ var tpResult = TestPoint("startCommitMergeDeletes");
+ Debug.Assert(tpResult);
IList<SegmentCommitInfo> sourceSegments = merge.Segments;
@@ -4339,7 +4342,8 @@ namespace Lucene.Net.Index
{
lock (this)
{
- Debug.Assert(TestPoint("startCommitMerge"));
+ var tpResult = TestPoint("startCommitMerge");
+ Debug.Assert(tpResult);
if (HitOOM)
{
@@ -4758,7 +4762,8 @@ namespace Lucene.Net.Index
{
lock (this)
{
- Debug.Assert(TestPoint("startMergeInit"));
+ var testPointResult = TestPoint("startMergeInit");
+ Debug.Assert(testPointResult);
Debug.Assert(merge.RegisterDone);
Debug.Assert(merge.MaxNumSegments == -1 || merge.MaxNumSegments > 0);
@@ -5440,7 +5445,8 @@ namespace Lucene.Net.Index
/// </summary>
private void StartCommit(SegmentInfos toSync)
{
- Debug.Assert(TestPoint("startStartCommit"));
+ var tpResult = TestPoint("startStartCommit");
+ Debug.Assert(tpResult);
Debug.Assert(PendingCommit == null);
if (HitOOM)
@@ -5478,13 +5484,15 @@ namespace Lucene.Net.Index
Debug.Assert(FilesExist(toSync));
}
- Debug.Assert(TestPoint("midStartCommit"));
+ tpResult = TestPoint("midStartCommit");
+ Debug.Assert(tpResult);
bool pendingCommitSet = false;
try
{
- Debug.Assert(TestPoint("midStartCommit2"));
+ tpResult = TestPoint("midStartCommit2");
+ Debug.Assert(tpResult);
lock (this)
{
@@ -5527,7 +5535,8 @@ namespace Lucene.Net.Index
infoStream.Message("IW", "done all syncs: " + filesToSync);
}
- Debug.Assert(TestPoint("midStartCommitSuccess"));
+ tpResult = TestPoint("midStartCommitSuccess");
+ Debug.Assert(tpResult);
}
finally
{
@@ -5557,7 +5566,8 @@ namespace Lucene.Net.Index
{
HandleOOM(oom, "startCommit");
}
- Debug.Assert(TestPoint("finishStartCommit"));
+ tpResult = TestPoint("finishStartCommit");
+ Debug.Assert(tpResult);
}
/// <summary>
[4/6] lucenenet git commit: run testpoint outside of debug.assert
Posted by sy...@apache.org.
run testpoint outside of debug.assert
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/185e3e19
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/185e3e19
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/185e3e19
Branch: refs/heads/master
Commit: 185e3e19350f34a249c0f76d6b0e04118d284800
Parents: 40ea94e
Author: Laimonas Simutis <la...@gmail.com>
Authored: Fri May 8 16:15:18 2015 -0400
Committer: Laimonas Simutis <la...@gmail.com>
Committed: Fri May 8 16:15:18 2015 -0400
----------------------------------------------------------------------
src/Lucene.Net.Core/Index/IndexWriter.cs | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/185e3e19/src/Lucene.Net.Core/Index/IndexWriter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Index/IndexWriter.cs b/src/Lucene.Net.Core/Index/IndexWriter.cs
index b4ca4b0..4fce66b 100644
--- a/src/Lucene.Net.Core/Index/IndexWriter.cs
+++ b/src/Lucene.Net.Core/Index/IndexWriter.cs
@@ -2576,7 +2576,8 @@ namespace Lucene.Net.Index
infoStream.Message("IW", "rollback: infos=" + SegString(segmentInfos.Segments));
}
- Debug.Assert(TestPoint("rollback before checkpoint"));
+ var result = TestPoint("rollback before checkpoint");
+ Debug.Assert(result);
// Ask deleter to locate unreferenced files & remove
// them:
[6/6] lucenenet git commit: Merge remote-tracking branch
'laimis/stallcontrol_fix'
Posted by sy...@apache.org.
Merge remote-tracking branch 'laimis/stallcontrol_fix'
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/37c40039
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/37c40039
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/37c40039
Branch: refs/heads/master
Commit: 37c400392238477efff39d841bbf8089c73e4eee
Parents: 95f358e 085519a
Author: Itamar Syn-Hershko <it...@code972.com>
Authored: Sat May 9 21:46:07 2015 +0300
Committer: Itamar Syn-Hershko <it...@code972.com>
Committed: Sat May 9 21:46:07 2015 +0300
----------------------------------------------------------------------
src/Lucene.Net.Core/Analysis/TokenStream.cs | 6 ++--
.../Index/DocumentsWriterStallControl.cs | 8 +++--
src/Lucene.Net.Core/Index/IndexWriter.cs | 33 +++++++++++++-------
3 files changed, 31 insertions(+), 16 deletions(-)
----------------------------------------------------------------------