(hive) branch dependabot/maven/standalone-metastore/org.springframework-spring-core-5.3.27 deleted (was dda43a772c5)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/standalone-metastore/org.springframework-spring-core-5.3.27 in repository https://gitbox.apache.org/repos/asf/hive.git was dda43a772c5 Bump org.springframework:spring-core in /standalone-metastore The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(hive) branch dependabot/maven/org.springframework-spring-core-5.3.27 deleted (was 5bf216064f0)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/org.springframework-spring-core-5.3.27 in repository https://gitbox.apache.org/repos/asf/hive.git was 5bf216064f0 Bump org.springframework:spring-core from 5.3.21 to 5.3.27 The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(hive) branch dependabot/maven/org.springframework-spring-core-6.0.15 deleted (was a39f82c499c)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/org.springframework-spring-core-6.0.15 in repository https://gitbox.apache.org/repos/asf/hive.git was a39f82c499c Bump org.springframework:spring-core from 5.2.24.RELEASE to 6.0.15 The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(hive) branch dependabot/maven/org.springframework-spring-core-5.3.27 created (now 5bf216064f0)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/org.springframework-spring-core-5.3.27 in repository https://gitbox.apache.org/repos/asf/hive.git at 5bf216064f0 Bump org.springframework:spring-core from 5.3.21 to 5.3.27 No new revisions were added by this update.
(hive) branch dependabot/maven/standalone-metastore/org.springframework-spring-core-6.0.15 deleted (was 5e27c0f8a82)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/standalone-metastore/org.springframework-spring-core-6.0.15 in repository https://gitbox.apache.org/repos/asf/hive.git was 5e27c0f8a82 Bump org.springframework:spring-core in /standalone-metastore The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(hive) branch dependabot/maven/standalone-metastore/org.springframework-spring-core-5.3.27 created (now dda43a772c5)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/standalone-metastore/org.springframework-spring-core-5.3.27 in repository https://gitbox.apache.org/repos/asf/hive.git at dda43a772c5 Bump org.springframework:spring-core in /standalone-metastore No new revisions were added by this update.
(hive) branch master updated: HIVE-28052: Iceberg: Major QB Compaction fails with ClassNotFoundException: org.springframework.core.ErrorCoded (#5061). (Ayush Saxena, reviewed by Butao Zhang, Attila Tu
This is an automated email from the ASF dual-hosted git repository. ayushsaxena pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/hive.git The following commit(s) were added to refs/heads/master by this push: new 57e686e9d67 HIVE-28052: Iceberg: Major QB Compaction fails with ClassNotFoundException: org.springframework.core.ErrorCoded (#5061). (Ayush Saxena, reviewed by Butao Zhang, Attila Turoczy) 57e686e9d67 is described below commit 57e686e9d67809ea6ef77f7e1109cc1c08fc656b Author: Ayush Saxena AuthorDate: Wed Feb 7 10:42:59 2024 +0530 HIVE-28052: Iceberg: Major QB Compaction fails with ClassNotFoundException: org.springframework.core.ErrorCoded (#5061). (Ayush Saxena, reviewed by Butao Zhang, Attila Turoczy) --- pom.xml | 3 ++- ql/pom.xml | 2 +- standalone-metastore/pom.xml | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 1317235e40c..82a9f753d37 100644 --- a/pom.xml +++ b/pom.xml @@ -223,7 +223,8 @@ 1.0.1 1.12.499 2.4.0 -5.2.24.RELEASE + +5.3.21 diff --git a/ql/pom.xml b/ql/pom.xml index 30bd3e31035..ec43088346b 100644 --- a/ql/pom.xml +++ b/ql/pom.xml @@ -26,7 +26,7 @@ .. 0.10.2 -2.1.0 +2.3.0 diff --git a/standalone-metastore/pom.xml b/standalone-metastore/pom.xml index caba6ea7f23..9e9e47197fc 100644 --- a/standalone-metastore/pom.xml +++ b/standalone-metastore/pom.xml @@ -110,7 +110,8 @@ 9.31 9.4.40.v20210413 1.3.2 -5.2.24.RELEASE + +5.3.21 you-must-set-this-to-run-thrift ${basedir}/src/gen/thrift
(hive) branch master updated: HIVE-27958: Refactor DirectSqlUpdatePart class (Wechar Yu, reviewed by Attila Turoczy, Denys Kuzmenko)
This is an automated email from the ASF dual-hosted git repository. dkuzmenko pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/hive.git The following commit(s) were added to refs/heads/master by this push: new 4b01a607091 HIVE-27958: Refactor DirectSqlUpdatePart class (Wechar Yu, reviewed by Attila Turoczy, Denys Kuzmenko) 4b01a607091 is described below commit 4b01a607091581ac9bdb372f8b47c1efca4d4bb4 Author: Wechar Yu AuthorDate: Tue Feb 6 17:15:18 2024 +0800 HIVE-27958: Refactor DirectSqlUpdatePart class (Wechar Yu, reviewed by Attila Turoczy, Denys Kuzmenko) Closes #5003 --- .../hadoop/hive/metastore/DatabaseProduct.java | 23 +++ .../hadoop/hive/metastore/DirectSqlUpdatePart.java | 192 +++-- .../hive/metastore/txn/retry/SqlRetryHandler.java | 27 +-- 3 files changed, 87 insertions(+), 155 deletions(-) diff --git a/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/DatabaseProduct.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/DatabaseProduct.java index 642057bd69a..b2b20503d24 100644 --- a/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/DatabaseProduct.java +++ b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/DatabaseProduct.java @@ -27,6 +27,7 @@ import java.util.EnumMap; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.concurrent.locks.ReentrantLock; import java.util.stream.Stream; import org.apache.commons.lang3.exception.ExceptionUtils; @@ -57,6 +58,11 @@ public class DatabaseProduct implements Configurable { DeadlineException.class }; + /** + * Derby specific concurrency control + */ + private static final ReentrantLock derbyLock = new ReentrantLock(true); + public enum DbType {DERBY, MYSQL, POSTGRES, ORACLE, SQLSERVER, CUSTOM, UNDEFINED}; public DbType dbType; @@ -776,4 +782,21 @@ public class DatabaseProduct implements Configurable { public void setConf(Configuration c) { myConf = c; } + + /** + * lockInternal() and {@link #unlockInternal()} are used to serialize those operations that require + * Select ... For Update to sequence operations properly. In practice that means when running + * with Derby database. See more notes at class level. + */ + public void lockInternal() { +if (isDERBY()) { + derbyLock.lock(); +} + } + + public void unlockInternal() { +if (isDERBY()) { + derbyLock.unlock(); +} + } } diff --git a/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/DirectSqlUpdatePart.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/DirectSqlUpdatePart.java index 67c293ee64f..441ce26ac6d 100644 --- a/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/DirectSqlUpdatePart.java +++ b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/DirectSqlUpdatePart.java @@ -67,7 +67,6 @@ import java.util.Map; import java.util.Objects; import java.util.Optional; import java.util.Set; -import java.util.concurrent.locks.ReentrantLock; import java.util.stream.Collectors; import static org.apache.hadoop.hive.common.StatsSetupConst.COLUMN_STATS_ACCURATE; @@ -92,8 +91,6 @@ class DirectSqlUpdatePart { private final int maxBatchSize; private final SQLGenerator sqlGenerator; - private static final ReentrantLock derbyLock = new ReentrantLock(true); - public DirectSqlUpdatePart(PersistenceManager pm, Configuration conf, DatabaseProduct dbType, int batchSize) { this.pm = pm; @@ -103,23 +100,6 @@ class DirectSqlUpdatePart { sqlGenerator = new SQLGenerator(dbType, conf); } - /** - * {@link #lockInternal()} and {@link #unlockInternal()} are used to serialize those operations that require - * Select ... For Update to sequence operations properly. In practice that means when running - * with Derby database. See more notes at class level. - */ - private void lockInternal() { -if(dbType.isDERBY()) { - derbyLock.lock(); -} - } - - private void unlockInternal() { -if(dbType.isDERBY()) { - derbyLock.unlock(); -} - } - void rollbackDBConn(Connection dbConn) { try { if (dbConn != null && !dbConn.isClosed()) dbConn.rollback(); @@ -138,43 +118,16 @@ class DirectSqlUpdatePart { } } - void closeStmt(Statement stmt) { -try { - if (stmt != null && !stmt.isClosed()) stmt.close(); -} catch (SQLException e) { - LOG.warn("Failed to close statement ", e); -} - } - - void close(ResultSet rs) { -try { - if (rs != null && !rs.isClosed()) { -rs.close(); - } -} -catch(SQLException ex) { - LOG.warn("Failed to close statement ", ex); -} - }
(hive) branch master updated (8b735924b4d -> af545603951)
This is an automated email from the ASF dual-hosted git repository. zabetak pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/hive.git from 8b735924b4d HIVE-28038: Disable fallback to jdo for DeadlineException (#5040)(Wechar Yu, reviewed by Butao Zhang) add af545603951 HIVE-26818: Beeline module misses transitive dependencies due to shading (Stamatis Zampetakis reviewed by Attila Turoczy, Ayush Saxena, Kokila N) No new revisions were added by this update. Summary of changes: beeline/pom.xml | 1 + itests/hive-unit/pom.xml | 6 -- itests/util/pom.xml | 4 3 files changed, 1 insertion(+), 10 deletions(-)