You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by is...@apache.org on 2020/08/18 10:52:45 UTC
[lucene-solr] branch master updated: SOLR-14731: Rename
@SolrSingleThreaded to @SolrThreadUnsafe,
mark DistribPackageStore with the annotation
This is an automated email from the ASF dual-hosted git repository.
ishan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
The following commit(s) were added to refs/heads/master by this push:
new 77a4d49 SOLR-14731: Rename @SolrSingleThreaded to @SolrThreadUnsafe, mark DistribPackageStore with the annotation
77a4d49 is described below
commit 77a4d495cc553ec80001346376fd87d6b73a6059
Author: Ishan Chattopadhyaya <is...@apache.org>
AuthorDate: Tue Aug 18 16:21:38 2020 +0530
SOLR-14731: Rename @SolrSingleThreaded to @SolrThreadUnsafe, mark DistribPackageStore with the annotation
Co-authored-by: Marcus <ma...@gmail.com>
---
solr/CHANGES.txt | 3 +++
.../core/src/java/org/apache/solr/filestore/DistribPackageStore.java | 5 +++--
.../src/java/org/apache/solr/handler/component/HttpShardHandler.java | 4 ++--
.../annotation/{SolrSingleThreaded.java => SolrThreadUnsafe.java} | 2 +-
4 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 4e4a34b..911834e 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -207,6 +207,9 @@ Other Changes
* SOLR-14641: PeerSync, remove canHandleVersionRanges check (Cao Manh Dat)
+* SOLR-14731: Rename @SolrSingleThreaded to @SolrThreadUnsafe, mark DistribPackageStore with the annotation
+ (marcussorealheis)
+
================== 8.6.1 ==================
Bug Fixes
diff --git a/solr/core/src/java/org/apache/solr/filestore/DistribPackageStore.java b/solr/core/src/java/org/apache/solr/filestore/DistribPackageStore.java
index 021729f..37aaeb2 100644
--- a/solr/core/src/java/org/apache/solr/filestore/DistribPackageStore.java
+++ b/solr/core/src/java/org/apache/solr/filestore/DistribPackageStore.java
@@ -47,6 +47,7 @@ import org.apache.solr.common.cloud.SolrZkClient;
import org.apache.solr.common.cloud.ZkStateReader;
import org.apache.solr.common.params.CommonParams;
import org.apache.solr.common.util.Utils;
+import org.apache.solr.common.annotation.SolrThreadUnsafe;
import org.apache.solr.core.CoreContainer;
import org.apache.solr.filestore.PackageStoreAPI.MetaData;
import org.apache.solr.util.SimplePostTool;
@@ -60,7 +61,7 @@ import static java.nio.charset.StandardCharsets.UTF_8;
import static org.apache.solr.common.SolrException.ErrorCode.BAD_REQUEST;
import static org.apache.solr.common.SolrException.ErrorCode.SERVER_ERROR;
-
+@SolrThreadUnsafe
public class DistribPackageStore implements PackageStore {
static final long MAX_PKG_SIZE = Long.parseLong(System.getProperty("max.file.store.size", String.valueOf(100 * 1024 * 1024)));
/**
@@ -636,4 +637,4 @@ public class DistribPackageStore implements PackageStore {
log.error("", e);
}
}
-}
\ No newline at end of file
+}
diff --git a/solr/core/src/java/org/apache/solr/handler/component/HttpShardHandler.java b/solr/core/src/java/org/apache/solr/handler/component/HttpShardHandler.java
index f33b783..5aa8012 100644
--- a/solr/core/src/java/org/apache/solr/handler/component/HttpShardHandler.java
+++ b/solr/core/src/java/org/apache/solr/handler/component/HttpShardHandler.java
@@ -38,7 +38,7 @@ import org.apache.solr.client.solrj.util.AsyncListener;
import org.apache.solr.cloud.CloudDescriptor;
import org.apache.solr.cloud.ZkController;
import org.apache.solr.common.SolrException;
-import org.apache.solr.common.annotation.SolrSingleThreaded;
+import org.apache.solr.common.annotation.SolrThreadUnsafe;
import org.apache.solr.common.cloud.Replica;
import org.apache.solr.common.cloud.ZkCoreNodeProps;
import org.apache.solr.common.params.CommonParams;
@@ -52,7 +52,7 @@ import org.apache.solr.request.SolrRequestInfo;
import org.apache.solr.util.tracing.GlobalTracer;
import org.apache.solr.util.tracing.SolrRequestCarrier;
-@SolrSingleThreaded
+@SolrThreadUnsafe
public class HttpShardHandler extends ShardHandler {
/**
* If the request context map has an entry with this key and Boolean.TRUE as value,
diff --git a/solr/solrj/src/java/org/apache/solr/common/annotation/SolrSingleThreaded.java b/solr/solrj/src/java/org/apache/solr/common/annotation/SolrThreadUnsafe.java
similarity index 96%
rename from solr/solrj/src/java/org/apache/solr/common/annotation/SolrSingleThreaded.java
rename to solr/solrj/src/java/org/apache/solr/common/annotation/SolrThreadUnsafe.java
index 3845468..7316237 100644
--- a/solr/solrj/src/java/org/apache/solr/common/annotation/SolrSingleThreaded.java
+++ b/solr/solrj/src/java/org/apache/solr/common/annotation/SolrThreadUnsafe.java
@@ -29,6 +29,6 @@ import java.lang.annotation.Target;
@Documented
@Retention(SOURCE)
@Target(TYPE)
-public @interface SolrSingleThreaded {
+public @interface SolrThreadUnsafe {
}