mirror of https://github.com/apache/lucene.git
Merge remote-tracking branch 'origin/master'
This commit is contained in:
Noble Paul
commit
346e766599
|
|
@ -103,7 +103,10 @@ public class TestIndexSorting extends LuceneTestCase {
|
|||
return new PointsWriter() {
|
||||
@Override
|
||||
public void merge(MergeState mergeState) throws IOException {
|
||||
assertEquals(needsIndexSort, mergeState.needsIndexSort);
|
||||
// For single segment merge we cannot infer if the segment is already sorted or not.
|
||||
if (mergeState.docMaps.length > 1) {
|
||||
assertEquals(needsIndexSort, mergeState.needsIndexSort);
|
||||
}
|
||||
++ numCalls;
|
||||
writer.merge(mergeState);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -241,7 +241,7 @@ org.codehaus.jackson.version = 1.9.13
|
|||
/org.codehaus.woodstox/woodstox-core-asl = 4.4.1
|
||||
/org.easymock/easymock = 3.0
|
||||
|
||||
org.eclipse.jetty.version = 9.3.8.v20160314
|
||||
org.eclipse.jetty.version = 9.3.14.v20161028
|
||||
/org.eclipse.jetty/jetty-continuation = ${org.eclipse.jetty.version}
|
||||
/org.eclipse.jetty/jetty-deploy = ${org.eclipse.jetty.version}
|
||||
/org.eclipse.jetty/jetty-http = ${org.eclipse.jetty.version}
|
||||
|
|
|
|||
|
|
@ -0,0 +1 @@
|
|||
4ba272cee2e367766dfdc1901c960de352160d41
|
||||
|
|
@ -1 +0,0 @@
|
|||
dec4dfc43617637694762822ef99c8373c944c98
|
||||
|
|
@ -0,0 +1 @@
|
|||
ea3800883f79f757b2635a737bb71bb21e90cf19
|
||||
|
|
@ -1 +0,0 @@
|
|||
0127feb7407f4137ff4295b5fa2895845db56710
|
||||
|
|
@ -0,0 +1 @@
|
|||
52d796b58c3a997e59e6b47c4bf022cedcba3514
|
||||
|
|
@ -1 +0,0 @@
|
|||
371e3c2b72d9a9737579ec0fdfd6a2a3ab8b8141
|
||||
|
|
@ -0,0 +1 @@
|
|||
791df6c55ad62841ff518ba6634e905a95567260
|
||||
|
|
@ -1 +0,0 @@
|
|||
da8366f602f35d4c3177cb081472e2fc4abe04ea
|
||||
|
|
@ -0,0 +1 @@
|
|||
b5714a6005387b2a361d5b39a3a37d4df1892e62
|
||||
|
|
@ -1 +0,0 @@
|
|||
ea5f25d3326d7745d9c21d405dcf6f878efbd5fb
|
||||
|
|
@ -0,0 +1 @@
|
|||
fbf89f6f3b995992f82ec09104ab9a75d31d281b
|
||||
|
|
@ -1 +0,0 @@
|
|||
01d53c7a7e7715e67d6f4edec6c5b328ee162e65
|
||||
|
|
@ -74,7 +74,7 @@ Carrot2 3.15.0
|
|||
Velocity 1.7 and Velocity Tools 2.0
|
||||
Apache UIMA 2.3.1
|
||||
Apache ZooKeeper 3.4.6
|
||||
Jetty 9.3.8.v20160314
|
||||
Jetty 9.3.14.v20161028
|
||||
|
||||
Detailed Change List
|
||||
----------------------
|
||||
|
|
@ -239,6 +239,8 @@ Other Changes
|
|||
|
||||
* SOLR-9784: Refactor CloudSolrClient to eliminate direct dependency on ZK (noble)
|
||||
|
||||
* SOLR-9801: Upgrade jetty to 9.3.14.v20161028 (shalin)
|
||||
|
||||
================== 6.3.0 ==================
|
||||
|
||||
Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release.
|
||||
|
|
|
|||
|
|
@ -1,21 +1,3 @@
|
|||
<!--
|
||||
Licensed to the Apache Software Foundation (ASF) under one or more
|
||||
contributor license agreements. See the NOTICE file distributed with
|
||||
this work for additional information regarding copyright ownership.
|
||||
The ASF licenses this file to You 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.
|
||||
-->
|
||||
|
||||
<?xml version="1.0" ?>
|
||||
<!--
|
||||
Licensed to the Apache Software Foundation (ASF) under one or more
|
||||
contributor license agreements. See the NOTICE file distributed with
|
||||
|
|
@ -33,7 +15,7 @@
|
|||
limitations under the License.
|
||||
-->
|
||||
|
||||
<!-- Test schema file for PostingsHighlighter -->
|
||||
<!-- Test schema file for UnifiedHighlighter -->
|
||||
|
||||
<schema name="unifiedhighlight" version="1.0">
|
||||
<fieldType name="int" class="solr.TrieIntField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
|
||||
|
|
|
|||
|
|
@ -25,6 +25,7 @@ import java.util.Map;
|
|||
|
||||
import com.carrotsearch.randomizedtesting.rules.SystemPropertiesRestoreRule;
|
||||
import org.apache.commons.io.FileUtils;
|
||||
import org.apache.lucene.util.Constants;
|
||||
import org.apache.solr.SolrTestCaseJ4;
|
||||
import org.apache.solr.client.solrj.embedded.JettySolrRunner;
|
||||
import org.apache.solr.client.solrj.impl.HttpSolrClient;
|
||||
|
|
@ -283,6 +284,7 @@ public class CoreAdminHandlerTest extends SolrTestCaseJ4 {
|
|||
|
||||
@Test
|
||||
public void testDeleteInstanceDirAfterCreateFailure() throws Exception {
|
||||
assumeFalse("Ignore test on windows because it does not delete data directory immediately after unload", Constants.WINDOWS);
|
||||
File solrHomeDirectory = new File(initCoreDataDir, getClass().getName() + "-corex-"
|
||||
+ System.nanoTime());
|
||||
solrHomeDirectory.mkdirs();
|
||||
|
|
|
|||
|
|
@ -0,0 +1 @@
|
|||
4ba272cee2e367766dfdc1901c960de352160d41
|
||||
|
|
@ -1 +0,0 @@
|
|||
dec4dfc43617637694762822ef99c8373c944c98
|
||||
|
|
@ -0,0 +1 @@
|
|||
f2aae796f4643180b4e4a159dafc4403e6b25ca7
|
||||
|
|
@ -1 +0,0 @@
|
|||
fe4025121641f5c4b06986e9b14983964bfcd7d5
|
||||
|
|
@ -0,0 +1 @@
|
|||
ea3800883f79f757b2635a737bb71bb21e90cf19
|
||||
|
|
@ -1 +0,0 @@
|
|||
0127feb7407f4137ff4295b5fa2895845db56710
|
||||
|
|
@ -0,0 +1 @@
|
|||
52d796b58c3a997e59e6b47c4bf022cedcba3514
|
||||
|
|
@ -1 +0,0 @@
|
|||
371e3c2b72d9a9737579ec0fdfd6a2a3ab8b8141
|
||||
|
|
@ -0,0 +1 @@
|
|||
d4829a57973c36f117792455024684bb6a5202aa
|
||||
|
|
@ -1 +0,0 @@
|
|||
4aca2eb607d49969bac6a5f36be24ebe1d6d39ad
|
||||
|
|
@ -0,0 +1 @@
|
|||
823899b9456b3337422e0d98851cfe7842ef2516
|
||||
|
|
@ -1 +0,0 @@
|
|||
264a34089a62d22cea8e38f6ab6c55d8cef992dc
|
||||
|
|
@ -0,0 +1 @@
|
|||
68be91fa1bcc82eed1709d36e6a85db7d5aff331
|
||||
|
|
@ -1 +0,0 @@
|
|||
5291fa5e3098f08017bfcc7f950a7ce36c9544d7
|
||||
|
|
@ -0,0 +1 @@
|
|||
791df6c55ad62841ff518ba6634e905a95567260
|
||||
|
|
@ -1 +0,0 @@
|
|||
da8366f602f35d4c3177cb081472e2fc4abe04ea
|
||||
|
|
@ -0,0 +1 @@
|
|||
b5714a6005387b2a361d5b39a3a37d4df1892e62
|
||||
|
|
@ -1 +0,0 @@
|
|||
ea5f25d3326d7745d9c21d405dcf6f878efbd5fb
|
||||
|
|
@ -0,0 +1 @@
|
|||
6f49da101a1c3cd1ccd78ac38391bbc36619658e
|
||||
|
|
@ -1 +0,0 @@
|
|||
7c6cca49412e873cc2cee9903e3209525175f60d
|
||||
|
|
@ -0,0 +1 @@
|
|||
fbf89f6f3b995992f82ec09104ab9a75d31d281b
|
||||
|
|
@ -1 +0,0 @@
|
|||
01d53c7a7e7715e67d6f4edec6c5b328ee162e65
|
||||
|
|
@ -0,0 +1 @@
|
|||
c9ad20bd632ffe1d8e4631f2ed185310db258f48
|
||||
|
|
@ -1 +0,0 @@
|
|||
2f0dfef84af7c97f2a1f14db65aa3f37349420e4
|
||||
|
|
@ -0,0 +1 @@
|
|||
3054375490c577ee6156a4b63ec262a39b36fc7e
|
||||
|
|
@ -1 +0,0 @@
|
|||
f02bbbf71d7ea706a95fedf7e76c3ff243049bfc
|
||||
|
|
@ -1 +1 @@
|
|||
365649a3404c9baa5b0345b3375cd9698f3cc43d
|
||||
122f8028ab12222c9c9b6a7861d9cd3cc5d2ad45
|
||||
|
|
|
|||
Loading…
Reference in New Issue