wecisecode 2 ngày trước cách đây
mục cha
commit
f20fbbcbb2

+ 1 - 2
odbctest/mql/basic/10basic/10class.mql

@@ -1,8 +1,7 @@
 
 delete from /test/basic with version
 /**
-onerror(continue)
-noerrinfo()
+onerror(continue,`not exist`,`not find`,`not found`)
 **/
 ;
 

+ 1 - 2
odbctest/mql/basic/10basic/39init.mql

@@ -4,8 +4,7 @@ create class if not exists /test() with namespace="test"
 
 delete from /test/foo with version
 /**
-onerror(continue)
-noerrinfo()
+onerror(continue,`not exist`,`not find`,`not found`)
 **/
 ;
 

+ 1 - 2
odbctest/mql/basic/10cachedb/10class.mql

@@ -1,8 +1,7 @@
 
 delete from /test/basic3 with version
 /**
-onerror(continue)
-noerrinfo()
+onerror(continue,`not exist`,`not find`,`not found`)
 **/
 ;
 

+ 1 - 2
odbctest/mql/basic/10memdb/10class.mql

@@ -1,8 +1,7 @@
 
 delete from /test/basic2 with version
 /**
-onerror(continue)
-noerrinfo()
+onerror(continue,`not exist`,`not find`,`not found`)
 **/
 ;
 

+ 2 - 3
odbctest/mql/basic/10order/01init.mql

@@ -5,10 +5,9 @@ create class if not exists /test() with namespace="test"
 create edge type if not exists test.connect
 ;
 
-delete from /test/ with version
+delete from /test/order with version
 /**
-onerror(continue)
-noerrinfo()
+onerror(continue,`not exist`,`not find`,`not found`)
 **/
 ;
 

+ 1 - 2
odbctest/mql/basic/11cacheonly/10class.mql

@@ -1,8 +1,7 @@
 
 delete from /test/cacheonly with version
 /**
-onerror(continue)
-noerrinfo()
+onerror(continue,`not exist`,`not find`,`not found`)
 **/
 ;
 

+ 1 - 2
odbctest/mql/basic/11cncachedb/10class.mql

@@ -1,8 +1,7 @@
 
 delete from /test/测试缓存库 with version
 /**
-onerror(continue)
-noerrinfo()
+onerror(continue,`not exist`,`not find`,`not found`)
 **/
 ;
 

+ 1 - 2
odbctest/mql/basic/11cncassdb/10class.mql

@@ -1,8 +1,7 @@
 
 delete from /test/测试 with version
 /**
-onerror(continue)
-noerrinfo()
+onerror(continue,`not exist`,`not find`,`not found`)
 **/
 ;
 

+ 1 - 2
odbctest/mql/basic/11cnmemdb/10class.mql

@@ -1,8 +1,7 @@
 
 delete from /test/测试二 with version
 /**
-onerror(continue)
-noerrinfo()
+onerror(continue,`not exist`,`not find`,`not found`)
 **/
 ;
 

+ 1 - 2
odbctest/mql/basic/11localdb/10class.mql

@@ -6,8 +6,7 @@ create class if not exists /mtest() with namespace='mtest'
 
 delete from /mtest/测试二 with version
 /**
-onerror(continue)
-noerrinfo()
+onerror(continue,`not exist`,`not find`,`not found`)
 **/
 ;
 

+ 1 - 2
odbctest/mql/basic/11localdb/99defaultnamespace.mql

@@ -5,8 +5,7 @@ create class if not exists /matrix/test()
 
 delete from /matrix/test/测试二 with version
 /**
-onerror(continue)
-noerrinfo()
+onerror(continue,`not exist`,`not find`,`not found`)
 **/
 ;
 

+ 1 - 1
odbctest/mql/basic/15oo/10class1.mql

