Skip to content
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

Jump to bottom

Implement DBInterface/SonicV2Connector in C++ #387

Merged
merged 37 commits into from
Oct 12, 2020
Merged

Implement DBInterface/SonicV2Connector in C++ #387

merged 37 commits into from
Oct 12, 2020

Conversation

qiluo-msft
Copy link
Contributor

@qiluo-msft qiluo-msft commented Sep 28, 2020 •
edited
Loading

This is the first step for merging sonic-py-swsssdk into sonic-swss-common. The whole plan is roughly listed as below

What I did in this PR:

  1. Extract RedisContext class from DBConnector class
  2. Extract DBConnector methods: subscribe/psubscribe/publish/config_set
  3. Implement DBInterface/SonicV2Connector in C++ which deriving from python implementation in https://github.com/Azure/sonic-py-swsssdk/
    • maintain the interfaces through the SWIG wrapper functions
    • Add set_redis_kwargs for easy handling python kwargs.

@qiluo-msft
[pyext] Add more OUTPUT type
eddb06e
@qiluo-msft
Refactor: add new class RedisConnector
639599d
@qiluo-msft
dbconnector: remove emtpy line
27dc476
@qiluo-msft
Refine script functions parameter
9341111
@qiluo-msft
Add copy constructor to RedisConnector
ee3a609
@qiluo-msft
Optimize DBConnector ctor
c358b24
@qiluo-msft
Revert back m_namespace
eab9a9b 
Signed-off-by: Qi Luo <qiluo-msft@users.noreply.github.com>
@qiluo-msft
Refactor: change name
89bd455
@qiluo-msft
Add new ctor for DBConnector from RedisContext and dbId
f11bca4
@qiluo-msft
(ongoing) Add DBInterface class
5f4e3da
@qiluo-msft
(temp, not build)
f731fcf 
Signed-off-by: Qi Luo <qiluo-msft@users.noreply.github.com>
@qiluo-msft
Fix build
c7b7023 
Signed-off-by: Qi Luo <qiluo-msft@users.noreply.github.com>
@qiluo-msft
Extract psubscribe and subscribe function into DBConnector class
9b4d414
@qiluo-msft
Implement _subscribe_keyspace_notification, _unsubscribe_keyspace_not…
d901fe5 
…ification and _connection_error_handler
@qiluo-msft
Implement blockable
03b99c5 
Signed-off-by: Qi Luo <qiluo-msft@users.noreply.github.com>
@qiluo-msft
Implement connect with retry
1aa56b4 
Signed-off-by: Qi Luo <qiluo-msft@users.noreply.github.com>
@qiluo-msft
Implement DBConnector::publish(),
a8457a9 
DBInterface::_unavailable_data_handler()

Signed-off-by: Qi Luo <qiluo-msft@users.noreply.github.com>
@qiluo-msft
Use c++11 syntax instead of c++14
87bcf7f
@qiluo-msft
Implement blocking for get and del
b0fbe03
@qiluo-msft
Add to pyext
bf779bd
@qiluo-msft
Add set_redis_kwargs(), fix _onetime_connect()
c193a6a
@lgtm-com
Copy link

lgtm-com bot commented Sep 29, 2020 •
edited by qiluo-msft
Loading

This pull request introduces 2 alerts when merging c193a6a into 3751c81 - view on LGTM.com

new alerts:

  • 2 for Inconsistent definition of copy constructor and assignment ('Rule of Two') #Closed

