>From Murtadha Hubail <[email protected]>: Murtadha Hubail has submitted this change. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/17531 )
Change subject: [NO ISSUE][OTH] Move page size storage config to common config ...................................................................... [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 <[email protected]> Tested-by: Jenkins <[email protected]> Reviewed-by: Murtadha Hubail <[email protected]> Reviewed-by: Wail Alkowaileet <[email protected]> --- 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/cc3.conf 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-storage.conf M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/StorageProperties.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/cc-ssl.conf M asterixdb/asterix-app/src/test/resources/runtimets/results/api/cluster_state_1_less/cluster_state_1_less.1.regexadm M asterixdb/asterix-app/src/test/resources/cc-single-lookup.conf M asterixdb/asterix-app/src/main/resources/cc2.conf M asterixdb/asterix-app/src/test/resources/cc.conf M asterixdb/asterix-app/src/main/resources/cc4.conf M asterixdb/asterix-app/src/test/resources/cc-single.conf M asterixdb/asterix-app/src/main/resources/cc.conf M asterixdb/asterix-app/src/test/resources/cc-small-txn-log-partition.conf M asterixdb/asterix-app/src/main/resources/cc_no_cbo.conf M asterixdb/asterix-app/src/test/resources/cc-multipart.conf 20 files changed, 46 insertions(+), 19 deletions(-) Approvals: Murtadha Hubail: Looks good to me, but someone else must approve Wail Alkowaileet: Looks good to me, approved Jenkins: Verified; 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 2b03c9a..be9bd54 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 @@ 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 @@ 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 dc6e5a2..b531940 100644 --- a/asterixdb/asterix-app/src/main/resources/cc.conf +++ b/asterixdb/asterix-app/src/main/resources/cc.conf @@ -37,7 +37,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 storage.io.scheduler=greedy @@ -65,3 +64,4 @@ 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 c746198..3f456cf 100644 --- a/asterixdb/asterix-app/src/main/resources/cc2.conf +++ b/asterixdb/asterix-app/src/main/resources/cc2.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 @@ -60,3 +59,4 @@ 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 8e9b5ab..aac7cbe 100644 --- a/asterixdb/asterix-app/src/main/resources/cc3.conf +++ b/asterixdb/asterix-app/src/main/resources/cc3.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 @@ -60,3 +59,4 @@ 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 6a66d25..bf37499 100644 --- a/asterixdb/asterix-app/src/main/resources/cc4.conf +++ b/asterixdb/asterix-app/src/main/resources/cc4.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 [cc] address = 127.0.0.1 @@ -54,3 +53,4 @@ 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 deb92e0..ab028c8 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 @@ 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.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 fc350a9..8f906a7 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 @@ 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.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 58bba25..9d45ddb 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 @@ 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 @@ [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 b3206a6..c3f9591 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 @@ 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 @@ 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 5543e51..6c67624 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 @@ 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.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 68d4547..d59d4d5 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 @@ 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=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 794b5b0..a6f4e89 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 @@ 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.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 dd8edb4..ae91f5e 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 @@ 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.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 ff7e73b..1498244 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 @@ 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.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 9e869c7..68faa17 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 @@ 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.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 953284964..624455c 100644 --- a/asterixdb/asterix-app/src/test/resources/cc.conf +++ b/asterixdb/asterix-app/src/test/resources/cc.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 @@ -61,3 +60,4 @@ 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 bdd3f51..9e8e5c4 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 7c416e6..af5a6f6 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 a28cc11..1e98593 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 70cd4ff..aa90e7a 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 @@ @Override public Section section() { switch (this) { + case STORAGE_BUFFERCACHE_PAGESIZE: case STORAGE_COMPRESSION_BLOCK: case STORAGE_LSM_BLOOMFILTER_FALSEPOSITIVERATE: case STORAGE_GLOBAL_CLEANUP: -- To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/17531 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: I43d603feec63261ec14b723d0d39e4a71461750f Gerrit-Change-Number: 17531 Gerrit-PatchSet: 3 Gerrit-Owner: Murtadha Hubail <[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-Reviewer: Wail Alkowaileet <[email protected]> Gerrit-MessageType: merged