@@ -21,6 +21,6 @@ alter class /test/oo/car add column  bk2  bucket {
     
     wwheel Wheel[4..4] "hhh"
 /**
-onerror(continue)
+onerror(continue) rem('列已存在是正常的,需要增加相应错误信息')
 **/
 ;

+ 10 - 20
odbctest/mql/basic/17_cypher_return/10class.mql

@@ -7,71 +7,61 @@ create class if not exists /test() with namespace="test"
 
 delete from /test/cypher with version
 /**
-onerror(continue)
-noerrinfo()
+onerror(continue,`not exist`,`not find`,`not found`)
 **/
 ;
 
 delete from /test/cypher1 with version
 /**
-onerror(continue)
-noerrinfo()
+onerror(continue,`not exist`,`not find`,`not found`)
 **/
 ;
 
 delete from /test/cypher2 with version
 /**
-onerror(continue)
-noerrinfo()
+onerror(continue,`not exist`,`not find`,`not found`)
 **/
 ;
 
 delete from /test/cypher3 with version
 /**
-onerror(continue)
-noerrinfo()
+onerror(continue,`not exist`,`not find`,`not found`)
 **/
 ;
 
 delete from /test/cypher4 with version
 /**
-onerror(continue)
-noerrinfo()
+onerror(continue,`not exist`,`not find`,`not found`)
 **/
 ;
 
 delete from /test/cypher5 with version
 /**
-onerror(continue)
-noerrinfo()
+onerror(continue,`not exist`,`not find`,`not found`)
 **/
 ;
 
 delete from /test/cypher6 with version
 /**
-onerror(continue)
-noerrinfo()
+onerror(continue,`not exist`,`not find`,`not found`)
 **/
 ;
 
 delete from /test/cypher7 with version
 /**
-onerror(continue)
-noerrinfo()
+onerror(continue,`not exist`,`not find`,`not found`)
 **/
 ;
 
 delete from /test/cypher8 with version
 /**
-onerror(continue)
-noerrinfo()
+onerror(continue,`not exist`,`not find`,`not found`)
 **/
 ;
 
 delete from /test/cypher9 with version
 /**
-onerror(continue)
-noerrinfo()
+onerror(continue,`not exist`,`not find`,`not found`)
 **/
 ;
 

+ 0 - 1
odbctest/mql/basic/21bucket_logs/10class.mql

@@ -4,7 +4,6 @@ create class if not exists /test();
 alter /test/ drop column bklog3
 /**
 onerror(continue)
-noerrinfo()
 **/
 ;
 

+ 1 - 1
odbctest/mql/basic/99cassdb/111checkinsertrate.mql

@@ -13,7 +13,7 @@ select count(*) from object where class='test_insert_rate'
 /**
 output()
 match("count",10000)
-onerror(continue)
+onerror(continue) rem('数量不对说明cassandra有问题')
 **/
 ;
 

+ 3 - 3
odbctest/mql/basic/99cassdb/222checklucene.mql

@@ -9,7 +9,7 @@ select count(*) from object_test where class='/test/oo/dimension' and int_4>=100
 /**
 output()
 match("count",1)
-onerror(continue)
+onerror(continue) rem('数量不对说明cassandra有问题')
 **/
 ;
 
@@ -20,7 +20,7 @@ expr(object_test_lucene,'{"filter":{"type":"range","field":"int_4","lower":100,"
 /**
 output()
 match("count",1)
-onerror(continue)
+onerror(continue) rem('数量不对说明cassandra有问题')
 **/
 ;
 
@@ -30,7 +30,7 @@ expr(object_test_lucene,'{"filter":{"type":"prefix","field":"class","value":"/te
 /**
 output()
 xxmatch("count",10171)
-onerror(continue)
+onerror(continue) rem('数量不对说明cassandra有问题')
 **/
 ;
 

+ 29 - 58
odbctest/mql/basic/graph_test/14graph_delete_data.mql

@@ -1,174 +1,145 @@
 delete from /m3graph/entity/vmware with version!
 /**
-onerror(continue)
-noerrinfo()
+onerror(continue,`not exist`,`not find`,`not found`)
 **/;
 
 delete from /m3graph/entity/weblogic with version!
 /**
-onerror(continue)
-noerrinfo()
+onerror(continue,`not exist`,`not find`,`not found`)
 **/;
 
 delete from /m3graph/entity/websphere with version!
 /**
-onerror(continue)
-noerrinfo()
+onerror(continue,`not exist`,`not find`,`not found`)
 **/;
 
 delete from /m3graph/entity/windows with version!
 /**
-onerror(continue)
-noerrinfo()
+onerror(continue,`not exist`,`not find`,`not found`)
 **/;
 
 delete from /m3graph/entity/x86 with version!
 /**
-onerror(continue)
-noerrinfo()
+onerror(continue,`not exist`,`not find`,`not found`)
 **/;
 
 delete from /m3graph/entity/aix with version!
 /**
-onerror(continue)
-noerrinfo()
+onerror(continue,`not exist`,`not find`,`not found`)
 **/;
 
 delete from /m3graph/entity/app with version!
 /**
-onerror(continue)
-noerrinfo()
+onerror(continue,`not exist`,`not find`,`not found`)
 **/;
 
 delete from /m3graph/entity/biz with version!
 /**
-onerror(continue)
-noerrinfo()
+onerror(continue,`not exist`,`not find`,`not found`)
 **/;
 
 delete from /m3graph/entity/cluster with version!
 /**
-onerror(continue)
-noerrinfo()
+onerror(continue,`not exist`,`not find`,`not found`)
 **/;
 
 delete from /m3graph/entity/db2 with version!
 /**
-onerror(continue)
-noerrinfo()
+onerror(continue,`not exist`,`not find`,`not found`)
 **/;
 
 delete from /m3graph/entity/esx with version!
 /**
-onerror(continue)
-noerrinfo()
+onerror(continue,`not exist`,`not find`,`not found`)
 **/;
 
 delete from /m3graph/entity/ha with version!
 /**
-onerror(continue)
-noerrinfo()
+onerror(continue,`not exist`,`not find`,`not found`)
 **/;
 
 delete from /m3graph/entity/hmc with version!
 /**
-onerror(continue)
-noerrinfo()
+onerror(continue,`not exist`,`not find`,`not found`)
 **/;
 
 delete from /m3graph/entity/http with version!
 /**
-onerror(continue)
-noerrinfo()
+onerror(continue,`not exist`,`not find`,`not found`)
 **/;
 
 delete from /m3graph/entity/linux with version!
 /**
-onerror(continue)
-noerrinfo()
+onerror(continue,`not exist`,`not find`,`not found`)
 **/;
 
 delete from /m3graph/entity/mal with version!
 /**
-onerror(continue)
-noerrinfo()
+onerror(continue,`not exist`,`not find`,`not found`)
 **/;
 
 delete from /m3graph/entity/mysql with version!
 /**
-onerror(continue)
-noerrinfo()
+onerror(continue,`not exist`,`not find`,`not found`)
 **/;
 
 delete from /m3graph/entity/openstack with version!
 /**
-onerror(continue)
-noerrinfo()
+onerror(continue,`not exist`,`not find`,`not found`)
 **/;
 
 delete from /m3graph/entity/oracle with version!
 /**
-onerror(continue)
-noerrinfo()
+onerror(continue,`not exist`,`not find`,`not found`)
 **/;
 
 delete from /m3graph/entity/pdu with version!
 /**
-onerror(continue)
-noerrinfo()
+onerror(continue,`not exist`,`not find`,`not found`)
 **/;
 
 delete from /m3graph/entity/power with version!
 /**
-onerror(continue)
-noerrinfo()
+onerror(continue,`not exist`,`not find`,`not found`)
 **/;
 
 delete from /m3graph/entity/router with version!
 /**
-onerror(continue)
-noerrinfo()
+onerror(continue,`not exist`,`not find`,`not found`)
 **/;
 
 delete from /m3graph/entity/sanstorage with version!
 /**
-onerror(continue)
-noerrinfo()
+onerror(continue,`not exist`,`not find`,`not found`)
 **/;
 
 delete from /m3graph/entity/sanswitch with version!
 /**
-onerror(continue)
-noerrinfo()
+onerror(continue,`not exist`,`not find`,`not found`)
 **/;
 
 delete from /m3graph/entity/sqlserver with version!
 /**
-onerror(continue)
-noerrinfo()
+onerror(continue,`not exist`,`not find`,`not found`)
 **/;
 
 delete from /m3graph/entity/switch with version!
 /**
-onerror(continue)
-noerrinfo()
+onerror(continue,`not exist`,`not find`,`not found`)
 **/;
 
 delete from /m3graph/entity/tomcat with version!
 /**
-onerror(continue)
-noerrinfo()
+onerror(continue,`not exist`,`not find`,`not found`)
 **/;
 
 delete from /m3graph/entity/ups with version!
 /**
-onerror(continue)
-noerrinfo()
+onerror(continue,`not exist`,`not find`,`not found`)
 **/;
 
 delete from /m3graph/entity/vlan with version!
 /**
-onerror(continue)
-noerrinfo()
+onerror(continue,`not exist`,`not find`,`not found`)
 **/;
 

+ 62 - 156
odbctest/mql/basic/graph_test/15graph_drop_class.mql

@@ -3,166 +3,72 @@ DROP EDGE TYPE m3graph.contain;
 DROP EDGE TYPE m3graph.runon;
 DROP EDGE TYPE m3graph.depend;
 
-drop class /m3graph/entity/vmware
-/**
-onerror(continue)
-noerrinfo()
-**/;
-drop class /m3graph/entity/weblogic
-/**
-onerror(continue)
-noerrinfo()
-**/;
-drop class /m3graph/entity/websphere
-/**
-onerror(continue)
-noerrinfo()
-**/;
-drop class /m3graph/entity/windows
-/**
-onerror(continue)
-noerrinfo()
-**/;
-drop class /m3graph/entity/x86
-/**
-onerror(continue)
-noerrinfo()
-**/;
+drop class if exists /m3graph/entity/vmware
+;
+drop class if exists /m3graph/entity/weblogic
+;
+drop class if exists /m3graph/entity/websphere
+;
+drop class if exists /m3graph/entity/windows
+;
+drop class if exists /m3graph/entity/x86
+;
 
+drop class if exists /m3graph/entity/aix
+;
+drop class if exists /m3graph/entity/app
+;
+drop class if exists /m3graph/entity/biz
+;
 
-drop class /m3graph/entity/aix
-/**
-onerror(continue)
-noerrinfo()
-**/;
-drop class /m3graph/entity/app
-/**
-onerror(continue)
-noerrinfo()
-**/;
-drop class /m3graph/entity/biz
-/**
-onerror(continue)
-noerrinfo()
-**/;
+drop class if exists /m3graph/entity/cluster
+;
+drop class if exists /m3graph/entity/db2
+;
+drop class if exists /m3graph/entity/esx
+;
 
-drop class /m3graph/entity/cluster
-/**
-onerror(continue)
-noerrinfo()
-**/;
-drop class /m3graph/entity/db2
-/**
-onerror(continue)
-noerrinfo()
-**/;
-drop class /m3graph/entity/esx
-/**
-onerror(continue)
-noerrinfo()
-**/;
+drop class if exists /m3graph/entity/ha
+;
+drop class if exists /m3graph/entity/hmc
+;
+drop class if exists /m3graph/entity/http
+;
 
-drop class /m3graph/entity/ha
-/**
-onerror(continue)
-noerrinfo()
-**/;
-drop class /m3graph/entity/hmc
-/**
-onerror(continue)
-noerrinfo()
-**/;
-drop class /m3graph/entity/http
-/**
-onerror(continue)
-noerrinfo()
-**/;
+drop class if exists /m3graph/entity/linux
+;
+drop class if exists /m3graph/entity/mal
+;
+drop class if exists /m3graph/entity/mysql
+;
 
-drop class /m3graph/entity/linux
-/**
-onerror(continue)
-noerrinfo()
-**/;
-drop class /m3graph/entity/mal
-/**
-onerror(continue)
-noerrinfo()
-**/;
-drop class /m3graph/entity/mysql
-/**
-onerror(continue)
-noerrinfo()
-**/;
+drop class if exists /m3graph/entity/openstack
+;
+drop class if exists /m3graph/entity/oracle
+;
+drop class if exists /m3graph/entity/pdu
+;
+drop class if exists /m3graph/entity/power
+;
 
-drop class /m3graph/entity/openstack
-/**
-onerror(continue)
-noerrinfo()
-**/;
-drop class /m3graph/entity/oracle
-/**
-onerror(continue)
-noerrinfo()
-**/;
-drop class /m3graph/entity/pdu
-/**
-onerror(continue)
-noerrinfo()
-**/;
-drop class /m3graph/entity/power
-/**
-onerror(continue)
-noerrinfo()
-**/;
+drop class if exists /m3graph/entity/router
+;
+drop class if exists /m3graph/entity/sanstorage
+;
+drop class if exists /m3graph/entity/sanswitch
+;
+drop class if exists /m3graph/entity/sqlserver
+;
 
-drop class /m3graph/entity/router
-/**
-onerror(continue)
-noerrinfo()
-**/;
-drop class /m3graph/entity/sanstorage
-/**
-onerror(continue)
-noerrinfo()
-**/;
-drop class /m3graph/entity/sanswitch
-/**
-onerror(continue)
-noerrinfo()
-**/;
-drop class /m3graph/entity/sqlserver
-/**
-onerror(continue)
-noerrinfo()
-**/;
-
-drop class /m3graph/entity/switch
-/**
-onerror(continue)
-noerrinfo()
-**/;
-drop class /m3graph/entity/tomcat
-/**
-onerror(continue)
-noerrinfo()
-**/;
-drop class /m3graph/entity/ups
-/**
-onerror(continue)
-noerrinfo()
-**/;
-drop class /m3graph/entity/vlan
-/**
-onerror(continue)
-noerrinfo()
-**/;
-drop class /m3graph/entity
-/**
-onerror(continue)
-noerrinfo()
-**/;
-drop class /m3graph
-/**
-onerror(continue)
-noerrinfo()
-**/;
+drop class if exists /m3graph/entity/switch
+;
+drop class if exists /m3graph/entity/tomcat
+;
+drop class if exists /m3graph/entity/ups
+;
+drop class if exists /m3graph/entity/vlan
+;
+drop class if exists /m3graph/entity
+;
+drop class if exists /m3graph
+;

+ 1 - 2
odbctest/mql/basic_scenario/501basic/1_clear_data.no_check.mql

@@ -1,6 +1,5 @@
 
 delete from /matrix/test/basic with version
 /**
-onerror(continue)
-noerrinfo()
+onerror(continue,`not exist`,`not find`,`not found`)
 **/;

+ 1 - 2
odbctest/mql/create/1011.delete.mql

@@ -3,7 +3,6 @@
 
 delete from /testzx/zxcvbnm with version
 /**
-onerror(continue)
-noerrinfo()
+onerror(continue,`not exist`,`not find`,`not found`)
 **/
 ;