From 667e59ac17186858a792c84db28da961b4da4808 Mon Sep 17 00:00:00 2001 From: Clint Wylie Date: Thu, 3 Apr 2025 23:51:48 -0700 Subject: [PATCH] remove some stale configs from example configs, minor doc update --- docs/querying/sql-functions.md | 4 ++-- examples/conf/druid/auto/_common/common.runtime.properties | 5 ----- .../conf/druid/cluster/_common/common.runtime.properties | 5 ----- .../single-server/large/_common/common.runtime.properties | 6 ------ .../single-server/medium/_common/common.runtime.properties | 6 ------ .../micro-quickstart/_common/common.runtime.properties | 6 ------ .../nano-quickstart/_common/common.runtime.properties | 6 ------ .../single-server/small/_common/common.runtime.properties | 6 ------ .../single-server/xlarge/_common/common.runtime.properties | 6 ------ .../apache/druid/query/scan/NestedDataScanQueryTest.java | 2 +- 10 files changed, 3 insertions(+), 49 deletions(-) diff --git a/docs/querying/sql-functions.md b/docs/querying/sql-functions.md index 05e1faafd688..44c849794bbc 100644 --- a/docs/querying/sql-functions.md +++ b/docs/querying/sql-functions.md @@ -659,7 +659,7 @@ Returns the following: ## ARRAY_OFFSET_OF -Returns the zero-based index of the first occurrence of the expression in the array. Returns null if the value isn't present, or `-1` if `druid.generic.useDefaultValueForNull=true` (deprecated legacy mode). +Returns the zero-based index of the first occurrence of the expression in the array. Returns null if the value isn't present. * **Syntax**: `ARRAY_OFFSET_OF(arr, expr)` * **Function type:** Array @@ -721,7 +721,7 @@ Returns the following: ## ARRAY_ORDINAL_OF -Returns the one-based index of the first occurrence of the expression in the array. Returns null if the value isn't present, or `-1` if `druid.generic.useDefaultValueForNull=true` (deprecated legacy mode). +Returns the one-based index of the first occurrence of the expression in the array. Returns null if the value isn't present. * **Syntax**: `ARRAY_ORDINAL_OF(arr, expr)` * **Function type:** Array diff --git a/examples/conf/druid/auto/_common/common.runtime.properties b/examples/conf/druid/auto/_common/common.runtime.properties index 985a84994d14..1af96555aaca 100644 --- a/examples/conf/druid/auto/_common/common.runtime.properties +++ b/examples/conf/druid/auto/_common/common.runtime.properties @@ -146,8 +146,3 @@ druid.sql.planner.useGroupingSetForExactDistinct=true # Lookups # druid.lookup.enableLookupSyncOnStartup=false - -# -# Expression processing config -# -druid.expressions.useStrictBooleans=true diff --git a/examples/conf/druid/cluster/_common/common.runtime.properties b/examples/conf/druid/cluster/_common/common.runtime.properties index 985a84994d14..1af96555aaca 100644 --- a/examples/conf/druid/cluster/_common/common.runtime.properties +++ b/examples/conf/druid/cluster/_common/common.runtime.properties @@ -146,8 +146,3 @@ druid.sql.planner.useGroupingSetForExactDistinct=true # Lookups # druid.lookup.enableLookupSyncOnStartup=false - -# -# Expression processing config -# -druid.expressions.useStrictBooleans=true diff --git a/examples/conf/druid/single-server/large/_common/common.runtime.properties b/examples/conf/druid/single-server/large/_common/common.runtime.properties index d27c83ca569e..1af96555aaca 100644 --- a/examples/conf/druid/single-server/large/_common/common.runtime.properties +++ b/examples/conf/druid/single-server/large/_common/common.runtime.properties @@ -146,9 +146,3 @@ druid.sql.planner.useGroupingSetForExactDistinct=true # Lookups # druid.lookup.enableLookupSyncOnStartup=false - -# -# Expression processing config -# -druid.expressions.useStrictBooleans=true - diff --git a/examples/conf/druid/single-server/medium/_common/common.runtime.properties b/examples/conf/druid/single-server/medium/_common/common.runtime.properties index d27c83ca569e..1af96555aaca 100644 --- a/examples/conf/druid/single-server/medium/_common/common.runtime.properties +++ b/examples/conf/druid/single-server/medium/_common/common.runtime.properties @@ -146,9 +146,3 @@ druid.sql.planner.useGroupingSetForExactDistinct=true # Lookups # druid.lookup.enableLookupSyncOnStartup=false - -# -# Expression processing config -# -druid.expressions.useStrictBooleans=true - diff --git a/examples/conf/druid/single-server/micro-quickstart/_common/common.runtime.properties b/examples/conf/druid/single-server/micro-quickstart/_common/common.runtime.properties index d27c83ca569e..1af96555aaca 100644 --- a/examples/conf/druid/single-server/micro-quickstart/_common/common.runtime.properties +++ b/examples/conf/druid/single-server/micro-quickstart/_common/common.runtime.properties @@ -146,9 +146,3 @@ druid.sql.planner.useGroupingSetForExactDistinct=true # Lookups # druid.lookup.enableLookupSyncOnStartup=false - -# -# Expression processing config -# -druid.expressions.useStrictBooleans=true - diff --git a/examples/conf/druid/single-server/nano-quickstart/_common/common.runtime.properties b/examples/conf/druid/single-server/nano-quickstart/_common/common.runtime.properties index d27c83ca569e..1af96555aaca 100644 --- a/examples/conf/druid/single-server/nano-quickstart/_common/common.runtime.properties +++ b/examples/conf/druid/single-server/nano-quickstart/_common/common.runtime.properties @@ -146,9 +146,3 @@ druid.sql.planner.useGroupingSetForExactDistinct=true # Lookups # druid.lookup.enableLookupSyncOnStartup=false - -# -# Expression processing config -# -druid.expressions.useStrictBooleans=true - diff --git a/examples/conf/druid/single-server/small/_common/common.runtime.properties b/examples/conf/druid/single-server/small/_common/common.runtime.properties index d27c83ca569e..1af96555aaca 100644 --- a/examples/conf/druid/single-server/small/_common/common.runtime.properties +++ b/examples/conf/druid/single-server/small/_common/common.runtime.properties @@ -146,9 +146,3 @@ druid.sql.planner.useGroupingSetForExactDistinct=true # Lookups # druid.lookup.enableLookupSyncOnStartup=false - -# -# Expression processing config -# -druid.expressions.useStrictBooleans=true - diff --git a/examples/conf/druid/single-server/xlarge/_common/common.runtime.properties b/examples/conf/druid/single-server/xlarge/_common/common.runtime.properties index d27c83ca569e..1af96555aaca 100644 --- a/examples/conf/druid/single-server/xlarge/_common/common.runtime.properties +++ b/examples/conf/druid/single-server/xlarge/_common/common.runtime.properties @@ -146,9 +146,3 @@ druid.sql.planner.useGroupingSetForExactDistinct=true # Lookups # druid.lookup.enableLookupSyncOnStartup=false - -# -# Expression processing config -# -druid.expressions.useStrictBooleans=true - diff --git a/processing/src/test/java/org/apache/druid/query/scan/NestedDataScanQueryTest.java b/processing/src/test/java/org/apache/druid/query/scan/NestedDataScanQueryTest.java index baee61a86fab..9b3e644fb7b4 100644 --- a/processing/src/test/java/org/apache/druid/query/scan/NestedDataScanQueryTest.java +++ b/processing/src/test/java/org/apache/druid/query/scan/NestedDataScanQueryTest.java @@ -665,7 +665,7 @@ public void testIngestAndScanSegmentsRealtimeSchemaDiscoveryArrayTypes() throws } @Test - public void testIngestAndScanSegmentsRealtimeSchemaDiscoveryMoreArrayTypesStrictBooleans() throws Exception + public void testIngestAndScanSegmentsRealtimeSchemaDiscoveryMoreArrayTypes() throws Exception { Druids.ScanQueryBuilder builder = Druids.newScanQueryBuilder() .dataSource("test_datasource")