Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
yiicenne
TDengine
提交
6c2d8067
TDengine
项目概览
yiicenne
/
TDengine
与 Fork 源项目一致
Fork自
taosdata / TDengine
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
TDengine
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
6c2d8067
编写于
8月 29, 2020
作者:
S
Steven Li
浏览文件
操作
浏览文件
下载
差异文件
Merge remote-tracking branch 'origin/develop' into feature/crash_gen
上级
45f855ca
32bb9820
变更
25
隐藏空白更改
内联
并排
Showing
25 changed file
with
182 addition
and
31 deletion
+182
-31
src/connector/jdbc/src/test/java/TestPreparedStatement.java
src/connector/jdbc/src/test/java/TestPreparedStatement.java
+1
-1
src/connector/jdbc/src/test/java/TestTSDBDatabaseMetaData.java
...onnector/jdbc/src/test/java/TestTSDBDatabaseMetaData.java
+1
-1
src/connector/jdbc/src/test/java/TestTSDBSubscribe.java
src/connector/jdbc/src/test/java/TestTSDBSubscribe.java
+1
-4
src/connector/jdbc/src/test/java/com/taosdata/jdbc/BatchInsertTest.java
...jdbc/src/test/java/com/taosdata/jdbc/BatchInsertTest.java
+1
-2
src/connector/jdbc/src/test/java/com/taosdata/jdbc/ConnectionTest.java
.../jdbc/src/test/java/com/taosdata/jdbc/ConnectionTest.java
+2
-4
src/connector/jdbc/src/test/java/com/taosdata/jdbc/DatabaseMetaDataTest.java
...src/test/java/com/taosdata/jdbc/DatabaseMetaDataTest.java
+1
-2
src/connector/jdbc/src/test/java/com/taosdata/jdbc/ImportTest.java
...ctor/jdbc/src/test/java/com/taosdata/jdbc/ImportTest.java
+1
-2
src/connector/jdbc/src/test/java/com/taosdata/jdbc/PreparedStatementTest.java
...rc/test/java/com/taosdata/jdbc/PreparedStatementTest.java
+1
-2
src/connector/jdbc/src/test/java/com/taosdata/jdbc/ResultSetTest.java
...r/jdbc/src/test/java/com/taosdata/jdbc/ResultSetTest.java
+1
-2
src/connector/jdbc/src/test/java/com/taosdata/jdbc/SelectTest.java
...ctor/jdbc/src/test/java/com/taosdata/jdbc/SelectTest.java
+1
-2
src/connector/jdbc/src/test/java/com/taosdata/jdbc/StableTest.java
...ctor/jdbc/src/test/java/com/taosdata/jdbc/StableTest.java
+1
-2
src/connector/jdbc/src/test/java/com/taosdata/jdbc/StatementTest.java
...r/jdbc/src/test/java/com/taosdata/jdbc/StatementTest.java
+1
-2
src/connector/jdbc/src/test/java/com/taosdata/jdbc/SubscribeTest.java
...r/jdbc/src/test/java/com/taosdata/jdbc/SubscribeTest.java
+1
-2
src/connector/jdbc/src/test/java/com/taosdata/jdbc/TSDBDriverTest.java
.../jdbc/src/test/java/com/taosdata/jdbc/TSDBDriverTest.java
+1
-1
src/mnode/src/mnodeShow.c
src/mnode/src/mnodeShow.c
+1
-0
src/mnode/src/mnodeTable.c
src/mnode/src/mnodeTable.c
+7
-0
src/mnode/src/mnodeVgroup.c
src/mnode/src/mnodeVgroup.c
+11
-2
tests/pytest/insert/nchar.py
tests/pytest/insert/nchar.py
+2
-0
tests/pytest/tag_lite/bigint.py
tests/pytest/tag_lite/bigint.py
+14
-0
tests/pytest/tag_lite/binary.py
tests/pytest/tag_lite/binary.py
+14
-0
tests/pytest/tag_lite/float.py
tests/pytest/tag_lite/float.py
+17
-0
tests/pytest/tag_lite/int.py
tests/pytest/tag_lite/int.py
+18
-0
tests/pytest/tag_lite/nchar.py
tests/pytest/tag_lite/nchar.py
+48
-0
tests/pytest/tag_lite/smallint.py
tests/pytest/tag_lite/smallint.py
+17
-0
tests/pytest/tag_lite/tinyint.py
tests/pytest/tag_lite/tinyint.py
+18
-0
未找到文件。
src/connector/jdbc/src/test/java/TestPreparedStatement.java
浏览文件 @
6c2d8067
...
...
@@ -12,7 +12,7 @@ public class TestPreparedStatement {
Class
.
forName
(
"com.taosdata.jdbc.TSDBDriver"
);
Properties
properties
=
new
Properties
();
properties
.
setProperty
(
TSDBDriver
.
PROPERTY_KEY_HOST
,
"localhost"
);
connection
=
DriverManager
.
getConnection
(
"jdbc:TAOS://localhost:0/
?user=root&password=taosdata
"
,
properties
);
connection
=
DriverManager
.
getConnection
(
"jdbc:TAOS://localhost:0/"
,
properties
);
String
rawSql
=
"select * from test.log0601"
;
// String[] params = new String[]{"ts", "c1"};
PreparedStatement
pstmt
=
(
TSDBPreparedStatement
)
connection
.
prepareStatement
(
rawSql
);
...
...
src/connector/jdbc/src/test/java/TestTSDBDatabaseMetaData.java
浏览文件 @
6c2d8067
...
...
@@ -13,7 +13,7 @@ public class TestTSDBDatabaseMetaData {
Class
.
forName
(
"com.taosdata.jdbc.TSDBDriver"
);
Properties
properties
=
new
Properties
();
properties
.
setProperty
(
TSDBDriver
.
PROPERTY_KEY_HOST
,
"localhost"
);
connection
=
DriverManager
.
getConnection
(
"jdbc:TAOS://localhost:0/
?user=root&password=taosdata
"
,
properties
);
connection
=
DriverManager
.
getConnection
(
"jdbc:TAOS://localhost:0/"
,
properties
);
dbMetaData
=
connection
.
getMetaData
();
resSet
=
dbMetaData
.
getCatalogs
();
while
(
resSet
.
next
())
{
...
...
src/connector/jdbc/src/test/java/TestTSDBSubscribe.java
浏览文件 @
6c2d8067
...
...
@@ -3,7 +3,6 @@ import com.taosdata.jdbc.TSDBDriver;
import
com.taosdata.jdbc.TSDBResultSet
;
import
com.taosdata.jdbc.TSDBSubscribe
;
import
java.sql.Connection
;
import
java.sql.DriverManager
;
import
java.util.Properties
;
...
...
@@ -17,12 +16,10 @@ public class TestTSDBSubscribe {
properties
.
setProperty
(
TSDBDriver
.
PROPERTY_KEY_LOCALE
,
"en_US.UTF-8"
);
properties
.
setProperty
(
TSDBDriver
.
PROPERTY_KEY_TIME_ZONE
,
"UTC-8"
);
String
cs
=
String
.
format
(
"jdbc:TAOS://%s:0/%s
?user=root&password=taosdata
"
,
host
,
database
);
String
cs
=
String
.
format
(
"jdbc:TAOS://%s:0/%s"
,
host
,
database
);
return
(
TSDBConnection
)
DriverManager
.
getConnection
(
cs
,
properties
);
}
public
static
void
main
(
String
[]
args
)
throws
Exception
{
String
usage
=
"java -Djava.ext.dirs=../ TestTSDBSubscribe [-host host] <-db database> <-topic topic> <-sql sql>"
;
if
(
args
.
length
<
2
)
{
...
...
src/connector/jdbc/src/test/java/com/taosdata/jdbc/BatchInsertTest.java
浏览文件 @
6c2d8067
...
...
@@ -40,8 +40,7 @@ public class BatchInsertTest extends BaseTest {
properties
.
setProperty
(
TSDBDriver
.
PROPERTY_KEY_CHARSET
,
"UTF-8"
);
properties
.
setProperty
(
TSDBDriver
.
PROPERTY_KEY_LOCALE
,
"en_US.UTF-8"
);
properties
.
setProperty
(
TSDBDriver
.
PROPERTY_KEY_TIME_ZONE
,
"UTC-8"
);
connection
=
DriverManager
.
getConnection
(
"jdbc:TAOS://"
+
host
+
":0/"
+
"?user=root&password=taosdata"
,
properties
);
connection
=
DriverManager
.
getConnection
(
"jdbc:TAOS://"
+
host
+
":0/"
,
properties
);
statement
=
connection
.
createStatement
();
statement
.
executeUpdate
(
"drop database if exists "
+
dbName
);
...
...
src/connector/jdbc/src/test/java/com/taosdata/jdbc/ConnectionTest.java
浏览文件 @
6c2d8067
...
...
@@ -29,16 +29,14 @@ public class ConnectionTest extends BaseTest {
properties
.
setProperty
(
TSDBDriver
.
PROPERTY_KEY_CHARSET
,
"UTF-8"
);
properties
.
setProperty
(
TSDBDriver
.
PROPERTY_KEY_LOCALE
,
"en_US.UTF-8"
);
properties
.
setProperty
(
TSDBDriver
.
PROPERTY_KEY_TIME_ZONE
,
"UTC-8"
);
connection
=
DriverManager
.
getConnection
(
"jdbc:TAOS://"
+
host
+
":0/"
+
"?user=root&password=taosdata"
,
properties
);
connection
=
DriverManager
.
getConnection
(
"jdbc:TAOS://"
+
host
+
":0/"
,
properties
);
assertTrue
(
null
!=
connection
);
statement
=
connection
.
createStatement
();
assertTrue
(
null
!=
statement
);
// try reconnect
connection
=
DriverManager
.
getConnection
(
"jdbc:TAOS://"
+
host
+
":0/"
+
"?user=root&password=taosdata"
,
properties
);
connection
=
DriverManager
.
getConnection
(
"jdbc:TAOS://"
+
host
+
":0/"
,
properties
);
try
{
statement
.
execute
(
"create database if not exists "
+
dbName
);
...
...
src/connector/jdbc/src/test/java/com/taosdata/jdbc/DatabaseMetaDataTest.java
浏览文件 @
6c2d8067
...
...
@@ -26,8 +26,7 @@ public class DatabaseMetaDataTest extends BaseTest {
properties
.
setProperty
(
TSDBDriver
.
PROPERTY_KEY_CHARSET
,
"UTF-8"
);
properties
.
setProperty
(
TSDBDriver
.
PROPERTY_KEY_LOCALE
,
"en_US.UTF-8"
);
properties
.
setProperty
(
TSDBDriver
.
PROPERTY_KEY_TIME_ZONE
,
"UTC-8"
);
connection
=
DriverManager
.
getConnection
(
"jdbc:TAOS://"
+
host
+
":0/"
+
"?user=root&password=taosdata"
,
properties
);
connection
=
DriverManager
.
getConnection
(
"jdbc:TAOS://"
+
host
+
":0/"
,
properties
);
String
sql
=
"drop database if exists "
+
dbName
;
statement
=
(
TSDBPreparedStatement
)
connection
.
prepareStatement
(
sql
);
...
...
src/connector/jdbc/src/test/java/com/taosdata/jdbc/ImportTest.java
浏览文件 @
6c2d8067
...
...
@@ -28,8 +28,7 @@ public class ImportTest extends BaseTest {
properties
.
setProperty
(
TSDBDriver
.
PROPERTY_KEY_CHARSET
,
"UTF-8"
);
properties
.
setProperty
(
TSDBDriver
.
PROPERTY_KEY_LOCALE
,
"en_US.UTF-8"
);
properties
.
setProperty
(
TSDBDriver
.
PROPERTY_KEY_TIME_ZONE
,
"UTC-8"
);
connection
=
DriverManager
.
getConnection
(
"jdbc:TAOS://"
+
host
+
":0/"
+
"?user=root&password=taosdata"
,
properties
);
connection
=
DriverManager
.
getConnection
(
"jdbc:TAOS://"
+
host
+
":0/"
,
properties
);
statement
=
connection
.
createStatement
();
statement
.
executeUpdate
(
"drop database if exists "
+
dbName
);
...
...
src/connector/jdbc/src/test/java/com/taosdata/jdbc/PreparedStatementTest.java
浏览文件 @
6c2d8067
...
...
@@ -33,8 +33,7 @@ public class PreparedStatementTest extends BaseTest {
properties
.
setProperty
(
TSDBDriver
.
PROPERTY_KEY_CHARSET
,
"UTF-8"
);
properties
.
setProperty
(
TSDBDriver
.
PROPERTY_KEY_LOCALE
,
"en_US.UTF-8"
);
properties
.
setProperty
(
TSDBDriver
.
PROPERTY_KEY_TIME_ZONE
,
"UTC-8"
);
connection
=
DriverManager
.
getConnection
(
"jdbc:TAOS://"
+
host
+
":0/"
+
"?user=root&password=taosdata"
,
properties
);
connection
=
DriverManager
.
getConnection
(
"jdbc:TAOS://"
+
host
+
":0/"
,
properties
);
String
sql
=
"drop database if exists "
+
dbName
;
statement
=
(
TSDBPreparedStatement
)
connection
.
prepareStatement
(
sql
);
...
...
src/connector/jdbc/src/test/java/com/taosdata/jdbc/ResultSetTest.java
浏览文件 @
6c2d8067
...
...
@@ -35,8 +35,7 @@ public class ResultSetTest extends BaseTest {
properties
.
setProperty
(
TSDBDriver
.
PROPERTY_KEY_LOCALE
,
"en_US.UTF-8"
);
properties
.
setProperty
(
TSDBDriver
.
PROPERTY_KEY_TIME_ZONE
,
"UTC-8"
);
connection
=
DriverManager
.
getConnection
(
"jdbc:TAOS://"
+
host
+
":0/"
+
"?user=root&password=taosdata"
,
properties
);
connection
=
DriverManager
.
getConnection
(
"jdbc:TAOS://"
+
host
+
":0/"
,
properties
);
statement
=
connection
.
createStatement
();
statement
.
executeUpdate
(
"drop database if exists "
+
dbName
);
...
...
src/connector/jdbc/src/test/java/com/taosdata/jdbc/SelectTest.java
浏览文件 @
6c2d8067
...
...
@@ -28,8 +28,7 @@ public class SelectTest extends BaseTest {
properties
.
setProperty
(
TSDBDriver
.
PROPERTY_KEY_CHARSET
,
"UTF-8"
);
properties
.
setProperty
(
TSDBDriver
.
PROPERTY_KEY_LOCALE
,
"en_US.UTF-8"
);
properties
.
setProperty
(
TSDBDriver
.
PROPERTY_KEY_TIME_ZONE
,
"UTC-8"
);
connection
=
DriverManager
.
getConnection
(
"jdbc:TAOS://"
+
host
+
":0/"
+
"?user=root&password=taosdata"
,
properties
);
connection
=
DriverManager
.
getConnection
(
"jdbc:TAOS://"
+
host
+
":0/"
,
properties
);
statement
=
connection
.
createStatement
();
statement
.
executeUpdate
(
"drop database if exists "
+
dbName
);
...
...
src/connector/jdbc/src/test/java/com/taosdata/jdbc/StableTest.java
浏览文件 @
6c2d8067
...
...
@@ -31,8 +31,7 @@ public class StableTest extends BaseTest {
properties
.
setProperty
(
TSDBDriver
.
PROPERTY_KEY_CHARSET
,
"UTF-8"
);
properties
.
setProperty
(
TSDBDriver
.
PROPERTY_KEY_LOCALE
,
"en_US.UTF-8"
);
properties
.
setProperty
(
TSDBDriver
.
PROPERTY_KEY_TIME_ZONE
,
"UTC-8"
);
connection
=
DriverManager
.
getConnection
(
"jdbc:TAOS://"
+
host
+
":0/"
+
"?user=root&password=taosdata"
,
properties
);
connection
=
DriverManager
.
getConnection
(
"jdbc:TAOS://"
+
host
+
":0/"
,
properties
);
statement
=
connection
.
createStatement
();
statement
.
executeUpdate
(
"create database if not exists "
+
dbName
);
...
...
src/connector/jdbc/src/test/java/com/taosdata/jdbc/StatementTest.java
浏览文件 @
6c2d8067
...
...
@@ -30,8 +30,7 @@ public class StatementTest extends BaseTest {
properties
.
setProperty
(
TSDBDriver
.
PROPERTY_KEY_CHARSET
,
"UTF-8"
);
properties
.
setProperty
(
TSDBDriver
.
PROPERTY_KEY_LOCALE
,
"en_US.UTF-8"
);
properties
.
setProperty
(
TSDBDriver
.
PROPERTY_KEY_TIME_ZONE
,
"UTC-8"
);
connection
=
DriverManager
.
getConnection
(
"jdbc:TAOS://"
+
host
+
":0/"
+
"?user=root&password=taosdata"
,
properties
);
connection
=
DriverManager
.
getConnection
(
"jdbc:TAOS://"
+
host
+
":0/"
,
properties
);
statement
=
connection
.
createStatement
();
statement
.
executeUpdate
(
"drop database if exists "
+
dbName
);
...
...
src/connector/jdbc/src/test/java/com/taosdata/jdbc/SubscribeTest.java
浏览文件 @
6c2d8067
...
...
@@ -32,8 +32,7 @@ public class SubscribeTest extends BaseTest {
properties
.
setProperty
(
TSDBDriver
.
PROPERTY_KEY_CHARSET
,
"UTF-8"
);
properties
.
setProperty
(
TSDBDriver
.
PROPERTY_KEY_LOCALE
,
"en_US.UTF-8"
);
properties
.
setProperty
(
TSDBDriver
.
PROPERTY_KEY_TIME_ZONE
,
"UTC-8"
);
connection
=
DriverManager
.
getConnection
(
"jdbc:TAOS://"
+
host
+
":0/"
+
"?user=root&password=taosdata"
,
properties
);
connection
=
DriverManager
.
getConnection
(
"jdbc:TAOS://"
+
host
+
":0/"
,
properties
);
statement
=
connection
.
createStatement
();
statement
.
executeUpdate
(
"create database if not exists "
+
dbName
);
...
...
src/connector/jdbc/src/test/java/com/taosdata/jdbc/TSDBDriverTest.java
浏览文件 @
6c2d8067
...
...
@@ -12,7 +12,7 @@ public class TSDBDriverTest {
@Test
public
void
urlParserTest
()
throws
SQLException
{
TSDBDriver
driver
=
new
TSDBDriver
();
String
url
=
"jdbc:TSDB://127.0.0.1:0/db
?user=root&password=your_password
"
;
String
url
=
"jdbc:TSDB://127.0.0.1:0/db"
;
Properties
properties
=
new
Properties
();
driver
.
parseURL
(
url
,
properties
);
...
...
src/mnode/src/mnodeShow.c
浏览文件 @
6c2d8067
...
...
@@ -313,6 +313,7 @@ static int32_t mnodeProcessConnectMsg(SMnodeMsg *pMsg) {
if
(
pDb
->
status
!=
TSDB_DB_STATUS_READY
)
{
mError
(
"db:%s, status:%d, in dropping"
,
pDb
->
name
,
pDb
->
status
);
code
=
TSDB_CODE_MND_DB_IN_DROPPING
;
mnodeDecDbRef
(
pDb
);
goto
connect_over
;
}
mnodeDecDbRef
(
pDb
);
...
...
src/mnode/src/mnodeTable.c
浏览文件 @
6c2d8067
...
...
@@ -294,6 +294,7 @@ static int32_t mnodeChildTableActionRestored() {
SSdbOper
desc
=
{.
type
=
SDB_OPER_LOCAL
,
.
pObj
=
pTable
,
.
table
=
tsChildTableSdb
};
sdbDeleteRow
(
&
desc
);
mnodeDecTableRef
(
pTable
);
mnodeDecDbRef
(
pDb
);
continue
;
}
mnodeDecDbRef
(
pDb
);
...
...
@@ -1259,6 +1260,7 @@ static int32_t mnodeGetShowSuperTableMeta(STableMetaMsg *pMeta, SShowObj *pShow,
if
(
pDb
->
status
!=
TSDB_DB_STATUS_READY
)
{
mError
(
"db:%s, status:%d, in dropping"
,
pDb
->
name
,
pDb
->
status
);
mnodeDecDbRef
(
pDb
);
return
TSDB_CODE_MND_DB_IN_DROPPING
;
}
...
...
@@ -1323,6 +1325,7 @@ int32_t mnodeRetrieveShowSuperTables(SShowObj *pShow, char *data, int32_t rows,
if
(
pDb
->
status
!=
TSDB_DB_STATUS_READY
)
{
mError
(
"db:%s, status:%d, in dropping"
,
pDb
->
name
,
pDb
->
status
);
mnodeDecDbRef
(
pDb
);
return
0
;
}
...
...
@@ -2495,6 +2498,7 @@ static int32_t mnodeGetShowTableMeta(STableMetaMsg *pMeta, SShowObj *pShow, void
if
(
pDb
->
status
!=
TSDB_DB_STATUS_READY
)
{
mError
(
"db:%s, status:%d, in dropping"
,
pDb
->
name
,
pDb
->
status
);
mnodeDecDbRef
(
pDb
);
return
TSDB_CODE_MND_DB_IN_DROPPING
;
}
...
...
@@ -2548,6 +2552,7 @@ static int32_t mnodeRetrieveShowTables(SShowObj *pShow, char *data, int32_t rows
if
(
pDb
->
status
!=
TSDB_DB_STATUS_READY
)
{
mError
(
"db:%s, status:%d, in dropping"
,
pDb
->
name
,
pDb
->
status
);
mnodeDecDbRef
(
pDb
);
return
0
;
}
...
...
@@ -2716,6 +2721,7 @@ static int32_t mnodeGetStreamTableMeta(STableMetaMsg *pMeta, SShowObj *pShow, vo
if
(
pDb
->
status
!=
TSDB_DB_STATUS_READY
)
{
mError
(
"db:%s, status:%d, in dropping"
,
pDb
->
name
,
pDb
->
status
);
mnodeDecDbRef
(
pDb
);
return
TSDB_CODE_MND_DB_IN_DROPPING
;
}
...
...
@@ -2768,6 +2774,7 @@ static int32_t mnodeRetrieveStreamTables(SShowObj *pShow, char *data, int32_t ro
if
(
pDb
->
status
!=
TSDB_DB_STATUS_READY
)
{
mError
(
"db:%s, status:%d, in dropping"
,
pDb
->
name
,
pDb
->
status
);
mnodeDecDbRef
(
pDb
);
return
0
;
}
...
...
src/mnode/src/mnodeVgroup.c
浏览文件 @
6c2d8067
...
...
@@ -89,6 +89,7 @@ static int32_t mnodeVgroupActionInsert(SSdbOper *pOper) {
if
(
pDb
->
status
!=
TSDB_DB_STATUS_READY
)
{
mError
(
"vgId:%d, db:%s status:%d, in dropping"
,
pVgroup
->
vgId
,
pDb
->
name
,
pDb
->
status
);
mnodeDecDbRef
(
pDb
);
return
TSDB_CODE_MND_DB_IN_DROPPING
;
}
...
...
@@ -617,6 +618,7 @@ static int32_t mnodeGetVgroupMeta(STableMetaMsg *pMeta, SShowObj *pShow, void *p
if
(
pDb
->
status
!=
TSDB_DB_STATUS_READY
)
{
mError
(
"db:%s, status:%d, in dropping"
,
pDb
->
name
,
pDb
->
status
);
mnodeDecDbRef
(
pDb
);
return
TSDB_CODE_MND_DB_IN_DROPPING
;
}
...
...
@@ -708,6 +710,7 @@ static int32_t mnodeRetrieveVgroups(SShowObj *pShow, char *data, int32_t rows, v
if
(
pDb
->
status
!=
TSDB_DB_STATUS_READY
)
{
mError
(
"db:%s, status:%d, in dropping"
,
pDb
->
name
,
pDb
->
status
);
mnodeDecDbRef
(
pDb
);
return
0
;
}
...
...
@@ -784,7 +787,10 @@ void mnodeAddTableIntoVgroup(SVgObj *pVgroup, SChildTableObj *pTable) {
if
(
pTable
->
sid
>=
1
)
{
taosIdPoolMarkStatus
(
pVgroup
->
idPool
,
pTable
->
sid
);
pVgroup
->
numOfTables
++
;
mnodeIncVgroupRef
(
pVgroup
);
// The create vgroup message may be received later than the create table message
// and the writing order in sdb is therefore uncertain
// which will cause the reference count of the vgroup to be incorrect when restarting
// mnodeIncVgroupRef(pVgroup);
}
}
...
...
@@ -792,7 +798,10 @@ void mnodeRemoveTableFromVgroup(SVgObj *pVgroup, SChildTableObj *pTable) {
if
(
pTable
->
sid
>=
1
)
{
taosFreeId
(
pVgroup
->
idPool
,
pTable
->
sid
);
pVgroup
->
numOfTables
--
;
mnodeDecVgroupRef
(
pVgroup
);
// The create vgroup message may be received later than the create table message
// and the writing order in sdb is therefore uncertain
// which will cause the reference count of the vgroup to be incorrect when restarting
// mnodeDecVgroupRef(pVgroup);
}
}
...
...
tests/pytest/insert/nchar.py
浏览文件 @
6c2d8067
...
...
@@ -35,6 +35,8 @@ class TDTestCase:
tdSql
.
checkRows
(
2
)
tdSql
.
checkData
(
1
,
1
,
'涛思数据'
)
tdSql
.
error
(
"insert into tb values (now, 'taosdata001')"
)
def
stop
(
self
):
tdSql
.
close
()
tdLog
.
success
(
"%s successfully executed"
%
__file__
)
...
...
tests/pytest/tag_lite/bigint.py
浏览文件 @
6c2d8067
...
...
@@ -575,6 +575,20 @@ class TDTestCase:
# TSIM: system sh/exec.sh -n dnode1 -s stop -x SIGINT
# convert end
tdSql
.
execute
(
"create database db"
)
tdSql
.
execute
(
"use db"
)
tdSql
.
execute
(
"create table if not exists st (ts timestamp, tagtype int) tags(dev bigint)"
)
tdSql
.
execute
(
'CREATE TABLE if not exists dev_001 using st tags(%d)'
%
(
pow
(
2
,
63
)
-
1
))
tdSql
.
execute
(
'CREATE TABLE if not exists dev_002 using st tags(%d)'
%
(
-
1
*
pow
(
2
,
63
)
+
1
))
print
(
"==============step2"
)
tdSql
.
query
(
"show tables"
)
tdSql
.
checkRows
(
2
)
def
stop
(
self
):
tdSql
.
close
()
tdLog
.
success
(
"%s successfully executed"
%
__file__
)
...
...
tests/pytest/tag_lite/binary.py
浏览文件 @
6c2d8067
...
...
@@ -579,6 +579,20 @@ class TDTestCase:
# TSIM: system sh/exec.sh -n dnode1 -s stop -x SIGINT
# convert end
tdSql
.
execute
(
"create database db"
)
tdSql
.
execute
(
"use db"
)
tdSql
.
execute
(
"create table if not exists st (ts timestamp, tagtype int) tags(dev binary(5))"
)
tdSql
.
error
(
'CREATE TABLE if not exists dev_001 using st tags("dev_001")'
)
tdSql
.
execute
(
'CREATE TABLE if not exists dev_002 using st tags("dev")'
)
print
(
"==============step2"
)
tdSql
.
query
(
"show tables"
)
tdSql
.
checkRows
(
1
)
def
stop
(
self
):
tdSql
.
close
()
tdLog
.
success
(
"%s successfully executed"
%
__file__
)
...
...
tests/pytest/tag_lite/float.py
浏览文件 @
6c2d8067
...
...
@@ -575,6 +575,23 @@ class TDTestCase:
# TSIM: system sh/exec.sh -n dnode1 -s stop -x SIGINT
# convert end
tdSql
.
execute
(
"create database db"
)
tdSql
.
execute
(
"use db"
)
tdSql
.
execute
(
"create table if not exists st (ts timestamp, tagtype int) tags(dev float)"
)
tdSql
.
error
(
'CREATE TABLE if not exists dev_001 using st tags(%f)'
%
-
3.4E38
-
1
)
tdSql
.
error
(
'CREATE TABLE if not exists dev_001 using st tags(%f)'
%
3.4E38
+
1
)
tdSql
.
execute
(
'CREATE TABLE if not exists dev_001 using st tags(%f)'
%
3.4E38
)
tdSql
.
execute
(
'CREATE TABLE if not exists dev_002 using st tags(%f)'
%
-
3.4E38
)
tdSql
.
query
(
"show tables"
)
tdSql
.
checkRows
(
2
)
def
stop
(
self
):
tdSql
.
close
()
tdLog
.
success
(
"%s successfully executed"
%
__file__
)
...
...
tests/pytest/tag_lite/int.py
浏览文件 @
6c2d8067
...
...
@@ -574,6 +574,24 @@ class TDTestCase:
# TSIM: system sh/exec.sh -n dnode1 -s stop -x SIGINT
# convert end
tdSql
.
execute
(
"create database db"
)
tdSql
.
execute
(
"use db"
)
tdSql
.
execute
(
"create table if not exists st (ts timestamp, tagtype int) tags(dev int)"
)
tdSql
.
error
(
'CREATE TABLE if not exists dev_001 using st tags(%d)'
%
pow
(
2
,
31
))
tdSql
.
error
(
'CREATE TABLE if not exists dev_001 using st tags(%d)'
%
(
-
1
*
pow
(
2
,
31
)))
tdSql
.
execute
(
'CREATE TABLE if not exists dev_001 using st tags(%d)'
%
(
pow
(
2
,
31
)
-
1
))
tdSql
.
execute
(
'CREATE TABLE if not exists dev_002 using st tags(%d)'
%
(
-
1
*
pow
(
2
,
31
)
+
1
))
print
(
"==============step2"
)
tdSql
.
query
(
"show tables"
)
tdSql
.
checkRows
(
2
)
def
stop
(
self
):
tdSql
.
close
()
tdLog
.
success
(
"%s successfully executed"
%
__file__
)
...
...
tests/pytest/tag_lite/nchar.py
0 → 100644
浏览文件 @
6c2d8067
###################################################################
# Copyright (c) 2016 by TAOS Technologies, Inc.
# All rights reserved.
#
# This file is proprietary and confidential to TAOS Technologies.
# No part of this file may be reproduced, stored, transmitted,
# disclosed or used in any form or by any means other than as
# expressly provided by the written permission from Jianhui Tao
#
###################################################################
# -*- coding: utf-8 -*-
import
sys
import
taos
from
util.log
import
tdLog
from
util.cases
import
tdCases
from
util.sql
import
tdSql
class
TDTestCase
:
def
init
(
self
,
conn
,
logSql
):
tdLog
.
debug
(
"start to execute %s"
%
__file__
)
tdSql
.
init
(
conn
.
cursor
(),
logSql
)
def
run
(
self
):
tdSql
.
prepare
()
print
(
"==============step1"
)
tdSql
.
execute
(
"create table if not exists st (ts timestamp, tagtype int) tags(dev nchar(5))"
)
tdSql
.
error
(
'CREATE TABLE if not exists dev_001 using st tags("dev_001")'
)
tdSql
.
execute
(
'CREATE TABLE if not exists dev_002 using st tags("dev")'
)
print
(
"==============step2"
)
tdSql
.
query
(
"show tables"
)
tdSql
.
checkRows
(
1
)
def
stop
(
self
):
tdSql
.
close
()
tdLog
.
success
(
"%s successfully executed"
%
__file__
)
tdCases
.
addWindows
(
__file__
,
TDTestCase
())
tdCases
.
addLinux
(
__file__
,
TDTestCase
())
tests/pytest/tag_lite/smallint.py
浏览文件 @
6c2d8067
...
...
@@ -574,6 +574,23 @@ class TDTestCase:
# TSIM:
# TSIM: system sh/exec.sh -n dnode1 -s stop -x SIGINT
# convert end
tdSql
.
execute
(
"create database db"
)
tdSql
.
execute
(
"use db"
)
tdSql
.
execute
(
"create table if not exists st (ts timestamp, tagtype int) tags(dev smallint)"
)
tdSql
.
error
(
'CREATE TABLE if not exists dev_001 using st tags(%d)'
%
pow
(
2
,
15
))
tdSql
.
error
(
'CREATE TABLE if not exists dev_001 using st tags(%d)'
%
(
-
1
*
pow
(
2
,
15
)))
tdSql
.
execute
(
'CREATE TABLE if not exists dev_001 using st tags(%d)'
%
(
pow
(
2
,
15
)
-
1
))
tdSql
.
execute
(
'CREATE TABLE if not exists dev_002 using st tags(%d)'
%
(
-
1
*
pow
(
2
,
15
)
+
1
))
print
(
"==============step2"
)
tdSql
.
query
(
"show tables"
)
tdSql
.
checkRows
(
2
)
def
stop
(
self
):
tdSql
.
close
()
...
...
tests/pytest/tag_lite/tinyint.py
浏览文件 @
6c2d8067
...
...
@@ -575,6 +575,24 @@ class TDTestCase:
# TSIM: system sh/exec.sh -n dnode1 -s stop -x SIGINT
# convert end
tdSql
.
execute
(
"create database db"
)
tdSql
.
execute
(
"use db"
)
tdSql
.
execute
(
"create table if not exists st (ts timestamp, tagtype int) tags(dev tinyint)"
)
tdSql
.
error
(
'CREATE TABLE if not exists dev_001 using st tags(%d)'
%
pow
(
2
,
7
))
tdSql
.
error
(
'CREATE TABLE if not exists dev_001 using st tags(%d)'
%
(
-
1
*
pow
(
2
,
7
)))
tdSql
.
execute
(
'CREATE TABLE if not exists dev_001 using st tags(%d)'
%
(
pow
(
2
,
7
)
-
1
))
tdSql
.
execute
(
'CREATE TABLE if not exists dev_002 using st tags(%d)'
%
(
-
1
*
pow
(
2
,
7
)
+
1
))
print
(
"==============step2"
)
tdSql
.
query
(
"show tables"
)
tdSql
.
checkRows
(
2
)
def
stop
(
self
):
tdSql
.
close
()
tdLog
.
success
(
"%s successfully executed"
%
__file__
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录