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 2024/03/20 22:40:02 UTC
(accumulo) branch main updated (0ad96b1dc0 -> eaa1f678c9)
This is an automated email from the ASF dual-hosted git repository.
kturner pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/accumulo.git
from 0ad96b1dc0 Merge remote-tracking branch 'upstream/2.1'
add 7947c2c2df adds PluginEnv support to client side iterators (#4283)
new eaa1f678c9 Merge branch '2.1'
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../core/client/ClientSideIteratorScanner.java | 39 +++++++-
.../accumulo/core/clientImpl/OfflineIterator.java | 27 +++++-
.../accumulo/core/clientImpl/ScannerImpl.java | 10 ++
.../apache/accumulo/test/ClientSideIteratorIT.java | 108 +++++++++++++++++++++
4 files changed, 178 insertions(+), 6 deletions(-)
(accumulo) 01/01: Merge branch '2.1'
Posted by kt...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
kturner pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/accumulo.git
commit eaa1f678c96b135534fba89fe585107c4f242e54
Merge: 0ad96b1dc0 7947c2c2df
Author: Keith Turner <kt...@apache.org>
AuthorDate: Wed Mar 20 18:39:26 2024 -0400
Merge branch '2.1'
.../core/client/ClientSideIteratorScanner.java | 39 +++++++-
.../accumulo/core/clientImpl/OfflineIterator.java | 27 +++++-
.../accumulo/core/clientImpl/ScannerImpl.java | 10 ++
.../apache/accumulo/test/ClientSideIteratorIT.java | 108 +++++++++++++++++++++
4 files changed, 178 insertions(+), 6 deletions(-)
diff --cc core/src/main/java/org/apache/accumulo/core/client/ClientSideIteratorScanner.java
index a50561263f,362c4e85d6..7e300e917d
--- a/core/src/main/java/org/apache/accumulo/core/client/ClientSideIteratorScanner.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/ClientSideIteratorScanner.java
@@@ -122,6 -133,22 +133,16 @@@ public class ClientSideIteratorScanner
public SamplerConfiguration getSamplerConfiguration() {
return samplerConfig;
}
+
- @Deprecated(since = "2.1.0")
- @Override
- public ServiceEnvironment getServiceEnv() {
- return new ClientServiceEnvironmentImpl(context.get());
- }
-
+ @Override
+ public PluginEnvironment getPluginEnv() {
+ return new ClientServiceEnvironmentImpl(context.get());
+ }
+
+ @Override
+ public TableId getTableId() {
+ return tableId.get();
+ }
}
/**
diff --cc core/src/main/java/org/apache/accumulo/core/clientImpl/OfflineIterator.java
index 0e7a3fd4d2,a03cc811ab..9200591ff2
--- a/core/src/main/java/org/apache/accumulo/core/clientImpl/OfflineIterator.java
+++ b/core/src/main/java/org/apache/accumulo/core/clientImpl/OfflineIterator.java
@@@ -135,7 -153,24 +140,18 @@@ class OfflineIterator implements Iterat
if (sampleConf == null) {
throw new SampleNotPresentException();
}
- return new OfflineIteratorEnvironment(authorizations, conf, true, sampleConf);
+ return new OfflineIteratorEnvironment(context, tableId, authorizations, conf, true,
+ sampleConf);
+ }
+
- @Deprecated(since = "2.1.0")
- @Override
- public ServiceEnvironment getServiceEnv() {
- return new ClientServiceEnvironmentImpl(context);
- }
-
+ @Override
+ public PluginEnvironment getPluginEnv() {
+ return new ClientServiceEnvironmentImpl(context);
+ }
+
+ @Override
+ public TableId getTableId() {
+ return tableId;
}
}