Skip to content

Commit 27db2e9

Browse files
release 300.0.1
1 parent 2bf18f6 commit 27db2e9

File tree

98 files changed

+7065
-4906
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

98 files changed

+7065
-4906
lines changed

example/DFSWriting/dfsWriting.cpp

Lines changed: 0 additions & 186 deletions
This file was deleted.
-366 KB
Binary file not shown.

include/AsynWorker.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ class AsynWorker: public Runnable {
1010
using Task = DBConnectionPoolImpl::Task;
1111
AsynWorker(DBConnectionPoolImpl& pool, CountDownLatchSP latch, const SmartPointer<DBConnection>& conn,
1212
const SmartPointer<SynchronizedQueue<Task>>& queue, TaskStatusMgmt& status,
13-
const string& hostName, int port, const string& userId , const string& password)
13+
const std::string& hostName, int port, const std::string& userId , const std::string& password)
1414
: pool_(pool), latch_(latch), conn_(conn), queue_(queue),taskStatus_(status),
1515
hostName_(hostName), port_(port), userId_(userId), password_(password){}
1616
protected:
@@ -22,10 +22,10 @@ class AsynWorker: public Runnable {
2222
SmartPointer<DBConnection> conn_;
2323
SmartPointer<SynchronizedQueue<Task>> queue_;
2424
TaskStatusMgmt& taskStatus_;
25-
const string hostName_;
25+
const std::string hostName_;
2626
int port_;
27-
const string userId_;
28-
const string password_;
27+
const std::string userId_;
28+
const std::string password_;
2929
};
3030

3131
}

include/BatchTableWriter.h

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -39,28 +39,28 @@ class EXPORT_DECL BatchTableWriter {
3939
* table, and the parameter tableName should be a null string. If error is raised on the server, this
4040
* function throws an exception.
4141
*/
42-
void addTable(const string& dbName, const string& tableName="", bool partitioned=true);
42+
void addTable(const std::string& dbName, const std::string& tableName="", bool partitioned=true);
4343

4444
/**
4545
* Gets the current size of the specified table write queue and whethre the specified table is removed. If
4646
* the specified table is not added first, this function throw and exception.
4747
*/
48-
std::tuple<int,bool,bool> getStatus(const string& dbName, const string& tableName="");
48+
std::tuple<int,bool,bool> getStatus(const std::string& dbName, const std::string& tableName="");
4949

5050
/**
5151
* Gets the current size of all table write queue, number of rows already sended to server, whether a
5252
* table is being removed, and whether the backgroud thread is returned because of error.
5353
*/
5454
TableSP getAllStatus();
5555

56-
TableSP getUnwrittenData(const string& dbName, const string& tableName="");
56+
TableSP getUnwrittenData(const std::string& dbName, const std::string& tableName="");
5757

5858
/**
5959
* Release the resouces occupied by the specified table, including write queue and write thread. If this
6060
* function is called to add an in-memory table, the parameter dbName indicates the name of the in-memory
6161
* table, and the parameter tableName should be a null string.
6262
*/
63-
void removeTable(const string& dbName, const string& tableName="");
63+
void removeTable(const std::string& dbName, const std::string& tableName="");
6464

6565
/**
6666
* Insert a row into the specified table. If this function is called to insert data into an in-memory table,
@@ -72,7 +72,7 @@ class EXPORT_DECL BatchTableWriter {
7272
* If the background thread fails to write a row, it will print error message to std::cerr and return.
7373
*/
7474
template<typename... Targs>
75-
void insert(const string& dbName, const string& tableName, Targs... Fargs){
75+
void insert(const std::string& dbName, const std::string& tableName, Targs... Fargs){
7676
//RECORDTIME("BTW::insert");
7777
SmartPointer<DestTable> destTable;
7878
{
@@ -104,7 +104,7 @@ class EXPORT_DECL BatchTableWriter {
104104
TableSP colDefs;
105105
int columnNum;
106106
ConstantSP colDefsTypeInt;
107-
std::vector<string> colNames;
107+
std::vector<std::string> colNames;
108108
std::vector<DATA_TYPE> colTypes;
109109
std::string createTmpSharedTable;
110110
SynchronizedQueue<std::vector<ConstantSP>> writeQueue;
@@ -183,5 +183,5 @@ class EXPORT_DECL BatchTableWriter {
183183
};
184184

185185

186-
};
186+
}
187187
#endif /* BATCHTABLEWRITER_H_ */

include/Compress.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,5 +63,5 @@ class CompressDeltaofDelta : public CompressEncoderDecoder {
6363
static const int maxCompressedSize_;
6464
};
6565

66-
};//dolphindb
66+
}//dolphindb
6767
#endif//COMPRESSION_H_

include/Concurrent.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -647,6 +647,6 @@ class BlockingQueue {
647647

648648
};
649649

650-
};
650+
}
651651

652652
#endif /* CONCURRENT_H_ */

