Refactored the highlight process so that callers can create a single token matcher and then apply it repeatedly. This allows the Highlighter to process all table cells/column names/etc. without re-parsing the query for each one.

The new object counts are:

Class name Instance count Difference
-------------------------------------------------------------------- -------------- ----------
java.util.LinkedList$Entry 26386 + 26241
char[] 80306 + 20806
java.lang.String 109591 + 19758
java.util.LinkedList$ListItr 13286 + 13286
java.util.LinkedList 12603 + 12600
int[] 8827 + 8159
java.lang.StringBuffer 6999 + 6971
Object[] 7724 + 5335
com.xrefer.lucene.entitytokenizer.Token 4651 + 4651
org.apache.lucene.analysis.Token 3322 + 3322
byte[] 2433 + 1802
java.util.regex.Pattern$Slice 1338 + 1338
java.util.regex.Pattern 1337 + 1337
java.util.regex.Matcher 1337 + 1337
java.util.regex.Pattern$BnM 1335 + 1335
java.nio.HeapCharBuffer 1138 + 1138
short[] 1838 + 1070
java.io.IOException 1049 + 1049

which looks better, but could still do with some improvement.

T
- posted by Tim Bruce @ 3:44 PM