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 32007cff27b56cea098deebc20134eff04e861db Merge: 32a3442633 da15c7d42b Author: Michael Blow <[email protected]> AuthorDate: Wed May 21 19:46:02 2025 -0400 Merge branch 'gerrit/neo' into 'gerrit/trinity' Ext-ref: MB-66739 Change-Id: Ib28607ecd5c973fbd4a62625a4e032e063ac70cf .../InjectTypeCastForFunctionArgumentsRule.java | 1 + asterixdb/asterix-app/pom.xml | 2 +- .../hash_join_exchange.5.query.sqlpp | 47 +++++ .../hash_join_exchange.7.query.sqlpp | 30 +++ .../hash_join_exchange.9.query.sqlpp | 41 ++++ .../hash_join_exchange_1.11.query.sqlpp | 43 ++++ .../hash_join_exchange_1.13.query.sqlpp | 36 ++++ .../hash_join_exchange_1.5.query.sqlpp | 46 +++++ .../hash_join_exchange_1.7.query.sqlpp | 33 +++ .../hash_join_exchange_1.9.query.sqlpp | 32 +++ .../hash_join_exchange.5.query.plan | 42 ++++ .../hash_join_exchange.7.query.plan | 42 ++++ .../hash_join_exchange.9.query.plan | 60 ++++++ .../hash_join_exchange_1.11.query.plan | 44 ++++ .../hash_join_exchange_1.13.query.plan | 42 ++++ .../hash_join_exchange_1.5.query.plan | 42 ++++ .../hash_join_exchange_1.7.query.plan | 44 ++++ .../hash_join_exchange_1.9.query.plan | 44 ++++ .../hash_join_exchange.1.ddl.sqlpp | 28 +++ .../hash_join_exchange.2.update.sqlpp | 30 +++ .../hash_join_exchange.3.update.sqlpp | 37 ++++ .../hash_join_exchange.4.query.sqlpp | 33 +++ .../hash_join_exchange.6.query.sqlpp | 26 +++ .../hash_join_exchange.8.query.sqlpp | 33 +++ .../hash_join_exchange_1.1.ddl.sqlpp | 27 +++ .../hash_join_exchange_1.10.query.sqlpp | 33 +++ .../hash_join_exchange_1.12.query.sqlpp | 28 +++ .../hash_join_exchange_1.2.update.sqlpp | 24 +++ .../hash_join_exchange_1.3.update.sqlpp | 25 +++ .../hash_join_exchange_1.4.query.sqlpp | 31 +++ .../hash_join_exchange_1.6.query.sqlpp | 25 +++ .../hash_join_exchange_1.8.query.sqlpp | 24 +++ .../handle_error_fun.01.query.sqlpp | 25 +++ .../hash_join_exchange/hash_join_exchange.4.adm | 10 + .../hash_join_exchange/hash_join_exchange.6.adm | 10 + .../hash_join_exchange/hash_join_exchange.8.adm | 10 + .../hash_join_exchange_1.10.adm | 100 +++++++++ .../hash_join_exchange_1.12.adm | 100 +++++++++ .../hash_join_exchange_1.4.adm | 100 +++++++++ .../hash_join_exchange_1.6.adm | 100 +++++++++ .../hash_join_exchange_1.8.adm | 100 +++++++++ .../misc/handle_error_fun/handle_error_fun.01.adm | 1 + .../src/test/resources/runtimets/sqlpp_queries.xml | 15 ++ asterixdb/asterix-external-data/pom.xml | 5 - .../asterix/om/functions/BuiltinFunctions.java | 3 + .../evaluators/functions/IfErrorDescriptor.java | 70 +++++++ .../runtime/functions/FunctionCollection.java | 2 + asterixdb/pom.xml | 229 ++------------------- .../physical/AbstractHashJoinPOperator.java | 41 ++-- hyracks-fullstack/hyracks/hyracks-hdfs/pom.xml | 4 +- hyracks-fullstack/pom.xml | 97 ++++++++- 51 files changed, 1842 insertions(+), 255 deletions(-) diff --cc asterixdb/asterix-external-data/pom.xml index e9ab1ee4f6,d94c285ee5..184320a723 --- a/asterixdb/asterix-external-data/pom.xml +++ b/asterixdb/asterix-external-data/pom.xml @@@ -218,9 -210,7 +218,8 @@@ <usedDependency>net.razorvine:serpent</usedDependency> <usedDependency>io.netty:netty-resolver-dns</usedDependency> <usedDependency>io.netty:netty-codec-http2</usedDependency> - <usedDependency>io.netty:netty-transport-native-unix-common</usedDependency> <usedDependency>io.netty:netty-handler-proxy</usedDependency> + <usedDependency>io.netty:netty-handler-proxy</usedDependency> </usedDependencies> </configuration> </plugin> diff --cc asterixdb/pom.xml index 8639b323a1,e62eeeb4e8..12fa6fbd7a --- a/asterixdb/pom.xml +++ b/asterixdb/pom.xml @@@ -604,69 -668,6 +604,69 @@@ <artifactId>maven-enforcer-plugin</artifactId> <version>3.0.0-M3</version> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <version>3.0.0-M5</version> + <configuration> + <failIfNoTests>true</failIfNoTests> + <systemPropertyVariables> + <skipFredSlowTests>true</skipFredSlowTests> + <log4j.configurationFile>${testLog4jConfigFile}</log4j.configurationFile> + </systemPropertyVariables> + <forkCount>1</forkCount> + <reuseForks>false</reuseForks> + <argLine> + -enableassertions -Xmx${test.heap.size}m + -Dfile.encoding=UTF-8 + -DrunSlowAQLTests=${runSlowAQLTests} + -Xdebug + -Xrunjdwp:transport=dt_socket,server=y,address=8000,suspend=${debug.suspend.flag} + --add-opens=jdk.management/com.sun.management.internal=ALL-UNNAMED --add-opens=java.management/sun.management=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.nio=ALL-UNNAMED --add-opens=java.base/java.util=ALL-UNNAMED + ${coverageArgLine} + ${extraSurefireArgLine} + </argLine> + <includes> + <include>${test.includes}</include> + </includes> + <excludes> + <exclude>${test.excludes}</exclude> + </excludes> + <skipTests>${skip.surefire.tests}</skipTests> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-failsafe-plugin</artifactId> + <version>2.21.0</version> + <configuration> + <failIfNoTests>true</failIfNoTests> + <runOrder>alphabetical</runOrder> + <forkCount>1</forkCount> + <reuseForks>false</reuseForks> + <argLine> + ${coverageArgLine} + ${extraFailsafeArgLine} + </argLine> - <systemProperties> ++ <systemPropertyVariables> + <log4j.configurationFile>${testLog4jConfigFile}</log4j.configurationFile> - </systemProperties> ++ </systemPropertyVariables> + <includes> + <include>${itest.includes}</include> + </includes> + <excludes> + <exclude>${itest.excludes}</exclude> + </excludes> + </configuration> + <executions> + <execution> + <goals> + <goal>integration-test</goal> + <goal>verify</goal> + </goals> + </execution> + </executions> + </plugin> </plugins> </pluginManagement> </build> @@@ -1978,58 -1760,13 +1772,63 @@@ <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-util-ajax</artifactId> - <version>9.4.56.v20240826</version> + <version>9.4.57.v20241219</version> + </dependency> + <dependency> + <groupId>io.netty</groupId> + <artifactId>netty-tcnative-boringssl-static</artifactId> + <version>2.0.71.Final</version> </dependency> + <dependency> + <groupId>io.grpc</groupId> + <artifactId>grpc-census</artifactId> + <version>1.68.1</version> + </dependency> + <dependency> + <groupId>io.opencensus</groupId> + <artifactId>opencensus-contrib-http-util</artifactId> + <version>${io.opencensus.version}</version> + </dependency> + <dependency> + <groupId>io.opencensus</groupId> + <artifactId>opencensus-api</artifactId> + <version>${io.opencensus.version}</version> + </dependency> + <dependency> + <groupId>io.opencensus</groupId> + <artifactId>opencensus-impl</artifactId> + <version>${io.opencensus.version}</version> + </dependency> + <dependency> + <groupId>io.opencensus</groupId> + <artifactId>opencensus-impl-core</artifactId> + <version>${io.opencensus.version}</version> + </dependency> + <dependency> + <groupId>io.opencensus</groupId> + <artifactId>opencensus-exporter-stats-stackdriver</artifactId> + <version>${io.opencensus.version}</version> + </dependency> + <dependency> + <groupId>io.opencensus</groupId> + <artifactId>opencensus-contrib-exemplar-util</artifactId> + <version>${io.opencensus.version}</version> + </dependency> + <dependency> + <groupId>io.opencensus</groupId> + <artifactId>opencensus-contrib-resource-util</artifactId> + <version>${io.opencensus.version}</version> + </dependency> + <dependency> + <groupId>io.opencensus</groupId> + <artifactId>opencensus-exporter-metrics-util</artifactId> + <version>${io.opencensus.version}</version> + </dependency> + <dependency> + <groupId>io.opencensus</groupId> + <artifactId>opencensus-contrib-grpc-metrics</artifactId> + <version>${io.opencensus.version}</version> + </dependency> </dependencies> </dependencyManagement>
