diff options
| author | Olivier Bertrand <bertrandop@gmail.com> | 2017-07-18 13:16:55 +0200 |
|---|---|---|
| committer | Olivier Bertrand <bertrandop@gmail.com> | 2017-07-18 13:16:55 +0200 |
| commit | f590296c28ec54007692181e010d7064c1071ff2 (patch) | |
| tree | 8ca5932a93f59bb60abfb0928ef483e96ed999d6 /storage/connect/cmgoconn.h | |
| parent | a9d32010d0ba36cc9b9d7fb58eeace687bb13f7a (diff) | |
| download | mariadb-git-f590296c28ec54007692181e010d7064c1071ff2.tar.gz | |
-- Finalize work on MongoDB access
Implement discovery for the MongoDB Java Driver
Create classes to minimize code and avoid dupicates
Rearrange and rename implied files
modified: storage/connect/CMakeLists.txt
renamed: storage/connect/mongofam.cpp -> storage/connect/cmgfam.cpp
renamed: storage/connect/mongofam.h -> storage/connect/cmgfam.h
modified: storage/connect/cmgoconn.h
modified: storage/connect/javaconn.h
modified: storage/connect/jdbconn.cpp
modified: storage/connect/jmgoconn.cpp
modified: storage/connect/jmgoconn.h
modified: storage/connect/mongo.cpp
modified: storage/connect/mongo.h
renamed: storage/connect/tabmgo.cpp -> storage/connect/tabcmg.cpp
renamed: storage/connect/tabmgo.h -> storage/connect/tabcmg.h
modified: storage/connect/tabjmg.cpp
modified: storage/connect/tabjmg.h
modified: storage/connect/tabjson.cpp
modified: storage/connect/tabjson.h
-- Trace Sarea allocation and freeing
modified: storage/connect/connect.cc
modified: storage/connect/plugutil.cpp
modified: storage/connect/user_connect.cc
-- Null Json values where not mark as null in JSNX::SetJsonValue
This was added in TYPE_NULL (declared as TYPE_VOID)
modified: storage/connect/json.cpp
modified: storage/connect/json.h
modified: storage/connect/jsonudf.cpp
-- Null JValues are ignored in JSNX::CalculateArray
Also done in tabjson.cpp for JSONCOL::CalculateArray
modified: storage/connect/json.h
modified: storage/connect/jsonudf.cpp
modified: storage/connect/tabjson.cpp
-- Null JSON values now represented by connect_json_null session variable
modified: storage/connect/json.cpp
modified: storage/connect/json.h
modified: storage/connect/jsonudf.cpp
modified: storage/connect/tabjson.cpp
-- JVALUE has size = 1
modified: storage/connect/json.h
-- Fix by vuvova because Debian compilation failure.
modified: storage/connect/value.cpp
Diffstat (limited to 'storage/connect/cmgoconn.h')
| -rw-r--r-- | storage/connect/cmgoconn.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/storage/connect/cmgoconn.h b/storage/connect/cmgoconn.h index 9e1361039ab..47275f54381 100644 --- a/storage/connect/cmgoconn.h +++ b/storage/connect/cmgoconn.h @@ -10,7 +10,7 @@ #include <mongoc.h> // C connection to a MongoDB data source -class TDBMGO; +class TDBCMG; class MGOCOL; /***********************************************************************/ @@ -18,7 +18,7 @@ class MGOCOL; /***********************************************************************/ typedef class INCOL *PINCOL; typedef class MGODEF *PMGODEF; -typedef class TDBMGO *PTDBMGO; +typedef class TDBCMG *PTDBCMG; typedef class MGOCOL *PMGOCOL; typedef struct mongo_parms { @@ -63,8 +63,8 @@ public: /* CMgoConn class. */ /***********************************************************************/ class CMgoConn : public BLOCK { - friend class TDBMGO; - friend class MGODISC; + friend class TDBCMG; + friend class CMGDISC; public: // Constructor CMgoConn(PGLOBAL g, PCPARM pcg); |