schema: max and min index interval

Signed-off-by: Glauber Costa <glommer@cloudius-systems.com>
nawenqiang · Jul 10, 2015 · ea17f6d · ea17f6d
1 parent aa270a1
commit ea17f6d
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 9 deletions.
diff --git a/cql3/statements/cf_prop_defs.hh b/cql3/statements/cf_prop_defs.hh
@@ -201,9 +201,16 @@ public:
         cfm.defaultTimeToLive(getInt(KW_DEFAULT_TIME_TO_LIVE, cfm.getDefaultTimeToLive()));
         cfm.speculativeRetry(CFMetaData.SpeculativeRetry.fromString(getString(KW_SPECULATIVE_RETRY, cfm.getSpeculativeRetry().toString())));
         cfm.memtableFlushPeriod(getInt(KW_MEMTABLE_FLUSH_PERIOD, cfm.getMemtableFlushPeriod()));
-        cfm.minIndexInterval(getInt(KW_MIN_INDEX_INTERVAL, cfm.getMinIndexInterval()));
-        cfm.maxIndexInterval(getInt(KW_MAX_INDEX_INTERVAL, cfm.getMaxIndexInterval()));
+#endif
+        if (has_property(KW_MIN_INDEX_INTERVAL)) {
+            builder.set_min_index_interval(get_int(KW_MIN_INDEX_INTERVAL, builder.get_min_index_interval()));
+        }
 
+        if (has_property(KW_MAX_INDEX_INTERVAL)) {
+            builder.set_max_index_interval(get_int(KW_MAX_INDEX_INTERVAL, builder.get_max_index_interval()));
+        }
+
+#if 0
         if (compactionStrategyClass != null)
         {
             cfm.compactionStrategyClass(compactionStrategyClass);

diff --git a/db/legacy_schema_tables.cc b/db/legacy_schema_tables.cc
@@ -1034,10 +1034,10 @@ future<> save_system_keyspace_schema() {
         m.set_clustered_cell(ckey, "local_read_repair_chance", table->dc_local_read_repair_chance(), timestamp);
         m.set_clustered_cell(ckey, "min_compaction_threshold", table->min_compaction_threshold(), timestamp);
         m.set_clustered_cell(ckey, "max_compaction_threshold", table->max_compaction_threshold(), timestamp);
+        m.set_clustered_cell(ckey, "min_index_interval", table->min_index_interval(), timestamp);
+        m.set_clustered_cell(ckey, "max_index_interval", table->max_index_interval(), timestamp);
 #if 0
-        adder.add("max_index_interval", table.getMaxIndexInterval());
         adder.add("memtable_flush_period_in_ms", table.getMemtableFlushPeriod());
-        adder.add("min_index_interval", table.getMinIndexInterval());
         adder.add("read_repair_chance", table.getReadRepairChance());
         adder.add("speculative_retry", table.getSpeculativeRetry().toString());
 
@@ -1298,13 +1298,15 @@ future<> save_system_keyspace_schema() {
         builder.set_compressor_params(cp);
 #if 0
         cfm.compactionStrategyOptions(fromJsonMap(result.getString("compaction_strategy_options")));
+#endif
 
-        if (result.has("min_index_interval"))
-            cfm.minIndexInterval(result.getInt("min_index_interval"));
+        if (table_row.has("min_index_interval")) {
+            builder.set_min_index_interval(table_row.get_nonnull<int>("min_index_interval"));
+        }
 
-        if (result.has("max_index_interval"))
-            cfm.maxIndexInterval(result.getInt("max_index_interval"));
-#endif
+        if (table_row.has("max_index_interval")) {
+            builder.set_max_index_interval(table_row.get_nonnull<int>("max_index_interval"));
+        }
 
         if (table_row.has("bloom_filter_fp_chance")) {
             builder.set_bloom_filter_fp_chance(table_row.get_nonnull<double>("bloom_filter_fp_chance"));

diff --git a/schema.hh b/schema.hh
@@ -177,6 +177,8 @@ private:
         double _dc_local_read_repair_chance = 0.1;
         int32_t _min_compaction_threshold = 4;
         int32_t _max_compaction_threshold = 32;
+        int32_t _min_index_interval = 128;
+        int32_t _max_index_interval = 2048;
     };
     raw_schema _raw;
     thrift_schema _thrift;
@@ -288,6 +290,14 @@ public:
         return _raw._max_compaction_threshold;
     }
 
+    int32_t min_index_interval() const {
+        return _raw._min_index_interval;
+    }
+
+    int32_t max_index_interval() const {
+        return _raw._max_index_interval;
+    }
+
     const column_definition* get_column_definition(const bytes& name) const;
     const_iterator regular_begin() const {
         return regular_columns().begin();

diff --git a/schema_builder.hh b/schema_builder.hh
@@ -84,6 +84,22 @@ public:
         return _raw._max_compaction_threshold;
     }
 
+    void set_min_index_interval(int32_t t) {
+        _raw._min_index_interval = t;
+    }
+
+    int32_t get_min_index_interval() {
+        return _raw._min_index_interval;
+    }
+
+    void set_max_index_interval(int32_t t) {
+        _raw._max_index_interval = t;
+    }
+
+    int32_t get_max_index_interval() {
+        return _raw._max_index_interval;
+    }
+
     void set_bloom_filter_fp_chance(double fp) {
         _raw._bloom_filter_fp_chance = fp;
     }