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/04 18:17:40 UTC
[11/12] lucene-solr git commit: merge master
merge master
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/9cf74f79
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/9cf74f79
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/9cf74f79
Branch: refs/heads/lucene-6835
Commit: 9cf74f791c23c8c117e1fa148e104a27d15659cf
Parents: 8cd731b 732b8fb
Author: Mike McCandless <mi...@apache.org>
Authored: Wed Feb 3 17:03:23 2016 -0500
Committer: Mike McCandless <mi...@apache.org>
Committed: Wed Feb 3 17:03:23 2016 -0500
----------------------------------------------------------------------
.../dot.settings/org.eclipse.jdt.ui.prefs | 3 +-
dev-tools/git/HELP.txt | 14 +++++
.../idea/.idea/copyright/profiles_settings.xml | 2 +-
lucene/CHANGES.txt | 6 ++
.../simpletext/SimpleTextPointWriter.java | 37 ++++++------
.../org/apache/lucene/store/FSDirectory.java | 1 -
.../org/apache/lucene/util/LuceneTestCase.java | 22 +++++++
solr/CHANGES.txt | 3 +
.../org/apache/solr/core/CoreContainer.java | 58 +++++++++++--------
.../org/apache/solr/handler/SQLHandler.java | 57 +++++++++++++++++-
.../handler/admin/CoreAdminHandlerTest.java | 61 ++++++++++++++++++--
.../solrj/io/sql/DatabaseMetaDataImpl.java | 4 +-
.../solr/client/solrj/io/sql/JdbcTest.java | 16 +++++
13 files changed, 231 insertions(+), 53 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/9cf74f79/lucene/core/src/java/org/apache/lucene/store/FSDirectory.java
----------------------------------------------------------------------
diff --cc lucene/core/src/java/org/apache/lucene/store/FSDirectory.java
index da69aca,400ad5d..14bb7af
--- a/lucene/core/src/java/org/apache/lucene/store/FSDirectory.java
+++ b/lucene/core/src/java/org/apache/lucene/store/FSDirectory.java
@@@ -269,13 -245,6 +269,12 @@@ public abstract class FSDirectory exten
}
}
+ protected void ensureCanRead(String name) throws IOException {
- maybeDeletePendingFiles();
+ if (pendingDeletes.contains(name)) {
+ throw new NoSuchFileException("file \"" + name + "\" is pending delete and cannot be opened for read");
+ }
+ }
+
@Override
public void sync(Collection<String> names) throws IOException {
ensureOpen();