[asterixdb] branch master updated: [ASTERIXDB-3259][MTD] Implement database name resolution
This is an automated email from the ASF dual-hosted git repository. alsuliman pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/asterixdb.git The following commit(s) were added to refs/heads/master by this push: new 3869f2f913 [ASTERIXDB-3259][MTD] Implement database name resolution 3869f2f913 is described below commit 3869f2f913b1d940f578229b071573f996a4c6b2 Author: Ali Alsuliman AuthorDate: Thu Oct 12 00:00:32 2023 -0700 [ASTERIXDB-3259][MTD] Implement database name resolution - user model changes: no - storage format changes: no - interface changes: yes Details: Currently, qualification to database objects are resolved as DataverseName only. That is a multipart identifier is resolved as pure DataverseName only and the database name is defaulted to 'System'/'Default'. This patch is to resolve qualification to database objects as database_name + dataverse_name + database_object. This resolution is only applicable when database is used. That is when cloud deployment is used. Change-Id: Ic3f1d7b2019fcf62e5dcbce8c05a78d18cc0a710 Reviewed-on: https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/17861 Reviewed-by: Murtadha Hubail Integration-Tests: Jenkins Tested-by: Ali Alsuliman --- .../asterix/app/cc/CcApplicationContext.java | 9 ++--- .../apache/asterix/app/nc/NCAppRuntimeContext.java | 11 +++--- .../asterix/app/translator/QueryTranslator.java| 28 -- .../asterix/hyracks/bootstrap/CCApplication.java | 20 +++--- .../asterix/hyracks/bootstrap/NCApplication.java | 19 ++--- .../test/cloud_storage/CloudStorageTest.java | 18 - .../apache/asterix/test/common/TestExecutor.java | 45 ++ .../request-dataverse.1.ddl.sqlpp | 2 + .../cloud_storage/special-chars/test.000.ddl.sqlpp | 2 + .../cloud_storage/special-chars/test.999.ddl.sqlpp | 1 + .../index_1/index_1.1.ddl.sqlpp| 2 + .../resolution_1/resolution_1.1.ddl.sqlpp | 2 + .../multipart-dataverse/udf_1/udf_1.1.ddl.sqlpp| 2 + .../src/test/resources/runtimets/sqlpp_queries.xml | 2 + .../asterix/cloud/AbstractCloudIOManager.java | 13 +-- .../apache/asterix/cloud/CloudManagerProvider.java | 9 +++-- .../apache/asterix/cloud/EagerCloudIOManager.java | 6 ++- .../apache/asterix/cloud/LazyCloudIOManager.java | 6 ++- .../asterix/common/api/INamespaceResolver.java | 1 + .../asterix/common/config/CompilerProperties.java | 13 ++- .../asterix/common/exceptions/ErrorCode.java | 2 + .../common/metadata/DatasetFullyQualifiedName.java | 3 +- .../asterix/common/metadata/MetadataConstants.java | 1 + .../asterix/common/metadata/MetadataUtil.java | 5 +++ .../common/metadata/NamespacePathResolver.java | 24 ++-- .../asterix/common/metadata/NamespaceResolver.java | 42 ++-- .../common/storage/DatasetCopyIdentifier.java | 21 +- .../asterix/common/storage/ResourceReference.java | 17 +++- .../src/main/resources/asx_errormsg/en.properties | 2 + .../ioopcallbacks/LSMIOOperationCallbackTest.java | 11 -- .../asterix/lang/common/base/IQueryRewriter.java | 3 +- .../lang/sqlpp/rewrites/SqlppQueryRewriter.java| 29 ++ .../visitor/VariableCheckAndRewriteVisitor.java| 7 ++-- .../org/apache/asterix/metadata/MetadataNode.java | 23 ++- .../apache/asterix/metadata/utils/DatasetUtil.java | 5 +++ 35 files changed, 327 insertions(+), 79 deletions(-) diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/cc/CcApplicationContext.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/cc/CcApplicationContext.java index 24b4856ffe..6ea7aebf83 100644 --- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/cc/CcApplicationContext.java +++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/cc/CcApplicationContext.java @@ -57,7 +57,6 @@ import org.apache.asterix.common.dataflow.IDataPartitioningProvider; import org.apache.asterix.common.external.IAdapterFactoryService; import org.apache.asterix.common.metadata.IMetadataBootstrap; import org.apache.asterix.common.metadata.IMetadataLockUtil; -import org.apache.asterix.common.metadata.NamespacePathResolver; import org.apache.asterix.common.replication.INcLifecycleCoordinator; import org.apache.asterix.common.storage.ICompressionManager; import org.apache.asterix.common.transactions.IResourceIdManager; @@ -126,7 +125,7 @@ public class CcApplicationContext implements ICcApplicationContext { private final IDataPartitioningProvider dataPartitioningProvider; private final IGlobalTxManager globalTxManager; private final IOManager ioManager; -private final NamespacePathResolver namespacePathResolver; +private final INamespacePathResolver namespacePathResolver; private final
[asterixdb] branch master updated: [NO ISSUE][OTH] Added license override for zstd-jni-1.5.5-1
This is an automated email from the ASF dual-hosted git repository. mhubail pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/asterixdb.git The following commit(s) were added to refs/heads/master by this push: new 457b8ad6c6 [NO ISSUE][OTH] Added license override for zstd-jni-1.5.5-1 457b8ad6c6 is described below commit 457b8ad6c69a3e0a1b666282f6bcb0cac7fce46c Author: Ritik Raj AuthorDate: Fri Oct 13 20:24:39 2023 +0530 [NO ISSUE][OTH] Added license override for zstd-jni-1.5.5-1 - user model changes: no - storage format changes: no - interface changes: no Change-Id: Idd83208d2d92240999319e929e60f07422c8715f Reviewed-on: https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/17865 Integration-Tests: Jenkins Reviewed-by: Murtadha Hubail Tested-by: Ali Alsuliman --- asterixdb/src/main/appended-resources/supplemental-models.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/asterixdb/src/main/appended-resources/supplemental-models.xml b/asterixdb/src/main/appended-resources/supplemental-models.xml index 60530e99c9..eb94233acd 100644 --- a/asterixdb/src/main/appended-resources/supplemental-models.xml +++ b/asterixdb/src/main/appended-resources/supplemental-models.xml @@ -2321,9 +2321,9 @@ com.github.luben zstd-jni - 1.5.0-1 - 1.5.0-1 -1.5.0-1 + 1.5.0-1,1.5.5-1 + 1.5.0-1,1.5.5-1 + 1.5.0-1,1.5.5-1
[asterixdb] branch dependabot/maven/hyracks-fullstack/io.netty-netty-codec-http2-4.1.100.Final deleted (was a4294bb8f8)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/hyracks-fullstack/io.netty-netty-codec-http2-4.1.100.Final in repository https://gitbox.apache.org/repos/asf/asterixdb.git was a4294bb8f8 Bump io.netty:netty-codec-http2 in /hyracks-fullstack The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[asterixdb] branch dependabot/maven/hyracks-fullstack/org.xerial.snappy-snappy-java-1.1.10.4 deleted (was 2fb89adbdd)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/hyracks-fullstack/org.xerial.snappy-snappy-java-1.1.10.4 in repository https://gitbox.apache.org/repos/asf/asterixdb.git was 2fb89adbdd Bump org.xerial.snappy:snappy-java in /hyracks-fullstack The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[asterixdb] 03/04: Merge branch 'gerrit/neo' into 'gerrit/trinity'
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 603d7c1e9a9948ca5df558ea69f9a3d72e0cbe89 Merge: 22c6d549ae ce631f3284 Author: Michael Blow AuthorDate: Thu Oct 12 11:11:48 2023 -0400 Merge branch 'gerrit/neo' into 'gerrit/trinity' Change-Id: I8d38233ec954b75ae2ee8fd4ba48ea7ec995a28a .../appended-resources/supplemental-models.xml | 90 +++--- ...com_netty_netty_netty-4.1.100.Final_NOTICE.txt} | 0 hyracks-fullstack/pom.xml | 2 +- 3 files changed, 46 insertions(+), 46 deletions(-)
[asterixdb] branch master updated (30c60f9ad9 -> debb4553cb)
This is an automated email from the ASF dual-hosted git repository. mblow pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/asterixdb.git from 30c60f9ad9 [NO ISSUE][OTH] Add hashcode and equals function to ComputePartition new 22c6d549ae [ASTERIXDB-3279] Prepare for move to Java 17 new ce631f3284 [NO ISSUE][MISC] Update Netty to 4.1.100.Final new 603d7c1e9a Merge branch 'gerrit/neo' into 'gerrit/trinity' new debb4553cb Merge branch 'gerrit/trinity' into 'master' The 4 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: asterixdb/asterix-app/pom.xml | 1 + asterixdb/pom.xml | 12 ++- .../appended-resources/supplemental-models.xml | 90 +++--- ...com_netty_netty_netty-4.1.100.Final_NOTICE.txt} | 0 .../algebricks/algebricks-tests/pom.xml| 12 +++ hyracks-fullstack/hyracks/hyracks-client/pom.xml | 2 + .../hyracks-control/hyracks-control-cc/pom.xml | 21 - .../hyracks/hyracks-dataflow-common/pom.xml| 1 + .../hyracks/hyracks-dataflow-std/pom.xml | 1 + .../hyracks-integration-tests/pom.xml | 19 + .../hyracks-examples/hyracks-shutdown-test/pom.xml | 6 +- hyracks-fullstack/hyracks/hyracks-net/pom.xml | 1 + hyracks-fullstack/hyracks/hyracks-server/pom.xml | 7 ++ .../hyracks/hyracks-storage-am-btree/pom.xml | 1 + .../hyracks-dataflow-common-test/pom.xml | 6 ++ .../hyracks-storage-am-bloomfilter-test/pom.xml| 5 ++ .../hyracks-storage-am-btree-test/pom.xml | 13 .../hyracks-storage-am-lsm-btree-test/pom.xml | 16 .../hyracks-storage-am-lsm-common-test/pom.xml | 9 +++ .../pom.xml| 11 +++ .../hyracks-storage-am-lsm-rtree-test/pom.xml | 17 .../hyracks-storage-am-rtree-test/pom.xml | 18 + .../hyracks-storage-common-test/pom.xml| 8 ++ hyracks-fullstack/hyracks/pom.xml | 2 +- hyracks-fullstack/pom.xml | 12 ++- 25 files changed, 229 insertions(+), 62 deletions(-) rename asterixdb/src/main/licenses/content/{raw.githubusercontent.com_netty_netty_netty-4.1.94.Final_NOTICE.txt => raw.githubusercontent.com_netty_netty_netty-4.1.100.Final_NOTICE.txt} (100%)
[asterixdb] 02/04: [NO ISSUE][MISC] Update Netty to 4.1.100.Final
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 ce631f32848dc1af6f859016e92187c583841606 Author: Michael Blow AuthorDate: Wed Oct 11 17:39:03 2023 -0400 [NO ISSUE][MISC] Update Netty to 4.1.100.Final Change-Id: Ifa12a2781c2a561ff99cf3c9b64e216028be83c7 Reviewed-on: https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/17860 Integration-Tests: Jenkins Reviewed-by: Michael Blow Reviewed-by: Murtadha Hubail Reviewed-by: Hussain Towaileb Tested-by: Michael Blow --- .../appended-resources/supplemental-models.xml | 90 +++--- ...com_netty_netty_netty-4.1.100.Final_NOTICE.txt} | 0 hyracks-fullstack/pom.xml | 2 +- 3 files changed, 46 insertions(+), 46 deletions(-) diff --git a/asterixdb/src/main/appended-resources/supplemental-models.xml b/asterixdb/src/main/appended-resources/supplemental-models.xml index 2b8e438a82..66ed280457 100644 --- a/asterixdb/src/main/appended-resources/supplemental-models.xml +++ b/asterixdb/src/main/appended-resources/supplemental-models.xml @@ -163,9 +163,9 @@ netty-transport - 4.1.94.Final - 4.1.94.Final - 4.1.94.Final + 4.1.100.Final + 4.1.100.Final + 4.1.100.Final @@ -175,9 +175,9 @@ netty-transport-classes-epoll - 4.1.94.Final - 4.1.94.Final - 4.1.94.Final + 4.1.100.Final + 4.1.100.Final + 4.1.100.Final @@ -187,9 +187,9 @@ netty-transport-native-unix-common - 4.1.94.Final - 4.1.94.Final - 4.1.94.Final + 4.1.100.Final + 4.1.100.Final + 4.1.100.Final @@ -199,9 +199,9 @@ netty-codec - 4.1.94.Final - 4.1.94.Final - 4.1.94.Final + 4.1.100.Final + 4.1.100.Final + 4.1.100.Final @@ -211,9 +211,9 @@ netty-codec-dns - 4.1.94.Final - 4.1.94.Final - 4.1.94.Final + 4.1.100.Final + 4.1.100.Final + 4.1.100.Final @@ -223,9 +223,9 @@ netty-codec-http2 - 4.1.94.Final - 4.1.94.Final - 4.1.94.Final + 4.1.100.Final + 4.1.100.Final + 4.1.100.Final @@ -235,9 +235,9 @@ netty-codec-socks - 4.1.94.Final - 4.1.94.Final - 4.1.94.Final + 4.1.100.Final + 4.1.100.Final + 4.1.100.Final @@ -247,9 +247,9 @@ netty-handler - 4.1.94.Final - 4.1.94.Final - 4.1.94.Final + 4.1.100.Final + 4.1.100.Final + 4.1.100.Final @@ -259,9 +259,9 @@ netty-handler-proxy - 4.1.94.Final - 4.1.94.Final - 4.1.94.Final + 4.1.100.Final + 4.1.100.Final + 4.1.100.Final @@ -271,9 +271,9 @@ netty-buffer - 4.1.94.Final - 4.1.94.Final - 4.1.94.Final + 4.1.100.Final + 4.1.100.Final + 4.1.100.Final @@ -283,9 +283,9 @@ netty-common - 4.1.94.Final - 4.1.94.Final - 4.1.94.Final + 4.1.100.Final + 4.1.100.Final + 4.1.100.Final @@ -295,9 +295,9 @@ netty-codec-http - 4.1.94.Final - 4.1.94.Final - 4.1.94.Final + 4.1.100.Final + 4.1.100.Final + 4.1.100.Final @@ -307,9 +307,9 @@ netty-resolver - 4.1.94.Final - 4.1.94.Final - 4.1.94.Final + 4.1.100.Final + 4.1.100.Final + 4.1.100.Final @@ -319,9 +319,9 @@ netty-resolver-dns - 4.1.94.Final - 4.1.94.Final - 4.1.94.Final + 4.1.100.Final + 4.1.100.Final + 4.1.100.Final @@ -331,9 +331,9 @@ netty-transport-native-unix-common - 4.1.94.Final - 4.1.94.Final - 4.1.94.Final + 4.1.100.Final + 4.1.100.Final + 4.1.100.Final diff --git a/asterixdb/src/main/licenses/content/raw.githubusercontent.com_netty_netty_netty-4.1.94.Final_NOTICE.txt b/asterixdb/src/main/licenses/content/raw.githubusercontent.com_netty_netty_netty-4.1.100.Final_NOTICE.txt similarity index 100% rename from asterixdb/src/main/licenses/content/raw.githubusercontent.com_netty_netty_netty-4.1.94.Final_NOTICE.txt rename to
[asterixdb] 04/04: Merge branch 'gerrit/trinity' into 'master'
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 debb4553cbfe7245016e505bf7dd6ef617355f64 Merge: 30c60f9ad9 603d7c1e9a Author: Michael Blow AuthorDate: Thu Oct 12 15:59:42 2023 -0400 Merge branch 'gerrit/trinity' into 'master' Change-Id: I3001297b663c729fdc22621444c2f9c007696129 asterixdb/asterix-app/pom.xml | 1 + asterixdb/pom.xml | 12 ++- .../appended-resources/supplemental-models.xml | 90 +++--- ...com_netty_netty_netty-4.1.100.Final_NOTICE.txt} | 0 .../algebricks/algebricks-tests/pom.xml| 12 +++ hyracks-fullstack/hyracks/hyracks-client/pom.xml | 2 + .../hyracks-control/hyracks-control-cc/pom.xml | 21 - .../hyracks/hyracks-dataflow-common/pom.xml| 1 + .../hyracks/hyracks-dataflow-std/pom.xml | 1 + .../hyracks-integration-tests/pom.xml | 19 + .../hyracks-examples/hyracks-shutdown-test/pom.xml | 6 +- hyracks-fullstack/hyracks/hyracks-net/pom.xml | 1 + hyracks-fullstack/hyracks/hyracks-server/pom.xml | 7 ++ .../hyracks/hyracks-storage-am-btree/pom.xml | 1 + .../hyracks-dataflow-common-test/pom.xml | 6 ++ .../hyracks-storage-am-bloomfilter-test/pom.xml| 5 ++ .../hyracks-storage-am-btree-test/pom.xml | 13 .../hyracks-storage-am-lsm-btree-test/pom.xml | 16 .../hyracks-storage-am-lsm-common-test/pom.xml | 9 +++ .../pom.xml| 11 +++ .../hyracks-storage-am-lsm-rtree-test/pom.xml | 17 .../hyracks-storage-am-rtree-test/pom.xml | 18 + .../hyracks-storage-common-test/pom.xml| 8 ++ hyracks-fullstack/hyracks/pom.xml | 2 +- hyracks-fullstack/pom.xml | 12 ++- 25 files changed, 229 insertions(+), 62 deletions(-) diff --cc hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/pom.xml index 01f426cc13,71139f9d0a..4bf1961323 --- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/pom.xml +++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/pom.xml @@@ -24,9 -24,8 +24,8 @@@ org.apache.hyracks hyracks-control -0.3.8.2-SNAPSHOT +0.3.9-SNAPSHOT - ${basedir}/../../.. pom.xml,src/main/java,src/main/resources diff --cc hyracks-fullstack/hyracks/hyracks-examples/hyracks-integration-tests/pom.xml index 700354e7ab,e4de6f2692..3b5ec200cb --- a/hyracks-fullstack/hyracks/hyracks-examples/hyracks-integration-tests/pom.xml +++ b/hyracks-fullstack/hyracks/hyracks-examples/hyracks-integration-tests/pom.xml @@@ -181,14 -198,8 +198,15 @@@ org.apache.hyracks hyracks-util ${project.version} + test + + org.apache.hyracks + hyracks-util + ${project.version} + test-jar + test + org.apache.logging.log4j log4j-api
[asterixdb] 01/04: [ASTERIXDB-3279] Prepare for move to Java 17
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 22c6d549ae7ee1221fad4ab0b7340bb67bc60632 Author: Michael Blow AuthorDate: Tue Oct 3 23:30:18 2023 -0400 [ASTERIXDB-3279] Prepare for move to Java 17 Update plugins as needed for Java 17 class file format compat Change-Id: I88d9357854c5c5807019fea7f818ec768e254748 Reviewed-on: https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/17838 Reviewed-by: Michael Blow Tested-by: Michael Blow --- asterixdb/asterix-app/pom.xml | 1 + asterixdb/pom.xml | 12 +--- .../algebricks/algebricks-tests/pom.xml | 12 hyracks-fullstack/hyracks/hyracks-client/pom.xml| 2 ++ .../hyracks-control/hyracks-control-cc/pom.xml | 21 - .../hyracks/hyracks-dataflow-common/pom.xml | 1 + .../hyracks/hyracks-dataflow-std/pom.xml| 1 + .../hyracks-integration-tests/pom.xml | 19 +++ .../hyracks-examples/hyracks-shutdown-test/pom.xml | 6 +- hyracks-fullstack/hyracks/hyracks-net/pom.xml | 1 + hyracks-fullstack/hyracks/hyracks-server/pom.xml| 7 +++ .../hyracks/hyracks-storage-am-btree/pom.xml| 1 + .../hyracks-dataflow-common-test/pom.xml| 6 ++ .../hyracks-storage-am-bloomfilter-test/pom.xml | 5 + .../hyracks-storage-am-btree-test/pom.xml | 13 + .../hyracks-storage-am-lsm-btree-test/pom.xml | 16 .../hyracks-storage-am-lsm-common-test/pom.xml | 9 + .../pom.xml | 11 +++ .../hyracks-storage-am-lsm-rtree-test/pom.xml | 17 + .../hyracks-storage-am-rtree-test/pom.xml | 18 ++ .../hyracks-storage-common-test/pom.xml | 8 hyracks-fullstack/hyracks/pom.xml | 2 +- hyracks-fullstack/pom.xml | 10 -- 23 files changed, 183 insertions(+), 16 deletions(-) diff --git a/asterixdb/asterix-app/pom.xml b/asterixdb/asterix-app/pom.xml index dfb9224d2e..6c01245a82 100644 --- a/asterixdb/asterix-app/pom.xml +++ b/asterixdb/asterix-app/pom.xml @@ -155,6 +155,7 @@ org.apache.hadoop:hadoop-common org.apache.asterix:asterix-geo +org.apache.logging.log4j:log4j-jul org.apache.asterix:asterix-external-data:zip:* diff --git a/asterixdb/pom.xml b/asterixdb/pom.xml index 265aa37c91..398239d0cc 100644 --- a/asterixdb/pom.xml +++ b/asterixdb/pom.xml @@ -46,8 +46,7 @@ UTF-8 UTF-8 -11 -11 +11 all format false @@ -226,8 +225,7 @@ org.apache.maven.plugins maven-compiler-plugin - ${source.jdk.version} - ${target.jdk.version} + ${release.jdk.version} -Xlint:${javac.xlint.value} @@ -338,7 +336,7 @@ [3.3.9,) - [11,) + [${release.jdk.version},) @@ -605,7 +603,7 @@ org.apache.maven.plugins maven-dependency-plugin - 3.1.2 + 3.6.0 org.apache.maven.plugins @@ -615,7 +613,7 @@ org.apache.maven.plugins maven-plugin-plugin - 3.6.0 + 3.9.0 org.apache.maven.plugins diff --git a/hyracks-fullstack/algebricks/algebricks-tests/pom.xml b/hyracks-fullstack/algebricks/algebricks-tests/pom.xml index 34894cb395..4f563a6702 100644 --- a/hyracks-fullstack/algebricks/algebricks-tests/pom.xml +++ b/hyracks-fullstack/algebricks/algebricks-tests/pom.xml @@ -117,16 +117,19 @@ junit junit + test org.apache.hyracks hyracks-control-cc ${project.version} + test org.apache.hyracks hyracks-control-nc ${project.version} + test org.apache.hyracks @@ -142,6 +145,7 @@ org.apache.hyracks hyracks-control-common ${project.version} + test org.apache.hyracks @@ -152,11 +156,13 @@ org.apache.hyracks algebricks-data ${project.version} + test org.apache.hyracks algebricks-core ${project.version} + test org.apache.hyracks @@ -167,28 +173,34 @@ org.apache.hyracks hyracks-dataflow-std ${project.version} + test org.apache.hyracks hyracks-util ${project.version} + test org.apache.hyracks hyracks-ipc
[asterixdb] 10/10: Merge branch 'gerrit/trinity' into 'master'
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 028998c50b2015a5d08228fd087ad5e2887d6d55 Merge: ad2e106326 4bdcbc5881 Author: Michael Blow AuthorDate: Tue Oct 10 13:54:07 2023 -0400 Merge branch 'gerrit/trinity' into 'master' Change-Id: If21b84885d2b5d8e899b58eeb1955079c00e34d3 .../asterix/active/IActiveNotificationHandler.java | 8 +- asterixdb/asterix-external-data/pom.xml| 24 +- asterixdb/asterix-server/pom.xml | 8 +- asterixdb/pom.xml | 111 ++ .../appended-resources/supplemental-models.xml | 382 +++-- ...oogleapis_api-common-java_blob_main_LICENSE.txt | 26 ++ ...com_googleapis_gax-java_blob_master_LICENSE.txt | 27 ++ .../opensource.org_licenses_BSD-3-Clause.txt | 11 + ...ercontent.com_grpc_grpc-java_v1.52.1_NOTICE.txt | 62 ...rcontent.com_grpc_grpc-java_v1.56.1_NOTICE.txt} | 0 ...nt.com_xerial_snappy-java_v1.1.10.5_NOTICE.txt} | 10 +- .../licenses/content/spdx.org_licenses_MIT.txt | 9 + hyracks-fullstack/hyracks/hyracks-hdfs/pom.xml | 14 - hyracks-fullstack/pom.xml | 61 +--- 14 files changed, 277 insertions(+), 476 deletions(-) diff --cc asterixdb/asterix-external-data/pom.xml index 5957eff6fc,4306864c5c..476708b32e --- a/asterixdb/asterix-external-data/pom.xml +++ b/asterixdb/asterix-external-data/pom.xml @@@ -561,16 -560,11 +560,21 @@@ net.minidev json-smart + + + org.codehaus.jettison + jettison + + + org.apache.iceberg + iceberg-core + 1.1.0 + + + org.apache.avro + avro + 1.11.1 + diff --cc asterixdb/asterix-server/pom.xml index 41720333fc,479ef8508b..98517ef213 --- a/asterixdb/asterix-server/pom.xml +++ b/asterixdb/asterix-server/pom.xml @@@ -544,52 -540,6 +544,45 @@@ com.google.api:gax-grpc:2.7.1 https://raw.githubusercontent.com/googleapis/gax-java/v2.7.1/LICENSE - - - org.bouncycastle:bcprov-jdk15on:1.60 - org.bouncycastle:bcpkix-jdk15on:1.60 - - https://raw.githubusercontent.com/bcgit/bc-java/r1rv60/LICENSE.html - + + +org.jetbrains:annotations:17.0.0 + + https://raw.githubusercontent.com/JetBrains/java-annotations/master/LICENSE.txt + + + +org.roaringbitmap:RoaringBitmap:0.9.22 +org.roaringbitmap:shims:0.9.22 + + https://raw.githubusercontent.com/RoaringBitmap/RoaringBitmap/0.9.39/LICENSE + + + +io.airlift:aircompressor:0.21 + + https://raw.githubusercontent.com/airlift/aircompressor/0.21/license.txt + https://raw.githubusercontent.com/airlift/aircompressor/0.21/notice.md + + + +org.apache.orc:orc-core:1.8.0 + + https://raw.githubusercontent.com/apache/orc/v1.8.0/LICENSE + https://raw.githubusercontent.com/apache/orc/v1.8.0/NOTICE + + + +tech.allegro.schema.json2avro:converter:0.2.15 + + https://raw.githubusercontent.com/allegro/json-avro-converter/json-avro-converter-0.2.15/LICENSE.md + + + + com.github.stephenc.findbugs:findbugs-annotations:1.3.9-1 + + https://www.apache.org/licenses/LICENSE-2.0.txt + diff --cc asterixdb/pom.xml index d08b752a61,265aa37c91..65116d3150 --- a/asterixdb/pom.xml +++ b/asterixdb/pom.xml @@@ -82,18 -82,14 +82,18 @@@ none none none +none +none +none -0.3.8.2-SNAPSHOT -0.3.8.2-SNAPSHOT +0.3.9-SNAPSHOT +0.3.9-SNAPSHOT - 3.3.4 + 3.3.6 0.7.6.201602180812 2.19.0 -2.17.218 +2.20.135 +0.27.1 1.12.3 1.12.402 12.22.0 @@@ -2051,24 -1956,16 +2019,21 @@@ - - - org.eclipse.jetty - jetty-util - 9.4.51.v20230217 + org.codehaus.jettison + jettison + 1.5.4 - org.eclipse.jetty - jetty-util-ajax - 9.4.51.v20230217 + io.grpc + grpc-census + 1.56.1 + +org.apache.avro +avro +1.11.1 +
[asterixdb] 08/10: [NO ISSUE][OTH]: Add methods to collect requests/jobs stats
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 1a93ce8b0b6137347e8f5ce665e6e56fddb9abfd Author: Hussain Towaileb AuthorDate: Tue Oct 3 14:07:03 2023 +0300 [NO ISSUE][OTH]: Add methods to collect requests/jobs stats Change-Id: Ib266878bf05782506045abfadaa83b41f0f95986 Reviewed-on: https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/17839 Integration-Tests: Jenkins Tested-by: Jenkins Reviewed-by: Hussain Towaileb Reviewed-by: Peeyush Gupta --- .../org/apache/asterix/active/IActiveNotificationHandler.java | 7 +++ .../org/apache/asterix/app/active/ActiveNotificationHandler.java | 6 ++ .../main/java/org/apache/asterix/common/api/IRequestTracker.java | 6 ++ .../java/org/apache/asterix/runtime/utils/RequestTracker.java | 8 .../main/java/org/apache/hyracks/control/cc/job/IJobManager.java | 5 + .../main/java/org/apache/hyracks/control/cc/job/JobManager.java | 5 + 6 files changed, 37 insertions(+) diff --git a/asterixdb/asterix-active/src/main/java/org/apache/asterix/active/IActiveNotificationHandler.java b/asterixdb/asterix-active/src/main/java/org/apache/asterix/active/IActiveNotificationHandler.java index 60bfa69801..9a0514839f 100644 --- a/asterixdb/asterix-active/src/main/java/org/apache/asterix/active/IActiveNotificationHandler.java +++ b/asterixdb/asterix-active/src/main/java/org/apache/asterix/active/IActiveNotificationHandler.java @@ -19,6 +19,8 @@ */ package org.apache.asterix.active; +import java.util.Collection; + import org.apache.asterix.active.message.ActivePartitionMessage; import org.apache.hyracks.api.exceptions.HyracksDataException; @@ -52,6 +54,11 @@ public interface IActiveNotificationHandler { */ void unregisterListener(IActiveEntityEventsListener listener) throws HyracksDataException; +/** + * @return List of all the registered event listeners + */ +Collection getEventListenersAsList(); + /** * @return all the registered event listeners */ diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/active/ActiveNotificationHandler.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/active/ActiveNotificationHandler.java index 6b3581e66c..3c277d5aa6 100644 --- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/active/ActiveNotificationHandler.java +++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/active/ActiveNotificationHandler.java @@ -19,6 +19,7 @@ package org.apache.asterix.app.active; import java.util.Collection; +import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -186,6 +187,11 @@ public class ActiveNotificationHandler extends SingleThreadEventProcessor getEventListenersAsList() { +return Collections.unmodifiableCollection(entityEventListeners.values()); +} + @Override public synchronized void registerListener(IActiveEntityEventsListener listener) throws HyracksDataException { if (suspended) { diff --git a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/api/IRequestTracker.java b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/api/IRequestTracker.java index a3ddb30ef0..0019015df8 100644 --- a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/api/IRequestTracker.java +++ b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/api/IRequestTracker.java @@ -75,4 +75,10 @@ public interface IRequestTracker { * @return the recently completed requests */ Collection getCompletedRequests(); + +/** + * + * @return the total number of requests since cluster start/restart + */ +long getTotalNumberOfRequests(); } diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/utils/RequestTracker.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/utils/RequestTracker.java index 333c709b61..c9425c6065 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/utils/RequestTracker.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/utils/RequestTracker.java @@ -24,6 +24,7 @@ import java.util.Collections; import java.util.Map; import java.util.Objects; import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.atomic.AtomicLong; import org.apache.asterix.common.api.IClientRequest; import org.apache.asterix.common.api.IRequestTracker; @@ -37,10 +38,12 @@ public class RequestTracker implements IRequestTracker { private final Map clientIdRequests = new ConcurrentHashMap<>(); private final CircularFifoQueue completedRequests; private final ICcApplicationContext ccAppCtx; +private final AtomicLong numRequests; public
[asterixdb] 07/10: Merge branch 'gerrit/7.1.x' into 'gerrit/neo'
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 5567be6377901b087974eeb4ed8070d3da8e850d Merge: 3227d347d1 6671523714 Author: Michael Blow AuthorDate: Thu Oct 5 17:16:18 2023 -0400 Merge branch 'gerrit/7.1.x' into 'gerrit/neo' Change-Id: I63e00f78c78f7f5c15c0a8587c8f591035b4df82 asterixdb/asterix-external-data/pom.xml| 15 +- asterixdb/asterix-server/pom.xml | 9 + asterixdb/pom.xml | 101 ++-- .../appended-resources/supplemental-models.xml | 266 +++-- ...oogleapis_api-common-java_blob_main_LICENSE.txt | 26 ++ ...com_googleapis_gax-java_blob_master_LICENSE.txt | 27 +++ .../opensource.org_licenses_BSD-3-Clause.txt | 11 + ...ercontent.com_grpc_grpc-java_v1.52.1_NOTICE.txt | 62 - ...rcontent.com_grpc_grpc-java_v1.56.1_NOTICE.txt} | 0 ...nt.com_xerial_snappy-java_v1.1.10.5_NOTICE.txt} | 10 +- .../licenses/content/spdx.org_licenses_MIT.txt | 9 + hyracks-fullstack/hyracks/hyracks-hdfs/pom.xml | 14 -- hyracks-fullstack/pom.xml | 61 + 13 files changed, 266 insertions(+), 345 deletions(-) diff --cc asterixdb/pom.xml index 9181f142d5,ca3314e683..6e68ab401c --- a/asterixdb/pom.xml +++ b/asterixdb/pom.xml @@@ -82,9 -82,9 +82,9 @@@ none -0.3.8-SNAPSHOT -0.3.8-SNAPSHOT +0.3.8.2-SNAPSHOT +0.3.8.2-SNAPSHOT - 3.3.4 + 3.3.6 0.7.6.201602180812 2.19.0 2.17.218 @@@ -989,22 -993,21 +989,17 @@@ hadoop-hdfs ${hadoop.version} - -log4j -log4j - org.slf4j -slf4j-api +slf4j-reload4j - ch.qos.reload4j - reload4j - - - - org.eclipse.jetty - jetty-util + org.slf4j + slf4j-log4j12 - org.eclipse.jetty - jetty-util-ajax + ch.qos.reload4j + reload4j @@@ -1109,22 -1115,21 +1099,17 @@@ com.nimbusds nimbus-jose-jwt - -log4j -log4j - org.slf4j -slf4j-api +slf4j-reload4j - ch.qos.reload4j - reload4j - - - - org.eclipse.jetty - jetty-util + org.slf4j + slf4j-log4j12 - org.eclipse.jetty - jetty-util-ajax + ch.qos.reload4j + reload4j @@@ -1176,22 -1184,21 +1156,17 @@@ hadoop-minicluster ${hadoop.version} - -log4j -log4j - org.slf4j -slf4j-api +slf4j-reload4j - ch.qos.reload4j - reload4j - - - - org.eclipse.jetty - jetty-util + org.slf4j + slf4j-log4j12 - org.eclipse.jetty - jetty-util-ajax + ch.qos.reload4j + reload4j @@@ -1205,22 -1212,21 +1180,17 @@@ commons-logging commons-logging - -log4j -log4j - org.slf4j -slf4j-api +slf4j-reload4j - ch.qos.reload4j - reload4j - - - - org.eclipse.jetty - jetty-util + org.slf4j + slf4j-log4j12 - org.eclipse.jetty - jetty-util-ajax + ch.qos.reload4j + reload4j diff --cc hyracks-fullstack/hyracks/hyracks-hdfs/pom.xml index 33526f1d12,2010653560..237d799f58 --- a/hyracks-fullstack/hyracks/hyracks-hdfs/pom.xml +++ b/hyracks-fullstack/hyracks/hyracks-hdfs/pom.xml @@@ -151,23 -151,18 +151,14 @@@ io.netty netty-all - - log4j - log4j - org.slf4j - slf4j-api + slf4j-reload4j - org.slf4j - slf4j-log4j12 + ch.qos.reload4j + reload4j - - - org.eclipse.jetty - jetty-util - - - org.eclipse.jetty - jetty-util-ajax -
[asterixdb] 05/10: [NO ISSUE][*DB] Update org.xerial.snappy:snappy-java to 1.1.10.5
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 6baf8ff08f92935a4b0cdef6b1cd1a81c4036dd7 Author: Michael Blow AuthorDate: Wed Oct 4 20:46:43 2023 -0400 [NO ISSUE][*DB] Update org.xerial.snappy:snappy-java to 1.1.10.5 Change-Id: I9e743060391936f78cade63be094704af1c6e35e Reviewed-on: https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/17844 Integration-Tests: Jenkins Reviewed-by: Michael Blow Reviewed-by: Hussain Towaileb Tested-by: Michael Blow --- .../appended-resources/supplemental-models.xml | 9 ++--- ...ent.com_xerial_snappy-java_v1.1.10.5_NOTICE.txt | 22 ++ hyracks-fullstack/pom.xml | 2 +- 3 files changed, 29 insertions(+), 4 deletions(-) diff --git a/asterixdb/src/main/appended-resources/supplemental-models.xml b/asterixdb/src/main/appended-resources/supplemental-models.xml index 091cda7ce5..09bdea3f76 100644 --- a/asterixdb/src/main/appended-resources/supplemental-models.xml +++ b/asterixdb/src/main/appended-resources/supplemental-models.xml @@ -464,9 +464,12 @@ - - 1.1.8.4 - 1.1.8.4 + + 1.1.10.5 + 1.1.10.5 + + +1.1.10.5 diff --git a/asterixdb/src/main/licenses/content/raw.githubusercontent.com_xerial_snappy-java_v1.1.10.5_NOTICE.txt b/asterixdb/src/main/licenses/content/raw.githubusercontent.com_xerial_snappy-java_v1.1.10.5_NOTICE.txt new file mode 100644 index 00..20b1317a8f --- /dev/null +++ b/asterixdb/src/main/licenses/content/raw.githubusercontent.com_xerial_snappy-java_v1.1.10.5_NOTICE.txt @@ -0,0 +1,22 @@ +This product includes software developed by Google + Snappy: http://code.google.com/p/snappy/ (New BSD License) + +This product includes software developed by Apache + PureJavaCrc32C from apache-hadoop-common http://hadoop.apache.org/ + (Apache 2.0 license) + +This library contains statically linked libstdc++. This inclusion is allowed by +"GCC Runtime Library Exception" +http://gcc.gnu.org/onlinedocs/libstdc++/manual/license.html + +== Contributors == + * Tatu Saloranta +* Providing benchmark suite + * Alec Wysoker +* Performance and memory usage improvement + +Third-Party Notices and Licenses: + +- Hadoop: Apache Hadoop is used as a dependency + License: Apache License 2.0 + Source/Reference: https://github.com/apache/hadoop/blob/trunk/NOTICE.txt \ No newline at end of file diff --git a/hyracks-fullstack/pom.xml b/hyracks-fullstack/pom.xml index 9fdcc8d0d7..432947ebcb 100644 --- a/hyracks-fullstack/pom.xml +++ b/hyracks-fullstack/pom.xml @@ -73,7 +73,7 @@ 3.3.6 0.7.6.201602180812 2.19.0 -1.1.8.4 +1.1.10.5 2.14.1 ${jackson.version} 4.1.87.Final
[asterixdb] branch master updated: [NO ISSUE][OTH] Add hashcode and equals function to ComputePartition
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 The following commit(s) were added to refs/heads/master by this push: new 30c60f9ad9 [NO ISSUE][OTH] Add hashcode and equals function to ComputePartition 30c60f9ad9 is described below commit 30c60f9ad92a3227d332a44ba0c6c49597f9fd20 Author: Peeyush Gupta AuthorDate: Tue Oct 10 22:07:08 2023 -0700 [NO ISSUE][OTH] Add hashcode and equals function to ComputePartition - user model changes: no - storage format changes: no - interface changes: no Change-Id: If05b1e443c7fb49cd4a3bfef5646d4e468c99d04 Reviewed-on: https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/17859 Integration-Tests: Jenkins Reviewed-by: Peeyush Gupta Reviewed-by: Murtadha Hubail Tested-by: Peeyush Gupta --- .../apache/asterix/common/cluster/ComputePartition.java | 16 1 file changed, 16 insertions(+) diff --git a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/cluster/ComputePartition.java b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/cluster/ComputePartition.java index 1d11c302cc..540eb6953c 100644 --- a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/cluster/ComputePartition.java +++ b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/cluster/ComputePartition.java @@ -18,6 +18,8 @@ */ package org.apache.asterix.common.cluster; +import java.util.Objects; + public class ComputePartition { private final String nodeId; private final int id; @@ -34,4 +36,18 @@ public class ComputePartition { public int getId() { return id; } + +@Override +public int hashCode() { +return Objects.hash(nodeId, id); +} + +@Override +public boolean equals(Object object) { +if (!(object instanceof ComputePartition)) { +return false; +} +ComputePartition target = (ComputePartition) object; +return Objects.equals(id, target.getId()) && Objects.equals(nodeId, target.getNodeId()); +} }
[asterixdb] 03/10: [NO ISSUE][MISC] override org.codehaus.jettison:jettison to avoid CVEs
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 f000fb57dce2d0ed79ec1ea32f251747c6d0f5bf Author: Michael Blow AuthorDate: Wed Oct 4 19:27:28 2023 -0400 [NO ISSUE][MISC] override org.codehaus.jettison:jettison to avoid CVEs Change-Id: Ida41aaddb65405516c3baeea9de4bbf21a0f0e41 Reviewed-on: https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/17842 Integration-Tests: Jenkins Reviewed-by: Michael Blow Reviewed-by: Hussain Towaileb Tested-by: Michael Blow --- asterixdb/asterix-external-data/pom.xml | 5 + asterixdb/pom.xml | 9 + asterixdb/src/main/appended-resources/supplemental-models.xml | 11 +++ 3 files changed, 25 insertions(+) diff --git a/asterixdb/asterix-external-data/pom.xml b/asterixdb/asterix-external-data/pom.xml index de14287a8c..fbb1751746 100644 --- a/asterixdb/asterix-external-data/pom.xml +++ b/asterixdb/asterix-external-data/pom.xml @@ -546,6 +546,11 @@ net.minidev json-smart + + + org.codehaus.jettison + jettison + diff --git a/asterixdb/pom.xml b/asterixdb/pom.xml index b2d8831763..dee21dcf13 100644 --- a/asterixdb/pom.xml +++ b/asterixdb/pom.xml @@ -1016,6 +1016,10 @@ hadoop-common ${hadoop.version} + +org.codehaus.jettison +jettison + net.minidev json-smart @@ -1959,6 +1963,11 @@ ${hadoop.version} + +org.codehaus.jettison +jettison +1.5.4 + diff --git a/asterixdb/src/main/appended-resources/supplemental-models.xml b/asterixdb/src/main/appended-resources/supplemental-models.xml index e31de235a0..877a843a44 100644 --- a/asterixdb/src/main/appended-resources/supplemental-models.xml +++ b/asterixdb/src/main/appended-resources/supplemental-models.xml @@ -2104,4 +2104,15 @@ + + + + + org.codehaus.jettison + jettison + + 1.5.4 + + +
[asterixdb] 04/10: [NO ISSUE][MISC] Update com.google.guava:guava to 32.1.2-jre
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 d43ed60ed97c5cff9d4eff0b8399205d339230fc Author: Michael Blow AuthorDate: Wed Oct 4 19:36:43 2023 -0400 [NO ISSUE][MISC] Update com.google.guava:guava to 32.1.2-jre Change-Id: Ifb3da1eedd25052947abbff0aad3eb785d2844cc Reviewed-on: https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/17843 Integration-Tests: Jenkins Reviewed-by: Michael Blow Reviewed-by: Hussain Towaileb Tested-by: Michael Blow --- asterixdb/src/main/appended-resources/supplemental-models.xml | 7 --- hyracks-fullstack/pom.xml | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/asterixdb/src/main/appended-resources/supplemental-models.xml b/asterixdb/src/main/appended-resources/supplemental-models.xml index 877a843a44..091cda7ce5 100644 --- a/asterixdb/src/main/appended-resources/supplemental-models.xml +++ b/asterixdb/src/main/appended-resources/supplemental-models.xml @@ -346,7 +346,8 @@ - 18.0,28.0-jre,28.1-jre,28.2-jre,30.1-jre,31.0.1-jre,31.1-jre + + 18.0,28.0-jre,28.1-jre,28.2-jre,30.1-jre,31.0.1-jre,31.1-jre,jre,32.1.2-jre 18.0,28.0-jre,28.1-jre,28.2-jre,30.1-jre,31.0.1-jre,31.1-jre @@ -370,8 +371,8 @@ - 2.3.2,2.3.4,2.7.1,2.11.0 - 2.3.2,2.3.4,2.7.1,2.11.0 + 2.3.2,2.3.4,2.7.1,2.11.0,2.18.0 + 2.3.2,2.3.4,2.7.1,2.11.0,2.18.0 diff --git a/hyracks-fullstack/pom.xml b/hyracks-fullstack/pom.xml index 4b625e5f68..9fdcc8d0d7 100644 --- a/hyracks-fullstack/pom.xml +++ b/hyracks-fullstack/pom.xml @@ -271,7 +271,7 @@ com.google.guava guava -31.1-jre +32.1.2-jre com.google.code.findbugs
[asterixdb] 06/10: [NO ISSUE][*DB] Update commons-compress to 1.24.0
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 6671523714fbaab257141bfbc3b81e6cf269018f Author: Michael Blow AuthorDate: Thu Oct 5 09:49:19 2023 -0400 [NO ISSUE][*DB] Update commons-compress to 1.24.0 Change-Id: I7ed996c571afae39ff7e968b92c316b4582e261e Reviewed-on: https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/17845 Integration-Tests: Jenkins Reviewed-by: Michael Blow Reviewed-by: Hussain Towaileb Tested-by: Michael Blow --- asterixdb/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/asterixdb/pom.xml b/asterixdb/pom.xml index dee21dcf13..ca3314e683 100644 --- a/asterixdb/pom.xml +++ b/asterixdb/pom.xml @@ -1233,7 +1233,7 @@ org.apache.commons commons-compress -1.22 +1.24.0 commons-logging
[asterixdb] 09/10: Merge branch 'gerrit/neo' into 'gerrit/trinity'
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 4bdcbc5881eada768016138b6cd0d6bd5a57b0fa Merge: 8a18d73863 1a93ce8b0b Author: Michael Blow AuthorDate: Mon Oct 9 00:12:55 2023 -0400 Merge branch 'gerrit/neo' into 'gerrit/trinity' Change-Id: I568a2df4594bdde19932ba72362c9661096a9183 .../asterix/active/IActiveNotificationHandler.java | 7 + .../app/active/ActiveNotificationHandler.java | 6 + .../apache/asterix/common/api/IRequestTracker.java | 6 + asterixdb/asterix-external-data/pom.xml| 24 +- .../asterix/runtime/utils/RequestTracker.java | 8 + asterixdb/asterix-server/pom.xml | 8 +- asterixdb/pom.xml | 111 ++ .../appended-resources/supplemental-models.xml | 382 +++-- ...oogleapis_api-common-java_blob_main_LICENSE.txt | 26 ++ ...com_googleapis_gax-java_blob_master_LICENSE.txt | 27 ++ .../opensource.org_licenses_BSD-3-Clause.txt | 11 + ...ercontent.com_grpc_grpc-java_v1.52.1_NOTICE.txt | 62 ...rcontent.com_grpc_grpc-java_v1.56.1_NOTICE.txt} | 0 ...nt.com_xerial_snappy-java_v1.1.10.5_NOTICE.txt} | 10 +- .../licenses/content/spdx.org_licenses_MIT.txt | 9 + .../apache/hyracks/control/cc/job/IJobManager.java | 5 + .../apache/hyracks/control/cc/job/JobManager.java | 5 + hyracks-fullstack/hyracks/hyracks-hdfs/pom.xml | 14 - hyracks-fullstack/pom.xml | 61 +--- 19 files changed, 310 insertions(+), 472 deletions(-) diff --cc asterixdb/asterix-external-data/pom.xml index 45d1f44ac6,ee4ac894dd..4306864c5c --- a/asterixdb/asterix-external-data/pom.xml +++ b/asterixdb/asterix-external-data/pom.xml @@@ -212,7 -212,7 +212,11 @@@ io.netty:netty-codec-http2 io.netty:netty-transport-native-unix-common io.netty:netty-handler-proxy ++ io.netty:netty-handler-proxy ++ ++ io.grpc:grpc-census:* ++ @@@ -514,10 -514,6 +518,15 @@@ + + com.google.cloud.bigdataoss + gcs-connector + ++ ++ ++ io.grpc ++ grpc-census ++ org.codehaus.jackson diff --cc asterixdb/asterix-server/pom.xml index dcd8e1b8b8,d47c9e4cc7..479ef8508b --- a/asterixdb/asterix-server/pom.xml +++ b/asterixdb/asterix-server/pom.xml @@@ -485,68 -462,6 +485,61 @@@ https://raw.githubusercontent.com/perfmark/perfmark/v0.26.0/LICENSE https://raw.githubusercontent.com/perfmark/perfmark/v0.26.0/NOTICE + + + com.google.cloud.bigdataoss:gcs-connector:hadoop3-2.2.6 +com.google.cloud.bigdataoss:gcsio:2.2.6 + com.google.cloud.bigdataoss:util-hadoop:hadoop3-2.2.6 +com.google.cloud.bigdataoss:util:2.2.6 + + https://raw.githubusercontent.com/GoogleCloudDataproc/hadoop-connectors/v2.2.6/LICENSE + + + +com.google.flogger:flogger:0.7.1 +com.google.flogger:google-extensions:0.7.1 +com.google.flogger:flogger-system-backend:0.7.1 + + https://raw.githubusercontent.com/google/flogger/flogger-0.7.1/LICENSE + + + + com.google.api.grpc:proto-google-cloud-monitoring-v3:1.64.0 + com.google.api.grpc:proto-google-cloud-storage-v2:2.2.2-alpha + com.google.api.grpc:grpc-google-cloud-storage-v2:2.2.2-alpha + + https://raw.githubusercontent.com/googleapis/googleapis/master/LICENSE + + + com.lmax:disruptor:3.4.2 + https://raw.githubusercontent.com/LMAX-Exchange/disruptor/3.4.2/LICENCE.txt + + + com.google.cloud:google-cloud-core-grpc:1.82.0 + https://raw.githubusercontent.com/googleapis/java-core/v1.82.0/LICENSE + + + com.google.cloud:google-cloud-monitoring:1.82.0 + https://raw.githubusercontent.com/googleapis/java-monitoring/1.82.0/LICENSE + + + com.google.api-client:google-api-client-jackson2:1.32.2 + https://raw.githubusercontent.com/googleapis/google-api-java-client/v1.32.2/LICENSE + + + org.conscrypt:conscrypt-openjdk-uber:2.5.1 + https://raw.githubusercontent.com/google/conscrypt/2.5.1/LICENSE + https://raw.githubusercontent.com/google/conscrypt/2.5.1/NOTICE + + + io.perfmark:perfmark-api:0.23.0 +
[asterixdb] 01/10: [NO ISSUE][*DB][EXT] Update GCS SDK 2.17.2 -> 2.26.0
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 569781244d03191fb49de049ec0495b74454a0b6 Author: Michael Blow AuthorDate: Wed Aug 9 20:07:40 2023 -0400 [NO ISSUE][*DB][EXT] Update GCS SDK 2.17.2 -> 2.26.0 Change-Id: I41d34b96e6d34ea87a54fffd11d19f40a10d3e73 Reviewed-on: https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/17714 Integration-Tests: Jenkins Reviewed-by: Hussain Towaileb Tested-by: Jenkins --- asterixdb/asterix-server/pom.xml | 9 + asterixdb/pom.xml | 2 +- .../appended-resources/supplemental-models.xml | 240 ++--- ...oogleapis_api-common-java_blob_main_LICENSE.txt | 26 +++ ...com_googleapis_gax-java_blob_master_LICENSE.txt | 27 +++ .../opensource.org_licenses_BSD-3-Clause.txt | 11 + ...ercontent.com_grpc_grpc-java_v1.52.1_NOTICE.txt | 62 -- ...rcontent.com_grpc_grpc-java_v1.56.1_NOTICE.txt} | 0 .../licenses/content/spdx.org_licenses_MIT.txt | 9 + 9 files changed, 201 insertions(+), 185 deletions(-) diff --git a/asterixdb/asterix-server/pom.xml b/asterixdb/asterix-server/pom.xml index 7832dec560..542abd0d23 100644 --- a/asterixdb/asterix-server/pom.xml +++ b/asterixdb/asterix-server/pom.xml @@ -497,6 +497,7 @@ http://www.apache.org/licenses/LICENSE-2.0.html https://www.apache.org/licenses/LICENSE-2.0.html https://aws.amazon.com/apache2.0 +https://opensource.org/licenses/Apache-2.0 https://raw.githubusercontent.com/jorabin/KeePassJava2/KeePassJava2-2.1.4/LICENSE https://raw.githubusercontent.com/reactor/reactor-core/v3.4.27/LICENSE https://raw.githubusercontent.com/codehaus/stax/master/dev/ASF2.0.txt @@ -596,6 +597,14 @@ https://golang.org/LICENSE + + MIT No Attribution (MIT-0) + https://spdx.org/licenses/MIT-0 + +https://spdx.org/licenses/MIT-0.html +https://github.com/aws/mit-0 + + Apache AsterixDB Server Install diff --git a/asterixdb/pom.xml b/asterixdb/pom.xml index 952f838abc..730d27b074 100644 --- a/asterixdb/pom.xml +++ b/asterixdb/pom.xml @@ -94,7 +94,7 @@ 12.21.0 1.9.0 12.7.2 -2.17.2 +2.26.0 8.6.6 Apache AsterixDB - ${project.name} diff --git a/asterixdb/src/main/appended-resources/supplemental-models.xml b/asterixdb/src/main/appended-resources/supplemental-models.xml index d33451f77e..e31de235a0 100644 --- a/asterixdb/src/main/appended-resources/supplemental-models.xml +++ b/asterixdb/src/main/appended-resources/supplemental-models.xml @@ -1163,9 +1163,8 @@ com.google.api api-common - 2.5.0 - 2.5.0 -2.5.0 + 2.15.0 + 2.15.0 @@ -1176,9 +1175,8 @@ com.google.api gax-httpjson - 0.107.0 - 0.107.0 -0.107.0 + 2.32.0 + 2.32.0 @@ -1189,9 +1187,8 @@ com.google.api gax - 2.22.0 - 2.22.0 -2.22.0 + 2.32.0 + 2.32.0 @@ -1202,9 +1199,8 @@ com.google.api-client google-api-client - 2.1.2 - 2.1.2 -2.1.2 + 2.2.0 + 2.2.0 @@ -1292,9 +1288,8 @@ com.google.api.grpc gapic-google-cloud-storage-v2 - 2.17.2-alpha - 2.17.2-alpha - 2.17.2-alpha + 2.26.0-alpha + 2.26.0-alpha @@ -1305,9 +1300,8 @@ com.google.api.grpc grpc-google-cloud-storage-v2 - 2.17.2-alpha - 2.17.2-alpha - 2.17.2-alpha + 2.26.0-alpha + 2.26.0-alpha @@ -1318,9 +1312,8 @@ com.google.api.grpc proto-google-cloud-storage-v2 - 2.17.2-alpha - 2.17.2-alpha - 2.17.2-alpha + 2.26.0-alpha + 2.26.0-alpha @@ -1346,7 +1339,7 @@ 0.26.0 0.26.0 -0.26.0 +0.26.0 @@ -1357,8 +1350,8 @@ org.codehaus.mojo animal-sniffer-annotations - 1.22 - 1.22 + 1.23 + 1.23 @@ -1381,9 +1374,8 @@ com.google.api gax-grpc - 2.22.0 - 2.22.0 -2.22.0 + 2.32.0 + 2.32.0 @@ -1394,9 +1386,8 @@ com.google.cloud google-cloud-core-grpc - 2.9.4 - 2.9.4 -2.9.4 + 2.22.0 + 2.22.0 @@ -1407,9 +1398,8 @@ com.google.cloud google-cloud-core
[asterixdb] 02/10: [NO ISSUE] Upgrade Hadoop to 3.3.6
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 aa0f6c780cdcfbbaee9fbf71d02c246da107fbed Author: Michael Blow AuthorDate: Tue Oct 3 22:47:55 2023 -0400 [NO ISSUE] Upgrade Hadoop to 3.3.6 Change-Id: Ief6aff3081ada9ab42833bd894ded60f446cb167 Reviewed-on: https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/17837 Integration-Tests: Jenkins Reviewed-by: Hussain Towaileb Tested-by: Jenkins --- asterixdb/asterix-external-data/pom.xml| 10 asterixdb/pom.xml | 76 +++--- hyracks-fullstack/hyracks/hyracks-hdfs/pom.xml | 14 - hyracks-fullstack/pom.xml | 53 +- 4 files changed, 10 insertions(+), 143 deletions(-) diff --git a/asterixdb/asterix-external-data/pom.xml b/asterixdb/asterix-external-data/pom.xml index b3ab6dae38..de14287a8c 100644 --- a/asterixdb/asterix-external-data/pom.xml +++ b/asterixdb/asterix-external-data/pom.xml @@ -541,16 +541,6 @@ io.netty netty-handler-proxy - - - org.eclipse.jetty - jetty-util - - - org.eclipse.jetty - jetty-util-ajax - net.minidev diff --git a/asterixdb/pom.xml b/asterixdb/pom.xml index 730d27b074..b2d8831763 100644 --- a/asterixdb/pom.xml +++ b/asterixdb/pom.xml @@ -84,7 +84,7 @@ 0.3.8-SNAPSHOT 0.3.8-SNAPSHOT -3.3.4 +3.3.6 0.7.6.201602180812 2.19.0 2.17.218 @@ -1005,14 +1005,9 @@ org.slf4j slf4j-log4j12 - -org.eclipse.jetty -jetty-util - - -org.eclipse.jetty -jetty-util-ajax +ch.qos.reload4j +reload4j @@ -1081,15 +1076,6 @@ javax.ws.rs jsr311-api - - -org.eclipse.jetty -jetty-util - - -org.eclipse.jetty -jetty-util-ajax - @@ -1137,14 +1123,9 @@ org.slf4j slf4j-log4j12 - -org.eclipse.jetty -jetty-util - - -org.eclipse.jetty -jetty-util-ajax +ch.qos.reload4j +reload4j @@ -1173,11 +1154,6 @@ org.jline jline - - -org.eclipse.jetty -jetty-util - @@ -1216,14 +1192,9 @@ org.slf4j slf4j-log4j12 - -org.eclipse.jetty -jetty-util - - -org.eclipse.jetty -jetty-util-ajax +ch.qos.reload4j +reload4j @@ -1249,14 +1220,9 @@ org.slf4j slf4j-log4j12 - -org.eclipse.jetty -jetty-util - - -org.eclipse.jetty -jetty-util-ajax +ch.qos.reload4j +reload4j @@ -1991,32 +1957,8 @@ org.apache.hadoop hadoop-azure ${hadoop.version} - - - -org.eclipse.jetty -jetty-util - - -org.eclipse.jetty -jetty-util-ajax - - - - - -org.eclipse.jetty -jetty-util -9.4.48.v20220622 - - -org.eclipse.jetty -jetty-util-ajax -9.4.48.v20220622 - diff --git a/hyracks-fullstack/hyracks/hyracks-hdfs/pom.xml b/hyracks-fullstack/hyracks/hyracks-hdfs/pom.xml index 816746cfca..2010653560 100644 --- a/hyracks-fullstack/hyracks/hyracks-hdfs/pom.xml +++ b/hyracks-fullstack/hyracks/hyracks-hdfs/pom.xml @@ -163,15 +163,6 @@ org.slf4j slf4j-log4j12 - - - org.eclipse.jetty - jetty-util - - - org.eclipse.jetty - jetty-util-ajax - @@ -198,11 +189,6 @@ org.slf4j slf4j-log4j12 - - - org.eclipse.jetty - jetty-util - diff --git a/hyracks-fullstack/pom.xml b/hyracks-fullstack/pom.xml index 86a0ad7387..4b625e5f68 100644 --- a/hyracks-fullstack/pom.xml +++ b/hyracks-fullstack/pom.xml @@ -70,7 +70,7 @@ ${global.test.includes} ${global.test.excludes} -3.3.1 +3.3.6 0.7.6.201602180812 2.19.0 1.1.8.4 @@ -192,15 +192,6 @@ org.slf4j slf4j-log4j12 -
[asterixdb] branch master updated (ad2e106326 -> 028998c50b)
This is an automated email from the ASF dual-hosted git repository. mblow pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/asterixdb.git from ad2e106326 [ASTERIXDB-3259][MTD] Change SQLPP parser to parse multiparts into Namespace new 569781244d [NO ISSUE][*DB][EXT] Update GCS SDK 2.17.2 -> 2.26.0 new aa0f6c780c [NO ISSUE] Upgrade Hadoop to 3.3.6 new f000fb57dc [NO ISSUE][MISC] override org.codehaus.jettison:jettison to avoid CVEs new d43ed60ed9 [NO ISSUE][MISC] Update com.google.guava:guava to 32.1.2-jre new 6baf8ff08f [NO ISSUE][*DB] Update org.xerial.snappy:snappy-java to 1.1.10.5 new 6671523714 [NO ISSUE][*DB] Update commons-compress to 1.24.0 new 5567be6377 Merge branch 'gerrit/7.1.x' into 'gerrit/neo' new 1a93ce8b0b [NO ISSUE][OTH]: Add methods to collect requests/jobs stats new 4bdcbc5881 Merge branch 'gerrit/neo' into 'gerrit/trinity' new 028998c50b Merge branch 'gerrit/trinity' into 'master' The 10 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../asterix/active/IActiveNotificationHandler.java | 8 +- asterixdb/asterix-external-data/pom.xml| 24 +- asterixdb/asterix-server/pom.xml | 8 +- asterixdb/pom.xml | 111 ++ .../appended-resources/supplemental-models.xml | 382 +++-- ...ogleapis_api-common-java_blob_main_LICENSE.txt} | 2 +- ...om_googleapis_gax-java_blob_master_LICENSE.txt} | 0 .../opensource.org_licenses_BSD-3-Clause.txt | 11 + ...ercontent.com_grpc_grpc-java_v1.52.1_NOTICE.txt | 62 ...rcontent.com_grpc_grpc-java_v1.56.1_NOTICE.txt} | 0 ...nt.com_xerial_snappy-java_v1.1.10.5_NOTICE.txt} | 10 +- ...t-license.php.txt => spdx.org_licenses_MIT.txt} | 6 +- hyracks-fullstack/hyracks/hyracks-hdfs/pom.xml | 14 - hyracks-fullstack/pom.xml | 61 +--- 14 files changed, 220 insertions(+), 479 deletions(-) copy asterixdb/src/main/licenses/content/{raw.githubusercontent.com_googleapis_gapic-generator-java_v2.13.0_api-common-java_LICENSE.txt => github.com_googleapis_api-common-java_blob_main_LICENSE.txt} (99%) copy asterixdb/src/main/licenses/content/{raw.githubusercontent.com_googleapis_gapic-generator-java_v2.13.0_gax-java_LICENSE.txt => github.com_googleapis_gax-java_blob_master_LICENSE.txt} (100%) create mode 100644 asterixdb/src/main/licenses/content/opensource.org_licenses_BSD-3-Clause.txt delete mode 100644 asterixdb/src/main/licenses/content/raw.githubusercontent.com_grpc_grpc-java_v1.52.1_NOTICE.txt rename asterixdb/src/main/licenses/content/{raw.githubusercontent.com_grpc_grpc-java_v1.50.2_NOTICE.txt => raw.githubusercontent.com_grpc_grpc-java_v1.56.1_NOTICE.txt} (100%) rename asterixdb/src/main/licenses/content/{raw.githubusercontent.com_xerial_snappy-java_v1.1.10.1_NOTICE.txt => raw.githubusercontent.com_xerial_snappy-java_v1.1.10.5_NOTICE.txt} (62%) copy asterixdb/src/main/licenses/content/{opensource.org_licenses_mit-license.php.txt => spdx.org_licenses_MIT.txt} (93%)