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 6b74ff0b0306080671c60cfc4e265be8299c2ee6 Merge: 4dea428622 77704ebea4 Author: Michael Blow <[email protected]> AuthorDate: Sat Sep 13 07:48:25 2025 -0400 Merge branch 'gerrit/trinity' into 'gerrit/phoenix' * [NO ISSUE][HYR][STO] FileMapManager performance improvements * [NO ISSUE][HYR][STO] Add missing serialVersionUID Ext-ref: MB-68501 Change-Id: Ia019cf76670d9c5b86061562255094c5518f05af .../algebricks/algebricks-core/pom.xml | 2 +- hyracks-fullstack/hyracks/hyracks-cloud/pom.xml | 2 +- .../hyracks/hyracks-data/hyracks-data-std/pom.xml | 2 +- .../hyracks/hyracks-dataflow-common/pom.xml | 2 +- .../hyracks/hyracks-storage-am-btree/pom.xml | 2 +- .../hyracks/hyracks-storage-am-common/pom.xml | 2 +- .../hyracks-storage-am-lsm-btree-column/pom.xml | 2 +- .../hyracks/hyracks-storage-am-lsm-common/pom.xml | 2 +- .../am/lsm/common/impls/VirtualBufferCache.java | 33 +++----- .../hyracks/hyracks-storage-common/pom.xml | 4 + .../storage/common/file/FileMapManager.java | 54 +++++++++++--- .../storage/common/file/IFileMapManager.java | 19 +++++ .../common/file/SynchronizedFileMapManager.java | 87 ++++++++++++++++++++++ hyracks-fullstack/hyracks/hyracks-util/pom.xml | 2 +- hyracks-fullstack/pom.xml | 2 +- 15 files changed, 177 insertions(+), 40 deletions(-) diff --cc hyracks-fullstack/hyracks/hyracks-cloud/pom.xml index 07dcacc560,0000000000..300c633d54 mode 100644,000000..100644 --- a/hyracks-fullstack/hyracks/hyracks-cloud/pom.xml +++ b/hyracks-fullstack/hyracks/hyracks-cloud/pom.xml @@@ -1,101 -1,0 +1,101 @@@ +<!-- + ! Licensed to the Apache Software Foundation (ASF) under one + ! or more contributor license agreements. See the NOTICE file + ! distributed with this work for additional information + ! regarding copyright ownership. The ASF licenses this file + ! to you under the Apache License, Version 2.0 (the + ! "License"); you may not use this file except in compliance + ! with the License. You may obtain a copy of the License at + ! + ! http://www.apache.org/licenses/LICENSE-2.0 + ! + ! Unless required by applicable law or agreed to in writing, + ! software distributed under the License is distributed on an + ! "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + ! KIND, either express or implied. See the License for the + ! specific language governing permissions and limitations + ! under the License. + !--> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> + <modelVersion>4.0.0</modelVersion> + <artifactId>hyracks-cloud</artifactId> + <parent> + <groupId>org.apache.hyracks</groupId> + <artifactId>hyracks</artifactId> + <version>0.3.10-SNAPSHOT</version> + </parent> + <licenses> + <license> + <name>Apache License, Version 2.0</name> + <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> + <distribution>repo</distribution> + <comments>A business-friendly OSS license</comments> + </license> + </licenses> + <properties> + <root.dir>${basedir}/../..</root.dir> + <jnr-posix.version>3.1.19</jnr-posix.version> + <jnr-ffi.version>2.2.16</jnr-ffi.version> + </properties> + <dependencies> + <dependency> + <groupId>org.apache.hyracks</groupId> + <artifactId>hyracks-api</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.hyracks</groupId> + <artifactId>hyracks-storage-common</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.hyracks</groupId> + <artifactId>hyracks-storage-am-lsm-common</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.hyracks</groupId> + <artifactId>hyracks-control-nc</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.hyracks</groupId> + <artifactId>hyracks-util</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>it.unimi.dsi</groupId> - <artifactId>fastutil-core</artifactId> ++ <artifactId>fastutil</artifactId> + </dependency> + <dependency> + <groupId>com.github.jnr</groupId> + <artifactId>jnr-posix</artifactId> + <version>${jnr-posix.version}</version> + </dependency> + <dependency> + <groupId>com.github.jnr</groupId> + <artifactId>jnr-ffi</artifactId> + <version>${jnr-ffi.version}</version> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-api</artifactId> + </dependency> + <dependency> + <groupId>com.google.cloud</groupId> + <artifactId>google-cloud-core</artifactId> + <version>${gcsjavasdk.version}</version> + </dependency> + <dependency> + <groupId>software.amazon.awssdk</groupId> + <artifactId>sdk-core</artifactId> + <version>${awsjavasdk.version}</version> + </dependency> + </dependencies> +</project> diff --cc hyracks-fullstack/hyracks/hyracks-dataflow-common/pom.xml index 41f6ed5e35,9d363754bd..13b6f018c4 --- a/hyracks-fullstack/hyracks/hyracks-dataflow-common/pom.xml +++ b/hyracks-fullstack/hyracks/hyracks-dataflow-common/pom.xml @@@ -84,10 -84,6 +84,10 @@@ <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> </dependency> + <dependency> + <groupId>it.unimi.dsi</groupId> - <artifactId>fastutil-core</artifactId> ++ <artifactId>fastutil</artifactId> + </dependency> <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> diff --cc hyracks-fullstack/hyracks/hyracks-storage-am-btree/pom.xml index 6be5f37623,22d387702a..3731953c2d --- a/hyracks-fullstack/hyracks/hyracks-storage-am-btree/pom.xml +++ b/hyracks-fullstack/hyracks/hyracks-storage-am-btree/pom.xml @@@ -118,10 -118,6 +118,10 @@@ <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> </dependency> + <dependency> + <groupId>it.unimi.dsi</groupId> - <artifactId>fastutil-core</artifactId> ++ <artifactId>fastutil</artifactId> + </dependency> <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-api</artifactId> diff --cc hyracks-fullstack/hyracks/hyracks-storage-am-common/pom.xml index 7836d34c77,6367ebb08f..de4678e350 --- a/hyracks-fullstack/hyracks/hyracks-storage-am-common/pom.xml +++ b/hyracks-fullstack/hyracks/hyracks-storage-am-common/pom.xml @@@ -117,9 -117,5 +117,9 @@@ <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-core</artifactId> </dependency> + <dependency> + <groupId>it.unimi.dsi</groupId> - <artifactId>fastutil-core</artifactId> ++ <artifactId>fastutil</artifactId> + </dependency> </dependencies> </project> diff --cc hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree-column/pom.xml index 72eae65216,24c1d4e3fa..91ce31bb4f --- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree-column/pom.xml +++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree-column/pom.xml @@@ -87,37 -87,5 +87,37 @@@ <artifactId>hyracks-util</artifactId> <version>${project.version}</version> </dependency> + <dependency> + <groupId>org.apache.hyracks</groupId> + <artifactId>hyracks-control-nc</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.hyracks</groupId> + <artifactId>hyracks-control-common</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.hyracks</groupId> + <artifactId>hyracks-cloud</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-api</artifactId> + </dependency> + <dependency> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-databind</artifactId> + </dependency> + <dependency> + <groupId>it.unimi.dsi</groupId> - <artifactId>fastutil-core</artifactId> ++ <artifactId>fastutil</artifactId> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + </dependency> </dependencies> -</project> +</project> diff --cc hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/pom.xml index 50e534a3a2,4224015e83..9704e549bf --- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/pom.xml +++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/pom.xml @@@ -94,18 -94,5 +94,18 @@@ <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> </dependency> + <dependency> + <groupId>it.unimi.dsi</groupId> - <artifactId>fastutil-core</artifactId> ++ <artifactId>fastutil</artifactId> + </dependency> + <dependency> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-annotations</artifactId> + </dependency> + <dependency> + <groupId>org.apache.hyracks</groupId> + <artifactId>hyracks-control-common</artifactId> + <version>${project.version}</version> + </dependency> </dependencies> </project>
