xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

[TD-1001] fix node js connector

This commit is contained in:
liu0x54 2020-07-31 03:16:38 +00:00
parent 2b84d45098
commit 8da73b3b00
2 changed files with 32 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/connector/nodejs/nodetaos/cursor.js
View File

@ -265,13 +265,15 @@ TDengineCursor.prototype.execute_a = function execute_a (operation, options, cal
} }
if (resCode >= 0) { if (resCode >= 0) {
let fieldCount = cr._chandle.numFields(res2); // let fieldCount = cr._chandle.numFields(res2);
if (fieldCount == 0) { // if (fieldCount == 0) {
cr._chandle.freeResult(res2); // //cr._chandle.freeResult(res2);
} // return res2;
else { // }
return res2; // else {
} // return res2;
// }
return res2;
} }
else { else {

42
src/connector/nodejs/test/test.js
View File

@ -28,7 +28,7 @@ c1.execute('create table if not exists stabletest (ts timestamp, v1 int, v2 int,
// Shell Test : The following uses the cursor to imitate the taos shell // Shell Test : The following uses the cursor to imitate the taos shell
// Insert // Insert
for (let i = 0; i < 1000; i++) { for (let i = 0; i < 10000; i++) {
let insertData = ["now+" + i + "s", // Timestamp let insertData = ["now+" + i + "s", // Timestamp
parseInt( R(-Math.pow(2,31) + 1 , Math.pow(2,31) - 1) ), // Int parseInt( R(-Math.pow(2,31) + 1 , Math.pow(2,31) - 1) ), // Int
parseInt( R(-Math.pow(2,31) + 1 , Math.pow(2,31) - 1) ), // BigInt parseInt( R(-Math.pow(2,31) + 1 , Math.pow(2,31) - 1) ), // BigInt
@ -40,7 +40,7 @@ for (let i = 0; i < 1000; i++) {
randomBool(), randomBool(),
"\"Nchars\""]; // Bool "\"Nchars\""]; // Bool
c1.execute('insert into td_connector_test.all_types values(' + insertData.join(',') + ' );', {quiet:true}); c1.execute('insert into td_connector_test.all_types values(' + insertData.join(',') + ' );', {quiet:true});
if (i % 100 == 0) { if (i % 1000 == 0) {
console.log("Insert # " , i); console.log("Insert # " , i);
} }
} }
@ -61,9 +61,9 @@ console.log(d);
// Immediate Execution like the Shell // Immediate Execution like the Shell
//c1.query('select count(*), stddev(_double), min(_tinyint) from all_types where _tinyint > 50 and _int < 0;', true).then(function(result){ c1.query('select count(*), stddev(_double), min(_tinyint) from all_types where _tinyint > 50 and _int < 0;', true).then(function(result){
// result.pretty(); result.pretty();
//}) })
c1.query('select _tinyint, _bool from all_types where _tinyint > 50 and _int < 0 limit 50;', true).then(function(result){ c1.query('select _tinyint, _bool from all_types where _tinyint > 50 and _int < 0 limit 50;', true).then(function(result){
result.pretty(); result.pretty();
@ -87,54 +87,58 @@ q.execute().then(function(r) {
// Raw Async Testing (Callbacks, not promises) // Raw Async Testing (Callbacks, not promises)
function cb2(param, result, rowCount, rd) { function cb2(param, result, rowCount, rd) {
console.log('CB2 Callbacked!');
console.log("RES *", result); console.log("RES *", result);
console.log("Async fetched", rowCount, "rows"); console.log("Async fetched", rowCount, " rows");
console.log("Passed Param: ", param); console.log("Passed Param: ", param);
console.log("Fields", rd.fields); console.log("Fields ", rd.fields);
console.log("Data", rd.data); console.log("Data ", rd.data);
} }
function cb1(param,result,code) { function cb1(param,result,code) {
console.log('Callbacked!'); console.log('CB1 Callbacked!');
console.log("RES *", result); console.log("RES * ", result);
console.log("Status: ", code); console.log("Status: ", code);
console.log("Passed Param", param); console.log("Passed Param ", param);
c1.fetchall_a(result, cb2, param) c1.fetchall_a(result, cb2, param);
} }
c1.execute_a("describe td_connector_test.all_types;", cb1, {myparam:3.141}); c1.execute_a("describe td_connector_test.all_types;", cb1, {myparam:3.141});
function cb4(param, result, rowCount, rd) { function cb4(param, result, rowCount, rd) {
console.log('CB4 Callbacked!');
console.log("RES *", result); console.log("RES *", result);
console.log("Async fetched", rowCount, "rows"); console.log("Async fetched", rowCount, "rows");
console.log("Passed Param: ", param); console.log("Passed Param: ", param);
console.log("Fields", rd.fields); console.log("Fields", rd.fields);
console.log("Data", rd.data); console.log("Data", rd.data);
} }
// Without directly calling fetchall_a // Without directly calling fetchall_a
var thisRes; var thisRes;
function cb3(param,result,code) { function cb3(param,result,code) {
console.log('Callbacked!'); console.log('CB3 Callbacked!');
console.log("RES *", result); console.log("RES *", result);
console.log("Status: ", code); console.log("Status:", code);
console.log("Passed Param", param); console.log("Passed Param", param);
thisRes = result; thisRes = result;
} }
//Test calling execute and fetchall seperately and not through callbacks //Test calling execute and fetchall seperately and not through callbacks
var param = c1.execute_a("describe td_connector_test.all_types;", cb3, {e:2.718}); var param = c1.execute_a("describe td_connector_test.all_types;", cb3, {e:2.718});
console.log("Passed Param outside of callback: ", param); console.log("Passed Param outside of callback: ", param);
console.log(param);
setTimeout(function(){ setTimeout(function(){
c1.fetchall_a(thisRes, cb4, param); c1.fetchall_a(thisRes, cb4, param);
},100); },100);
// Async through promises // Async through promises
var aq = c1.query('select count(*) from td_connector_test.all_types;') var aq = c1.query('select count(*) from td_connector_test.all_types;',false);
aq.execute_a().then(function(data) { aq.execute_a().then(function(data) {
data.pretty(); data.pretty();
}) });
c1.query('describe td_connector_test.stabletest;').execute_a().then(r=> r.pretty()); c1.query('describe td_connector_test.stabletest;').execute_a().then(r=> r.pretty());
setTimeout(function(){ setTimeout(function(){
c1.query('drop database td_connector_test;'); c1.query('drop database td_connector_test;');
},200);
setTimeout(function(){
conn.close();
},2000); },2000);
conn.close();