add missing fields and fix doc blocks

Author: Bulat Shakirzyanov

ext/doc/Cassandra/DefaultKeyspace.php

@@ -40,7 +40,7 @@ public function replicationClassName() {}
     /**
      * {@inheritDoc}
      *
-     * @return array Replication options
+     * @return Cassandra\Map Replication options
      */
     public function replicationOptions() {}
 

ext/doc/Cassandra/DefaultTable.php

@@ -110,17 +110,41 @@ public function compactionStrategyClassName() {}
     /**
      * {@inheritDoc}
      *
-     * @return string Compaction strategy options
+     * @return Cassandra\Map Compaction strategy options
      */
     public function compactionStrategyOptions() {}
 
     /**
      * {@inheritDoc}
      *
-     * @return string Compression parameters
+     * @return Cassandra\Map Compression parameters
      */
     public function compressionParameters() {}
 
+    /**
+     * {@inheritDoc}
+     * @return boolean|null Value of `populate_io_cache_on_flush`
+     */
+    public function populateIOCacheOnFlush();
+
+    /**
+     * {@inheritDoc}
+     * @return boolean|null Value of `replicate_on_write`
+     */
+    public function replicateOnWrite();
+
+    /**
+     * {@inheritDoc}
+     * @return int|null Value of `max_index_interval`
+     */
+    public function maxIndexInterval();
+
+    /**
+     * {@inheritDoc}
+     * @return int|null Value of `min_index_interval`
+     */
+    public function minIndexInterval();
+
     /**
      * {@inheritDoc}
      *

ext/doc/Cassandra/Keyspace.php

@@ -37,7 +37,7 @@ function replicationClassName();
 
     /**
      * Returns replication options
-     * @return array Replication options
+     * @return Cassandra\Map Replication options
      */
     function replicationOptions();
 

ext/doc/Cassandra/Table.php

@@ -97,16 +97,40 @@ function compactionStrategyClassName();
 
     /**
      * Returns compaction strategy options
-     * @return string Compaction strategy options
+     * @return Cassandra\Map Compaction strategy options
      */
     function compactionStrategyOptions();
 
     /**
      * Returns compression parameters
-     * @return string Compression parameters
+     * @return Cassandra\Map Compression parameters
      */
     function compressionParameters();
 
