GitHub user PaulElschot opened a pull request: https://github.com/apache/lucene-solr/pull/24
Lucene 5092 pull 1 DocBlocksIterator extends DocIdSetIterator. FixedBitSetDBI and EliasFanoDocIdSet implement DocBlocksIterator. The join module ToParent/ToChild queries use DocBlocksIterator instead of FixedBitSet. You can merge this pull request into a Git repository by running: $ git pull https://github.com/PaulElschot/lucene-solr LUCENE-5092-pull-1 Alternatively you can review and apply these changes as the patch at: https://github.com/apache/lucene-solr/pull/24.patch ---- commit 0b4c85b1b30426f34f65a03c32bb2618e1d03f99 Author: Paul Elschot <paul.j.elsc...@gmail.com> Date: 2014-01-19T19:31:14Z Ignore *.*~ and *.jar files commit 9a3c80013219b986340cd5a470fb30d20d35504a Author: Paul Elschot <paul.j.elsc...@gmail.com> Date: 2014-01-19T20:35:54Z Add first version of DocBlockIterator commit 77341eed771facde8cf89bc85c99fe0ccd6bd257 Author: Paul Elschot <paul.j.elsc...@gmail.com> Date: 2014-01-19T20:53:00Z OpenBitSetIterator extends DocBlockIterator, advanceToJustBefore() not yet implemented. commit d920b8e6f2fbf39da42a5eff19301c4ca92647c6 Author: Paul Elschot <paul.j.elsc...@gmail.com> Date: 2014-01-19T21:46:48Z Initial implementation of OpenBitSetIterator.advanceToJustBefore() commit ebff7763d31518989882909da56e0b9be22a4f89 Author: Paul Elschot <paul.j.elsc...@gmail.com> Date: 2014-01-19T21:57:38Z The OpenBitSetIterator constructor not using an OpenBitSet can not easily be deleted commit 4166b0e4fa44b10f7c25158a811ff8593d540957 Author: Paul Elschot <paul.j.elsc...@gmail.com> Date: 2014-01-19T22:16:30Z More detailed plan commit 807f98db323ee78454d6bb7d76a9d40d89e8126b Author: Paul Elschot <paul.j.elsc...@gmail.com> Date: 2014-01-20T19:11:17Z Rename to DocBlocksIterator commit 7ea28b0443e62d4e02458943a06cd97a9c8ad843 Author: Paul Elschot <paul.j.elsc...@gmail.com> Date: 2014-01-20T19:17:09Z Rename to class DocBlocksIterator commit 42e4bbc18769f7f91a6dfd730cc5d7d51582cb6c Author: Paul Elschot <paul.j.elsc...@gmail.com> Date: 2014-01-20T19:52:21Z Adapted ToParentBlockJoinQuery to use DocBlocksIterator directly from FBS, tests pass commit 3d7819bc9e3b8754e6f882e60a0920800ba09954 Author: Paul Elschot <paul.j.elsc...@gmail.com> Date: 2014-01-20T21:19:53Z Remove some commented code commit 4b2a7a4a529810dbf742958463c3f9327444f3b1 Author: Paul Elschot <paul.j.elsc...@gmail.com> Date: 2014-01-20T22:26:27Z Getting closer with ToChildBJQ commit 24032392ede9b8b2997152f4f6aec3af03a6e550 Author: Paul Elschot <paul.j.elsc...@gmail.com> Date: 2014-01-21T15:16:21Z Merge branch 'trunk' into docblocksiter commit 8fde265979ba8913045a3f9cd87a15482739cc43 Author: Paul Elschot <paul.j.elsc...@gmail.com> Date: 2014-01-21T16:49:48Z Always set OpenBitSet attribute in OpenBitSetIterator commit b7627dd4f41aff421af6d9a0781fcc13fe668995 Author: Paul Elschot <paul.j.elsc...@gmail.com> Date: 2014-01-21T16:51:06Z Added a test for advanceToJustBefore in BaseDocIdSetTestCase, TestFixedBitSet fails commit f1966ae5b4f375c7451ff083288e409a0b41b9ef Author: Paul Elschot <paul.j.elsc...@gmail.com> Date: 2014-01-21T21:14:11Z Previous test seed passes, next one fails commit c198cd8b6b06187c65477f088dad918974721099 Author: Paul Elschot <paul.j.elsc...@gmail.com> Date: 2014-01-22T23:49:52Z Added OpenBitSetDocBlocksIterator commit c29094ceba3bec8773e51c17fe3c80abab5ae526 Author: Paul Elschot <paul.j.elsc...@gmail.com> Date: 2014-01-22T23:53:00Z Merge branch 'trunk' of https://github.com/apache/lucene-solr into docblocksiter commit 7f7d8901bb396b82a0e874ca1f3c4264806fcd8e Author: Paul Elschot <paul.j.elsc...@gmail.com> Date: 2014-01-23T20:37:49Z Improve ignoring lib directories commit e8abc6f30060ac10de886b6fcc225d561e4758b5 Author: Paul Elschot <paul.j.elsc...@gmail.com> Date: 2014-01-23T21:20:13Z Added FixedBitSetDBI, tests pass. FixedBitSet.java from trunk, made some private things protected. commit f78dca9bdf2b79fe3fbb7b80898fb88420891418 Author: Paul Elschot <paul.j.elsc...@gmail.com> Date: 2014-01-23T21:30:05Z Remove some unused imports commit 273a7e80767252f9748878878b0e9d742d2df669 Author: Paul Elschot <paul.j.elsc...@gmail.com> Date: 2014-01-23T21:33:17Z Remove commented println lines commit 3f93aa8d76422844d141fc2070a236e780e577f8 Author: Paul Elschot <paul.j.elsc...@gmail.com> Date: 2014-01-23T23:24:09Z Add TestDocIdSetBenchMark.java. Note: no APL 2.0 commit 3ca778ffee79cc9bd549e4b0dd37e00f16ba6320 Author: Paul Elschot <paul.j.elsc...@gmail.com> Date: 2014-01-23T23:26:06Z Add assert message commit 50f0175fda3637b88e982f285021921c69fe4dff Author: Paul Elschot <paul.j.elsc...@gmail.com> Date: 2014-01-23T23:26:22Z Correct comment commit d07201d00dada7d3c4bde33471dac3accdb9b1e8 Author: Paul Elschot <paul.j.elsc...@gmail.com> Date: 2014-01-23T23:26:52Z Remove final declaration commit 8dce024d8fe61aa7ebbb1ad4a1f98bb1949dd221 Author: Paul Elschot <paul.j.elsc...@gmail.com> Date: 2014-01-23T23:28:12Z Plan performance comparison between OBS and OBSDocBlocksIterator commit 53ac8ed8daae2f2d36e7410fc38e35ef99a19873 Author: Paul Elschot <paul.j.elsc...@gmail.com> Date: 2014-01-24T16:43:35Z Merge branch 'trunk' into docblocksiter commit 77779b856cf524c9a93cbc579a18ed93c00a36f5 Author: Paul Elschot <paul.j.elsc...@gmail.com> Date: 2014-01-24T17:22:48Z Small improvements commit 24a1f94baeefcd2b71266aa2a54a9d1cb7b62d7e Author: Paul Elschot <paul.j.elsc...@gmail.com> Date: 2014-01-24T18:06:52Z In FixedBitSet relax preconditions for prevSetBit and nextSetBit commit a73dc87c38162641f8336acb1f5c913eef89181f Author: Paul Elschot <paul.j.elsc...@gmail.com> Date: 2014-01-24T18:08:47Z In TestDocIdSet reduce MAX_DOC so single test run stays within minute. Adapt LOAD_FACTORS to show difference bitween FBS and FBSDBI. commit 95e8109e615d178f53503526e7c423b7b5d98b7d Author: Paul Elschot <paul.j.elsc...@gmail.com> Date: 2014-01-25T13:38:57Z Merge branch 'trunk' into docblocksiter commit 7df6eb060ea841225a03ce41d2bd05aad835d57a Author: Paul Elschot <paul.j.elsc...@gmail.com> Date: 2014-01-25T14:53:48Z Adapt planning to exclude new fbsperf branch. commit a10a5eadb8e6f65edea727edba33f8f361db757a Author: Paul Elschot <paul.j.elsc...@gmail.com> Date: 2014-01-25T15:05:59Z Moved joins to FixedBitSetDBI, core tests pass, most join tests fail. commit db93ecfb641cdbbee1c1e1e8986510fa6e5f0fd0 Author: Paul Elschot <paul.j.elsc...@gmail.com> Date: 2014-01-25T15:46:36Z Replaced FixedBitSetCachingWrapperFilter by a new DocBlocksCachingWrapperFilter commit 61987f4f2e5e2865794c6551f67623adb10b8a8e Author: Paul Elschot <paul.j.elsc...@gmail.com> Date: 2014-01-25T16:22:48Z Refined planning commit 6e1b2bc996e0590eba1c6baae06a5639acbb4295 Author: Paul Elschot <paul.j.elsc...@gmail.com> Date: 2014-01-25T16:29:01Z More planning commit b45a02979209b85aad1863c7138e242c490c8ba2 Author: Paul Elschot <paul.j.elsc...@gmail.com> Date: 2014-01-26T16:10:11Z Refine planning commit d8f4d3ec089dc6baae04677c1c40157b28134146 Author: Paul Elschot <paul.j.elsc...@gmail.com> Date: 2014-01-26T16:12:36Z Merge branch 'trunk' of https://github.com/apache/lucene-solr into docblocksiter commit e8e485dd6077a82e02b0d4d7efdaec71b1ba1f37 Author: Paul Elschot <paul.j.elsc...@gmail.com> Date: 2014-01-27T19:09:45Z Merge branch 'trunk' into docblocksiter commit 950dccc54effeef6dad0ca908a297c174bda794f Author: Paul Elschot <paul.j.elsc...@gmail.com> Date: 2014-01-27T21:20:48Z Join module tests pass commit 4c781730455781f4bab6f6b3d734cc4e7adb286c Author: Paul Elschot <paul.j.elsc...@gmail.com> Date: 2014-01-27T21:48:42Z EliasFanoDocIdSet returns a DocBlocksIterator, some some tests fail commit f56a310911792f6822fabae184457b6decbf43da Author: Paul Elschot <paul.j.elsc...@gmail.com> Date: 2014-01-27T21:55:17Z TestEliasFanoDocIdSet passes commit 6674310597eb827f6a71c357f477734b2d290099 Author: Paul Elschot <paul.j.elsc...@gmail.com> Date: 2014-01-27T22:38:16Z ToChild... and ToParent... queries in join module use DocBlocksIterator commit 467fa337304703501cf2acc20b995f9a474bf21a Author: Paul Elschot <paul.j.elsc...@gmail.com> Date: 2014-01-27T22:39:02Z Remove commented code lines for stdout commit f11d4f007a8b3a850a086127fc4f96f419650283 Author: Paul Elschot <paul.j.elsc...@gmail.com> Date: 2014-01-27T22:52:23Z Deleted plan file commit 799734216c8e892f6261568d5743a0208837266a Author: Paul Elschot <paul.j.elsc...@gmail.com> Date: 2014-01-27T23:01:54Z Removed changes not needed for benchmark tests commit 8cd15196329e620d53fb1db258e042e86a4e9002 Author: Paul Elschot <paul.j.elsc...@gmail.com> Date: 2014-01-27T23:10:42Z Adapt FixedBitSet to allow subclass ---- --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@lucene.apache.org For additional commands, e-mail: dev-h...@lucene.apache.org