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 20df82f049 build fix
20df82f049 is described below
commit 20df82f0490dd19358c639396e20f56e2103bf92
Author: Kevin Rathbun <[email protected]>
AuthorDate: Fri Dec 5 13:01:21 2025 -0500
build fix
---
.../core/client/admin/TableOperations.java | 47 +---------------------
1 file changed, 2 insertions(+), 45 deletions(-)
diff --git
a/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperations.java
b/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperations.java
index 8e0bb88b98..147383df11 100644
---
a/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperations.java
+++
b/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperations.java
@@ -91,51 +91,8 @@ public interface TableOperations {
throws AccumuloException, AccumuloSecurityException,
TableExistsException;
/**
- * <<<<<<< HEAD =======
- *
- * @param tableName the name of the table
- * @param limitVersion Enables/disables the versioning iterator, which will
limit the number of
- * Key versions kept.
- * @throws AccumuloException if a general error occurs
- * @throws AccumuloSecurityException if the user does not have permission
- * @throws TableExistsException if the table already exists
- * @deprecated since 1.7.0; use {@link #create(String,
NewTableConfiguration)} instead.
- */
- @Deprecated(since = "1.7.0")
- default void create(String tableName, boolean limitVersion)
- throws AccumuloException, AccumuloSecurityException,
TableExistsException {
- if (limitVersion) {
- create(tableName);
- } else {
- create(tableName, new NewTableConfiguration().withoutDefaults());
- }
- }
-
- /**
- * @param tableName the name of the table
- * @param versioningIter Enables/disables the versioning iterator, which
will limit the number of
- * Key versions kept.
- * @param timeType specifies logical or real-time based time recording for
entries in the table
- * @throws AccumuloException if a general error occurs
- * @throws AccumuloSecurityException if the user does not have permission
- * @throws TableExistsException if the table already exists
- * @deprecated since 1.7.0; use {@link #create(String,
NewTableConfiguration)} instead.
- */
- @Deprecated(since = "1.7.0")
- default void create(String tableName, boolean versioningIter, TimeType
timeType)
- throws AccumuloException, AccumuloSecurityException,
TableExistsException {
- NewTableConfiguration ntc = new
NewTableConfiguration().setTimeType(timeType);
-
- if (versioningIter) {
- create(tableName, ntc);
- } else {
- create(tableName, ntc.withoutDefaults());
- }
- }
-
- /**
- * >>>>>>> 2.1 Create a table with specified configuration. A safe way to
ignore tables that do
- * exist would be to do something like the following:
+ * Create a table with specified configuration. A safe way to ignore tables
that do exist would be
+ * to do something like the following:
*
* <pre>
* try {
