>From Ali Alsuliman <[email protected]>: Ali Alsuliman has submitted this change. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/17689 )
Change subject: [NO ISSUE][TEST] Fix conf files ...................................................................... [NO ISSUE][TEST] Fix conf files - user model changes: no - storage format changes: no - interface changes: no Change-Id: I9aac2d2e0e42562c7b295d9984566317a4ddcfe9 Reviewed-on: https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/17689 Integration-Tests: Jenkins <[email protected]> Reviewed-by: Murtadha Hubail <[email protected]> Tested-by: Jenkins <[email protected]> --- D asterixdb/asterix-app/src/main/resources/cc-cloud-storage.conf M asterixdb/asterix-app/src/main/resources/cc_static_partitioning.conf M asterixdb/asterix-app/src/test/resources/cc-cloud-storage.conf 3 files changed, 25 insertions(+), 71 deletions(-) Approvals: Murtadha Hubail: Looks good to me, approved Jenkins: Verified; Verified Objections: Anon. E. Moose #1000171: Violations found diff --git a/asterixdb/asterix-app/src/main/resources/cc-cloud-storage.conf b/asterixdb/asterix-app/src/main/resources/cc-cloud-storage.conf deleted file mode 100644 index be9bd54..0000000 --- a/asterixdb/asterix-app/src/main/resources/cc-cloud-storage.conf +++ /dev/null @@ -1,68 +0,0 @@ -; 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=asterix_nc1/iodevice1 -iodevices=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=asterix_nc2/iodevice1 -iodevices=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 -storage.io.scheduler=greedy -storage.filtered.memorycomponent.max.size=16MB - -[cc] -address = 127.0.0.1 -app.class=org.apache.asterix.hyracks.bootstrap.CCApplication -heartbeat.period=2000 -heartbeat.max.misses=25 - -[common] -log.dir = logs/ -log.level = INFO -compiler.cbo=false -compiler.cbotest=true -compiler.queryplanshape=zigzag -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 -cloud.deployment=true -storage.buffercache.pagesize=32KB 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 9884116..9d28e55 100644 --- a/asterixdb/asterix-app/src/main/resources/cc_static_partitioning.conf +++ b/asterixdb/asterix-app/src/main/resources/cc_static_partitioning.conf @@ -51,9 +51,6 @@ [common] log.dir = logs/ log.level = INFO -compiler.cbo=false -compiler.cbotest=true -compiler.queryplanshape=zigzag compiler.framesize=32KB compiler.sortmemory=320KB compiler.groupmemory=160KB 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 6373eae..56c9edf 100644 --- a/asterixdb/asterix-app/src/test/resources/cc-cloud-storage.conf +++ b/asterixdb/asterix-app/src/test/resources/cc-cloud-storage.conf @@ -58,7 +58,15 @@ compiler.joinmemory=256KB compiler.textsearchmemory=160KB compiler.windowmemory=192KB +compiler.internal.sanitycheck=true messaging.frame.size=4096 messaging.frame.count=512 cloud.deployment=true storage.buffercache.pagesize=32KB +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 \ No newline at end of file -- To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/17689 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: I9aac2d2e0e42562c7b295d9984566317a4ddcfe9 Gerrit-Change-Number: 17689 Gerrit-PatchSet: 3 Gerrit-Owner: Ali Alsuliman <[email protected]> Gerrit-Reviewer: Ali Alsuliman <[email protected]> Gerrit-Reviewer: Anon. E. Moose #1000171 Gerrit-Reviewer: Jenkins <[email protected]> Gerrit-Reviewer: Murtadha Hubail <[email protected]> Gerrit-MessageType: merged
