This is an automated email from the ASF dual-hosted git repository.
krathbun pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/accumulo.git
The following commit(s) were added to refs/heads/main by this push:
new 9749dc28be Cleans up references to 3.1 (#5659)
9749dc28be is described below
commit 9749dc28be13838a4c4846db8e71af602caae1ea
Author: Kevin Rathbun <[email protected]>
AuthorDate: Tue Jul 8 12:13:37 2025 -0400
Cleans up references to 3.1 (#5659)
* Cleans up references to 3.1
Cleans up references to 3.1 which are no longer applicable since 3.1 has
since been dropped.
---
.../accumulo/core/client/PluginEnvironment.java | 2 +-
.../core/client/admin/ActiveCompaction.java | 2 +-
.../core/client/admin/InstanceOperations.java | 2 +-
.../client/admin/compaction/CompactableFile.java | 4 +--
.../admin/compaction/CompactionConfigurer.java | 2 +-
.../apache/accumulo/core/client/rfile/RFile.java | 4 +--
.../accumulo/core/client/rfile/RFileSource.java | 4 +--
.../core/clientImpl/TabletServerBatchWriter.java | 39 +++++-----------------
.../org/apache/accumulo/core/conf/Property.java | 17 +++++-----
.../accumulo/core/data/ArrayByteSequence.java | 2 +-
.../java/org/apache/accumulo/core/data/Key.java | 10 +++---
.../org/apache/accumulo/core/data/KeyBuilder.java | 8 ++---
.../blockfile/cache/lru/LruBlockCacheManager.java | 2 +-
.../core/metadata/schema/MetadataSchema.java | 4 +--
.../accumulo/core/security/Authorizations.java | 2 +-
.../accumulo/core/security/ColumnVisibility.java | 2 +-
.../core/security/VisibilityParseException.java | 2 +-
.../apache/accumulo/core/spi/cache/BlockCache.java | 2 +-
.../core/spi/common/ServiceEnvironment.java | 2 +-
.../core/spi/compaction/CompactorGroupId.java | 2 +-
.../accumulo/core/spi/compaction/GroupManager.java | 2 +-
.../core/spi/ondemand/OnDemandTabletUnloader.java | 12 +++----
.../accumulo/server/AccumuloDataVersion.java | 3 +-
.../manager/tableOps/tableExport/ExportTable.java | 4 +--
.../tableImport/PopulateMetadataTable.java | 2 +-
.../org/apache/accumulo/test/ImportExportIT.java | 2 +-
.../org/apache/accumulo/test/ZombieScanIT.java | 7 ----
.../apache/accumulo/test/functional/ScannerIT.java | 7 ----
28 files changed, 58 insertions(+), 95 deletions(-)
diff --git
a/core/src/main/java/org/apache/accumulo/core/client/PluginEnvironment.java
b/core/src/main/java/org/apache/accumulo/core/client/PluginEnvironment.java
index 3700086b96..1d590110b5 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/PluginEnvironment.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/PluginEnvironment.java
@@ -140,7 +140,7 @@ public interface PluginEnvironment {
*
* @param includeDefaults If true will include accumulo's default
properties and layer the
* passed in map on top of these.
- * @since 3.1.0
+ * @since 4.0.0
*/
static Configuration from(Map<String,String> properties, boolean
includeDefaults) {
ConfigurationCopy config = includeDefaults
diff --git
a/core/src/main/java/org/apache/accumulo/core/client/admin/ActiveCompaction.java
b/core/src/main/java/org/apache/accumulo/core/client/admin/ActiveCompaction.java
index 3b461e0758..49cb7a32fd 100644
---
a/core/src/main/java/org/apache/accumulo/core/client/admin/ActiveCompaction.java
+++
b/core/src/main/java/org/apache/accumulo/core/client/admin/ActiveCompaction.java
@@ -58,7 +58,7 @@ public abstract class ActiveCompaction {
* @deprecated Chop compactions no longer occur and it's not expected that
listing compaction
* would ever return this.
*/
- @Deprecated(since = "3.1.0")
+ @Deprecated(since = "4.0.0")
CHOP,
/**
* idle compaction
diff --git
a/core/src/main/java/org/apache/accumulo/core/client/admin/InstanceOperations.java
b/core/src/main/java/org/apache/accumulo/core/client/admin/InstanceOperations.java
index 739fc3ee70..69795af524 100644
---
a/core/src/main/java/org/apache/accumulo/core/client/admin/InstanceOperations.java
+++
b/core/src/main/java/org/apache/accumulo/core/client/admin/InstanceOperations.java
@@ -178,7 +178,7 @@ public interface InstanceOperations {
* {@link #getSystemConfiguration} for a merged view.
*
* @return A map of the system properties set in Zookeeper only.
- * @since 3.1
+ * @since 4.0.0
*/
Map<String,String> getSystemProperties() throws AccumuloException,
AccumuloSecurityException;
diff --git
a/core/src/main/java/org/apache/accumulo/core/client/admin/compaction/CompactableFile.java
b/core/src/main/java/org/apache/accumulo/core/client/admin/compaction/CompactableFile.java
index 36b2d7b0ea..8f9a9abbc1 100644
---
a/core/src/main/java/org/apache/accumulo/core/client/admin/compaction/CompactableFile.java
+++
b/core/src/main/java/org/apache/accumulo/core/client/admin/compaction/CompactableFile.java
@@ -40,7 +40,7 @@ public interface CompactableFile {
* not have a range then an infinite range is returned. The URI plus
this range uniquely
* identify a file.
*
- * @since 3.1.0
+ * @since 4.0.0
*/
public Range getRange();
@@ -55,7 +55,7 @@ public interface CompactableFile {
/**
* Creates a new CompactableFile object that implements this interface.
*
- * @since 3.1.0
+ * @since 4.0.0
*/
static CompactableFile create(URI uri, Range range, long estimatedSize, long
estimatedEntries) {
return new CompactableFileImpl(uri, range, estimatedSize,
estimatedEntries);
diff --git
a/core/src/main/java/org/apache/accumulo/core/client/admin/compaction/CompactionConfigurer.java
b/core/src/main/java/org/apache/accumulo/core/client/admin/compaction/CompactionConfigurer.java
index 1e0e47c0f8..2d3e94e11a 100644
---
a/core/src/main/java/org/apache/accumulo/core/client/admin/compaction/CompactionConfigurer.java
+++
b/core/src/main/java/org/apache/accumulo/core/client/admin/compaction/CompactionConfigurer.java
@@ -78,7 +78,7 @@ public interface CompactionConfigurer {
* <li>There is no selected set of files so the empty set is returned.</li>
* </ul>
*
- * @since 3.1
+ * @since 4.0.0
*/
public Set<CompactableFile> getSelectedFiles();
diff --git
a/core/src/main/java/org/apache/accumulo/core/client/rfile/RFile.java
b/core/src/main/java/org/apache/accumulo/core/client/rfile/RFile.java
index 008620eb3f..01bfd14af7 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/rfile/RFile.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/rfile/RFile.java
@@ -91,12 +91,12 @@ public class RFile {
* @param files one or more FencedPaths to read.
* @return this
*
- * @since 3.1.0
+ * @since 4.0.0
*/
ScannerFSOptions from(FencedPath... files);
/**
- * @since 3.1.0
+ * @since 4.0.0
*/
class FencedPath {
private final Path path;
diff --git
a/core/src/main/java/org/apache/accumulo/core/client/rfile/RFileSource.java
b/core/src/main/java/org/apache/accumulo/core/client/rfile/RFileSource.java
index a77e2a4a64..1711e8d6e6 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/rfile/RFileSource.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/rfile/RFileSource.java
@@ -39,7 +39,7 @@ public class RFileSource {
}
/**
- * @since 3.1.0
+ * @since 4.0.0
*/
public RFileSource(InputStream in, long len, Range range) {
this.in = Objects.requireNonNull(in);
@@ -58,7 +58,7 @@ public class RFileSource {
/**
* @return The range of the RFileSource
*
- * @since 3.1.0
+ * @since 4.0.0
*/
public Range getRange() {
return range;
diff --git
a/core/src/main/java/org/apache/accumulo/core/clientImpl/TabletServerBatchWriter.java
b/core/src/main/java/org/apache/accumulo/core/clientImpl/TabletServerBatchWriter.java
index de0f73e31d..ab3bb1a1a5 100644
---
a/core/src/main/java/org/apache/accumulo/core/clientImpl/TabletServerBatchWriter.java
+++
b/core/src/main/java/org/apache/accumulo/core/clientImpl/TabletServerBatchWriter.java
@@ -1096,8 +1096,6 @@ public class TabletServerBatchWriter implements
AutoCloseable {
long startTime = System.nanoTime();
- boolean useCloseUpdate = false;
-
// If somethingFailed is true then the batch writer will throw an
exception on close or
// flush, so no need to close this session. Only want to close the
session for retryable
// exceptions.
@@ -1123,21 +1121,12 @@ public class TabletServerBatchWriter implements
AutoCloseable {
} else {
client = ThriftUtil.getClient(ThriftClientTypes.TABLET_INGEST,
parsedServer, context);
}
-
- if (useCloseUpdate) {
- // This compatability handling for accumulo version 2.1.2 and
earlier that did not
- // have cancelUpdate. Can remove this in 3.1.
- client.closeUpdate(TraceUtil.traceInfo(), usid.getAsLong());
- retry.logCompletion(log, "Closed failed write session " +
location + " " + usid);
+ if (client.cancelUpdate(TraceUtil.traceInfo(), usid.getAsLong())) {
+ retry.logCompletion(log, "Canceled failed write session " +
location + " " + usid);
break;
} else {
- if (client.cancelUpdate(TraceUtil.traceInfo(),
usid.getAsLong())) {
- retry.logCompletion(log, "Canceled failed write session " +
location + " " + usid);
- break;
- } else {
- retry.waitForNextAttempt(log,
- "Attempting to cancel failed write session " + location +
" " + usid);
- }
+ retry.waitForNextAttempt(log,
+ "Attempting to cancel failed write session " + location + "
" + usid);
}
} catch (NoSuchScanIDException e) {
retry.logCompletion(log,
@@ -1145,24 +1134,14 @@ public class TabletServerBatchWriter implements
AutoCloseable {
// The session no longer exists, so done
break;
} catch (TApplicationException tae) {
- if (tae.getType() == TApplicationException.UNKNOWN_METHOD &&
!useCloseUpdate) {
- useCloseUpdate = true;
- log.debug(
- "Accumulo server {} does not have cancelUpdate, falling back
to closeUpdate.",
- location);
- retry.waitForNextAttempt(log, "Attempting to cancel failed write
session " + location
- + " " + usid + " " + tae.getMessage());
- } else {
- // no need to bother closing session in this case
- updateServerErrors(location, tae);
- break;
- }
+ // no need to bother closing session in this case
+ updateServerErrors(location, tae);
+ break;
} catch (ThriftSecurityException e) {
throw e;
} catch (TException e) {
- String op = useCloseUpdate ? "close" : "cancel";
- retry.waitForNextAttempt(log, "Attempting to " + op + " failed
write session "
- + location + " " + usid + " " + e.getMessage());
+ retry.waitForNextAttempt(log, "Attempting to cancel failed write
session " + location
+ + " " + usid + " " + e.getMessage());
} finally {
ThriftUtil.returnClient(client, context);
}
diff --git a/core/src/main/java/org/apache/accumulo/core/conf/Property.java
b/core/src/main/java/org/apache/accumulo/core/conf/Property.java
index faf09b0189..8139e31ff3 100644
--- a/core/src/main/java/org/apache/accumulo/core/conf/Property.java
+++ b/core/src/main/java/org/apache/accumulo/core/conf/Property.java
@@ -52,7 +52,7 @@ import com.google.common.base.Preconditions;
public enum Property {
COMPACTION_PREFIX("compaction.", null, PropertyType.PREFIX,
- "Both major and minor compaction properties can be included under this
prefix.", "3.1.0"),
+ "Both major and minor compaction properties can be included under this
prefix.", "4.0.0"),
COMPACTION_SERVICE_PREFIX(COMPACTION_PREFIX + "service.", null,
PropertyType.PREFIX,
"This prefix should be used to define all properties for the compaction
services."
+ "See {% jlink -f
org.apache.accumulo.core.spi.compaction.RatioBasedCompactionPlanner %}.\n"
@@ -64,7 +64,7 @@ public enum Property {
+ "{ \"group\":\"medium\",
\"maxSize\":\"512M\"},{\"group\":\"large\"}]`\n"
+ "`compaction.service.newService.opts.maxOpen=50`.\n"
+ "Additional options can be defined using the
`compaction.service.<service>.opts.<option>` property.",
- "3.1.0"),
+ "4.0.0"),
COMPACTION_SERVICE_DEFAULT_PLANNER(
COMPACTION_SERVICE_PREFIX + DEFAULT_COMPACTION_SERVICE_NAME + ".planner",
RatioBasedCompactionPlanner.class.getName(), PropertyType.CLASSNAME,
@@ -77,7 +77,7 @@ public enum Property {
"4.0.0"),
COMPACTION_WARN_TIME(COMPACTION_PREFIX + "warn.time", "10m",
PropertyType.TIMEDURATION,
"When a compaction has not made progress for this time period, a warning
will be logged.",
- "3.1.0"),
+ "4.0.0"),
// SSL properties local to each node (see also instance.ssl.enabled which
must be consistent
// across all nodes in an instance)
RPC_PREFIX("rpc.", null, PropertyType.PREFIX,
@@ -372,8 +372,7 @@ public enum Property {
"A comma separated list of tags to emit with all metrics from the
process. Example:"
+ "\"tag1=value1,tag2=value2\".",
"4.0.0"),
- // TODO: Make sure to backport this to 3.1, then remove here in 4.0
- @Deprecated(since = "3.1.0")
+ @Deprecated(since = "4.0.0")
@ReplacedBy(property = RPC_PROCESS_BIND_ADDRESS)
GENERAL_PROCESS_BIND_ADDRESS("general.process.bind.addr", "0.0.0.0",
PropertyType.STRING,
"The local IP address to which this server should bind for sending and
receiving network traffic.",
@@ -381,7 +380,7 @@ public enum Property {
GENERAL_SERVER_LOCK_VERIFICATION_INTERVAL("general.server.lock.verification.interval",
"2m",
PropertyType.TIMEDURATION,
"Interval at which the Manager and TabletServer should verify their
server locks. A value of zero"
- + " disables this check. The default value change from 0 to 2m in
3.1.0.",
+ + " disables this check. The default value changed from 0 to 2m in
4.0.0.",
"2.1.4"),
// properties that are specific to manager server behavior
MANAGER_PREFIX("manager.", null, PropertyType.PREFIX,
@@ -526,13 +525,13 @@ public enum Property {
+ "needed.",
"4.0.0"),
SPLIT_PREFIX("split.", null, PropertyType.PREFIX,
- "System wide properties related to splitting tablets.", "3.1.0"),
+ "System wide properties related to splitting tablets.", "4.0.0"),
SPLIT_MAXOPEN("split.files.max", "300", PropertyType.COUNT,
"To find a tablets split points, all RFiles are opened and their indexes"
+ " are read. This setting determines how many RFiles can be opened
at once."
+ " When there are more RFiles than this setting the tablet will be
marked"
+ " as un-splittable.",
- "3.1.0"),
+ "4.0.0"),
// properties that are specific to scan server behavior
SSERV_PREFIX("sserver.", null, PropertyType.PREFIX,
"Properties in this category affect the behavior of the scan servers.",
"2.1.0"),
@@ -947,7 +946,7 @@ public enum Property {
+ ". These two properties together can be used to control that
amount of time it takes for a scan "
+ "server to see a write to a tablet server. The default value of
this property is set to such a "
+ "high value that is should never cause a minor compaction.",
- "3.1.0"),
+ "4.0.0"),
TABLE_COMPACTION_DISPATCHER("table.compaction.dispatcher",
SimpleCompactionDispatcher.class.getName(), PropertyType.CLASSNAME,
"A configurable dispatcher that decides what compaction service a table
should use.",
diff --git
a/core/src/main/java/org/apache/accumulo/core/data/ArrayByteSequence.java
b/core/src/main/java/org/apache/accumulo/core/data/ArrayByteSequence.java
index 608804a0f6..843b1a4bb5 100644
--- a/core/src/main/java/org/apache/accumulo/core/data/ArrayByteSequence.java
+++ b/core/src/main/java/org/apache/accumulo/core/data/ArrayByteSequence.java
@@ -149,7 +149,7 @@ public class ArrayByteSequence extends ByteSequence
implements Serializable {
/**
* Reset the backing array for this byte sequence object. This is useful for
object re-use.
*
- * @since 3.1.0
+ * @since 4.0.0
*/
public void reset(byte[] data, int offset, int length) {
Objects.checkFromIndexSize(offset, length, data.length);
diff --git a/core/src/main/java/org/apache/accumulo/core/data/Key.java
b/core/src/main/java/org/apache/accumulo/core/data/Key.java
index 10359591d5..e31e39b80a 100644
--- a/core/src/main/java/org/apache/accumulo/core/data/Key.java
+++ b/core/src/main/java/org/apache/accumulo/core/data/Key.java
@@ -562,7 +562,7 @@ public class Key implements WritableComparable<Key>,
Cloneable {
* instead.
*
* @see #builder()
- * @since 3.1.0
+ * @since 4.0.0
*/
public Key(ByteSequence row, ByteSequence cf, ByteSequence cq, ByteSequence
cv, long ts) {
byte[] rowBytes;
@@ -733,7 +733,7 @@ public class Key implements WritableComparable<Key>,
Cloneable {
*
* @param r <code>ArrayByteSequence</code> object to copy into
* @return the <code>ArrayByteSequence</code> that was passed in
- * @since 3.1.0
+ * @since 4.0.0
*/
public ArrayByteSequence getRowData(ArrayByteSequence r) {
r.reset(row, 0, row.length);
@@ -777,7 +777,7 @@ public class Key implements WritableComparable<Key>,
Cloneable {
*
* @param cf <code>ArrayByteSequence</code> object to copy into
* @return the <code>ArrayByteSequence</code> that was passed in
- * @since 3.1.0
+ * @since 4.0.0
*/
public ArrayByteSequence getColumnFamilyData(ArrayByteSequence cf) {
cf.reset(colFamily, 0, colFamily.length);
@@ -836,7 +836,7 @@ public class Key implements WritableComparable<Key>,
Cloneable {
*
* @param cq <code>ArrayByteSequence</code> object to copy into
* @return the <code>ArrayByteSequence</code> that was passed in
- * @since 3.1.0
+ * @since 4.0.0
*/
public ArrayByteSequence getColumnQualifierData(ArrayByteSequence cq) {
cq.reset(colQualifier, 0, colQualifier.length);
@@ -930,7 +930,7 @@ public class Key implements WritableComparable<Key>,
Cloneable {
*
* @param cv <code>ArrayByteSequence</code> object to copy into
* @return the <code>ArrayByteSequence</code> that was passed in
- * @since 3.1.0
+ * @since 4.0.0
*/
public ArrayByteSequence getColumnVisibilityData(ArrayByteSequence cv) {
cv.reset(colVisibility, 0, colVisibility.length);
diff --git a/core/src/main/java/org/apache/accumulo/core/data/KeyBuilder.java
b/core/src/main/java/org/apache/accumulo/core/data/KeyBuilder.java
index b49d9f76c9..b8941ab82c 100644
--- a/core/src/main/java/org/apache/accumulo/core/data/KeyBuilder.java
+++ b/core/src/main/java/org/apache/accumulo/core/data/KeyBuilder.java
@@ -105,7 +105,7 @@ public class KeyBuilder {
*
* @param row the row to use for the key
* @return this builder
- * @since 3.1.0
+ * @since 4.0.0
*/
ColumnFamilyStep row(final ByteSequence row);
@@ -150,7 +150,7 @@ public class KeyBuilder {
*
* @param columnFamily the column family to use for the {@link Key}
* @return this builder
- * @since 3.1.0
+ * @since 4.0.0
*/
ColumnQualifierStep family(final ByteSequence columnFamily);
@@ -203,7 +203,7 @@ public class KeyBuilder {
*
* @param columnQualifier the column qualifier to use for the {@link Key}
* @return this builder
- * @since 3.1.0
+ * @since 4.0.0
*/
ColumnVisibilityStep qualifier(final ByteSequence columnQualifier);
@@ -257,7 +257,7 @@ public class KeyBuilder {
*
* @param columnVisibility the column visibility to use for the {@link Key}
* @return this builder
- * @since 3.1.0
+ * @since 4.0.0
*/
Build visibility(ByteSequence columnVisibility);
diff --git
a/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/lru/LruBlockCacheManager.java
b/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/lru/LruBlockCacheManager.java
index 76be394e3b..d8bb5bc552 100644
---
a/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/lru/LruBlockCacheManager.java
+++
b/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/lru/LruBlockCacheManager.java
@@ -24,7 +24,7 @@ import org.apache.accumulo.core.spi.cache.CacheType;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-@Deprecated(since = "3.1.0")
+@Deprecated(since = "4.0.0")
public class LruBlockCacheManager extends BlockCacheManager {
private static final Logger LOG =
LoggerFactory.getLogger(LruBlockCacheManager.class);
diff --git
a/core/src/main/java/org/apache/accumulo/core/metadata/schema/MetadataSchema.java
b/core/src/main/java/org/apache/accumulo/core/metadata/schema/MetadataSchema.java
index 37fb46cf0e..28b720eb67 100644
---
a/core/src/main/java/org/apache/accumulo/core/metadata/schema/MetadataSchema.java
+++
b/core/src/main/java/org/apache/accumulo/core/metadata/schema/MetadataSchema.java
@@ -408,8 +408,8 @@ public class MetadataSchema {
* data for the current tablet, so that they are safe to merge
*/
public static class ChoppedColumnFamily {
- // kept to support upgrades to 3.1; name is used for both col fam and
col qual
- @Deprecated(since = "3.1.0")
+ // kept to support upgrades to 4.0; name is used for both col fam and
col qual
+ @Deprecated(since = "4.0.0")
public static final Text NAME = new Text("chopped");
}
diff --git
a/core/src/main/java/org/apache/accumulo/core/security/Authorizations.java
b/core/src/main/java/org/apache/accumulo/core/security/Authorizations.java
index 380a183679..e9db8f2ca4 100644
--- a/core/src/main/java/org/apache/accumulo/core/security/Authorizations.java
+++ b/core/src/main/java/org/apache/accumulo/core/security/Authorizations.java
@@ -389,7 +389,7 @@ public class Authorizations implements Iterable<byte[]>,
Serializable, Authoriza
/**
* Converts to an Accumulo Access Authorizations object.
*
- * @since 3.1.0
+ * @since 4.0.0
*/
public org.apache.accumulo.access.Authorizations toAccessAuthorizations() {
if (auths.isEmpty()) {
diff --git
a/core/src/main/java/org/apache/accumulo/core/security/ColumnVisibility.java
b/core/src/main/java/org/apache/accumulo/core/security/ColumnVisibility.java
index 54e5c47339..ff7b6989d4 100644
--- a/core/src/main/java/org/apache/accumulo/core/security/ColumnVisibility.java
+++ b/core/src/main/java/org/apache/accumulo/core/security/ColumnVisibility.java
@@ -133,7 +133,7 @@ public class ColumnVisibility {
*
* @param expression visibility expression, encoded as UTF-8 bytes
* @see #ColumnVisibility(String)
- * @since 3.1.0
+ * @since 4.0.0
*/
public ColumnVisibility(AccessExpression expression) {
// AccessExpression is a validated immutable object, so no need to re
validate
diff --git
a/core/src/main/java/org/apache/accumulo/core/security/VisibilityParseException.java
b/core/src/main/java/org/apache/accumulo/core/security/VisibilityParseException.java
index 07c4b4f347..697f3c5655 100644
---
a/core/src/main/java/org/apache/accumulo/core/security/VisibilityParseException.java
+++
b/core/src/main/java/org/apache/accumulo/core/security/VisibilityParseException.java
@@ -44,7 +44,7 @@ public class VisibilityParseException extends ParseException {
}
/**
- * @since 3.1.0
+ * @since 4.0.0
*/
public VisibilityParseException(InvalidAccessExpressionException e) {
// TODO need to look at output for this
diff --git
a/core/src/main/java/org/apache/accumulo/core/spi/cache/BlockCache.java
b/core/src/main/java/org/apache/accumulo/core/spi/cache/BlockCache.java
index 9ebe3fc962..1a01fa6651 100644
--- a/core/src/main/java/org/apache/accumulo/core/spi/cache/BlockCache.java
+++ b/core/src/main/java/org/apache/accumulo/core/spi/cache/BlockCache.java
@@ -115,7 +115,7 @@ public interface BlockCache {
/**
* @return The number of entries evicted from the cache.
*
- * @since 3.1.0
+ * @since 4.0.0
*/
long evictionCount();
}
diff --git
a/core/src/main/java/org/apache/accumulo/core/spi/common/ServiceEnvironment.java
b/core/src/main/java/org/apache/accumulo/core/spi/common/ServiceEnvironment.java
index 7e7b536a68..5d6fd3abac 100644
---
a/core/src/main/java/org/apache/accumulo/core/spi/common/ServiceEnvironment.java
+++
b/core/src/main/java/org/apache/accumulo/core/spi/common/ServiceEnvironment.java
@@ -46,7 +46,7 @@ public interface ServiceEnvironment extends PluginEnvironment
{
*
* @param includeDefaults If true will include accumulo's default
properties and layer the
* passed in map on top of these.
- * @since 3.1.0
+ * @since 4.0.0
*/
static Configuration from(Map<String,String> properties, boolean
includeDefaults) {
return (Configuration) PluginEnvironment.Configuration.from(properties,
includeDefaults);
diff --git
a/core/src/main/java/org/apache/accumulo/core/spi/compaction/CompactorGroupId.java
b/core/src/main/java/org/apache/accumulo/core/spi/compaction/CompactorGroupId.java
index 83af094dbd..ef7a51204d 100644
---
a/core/src/main/java/org/apache/accumulo/core/spi/compaction/CompactorGroupId.java
+++
b/core/src/main/java/org/apache/accumulo/core/spi/compaction/CompactorGroupId.java
@@ -27,7 +27,7 @@ import com.github.benmanes.caffeine.cache.Cache;
* A unique identifier for a compactor group that a {@link CompactionPlanner}
can schedule
* compactions on using a {@link CompactionJob}.
*
- * @since 3.1.0
+ * @since 4.0.0
* @see org.apache.accumulo.core.spi.compaction
*/
public class CompactorGroupId extends AbstractId<CompactorGroupId> {
diff --git
a/core/src/main/java/org/apache/accumulo/core/spi/compaction/GroupManager.java
b/core/src/main/java/org/apache/accumulo/core/spi/compaction/GroupManager.java
index 9c2685b861..98a34c7b4d 100644
---
a/core/src/main/java/org/apache/accumulo/core/spi/compaction/GroupManager.java
+++
b/core/src/main/java/org/apache/accumulo/core/spi/compaction/GroupManager.java
@@ -21,7 +21,7 @@ package org.apache.accumulo.core.spi.compaction;
/**
* Offered to a Compaction Planner at initialization time, so it can create
compactor groups.
*
- * @since 3.1.0
+ * @since 4.0.0
* @see
CompactionPlanner#init(org.apache.accumulo.core.spi.compaction.CompactionPlanner.InitParameters)
* @see org.apache.accumulo.core.spi.compaction
*/
diff --git
a/core/src/main/java/org/apache/accumulo/core/spi/ondemand/OnDemandTabletUnloader.java
b/core/src/main/java/org/apache/accumulo/core/spi/ondemand/OnDemandTabletUnloader.java
index 6f4eacda8d..b5c503757f 100644
---
a/core/src/main/java/org/apache/accumulo/core/spi/ondemand/OnDemandTabletUnloader.java
+++
b/core/src/main/java/org/apache/accumulo/core/spi/ondemand/OnDemandTabletUnloader.java
@@ -27,7 +27,7 @@ import org.apache.accumulo.core.spi.common.ServiceEnvironment;
/**
* Object used by the TabletServer to determine which on-demand Tablets to
unload for a Table
*
- * @since 3.1.0
+ * @since 4.0.0
*/
public interface OnDemandTabletUnloader {
@@ -35,13 +35,13 @@ public interface OnDemandTabletUnloader {
/**
* @return table id
- * @since 3.1.0
+ * @since 4.0.0
*/
String getTableId();
/**
* @return service environment
- * @since 3.1.0
+ * @since 4.0.0
*/
ServiceEnvironment getServiceEnvironment();
@@ -50,7 +50,7 @@ public interface OnDemandTabletUnloader {
* accessed. Access times are in nanoseconds, from {@link
System#nanoTime()}, and should be
* handled accordingly.
*
- * @since 3.1.0
+ * @since 4.0.0
*/
Map<TabletId,Long> getLastAccessTimes();
@@ -60,7 +60,7 @@ public interface OnDemandTabletUnloader {
* call this method.
*
* @param tablets onDemand Tablets to unload
- * @since 3.1.0
+ * @since 4.0.0
*/
void setOnDemandTabletsToUnload(Set<TabletId> tablets);
@@ -73,7 +73,7 @@ public interface OnDemandTabletUnloader {
* unloaded by the TabletServer
*
* @param params UnloaderParams object
- * @since 3.1.0
+ * @since 4.0.0
*/
void evaluate(UnloaderParams params);
}
diff --git
a/server/base/src/main/java/org/apache/accumulo/server/AccumuloDataVersion.java
b/server/base/src/main/java/org/apache/accumulo/server/AccumuloDataVersion.java
index e2dfa4d961..af12c5ad10 100644
---
a/server/base/src/main/java/org/apache/accumulo/server/AccumuloDataVersion.java
+++
b/server/base/src/main/java/org/apache/accumulo/server/AccumuloDataVersion.java
@@ -43,7 +43,7 @@ public class AccumuloDataVersion {
/**
* version (12) reflect changes to support no chop merges including json
encoding of the file
- * column family stored in root and metadata tables in version 3.1
+ * column family stored in root and metadata tables in version 4.0
*/
public static final int METADATA_FILE_JSON_ENCODING = 12;
@@ -113,7 +113,6 @@ public class AccumuloDataVersion {
case REMOVE_DEPRECATIONS_FOR_VERSION_3:
return "3.0.0";
case METADATA_FILE_JSON_ENCODING:
- return "3.1.0";
case ONDEMAND_TABLETS_FOR_VERSION_4:
return "4.0.0";
}
diff --git
a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/tableExport/ExportTable.java
b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/tableExport/ExportTable.java
index dcb277c747..36a766c098 100644
---
a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/tableExport/ExportTable.java
+++
b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/tableExport/ExportTable.java
@@ -59,8 +59,8 @@ public class ExportTable extends ManagerRepo {
/**
* Defines export / version.
* <ul>
- * <li>version 1 exported by Accumulo < 3.1</li>
- * <li>version 2 exported by Accumulo => 3.1 - uses file references with
ranges.</li>
+ * <li>version 1 exported by Accumulo < 4.0</li>
+ * <li>version 2 exported by Accumulo => 4.0 - uses file references with
ranges.</li>
* </ul>
*/
public static final int VERSION_2 = 2;
diff --git
a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/tableImport/PopulateMetadataTable.java
b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/tableImport/PopulateMetadataTable.java
index 36944987cd..cd1ea67619 100644
---
a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/tableImport/PopulateMetadataTable.java
+++
b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/tableImport/PopulateMetadataTable.java
@@ -143,7 +143,7 @@ class PopulateMetadataTable extends ManagerRepo {
StoredTabletFile exportedRef;
var dataFileCQ = key.getColumnQualifier().toString();
if (tableInfo.exportedVersion == null ||
tableInfo.exportedVersion < VERSION_2) {
- // written without fenced range information (accumulo < 3.1),
use default
+ // written without fenced range information (accumulo < 4.0),
use default
// (null,null)
exportedRef = StoredTabletFile.of(new Path(dataFileCQ));
} else {
diff --git a/test/src/main/java/org/apache/accumulo/test/ImportExportIT.java
b/test/src/main/java/org/apache/accumulo/test/ImportExportIT.java
index c190121d7a..54ef657a00 100644
--- a/test/src/main/java/org/apache/accumulo/test/ImportExportIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/ImportExportIT.java
@@ -531,7 +531,7 @@ public class ImportExportIT extends AccumuloClusterHarness {
/**
* Validate that files exported with Accumulo 2.x without fence ranges can
be imported into
- * version that require the fenced ranges (3.1 and later)
+ * version that require the fenced ranges (4.0 and later)
*/
@Test
public void importV2data() throws Exception {
diff --git a/test/src/main/java/org/apache/accumulo/test/ZombieScanIT.java
b/test/src/main/java/org/apache/accumulo/test/ZombieScanIT.java
index 8681aee9fd..ec59326fc1 100644
--- a/test/src/main/java/org/apache/accumulo/test/ZombieScanIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/ZombieScanIT.java
@@ -274,13 +274,6 @@ public class ZombieScanIT extends ConfigurableMacBase {
try (AccumuloClient c =
Accumulo.newClient().from(getClientProperties()).build()) {
- if (serverType == SCAN_SERVER) {
- // Scans will fall back to tablet servers when no scan servers are
present. So wait for scan
- // servers to show up in zookeeper. Can remove this in 3.1.
- Wait.waitFor(() ->
!c.instanceOperations().getServers(ServerId.Type.SCAN_SERVER).isEmpty(),
- 60_000);
- }
-
c.tableOperations().create(table);
var executor = Executors.newCachedThreadPool();
diff --git
a/test/src/main/java/org/apache/accumulo/test/functional/ScannerIT.java
b/test/src/main/java/org/apache/accumulo/test/functional/ScannerIT.java
index 3458ceb9b3..eeec3ce7e3 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/ScannerIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/ScannerIT.java
@@ -137,13 +137,6 @@ public class ScannerIT extends ConfigurableMacBase {
final ServerType serverType = consistency == IMMEDIATE ? TABLET_SERVER :
SCAN_SERVER;
try (AccumuloClient accumuloClient =
Accumulo.newClient().from(getClientProperties()).build()) {
- if (serverType == SCAN_SERVER) {
- // Scans will fall back to tablet servers when no scan servers are
present. So wait for scan
- // servers to show up in zookeeper. Can remove this in 3.1.
- Wait.waitFor(() -> !accumuloClient.instanceOperations()
- .getServers(ServerId.Type.SCAN_SERVER).isEmpty());
- }
-
accumuloClient.tableOperations().create(tableName);
try (var writer = accumuloClient.createBatchWriter(tableName)) {
