Return-Path: X-Original-To: apmail-lucene-commits-archive@www.apache.org Delivered-To: apmail-lucene-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 24FE811AEC for ; Wed, 18 Jun 2014 16:57:24 +0000 (UTC) Received: (qmail 79293 invoked by uid 500); 18 Jun 2014 16:57:23 -0000 Mailing-List: contact commits-help@lucene.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@lucene.apache.org Delivered-To: mailing list commits@lucene.apache.org Received: (qmail 79284 invoked by uid 99); 18 Jun 2014 16:57:23 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 18 Jun 2014 16:57:23 +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; Wed, 18 Jun 2014 16:57:22 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 1346723888FE; Wed, 18 Jun 2014 16:57:02 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1603523 - in /lucene/dev/branches/branch_4x: ./ lucene/ lucene/suggest/ lucene/suggest/src/java/org/apache/lucene/search/suggest/jaspell/ Date: Wed, 18 Jun 2014 16:57:01 -0000 To: commits@lucene.apache.org From: mikemccand@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140618165702.1346723888FE@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: mikemccand Date: Wed Jun 18 16:57:01 2014 New Revision: 1603523 URL: http://svn.apache.org/r1603523 Log: LUCENE-5775: Deprecate JaspellLookup; fix its ramBytesUsed to not StackOverflow Modified: lucene/dev/branches/branch_4x/ (props changed) lucene/dev/branches/branch_4x/lucene/ (props changed) lucene/dev/branches/branch_4x/lucene/CHANGES.txt (contents, props changed) lucene/dev/branches/branch_4x/lucene/suggest/ (props changed) lucene/dev/branches/branch_4x/lucene/suggest/src/java/org/apache/lucene/search/suggest/jaspell/JaspellLookup.java lucene/dev/branches/branch_4x/lucene/suggest/src/java/org/apache/lucene/search/suggest/jaspell/JaspellTernarySearchTrie.java Modified: lucene/dev/branches/branch_4x/lucene/CHANGES.txt URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/CHANGES.txt?rev=1603523&r1=1603522&r2=1603523&view=diff ============================================================================== --- lucene/dev/branches/branch_4x/lucene/CHANGES.txt (original) +++ lucene/dev/branches/branch_4x/lucene/CHANGES.txt Wed Jun 18 16:57:01 2014 @@ -142,6 +142,8 @@ API Changes * LUCENE-5761: Removed DiskDocValuesFormat, it was very inefficient and saved very little RAM over the default codec. (Robert Muir) +* LUCENE-5775: Deprecate JaspellLookup. (Mike McCandless) + Optimizations * LUCENE-5603: hunspell stemmer more efficiently strips prefixes Modified: lucene/dev/branches/branch_4x/lucene/suggest/src/java/org/apache/lucene/search/suggest/jaspell/JaspellLookup.java URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/suggest/src/java/org/apache/lucene/search/suggest/jaspell/JaspellLookup.java?rev=1603523&r1=1603522&r2=1603523&view=diff ============================================================================== --- lucene/dev/branches/branch_4x/lucene/suggest/src/java/org/apache/lucene/search/suggest/jaspell/JaspellLookup.java (original) +++ lucene/dev/branches/branch_4x/lucene/suggest/src/java/org/apache/lucene/search/suggest/jaspell/JaspellLookup.java Wed Jun 18 16:57:01 2014 @@ -38,7 +38,9 @@ import org.apache.lucene.util.UnicodeUti * JaSpell. * * @see JaspellTernarySearchTrie + * @deprecated Migrate to one of the newer suggesters which are much more RAM efficient. */ +@Deprecated public class JaspellLookup extends Lookup implements Accountable { JaspellTernarySearchTrie trie = new JaspellTernarySearchTrie(); private boolean usePrefix = true; Modified: lucene/dev/branches/branch_4x/lucene/suggest/src/java/org/apache/lucene/search/suggest/jaspell/JaspellTernarySearchTrie.java URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/suggest/src/java/org/apache/lucene/search/suggest/jaspell/JaspellTernarySearchTrie.java?rev=1603523&r1=1603522&r2=1603523&view=diff ============================================================================== --- lucene/dev/branches/branch_4x/lucene/suggest/src/java/org/apache/lucene/search/suggest/jaspell/JaspellTernarySearchTrie.java (original) +++ lucene/dev/branches/branch_4x/lucene/suggest/src/java/org/apache/lucene/search/suggest/jaspell/JaspellTernarySearchTrie.java Wed Jun 18 16:57:01 2014 @@ -62,7 +62,10 @@ import org.apache.lucene.util.RamUsageEs * Algorithms, January 1997). Algorithms in C, Third Edition, by Robert * Sedgewick (Addison-Wesley, 1998) provides yet another view of ternary search * trees. + * + * @deprecated Migrate to one of the newer suggesters which are much more RAM efficient. */ +@Deprecated public class JaspellTernarySearchTrie implements Accountable { /** @@ -98,7 +101,9 @@ public class JaspellTernarySearchTrie im @Override public long ramBytesUsed() { long mem = RamUsageEstimator.shallowSizeOf(this) + RamUsageEstimator.shallowSizeOf(relatives); - for (TSTNode node : relatives) { + // We don't need to add parent since our parent added itself: + for (int i=1;i<4;i++) { + TSTNode node = relatives[i]; if (node != null) { mem += node.ramBytesUsed(); }