You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2016/08/25 12:25:20 UTC
[1/2] lucene-solr:branch_6x: make javadoc less confusing
Repository: lucene-solr
Updated Branches:
refs/heads/branch_6x daa719996 -> e3b08517c
make javadoc less confusing
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/2fcccc03
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/2fcccc03
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/2fcccc03
Branch: refs/heads/branch_6x
Commit: 2fcccc037d101385c60b9e8ca4a65c005072ddb9
Parents: daa7199
Author: Robert Muir <rm...@apache.org>
Authored: Wed Aug 24 13:23:02 2016 -0400
Committer: Robert Muir <rm...@apache.org>
Committed: Thu Aug 25 08:22:16 2016 -0400
----------------------------------------------------------------------
.../src/java/org/apache/lucene/document/InetAddressPoint.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/2fcccc03/lucene/sandbox/src/java/org/apache/lucene/document/InetAddressPoint.java
----------------------------------------------------------------------
diff --git a/lucene/sandbox/src/java/org/apache/lucene/document/InetAddressPoint.java b/lucene/sandbox/src/java/org/apache/lucene/document/InetAddressPoint.java
index 88684f6..5cda742 100644
--- a/lucene/sandbox/src/java/org/apache/lucene/document/InetAddressPoint.java
+++ b/lucene/sandbox/src/java/org/apache/lucene/document/InetAddressPoint.java
@@ -41,7 +41,7 @@ import org.apache.lucene.util.StringHelper;
* <li>{@link #newExactQuery(String, InetAddress)} for matching an exact network address.
* <li>{@link #newPrefixQuery(String, InetAddress, int)} for matching a network based on CIDR prefix.
* <li>{@link #newRangeQuery(String, InetAddress, InetAddress)} for matching arbitrary network address ranges.
- * <li>{@link #newSetQuery(String, InetAddress...)} for matching a set of 1D values.
+ * <li>{@link #newSetQuery(String, InetAddress...)} for matching a set of network addresses.
* </ul>
* <p>
* This field supports both IPv4 and IPv6 addresses: IPv4 addresses are converted
[2/2] lucene-solr:branch_6x: LUCENE-7422: fix bugs in test's retry
loop
Posted by rm...@apache.org.
LUCENE-7422: fix bugs in test's retry loop
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/e3b08517
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/e3b08517
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/e3b08517
Branch: refs/heads/branch_6x
Commit: e3b08517c56307e75fc2d74c10efd52cd353feef
Parents: 2fcccc0
Author: Robert Muir <rm...@apache.org>
Authored: Thu Aug 25 08:20:53 2016 -0400
Committer: Robert Muir <rm...@apache.org>
Committed: Thu Aug 25 08:22:26 2016 -0400
----------------------------------------------------------------------
.../org/apache/lucene/index/TestAllFilesCheckIndexHeader.java | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e3b08517/lucene/core/src/test/org/apache/lucene/index/TestAllFilesCheckIndexHeader.java
----------------------------------------------------------------------
diff --git a/lucene/core/src/test/org/apache/lucene/index/TestAllFilesCheckIndexHeader.java b/lucene/core/src/test/org/apache/lucene/index/TestAllFilesCheckIndexHeader.java
index dfb2f1b..b4c6368 100644
--- a/lucene/core/src/test/org/apache/lucene/index/TestAllFilesCheckIndexHeader.java
+++ b/lucene/core/src/test/org/apache/lucene/index/TestAllFilesCheckIndexHeader.java
@@ -28,6 +28,8 @@ import org.apache.lucene.store.Directory;
import org.apache.lucene.store.IOContext;
import org.apache.lucene.store.IndexInput;
import org.apache.lucene.store.IndexOutput;
+import org.apache.lucene.store.MockDirectoryWrapper;
+import org.apache.lucene.store.RAMDirectory;
import org.apache.lucene.util.LineFileDocs;
import org.apache.lucene.util.LuceneTestCase.SuppressFileSystems;
import org.apache.lucene.util.LuceneTestCase;
@@ -84,7 +86,8 @@ public class TestAllFilesCheckIndexHeader extends LuceneTestCase {
}
private void checkOneFile(Directory dir, String victim) throws IOException {
- try (BaseDirectoryWrapper dirCopy = newDirectory()) {
+ // use ramdir explicit, as we do evil things like try to generate broken files, deletes must work.
+ try (BaseDirectoryWrapper dirCopy = new MockDirectoryWrapper(random(), new RAMDirectory())) {
dirCopy.setCheckIndexOnClose(false);
long victimLength = dir.fileLength(victim);
@@ -117,6 +120,8 @@ public class TestAllFilesCheckIndexHeader extends LuceneTestCase {
break;
}
}
+ // we have to try again, delete the first attempt and retry the loop
+ dirCopy.deleteFile(name);
}
}
dirCopy.sync(Collections.singleton(name));