Change in asterixdb[master]: Merge branch 'gerrit/trinity' into 'master'
>From Michael Blow : Michael Blow has submitted this change. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18402 ) Change subject: Merge branch 'gerrit/trinity' into 'master' .. Merge branch 'gerrit/trinity' into 'master' Change-Id: I283a03c7f780e9cba08a757bff37537c949f365e --- 1 file changed, 13 insertions(+), 0 deletions(-) Approvals: Jenkins: Verified Michael Blow: Looks good to me, approved; Verified -- To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18402 To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Change-Id: I283a03c7f780e9cba08a757bff37537c949f365e Gerrit-Change-Number: 18402 Gerrit-PatchSet: 1 Gerrit-Owner: Michael Blow Gerrit-Reviewer: Jenkins Gerrit-Reviewer: Michael Blow Gerrit-MessageType: merged
Change in asterixdb[master]: Merge branch 'gerrit/trinity' into 'master'
>From Michael Blow : Michael Blow has removed a vote from this change. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18402 ) Change subject: Merge branch 'gerrit/trinity' into 'master' .. Removed Verified-1 by Jenkins -- To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18402 To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Change-Id: I283a03c7f780e9cba08a757bff37537c949f365e Gerrit-Change-Number: 18402 Gerrit-PatchSet: 1 Gerrit-Owner: Michael Blow Gerrit-Reviewer: Jenkins Gerrit-Reviewer: Michael Blow Gerrit-MessageType: deleteVote
Change in asterixdb[master]: Merge branch 'gerrit/trinity' into 'master'
>From Michael Blow : Michael Blow has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18402 ) Change subject: Merge branch 'gerrit/trinity' into 'master' .. Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18402 To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Change-Id: I283a03c7f780e9cba08a757bff37537c949f365e Gerrit-Change-Number: 18402 Gerrit-PatchSet: 1 Gerrit-Owner: Michael Blow Gerrit-Reviewer: Jenkins Gerrit-Reviewer: Michael Blow Gerrit-Comment-Date: Wed, 26 Jun 2024 15:15:14 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in asterixdb[master]: Merge branch 'gerrit/trinity' into 'master'
>From Jenkins : Jenkins has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18402 ) Change subject: Merge branch 'gerrit/trinity' into 'master' .. Patch Set 1: Integration-Tests+1 Integration Tests Successful https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-trigger/907/ : SUCCESS -- To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18402 To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Change-Id: I283a03c7f780e9cba08a757bff37537c949f365e Gerrit-Change-Number: 18402 Gerrit-PatchSet: 1 Gerrit-Owner: Michael Blow Gerrit-Reviewer: Jenkins Gerrit-Comment-Date: Wed, 26 Jun 2024 01:40:14 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in asterixdb[master]: Merge branch 'gerrit/trinity' into 'master'
>From Michael Blow : Michael Blow has uploaded this change for review. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18402 ) Change subject: Merge branch 'gerrit/trinity' into 'master' .. Merge branch 'gerrit/trinity' into 'master' Change-Id: I283a03c7f780e9cba08a757bff37537c949f365e --- 1 file changed, 13 insertions(+), 0 deletions(-) git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/02/18402/1 -- To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18402 To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Change-Id: I283a03c7f780e9cba08a757bff37537c949f365e Gerrit-Change-Number: 18402 Gerrit-PatchSet: 1 Gerrit-Owner: Michael Blow Gerrit-MessageType: newchange
Change in asterixdb[master]: Merge branch 'gerrit/trinity' into 'master'
>From Michael Blow : Michael Blow has submitted this change. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18379 ) Change subject: Merge branch 'gerrit/trinity' into 'master' .. Merge branch 'gerrit/trinity' into 'master' Change-Id: I23be0ff73d5f40c80be8dcb2afb352b730f59218 --- M asterixdb/asterix-app/src/test/resources/runtimets/sqlpp_queries.xml M asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml 3 files changed, 29 insertions(+), 16,092 deletions(-) Approvals: Jenkins: Verified; Verified Michael Blow: Looks good to me, approved -- To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18379 To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Change-Id: I23be0ff73d5f40c80be8dcb2afb352b730f59218 Gerrit-Change-Number: 18379 Gerrit-PatchSet: 1 Gerrit-Owner: Michael Blow Gerrit-Reviewer: Jenkins Gerrit-Reviewer: Michael Blow Gerrit-MessageType: merged
Change in asterixdb[master]: Merge branch 'gerrit/trinity' into 'master'
>From Michael Blow : Michael Blow has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18379 ) Change subject: Merge branch 'gerrit/trinity' into 'master' .. Patch Set 1: Code-Review+2 -- To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18379 To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Change-Id: I23be0ff73d5f40c80be8dcb2afb352b730f59218 Gerrit-Change-Number: 18379 Gerrit-PatchSet: 1 Gerrit-Owner: Michael Blow Gerrit-Reviewer: Jenkins Gerrit-Reviewer: Michael Blow Gerrit-Comment-Date: Sat, 15 Jun 2024 17:18:46 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in asterixdb[master]: Merge branch 'gerrit/trinity' into 'master'
>From Jenkins : Jenkins has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18379 ) Change subject: Merge branch 'gerrit/trinity' into 'master' .. Patch Set 1: Integration-Tests+1 Integration Tests Successful https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-trigger/800/ : SUCCESS -- To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18379 To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Change-Id: I23be0ff73d5f40c80be8dcb2afb352b730f59218 Gerrit-Change-Number: 18379 Gerrit-PatchSet: 1 Gerrit-Owner: Michael Blow Gerrit-Reviewer: Jenkins Gerrit-Comment-Date: Sat, 15 Jun 2024 12:29:23 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in asterixdb[master]: Merge branch 'gerrit/trinity' into 'master'
>From Michael Blow : Michael Blow has uploaded this change for review. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18379 ) Change subject: Merge branch 'gerrit/trinity' into 'master' .. Merge branch 'gerrit/trinity' into 'master' Change-Id: I23be0ff73d5f40c80be8dcb2afb352b730f59218 --- M asterixdb/asterix-app/src/test/resources/runtimets/sqlpp_queries.xml M asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml 3 files changed, 29 insertions(+), 16,092 deletions(-) git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/79/18379/1 -- To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18379 To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Change-Id: I23be0ff73d5f40c80be8dcb2afb352b730f59218 Gerrit-Change-Number: 18379 Gerrit-PatchSet: 1 Gerrit-Owner: Michael Blow Gerrit-MessageType: newchange
Change in asterixdb[master]: Merge branch 'gerrit/trinity' into 'master'
>From Michael Blow : Attention is currently required from: Michael Blow. Michael Blow has removed a vote from this change. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18300 ) Change subject: Merge branch 'gerrit/trinity' into 'master' .. Removed Verified-1 by Jenkins -- To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18300 To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Change-Id: Id5bc38ec8fd856550f118668e17e73b9420fdf5a Gerrit-Change-Number: 18300 Gerrit-PatchSet: 1 Gerrit-Owner: Michael Blow Gerrit-Reviewer: Jenkins Gerrit-Reviewer: Michael Blow Gerrit-Attention: Michael Blow Gerrit-MessageType: deleteVote
Change in asterixdb[master]: Merge branch 'gerrit/trinity' into 'master'
>From Michael Blow :
Michael Blow has submitted this change. (
https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18300 )
Change subject: Merge branch 'gerrit/trinity' into 'master'
..
Merge branch 'gerrit/trinity' into 'master'
Change-Id: Id5bc38ec8fd856550f118668e17e73b9420fdf5a
---
M
asterixdb/asterix-app/src/main/java/org/apache/asterix/app/nc/NCAppRuntimeContext.java
M
asterixdb/asterix-replication/src/main/java/org/apache/asterix/replication/messaging/PartitionResourcesListTask.java
M
asterixdb/asterix-common/src/main/java/org/apache/asterix/common/api/INcApplicationContext.java
4 files changed, 18 insertions(+), 27 deletions(-)
Approvals:
Michael Blow: Looks good to me, approved; Verified
Jenkins: Verified
diff --git
a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/nc/NCAppRuntimeContext.java
b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/nc/NCAppRuntimeContext.java
index 8f6886c..18e24ab 100644
---
a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/nc/NCAppRuntimeContext.java
+++
b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/nc/NCAppRuntimeContext.java
@@ -24,12 +24,8 @@
import java.rmi.RemoteException;
import java.rmi.server.UnicastRemoteObject;
import java.util.Collection;
-<<< HEAD (079f11 [NO ISSUE][*DB][STO] Introduce ICloudGuardian, for
validatin)
import java.util.HashMap;
import java.util.Map;
-===
-import java.util.OptionalInt;
->>> BRANCH (531f76 Merge branch 'gerrit/neo' into 'gerrit/trinity')
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
@@ -185,15 +181,11 @@
private final ICacheManager cacheManager;
private IConfigValidator configValidator;
private IDiskWriteRateLimiterProvider diskWriteRateLimiterProvider;
-<<< HEAD (079f11 [NO ISSUE][*DB][STO] Introduce ICloudGuardian, for
validatin)
private final CloudProperties cloudProperties;
private IPartitionBootstrapper partitionBootstrapper;
private final INamespacePathResolver namespacePathResolver;
private final INamespaceResolver namespaceResolver;
private IDiskCacheMonitoringService diskCacheService;
-===
-private Integer metadataPartitionId;
->>> BRANCH (531f76 Merge branch 'gerrit/neo' into 'gerrit/trinity')
public NCAppRuntimeContext(INCServiceContext ncServiceContext,
NCExtensionManager extensionManager,
IPropertiesFactory propertiesFactory, INamespaceResolver
namespaceResolver,
@@ -535,17 +527,10 @@
@Override
public void initializeMetadata(boolean newUniverse, int partitionId)
throws Exception {
-<<< HEAD (079f11 [NO ISSUE][*DB][STO] Introduce ICloudGuardian, for
validatin)
LOGGER.info("Bootstrapping ({}) metadata in partition {}", newUniverse
? "new" : "existing", partitionId);
MetadataNode.INSTANCE.initialize(this,
ncExtensionManager.getMetadataIndexesProvider(),
ncExtensionManager.getMetadataTupleTranslatorProvider(),
ncExtensionManager.getMetadataExtensions(),
partitionId);
-===
-LOGGER.info("Bootstrapping metadata");
-metadataPartitionId = partitionId;
-MetadataNode.INSTANCE.initialize(this,
ncExtensionManager.getMetadataTupleTranslatorProvider(),
-ncExtensionManager.getMetadataExtensions(), partitionId);
->>> BRANCH (531f76 Merge branch 'gerrit/neo' into 'gerrit/trinity')
// This is a special case, we just give the metadataNode directly.
// This way we can delay the registration of the metadataNode until
@@ -740,7 +725,6 @@
}
@Override
-<<< HEAD (079f11 [NO ISSUE][*DB][STO] Introduce ICloudGuardian, for
validatin)
public IDiskCacheMonitoringService getDiskCacheService() {
return diskCacheService;
}
@@ -763,9 +747,5 @@
private int getResourceIdBlockSize() {
return isCloudDeployment() ?
storageProperties.getStoragePartitionsCount()
: ncServiceContext.getIoManager().getIODevices().size();
-===
-public OptionalInt getMetadataPartitionId() {
-return metadataPartitionId == null ? OptionalInt.empty() :
OptionalInt.of(metadataPartitionId);
->>> BRANCH (531f76 Merge branch 'gerrit/neo' into 'gerrit/trinity')
}
}
diff --git
a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/api/INcApplicationContext.java
b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/api/INcApplicationContext.java
index ac4ee6f8..888cea1 100644
---
a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/api/INcApplicationContext.java
+++
b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/api/INcApplicationContext.java
@@ -20,7 +20,6 @@
import java.io.IOException;
import java.rmi.RemoteException;
-import java.util.OptionalInt;
import java.util.concurrent.Executor;
Change in asterixdb[master]: Merge branch 'gerrit/trinity' into 'master'
>From Jenkins : Jenkins has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18300 ) Change subject: Merge branch 'gerrit/trinity' into 'master' .. Patch Set 1: Integration-Tests+1 Integration Tests Successful https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-trigger/596/ : SUCCESS -- To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18300 To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Change-Id: Id5bc38ec8fd856550f118668e17e73b9420fdf5a Gerrit-Change-Number: 18300 Gerrit-PatchSet: 1 Gerrit-Owner: Michael Blow Gerrit-Reviewer: Jenkins Gerrit-Reviewer: Michael Blow Gerrit-Comment-Date: Sat, 18 May 2024 04:38:50 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in asterixdb[master]: Merge branch 'gerrit/trinity' into 'master'
>From Michael Blow : Michael Blow has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18300 ) Change subject: Merge branch 'gerrit/trinity' into 'master' .. Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18300 To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Change-Id: Id5bc38ec8fd856550f118668e17e73b9420fdf5a Gerrit-Change-Number: 18300 Gerrit-PatchSet: 1 Gerrit-Owner: Michael Blow Gerrit-Reviewer: Michael Blow Gerrit-CC: Jenkins Gerrit-Comment-Date: Sat, 18 May 2024 04:32:37 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in asterixdb[master]: Merge branch 'gerrit/trinity' into 'master'
>From Michael Blow :
Michael Blow has uploaded this change for review. (
https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18300 )
Change subject: Merge branch 'gerrit/trinity' into 'master'
..
Merge branch 'gerrit/trinity' into 'master'
Change-Id: Id5bc38ec8fd856550f118668e17e73b9420fdf5a
---
M
asterixdb/asterix-app/src/main/java/org/apache/asterix/app/nc/NCAppRuntimeContext.java
M
asterixdb/asterix-replication/src/main/java/org/apache/asterix/replication/messaging/PartitionResourcesListTask.java
M
asterixdb/asterix-common/src/main/java/org/apache/asterix/common/api/INcApplicationContext.java
4 files changed, 18 insertions(+), 27 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb
refs/changes/00/18300/1
diff --git
a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/nc/NCAppRuntimeContext.java
b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/nc/NCAppRuntimeContext.java
index 8f6886c..18e24ab 100644
---
a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/nc/NCAppRuntimeContext.java
+++
b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/nc/NCAppRuntimeContext.java
@@ -24,12 +24,8 @@
import java.rmi.RemoteException;
import java.rmi.server.UnicastRemoteObject;
import java.util.Collection;
-<<< HEAD (079f11 [NO ISSUE][*DB][STO] Introduce ICloudGuardian, for
validatin)
import java.util.HashMap;
import java.util.Map;
-===
-import java.util.OptionalInt;
->>> BRANCH (531f76 Merge branch 'gerrit/neo' into 'gerrit/trinity')
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
@@ -185,15 +181,11 @@
private final ICacheManager cacheManager;
private IConfigValidator configValidator;
private IDiskWriteRateLimiterProvider diskWriteRateLimiterProvider;
-<<< HEAD (079f11 [NO ISSUE][*DB][STO] Introduce ICloudGuardian, for
validatin)
private final CloudProperties cloudProperties;
private IPartitionBootstrapper partitionBootstrapper;
private final INamespacePathResolver namespacePathResolver;
private final INamespaceResolver namespaceResolver;
private IDiskCacheMonitoringService diskCacheService;
-===
-private Integer metadataPartitionId;
->>> BRANCH (531f76 Merge branch 'gerrit/neo' into 'gerrit/trinity')
public NCAppRuntimeContext(INCServiceContext ncServiceContext,
NCExtensionManager extensionManager,
IPropertiesFactory propertiesFactory, INamespaceResolver
namespaceResolver,
@@ -535,17 +527,10 @@
@Override
public void initializeMetadata(boolean newUniverse, int partitionId)
throws Exception {
-<<< HEAD (079f11 [NO ISSUE][*DB][STO] Introduce ICloudGuardian, for
validatin)
LOGGER.info("Bootstrapping ({}) metadata in partition {}", newUniverse
? "new" : "existing", partitionId);
MetadataNode.INSTANCE.initialize(this,
ncExtensionManager.getMetadataIndexesProvider(),
ncExtensionManager.getMetadataTupleTranslatorProvider(),
ncExtensionManager.getMetadataExtensions(),
partitionId);
-===
-LOGGER.info("Bootstrapping metadata");
-metadataPartitionId = partitionId;
-MetadataNode.INSTANCE.initialize(this,
ncExtensionManager.getMetadataTupleTranslatorProvider(),
-ncExtensionManager.getMetadataExtensions(), partitionId);
->>> BRANCH (531f76 Merge branch 'gerrit/neo' into 'gerrit/trinity')
// This is a special case, we just give the metadataNode directly.
// This way we can delay the registration of the metadataNode until
@@ -740,7 +725,6 @@
}
@Override
-<<< HEAD (079f11 [NO ISSUE][*DB][STO] Introduce ICloudGuardian, for
validatin)
public IDiskCacheMonitoringService getDiskCacheService() {
return diskCacheService;
}
@@ -763,9 +747,5 @@
private int getResourceIdBlockSize() {
return isCloudDeployment() ?
storageProperties.getStoragePartitionsCount()
: ncServiceContext.getIoManager().getIODevices().size();
-===
-public OptionalInt getMetadataPartitionId() {
-return metadataPartitionId == null ? OptionalInt.empty() :
OptionalInt.of(metadataPartitionId);
->>> BRANCH (531f76 Merge branch 'gerrit/neo' into 'gerrit/trinity')
}
}
diff --git
a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/api/INcApplicationContext.java
b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/api/INcApplicationContext.java
index ac4ee6f8..888cea1 100644
---
a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/api/INcApplicationContext.java
+++
b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/api/INcApplicationContext.java
@@ -20,7 +20,6 @@
import java.io.IOException;
import java.rmi.RemoteException;
-import java.util.OptionalInt;
import java.util.concurrent.E
Change in asterixdb[master]: Merge branch 'gerrit/trinity' into 'master'
>From Michael Blow :
Michael Blow has submitted this change. (
https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18281 )
Change subject: Merge branch 'gerrit/trinity' into 'master'
..
Merge branch 'gerrit/trinity' into 'master'
Change-Id: I4408569b9d202ef120fe042781710cf04af884a1
---
M
asterixdb/asterix-common/src/main/java/org/apache/asterix/common/api/IReceptionist.java
M
asterixdb/asterix-app/src/main/java/org/apache/asterix/app/translator/QueryTranslator.java
M
asterixdb/asterix-app/src/main/java/org/apache/asterix/app/cc/GlobalTxManager.java
M
asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/job/listener/NodeJobTracker.java
M
hyracks-fullstack/hyracks/hyracks-examples/hyracks-integration-tests/src/test/java/org/apache/hyracks/tests/integration/TestJobLifecycleListener.java
6 files changed, 30 insertions(+), 23 deletions(-)
Approvals:
Jenkins: Verified
Michael Blow: Looks good to me, approved; Verified
diff --git
a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/cc/GlobalTxManager.java
b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/cc/GlobalTxManager.java
index 9d1e108..c85e3b0 100644
---
a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/cc/GlobalTxManager.java
+++
b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/cc/GlobalTxManager.java
@@ -41,6 +41,7 @@
import org.apache.hyracks.api.job.JobId;
import org.apache.hyracks.api.job.JobSpecification;
import org.apache.hyracks.api.job.JobStatus;
+import org.apache.hyracks.api.job.resource.IJobCapacityController;
import org.apache.hyracks.control.cc.ClusterControllerService;
import org.apache.hyracks.control.common.controllers.CCConfig;
import org.apache.hyracks.control.nc.io.IOManager;
@@ -223,7 +224,13 @@
}
@Override
-public void notifyJobCreation(JobId jobId, JobSpecification spec) throws
HyracksException {
+public void notifyJobCreation(JobId jobId, JobSpecification spec,
IJobCapacityController.JobSubmissionStatus status)
+throws HyracksException {
+
+}
+
+@Override
+public void notifyJobStart(JobId jobId, JobSpecification spec) throws
HyracksException {
GlobalTxInfo globalTxInfo = (GlobalTxInfo)
spec.getProperty(GlOBAL_TX_PROPERTY_NAME);
if (globalTxInfo != null) {
beginTransaction(jobId, globalTxInfo.getNumNodes(),
globalTxInfo.getNumPartitions(),
@@ -232,11 +239,8 @@
}
@Override
-public void notifyJobStart(JobId jobId) throws HyracksException {
+public void notifyJobFinish(JobId jobId, JobSpecification spec, JobStatus
jobStatus, List exceptions)
+throws HyracksException {
}
-
-@Override
-public void notifyJobFinish(JobId jobId, JobStatus jobStatus,
List exceptions) throws HyracksException {
-}
}
diff --git
a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/translator/QueryTranslator.java
b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/translator/QueryTranslator.java
index d57835c..2ef3657 100644
---
a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/translator/QueryTranslator.java
+++
b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/translator/QueryTranslator.java
@@ -5412,7 +5412,7 @@
appCtx.getReceptionist().ensureSchedulable(schedulableRequest);
// ensure request not cancelled before running job
ensureNotCancelled(clientRequest);
-<<< HEAD (746e3f [ASTERIXDB-3389][STO] Support caching/eviciting columns)
+jobSpec.setRequestId(clientRequest.getId());
if (atomicStatement != null) {
Dataset ds = metadataProvider.findDataset(((InsertStatement)
atomicStatement).getDatabaseName(),
((InsertStatement) atomicStatement).getDataverseName(),
@@ -5431,10 +5431,6 @@
}
}
jobId = JobUtils.runJob(hcc, jobSpec, jobFlags, false);
-===
-jobSpec.setRequestId(clientRequest.getId());
-final JobId jobId = JobUtils.runJob(hcc, jobSpec, jobFlags, false);
->>> BRANCH (7c7d24 [ASTERIXDB-3343][API] Capture job state changes in
client re)
if (LOGGER.isInfoEnabled()) {
LOGGER.info("Created job {} for query uuid:{},
clientContextID:{}", jobId,
requestParameters.getRequestReference().getUuid(),
requestParameters.getClientContextId());
diff --git
a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/api/IReceptionist.java
b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/api/IReceptionist.java
index fe46589..04adce9 100644
---
a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/api/IReceptionist.java
+++
b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/api/IReceptionist.java
@@ -18,11 +18,7 @@
*/
package org.apache.asterix.common.api;
Change in asterixdb[master]: Merge branch 'gerrit/trinity' into 'master'
>From Michael Blow : Michael Blow has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18281 ) Change subject: Merge branch 'gerrit/trinity' into 'master' .. Patch Set 2: Verified+1 Code-Review+2 -- To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18281 To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Change-Id: I4408569b9d202ef120fe042781710cf04af884a1 Gerrit-Change-Number: 18281 Gerrit-PatchSet: 2 Gerrit-Owner: Michael Blow Gerrit-Reviewer: Jenkins Gerrit-Reviewer: Michael Blow Gerrit-Comment-Date: Fri, 10 May 2024 15:06:20 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in asterixdb[master]: Merge branch 'gerrit/trinity' into 'master'
>From Jenkins : Attention is currently required from: Michael Blow. Jenkins has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18281 ) Change subject: Merge branch 'gerrit/trinity' into 'master' .. Patch Set 2: Integration-Tests+1 Integration Tests Successful https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-trigger/531/ : SUCCESS -- To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18281 To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Change-Id: I4408569b9d202ef120fe042781710cf04af884a1 Gerrit-Change-Number: 18281 Gerrit-PatchSet: 2 Gerrit-Owner: Michael Blow Gerrit-Reviewer: Jenkins Gerrit-Attention: Michael Blow Gerrit-Comment-Date: Fri, 10 May 2024 13:32:08 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in asterixdb[master]: Merge branch 'gerrit/trinity' into 'master'
>From Michael Blow : Attention is currently required from: Michael Blow. Hello Jenkins, I'd like you to reexamine a change. Please visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18281 to look at the new patch set (#2). Change subject: Merge branch 'gerrit/trinity' into 'master' .. Merge branch 'gerrit/trinity' into 'master' Change-Id: I4408569b9d202ef120fe042781710cf04af884a1 --- M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/api/IReceptionist.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/app/translator/QueryTranslator.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/app/cc/GlobalTxManager.java M asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/job/listener/NodeJobTracker.java M hyracks-fullstack/hyracks/hyracks-examples/hyracks-integration-tests/src/test/java/org/apache/hyracks/tests/integration/TestJobLifecycleListener.java 6 files changed, 30 insertions(+), 23 deletions(-) git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/81/18281/2 -- To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18281 To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Change-Id: I4408569b9d202ef120fe042781710cf04af884a1 Gerrit-Change-Number: 18281 Gerrit-PatchSet: 2 Gerrit-Owner: Michael Blow Gerrit-Reviewer: Jenkins Gerrit-Attention: Michael Blow Gerrit-MessageType: newpatchset
Change in asterixdb[master]: Merge branch 'gerrit/trinity' into 'master'
>From Jenkins : Attention is currently required from: Michael Blow. Jenkins has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18281 ) Change subject: Merge branch 'gerrit/trinity' into 'master' .. Patch Set 1: Integration-Tests+1 Integration Tests Successful https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-trigger/524/ : SUCCESS -- To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18281 To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Change-Id: I4408569b9d202ef120fe042781710cf04af884a1 Gerrit-Change-Number: 18281 Gerrit-PatchSet: 1 Gerrit-Owner: Michael Blow Gerrit-Reviewer: Jenkins Gerrit-Attention: Michael Blow Gerrit-Comment-Date: Fri, 10 May 2024 04:03:54 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in asterixdb[master]: Merge branch 'gerrit/trinity' into 'master'
>From Michael Blow :
Michael Blow has uploaded this change for review. (
https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18281 )
Change subject: Merge branch 'gerrit/trinity' into 'master'
..
Merge branch 'gerrit/trinity' into 'master'
Change-Id: I4408569b9d202ef120fe042781710cf04af884a1
---
M
asterixdb/asterix-common/src/main/java/org/apache/asterix/common/api/IReceptionist.java
M
asterixdb/asterix-app/src/main/java/org/apache/asterix/app/translator/QueryTranslator.java
M
asterixdb/asterix-app/src/main/java/org/apache/asterix/app/cc/GlobalTxManager.java
M
asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/job/listener/NodeJobTracker.java
5 files changed, 26 insertions(+), 21 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb
refs/changes/81/18281/1
diff --git
a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/cc/GlobalTxManager.java
b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/cc/GlobalTxManager.java
index 9d1e108..c85e3b0 100644
---
a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/cc/GlobalTxManager.java
+++
b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/cc/GlobalTxManager.java
@@ -41,6 +41,7 @@
import org.apache.hyracks.api.job.JobId;
import org.apache.hyracks.api.job.JobSpecification;
import org.apache.hyracks.api.job.JobStatus;
+import org.apache.hyracks.api.job.resource.IJobCapacityController;
import org.apache.hyracks.control.cc.ClusterControllerService;
import org.apache.hyracks.control.common.controllers.CCConfig;
import org.apache.hyracks.control.nc.io.IOManager;
@@ -223,7 +224,13 @@
}
@Override
-public void notifyJobCreation(JobId jobId, JobSpecification spec) throws
HyracksException {
+public void notifyJobCreation(JobId jobId, JobSpecification spec,
IJobCapacityController.JobSubmissionStatus status)
+throws HyracksException {
+
+}
+
+@Override
+public void notifyJobStart(JobId jobId, JobSpecification spec) throws
HyracksException {
GlobalTxInfo globalTxInfo = (GlobalTxInfo)
spec.getProperty(GlOBAL_TX_PROPERTY_NAME);
if (globalTxInfo != null) {
beginTransaction(jobId, globalTxInfo.getNumNodes(),
globalTxInfo.getNumPartitions(),
@@ -232,11 +239,8 @@
}
@Override
-public void notifyJobStart(JobId jobId) throws HyracksException {
+public void notifyJobFinish(JobId jobId, JobSpecification spec, JobStatus
jobStatus, List exceptions)
+throws HyracksException {
}
-
-@Override
-public void notifyJobFinish(JobId jobId, JobStatus jobStatus,
List exceptions) throws HyracksException {
-}
}
diff --git
a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/translator/QueryTranslator.java
b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/translator/QueryTranslator.java
index d57835c..2ef3657 100644
---
a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/translator/QueryTranslator.java
+++
b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/translator/QueryTranslator.java
@@ -5412,7 +5412,7 @@
appCtx.getReceptionist().ensureSchedulable(schedulableRequest);
// ensure request not cancelled before running job
ensureNotCancelled(clientRequest);
-<<< HEAD (746e3f [ASTERIXDB-3389][STO] Support caching/eviciting columns)
+jobSpec.setRequestId(clientRequest.getId());
if (atomicStatement != null) {
Dataset ds = metadataProvider.findDataset(((InsertStatement)
atomicStatement).getDatabaseName(),
((InsertStatement) atomicStatement).getDataverseName(),
@@ -5431,10 +5431,6 @@
}
}
jobId = JobUtils.runJob(hcc, jobSpec, jobFlags, false);
-===
-jobSpec.setRequestId(clientRequest.getId());
-final JobId jobId = JobUtils.runJob(hcc, jobSpec, jobFlags, false);
->>> BRANCH (7c7d24 [ASTERIXDB-3343][API] Capture job state changes in
client re)
if (LOGGER.isInfoEnabled()) {
LOGGER.info("Created job {} for query uuid:{},
clientContextID:{}", jobId,
requestParameters.getRequestReference().getUuid(),
requestParameters.getClientContextId());
diff --git
a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/api/IReceptionist.java
b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/api/IReceptionist.java
index fe46589..04adce9 100644
---
a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/api/IReceptionist.java
+++
b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/api/IReceptionist.java
@@ -18,11 +18,7 @@
*/
package org.apache.asterix.common.api;
-<<< HEAD (746e3f [ASTERIXDB-3389][STO] Support caching/eviciting columns)
-import org.apache.asterix.common.dataflow.ICcApplicationCon
Change in asterixdb[master]: Merge branch 'gerrit/trinity' into 'master'
>From Michael Blow : Michael Blow has submitted this change. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18228 ) Change subject: Merge branch 'gerrit/trinity' into 'master' .. Merge branch 'gerrit/trinity' into 'master' Change-Id: I1850f4af7fcaca4649d503cbe64f6f33a853a524 --- M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/api/IReceptionist.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/app/translator/QueryTranslator.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/CompilerProperties.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/api/common/APIFramework.java M asterixdb/asterix-om/src/main/java/org/apache/asterix/om/functions/BuiltinFunctions.java M asterixdb/asterix-algebra/src/main/java/org/apache/asterix/translator/ClientRequest.java M asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml 8 files changed, 38 insertions(+), 16,224 deletions(-) Approvals: Jenkins: Verified Ian Maxon: Verified Michael Blow: Looks good to me, approved -- To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18228 To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Change-Id: I1850f4af7fcaca4649d503cbe64f6f33a853a524 Gerrit-Change-Number: 18228 Gerrit-PatchSet: 3 Gerrit-Owner: Michael Blow Gerrit-Reviewer: Ian Maxon Gerrit-Reviewer: Jenkins Gerrit-Reviewer: Michael Blow Gerrit-MessageType: merged
Change in asterixdb[master]: Merge branch 'gerrit/trinity' into 'master'
>From Michael Blow : Attention is currently required from: Ian Maxon. Michael Blow has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18228 ) Change subject: Merge branch 'gerrit/trinity' into 'master' .. Patch Set 3: Code-Review+2 -- To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18228 To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Change-Id: I1850f4af7fcaca4649d503cbe64f6f33a853a524 Gerrit-Change-Number: 18228 Gerrit-PatchSet: 3 Gerrit-Owner: Michael Blow Gerrit-Reviewer: Ian Maxon Gerrit-Reviewer: Jenkins Gerrit-Reviewer: Michael Blow Gerrit-Attention: Ian Maxon Gerrit-Comment-Date: Thu, 09 May 2024 01:43:24 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in asterixdb[master]: Merge branch 'gerrit/trinity' into 'master'
>From Ian Maxon : Attention is currently required from: Michael Blow. Ian Maxon has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18228 ) Change subject: Merge branch 'gerrit/trinity' into 'master' .. Patch Set 3: Verified+1 (1 comment) Patchset: PS3: just a cancellation test flake -- To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18228 To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Change-Id: I1850f4af7fcaca4649d503cbe64f6f33a853a524 Gerrit-Change-Number: 18228 Gerrit-PatchSet: 3 Gerrit-Owner: Michael Blow Gerrit-Reviewer: Ian Maxon Gerrit-Reviewer: Jenkins Gerrit-Attention: Michael Blow Gerrit-Comment-Date: Wed, 08 May 2024 20:48:19 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in asterixdb[master]: Merge branch 'gerrit/trinity' into 'master'
>From Ian Maxon : Attention is currently required from: Ian Maxon, Michael Blow. Ian Maxon has removed a vote from this change. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18228 ) Change subject: Merge branch 'gerrit/trinity' into 'master' .. Removed Verified-1 by Jenkins -- To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18228 To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Change-Id: I1850f4af7fcaca4649d503cbe64f6f33a853a524 Gerrit-Change-Number: 18228 Gerrit-PatchSet: 3 Gerrit-Owner: Michael Blow Gerrit-Reviewer: Jenkins Gerrit-Attention: Ian Maxon Gerrit-Attention: Michael Blow Gerrit-MessageType: deleteVote
Change in asterixdb[master]: Merge branch 'gerrit/trinity' into 'master'
>From Jenkins : Attention is currently required from: Ian Maxon, Michael Blow. Jenkins has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18228 ) Change subject: Merge branch 'gerrit/trinity' into 'master' .. Patch Set 3: Integration-Tests+1 Integration Tests Successful https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-trigger/498/ : SUCCESS -- To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18228 To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Change-Id: I1850f4af7fcaca4649d503cbe64f6f33a853a524 Gerrit-Change-Number: 18228 Gerrit-PatchSet: 3 Gerrit-Owner: Michael Blow Gerrit-Reviewer: Jenkins Gerrit-Attention: Ian Maxon Gerrit-Attention: Michael Blow Gerrit-Comment-Date: Wed, 08 May 2024 20:34:38 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in asterixdb[master]: Merge branch 'gerrit/trinity' into 'master'
>From Ian Maxon : Attention is currently required from: Michael Blow. Ian Maxon has uploaded a new patch set (#3) to the change originally created by Michael Blow. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18228 ) Change subject: Merge branch 'gerrit/trinity' into 'master' .. Merge branch 'gerrit/trinity' into 'master' Change-Id: I1850f4af7fcaca4649d503cbe64f6f33a853a524 --- M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/api/IReceptionist.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/app/translator/QueryTranslator.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/CompilerProperties.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/api/common/APIFramework.java M asterixdb/asterix-om/src/main/java/org/apache/asterix/om/functions/BuiltinFunctions.java M asterixdb/asterix-algebra/src/main/java/org/apache/asterix/translator/ClientRequest.java M asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml 8 files changed, 38 insertions(+), 16,224 deletions(-) git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/28/18228/3 -- To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18228 To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Change-Id: I1850f4af7fcaca4649d503cbe64f6f33a853a524 Gerrit-Change-Number: 18228 Gerrit-PatchSet: 3 Gerrit-Owner: Michael Blow Gerrit-Reviewer: Jenkins Gerrit-Attention: Michael Blow Gerrit-MessageType: newpatchset
Change in asterixdb[master]: Merge branch 'gerrit/trinity' into 'master'
Anon. E. Moose #1000171 has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18275 ) Change subject: Merge branch 'gerrit/trinity' into 'master' .. Patch Set 1: Analytics Compatibility Compilation Successful https://cbjenkins.page.link/zX5EmPR6aY682drYA : SUCCESS -- To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18275 To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Change-Id: I1850f4af7fcaca4649d503cbe64f6f33a853c521 Gerrit-Change-Number: 18275 Gerrit-PatchSet: 1 Gerrit-Owner: Ian Maxon Gerrit-CC: Anon. E. Moose #1000171 Gerrit-CC: Jenkins Gerrit-Comment-Date: Wed, 08 May 2024 18:13:50 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in asterixdb[master]: Merge branch 'gerrit/trinity' into 'master'
>From Ian Maxon : Ian Maxon has abandoned this change. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18275 ) Change subject: Merge branch 'gerrit/trinity' into 'master' .. Abandoned replace --graft is git-fu that i don't understand yet and scares me -- To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18275 To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Change-Id: I1850f4af7fcaca4649d503cbe64f6f33a853c521 Gerrit-Change-Number: 18275 Gerrit-PatchSet: 1 Gerrit-Owner: Ian Maxon Gerrit-CC: Jenkins Gerrit-MessageType: abandon
Change in asterixdb[master]: Merge branch 'gerrit/trinity' into 'master'
>From Ian Maxon : Ian Maxon has uploaded this change for review. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18275 ) Change subject: Merge branch 'gerrit/trinity' into 'master' .. Merge branch 'gerrit/trinity' into 'master' Change-Id: I1850f4af7fcaca4649d503cbe64f6f33a853c521 --- M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/api/IReceptionist.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/app/translator/QueryTranslator.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/CompilerProperties.java M asterixdb/asterix-app/src/test/resources/runtimets/sqlpp_queries.xml M asterixdb/asterix-app/src/main/java/org/apache/asterix/api/common/APIFramework.java M asterixdb/asterix-om/src/main/java/org/apache/asterix/om/functions/BuiltinFunctions.java M asterixdb/asterix-algebra/src/main/java/org/apache/asterix/translator/ClientRequest.java M asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml 9 files changed, 43 insertions(+), 16,224 deletions(-) git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/75/18275/1 -- To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18275 To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Change-Id: I1850f4af7fcaca4649d503cbe64f6f33a853c521 Gerrit-Change-Number: 18275 Gerrit-PatchSet: 1 Gerrit-Owner: Ian Maxon Gerrit-MessageType: newchange
Change in asterixdb[master]: Merge branch 'gerrit/trinity' into 'master'
>From Michael Blow : Attention is currently required from: Michael Blow. Michael Blow has removed a vote from this change. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18228 ) Change subject: Merge branch 'gerrit/trinity' into 'master' .. Removed Integration-Tests-1 by Jenkins -- To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18228 To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Change-Id: I1850f4af7fcaca4649d503cbe64f6f33a853a524 Gerrit-Change-Number: 18228 Gerrit-PatchSet: 2 Gerrit-Owner: Michael Blow Gerrit-Reviewer: Jenkins Gerrit-Attention: Michael Blow Gerrit-MessageType: deleteVote
Change in asterixdb[master]: Merge branch 'gerrit/trinity' into 'master'
>From Jenkins : Attention is currently required from: Michael Blow. Jenkins has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18228 ) Change subject: Merge branch 'gerrit/trinity' into 'master' .. Patch Set 2: Integration-Tests-1 Integration Tests Failed https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-trigger/483/ : UNSTABLE -- To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18228 To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Change-Id: I1850f4af7fcaca4649d503cbe64f6f33a853a524 Gerrit-Change-Number: 18228 Gerrit-PatchSet: 2 Gerrit-Owner: Michael Blow Gerrit-Reviewer: Jenkins Gerrit-Attention: Michael Blow Gerrit-Comment-Date: Tue, 07 May 2024 18:33:50 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in asterixdb[master]: Merge branch 'gerrit/trinity' into 'master'
>From Michael Blow : Attention is currently required from: Michael Blow. Hello Jenkins, I'd like you to reexamine a change. Please visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18228 to look at the new patch set (#2). Change subject: Merge branch 'gerrit/trinity' into 'master' .. Merge branch 'gerrit/trinity' into 'master' Change-Id: I1850f4af7fcaca4649d503cbe64f6f33a853a524 --- M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/api/IReceptionist.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/app/translator/QueryTranslator.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/CompilerProperties.java M asterixdb/asterix-app/src/test/resources/runtimets/sqlpp_queries.xml M asterixdb/asterix-app/src/main/java/org/apache/asterix/api/common/APIFramework.java M asterixdb/asterix-om/src/main/java/org/apache/asterix/om/functions/BuiltinFunctions.java M asterixdb/asterix-algebra/src/main/java/org/apache/asterix/translator/ClientRequest.java M asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml 9 files changed, 42 insertions(+), 16,224 deletions(-) git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/28/18228/2 -- To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18228 To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Change-Id: I1850f4af7fcaca4649d503cbe64f6f33a853a524 Gerrit-Change-Number: 18228 Gerrit-PatchSet: 2 Gerrit-Owner: Michael Blow Gerrit-Reviewer: Jenkins Gerrit-Attention: Michael Blow Gerrit-MessageType: newpatchset
Change in asterixdb[master]: Merge branch 'gerrit/trinity' into 'master'
>From Jenkins : Jenkins has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18228 ) Change subject: Merge branch 'gerrit/trinity' into 'master' .. Patch Set 1: Integration-Tests+1 Integration Tests Successful https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-trigger/268/ : SUCCESS -- To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18228 To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Change-Id: I1850f4af7fcaca4649d503cbe64f6f33a853a524 Gerrit-Change-Number: 18228 Gerrit-PatchSet: 1 Gerrit-Owner: Michael Blow Gerrit-Reviewer: Jenkins Gerrit-Comment-Date: Sun, 07 Apr 2024 15:21:35 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in asterixdb[master]: Merge branch 'gerrit/trinity' into 'master'
>From Michael Blow : Michael Blow has uploaded this change for review. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18228 ) Change subject: Merge branch 'gerrit/trinity' into 'master' .. Merge branch 'gerrit/trinity' into 'master' Change-Id: I1850f4af7fcaca4649d503cbe64f6f33a853a524 --- 1 file changed, 14 insertions(+), 0 deletions(-) git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/28/18228/1 -- To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18228 To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Change-Id: I1850f4af7fcaca4649d503cbe64f6f33a853a524 Gerrit-Change-Number: 18228 Gerrit-PatchSet: 1 Gerrit-Owner: Michael Blow Gerrit-MessageType: newchange
Change in asterixdb[master]: Merge branch 'gerrit/trinity' into 'master'
>From Michael Blow : Michael Blow has submitted this change. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18185 ) Change subject: Merge branch 'gerrit/trinity' into 'master' .. Merge branch 'gerrit/trinity' into 'master' Change-Id: If1f5c3109250d6a7cf8f92d3dea6fb403b4e70dc --- 1 file changed, 15 insertions(+), 0 deletions(-) Approvals: Jenkins: Verified Michael Blow: Looks good to me, approved -- To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18185 To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Change-Id: If1f5c3109250d6a7cf8f92d3dea6fb403b4e70dc Gerrit-Change-Number: 18185 Gerrit-PatchSet: 1 Gerrit-Owner: Michael Blow Gerrit-Reviewer: Jenkins Gerrit-Reviewer: Michael Blow Gerrit-MessageType: merged
Change in asterixdb[master]: Merge branch 'gerrit/trinity' into 'master'
>From Michael Blow : Attention is currently required from: Michael Blow. Michael Blow has removed a vote from this change. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18185 ) Change subject: Merge branch 'gerrit/trinity' into 'master' .. Removed Integration-Tests-1 by Jenkins -- To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18185 To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Change-Id: If1f5c3109250d6a7cf8f92d3dea6fb403b4e70dc Gerrit-Change-Number: 18185 Gerrit-PatchSet: 1 Gerrit-Owner: Michael Blow Gerrit-Reviewer: Jenkins Gerrit-Attention: Michael Blow Gerrit-MessageType: deleteVote
Change in asterixdb[master]: Merge branch 'gerrit/trinity' into 'master'
>From Michael Blow : Michael Blow has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18185 ) Change subject: Merge branch 'gerrit/trinity' into 'master' .. Patch Set 1: Code-Review+2 -- To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18185 To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Change-Id: If1f5c3109250d6a7cf8f92d3dea6fb403b4e70dc Gerrit-Change-Number: 18185 Gerrit-PatchSet: 1 Gerrit-Owner: Michael Blow Gerrit-Reviewer: Jenkins Gerrit-Reviewer: Michael Blow Gerrit-Comment-Date: Wed, 28 Feb 2024 20:53:01 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in asterixdb[master]: Merge branch 'gerrit/trinity' into 'master'
>From Jenkins : Attention is currently required from: Michael Blow. Jenkins has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18185 ) Change subject: Merge branch 'gerrit/trinity' into 'master' .. Patch Set 1: Integration-Tests-1 Integration Tests Failed https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-trigger/173/ : UNSTABLE -- To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18185 To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Change-Id: If1f5c3109250d6a7cf8f92d3dea6fb403b4e70dc Gerrit-Change-Number: 18185 Gerrit-PatchSet: 1 Gerrit-Owner: Michael Blow Gerrit-Reviewer: Jenkins Gerrit-Attention: Michael Blow Gerrit-Comment-Date: Wed, 28 Feb 2024 18:00:47 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in asterixdb[master]: Merge branch 'gerrit/trinity' into 'master'
>From Michael Blow : Michael Blow has uploaded this change for review. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18185 ) Change subject: Merge branch 'gerrit/trinity' into 'master' .. Merge branch 'gerrit/trinity' into 'master' Change-Id: If1f5c3109250d6a7cf8f92d3dea6fb403b4e70dc --- 1 file changed, 15 insertions(+), 0 deletions(-) git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/85/18185/1 -- To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18185 To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Change-Id: If1f5c3109250d6a7cf8f92d3dea6fb403b4e70dc Gerrit-Change-Number: 18185 Gerrit-PatchSet: 1 Gerrit-Owner: Michael Blow Gerrit-MessageType: newchange
Change in asterixdb[master]: Merge branch 'gerrit/trinity' into 'master'
>From Michael Blow : Michael Blow has submitted this change. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18167 ) Change subject: Merge branch 'gerrit/trinity' into 'master' .. Merge branch 'gerrit/trinity' into 'master' Change-Id: I0eb6d956f60cafd0829b756dc4956bcc9d187e75 --- 1 file changed, 14 insertions(+), 0 deletions(-) Approvals: Michael Blow: Looks good to me, approved; Verified -- To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18167 To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Change-Id: I0eb6d956f60cafd0829b756dc4956bcc9d187e75 Gerrit-Change-Number: 18167 Gerrit-PatchSet: 1 Gerrit-Owner: Michael Blow Gerrit-Reviewer: Michael Blow Gerrit-CC: Jenkins Gerrit-MessageType: merged
Change in asterixdb[master]: Merge branch 'gerrit/trinity' into 'master'
>From Michael Blow : Michael Blow has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18167 ) Change subject: Merge branch 'gerrit/trinity' into 'master' .. Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18167 To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Change-Id: I0eb6d956f60cafd0829b756dc4956bcc9d187e75 Gerrit-Change-Number: 18167 Gerrit-PatchSet: 1 Gerrit-Owner: Michael Blow Gerrit-Reviewer: Michael Blow Gerrit-CC: Jenkins Gerrit-Comment-Date: Thu, 15 Feb 2024 22:43:08 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in asterixdb[master]: Merge branch 'gerrit/trinity' into 'master'
>From Michael Blow : Michael Blow has uploaded this change for review. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18167 ) Change subject: Merge branch 'gerrit/trinity' into 'master' .. Merge branch 'gerrit/trinity' into 'master' Change-Id: I0eb6d956f60cafd0829b756dc4956bcc9d187e75 --- 1 file changed, 14 insertions(+), 0 deletions(-) git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/67/18167/1 -- To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18167 To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Change-Id: I0eb6d956f60cafd0829b756dc4956bcc9d187e75 Gerrit-Change-Number: 18167 Gerrit-PatchSet: 1 Gerrit-Owner: Michael Blow Gerrit-MessageType: newchange
Change in asterixdb[master]: Merge branch 'gerrit/trinity' into 'master'
>From Michael Blow : Michael Blow has submitted this change. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18163 ) Change subject: Merge branch 'gerrit/trinity' into 'master' .. Merge branch 'gerrit/trinity' into 'master' Change-Id: I82b0b02b70ad68a2d0bca10a80894a105a93e5be --- 1 file changed, 13 insertions(+), 0 deletions(-) Approvals: Jenkins: Verified; Verified Michael Blow: Looks good to me, approved -- To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18163 To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Change-Id: I82b0b02b70ad68a2d0bca10a80894a105a93e5be Gerrit-Change-Number: 18163 Gerrit-PatchSet: 1 Gerrit-Owner: Michael Blow Gerrit-Reviewer: Jenkins Gerrit-Reviewer: Michael Blow Gerrit-MessageType: merged
Change in asterixdb[master]: Merge branch 'gerrit/trinity' into 'master'
>From Michael Blow : Michael Blow has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18163 ) Change subject: Merge branch 'gerrit/trinity' into 'master' .. Patch Set 1: Code-Review+2 -- To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18163 To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Change-Id: I82b0b02b70ad68a2d0bca10a80894a105a93e5be Gerrit-Change-Number: 18163 Gerrit-PatchSet: 1 Gerrit-Owner: Michael Blow Gerrit-Reviewer: Jenkins Gerrit-Reviewer: Michael Blow Gerrit-Comment-Date: Thu, 15 Feb 2024 03:15:02 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in asterixdb[master]: Merge branch 'gerrit/trinity' into 'master'
>From Jenkins : Jenkins has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18163 ) Change subject: Merge branch 'gerrit/trinity' into 'master' .. Patch Set 1: Integration-Tests+1 Integration Tests Successful https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-trigger/131/ : SUCCESS -- To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18163 To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Change-Id: I82b0b02b70ad68a2d0bca10a80894a105a93e5be Gerrit-Change-Number: 18163 Gerrit-PatchSet: 1 Gerrit-Owner: Michael Blow Gerrit-Reviewer: Jenkins Gerrit-Comment-Date: Wed, 14 Feb 2024 20:37:01 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in asterixdb[master]: Merge branch 'gerrit/trinity' into 'master'
>From Michael Blow : Michael Blow has uploaded this change for review. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18163 ) Change subject: Merge branch 'gerrit/trinity' into 'master' .. Merge branch 'gerrit/trinity' into 'master' Change-Id: I82b0b02b70ad68a2d0bca10a80894a105a93e5be --- 1 file changed, 13 insertions(+), 0 deletions(-) git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/63/18163/1 -- To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18163 To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Change-Id: I82b0b02b70ad68a2d0bca10a80894a105a93e5be Gerrit-Change-Number: 18163 Gerrit-PatchSet: 1 Gerrit-Owner: Michael Blow Gerrit-MessageType: newchange
Change in asterixdb[master]: Merge branch 'gerrit/trinity' into 'master'
>From Michael Blow : Michael Blow has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18149 ) Change subject: Merge branch 'gerrit/trinity' into 'master' .. Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18149 To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Change-Id: I1d024c219be00fcc91c2d3f87973cb3e5942626a Gerrit-Change-Number: 18149 Gerrit-PatchSet: 1 Gerrit-Owner: Michael Blow Gerrit-Reviewer: Michael Blow Gerrit-CC: Jenkins Gerrit-Comment-Date: Thu, 01 Feb 2024 03:04:58 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in asterixdb[master]: Merge branch 'gerrit/trinity' into 'master'
>From Michael Blow : Michael Blow has submitted this change. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18149 ) Change subject: Merge branch 'gerrit/trinity' into 'master' .. Merge branch 'gerrit/trinity' into 'master' Change-Id: I1d024c219be00fcc91c2d3f87973cb3e5942626a --- M asterixdb/pom.xml M asterixdb/src/main/appended-resources/supplemental-models.xml 3 files changed, 22 insertions(+), 10 deletions(-) Approvals: Michael Blow: Looks good to me, approved; Verified diff --git a/asterixdb/pom.xml b/asterixdb/pom.xml index 43b16fe..a1da969 100644 --- a/asterixdb/pom.xml +++ b/asterixdb/pom.xml @@ -91,12 +91,8 @@ 3.3.6 0.7.6.201602180812 2.22.1 -<<< HEAD (b7cce6 [ASTERIXDB-3341][COMP]: CBO choosing bad indexes (CH2 Q8)) -2.20.135 -0.27.1 -=== 2.23.3 ->>> BRANCH (70885c Merge branch 'gerrit/neo' into 'gerrit/trinity') +0.27.1 1.12.3 1.12.637 12.25.1 diff --git a/asterixdb/src/main/appended-resources/supplemental-models.xml b/asterixdb/src/main/appended-resources/supplemental-models.xml index 7e15fb9..1717ba6 100644 --- a/asterixdb/src/main/appended-resources/supplemental-models.xml +++ b/asterixdb/src/main/appended-resources/supplemental-models.xml @@ -480,13 +480,8 @@ software.amazon.awssdk third-party-jackson-core -<<< HEAD (b7cce6 [ASTERIXDB-3341][COMP]: CBO choosing bad indexes (CH2 Q8)) - 2.17.218:META-INF/NOTICE.txt,2.20.37:META-INF/NOTICE.txt,2.20.135:META-INF/NOTICE.txt - 2.17.218:META-INF/LICENSE.txt,2.20.37:META-INF/LICENSE.txt,2.20.135:META-INF/LICENSE.txt -=== 2.23.3:META-INF/NOTICE.txt 2.23.3:META-INF/LICENSE.txt ->>> BRANCH (70885c Merge branch 'gerrit/neo' into 'gerrit/trinity') -- To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18149 To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Change-Id: I1d024c219be00fcc91c2d3f87973cb3e5942626a Gerrit-Change-Number: 18149 Gerrit-PatchSet: 1 Gerrit-Owner: Michael Blow Gerrit-Reviewer: Michael Blow Gerrit-CC: Jenkins Gerrit-MessageType: merged
Change in asterixdb[master]: Merge branch 'gerrit/trinity' into 'master'
>From Michael Blow : Michael Blow has uploaded this change for review. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18149 ) Change subject: Merge branch 'gerrit/trinity' into 'master' .. Merge branch 'gerrit/trinity' into 'master' Change-Id: I1d024c219be00fcc91c2d3f87973cb3e5942626a --- M asterixdb/pom.xml M asterixdb/src/main/appended-resources/supplemental-models.xml 3 files changed, 22 insertions(+), 10 deletions(-) git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/49/18149/1 diff --git a/asterixdb/pom.xml b/asterixdb/pom.xml index 43b16fe..a1da969 100644 --- a/asterixdb/pom.xml +++ b/asterixdb/pom.xml @@ -91,12 +91,8 @@ 3.3.6 0.7.6.201602180812 2.22.1 -<<< HEAD (b7cce6 [ASTERIXDB-3341][COMP]: CBO choosing bad indexes (CH2 Q8)) -2.20.135 -0.27.1 -=== 2.23.3 ->>> BRANCH (70885c Merge branch 'gerrit/neo' into 'gerrit/trinity') +0.27.1 1.12.3 1.12.637 12.25.1 diff --git a/asterixdb/src/main/appended-resources/supplemental-models.xml b/asterixdb/src/main/appended-resources/supplemental-models.xml index 7e15fb9..1717ba6 100644 --- a/asterixdb/src/main/appended-resources/supplemental-models.xml +++ b/asterixdb/src/main/appended-resources/supplemental-models.xml @@ -480,13 +480,8 @@ software.amazon.awssdk third-party-jackson-core -<<< HEAD (b7cce6 [ASTERIXDB-3341][COMP]: CBO choosing bad indexes (CH2 Q8)) - 2.17.218:META-INF/NOTICE.txt,2.20.37:META-INF/NOTICE.txt,2.20.135:META-INF/NOTICE.txt - 2.17.218:META-INF/LICENSE.txt,2.20.37:META-INF/LICENSE.txt,2.20.135:META-INF/LICENSE.txt -=== 2.23.3:META-INF/NOTICE.txt 2.23.3:META-INF/LICENSE.txt ->>> BRANCH (70885c Merge branch 'gerrit/neo' into 'gerrit/trinity') -- To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18149 To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Change-Id: I1d024c219be00fcc91c2d3f87973cb3e5942626a Gerrit-Change-Number: 18149 Gerrit-PatchSet: 1 Gerrit-Owner: Michael Blow Gerrit-MessageType: newchange
Change in asterixdb[master]: Merge branch 'gerrit/trinity' into 'master'
>From Michael Blow :
Michael Blow has submitted this change. (
https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18125 )
Change subject: Merge branch 'gerrit/trinity' into 'master'
..
Merge branch 'gerrit/trinity' into 'master'
Change-Id: Iaa525ccf3067e52a0b6a645d50dd94006fa11d54
---
M
asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/input/record/reader/abstracts/AbstractExternalInputStreamFactory.java
M
asterixdb/asterix-common/src/main/java/org/apache/asterix/common/cluster/IClusterStateManager.java
3 files changed, 19 insertions(+), 13 deletions(-)
Approvals:
Michael Blow: Looks good to me, approved; Verified
diff --git
a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/cluster/IClusterStateManager.java
b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/cluster/IClusterStateManager.java
index 4ca43c5..ffa6c87 100644
---
a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/cluster/IClusterStateManager.java
+++
b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/cluster/IClusterStateManager.java
@@ -171,17 +171,12 @@
AlgebricksAbsolutePartitionConstraint getClusterLocations();
/**
-<<< HEAD (0f54b5 [ASTERIXDB-3342][RT] Avoid NPE in close() of
NestedLoopJoinO)
- * @param excludePendingRemoval true, if the desired set shouldn't have
pending removal nodes
-===
* @return the constraint representing all the partitions of the cluster
sorted by node name
*/
AlgebricksAbsolutePartitionConstraint getSortedClusterLocations();
/**
- * @param excludePendingRemoval
- *true, if the desired set shouldn't have pending removal nodes
->>> BRANCH (c566be Null merge branch 'gerrit/neo' into 'gerrit/trinity')
+ * @param excludePendingRemoval true, if the desired set shouldn't have
pending removal nodes
* @return the set of participant nodes
*/
Set getParticipantNodes(boolean excludePendingRemoval);
diff --git
a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/input/record/reader/abstracts/AbstractExternalInputStreamFactory.java
b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/input/record/reader/abstracts/AbstractExternalInputStreamFactory.java
index 95d06d4..ac8859b 100644
---
a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/input/record/reader/abstracts/AbstractExternalInputStreamFactory.java
+++
b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/input/record/reader/abstracts/AbstractExternalInputStreamFactory.java
@@ -70,9 +70,8 @@
public void configure(IServiceContext ctx, Map
configuration, IWarningCollector warningCollector,
IExternalFilterEvaluatorFactory filterEvaluatorFactory) throws
AlgebricksException, HyracksDataException {
this.configuration = configuration;
-<<< HEAD (0f54b5 [ASTERIXDB-3342][RT] Avoid NPE in close() of
NestedLoopJoinO)
-this.partitionConstraint =
-((ICcApplicationContext)
ctx.getApplicationContext()).getClusterStateManager().getClusterLocations();
+this.partitionConstraint = ((ICcApplicationContext)
ctx.getApplicationContext()).getClusterStateManager()
+.getSortedClusterLocations();
this.filterEvaluatorFactory = filterEvaluatorFactory;
}
@@ -81,10 +80,6 @@
IExternalFilterValueEmbedder valueEmbedder =
filterEvaluatorFactory.createValueEmbedder(context.getWarningCollector());
return new ExternalStreamRuntimeDataContext(context, partition,
valueEmbedder);
-===
-this.partitionConstraint = ((ICcApplicationContext)
ctx.getApplicationContext()).getClusterStateManager()
-.getSortedClusterLocations();
->>> BRANCH (c566be Null merge branch 'gerrit/neo' into 'gerrit/trinity')
}
public static class PartitionWorkLoadBasedOnSize implements Serializable {
--
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18125
To unsubscribe, or for help writing mail filters, visit
https://asterix-gerrit.ics.uci.edu/settings
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Change-Id: Iaa525ccf3067e52a0b6a645d50dd94006fa11d54
Gerrit-Change-Number: 18125
Gerrit-PatchSet: 1
Gerrit-Owner: Michael Blow
Gerrit-Reviewer: Jenkins
Gerrit-Reviewer: Michael Blow
Gerrit-MessageType: merged
Change in asterixdb[master]: Merge branch 'gerrit/trinity' into 'master'
>From Michael Blow : Attention is currently required from: Michael Blow. Michael Blow has removed a vote from this change. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18125 ) Change subject: Merge branch 'gerrit/trinity' into 'master' .. Removed Integration-Tests-1 by Jenkins -- To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18125 To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Change-Id: Iaa525ccf3067e52a0b6a645d50dd94006fa11d54 Gerrit-Change-Number: 18125 Gerrit-PatchSet: 1 Gerrit-Owner: Michael Blow Gerrit-Reviewer: Jenkins Gerrit-Attention: Michael Blow Gerrit-MessageType: deleteVote
Change in asterixdb[master]: Merge branch 'gerrit/trinity' into 'master'
>From Michael Blow : Michael Blow has removed a vote from this change. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18125 ) Change subject: Merge branch 'gerrit/trinity' into 'master' .. Removed Verified-1 by Jenkins -- To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18125 To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Change-Id: Iaa525ccf3067e52a0b6a645d50dd94006fa11d54 Gerrit-Change-Number: 18125 Gerrit-PatchSet: 1 Gerrit-Owner: Michael Blow Gerrit-Reviewer: Jenkins Gerrit-Reviewer: Michael Blow Gerrit-MessageType: deleteVote
Change in asterixdb[master]: Merge branch 'gerrit/trinity' into 'master'
>From Michael Blow : Michael Blow has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18125 ) Change subject: Merge branch 'gerrit/trinity' into 'master' .. Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18125 To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Change-Id: Iaa525ccf3067e52a0b6a645d50dd94006fa11d54 Gerrit-Change-Number: 18125 Gerrit-PatchSet: 1 Gerrit-Owner: Michael Blow Gerrit-Reviewer: Jenkins Gerrit-Reviewer: Michael Blow Gerrit-Comment-Date: Fri, 19 Jan 2024 18:07:50 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in asterixdb[master]: Merge branch 'gerrit/trinity' into 'master'
>From Jenkins : Attention is currently required from: Michael Blow. Jenkins has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18125 ) Change subject: Merge branch 'gerrit/trinity' into 'master' .. Patch Set 1: Integration-Tests-1 Integration Tests Failed https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-trigger/3/ : UNSTABLE -- To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18125 To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Change-Id: Iaa525ccf3067e52a0b6a645d50dd94006fa11d54 Gerrit-Change-Number: 18125 Gerrit-PatchSet: 1 Gerrit-Owner: Michael Blow Gerrit-Reviewer: Jenkins Gerrit-Attention: Michael Blow Gerrit-Comment-Date: Fri, 19 Jan 2024 16:30:00 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in asterixdb[master]: Merge branch 'gerrit/trinity' into 'master'
>From Jenkins : Jenkins has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18125 ) Change subject: Merge branch 'gerrit/trinity' into 'master' .. Patch Set 1: Integration-Tests+1 Integration Tests Successful https://asterix-jenkins.ics.uci.edu/job/asterix-integration-tests/2126/ : null -- To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18125 To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Change-Id: Iaa525ccf3067e52a0b6a645d50dd94006fa11d54 Gerrit-Change-Number: 18125 Gerrit-PatchSet: 1 Gerrit-Owner: Michael Blow Gerrit-Reviewer: Jenkins Gerrit-Comment-Date: Fri, 19 Jan 2024 16:00:26 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in asterixdb[master]: Merge branch 'gerrit/trinity' into 'master'
>From Jenkins : Jenkins has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18125 ) Change subject: Merge branch 'gerrit/trinity' into 'master' .. Patch Set 1: Integration Tests Started https://asterix-jenkins.ics.uci.edu/job/asterix-integration-tests/2126/ -- To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18125 To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Change-Id: Iaa525ccf3067e52a0b6a645d50dd94006fa11d54 Gerrit-Change-Number: 18125 Gerrit-PatchSet: 1 Gerrit-Owner: Michael Blow Gerrit-CC: Jenkins Gerrit-Comment-Date: Fri, 19 Jan 2024 15:54:07 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in asterixdb[master]: Merge branch 'gerrit/trinity' into 'master'
>From Michael Blow :
Michael Blow has uploaded this change for review. (
https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18125 )
Change subject: Merge branch 'gerrit/trinity' into 'master'
..
Merge branch 'gerrit/trinity' into 'master'
Change-Id: Iaa525ccf3067e52a0b6a645d50dd94006fa11d54
---
M
asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/input/record/reader/abstracts/AbstractExternalInputStreamFactory.java
M
asterixdb/asterix-common/src/main/java/org/apache/asterix/common/cluster/IClusterStateManager.java
3 files changed, 19 insertions(+), 13 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb
refs/changes/25/18125/1
diff --git
a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/cluster/IClusterStateManager.java
b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/cluster/IClusterStateManager.java
index 4ca43c5..ffa6c87 100644
---
a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/cluster/IClusterStateManager.java
+++
b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/cluster/IClusterStateManager.java
@@ -171,17 +171,12 @@
AlgebricksAbsolutePartitionConstraint getClusterLocations();
/**
-<<< HEAD (0f54b5 [ASTERIXDB-3342][RT] Avoid NPE in close() of
NestedLoopJoinO)
- * @param excludePendingRemoval true, if the desired set shouldn't have
pending removal nodes
-===
* @return the constraint representing all the partitions of the cluster
sorted by node name
*/
AlgebricksAbsolutePartitionConstraint getSortedClusterLocations();
/**
- * @param excludePendingRemoval
- *true, if the desired set shouldn't have pending removal nodes
->>> BRANCH (c566be Null merge branch 'gerrit/neo' into 'gerrit/trinity')
+ * @param excludePendingRemoval true, if the desired set shouldn't have
pending removal nodes
* @return the set of participant nodes
*/
Set getParticipantNodes(boolean excludePendingRemoval);
diff --git
a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/input/record/reader/abstracts/AbstractExternalInputStreamFactory.java
b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/input/record/reader/abstracts/AbstractExternalInputStreamFactory.java
index 95d06d4..ac8859b 100644
---
a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/input/record/reader/abstracts/AbstractExternalInputStreamFactory.java
+++
b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/input/record/reader/abstracts/AbstractExternalInputStreamFactory.java
@@ -70,9 +70,8 @@
public void configure(IServiceContext ctx, Map
configuration, IWarningCollector warningCollector,
IExternalFilterEvaluatorFactory filterEvaluatorFactory) throws
AlgebricksException, HyracksDataException {
this.configuration = configuration;
-<<< HEAD (0f54b5 [ASTERIXDB-3342][RT] Avoid NPE in close() of
NestedLoopJoinO)
-this.partitionConstraint =
-((ICcApplicationContext)
ctx.getApplicationContext()).getClusterStateManager().getClusterLocations();
+this.partitionConstraint = ((ICcApplicationContext)
ctx.getApplicationContext()).getClusterStateManager()
+.getSortedClusterLocations();
this.filterEvaluatorFactory = filterEvaluatorFactory;
}
@@ -81,10 +80,6 @@
IExternalFilterValueEmbedder valueEmbedder =
filterEvaluatorFactory.createValueEmbedder(context.getWarningCollector());
return new ExternalStreamRuntimeDataContext(context, partition,
valueEmbedder);
-===
-this.partitionConstraint = ((ICcApplicationContext)
ctx.getApplicationContext()).getClusterStateManager()
-.getSortedClusterLocations();
->>> BRANCH (c566be Null merge branch 'gerrit/neo' into 'gerrit/trinity')
}
public static class PartitionWorkLoadBasedOnSize implements Serializable {
--
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18125
To unsubscribe, or for help writing mail filters, visit
https://asterix-gerrit.ics.uci.edu/settings
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Change-Id: Iaa525ccf3067e52a0b6a645d50dd94006fa11d54
Gerrit-Change-Number: 18125
Gerrit-PatchSet: 1
Gerrit-Owner: Michael Blow
Gerrit-MessageType: newchange
Change in asterixdb[master]: Merge branch 'gerrit/trinity' into 'master'
>From Michael Blow : Michael Blow has submitted this change. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18101 ) Change subject: Merge branch 'gerrit/trinity' into 'master' .. Merge branch 'gerrit/trinity' into 'master' Change-Id: I36cc03cfbdc9bf6bbdd48666af4f0b8a74e26754 --- 1 file changed, 13 insertions(+), 0 deletions(-) Approvals: Michael Blow: Looks good to me, approved; Verified -- To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18101 To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Change-Id: I36cc03cfbdc9bf6bbdd48666af4f0b8a74e26754 Gerrit-Change-Number: 18101 Gerrit-PatchSet: 1 Gerrit-Owner: Michael Blow Gerrit-Reviewer: Michael Blow Gerrit-CC: Jenkins Gerrit-MessageType: merged
Change in asterixdb[master]: Merge branch 'gerrit/trinity' into 'master'
>From Michael Blow : Michael Blow has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18101 ) Change subject: Merge branch 'gerrit/trinity' into 'master' .. Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18101 To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Change-Id: I36cc03cfbdc9bf6bbdd48666af4f0b8a74e26754 Gerrit-Change-Number: 18101 Gerrit-PatchSet: 1 Gerrit-Owner: Michael Blow Gerrit-Reviewer: Michael Blow Gerrit-CC: Jenkins Gerrit-Comment-Date: Thu, 18 Jan 2024 02:50:01 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in asterixdb[master]: Merge branch 'gerrit/trinity' into 'master'
>From Jenkins : Jenkins has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18101 ) Change subject: Merge branch 'gerrit/trinity' into 'master' .. Patch Set 1: Integration Tests Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-integration-tests-redux/1829/ -- To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18101 To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Change-Id: I36cc03cfbdc9bf6bbdd48666af4f0b8a74e26754 Gerrit-Change-Number: 18101 Gerrit-PatchSet: 1 Gerrit-Owner: Michael Blow Gerrit-CC: Jenkins Gerrit-Comment-Date: Thu, 18 Jan 2024 00:53:27 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in asterixdb[master]: Merge branch 'gerrit/trinity' into 'master'
>From Michael Blow : Michael Blow has uploaded this change for review. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18101 ) Change subject: Merge branch 'gerrit/trinity' into 'master' .. Merge branch 'gerrit/trinity' into 'master' Change-Id: I36cc03cfbdc9bf6bbdd48666af4f0b8a74e26754 --- 1 file changed, 13 insertions(+), 0 deletions(-) git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/01/18101/1 -- To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18101 To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Change-Id: I36cc03cfbdc9bf6bbdd48666af4f0b8a74e26754 Gerrit-Change-Number: 18101 Gerrit-PatchSet: 1 Gerrit-Owner: Michael Blow Gerrit-MessageType: newchange
Change in asterixdb[master]: Merge branch 'gerrit/trinity' into 'master'
>From Michael Blow : Michael Blow has submitted this change. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18096 ) Change subject: Merge branch 'gerrit/trinity' into 'master' .. Merge branch 'gerrit/trinity' into 'master' Change-Id: I08529e4443bed36ab7d77dd53e4ad53e760515d9 --- 1 file changed, 17 insertions(+), 0 deletions(-) Approvals: Michael Blow: Looks good to me, approved; Verified -- To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18096 To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Change-Id: I08529e4443bed36ab7d77dd53e4ad53e760515d9 Gerrit-Change-Number: 18096 Gerrit-PatchSet: 1 Gerrit-Owner: Michael Blow Gerrit-Reviewer: Jenkins Gerrit-Reviewer: Michael Blow Gerrit-MessageType: merged
Change in asterixdb[master]: Merge branch 'gerrit/trinity' into 'master'
>From Michael Blow : Michael Blow has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18096 ) Change subject: Merge branch 'gerrit/trinity' into 'master' .. Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18096 To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Change-Id: I08529e4443bed36ab7d77dd53e4ad53e760515d9 Gerrit-Change-Number: 18096 Gerrit-PatchSet: 1 Gerrit-Owner: Michael Blow Gerrit-Reviewer: Jenkins Gerrit-Reviewer: Michael Blow Gerrit-Comment-Date: Sun, 14 Jan 2024 02:10:32 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in asterixdb[master]: Merge branch 'gerrit/trinity' into 'master'
>From Michael Blow : Michael Blow has removed a vote from this change. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18096 ) Change subject: Merge branch 'gerrit/trinity' into 'master' .. Removed Verified-1 by Jenkins -- To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18096 To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Change-Id: I08529e4443bed36ab7d77dd53e4ad53e760515d9 Gerrit-Change-Number: 18096 Gerrit-PatchSet: 1 Gerrit-Owner: Michael Blow Gerrit-Reviewer: Jenkins Gerrit-Reviewer: Michael Blow Gerrit-MessageType: deleteVote
Change in asterixdb[master]: Merge branch 'gerrit/trinity' into 'master'
>From Jenkins : Jenkins has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18096 ) Change subject: Merge branch 'gerrit/trinity' into 'master' .. Patch Set 1: Integration Tests Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-integration-tests-redux/1810/ -- To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18096 To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Change-Id: I08529e4443bed36ab7d77dd53e4ad53e760515d9 Gerrit-Change-Number: 18096 Gerrit-PatchSet: 1 Gerrit-Owner: Michael Blow Gerrit-CC: Jenkins Gerrit-Comment-Date: Sat, 13 Jan 2024 22:17:11 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in asterixdb[master]: Merge branch 'gerrit/trinity' into 'master'
>From Michael Blow : Michael Blow has uploaded this change for review. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18096 ) Change subject: Merge branch 'gerrit/trinity' into 'master' .. Merge branch 'gerrit/trinity' into 'master' Change-Id: I08529e4443bed36ab7d77dd53e4ad53e760515d9 --- 1 file changed, 17 insertions(+), 0 deletions(-) git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/96/18096/1 -- To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18096 To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Change-Id: I08529e4443bed36ab7d77dd53e4ad53e760515d9 Gerrit-Change-Number: 18096 Gerrit-PatchSet: 1 Gerrit-Owner: Michael Blow Gerrit-MessageType: newchange
Change in asterixdb[master]: Merge branch 'gerrit/trinity' into 'master'
>From Michael Blow : Michael Blow has submitted this change. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18089 ) Change subject: Merge branch 'gerrit/trinity' into 'master' .. Merge branch 'gerrit/trinity' into 'master' Change-Id: I5e6759c0e891e47feab9a5819fe4ffcd934bb9b9 --- M asterixdb/pom.xml 2 files changed, 18 insertions(+), 6 deletions(-) Approvals: Michael Blow: Looks good to me, approved; Verified diff --git a/asterixdb/pom.xml b/asterixdb/pom.xml index 76dd324..27efc88 100644 --- a/asterixdb/pom.xml +++ b/asterixdb/pom.xml @@ -90,14 +90,9 @@ 0.3.9-SNAPSHOT 3.3.6 0.7.6.201602180812 -<<< HEAD (117e79 [ASTERIXDB-3332][COMP] Consolidate projection and filters) -2.21.1 +2.22.1 2.20.135 0.27.1 -=== -2.22.1 -2.17.218 ->>> BRANCH (8f8402 Revert "[NO ISSUE][MISC] Update Jackson to 2.16.1") 1.12.3 1.12.572 12.22.0 -- To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18089 To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Change-Id: I5e6759c0e891e47feab9a5819fe4ffcd934bb9b9 Gerrit-Change-Number: 18089 Gerrit-PatchSet: 2 Gerrit-Owner: Michael Blow Gerrit-Reviewer: Jenkins Gerrit-Reviewer: Michael Blow Gerrit-MessageType: merged
Change in asterixdb[master]: Merge branch 'gerrit/trinity' into 'master'
>From Michael Blow : Michael Blow has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18089 ) Change subject: Merge branch 'gerrit/trinity' into 'master' .. Patch Set 2: Verified+1 Code-Review+2 -- To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18089 To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Change-Id: I5e6759c0e891e47feab9a5819fe4ffcd934bb9b9 Gerrit-Change-Number: 18089 Gerrit-PatchSet: 2 Gerrit-Owner: Michael Blow Gerrit-Reviewer: Jenkins Gerrit-Reviewer: Michael Blow Gerrit-Comment-Date: Thu, 11 Jan 2024 17:32:21 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in asterixdb[master]: Merge branch 'gerrit/trinity' into 'master'
>From Jenkins : Attention is currently required from: Michael Blow. Jenkins has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18089 ) Change subject: Merge branch 'gerrit/trinity' into 'master' .. Patch Set 2: Integration Tests Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-integration-tests-redux/1796/ -- To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18089 To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Change-Id: I5e6759c0e891e47feab9a5819fe4ffcd934bb9b9 Gerrit-Change-Number: 18089 Gerrit-PatchSet: 2 Gerrit-Owner: Michael Blow Gerrit-Reviewer: Jenkins Gerrit-Attention: Michael Blow Gerrit-Comment-Date: Thu, 11 Jan 2024 17:06:38 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in asterixdb[master]: Merge branch 'gerrit/trinity' into 'master'
>From Michael Blow : Attention is currently required from: Michael Blow. Hello Jenkins, I'd like you to reexamine a change. Please visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18089 to look at the new patch set (#2). Change subject: Merge branch 'gerrit/trinity' into 'master' .. Merge branch 'gerrit/trinity' into 'master' Change-Id: I5e6759c0e891e47feab9a5819fe4ffcd934bb9b9 --- M asterixdb/pom.xml 2 files changed, 18 insertions(+), 6 deletions(-) git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/89/18089/2 -- To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18089 To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Change-Id: I5e6759c0e891e47feab9a5819fe4ffcd934bb9b9 Gerrit-Change-Number: 18089 Gerrit-PatchSet: 2 Gerrit-Owner: Michael Blow Gerrit-Reviewer: Jenkins Gerrit-Attention: Michael Blow Gerrit-MessageType: newpatchset
Change in asterixdb[master]: Merge branch 'gerrit/trinity' into 'master'
>From Jenkins : Jenkins has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18089 ) Change subject: Merge branch 'gerrit/trinity' into 'master' .. Patch Set 1: Integration Tests Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-integration-tests-redux/1787/ -- To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18089 To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Change-Id: I5e6759c0e891e47feab9a5819fe4ffcd934bb9b9 Gerrit-Change-Number: 18089 Gerrit-PatchSet: 1 Gerrit-Owner: Michael Blow Gerrit-CC: Jenkins Gerrit-Comment-Date: Wed, 10 Jan 2024 12:29:34 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in asterixdb[master]: Merge branch 'gerrit/trinity' into 'master'
>From Michael Blow : Michael Blow has uploaded this change for review. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18089 ) Change subject: Merge branch 'gerrit/trinity' into 'master' .. Merge branch 'gerrit/trinity' into 'master' Change-Id: I5e6759c0e891e47feab9a5819fe4ffcd934bb9b9 --- M asterixdb/pom.xml 2 files changed, 17 insertions(+), 6 deletions(-) git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/89/18089/1 diff --git a/asterixdb/pom.xml b/asterixdb/pom.xml index 71af4d8..27efc88 100644 --- a/asterixdb/pom.xml +++ b/asterixdb/pom.xml @@ -90,14 +90,9 @@ 0.3.9-SNAPSHOT 3.3.6 0.7.6.201602180812 -<<< HEAD (4f3ea9 [NO ISSUE] Fix column left-outer test) -2.21.1 +2.22.1 2.20.135 0.27.1 -=== -2.22.1 -2.17.218 ->>> BRANCH (72b344 [NO ISSUE][MISC] Update Netty to 4.1.101.Final) 1.12.3 1.12.572 12.22.0 -- To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18089 To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Change-Id: I5e6759c0e891e47feab9a5819fe4ffcd934bb9b9 Gerrit-Change-Number: 18089 Gerrit-PatchSet: 1 Gerrit-Owner: Michael Blow Gerrit-MessageType: newchange
Change in asterixdb[master]: Merge branch 'gerrit/trinity' into 'master'
>From Michael Blow :
Michael Blow has submitted this change. (
https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18083 )
Change subject: Merge branch 'gerrit/trinity' into 'master'
..
Merge branch 'gerrit/trinity' into 'master'
Change-Id: I31d1dd61195b4f03cc983c21e309cfd9adb02f6c
---
M
asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/DatasetTupleTranslator.java
M
asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/IndexTupleTranslator.java
M
asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/SynonymTupleTranslator.java
M
asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/MetadataNode.java
M
asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/DataverseTupleTranslator.java
M
asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/LibraryTupleTranslator.java
M
asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/FunctionTupleTranslator.java
8 files changed, 15 insertions(+), 45 deletions(-)
Approvals:
Michael Blow: Looks good to me, approved; Verified
diff --git
a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/MetadataNode.java
b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/MetadataNode.java
index 8317025..0eb 100644
---
a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/MetadataNode.java
+++
b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/MetadataNode.java
@@ -164,22 +164,15 @@
import
org.apache.asterix.transaction.management.opcallbacks.UpsertOperationCallback;
import
org.apache.asterix.transaction.management.service.transaction.DatasetIdFactory;
import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
-<<< HEAD (4a834b Merge branch 'gerrit/trinity' into 'master')
-===
-import org.apache.hyracks.algebricks.common.utils.Triple;
import org.apache.hyracks.algebricks.data.IPrinter;
import org.apache.hyracks.algebricks.data.IPrinterFactory;
->>> BRANCH (d0c631 [NO ISSUE][MTD] Add metadata API to get metadata
entities as)
import org.apache.hyracks.api.dataflow.value.IBinaryComparator;
import org.apache.hyracks.api.dataflow.value.IBinaryComparatorFactory;
import org.apache.hyracks.api.dataflow.value.ISerializerDeserializer;
import org.apache.hyracks.api.exceptions.ErrorCode;
import org.apache.hyracks.api.exceptions.HyracksDataException;
-<<< HEAD (4a834b Merge branch 'gerrit/trinity' into 'master')
import org.apache.hyracks.api.util.HyracksConstants;
-===
import org.apache.hyracks.data.std.util.ByteArrayAccessibleOutputStream;
->>> BRANCH (d0c631 [NO ISSUE][MTD] Add metadata API to get metadata
entities as)
import org.apache.hyracks.dataflow.common.comm.io.ArrayTupleBuilder;
import org.apache.hyracks.dataflow.common.comm.io.ArrayTupleReference;
import org.apache.hyracks.dataflow.common.data.accessors.ITupleReference;
@@ -3076,7 +3069,6 @@
return txnIdFactory;
}
-<<< HEAD (4a834b Merge branch 'gerrit/trinity' into 'master')
private Database defaultDatabase(String databaseName) {
//TODO(DB): review
if (MetadataConstants.SYSTEM_DATABASE.equals(databaseName)) {
@@ -3084,7 +3076,8 @@
} else {
return MetadataBuiltinEntities.DEFAULT_DATABASE;
}
-===
+}
+
private ArrayNode getJsonNodes(TxnId txnId, IMetadataIndex mdIndex, int
payloadPosition)
throws AlgebricksException, HyracksDataException {
IValueExtractor valueExtractor =
createValueExtractor(mdIndex, payloadPosition);
@@ -3123,6 +3116,5 @@
}
}
};
->>> BRANCH (d0c631 [NO ISSUE][MTD] Add metadata API to get metadata
entities as)
}
}
diff --git
a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/DatasetTupleTranslator.java
b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/DatasetTupleTranslator.java
index 37a7ea8..7613dd3 100644
---
a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/DatasetTupleTranslator.java
+++
b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/DatasetTupleTranslator.java
@@ -89,13 +89,7 @@
*/
public class DatasetTupleTranslator extends AbstractTupleTranslator {
-<<< HEAD (4a834b Merge branch 'gerrit/trinity' into 'master')
protected final DatasetEntity datasetEntity;
-===
-// Payload field containing serialized Dataset.
-public static final int DATASET_PAYLOAD_TUPLE_FIELD_INDEX = 2;
-
->>> BRANCH (d0c631 [NO ISSUE][MTD] Add metadata API to get metadata
entities as)
protected AMutableI
Change in asterixdb[master]: Merge branch 'gerrit/trinity' into 'master'
>From Michael Blow : Attention is currently required from: Ali Alsuliman. Michael Blow has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18083 ) Change subject: Merge branch 'gerrit/trinity' into 'master' .. Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18083 To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Change-Id: I31d1dd61195b4f03cc983c21e309cfd9adb02f6c Gerrit-Change-Number: 18083 Gerrit-PatchSet: 1 Gerrit-Owner: Ali Alsuliman Gerrit-Reviewer: Jenkins Gerrit-Reviewer: Michael Blow Gerrit-Attention: Ali Alsuliman Gerrit-Comment-Date: Sun, 07 Jan 2024 01:49:24 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in asterixdb[master]: Merge branch 'gerrit/trinity' into 'master'
>From Michael Blow : Attention is currently required from: Ali Alsuliman. Michael Blow has removed a vote from this change. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18083 ) Change subject: Merge branch 'gerrit/trinity' into 'master' .. Removed Verified-1 by Jenkins -- To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18083 To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Change-Id: I31d1dd61195b4f03cc983c21e309cfd9adb02f6c Gerrit-Change-Number: 18083 Gerrit-PatchSet: 1 Gerrit-Owner: Ali Alsuliman Gerrit-Reviewer: Jenkins Gerrit-Reviewer: Michael Blow Gerrit-Attention: Ali Alsuliman Gerrit-MessageType: deleteVote
Change in asterixdb[master]: Merge branch 'gerrit/trinity' into 'master'
>From Jenkins : Attention is currently required from: Michael Blow. Jenkins has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18083 ) Change subject: Merge branch 'gerrit/trinity' into 'master' .. Patch Set 1: Integration Tests Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-integration-tests-redux/1776/ -- To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18083 To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Change-Id: I31d1dd61195b4f03cc983c21e309cfd9adb02f6c Gerrit-Change-Number: 18083 Gerrit-PatchSet: 1 Gerrit-Owner: Ali Alsuliman Gerrit-Reviewer: Michael Blow Gerrit-CC: Jenkins Gerrit-Attention: Michael Blow Gerrit-Comment-Date: Sat, 06 Jan 2024 17:54:01 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in asterixdb[master]: Merge branch 'gerrit/trinity' into 'master'
>From Ali Alsuliman :
Ali Alsuliman has uploaded this change for review. (
https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18083 )
Change subject: Merge branch 'gerrit/trinity' into 'master'
..
Merge branch 'gerrit/trinity' into 'master'
Change-Id: I31d1dd61195b4f03cc983c21e309cfd9adb02f6c
---
M
asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/DatasetTupleTranslator.java
M
asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/IndexTupleTranslator.java
M
asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/SynonymTupleTranslator.java
M
asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/MetadataNode.java
M
asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/DataverseTupleTranslator.java
M
asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/LibraryTupleTranslator.java
M
asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/FunctionTupleTranslator.java
8 files changed, 15 insertions(+), 45 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb
refs/changes/83/18083/1
diff --git
a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/MetadataNode.java
b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/MetadataNode.java
index 8317025..0eb 100644
---
a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/MetadataNode.java
+++
b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/MetadataNode.java
@@ -164,22 +164,15 @@
import
org.apache.asterix.transaction.management.opcallbacks.UpsertOperationCallback;
import
org.apache.asterix.transaction.management.service.transaction.DatasetIdFactory;
import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
-<<< HEAD (4a834b Merge branch 'gerrit/trinity' into 'master')
-===
-import org.apache.hyracks.algebricks.common.utils.Triple;
import org.apache.hyracks.algebricks.data.IPrinter;
import org.apache.hyracks.algebricks.data.IPrinterFactory;
->>> BRANCH (d0c631 [NO ISSUE][MTD] Add metadata API to get metadata
entities as)
import org.apache.hyracks.api.dataflow.value.IBinaryComparator;
import org.apache.hyracks.api.dataflow.value.IBinaryComparatorFactory;
import org.apache.hyracks.api.dataflow.value.ISerializerDeserializer;
import org.apache.hyracks.api.exceptions.ErrorCode;
import org.apache.hyracks.api.exceptions.HyracksDataException;
-<<< HEAD (4a834b Merge branch 'gerrit/trinity' into 'master')
import org.apache.hyracks.api.util.HyracksConstants;
-===
import org.apache.hyracks.data.std.util.ByteArrayAccessibleOutputStream;
->>> BRANCH (d0c631 [NO ISSUE][MTD] Add metadata API to get metadata
entities as)
import org.apache.hyracks.dataflow.common.comm.io.ArrayTupleBuilder;
import org.apache.hyracks.dataflow.common.comm.io.ArrayTupleReference;
import org.apache.hyracks.dataflow.common.data.accessors.ITupleReference;
@@ -3076,7 +3069,6 @@
return txnIdFactory;
}
-<<< HEAD (4a834b Merge branch 'gerrit/trinity' into 'master')
private Database defaultDatabase(String databaseName) {
//TODO(DB): review
if (MetadataConstants.SYSTEM_DATABASE.equals(databaseName)) {
@@ -3084,7 +3076,8 @@
} else {
return MetadataBuiltinEntities.DEFAULT_DATABASE;
}
-===
+}
+
private ArrayNode getJsonNodes(TxnId txnId, IMetadataIndex mdIndex, int
payloadPosition)
throws AlgebricksException, HyracksDataException {
IValueExtractor valueExtractor =
createValueExtractor(mdIndex, payloadPosition);
@@ -3123,6 +3116,5 @@
}
}
};
->>> BRANCH (d0c631 [NO ISSUE][MTD] Add metadata API to get metadata
entities as)
}
}
diff --git
a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/DatasetTupleTranslator.java
b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/DatasetTupleTranslator.java
index 37a7ea8..7613dd3 100644
---
a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/DatasetTupleTranslator.java
+++
b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/DatasetTupleTranslator.java
@@ -89,13 +89,7 @@
*/
public class DatasetTupleTranslator extends AbstractTupleTranslator {
-<<< HEAD (4a834b Merge branch 'gerrit/trinity' into 'master')
protected final DatasetEntity datasetEntity;
-===
-// Payload field containing serialized Dataset.
-public static final int DATASET_PAYLOAD_TUPLE_FIELD_INDEX = 2;
-
->>> BRANCH (d0c631 [NO ISSUE][MTD] Add metadata API to get metadata
enti
Change in asterixdb[master]: Merge branch 'gerrit/trinity' into 'master'
>From Michael Blow : Michael Blow has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18026 ) Change subject: Merge branch 'gerrit/trinity' into 'master' .. Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18026 To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Change-Id: I9c5c3a6deb9a277cbe74255022cddffc550b4d94 Gerrit-Change-Number: 18026 Gerrit-PatchSet: 1 Gerrit-Owner: Michael Blow Gerrit-Reviewer: Jenkins Gerrit-Reviewer: Michael Blow Gerrit-Comment-Date: Wed, 27 Dec 2023 16:43:42 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in asterixdb[master]: Merge branch 'gerrit/trinity' into 'master'
>From Michael Blow : Michael Blow has submitted this change. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18026 ) Change subject: Merge branch 'gerrit/trinity' into 'master' .. Merge branch 'gerrit/trinity' into 'master' Change-Id: I9c5c3a6deb9a277cbe74255022cddffc550b4d94 --- M asterixdb/asterix-app/src/test/resources/runtimets/sqlpp_queries.xml M asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/base/AsterixOptimizationContext.java M asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml 4 files changed, 21 insertions(+), 16,081 deletions(-) Approvals: Jenkins: Verified Michael Blow: Looks good to me, approved; Verified -- To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18026 To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Change-Id: I9c5c3a6deb9a277cbe74255022cddffc550b4d94 Gerrit-Change-Number: 18026 Gerrit-PatchSet: 1 Gerrit-Owner: Michael Blow Gerrit-Reviewer: Jenkins Gerrit-Reviewer: Michael Blow Gerrit-MessageType: merged
Change in asterixdb[master]: Merge branch 'gerrit/trinity' into 'master'
>From Jenkins : Jenkins has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18026 ) Change subject: Merge branch 'gerrit/trinity' into 'master' .. Patch Set 1: Integration-Tests+1 Integration Tests Successful https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-integration-tests-redux/1750/ : 1 -- To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18026 To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Change-Id: I9c5c3a6deb9a277cbe74255022cddffc550b4d94 Gerrit-Change-Number: 18026 Gerrit-PatchSet: 1 Gerrit-Owner: Michael Blow Gerrit-Reviewer: Jenkins Gerrit-Comment-Date: Wed, 27 Dec 2023 15:33:09 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in asterixdb[master]: Merge branch 'gerrit/trinity' into 'master'
>From Jenkins : Jenkins has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18026 ) Change subject: Merge branch 'gerrit/trinity' into 'master' .. Patch Set 1: Integration Tests Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-integration-tests-redux/1750/ -- To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18026 To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Change-Id: I9c5c3a6deb9a277cbe74255022cddffc550b4d94 Gerrit-Change-Number: 18026 Gerrit-PatchSet: 1 Gerrit-Owner: Michael Blow Gerrit-CC: Jenkins Gerrit-Comment-Date: Wed, 27 Dec 2023 14:35:09 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in asterixdb[master]: Merge branch 'gerrit/trinity' into 'master'
>From Michael Blow : Michael Blow has uploaded this change for review. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18026 ) Change subject: Merge branch 'gerrit/trinity' into 'master' .. Merge branch 'gerrit/trinity' into 'master' Change-Id: I9c5c3a6deb9a277cbe74255022cddffc550b4d94 --- M asterixdb/asterix-app/src/test/resources/runtimets/sqlpp_queries.xml M asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/base/AsterixOptimizationContext.java M asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml 4 files changed, 21 insertions(+), 16,081 deletions(-) git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/26/18026/1 -- To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18026 To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Change-Id: I9c5c3a6deb9a277cbe74255022cddffc550b4d94 Gerrit-Change-Number: 18026 Gerrit-PatchSet: 1 Gerrit-Owner: Michael Blow Gerrit-MessageType: newchange
Change in asterixdb[master]: Merge branch 'gerrit/trinity' into 'master'
>From Michael Blow :
Michael Blow has submitted this change. (
https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18018 )
Change subject: Merge branch 'gerrit/trinity' into 'master'
..
Merge branch 'gerrit/trinity' into 'master'
Change-Id: I869ea2df850ce020a23e7c4beaf61aebda6ef373
---
M
hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/LSMHarness.java
2 files changed, 14 insertions(+), 5 deletions(-)
Approvals:
Michael Blow: Looks good to me, approved; Verified
diff --git
a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/LSMHarness.java
b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/LSMHarness.java
index 050f9f7..cdf7ad7 100644
---
a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/LSMHarness.java
+++
b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/LSMHarness.java
@@ -583,15 +583,11 @@
@Override
public void merge(ILSMIOOperation operation) throws HyracksDataException {
-<<< HEAD (ac782e [ASTERIXDB-3322][FUN] Adapt external artifacts to DB)
if (LOGGER.isDebugEnabled()) {
MergeOperation mergeOp = (MergeOperation) operation;
-LOGGER.debug("Started a merge operation (number of merging
components {}) for index: {}",
+LOGGER.debug("Started a merge operation (number of merging
components {}) for index {}",
mergeOp.getMergingComponents().size(), lsmIndex);
}
-===
-LOGGER.debug("Started a merge operation for index {}", lsmIndex);
->>> BRANCH (1f82cd [NO ISSUE][OTH] Improve logging)
synchronized (opTracker) {
enterComponents(operation.getAccessor().getOpContext(),
LSMOperationType.MERGE);
}
--
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18018
To unsubscribe, or for help writing mail filters, visit
https://asterix-gerrit.ics.uci.edu/settings
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Change-Id: I869ea2df850ce020a23e7c4beaf61aebda6ef373
Gerrit-Change-Number: 18018
Gerrit-PatchSet: 1
Gerrit-Owner: Michael Blow
Gerrit-Reviewer: Michael Blow
Gerrit-CC: Jenkins
Gerrit-MessageType: merged
Change in asterixdb[master]: Merge branch 'gerrit/trinity' into 'master'
>From Michael Blow : Michael Blow has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18018 ) Change subject: Merge branch 'gerrit/trinity' into 'master' .. Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18018 To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Change-Id: I869ea2df850ce020a23e7c4beaf61aebda6ef373 Gerrit-Change-Number: 18018 Gerrit-PatchSet: 1 Gerrit-Owner: Michael Blow Gerrit-Reviewer: Michael Blow Gerrit-CC: Jenkins Gerrit-Comment-Date: Wed, 20 Dec 2023 05:32:57 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in asterixdb[master]: Merge branch 'gerrit/trinity' into 'master'
>From Jenkins : Jenkins has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18018 ) Change subject: Merge branch 'gerrit/trinity' into 'master' .. Patch Set 1: Integration Tests Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-integration-tests-redux/1739/ -- To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18018 To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Change-Id: I869ea2df850ce020a23e7c4beaf61aebda6ef373 Gerrit-Change-Number: 18018 Gerrit-PatchSet: 1 Gerrit-Owner: Michael Blow Gerrit-CC: Jenkins Gerrit-Comment-Date: Wed, 20 Dec 2023 04:46:16 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in asterixdb[master]: Merge branch 'gerrit/trinity' into 'master'
>From Michael Blow :
Michael Blow has uploaded this change for review. (
https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18018 )
Change subject: Merge branch 'gerrit/trinity' into 'master'
..
Merge branch 'gerrit/trinity' into 'master'
Change-Id: I869ea2df850ce020a23e7c4beaf61aebda6ef373
---
M
hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/LSMHarness.java
2 files changed, 14 insertions(+), 5 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb
refs/changes/18/18018/1
diff --git
a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/LSMHarness.java
b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/LSMHarness.java
index 050f9f7..cdf7ad7 100644
---
a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/LSMHarness.java
+++
b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/LSMHarness.java
@@ -583,15 +583,11 @@
@Override
public void merge(ILSMIOOperation operation) throws HyracksDataException {
-<<< HEAD (ac782e [ASTERIXDB-3322][FUN] Adapt external artifacts to DB)
if (LOGGER.isDebugEnabled()) {
MergeOperation mergeOp = (MergeOperation) operation;
-LOGGER.debug("Started a merge operation (number of merging
components {}) for index: {}",
+LOGGER.debug("Started a merge operation (number of merging
components {}) for index {}",
mergeOp.getMergingComponents().size(), lsmIndex);
}
-===
-LOGGER.debug("Started a merge operation for index {}", lsmIndex);
->>> BRANCH (1f82cd [NO ISSUE][OTH] Improve logging)
synchronized (opTracker) {
enterComponents(operation.getAccessor().getOpContext(),
LSMOperationType.MERGE);
}
--
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18018
To unsubscribe, or for help writing mail filters, visit
https://asterix-gerrit.ics.uci.edu/settings
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Change-Id: I869ea2df850ce020a23e7c4beaf61aebda6ef373
Gerrit-Change-Number: 18018
Gerrit-PatchSet: 1
Gerrit-Owner: Michael Blow
Gerrit-MessageType: newchange
Change in asterixdb[master]: Merge branch 'gerrit/trinity' into 'master'
>From Michael Blow : Michael Blow has submitted this change. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18012 ) Change subject: Merge branch 'gerrit/trinity' into 'master' .. Merge branch 'gerrit/trinity' into 'master' Change-Id: I71ab92baa5aa7bb8cf0fd052f1117c0418b988c3 --- M asterixdb/asterix-app/src/test/resources/optimizerts/results/query_issue3316.plan M asterixdb/asterix-app/src/main/java/org/apache/asterix/app/translator/QueryTranslator.java M asterixdb/asterix-app/src/test/resources/optimizerts/queries/query_issue3316.sqlpp M asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/QueryServiceServlet.java M asterixdb/asterix-app/src/test/resources/optimizerts/results_cbo/query_issue3316.plan M asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/misc/query-ASTERIXDB-3316/query-ASTERIXDB-3316.1.ddl.sqlpp M asterixdb/asterix-app/src/test/resources/runtimets/sqlpp_queries.xml M asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/cbo/EnumerateJoinsRule.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/app/message/ExecuteStatementRequestMessage.java M asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml 11 files changed, 25 insertions(+), 18,103 deletions(-) Approvals: Jenkins: Verified Michael Blow: Looks good to me, approved; Verified -- To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18012 To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Change-Id: I71ab92baa5aa7bb8cf0fd052f1117c0418b988c3 Gerrit-Change-Number: 18012 Gerrit-PatchSet: 2 Gerrit-Owner: Michael Blow Gerrit-Reviewer: Jenkins Gerrit-Reviewer: Michael Blow Gerrit-MessageType: merged
Change in asterixdb[master]: Merge branch 'gerrit/trinity' into 'master'
>From Michael Blow : Michael Blow has removed a vote from this change. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18012 ) Change subject: Merge branch 'gerrit/trinity' into 'master' .. Removed Verified-1 by Jenkins -- To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18012 To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Change-Id: I71ab92baa5aa7bb8cf0fd052f1117c0418b988c3 Gerrit-Change-Number: 18012 Gerrit-PatchSet: 2 Gerrit-Owner: Michael Blow Gerrit-Reviewer: Jenkins Gerrit-Reviewer: Michael Blow Gerrit-MessageType: deleteVote
Change in asterixdb[master]: Merge branch 'gerrit/trinity' into 'master'
>From Michael Blow : Michael Blow has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18012 ) Change subject: Merge branch 'gerrit/trinity' into 'master' .. Patch Set 2: Verified+1 Code-Review+2 -- To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18012 To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Change-Id: I71ab92baa5aa7bb8cf0fd052f1117c0418b988c3 Gerrit-Change-Number: 18012 Gerrit-PatchSet: 2 Gerrit-Owner: Michael Blow Gerrit-Reviewer: Jenkins Gerrit-Reviewer: Michael Blow Gerrit-Comment-Date: Wed, 13 Dec 2023 22:46:34 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in asterixdb[master]: Merge branch 'gerrit/trinity' into 'master'
>From Jenkins : Attention is currently required from: Michael Blow. Jenkins has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18012 ) Change subject: Merge branch 'gerrit/trinity' into 'master' .. Patch Set 2: Integration-Tests+1 Integration Tests Successful https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-integration-tests-redux/1723/ : 1 -- To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18012 To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Change-Id: I71ab92baa5aa7bb8cf0fd052f1117c0418b988c3 Gerrit-Change-Number: 18012 Gerrit-PatchSet: 2 Gerrit-Owner: Michael Blow Gerrit-Reviewer: Jenkins Gerrit-Attention: Michael Blow Gerrit-Comment-Date: Wed, 13 Dec 2023 21:04:04 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in asterixdb[master]: Merge branch 'gerrit/trinity' into 'master'
>From Jenkins : Attention is currently required from: Michael Blow. Jenkins has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18012 ) Change subject: Merge branch 'gerrit/trinity' into 'master' .. Patch Set 2: Integration Tests Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-integration-tests-redux/1723/ -- To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18012 To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Change-Id: I71ab92baa5aa7bb8cf0fd052f1117c0418b988c3 Gerrit-Change-Number: 18012 Gerrit-PatchSet: 2 Gerrit-Owner: Michael Blow Gerrit-Reviewer: Jenkins Gerrit-Attention: Michael Blow Gerrit-Comment-Date: Wed, 13 Dec 2023 20:07:08 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in asterixdb[master]: Merge branch 'gerrit/trinity' into 'master'
>From Michael Blow : Attention is currently required from: Michael Blow. Hello Jenkins, I'd like you to reexamine a change. Please visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18012 to look at the new patch set (#2). Change subject: Merge branch 'gerrit/trinity' into 'master' .. Merge branch 'gerrit/trinity' into 'master' Change-Id: I71ab92baa5aa7bb8cf0fd052f1117c0418b988c3 --- M asterixdb/asterix-app/src/test/resources/optimizerts/results/query_issue3316.plan M asterixdb/asterix-app/src/main/java/org/apache/asterix/app/translator/QueryTranslator.java M asterixdb/asterix-app/src/test/resources/optimizerts/queries/query_issue3316.sqlpp M asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/QueryServiceServlet.java M asterixdb/asterix-app/src/test/resources/optimizerts/results_cbo/query_issue3316.plan M asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/misc/query-ASTERIXDB-3316/query-ASTERIXDB-3316.1.ddl.sqlpp M asterixdb/asterix-app/src/test/resources/runtimets/sqlpp_queries.xml M asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/cbo/EnumerateJoinsRule.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/app/message/ExecuteStatementRequestMessage.java M asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml 11 files changed, 25 insertions(+), 18,103 deletions(-) git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/12/18012/2 -- To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18012 To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Change-Id: I71ab92baa5aa7bb8cf0fd052f1117c0418b988c3 Gerrit-Change-Number: 18012 Gerrit-PatchSet: 2 Gerrit-Owner: Michael Blow Gerrit-Reviewer: Jenkins Gerrit-Attention: Michael Blow Gerrit-MessageType: newpatchset
Change in asterixdb[master]: Merge branch 'gerrit/trinity' into 'master'
>From Michael Blow : Michael Blow has uploaded this change for review. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18012 ) Change subject: Merge branch 'gerrit/trinity' into 'master' .. Merge branch 'gerrit/trinity' into 'master' Change-Id: I71ab92baa5aa7bb8cf0fd052f1117c0418b988c3 --- M asterixdb/asterix-app/src/test/resources/optimizerts/results/query_issue3316.plan M asterixdb/asterix-app/src/main/java/org/apache/asterix/app/translator/QueryTranslator.java M asterixdb/asterix-app/src/test/resources/optimizerts/queries/query_issue3316.sqlpp M asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/QueryServiceServlet.java M asterixdb/asterix-app/src/test/resources/optimizerts/results_cbo/query_issue3316.plan M asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/misc/query-ASTERIXDB-3316/query-ASTERIXDB-3316.1.ddl.sqlpp M asterixdb/asterix-app/src/test/resources/runtimets/sqlpp_queries.xml M asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/cbo/EnumerateJoinsRule.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/app/message/ExecuteStatementRequestMessage.java M asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml 11 files changed, 26 insertions(+), 18,104 deletions(-) git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/12/18012/1 -- To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18012 To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Change-Id: I71ab92baa5aa7bb8cf0fd052f1117c0418b988c3 Gerrit-Change-Number: 18012 Gerrit-PatchSet: 1 Gerrit-Owner: Michael Blow Gerrit-MessageType: newchange
Change in asterixdb[master]: Merge branch 'gerrit/trinity' into 'master'
>From Michael Blow : Michael Blow has submitted this change. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/17992 ) Change subject: Merge branch 'gerrit/trinity' into 'master' .. Merge branch 'gerrit/trinity' into 'master' Change-Id: I28867c5e66871402d09f24b4eea254c9758f3a65 --- M hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/util/string/UTF8StringUtil.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/exceptions/ErrorCode.java R hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/util/string/UTF8CharBuffer.java M hyracks-fullstack/hyracks/hyracks-api/src/main/resources/errormsg/en.properties D hyracks-fullstack/hyracks/hyracks-util/src/main/java/org/apache/hyracks/util/string/UTF8StringUtil.java M asterixdb/asterix-app/src/test/resources/runtimets/sqlpp_queries.xml M hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/exceptions/ErrorCode.java M asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml M asterixdb/asterix-common/src/main/resources/asx_errormsg/en.properties M hyracks-fullstack/hyracks/hyracks-data/hyracks-data-std/src/main/java/org/apache/hyracks/data/std/primitive/UTF8StringPointable.java 11 files changed, 74 insertions(+), 16,821 deletions(-) Approvals: Jenkins: Verified Michael Blow: Looks good to me, approved; Verified -- To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/17992 To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Change-Id: I28867c5e66871402d09f24b4eea254c9758f3a65 Gerrit-Change-Number: 17992 Gerrit-PatchSet: 1 Gerrit-Owner: Michael Blow Gerrit-Reviewer: Jenkins Gerrit-Reviewer: Michael Blow Gerrit-MessageType: merged
Change in asterixdb[master]: Merge branch 'gerrit/trinity' into 'master'
>From Michael Blow : Attention is currently required from: Michael Blow. Michael Blow has removed a vote from this change. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/17992 ) Change subject: Merge branch 'gerrit/trinity' into 'master' .. Removed Verified-1 by Jenkins -- To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/17992 To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Change-Id: I28867c5e66871402d09f24b4eea254c9758f3a65 Gerrit-Change-Number: 17992 Gerrit-PatchSet: 1 Gerrit-Owner: Michael Blow Gerrit-Reviewer: Jenkins Gerrit-Attention: Michael Blow Gerrit-MessageType: deleteVote
Change in asterixdb[master]: Merge branch 'gerrit/trinity' into 'master'
>From Michael Blow : Michael Blow has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/17992 ) Change subject: Merge branch 'gerrit/trinity' into 'master' .. Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/17992 To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Change-Id: I28867c5e66871402d09f24b4eea254c9758f3a65 Gerrit-Change-Number: 17992 Gerrit-PatchSet: 1 Gerrit-Owner: Michael Blow Gerrit-Reviewer: Jenkins Gerrit-Reviewer: Michael Blow Gerrit-Comment-Date: Sat, 02 Dec 2023 13:37:11 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in asterixdb[master]: Merge branch 'gerrit/trinity' into 'master'
>From Jenkins : Jenkins has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/17992 ) Change subject: Merge branch 'gerrit/trinity' into 'master' .. Patch Set 1: Integration-Tests+1 Integration Tests Successful https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-integration-tests-redux/1678/ : 1 -- To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/17992 To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Change-Id: I28867c5e66871402d09f24b4eea254c9758f3a65 Gerrit-Change-Number: 17992 Gerrit-PatchSet: 1 Gerrit-Owner: Michael Blow Gerrit-Reviewer: Jenkins Gerrit-Comment-Date: Sat, 02 Dec 2023 01:44:27 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in asterixdb[master]: Merge branch 'gerrit/trinity' into 'master'
>From Jenkins : Jenkins has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/17992 ) Change subject: Merge branch 'gerrit/trinity' into 'master' .. Patch Set 1: Integration Tests Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-integration-tests-redux/1678/ -- To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/17992 To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Change-Id: I28867c5e66871402d09f24b4eea254c9758f3a65 Gerrit-Change-Number: 17992 Gerrit-PatchSet: 1 Gerrit-Owner: Michael Blow Gerrit-CC: Jenkins Gerrit-Comment-Date: Sat, 02 Dec 2023 00:46:10 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in asterixdb[master]: Merge branch 'gerrit/trinity' into 'master'
>From Michael Blow : Michael Blow has uploaded this change for review. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/17992 ) Change subject: Merge branch 'gerrit/trinity' into 'master' .. Merge branch 'gerrit/trinity' into 'master' Change-Id: I28867c5e66871402d09f24b4eea254c9758f3a65 --- M hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/util/string/UTF8StringUtil.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/exceptions/ErrorCode.java R hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/util/string/UTF8CharBuffer.java M hyracks-fullstack/hyracks/hyracks-api/src/main/resources/errormsg/en.properties D hyracks-fullstack/hyracks/hyracks-util/src/main/java/org/apache/hyracks/util/string/UTF8StringUtil.java M asterixdb/asterix-app/src/test/resources/runtimets/sqlpp_queries.xml M hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/exceptions/ErrorCode.java M asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml M asterixdb/asterix-common/src/main/resources/asx_errormsg/en.properties M hyracks-fullstack/hyracks/hyracks-data/hyracks-data-std/src/main/java/org/apache/hyracks/data/std/primitive/UTF8StringPointable.java 11 files changed, 74 insertions(+), 16,821 deletions(-) git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/92/17992/1 -- To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/17992 To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Change-Id: I28867c5e66871402d09f24b4eea254c9758f3a65 Gerrit-Change-Number: 17992 Gerrit-PatchSet: 1 Gerrit-Owner: Michael Blow Gerrit-MessageType: newchange
Change in asterixdb[master]: Merge branch 'gerrit/trinity' into 'master'
>From Michael Blow : Michael Blow has removed a vote from this change. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/17980 ) Change subject: Merge branch 'gerrit/trinity' into 'master' .. Removed Verified-1 by Jenkins -- To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/17980 To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Change-Id: I79ce9134f8c358fd548f8b5425be391403a8d5f0 Gerrit-Change-Number: 17980 Gerrit-PatchSet: 1 Gerrit-Owner: Michael Blow Gerrit-Reviewer: Jenkins Gerrit-Reviewer: Michael Blow Gerrit-MessageType: deleteVote
