Re: svn commit: r1666186 - in /lucene/dev/branches/branch_5x: ./ solr/ solr/core/ solr/core/src/java/org/apache/solr/parser/ solr/core/src/test/org/apache/solr/search/
That explains a lot. Thanks Mike! On 13 Mar 2015 00:46, Michael McCandless luc...@mikemccandless.com wrote: On Thu, Mar 12, 2015 at 5:38 PM, Yonik Seeley ysee...@gmail.com wrote: On Thu, Mar 12, 2015 at 8:04 PM, Ramkumar R. Aiyengar andyetitmo...@gmail.com wrote: This actually brings me to a question I have had for a while. Why do we check in auto generated code? Shouldn't the build system run javacc as a prereq to compiling instead? Historically, the compilation wasn't automated (you had to find + install JavaCC yourself, run it yourself, etc). I don't know the current reasons however. Some discussion about this here: https://issues.apache.org/jira/browse/LUCENE-4335 Mike McCandless http://blog.mikemccandless.com - To unsubscribe, e-mail: dev-unsubscr...@lucene.apache.org For additional commands, e-mail: dev-h...@lucene.apache.org
Re: svn commit: r1666186 - in /lucene/dev/branches/branch_5x: ./ solr/ solr/core/ solr/core/src/java/org/apache/solr/parser/ solr/core/src/test/org/apache/solr/search/
Hey Yonik,
I think you've inadvertently added a couple of deprecated methods back in here?
Modified:
lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/parser/CharStream.java
URL:
http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/parser/CharStream.java?rev=1666186r1=1666185r2=1666186view=diff
==
---
lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/parser/CharStream.java
(original)
+++
lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/parser/CharStream.java
Thu Mar 12 13:33:32 2015
@@ -27,6 +27,22 @@ interface CharStream {
*/
char readChar() throws java.io.IOException;
+ @Deprecated
+ /**
+ * Returns the column position of the character last read.
+ * @deprecated
+ * @see #getEndColumn
+ */
+ int getColumn();
+
+ @Deprecated
+ /**
+ * Returns the line number of the character last read.
+ * @deprecated
+ * @see #getEndLine
+ */
+ int getLine();
+
/**
* Returns the column number of the last character for current token (being
* matched after the last call to BeginTOken).
@@ -96,4 +112,4 @@ interface CharStream {
void Done();
}
-/* JavaCC - OriginalChecksum=a81c9280a3ec4578458c607a9d95acb4 (do not edit
this line) */
+/* JavaCC - OriginalChecksum=48b70e7c01825c8f301c7362bf1028d8 (do not edit
this line) */
Modified:
lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/parser/FastCharStream.java
URL:
http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/parser/FastCharStream.java?rev=1666186r1=1666185r2=1666186view=diff
==
---
lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/parser/FastCharStream.java
(original)
+++
lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/parser/FastCharStream.java
Thu Mar 12 13:33:32 2015
@@ -108,6 +108,15 @@ public final class FastCharStream implem
}
}
+ @Override
+ public final int getColumn() {
+return bufferStart + bufferPosition;
+ }
+ @Override
+ public final int getLine() {
+return 1;
+ }
+ @Override
public final int getEndColumn() {
return bufferStart + bufferPosition;
}
Modified:
lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/parser/ParseException.java
URL:
http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/parser/ParseException.java?rev=1666186r1=1666185r2=1666186view=diff
==
---
lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/parser/ParseException.java
(original)
+++
lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/parser/ParseException.java
Thu Mar 12 13:33:32 2015
@@ -184,4 +184,4 @@ public class ParseException extends Exce
}
}
-/* JavaCC - OriginalChecksum=d7aa203ee92ebbb23011a23311e60537 (do not edit
this line) */
+/* JavaCC - OriginalChecksum=25e1ae9ad9614c4ce31c4b83f8a7397b (do not edit
this line) */
Modified:
lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/parser/QueryParser.java
URL:
http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/parser/QueryParser.java?rev=1666186r1=1666185r2=1666186view=diff
==
---
lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/parser/QueryParser.java
(original)
+++
lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/parser/QueryParser.java
Thu Mar 12 13:33:32 2015
@@ -100,7 +100,7 @@ public class QueryParser extends SolrQue
}
final public Query Query(String field) throws ParseException, SyntaxError {
- ListBooleanClause clauses = new ArrayList();
+ ListBooleanClause clauses = new ArrayListBooleanClause();
Query q, firstQuery=null;
int conj, mods;
mods = Modifiers();
@@ -581,7 +581,7 @@ public class QueryParser extends SolrQue
return (jj_ntk = jj_nt.kind);
}
- private java.util.Listint[] jj_expentries = new java.util.ArrayList();
+ private java.util.Listint[] jj_expentries = new
java.util.ArrayListint[]();
private int[] jj_expentry;
private int jj_kind = -1;
private int[] jj_lasttokens = new int[100];
Modified:
lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/parser/QueryParser.jj
URL:
http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/parser/QueryParser.jj?rev=1666186r1=1666185r2=1666186view=diff
==
---
lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/parser/QueryParser.jj
Re: svn commit: r1666186 - in /lucene/dev/branches/branch_5x: ./ solr/ solr/core/ solr/core/src/java/org/apache/solr/parser/ solr/core/src/test/org/apache/solr/search/
Looks like the original removal of these deprecated methods happened in SOLR-6976, but probably should not have given that this is a generated file? -Yonik On Thu, Mar 12, 2015 at 11:19 AM, Yonik Seeley ysee...@gmail.com wrote: On Thu, Mar 12, 2015 at 11:08 AM, Alan Woodward a...@flax.co.uk wrote: Hey Yonik, I think you've inadvertently added a couple of deprecated methods back in here? Hmmm, but CharStream.java is generated by JavaCC... When I got a compile error in FastCharStream.java, I simply copied the lucene version. I built it using the following method: $ cd solr/core $ ant javacc -Yonik - To unsubscribe, e-mail: dev-unsubscr...@lucene.apache.org For additional commands, e-mail: dev-h...@lucene.apache.org
Re: svn commit: r1666186 - in /lucene/dev/branches/branch_5x: ./ solr/ solr/core/ solr/core/src/java/org/apache/solr/parser/ solr/core/src/test/org/apache/solr/search/
On Thu, Mar 12, 2015 at 11:08 AM, Alan Woodward a...@flax.co.uk wrote: Hey Yonik, I think you've inadvertently added a couple of deprecated methods back in here? Hmmm, but CharStream.java is generated by JavaCC... When I got a compile error in FastCharStream.java, I simply copied the lucene version. I built it using the following method: $ cd solr/core $ ant javacc -Yonik - To unsubscribe, e-mail: dev-unsubscr...@lucene.apache.org For additional commands, e-mail: dev-h...@lucene.apache.org
Re: svn commit: r1666186 - in /lucene/dev/branches/branch_5x: ./ solr/ solr/core/ solr/core/src/java/org/apache/solr/parser/ solr/core/src/test/org/apache/solr/search/
Ah, OK. Sorry for the noise! On 12 Mar 2015, at 15:19, Yonik Seeley wrote: On Thu, Mar 12, 2015 at 11:08 AM, Alan Woodward a...@flax.co.uk wrote: Hey Yonik, I think you've inadvertently added a couple of deprecated methods back in here? Hmmm, but CharStream.java is generated by JavaCC... When I got a compile error in FastCharStream.java, I simply copied the lucene version. I built it using the following method: $ cd solr/core $ ant javacc -Yonik - To unsubscribe, e-mail: dev-unsubscr...@lucene.apache.org For additional commands, e-mail: dev-h...@lucene.apache.org - To unsubscribe, e-mail: dev-unsubscr...@lucene.apache.org For additional commands, e-mail: dev-h...@lucene.apache.org
Re: svn commit: r1666186 - in /lucene/dev/branches/branch_5x: ./ solr/ solr/core/ solr/core/src/java/org/apache/solr/parser/ solr/core/src/test/org/apache/solr/search/
This actually brings me to a question I have had for a while. Why do we check in auto generated code? Shouldn't the build system run javacc as a prereq to compiling instead? On 12 Mar 2015 18:08, Alan Woodward a...@flax.co.uk wrote: Ah, OK. Sorry for the noise! On 12 Mar 2015, at 15:19, Yonik Seeley wrote: On Thu, Mar 12, 2015 at 11:08 AM, Alan Woodward a...@flax.co.uk wrote: Hey Yonik, I think you've inadvertently added a couple of deprecated methods back in here? Hmmm, but CharStream.java is generated by JavaCC... When I got a compile error in FastCharStream.java, I simply copied the lucene version. I built it using the following method: $ cd solr/core $ ant javacc -Yonik - To unsubscribe, e-mail: dev-unsubscr...@lucene.apache.org For additional commands, e-mail: dev-h...@lucene.apache.org - To unsubscribe, e-mail: dev-unsubscr...@lucene.apache.org For additional commands, e-mail: dev-h...@lucene.apache.org
Re: svn commit: r1666186 - in /lucene/dev/branches/branch_5x: ./ solr/ solr/core/ solr/core/src/java/org/apache/solr/parser/ solr/core/src/test/org/apache/solr/search/
On Thu, Mar 12, 2015 at 8:04 PM, Ramkumar R. Aiyengar andyetitmo...@gmail.com wrote: This actually brings me to a question I have had for a while. Why do we check in auto generated code? Shouldn't the build system run javacc as a prereq to compiling instead? Historically, the compilation wasn't automated (you had to find + install JavaCC yourself, run it yourself, etc). I don't know the current reasons however. -Yonik - To unsubscribe, e-mail: dev-unsubscr...@lucene.apache.org For additional commands, e-mail: dev-h...@lucene.apache.org
Re: svn commit: r1666186 - in /lucene/dev/branches/branch_5x: ./ solr/ solr/core/ solr/core/src/java/org/apache/solr/parser/ solr/core/src/test/org/apache/solr/search/
On Thu, Mar 12, 2015 at 5:38 PM, Yonik Seeley ysee...@gmail.com wrote: On Thu, Mar 12, 2015 at 8:04 PM, Ramkumar R. Aiyengar andyetitmo...@gmail.com wrote: This actually brings me to a question I have had for a while. Why do we check in auto generated code? Shouldn't the build system run javacc as a prereq to compiling instead? Historically, the compilation wasn't automated (you had to find + install JavaCC yourself, run it yourself, etc). I don't know the current reasons however. Some discussion about this here: https://issues.apache.org/jira/browse/LUCENE-4335 Mike McCandless http://blog.mikemccandless.com - To unsubscribe, e-mail: dev-unsubscr...@lucene.apache.org For additional commands, e-mail: dev-h...@lucene.apache.org