include/Constant.h

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -77,9 +77,9 @@ class EXPORT_DECL Constant {
7777
virtual INDEX getIndex() const {throw RuntimeException("The object can't be converted to index scalar.");}
7878
virtual float getFloat() const {throw RuntimeException("The object can't be converted to float scalar.");}
7979
virtual double getDouble() const {throw RuntimeException("The object can't be converted to double scalar.");}
80-
virtual string getString() const {return "";}
81-
virtual string getScript() const { return getString();}
82-
virtual const string& getStringRef() const {return EMPTY;}
80+
virtual std::string getString() const {return "";}
81+
virtual std::string getScript() const { return getString();}
82+
virtual const std::string& getStringRef() const {return EMPTY;}
8383
virtual const Guid getUuid() const {return getInt128();}
8484
virtual const Guid getInt128() const {throw RuntimeException("The object can't be converted to uuid scalar.");}
8585
virtual const unsigned char* getBinary() const {throw RuntimeException("The object can't be converted to int128 scalar.");}
@@ -94,7 +94,7 @@ class EXPORT_DECL Constant {
9494
virtual void setIndex(INDEX val){}
9595
virtual void setFloat(float val){}
9696
virtual void setDouble(double val){}
97-
virtual void setString(const string& val){}
97+
virtual void setString(const std::string& val){}
9898
virtual void setBinary(const unsigned char* val, int unitLength){}
9999
virtual void setNull(){}
100100

@@ -106,8 +106,8 @@ class EXPORT_DECL Constant {
106106
virtual INDEX getIndex(INDEX index) const {return getIndex();}
107107
virtual float getFloat(INDEX index) const {return getFloat();}
108108
virtual double getDouble(INDEX index) const {return getDouble();}
109-
virtual string getString(INDEX index) const {return getString();}
110-
virtual const string& getStringRef(INDEX index) const {return EMPTY;}
109+
virtual std::string getString(INDEX index) const {return getString();}
110+
virtual const std::string& getStringRef(INDEX index) const {return EMPTY;}
111111
virtual bool isNull(INDEX index) const {return isNull();}
112112

113113
virtual int32_t getDecimal32(INDEX index, int scale) const { NOT_IMPLEMENT; }
@@ -135,7 +135,7 @@ class EXPORT_DECL Constant {
135135
virtual bool getFloat(INDEX start, int len, float* buf) const {return false;}
136136
virtual bool getDouble(INDEX start, int len, double* buf) const {return false;}
137137
virtual bool getSymbol(INDEX start, int len, int* buf, SymbolBase* symBase,bool insertIfNotThere) const {return false;}
138-
virtual bool getString(INDEX start, int len, string** buf) const {return false;}
138+
virtual bool getString(INDEX start, int len, std::string** buf) const {return false;}
139139
virtual bool getString(INDEX start, int len, char** buf) const {return false;}
140140
virtual bool getBinary(INDEX start, int len, int unitLength, unsigned char* buf) const {return false;}
141141
virtual bool getHash(INDEX start, int len, int buckets, int* buf) const {return false;}
@@ -152,7 +152,7 @@ class EXPORT_DECL Constant {
152152
virtual const float* getFloatConst(INDEX start, int len, float* buf) const {throw RuntimeException("getFloatConst method not supported");}
153153
virtual const double* getDoubleConst(INDEX start, int len, double* buf) const {throw RuntimeException("getDoubleConst method not supported");}
154154
virtual const int* getSymbolConst(INDEX start, int len, int* buf, SymbolBase* symBase, bool insertIfNotThere) const {throw RuntimeException("getSymbolConst method not supported");}
155-
virtual string** getStringConst(INDEX start, int len, string** buf) const {throw RuntimeException("getStringConst method not supported");}
155+
virtual std::string** getStringConst(INDEX start, int len, std::string** buf) const {throw RuntimeException("getStringConst method not supported");}
156156
virtual char** getStringConst(INDEX start, int len, char** buf) const {throw RuntimeException("getStringConst method not supported");}
157157
virtual const unsigned char* getBinaryConst(INDEX start, int len, int unitLength, unsigned char* buf) const {throw RuntimeException("getBinaryConst method not supported");}
158158

@@ -180,7 +180,7 @@ class EXPORT_DECL Constant {
180180
virtual void setIndex(INDEX index,INDEX val){setIndex(val);}
181181
virtual void setFloat(INDEX index,float val){setFloat(val);}
182182
virtual void setDouble(INDEX index, double val){setDouble(val);}
183-
virtual void setString(INDEX index, const string& val){setString(val);}
183+
virtual void setString(INDEX index, const std::string& val){setString(val);}
184184
virtual void setBinary(INDEX index, int unitLength, const unsigned char* val){setBinary(val, unitLength);}
185185
virtual void setNull(INDEX index){setNull();}
186186

@@ -191,7 +191,7 @@ class EXPORT_DECL Constant {
191191
virtual bool setColumn(INDEX index, const ConstantSP& value){return assign(value);}
192192
virtual void setRowLabel(const ConstantSP& label){}
193193
virtual void setColumnLabel(const ConstantSP& label){}
194-
virtual bool reshape(INDEX cols, INDEX rows) {return false;}
194+
virtual bool reshape(INDEX colNum, INDEX rowNum) {return false;}
195195
virtual bool assign(const ConstantSP& value){return false;}
196196

197197
virtual bool setBool(INDEX start, int len, const char* buf){return false;}
@@ -202,7 +202,7 @@ class EXPORT_DECL Constant {
202202
virtual bool setIndex(INDEX start, int len, const INDEX* buf){return false;}
203203
virtual bool setFloat(INDEX start, int len, const float* buf){return false;}
204204
virtual bool setDouble(INDEX start, int len, const double* buf){return false;}
205-
virtual bool setString(INDEX start, int len, const string* buf){return false;}
205+
virtual bool setString(INDEX start, int len, const std::string* buf){return false;}
206206
virtual bool setString(INDEX start, int len, char** buf){return false;}
207207
virtual bool setBinary(INDEX start, int len, int unitLength, const unsigned char* buf){return false;}
208208
virtual bool setData(INDEX start, int len, void* buf) {return false;}

0 commit comments

Comments
 (0)