>From Michael Blow <[email protected]>:
Michael Blow has submitted this change. (
https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/17684 )
Change subject: Merge branch 'gerrit/trinity' into 'master'
......................................................................
Merge branch 'gerrit/trinity' into 'master'
Change-Id: Ia4c6bdfa9dce9437049d59e137494b2372348754
---
M
asterixdb/asterix-app/src/test/resources/runtimets/results/api/cluster_state_1_full/cluster_state_1_full.1.regexadm
M
asterixdb/asterix-app/src/test/resources/runtimets/results/api/cluster_state_1/cluster_state_1.1.regexadm
M asterixdb/asterix-app/src/main/resources/cc_static_partitioning.conf
M
asterixdb/asterix-app/src/main/java/org/apache/asterix/app/translator/QueryTranslator.java
M
asterixdb/asterix-app/src/main/java/org/apache/asterix/utils/RebalanceUtil.java
M
asterixdb/asterix-common/src/main/java/org/apache/asterix/common/context/PrimaryIndexOperationTracker.java
M
asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/utils/DatasetUtil.java
M asterixdb/asterix-app/src/test/resources/cc-analyze.conf
M asterixdb/asterix-app/src/test/resources/cc-cloud-storage.conf
M
asterixdb/asterix-app/src/test/resources/runtimets/results/api/cluster_state_1_less/cluster_state_1_less.1.regexadm
D asterixdb/asterix-app/src/test/resources/cc-batch-lookup.conf
D asterixdb/asterix-app/src/test/resources/cc-compression.conf
13 files changed, 34 insertions(+), 195 deletions(-)
Approvals:
Michael Blow: Looks good to me, approved; Verified
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 02b1ba7..d41b549 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
@@ -4796,7 +4796,6 @@
appCtx.getReceptionist().ensureSchedulable(schedulableRequest);
// ensure request not cancelled before running job
ensureNotCancelled(clientRequest);
-<<<<<<< HEAD (1cb3ee [ASTERIXDB-3232][COMP] cleanup and simplification)
if (atomicStatement != null) {
Dataset ds = metadataProvider.findDataset(((InsertStatement)
atomicStatement).getDataverseName(),
((InsertStatement) atomicStatement).getDatasetName());
@@ -4814,13 +4813,10 @@
}
}
jobId = JobUtils.runJob(hcc, jobSpec, jobFlags, false);
-=======
- final JobId jobId = JobUtils.runJob(hcc, jobSpec, jobFlags, false);
if (LOGGER.isDebugEnabled()) {
LOGGER.debug("createAndRunJob jobId:{}, uuid:{}", jobId,
requestParameters.getRequestReference().getUuid());
}
->>>>>>> BRANCH (0f3fb3 Merge branch 'gerrit/neo' into 'gerrit/trinity')
clientRequest.setJobId(jobId);
if (jId != null) {
jId.setValue(jobId);
diff --git
a/asterixdb/asterix-app/src/main/java/org/apache/asterix/utils/RebalanceUtil.java
b/asterixdb/asterix-app/src/main/java/org/apache/asterix/utils/RebalanceUtil.java
index d20b7f9..837d2cb 100644
---
a/asterixdb/asterix-app/src/main/java/org/apache/asterix/utils/RebalanceUtil.java
+++
b/asterixdb/asterix-app/src/main/java/org/apache/asterix/utils/RebalanceUtil.java
@@ -20,12 +20,9 @@
import static org.apache.asterix.app.translator.QueryTranslator.abort;
import static org.apache.asterix.common.config.DatasetConfig.DatasetType;
-<<<<<<< HEAD (1cb3ee [ASTERIXDB-3232][COMP] cleanup and simplification)
-import static
org.apache.asterix.om.utils.ProjectionFiltrationTypeUtil.ALL_FIELDS_TYPE;
-=======
import static org.apache.asterix.common.utils.IdentifierUtil.dataset;
import static
org.apache.asterix.metadata.utils.DatasetUtil.getFullyQualifiedDisplayName;
->>>>>>> BRANCH (0f3fb3 Merge branch 'gerrit/neo' into 'gerrit/trinity')
+import static
org.apache.asterix.om.utils.ProjectionFiltrationTypeUtil.ALL_FIELDS_TYPE;
import static
org.apache.hyracks.storage.am.common.dataflow.IndexDropOperatorDescriptor.DropOption;
import java.rmi.RemoteException;
@@ -88,25 +85,12 @@
/**
* Rebalances an existing dataset to a list of target nodes.
*
-<<<<<<< HEAD (1cb3ee [ASTERIXDB-3232][COMP] cleanup and simplification)
* @param dataverseName, the dataverse name.
* @param datasetName, the dataset name.
* @param targetNcNames, the list of target nodes.
* @param metadataProvider, the metadata provider.
* @param hcc, the reusable hyracks connection.
-=======
- * @param dataverseName,
- * the dataverse name.
- * @param datasetName,
- * the dataset name.
- * @param targetNcNames,
- * the list of target nodes.
- * @param metadataProvider,
- * the metadata provider.
- * @param hcc,
- * the reusable hyracks connection.
* @return <code>false</code> if the rebalance was safely skipped
->>>>>>> BRANCH (0f3fb3 Merge branch 'gerrit/neo' into 'gerrit/trinity')
* @throws Exception
*/
public static boolean rebalance(DataverseName dataverseName, String
datasetName, Set<String> targetNcNames,
diff --git
a/asterixdb/asterix-app/src/main/resources/cc_static_partitioning.conf
b/asterixdb/asterix-app/src/main/resources/cc_static_partitioning.conf
index 36e9be7..9884116 100644
--- a/asterixdb/asterix-app/src/main/resources/cc_static_partitioning.conf
+++ b/asterixdb/asterix-app/src/main/resources/cc_static_partitioning.conf
@@ -51,20 +51,6 @@
[common]
log.dir = logs/
log.level = INFO
-<<<<<<< HEAD (1cb3ee [ASTERIXDB-3232][COMP] cleanup and simplification)
-compiler.framesize=32KB
-compiler.sortmemory=320KB
-compiler.groupmemory=160KB
-compiler.joinmemory=256KB
-compiler.textsearchmemory=160KB
-compiler.windowmemory=192KB
-compiler.sort.parallel=false
-compiler.internal.sanitycheck=true
-messaging.frame.size=4096
-messaging.frame.count=512
-storage.buffercache.pagesize=32KB
-storage.partitioning=static
-=======
compiler.cbo=false
compiler.cbotest=true
compiler.queryplanshape=zigzag
@@ -80,4 +66,4 @@
messaging.frame.count=512
storage.buffercache.pagesize=32KB
storage.partitioning=static
->>>>>>> BRANCH (0f3fb3 Merge branch 'gerrit/neo' into 'gerrit/trinity')
+storage.compression.block=snappy
diff --git a/asterixdb/asterix-app/src/test/resources/cc-analyze.conf
b/asterixdb/asterix-app/src/test/resources/cc-analyze.conf
index de7eedf..16fa0ae 100644
--- a/asterixdb/asterix-app/src/test/resources/cc-analyze.conf
+++ b/asterixdb/asterix-app/src/test/resources/cc-analyze.conf
@@ -53,8 +53,4 @@
log.dir = logs/
log.level = INFO
compiler.groupmemory=64MB
-<<<<<<< HEAD (1cb3ee [ASTERIXDB-3232][COMP] cleanup and simplification)
storage.buffercache.pagesize=32KB
-=======
-storage.buffercache.pagesize=32KB
->>>>>>> BRANCH (0f3fb3 Merge branch 'gerrit/neo' into 'gerrit/trinity')
diff --git a/asterixdb/asterix-app/src/test/resources/cc-batch-lookup.conf
b/asterixdb/asterix-app/src/test/resources/cc-batch-lookup.conf
deleted file mode 100644
index c526b8c..0000000
--- a/asterixdb/asterix-app/src/test/resources/cc-batch-lookup.conf
+++ /dev/null
@@ -1,67 +0,0 @@
-<<<<<<< HEAD (1cb3ee [ASTERIXDB-3232][COMP] cleanup and simplification)
-=======
-; Licensed to the Apache Software Foundation (ASF) under one
-; or more contributor license agreements. See the NOTICE file
-; distributed with this work for additional information
-; regarding copyright ownership. The ASF licenses this file
-; to you under the Apache License, Version 2.0 (the
-; "License"); you may not use this file except in compliance
-; with the License. You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing,
-; software distributed under the License is distributed on an
-; "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-; KIND, either express or implied. See the License for the
-; specific language governing permissions and limitations
-; under the License.
-
-[nc/asterix_nc1]
-txn.log.dir=target/tmp/asterix_nc1/txnlog
-core.dump.dir=target/tmp/asterix_nc1/coredump
-iodevices=target/tmp/asterix_nc1/iodevice1,
-iodevices=../asterix-server/target/tmp/asterix_nc1/iodevice2
-nc.api.port=19004
-#jvm.args=-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=5006
-
-[nc/asterix_nc2]
-ncservice.port=9091
-txn.log.dir=target/tmp/asterix_nc2/txnlog
-core.dump.dir=target/tmp/asterix_nc2/coredump
-iodevices=target/tmp/asterix_nc2/iodevice1,../asterix-server/target/tmp/asterix_nc2/iodevice2
-nc.api.port=19005
-#jvm.args=-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=5007
-
-[nc]
-credential.file=src/test/resources/security/passwd
-python.cmd.autolocate=true
-python.env=FOO=BAR=BAZ,BAR=BAZ
-address=127.0.0.1
-command=asterixnc
-app.class=org.apache.asterix.hyracks.bootstrap.NCApplication
-jvm.args=-Xmx4096m
-Dnode.Resolver="org.apache.asterix.external.util.IdentitiyResolverFactory"
-storage.buffercache.size=128MB
-storage.memorycomponent.globalbudget=512MB
-
-[cc]
-address = 127.0.0.1
-app.class=org.apache.asterix.hyracks.bootstrap.CCApplication
-heartbeat.period=2000
-heartbeat.max.misses=25
-credential.file=src/test/resources/security/passwd
-
-[common]
-log.dir = logs/
-log.level = INFO
-compiler.framesize=32KB
-compiler.sortmemory=320KB
-compiler.groupmemory=160KB
-compiler.joinmemory=256KB
-compiler.textsearchmemory=160KB
-compiler.windowmemory=192KB
-compiler.batch.lookup=true
-messaging.frame.size=4096
-messaging.frame.count=512
-storage.buffercache.pagesize=32KB
->>>>>>> BRANCH (0f3fb3 Merge branch 'gerrit/neo' into 'gerrit/trinity')
diff --git a/asterixdb/asterix-app/src/test/resources/cc-cloud-storage.conf
b/asterixdb/asterix-app/src/test/resources/cc-cloud-storage.conf
index 546d8a4..6373eae 100644
--- a/asterixdb/asterix-app/src/test/resources/cc-cloud-storage.conf
+++ b/asterixdb/asterix-app/src/test/resources/cc-cloud-storage.conf
@@ -62,13 +62,3 @@
messaging.frame.count=512
cloud.deployment=true
storage.buffercache.pagesize=32KB
-<<<<<<< HEAD (1cb3ee [ASTERIXDB-3232][COMP] cleanup and simplification)
-storage.partitioning=static
-cloud.storage.scheme=s3
-cloud.storage.bucket=cloud-storage-container
-cloud.storage.region=us-west-2
-cloud.storage.endpoint=http://127.0.0.1:8001
-cloud.storage.anonymous.auth=true
-cloud.storage.cache.policy=lazy
-=======
->>>>>>> BRANCH (0f3fb3 Merge branch 'gerrit/neo' into 'gerrit/trinity')
diff --git a/asterixdb/asterix-app/src/test/resources/cc-compression.conf
b/asterixdb/asterix-app/src/test/resources/cc-compression.conf
deleted file mode 100644
index 16d505c..0000000
--- a/asterixdb/asterix-app/src/test/resources/cc-compression.conf
+++ /dev/null
@@ -1,63 +0,0 @@
-<<<<<<< HEAD (1cb3ee [ASTERIXDB-3232][COMP] cleanup and simplification)
-=======
-; Licensed to the Apache Software Foundation (ASF) under one
-; or more contributor license agreements. See the NOTICE file
-; distributed with this work for additional information
-; regarding copyright ownership. The ASF licenses this file
-; to you under the Apache License, Version 2.0 (the
-; "License"); you may not use this file except in compliance
-; with the License. You may obtain a copy of the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing,
-; software distributed under the License is distributed on an
-; "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-; KIND, either express or implied. See the License for the
-; specific language governing permissions and limitations
-; under the License.
-
-[nc/asterix_nc1]
-txn.log.dir=target/tmp/asterix_nc1/txnlog
-core.dump.dir=target/tmp/asterix_nc1/coredump
-iodevices=target/tmp/asterix_nc1/iodevice1,../asterix-server/target/tmp/asterix_nc1/iodevice2
-nc.api.port=19004
-#jvm.args=-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=5006
-
-[nc/asterix_nc2]
-ncservice.port=9091
-txn.log.dir=target/tmp/asterix_nc2/txnlog
-core.dump.dir=target/tmp/asterix_nc2/coredump
-iodevices=target/tmp/asterix_nc2/iodevice1,../asterix-server/target/tmp/asterix_nc2/iodevice2
-nc.api.port=19005
-#jvm.args=-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=5007
-
-[nc]
-address=127.0.0.1
-command=asterixnc
-app.class=org.apache.asterix.hyracks.bootstrap.NCApplication
-jvm.args=-Xmx4096m
-Dnode.Resolver="org.apache.asterix.external.util.IdentitiyResolverFactory"
-storage.buffercache.size=128MB
-storage.memorycomponent.globalbudget=512MB
-
-[cc]
-address = 127.0.0.1
-app.class=org.apache.asterix.hyracks.bootstrap.CCApplication
-heartbeat.period=2000
-heartbeat.max.misses=25
-
-[common]
-log.level = INFO
-compiler.cbo=false
-compiler.cbotest=true
-compiler.framesize=32KB
-compiler.sortmemory=320KB
-compiler.groupmemory=160KB
-compiler.joinmemory=256KB
-compiler.textsearchmemory=160KB
-compiler.windowmemory=192KB
-messaging.frame.size=4096
-messaging.frame.count=512
-storage.compression.block=snappy
-storage.buffercache.pagesize=32KB
->>>>>>> BRANCH (0f3fb3 Merge branch 'gerrit/neo' into 'gerrit/trinity')
diff --git
a/asterixdb/asterix-app/src/test/resources/runtimets/results/api/cluster_state_1/cluster_state_1.1.regexadm
b/asterixdb/asterix-app/src/test/resources/runtimets/results/api/cluster_state_1/cluster_state_1.1.regexadm
index d2e4a44..a67d326 100644
---
a/asterixdb/asterix-app/src/test/resources/runtimets/results/api/cluster_state_1/cluster_state_1.1.regexadm
+++
b/asterixdb/asterix-app/src/test/resources/runtimets/results/api/cluster_state_1/cluster_state_1.1.regexadm
@@ -60,11 +60,8 @@
"replication\.timeout" : 120,
"ssl\.enabled" : false,
"storage.buffercache.pagesize" : 32768,
-<<<<<<< HEAD (1cb3ee [ASTERIXDB-3232][COMP] cleanup and simplification)
"storage.column.free.space.tolerance" : 0.15,
"storage.column.max.tuple.count" : 15000,
-=======
->>>>>>> BRANCH (0f3fb3 Merge branch 'gerrit/neo' into 'gerrit/trinity')
"storage.compression.block" : "snappy",
"storage.format" : "row",
"storage.global.cleanup.timeout" : 600,
diff --git
a/asterixdb/asterix-app/src/test/resources/runtimets/results/api/cluster_state_1_full/cluster_state_1_full.1.regexadm
b/asterixdb/asterix-app/src/test/resources/runtimets/results/api/cluster_state_1_full/cluster_state_1_full.1.regexadm
index d313ca4..0e90266 100644
---
a/asterixdb/asterix-app/src/test/resources/runtimets/results/api/cluster_state_1_full/cluster_state_1_full.1.regexadm
+++
b/asterixdb/asterix-app/src/test/resources/runtimets/results/api/cluster_state_1_full/cluster_state_1_full.1.regexadm
@@ -60,11 +60,8 @@
"replication\.timeout" : 120,
"ssl\.enabled" : false,
"storage.buffercache.pagesize" : 32768,
-<<<<<<< HEAD (1cb3ee [ASTERIXDB-3232][COMP] cleanup and simplification)
"storage.column.free.space.tolerance" : 0.15,
"storage.column.max.tuple.count" : 15000,
-=======
->>>>>>> BRANCH (0f3fb3 Merge branch 'gerrit/neo' into 'gerrit/trinity')
"storage.compression.block" : "snappy",
"storage.format" : "row",
"storage.global.cleanup.timeout" : 600,
diff --git
a/asterixdb/asterix-app/src/test/resources/runtimets/results/api/cluster_state_1_less/cluster_state_1_less.1.regexadm
b/asterixdb/asterix-app/src/test/resources/runtimets/results/api/cluster_state_1_less/cluster_state_1_less.1.regexadm
index 17a4bf7..931fd06 100644
---
a/asterixdb/asterix-app/src/test/resources/runtimets/results/api/cluster_state_1_less/cluster_state_1_less.1.regexadm
+++
b/asterixdb/asterix-app/src/test/resources/runtimets/results/api/cluster_state_1_less/cluster_state_1_less.1.regexadm
@@ -60,11 +60,8 @@
"replication\.timeout" : 120,
"ssl\.enabled" : false,
"storage.buffercache.pagesize" : 32768,
-<<<<<<< HEAD (1cb3ee [ASTERIXDB-3232][COMP] cleanup and simplification)
"storage.column.free.space.tolerance" : 0.15,
"storage.column.max.tuple.count" : 15000,
-=======
->>>>>>> BRANCH (0f3fb3 Merge branch 'gerrit/neo' into 'gerrit/trinity')
"storage.compression.block" : "snappy",
"storage.format" : "row",
"storage.global.cleanup.timeout" : 600,
diff --git
a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/context/PrimaryIndexOperationTracker.java
b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/context/PrimaryIndexOperationTracker.java
index 261536f..2e32fb3 100644
---
a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/context/PrimaryIndexOperationTracker.java
+++
b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/context/PrimaryIndexOperationTracker.java
@@ -77,14 +77,8 @@
private final IIndexCheckpointManagerProvider
indexCheckpointManagerProvider;
public PrimaryIndexOperationTracker(int datasetID, int partition,
ILogManager logManager, DatasetInfo dsInfo,
-<<<<<<< HEAD (1cb3ee [ASTERIXDB-3232][COMP] cleanup and simplification)
ILSMComponentIdGenerator idGenerator,
IIndexCheckpointManagerProvider indexCheckpointManagerProvider) {
- super(datasetID, dsInfo);
- this.partition = partition;
-=======
- ILSMComponentIdGenerator idGenerator) {
super(datasetID, dsInfo, partition);
->>>>>>> BRANCH (0f3fb3 Merge branch 'gerrit/neo' into 'gerrit/trinity')
this.logManager = logManager;
this.numActiveOperations = new AtomicInteger();
this.idGenerator = idGenerator;
diff --git
a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/utils/DatasetUtil.java
b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/utils/DatasetUtil.java
index 5654913..88eafcd 100644
---
a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/utils/DatasetUtil.java
+++
b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/utils/DatasetUtil.java
@@ -22,6 +22,7 @@
import static
org.apache.asterix.om.utils.ProjectionFiltrationTypeUtil.EMPTY_TYPE;
import java.io.DataOutput;
+import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Map;
--
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/17684
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: Ia4c6bdfa9dce9437049d59e137494b2372348754
Gerrit-Change-Number: 17684
Gerrit-PatchSet: 3
Gerrit-Owner: Michael Blow <[email protected]>
Gerrit-Reviewer: Jenkins <[email protected]>
Gerrit-Reviewer: Michael Blow <[email protected]>
Gerrit-MessageType: merged
