This is an automated email from the ASF dual-hosted git repository. FrankChen021 pushed a commit to branch codex/deps-remove-jackson1 in repository https://gitbox.apache.org/repos/asf/druid.git
commit cbea7e626ce705936e42b397d226436b7920211a Merge: 25e4abb429d ca0064ef47a Author: Frank Chen <[email protected]> AuthorDate: Mon Aug 3 13:28:09 2026 +0800 Merge remote-tracking branch 'origin/master' into codex/pr-19808-resolve # Conflicts: # pom.xml docs/api-reference/sql-ingestion-api.md | 4 +- docs/configuration/index.md | 1 + docs/data-management/automatic-compaction.md | 13 + docs/ingestion/data-formats.md | 68 ++ docs/multi-stage-query/concepts.md | 2 +- docs/multi-stage-query/index.md | 3 +- .../compact/AutoCompactionUpgradeTest.java | 2 +- extensions-contrib/cloudfiles-extensions/pom.xml | 29 +- extensions-contrib/grpc-query/pom.xml | 2 +- extensions-contrib/statsd-emitter/pom.xml | 2 +- .../catalog/compact/CatalogCompactionTest.java | 4 +- extensions-core/druid-kerberos/pom.xml | 4 + indexing-service/pom.xml | 1 + .../compact/CascadingReindexingTemplate.java | 6 + licenses.yaml | 125 ++- .../druid/msq/exec/MSQCompactionTaskRunTest.java | 4 + pom.xml | 16 +- processing/pom.xml | 5 + .../druid/data/input/impl/RegexInputFormat.java | 10 +- .../apache/druid/data/input/impl/RegexReader.java | 10 +- .../RegexEngineModule.java} | 19 +- .../apache/druid/guice/StartupInjectorBuilder.java | 1 + .../apache/druid/java/util/common/JodaUtils.java | 4 +- .../druid/java/util/common/guava/Comparators.java | 39 + .../apache/druid/query/QueryConfigProvider.java | 2 +- .../apache/druid/query/filter/TypedInFilter.java | 16 +- .../RegexConfig.java} | 42 +- .../RegexEngineType.java} | 16 +- .../RegexMatcher.java} | 21 +- .../RegexPattern.java} | 16 +- .../apache/druid/regex/RegexPatternFactory.java | 108 +++ .../druid/segment/column/ConstantColumns.java | 4 +- .../segment/index/ConstantColumnIndexSupplier.java | 237 ++++++ .../segment/loading/CompositePartialLoadSpec.java | 217 +++++ .../loading/PartialClusterGroupLoadSpec.java | 6 +- .../druid/segment/loading/PartialLoadSpec.java | 41 +- .../segment/loading/PartialProjectionLoadSpec.java | 6 +- .../nested/ScalarLongColumnAndIndexSupplier.java | 28 +- .../org/apache/druid/timeline/IntervalTreeMap.java | 880 +++++++++++++++++++++ .../druid/timeline/VersionedIntervalTimeline.java | 125 ++- .../data/input/impl/RegexInputFormatTest.java | 68 +- .../apache/druid/segment/filter/InFilterTests.java | 115 +++ .../IncrementalIndexCursorFactoryTest.java | 13 +- .../index/ConstantColumnIndexSupplierTest.java | 304 +++++++ .../loading/CompositePartialLoadSpecTest.java | 612 ++++++++++++++ .../apache/druid/timeline/IntervalTreeMapTest.java | 550 +++++++++++++ .../VersionedIntervalTimelineSpecificDataTest.java | 22 +- .../timeline/VersionedIntervalTimelineTest.java | 20 +- .../VersionedIntervalTimelineTestBase.java | 7 +- .../druid/client/BrokerViewOfBrokerConfig.java | 45 +- .../apache/druid/guice/PartialLoadSpecModule.java | 10 +- .../org/apache/druid/guice/StorageNodeModule.java | 2 + .../druid/metadata/SqlSegmentsMetadataManager.java | 46 +- .../org/apache/druid/rpc/ServiceClientImpl.java | 38 +- .../segment/indexing/SegmentTimelineConfig.java | 33 +- .../org/apache/druid/server/QueryLifecycle.java | 107 ++- .../apache/druid/server/QueryLifecycleFactory.java | 23 +- .../org/apache/druid/server/SegmentManager.java | 22 +- .../druid/server/broker/BrokerDynamicConfig.java | 36 + .../druid/server/broker/QueryConfigSnapshot.java | 91 +++ .../DataSourceCompactibleSegmentIterator.java | 55 +- .../CatalogDataSourceCompactionConfig.java | 15 +- .../coordinator/DataSourceCompactionConfig.java | 6 + .../InlineSchemaDataSourceCompactionConfig.java | 23 + .../rules/CompositePartialLoadMatcher.java | 198 +++++ .../coordinator/rules/PartialLoadMatcher.java | 3 +- .../druid/client/BrokerViewOfBrokerConfigTest.java | 52 ++ ...egmentLocalCacheManagerPartialRuleLoadTest.java | 94 +++ .../server/PerSegmentTimeoutInjectionTest.java | 146 ++-- .../apache/druid/server/QueryLifecycleTest.java | 20 +- .../org/apache/druid/server/QueryResourceTest.java | 13 +- .../server/broker/BrokerDynamicConfigTest.java | 45 ++ .../DataSourceCompactibleSegmentIteratorTest.java | 101 ++- .../compaction/NewestSegmentFirstPolicyTest.java | 33 + .../CatalogDataSourceCompactionConfigTest.java | 38 + ...InlineSchemaDataSourceCompactionConfigTest.java | 17 + .../coordinator/duty/CompactSegmentsTest.java | 1 + .../rules/CompositePartialLoadMatcherTest.java | 457 +++++++++++ ...WildcardClusterGroupPartialLoadMatcherTest.java | 10 + services/pom.xml | 1 + .../java/org/apache/druid/cli/CliCoordinator.java | 2 + .../main/java/org/apache/druid/cli/CliIndexer.java | 4 +- .../org/apache/druid/cli/CliMiddleManager.java | 4 +- .../java/org/apache/druid/cli/CliOverlord.java | 4 +- .../main/java/org/apache/druid/cli/CliPeon.java | 2 + .../druid/sql/calcite/run/NativeQueryMaker.java | 4 +- .../druid/sql/calcite/schema/SystemSchemaTest.java | 2 +- .../org/apache/druid/sql/guice/SqlModuleTest.java | 6 + .../query-context-completions.ts | 4 + website/.spelling | 2 + 90 files changed, 5197 insertions(+), 468 deletions(-) diff --cc pom.xml index 52eb301b456,440d3f52393..1bf0e41b94d --- a/pom.xml +++ b/pom.xml @@@ -105,7 -106,8 +106,7 @@@ <iceberg.core.version>1.10.0</iceberg.core.version> <jetty.version>12.1.11</jetty.version> <jersey.version>1.19.4</jersey.version> - <jackson.version>2.21.4</jackson.version> + <jackson.version>2.22.1</jackson.version> - <codehaus.jackson.version>1.9.13</codehaus.jackson.version> <log4j.version>2.26.0</log4j.version> <mysql.version>8.2.0</mysql.version> <mariadb.version>2.7.3</mariadb.version> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
