mirror of https://github.com/apache/lucene.git
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/lucene-solr
This commit is contained in:
commit
90199e7485
|
@ -84,15 +84,16 @@ io.netty.netty-all.version = 4.0.36.Final
|
|||
|
||||
/org.apache.ant/ant = 1.8.2
|
||||
|
||||
org.apache.calcite.avatica.version = 1.9.0
|
||||
org.apache.calcite.avatica.version = 1.10.0
|
||||
/org.apache.calcite.avatica/avatica-core = ${org.apache.calcite.avatica.version}
|
||||
|
||||
org.apache.calcite.version = 1.11.0
|
||||
org.apache.calcite.version = 1.13.0
|
||||
/org.apache.calcite/calcite-core = ${org.apache.calcite.version}
|
||||
/org.apache.calcite/calcite-linq4j = ${org.apache.calcite.version}
|
||||
|
||||
/org.apache.commons/commons-compress = 1.11
|
||||
/org.apache.commons/commons-exec = 1.3
|
||||
/org.apache.commons/commons-lang3 = 3.6
|
||||
/org.apache.commons/commons-math3 = 3.4.1
|
||||
|
||||
org.apache.curator.version = 2.8.0
|
||||
|
|
|
@ -176,9 +176,11 @@ public class AnalyzingSuggesterTest extends LuceneTestCase {
|
|||
Document nextDoc = lineFile.nextDoc();
|
||||
String title = nextDoc.getField("title").stringValue();
|
||||
int randomWeight = random().nextInt(100);
|
||||
keys.add(new Input(title, randomWeight));
|
||||
if (!mapping.containsKey(title) || mapping.get(title) < randomWeight) {
|
||||
mapping.put(title, Long.valueOf(randomWeight));
|
||||
int maxLen = Math.min(title.length(), 500);
|
||||
String prefix = title.substring(0, maxLen);
|
||||
keys.add(new Input(prefix, randomWeight));
|
||||
if (!mapping.containsKey(prefix) || mapping.get(prefix) < randomWeight) {
|
||||
mapping.put(prefix, Long.valueOf(randomWeight));
|
||||
}
|
||||
}
|
||||
Analyzer indexAnalyzer = new MockAnalyzer(random());
|
||||
|
|
|
@ -426,6 +426,8 @@ Bug Fixes
|
|||
|
||||
* SOLR-11182: A split shard failure on IOException should be logged (Varun Thacker)
|
||||
|
||||
* SOLR-10353: TestSQLHandler reproducible failure: No match found for function signature min(<NUMERIC>) (Kevin Risden)
|
||||
|
||||
Optimizations
|
||||
----------------------
|
||||
|
||||
|
@ -765,6 +767,8 @@ when using one of Exact*StatsCache (Mikhail Khludnev)
|
|||
|
||||
* SOLR-10908: CloudSolrStream.toExpression incorrectly handles fq clauses (Rohit Singh via Erick Erickson)
|
||||
|
||||
* SOLR-11198: downconfig downloads empty file as folder (Erick Erickson)
|
||||
|
||||
Optimizations
|
||||
----------------------
|
||||
* SOLR-10634: JSON Facet API: When a field/terms facet will retrieve all buckets (i.e. limit:-1)
|
||||
|
|
|
@ -85,6 +85,7 @@
|
|||
<artifact name="hadoop-hdfs" type="test" ext="jar" maven:classifier="tests" />
|
||||
</dependency>
|
||||
<dependency org="org.mortbay.jetty" name="jetty" rev="${/org.mortbay.jetty/jetty}" conf="test.DfsMiniCluster"/>
|
||||
<dependency org="org.codehaus.janino" name="commons-compiler" rev="${/org.codehaus.janino/commons-compiler}" conf="compile"/>
|
||||
<dependency org="org.mortbay.jetty" name="jetty-util" rev="${/org.mortbay.jetty/jetty-util}" conf="test.DfsMiniCluster"/>
|
||||
<dependency org="com.sun.jersey" name="jersey-core" rev="${/com.sun.jersey/jersey-core}" conf="test.DfsMiniCluster"/>
|
||||
<dependency org="com.sun.jersey" name="jersey-server" rev="${/com.sun.jersey/jersey-server}" conf="test.DfsMiniCluster"/>
|
||||
|
@ -143,6 +144,7 @@
|
|||
<dependency org="org.apache.calcite" name="calcite-core" rev="${/org.apache.calcite/calcite-core}" conf="compile"/>
|
||||
<dependency org="org.apache.calcite" name="calcite-linq4j" rev="${/org.apache.calcite/calcite-linq4j}" conf="compile"/>
|
||||
<dependency org="org.apache.calcite.avatica" name="avatica-core" rev="${/org.apache.calcite.avatica/avatica-core}" conf="compile"/>
|
||||
<dependency org="org.apache.commons" name="commons-lang3" rev="${/org.apache.commons/commons-lang3}" conf="compile"/>
|
||||
<dependency org="net.hydromatic" name="eigenbase-properties" rev="${/net.hydromatic/eigenbase-properties}" conf="compile"/>
|
||||
<dependency org="org.codehaus.janino" name="janino" rev="${/org.codehaus.janino/janino}" conf="compile"/>
|
||||
<dependency org="org.codehaus.janino" name="commons-compiler" rev="${/org.codehaus.janino/commons-compiler}" conf="compile"/>
|
||||
|
|
|
@ -21,6 +21,7 @@ import java.io.ByteArrayOutputStream;
|
|||
import java.io.File;
|
||||
import java.io.IOException;
|
||||
import java.io.PrintStream;
|
||||
import java.lang.invoke.MethodHandles;
|
||||
import java.nio.charset.Charset;
|
||||
import java.nio.charset.StandardCharsets;
|
||||
import java.nio.file.FileVisitResult;
|
||||
|
@ -40,9 +41,13 @@ import org.apache.zookeeper.data.Stat;
|
|||
import org.junit.AfterClass;
|
||||
import org.junit.BeforeClass;
|
||||
import org.junit.Test;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
public class SolrCLIZkUtilsTest extends SolrCloudTestCase {
|
||||
|
||||
private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
|
||||
|
||||
@BeforeClass
|
||||
public static void setupCluster() throws Exception {
|
||||
configureCluster(1)
|
||||
|
@ -106,7 +111,7 @@ public class SolrCLIZkUtilsTest extends SolrCloudTestCase {
|
|||
|
||||
@Test
|
||||
public void testDownconfig() throws Exception {
|
||||
Path tmp = createTempDir("downConfigNewPlace");
|
||||
Path tmp = Paths.get(createTempDir("downConfigNewPlace").toAbsolutePath().toString(), "myconfset");
|
||||
|
||||
// First we need a configset on ZK to bring down.
|
||||
|
||||
|
@ -127,6 +132,28 @@ public class SolrCLIZkUtilsTest extends SolrCloudTestCase {
|
|||
assertEquals("Download should have succeeded.", 0, res);
|
||||
verifyZkLocalPathsMatch(Paths.get(tmp.toAbsolutePath().toString(), "conf"), "/configs/downconfig1");
|
||||
|
||||
// Insure that empty files don't become directories (SOLR-11198)
|
||||
|
||||
Path emptyFile = Paths.get(tmp.toAbsolutePath().toString(), "conf", "stopwords", "emptyfile");
|
||||
Files.createFile(emptyFile);
|
||||
|
||||
// Now copy it up and back and insure it's still a file in the new place
|
||||
copyConfigUp(tmp.getParent(), "myconfset", "downconfig2");
|
||||
Path tmp2 = createTempDir("downConfigNewPlace2");
|
||||
downTool = new SolrCLI.ConfigSetDownloadTool();
|
||||
args = new String[]{
|
||||
"-confname", "downconfig2",
|
||||
"-confdir", tmp2.toAbsolutePath().toString(),
|
||||
"-zkHost", zkAddr,
|
||||
};
|
||||
|
||||
res = downTool.runTool(SolrCLI.processCommandLineArgs(SolrCLI.joinCommonAndToolOptions(downTool.getOptions()), args));
|
||||
assertEquals("Download should have succeeded.", 0, res);
|
||||
verifyZkLocalPathsMatch(Paths.get(tmp.toAbsolutePath().toString(), "conf"), "/configs/downconfig2");
|
||||
// And insure the empty file is a text file
|
||||
Path destEmpty = Paths.get(tmp2.toAbsolutePath().toString(), "conf", "stopwords", "emptyfile");
|
||||
assertTrue("Empty files should NOT be copied down as directories", destEmpty.toFile().isFile());
|
||||
|
||||
}
|
||||
|
||||
@Test
|
||||
|
@ -373,6 +400,63 @@ public class SolrCLIZkUtilsTest extends SolrCloudTestCase {
|
|||
content = new String(zkClient.getData("/cp9/conf/stopwords", null, null, true), StandardCharsets.UTF_8);
|
||||
assertTrue("There should be content in the node! ", content.contains("{Some Arbitrary Data}"));
|
||||
|
||||
// Copy an individual empty file up and back down and insure it's still a file
|
||||
Path emptyFile = Paths.get(tmp.toAbsolutePath().toString(), "conf", "stopwords", "emptyfile");
|
||||
Files.createFile(emptyFile);
|
||||
|
||||
args = new String[]{
|
||||
"-src", "file:" + emptyFile.toAbsolutePath().toString(),
|
||||
"-dst", "zk:/cp7/conf/stopwords/emptyfile",
|
||||
"-recurse", "false",
|
||||
"-zkHost", zkAddr,
|
||||
};
|
||||
|
||||
res = cpTool.runTool(SolrCLI.processCommandLineArgs(SolrCLI.joinCommonAndToolOptions(cpTool.getOptions()), args));
|
||||
assertEquals("Copy should have succeeded.", 0, res);
|
||||
|
||||
Path tmp2 = createTempDir("cp9");
|
||||
Path emptyDest = Paths.get(tmp2.toAbsolutePath().toString(), "emptyfile");
|
||||
args = new String[]{
|
||||
"-src", "zk:/cp7/conf/stopwords/emptyfile",
|
||||
"-dst", "file:" + emptyDest.toAbsolutePath().toString(),
|
||||
"-recurse", "false",
|
||||
"-zkHost", zkAddr,
|
||||
};
|
||||
res = cpTool.runTool(SolrCLI.processCommandLineArgs(SolrCLI.joinCommonAndToolOptions(cpTool.getOptions()), args));
|
||||
assertEquals("Copy should have succeeded.", 0, res);
|
||||
|
||||
assertTrue("Empty files should NOT be copied down as directories", emptyDest.toFile().isFile());
|
||||
|
||||
// Now with recursive copy
|
||||
|
||||
args = new String[]{
|
||||
"-src", "file:" + emptyFile.getParent().getParent().toString(),
|
||||
"-dst", "zk:/cp10",
|
||||
"-recurse", "true",
|
||||
"-zkHost", zkAddr,
|
||||
};
|
||||
|
||||
res = cpTool.runTool(SolrCLI.processCommandLineArgs(SolrCLI.joinCommonAndToolOptions(cpTool.getOptions()), args));
|
||||
assertEquals("Copy should have succeeded.", 0, res);
|
||||
|
||||
// Now copy it all back and make sure empty file is still a file when recursively copying.
|
||||
tmp2 = createTempDir("cp10");
|
||||
args = new String[]{
|
||||
"-src", "zk:/cp10",
|
||||
"-dst", "file:" + tmp2.toAbsolutePath().toString(),
|
||||
"-recurse", "true",
|
||||
"-zkHost", zkAddr,
|
||||
};
|
||||
res = cpTool.runTool(SolrCLI.processCommandLineArgs(SolrCLI.joinCommonAndToolOptions(cpTool.getOptions()), args));
|
||||
assertEquals("Copy should have succeeded.", 0, res);
|
||||
|
||||
Path locEmpty = Paths.get(tmp2.toAbsolutePath().toString(), "stopwords", "emptyfile");
|
||||
log.info("EOE Checking file at (var1) " + locEmpty.toAbsolutePath().toString()); // TODO: remove me EOE
|
||||
log.info("EOE Checking file at (var2) " + locEmpty.toFile().getAbsolutePath()); // TODO: remove me EOE
|
||||
log.info("EOE Checking file exists: " + Boolean.toString(locEmpty.toFile().exists()));
|
||||
log.info("EOE Checking isFile: " + Boolean.toString(locEmpty.toFile().isFile()));
|
||||
log.info("EOE Checking isDirectory: " + Boolean.toString(locEmpty.toFile().isDirectory())); //TODO: remove me EOE to here.
|
||||
assertTrue("Empty files should NOT be copied down as directories", locEmpty.toFile().isFile());
|
||||
}
|
||||
|
||||
@Test
|
||||
|
|
|
@ -22,7 +22,6 @@ import java.io.InputStream;
|
|||
import java.io.InputStreamReader;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.Locale;
|
||||
|
||||
import org.apache.solr.client.solrj.SolrClient;
|
||||
import org.apache.solr.client.solrj.SolrRequest;
|
||||
|
@ -79,9 +78,6 @@ public class TestSQLHandler extends AbstractFullDistribZkTestBase {
|
|||
|
||||
@Test
|
||||
public void doTest() throws Exception {
|
||||
|
||||
assumeFalse("This test fails on UNIX with Turkish default locale", new Locale("tr").getLanguage().equals(Locale.getDefault().getLanguage()));
|
||||
|
||||
waitForRecoveriesToFinish(false);
|
||||
|
||||
testBasicSelect();
|
||||
|
|
|
@ -746,7 +746,7 @@ public class TestPointFields extends SolrTestCaseJ4 {
|
|||
max = sortedValues.get(sortedValues.size() - 1).val;
|
||||
buffer = BigDecimal.valueOf(max).subtract(BigDecimal.valueOf(min))
|
||||
.divide(BigDecimal.valueOf(numValues / 2), RoundingMode.HALF_UP).doubleValue();
|
||||
gap = BigDecimal.valueOf(max + buffer).subtract(BigDecimal.valueOf(min - buffer))
|
||||
gap = BigDecimal.valueOf(max).subtract(BigDecimal.valueOf(min)).add(BigDecimal.valueOf(buffer * 2.0D))
|
||||
.divide(BigDecimal.valueOf(numBuckets), RoundingMode.HALF_UP).doubleValue();
|
||||
} while (max >= Double.MAX_VALUE - buffer || min <= -Double.MAX_VALUE + buffer);
|
||||
// System.err.println("min: " + min + " max: " + max + " gap: " + gap + " buffer: " + buffer);
|
||||
|
|
|
@ -0,0 +1 @@
|
|||
82280b09d490c7e4981b5af2d79fcf55efbe6144
|
|
@ -1 +0,0 @@
|
|||
c16b346eef02495f2f4b429fe04c33e526ec0229
|
|
@ -1 +0,0 @@
|
|||
d0f90841119f1ec02a64ef029ff525171a320cff
|
|
@ -0,0 +1 @@
|
|||
1e7995aa0afe4c27a12e7b320a2938dcf05d9581
|
|
@ -1 +0,0 @@
|
|||
b09e988f64c69c21cc61aa734e9955736a07e016
|
|
@ -0,0 +1 @@
|
|||
96c814d27516cf48d439277300252bfb2b00486f
|
|
@ -0,0 +1 @@
|
|||
9d28a6b23650e8a7e9063c04588ace6cf7012c17
|
|
@ -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.
|
|
@ -0,0 +1,8 @@
|
|||
Apache Commons Lang
|
||||
Copyright 2001-2017 The Apache Software Foundation
|
||||
|
||||
This product includes software developed at
|
||||
The Apache Software Foundation (http://www.apache.org/).
|
||||
|
||||
This product includes software from the Spring Framework,
|
||||
under the Apache License 2.0 (see: StringUtils.containsWhitespace())
|
|
@ -72,6 +72,7 @@ public class RegressionEvaluator extends ComplexEvaluator implements Expressible
|
|||
map.put("intercept", regression.getIntercept());
|
||||
map.put("R", regression.getR());
|
||||
map.put("N", regression.getN());
|
||||
map.put("RSquare", regression.getRSquare());
|
||||
map.put("regressionSumSquares", regression.getRegressionSumSquares());
|
||||
map.put("slopeConfidenceInterval", regression.getSlopeConfidenceInterval());
|
||||
map.put("interceptStdErr", regression.getInterceptStdErr());
|
||||
|
|
|
@ -308,13 +308,18 @@ public class ZkMaintenanceUtils {
|
|||
public static void downloadFromZK(SolrZkClient zkClient, String zkPath, Path file) throws IOException {
|
||||
try {
|
||||
List<String> children = zkClient.getChildren(zkPath, null, true);
|
||||
// If it has no children, it's a leaf node, write the assoicated data from the ZNode.
|
||||
// If it has no children, it's a leaf node, write the associated data from the ZNode.
|
||||
// Otherwise, continue recursing, but write the associated data to a special file if any
|
||||
if (children.size() == 0) {
|
||||
// If we didn't copy data down, then we also didn't create the file. But we still need a marker on the local
|
||||
// disk so create a dir.
|
||||
// disk so create an empty file.
|
||||
if (copyDataDown(zkClient, zkPath, file.toFile()) == 0) {
|
||||
Files.createDirectories(file);
|
||||
log.info("EOE Creating file at (var 1)" + file.toAbsolutePath().toString()); // TODO remove me EOE
|
||||
log.info("EOE Creating file at (var2) " + file.toFile().getAbsolutePath()); // TODO remove me EOE
|
||||
Files.createFile(file);
|
||||
log.info("EOE Creating file exists: " + Boolean.toString(file.toFile().exists()));
|
||||
log.info("EOE Creating isFile: " + Boolean.toString(file.toFile().isFile()));
|
||||
log.info("EOE Creating isDirectory: " + Boolean.toString(file.toFile().isDirectory())); //TODO: remove me EOE to here.
|
||||
}
|
||||
} else {
|
||||
Files.createDirectories(file); // Make parent dir.
|
||||
|
|
|
@ -6287,8 +6287,10 @@ public class StreamExpressionTest extends SolrCloudTestCase {
|
|||
Map regression = (Map)tuple.get("regress");
|
||||
double slope = (double)regression.get("slope");
|
||||
double intercept= (double) regression.get("intercept");
|
||||
double rSquare= (double) regression.get("RSquare");
|
||||
assertTrue(slope == 2.0D);
|
||||
assertTrue(intercept == 0.0D);
|
||||
assertTrue(rSquare == 1.0D);
|
||||
double prediction = tuple.getDouble("p");
|
||||
assertTrue(prediction == 600.0D);
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue