This is an automated email from the ASF dual-hosted git repository.
xiangfu0 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/pinot.git
The following commit(s) were added to refs/heads/master by this push:
new a80f0f69bc5 Remove APIs deprecated in 1.3.0 (#19143)
a80f0f69bc5 is described below
commit a80f0f69bc53f6a891351095697571475a0a275e
Author: Xiang Fu <[email protected]>
AuthorDate: Sun Aug 2 14:31:01 2026 -0700
Remove APIs deprecated in 1.3.0 (#19143)
- FunctionRegistry: remove deprecated containsFunction(String) and
getFunctionInfo(String, int); migrate FastJsonPathExtractorTest to
lookupFunctionInfo(canonicalize(name), numArguments)
- TransformFunctionType: remove deprecated getAlternativeNames()
- ScalarFunction annotation: remove deprecated isPlaceholder() attribute
- PartitionDedupMetadataManager: remove deprecated
checkRecordPresentOrUpdate(PrimaryKey, IndexSegment); make the DedupRecordInfo
variant a plain interface method and drop the throwing override in
BasePartitionDedupMetadataManager
- SegmentGeneratorConfig: remove deprecated
isNullHandlingEnabled()/setNullHandlingEnabled(boolean) aliases;
RealtimeSegmentConfig.Builder: remove deprecated setNullHandlingEnabled(boolean)
- Schema: remove deprecated clone() override
- QueryContext.Builder: remove deprecated setExplain(boolean)
- ControllerRequestURLBuilder: remove deprecated
forSegmentsMetadataFromServer(String, String)
- SegmentAssignmentUtils: remove deprecated
getNumSegmentsToBeMovedPerInstance
- BrokerSelectorUtils: remove deprecated getTablesCommonBrokers; drop its
List-variant tests (Set-variant coverage retained)
- Remove dead non-split-commit residue:
ServerSegmentCompletionProtocolHandler.segmentCommit and
SegmentCompletionProtocol.SegmentCommitRequest (endpoints removed in #14559);
keep MSG_TYPE_COMMIT as the segment-completion FSM key with a clarifying comment
---
.../pinot/client/utils/BrokerSelectorUtils.java | 17 ---------
.../client/utils/BrokerSelectorUtilsTest.java | 43 ----------------------
.../pinot/common/function/FunctionRegistry.java | 15 --------
.../common/function/TransformFunctionType.java | 5 ---
.../protocols/SegmentCompletionProtocol.java | 20 ++++------
.../common/function/FastJsonPathExtractorTest.java | 3 +-
.../protocols/SegmentCompletionProtocolTest.java | 6 +--
.../assignment/segment/SegmentAssignmentUtils.java | 19 ----------
.../core/query/request/context/QueryContext.java | 7 ----
.../ServerSegmentCompletionProtocolHandler.java | 22 -----------
.../dedup/BasePartitionDedupMetadataManager.java | 7 ----
.../local/dedup/PartitionDedupMetadataManager.java | 13 +------
.../local/realtime/impl/RealtimeSegmentConfig.java | 7 ----
.../BasePartitionDedupMetadataManagerTest.java | 5 +++
.../spi/creator/SegmentGeneratorConfig.java | 22 +----------
.../pinot/spi/annotations/ScalarFunction.java | 2 -
.../java/org/apache/pinot/spi/data/Schema.java | 16 --------
.../utils/builder/ControllerRequestURLBuilder.java | 9 -----
18 files changed, 22 insertions(+), 216 deletions(-)
diff --git
a/pinot-clients/pinot-java-client/src/main/java/org/apache/pinot/client/utils/BrokerSelectorUtils.java
b/pinot-clients/pinot-java-client/src/main/java/org/apache/pinot/client/utils/BrokerSelectorUtils.java
index 05171b8b61f..a905aa65809 100644
---
a/pinot-clients/pinot-java-client/src/main/java/org/apache/pinot/client/utils/BrokerSelectorUtils.java
+++
b/pinot-clients/pinot-java-client/src/main/java/org/apache/pinot/client/utils/BrokerSelectorUtils.java
@@ -18,7 +18,6 @@
*/
package org.apache.pinot.client.utils;
-import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
@@ -33,22 +32,6 @@ public class BrokerSelectorUtils {
private BrokerSelectorUtils() {
}
- /// @param tableNames: List of table names.
- /// @param brokerData: map holding data for table hosting on brokers.
- /// @return list of common brokers hosting all the tables or null if no
common brokers found.
- /// @deprecated Use [#getTablesCommonBrokersSet(List, Map)] instead. It is
more efficient and its semantics are
- /// clearer (ie it returns an empty set instead of null if no common brokers
are found).
- @Nullable
- @Deprecated
- public static List<String> getTablesCommonBrokers(@Nullable List<String>
tableNames,
- Map<String, List<String>> brokerData) {
- Set<String> tablesCommonBrokersSet = getTablesCommonBrokersSet(tableNames,
brokerData);
- if (tablesCommonBrokersSet == null || tablesCommonBrokersSet.isEmpty()) {
- return null;
- }
- return new ArrayList<>(tablesCommonBrokersSet);
- }
-
/// Returns a random broker from the common brokers hosting all the tables.
@Nullable
public static String getRandomBroker(@Nullable List<String> tableNames,
Map<String, List<String>> brokerData) {
diff --git
a/pinot-clients/pinot-java-client/src/test/java/org/apache/pinot/client/utils/BrokerSelectorUtilsTest.java
b/pinot-clients/pinot-java-client/src/test/java/org/apache/pinot/client/utils/BrokerSelectorUtilsTest.java
index 512a0a3c862..5c4bd314f9b 100644
---
a/pinot-clients/pinot-java-client/src/test/java/org/apache/pinot/client/utils/BrokerSelectorUtilsTest.java
+++
b/pinot-clients/pinot-java-client/src/test/java/org/apache/pinot/client/utils/BrokerSelectorUtilsTest.java
@@ -35,36 +35,18 @@ public class BrokerSelectorUtilsTest {
Assert.assertEquals(tableSet, Set.of());
}
- @Test
- public void getTablesCommonBrokersListNullTables() {
- List<String> tableList = BrokerSelectorUtils.getTablesCommonBrokers(null,
_brokerData);
- Assert.assertNull(tableList);
- }
-
@Test
public void getTablesCommonBrokersSetEmptyTables() {
Set<String> tableSet =
BrokerSelectorUtils.getTablesCommonBrokersSet(List.of(), _brokerData);
Assert.assertEquals(tableSet, Set.of());
}
- @Test
- public void getTablesCommonBrokersListEmptyTables() {
- List<String> tableList =
BrokerSelectorUtils.getTablesCommonBrokers(List.of(), _brokerData);
- Assert.assertNull(tableList);
- }
-
@Test
public void getTablesCommonBrokersSetNotExistentTable() {
Set<String> tableSet =
BrokerSelectorUtils.getTablesCommonBrokersSet(List.of("notExistent"),
_brokerData);
Assert.assertEquals(tableSet, Set.of());
}
- @Test
- public void getTablesCommonBrokersListNotExistentTable() {
- List<String> tableList =
BrokerSelectorUtils.getTablesCommonBrokers(List.of("notExistent"), _brokerData);
- Assert.assertNull(tableList);
- }
-
@Test
public void getTablesCommonBrokersSetOneTable() {
_brokerData.put("table1", List.of("broker1"));
@@ -72,14 +54,6 @@ public class BrokerSelectorUtilsTest {
Assert.assertEquals(tableSet, Set.of("broker1"));
}
- @Test
- public void getTablesCommonBrokersListOneTable() {
- _brokerData.put("table1", List.of("broker1"));
- List<String> tableList =
BrokerSelectorUtils.getTablesCommonBrokers(List.of("table1"), _brokerData);
- Assert.assertNotNull(tableList);
- Assert.assertEquals(tableList, List.of("broker1"));
- }
-
@Test
public void getTablesCommonBrokersSetTwoTables() {
_brokerData.put("table1", List.of("broker1"));
@@ -89,15 +63,6 @@ public class BrokerSelectorUtilsTest {
Assert.assertEquals(tableSet, Set.of("broker1"));
}
- @Test
- public void getTablesCommonBrokersListTwoTables() {
- _brokerData.put("table1", List.of("broker1"));
- _brokerData.put("table2", List.of("broker1"));
- List<String> tableList =
BrokerSelectorUtils.getTablesCommonBrokers(List.of("table1", "table2"),
_brokerData);
- Assert.assertNotNull(tableList);
- Assert.assertEquals(tableList, List.of("broker1"));
- }
-
@Test
public void getTablesCommonBrokersSetTwoTablesDifferentBrokers() {
_brokerData.put("table1", List.of("broker1"));
@@ -106,14 +71,6 @@ public class BrokerSelectorUtilsTest {
Assert.assertEquals(tableSet, Set.of());
}
- @Test
- public void getTablesCommonBrokersListTwoTablesDifferentBrokers() {
- _brokerData.put("table1", List.of("broker1"));
- _brokerData.put("table2", List.of("broker2"));
- List<String> tableList =
BrokerSelectorUtils.getTablesCommonBrokers(List.of("table1", "table2"),
_brokerData);
- Assert.assertNull(tableList);
- }
-
@AfterMethod
public void tearDown() {
_brokerData.clear();
diff --git
a/pinot-common/src/main/java/org/apache/pinot/common/function/FunctionRegistry.java
b/pinot-common/src/main/java/org/apache/pinot/common/function/FunctionRegistry.java
index b955652f3bc..f88b73cf740 100644
---
a/pinot-common/src/main/java/org/apache/pinot/common/function/FunctionRegistry.java
+++
b/pinot-common/src/main/java/org/apache/pinot/common/function/FunctionRegistry.java
@@ -195,13 +195,6 @@ public class FunctionRegistry {
return FUNCTION_MAP.containsKey(canonicalName);
}
- /// @deprecated For performance concern, use [#contains(String)] instead to
avoid invoking
- /// [#canonicalize(String)] multiple times.
- @Deprecated
- public static boolean containsFunction(String name) {
- return contains(canonicalize(name));
- }
-
/// Returns the [FunctionInfo] associated with the given canonical name and
argument types, or `null` if
/// there is no matching method. This method should be called after the
FunctionRegistry is initialized and all
/// methods
@@ -222,14 +215,6 @@ public class FunctionRegistry {
return function != null ? function.getFunctionInfo(numArguments) : null;
}
- /// @deprecated For performance concern, use [#lookupFunctionInfo(String,
int)] instead to avoid invoking
- /// [#canonicalize(String)] multiple times.
- @Deprecated
- @Nullable
- public static FunctionInfo getFunctionInfo(String name, int numArguments) {
- return lookupFunctionInfo(canonicalize(name), numArguments);
- }
-
public static String canonicalize(String name) {
return StringUtils.remove(name, '_').toLowerCase();
}
diff --git
a/pinot-common/src/main/java/org/apache/pinot/common/function/TransformFunctionType.java
b/pinot-common/src/main/java/org/apache/pinot/common/function/TransformFunctionType.java
index a2ca2cabcbf..e884e526699 100644
---
a/pinot-common/src/main/java/org/apache/pinot/common/function/TransformFunctionType.java
+++
b/pinot-common/src/main/java/org/apache/pinot/common/function/TransformFunctionType.java
@@ -290,11 +290,6 @@ public enum TransformFunctionType {
return _names;
}
- @Deprecated
- public List<String> getAlternativeNames() {
- return _names;
- }
-
public SqlReturnTypeInference getReturnTypeInference() {
return _returnTypeInference;
}
diff --git
a/pinot-common/src/main/java/org/apache/pinot/common/protocols/SegmentCompletionProtocol.java
b/pinot-common/src/main/java/org/apache/pinot/common/protocols/SegmentCompletionProtocol.java
index e989d95957d..797681a64a0 100644
---
a/pinot-common/src/main/java/org/apache/pinot/common/protocols/SegmentCompletionProtocol.java
+++
b/pinot-common/src/main/java/org/apache/pinot/common/protocols/SegmentCompletionProtocol.java
@@ -32,9 +32,10 @@ import org.apache.pinot.spi.utils.JsonUtils;
/*
* This class encapsulates the segment completion protocol used by the server
and the controller for
- * low-level consumer realtime segments. The protocol has two requests:
SegmentConsumedRequest
- * and SegmentCommitRequest.It has a response that may contain different
status codes depending on the state machine
- * that the controller drives for that segment. All responses have two
elements -- status and an offset.
+ * low-level consumer realtime segments. The protocol has a
SegmentConsumedRequest and a split-commit request
+ * sequence (SegmentCommitStartRequest, segment upload,
SegmentCommitEndWithMetadataRequest). It has a response that
+ * may contain different status codes depending on the state machine that the
controller drives for that segment. All
+ * responses have two elements -- status and an offset.
*
* The overall idea is that when a server has completed consuming a segment
until the "end criteria" that
* is set (in the table configuration), it sends a SegmentConsumedRequest to
the controller (leader). The
@@ -42,8 +43,8 @@ import org.apache.pinot.spi.utils.JsonUtils;
* to the controller after a while.
*
* Meanwhile, the controller co-ordinates the SegmentConsumedRequest messages
from replicas and selects a server
- * to commit the segment. The server uses SegmentCommitRequest message, in
which it also posts the completed
- * segment to the controller.
+ * to commit the segment. The selected server commits the segment via the
split-commit sequence: it sends a
+ * SegmentCommitStartRequest, uploads the completed segment, and finishes with
a SegmentCommitEndWithMetadataRequest.
*
* The controller may respond with a failure for this commit message, but on
success, the controller changes the
* segment state to ONLINE in idealstate, and adds new CONSUMING segments as
well.
@@ -69,7 +70,7 @@ public class SegmentCompletionProtocol {
/// Never sent by the controller, but locally used by server when sending
a request fails
NOT_SENT,
- /// Server should send back a SegmentCommitRequest after processing this
response
+ /// Server should start the split-commit sequence
(SegmentCommitStartRequest) after processing this response
COMMIT,
/// Server should send SegmentConsumedRequest after waiting for less than
MAX_HOLD_TIME_MS
@@ -112,6 +113,7 @@ public class SegmentCompletionProtocol {
public static final String STREAM_PARTITION_MSG_OFFSET_KEY =
"streamPartitionMsgOffset";
public static final String MSG_TYPE_CONSUMED = "segmentConsumed";
+ // The non-split-commit endpoint is gone, but this message type remains as
the segment-completion FSM lookup key.
public static final String MSG_TYPE_COMMIT = "segmentCommit";
public static final String MSG_TYPE_COMMIT_START = "segmentCommitStart";
public static final String MSG_TYPE_SEGMENT_UPLOAD = "segmentUpload";
@@ -394,12 +396,6 @@ public class SegmentCompletionProtocol {
}
}
- public static class SegmentCommitRequest extends Request {
- public SegmentCommitRequest(Params params) {
- super(params, MSG_TYPE_COMMIT);
- }
- }
-
public static class SegmentCommitStartRequest extends Request {
public SegmentCommitStartRequest(Params params) {
super(params, MSG_TYPE_COMMIT_START);
diff --git
a/pinot-common/src/test/java/org/apache/pinot/common/function/FastJsonPathExtractorTest.java
b/pinot-common/src/test/java/org/apache/pinot/common/function/FastJsonPathExtractorTest.java
index 7337dfa1be3..3212b705d1b 100644
---
a/pinot-common/src/test/java/org/apache/pinot/common/function/FastJsonPathExtractorTest.java
+++
b/pinot-common/src/test/java/org/apache/pinot/common/function/FastJsonPathExtractorTest.java
@@ -423,7 +423,8 @@ public class FastJsonPathExtractorTest {
private static Object invoke(String name, Object... arguments)
throws Exception {
- FunctionInfo functionInfo = FunctionRegistry.getFunctionInfo(name,
arguments.length);
+ FunctionInfo functionInfo =
+
FunctionRegistry.lookupFunctionInfo(FunctionRegistry.canonicalize(name),
arguments.length);
assertNotNull(functionInfo, name + "/" + arguments.length + " is not
registered");
FunctionInvoker invoker = new FunctionInvoker(functionInfo);
Object[] copy = arguments.clone();
diff --git
a/pinot-common/src/test/java/org/apache/pinot/common/protocols/SegmentCompletionProtocolTest.java
b/pinot-common/src/test/java/org/apache/pinot/common/protocols/SegmentCompletionProtocolTest.java
index 80fa3084d68..f5854cdb060 100644
---
a/pinot-common/src/test/java/org/apache/pinot/common/protocols/SegmentCompletionProtocolTest.java
+++
b/pinot-common/src/test/java/org/apache/pinot/common/protocols/SegmentCompletionProtocolTest.java
@@ -82,9 +82,9 @@ public class SegmentCompletionProtocolTest {
.withInstanceId("Server_localhost_8099").withReason("ROW_LIMIT").withBuildTimeMillis(1000)
.withWaitTimeMillis(2000).withExtraTimeSec(3000).withMemoryUsedBytes(4000).withSegmentSizeBytes(5000)
.withNumRows(6000).withSegmentLocation("/tmp/segment").withStreamPartitionMsgOffset("7000");
- SegmentCompletionProtocol.SegmentCommitRequest segmentCommitRequest =
- new SegmentCompletionProtocol.SegmentCommitRequest(params);
- uri = new URI(segmentCommitRequest.getUrl("localhost:8080", "http"));
+ SegmentCompletionProtocol.SegmentCommitStartRequest
commitStartRequestWithAllParams =
+ new SegmentCompletionProtocol.SegmentCommitStartRequest(params);
+ uri = new URI(commitStartRequestWithAllParams.getUrl("localhost:8080",
"http"));
paramsMap =
Arrays.stream(uri.getQuery().split("&")).collect(Collectors.toMap(e ->
e.split("=")[0], e -> e.split("=")[1]));
Assert.assertEquals(paramsMap.get(SegmentCompletionProtocol.PARAM_SEGMENT_NAME),
"foo__0__0__12345Z");
diff --git
a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/assignment/segment/SegmentAssignmentUtils.java
b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/assignment/segment/SegmentAssignmentUtils.java
index 15e03e9edf5..dd4444433f3 100644
---
a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/assignment/segment/SegmentAssignmentUtils.java
+++
b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/assignment/segment/SegmentAssignmentUtils.java
@@ -307,25 +307,6 @@ public class SegmentAssignmentUtils {
return instanceStateMap;
}
- /// Returns a map from instance name to number of segments to be moved to it.
- @Deprecated
- public static Map<String, Integer>
getNumSegmentsToBeMovedPerInstance(Map<String, Map<String, String>>
oldAssignment,
- Map<String, Map<String, String>> newAssignment) {
- Map<String, Integer> numSegmentsToBeMovedPerInstance = new TreeMap<>();
- for (Map.Entry<String, Map<String, String>> entry :
newAssignment.entrySet()) {
- String segmentName = entry.getKey();
- Set<String> newInstancesAssigned = entry.getValue().keySet();
- Set<String> oldInstancesAssigned =
oldAssignment.get(segmentName).keySet();
- // For each new assigned instance, check if the segment needs to be
moved to it
- for (String instanceName : newInstancesAssigned) {
- if (!oldInstancesAssigned.contains(instanceName)) {
- numSegmentsToBeMovedPerInstance.merge(instanceName, 1, Integer::sum);
- }
- }
- }
- return numSegmentsToBeMovedPerInstance;
- }
-
/// Returns a map from instance name to number of segments to be
added/removed.
public static Map<String, IntIntPair>
getNumSegmentsToMovePerInstance(Map<String, Map<String, String>> oldAssignment,
Map<String, Map<String, String>> newAssignment) {
diff --git
a/pinot-core/src/main/java/org/apache/pinot/core/query/request/context/QueryContext.java
b/pinot-core/src/main/java/org/apache/pinot/core/query/request/context/QueryContext.java
index 4fcca5ad95c..b3fcd8f9b06 100644
---
a/pinot-core/src/main/java/org/apache/pinot/core/query/request/context/QueryContext.java
+++
b/pinot-core/src/main/java/org/apache/pinot/core/query/request/context/QueryContext.java
@@ -727,13 +727,6 @@ public class QueryContext {
return this;
}
- /// @deprecated Use [#setExplain(ExplainMode)] instead.
- @Deprecated
- public Builder setExplain(boolean explain) {
- _explain = explain ? ExplainMode.DESCRIPTION : ExplainMode.NONE;
- return this;
- }
-
public Builder setExplain(ExplainMode explain) {
_explain = explain;
return this;
diff --git
a/pinot-core/src/main/java/org/apache/pinot/server/realtime/ServerSegmentCompletionProtocolHandler.java
b/pinot-core/src/main/java/org/apache/pinot/server/realtime/ServerSegmentCompletionProtocolHandler.java
index 0e9fb93b5e2..35eb92cf539 100644
---
a/pinot-core/src/main/java/org/apache/pinot/server/realtime/ServerSegmentCompletionProtocolHandler.java
+++
b/pinot-core/src/main/java/org/apache/pinot/server/realtime/ServerSegmentCompletionProtocolHandler.java
@@ -21,7 +21,6 @@ package org.apache.pinot.server.realtime;
import com.google.common.base.Preconditions;
import java.io.File;
import java.net.URI;
-import java.net.URISyntaxException;
import java.nio.file.Files;
import java.util.List;
import java.util.Map;
@@ -44,7 +43,6 @@ import org.apache.pinot.common.utils.URIUtils;
import org.apache.pinot.common.utils.http.HttpClient;
import org.apache.pinot.common.utils.http.HttpClientConfig;
import org.apache.pinot.core.data.manager.realtime.SegmentCompletionUtils;
-import
org.apache.pinot.core.data.manager.realtime.Server2ControllerSegmentUploader;
import org.apache.pinot.core.util.SegmentCompletionProtocolUtils;
import org.apache.pinot.segment.spi.V1Constants;
import org.apache.pinot.spi.auth.AuthProvider;
@@ -160,26 +158,6 @@ public class ServerSegmentCompletionProtocolHandler {
return sendCommitEndWithMetadataFiles(url, metadataFiles);
}
- public SegmentCompletionProtocol.Response
segmentCommit(SegmentCompletionProtocol.Request.Params params,
- final File segmentTarFile) {
- SegmentCompletionProtocol.SegmentCommitRequest request = new
SegmentCompletionProtocol.SegmentCommitRequest(params);
- String url = createSegmentCompletionUrl(request);
- if (url == null) {
- return SegmentCompletionProtocol.RESP_NOT_SENT;
- }
-
- Server2ControllerSegmentUploader segmentUploader = null;
- try {
- segmentUploader =
- new Server2ControllerSegmentUploader(LOGGER,
_fileUploadDownloadClient, url, params.getSegmentName(),
- _segmentUploadRequestTimeoutMs, _serverMetrics, _authProvider,
_rawTableName);
- } catch (URISyntaxException e) {
- LOGGER.error("Segment commit upload url error: ", e);
- return SegmentCompletionProtocol.RESP_NOT_SENT;
- }
- return segmentUploader.uploadSegmentToController(segmentTarFile);
- }
-
public SegmentCompletionProtocol.Response
extendBuildTime(SegmentCompletionProtocol.Request.Params params) {
SegmentCompletionProtocol.ExtendBuildTimeRequest request =
new SegmentCompletionProtocol.ExtendBuildTimeRequest(params);
diff --git
a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/dedup/BasePartitionDedupMetadataManager.java
b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/dedup/BasePartitionDedupMetadataManager.java
index 27c54ccdbfd..693c085d91a 100644
---
a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/dedup/BasePartitionDedupMetadataManager.java
+++
b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/dedup/BasePartitionDedupMetadataManager.java
@@ -45,7 +45,6 @@ import org.apache.pinot.segment.spi.IndexSegment;
import org.apache.pinot.segment.spi.MutableSegment;
import org.apache.pinot.segment.spi.V1Constants;
import org.apache.pinot.spi.config.table.HashFunction;
-import org.apache.pinot.spi.data.readers.PrimaryKey;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -102,12 +101,6 @@ public abstract class BasePartitionDedupMetadataManager
implements PartitionDedu
return _context;
}
- @Override
- public boolean checkRecordPresentOrUpdate(PrimaryKey pk, IndexSegment
indexSegment) {
- throw new UnsupportedOperationException(
- "checkRecordPresentOrUpdate(PrimaryKey pk, IndexSegment indexSegment)
is " + "deprecated!");
- }
-
@Override
public boolean isPreloading() {
return _isPreloading;
diff --git
a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/dedup/PartitionDedupMetadataManager.java
b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/dedup/PartitionDedupMetadataManager.java
index 50dc36cd882..f7587084e44 100644
---
a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/dedup/PartitionDedupMetadataManager.java
+++
b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/dedup/PartitionDedupMetadataManager.java
@@ -22,7 +22,6 @@ import java.io.Closeable;
import org.apache.pinot.segment.local.segment.index.loader.IndexLoadingConfig;
import org.apache.pinot.segment.spi.ImmutableSegment;
import org.apache.pinot.segment.spi.IndexSegment;
-import org.apache.pinot.spi.data.readers.PrimaryKey;
public interface PartitionDedupMetadataManager extends Closeable {
@@ -56,22 +55,14 @@ public interface PartitionDedupMetadataManager extends
Closeable {
/// Remove the expired primary keys from the metadata when TTL is enabled.
void removeExpiredPrimaryKeys();
- /// Add the primary key to the given segment to the dedup matadata if it is
absent.
- /// Returns true if the key was already present, i.e., the new record
associated with the given [PrimaryKey]
- /// is a duplicate and should be skipped/dropped.
- @Deprecated
- boolean checkRecordPresentOrUpdate(PrimaryKey pk, IndexSegment indexSegment);
-
- /// Add the primary key to the given segment to the dedup matadata if it is
absent and with in the retention time.
+ /// Add the primary key to the given segment to the dedup metadata if it is
absent and within the retention time.
/// Returns true if the key was already present, i.e., the new record
associated with the given
/// [DedupRecordInfo] is a duplicate and should be skipped/dropped.
/// @param dedupRecordInfo The primary key and the dedup time.
/// @param indexSegment The segment to which the record belongs.
/// @return true if the key was already present, i.e., the new record
associated with the given
/// [DedupRecordInfo] is a duplicate and should be skipped/dropped.
- default boolean checkRecordPresentOrUpdate(DedupRecordInfo dedupRecordInfo,
IndexSegment indexSegment) {
- return checkRecordPresentOrUpdate(dedupRecordInfo.getPrimaryKey(),
indexSegment);
- }
+ boolean checkRecordPresentOrUpdate(DedupRecordInfo dedupRecordInfo,
IndexSegment indexSegment);
/// Stops the metadata manager. After invoking this method, no access to the
metadata will be accepted.
void stop();
diff --git
a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/realtime/impl/RealtimeSegmentConfig.java
b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/realtime/impl/RealtimeSegmentConfig.java
index 2503b56098e..4071edb8bf3 100644
---
a/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/realtime/impl/RealtimeSegmentConfig.java
+++
b/pinot-segment-local/src/main/java/org/apache/pinot/segment/local/realtime/impl/RealtimeSegmentConfig.java
@@ -387,13 +387,6 @@ public class RealtimeSegmentConfig {
return this;
}
- /// Whether null handling is enabled by default. This value is only used if
- /// [Schema#isEnableColumnBasedNullHandling()] is false.
- @Deprecated
- public Builder setNullHandlingEnabled(boolean nullHandlingEnabled) {
- return setDefaultNullHandlingEnabled(nullHandlingEnabled);
- }
-
/// Whether null handling is enabled by default. This value is only used if
/// [Schema#isEnableColumnBasedNullHandling()] is false.
public Builder setDefaultNullHandlingEnabled(boolean
defaultNullHandlingEnabled) {
diff --git
a/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/dedup/BasePartitionDedupMetadataManagerTest.java
b/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/dedup/BasePartitionDedupMetadataManagerTest.java
index e02da4408e0..8933a5a756c 100644
---
a/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/dedup/BasePartitionDedupMetadataManagerTest.java
+++
b/pinot-segment-local/src/test/java/org/apache/pinot/segment/local/dedup/BasePartitionDedupMetadataManagerTest.java
@@ -78,6 +78,11 @@ public class BasePartitionDedupMetadataManagerTest {
protected void doRemoveExpiredPrimaryKeys() {
}
+ @Override
+ public boolean checkRecordPresentOrUpdate(DedupRecordInfo dedupRecordInfo,
IndexSegment indexSegment) {
+ return false;
+ }
+
@Override
public long getNumPrimaryKeys() {
return 0;
diff --git
a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/creator/SegmentGeneratorConfig.java
b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/creator/SegmentGeneratorConfig.java
index 8f88f4f62e6..6e2d6ca5673 100644
---
a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/creator/SegmentGeneratorConfig.java
+++
b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/creator/SegmentGeneratorConfig.java
@@ -542,15 +542,6 @@ public class SegmentGeneratorConfig implements
Serializable {
return fields;
}
- /// Whether null handling is enabled by default. This value is only used if
- /// [Schema#isEnableColumnBasedNullHandling()] is false.
- ///
- /// @deprecated Use [#isDefaultNullHandlingEnabled()] instead
- @Deprecated
- public boolean isNullHandlingEnabled() {
- return _defaultNullHandlingEnabled;
- }
-
/// Whether null handling is enabled by default. This value is only used if
/// [Schema#isEnableColumnBasedNullHandling()] is false.
public boolean isDefaultNullHandlingEnabled() {
@@ -559,17 +550,8 @@ public class SegmentGeneratorConfig implements
Serializable {
/// Whether null handling is enabled by default. This value is only used if
/// [Schema#isEnableColumnBasedNullHandling()] is false.
- ///
- /// @deprecated Use [#setDefaultNullHandlingEnabled(boolean)] instead
- @Deprecated
- public void setNullHandlingEnabled(boolean nullHandlingEnabled) {
- setDefaultNullHandlingEnabled(nullHandlingEnabled);
- }
-
- /// Whether null handling is enabled by default. This value is only used if
- /// [Schema#isEnableColumnBasedNullHandling()] is false.
- public void setDefaultNullHandlingEnabled(boolean nullHandlingEnabled) {
- _defaultNullHandlingEnabled = nullHandlingEnabled;
+ public void setDefaultNullHandlingEnabled(boolean
defaultNullHandlingEnabled) {
+ _defaultNullHandlingEnabled = defaultNullHandlingEnabled;
}
public boolean isContinueOnError() {
diff --git
a/pinot-spi/src/main/java/org/apache/pinot/spi/annotations/ScalarFunction.java
b/pinot-spi/src/main/java/org/apache/pinot/spi/annotations/ScalarFunction.java
index 3c8fa53aa6f..b514c003492 100644
---
a/pinot-spi/src/main/java/org/apache/pinot/spi/annotations/ScalarFunction.java
+++
b/pinot-spi/src/main/java/org/apache/pinot/spi/annotations/ScalarFunction.java
@@ -68,6 +68,4 @@ public @interface ScalarFunction {
/// existing function has been audited for environment-sensitive behavior.
When class-level and method-level
/// declarations coexist, the most volatile category wins.
FunctionVolatility volatility() default FunctionVolatility.IMMUTABLE;
-
- @Deprecated boolean isPlaceholder() default false;
}
diff --git a/pinot-spi/src/main/java/org/apache/pinot/spi/data/Schema.java
b/pinot-spi/src/main/java/org/apache/pinot/spi/data/Schema.java
index 52ce2469102..2d0c9bd8884 100644
--- a/pinot-spi/src/main/java/org/apache/pinot/spi/data/Schema.java
+++ b/pinot-spi/src/main/java/org/apache/pinot/spi/data/Schema.java
@@ -899,22 +899,6 @@ public final class Schema implements Serializable {
return result;
}
- /// @deprecated this method is not correctly implemented. ie doesn't call
super.clone and does not create a deep copy
- /// of the fieldSpecs.
- @Deprecated
- @Override
- public Schema clone() {
- Schema cloned = new SchemaBuilder()
- .setSchemaName(getSchemaName())
- .setDescription(getDescription())
- .setTags(getTags())
- .setPrimaryKeyColumns(getPrimaryKeyColumns())
- .setEnableColumnBasedNullHandling(isEnableColumnBasedNullHandling())
- .build();
- getAllFieldSpecs().forEach(fieldSpec -> cloned.addField(fieldSpec));
- return cloned;
- }
-
public static Schema cloneSchemaWithName(Schema source, String newName) {
try {
String json = JsonUtils.objectToString(source);
diff --git
a/pinot-spi/src/main/java/org/apache/pinot/spi/utils/builder/ControllerRequestURLBuilder.java
b/pinot-spi/src/main/java/org/apache/pinot/spi/utils/builder/ControllerRequestURLBuilder.java
index 4346cc394b9..97ab724da78 100644
---
a/pinot-spi/src/main/java/org/apache/pinot/spi/utils/builder/ControllerRequestURLBuilder.java
+++
b/pinot-spi/src/main/java/org/apache/pinot/spi/utils/builder/ControllerRequestURLBuilder.java
@@ -443,15 +443,6 @@ public class ControllerRequestURLBuilder {
return forSegmentsMetadataFromServer(tableName, (List<String>) null);
}
- @Deprecated
- public String forSegmentsMetadataFromServer(String tableName, @Nullable
String columns) {
- String url = StringUtil.join("/", _baseUrl, "segments", tableName,
"metadata");
- if (columns != null) {
- url += "?columns=" + columns;
- }
- return url;
- }
-
public String forSegmentsMetadataFromServer(String tableName, @Nullable
List<String> columns) {
return forSegmentsMetadataFromServer(tableName, columns, null);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
