You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by kt...@apache.org on 2021/02/24 02:31:43 UTC
[accumulo] branch 1451-external-compactions-feature updated: add
support back for deprecated iterator side channels
This is an automated email from the ASF dual-hosted git repository.
kturner pushed a commit to branch 1451-external-compactions-feature
in repository https://gitbox.apache.org/repos/asf/accumulo.git
The following commit(s) were added to refs/heads/1451-external-compactions-feature by this push:
new 917e479 add support back for deprecated iterator side channels
917e479 is described below
commit 917e47944b8e5adbff88681c1342b42114c48412
Author: Keith Turner <kt...@apache.org>
AuthorDate: Tue Feb 23 21:31:27 2021 -0500
add support back for deprecated iterator side channels
---
.../org/apache/accumulo/server/compaction/Compactor.java | 12 ++++++------
.../accumulo/server/iterators/SystemIteratorEnvironment.java | 5 +++++
.../apache/accumulo/tserver/TabletIteratorEnvironment.java | 1 +
.../org/apache/accumulo/tserver/tablet/CompactableUtils.java | 4 ++--
.../org/apache/accumulo/tserver/tablet/MinorCompactor.java | 4 ++--
5 files changed, 16 insertions(+), 10 deletions(-)
diff --git a/server/base/src/main/java/org/apache/accumulo/server/compaction/Compactor.java b/server/base/src/main/java/org/apache/accumulo/server/compaction/Compactor.java
index b228335..da3074c 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/compaction/Compactor.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/compaction/Compactor.java
@@ -44,7 +44,6 @@ import org.apache.accumulo.core.dataImpl.KeyExtent;
import org.apache.accumulo.core.file.FileOperations;
import org.apache.accumulo.core.file.FileSKVIterator;
import org.apache.accumulo.core.file.FileSKVWriter;
-import org.apache.accumulo.core.iterators.IteratorEnvironment;
import org.apache.accumulo.core.iterators.IteratorUtil.IteratorScope;
import org.apache.accumulo.core.iterators.SortedKeyValueIterator;
import org.apache.accumulo.core.iteratorsImpl.system.ColumnFamilySkippingIterator;
@@ -60,6 +59,7 @@ import org.apache.accumulo.core.util.LocalityGroupUtil.LocalityGroupConfiguratio
import org.apache.accumulo.core.util.ratelimit.RateLimiter;
import org.apache.accumulo.server.ServerContext;
import org.apache.accumulo.server.fs.VolumeManager;
+import org.apache.accumulo.server.iterators.SystemIteratorEnvironment;
import org.apache.accumulo.server.problems.ProblemReport;
import org.apache.accumulo.server.problems.ProblemReportingIterator;
import org.apache.accumulo.server.problems.ProblemReports;
@@ -88,8 +88,8 @@ public class Compactor implements Callable<CompactionStats> {
RateLimiter getWriteLimiter();
- IteratorEnvironment createIteratorEnv(ServerContext context, AccumuloConfiguration acuTableConf,
- TableId tableId);
+ SystemIteratorEnvironment createIteratorEnv(ServerContext context,
+ AccumuloConfiguration acuTableConf, TableId tableId);
SortedKeyValueIterator<Key,Value> getMinCIterator();
@@ -352,11 +352,11 @@ public class Compactor implements Callable<CompactionStats> {
// if(env.getIteratorScope() )
- IteratorEnvironment iterEnv =
+ SystemIteratorEnvironment iterEnv =
env.createIteratorEnv(context, acuTableConf, getExtent().tableId());
- SortedKeyValueIterator<Key,Value> itr = IterConfigUtil
- .convertItersAndLoad(env.getIteratorScope(), cfsi, acuTableConf, iterators, iterEnv);
+ SortedKeyValueIterator<Key,Value> itr = iterEnv.getTopLevelIterator(IterConfigUtil
+ .convertItersAndLoad(env.getIteratorScope(), cfsi, acuTableConf, iterators, iterEnv));
itr.seek(extent.toDataRange(), columnFamilies, inclusive);
diff --git a/server/base/src/main/java/org/apache/accumulo/server/iterators/SystemIteratorEnvironment.java b/server/base/src/main/java/org/apache/accumulo/server/iterators/SystemIteratorEnvironment.java
index e37628a..54d671d 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/iterators/SystemIteratorEnvironment.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/iterators/SystemIteratorEnvironment.java
@@ -18,11 +18,16 @@
*/
package org.apache.accumulo.server.iterators;
+import org.apache.accumulo.core.data.Key;
+import org.apache.accumulo.core.data.Value;
import org.apache.accumulo.core.iterators.IteratorEnvironment;
+import org.apache.accumulo.core.iterators.SortedKeyValueIterator;
import org.apache.accumulo.server.ServerContext;
public interface SystemIteratorEnvironment extends IteratorEnvironment {
ServerContext getServerContext();
+ SortedKeyValueIterator<Key,Value> getTopLevelIterator(SortedKeyValueIterator<Key,Value> iter);
+
}
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletIteratorEnvironment.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletIteratorEnvironment.java
index 87c9844..9d4467d 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletIteratorEnvironment.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletIteratorEnvironment.java
@@ -172,6 +172,7 @@ public class TabletIteratorEnvironment implements SystemIteratorEnvironment {
return authorizations;
}
+ @Override
public SortedKeyValueIterator<Key,Value>
getTopLevelIterator(SortedKeyValueIterator<Key,Value> iter) {
if (topLevelIterators.isEmpty())
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/CompactableUtils.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/CompactableUtils.java
index 6a54c65..aae18e0 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/CompactableUtils.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/CompactableUtils.java
@@ -58,7 +58,6 @@ import org.apache.accumulo.core.data.Value;
import org.apache.accumulo.core.dataImpl.KeyExtent;
import org.apache.accumulo.core.file.FileOperations;
import org.apache.accumulo.core.file.FileSKVIterator;
-import org.apache.accumulo.core.iterators.IteratorEnvironment;
import org.apache.accumulo.core.iterators.IteratorUtil.IteratorScope;
import org.apache.accumulo.core.iterators.SortedKeyValueIterator;
import org.apache.accumulo.core.metadata.CompactableFileImpl;
@@ -83,6 +82,7 @@ import org.apache.accumulo.server.compaction.Compactor;
import org.apache.accumulo.server.compaction.Compactor.CompactionCanceledException;
import org.apache.accumulo.server.compaction.Compactor.CompactionEnv;
import org.apache.accumulo.server.fs.VolumeManager;
+import org.apache.accumulo.server.iterators.SystemIteratorEnvironment;
import org.apache.accumulo.server.util.MetadataTableUtil;
import org.apache.accumulo.tserver.TabletIteratorEnvironment;
import org.apache.accumulo.tserver.compaction.CompactionPlan;
@@ -563,7 +563,7 @@ public class CompactableUtils {
}
@Override
- public IteratorEnvironment createIteratorEnv(ServerContext context,
+ public SystemIteratorEnvironment createIteratorEnv(ServerContext context,
AccumuloConfiguration acuTableConf, TableId tableId) {
return new TabletIteratorEnvironment(context, IteratorScope.majc, !propogateDeletes,
acuTableConf, tableId, job.getKind());
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/MinorCompactor.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/MinorCompactor.java
index ab04649..75a424b 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/MinorCompactor.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/MinorCompactor.java
@@ -34,7 +34,6 @@ import org.apache.accumulo.core.data.ByteSequence;
import org.apache.accumulo.core.data.Key;
import org.apache.accumulo.core.data.TableId;
import org.apache.accumulo.core.data.Value;
-import org.apache.accumulo.core.iterators.IteratorEnvironment;
import org.apache.accumulo.core.iterators.IteratorUtil.IteratorScope;
import org.apache.accumulo.core.iterators.SortedKeyValueIterator;
import org.apache.accumulo.core.manager.state.tables.TableState;
@@ -46,6 +45,7 @@ import org.apache.accumulo.server.ServerContext;
import org.apache.accumulo.server.compaction.CompactionStats;
import org.apache.accumulo.server.compaction.Compactor;
import org.apache.accumulo.server.conf.TableConfiguration;
+import org.apache.accumulo.server.iterators.SystemIteratorEnvironment;
import org.apache.accumulo.server.problems.ProblemReport;
import org.apache.accumulo.server.problems.ProblemReports;
import org.apache.accumulo.server.problems.ProblemType;
@@ -88,7 +88,7 @@ public class MinorCompactor extends Compactor {
}
@Override
- public IteratorEnvironment createIteratorEnv(ServerContext context,
+ public SystemIteratorEnvironment createIteratorEnv(ServerContext context,
AccumuloConfiguration acuTableConf, TableId tableId) {
return new TabletIteratorEnvironment(context, IteratorScope.minc, acuTableConf,
tableId);