This is an automated email from the ASF dual-hosted git repository.
kturner pushed a commit to branch elasticity
in repository https://gitbox.apache.org/repos/asf/accumulo.git
The following commit(s) were added to refs/heads/elasticity by this push:
new 0386506c1d moves ample filters out of public API (#4431)
0386506c1d is described below
commit 0386506c1d91a5edfcc524df17ee472992adc46d
Author: Keith Turner <ktur...@apache.org>
AuthorDate: Fri Apr 5 12:05:38 2024 -0400
moves ample filters out of public API (#4431)
Ample filters were in a package that is in the public API. Since Ample
itself is not in the public API, these filters should also not be in the
public API. This commit moves the filters to another packages that is
not in the public API
---
.../org/apache/accumulo/core/metadata/schema/TabletsMetadata.java | 2 +-
.../{iterators/user => metadata/schema/filters}/GcWalsFilter.java | 5 +----
.../user => metadata/schema/filters}/HasCurrentFilter.java | 2 +-
.../schema/filters}/HasExternalCompactionsFilter.java | 2 +-
.../user => metadata/schema/filters}/TabletMetadataFilter.java | 3 ++-
.../java/org/apache/accumulo/gc/GarbageCollectWriteAheadLogs.java | 2 +-
.../manager/compaction/coordinator/CompactionCoordinator.java | 2 +-
.../manager/compaction/coordinator/DeadCompactionDetector.java | 2 +-
.../org/apache/accumulo/monitor/rest/tables/TablesResource.java | 2 +-
.../apache/accumulo/test/functional/AmpleConditionalWriterIT.java | 6 +++---
.../apache/accumulo/test/functional/TestTabletMetadataFilter.java | 2 +-
11 files changed, 14 insertions(+), 16 deletions(-)
diff --git
a/core/src/main/java/org/apache/accumulo/core/metadata/schema/TabletsMetadata.java
b/core/src/main/java/org/apache/accumulo/core/metadata/schema/TabletsMetadata.java
index 14b8181e78..48a1160513 100644
---
a/core/src/main/java/org/apache/accumulo/core/metadata/schema/TabletsMetadata.java
+++
b/core/src/main/java/org/apache/accumulo/core/metadata/schema/TabletsMetadata.java
@@ -63,7 +63,6 @@ import org.apache.accumulo.core.data.TableId;
import org.apache.accumulo.core.dataImpl.KeyExtent;
import org.apache.accumulo.core.fate.zookeeper.ZooCache;
import org.apache.accumulo.core.fate.zookeeper.ZooReader;
-import org.apache.accumulo.core.iterators.user.TabletMetadataFilter;
import org.apache.accumulo.core.iterators.user.WholeRowIterator;
import org.apache.accumulo.core.metadata.AccumuloTable;
import org.apache.accumulo.core.metadata.RootTable;
@@ -85,6 +84,7 @@ import
org.apache.accumulo.core.metadata.schema.MetadataSchema.TabletsSection.Sp
import
org.apache.accumulo.core.metadata.schema.MetadataSchema.TabletsSection.SuspendLocationColumn;
import
org.apache.accumulo.core.metadata.schema.MetadataSchema.TabletsSection.UserCompactionRequestedColumnFamily;
import org.apache.accumulo.core.metadata.schema.TabletMetadata.ColumnType;
+import org.apache.accumulo.core.metadata.schema.filters.TabletMetadataFilter;
import org.apache.accumulo.core.security.Authorizations;
import org.apache.accumulo.core.util.ColumnFQ;
import org.apache.hadoop.io.Text;
diff --git
a/core/src/main/java/org/apache/accumulo/core/iterators/user/GcWalsFilter.java
b/core/src/main/java/org/apache/accumulo/core/metadata/schema/filters/GcWalsFilter.java
similarity index 94%
rename from
core/src/main/java/org/apache/accumulo/core/iterators/user/GcWalsFilter.java
rename to
core/src/main/java/org/apache/accumulo/core/metadata/schema/filters/GcWalsFilter.java
index a30302ce59..4e1aca1a06 100644
---
a/core/src/main/java/org/apache/accumulo/core/iterators/user/GcWalsFilter.java
+++
b/core/src/main/java/org/apache/accumulo/core/metadata/schema/filters/GcWalsFilter.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.accumulo.core.iterators.user;
+package org.apache.accumulo.core.metadata.schema.filters;
import java.io.IOException;
import java.util.Arrays;
@@ -41,9 +41,6 @@ import com.google.common.collect.Sets;
* A filter used by the Accumulo GC to find tablets that either have walogs or
are assigned to a
* dead tablet server.
*/
-
-// ELASTICITY_TODO Move TabletMetadataFilter and its subclasses out of public
API. It use internal
-// types that are not user facing.
public class GcWalsFilter extends TabletMetadataFilter {
private Map<String,String> options = null;
diff --git
a/core/src/main/java/org/apache/accumulo/core/iterators/user/HasCurrentFilter.java
b/core/src/main/java/org/apache/accumulo/core/metadata/schema/filters/HasCurrentFilter.java
similarity index 96%
rename from
core/src/main/java/org/apache/accumulo/core/iterators/user/HasCurrentFilter.java
rename to
core/src/main/java/org/apache/accumulo/core/metadata/schema/filters/HasCurrentFilter.java
index ca58922306..0d00b59837 100644
---
a/core/src/main/java/org/apache/accumulo/core/iterators/user/HasCurrentFilter.java
+++
b/core/src/main/java/org/apache/accumulo/core/metadata/schema/filters/HasCurrentFilter.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.accumulo.core.iterators.user;
+package org.apache.accumulo.core.metadata.schema.filters;
import java.util.Set;
import java.util.function.Predicate;
diff --git
a/core/src/main/java/org/apache/accumulo/core/iterators/user/HasExternalCompactionsFilter.java
b/core/src/main/java/org/apache/accumulo/core/metadata/schema/filters/HasExternalCompactionsFilter.java
similarity index 96%
rename from
core/src/main/java/org/apache/accumulo/core/iterators/user/HasExternalCompactionsFilter.java
rename to
core/src/main/java/org/apache/accumulo/core/metadata/schema/filters/HasExternalCompactionsFilter.java
index fd3b5ae5d6..496dd24828 100644
---
a/core/src/main/java/org/apache/accumulo/core/iterators/user/HasExternalCompactionsFilter.java
+++
b/core/src/main/java/org/apache/accumulo/core/metadata/schema/filters/HasExternalCompactionsFilter.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.accumulo.core.iterators.user;
+package org.apache.accumulo.core.metadata.schema.filters;
import java.util.Set;
import java.util.function.Predicate;
diff --git
a/core/src/main/java/org/apache/accumulo/core/iterators/user/TabletMetadataFilter.java
b/core/src/main/java/org/apache/accumulo/core/metadata/schema/filters/TabletMetadataFilter.java
similarity index 93%
rename from
core/src/main/java/org/apache/accumulo/core/iterators/user/TabletMetadataFilter.java
rename to
core/src/main/java/org/apache/accumulo/core/metadata/schema/filters/TabletMetadataFilter.java
index 2381b7e475..02dc251777 100644
---
a/core/src/main/java/org/apache/accumulo/core/iterators/user/TabletMetadataFilter.java
+++
b/core/src/main/java/org/apache/accumulo/core/metadata/schema/filters/TabletMetadataFilter.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.accumulo.core.iterators.user;
+package org.apache.accumulo.core.metadata.schema.filters;
import java.util.EnumSet;
import java.util.Map;
@@ -27,6 +27,7 @@ import org.apache.accumulo.core.data.Key;
import org.apache.accumulo.core.data.Value;
import org.apache.accumulo.core.iterators.IteratorAdapter;
import org.apache.accumulo.core.iterators.SortedKeyValueIterator;
+import org.apache.accumulo.core.iterators.user.RowFilter;
import org.apache.accumulo.core.metadata.schema.TabletMetadata;
public abstract class TabletMetadataFilter extends RowFilter {
diff --git
a/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectWriteAheadLogs.java
b/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectWriteAheadLogs.java
index e24ea0274f..79cbe9535a 100644
---
a/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectWriteAheadLogs.java
+++
b/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectWriteAheadLogs.java
@@ -39,12 +39,12 @@ import java.util.stream.Stream;
import org.apache.accumulo.core.gc.thrift.GCStatus;
import org.apache.accumulo.core.gc.thrift.GcCycleStats;
-import org.apache.accumulo.core.iterators.user.GcWalsFilter;
import org.apache.accumulo.core.metadata.TServerInstance;
import org.apache.accumulo.core.metadata.TabletState;
import org.apache.accumulo.core.metadata.schema.Ample.DataLevel;
import org.apache.accumulo.core.metadata.schema.TabletMetadata;
import org.apache.accumulo.core.metadata.schema.TabletsMetadata;
+import org.apache.accumulo.core.metadata.schema.filters.GcWalsFilter;
import org.apache.accumulo.core.tabletserver.log.LogEntry;
import org.apache.accumulo.core.trace.TraceUtil;
import org.apache.accumulo.core.util.Pair;
diff --git
a/server/manager/src/main/java/org/apache/accumulo/manager/compaction/coordinator/CompactionCoordinator.java
b/server/manager/src/main/java/org/apache/accumulo/manager/compaction/coordinator/CompactionCoordinator.java
index 48419a47a0..5eb0ab7414 100644
---
a/server/manager/src/main/java/org/apache/accumulo/manager/compaction/coordinator/CompactionCoordinator.java
+++
b/server/manager/src/main/java/org/apache/accumulo/manager/compaction/coordinator/CompactionCoordinator.java
@@ -77,7 +77,6 @@ import org.apache.accumulo.core.fate.FateId;
import org.apache.accumulo.core.fate.FateInstanceType;
import org.apache.accumulo.core.fate.FateKey;
import org.apache.accumulo.core.fate.zookeeper.ZooReaderWriter;
-import org.apache.accumulo.core.iterators.user.HasExternalCompactionsFilter;
import org.apache.accumulo.core.iteratorsImpl.system.SystemIteratorUtil;
import org.apache.accumulo.core.logging.TabletLogger;
import org.apache.accumulo.core.manager.state.tables.TableState;
@@ -92,6 +91,7 @@ import
org.apache.accumulo.core.metadata.schema.ExternalCompactionId;
import org.apache.accumulo.core.metadata.schema.TabletMetadata;
import org.apache.accumulo.core.metadata.schema.TabletMetadata.ColumnType;
import org.apache.accumulo.core.metadata.schema.TabletsMetadata;
+import
org.apache.accumulo.core.metadata.schema.filters.HasExternalCompactionsFilter;
import org.apache.accumulo.core.metrics.MetricsProducer;
import org.apache.accumulo.core.securityImpl.thrift.TCredentials;
import org.apache.accumulo.core.spi.compaction.CompactionJob;
diff --git
a/server/manager/src/main/java/org/apache/accumulo/manager/compaction/coordinator/DeadCompactionDetector.java
b/server/manager/src/main/java/org/apache/accumulo/manager/compaction/coordinator/DeadCompactionDetector.java
index 87a4cef78b..bf702b0db7 100644
---
a/server/manager/src/main/java/org/apache/accumulo/manager/compaction/coordinator/DeadCompactionDetector.java
+++
b/server/manager/src/main/java/org/apache/accumulo/manager/compaction/coordinator/DeadCompactionDetector.java
@@ -37,12 +37,12 @@ import org.apache.accumulo.core.dataImpl.KeyExtent;
import org.apache.accumulo.core.fate.Fate;
import org.apache.accumulo.core.fate.FateInstanceType;
import org.apache.accumulo.core.fate.FateKey;
-import org.apache.accumulo.core.iterators.user.HasExternalCompactionsFilter;
import org.apache.accumulo.core.metadata.schema.Ample.DataLevel;
import org.apache.accumulo.core.metadata.schema.ExternalCompactionId;
import org.apache.accumulo.core.metadata.schema.TabletMetadata;
import org.apache.accumulo.core.metadata.schema.TabletMetadata.ColumnType;
import org.apache.accumulo.core.metadata.schema.TabletsMetadata;
+import
org.apache.accumulo.core.metadata.schema.filters.HasExternalCompactionsFilter;
import org.apache.accumulo.core.util.compaction.ExternalCompactionUtil;
import org.apache.accumulo.core.util.threads.ThreadPools;
import org.apache.accumulo.manager.Manager;
diff --git
a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tables/TablesResource.java
b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tables/TablesResource.java
index 489e2f62f6..c6161e0119 100644
---
a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tables/TablesResource.java
+++
b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tables/TablesResource.java
@@ -37,7 +37,6 @@ import jakarta.ws.rs.Produces;
import jakarta.ws.rs.core.MediaType;
import org.apache.accumulo.core.data.TableId;
-import org.apache.accumulo.core.iterators.user.HasCurrentFilter;
import org.apache.accumulo.core.manager.state.tables.TableState;
import org.apache.accumulo.core.manager.thrift.ManagerMonitorInfo;
import org.apache.accumulo.core.manager.thrift.TableInfo;
@@ -46,6 +45,7 @@ import org.apache.accumulo.core.metadata.AccumuloTable;
import org.apache.accumulo.core.metadata.schema.Ample;
import org.apache.accumulo.core.metadata.schema.TabletMetadata;
import org.apache.accumulo.core.metadata.schema.TabletsMetadata;
+import org.apache.accumulo.core.metadata.schema.filters.HasCurrentFilter;
import org.apache.accumulo.monitor.Monitor;
import org.apache.accumulo.monitor.rest.tservers.TabletServer;
import org.apache.accumulo.monitor.rest.tservers.TabletServers;
diff --git
a/test/src/main/java/org/apache/accumulo/test/functional/AmpleConditionalWriterIT.java
b/test/src/main/java/org/apache/accumulo/test/functional/AmpleConditionalWriterIT.java
index c6445d62a6..4a05fad955 100644
---
a/test/src/main/java/org/apache/accumulo/test/functional/AmpleConditionalWriterIT.java
+++
b/test/src/main/java/org/apache/accumulo/test/functional/AmpleConditionalWriterIT.java
@@ -73,9 +73,6 @@ import org.apache.accumulo.core.data.Value;
import org.apache.accumulo.core.dataImpl.KeyExtent;
import org.apache.accumulo.core.fate.FateId;
import org.apache.accumulo.core.fate.FateInstanceType;
-import org.apache.accumulo.core.iterators.user.GcWalsFilter;
-import org.apache.accumulo.core.iterators.user.HasCurrentFilter;
-import org.apache.accumulo.core.iterators.user.TabletMetadataFilter;
import org.apache.accumulo.core.metadata.AccumuloTable;
import org.apache.accumulo.core.metadata.RootTable;
import org.apache.accumulo.core.metadata.StoredTabletFile;
@@ -93,6 +90,9 @@ import
org.apache.accumulo.core.metadata.schema.TabletMetadataBuilder;
import org.apache.accumulo.core.metadata.schema.TabletOperationId;
import org.apache.accumulo.core.metadata.schema.TabletOperationType;
import org.apache.accumulo.core.metadata.schema.TabletsMetadata;
+import org.apache.accumulo.core.metadata.schema.filters.GcWalsFilter;
+import org.apache.accumulo.core.metadata.schema.filters.HasCurrentFilter;
+import org.apache.accumulo.core.metadata.schema.filters.TabletMetadataFilter;
import org.apache.accumulo.core.security.TablePermission;
import org.apache.accumulo.core.spi.balancer.TableLoadBalancer;
import org.apache.accumulo.core.tabletserver.log.LogEntry;
diff --git
a/test/src/main/java/org/apache/accumulo/test/functional/TestTabletMetadataFilter.java
b/test/src/main/java/org/apache/accumulo/test/functional/TestTabletMetadataFilter.java
index 1847f7d941..91cdf9041b 100644
---
a/test/src/main/java/org/apache/accumulo/test/functional/TestTabletMetadataFilter.java
+++
b/test/src/main/java/org/apache/accumulo/test/functional/TestTabletMetadataFilter.java
@@ -22,8 +22,8 @@ import java.util.OptionalLong;
import java.util.Set;
import java.util.function.Predicate;
-import org.apache.accumulo.core.iterators.user.TabletMetadataFilter;
import org.apache.accumulo.core.metadata.schema.TabletMetadata;
+import org.apache.accumulo.core.metadata.schema.filters.TabletMetadataFilter;
import com.google.common.collect.Sets;
