Return-Path: X-Original-To: apmail-lucene-lucene-net-commits-archive@www.apache.org Delivered-To: apmail-lucene-lucene-net-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 3F8889CD8 for ; Tue, 28 Feb 2012 22:45:00 +0000 (UTC) Received: (qmail 26623 invoked by uid 500); 28 Feb 2012 22:45:00 -0000 Delivered-To: apmail-lucene-lucene-net-commits-archive@lucene.apache.org Received: (qmail 26597 invoked by uid 500); 28 Feb 2012 22:45:00 -0000 Mailing-List: contact lucene-net-commits-help@lucene.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: lucene-net-dev@lucene.apache.org Delivered-To: mailing list lucene-net-commits@lucene.apache.org Received: (qmail 26589 invoked by uid 99); 28 Feb 2012 22:45:00 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 28 Feb 2012 22:45:00 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 28 Feb 2012 22:44:54 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 1DC172388C22; Tue, 28 Feb 2012 22:44:03 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Date: Tue, 28 Feb 2012 22:43:28 -0000 To: lucene-net-commits@lucene.apache.org From: ccurrens@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120228224403.1DC172388C22@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Subject: [Lucene.Net] svn commit: r1294875 [15/45] - in /incubator/lucene.net/trunk: ./ build/ build/vs2010/contrib/ build/vs2010/test/ doc/ src/ src/contrib/Analyzers/ src/contrib/Analyzers/AR/ src/contrib/Analyzers/BR/ src/contrib/Analyzers/CJK/ src/contrib/Analyzers/Cn/ ... Modified: incubator/lucene.net/trunk/src/core/Index/DocConsumer.cs URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Index/DocConsumer.cs?rev=1294875&r1=1294874&r2=1294875&view=diff ============================================================================== --- incubator/lucene.net/trunk/src/core/Index/DocConsumer.cs (original) +++ incubator/lucene.net/trunk/src/core/Index/DocConsumer.cs Tue Feb 28 22:43:08 2012 @@ -23,7 +23,7 @@ namespace Lucene.Net.Index abstract class DocConsumer { public abstract DocConsumerPerThread AddThread(DocumentsWriterThreadState perThread); - public abstract void Flush(System.Collections.ICollection threads, SegmentWriteState state); + public abstract void Flush(System.Collections.Generic.ICollection threads, SegmentWriteState state); public abstract void CloseDocStore(SegmentWriteState state); public abstract void Abort(); public abstract bool FreeRAM(); Modified: incubator/lucene.net/trunk/src/core/Index/DocFieldConsumer.cs URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Index/DocFieldConsumer.cs?rev=1294875&r1=1294874&r2=1294875&view=diff ============================================================================== --- incubator/lucene.net/trunk/src/core/Index/DocFieldConsumer.cs (original) +++ incubator/lucene.net/trunk/src/core/Index/DocFieldConsumer.cs Tue Feb 28 22:43:08 2012 @@ -16,6 +16,7 @@ */ using System; +using System.Collections.Generic; namespace Lucene.Net.Index { @@ -28,7 +29,7 @@ namespace Lucene.Net.Index ///

Called when DocumentsWriter decides to create a new /// segment ///

- public abstract void Flush(System.Collections.IDictionary threadsAndFields, SegmentWriteState state); + public abstract void Flush(IDictionary> threadsAndFields, SegmentWriteState state); ///

Called when DocumentsWriter decides to close the doc /// stores Modified: incubator/lucene.net/trunk/src/core/Index/DocFieldConsumers.cs URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Index/DocFieldConsumers.cs?rev=1294875&r1=1294874&r2=1294875&view=diff ============================================================================== --- incubator/lucene.net/trunk/src/core/Index/DocFieldConsumers.cs (original) +++ incubator/lucene.net/trunk/src/core/Index/DocFieldConsumers.cs Tue Feb 28 22:43:08 2012 @@ -16,7 +16,8 @@ */ using System; - +using System.Collections.Generic; +using Lucene.Net.Support; using ArrayUtil = Lucene.Net.Util.ArrayUtil; namespace Lucene.Net.Index @@ -26,7 +27,7 @@ namespace Lucene.Net.Index /// DocFieldConsumer instances as a single consumer. ///

- sealed class DocFieldConsumers:DocFieldConsumer + sealed class DocFieldConsumers : DocFieldConsumer { private void InitBlock() { @@ -48,31 +49,26 @@ namespace Lucene.Net.Index one.SetFieldInfos(fieldInfos); two.SetFieldInfos(fieldInfos); } - - public override void Flush(System.Collections.IDictionary threadsAndFields, SegmentWriteState state) + + public override void Flush(IDictionary> threadsAndFields, SegmentWriteState state) { + + var oneThreadsAndFields = new HashMap>(); + var twoThreadsAndFields = new HashMap>(); - System.Collections.IDictionary oneThreadsAndFields = new System.Collections.Hashtable(); - System.Collections.IDictionary twoThreadsAndFields = new System.Collections.Hashtable(); - - System.Collections.IEnumerator it = new System.Collections.Hashtable(threadsAndFields).GetEnumerator(); - while (it.MoveNext()) + foreach(var entry in threadsAndFields) { - - System.Collections.DictionaryEntry entry = (System.Collections.DictionaryEntry) it.Current; - DocFieldConsumersPerThread perThread = (DocFieldConsumersPerThread) entry.Key; - - System.Collections.ICollection fields = (System.Collections.ICollection) entry.Value; - - System.Collections.IEnumerator fieldsIt = fields.GetEnumerator(); - System.Collections.Hashtable oneFields = new System.Collections.Hashtable(); - System.Collections.Hashtable twoFields = new System.Collections.Hashtable(); + ICollection fields = entry.Value; + + IEnumerator fieldsIt = fields.GetEnumerator(); + ICollection oneFields = new HashSet(); + ICollection twoFields = new HashSet(); while (fieldsIt.MoveNext()) { DocFieldConsumersPerField perField = (DocFieldConsumersPerField) fieldsIt.Current; - SupportClass.CollectionsHelper.AddIfNotContains(oneFields, perField.one); - SupportClass.CollectionsHelper.AddIfNotContains(twoFields, perField.two); + oneFields.Add(perField.one); + twoFields.Add(perField.two); } oneThreadsAndFields[perThread.one] = oneFields; @@ -83,8 +79,8 @@ namespace Lucene.Net.Index one.Flush(oneThreadsAndFields, state); two.Flush(twoThreadsAndFields, state); } - - public override void CloseDocStore(SegmentWriteState state) + + public override void CloseDocStore(SegmentWriteState state) { try { Modified: incubator/lucene.net/trunk/src/core/Index/DocFieldProcessor.cs URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Index/DocFieldProcessor.cs?rev=1294875&r1=1294874&r2=1294875&view=diff ============================================================================== --- incubator/lucene.net/trunk/src/core/Index/DocFieldProcessor.cs (original) +++ incubator/lucene.net/trunk/src/core/Index/DocFieldProcessor.cs Tue Feb 28 22:43:08 2012 @@ -16,6 +16,9 @@ */ using System; +using System.Collections; +using System.Collections.Generic; +using Lucene.Net.Support; namespace Lucene.Net.Index { @@ -27,7 +30,7 @@ namespace Lucene.Net.Index /// DocFieldConsumer. /// - sealed class DocFieldProcessor:DocConsumer + sealed class DocFieldProcessor : DocConsumer { internal DocumentsWriter docWriter; @@ -49,14 +52,12 @@ namespace Lucene.Net.Index fieldsWriter.CloseDocStore(state); } - public override void Flush(System.Collections.ICollection threads, SegmentWriteState state) + public override void Flush(ICollection threads, SegmentWriteState state) { - - System.Collections.IDictionary childThreadsAndFields = new System.Collections.Hashtable(); - System.Collections.IEnumerator it = threads.GetEnumerator(); - while (it.MoveNext()) + var childThreadsAndFields = new HashMap>(); + foreach(DocConsumerPerThread thread in threads) { - DocFieldProcessorPerThread perThread = (DocFieldProcessorPerThread) ((System.Collections.DictionaryEntry) it.Current).Key; + DocFieldProcessorPerThread perThread = (DocFieldProcessorPerThread)thread; childThreadsAndFields[perThread.consumer] = perThread.Fields(); perThread.TrimFields(state); } @@ -69,7 +70,7 @@ namespace Lucene.Net.Index // FieldInfo.storePayload. System.String fileName = state.SegmentFileName(IndexFileNames.FIELD_INFOS_EXTENSION); fieldInfos.Write(state.directory, fileName); - SupportClass.CollectionsHelper.AddIfNotContains(state.flushedFiles, fileName); + state.flushedFiles.Add(fileName); } public override void Abort() Modified: incubator/lucene.net/trunk/src/core/Index/DocFieldProcessorPerThread.cs URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Index/DocFieldProcessorPerThread.cs?rev=1294875&r1=1294874&r2=1294875&view=diff ============================================================================== --- incubator/lucene.net/trunk/src/core/Index/DocFieldProcessorPerThread.cs (original) +++ incubator/lucene.net/trunk/src/core/Index/DocFieldProcessorPerThread.cs Tue Feb 28 22:43:08 2012 @@ -16,7 +16,7 @@ */ using System; - +using Lucene.Net.Support; using Document = Lucene.Net.Documents.Document; using Fieldable = Lucene.Net.Documents.Fieldable; using ArrayUtil = Lucene.Net.Util.ArrayUtil; @@ -84,15 +84,16 @@ namespace Lucene.Net.Index consumer.Abort(); } - public System.Collections.ICollection Fields() + public System.Collections.Generic.ICollection Fields() { - System.Collections.Hashtable fields = new System.Collections.Hashtable(); + System.Collections.Generic.ICollection fields = + new System.Collections.Generic.HashSet(); for (int i = 0; i < fieldHash.Length; i++) { DocFieldProcessorPerField field = fieldHash[i]; while (field != null) { - fields[field.consumer] = field.consumer; + fields.Add(field.consumer); field = field.next; } } @@ -146,7 +147,7 @@ namespace Lucene.Net.Index private void Rehash() { - int newHashSize = (int) (fieldHash.Length * 2); + int newHashSize = (fieldHash.Length * 2); System.Diagnostics.Debug.Assert(newHashSize > fieldHash.Length); DocFieldProcessorPerField[] newHashArray = new DocFieldProcessorPerField[newHashSize]; @@ -184,7 +185,7 @@ namespace Lucene.Net.Index int thisFieldGen = fieldGen++; - System.Collections.IList docFields = doc.GetFields(); + System.Collections.Generic.IList docFields = doc.GetFields(); int numDocFields = docFields.Count; // Absorb any new fields first seen in this document. @@ -194,7 +195,7 @@ namespace Lucene.Net.Index for (int i = 0; i < numDocFields; i++) { - Fieldable field = (Fieldable) docFields[i]; + Fieldable field = docFields[i]; System.String fieldName = field.Name(); // Make sure we have a PerField allocated @@ -202,29 +203,35 @@ namespace Lucene.Net.Index DocFieldProcessorPerField fp = fieldHash[hashPos]; while (fp != null && !fp.fieldInfo.name.Equals(fieldName)) fp = fp.next; - - if (fp == null) - { - - // TODO FI: we need to genericize the "flags" that a - // field holds, and, how these flags are merged; it - // needs to be more "pluggable" such that if I want - // to have a new "thing" my Fields can do, I can - // easily add it - FieldInfo fi = fieldInfos.Add(fieldName, field.IsIndexed(), field.IsTermVectorStored(), field.IsStorePositionWithTermVector(), field.IsStoreOffsetWithTermVector(), field.GetOmitNorms(), false, field.GetOmitTf()); - - fp = new DocFieldProcessorPerField(this, fi); - fp.next = fieldHash[hashPos]; - fieldHash[hashPos] = fp; - totalFieldCount++; - - if (totalFieldCount >= fieldHash.Length / 2) - Rehash(); - } - else - fp.fieldInfo.Update(field.IsIndexed(), field.IsTermVectorStored(), field.IsStorePositionWithTermVector(), field.IsStoreOffsetWithTermVector(), field.GetOmitNorms(), false, field.GetOmitTf()); - - if (thisFieldGen != fp.lastGen) + + if (fp == null) + { + + // TODO FI: we need to genericize the "flags" that a + // field holds, and, how these flags are merged; it + // needs to be more "pluggable" such that if I want + // to have a new "thing" my Fields can do, I can + // easily add it + FieldInfo fi = fieldInfos.Add(fieldName, field.IsIndexed(), field.IsTermVectorStored(), + field.IsStorePositionWithTermVector(), field.IsStoreOffsetWithTermVector(), + field.GetOmitNorms(), false, field.GetOmitTermFreqAndPositions()); + + fp = new DocFieldProcessorPerField(this, fi); + fp.next = fieldHash[hashPos]; + fieldHash[hashPos] = fp; + totalFieldCount++; + + if (totalFieldCount >= fieldHash.Length / 2) + Rehash(); + } + else + { + fp.fieldInfo.Update(field.IsIndexed(), field.IsTermVectorStored(), + field.IsStorePositionWithTermVector(), field.IsStoreOffsetWithTermVector(), + field.GetOmitNorms(), false, field.GetOmitTermFreqAndPositions()); + } + + if (thisFieldGen != fp.lastGen) { // First time we're seeing this field for this doc @@ -310,7 +317,7 @@ namespace Lucene.Net.Index return ; } - int mid = SupportClass.Number.URShift((lo + hi), 1); + int mid = Number.URShift((lo + hi), 1); if (String.CompareOrdinal(array[lo].fieldInfo.name, array[mid].fieldInfo.name) > 0) { Modified: incubator/lucene.net/trunk/src/core/Index/DocInverter.cs URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Index/DocInverter.cs?rev=1294875&r1=1294874&r2=1294875&view=diff ============================================================================== --- incubator/lucene.net/trunk/src/core/Index/DocInverter.cs (original) +++ incubator/lucene.net/trunk/src/core/Index/DocInverter.cs Tue Feb 28 22:43:08 2012 @@ -16,7 +16,8 @@ */ using System; - +using System.Collections.Generic; +using Lucene.Net.Support; using AttributeSource = Lucene.Net.Util.AttributeSource; namespace Lucene.Net.Index @@ -27,7 +28,7 @@ namespace Lucene.Net.Index /// InvertedTermsConsumer to process those terms. /// - sealed class DocInverter:DocFieldConsumer + sealed class DocInverter : DocFieldConsumer { internal InvertedDocConsumer consumer; @@ -45,31 +46,24 @@ namespace Lucene.Net.Index consumer.SetFieldInfos(fieldInfos); endConsumer.SetFieldInfos(fieldInfos); } - - public override void Flush(System.Collections.IDictionary threadsAndFields, SegmentWriteState state) + + public override void Flush(IDictionary> threadsAndFields, SegmentWriteState state) { - - System.Collections.IDictionary childThreadsAndFields = new System.Collections.Hashtable(); - System.Collections.IDictionary endChildThreadsAndFields = new System.Collections.Hashtable(); - - System.Collections.IEnumerator it = new System.Collections.Hashtable(threadsAndFields).GetEnumerator(); - while (it.MoveNext()) + + var childThreadsAndFields = new HashMap>(); + var endChildThreadsAndFields = new HashMap>(); + + foreach (var entry in threadsAndFields) { - - System.Collections.DictionaryEntry entry = (System.Collections.DictionaryEntry) it.Current; - DocInverterPerThread perThread = (DocInverterPerThread) entry.Key; - - System.Collections.ICollection fields = (System.Collections.ICollection) entry.Value; - - System.Collections.IEnumerator fieldsIt = fields.GetEnumerator(); - System.Collections.Hashtable childFields = new System.Collections.Hashtable(); - System.Collections.Hashtable endChildFields = new System.Collections.Hashtable(); - while (fieldsIt.MoveNext()) + + ICollection childFields = new HashSet(); + ICollection endChildFields = new HashSet(); + foreach(DocFieldConsumerPerField field in entry.Value) { - DocInverterPerField perField = (DocInverterPerField) ((System.Collections.DictionaryEntry) fieldsIt.Current).Key; - childFields[perField.consumer] = perField.consumer; - endChildFields[perField.endConsumer] = perField.endConsumer; + DocInverterPerField perField = (DocInverterPerField)field; + childFields.Add(perField.consumer); + endChildFields.Add(perField.endConsumer); } childThreadsAndFields[perThread.consumer] = childFields; @@ -79,8 +73,8 @@ namespace Lucene.Net.Index consumer.Flush(childThreadsAndFields, state); endConsumer.Flush(endChildThreadsAndFields, state); } - - public override void CloseDocStore(SegmentWriteState state) + + public override void CloseDocStore(SegmentWriteState state) { consumer.CloseDocStore(state); endConsumer.CloseDocStore(state); Modified: incubator/lucene.net/trunk/src/core/Index/DocInverterPerField.cs URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Index/DocInverterPerField.cs?rev=1294875&r1=1294874&r2=1294875&view=diff ============================================================================== --- incubator/lucene.net/trunk/src/core/Index/DocInverterPerField.cs (original) +++ incubator/lucene.net/trunk/src/core/Index/DocInverterPerField.cs Tue Feb 28 22:43:08 2012 @@ -89,9 +89,9 @@ namespace Lucene.Net.Index // un-tokenized field System.String stringValue = field.StringValue(); int valueLength = stringValue.Length; - perThread.singleTokenTokenStream.Reinit(stringValue, 0, valueLength); - fieldState.attributeSource = perThread.singleTokenTokenStream; - consumer.Start(field); + perThread.singleToken.Reinit(stringValue, 0, valueLength); + fieldState.attributeSource = perThread.singleToken; + consumer.Start(field); bool success = false; try @@ -144,9 +144,6 @@ namespace Lucene.Net.Index int startLength = fieldState.length; - // deprecated - bool allowMinus1Position = docState.allowMinus1Position; - try { int offsetEnd = fieldState.offset - 1; @@ -154,9 +151,9 @@ namespace Lucene.Net.Index bool hasMoreTokens = stream.IncrementToken(); fieldState.attributeSource = stream; - - OffsetAttribute offsetAttribute = (OffsetAttribute) fieldState.attributeSource.AddAttribute(typeof(OffsetAttribute)); - PositionIncrementAttribute posIncrAttribute = (PositionIncrementAttribute) fieldState.attributeSource.AddAttribute(typeof(PositionIncrementAttribute)); + + OffsetAttribute offsetAttribute = fieldState.attributeSource.AddAttribute(); + PositionIncrementAttribute posIncrAttribute = fieldState.attributeSource.AddAttribute(); consumer.Start(field); @@ -175,7 +172,7 @@ namespace Lucene.Net.Index int posIncr = posIncrAttribute.GetPositionIncrement(); fieldState.position += posIncr; - if (allowMinus1Position || fieldState.position > 0) + if (fieldState.position > 0) { fieldState.position--; } Modified: incubator/lucene.net/trunk/src/core/Index/DocInverterPerThread.cs URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Index/DocInverterPerThread.cs?rev=1294875&r1=1294874&r2=1294875&view=diff ============================================================================== --- incubator/lucene.net/trunk/src/core/Index/DocInverterPerThread.cs (original) +++ incubator/lucene.net/trunk/src/core/Index/DocInverterPerThread.cs Tue Feb 28 22:43:08 2012 @@ -16,7 +16,7 @@ */ using System; - +using Lucene.Net.Util; using TokenStream = Lucene.Net.Analysis.TokenStream; using OffsetAttribute = Lucene.Net.Analysis.Tokenattributes.OffsetAttribute; using TermAttribute = Lucene.Net.Analysis.Tokenattributes.TermAttribute; @@ -29,27 +29,26 @@ namespace Lucene.Net.Index /// InvertedTermsConsumer to process those terms. /// - sealed class DocInverterPerThread:DocFieldConsumerPerThread + sealed class DocInverterPerThread : DocFieldConsumerPerThread { private void InitBlock() { - singleTokenTokenStream = new SingleTokenTokenStream(); + singleToken = new SingleTokenAttributeSource(); } internal DocInverter docInverter; internal InvertedDocConsumerPerThread consumer; internal InvertedDocEndConsumerPerThread endConsumer; - //TODO: change to SingleTokenTokenStream after Token was removed - internal SingleTokenTokenStream singleTokenTokenStream; + internal SingleTokenAttributeSource singleToken; - internal class SingleTokenTokenStream:TokenStream + internal class SingleTokenAttributeSource : AttributeSource { internal TermAttribute termAttribute; internal OffsetAttribute offsetAttribute; - - internal SingleTokenTokenStream() + + internal SingleTokenAttributeSource() { - termAttribute = (TermAttribute) AddAttribute(typeof(TermAttribute)); - offsetAttribute = (OffsetAttribute) AddAttribute(typeof(OffsetAttribute)); + termAttribute = AddAttribute(); + offsetAttribute = AddAttribute(); } public void Reinit(System.String stringValue, int startOffset, int endOffset) @@ -57,12 +56,6 @@ namespace Lucene.Net.Index termAttribute.SetTermBuffer(stringValue); offsetAttribute.SetOffset(startOffset, endOffset); } - - // this is a dummy, to not throw an UOE because this class does not implement any iteration method - public override bool IncrementToken() - { - throw new System.NotSupportedException(); - } } internal DocumentsWriter.DocState docState; Modified: incubator/lucene.net/trunk/src/core/Index/DocumentsWriter.cs URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Index/DocumentsWriter.cs?rev=1294875&r1=1294874&r2=1294875&view=diff ============================================================================== --- incubator/lucene.net/trunk/src/core/Index/DocumentsWriter.cs (original) +++ incubator/lucene.net/trunk/src/core/Index/DocumentsWriter.cs Tue Feb 28 22:43:08 2012 @@ -16,7 +16,10 @@ */ using System; - +using System.Collections.Generic; +using System.Linq; +using System.Threading; +using Lucene.Net.Support; using Analyzer = Lucene.Net.Analysis.Analyzer; using Document = Lucene.Net.Documents.Document; using AlreadyClosedException = Lucene.Net.Store.AlreadyClosedException; @@ -69,9 +72,8 @@ namespace Lucene.Net.Index /// call). Finally the synchronized "finishDocument" is /// called to flush changes to the directory. /// - /// When flush is called by IndexWriter, or, we flush - /// internally when autoCommit=false, we forcefully idle all - /// threads and flush only once they are all idle. This + /// When flush is called by IndexWriter we forcefully idle + /// all threads and flush only once they are all idle. This /// means you can call flush with a given thread even while /// other threads are actively adding/deleting documents. /// @@ -98,7 +100,7 @@ namespace Lucene.Net.Index /// or none") added to the index. /// - public sealed class DocumentsWriter + public sealed class DocumentsWriter : IDisposable { internal class AnonymousClassIndexingChain:IndexingChain { @@ -153,19 +155,19 @@ namespace Lucene.Net.Index internal IndexWriter writer; internal Directory directory; - internal System.String segment; // Current segment we are working on - private System.String docStoreSegment; // Current doc-store segment we are writing - private int docStoreOffset; // Current starting doc-store offset of current segment - - private int nextDocID; // Next docID to be added - private int numDocsInRAM; // # docs buffered in RAM - internal int numDocsInStore; // # docs written to doc stores + internal System.String segment; // Current segment we are working on + private System.String docStoreSegment; // Current doc-store segment we are writing + private int docStoreOffset; // Current starting doc-store offset of current segment + + private int nextDocID; // Next docID to be added + private int numDocsInRAM; // # docs buffered in RAM + internal int numDocsInStore; // # docs written to doc stores // Max # ThreadState instances; if there are more threads // than this they share ThreadStates private const int MAX_THREAD_STATE = 5; private DocumentsWriterThreadState[] threadStates = new DocumentsWriterThreadState[0]; - private System.Collections.Hashtable threadBindings = new System.Collections.Hashtable(); + private HashMap threadBindings = new HashMap(); private int pauseThreads; // Non-zero when we need all threads to // pause (eg to flush) @@ -179,7 +181,7 @@ namespace Lucene.Net.Index internal int maxFieldLength; internal Similarity similarity; - internal System.Collections.IList newFiles; + internal IList newFiles; internal class DocState { @@ -192,10 +194,6 @@ namespace Lucene.Net.Index internal Document doc; internal System.String maxTermPrefix; - // deprecated - [Obsolete] - internal bool allowMinus1Position; - // Only called by asserts public bool TestPoint(System.String name) { @@ -400,15 +398,6 @@ namespace Lucene.Net.Index } } - internal void SetAllowMinus1Position() - { - lock (this) - { - for (int i = 0; i < threadStates.Length; i++) - threadStates[i].docState.allowMinus1Position = true; - } - } - ///

Set how much RAM we can use before flushing.

internal void SetRAMBufferSizeMB(double mb) { @@ -472,8 +461,7 @@ namespace Lucene.Net.Index } ///

Returns the current doc store segment we are writing - /// to. This will be the same as segment when autoCommit - /// * is true. + /// to. ///

internal System.String GetDocStoreSegment() { @@ -532,11 +520,11 @@ namespace Lucene.Net.Index } } - private System.Collections.Generic.ICollection abortedFiles; // List of files that were written before last abort() + private ICollection abortedFiles; // List of files that were written before last abort() private SegmentWriteState flushState; - internal System.Collections.Generic.ICollection AbortedFiles() + internal ICollection AbortedFiles() { return abortedFiles; } @@ -547,28 +535,26 @@ namespace Lucene.Net.Index writer.Message("DW: " + message); } - internal System.Collections.Generic.IList openFiles = new System.Collections.Generic.List(); - internal System.Collections.Generic.IList closedFiles = new System.Collections.Generic.List(); + internal IList openFiles = new List(); + internal IList closedFiles = new List(); /* Returns Collection of files in use by this instance, * including any flushed segments. */ - internal System.Collections.Generic.IList OpenFiles() + internal IList OpenFiles() { lock (this) { - string[] tmp = new string[openFiles.Count]; - openFiles.CopyTo(tmp, 0); - return tmp; + // ToArray returns a copy + return openFiles.ToArray(); } } - internal System.Collections.Generic.IList ClosedFiles() + internal IList ClosedFiles() { lock (this) { - string[] tmp = new string[closedFiles.Count]; - closedFiles.CopyTo(tmp, 0); - return tmp; + // ToArray returns a copy + return closedFiles.ToArray(); } } @@ -608,13 +594,14 @@ namespace Lucene.Net.Index { lock (this) { - try { - if (infoStream != null) - Message("docWriter: now abort"); - - // Forcefully remove waiting ThreadStates from line + if (infoStream != null) + { + Message("docWriter: now abort"); + } + + // Forcefully remove waiting ThreadStates from line waitQueue.Abort(); // Wait for all other threads to finish with @@ -713,10 +700,11 @@ namespace Lucene.Net.Index } catch (System.Threading.ThreadInterruptedException ie) { - // In 3.0 we will change this to throw - // InterruptedException instead - SupportClass.ThreadClass.Current().Interrupt(); - throw new System.SystemException(ie.Message, ie); + //// In 3.0 we will change this to throw + //// InterruptedException instead + //SupportClass.ThreadClass.Current().Interrupt(); + //throw new System.SystemException(ie.Message, ie); + throw; } } @@ -797,9 +785,9 @@ namespace Lucene.Net.Index flushState.numDocsInStore = 0; } - System.Collections.Hashtable threads = new System.Collections.Hashtable(); + ICollection threads = new HashSet(); for (int i = 0; i < threadStates.Length; i++) - threads[threadStates[i].consumer] = threadStates[i].consumer; + threads.Add(threadStates[i].consumer); consumer.Flush(threads, flushState); if (infoStream != null) @@ -831,7 +819,7 @@ namespace Lucene.Net.Index } } - internal System.Collections.ICollection GetFlushedFiles() + internal ICollection GetFlushedFiles() { return flushState.flushedFiles; } @@ -841,10 +829,9 @@ namespace Lucene.Net.Index { CompoundFileWriter cfsWriter = new CompoundFileWriter(directory, segment + "." + IndexFileNames.COMPOUND_FILE_EXTENSION); - System.Collections.IEnumerator it = flushState.flushedFiles.GetEnumerator(); - while (it.MoveNext()) + foreach(string flushedFile in flushState.flushedFiles) { - cfsWriter.AddFile((System.String) ((System.Collections.DictionaryEntry) it.Current).Key); + cfsWriter.AddFile(flushedFile); } // Perform the merge @@ -886,14 +873,15 @@ namespace Lucene.Net.Index } } - internal void Close() - { - lock (this) - { - closed = true; - System.Threading.Monitor.PulseAll(this); - } - } + public void Dispose() + { + // Move to protected method if class becomes unsealed + lock (this) + { + closed = true; + System.Threading.Monitor.PulseAll(this); + } + } internal void InitSegmentName(bool onlyDocStore) { @@ -926,7 +914,7 @@ namespace Lucene.Net.Index // First, find a thread state. If this thread already // has affinity to a specific ThreadState, use that one // again. - DocumentsWriterThreadState state = (DocumentsWriterThreadState) threadBindings[SupportClass.ThreadClass.Current()]; + DocumentsWriterThreadState state = threadBindings[ThreadClass.Current()]; if (state == null) { @@ -953,7 +941,7 @@ namespace Lucene.Net.Index state = newArray[threadStates.Length] = new DocumentsWriterThreadState(this); threadStates = newArray; } - threadBindings[SupportClass.ThreadClass.Current()] = state; + threadBindings[ThreadClass.Current()] = state; } // Next, wait until my thread state is idle (in case @@ -1135,7 +1123,7 @@ namespace Lucene.Net.Index } // for testing - internal System.Collections.IDictionary GetBufferedDeleteTerms() + internal IDictionary GetBufferedDeleteTerms() { lock (this) { @@ -1171,10 +1159,11 @@ namespace Lucene.Net.Index } catch (System.Threading.ThreadInterruptedException ie) { - // In 3.0 we will change this to throw - // InterruptedException instead - SupportClass.ThreadClass.Current().Interrupt(); - throw new System.SystemException(ie.Message, ie); + throw; + //// In 3.0 we will change this to throw + //// InterruptedException instead + //SupportClass.ThreadClass.Current().Interrupt(); + //throw new System.SystemException(ie.Message, ie); } } @@ -1279,7 +1268,6 @@ namespace Lucene.Net.Index { lock (this) { - if (!HasDeletes()) return false; @@ -1334,27 +1322,23 @@ namespace Lucene.Net.Index { lock (this) { - int docEnd = docIDStart + reader.MaxDoc(); bool any = false; System.Diagnostics.Debug.Assert(CheckDeleteTerm(null)); // Delete by term - //System.Collections.IEnumerator iter = new System.Collections.Hashtable(deletesFlushed.terms).GetEnumerator(); - System.Collections.IEnumerator iter = deletesFlushed.terms.GetEnumerator(); TermDocs docs = reader.TermDocs(); try { - while (iter.MoveNext()) + foreach(KeyValuePair entry in deletesFlushed.terms) { - System.Collections.DictionaryEntry entry = (System.Collections.DictionaryEntry) iter.Current; - Term term = (Term) entry.Key; + Term term = entry.Key; // LUCENE-2086: we should be iterating a TreeMap, // here, so terms better be in order: System.Diagnostics.Debug.Assert(CheckDeleteTerm(term)); docs.Seek(term); - int limit = ((BufferedDeletes.Num) entry.Value).GetNum(); + int limit = entry.Value.GetNum(); while (docs.Next()) { int docID = docs.Doc(); @@ -1371,10 +1355,9 @@ namespace Lucene.Net.Index } // Delete by docID - iter = deletesFlushed.docIDs.GetEnumerator(); - while (iter.MoveNext()) + foreach(int docIdInt in deletesFlushed.docIDs) { - int docID = ((System.Int32) iter.Current); + int docID = docIdInt; if (docID >= docIDStart && docID < docEnd) { reader.DeleteDocument(docID - docIDStart); @@ -1384,12 +1367,10 @@ namespace Lucene.Net.Index // Delete by query IndexSearcher searcher = new IndexSearcher(reader); - iter = new System.Collections.Hashtable(deletesFlushed.queries).GetEnumerator(); - while (iter.MoveNext()) + foreach(KeyValuePair entry in deletesFlushed.queries) { - System.Collections.DictionaryEntry entry = (System.Collections.DictionaryEntry) iter.Current; Query query = (Query) entry.Key; - int limit = ((System.Int32) entry.Value); + int limit = (int)entry.Value; Weight weight = query.Weight(searcher); Scorer scorer = weight.Scorer(reader, true, false); if (scorer != null) @@ -1417,7 +1398,7 @@ namespace Lucene.Net.Index { lock (this) { - BufferedDeletes.Num num = (BufferedDeletes.Num) deletesInRAM.terms[term]; + BufferedDeletes.Num num = deletesInRAM.terms[term]; int docIDUpto = flushedDocCount + docCount; if (num == null) deletesInRAM.terms[term] = new BufferedDeletes.Num(docIDUpto); @@ -1435,8 +1416,8 @@ namespace Lucene.Net.Index { lock (this) { - deletesInRAM.docIDs.Add((System.Int32) (flushedDocCount + docID)); - deletesInRAM.AddBytesUsed(BYTES_PER_DEL_DOCID); + deletesInRAM.docIDs.Add(flushedDocCount + docID); + deletesInRAM.AddBytesUsed(BYTES_PER_DEL_DOCID); } } @@ -1444,7 +1425,7 @@ namespace Lucene.Net.Index { lock (this) { - deletesInRAM.queries[query] = (System.Int32) (flushedDocCount + docID); + deletesInRAM.queries[query] = flushedDocCount + docID; deletesInRAM.AddBytesUsed(BYTES_PER_DEL_QUERY); } } @@ -1530,10 +1511,11 @@ namespace Lucene.Net.Index } catch (System.Threading.ThreadInterruptedException ie) { - // In 3.0 we will change this to throw - // InterruptedException instead - SupportClass.ThreadClass.Current().Interrupt(); - throw new System.SystemException(ie.Message, ie); + throw; + //// In 3.0 we will change this to throw + //// InterruptedException instead + //SupportClass.ThreadClass.Current().Interrupt(); + //throw new System.SystemException(ie.Message, ie); } } while (!waitQueue.DoResume()); @@ -1602,7 +1584,7 @@ namespace Lucene.Net.Index internal static readonly int BYTE_BLOCK_MASK = BYTE_BLOCK_SIZE - 1; internal static readonly int BYTE_BLOCK_NOT_MASK = ~ BYTE_BLOCK_MASK; - internal class ByteBlockAllocator:ByteBlockPool.Allocator + internal class ByteBlockAllocator : ByteBlockPool.Allocator { public ByteBlockAllocator(DocumentsWriter enclosingInstance, int blockSize) { @@ -1624,7 +1606,7 @@ namespace Lucene.Net.Index } int blockSize; - internal System.Collections.ArrayList freeByteBlocks = new System.Collections.ArrayList(); + internal List freeByteBlocks = new List(); /* Allocate another byte[] from the shared pool */ public /*internal*/ override byte[] GetByteBlock(bool trackAllocations) @@ -1646,10 +1628,8 @@ namespace Lucene.Net.Index } else { - System.Object tempObject; - tempObject = freeByteBlocks[size - 1]; - freeByteBlocks.RemoveAt(size - 1); - b = (byte[]) tempObject; + b = freeByteBlocks[size - 1]; + freeByteBlocks.RemoveAt(size - 1); } if (trackAllocations) Enclosing_Instance.numBytesUsed += blockSize; @@ -1668,14 +1648,10 @@ namespace Lucene.Net.Index freeByteBlocks.Add(blocks[i]); blocks[i] = null; } - if (enclosingInstance.infoStream != null && blockSize != 1024) - { - enclosingInstance.Message("DW.recycleByteBlocks blockSize=" + blockSize + " count=" + (end - start) + " total now " + freeByteBlocks.Count); - } } } - public /*internal*/ override void RecycleByteBlocks(System.Collections.ArrayList blocks) + public /*internal*/ override void RecycleByteBlocks(IList blocks) { lock (Enclosing_Instance) { @@ -1691,8 +1667,8 @@ namespace Lucene.Net.Index internal const int INT_BLOCK_SHIFT = 13; internal static readonly int INT_BLOCK_SIZE = 1 << INT_BLOCK_SHIFT; internal static readonly int INT_BLOCK_MASK = INT_BLOCK_SIZE - 1; - - private System.Collections.ArrayList freeIntBlocks = new System.Collections.ArrayList(); + + private List freeIntBlocks = new List(); /* Allocate another int[] from the shared pool */ internal int[] GetIntBlock(bool trackAllocations) @@ -1714,10 +1690,8 @@ namespace Lucene.Net.Index } else { - System.Object tempObject; - tempObject = freeIntBlocks[size - 1]; - freeIntBlocks.RemoveAt(size - 1); - b = (int[]) tempObject; + b = freeIntBlocks[size - 1]; + freeIntBlocks.RemoveAt(size - 1); } if (trackAllocations) numBytesUsed += INT_BLOCK_SIZE * INT_NUM_BYTE; @@ -1753,10 +1727,6 @@ namespace Lucene.Net.Index freeIntBlocks.Add(blocks[i]); blocks[i] = null; } - if (infoStream != null) - { - Message("DW.recycleIntBlocks count=" + (end - start) + " total now " + freeIntBlocks.Count); - } } } @@ -1774,7 +1744,7 @@ namespace Lucene.Net.Index internal static readonly int MAX_TERM_LENGTH = CHAR_BLOCK_SIZE - 1; - private System.Collections.ArrayList freeCharBlocks = new System.Collections.ArrayList(); + private List freeCharBlocks = new List(); /* Allocate another char[] from the shared pool */ internal char[] GetCharBlock() @@ -1790,10 +1760,8 @@ namespace Lucene.Net.Index } else { - System.Object tempObject; - tempObject = freeCharBlocks[size - 1]; - freeCharBlocks.RemoveAt(size - 1); - c = (char[]) tempObject; + c = freeCharBlocks[size - 1]; + freeCharBlocks.RemoveAt(size - 1); } // We always track allocations of char blocks, for now, // because nothing that skips allocation tracking @@ -1815,10 +1783,6 @@ namespace Lucene.Net.Index freeCharBlocks.Add(blocks[i]); blocks[i] = null; } - if (infoStream != null) - { - Message("DW.recycleCharBlocks count=" + numBlocks + " total now " + freeCharBlocks.Count); - } } } Modified: incubator/lucene.net/trunk/src/core/Index/DocumentsWriterThreadState.cs URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Index/DocumentsWriterThreadState.cs?rev=1294875&r1=1294874&r2=1294875&view=diff ============================================================================== --- incubator/lucene.net/trunk/src/core/Index/DocumentsWriterThreadState.cs (original) +++ incubator/lucene.net/trunk/src/core/Index/DocumentsWriterThreadState.cs Tue Feb 28 22:43:08 2012 @@ -44,7 +44,6 @@ namespace Lucene.Net.Index docState.infoStream = docWriter.infoStream; docState.similarity = docWriter.similarity; docState.docWriter = docWriter; - docState.allowMinus1Position = docWriter.writer.GetAllowMinus1Position(); consumer = docWriter.consumer.AddThread(this); } Modified: incubator/lucene.net/trunk/src/core/Index/FieldInfos.cs URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Index/FieldInfos.cs?rev=1294875&r1=1294874&r2=1294875&view=diff ============================================================================== --- incubator/lucene.net/trunk/src/core/Index/FieldInfos.cs (original) +++ incubator/lucene.net/trunk/src/core/Index/FieldInfos.cs Tue Feb 28 22:43:08 2012 @@ -16,7 +16,7 @@ */ using System; - +using Lucene.Net.Support; using Document = Lucene.Net.Documents.Document; using Fieldable = Lucene.Net.Documents.Fieldable; using Directory = Lucene.Net.Store.Directory; @@ -44,16 +44,16 @@ namespace Lucene.Net.Index internal static readonly int CURRENT_FORMAT = FORMAT_START; - internal const byte IS_INDEXED = (byte) (0x1); - internal const byte STORE_TERMVECTOR = (byte) (0x2); - internal const byte STORE_POSITIONS_WITH_TERMVECTOR = (byte) (0x4); - internal const byte STORE_OFFSET_WITH_TERMVECTOR = (byte) (0x8); - internal const byte OMIT_NORMS = (byte) (0x10); - internal const byte STORE_PAYLOADS = (byte) (0x20); - internal const byte OMIT_TERM_FREQ_AND_POSITIONS = (byte) (0x40); - - private System.Collections.ArrayList byNumber = new System.Collections.ArrayList(); - private System.Collections.Hashtable byName = new System.Collections.Hashtable(); + internal const byte IS_INDEXED = (0x1); + internal const byte STORE_TERMVECTOR = (0x2); + internal const byte STORE_POSITIONS_WITH_TERMVECTOR =(0x4); + internal const byte STORE_OFFSET_WITH_TERMVECTOR = (0x8); + internal const byte OMIT_NORMS = (0x10); + internal const byte STORE_PAYLOADS = (0x20); + internal const byte OMIT_TERM_FREQ_AND_POSITIONS = (0x40); + + private System.Collections.Generic.List byNumber = new System.Collections.Generic.List(); + private HashMap byName = new HashMap(); private int format; public /*internal*/ FieldInfos() @@ -94,15 +94,15 @@ namespace Lucene.Net.Index } catch (System.Exception t) { - // Ignore any new exception & throw original IOE - throw ioe; + // Ignore any new exception & throw original IOE + throw ioe; } } else { // The IOException cannot be caused by // LUCENE-1623, so re-throw it - throw ioe; + throw; } } } @@ -121,7 +121,7 @@ namespace Lucene.Net.Index int numField = byNumber.Count; for (int i = 0; i < numField; i++) { - FieldInfo fi = (FieldInfo)((FieldInfo)byNumber[i]).Clone(); + FieldInfo fi = (FieldInfo)byNumber[i].Clone(); fis.byNumber.Add(fi); fis.byName[fi.name] = fi; } @@ -134,13 +134,13 @@ namespace Lucene.Net.Index { lock (this) { - System.Collections.IList fields = doc.GetFields(); - System.Collections.IEnumerator fieldIterator = fields.GetEnumerator(); - while (fieldIterator.MoveNext()) - { - Fieldable field = (Fieldable) fieldIterator.Current; - Add(field.Name(), field.IsIndexed(), field.IsTermVectorStored(), field.IsStorePositionWithTermVector(), field.IsStoreOffsetWithTermVector(), field.GetOmitNorms(), false, field.GetOmitTf()); - } + System.Collections.Generic.IList fields = doc.GetFields(); + foreach(Fieldable field in fields) + { + Add(field.Name(), field.IsIndexed(), field.IsTermVectorStored(), + field.IsStorePositionWithTermVector(), field.IsStoreOffsetWithTermVector(), field.GetOmitNorms(), + false, field.GetOmitTermFreqAndPositions()); + } } } @@ -170,14 +170,13 @@ namespace Lucene.Net.Index /// /// true if offsets should be stored /// - public void AddIndexed(System.Collections.ICollection names, bool storeTermVectors, bool storePositionWithTermVector, bool storeOffsetWithTermVector) + public void AddIndexed(System.Collections.Generic.ICollection names, bool storeTermVectors, bool storePositionWithTermVector, bool storeOffsetWithTermVector) { lock (this) { - System.Collections.IEnumerator i = names.GetEnumerator(); - while (i.MoveNext()) + foreach(string name in names) { - Add((System.String) i.Current, true, storeTermVectors, storePositionWithTermVector, storeOffsetWithTermVector); + Add(name, true, storeTermVectors, storePositionWithTermVector, storeOffsetWithTermVector); } } } @@ -196,10 +195,9 @@ namespace Lucene.Net.Index { lock (this) { - System.Collections.IEnumerator i = names.GetEnumerator(); - while (i.MoveNext()) + foreach(string name in names) { - Add((System.String) i.Current, isIndexed); + Add(name, isIndexed); } } } @@ -345,7 +343,7 @@ namespace Lucene.Net.Index public FieldInfo FieldInfo(System.String fieldName) { - return (FieldInfo) byName[fieldName]; + return byName[fieldName]; } ///

Return the fieldName identified by its number. @@ -358,8 +356,8 @@ namespace Lucene.Net.Index /// public System.String FieldName(int fieldNumber) { - FieldInfo fi = FieldInfo(fieldNumber); - return (fi != null)?fi.name:""; + FieldInfo fi = FieldInfo(fieldNumber); + return (fi != null) ? fi.name : ""; } ///

Return the fieldinfo object referenced by the fieldNumber.

@@ -370,7 +368,7 @@ namespace Lucene.Net.Index /// public FieldInfo FieldInfo(int fieldNumber) { - return (fieldNumber >= 0)?(FieldInfo) byNumber[fieldNumber]:null; + return (fieldNumber >= 0) ? byNumber[fieldNumber] : null; } public int Size() Modified: incubator/lucene.net/trunk/src/core/Index/FieldSortedTermVectorMapper.cs URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Index/FieldSortedTermVectorMapper.cs?rev=1294875&r1=1294874&r2=1294875&view=diff ============================================================================== --- incubator/lucene.net/trunk/src/core/Index/FieldSortedTermVectorMapper.cs (original) +++ incubator/lucene.net/trunk/src/core/Index/FieldSortedTermVectorMapper.cs Tue Feb 28 22:43:08 2012 @@ -16,6 +16,8 @@ */ using System; +using System.Collections.Generic; +using Lucene.Net.Support; namespace Lucene.Net.Index { @@ -26,20 +28,22 @@ namespace Lucene.Net.Index ///

public class FieldSortedTermVectorMapper:TermVectorMapper { - private System.Collections.IDictionary fieldToTerms = new System.Collections.Hashtable(); - private System.Collections.Generic.SortedDictionary currentSet; + private IDictionary> fieldToTerms = new HashMap>(); + private SortedSet currentSet; private System.String currentField; - private System.Collections.Generic.IComparer