>From Michael Blow <[email protected]>: Michael Blow has submitted this change. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/17661 )
Change subject: Merge branch 'gerrit/neo' into 'gerrit/trinity' ...................................................................... Merge branch 'gerrit/neo' into 'gerrit/trinity' Change-Id: I0b56219450da9db28ef21cd5266dbf1e440424c7 --- M 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-analyze.conf M asterixdb/asterix-app/src/test/resources/cc-cloud-storage.conf M asterixdb/asterix-app/src/test/resources/cc-single-lookup.conf M asterixdb/asterix-app/src/test/resources/cc-batch-lookup.conf M asterixdb/asterix-app/src/test/resources/cc-compression.conf 8 files changed, 32 insertions(+), 18 deletions(-) Approvals: Michael Blow: Looks good to me, approved; Verified diff --git a/asterixdb/asterix-app/src/main/resources/cc-cloud-storage.conf b/asterixdb/asterix-app/src/main/resources/cc-cloud-storage.conf index a61ac87..be9bd54 100644 --- a/asterixdb/asterix-app/src/main/resources/cc-cloud-storage.conf +++ b/asterixdb/asterix-app/src/main/resources/cc-cloud-storage.conf @@ -1,5 +1,3 @@ -<<<<<<< HEAD (5f076a [ASTERIXDB-3221][REPL] Use IO scheduler for replication ops) -======= ; 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 @@ -68,4 +66,3 @@ messaging.frame.count=512 cloud.deployment=true storage.buffercache.pagesize=32KB ->>>>>>> CHANGE (337517 [NO ISSUE][OTH] Move page size storage config to common conf) 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 e3e779e..3923222 100644 --- a/asterixdb/asterix-app/src/main/resources/cc_static_partitioning.conf +++ b/asterixdb/asterix-app/src/main/resources/cc_static_partitioning.conf @@ -1,5 +1,3 @@ -<<<<<<< HEAD (5f076a [ASTERIXDB-3221][REPL] Use IO scheduler for replication ops) -======= ; 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 @@ -68,4 +66,3 @@ messaging.frame.count=512 storage.buffercache.pagesize=32KB storage.partitioning=static ->>>>>>> CHANGE (337517 [NO ISSUE][OTH] Move page size storage config to common conf) diff --git a/asterixdb/asterix-app/src/test/resources/cc-analyze.conf b/asterixdb/asterix-app/src/test/resources/cc-analyze.conf index d8b3512..16fa0ae 100644 --- a/asterixdb/asterix-app/src/test/resources/cc-analyze.conf +++ b/asterixdb/asterix-app/src/test/resources/cc-analyze.conf @@ -1,5 +1,3 @@ -<<<<<<< HEAD (5f076a [ASTERIXDB-3221][REPL] Use IO scheduler for replication ops) -======= ; 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 @@ -56,4 +54,3 @@ log.level = INFO compiler.groupmemory=64MB storage.buffercache.pagesize=32KB ->>>>>>> CHANGE (337517 [NO ISSUE][OTH] Move page size storage config to common conf) diff --git a/asterixdb/asterix-app/src/test/resources/cc-batch-lookup.conf b/asterixdb/asterix-app/src/test/resources/cc-batch-lookup.conf index 6e10481..7d3aa52 100644 --- a/asterixdb/asterix-app/src/test/resources/cc-batch-lookup.conf +++ b/asterixdb/asterix-app/src/test/resources/cc-batch-lookup.conf @@ -39,7 +39,6 @@ command=asterixnc app.class=org.apache.asterix.hyracks.bootstrap.NCApplication jvm.args=-Xmx4096m -Dnode.Resolver="org.apache.asterix.external.util.IdentitiyResolverFactory" -storage.buffercache.pagesize=32KB storage.buffercache.size=128MB storage.memorycomponent.globalbudget=512MB @@ -62,4 +61,4 @@ compiler.batch.lookup=true messaging.frame.size=4096 messaging.frame.count=512 - +storage.buffercache.pagesize=32KB 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 18627b4..6373eae 100644 --- a/asterixdb/asterix-app/src/test/resources/cc-cloud-storage.conf +++ b/asterixdb/asterix-app/src/test/resources/cc-cloud-storage.conf @@ -1,5 +1,3 @@ -<<<<<<< HEAD (5f076a [ASTERIXDB-3221][REPL] Use IO scheduler for replication ops) -======= ; 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 @@ -64,4 +62,3 @@ messaging.frame.count=512 cloud.deployment=true storage.buffercache.pagesize=32KB ->>>>>>> CHANGE (337517 [NO ISSUE][OTH] Move page size storage config to common conf) diff --git a/asterixdb/asterix-app/src/test/resources/cc-compression.conf b/asterixdb/asterix-app/src/test/resources/cc-compression.conf index 373d9bb..bc4ea4a 100644 --- a/asterixdb/asterix-app/src/test/resources/cc-compression.conf +++ b/asterixdb/asterix-app/src/test/resources/cc-compression.conf @@ -35,7 +35,6 @@ command=asterixnc app.class=org.apache.asterix.hyracks.bootstrap.NCApplication jvm.args=-Xmx4096m -Dnode.Resolver="org.apache.asterix.external.util.IdentitiyResolverFactory" -storage.buffercache.pagesize=32KB storage.buffercache.size=128MB storage.memorycomponent.globalbudget=512MB @@ -58,3 +57,4 @@ messaging.frame.size=4096 messaging.frame.count=512 storage.compression.block=snappy +storage.buffercache.pagesize=32KB diff --git a/asterixdb/asterix-app/src/test/resources/cc-single-lookup.conf b/asterixdb/asterix-app/src/test/resources/cc-single-lookup.conf index 1b006b3..d59d4d5 100644 --- a/asterixdb/asterix-app/src/test/resources/cc-single-lookup.conf +++ b/asterixdb/asterix-app/src/test/resources/cc-single-lookup.conf @@ -1,5 +1,3 @@ -<<<<<<< HEAD (5f076a [ASTERIXDB-3221][REPL] Use IO scheduler for replication ops) -======= ; 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 @@ -64,4 +62,3 @@ messaging.frame.size=4096 messaging.frame.count=512 storage.buffercache.pagesize=32KB ->>>>>>> CHANGE (337517 [NO ISSUE][OTH] Move page size storage config to common conf) -- To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/17661 To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: trinity Gerrit-Change-Id: I0b56219450da9db28ef21cd5266dbf1e440424c7 Gerrit-Change-Number: 17661 Gerrit-PatchSet: 3 Gerrit-Owner: Michael Blow <[email protected]> Gerrit-Reviewer: Jenkins <[email protected]> Gerrit-Reviewer: Michael Blow <[email protected]> Gerrit-MessageType: merged
