Uploaded image for project: 'Solr'
  1. Solr
  2. SOLR-8674

increase <mergePolicy> vs. <mergePolicyFactory> test coverage

    Details

    • Type: Test
    • Status: Closed
    • Priority: Major
    • Resolution: Fixed
    • Affects Version/s: None
    • Fix Version/s: 5.5.2, 5.6, 6.0
    • Component/s: None
    • Labels:
      None

      Description

      Following on from SOLR-8621 which deprecated/replaced <mergePolicy> with <mergePolicyFactory> there are some test solrconfig.xml files and associated test code that need to be transitioned from

      <mergePolicy class="${solr.tests.mergePolicy:org.apache.solr.util.RandomMergePolicy}"/>
      

      to

      <mergePolicyFactory class="${solr.tests.mergePolicyFactory:org.apache.solr.util.RandomMergePolicyFactory}"/>
      

      or something similar.

      1. SOLR-8674.patch
        25 kB
        Christine Poerschke

        Issue Links

          Activity

          Hide
          cpoerschke Christine Poerschke added a comment -

          Attached proposed patch against master, with the change solr.tests.mergePolicy[Factory] tests now randomly choose between <mergePolicy> and <mergePolicyFactory>

          • This increases <mergePolicy> vs. <mergePolicyFactory> test coverage.
          • This temporarily also adds a little test setup complexity but when SOLR-8668 removes support for <mergePolicy> then test setup will return to its original complexity.

          Shai Erera - with this following on from SOLR-8621, would you have a chance to review the patch at some point? Thanks.

          Show
          cpoerschke Christine Poerschke added a comment - Attached proposed patch against master, with the change solr.tests.mergePolicy[Factory] tests now randomly choose between <mergePolicy> and <mergePolicyFactory> This increases <mergePolicy> vs. <mergePolicyFactory> test coverage. This temporarily also adds a little test setup complexity but when SOLR-8668 removes support for <mergePolicy> then test setup will return to its original complexity. Shai Erera - with this following on from SOLR-8621 , would you have a chance to review the patch at some point? Thanks.
          Hide
          shaie Shai Erera added a comment -

          Patch looks good!

          Show
          shaie Shai Erera added a comment - Patch looks good!
          Hide
          jira-bot ASF subversion and git services added a comment -

          Commit b14fb50b7fb5c2a57f55ce42263f888576b8ca1f in lucene-solr's branch refs/heads/master from Christine Poerschke
          [ https://git-wip-us.apache.org/repos/asf?p=lucene-solr.git;h=b14fb50 ]

          SOLR-8674: solr.tests.mergePolicy[Factory] tests now randomly choose between <mergePolicy> and <mergePolicyFactory>

          • This increases <mergePolicy> vs. <mergePolicyFactory> test coverage.
          • This temporarily also adds a little test setup complexity but when SOLR-8668 removes support for <mergePolicy> then test setup will return to its original complexity.
          Show
          jira-bot ASF subversion and git services added a comment - Commit b14fb50b7fb5c2a57f55ce42263f888576b8ca1f in lucene-solr's branch refs/heads/master from Christine Poerschke [ https://git-wip-us.apache.org/repos/asf?p=lucene-solr.git;h=b14fb50 ] SOLR-8674 : solr.tests.mergePolicy [Factory] tests now randomly choose between <mergePolicy> and <mergePolicyFactory> This increases <mergePolicy> vs. <mergePolicyFactory> test coverage. This temporarily also adds a little test setup complexity but when SOLR-8668 removes support for <mergePolicy> then test setup will return to its original complexity.
          Hide
          jira-bot ASF subversion and git services added a comment -

          Commit e6bc86d4b972e9560ff524ba113b474365982a59 in lucene-solr's branch refs/heads/branch_5x from Christine Poerschke
          [ https://git-wip-us.apache.org/repos/asf?p=lucene-solr.git;h=e6bc86d ]

          SOLR-8674: solr.tests.mergePolicy[Factory] tests now randomly choose between <mergePolicy> and <mergePolicyFactory>

          • This increases <mergePolicy> vs. <mergePolicyFactory> test coverage.
          • This temporarily also adds a little test setup complexity but when SOLR-8668 removes support for <mergePolicy> then test setup will return to its original complexity.

          (Resolved conflict for solr/core/src/test/org/apache/solr/cloud/TestMiniSolrCloudCluster.java (java7 has no putIfAbsent).)

          Show
          jira-bot ASF subversion and git services added a comment - Commit e6bc86d4b972e9560ff524ba113b474365982a59 in lucene-solr's branch refs/heads/branch_5x from Christine Poerschke [ https://git-wip-us.apache.org/repos/asf?p=lucene-solr.git;h=e6bc86d ] SOLR-8674 : solr.tests.mergePolicy [Factory] tests now randomly choose between <mergePolicy> and <mergePolicyFactory> This increases <mergePolicy> vs. <mergePolicyFactory> test coverage. This temporarily also adds a little test setup complexity but when SOLR-8668 removes support for <mergePolicy> then test setup will return to its original complexity. (Resolved conflict for solr/core/src/test/org/apache/solr/cloud/TestMiniSolrCloudCluster.java (java7 has no putIfAbsent).)
          Hide
          jira-bot ASF subversion and git services added a comment -

          Commit bc5dfeeff1a182630fc3b55be3cf2f4fe164d446 in lucene-solr's branch refs/heads/jira/SOLR-445 from Chris Hostetter (Unused)
          [ https://git-wip-us.apache.org/repos/asf?p=lucene-solr.git;h=bc5dfee ]

          SOLR-445: play nice with SOLR-8674 test changes

          Show
          jira-bot ASF subversion and git services added a comment - Commit bc5dfeeff1a182630fc3b55be3cf2f4fe164d446 in lucene-solr's branch refs/heads/jira/ SOLR-445 from Chris Hostetter (Unused) [ https://git-wip-us.apache.org/repos/asf?p=lucene-solr.git;h=bc5dfee ] SOLR-445 : play nice with SOLR-8674 test changes
          Hide
          jira-bot ASF subversion and git services added a comment -

          Commit 59a664ec27ddf89134dc0f636f38b7a05b2be776 in lucene-solr's branch refs/heads/branch_5_5 from Christine Poerschke
          [ https://git-wip-us.apache.org/repos/asf?p=lucene-solr.git;h=59a664e ]

          SOLR-8674: solr.tests.mergePolicy[Factory] tests now randomly choose between <mergePolicy> and <mergePolicyFactory>

          • This increases <mergePolicy> vs. <mergePolicyFactory> test coverage.
          • This temporarily also adds a little test setup complexity but when SOLR-8668 removes support for <mergePolicy> then test setup will return to its original complexity.

          (Resolved conflict for solr/core/src/test/org/apache/solr/cloud/TestMiniSolrCloudCluster.java (java7 has no putIfAbsent).)

          Added 5.5.2 CHANG5 entry.

          Show
          jira-bot ASF subversion and git services added a comment - Commit 59a664ec27ddf89134dc0f636f38b7a05b2be776 in lucene-solr's branch refs/heads/branch_5_5 from Christine Poerschke [ https://git-wip-us.apache.org/repos/asf?p=lucene-solr.git;h=59a664e ] SOLR-8674 : solr.tests.mergePolicy [Factory] tests now randomly choose between <mergePolicy> and <mergePolicyFactory> This increases <mergePolicy> vs. <mergePolicyFactory> test coverage. This temporarily also adds a little test setup complexity but when SOLR-8668 removes support for <mergePolicy> then test setup will return to its original complexity. (Resolved conflict for solr/core/src/test/org/apache/solr/cloud/TestMiniSolrCloudCluster.java (java7 has no putIfAbsent).) Added 5.5.2 CHANG5 entry.
          Hide
          steve_rowe Steve Rowe added a comment -

          Reopening to backport to branch_5_5.

          Show
          steve_rowe Steve Rowe added a comment - Reopening to backport to branch_5_5.
          Hide
          steve_rowe Steve Rowe added a comment -

          Bulk close issues released with 5.5.2.

          Show
          steve_rowe Steve Rowe added a comment - Bulk close issues released with 5.5.2.

            People

            • Assignee:
              cpoerschke Christine Poerschke
              Reporter:
              cpoerschke Christine Poerschke
            • Votes:
              0 Vote for this issue
              Watchers:
              2 Start watching this issue

              Dates

              • Created:
                Updated:
                Resolved:

                Development