You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@asterixdb.apache.org by im...@apache.org on 2021/06/04 19:48:26 UTC
[asterixdb] 03/04: Merge branch 'mad-hatter' into 'cheshire-cat'
This is an automated email from the ASF dual-hosted git repository.
imaxon pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/asterixdb.git
commit 94eb3c2c02d70003369b2cd04b0667e36832f4f5
Merge: b4f8ddd 4889f6b
Author: Ian Maxon <ia...@maxons.email>
AuthorDate: Thu Jun 3 12:31:18 2021 -0700
Merge branch 'mad-hatter' into 'cheshire-cat'
Change-Id: Ib9aa81fa2e51954a46218e9907562685c8cd09e1
asterixdb/asterix-app/pom.xml | 3 +-
.../asterix/test/sqlpp/ParserTestExecutor.java | 28 ++++----
asterixdb/asterix-common/pom.xml | 2 +-
.../context/CorrelatedPrefixMergePolicyTest.java | 2 +-
asterixdb/asterix-external-data/pom.xml | 2 +-
asterixdb/asterix-metadata/pom.xml | 2 +-
asterixdb/asterix-om/pom.xml | 24 ++++++-
asterixdb/asterix-runtime/pom.xml | 2 +-
asterixdb/asterix-transactions/pom.xml | 2 +-
asterixdb/pom.xml | 64 +++++++----------
.../algebricks/algebricks-compiler/pom.xml | 8 +--
...alFirstRuleCheckFixpointRuleControllerTest.java | 2 +-
hyracks-fullstack/hyracks/hyracks-api/pom.xml | 2 +-
.../hyracks-control/hyracks-control-cc/pom.xml | 2 +-
.../hyracks-integration-tests/pom.xml | 2 +-
hyracks-fullstack/hyracks/hyracks-http/pom.xml | 2 +-
.../org/apache/hyracks/test/http/HttpTestUtil.java | 16 ++---
hyracks-fullstack/hyracks/hyracks-net/pom.xml | 2 +-
.../tests/FullFrameChannelReadInterfaceTest.java | 4 +-
.../hyracks/hyracks-storage-am-btree/pom.xml | 7 +-
.../storage/am/btree/test/FramewriterTest.java | 2 +-
.../hyracks/hyracks-storage-am-common/pom.xml | 2 +-
.../hyracks/hyracks-test-support/pom.xml | 2 +-
.../hyracks-storage-am-lsm-common-test/pom.xml | 2 +-
.../lsm/common/test/ConcurrentMergePolicyTest.java | 2 +-
.../am/lsm/common/test/PrefixMergePolicyTest.java | 2 +-
hyracks-fullstack/pom.xml | 83 +++++++++++-----------
27 files changed, 136 insertions(+), 137 deletions(-)
diff --cc asterixdb/asterix-app/src/test/java/org/apache/asterix/test/sqlpp/ParserTestExecutor.java
index 98f328d,53201f5..2039d53
--- a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/sqlpp/ParserTestExecutor.java
+++ b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/sqlpp/ParserTestExecutor.java
@@@ -151,39 -136,17 +150,40 @@@ public class ParserTestExecutor extend
when(metadataProvider.getDefaultDataverseName()).thenReturn(dvName);
when(metadataProvider.getConfig()).thenReturn(config);
when(config.get(FunctionUtil.IMPORT_PRIVATE_FUNCTIONS)).thenReturn("true");
- when(metadataProvider.findDataverse(any(DataverseName.class))).thenAnswer(new Answer<Dataverse>() {
- when(metadataProvider.findDataset(Mockito.<String> any(), Mockito.<String> any()))
++ when(metadataProvider.findDataverse(Mockito.<DataverseName> any())).thenAnswer(new Answer<Dataverse>() {
+ @Override
+ public Dataverse answer(InvocationOnMock invocation) {
+ Object[] args = invocation.getArguments();
+ final Dataverse mockDataverse = mock(Dataverse.class);
+ when(mockDataverse.getDataverseName()).thenReturn((DataverseName) args[0]);
+ return mockDataverse;
+ }
+ });
- when(metadataProvider.findDataset(any(DataverseName.class), anyString())).thenAnswer(new Answer<Dataset>() {
- @Override
- public Dataset answer(InvocationOnMock invocation) {
- Object[] args = invocation.getArguments();
- final Dataset mockDataset = mock(Dataset.class);
- when(mockDataset.getDataverseName()).thenReturn((DataverseName) args[0]);
- when(mockDataset.getDatasetName()).thenReturn((String) args[1]);
- return mockDataset;
- }
- });
- when(metadataProvider.lookupUserDefinedFunction(any(FunctionSignature.class)))
++ when(metadataProvider.findDataset(Mockito.<DataverseName> any(), Mockito.<String> any()))
+ .thenAnswer(new Answer<Dataset>() {
+ @Override
+ public Dataset answer(InvocationOnMock invocation) {
+ Object[] args = invocation.getArguments();
+ final Dataset mockDataset = mock(Dataset.class);
- String fullyQualifiedName = args[0] != null ? args[0] + "." + args[1] : (String) args[1];
- when(mockDataset.getFullyQualifiedName()).thenReturn(fullyQualifiedName);
++ when(mockDataset.getDataverseName()).thenReturn((DataverseName) args[0]);
++ when(mockDataset.getDatasetName()).thenReturn((String) args[1]);
+ return mockDataset;
+ }
+ });
++ when(metadataProvider.lookupUserDefinedFunction(Mockito.<FunctionSignature> any()))
+ .thenAnswer(new Answer<Function>() {
+ @Override
+ public Function answer(InvocationOnMock invocation) {
+ Object[] args = invocation.getArguments();
+ FunctionSignature fs = (FunctionSignature) args[0];
+ if (!createdFunctions.contains(fs)) {
+ return null;
+ }
+ Function mockFunction = mock(Function.class);
+ when(mockFunction.getSignature()).thenReturn(fs);
+ return mockFunction;
+ }
+ });
for (Statement st : statements) {
if (st.getKind() == Statement.Kind.QUERY) {
diff --cc asterixdb/pom.xml
index a930643,f985b70..ecda2c1
--- a/asterixdb/pom.xml
+++ b/asterixdb/pom.xml
@@@ -626,10 -642,10 +641,15 @@@
<version>1.2.0</version>
</plugin>
<plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>exec-maven-plugin</artifactId>
+ <version>1.6.0</version>
+ </plugin>
++ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <version>3.0.0-M3</version>
+ </plugin>
</plugins>
</pluginManagement>
</build>
diff --cc hyracks-fullstack/pom.xml
index 600d57c,5af1995..09ae228
--- a/hyracks-fullstack/pom.xml
+++ b/hyracks-fullstack/pom.xml
@@@ -306,15 -280,25 +302,35 @@@
<version>3.6.3</version>
</dependency>
<dependency>
+ <groupId>it.unimi.dsi</groupId>
+ <artifactId>fastutil-core</artifactId>
+ <version>8.5.4</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-1.2-api</artifactId>
+ <version>2.13.1</version>
+ </dependency>
++ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-core</artifactId>
+ <version>3.10.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.powermock</groupId>
+ <artifactId>powermock-api-mockito2</artifactId>
+ <version>2.0.9</version>
+ </dependency>
+ <dependency>
+ <groupId>org.powermock</groupId>
+ <artifactId>powermock-module-junit4</artifactId>
+ <version>2.0.9</version>
+ </dependency>
+ <dependency>
+ <groupId>org.powermock</groupId>
+ <artifactId>powermock-core</artifactId>
+ <version>2.0.9</version>
+ </dependency>
</dependencies>
</dependencyManagement>
<build>