You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@lucene.apache.org by "Uwe Schindler (JIRA)" <ji...@apache.org> on 2010/04/06 13:25:33 UTC
[jira] Created: (LUCENE-2370) Reintegrate flex branch into trunk
Reintegrate flex branch into trunk
----------------------------------
Key: LUCENE-2370
URL: https://issues.apache.org/jira/browse/LUCENE-2370
Project: Lucene - Java
Issue Type: Task
Affects Versions: Flex Branch
Reporter: Uwe Schindler
Assignee: Uwe Schindler
Fix For: 3.1
This issue is for reintegrating the flex branch into current trunk. I will post the patch here for review and commit, when all contributors to flex have reviewed the patch.
Before committing, I will tag both trunk and flex.
--
This message is automatically generated by JIRA.
-
You can reply to this email to add a comment to the issue online.
---------------------------------------------------------------------
To unsubscribe, e-mail: java-dev-unsubscribe@lucene.apache.org
For additional commands, e-mail: java-dev-help@lucene.apache.org
[jira] Resolved: (LUCENE-2370) Reintegrate flex branch into trunk
Posted by "Uwe Schindler (JIRA)" <ji...@apache.org>.
[ https://issues.apache.org/jira/browse/LUCENE-2370?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ]
Uwe Schindler resolved LUCENE-2370.
-----------------------------------
Resolution: Fixed
Mike fixed the missing merges! Thanks.
> Reintegrate flex branch into trunk
> ----------------------------------
>
> Key: LUCENE-2370
> URL: https://issues.apache.org/jira/browse/LUCENE-2370
> Project: Lucene - Java
> Issue Type: Task
> Affects Versions: Flex Branch
> Reporter: Uwe Schindler
> Assignee: Uwe Schindler
> Fix For: 3.1
>
> Attachments: LUCENE-2370-solrfixes.patch, LUCENE-2370.patch, LUCENE-2370.patch, LUCENE-2370.patch, LUCENE-2370.patch
>
>
> This issue is for reintegrating the flex branch into current trunk. I will post the patch here for review and commit, when all contributors to flex have reviewed the patch.
> Before committing, I will tag both trunk and flex.
--
This message is automatically generated by JIRA.
-
You can reply to this email to add a comment to the issue online.
---------------------------------------------------------------------
To unsubscribe, e-mail: java-dev-unsubscribe@lucene.apache.org
For additional commands, e-mail: java-dev-help@lucene.apache.org
[jira] Updated: (LUCENE-2370) Reintegrate flex branch into trunk
Posted by "Uwe Schindler (JIRA)" <ji...@apache.org>.
[ https://issues.apache.org/jira/browse/LUCENE-2370?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ]
Uwe Schindler updated LUCENE-2370:
----------------------------------
Attachment: LUCENE-2370.patch
New patch, reverted all files with whitespace-only changes.
> Reintegrate flex branch into trunk
> ----------------------------------
>
> Key: LUCENE-2370
> URL: https://issues.apache.org/jira/browse/LUCENE-2370
> Project: Lucene - Java
> Issue Type: Task
> Affects Versions: Flex Branch
> Reporter: Uwe Schindler
> Assignee: Uwe Schindler
> Fix For: 3.1
>
> Attachments: LUCENE-2370-solrfixes.patch, LUCENE-2370.patch, LUCENE-2370.patch, LUCENE-2370.patch
>
>
> This issue is for reintegrating the flex branch into current trunk. I will post the patch here for review and commit, when all contributors to flex have reviewed the patch.
> Before committing, I will tag both trunk and flex.
--
This message is automatically generated by JIRA.
-
You can reply to this email to add a comment to the issue online.
---------------------------------------------------------------------
To unsubscribe, e-mail: java-dev-unsubscribe@lucene.apache.org
For additional commands, e-mail: java-dev-help@lucene.apache.org
[jira] Updated: (LUCENE-2370) Reintegrate flex branch into trunk
Posted by "Uwe Schindler (JIRA)" <ji...@apache.org>.
[ https://issues.apache.org/jira/browse/LUCENE-2370?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ]
Uwe Schindler updated LUCENE-2370:
----------------------------------
Attachment: LUCENE-2370.patch
sorry, new patch.
The flex branch still contains some whitespace problems in contrib, but this is ok for now. I will check them and fix as far as i see.
> Reintegrate flex branch into trunk
> ----------------------------------
>
> Key: LUCENE-2370
> URL: https://issues.apache.org/jira/browse/LUCENE-2370
> Project: Lucene - Java
> Issue Type: Task
> Affects Versions: Flex Branch
> Reporter: Uwe Schindler
> Assignee: Uwe Schindler
> Fix For: 3.1
>
> Attachments: LUCENE-2370.patch
>
>
> This issue is for reintegrating the flex branch into current trunk. I will post the patch here for review and commit, when all contributors to flex have reviewed the patch.
> Before committing, I will tag both trunk and flex.
--
This message is automatically generated by JIRA.
-
You can reply to this email to add a comment to the issue online.
---------------------------------------------------------------------
To unsubscribe, e-mail: java-dev-unsubscribe@lucene.apache.org
For additional commands, e-mail: java-dev-help@lucene.apache.org
[jira] Updated: (LUCENE-2370) Reintegrate flex branch into trunk
Posted by "Uwe Schindler (JIRA)" <ji...@apache.org>.
[ https://issues.apache.org/jira/browse/LUCENE-2370?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ]
Uwe Schindler updated LUCENE-2370:
----------------------------------
Attachment: LUCENE-2370-solrfixes.patch
Here some fixes for Solr:
- makes it compile after flex merge
- has some really dirty hacks. Numeric field contents should no longer be seen as Strings, they are now BytesRefs. This affects AnalysisRequestHandler and also the converter methods in TrieField type. They should use BytesRefs after flex has landed.
> Reintegrate flex branch into trunk
> ----------------------------------
>
> Key: LUCENE-2370
> URL: https://issues.apache.org/jira/browse/LUCENE-2370
> Project: Lucene - Java
> Issue Type: Task
> Affects Versions: Flex Branch
> Reporter: Uwe Schindler
> Assignee: Uwe Schindler
> Fix For: 3.1
>
> Attachments: LUCENE-2370-solrfixes.patch, LUCENE-2370.patch, LUCENE-2370.patch
>
>
> This issue is for reintegrating the flex branch into current trunk. I will post the patch here for review and commit, when all contributors to flex have reviewed the patch.
> Before committing, I will tag both trunk and flex.
--
This message is automatically generated by JIRA.
-
You can reply to this email to add a comment to the issue online.
---------------------------------------------------------------------
To unsubscribe, e-mail: java-dev-unsubscribe@lucene.apache.org
For additional commands, e-mail: java-dev-help@lucene.apache.org
[jira] Updated: (LUCENE-2370) Reintegrate flex branch into trunk
Posted by "Uwe Schindler (JIRA)" <ji...@apache.org>.
[ https://issues.apache.org/jira/browse/LUCENE-2370?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ]
Uwe Schindler updated LUCENE-2370:
----------------------------------
Attachment: LUCENE-2370.patch
Here the patch just for review!
You cannot really apply it as it does not contains changes that are simply svn copied from flex (that are all new files added by flex). The idea behind this patch is only that everybody working on flex should scroll through it and verify that actually changed files are fine; e.g. we did not miss a change to trunk in flex (such a missing merge would apply as a "revert" in the patch).
My working copy tests fine, only solr is not compiling anymore because of recent changes in NumericUtils internal class that are non backwards compatible. I will commit this patch before and break solr, but will fix it soon!
> Reintegrate flex branch into trunk
> ----------------------------------
>
> Key: LUCENE-2370
> URL: https://issues.apache.org/jira/browse/LUCENE-2370
> Project: Lucene - Java
> Issue Type: Task
> Affects Versions: Flex Branch
> Reporter: Uwe Schindler
> Assignee: Uwe Schindler
> Fix For: 3.1
>
> Attachments: LUCENE-2370.patch
>
>
> This issue is for reintegrating the flex branch into current trunk. I will post the patch here for review and commit, when all contributors to flex have reviewed the patch.
> Before committing, I will tag both trunk and flex.
--
This message is automatically generated by JIRA.
-
You can reply to this email to add a comment to the issue online.
---------------------------------------------------------------------
To unsubscribe, e-mail: java-dev-unsubscribe@lucene.apache.org
For additional commands, e-mail: java-dev-help@lucene.apache.org
[jira] Updated: (LUCENE-2370) Reintegrate flex branch into trunk
Posted by "Uwe Schindler (JIRA)" <ji...@apache.org>.
[ https://issues.apache.org/jira/browse/LUCENE-2370?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ]
Uwe Schindler updated LUCENE-2370:
----------------------------------
Attachment: LUCENE-2370.patch
Here the final patch after cooperative reviewing in IRC. I will commit the merge now for Solr+Lucene.
The following points are still broken:
- DirectoryReader readded a bug (Mike McCandless knows)
- TestIndexWriterReader in trunk and backwards has some test commented out, they have to do with above problem
> Reintegrate flex branch into trunk
> ----------------------------------
>
> Key: LUCENE-2370
> URL: https://issues.apache.org/jira/browse/LUCENE-2370
> Project: Lucene - Java
> Issue Type: Task
> Affects Versions: Flex Branch
> Reporter: Uwe Schindler
> Assignee: Uwe Schindler
> Fix For: 3.1
>
> Attachments: LUCENE-2370-solrfixes.patch, LUCENE-2370.patch, LUCENE-2370.patch, LUCENE-2370.patch, LUCENE-2370.patch
>
>
> This issue is for reintegrating the flex branch into current trunk. I will post the patch here for review and commit, when all contributors to flex have reviewed the patch.
> Before committing, I will tag both trunk and flex.
--
This message is automatically generated by JIRA.
-
You can reply to this email to add a comment to the issue online.
---------------------------------------------------------------------
To unsubscribe, e-mail: java-dev-unsubscribe@lucene.apache.org
For additional commands, e-mail: java-dev-help@lucene.apache.org
[jira] Commented: (LUCENE-2370) Reintegrate flex branch into trunk
Posted by "Michael McCandless (JIRA)" <ji...@apache.org>.
[ https://issues.apache.org/jira/browse/LUCENE-2370?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=12854112#action_12854112 ]
Michael McCandless commented on LUCENE-2370:
--------------------------------------------
The bug is LUCENE-1976 -- after flex is landed (thanks Uwe!!) I'll fix the bug again.
> Reintegrate flex branch into trunk
> ----------------------------------
>
> Key: LUCENE-2370
> URL: https://issues.apache.org/jira/browse/LUCENE-2370
> Project: Lucene - Java
> Issue Type: Task
> Affects Versions: Flex Branch
> Reporter: Uwe Schindler
> Assignee: Uwe Schindler
> Fix For: 3.1
>
> Attachments: LUCENE-2370-solrfixes.patch, LUCENE-2370.patch, LUCENE-2370.patch, LUCENE-2370.patch, LUCENE-2370.patch
>
>
> This issue is for reintegrating the flex branch into current trunk. I will post the patch here for review and commit, when all contributors to flex have reviewed the patch.
> Before committing, I will tag both trunk and flex.
--
This message is automatically generated by JIRA.
-
You can reply to this email to add a comment to the issue online.
---------------------------------------------------------------------
To unsubscribe, e-mail: java-dev-unsubscribe@lucene.apache.org
For additional commands, e-mail: java-dev-help@lucene.apache.org
[jira] Commented: (LUCENE-2370) Reintegrate flex branch into trunk
Posted by "Robert Muir (JIRA)" <ji...@apache.org>.
[ https://issues.apache.org/jira/browse/LUCENE-2370?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=12853918#action_12853918 ]
Robert Muir commented on LUCENE-2370:
-------------------------------------
bq. we did not miss a change to trunk in flex (such a missing merge would apply as a "revert" in the patch).
* BUILD.txt
* common-build.xml
* contrib/benchmark/CHANGES.txt
> Reintegrate flex branch into trunk
> ----------------------------------
>
> Key: LUCENE-2370
> URL: https://issues.apache.org/jira/browse/LUCENE-2370
> Project: Lucene - Java
> Issue Type: Task
> Affects Versions: Flex Branch
> Reporter: Uwe Schindler
> Assignee: Uwe Schindler
> Fix For: 3.1
>
> Attachments: LUCENE-2370.patch
>
>
> This issue is for reintegrating the flex branch into current trunk. I will post the patch here for review and commit, when all contributors to flex have reviewed the patch.
> Before committing, I will tag both trunk and flex.
--
This message is automatically generated by JIRA.
-
You can reply to this email to add a comment to the issue online.
---------------------------------------------------------------------
To unsubscribe, e-mail: java-dev-unsubscribe@lucene.apache.org
For additional commands, e-mail: java-dev-help@lucene.apache.org
[jira] Commented: (LUCENE-2370) Reintegrate flex branch into trunk
Posted by "Uwe Schindler (JIRA)" <ji...@apache.org>.
[ https://issues.apache.org/jira/browse/LUCENE-2370?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=12854134#action_12854134 ]
Uwe Schindler commented on LUCENE-2370:
---------------------------------------
Committed revision: 931278
I leave the issue open until the bugs are fixed.
> Reintegrate flex branch into trunk
> ----------------------------------
>
> Key: LUCENE-2370
> URL: https://issues.apache.org/jira/browse/LUCENE-2370
> Project: Lucene - Java
> Issue Type: Task
> Affects Versions: Flex Branch
> Reporter: Uwe Schindler
> Assignee: Uwe Schindler
> Fix For: 3.1
>
> Attachments: LUCENE-2370-solrfixes.patch, LUCENE-2370.patch, LUCENE-2370.patch, LUCENE-2370.patch, LUCENE-2370.patch
>
>
> This issue is for reintegrating the flex branch into current trunk. I will post the patch here for review and commit, when all contributors to flex have reviewed the patch.
> Before committing, I will tag both trunk and flex.
--
This message is automatically generated by JIRA.
-
You can reply to this email to add a comment to the issue online.
---------------------------------------------------------------------
To unsubscribe, e-mail: java-dev-unsubscribe@lucene.apache.org
For additional commands, e-mail: java-dev-help@lucene.apache.org
[jira] Updated: (LUCENE-2370) Reintegrate flex branch into trunk
Posted by "Uwe Schindler (JIRA)" <ji...@apache.org>.
[ https://issues.apache.org/jira/browse/LUCENE-2370?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ]
Uwe Schindler updated LUCENE-2370:
----------------------------------
Attachment: (was: LUCENE-2370.patch)
> Reintegrate flex branch into trunk
> ----------------------------------
>
> Key: LUCENE-2370
> URL: https://issues.apache.org/jira/browse/LUCENE-2370
> Project: Lucene - Java
> Issue Type: Task
> Affects Versions: Flex Branch
> Reporter: Uwe Schindler
> Assignee: Uwe Schindler
> Fix For: 3.1
>
>
> This issue is for reintegrating the flex branch into current trunk. I will post the patch here for review and commit, when all contributors to flex have reviewed the patch.
> Before committing, I will tag both trunk and flex.
--
This message is automatically generated by JIRA.
-
You can reply to this email to add a comment to the issue online.
---------------------------------------------------------------------
To unsubscribe, e-mail: java-dev-unsubscribe@lucene.apache.org
For additional commands, e-mail: java-dev-help@lucene.apache.org
[jira] Updated: (LUCENE-2370) Reintegrate flex branch into trunk
Posted by "Uwe Schindler (JIRA)" <ji...@apache.org>.
[ https://issues.apache.org/jira/browse/LUCENE-2370?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ]
Uwe Schindler updated LUCENE-2370:
----------------------------------
Attachment: LUCENE-2370.patch
Here a new patch with lots of cleanups, thanks rmuir. Also reverted whitespace-only files
> Reintegrate flex branch into trunk
> ----------------------------------
>
> Key: LUCENE-2370
> URL: https://issues.apache.org/jira/browse/LUCENE-2370
> Project: Lucene - Java
> Issue Type: Task
> Affects Versions: Flex Branch
> Reporter: Uwe Schindler
> Assignee: Uwe Schindler
> Fix For: 3.1
>
> Attachments: LUCENE-2370.patch, LUCENE-2370.patch
>
>
> This issue is for reintegrating the flex branch into current trunk. I will post the patch here for review and commit, when all contributors to flex have reviewed the patch.
> Before committing, I will tag both trunk and flex.
--
This message is automatically generated by JIRA.
-
You can reply to this email to add a comment to the issue online.
---------------------------------------------------------------------
To unsubscribe, e-mail: java-dev-unsubscribe@lucene.apache.org
For additional commands, e-mail: java-dev-help@lucene.apache.org