You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pinot.apache.org by ja...@apache.org on 2023/06/13 18:39:04 UTC
[pinot] branch master updated: Enable case insensitivity by default (#10771)
This is an automated email from the ASF dual-hosted git repository.
jackie 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 1d9682fc67 Enable case insensitivity by default (#10771)
1d9682fc67 is described below
commit 1d9682fc67aca813d7a14b3a7415f545f9420078
Author: soumitra-st <12...@users.noreply.github.com>
AuthorDate: Tue Jun 13 11:38:57 2023 -0700
Enable case insensitivity by default (#10771)
---
.../org/apache/pinot/broker/broker/helix/BaseBrokerStarter.java | 3 +--
.../pinot/controller/helix/core/PinotHelixResourceManager.java | 7 +++----
.../apache/pinot/controller/helix/core/util/HelixSetupUtils.java | 2 +-
.../src/main/java/org/apache/pinot/spi/utils/CommonConstants.java | 3 +--
4 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/pinot-broker/src/main/java/org/apache/pinot/broker/broker/helix/BaseBrokerStarter.java b/pinot-broker/src/main/java/org/apache/pinot/broker/broker/helix/BaseBrokerStarter.java
index e8329ec06f..dddd93ce02 100644
--- a/pinot-broker/src/main/java/org/apache/pinot/broker/broker/helix/BaseBrokerStarter.java
+++ b/pinot-broker/src/main/java/org/apache/pinot/broker/broker/helix/BaseBrokerStarter.java
@@ -270,8 +270,7 @@ public abstract class BaseBrokerStarter implements ServiceStartable {
// Initialize FunctionRegistry before starting the broker request handler
FunctionRegistry.init();
boolean caseInsensitive =
- _brokerConf.getProperty(Helix.ENABLE_CASE_INSENSITIVE_KEY, false) || _brokerConf.getProperty(
- Helix.DEPRECATED_ENABLE_CASE_INSENSITIVE_KEY, false);
+ _brokerConf.getProperty(Helix.ENABLE_CASE_INSENSITIVE_KEY, Helix.DEFAULT_ENABLE_CASE_INSENSITIVE);
TableCache tableCache = new TableCache(_propertyStore, caseInsensitive);
// Configure TLS for netty connection to server
TlsConfig tlsDefaults = TlsUtils.extractTlsConfig(_brokerConf, Broker.BROKER_TLS_PREFIX);
diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/PinotHelixResourceManager.java b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/PinotHelixResourceManager.java
index 111ea6a24b..c641132f95 100644
--- a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/PinotHelixResourceManager.java
+++ b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/PinotHelixResourceManager.java
@@ -315,10 +315,9 @@ public class PinotHelixResourceManager {
HelixConfigScope helixConfigScope =
new HelixConfigScopeBuilder(HelixConfigScope.ConfigScopeProperty.CLUSTER).forCluster(_helixClusterName).build();
Map<String, String> configs = _helixAdmin.getConfig(helixConfigScope,
- Arrays.asList(Helix.ENABLE_CASE_INSENSITIVE_KEY, Helix.DEPRECATED_ENABLE_CASE_INSENSITIVE_KEY));
- boolean caseInsensitive =
- Boolean.parseBoolean(configs.get(Helix.ENABLE_CASE_INSENSITIVE_KEY)) || Boolean.parseBoolean(
- configs.get(Helix.DEPRECATED_ENABLE_CASE_INSENSITIVE_KEY));
+ Arrays.asList(Helix.ENABLE_CASE_INSENSITIVE_KEY));
+ boolean caseInsensitive = Boolean.parseBoolean(configs.getOrDefault(Helix.ENABLE_CASE_INSENSITIVE_KEY,
+ Boolean.toString(Helix.DEFAULT_ENABLE_CASE_INSENSITIVE)));
_tableCache = new TableCache(_propertyStore, caseInsensitive);
}
diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/util/HelixSetupUtils.java b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/util/HelixSetupUtils.java
index d42fe6a36b..ea4d888589 100644
--- a/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/util/HelixSetupUtils.java
+++ b/pinot-controller/src/main/java/org/apache/pinot/controller/helix/core/util/HelixSetupUtils.java
@@ -79,7 +79,7 @@ public class HelixSetupUtils {
new HelixConfigScopeBuilder(ConfigScopeProperty.CLUSTER).forCluster(helixClusterName).build();
Map<String, String> configMap = new HashMap<>();
configMap.put(ZKHelixManager.ALLOW_PARTICIPANT_AUTO_JOIN, Boolean.toString(true));
- configMap.put(ENABLE_CASE_INSENSITIVE_KEY, Boolean.toString(false));
+ configMap.put(ENABLE_CASE_INSENSITIVE_KEY, Boolean.toString(DEFAULT_ENABLE_CASE_INSENSITIVE));
configMap.put(DEFAULT_HYPERLOGLOG_LOG2M_KEY, Integer.toString(DEFAULT_HYPERLOGLOG_LOG2M));
configMap.put(CommonConstants.Broker.CONFIG_OF_ENABLE_QUERY_LIMIT_OVERRIDE, Boolean.toString(false));
admin.setConfig(configScope, configMap);
diff --git a/pinot-spi/src/main/java/org/apache/pinot/spi/utils/CommonConstants.java b/pinot-spi/src/main/java/org/apache/pinot/spi/utils/CommonConstants.java
index 283ed14786..471e97eacd 100644
--- a/pinot-spi/src/main/java/org/apache/pinot/spi/utils/CommonConstants.java
+++ b/pinot-spi/src/main/java/org/apache/pinot/spi/utils/CommonConstants.java
@@ -84,10 +84,9 @@ public class CommonConstants {
public static final String LEAD_CONTROLLER_RESOURCE_ENABLED_KEY = "RESOURCE_ENABLED";
public static final String ENABLE_CASE_INSENSITIVE_KEY = "enable.case.insensitive";
+ public static final boolean DEFAULT_ENABLE_CASE_INSENSITIVE = true;
public static final String ALLOW_TABLE_NAME_WITH_DATABASE = "allow.table.name.with.database";
public static final boolean DEFAULT_ALLOW_TABLE_NAME_WITH_DATABASE = false;
- @Deprecated
- public static final String DEPRECATED_ENABLE_CASE_INSENSITIVE_KEY = "enable.case.insensitive.pql";
public static final String DEFAULT_HYPERLOGLOG_LOG2M_KEY = "default.hyperloglog.log2m";
public static final int DEFAULT_HYPERLOGLOG_LOG2M = 8;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pinot.apache.org
For additional commands, e-mail: commits-help@pinot.apache.org