Skip to content

PHPC-976: isDefault() method for read and write concerns #611

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jmikola merged 1 commit into from
Jul 12, 2017
Merged

PHPC-976: isDefault() method for read and write concerns #611

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions src/MongoDB/ReadConcern.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,23 @@ static PHP_METHOD(ReadConcern, getLevel)
RETURN_NULL();
} /* }}} */

/* {{{ proto boolean MongoDB\Driver\ReadConcern::isDefault()
Returns whether the read concern has not been modified (i.e. constructed
without a level or from a Manager with no read concern URI options). */
static PHP_METHOD(ReadConcern, isDefault)
{
php_phongo_readconcern_t *intern;
SUPPRESS_UNUSED_WARNING(return_value_ptr) SUPPRESS_UNUSED_WARNING(return_value_used)

intern = Z_READCONCERN_OBJ_P(getThis());

if (zend_parse_parameters_none() == FAILURE) {
return;
}

RETURN_BOOL(mongoc_read_concern_is_default(intern->read_concern));
} /* }}} */

/* {{{ proto array MongoDB\Driver\ReadConcern::bsonSerialize()
*/
static PHP_METHOD(ReadConcern, bsonSerialize)
Expand All @@ -104,6 +121,7 @@ ZEND_END_ARG_INFO()
static zend_function_entry php_phongo_readconcern_me[] = {
PHP_ME(ReadConcern, __construct, ai_ReadConcern___construct, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL)
PHP_ME(ReadConcern, getLevel, ai_ReadConcern_void, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL)
PHP_ME(ReadConcern, isDefault, ai_ReadConcern_void, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL)
PHP_ME(ReadConcern, bsonSerialize, ai_ReadConcern_void, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL)
PHP_FE_END
};
Expand Down
18 changes: 18 additions & 0 deletions src/MongoDB/WriteConcern.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,23 @@ static PHP_METHOD(WriteConcern, getJournal)
RETURN_NULL();
} /* }}} */

/* {{{ proto boolean MongoDB\Driver\WriteConcern::isDefault()
Returns whether the write concern has not been modified (i.e. from a Manager
with no write concern URI options). */
static PHP_METHOD(WriteConcern, isDefault)
{
php_phongo_writeconcern_t *intern;
SUPPRESS_UNUSED_WARNING(return_value_ptr) SUPPRESS_UNUSED_WARNING(return_value_used)

intern = Z_WRITECONCERN_OBJ_P(getThis());

if (zend_parse_parameters_none() == FAILURE) {
return;
}

RETURN_BOOL(mongoc_write_concern_is_default(intern->write_concern));
} /* }}} */

/* {{{ proto array MongoDB\Driver\WriteConcern::bsonSerialize()
*/
static PHP_METHOD(WriteConcern, bsonSerialize)
Expand Down Expand Up @@ -187,6 +204,7 @@ static zend_function_entry php_phongo_writeconcern_me[] = {
PHP_ME(WriteConcern, getW, ai_WriteConcern_void, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL)
PHP_ME(WriteConcern, getWtimeout, ai_WriteConcern_void, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL)
PHP_ME(WriteConcern, getJournal, ai_WriteConcern_void, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL)
PHP_ME(WriteConcern, isDefault, ai_WriteConcern_void, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL)
PHP_ME(WriteConcern, bsonSerialize, ai_WriteConcern_void, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL)
PHP_FE_END
};
Expand Down
2 changes: 1 addition & 1 deletion src/libmongoc
Open in desktop
Submodule libmongoc updated 30 files
+1 −1 .evergreen/compile-unix.sh
+3 −3 .evergreen/config.yml
+3 −1 Makefile.am
+4 −1 NEWS
+29 −27 build/autotools/CheckSnappy.m4
+28 −27 build/autotools/CheckZlib.m4
+3 −3 build/autotools/PrintBuildConfiguration.m4
+16 −0 build/autotools/ReadCommandLineArguments.m4
+6 −0 build/autotools/SetupAutomake.m4
+1 −1 configure.ac
+22 −0 doc/mongoc_read_concern_is_default.rst
+1 −0 doc/mongoc_read_concern_t.rst
+23 −0 doc/mongoc_write_concern_is_default.rst
+1 −0 doc/mongoc_write_concern_t.rst
+1 −1 src/libbson
+5 −3 src/mongoc/mongoc-async-cmd.c
+2 −2 src/mongoc/mongoc-client.c
+33 −14 src/mongoc/mongoc-cluster.c
+5 −39 src/mongoc/mongoc-cursor.c
+0 −2 src/mongoc/mongoc-read-concern-private.h
+2 −4 src/mongoc/mongoc-read-concern.c
+2 −1 src/mongoc/mongoc-read-concern.h
+2 −2 src/mongoc/mongoc-rpc-private.h
+95 −22 src/mongoc/mongoc-rpc.c
+1 −2 src/mongoc/mongoc-server-description.c
+1 −1 src/mongoc/mongoc-uri.c
+0 −2 src/mongoc/mongoc-write-concern-private.h
+2 −4 src/mongoc/mongoc-write-concern.c
+2 −0 src/mongoc/mongoc-write-concern.h
+1 −1 tests/test-mongoc-connection-uri.c
38 changes: 38 additions & 0 deletions tests/readConcern/readconcern-isdefault-001.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
--TEST--
MongoDB\Driver\ReadConcern::isDefault()
--SKIPIF--
<?php require __DIR__ . "/../utils/basic-skipif.inc"?>
--FILE--
<?php
require_once __DIR__ . "/../utils/basic.inc";

$tests = array(
new MongoDB\Driver\ReadConcern(),
new MongoDB\Driver\ReadConcern(null),
new MongoDB\Driver\ReadConcern(MongoDB\Driver\ReadConcern::LOCAL),
new MongoDB\Driver\ReadConcern(MongoDB\Driver\ReadConcern::MAJORITY),
new MongoDB\Driver\ReadConcern('not-yet-supported'),
(new MongoDB\Driver\Manager('mongodb://127.0.0.1/?readconcernlevel=local'))->getReadConcern(),
(new MongoDB\Driver\Manager(null, ['readconcernlevel' => 'local']))->getReadConcern(),
(new MongoDB\Driver\Manager(null, ['readconcernlevel' => '']))->getReadConcern(),
(new MongoDB\Driver\Manager)->getReadConcern(),
);

foreach ($tests as $rc) {
var_dump($rc->isDefault());
}

?>
===DONE===
<?php exit(0); ?>
--EXPECT--
bool(true)
bool(true)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(true)
===DONE===
28 changes: 28 additions & 0 deletions tests/writeConcern/writeconcern-isdefault-001.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
--TEST--
MongoDB\Driver\WriteConcern::isDefault()
--SKIPIF--
<?php require __DIR__ . "/../utils/basic-skipif.inc"?>
--FILE--
<?php
require_once __DIR__ . "/../utils/basic.inc";

$tests = array(
new MongoDB\Driver\WriteConcern(1),
(new MongoDB\Driver\Manager('mongodb://127.0.0.1/?w=1'))->getWriteConcern(),
(new MongoDB\Driver\Manager(null, ['w' => 1]))->getWriteConcern(),
(new MongoDB\Driver\Manager)->getWriteConcern(),
);

foreach ($tests as $wc) {
var_dump($wc->isDefault());
}

?>
===DONE===
<?php exit(0); ?>
--EXPECT--
bool(false)
bool(false)
bool(false)
bool(true)
===DONE===