You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by dw...@apache.org on 2018/03/29 07:54:43 UTC
[1/2] lucene-solr:master: LUCENE-8228: removed obsolete
IndexDeletionPolicy clone() requirements from the javadoc.
Repository: lucene-solr
Updated Branches:
refs/heads/branch_7x 70b88068e -> 779171533
refs/heads/master 060d82af3 -> e96811c7a
LUCENE-8228: removed obsolete IndexDeletionPolicy clone() requirements from the javadoc.
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/e96811c7
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/e96811c7
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/e96811c7
Branch: refs/heads/master
Commit: e96811c7a5b2882ce5776e71aa094cb95b99e5c8
Parents: 060d82a
Author: Dawid Weiss <dw...@apache.org>
Authored: Thu Mar 29 08:58:28 2018 +0200
Committer: Dawid Weiss <dw...@apache.org>
Committed: Thu Mar 29 08:58:28 2018 +0200
----------------------------------------------------------------------
lucene/CHANGES.txt | 3 +++
.../apache/lucene/index/IndexDeletionPolicy.java | 18 +++++++-----------
.../org/apache/lucene/index/NoDeletionPolicy.java | 6 ------
.../solr/core/IndexDeletionPolicyWrapper.java | 6 ------
4 files changed, 10 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e96811c7/lucene/CHANGES.txt
----------------------------------------------------------------------
diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txt
index c531b5a..1a6c1ef 100644
--- a/lucene/CHANGES.txt
+++ b/lucene/CHANGES.txt
@@ -113,6 +113,9 @@ New Features
Other
+* LUCENE-8228: removed obsolete IndexDeletionPolicy clone() requirements from
+ the javadoc. (Dawid Weiss)
+
* LUCENE-8219: Use a realistic estimate of the number of nodes and links in
LevensteinAutomaton.java, to save reallocation of arrays.
(Christian Ziech)
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e96811c7/lucene/core/src/java/org/apache/lucene/index/IndexDeletionPolicy.java
----------------------------------------------------------------------
diff --git a/lucene/core/src/java/org/apache/lucene/index/IndexDeletionPolicy.java b/lucene/core/src/java/org/apache/lucene/index/IndexDeletionPolicy.java
index b556a04..43d6bfc 100644
--- a/lucene/core/src/java/org/apache/lucene/index/IndexDeletionPolicy.java
+++ b/lucene/core/src/java/org/apache/lucene/index/IndexDeletionPolicy.java
@@ -20,17 +20,17 @@ package org.apache.lucene.index;
import java.util.List;
import java.io.IOException;
-import org.apache.lucene.store.Directory;
-
/**
* <p>Expert: policy for deletion of stale {@link IndexCommit index commits}.
*
- * <p>Implement this interface, and pass it to one
- * of the {@link IndexWriter} or {@link IndexReader}
- * constructors, to customize when older
+ * <p>Implement this interface, and set it on
+ * {@link IndexWriterConfig#setIndexDeletionPolicy(IndexDeletionPolicy)}
+ * to customize when older
* {@link IndexCommit point-in-time commits}
- * are deleted from the index directory. The default deletion policy
- * is {@link KeepOnlyLastCommitDeletionPolicy}, which always
+ * are deleted from the index directory.</p>
+ *
+ * <p>The default deletion policy
+ * is {@link KeepOnlyLastCommitDeletionPolicy}, always
* removes old commits as soon as a new commit is done (this
* matches the behavior before 2.2).</p>
*
@@ -48,10 +48,6 @@ import org.apache.lucene.store.Directory;
* target="top"
* href="http://issues.apache.org/jira/browse/LUCENE-710">LUCENE-710</a>
* for details.</p>
- *
- * <p>Implementers of sub-classes should make sure that {@link #clone()}
- * returns an independent instance able to work with any other {@link IndexWriter}
- * or {@link Directory} instance.</p>
*/
public abstract class IndexDeletionPolicy {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e96811c7/lucene/core/src/java/org/apache/lucene/index/NoDeletionPolicy.java
----------------------------------------------------------------------
diff --git a/lucene/core/src/java/org/apache/lucene/index/NoDeletionPolicy.java b/lucene/core/src/java/org/apache/lucene/index/NoDeletionPolicy.java
index 9b211e1..95c8bb8 100644
--- a/lucene/core/src/java/org/apache/lucene/index/NoDeletionPolicy.java
+++ b/lucene/core/src/java/org/apache/lucene/index/NoDeletionPolicy.java
@@ -38,10 +38,4 @@ public final class NoDeletionPolicy extends IndexDeletionPolicy {
@Override
public void onInit(List<? extends IndexCommit> commits) {}
-
- @Override
- public IndexDeletionPolicy clone() {
- return this;
- }
-
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e96811c7/solr/core/src/java/org/apache/solr/core/IndexDeletionPolicyWrapper.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/core/IndexDeletionPolicyWrapper.java b/solr/core/src/java/org/apache/solr/core/IndexDeletionPolicyWrapper.java
index 3616d4e..2969d5b 100644
--- a/solr/core/src/java/org/apache/solr/core/IndexDeletionPolicyWrapper.java
+++ b/solr/core/src/java/org/apache/solr/core/IndexDeletionPolicyWrapper.java
@@ -267,11 +267,5 @@ public final class IndexDeletionPolicyWrapper extends IndexDeletionPolicy {
return 0;
}
}
-
- @Override
- public IndexDeletionPolicy clone() {
- // see class-level javadocs
- return this;
- }
}
[2/2] lucene-solr:branch_7x: LUCENE-8228: removed obsolete
IndexDeletionPolicy clone() requirements from the javadoc.
Posted by dw...@apache.org.
LUCENE-8228: removed obsolete IndexDeletionPolicy clone() requirements from the javadoc.
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/77917153
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/77917153
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/77917153
Branch: refs/heads/branch_7x
Commit: 779171533ae0191a209a17e114b569313910f4f4
Parents: 70b8806
Author: Dawid Weiss <dw...@apache.org>
Authored: Thu Mar 29 08:58:28 2018 +0200
Committer: Dawid Weiss <dw...@apache.org>
Committed: Thu Mar 29 08:58:49 2018 +0200
----------------------------------------------------------------------
lucene/CHANGES.txt | 3 +++
.../apache/lucene/index/IndexDeletionPolicy.java | 18 +++++++-----------
.../org/apache/lucene/index/NoDeletionPolicy.java | 6 ------
.../solr/core/IndexDeletionPolicyWrapper.java | 6 ------
4 files changed, 10 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/77917153/lucene/CHANGES.txt
----------------------------------------------------------------------
diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txt
index 8465488..13ab3e7 100644
--- a/lucene/CHANGES.txt
+++ b/lucene/CHANGES.txt
@@ -23,6 +23,9 @@ New Features
Other
+* LUCENE-8228: removed obsolete IndexDeletionPolicy clone() requirements from
+ the javadoc. (Dawid Weiss)
+
* LUCENE-8219: Use a realistic estimate of the number of nodes and links in
LevensteinAutomaton.java, to save reallocation of arrays.
(Christian Ziech)
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/77917153/lucene/core/src/java/org/apache/lucene/index/IndexDeletionPolicy.java
----------------------------------------------------------------------
diff --git a/lucene/core/src/java/org/apache/lucene/index/IndexDeletionPolicy.java b/lucene/core/src/java/org/apache/lucene/index/IndexDeletionPolicy.java
index b556a04..43d6bfc 100644
--- a/lucene/core/src/java/org/apache/lucene/index/IndexDeletionPolicy.java
+++ b/lucene/core/src/java/org/apache/lucene/index/IndexDeletionPolicy.java
@@ -20,17 +20,17 @@ package org.apache.lucene.index;
import java.util.List;
import java.io.IOException;
-import org.apache.lucene.store.Directory;
-
/**
* <p>Expert: policy for deletion of stale {@link IndexCommit index commits}.
*
- * <p>Implement this interface, and pass it to one
- * of the {@link IndexWriter} or {@link IndexReader}
- * constructors, to customize when older
+ * <p>Implement this interface, and set it on
+ * {@link IndexWriterConfig#setIndexDeletionPolicy(IndexDeletionPolicy)}
+ * to customize when older
* {@link IndexCommit point-in-time commits}
- * are deleted from the index directory. The default deletion policy
- * is {@link KeepOnlyLastCommitDeletionPolicy}, which always
+ * are deleted from the index directory.</p>
+ *
+ * <p>The default deletion policy
+ * is {@link KeepOnlyLastCommitDeletionPolicy}, always
* removes old commits as soon as a new commit is done (this
* matches the behavior before 2.2).</p>
*
@@ -48,10 +48,6 @@ import org.apache.lucene.store.Directory;
* target="top"
* href="http://issues.apache.org/jira/browse/LUCENE-710">LUCENE-710</a>
* for details.</p>
- *
- * <p>Implementers of sub-classes should make sure that {@link #clone()}
- * returns an independent instance able to work with any other {@link IndexWriter}
- * or {@link Directory} instance.</p>
*/
public abstract class IndexDeletionPolicy {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/77917153/lucene/core/src/java/org/apache/lucene/index/NoDeletionPolicy.java
----------------------------------------------------------------------
diff --git a/lucene/core/src/java/org/apache/lucene/index/NoDeletionPolicy.java b/lucene/core/src/java/org/apache/lucene/index/NoDeletionPolicy.java
index 9b211e1..95c8bb8 100644
--- a/lucene/core/src/java/org/apache/lucene/index/NoDeletionPolicy.java
+++ b/lucene/core/src/java/org/apache/lucene/index/NoDeletionPolicy.java
@@ -38,10 +38,4 @@ public final class NoDeletionPolicy extends IndexDeletionPolicy {
@Override
public void onInit(List<? extends IndexCommit> commits) {}
-
- @Override
- public IndexDeletionPolicy clone() {
- return this;
- }
-
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/77917153/solr/core/src/java/org/apache/solr/core/IndexDeletionPolicyWrapper.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/core/IndexDeletionPolicyWrapper.java b/solr/core/src/java/org/apache/solr/core/IndexDeletionPolicyWrapper.java
index 3616d4e..2969d5b 100644
--- a/solr/core/src/java/org/apache/solr/core/IndexDeletionPolicyWrapper.java
+++ b/solr/core/src/java/org/apache/solr/core/IndexDeletionPolicyWrapper.java
@@ -267,11 +267,5 @@ public final class IndexDeletionPolicyWrapper extends IndexDeletionPolicy {
return 0;
}
}
-
- @Override
- public IndexDeletionPolicy clone() {
- // see class-level javadocs
- return this;
- }
}