>From Michael Blow <[email protected]>:
Michael Blow has submitted this change. (
https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/20387?usp=email )
Change subject: Merge branch 'gerrit/trinity' into 'gerrit/phoenix'
......................................................................
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
---
M hyracks-fullstack/hyracks/hyracks-cloud/pom.xml
M hyracks-fullstack/hyracks/hyracks-dataflow-common/pom.xml
M hyracks-fullstack/hyracks/hyracks-storage-am-btree/pom.xml
M hyracks-fullstack/hyracks/hyracks-storage-am-common/pom.xml
M hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree-column/pom.xml
M hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/pom.xml
7 files changed, 12 insertions(+), 6 deletions(-)
Approvals:
Michael Blow: Looks good to me, approved; Verified
diff --git a/hyracks-fullstack/hyracks/hyracks-cloud/pom.xml
b/hyracks-fullstack/hyracks/hyracks-cloud/pom.xml
index 07dcacc..300c633 100644
--- a/hyracks-fullstack/hyracks/hyracks-cloud/pom.xml
+++ b/hyracks-fullstack/hyracks/hyracks-cloud/pom.xml
@@ -66,7 +66,7 @@
</dependency>
<dependency>
<groupId>it.unimi.dsi</groupId>
- <artifactId>fastutil-core</artifactId>
+ <artifactId>fastutil</artifactId>
</dependency>
<dependency>
<groupId>com.github.jnr</groupId>
diff --git a/hyracks-fullstack/hyracks/hyracks-dataflow-common/pom.xml
b/hyracks-fullstack/hyracks/hyracks-dataflow-common/pom.xml
index 41f6ed5..13b6f01 100644
--- a/hyracks-fullstack/hyracks/hyracks-dataflow-common/pom.xml
+++ b/hyracks-fullstack/hyracks/hyracks-dataflow-common/pom.xml
@@ -86,7 +86,7 @@
</dependency>
<dependency>
<groupId>it.unimi.dsi</groupId>
- <artifactId>fastutil-core</artifactId>
+ <artifactId>fastutil</artifactId>
</dependency>
<dependency>
<groupId>junit</groupId>
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-btree/pom.xml
b/hyracks-fullstack/hyracks/hyracks-storage-am-btree/pom.xml
index 6be5f37..3731953 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-btree/pom.xml
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-btree/pom.xml
@@ -120,7 +120,7 @@
</dependency>
<dependency>
<groupId>it.unimi.dsi</groupId>
- <artifactId>fastutil-core</artifactId>
+ <artifactId>fastutil</artifactId>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-common/pom.xml
b/hyracks-fullstack/hyracks/hyracks-storage-am-common/pom.xml
index 7836d34..de4678e 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-common/pom.xml
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-common/pom.xml
@@ -119,7 +119,7 @@
</dependency>
<dependency>
<groupId>it.unimi.dsi</groupId>
- <artifactId>fastutil-core</artifactId>
+ <artifactId>fastutil</artifactId>
</dependency>
</dependencies>
</project>
\ No newline at end of file
diff --git
a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree-column/pom.xml
b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree-column/pom.xml
index 72eae65..91ce31b 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree-column/pom.xml
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree-column/pom.xml
@@ -112,7 +112,7 @@
</dependency>
<dependency>
<groupId>it.unimi.dsi</groupId>
- <artifactId>fastutil-core</artifactId>
+ <artifactId>fastutil</artifactId>
</dependency>
<dependency>
<groupId>junit</groupId>
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/pom.xml
b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/pom.xml
index 50e534a..9704e54 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/pom.xml
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/pom.xml
@@ -96,7 +96,7 @@
</dependency>
<dependency>
<groupId>it.unimi.dsi</groupId>
- <artifactId>fastutil-core</artifactId>
+ <artifactId>fastutil</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
--
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/20387?usp=email
To unsubscribe, or for help writing mail filters, visit
https://asterix-gerrit.ics.uci.edu/settings?usp=email
Gerrit-MessageType: merged
Gerrit-Project: asterixdb
Gerrit-Branch: phoenix
Gerrit-Change-Id: Ia019cf76670d9c5b86061562255094c5518f05af
Gerrit-Change-Number: 20387
Gerrit-PatchSet: 2
Gerrit-Owner: Michael Blow <[email protected]>
Gerrit-Reviewer: Anon. E. Moose #1000171
Gerrit-Reviewer: Jenkins <[email protected]>
Gerrit-Reviewer: Michael Blow <[email protected]>
