You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@asterixdb.apache.org by AsterixDB Code Review <do...@asterix-gerrit.ics.uci.edu> on 2021/06/03 19:32:23 UTC
Change in asterixdb[cheshire-cat]: Merge branch 'mad-hatter' into 'cheshire-cat'
From Ian Maxon <im...@uci.edu>:
Ian Maxon has uploaded this change for review. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/11765 )
Change subject: Merge branch 'mad-hatter' into 'cheshire-cat'
......................................................................
Merge branch 'mad-hatter' into 'cheshire-cat'
Change-Id: Ib9aa81fa2e51954a46218e9907562685c8cd09e1
---
M asterixdb/asterix-app/src/test/java/org/apache/asterix/test/sqlpp/ParserTestExecutor.java
M asterixdb/pom.xml
M hyracks-fullstack/pom.xml
4 files changed, 18 insertions(+), 36 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/65/11765/1
diff --git 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
index 8637faf..2039d53 100644
--- 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
@@ -19,11 +19,6 @@
package org.apache.asterix.test.sqlpp;
import static org.apache.hyracks.util.file.FileUtil.canonicalize;
-<<<<<<< HEAD (b4f8dd Merge branch 'gerrit/stabilization-3b6982ce7f')
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyString;
-=======
->>>>>>> BRANCH (4889f6 [ASTERIXDB-2890] Minimum Java version 8->11)
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -155,8 +150,7 @@
when(metadataProvider.getDefaultDataverseName()).thenReturn(dvName);
when(metadataProvider.getConfig()).thenReturn(config);
when(config.get(FunctionUtil.IMPORT_PRIVATE_FUNCTIONS)).thenReturn("true");
-<<<<<<< HEAD (b4f8dd Merge branch 'gerrit/stabilization-3b6982ce7f')
- when(metadataProvider.findDataverse(any(DataverseName.class))).thenAnswer(new Answer<Dataverse>() {
+ when(metadataProvider.findDataverse(Mockito.<DataverseName> any())).thenAnswer(new Answer<Dataverse>() {
@Override
public Dataverse answer(InvocationOnMock invocation) {
Object[] args = invocation.getArguments();
@@ -165,17 +159,18 @@
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);
+ 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) {
@@ -187,17 +182,6 @@
Function mockFunction = mock(Function.class);
when(mockFunction.getSignature()).thenReturn(fs);
return mockFunction;
-=======
- when(metadataProvider.findDataset(Mockito.<String> 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);
- return mockDataset;
->>>>>>> BRANCH (4889f6 [ASTERIXDB-2890] Minimum Java version 8->11)
}
});
diff --git a/asterixdb/pom.xml b/asterixdb/pom.xml
index 4461193..7d90c0d 100644
--- a/asterixdb/pom.xml
+++ b/asterixdb/pom.xml
@@ -629,7 +629,7 @@
<version>6.1.2</version>
</dependency>
</dependencies>
- </plugin>
+ </plugin>
<plugin>
<groupId>net.revelc.code.formatter</groupId>
<artifactId>formatter-maven-plugin</artifactId>
@@ -641,15 +641,14 @@
<version>1.2.0</version>
</plugin>
<plugin>
-<<<<<<< HEAD (b4f8dd Merge branch 'gerrit/stabilization-3b6982ce7f')
<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>
->>>>>>> BRANCH (4889f6 [ASTERIXDB-2890] Minimum Java version 8->11)
</plugin>
</plugins>
</pluginManagement>
diff --git a/hyracks-fullstack/pom.xml b/hyracks-fullstack/pom.xml
index dc7af06..09ae228 100644
--- a/hyracks-fullstack/pom.xml
+++ b/hyracks-fullstack/pom.xml
@@ -302,7 +302,6 @@
<version>3.6.3</version>
</dependency>
<dependency>
-<<<<<<< HEAD (b4f8dd Merge branch 'gerrit/stabilization-3b6982ce7f')
<groupId>it.unimi.dsi</groupId>
<artifactId>fastutil-core</artifactId>
<version>8.5.4</version>
@@ -311,7 +310,8 @@
<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>
@@ -330,7 +330,6 @@
<groupId>org.powermock</groupId>
<artifactId>powermock-core</artifactId>
<version>2.0.9</version>
->>>>>>> BRANCH (4889f6 [ASTERIXDB-2890] Minimum Java version 8->11)
</dependency>
</dependencies>
</dependencyManagement>
--
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/11765
To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-Project: asterixdb
Gerrit-Branch: cheshire-cat
Gerrit-Change-Id: Ib9aa81fa2e51954a46218e9907562685c8cd09e1
Gerrit-Change-Number: 11765
Gerrit-PatchSet: 1
Gerrit-Owner: Ian Maxon <im...@uci.edu>
Gerrit-MessageType: newchange
Change in asterixdb[cheshire-cat]: Merge branch 'mad-hatter' into 'cheshire-cat'
Posted by AsterixDB Code Review <do...@asterix-gerrit.ics.uci.edu>.
From Jenkins <je...@fulliautomatix.ics.uci.edu>:
Jenkins has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/11765 )
Change subject: Merge branch 'mad-hatter' into 'cheshire-cat'
......................................................................
Patch Set 2: Integration-Tests+1
Integration Tests Successful
https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-integration-tests/12047/ : SUCCESS
--
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/11765
To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-Project: asterixdb
Gerrit-Branch: cheshire-cat
Gerrit-Change-Id: Ib9aa81fa2e51954a46218e9907562685c8cd09e1
Gerrit-Change-Number: 11765
Gerrit-PatchSet: 2
Gerrit-Owner: Ian Maxon <im...@uci.edu>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-CC: Anon. E. Moose #1000171
Gerrit-Comment-Date: Thu, 03 Jun 2021 20:55:31 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Change in asterixdb[cheshire-cat]: Merge branch 'mad-hatter' into 'cheshire-cat'
Posted by AsterixDB Code Review <do...@asterix-gerrit.ics.uci.edu>.
From Ian Maxon <im...@uci.edu>:
Ian Maxon has uploaded this change for review. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/11765 )
Change subject: Merge branch 'mad-hatter' into 'cheshire-cat'
......................................................................
Merge branch 'mad-hatter' into 'cheshire-cat'
Change-Id: Ib9aa81fa2e51954a46218e9907562685c8cd09e1
---
M asterixdb/asterix-app/src/test/java/org/apache/asterix/test/sqlpp/ParserTestExecutor.java
M asterixdb/pom.xml
M hyracks-fullstack/pom.xml
4 files changed, 18 insertions(+), 36 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/65/11765/1
diff --git 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
index 8637faf..2039d53 100644
--- 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
@@ -19,11 +19,6 @@
package org.apache.asterix.test.sqlpp;
import static org.apache.hyracks.util.file.FileUtil.canonicalize;
-<<<<<<< HEAD (b4f8dd Merge branch 'gerrit/stabilization-3b6982ce7f')
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyString;
-=======
->>>>>>> BRANCH (4889f6 [ASTERIXDB-2890] Minimum Java version 8->11)
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -155,8 +150,7 @@
when(metadataProvider.getDefaultDataverseName()).thenReturn(dvName);
when(metadataProvider.getConfig()).thenReturn(config);
when(config.get(FunctionUtil.IMPORT_PRIVATE_FUNCTIONS)).thenReturn("true");
-<<<<<<< HEAD (b4f8dd Merge branch 'gerrit/stabilization-3b6982ce7f')
- when(metadataProvider.findDataverse(any(DataverseName.class))).thenAnswer(new Answer<Dataverse>() {
+ when(metadataProvider.findDataverse(Mockito.<DataverseName> any())).thenAnswer(new Answer<Dataverse>() {
@Override
public Dataverse answer(InvocationOnMock invocation) {
Object[] args = invocation.getArguments();
@@ -165,17 +159,18 @@
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);
+ 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) {
@@ -187,17 +182,6 @@
Function mockFunction = mock(Function.class);
when(mockFunction.getSignature()).thenReturn(fs);
return mockFunction;
-=======
- when(metadataProvider.findDataset(Mockito.<String> 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);
- return mockDataset;
->>>>>>> BRANCH (4889f6 [ASTERIXDB-2890] Minimum Java version 8->11)
}
});
diff --git a/asterixdb/pom.xml b/asterixdb/pom.xml
index 4461193..7d90c0d 100644
--- a/asterixdb/pom.xml
+++ b/asterixdb/pom.xml
@@ -629,7 +629,7 @@
<version>6.1.2</version>
</dependency>
</dependencies>
- </plugin>
+ </plugin>
<plugin>
<groupId>net.revelc.code.formatter</groupId>
<artifactId>formatter-maven-plugin</artifactId>
@@ -641,15 +641,14 @@
<version>1.2.0</version>
</plugin>
<plugin>
-<<<<<<< HEAD (b4f8dd Merge branch 'gerrit/stabilization-3b6982ce7f')
<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>
->>>>>>> BRANCH (4889f6 [ASTERIXDB-2890] Minimum Java version 8->11)
</plugin>
</plugins>
</pluginManagement>
diff --git a/hyracks-fullstack/pom.xml b/hyracks-fullstack/pom.xml
index dc7af06..09ae228 100644
--- a/hyracks-fullstack/pom.xml
+++ b/hyracks-fullstack/pom.xml
@@ -302,7 +302,6 @@
<version>3.6.3</version>
</dependency>
<dependency>
-<<<<<<< HEAD (b4f8dd Merge branch 'gerrit/stabilization-3b6982ce7f')
<groupId>it.unimi.dsi</groupId>
<artifactId>fastutil-core</artifactId>
<version>8.5.4</version>
@@ -311,7 +310,8 @@
<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>
@@ -330,7 +330,6 @@
<groupId>org.powermock</groupId>
<artifactId>powermock-core</artifactId>
<version>2.0.9</version>
->>>>>>> BRANCH (4889f6 [ASTERIXDB-2890] Minimum Java version 8->11)
</dependency>
</dependencies>
</dependencyManagement>
--
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/11765
To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-Project: asterixdb
Gerrit-Branch: cheshire-cat
Gerrit-Change-Id: Ib9aa81fa2e51954a46218e9907562685c8cd09e1
Gerrit-Change-Number: 11765
Gerrit-PatchSet: 1
Gerrit-Owner: Ian Maxon <im...@uci.edu>
Gerrit-MessageType: newchange
Change in asterixdb[cheshire-cat]: Merge branch 'mad-hatter' into 'cheshire-cat'
Posted by AsterixDB Code Review <do...@asterix-gerrit.ics.uci.edu>.
From Michael Blow <mb...@apache.org>:
Michael Blow has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/11765 )
Change subject: Merge branch 'mad-hatter' into 'cheshire-cat'
......................................................................
Patch Set 2: Verified+1 Code-Review+2
--
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/11765
To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-Project: asterixdb
Gerrit-Branch: cheshire-cat
Gerrit-Change-Id: Ib9aa81fa2e51954a46218e9907562685c8cd09e1
Gerrit-Change-Number: 11765
Gerrit-PatchSet: 2
Gerrit-Owner: Ian Maxon <im...@uci.edu>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-Reviewer: Michael Blow <mb...@apache.org>
Gerrit-CC: Anon. E. Moose #1000171
Gerrit-Comment-Date: Thu, 03 Jun 2021 22:00:32 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Change in asterixdb[cheshire-cat]: Merge branch 'mad-hatter' into 'cheshire-cat'
Posted by AsterixDB Code Review <do...@asterix-gerrit.ics.uci.edu>.
From Ian Maxon <im...@uci.edu>:
Ian Maxon has uploaded a new patch set (#2). ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/11765 )
Change subject: Merge branch 'mad-hatter' into 'cheshire-cat'
......................................................................
Merge branch 'mad-hatter' into 'cheshire-cat'
Change-Id: Ib9aa81fa2e51954a46218e9907562685c8cd09e1
---
M asterixdb/asterix-app/src/test/java/org/apache/asterix/test/sqlpp/ParserTestExecutor.java
M asterixdb/pom.xml
M hyracks-fullstack/pom.xml
4 files changed, 17 insertions(+), 35 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/65/11765/2
--
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/11765
To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-Project: asterixdb
Gerrit-Branch: cheshire-cat
Gerrit-Change-Id: Ib9aa81fa2e51954a46218e9907562685c8cd09e1
Gerrit-Change-Number: 11765
Gerrit-PatchSet: 2
Gerrit-Owner: Ian Maxon <im...@uci.edu>
Gerrit-CC: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-MessageType: newpatchset