>From Murtadha Hubail <[email protected]>:

Murtadha Hubail has submitted this change. ( 
https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/17527 )

Change subject: [NO ISSUE][OTH] Move compile time storage config to common 
config
......................................................................

[NO ISSUE][OTH] Move compile time storage config to common config

- user model changes: no
- storage format changes: no
- interface changes: no

Details:

- Move the storage properties used during compilation to
  the properties common section to avoid warning of usage
  outside NC scope.

Change-Id: Iac165a252fcecd2e23bdd47cc69a67e5253edd58
Reviewed-on: https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/17527
Integration-Tests: Jenkins <[email protected]>
Reviewed-by: Till Westmann <[email protected]>
Tested-by: Jenkins <[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-common/src/main/java/org/apache/asterix/common/config/StorageProperties.java
M 
asterixdb/asterix-app/src/test/resources/runtimets/results/api/cluster_state_1_less/cluster_state_1_less.1.regexadm
4 files changed, 35 insertions(+), 0 deletions(-)

Approvals:
  Till Westmann: Looks good to me, approved
  Jenkins: Verified; Verified




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 f28c303..bdd3f51 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,7 +51,10 @@
     "replication\.strategy" : "none",
     "replication\.timeout" : 120,
     "ssl\.enabled" : false,
+    "storage.column.free.space.tolerance" : 0.15,
+    "storage.column.max.tuple.count" : 15000,
     "storage.compression.block" : "snappy",
+    "storage.format" : "row",
     "storage.global.cleanup.timeout" : 600,
     "storage.lsm.bloomfilter.falsepositiverate" : 0.01,
     "storage.partitioning" : "dynamic",
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 99001d8..7c416e6 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,7 +51,10 @@
     "replication\.strategy" : "none",
     "replication\.timeout" : 120,
     "ssl\.enabled" : false,
+    "storage.column.free.space.tolerance" : 0.15,
+    "storage.column.max.tuple.count" : 15000,
     "storage.compression.block" : "snappy",
+    "storage.format" : "row",
     "storage.global.cleanup.timeout" : 600,
     "storage.lsm.bloomfilter.falsepositiverate" : 0.01,
     "storage.partitioning" : "dynamic",
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 f62aee3..a28cc11 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,7 +51,10 @@
     "replication\.strategy" : "none",
     "replication\.timeout" : 120,
     "ssl\.enabled" : false,
+    "storage.column.free.space.tolerance" : 0.15,
+    "storage.column.max.tuple.count" : 15000,
     "storage.compression.block" : "snappy",
+    "storage.format" : "row",
     "storage.global.cleanup.timeout" : 600,
     "storage.lsm.bloomfilter.falsepositiverate" : 0.01,
     "storage.partitioning" : "dynamic",
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 d61ee14..70cd4ff 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
@@ -87,6 +87,9 @@
                 case STORAGE_GLOBAL_CLEANUP_TIMEOUT:
                 case STORAGE_PARTITIONING:
                 case STORAGE_PARTITIONS_COUNT:
+                case STORAGE_FORMAT:
+                case STORAGE_COLUMN_MAX_TUPLE_COUNT:
+                case STORAGE_COLUMN_FREE_SPACE_TOLERANCE:
                     return Section.COMMON;
                 default:
                     return Section.NC;

--
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/17527
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: Iac165a252fcecd2e23bdd47cc69a67e5253edd58
Gerrit-Change-Number: 17527
Gerrit-PatchSet: 4
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: Till Westmann <[email protected]>
Gerrit-MessageType: merged

Reply via email to