@qiluo-msft qiluo-msft changed the title Implement DBInterface in C++ Implement DBInterface/SonicV2Connector in C++ Oct 5, 2020
shi-su
shi-su previously approved these changes Oct 12, 2020
View reviewed changes
tests/test_redis_ut.py Outdated Show resolved Hide resolved
@qiluo-msft qiluo-msft merged commit 92a35d9 into sonic-net:master Oct 12, 2020
@qiluo-msft qiluo-msft deleted the qiluo/redisconn branch October 12, 2020 19:46
@daall daall mentioned this pull request Oct 12, 2020
Merged
qiluo-msft added a commit to qiluo-msft/sonic-swss-common that referenced this pull request Nov 3, 2020
@qiluo-msft
Revert "Implement DBInterface/SonicV2Connector in C++ (sonic-net#387)"
05bf17d 
This reverts commit 92a35d9.
@qiluo-msft qiluo-msft mentioned this pull request Nov 3, 2020
Merged
qiluo-msft added a commit that referenced this pull request Nov 4, 2020
@qiluo-msft
Fix: treat DBConnector timeout=0 as infinite timeout (#408)
ec96868 
Fixed a bug introduced by #387
Fixed sonic-net/sonic-buildimage#5697
@qiluo-msft qiluo-msft mentioned this pull request Nov 5, 2020
Merged
qiluo-msft added a commit to sonic-net/sonic-snmpagent that referenced this pull request Nov 6, 2020
@qiluo-msft
Replace swsssdk.SonicV2Connector with swsscommon.SonicV2Connector (SW…
6b94ec3 
…IG wrapper of C++ implementation) in production code (#162)

This is the following step for merging sonic-py-swsssdk into sonic-swss-common sonic-net/sonic-swss-common#387

Note: Test code could still using old python implementation
qiluo-msft added a commit to sonic-net/sonic-utilities that referenced this pull request Nov 6, 2020
@qiluo-msft
Replace swsssdk.SonicV2Connector with swsscommon.SonicV2Connector (SW…
0d49a85 
…IG wrapper of C++ implementation) in production code (#1217)

**- What I did**
This is the following step for merging sonic-py-swsssdk into sonic-swss-common sonic-net/sonic-swss-common#387

**- How I did it**

**- How to verify it**
Unit test and tested in DUT

* Replace swsssdk.SonicV2Connector with swsscommon.SonicV2Connector (SWIG wrapper of C++ implementation) in production code
* Remove extra statement
* Move back the import to original place
kktheballer pushed a commit to kktheballer/sonic-swss-common that referenced this pull request Dec 21, 2020
@qiluo-msft @kktheballer
Implement DBInterface/SonicV2Connector in C++ (sonic-net#387)
5a4f355 
* [pyext] Add more OUTPUT type
* Refactor: add new class RedisConnector
* dbconnector: remove emtpy line
* Refine script functions parameter
* Add copy constructor to RedisConnector
* Optimize DBConnector ctor
* Revert back m_namespace
* Refactor: change name
* Fix build
* Extract psubscribe and subscribe function into DBConnector class
* Implement _subscribe_keyspace_notification, _unsubscribe_keyspace_notification and _connection_error_handler
* Implement blockable
* Implement connect with retry
* Implement DBConnector::publish(),
* Use c++11 syntax instead of c++14
* Implement blocking for get and del
* Add to pyext
* Add set_redis_kwargs(), fix _onetime_connect()
* Fix LGTM: delete implicitly-declared copy assignment operator
* update DBInterface redis_client index from db_id to db_name
* Add DBInterface::delete_all_by_pattern()
* Add SonicV2Connector class
* Add unit test for SonicV2Connector
* Make const strings public because they are used as public method default parameters
* SWIG supports keyword arguments in generated python module
* Add python namespace property to DBConnector class, solve the paramter conflicting with C++ keyword by customizing python code generation
* Move SonicV2Connector to standalone .h/.cpp files
* Add missing include statements into SWIG inteface file
* Add pytest unit test for DBInterface and SonicV2Connector
* Fix swig customization on SonicV2Connector ctor
* Add attrib SonicV2Connector.namespace
* Remove debug code
* Use EXPECT_NE to simplify test
* Remove unused code
kktheballer pushed a commit to kktheballer/sonic-swss-common that referenced this pull request Dec 21, 2020
@qiluo-msft @kktheballer
Fix: treat DBConnector timeout=0 as infinite timeout (sonic-net#408)
e06d97b 
Fixed a bug introduced by sonic-net#387
Fixed sonic-net/sonic-buildimage#5697
kktheballer pushed a commit to kktheballer/sonic-swss-common that referenced this pull request Jan 21, 2021
@qiluo-msft
Implement DBInterface/SonicV2Connector in C++ (sonic-net#387)
4a0fdc5 
* [pyext] Add more OUTPUT type
* Refactor: add new class RedisConnector
* dbconnector: remove emtpy line
* Refine script functions parameter
* Add copy constructor to RedisConnector
* Optimize DBConnector ctor
* Revert back m_namespace
* Refactor: change name
* Fix build
* Extract psubscribe and subscribe function into DBConnector class
* Implement _subscribe_keyspace_notification, _unsubscribe_keyspace_notification and _connection_error_handler
* Implement blockable
* Implement connect with retry
* Implement DBConnector::publish(),
* Use c++11 syntax instead of c++14
* Implement blocking for get and del
* Add to pyext
* Add set_redis_kwargs(), fix _onetime_connect()
* Fix LGTM: delete implicitly-declared copy assignment operator
* update DBInterface redis_client index from db_id to db_name
* Add DBInterface::delete_all_by_pattern()
* Add SonicV2Connector class
* Add unit test for SonicV2Connector
* Make const strings public because they are used as public method default parameters
* SWIG supports keyword arguments in generated python module
* Add python namespace property to DBConnector class, solve the paramter conflicting with C++ keyword by customizing python code generation
* Move SonicV2Connector to standalone .h/.cpp files
* Add missing include statements into SWIG inteface file
* Add pytest unit test for DBInterface and SonicV2Connector
* Fix swig customization on SonicV2Connector ctor
* Add attrib SonicV2Connector.namespace
* Remove debug code
* Use EXPECT_NE to simplify test
* Remove unused code
kktheballer pushed a commit to kktheballer/sonic-swss-common that referenced this pull request Jan 21, 2021
@qiluo-msft
Fix: treat DBConnector timeout=0 as infinite timeout (sonic-net#408)
5814c65 
Fixed a bug introduced by sonic-net#387
Fixed sonic-net/sonic-buildimage#5697
kktheballer pushed a commit to kktheballer/sonic-swss-common that referenced this pull request Feb 25, 2021
@qiluo-msft @kktheballer
Implement DBInterface/SonicV2Connector in C++ (sonic-net#387)
16435a4 
* [pyext] Add more OUTPUT type
* Refactor: add new class RedisConnector
* dbconnector: remove emtpy line
* Refine script functions parameter
* Add copy constructor to RedisConnector
* Optimize DBConnector ctor
* Revert back m_namespace
* Refactor: change name
* Fix build
* Extract psubscribe and subscribe function into DBConnector class
* Implement _subscribe_keyspace_notification, _unsubscribe_keyspace_notification and _connection_error_handler
* Implement blockable
* Implement connect with retry
* Implement DBConnector::publish(),
* Use c++11 syntax instead of c++14
* Implement blocking for get and del
* Add to pyext
* Add set_redis_kwargs(), fix _onetime_connect()
* Fix LGTM: delete implicitly-declared copy assignment operator
* update DBInterface redis_client index from db_id to db_name
* Add DBInterface::delete_all_by_pattern()
* Add SonicV2Connector class
* Add unit test for SonicV2Connector
* Make const strings public because they are used as public method default parameters
* SWIG supports keyword arguments in generated python module
* Add python namespace property to DBConnector class, solve the paramter conflicting with C++ keyword by customizing python code generation
* Move SonicV2Connector to standalone .h/.cpp files
* Add missing include statements into SWIG inteface file
* Add pytest unit test for DBInterface and SonicV2Connector
* Fix swig customization on SonicV2Connector ctor
* Add attrib SonicV2Connector.namespace
* Remove debug code
* Use EXPECT_NE to simplify test
* Remove unused code
kktheballer pushed a commit to kktheballer/sonic-swss-common that referenced this pull request Feb 25, 2021
@qiluo-msft @kktheballer
Fix: treat DBConnector timeout=0 as infinite timeout (sonic-net#408)
b92d0f3 
Fixed a bug introduced by sonic-net#387
Fixed sonic-net/sonic-buildimage#5697
kktheballer pushed a commit to kktheballer/sonic-swss-common that referenced this pull request Jul 20, 2021
@qiluo-msft @kktheballer
Implement DBInterface/SonicV2Connector in C++ (sonic-net#387)
0910bf8 
* [pyext] Add more OUTPUT type
* Refactor: add new class RedisConnector
* dbconnector: remove emtpy line
* Refine script functions parameter
* Add copy constructor to RedisConnector
* Optimize DBConnector ctor
* Revert back m_namespace
* Refactor: change name
* Fix build
* Extract psubscribe and subscribe function into DBConnector class
* Implement _subscribe_keyspace_notification, _unsubscribe_keyspace_notification and _connection_error_handler
* Implement blockable
* Implement connect with retry
* Implement DBConnector::publish(),
* Use c++11 syntax instead of c++14
* Implement blocking for get and del
* Add to pyext
* Add set_redis_kwargs(), fix _onetime_connect()
* Fix LGTM: delete implicitly-declared copy assignment operator
* update DBInterface redis_client index from db_id to db_name
* Add DBInterface::delete_all_by_pattern()
* Add SonicV2Connector class
* Add unit test for SonicV2Connector
* Make const strings public because they are used as public method default parameters
* SWIG supports keyword arguments in generated python module
* Add python namespace property to DBConnector class, solve the paramter conflicting with C++ keyword by customizing python code generation
* Move SonicV2Connector to standalone .h/.cpp files
* Add missing include statements into SWIG inteface file
* Add pytest unit test for DBInterface and SonicV2Connector
* Fix swig customization on SonicV2Connector ctor
* Add attrib SonicV2Connector.namespace
* Remove debug code
* Use EXPECT_NE to simplify test
* Remove unused code
kktheballer pushed a commit to kktheballer/sonic-swss-common that referenced this pull request Jul 20, 2021
@qiluo-msft @kktheballer
Fix: treat DBConnector timeout=0 as infinite timeout (sonic-net#408)
2478afe 
Fixed a bug introduced by sonic-net#387
Fixed sonic-net/sonic-buildimage#5697
@sshankar-marvell sshankar-marvell mentioned this pull request Oct 31, 2022
Open
malletvapid23 added a commit to malletvapid23/Sonic-Utility that referenced this pull request Aug 3, 2023
@malletvapid23
Replace swsssdk.SonicV2Connector with swsscommon.SonicV2Connector (SW…
c16391a 
…IG wrapper of C++ implementation) in production code (#1217)

**- What I did**
This is the following step for merging sonic-py-swsssdk into sonic-swss-common sonic-net/sonic-swss-common#387

**- How I did it**

**- How to verify it**
Unit test and tested in DUT

* Replace swsssdk.SonicV2Connector with swsscommon.SonicV2Connector (SWIG wrapper of C++ implementation) in production code
* Remove extra statement
* Move back the import to original place
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@shi-su shi-su shi-su approved these changes

@kcudnik kcudnik kcudnik left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@qiluo-msft @kcudnik @shi-su