+    /**
+     * Returns whether or not the `populate_io_cache_on_flush` is true
+     * @return boolean|null Value of `populate_io_cache_on_flush`
+     */
+    function populateIOCacheOnFlush();
+
+    /**
+     * Returns whether or not the `replicate_on_write` is true
+     * @return boolean|null Value of `replicate_on_write`
+     */
+    function replicateOnWrite();
+
+    /**
+     * Returns the value of `max_index_interval`
+     * @return int|null Value of `max_index_interval`
+     */
+    function maxIndexInterval();
+
+    /**
+     * Returns the value of `min_index_interval`
+     * @return int|null Value of `min_index_interval`
+     */
+    function minIndexInterval();
+
     /**
      * Returns column by name
      * @param  string           $name Name of the column

ext/src/Cassandra/DefaultTable.c

@@ -310,6 +310,61 @@ PHP_METHOD(DefaultTable, columns)
   cass_iterator_free(iterator);
 }
 
+PHP_METHOD(DefaultTable, populateIOCacheOnFlush)
+{
+  cassandra_table* self;
+  zval* value;
+
+  if (zend_parse_parameters_none() == FAILURE)
+    return;
+
+  self = (cassandra_table*) zend_object_store_get_object(getThis() TSRMLS_CC);
+
+  php_cassandra_get_schema_field(self->meta, "populate_io_cache_on_flush", &value TSRMLS_CC);
+  RETURN_ZVAL(value, 0, 1);
+}
+
+PHP_METHOD(DefaultTable, replicateOnWrite)
+{
+  cassandra_table* self;
+  zval* value;
+
+  if (zend_parse_parameters_none() == FAILURE)
+    return;
+
+  self = (cassandra_table*) zend_object_store_get_object(getThis() TSRMLS_CC);
+
+  php_cassandra_get_schema_field(self->meta, "replicate_on_write", &value TSRMLS_CC);
+  RETURN_ZVAL(value, 0, 1);
+}
+
+PHP_METHOD(DefaultTable, maxIndexInterval)
+{
+  cassandra_table* self;
+  zval* value;
+
+  if (zend_parse_parameters_none() == FAILURE)
+    return;
+
+  self = (cassandra_table*) zend_object_store_get_object(getThis() TSRMLS_CC);
+
+  php_cassandra_get_schema_field(self->meta, "max_index_interval", &value TSRMLS_CC);
+  RETURN_ZVAL(value, 0, 1);
+}
+
+PHP_METHOD(DefaultTable, minIndexInterval)
+{
+  cassandra_table* self;
+  zval* value;
+
+  if (zend_parse_parameters_none() == FAILURE)
+    return;
+
+  self = (cassandra_table*) zend_object_store_get_object(getThis() TSRMLS_CC);
+
+  php_cassandra_get_schema_field(self->meta, "min_index_interval", &value TSRMLS_CC);
+  RETURN_ZVAL(value, 0, 1);
+}
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_name, 0, ZEND_RETURN_VALUE, 1)
   ZEND_ARG_INFO(0, name)
@@ -333,6 +388,10 @@ static zend_function_entry cassandra_default_table_methods[] = {
   PHP_ME(DefaultTable, compactionStrategyClassName, arginfo_none, ZEND_ACC_PUBLIC)
   PHP_ME(DefaultTable, compactionStrategyOptions, arginfo_none, ZEND_ACC_PUBLIC)
   PHP_ME(DefaultTable, compressionParameters, arginfo_none, ZEND_ACC_PUBLIC)
+  PHP_ME(DefaultTable, populateIOCacheOnFlush, arginfo_none, ZEND_ACC_PUBLIC)
+  PHP_ME(DefaultTable, replicateOnWrite, arginfo_none, ZEND_ACC_PUBLIC)
+  PHP_ME(DefaultTable, maxIndexInterval, arginfo_none, ZEND_ACC_PUBLIC)
+  PHP_ME(DefaultTable, minIndexInterval, arginfo_none, ZEND_ACC_PUBLIC)
   PHP_ME(DefaultTable, column, arginfo_name, ZEND_ACC_PUBLIC)
   PHP_ME(DefaultTable, columns, arginfo_none, ZEND_ACC_PUBLIC)
   PHP_FE_END

ext/src/Cassandra/Table.c

@@ -24,6 +24,10 @@ static zend_function_entry cassandra_table_methods[] = {
   PHP_ABSTRACT_ME(Table, compactionStrategyClassName, arginfo_none)
   PHP_ABSTRACT_ME(Table, compactionStrategyOptions, arginfo_none)
   PHP_ABSTRACT_ME(Table, compressionParameters, arginfo_none)
+  PHP_ABSTRACT_ME(Table, populateIOCacheOnFlush, arginfo_none)
+  PHP_ABSTRACT_ME(Table, replicateOnWrite, arginfo_none)
+  PHP_ABSTRACT_ME(Table, maxIndexInterval, arginfo_none)
+  PHP_ABSTRACT_ME(Table, minIndexInterval, arginfo_none)
   PHP_ABSTRACT_ME(Table, column, arginfo_name)
   PHP_ABSTRACT_ME(Table, columns, arginfo_none)
   PHP_FE_END

ext/util/result.c

@@ -236,8 +236,24 @@ php_cassandra_value(const CassValue* value, CassValueType type, zval** out TSRML
 int
 php_cassandra_get_schema_field(const CassSchemaMeta* metadata, const char* field_name, zval** out TSRMLS_DC)
 {
-  const CassSchemaMetaField* field = cass_schema_meta_get_field(metadata, field_name);
-  const CassValue*           value = cass_schema_meta_field_value(field);
+  const CassSchemaMetaField* field;
+  const CassValue* value;
+
+  field = cass_schema_meta_get_field(metadata, field_name);
+
+  if (field == NULL) {
+    MAKE_STD_ZVAL(*out);
+    ZVAL_NULL(*out);
+    return SUCCESS;
+  }
+
+  value = cass_schema_meta_field_value(field);
+
+  if (value == NULL) {
+    MAKE_STD_ZVAL(*out);
+    ZVAL_NULL(*out);
+    return SUCCESS;
+  }
 
   return php_cassandra_value(value, cass_value_type(value), out TSRMLS_CC);
 }