diff --git a/dev-tools/eclipse/dot.classpath b/dev-tools/eclipse/dot.classpath index 1d76929b6f0..b10fb8bd59c 100644 --- a/dev-tools/eclipse/dot.classpath +++ b/dev-tools/eclipse/dot.classpath @@ -40,6 +40,8 @@ + + diff --git a/dev-tools/idea/.idea/modules.xml b/dev-tools/idea/.idea/modules.xml index ea39d1a3707..cbb391469fb 100644 --- a/dev-tools/idea/.idea/modules.xml +++ b/dev-tools/idea/.idea/modules.xml @@ -14,12 +14,13 @@ - + + diff --git a/dev-tools/idea/.idea/workspace.xml b/dev-tools/idea/.idea/workspace.xml index 0bca3b21b63..593a8fd9815 100644 --- a/dev-tools/idea/.idea/workspace.xml +++ b/dev-tools/idea/.idea/workspace.xml @@ -22,9 +22,16 @@ - + + + + + @@ -113,6 +120,13 @@ + + + + - + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + diff --git a/dev-tools/idea/modules/analysis/common/common.iml b/dev-tools/idea/modules/analysis/common/analysis-common.iml similarity index 100% rename from dev-tools/idea/modules/analysis/common/common.iml rename to dev-tools/idea/modules/analysis/common/analysis-common.iml diff --git a/dev-tools/idea/modules/common/common.iml b/dev-tools/idea/modules/common/common.iml new file mode 100644 index 00000000000..50cb2814087 --- /dev/null +++ b/dev-tools/idea/modules/common/common.iml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + diff --git a/dev-tools/idea/solr/solr.iml b/dev-tools/idea/solr/solr.iml index f0e93e3a38c..7fb2fb45c95 100644 --- a/dev-tools/idea/solr/solr.iml +++ b/dev-tools/idea/solr/solr.iml @@ -31,6 +31,7 @@ + diff --git a/dev-tools/maven/modules/common/pom.xml.template b/dev-tools/maven/modules/common/pom.xml.template new file mode 100644 index 00000000000..46091089f9e --- /dev/null +++ b/dev-tools/maven/modules/common/pom.xml.template @@ -0,0 +1,66 @@ + + + 4.0.0 + + org.apache.lucene + lucene-parent + @version@ + ../../lucene/pom.xml + + org.apache.lucene + lucene-common + jar + Lucene Common + Lucene Common Module + + modules/common + build + + + + ${project.groupId} + lucene-test-framework + ${project.version} + test + + + junit + junit + test + + + + ${build-directory} + ${build-directory}/classes/java + ${build-directory}/classes/test + src/java + src/test + + + ${project.build.testSourceDirectory} + + **/*.java + + + + + diff --git a/dev-tools/maven/modules/pom.xml.template b/dev-tools/maven/modules/pom.xml.template index 880ce44fdc0..f650df65ee8 100644 --- a/dev-tools/maven/modules/pom.xml.template +++ b/dev-tools/maven/modules/pom.xml.template @@ -33,6 +33,7 @@ analysis benchmark + common grouping suggest diff --git a/dev-tools/maven/solr/src/pom.xml.template b/dev-tools/maven/solr/src/pom.xml.template index 785dcf5d584..4fd6c3c13e5 100644 --- a/dev-tools/maven/solr/src/pom.xml.template +++ b/dev-tools/maven/solr/src/pom.xml.template @@ -96,6 +96,11 @@ lucene-grouping ${project.version} + + org.apache.lucene + lucene-common + ${project.version} + org.apache.solr solr-commons-csv diff --git a/modules/build.xml b/modules/build.xml index c57d55c9a0e..b7a72a12a87 100644 --- a/modules/build.xml +++ b/modules/build.xml @@ -23,6 +23,7 @@ + @@ -34,6 +35,7 @@ + @@ -45,6 +47,7 @@ + @@ -56,6 +59,7 @@ + @@ -68,6 +72,7 @@ + @@ -78,6 +83,7 @@ + @@ -90,6 +96,7 @@ + diff --git a/modules/common/LICENSE.txt b/modules/common/LICENSE.txt new file mode 100644 index 00000000000..d6456956733 --- /dev/null +++ b/modules/common/LICENSE.txt @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/modules/common/NOTICE.txt b/modules/common/NOTICE.txt new file mode 100644 index 00000000000..b48d3ed7907 --- /dev/null +++ b/modules/common/NOTICE.txt @@ -0,0 +1,5 @@ +Apache Lucene Common +Copyright 2011 The Apache Software Foundation + +This product includes software developed by +The Apache Software Foundation (http://www.apache.org/). diff --git a/modules/common/build.xml b/modules/common/build.xml new file mode 100644 index 00000000000..896bad40c8c --- /dev/null +++ b/modules/common/build.xml @@ -0,0 +1,31 @@ + + + + + Module containing common classes to be used by Solr and other modules + + + + + + + + + + + \ No newline at end of file diff --git a/solr/src/java/org/apache/solr/search/MutableValue.java b/modules/common/src/java/org/apache/lucene/common/mutable/MutableValue.java similarity index 97% rename from solr/src/java/org/apache/solr/search/MutableValue.java rename to modules/common/src/java/org/apache/lucene/common/mutable/MutableValue.java index 28fbbb99adc..05d98bf059d 100755 --- a/solr/src/java/org/apache/solr/search/MutableValue.java +++ b/modules/common/src/java/org/apache/lucene/common/mutable/MutableValue.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.solr.search; +package org.apache.lucene.common.mutable; /** @lucene.internal */ public abstract class MutableValue implements Comparable { diff --git a/solr/src/java/org/apache/solr/search/MutableValueBool.java b/modules/common/src/java/org/apache/lucene/common/mutable/MutableValueBool.java similarity index 97% rename from solr/src/java/org/apache/solr/search/MutableValueBool.java rename to modules/common/src/java/org/apache/lucene/common/mutable/MutableValueBool.java index 0328ff73ba1..394b11af6ca 100644 --- a/solr/src/java/org/apache/solr/search/MutableValueBool.java +++ b/modules/common/src/java/org/apache/lucene/common/mutable/MutableValueBool.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.solr.search; +package org.apache.lucene.common.mutable; public class MutableValueBool extends MutableValue { public boolean value; diff --git a/solr/src/java/org/apache/solr/search/MutableValueDate.java b/modules/common/src/java/org/apache/lucene/common/mutable/MutableValueDate.java similarity index 96% rename from solr/src/java/org/apache/solr/search/MutableValueDate.java rename to modules/common/src/java/org/apache/lucene/common/mutable/MutableValueDate.java index 953fcdba4f6..6fd420a23d5 100755 --- a/solr/src/java/org/apache/solr/search/MutableValueDate.java +++ b/modules/common/src/java/org/apache/lucene/common/mutable/MutableValueDate.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.solr.search; +package org.apache.lucene.common.mutable; import java.util.Date; diff --git a/solr/src/java/org/apache/solr/search/MutableValueDouble.java b/modules/common/src/java/org/apache/lucene/common/mutable/MutableValueDouble.java similarity index 97% rename from solr/src/java/org/apache/solr/search/MutableValueDouble.java rename to modules/common/src/java/org/apache/lucene/common/mutable/MutableValueDouble.java index 424ecb9a2fd..f832541dff5 100755 --- a/solr/src/java/org/apache/solr/search/MutableValueDouble.java +++ b/modules/common/src/java/org/apache/lucene/common/mutable/MutableValueDouble.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.solr.search; +package org.apache.lucene.common.mutable; public class MutableValueDouble extends MutableValue { public double value; diff --git a/solr/src/java/org/apache/solr/search/MutableValueFloat.java b/modules/common/src/java/org/apache/lucene/common/mutable/MutableValueFloat.java similarity index 97% rename from solr/src/java/org/apache/solr/search/MutableValueFloat.java rename to modules/common/src/java/org/apache/lucene/common/mutable/MutableValueFloat.java index 73b3bbb94b2..0d3b06a3a9d 100755 --- a/solr/src/java/org/apache/solr/search/MutableValueFloat.java +++ b/modules/common/src/java/org/apache/lucene/common/mutable/MutableValueFloat.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.solr.search; +package org.apache.lucene.common.mutable; public class MutableValueFloat extends MutableValue { public float value; diff --git a/solr/src/java/org/apache/solr/search/MutableValueInt.java b/modules/common/src/java/org/apache/lucene/common/mutable/MutableValueInt.java similarity index 97% rename from solr/src/java/org/apache/solr/search/MutableValueInt.java rename to modules/common/src/java/org/apache/lucene/common/mutable/MutableValueInt.java index 1502b1345b0..d05f51346d9 100755 --- a/solr/src/java/org/apache/solr/search/MutableValueInt.java +++ b/modules/common/src/java/org/apache/lucene/common/mutable/MutableValueInt.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.solr.search; +package org.apache.lucene.common.mutable; public class MutableValueInt extends MutableValue { public int value; diff --git a/solr/src/java/org/apache/solr/search/MutableValueLong.java b/modules/common/src/java/org/apache/lucene/common/mutable/MutableValueLong.java similarity index 97% rename from solr/src/java/org/apache/solr/search/MutableValueLong.java rename to modules/common/src/java/org/apache/lucene/common/mutable/MutableValueLong.java index 8cc5729c542..5410f64bf74 100644 --- a/solr/src/java/org/apache/solr/search/MutableValueLong.java +++ b/modules/common/src/java/org/apache/lucene/common/mutable/MutableValueLong.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.solr.search; +package org.apache.lucene.common.mutable; public class MutableValueLong extends MutableValue { public long value; diff --git a/solr/src/java/org/apache/solr/search/MutableValueStr.java b/modules/common/src/java/org/apache/lucene/common/mutable/MutableValueStr.java similarity index 97% rename from solr/src/java/org/apache/solr/search/MutableValueStr.java rename to modules/common/src/java/org/apache/lucene/common/mutable/MutableValueStr.java index 3c97a8f5a2f..6d507566045 100755 --- a/solr/src/java/org/apache/solr/search/MutableValueStr.java +++ b/modules/common/src/java/org/apache/lucene/common/mutable/MutableValueStr.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.solr.search; +package org.apache.lucene.common.mutable; import org.apache.lucene.util.BytesRef; diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt index ae7a688f500..4cd152a1fbf 100644 --- a/solr/CHANGES.txt +++ b/solr/CHANGES.txt @@ -238,6 +238,8 @@ Other Changes * SOLR-2576: Remove deprecated SpellingResult.add(Token, int). (James Dyer via rmuir) + +* LUCENE-3232: Moved MutableValue classes to new 'common' module. (Chris Male) Documentation ---------------------- diff --git a/solr/common-build.xml b/solr/common-build.xml index 76b8fded9f7..0a7d83c0327 100644 --- a/solr/common-build.xml +++ b/solr/common-build.xml @@ -199,7 +199,8 @@ - + + @@ -216,6 +217,7 @@ + @@ -253,6 +255,9 @@ + + + @@ -268,6 +273,7 @@ + diff --git a/solr/src/java/org/apache/solr/schema/BoolField.java b/solr/src/java/org/apache/solr/schema/BoolField.java index 10e1c862be7..ce9ae5d3bc1 100644 --- a/solr/src/java/org/apache/solr/schema/BoolField.java +++ b/solr/src/java/org/apache/solr/schema/BoolField.java @@ -17,14 +17,13 @@ package org.apache.solr.schema; +import org.apache.lucene.common.mutable.MutableValue; +import org.apache.lucene.common.mutable.MutableValueBool; import org.apache.lucene.index.IndexReader; import org.apache.lucene.search.FieldCache; import org.apache.lucene.search.SortField; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.CharsRef; -import org.apache.solr.search.MutableValue; -import org.apache.solr.search.MutableValueBool; -import org.apache.solr.search.MutableValueInt; import org.apache.solr.search.QParser; import org.apache.solr.search.function.*; import org.apache.lucene.analysis.Analyzer; diff --git a/solr/src/java/org/apache/solr/schema/SortableDoubleField.java b/solr/src/java/org/apache/solr/schema/SortableDoubleField.java index e31a6719820..ee6149b0cd5 100644 --- a/solr/src/java/org/apache/solr/schema/SortableDoubleField.java +++ b/solr/src/java/org/apache/solr/schema/SortableDoubleField.java @@ -17,11 +17,11 @@ package org.apache.solr.schema; +import org.apache.lucene.common.mutable.MutableValue; +import org.apache.lucene.common.mutable.MutableValueDouble; import org.apache.lucene.search.SortField; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.CharsRef; -import org.apache.solr.search.MutableValueDouble; -import org.apache.solr.search.MutableValue; import org.apache.solr.search.QParser; import org.apache.solr.search.function.ValueSource; import org.apache.solr.search.function.FieldCacheSource; diff --git a/solr/src/java/org/apache/solr/schema/SortableFloatField.java b/solr/src/java/org/apache/solr/schema/SortableFloatField.java index d5a5315b1aa..b15a9a6b350 100644 --- a/solr/src/java/org/apache/solr/schema/SortableFloatField.java +++ b/solr/src/java/org/apache/solr/schema/SortableFloatField.java @@ -17,11 +17,11 @@ package org.apache.solr.schema; +import org.apache.lucene.common.mutable.MutableValue; +import org.apache.lucene.common.mutable.MutableValueFloat; import org.apache.lucene.search.SortField; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.CharsRef; -import org.apache.solr.search.MutableValueFloat; -import org.apache.solr.search.MutableValue; import org.apache.solr.search.QParser; import org.apache.solr.search.function.ValueSource; import org.apache.solr.search.function.FieldCacheSource; diff --git a/solr/src/java/org/apache/solr/schema/SortableIntField.java b/solr/src/java/org/apache/solr/schema/SortableIntField.java index e13c2c3af07..8b0926b62ea 100644 --- a/solr/src/java/org/apache/solr/schema/SortableIntField.java +++ b/solr/src/java/org/apache/solr/schema/SortableIntField.java @@ -17,11 +17,11 @@ package org.apache.solr.schema; +import org.apache.lucene.common.mutable.MutableValue; +import org.apache.lucene.common.mutable.MutableValueInt; import org.apache.lucene.search.SortField; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.CharsRef; -import org.apache.solr.search.MutableValueInt; -import org.apache.solr.search.MutableValue; import org.apache.solr.search.QParser; import org.apache.solr.search.function.ValueSource; import org.apache.solr.search.function.FieldCacheSource; diff --git a/solr/src/java/org/apache/solr/schema/SortableLongField.java b/solr/src/java/org/apache/solr/schema/SortableLongField.java index 78344312463..8727fd04d2e 100644 --- a/solr/src/java/org/apache/solr/schema/SortableLongField.java +++ b/solr/src/java/org/apache/solr/schema/SortableLongField.java @@ -17,11 +17,11 @@ package org.apache.solr.schema; +import org.apache.lucene.common.mutable.MutableValue; +import org.apache.lucene.common.mutable.MutableValueLong; import org.apache.lucene.search.SortField; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.CharsRef; -import org.apache.solr.search.MutableValueLong; -import org.apache.solr.search.MutableValue; import org.apache.solr.search.QParser; import org.apache.solr.search.function.ValueSource; import org.apache.solr.search.function.FieldCacheSource; diff --git a/solr/src/java/org/apache/solr/schema/TrieField.java b/solr/src/java/org/apache/solr/schema/TrieField.java index 8fbde52d84c..1cc37e07c9b 100644 --- a/solr/src/java/org/apache/solr/schema/TrieField.java +++ b/solr/src/java/org/apache/solr/schema/TrieField.java @@ -16,6 +16,8 @@ */ package org.apache.solr.schema; +import org.apache.lucene.common.mutable.MutableValueDate; +import org.apache.lucene.common.mutable.MutableValueLong; import org.apache.lucene.document.Fieldable; import org.apache.lucene.document.Field; import org.apache.lucene.document.NumericField; @@ -31,8 +33,6 @@ import org.apache.lucene.util.NumericUtils; import org.apache.solr.analysis.*; import org.apache.solr.common.SolrException; import org.apache.solr.response.TextResponseWriter; -import org.apache.solr.search.MutableValueDate; -import org.apache.solr.search.MutableValueLong; import org.apache.solr.search.QParser; import org.apache.solr.search.function.*; diff --git a/solr/src/java/org/apache/solr/search/Grouping.java b/solr/src/java/org/apache/solr/search/Grouping.java index ce33795b6fe..bf604d78f46 100755 --- a/solr/src/java/org/apache/solr/search/Grouping.java +++ b/solr/src/java/org/apache/solr/search/Grouping.java @@ -18,6 +18,7 @@ package org.apache.solr.search; import org.apache.commons.lang.ArrayUtils; +import org.apache.lucene.common.mutable.MutableValue; import org.apache.lucene.document.Fieldable; import org.apache.lucene.index.IndexReader.AtomicReaderContext; import org.apache.lucene.queryParser.ParseException; diff --git a/solr/src/java/org/apache/solr/search/function/BoolDocValues.java b/solr/src/java/org/apache/solr/search/function/BoolDocValues.java index 443f379ab95..79442d653a5 100644 --- a/solr/src/java/org/apache/solr/search/function/BoolDocValues.java +++ b/solr/src/java/org/apache/solr/search/function/BoolDocValues.java @@ -1,8 +1,8 @@ package org.apache.solr.search.function; -import org.apache.solr.search.MutableValue; -import org.apache.solr.search.MutableValueBool; -import org.apache.solr.search.MutableValueInt; +import org.apache.lucene.common.mutable.MutableValue; +import org.apache.lucene.common.mutable.MutableValueBool; + public abstract class BoolDocValues extends DocValues { protected final ValueSource vs; diff --git a/solr/src/java/org/apache/solr/search/function/DocValues.java b/solr/src/java/org/apache/solr/search/function/DocValues.java index af71b15d3fb..889ef517948 100644 --- a/solr/src/java/org/apache/solr/search/function/DocValues.java +++ b/solr/src/java/org/apache/solr/search/function/DocValues.java @@ -17,11 +17,11 @@ package org.apache.solr.search.function; +import org.apache.lucene.common.mutable.MutableValue; +import org.apache.lucene.common.mutable.MutableValueFloat; import org.apache.lucene.search.*; import org.apache.lucene.index.IndexReader; import org.apache.lucene.util.BytesRef; -import org.apache.solr.search.MutableValue; -import org.apache.solr.search.MutableValueFloat; /** * Represents field values as different types. diff --git a/solr/src/java/org/apache/solr/search/function/DoubleDocValues.java b/solr/src/java/org/apache/solr/search/function/DoubleDocValues.java index 70ff39d1aea..f331b43a5a2 100644 --- a/solr/src/java/org/apache/solr/search/function/DoubleDocValues.java +++ b/solr/src/java/org/apache/solr/search/function/DoubleDocValues.java @@ -1,7 +1,7 @@ package org.apache.solr.search.function; -import org.apache.solr.search.MutableValue; -import org.apache.solr.search.MutableValueDouble; +import org.apache.lucene.common.mutable.MutableValue; +import org.apache.lucene.common.mutable.MutableValueDouble; public abstract class DoubleDocValues extends DocValues { protected final ValueSource vs; diff --git a/solr/src/java/org/apache/solr/search/function/DoubleFieldSource.java b/solr/src/java/org/apache/solr/search/function/DoubleFieldSource.java index 0d206179ccb..cf97a746955 100644 --- a/solr/src/java/org/apache/solr/search/function/DoubleFieldSource.java +++ b/solr/src/java/org/apache/solr/search/function/DoubleFieldSource.java @@ -17,13 +17,13 @@ package org.apache.solr.search.function; +import org.apache.lucene.common.mutable.MutableValue; +import org.apache.lucene.common.mutable.MutableValueDouble; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexReader.AtomicReaderContext; import org.apache.lucene.util.Bits; import org.apache.lucene.search.cache.DoubleValuesCreator; import org.apache.lucene.search.cache.CachedArray.DoubleValues; -import org.apache.solr.search.MutableValue; -import org.apache.solr.search.MutableValueDouble; import java.io.IOException; import java.util.Map; diff --git a/solr/src/java/org/apache/solr/search/function/FloatDocValues.java b/solr/src/java/org/apache/solr/search/function/FloatDocValues.java index 4d3a3e442b0..ce7f369799a 100644 --- a/solr/src/java/org/apache/solr/search/function/FloatDocValues.java +++ b/solr/src/java/org/apache/solr/search/function/FloatDocValues.java @@ -1,7 +1,7 @@ package org.apache.solr.search.function; -import org.apache.solr.search.MutableValue; -import org.apache.solr.search.MutableValueFloat; +import org.apache.lucene.common.mutable.MutableValue; +import org.apache.lucene.common.mutable.MutableValueFloat; public abstract class FloatDocValues extends DocValues { protected final ValueSource vs; diff --git a/solr/src/java/org/apache/solr/search/function/FloatFieldSource.java b/solr/src/java/org/apache/solr/search/function/FloatFieldSource.java index abcd6342f15..fa790ce399d 100644 --- a/solr/src/java/org/apache/solr/search/function/FloatFieldSource.java +++ b/solr/src/java/org/apache/solr/search/function/FloatFieldSource.java @@ -20,12 +20,12 @@ package org.apache.solr.search.function; import java.io.IOException; import java.util.Map; +import org.apache.lucene.common.mutable.MutableValue; +import org.apache.lucene.common.mutable.MutableValueFloat; import org.apache.lucene.index.IndexReader.AtomicReaderContext; import org.apache.lucene.util.Bits; import org.apache.lucene.search.cache.FloatValuesCreator; import org.apache.lucene.search.cache.CachedArray.FloatValues; -import org.apache.solr.search.MutableValue; -import org.apache.solr.search.MutableValueFloat; /** * Obtains float field values from the {@link org.apache.lucene.search.FieldCache} diff --git a/solr/src/java/org/apache/solr/search/function/IntDocValues.java b/solr/src/java/org/apache/solr/search/function/IntDocValues.java index 157ace2208b..0ae6a258801 100644 --- a/solr/src/java/org/apache/solr/search/function/IntDocValues.java +++ b/solr/src/java/org/apache/solr/search/function/IntDocValues.java @@ -1,7 +1,8 @@ package org.apache.solr.search.function; -import org.apache.solr.search.MutableValue; -import org.apache.solr.search.MutableValueInt; +import org.apache.lucene.common.mutable.MutableValue; +import org.apache.lucene.common.mutable.MutableValueInt; + public abstract class IntDocValues extends DocValues { protected final ValueSource vs; diff --git a/solr/src/java/org/apache/solr/search/function/IntFieldSource.java b/solr/src/java/org/apache/solr/search/function/IntFieldSource.java index 8f7a58039ea..80bfc95c1d6 100644 --- a/solr/src/java/org/apache/solr/search/function/IntFieldSource.java +++ b/solr/src/java/org/apache/solr/search/function/IntFieldSource.java @@ -17,11 +17,11 @@ package org.apache.solr.search.function; +import org.apache.lucene.common.mutable.MutableValue; +import org.apache.lucene.common.mutable.MutableValueInt; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexReader.AtomicReaderContext; import org.apache.lucene.util.Bits; -import org.apache.solr.search.MutableValueInt; -import org.apache.solr.search.MutableValue; import org.apache.lucene.search.cache.IntValuesCreator; import org.apache.lucene.search.cache.CachedArray.IntValues; diff --git a/solr/src/java/org/apache/solr/search/function/LongDocValues.java b/solr/src/java/org/apache/solr/search/function/LongDocValues.java index f0e8f6d8ee9..7eee4321f7e 100644 --- a/solr/src/java/org/apache/solr/search/function/LongDocValues.java +++ b/solr/src/java/org/apache/solr/search/function/LongDocValues.java @@ -1,7 +1,8 @@ package org.apache.solr.search.function; -import org.apache.solr.search.MutableValue; -import org.apache.solr.search.MutableValueLong; +import org.apache.lucene.common.mutable.MutableValue; +import org.apache.lucene.common.mutable.MutableValueLong; + public abstract class LongDocValues extends DocValues { protected final ValueSource vs; diff --git a/solr/src/java/org/apache/solr/search/function/LongFieldSource.java b/solr/src/java/org/apache/solr/search/function/LongFieldSource.java index 03ff11e23b3..8b149dc5245 100644 --- a/solr/src/java/org/apache/solr/search/function/LongFieldSource.java +++ b/solr/src/java/org/apache/solr/search/function/LongFieldSource.java @@ -17,13 +17,13 @@ package org.apache.solr.search.function; +import org.apache.lucene.common.mutable.MutableValue; +import org.apache.lucene.common.mutable.MutableValueLong; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexReader.AtomicReaderContext; import org.apache.lucene.util.Bits; import org.apache.lucene.search.cache.LongValuesCreator; import org.apache.lucene.search.cache.CachedArray.LongValues; -import org.apache.solr.search.MutableValue; -import org.apache.solr.search.MutableValueLong; import java.io.IOException; diff --git a/solr/src/java/org/apache/solr/search/function/OrdFieldSource.java b/solr/src/java/org/apache/solr/search/function/OrdFieldSource.java index f4ac6133597..6cdc52acc31 100644 --- a/solr/src/java/org/apache/solr/search/function/OrdFieldSource.java +++ b/solr/src/java/org/apache/solr/search/function/OrdFieldSource.java @@ -17,12 +17,12 @@ package org.apache.solr.search.function; +import org.apache.lucene.common.mutable.MutableValue; +import org.apache.lucene.common.mutable.MutableValueInt; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexReader.AtomicReaderContext; import org.apache.lucene.search.FieldCache; import org.apache.lucene.util.ReaderUtil; -import org.apache.solr.search.MutableValue; -import org.apache.solr.search.MutableValueInt; import java.io.IOException; import java.util.Map; diff --git a/solr/src/java/org/apache/solr/search/function/QueryValueSource.java b/solr/src/java/org/apache/solr/search/function/QueryValueSource.java index f0c15c6f929..c22617d2527 100755 --- a/solr/src/java/org/apache/solr/search/function/QueryValueSource.java +++ b/solr/src/java/org/apache/solr/search/function/QueryValueSource.java @@ -17,14 +17,14 @@ package org.apache.solr.search.function; +import org.apache.lucene.common.mutable.MutableValue; +import org.apache.lucene.common.mutable.MutableValueFloat; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexReader.AtomicReaderContext; import org.apache.lucene.search.*; import org.apache.lucene.search.Weight.ScorerContext; import org.apache.lucene.util.ReaderUtil; import org.apache.solr.common.SolrException; -import org.apache.solr.search.MutableValue; -import org.apache.solr.search.MutableValueFloat; import java.io.IOException; import java.util.Map; diff --git a/solr/src/java/org/apache/solr/search/function/StrDocValues.java b/solr/src/java/org/apache/solr/search/function/StrDocValues.java index 40d398eb8d8..fd9e7ac707b 100644 --- a/solr/src/java/org/apache/solr/search/function/StrDocValues.java +++ b/solr/src/java/org/apache/solr/search/function/StrDocValues.java @@ -1,9 +1,8 @@ package org.apache.solr.search.function; +import org.apache.lucene.common.mutable.MutableValue; +import org.apache.lucene.common.mutable.MutableValueStr; import org.apache.lucene.util.BytesRef; -import org.apache.solr.search.MutableValue; -import org.apache.solr.search.MutableValueFloat; -import org.apache.solr.search.MutableValueStr; public abstract class StrDocValues extends DocValues { protected final ValueSource vs; diff --git a/solr/src/java/org/apache/solr/search/function/StringIndexDocValues.java b/solr/src/java/org/apache/solr/search/function/StringIndexDocValues.java index 71db0ab36d0..e98b19aef7b 100755 --- a/solr/src/java/org/apache/solr/search/function/StringIndexDocValues.java +++ b/solr/src/java/org/apache/solr/search/function/StringIndexDocValues.java @@ -17,13 +17,13 @@ package org.apache.solr.search.function; +import org.apache.lucene.common.mutable.MutableValue; +import org.apache.lucene.common.mutable.MutableValueStr; import org.apache.lucene.search.FieldCache; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexReader.AtomicReaderContext; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.CharsRef; -import org.apache.solr.search.MutableValue; -import org.apache.solr.search.MutableValueStr; import java.io.IOException;