Skip to content

Commit dfdee96

Browse files
Remove deprecated TabletLocator methods (#3320)
## Summary Remove deprecated methods that use non-public TabletLocator class. ## Files Changed - `BatchScannerSession.java` - Remove `setTabletLocator(TabletLocator)` method (was a no-op) - `PushdownFunction.java` - Remove constructor with TabletLocator parameter ## Notes These methods were deprecated in PR #3246 and are no longer functional since TabletLocator usage was removed from BulkInputFormat. Fixes #3319 Part of #2443 Co-authored-by: foster33 <84727868+foster33@users.noreply.github.com>
1 parent ec4230b commit dfdee96

File tree

2 files changed

+1
-13
lines changed

2 files changed

+1
-13
lines changed

warehouse/query-core/src/main/java/datawave/query/scheduler/PushdownFunction.java

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
import java.util.List;
77

88
import org.apache.accumulo.core.client.IteratorSetting;
9-
import org.apache.accumulo.core.clientImpl.TabletLocator;
109
import org.apache.accumulo.core.data.Range;
1110
import org.apache.accumulo.core.data.TableId;
1211
import org.apache.hadoop.io.Text;
@@ -41,13 +40,8 @@ public class PushdownFunction implements Function<QueryData,List<ScannerChunk>>
4140
// table id, used to apply execution hints
4241
protected TableId tableId;
4342

44-
@Deprecated
45-
public PushdownFunction(TabletLocator tabletLocator, ShardQueryConfiguration config, Collection<IteratorSetting> settings, TableId tableId) {
46-
this(config, settings, tableId);
47-
}
48-
4943
/**
50-
* Preferred constructor
44+
* Constructor
5145
*
5246
* @param config
5347
* the config

warehouse/query-core/src/main/java/datawave/query/tables/BatchScannerSession.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import java.util.concurrent.atomic.AtomicInteger;
2121

2222
import org.apache.accumulo.core.client.ScannerBase;
23-
import org.apache.accumulo.core.clientImpl.TabletLocator;
2423
import org.apache.accumulo.core.data.Key;
2524
import org.apache.accumulo.core.data.PartialKey;
2625
import org.apache.accumulo.core.data.Range;
@@ -731,11 +730,6 @@ public void addVisitor(Function<ScannerChunk,ScannerChunk> visitorFunction) {
731730

732731
}
733732

734-
@Deprecated(forRemoval = true)
735-
public void setTabletLocator(TabletLocator tl) {
736-
// no-op
737-
}
738-
739733
public void setBackoffEnabled(boolean backoffEnabled) {
740734
this.backoffEnabled = backoffEnabled;
741735
}

0 commit comments

Comments
 (0)