You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by mi...@apache.org on 2016/02/11 17:42:51 UTC
[17/31] lucene-solr git commit: Merge branch 'master' into
jira/lucene-5438-nrt-replication
Merge branch 'master' into jira/lucene-5438-nrt-replication
Conflicts:
lucene/core/src/java/org/apache/lucene/index/IndexFileDeleter.java
lucene/test-framework/src/java/org/apache/lucene/store/MockDirectoryWrapper.java
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/9ba62e5e
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/9ba62e5e
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/9ba62e5e
Branch: refs/heads/master
Commit: 9ba62e5e3833b99fbec4ba1775a5d1c12254556d
Parents: 6369012 1d4d9c5
Author: Mike McCandless <mi...@apache.org>
Authored: Sun Feb 7 14:03:13 2016 -0500
Committer: Mike McCandless <mi...@apache.org>
Committed: Sun Feb 7 14:03:13 2016 -0500
----------------------------------------------------------------------
.../icu/segmentation/ScriptIterator.java | 2 +-
.../apache/lucene/index/IndexFileDeleter.java | 36 +------
.../org/apache/lucene/index/IndexWriter.java | 2 +-
.../org/apache/lucene/store/FSDirectory.java | 15 ++-
.../lucene/store/FileSwitchDirectory.java | 5 +-
.../lucene/store/NRTCachingDirectory.java | 4 +-
.../lucene/TestMergeSchedulerExternal.java | 39 ++++---
.../lucene/index/TestIndexFileDeleter.java | 76 ++++++++++++++
.../apache/lucene/index/TestIndexWriter.java | 11 +-
.../jaspell/JaspellTernarySearchTrie.java | 2 +-
.../lucene/store/BaseDirectoryTestCase.java | 26 +++++
.../lucene/store/BaseLockFactoryTestCase.java | 9 +-
.../lucene/store/MockDirectoryWrapper.java | 103 +++++++++----------
solr/CHANGES.txt | 6 ++
.../solr/update/StreamingSolrClients.java | 4 +-
.../solr/client/solrj/io/SolrClientCache.java | 13 ++-
.../client/solrj/io/sql/ConnectionImpl.java | 14 +--
.../solrj/io/sql/DatabaseMetaDataImpl.java | 95 ++++++++++++++---
.../solr/client/solrj/io/sql/StatementImpl.java | 16 ++-
.../solr/client/solrj/io/sql/JdbcTest.java | 28 ++++-
20 files changed, 360 insertions(+), 146 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/9ba62e5e/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/9ba62e5e/lucene/core/src/java/org/apache/lucene/store/NRTCachingDirectory.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/9ba62e5e/lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/9ba62e5e/lucene/test-framework/src/java/org/apache/lucene/store/MockDirectoryWrapper.java
----------------------------------------------------------------------
diff --cc lucene/test-framework/src/java/org/apache/lucene/store/MockDirectoryWrapper.java
index 9e25889,515f012..a36d6d4
--- a/lucene/test-framework/src/java/org/apache/lucene/store/MockDirectoryWrapper.java
+++ b/lucene/test-framework/src/java/org/apache/lucene/store/MockDirectoryWrapper.java
@@@ -833,12 -721,13 +833,12 @@@ public class MockDirectoryWrapper exten
}
throw new RuntimeException("MockDirectoryWrapper: cannot close: there are still open locks: " + openLocks, cause);
}
-
+ randomIOExceptionRate = 0.0;
+ randomIOExceptionRateOnOpen = 0.0;
- if (getCheckIndexOnClose()) {
- randomIOExceptionRate = 0.0;
- randomIOExceptionRateOnOpen = 0.0;
+ if ((getCheckIndexOnClose() || assertNoUnreferencedFilesOnClose) && DirectoryReader.indexExists(this)) {
+ if (getCheckIndexOnClose()) {
- if (DirectoryReader.indexExists(this)) {
if (LuceneTestCase.VERBOSE) {
System.out.println("\nNOTE: MockDirectoryWrapper: now crush");
}