This is an automated email from the ASF dual-hosted git repository. mhubail pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/asterixdb.git
The following commit(s) were added to refs/heads/master by this push: new 33751783f9 [NO ISSUE][OTH] Move page size storage config to common config 33751783f9 is described below commit 33751783f931e76c0fbe1fc54b319d548569097b Author: Murtadha Hubail <mhub...@apache.org> AuthorDate: Mon May 15 19:09:50 2023 +0300 [NO ISSUE][OTH] Move page size storage config to common config - user model changes: no - storage format changes: no - interface changes: no Details: - Move page size storage config used during compilation to the properties common section to avoid warning of usage outside NC scope. Change-Id: I43d603feec63261ec14b723d0d39e4a71461750f Reviewed-on: https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/17531 Integration-Tests: Jenkins <jenk...@fulliautomatix.ics.uci.edu> Tested-by: Jenkins <jenk...@fulliautomatix.ics.uci.edu> Reviewed-by: Murtadha Hubail <mhub...@apache.org> Reviewed-by: Wail Alkowaileet <wael....@gmail.com> --- asterixdb/asterix-app/src/main/resources/cc-cloud-storage.conf | 2 +- asterixdb/asterix-app/src/main/resources/cc.conf | 2 +- asterixdb/asterix-app/src/main/resources/cc2.conf | 2 +- asterixdb/asterix-app/src/main/resources/cc3.conf | 2 +- asterixdb/asterix-app/src/main/resources/cc4.conf | 2 +- asterixdb/asterix-app/src/main/resources/cc_no_cbo.conf | 2 +- asterixdb/asterix-app/src/main/resources/cc_static_partitioning.conf | 2 +- asterixdb/asterix-app/src/test/resources/cc-analyze.conf | 4 ++-- asterixdb/asterix-app/src/test/resources/cc-cloud-storage.conf | 2 +- asterixdb/asterix-app/src/test/resources/cc-multipart.conf | 2 +- asterixdb/asterix-app/src/test/resources/cc-single-lookup.conf | 3 +-- asterixdb/asterix-app/src/test/resources/cc-single.conf | 2 +- .../asterix-app/src/test/resources/cc-small-txn-log-partition.conf | 2 +- asterixdb/asterix-app/src/test/resources/cc-ssl.conf | 4 ++-- asterixdb/asterix-app/src/test/resources/cc-storage.conf | 2 +- asterixdb/asterix-app/src/test/resources/cc.conf | 2 +- .../runtimets/results/api/cluster_state_1/cluster_state_1.1.regexadm | 1 + .../results/api/cluster_state_1_full/cluster_state_1_full.1.regexadm | 1 + .../results/api/cluster_state_1_less/cluster_state_1_less.1.regexadm | 1 + .../main/java/org/apache/asterix/common/config/StorageProperties.java | 1 + 20 files changed, 22 insertions(+), 19 deletions(-) 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 2b03c9a4c6..be9bd544ea 100644 --- a/asterixdb/asterix-app/src/main/resources/cc-cloud-storage.conf +++ b/asterixdb/asterix-app/src/main/resources/cc-cloud-storage.conf @@ -37,7 +37,6 @@ 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.pagesize=32KB storage.buffercache.size=128MB storage.memorycomponent.globalbudget=512MB storage.io.scheduler=greedy @@ -66,3 +65,4 @@ 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.conf b/asterixdb/asterix-app/src/main/resources/cc.conf index dc6e5a2075..b531940447 100644 --- a/asterixdb/asterix-app/src/main/resources/cc.conf +++ b/asterixdb/asterix-app/src/main/resources/cc.conf @@ -37,7 +37,6 @@ 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.pagesize=32KB storage.buffercache.size=128MB storage.memorycomponent.globalbudget=512MB storage.io.scheduler=greedy @@ -65,3 +64,4 @@ compiler.sort.parallel=false compiler.internal.sanitycheck=true messaging.frame.size=4096 messaging.frame.count=512 +storage.buffercache.pagesize=32KB diff --git a/asterixdb/asterix-app/src/main/resources/cc2.conf b/asterixdb/asterix-app/src/main/resources/cc2.conf index c746198745..3f456cfa7d 100644 --- a/asterixdb/asterix-app/src/main/resources/cc2.conf +++ b/asterixdb/asterix-app/src/main/resources/cc2.conf @@ -35,7 +35,6 @@ 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.pagesize=32KB storage.buffercache.size=128MB storage.memorycomponent.globalbudget=512MB @@ -60,3 +59,4 @@ compiler.windowmemory=192KB compiler.parallelism=-1 messaging.frame.size=4096 messaging.frame.count=512 +storage.buffercache.pagesize=32KB \ No newline at end of file diff --git a/asterixdb/asterix-app/src/main/resources/cc3.conf b/asterixdb/asterix-app/src/main/resources/cc3.conf index 8e9b5ab407..aac7cbe33b 100644 --- a/asterixdb/asterix-app/src/main/resources/cc3.conf +++ b/asterixdb/asterix-app/src/main/resources/cc3.conf @@ -35,7 +35,6 @@ 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.pagesize=32KB storage.buffercache.size=128MB storage.memorycomponent.globalbudget=512MB @@ -60,3 +59,4 @@ compiler.windowmemory=192KB compiler.parallelism=3 messaging.frame.size=4096 messaging.frame.count=512 +storage.buffercache.pagesize=32KB diff --git a/asterixdb/asterix-app/src/main/resources/cc4.conf b/asterixdb/asterix-app/src/main/resources/cc4.conf index 6a66d250ac..bf37499874 100644 --- a/asterixdb/asterix-app/src/main/resources/cc4.conf +++ b/asterixdb/asterix-app/src/main/resources/cc4.conf @@ -35,7 +35,6 @@ 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.pagesize=32KB [cc] address = 127.0.0.1 @@ -54,3 +53,4 @@ compiler.windowmemory=192KB messaging.frame.size=4096 messaging.frame.count=512 compiler.parallelism=-1 +storage.buffercache.pagesize=32KB diff --git a/asterixdb/asterix-app/src/main/resources/cc_no_cbo.conf b/asterixdb/asterix-app/src/main/resources/cc_no_cbo.conf index deb92e0bb2..ab028c859b 100644 --- a/asterixdb/asterix-app/src/main/resources/cc_no_cbo.conf +++ b/asterixdb/asterix-app/src/main/resources/cc_no_cbo.conf @@ -37,7 +37,6 @@ 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.pagesize=32KB storage.buffercache.size=128MB storage.memorycomponent.globalbudget=512MB storage.io.scheduler=greedy @@ -64,3 +63,4 @@ compiler.sort.parallel=false compiler.internal.sanitycheck=true messaging.frame.size=4096 messaging.frame.count=512 +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 fc350a9c6a..8f906a7502 100644 --- a/asterixdb/asterix-app/src/main/resources/cc_static_partitioning.conf +++ b/asterixdb/asterix-app/src/main/resources/cc_static_partitioning.conf @@ -37,7 +37,6 @@ 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.pagesize=32KB storage.buffercache.size=128MB storage.memorycomponent.globalbudget=512MB storage.io.scheduler=greedy @@ -65,4 +64,5 @@ compiler.sort.parallel=false compiler.internal.sanitycheck=true messaging.frame.size=4096 messaging.frame.count=512 +storage.buffercache.pagesize=32KB storage.partitioning=static \ No newline at end of file diff --git a/asterixdb/asterix-app/src/test/resources/cc-analyze.conf b/asterixdb/asterix-app/src/test/resources/cc-analyze.conf index 58bba25ba4..9d45ddb327 100644 --- a/asterixdb/asterix-app/src/test/resources/cc-analyze.conf +++ b/asterixdb/asterix-app/src/test/resources/cc-analyze.conf @@ -39,7 +39,6 @@ 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.pagesize=32KB storage.buffercache.size=128MB storage.memorycomponent.globalbudget=512MB @@ -53,4 +52,5 @@ credential.file=src/test/resources/security/passwd [common] log.dir = logs/ log.level = INFO -compiler.groupmemory=64MB \ No newline at end of file +compiler.groupmemory=64MB +storage.buffercache.pagesize=32KB \ No newline at end of file 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 b3206a6796..c3f9591e1e 100644 --- a/asterixdb/asterix-app/src/test/resources/cc-cloud-storage.conf +++ b/asterixdb/asterix-app/src/test/resources/cc-cloud-storage.conf @@ -39,7 +39,6 @@ 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.pagesize=32KB storage.buffercache.size=128MB storage.memorycomponent.globalbudget=512MB @@ -62,3 +61,4 @@ compiler.windowmemory=192KB messaging.frame.size=4096 messaging.frame.count=512 cloud.deployment=true +storage.buffercache.pagesize=32KB \ No newline at end of file diff --git a/asterixdb/asterix-app/src/test/resources/cc-multipart.conf b/asterixdb/asterix-app/src/test/resources/cc-multipart.conf index 5543e512e8..6c676246fd 100644 --- a/asterixdb/asterix-app/src/test/resources/cc-multipart.conf +++ b/asterixdb/asterix-app/src/test/resources/cc-multipart.conf @@ -35,7 +35,6 @@ 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.pagesize=32KB storage.buffercache.size=128MB storage.memorycomponent.globalbudget=512MB @@ -54,3 +53,4 @@ compiler.joinmemory=256KB compiler.windowmemory=192KB messaging.frame.size=4096 messaging.frame.count=512 +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 68d454727e..d59d4d58c5 100644 --- a/asterixdb/asterix-app/src/test/resources/cc-single-lookup.conf +++ b/asterixdb/asterix-app/src/test/resources/cc-single-lookup.conf @@ -39,7 +39,6 @@ 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.pagesize=32KB storage.buffercache.size=128MB storage.memorycomponent.globalbudget=512MB @@ -62,4 +61,4 @@ compiler.windowmemory=192KB compiler.batch.lookup=false messaging.frame.size=4096 messaging.frame.count=512 - +storage.buffercache.pagesize=32KB diff --git a/asterixdb/asterix-app/src/test/resources/cc-single.conf b/asterixdb/asterix-app/src/test/resources/cc-single.conf index 794b5b0ab9..a6f4e8999a 100644 --- a/asterixdb/asterix-app/src/test/resources/cc-single.conf +++ b/asterixdb/asterix-app/src/test/resources/cc-single.conf @@ -27,7 +27,6 @@ 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.pagesize=32KB storage.buffercache.size=128MB storage.memorycomponent.globalbudget=512MB @@ -48,3 +47,4 @@ compiler.textsearchmemory=160KB compiler.windowmemory=192KB messaging.frame.size=4096 messaging.frame.count=512 +storage.buffercache.pagesize=32KB diff --git a/asterixdb/asterix-app/src/test/resources/cc-small-txn-log-partition.conf b/asterixdb/asterix-app/src/test/resources/cc-small-txn-log-partition.conf index dd8edb44f4..ae91f5e10d 100644 --- a/asterixdb/asterix-app/src/test/resources/cc-small-txn-log-partition.conf +++ b/asterixdb/asterix-app/src/test/resources/cc-small-txn-log-partition.conf @@ -33,7 +33,6 @@ 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.pagesize=32KB storage.buffercache.size=128MB storage.memorycomponent.globalbudget=128MB @@ -56,3 +55,4 @@ txn.log.partitionsize=2MB txn.log.buffer.pagesize=128KB txn.log.checkpoint.pollfrequency=2147483647 txn.log.checkpoint.history=0 +storage.buffercache.pagesize=32KB diff --git a/asterixdb/asterix-app/src/test/resources/cc-ssl.conf b/asterixdb/asterix-app/src/test/resources/cc-ssl.conf index ff7e73b8b2..1498244578 100644 --- a/asterixdb/asterix-app/src/test/resources/cc-ssl.conf +++ b/asterixdb/asterix-app/src/test/resources/cc-ssl.conf @@ -43,7 +43,6 @@ 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.pagesize=32KB storage.buffercache.size=128MB storage.memorycomponent.globalbudget=512MB @@ -69,4 +68,5 @@ compiler.textsearchmemory=160KB compiler.windowmemory=192KB messaging.frame.size=4096 messaging.frame.count=512 -ssl.enabled=true \ No newline at end of file +ssl.enabled=true +storage.buffercache.pagesize=32KB \ No newline at end of file diff --git a/asterixdb/asterix-app/src/test/resources/cc-storage.conf b/asterixdb/asterix-app/src/test/resources/cc-storage.conf index 9e869c7bf3..68faa17905 100644 --- a/asterixdb/asterix-app/src/test/resources/cc-storage.conf +++ b/asterixdb/asterix-app/src/test/resources/cc-storage.conf @@ -33,7 +33,6 @@ 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.pagesize=32KB storage.buffercache.size=128MB storage.memorycomponent.globalbudget=512MB @@ -53,6 +52,7 @@ compiler.textsearchmemory=160KB compiler.windowmemory=192KB messaging.frame.size=4096 messaging.frame.count=512 +storage.buffercache.pagesize=32KB storage.compression.block=snappy txn.log.checkpoint.pollfrequency=10 txn.dataset.checkpoint.interval=10 \ No newline at end of file diff --git a/asterixdb/asterix-app/src/test/resources/cc.conf b/asterixdb/asterix-app/src/test/resources/cc.conf index 9532849649..624455c594 100644 --- a/asterixdb/asterix-app/src/test/resources/cc.conf +++ b/asterixdb/asterix-app/src/test/resources/cc.conf @@ -39,7 +39,6 @@ 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.pagesize=32KB storage.buffercache.size=128MB storage.memorycomponent.globalbudget=512MB @@ -61,3 +60,4 @@ compiler.textsearchmemory=160KB compiler.windowmemory=192KB messaging.frame.size=4096 messaging.frame.count=512 +storage.buffercache.pagesize=32KB 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 bdd3f515ef..9e8e5c467b 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 @@ -51,6 +51,7 @@ "replication\.strategy" : "none", "replication\.timeout" : 120, "ssl\.enabled" : false, + "storage.buffercache.pagesize" : 32768, "storage.column.free.space.tolerance" : 0.15, "storage.column.max.tuple.count" : 15000, "storage.compression.block" : "snappy", 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 7c416e6622..af5a6f6367 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 @@ -51,6 +51,7 @@ "replication\.strategy" : "none", "replication\.timeout" : 120, "ssl\.enabled" : false, + "storage.buffercache.pagesize" : 32768, "storage.column.free.space.tolerance" : 0.15, "storage.column.max.tuple.count" : 15000, "storage.compression.block" : "snappy", 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 a28cc11642..1e98593180 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 @@ -51,6 +51,7 @@ "replication\.strategy" : "none", "replication\.timeout" : 120, "ssl\.enabled" : false, + "storage.buffercache.pagesize" : 32768, "storage.column.free.space.tolerance" : 0.15, "storage.column.max.tuple.count" : 15000, "storage.compression.block" : "snappy", diff --git a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/StorageProperties.java b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/StorageProperties.java index 70cd4ff65d..aa90e7ae8a 100644 --- a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/StorageProperties.java +++ b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/StorageProperties.java @@ -81,6 +81,7 @@ public class StorageProperties extends AbstractProperties { @Override public Section section() { switch (this) { + case STORAGE_BUFFERCACHE_PAGESIZE: case STORAGE_COMPRESSION_BLOCK: case STORAGE_LSM_BLOOMFILTER_FALSEPOSITIVERATE: case STORAGE_GLOBAL_CLEANUP: