You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by mi...@apache.org on 2013/07/23 22:23:50 UTC
svn commit: r1506258 - in /lucene/dev/branches/lucene4335/lucene:
analysis/common/src/java/org/apache/lucene/analysis/charfilter/
analysis/common/src/java/org/apache/lucene/analysis/standard/
analysis/common/src/java/org/apache/lucene/analysis/wikipedi...
Author: mikemccand
Date: Tue Jul 23 20:23:49 2013
New Revision: 1506258
URL: http://svn.apache.org/r1506258
Log:
LUCENE-4335: fix generators to match recent code changes to the gen'd files
Modified:
lucene/dev/branches/lucene4335/lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/HTMLStripCharFilter.java
lucene/dev/branches/lucene4335/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/ClassicTokenizerImpl.java
lucene/dev/branches/lucene4335/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/StandardTokenizerImpl.java
lucene/dev/branches/lucene4335/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/UAX29URLEmailTokenizerImpl.java
lucene/dev/branches/lucene4335/lucene/analysis/common/src/java/org/apache/lucene/analysis/wikipedia/WikipediaTokenizerImpl.java
lucene/dev/branches/lucene4335/lucene/core/src/java/org/apache/lucene/util/packed/Packed64SingleBlock.java
lucene/dev/branches/lucene4335/lucene/core/src/java/org/apache/lucene/util/packed/gen_Direct.py
lucene/dev/branches/lucene4335/lucene/core/src/java/org/apache/lucene/util/packed/gen_Packed64SingleBlock.py
Modified: lucene/dev/branches/lucene4335/lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/HTMLStripCharFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4335/lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/HTMLStripCharFilter.java?rev=1506258&r1=1506257&r2=1506258&view=diff
==============================================================================
--- lucene/dev/branches/lucene4335/lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/HTMLStripCharFilter.java (original)
+++ lucene/dev/branches/lucene4335/lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/HTMLStripCharFilter.java Tue Jul 23 20:23:49 2013
@@ -1,4 +1,4 @@
-/* The following code was generated by JFlex 1.5.0-SNAPSHOT on 7/23/13 3:28 PM */
+/* The following code was generated by JFlex 1.5.0-SNAPSHOT on 7/23/13 4:03 PM */
package org.apache.lucene.analysis.charfilter;
@@ -40,8 +40,8 @@ import org.apache.lucene.analysis.util.O
/**
* This class is a scanner generated by
* <a href="http://www.jflex.de/">JFlex</a> 1.5.0-SNAPSHOT
- * on 7/23/13 3:28 PM from the specification file
- * <tt>/l/trunk/lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/HTMLStripCharFilter.jflex</tt>
+ * on 7/23/13 4:03 PM from the specification file
+ * <tt>/l/regenerate.4335/lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/HTMLStripCharFilter.jflex</tt>
*/
public final class HTMLStripCharFilter extends BaseCharFilter {
Modified: lucene/dev/branches/lucene4335/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/ClassicTokenizerImpl.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4335/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/ClassicTokenizerImpl.java?rev=1506258&r1=1506257&r2=1506258&view=diff
==============================================================================
--- lucene/dev/branches/lucene4335/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/ClassicTokenizerImpl.java (original)
+++ lucene/dev/branches/lucene4335/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/ClassicTokenizerImpl.java Tue Jul 23 20:23:49 2013
@@ -1,4 +1,4 @@
-/* The following code was generated by JFlex 1.5.0-SNAPSHOT on 7/23/13 3:28 PM */
+/* The following code was generated by JFlex 1.5.0-SNAPSHOT on 7/23/13 4:02 PM */
package org.apache.lucene.analysis.standard;
@@ -33,8 +33,8 @@ import org.apache.lucene.analysis.tokena
/**
* This class is a scanner generated by
* <a href="http://www.jflex.de/">JFlex</a> 1.5.0-SNAPSHOT
- * on 7/23/13 3:28 PM from the specification file
- * <tt>/l/trunk/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/ClassicTokenizerImpl.jflex</tt>
+ * on 7/23/13 4:02 PM from the specification file
+ * <tt>/l/regenerate.4335/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/ClassicTokenizerImpl.jflex</tt>
*/
class ClassicTokenizerImpl implements StandardTokenizerInterface {
Modified: lucene/dev/branches/lucene4335/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/StandardTokenizerImpl.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4335/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/StandardTokenizerImpl.java?rev=1506258&r1=1506257&r2=1506258&view=diff
==============================================================================
--- lucene/dev/branches/lucene4335/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/StandardTokenizerImpl.java (original)
+++ lucene/dev/branches/lucene4335/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/StandardTokenizerImpl.java Tue Jul 23 20:23:49 2013
@@ -1,4 +1,4 @@
-/* The following code was generated by JFlex 1.5.0-SNAPSHOT on 7/23/13 3:28 PM */
+/* The following code was generated by JFlex 1.5.0-SNAPSHOT on 7/23/13 4:02 PM */
package org.apache.lucene.analysis.standard;
Modified: lucene/dev/branches/lucene4335/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/UAX29URLEmailTokenizerImpl.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4335/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/UAX29URLEmailTokenizerImpl.java?rev=1506258&r1=1506257&r2=1506258&view=diff
==============================================================================
--- lucene/dev/branches/lucene4335/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/UAX29URLEmailTokenizerImpl.java (original)
+++ lucene/dev/branches/lucene4335/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/UAX29URLEmailTokenizerImpl.java Tue Jul 23 20:23:49 2013
@@ -1,4 +1,4 @@
-/* The following code was generated by JFlex 1.5.0-SNAPSHOT on 7/23/13 3:28 PM */
+/* The following code was generated by JFlex 1.5.0-SNAPSHOT on 7/23/13 4:02 PM */
package org.apache.lucene.analysis.standard;
Modified: lucene/dev/branches/lucene4335/lucene/analysis/common/src/java/org/apache/lucene/analysis/wikipedia/WikipediaTokenizerImpl.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4335/lucene/analysis/common/src/java/org/apache/lucene/analysis/wikipedia/WikipediaTokenizerImpl.java?rev=1506258&r1=1506257&r2=1506258&view=diff
==============================================================================
--- lucene/dev/branches/lucene4335/lucene/analysis/common/src/java/org/apache/lucene/analysis/wikipedia/WikipediaTokenizerImpl.java (original)
+++ lucene/dev/branches/lucene4335/lucene/analysis/common/src/java/org/apache/lucene/analysis/wikipedia/WikipediaTokenizerImpl.java Tue Jul 23 20:23:49 2013
@@ -1,4 +1,4 @@
-/* The following code was generated by JFlex 1.5.0-SNAPSHOT on 7/23/13 3:28 PM */
+/* The following code was generated by JFlex 1.5.0-SNAPSHOT on 7/23/13 4:02 PM */
package org.apache.lucene.analysis.wikipedia;
@@ -25,8 +25,8 @@ import org.apache.lucene.analysis.tokena
/**
* This class is a scanner generated by
* <a href="http://www.jflex.de/">JFlex</a> 1.5.0-SNAPSHOT
- * on 7/23/13 3:28 PM from the specification file
- * <tt>/l/trunk/lucene/analysis/common/src/java/org/apache/lucene/analysis/wikipedia/WikipediaTokenizerImpl.jflex</tt>
+ * on 7/23/13 4:02 PM from the specification file
+ * <tt>/l/regenerate.4335/lucene/analysis/common/src/java/org/apache/lucene/analysis/wikipedia/WikipediaTokenizerImpl.jflex</tt>
*/
class WikipediaTokenizerImpl {
Modified: lucene/dev/branches/lucene4335/lucene/core/src/java/org/apache/lucene/util/packed/Packed64SingleBlock.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4335/lucene/core/src/java/org/apache/lucene/util/packed/Packed64SingleBlock.java?rev=1506258&r1=1506257&r2=1506258&view=diff
==============================================================================
--- lucene/dev/branches/lucene4335/lucene/core/src/java/org/apache/lucene/util/packed/Packed64SingleBlock.java (original)
+++ lucene/dev/branches/lucene4335/lucene/core/src/java/org/apache/lucene/util/packed/Packed64SingleBlock.java Tue Jul 23 20:23:49 2013
@@ -586,4 +586,4 @@ abstract class Packed64SingleBlock exten
}
-}
\ No newline at end of file
+}
Modified: lucene/dev/branches/lucene4335/lucene/core/src/java/org/apache/lucene/util/packed/gen_Direct.py
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4335/lucene/core/src/java/org/apache/lucene/util/packed/gen_Direct.py?rev=1506258&r1=1506257&r2=1506258&view=diff
==============================================================================
--- lucene/dev/branches/lucene4335/lucene/core/src/java/org/apache/lucene/util/packed/gen_Direct.py (original)
+++ lucene/dev/branches/lucene4335/lucene/core/src/java/org/apache/lucene/util/packed/gen_Direct.py Tue Jul 23 20:23:49 2013
@@ -87,6 +87,7 @@ if __name__ == '__main__':
return values[index]%s;
}
+ @Override
public void set(final int index, final long value) {
values[index] = %s(value);
}
@@ -100,6 +101,7 @@ if __name__ == '__main__':
+ RamUsageEstimator.sizeOf(values);
}
+ @Override
public void clear() {
Arrays.fill(values, %s0L);
}
@@ -128,6 +130,7 @@ if __name__ == '__main__':
return gets;
}
+ @Override
public int set(int index, long[] arr, int off, int len) {
assert len > 0 : "len must be > 0 (got " + len + ")";
assert index >= 0 && index < valueCount;
@@ -158,6 +161,7 @@ if __name__ == '__main__':
return gets;
}
+ @Override
public int set(int index, long[] arr, int off, int len) {
assert len > 0 : "len must be > 0 (got " + len + ")";
assert index >= 0 && index < valueCount;
Modified: lucene/dev/branches/lucene4335/lucene/core/src/java/org/apache/lucene/util/packed/gen_Packed64SingleBlock.py
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4335/lucene/core/src/java/org/apache/lucene/util/packed/gen_Packed64SingleBlock.py?rev=1506258&r1=1506257&r2=1506258&view=diff
==============================================================================
--- lucene/dev/branches/lucene4335/lucene/core/src/java/org/apache/lucene/util/packed/gen_Packed64SingleBlock.py (original)
+++ lucene/dev/branches/lucene4335/lucene/core/src/java/org/apache/lucene/util/packed/gen_Packed64SingleBlock.py Tue Jul 23 20:23:49 2013
@@ -77,8 +77,13 @@ abstract class Packed64SingleBlock exten
Arrays.fill(blocks, 0L);
}
+ @Override
public long ramBytesUsed() {
- return RamUsageEstimator.sizeOf(blocks);
+ return RamUsageEstimator.alignObjectSize(
+ RamUsageEstimator.NUM_BYTES_OBJECT_HEADER
+ + 2 * RamUsageEstimator.NUM_BYTES_INT // valueCount,bitsPerValue
+ + RamUsageEstimator.NUM_BYTES_OBJECT_REF) // blocks ref
+ + RamUsageEstimator.sizeOf(blocks);
}
@Override
@@ -106,8 +111,8 @@ abstract class Packed64SingleBlock exten
// bulk get
assert index %% valuesPerBlock == 0;
final PackedInts.Decoder decoder = BulkOperation.of(PackedInts.Format.PACKED_SINGLE_BLOCK, bitsPerValue);
- assert decoder.blockCount() == 1;
- assert decoder.valueCount() == valuesPerBlock;
+ assert decoder.longBlockCount() == 1;
+ assert decoder.longValueCount() == valuesPerBlock;
final int blockIndex = index / valuesPerBlock;
final int nblocks = (index + len) / valuesPerBlock - blockIndex;
decoder.decode(blocks, blockIndex, arr, off, nblocks);
@@ -150,8 +155,8 @@ abstract class Packed64SingleBlock exten
// bulk set
assert index %% valuesPerBlock == 0;
final BulkOperation op = BulkOperation.of(PackedInts.Format.PACKED_SINGLE_BLOCK, bitsPerValue);
- assert op.blockCount() == 1;
- assert op.valueCount() == valuesPerBlock;
+ assert op.longBlockCount() == 1;
+ assert op.longValueCount() == valuesPerBlock;
final int blockIndex = index / valuesPerBlock;
final int nblocks = (index + len) / valuesPerBlock - blockIndex;
op.encode(arr, off, blocks, blockIndex, nblocks);