This is an automated email from the ASF dual-hosted git repository. mblow pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/asterixdb.git
commit 62e5f251afa742cc60a387e758c875ef0fcd4a60 Merge: b69cead3fb 13f95fc15f Author: Michael Blow <[email protected]> AuthorDate: Mon Aug 25 17:38:34 2025 -0400 Merge branch 'gerrit/ionic' into 'gerrit/phoenix' * [NO ISSUE][HYR][MISC] Update commons-lang3 to 3.18.0 for CVE-2025-48924 * [NO ISSUE][OTH] Update parquet version * [NO ISSUE][HYR] Update Jackson to 2.19.2 to address CVEs * [NO ISSUE][*DB][TEST] avoid exceptions on duplicate s3mock shutdowns Ext-ref: MB-67819 Change-Id: I5f7d1b062147d29064a9eca068601a45db870411 asterixdb/asterix-app/pom.xml | 2 +- .../apache/asterix/api/common/LocalCloudUtil.java | 9 +- .../asterix/common/config/ConfigUsageTest.java | 2 +- .../api/cluster_state_1/cluster_state_1.1.regexadm | 6 + .../cluster_state_1_full.1.regexadm | 6 + .../cluster_state_1_less.1.regexadm | 6 + .../src/test/resources/runtimets/sqlpp_queries.xml | 2 +- asterixdb/asterix-cloud/pom.xml | 2 +- .../asterix/cloud/AbstractCloudIOManager.java | 1 + .../apache/asterix/cloud/clients/CloudFile.java | 7 +- .../apache/asterix/cloud/util/CloudFileUtil.java | 6 +- .../asterix/common/api/IPropertiesFactory.java | 3 + .../asterix/common/config/AsterixProperties.java | 10 +- .../asterix/common/config/JacksonProperties.java | 138 +++++++++++++++++++++ .../asterix/common/config/PropertiesFactory.java | 5 + asterixdb/asterix-server/pom.xml | 4 +- asterixdb/pom.xml | 101 ++++++++++++--- .../org/apache/hyracks/control/cc/CCDriver.java | 5 +- .../control/common/config/ConfigManager.java | 7 +- .../control/common/controllers/NCConfig.java | 3 +- .../java/org/apache/hyracks/util/StorageUtil.java | 23 ++-- .../org/apache/hyracks/util/StorageUnitTest.java | 17 ++- hyracks-fullstack/pom.xml | 103 ++++++++++++++- 23 files changed, 406 insertions(+), 62 deletions(-) diff --cc hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/controllers/NCConfig.java index e06d40072b,ec07affbdf..f55dd59c79 --- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/controllers/NCConfig.java +++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/controllers/NCConfig.java @@@ -103,13 -102,9 +103,12 @@@ public class NCConfig extends Controlle PYTHON_ARGS(STRING_ARRAY, (String[]) null), PYTHON_ENV(STRING_ARRAY, (String[]) null), PYTHON_DS_PATH(STRING, (String) null), + LIBRARY_MAX_FILE_SIZE(POSITIVE_LONG_BYTE_UNIT, 250L * 1024 * 1024), //250MB + LIBRARY_MAX_EXTRACTED_SIZE(POSITIVE_LONG_BYTE_UNIT, 1000L * 1024 * 1024), //1GB + LIBRARY_MAX_ARCHIVE_ENTRIES(INTEGER, 4096), CREDENTIAL_FILE( OptionTypes.STRING, - (Function<IApplicationConfig, String>) appConfig -> FileUtil - .joinPath(appConfig.getString(ControllerConfig.Option.DEFAULT_DIR), "passwd"), + appConfig -> FileUtil.joinPath(appConfig.getString(ControllerConfig.Option.DEFAULT_DIR), "passwd"), ControllerConfig.Option.DEFAULT_DIR.cmdline() + "/passwd"), STORAGE_MAX_COLUMNS_IN_ZEROTH_SEGMENT(INTEGER_BYTE_UNIT, 5000), STORAGE_PAGE_ZERO_WRITER(STRING, "default");
