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 0eeb356 [NO ISSUE][CONF] Fix storage properties section
0eeb356 is described below
commit 0eeb356dd39dada3bdcb480b9ec29b0d58980f88
Author: Murtadha Hubail <[email protected]>
AuthorDate: Tue Sep 8 13:49:43 2020 +0300
[NO ISSUE][CONF] Fix storage properties section
- user model changes: no
- storage format changes: no
- interface changes: no
Details:
- Make the section of the following storage properties
COMMON as they are accessed on both the NC and the CC:
-- STORAGE_COMPRESSION_BLOCK
-- STORAGE_LSM_BLOOMFILTER_FALSEPOSITIVERATE
- Adapt test cases.
Change-Id: I97de8ad10a63cb58bc5ca73b50cc24bd0471e993
Reviewed-on: https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/7844
Integration-Tests: Jenkins <[email protected]>
Tested-by: Jenkins <[email protected]>
Reviewed-by: Murtadha Hubail <[email protected]>
Reviewed-by: Ali Alsuliman <[email protected]>
---
asterixdb/asterix-app/src/test/resources/cc-compression.conf | 2 +-
asterixdb/asterix-app/src/test/resources/cc-storage.conf | 2 +-
.../results/api/cluster_state_1/cluster_state_1.1.regexadm | 2 ++
.../api/cluster_state_1_full/cluster_state_1_full.1.regexadm | 2 ++
.../api/cluster_state_1_less/cluster_state_1_less.1.regexadm | 2 ++
.../java/org/apache/asterix/common/config/StorageProperties.java | 8 +++++++-
6 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/asterixdb/asterix-app/src/test/resources/cc-compression.conf
b/asterixdb/asterix-app/src/test/resources/cc-compression.conf
index 105d313..c8d9780 100644
--- a/asterixdb/asterix-app/src/test/resources/cc-compression.conf
+++ b/asterixdb/asterix-app/src/test/resources/cc-compression.conf
@@ -38,7 +38,6 @@ jvm.args=-Xmx4096m
-Dnode.Resolver="org.apache.asterix.external.util.IdentitiyRe
storage.buffercache.pagesize=32KB
storage.buffercache.size=128MB
storage.memorycomponent.globalbudget=512MB
-storage.compression.block=snappy
[cc]
address = 127.0.0.1
@@ -56,3 +55,4 @@ compiler.textsearchmemory=160KB
compiler.windowmemory=192KB
messaging.frame.size=4096
messaging.frame.count=512
+storage.compression.block=snappy
diff --git a/asterixdb/asterix-app/src/test/resources/cc-storage.conf
b/asterixdb/asterix-app/src/test/resources/cc-storage.conf
index 41296a7..9e869c7 100644
--- a/asterixdb/asterix-app/src/test/resources/cc-storage.conf
+++ b/asterixdb/asterix-app/src/test/resources/cc-storage.conf
@@ -36,7 +36,6 @@ jvm.args=-Xmx4096m
-Dnode.Resolver="org.apache.asterix.external.util.IdentitiyRe
storage.buffercache.pagesize=32KB
storage.buffercache.size=128MB
storage.memorycomponent.globalbudget=512MB
-storage.compression.block=snappy
[cc]
address = 127.0.0.1
@@ -54,5 +53,6 @@ compiler.textsearchmemory=160KB
compiler.windowmemory=192KB
messaging.frame.size=4096
messaging.frame.count=512
+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/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 e3a39ec..e377fd1 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
@@ -38,6 +38,8 @@
"replication\.strategy" : "none",
"replication\.timeout" : 30,
"ssl\.enabled" : false,
+ "storage.compression.block" : "snappy",
+ "storage.lsm.bloomfilter.falsepositiverate" : 0.01,
"txn\.commitprofiler\.enabled" : false,
"txn\.commitprofiler\.reportinterval" : 5,
"txn\.dataset\.checkpoint\.interval" : 3600,
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 d5e6a65..b9c2894 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
@@ -38,6 +38,8 @@
"replication\.strategy" : "none",
"replication\.timeout" : 30,
"ssl\.enabled" : false,
+ "storage.compression.block" : "snappy",
+ "storage.lsm.bloomfilter.falsepositiverate" : 0.01,
"txn\.commitprofiler\.enabled" : false,
"txn\.commitprofiler\.reportinterval" : 5,
"txn\.dataset\.checkpoint\.interval" : 3600,
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 555d1d9..e51d12f 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
@@ -38,6 +38,8 @@
"replication\.strategy" : "none",
"replication\.timeout" : 30,
"ssl\.enabled" : false,
+ "storage.compression.block" : "snappy",
+ "storage.lsm.bloomfilter.falsepositiverate" : 0.01,
"txn\.commitprofiler\.enabled" : false,
"txn\.commitprofiler\.reportinterval" : 5,
"txn\.dataset\.checkpoint\.interval" : 3600,
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 ed0bf9a..adf57fd 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
@@ -66,7 +66,13 @@ public class StorageProperties extends AbstractProperties {
@Override
public Section section() {
- return Section.NC;
+ switch (this) {
+ case STORAGE_COMPRESSION_BLOCK:
+ case STORAGE_LSM_BLOOMFILTER_FALSEPOSITIVERATE:
+ return Section.COMMON;
+ default:
+ return Section.NC;
+ }
}
@Override
