fix python source code for pep8 standard.

tests/pytest/import_merge/importBlock1H.py

 ###################################################################
- #       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
- #
+#       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 -*-  
+# -*- coding: utf-8 -*-
 
 import sys
 import taos
@@ -18,53 +18,55 @@ from util.cases import *
 from util.sql import *
 from util.dnodes import *
 
+
 class TDTestCase:
-  def init(self, conn):
-    tdLog.debug("start to execute %s" % __file__)
-    tdSql.init(conn.cursor())
-    
-  def run(self):
-    self.ntables = 1
-    self.startTime = 1520000010000
+    def init(self, conn):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor())
+
+    def run(self):
+        self.ntables = 1
+        self.startTime = 1520000010000
+
+        tdDnodes.stop(1)
+        tdDnodes.deploy(1)
+        tdDnodes.start(1)
+
+        tdSql.execute('reset query cache')
+        tdSql.execute('drop database if exists db')
+        tdSql.execute('create database db cache 512')
+        tdSql.execute('use db')
+
+        tdLog.info("================= step1")
+        tdLog.info("create 1 table")
+        tdSql.execute('create table tb1 (ts timestamp, speed int)')
+        tdLog.info("one block can import 38 records")
 
-    tdDnodes.stop(1)
-    tdDnodes.deploy(1)
-    tdDnodes.start(1)
+        tdLog.info("================= step2")
+        tdLog.info("import 38 sequential data")
+        startTime = self.startTime
+        sqlcmd = ['import into tb1 values']
+        for rid in range(1, 39):
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        tdSql.execute(" ".join(sqlcmd))
 
-    tdSql.execute('reset query cache')
-    tdSql.execute('drop database if exists db')
-    tdSql.execute('create database db cache 512')
-    tdSql.execute('use db')
+        tdLog.info("================= step3")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(38)
 
-    tdLog.info("================= step1")
-    tdLog.info("create 1 table")
-    tdSql.execute('create table tb1 (ts timestamp, speed int)')
-    tdLog.info("one block can import 38 records")
+        tdLog.info("================= step4")
+        tdLog.info("import 1 data before")
+        startTime = self.startTime - 1
+        tdSql.execute('import into tb1 values(%ld, %d)' % (startTime, rid))
 
-    tdLog.info("================= step2")
-    tdLog.info("import 38 sequential data")
-    startTime = self.startTime
-    sqlcmd = ['import into tb1 values']
-    for rid in range(1,39):
-      sqlcmd.append('(%ld, %d)' %(startTime+rid, rid))
-    tdSql.execute(" ".join(sqlcmd))
-    
-    tdLog.info("================= step3")
-    tdSql.query('select * from tb1')
-    tdSql.checkRows(38)
+        tdLog.info("================= step5")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(39)
 
-    tdLog.info("================= step4")
-    tdLog.info("import 1 data before")
-    startTime = self.startTime - 1
-    tdSql.execute('import into tb1 values(%ld, %d)' %(startTime, rid))
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
 
-    tdLog.info("================= step5")
-    tdSql.query('select * from tb1')
-    tdSql.checkRows(39)
 
-  def stop(self):
-    tdSql.close()
-    tdLog.success("%s successfully executed" % __file__)
-  
 tdCases.addWindows(__file__, TDTestCase())
 tdCases.addLinux(__file__, TDTestCase())

tests/pytest/import_merge/importBlock1HO.py

 ###################################################################
- #       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
- #
+#       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 -*-  
+# -*- coding: utf-8 -*-
 
 import sys
 import taos
@@ -18,56 +18,58 @@ from util.cases import *
 from util.sql import *
 from util.dnodes import *
 
+
 class TDTestCase:
-  def init(self, conn):
-    tdLog.debug("start to execute %s" % __file__)
-    tdSql.init(conn.cursor())
-    
-  def run(self):
-    self.ntables = 1
-    self.startTime = 1520000010000
+    def init(self, conn):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor())
+
+    def run(self):
+        self.ntables = 1
+        self.startTime = 1520000010000
+
+        tdDnodes.stop(1)
+        tdDnodes.deploy(1)
+        tdDnodes.start(1)
+
+        tdSql.execute('reset query cache')
+        tdSql.execute('drop database if exists db')
+        tdSql.execute('create database db cache 512')
+        tdSql.execute('use db')
+
+        tdLog.info("================= step1")
+        tdLog.info("create 1 table")
+        tdSql.execute('create table tb1 (ts timestamp, speed int)')
+        tdLog.info("one block can import 38 records")
 
-    tdDnodes.stop(1)
-    tdDnodes.deploy(1)
-    tdDnodes.start(1)
+        tdLog.info("================= step2")
+        tdLog.info("import 38 sequential data")
+        startTime = self.startTime
+        sqlcmd = ['import into tb1 values']
+        for rid in range(1, 39):
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        tdSql.execute(" ".join(sqlcmd))
 
-    tdSql.execute('reset query cache')
-    tdSql.execute('drop database if exists db')
-    tdSql.execute('create database db cache 512')
-    tdSql.execute('use db')
+        tdLog.info("================= step3")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(38)
 
-    tdLog.info("================= step1")
-    tdLog.info("create 1 table")
-    tdSql.execute('create table tb1 (ts timestamp, speed int)')
-    tdLog.info("one block can import 38 records")
+        tdLog.info("================= step4")
+        tdLog.info("import 10 data before with overlap")
+        startTime = self.startTime - 5
+        sqlcmd = ['import into tb1 values']
+        for rid in range(1, 11):
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        tdSql.execute(" ".join(sqlcmd))
 
-    tdLog.info("================= step2")
-    tdLog.info("import 38 sequential data")
-    startTime = self.startTime
-    sqlcmd = ['import into tb1 values']
-    for rid in range(1,39):
-      sqlcmd.append('(%ld, %d)' %(startTime+rid, rid))
-    tdSql.execute(" ".join(sqlcmd))
-    
-    tdLog.info("================= step3")
-    tdSql.query('select * from tb1')
-    tdSql.checkRows(38)
+        tdLog.info("================= step5")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(43)
 
-    tdLog.info("================= step4")
-    tdLog.info("import 10 data before with overlap")
-    startTime = self.startTime - 5
-    sqlcmd = ['import into tb1 values']
-    for rid in range(1,11):
-      sqlcmd.append('(%ld, %d)' %(startTime+rid, rid))
-    tdSql.execute(" ".join(sqlcmd))
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
 
-    tdLog.info("================= step5")
-    tdSql.query('select * from tb1')
-    tdSql.checkRows(43)
 
-  def stop(self):
-    tdSql.close()
-    tdLog.success("%s successfully executed" % __file__)
-  
 tdCases.addWindows(__file__, TDTestCase())
 tdCases.addLinux(__file__, TDTestCase())

tests/pytest/import_merge/importBlock1HPO.py

 ###################################################################
- #       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
- #
+#       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 -*-  
+# -*- coding: utf-8 -*-
 
 import sys
 import taos
@@ -18,58 +18,60 @@ from util.cases import *
 from util.sql import *
 from util.dnodes import *
 
+
 class TDTestCase:
-  def init(self, conn):
-    tdLog.debug("start to execute %s" % __file__)
-    tdSql.init(conn.cursor())
-    
-  def run(self):
-    self.ntables = 1
-    self.startTime = 1520000010000
+    def init(self, conn):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor())
+
+    def run(self):
+        self.ntables = 1
+        self.startTime = 1520000010000
+
+        tdDnodes.stop(1)
+        tdDnodes.deploy(1)
+        tdDnodes.start(1)
+
+        tdSql.execute('reset query cache')
+        tdSql.execute('drop database if exists db')
+        tdSql.execute('create database db cache 512')
+        tdSql.execute('use db')
+
+        tdLog.info("================= step1")
+        tdLog.info("create 1 table")
+        tdSql.execute('create table tb1 (ts timestamp, speed int)')
+        tdLog.info("one block can import 38 records")
 
-    tdDnodes.stop(1)
-    tdDnodes.deploy(1)
-    tdDnodes.start(1)
+        tdLog.info("================= step2")
+        tdLog.info("import 38 sequential data")
+        startTime = self.startTime
+        sqlcmd = ['import into tb1 values']
+        for rid in range(1, 11):
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        for rid in range(15, 43):
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        tdSql.execute(" ".join(sqlcmd))
 
-    tdSql.execute('reset query cache')
-    tdSql.execute('drop database if exists db')
-    tdSql.execute('create database db cache 512')
-    tdSql.execute('use db')
+        tdLog.info("================= step3")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(38)
 
-    tdLog.info("================= step1")
-    tdLog.info("create 1 table")
-    tdSql.execute('create table tb1 (ts timestamp, speed int)')
-    tdLog.info("one block can import 38 records")
+        tdLog.info("================= step4")
+        tdLog.info("import 20 data before with partly overlap")
+        startTime = self.startTime - 5
+        sqlcmd = ['import into tb1 values']
+        for rid in range(1, 21):
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        tdSql.execute(" ".join(sqlcmd))
 
-    tdLog.info("================= step2")
-    tdLog.info("import 38 sequential data")
-    startTime = self.startTime
-    sqlcmd = ['import into tb1 values']
-    for rid in range(1,11):
-      sqlcmd.append('(%ld, %d)' %(startTime+rid, rid))
-    for rid in range(15,43):
-      sqlcmd.append('(%ld, %d)' %(startTime+rid, rid))
-    tdSql.execute(" ".join(sqlcmd))
-    
-    tdLog.info("================= step3")
-    tdSql.query('select * from tb1')
-    tdSql.checkRows(38)
+        tdLog.info("================= step5")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(47)
 
-    tdLog.info("================= step4")
-    tdLog.info("import 20 data before with partly overlap")
-    startTime = self.startTime - 5
-    sqlcmd = ['import into tb1 values']
-    for rid in range(1,21):
-      sqlcmd.append('(%ld, %d)' %(startTime+rid, rid))
-    tdSql.execute(" ".join(sqlcmd))
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
 
-    tdLog.info("================= step5")
-    tdSql.query('select * from tb1')
-    tdSql.checkRows(47)
 
-  def stop(self):
-    tdSql.close()
-    tdLog.success("%s successfully executed" % __file__)
-  
 tdCases.addWindows(__file__, TDTestCase())
 tdCases.addLinux(__file__, TDTestCase())

tests/pytest/import_merge/importBlock1S.py

 ###################################################################
- #       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
- #
+#       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 -*-  
+# -*- coding: utf-8 -*-
 
 import sys
 import taos
@@ -18,56 +18,58 @@ from util.cases import *
 from util.sql import *
 from util.dnodes import *
 
+
 class TDTestCase:
-  def init(self, conn):
-    tdLog.debug("start to execute %s" % __file__)
-    tdSql.init(conn.cursor())
-    
-  def run(self):
-    self.ntables = 1
-    self.startTime = 1520000010000
+    def init(self, conn):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor())
+
+    def run(self):
+        self.ntables = 1
+        self.startTime = 1520000010000
+
+        tdDnodes.stop(1)
+        tdDnodes.deploy(1)
+        tdDnodes.start(1)
+
+        tdSql.execute('reset query cache')
+        tdSql.execute('drop database if exists db')
+        tdSql.execute('create database db cache 512')
+        tdSql.execute('use db')
+
+        tdLog.info("================= step1")
+        tdLog.info("create 1 table")
+        tdSql.execute('create table tb1 (ts timestamp, speed int)')
+        tdLog.info("one block can import 38 records")
 
-    tdDnodes.stop(1)
-    tdDnodes.deploy(1)
-    tdDnodes.start(1)
+        tdLog.info("================= step2")
+        tdLog.info("import 38 sequential data")
+        startTime = self.startTime
+        sqlcmd = ['import into tb1 values']
+        for rid in range(1, 39):
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        tdSql.execute(" ".join(sqlcmd))
 
-    tdSql.execute('reset query cache')
-    tdSql.execute('drop database if exists db')
-    tdSql.execute('create database db cache 512')
-    tdSql.execute('use db')
+        tdLog.info("================= step3")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(38)
 
-    tdLog.info("================= step1")
-    tdLog.info("create 1 table")
-    tdSql.execute('create table tb1 (ts timestamp, speed int)')
-    tdLog.info("one block can import 38 records")
+        tdLog.info("================= step4")
+        tdLog.info("import 50 data covering existing data")
+        startTime = self.startTime - 5
+        sqlcmd = ['import into tb1 values']
+        for rid in range(1, 51):
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        tdSql.execute(" ".join(sqlcmd))
 
-    tdLog.info("================= step2")
-    tdLog.info("import 38 sequential data")
-    startTime = self.startTime
-    sqlcmd = ['import into tb1 values']
-    for rid in range(1,39):
-      sqlcmd.append('(%ld, %d)' %(startTime+rid, rid))
-    tdSql.execute(" ".join(sqlcmd))
-    
-    tdLog.info("================= step3")
-    tdSql.query('select * from tb1')
-    tdSql.checkRows(38)
+        tdLog.info("================= step5")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(50)
 
-    tdLog.info("================= step4")
-    tdLog.info("import 50 data covering existing data")
-    startTime = self.startTime - 5
-    sqlcmd = ['import into tb1 values']
-    for rid in range(1,51):
-      sqlcmd.append('(%ld, %d)' %(startTime+rid, rid))
-    tdSql.execute(" ".join(sqlcmd))
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
 
-    tdLog.info("================= step5")
-    tdSql.query('select * from tb1')
-    tdSql.checkRows(50)
 
-  def stop(self):
-    tdSql.close()
-    tdLog.success("%s successfully executed" % __file__)
-  
 tdCases.addWindows(__file__, TDTestCase())
 tdCases.addLinux(__file__, TDTestCase())

tests/pytest/import_merge/importBlock1Sub.py

 ###################################################################
- #       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
- #
+#       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 -*-  
+# -*- coding: utf-8 -*-
 
 import sys
 import taos
@@ -18,56 +18,58 @@ from util.cases import *
 from util.sql import *
 from util.dnodes import *
 
+
 class TDTestCase:
-  def init(self, conn):
-    tdLog.debug("start to execute %s" % __file__)
-    tdSql.init(conn.cursor())
-    
-  def run(self):
-    self.ntables = 1
-    self.startTime = 1520000010000
+    def init(self, conn):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor())
+
+    def run(self):
+        self.ntables = 1
+        self.startTime = 1520000010000
+
+        tdDnodes.stop(1)
+        tdDnodes.deploy(1)
+        tdDnodes.start(1)
+
+        tdSql.execute('reset query cache')
+        tdSql.execute('drop database if exists db')
+        tdSql.execute('create database db cache 512')
+        tdSql.execute('use db')
+
+        tdLog.info("================= step1")
+        tdLog.info("create 1 table")
+        tdSql.execute('create table tb1 (ts timestamp, speed int)')
+        tdLog.info("one block can import 38 records")
 
-    tdDnodes.stop(1)
-    tdDnodes.deploy(1)
-    tdDnodes.start(1)
+        tdLog.info("================= step2")
+        tdLog.info("import 38 sequential data")
+        startTime = self.startTime
+        sqlcmd = ['import into tb1 values']
+        for rid in range(1, 39):
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        tdSql.execute(" ".join(sqlcmd))
 
-    tdSql.execute('reset query cache')
-    tdSql.execute('drop database if exists db')
-    tdSql.execute('create database db cache 512')
-    tdSql.execute('use db')
+        tdLog.info("================= step3")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(38)
 
-    tdLog.info("================= step1")
-    tdLog.info("create 1 table")
-    tdSql.execute('create table tb1 (ts timestamp, speed int)')
-    tdLog.info("one block can import 38 records")
+        tdLog.info("================= step4")
+        tdLog.info("import 10 data totally repetitive")
+        startTime = self.startTime
+        sqlcmd = ['import into tb1 values']
+        for rid in range(1, 11):
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        tdSql.execute(" ".join(sqlcmd))
 
-    tdLog.info("================= step2")
-    tdLog.info("import 38 sequential data")
-    startTime = self.startTime
-    sqlcmd = ['import into tb1 values']
-    for rid in range(1,39):
-      sqlcmd.append('(%ld, %d)' %(startTime+rid, rid))
-    tdSql.execute(" ".join(sqlcmd))
-    
-    tdLog.info("================= step3")
-    tdSql.query('select * from tb1')
-    tdSql.checkRows(38)
+        tdLog.info("================= step5")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(38)
 
-    tdLog.info("================= step4")
-    tdLog.info("import 10 data totally repetitive")
-    startTime = self.startTime
-    sqlcmd = ['import into tb1 values']
-    for rid in range(1,11):
-      sqlcmd.append('(%ld, %d)' %(startTime+rid, rid))
-    tdSql.execute(" ".join(sqlcmd))
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
 
-    tdLog.info("================= step5")
-    tdSql.query('select * from tb1')
-    tdSql.checkRows(38)
 
-  def stop(self):
-    tdSql.close()
-    tdLog.success("%s successfully executed" % __file__)
-  
 tdCases.addWindows(__file__, TDTestCase())
 tdCases.addLinux(__file__, TDTestCase())

tests/pytest/import_merge/importBlock1T.py

 ###################################################################
- #       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
- #
+#       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 -*-  
+# -*- coding: utf-8 -*-
 
 import sys
 import taos
@@ -18,53 +18,55 @@ from util.cases import *
 from util.sql import *
 from util.dnodes import *
 
+
 class TDTestCase:
-  def init(self, conn):
-    tdLog.debug("start to execute %s" % __file__)
-    tdSql.init(conn.cursor())
-    
-  def run(self):
-    self.ntables = 1
-    self.startTime = 1520000010000
+    def init(self, conn):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor())
+
+    def run(self):
+        self.ntables = 1
+        self.startTime = 1520000010000
+
+        tdDnodes.stop(1)
+        tdDnodes.deploy(1)
+        tdDnodes.start(1)
+
+        tdSql.execute('reset query cache')
+        tdSql.execute('drop database if exists db')
+        tdSql.execute('create database db cache 512')
+        tdSql.execute('use db')
+
+        tdLog.info("================= step1")
+        tdLog.info("create 1 table")
+        tdSql.execute('create table tb1 (ts timestamp, speed int)')
+        tdLog.info("one block can import 38 records")
 
-    tdDnodes.stop(1)
-    tdDnodes.deploy(1)
-    tdDnodes.start(1)
+        tdLog.info("================= step2")
+        tdLog.info("import 38 sequential data")
+        startTime = self.startTime
+        sqlcmd = ['import into tb1 values']
+        for rid in range(1, 39):
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        tdSql.execute(" ".join(sqlcmd))
 
-    tdSql.execute('reset query cache')
-    tdSql.execute('drop database if exists db')
-    tdSql.execute('create database db cache 512')
-    tdSql.execute('use db')
+        tdLog.info("================= step3")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(38)
 
-    tdLog.info("================= step1")
-    tdLog.info("create 1 table")
-    tdSql.execute('create table tb1 (ts timestamp, speed int)')
-    tdLog.info("one block can import 38 records")
+        tdLog.info("================= step4")
+        tdLog.info("import 1 data after")
+        startTime = self.startTime + 38
+        tdSql.execute('import into tb1 values(%ld, %d)' % (startTime + 1, rid))
 
-    tdLog.info("================= step2")
-    tdLog.info("import 38 sequential data")
-    startTime = self.startTime
-    sqlcmd = ['import into tb1 values']
-    for rid in range(1,39):
-      sqlcmd.append('(%ld, %d)' %(startTime+rid, rid))
-    tdSql.execute(" ".join(sqlcmd))
-    
-    tdLog.info("================= step3")
-    tdSql.query('select * from tb1')
-    tdSql.checkRows(38)
+        tdLog.info("================= step5")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(39)
 
-    tdLog.info("================= step4")
-    tdLog.info("import 1 data after")
-    startTime = self.startTime + 38
-    tdSql.execute('import into tb1 values(%ld, %d)' %(startTime+1, rid))
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
 
-    tdLog.info("================= step5")
-    tdSql.query('select * from tb1')
-    tdSql.checkRows(39)
 
-  def stop(self):
-    tdSql.close()
-    tdLog.success("%s successfully executed" % __file__)
-  
 tdCases.addWindows(__file__, TDTestCase())
 tdCases.addLinux(__file__, TDTestCase())

tests/pytest/import_merge/importBlock1TO.py

 ###################################################################
- #       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
- #
+#       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 -*-  
+# -*- coding: utf-8 -*-
 
 import sys
 import taos
@@ -18,56 +18,58 @@ from util.cases import *
 from util.sql import *
 from util.dnodes import *
 
+
 class TDTestCase:
-  def init(self, conn):
-    tdLog.debug("start to execute %s" % __file__)
-    tdSql.init(conn.cursor())
-    
-  def run(self):
-    self.ntables = 1
-    self.startTime = 1520000010000
+    def init(self, conn):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor())
+
+    def run(self):
+        self.ntables = 1
+        self.startTime = 1520000010000
+
+        tdDnodes.stop(1)
+        tdDnodes.deploy(1)
+        tdDnodes.start(1)
+
+        tdSql.execute('reset query cache')
+        tdSql.execute('drop database if exists db')
+        tdSql.execute('create database db cache 512')
+        tdSql.execute('use db')
+
+        tdLog.info("================= step1")
+        tdLog.info("create 1 table")
+        tdSql.execute('create table tb1 (ts timestamp, speed int)')
+        tdLog.info("one block can import 38 records")
 
-    tdDnodes.stop(1)
-    tdDnodes.deploy(1)
-    tdDnodes.start(1)
+        tdLog.info("================= step2")
+        tdLog.info("import 38 sequential data")
+        startTime = self.startTime
+        sqlcmd = ['import into tb1 values']
+        for rid in range(1, 39):
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        tdSql.execute(" ".join(sqlcmd))
 
-    tdSql.execute('reset query cache')
-    tdSql.execute('drop database if exists db')
-    tdSql.execute('create database db cache 512')
-    tdSql.execute('use db')
+        tdLog.info("================= step3")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(38)
 
-    tdLog.info("================= step1")
-    tdLog.info("create 1 table")
-    tdSql.execute('create table tb1 (ts timestamp, speed int)')
-    tdLog.info("one block can import 38 records")
+        tdLog.info("================= step4")
+        tdLog.info("import 10 data later with overlap")
+        startTime = self.startTime + 30
+        sqlcmd = ['import into tb1 values']
+        for rid in range(1, 11):
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        tdSql.execute(" ".join(sqlcmd))
 
-    tdLog.info("================= step2")
-    tdLog.info("import 38 sequential data")
-    startTime = self.startTime
-    sqlcmd = ['import into tb1 values']
-    for rid in range(1,39):
-      sqlcmd.append('(%ld, %d)' %(startTime+rid, rid))
-    tdSql.execute(" ".join(sqlcmd))
-    
-    tdLog.info("================= step3")
-    tdSql.query('select * from tb1')
-    tdSql.checkRows(38)
+        tdLog.info("================= step5")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(40)
 
-    tdLog.info("================= step4")
-    tdLog.info("import 10 data later with overlap")
-    startTime = self.startTime + 30
-    sqlcmd = ['import into tb1 values']
-    for rid in range(1,11):
-      sqlcmd.append('(%ld, %d)' %(startTime+rid, rid))
-    tdSql.execute(" ".join(sqlcmd))
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
 
-    tdLog.info("================= step5")
-    tdSql.query('select * from tb1')
-    tdSql.checkRows(40)
 
-  def stop(self):
-    tdSql.close()
-    tdLog.success("%s successfully executed" % __file__)
-  
 tdCases.addWindows(__file__, TDTestCase())
 tdCases.addLinux(__file__, TDTestCase())

tests/pytest/import_merge/importBlock1TPO.py

 ###################################################################
- #       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
- #
+#       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 -*-  
+# -*- coding: utf-8 -*-
 
 import sys
 import taos
@@ -18,58 +18,60 @@ from util.cases import *
 from util.sql import *
 from util.dnodes import *
 
+
 class TDTestCase:
-  def init(self, conn):
-    tdLog.debug("start to execute %s" % __file__)
-    tdSql.init(conn.cursor())
-    
-  def run(self):
-    self.ntables = 1
-    self.startTime = 1520000010000
+    def init(self, conn):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor())
+
+    def run(self):
+        self.ntables = 1
+        self.startTime = 1520000010000
+
+        tdDnodes.stop(1)
+        tdDnodes.deploy(1)
+        tdDnodes.start(1)
+
+        tdSql.execute('reset query cache')
+        tdSql.execute('drop database if exists db')
+        tdSql.execute('create database db cache 512')
+        tdSql.execute('use db')
+
+        tdLog.info("================= step1")
+        tdLog.info("create 1 table")
+        tdSql.execute('create table tb1 (ts timestamp, speed int)')
+        tdLog.info("one block can import 38 records")
 
-    tdDnodes.stop(1)
-    tdDnodes.deploy(1)
-    tdDnodes.start(1)
+        tdLog.info("================= step2")
+        tdLog.info("import 38 sequential data")
+        startTime = self.startTime
+        sqlcmd = ['import into tb1 values']
+        for rid in range(1, 31):
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        for rid in range(35, 43):
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        tdSql.execute(" ".join(sqlcmd))
 
-    tdSql.execute('reset query cache')
-    tdSql.execute('drop database if exists db')
-    tdSql.execute('create database db cache 512')
-    tdSql.execute('use db')
+        tdLog.info("================= step3")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(38)
 
-    tdLog.info("================= step1")
-    tdLog.info("create 1 table")
-    tdSql.execute('create table tb1 (ts timestamp, speed int)')
-    tdLog.info("one block can import 38 records")
+        tdLog.info("================= step4")
+        tdLog.info("import 30 data later with partly overlap")
+        startTime = self.startTime + 25
+        sqlcmd = ['import into tb1 values']
+        for rid in range(1, 31):
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        tdSql.execute(" ".join(sqlcmd))
 
-    tdLog.info("================= step2")
-    tdLog.info("import 38 sequential data")
-    startTime = self.startTime
-    sqlcmd = ['import into tb1 values']
-    for rid in range(1,31):
-      sqlcmd.append('(%ld, %d)' %(startTime+rid, rid))
-    for rid in range(35,43):
-      sqlcmd.append('(%ld, %d)' %(startTime+rid, rid))
-    tdSql.execute(" ".join(sqlcmd))
-    
-    tdLog.info("================= step3")
-    tdSql.query('select * from tb1')
-    tdSql.checkRows(38)
+        tdLog.info("================= step5")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(55)
 
-    tdLog.info("================= step4")
-    tdLog.info("import 30 data later with partly overlap")
-    startTime = self.startTime + 25
-    sqlcmd = ['import into tb1 values']
-    for rid in range(1,31):
-      sqlcmd.append('(%ld, %d)' %(startTime+rid, rid))
-    tdSql.execute(" ".join(sqlcmd))
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
 
-    tdLog.info("================= step5")
-    tdSql.query('select * from tb1')
-    tdSql.checkRows(55)
 
-  def stop(self):
-    tdSql.close()
-    tdLog.success("%s successfully executed" % __file__)
-  
 tdCases.addWindows(__file__, TDTestCase())
 tdCases.addLinux(__file__, TDTestCase())

tests/pytest/import_merge/importBlock2H.py

 ###################################################################
- #       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
- #
+#       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 -*-  
+# -*- coding: utf-8 -*-
 
 import sys
 import taos
@@ -18,53 +18,55 @@ from util.cases import *
 from util.sql import *
 from util.dnodes import *
 
+
 class TDTestCase:
-  def init(self, conn):
-    tdLog.debug("start to execute %s" % __file__)
-    tdSql.init(conn.cursor())
-    
-  def run(self):
-    self.ntables = 1
-    self.startTime = 1520000010000
+    def init(self, conn):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor())
+
+    def run(self):
+        self.ntables = 1
+        self.startTime = 1520000010000
+
+        tdDnodes.stop(1)
+        tdDnodes.deploy(1)
+        tdDnodes.start(1)
+
+        tdSql.execute('reset query cache')
+        tdSql.execute('drop database if exists db')
+        tdSql.execute('create database db cache 512')
+        tdSql.execute('use db')
+
+        tdLog.info("================= step1")
+        tdLog.info("create 1 table")
+        tdSql.execute('create table tb1 (ts timestamp, speed int)')
+        tdLog.info("one block can import 38 records")
 
-    tdDnodes.stop(1)
-    tdDnodes.deploy(1)
-    tdDnodes.start(1)
+        tdLog.info("================= step2")
+        tdLog.info("import 76 sequential data")
+        startTime = self.startTime
+        sqlcmd = ['import into tb1 values']
+        for rid in range(1, 77):
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        tdSql.execute(" ".join(sqlcmd))
 
-    tdSql.execute('reset query cache')
-    tdSql.execute('drop database if exists db')
-    tdSql.execute('create database db cache 512')
-    tdSql.execute('use db')
+        tdLog.info("================= step3")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(76)
 
-    tdLog.info("================= step1")
-    tdLog.info("create 1 table")
-    tdSql.execute('create table tb1 (ts timestamp, speed int)')
-    tdLog.info("one block can import 38 records")
+        tdLog.info("================= step4")
+        tdLog.info("import 1 data before")
+        startTime = self.startTime - 1
+        tdSql.execute('import into tb1 values(%ld, %d)' % (startTime, rid))
 
-    tdLog.info("================= step2")
-    tdLog.info("import 76 sequential data")
-    startTime = self.startTime
-    sqlcmd = ['import into tb1 values']
-    for rid in range(1,77):
-      sqlcmd.append('(%ld, %d)' %(startTime+rid, rid))
-    tdSql.execute(" ".join(sqlcmd))
-    
-    tdLog.info("================= step3")
-    tdSql.query('select * from tb1')
-    tdSql.checkRows(76)
+        tdLog.info("================= step5")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(77)
 
-    tdLog.info("================= step4")
-    tdLog.info("import 1 data before")
-    startTime = self.startTime - 1
-    tdSql.execute('import into tb1 values(%ld, %d)' %(startTime, rid))
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
 
-    tdLog.info("================= step5")
-    tdSql.query('select * from tb1')
-    tdSql.checkRows(77)
 
-  def stop(self):
-    tdSql.close()
-    tdLog.success("%s successfully executed" % __file__)
-  
 tdCases.addWindows(__file__, TDTestCase())
 tdCases.addLinux(__file__, TDTestCase())

tests/pytest/import_merge/importBlock2HO.py

 ###################################################################
- #       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
- #
+#       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 -*-  
+# -*- coding: utf-8 -*-
 
 import sys
 import taos
@@ -18,56 +18,58 @@ from util.cases import *
 from util.sql import *
 from util.dnodes import *
 
+
 class TDTestCase:
-  def init(self, conn):
-    tdLog.debug("start to execute %s" % __file__)
-    tdSql.init(conn.cursor())
-    
-  def run(self):
-    self.ntables = 1
-    self.startTime = 1520000010000
+    def init(self, conn):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor())
+
+    def run(self):
+        self.ntables = 1
+        self.startTime = 1520000010000
+
+        tdDnodes.stop(1)
+        tdDnodes.deploy(1)
+        tdDnodes.start(1)
+
+        tdSql.execute('reset query cache')
+        tdSql.execute('drop database if exists db')
+        tdSql.execute('create database db cache 512')
+        tdSql.execute('use db')
+
+        tdLog.info("================= step1")
+        tdLog.info("create 1 table")
+        tdSql.execute('create table tb1 (ts timestamp, speed int)')
+        tdLog.info("one block can import 38 records")
 
-    tdDnodes.stop(1)
-    tdDnodes.deploy(1)
-    tdDnodes.start(1)
+        tdLog.info("================= step2")
+        tdLog.info("import 76 sequential data")
+        startTime = self.startTime
+        sqlcmd = ['import into tb1 values']
+        for rid in range(1, 77):
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        tdSql.execute(" ".join(sqlcmd))
 
-    tdSql.execute('reset query cache')
-    tdSql.execute('drop database if exists db')
-    tdSql.execute('create database db cache 512')
-    tdSql.execute('use db')
+        tdLog.info("================= step3")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(76)
 
-    tdLog.info("================= step1")
-    tdLog.info("create 1 table")
-    tdSql.execute('create table tb1 (ts timestamp, speed int)')
-    tdLog.info("one block can import 38 records")
+        tdLog.info("================= step4")
+        tdLog.info("import 10 data before with overlap")
+        startTime = self.startTime - 5
+        sqlcmd = ['import into tb1 values']
+        for rid in range(1, 11):
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        tdSql.execute(" ".join(sqlcmd))
 
-    tdLog.info("================= step2")
-    tdLog.info("import 76 sequential data")
-    startTime = self.startTime
-    sqlcmd = ['import into tb1 values']
-    for rid in range(1,77):
-      sqlcmd.append('(%ld, %d)' %(startTime+rid, rid))
-    tdSql.execute(" ".join(sqlcmd))
-    
-    tdLog.info("================= step3")
-    tdSql.query('select * from tb1')
-    tdSql.checkRows(76)
+        tdLog.info("================= step5")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(81)
 
-    tdLog.info("================= step4")
-    tdLog.info("import 10 data before with overlap")
-    startTime = self.startTime - 5
-    sqlcmd = ['import into tb1 values']
-    for rid in range(1,11):
-      sqlcmd.append('(%ld, %d)' %(startTime+rid, rid))
-    tdSql.execute(" ".join(sqlcmd))
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
 
-    tdLog.info("================= step5")
-    tdSql.query('select * from tb1')
-    tdSql.checkRows(81)
 
-  def stop(self):
-    tdSql.close()
-    tdLog.success("%s successfully executed" % __file__)
-  
 tdCases.addWindows(__file__, TDTestCase())
 tdCases.addLinux(__file__, TDTestCase())

tests/pytest/import_merge/importBlock2HPO.py

 ###################################################################
- #       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
- #
+#       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 -*-  
+# -*- coding: utf-8 -*-
 
 import sys
 import taos
@@ -18,58 +18,60 @@ from util.cases import *
 from util.sql import *
 from util.dnodes import *
 
+
 class TDTestCase:
-  def init(self, conn):
-    tdLog.debug("start to execute %s" % __file__)
-    tdSql.init(conn.cursor())
-    
-  def run(self):
-    self.ntables = 1
-    self.startTime = 1520000010000
+    def init(self, conn):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor())
+
+    def run(self):
+        self.ntables = 1
+        self.startTime = 1520000010000
+
+        tdDnodes.stop(1)
+        tdDnodes.deploy(1)
+        tdDnodes.start(1)
+
+        tdSql.execute('reset query cache')
+        tdSql.execute('drop database if exists db')
+        tdSql.execute('create database db cache 512')
+        tdSql.execute('use db')
+
+        tdLog.info("================= step1")
+        tdLog.info("create 1 table")
+        tdSql.execute('create table tb1 (ts timestamp, speed int)')
+        tdLog.info("one block can import 38 records")
 
-    tdDnodes.stop(1)
-    tdDnodes.deploy(1)
-    tdDnodes.start(1)
+        tdLog.info("================= step2")
+        tdLog.info("import 76 sequential data")
+        startTime = self.startTime
+        sqlcmd = ['import into tb1 values']
+        for rid in range(1, 11):
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        for rid in range(15, 81):
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        tdSql.execute(" ".join(sqlcmd))
 
-    tdSql.execute('reset query cache')
-    tdSql.execute('drop database if exists db')
-    tdSql.execute('create database db cache 512')
-    tdSql.execute('use db')
+        tdLog.info("================= step3")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(76)
 
-    tdLog.info("================= step1")
-    tdLog.info("create 1 table")
-    tdSql.execute('create table tb1 (ts timestamp, speed int)')
-    tdLog.info("one block can import 38 records")
+        tdLog.info("================= step4")
+        tdLog.info("import 20 data before with partly overlap")
+        startTime = self.startTime - 5
+        sqlcmd = ['import into tb1 values']
+        for rid in range(1, 21):
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        tdSql.execute(" ".join(sqlcmd))
 
-    tdLog.info("================= step2")
-    tdLog.info("import 76 sequential data")
-    startTime = self.startTime
-    sqlcmd = ['import into tb1 values']
-    for rid in range(1,11):
-      sqlcmd.append('(%ld, %d)' %(startTime+rid, rid))
-    for rid in range(15,81):
-      sqlcmd.append('(%ld, %d)' %(startTime+rid, rid))
-    tdSql.execute(" ".join(sqlcmd))
-    
-    tdLog.info("================= step3")
-    tdSql.query('select * from tb1')
-    tdSql.checkRows(76)
+        tdLog.info("================= step5")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(85)
 
-    tdLog.info("================= step4")
-    tdLog.info("import 20 data before with partly overlap")
-    startTime = self.startTime - 5
-    sqlcmd = ['import into tb1 values']
-    for rid in range(1,21):
-      sqlcmd.append('(%ld, %d)' %(startTime+rid, rid))
-    tdSql.execute(" ".join(sqlcmd))
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
 
-    tdLog.info("================= step5")
-    tdSql.query('select * from tb1')
-    tdSql.checkRows(85)
 
-  def stop(self):
-    tdSql.close()
-    tdLog.success("%s successfully executed" % __file__)
-  
 tdCases.addWindows(__file__, TDTestCase())
 tdCases.addLinux(__file__, TDTestCase())

tests/pytest/import_merge/importBlock2S.py

 ###################################################################
- #       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
- #
+#       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 -*-  
+# -*- coding: utf-8 -*-
 
 import sys
 import taos
@@ -18,56 +18,58 @@ from util.cases import *
 from util.sql import *
 from util.dnodes import *
 
+
 class TDTestCase:
-  def init(self, conn):
-    tdLog.debug("start to execute %s" % __file__)
-    tdSql.init(conn.cursor())
-    
-  def run(self):
-    self.ntables = 1
-    self.startTime = 1520000010000
+    def init(self, conn):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor())
+
+    def run(self):
+        self.ntables = 1
+        self.startTime = 1520000010000
+
+        tdDnodes.stop(1)
+        tdDnodes.deploy(1)
+        tdDnodes.start(1)
+
+        tdSql.execute('reset query cache')
+        tdSql.execute('drop database if exists db')
+        tdSql.execute('create database db cache 512')
+        tdSql.execute('use db')
+
+        tdLog.info("================= step1")
+        tdLog.info("create 1 table")
+        tdSql.execute('create table tb1 (ts timestamp, speed int)')
+        tdLog.info("one block can import 38 records")
 
-    tdDnodes.stop(1)
-    tdDnodes.deploy(1)
-    tdDnodes.start(1)
+        tdLog.info("================= step2")
+        tdLog.info("import 76 sequential data")
+        startTime = self.startTime
+        sqlcmd = ['import into tb1 values']
+        for rid in range(1, 77):
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        tdSql.execute(" ".join(sqlcmd))
 
-    tdSql.execute('reset query cache')
-    tdSql.execute('drop database if exists db')
-    tdSql.execute('create database db cache 512')
-    tdSql.execute('use db')
+        tdLog.info("================= step3")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(76)
 
-    tdLog.info("================= step1")
-    tdLog.info("create 1 table")
-    tdSql.execute('create table tb1 (ts timestamp, speed int)')
-    tdLog.info("one block can import 38 records")
+        tdLog.info("================= step4")
+        tdLog.info("import 90 data covering existing data")
+        startTime = self.startTime - 5
+        sqlcmd = ['import into tb1 values']
+        for rid in range(1, 91):
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        tdSql.execute(" ".join(sqlcmd))
 
-    tdLog.info("================= step2")
-    tdLog.info("import 76 sequential data")
-    startTime = self.startTime
-    sqlcmd = ['import into tb1 values']
-    for rid in range(1,77):
-      sqlcmd.append('(%ld, %d)' %(startTime+rid, rid))
-    tdSql.execute(" ".join(sqlcmd))
-    
-    tdLog.info("================= step3")
-    tdSql.query('select * from tb1')
-    tdSql.checkRows(76)
+        tdLog.info("================= step5")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(90)
 
-    tdLog.info("================= step4")
-    tdLog.info("import 90 data covering existing data")
-    startTime = self.startTime - 5
-    sqlcmd = ['import into tb1 values']
-    for rid in range(1,91):
-      sqlcmd.append('(%ld, %d)' %(startTime+rid, rid))
-    tdSql.execute(" ".join(sqlcmd))
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
 
-    tdLog.info("================= step5")
-    tdSql.query('select * from tb1')
-    tdSql.checkRows(90)
 
-  def stop(self):
-    tdSql.close()
-    tdLog.success("%s successfully executed" % __file__)
-  
 tdCases.addWindows(__file__, TDTestCase())
 tdCases.addLinux(__file__, TDTestCase())

tests/pytest/import_merge/importBlock2Sub.py

 ###################################################################
- #       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
- #
+#       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 -*-  
+# -*- coding: utf-8 -*-
 
 import sys
 import taos
@@ -18,56 +18,58 @@ from util.cases import *
 from util.sql import *
 from util.dnodes import *
 
+
 class TDTestCase:
-  def init(self, conn):
-    tdLog.debug("start to execute %s" % __file__)
-    tdSql.init(conn.cursor())
-    
-  def run(self):
-    self.ntables = 1
-    self.startTime = 1520000010000
+    def init(self, conn):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor())
+
+    def run(self):
+        self.ntables = 1
+        self.startTime = 1520000010000
+
+        tdDnodes.stop(1)
+        tdDnodes.deploy(1)
+        tdDnodes.start(1)
+
+        tdSql.execute('reset query cache')
+        tdSql.execute('drop database if exists db')
+        tdSql.execute('create database db cache 512')
+        tdSql.execute('use db')
+
+        tdLog.info("================= step1")
+        tdLog.info("create 1 table")
+        tdSql.execute('create table tb1 (ts timestamp, speed int)')
+        tdLog.info("one block can import 38 records")
 
-    tdDnodes.stop(1)
-    tdDnodes.deploy(1)
-    tdDnodes.start(1)
+        tdLog.info("================= step2")
+        tdLog.info("import 76 sequential data")
+        startTime = self.startTime
+        sqlcmd = ['import into tb1 values']
+        for rid in range(1, 77):
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        tdSql.execute(" ".join(sqlcmd))
 
-    tdSql.execute('reset query cache')
-    tdSql.execute('drop database if exists db')
-    tdSql.execute('create database db cache 512')
-    tdSql.execute('use db')
+        tdLog.info("================= step3")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(76)
 
-    tdLog.info("================= step1")
-    tdLog.info("create 1 table")
-    tdSql.execute('create table tb1 (ts timestamp, speed int)')
-    tdLog.info("one block can import 38 records")
+        tdLog.info("================= step4")
+        tdLog.info("import 10 data totally repetitive")
+        startTime = self.startTime + 10
+        sqlcmd = ['import into tb1 values']
+        for rid in range(1, 11):
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        tdSql.execute(" ".join(sqlcmd))
 
-    tdLog.info("================= step2")
-    tdLog.info("import 76 sequential data")
-    startTime = self.startTime
-    sqlcmd = ['import into tb1 values']
-    for rid in range(1,77):
-      sqlcmd.append('(%ld, %d)' %(startTime+rid, rid))
-    tdSql.execute(" ".join(sqlcmd))
-    
-    tdLog.info("================= step3")
-    tdSql.query('select * from tb1')
-    tdSql.checkRows(76)
+        tdLog.info("================= step5")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(76)
 
-    tdLog.info("================= step4")
-    tdLog.info("import 10 data totally repetitive")
-    startTime = self.startTime + 10
-    sqlcmd = ['import into tb1 values']
-    for rid in range(1,11):
-      sqlcmd.append('(%ld, %d)' %(startTime+rid, rid))
-    tdSql.execute(" ".join(sqlcmd))
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
 
-    tdLog.info("================= step5")
-    tdSql.query('select * from tb1')
-    tdSql.checkRows(76)
 
-  def stop(self):
-    tdSql.close()
-    tdLog.success("%s successfully executed" % __file__)
-  
 tdCases.addWindows(__file__, TDTestCase())
 tdCases.addLinux(__file__, TDTestCase())

tests/pytest/import_merge/importBlock2T.py

 ###################################################################
- #       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
- #
+#       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 -*-  
+# -*- coding: utf-8 -*-
 
 import sys
 import taos
@@ -18,53 +18,55 @@ from util.cases import *
 from util.sql import *
 from util.dnodes import *
 
+
 class TDTestCase:
-  def init(self, conn):
-    tdLog.debug("start to execute %s" % __file__)
-    tdSql.init(conn.cursor())
-    
-  def run(self):
-    self.ntables = 1
-    self.startTime = 1520000010000
+    def init(self, conn):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor())
+
+    def run(self):
+        self.ntables = 1
+        self.startTime = 1520000010000
+
+        tdDnodes.stop(1)
+        tdDnodes.deploy(1)
+        tdDnodes.start(1)
+
+        tdSql.execute('reset query cache')
+        tdSql.execute('drop database if exists db')
+        tdSql.execute('create database db cache 512')
+        tdSql.execute('use db')
+
+        tdLog.info("================= step1")
+        tdLog.info("create 1 table")
+        tdSql.execute('create table tb1 (ts timestamp, speed int)')
+        tdLog.info("one block can import 38 records")
 
-    tdDnodes.stop(1)
-    tdDnodes.deploy(1)
-    tdDnodes.start(1)
+        tdLog.info("================= step2")
+        tdLog.info("import 76 sequential data")
+        startTime = self.startTime
+        sqlcmd = ['import into tb1 values']
+        for rid in range(1, 77):
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        tdSql.execute(" ".join(sqlcmd))
 
-    tdSql.execute('reset query cache')
-    tdSql.execute('drop database if exists db')
-    tdSql.execute('create database db cache 512')
-    tdSql.execute('use db')
+        tdLog.info("================= step3")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(76)
 
-    tdLog.info("================= step1")
-    tdLog.info("create 1 table")
-    tdSql.execute('create table tb1 (ts timestamp, speed int)')
-    tdLog.info("one block can import 38 records")
+        tdLog.info("================= step4")
+        tdLog.info("import 1 data after")
+        startTime = self.startTime + 76
+        tdSql.execute('import into tb1 values(%ld, %d)' % (startTime + 1, rid))
 
-    tdLog.info("================= step2")
-    tdLog.info("import 76 sequential data")
-    startTime = self.startTime
-    sqlcmd = ['import into tb1 values']
-    for rid in range(1,77):
-      sqlcmd.append('(%ld, %d)' %(startTime+rid, rid))
-    tdSql.execute(" ".join(sqlcmd))
-    
-    tdLog.info("================= step3")
-    tdSql.query('select * from tb1')
-    tdSql.checkRows(76)
+        tdLog.info("================= step5")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(77)
 
-    tdLog.info("================= step4")
-    tdLog.info("import 1 data after")
-    startTime = self.startTime + 76
-    tdSql.execute('import into tb1 values(%ld, %d)' %(startTime+1, rid))
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
 
-    tdLog.info("================= step5")
-    tdSql.query('select * from tb1')
-    tdSql.checkRows(77)
 
-  def stop(self):
-    tdSql.close()
-    tdLog.success("%s successfully executed" % __file__)
-  
 tdCases.addWindows(__file__, TDTestCase())
 tdCases.addLinux(__file__, TDTestCase())

tests/pytest/import_merge/importBlock2TO.py

 ###################################################################
- #       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
- #
+#       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 -*-  
+# -*- coding: utf-8 -*-
 
 import sys
 import taos
@@ -18,56 +18,58 @@ from util.cases import *
 from util.sql import *
 from util.dnodes import *
 
+
 class TDTestCase:
-  def init(self, conn):
-    tdLog.debug("start to execute %s" % __file__)
-    tdSql.init(conn.cursor())
-    
-  def run(self):
-    self.ntables = 1
-    self.startTime = 1520000010000
+    def init(self, conn):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor())
+
+    def run(self):
+        self.ntables = 1
+        self.startTime = 1520000010000
+
+        tdDnodes.stop(1)
+        tdDnodes.deploy(1)
+        tdDnodes.start(1)
+
+        tdSql.execute('reset query cache')
+        tdSql.execute('drop database if exists db')
+        tdSql.execute('create database db cache 512')
+        tdSql.execute('use db')
+
+        tdLog.info("================= step1")
+        tdLog.info("create 1 table")
+        tdSql.execute('create table tb1 (ts timestamp, speed int)')
+        tdLog.info("one block can import 38 records")
 
-    tdDnodes.stop(1)
-    tdDnodes.deploy(1)
-    tdDnodes.start(1)
+        tdLog.info("================= step2")
+        tdLog.info("import 76 sequential data")
+        startTime = self.startTime
+        sqlcmd = ['import into tb1 values']
+        for rid in range(1, 77):
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        tdSql.execute(" ".join(sqlcmd))
 
-    tdSql.execute('reset query cache')
-    tdSql.execute('drop database if exists db')
-    tdSql.execute('create database db cache 512')
-    tdSql.execute('use db')
+        tdLog.info("================= step3")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(76)
 
-    tdLog.info("================= step1")
-    tdLog.info("create 1 table")
-    tdSql.execute('create table tb1 (ts timestamp, speed int)')
-    tdLog.info("one block can import 38 records")
+        tdLog.info("================= step4")
+        tdLog.info("import 10 data later with overlap")
+        startTime = self.startTime + 70
+        sqlcmd = ['import into tb1 values']
+        for rid in range(1, 11):
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        tdSql.execute(" ".join(sqlcmd))
 
-    tdLog.info("================= step2")
-    tdLog.info("import 76 sequential data")
-    startTime = self.startTime
-    sqlcmd = ['import into tb1 values']
-    for rid in range(1,77):
-      sqlcmd.append('(%ld, %d)' %(startTime+rid, rid))
-    tdSql.execute(" ".join(sqlcmd))
-    
-    tdLog.info("================= step3")
-    tdSql.query('select * from tb1')
-    tdSql.checkRows(76)
+        tdLog.info("================= step5")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(80)
 
-    tdLog.info("================= step4")
-    tdLog.info("import 10 data later with overlap")
-    startTime = self.startTime + 70
-    sqlcmd = ['import into tb1 values']
-    for rid in range(1,11):
-      sqlcmd.append('(%ld, %d)' %(startTime+rid, rid))
-    tdSql.execute(" ".join(sqlcmd))
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
 
-    tdLog.info("================= step5")
-    tdSql.query('select * from tb1')
-    tdSql.checkRows(80)
 
-  def stop(self):
-    tdSql.close()
-    tdLog.success("%s successfully executed" % __file__)
-  
 tdCases.addWindows(__file__, TDTestCase())
 tdCases.addLinux(__file__, TDTestCase())

tests/pytest/import_merge/importBlock2TPO.py

 ###################################################################
- #       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
- #
+#       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 -*-  
+# -*- coding: utf-8 -*-
 
 import sys
 import taos
@@ -18,58 +18,60 @@ from util.cases import *
 from util.sql import *
 from util.dnodes import *
 
+
 class TDTestCase:
-  def init(self, conn):
-    tdLog.debug("start to execute %s" % __file__)
-    tdSql.init(conn.cursor())
-    
-  def run(self):
-    self.ntables = 1
-    self.startTime = 1520000010000
+    def init(self, conn):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor())
+
+    def run(self):
+        self.ntables = 1
+        self.startTime = 1520000010000
+
+        tdDnodes.stop(1)
+        tdDnodes.deploy(1)
+        tdDnodes.start(1)
+
+        tdSql.execute('reset query cache')
+        tdSql.execute('drop database if exists db')
+        tdSql.execute('create database db cache 512')
+        tdSql.execute('use db')
+
+        tdLog.info("================= step1")
+        tdLog.info("create 1 table")
+        tdSql.execute('create table tb1 (ts timestamp, speed int)')
+        tdLog.info("one block can import 38 records")
 
-    tdDnodes.stop(1)
-    tdDnodes.deploy(1)
-    tdDnodes.start(1)
+        tdLog.info("================= step2")
+        tdLog.info("import 76 sequential data")
+        startTime = self.startTime
+        sqlcmd = ['import into tb1 values']
+        for rid in range(1, 61):
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        for rid in range(65, 81):
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        tdSql.execute(" ".join(sqlcmd))
 
-    tdSql.execute('reset query cache')
-    tdSql.execute('drop database if exists db')
-    tdSql.execute('create database db cache 512')
-    tdSql.execute('use db')
+        tdLog.info("================= step3")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(76)
 
-    tdLog.info("================= step1")
-    tdLog.info("create 1 table")
-    tdSql.execute('create table tb1 (ts timestamp, speed int)')
-    tdLog.info("one block can import 38 records")
+        tdLog.info("================= step4")
+        tdLog.info("import 30 data later with partly overlap")
+        startTime = self.startTime + 55
+        sqlcmd = ['import into tb1 values']
+        for rid in range(1, 31):
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        tdSql.execute(" ".join(sqlcmd))
 
-    tdLog.info("================= step2")
-    tdLog.info("import 76 sequential data")
-    startTime = self.startTime
-    sqlcmd = ['import into tb1 values']
-    for rid in range(1,61):
-      sqlcmd.append('(%ld, %d)' %(startTime+rid, rid))
-    for rid in range(65,81):
-      sqlcmd.append('(%ld, %d)' %(startTime+rid, rid))
-    tdSql.execute(" ".join(sqlcmd))
-    
-    tdLog.info("================= step3")
-    tdSql.query('select * from tb1')
-    tdSql.checkRows(76)
+        tdLog.info("================= step5")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(85)
 
-    tdLog.info("================= step4")
-    tdLog.info("import 30 data later with partly overlap")
-    startTime = self.startTime + 55
-    sqlcmd = ['import into tb1 values']
-    for rid in range(1,31):
-      sqlcmd.append('(%ld, %d)' %(startTime+rid, rid))
-    tdSql.execute(" ".join(sqlcmd))
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
 
-    tdLog.info("================= step5")
-    tdSql.query('select * from tb1')
-    tdSql.checkRows(85)
 
-  def stop(self):
-    tdSql.close()
-    tdLog.success("%s successfully executed" % __file__)
-  
 tdCases.addWindows(__file__, TDTestCase())
 tdCases.addLinux(__file__, TDTestCase())

tests/pytest/import_merge/importBlockbetween.py

 ###################################################################
- #       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
- #
+#       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 -*-  
+# -*- coding: utf-8 -*-
 
 import sys
 import taos
@@ -18,59 +18,61 @@ from util.cases import *
 from util.sql import *
 from util.dnodes import *
 
+
 class TDTestCase:
-  def init(self, conn):
-    tdLog.debug("start to execute %s" % __file__)
-    tdSql.init(conn.cursor())
-    
-  def run(self):
-    self.ntables = 1
-    self.startTime = 1520000010000
+    def init(self, conn):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor())
+
+    def run(self):
+        self.ntables = 1
+        self.startTime = 1520000010000
+
+        tdDnodes.stop(1)
+        tdDnodes.deploy(1)
+        tdDnodes.start(1)
+
+        tdSql.execute('reset query cache')
+        tdSql.execute('drop database if exists db')
+        tdSql.execute('create database db cache 512')
+        tdSql.execute('use db')
+
+        tdLog.info("================= step1")
+        tdLog.info("create 1 table")
+        tdSql.execute('create table tb1 (ts timestamp, speed int)')
+        tdLog.info("one block can import 38 records")
 
-    tdDnodes.stop(1)
-    tdDnodes.deploy(1)
-    tdDnodes.start(1)
+        tdLog.info("================= step2")
+        tdLog.info("import 76 sequential data with gap between 2 blocks")
+        startTime = self.startTime
+        sqlcmd = ['import into tb1 values']
+        for rid in range(1, 39):
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        tdSql.execute(" ".join(sqlcmd))
+        for rid in range(40, 78):
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        tdSql.execute(" ".join(sqlcmd))
 
-    tdSql.execute('reset query cache')
-    tdSql.execute('drop database if exists db')
-    tdSql.execute('create database db cache 512')
-    tdSql.execute('use db')
+        tdLog.info("================= step3")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(76)
 
-    tdLog.info("================= step1")
-    tdLog.info("create 1 table")
-    tdSql.execute('create table tb1 (ts timestamp, speed int)')
-    tdLog.info("one block can import 38 records")
+        tdLog.info("================= step4")
+        tdLog.info("import data into the gap between 2 blocks")
+        startTime = self.startTime
+        sqlcmd = ['import into tb1 values']
+        for rid in range(39, 40):
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        tdSql.execute(" ".join(sqlcmd))
 
-    tdLog.info("================= step2")
-    tdLog.info("import 76 sequential data with gap between 2 blocks")
-    startTime = self.startTime
-    sqlcmd = ['import into tb1 values']
-    for rid in range(1,39):
-      sqlcmd.append('(%ld, %d)' %(startTime+rid, rid))
-    tdSql.execute(" ".join(sqlcmd))
-    for rid in range(40,78):
-      sqlcmd.append('(%ld, %d)' %(startTime+rid, rid))
-    tdSql.execute(" ".join(sqlcmd))
-    
-    tdLog.info("================= step3")
-    tdSql.query('select * from tb1')
-    tdSql.checkRows(76)
+        tdLog.info("================= step5")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(77)
 
-    tdLog.info("================= step4")
-    tdLog.info("import data into the gap between 2 blocks")
-    startTime = self.startTime
-    sqlcmd = ['import into tb1 values']
-    for rid in range(39,40):
-      sqlcmd.append('(%ld, %d)' %(startTime+rid, rid))
-    tdSql.execute(" ".join(sqlcmd))
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
 
-    tdLog.info("================= step5")
-    tdSql.query('select * from tb1')
-    tdSql.checkRows(77)
 
-  def stop(self):
-    tdSql.close()
-    tdLog.success("%s successfully executed" % __file__)
-  
 tdCases.addWindows(__file__, TDTestCase())
 tdCases.addLinux(__file__, TDTestCase())

tests/pytest/import_merge/importCacheFileH.py

 ###################################################################
- #       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
- #
+#       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 -*-  
+# -*- coding: utf-8 -*-
 
 import sys
 import taos
@@ -18,69 +18,71 @@ from util.cases import *
 from util.sql import *
 from util.dnodes import *
 
+
 class TDTestCase:
-  def init(self, conn):
-    tdLog.debug("start to execute %s" % __file__)
-    tdSql.init(conn.cursor())
-    
-  def run(self):
-    self.ntables = 1
-    self.startTime = 1520000010000
-
-    tdDnodes.stop(1)
-    tdDnodes.deploy(1)
-    tdDnodes.start(1)
-
-    tdSql.execute('reset query cache')
-    tdSql.execute('drop database if exists db')
-    tdSql.execute('create database db')
-    tdSql.execute('use db')
-
-    tdLog.info("================= step1")
-    tdLog.info("create 1 table")
-    tdSql.execute('create table tb1 (ts timestamp, speed int)')
-
-    tdLog.info("================= step2")
-    tdLog.info("import 10 sequential data")
-    startTime = self.startTime
-    sqlcmd = ['import into tb1 values']
-    for rid in range(1,11):
-      sqlcmd.append('(%ld, %d)' %(startTime+rid, rid))
-    tdSql.execute(" ".join(sqlcmd))
-    
-    tdLog.info("================= step3")
-    tdSql.query('select * from tb1')
-    tdSql.checkRows(10)
-
-    tdLog.info("================= step4")
-    tdDnodes.stop(1)
-    tdLog.sleep(5)
-    tdDnodes.start(1)
-
-    tdLog.info("================= step5")
-    tdLog.info("import 10 data again")
-    startTime = self.startTime + 10
-    sqlcmd = ['import into tb1 values']
-    for rid in range(1,11):
-      sqlcmd.append('(%ld, %d)' %(startTime+rid, rid))
-    tdSql.execute(" ".join(sqlcmd))
-
-    tdLog.info("================= step6")
-    tdSql.query('select * from tb1')
-    tdSql.checkRows(20)
-
-    tdLog.info("================= step7")
-    tdLog.info("import 1 data before")
-    startTime = self.startTime - 1
-    tdSql.execute('import into tb1 values(%ld, %d)' %(startTime, rid))
-
-    tdLog.info("================= step8")
-    tdSql.query('select * from tb1')
-    tdSql.checkRows(21)
-
-  def stop(self):
-    tdSql.close()
-    tdLog.success("%s successfully executed" % __file__)
-  
+    def init(self, conn):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor())
+
+    def run(self):
+        self.ntables = 1
+        self.startTime = 1520000010000
+
+        tdDnodes.stop(1)
+        tdDnodes.deploy(1)
+        tdDnodes.start(1)
+
+        tdSql.execute('reset query cache')
+        tdSql.execute('drop database if exists db')
+        tdSql.execute('create database db')
+        tdSql.execute('use db')
+
+        tdLog.info("================= step1")
+        tdLog.info("create 1 table")
+        tdSql.execute('create table tb1 (ts timestamp, speed int)')
+
+        tdLog.info("================= step2")
+        tdLog.info("import 10 sequential data")
+        startTime = self.startTime
+        sqlcmd = ['import into tb1 values']
+        for rid in range(1, 11):
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        tdSql.execute(" ".join(sqlcmd))
+
+        tdLog.info("================= step3")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(10)
+
+        tdLog.info("================= step4")
+        tdDnodes.stop(1)
+        tdLog.sleep(5)
+        tdDnodes.start(1)
+
+        tdLog.info("================= step5")
+        tdLog.info("import 10 data again")
+        startTime = self.startTime + 10
+        sqlcmd = ['import into tb1 values']
+        for rid in range(1, 11):
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        tdSql.execute(" ".join(sqlcmd))
+
+        tdLog.info("================= step6")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(20)
+
+        tdLog.info("================= step7")
+        tdLog.info("import 1 data before")
+        startTime = self.startTime - 1
+        tdSql.execute('import into tb1 values(%ld, %d)' % (startTime, rid))
+
+        tdLog.info("================= step8")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(21)
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
 tdCases.addWindows(__file__, TDTestCase())
 tdCases.addLinux(__file__, TDTestCase())

tests/pytest/import_merge/importCacheFileHO.py

 ###################################################################
- #       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
- #
+#       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 -*-  
+# -*- coding: utf-8 -*-
 
 import sys
 import taos
@@ -18,72 +18,74 @@ from util.cases import *
 from util.sql import *
 from util.dnodes import *
 
+
 class TDTestCase:
-  def init(self, conn):
-    tdLog.debug("start to execute %s" % __file__)
-    tdSql.init(conn.cursor())
-    
-  def run(self):
-    self.ntables = 1
-    self.startTime = 1520000010000
-
-    tdDnodes.stop(1)
-    tdDnodes.deploy(1)
-    tdDnodes.start(1)
-
-    tdSql.execute('reset query cache')
-    tdSql.execute('drop database if exists db')
-    tdSql.execute('create database db')
-    tdSql.execute('use db')
-
-    tdLog.info("================= step1")
-    tdLog.info("create 1 table")
-    tdSql.execute('create table tb1 (ts timestamp, speed int)')
-
-    tdLog.info("================= step2")
-    tdLog.info("import 10 sequential data")
-    startTime = self.startTime
-    sqlcmd = ['import into tb1 values']
-    for rid in range(1,11):
-      sqlcmd.append('(%ld, %d)' %(startTime+rid, rid))
-    tdSql.execute(" ".join(sqlcmd))
-    
-    tdLog.info("================= step3")
-    tdSql.query('select * from tb1')
-    tdSql.checkRows(10)
-
-    tdLog.info("================= step4")
-    tdDnodes.stop(1)
-    tdLog.sleep(5)
-    tdDnodes.start(1)
-
-    tdLog.info("================= step5")
-    tdLog.info("import 10 data again")
-    startTime = self.startTime + 10
-    sqlcmd = ['import into tb1 values']
-    for rid in range(1,11):
-      sqlcmd.append('(%ld, %d)' %(startTime+rid, rid))
-    tdSql.execute(" ".join(sqlcmd))
-
-    tdLog.info("================= step6")
-    tdSql.query('select * from tb1')
-    tdSql.checkRows(20)
-
-    tdLog.info("================= step7")
-    tdLog.info("import 10 data before with overlap")
-    startTime = self.startTime - 5
-    sqlcmd = ['import into tb1 values']
-    for rid in range(1,11):
-      sqlcmd.append('(%ld, %d)' %(startTime+rid, rid))
-    tdSql.execute(" ".join(sqlcmd))
-
-    tdLog.info("================= step8")
-    tdSql.query('select * from tb1')
-    tdSql.checkRows(25)
-
-  def stop(self):
-    tdSql.close()
-    tdLog.success("%s successfully executed" % __file__)
-  
+    def init(self, conn):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor())
+
+    def run(self):
+        self.ntables = 1
+        self.startTime = 1520000010000
+
+        tdDnodes.stop(1)
+        tdDnodes.deploy(1)
+        tdDnodes.start(1)
+
+        tdSql.execute('reset query cache')
+        tdSql.execute('drop database if exists db')
+        tdSql.execute('create database db')
+        tdSql.execute('use db')
+
+        tdLog.info("================= step1")
+        tdLog.info("create 1 table")
+        tdSql.execute('create table tb1 (ts timestamp, speed int)')
+
+        tdLog.info("================= step2")
+        tdLog.info("import 10 sequential data")
+        startTime = self.startTime
+        sqlcmd = ['import into tb1 values']
+        for rid in range(1, 11):
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        tdSql.execute(" ".join(sqlcmd))
+
+        tdLog.info("================= step3")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(10)
+
+        tdLog.info("================= step4")
+        tdDnodes.stop(1)
+        tdLog.sleep(5)
+        tdDnodes.start(1)
+
+        tdLog.info("================= step5")
+        tdLog.info("import 10 data again")
+        startTime = self.startTime + 10
+        sqlcmd = ['import into tb1 values']
+        for rid in range(1, 11):
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        tdSql.execute(" ".join(sqlcmd))
+
+        tdLog.info("================= step6")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(20)
+
+        tdLog.info("================= step7")
+        tdLog.info("import 10 data before with overlap")
+        startTime = self.startTime - 5
+        sqlcmd = ['import into tb1 values']
+        for rid in range(1, 11):
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        tdSql.execute(" ".join(sqlcmd))
+
+        tdLog.info("================= step8")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(25)
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
 tdCases.addWindows(__file__, TDTestCase())
 tdCases.addLinux(__file__, TDTestCase())

tests/pytest/import_merge/importCacheFileHPO.py

 ###################################################################
- #       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
- #
+#       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 -*-  
+# -*- coding: utf-8 -*-
 
 import sys
 import taos
@@ -18,74 +18,78 @@ from util.cases import *
 from util.sql import *
 from util.dnodes import *
 
+
 class TDTestCase:
-  def init(self, conn):
-    tdLog.debug("start to execute %s" % __file__)
-    tdSql.init(conn.cursor())
-    
-  def run(self):
-    self.ntables = 1
-    self.startTime = 1520000010000
-
-    tdDnodes.stop(1)
-    tdDnodes.deploy(1)
-    tdDnodes.start(1)
-
-    tdSql.execute('reset query cache')
-    tdSql.execute('drop database if exists db')
-    tdSql.execute('create database db')
-    tdSql.execute('use db')
-
-    tdLog.info("================= step1")
-    tdLog.info("create 1 table")
-    tdSql.execute('create table tb1 (ts timestamp, speed int)')
-
-    tdLog.info("================= step2")
-    tdLog.info("import 9 sequential data with gap")
-    startTime = self.startTime
-    sqlcmd = ['import into tb1 values']
-    for rid in range(1,11):
-      if (rid == 5): continue
-      sqlcmd.append('(%ld, %d)' %(startTime+rid, rid))
-    tdSql.execute(" ".join(sqlcmd))
-    
-    tdLog.info("================= step3")
-    tdSql.query('select * from tb1')
-    tdSql.checkRows(9)
-
-    tdLog.info("================= step4")
-    tdDnodes.stop(1)
-    tdLog.sleep(5)
-    tdDnodes.start(1)
-
-    tdLog.info("================= step5")
-    tdLog.info("import 9 data again with gap")
-    startTime = self.startTime + 10
-    sqlcmd = ['import into tb1 values']
-    for rid in range(1,11):
-      if (rid == 5): continue
-      sqlcmd.append('(%ld, %d)' %(startTime+rid, rid))
-    tdSql.execute(" ".join(sqlcmd))
-
-    tdLog.info("================= step6")
-    tdSql.query('select * from tb1')
-    tdSql.checkRows(18)
-
-    tdLog.info("================= step7")
-    tdLog.info("import 20 data before with partly overlap")
-    startTime = self.startTime - 3
-    sqlcmd = ['import into tb1 values']
-    for rid in range(1,21):
-      sqlcmd.append('(%ld, %d)' %(startTime+rid, rid))
-    tdSql.execute(" ".join(sqlcmd))
-
-    tdLog.info("================= step8")
-    tdSql.query('select * from tb1')
-    tdSql.checkRows(23)
-
-  def stop(self):
-    tdSql.close()
-    tdLog.success("%s successfully executed" % __file__)
-  
+    def init(self, conn):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor())
+
+    def run(self):
+        self.ntables = 1
+        self.startTime = 1520000010000
+
+        tdDnodes.stop(1)
+        tdDnodes.deploy(1)
+        tdDnodes.start(1)
+
+        tdSql.execute('reset query cache')
+        tdSql.execute('drop database if exists db')
+        tdSql.execute('create database db')
+        tdSql.execute('use db')
+
+        tdLog.info("================= step1")
+        tdLog.info("create 1 table")
+        tdSql.execute('create table tb1 (ts timestamp, speed int)')
+
+        tdLog.info("================= step2")
+        tdLog.info("import 9 sequential data with gap")
+        startTime = self.startTime
+        sqlcmd = ['import into tb1 values']
+        for rid in range(1, 11):
+            if (rid == 5):
+                continue
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        tdSql.execute(" ".join(sqlcmd))
+
+        tdLog.info("================= step3")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(9)
+
+        tdLog.info("================= step4")
+        tdDnodes.stop(1)
+        tdLog.sleep(5)
+        tdDnodes.start(1)
+
+        tdLog.info("================= step5")
+        tdLog.info("import 9 data again with gap")
+        startTime = self.startTime + 10
+        sqlcmd = ['import into tb1 values']
+        for rid in range(1, 11):
+            if (rid == 5):
+                continue
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        tdSql.execute(" ".join(sqlcmd))
+
+        tdLog.info("================= step6")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(18)
+
+        tdLog.info("================= step7")
+        tdLog.info("import 20 data before with partly overlap")
+        startTime = self.startTime - 3
+        sqlcmd = ['import into tb1 values']
+        for rid in range(1, 21):
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        tdSql.execute(" ".join(sqlcmd))
+
+        tdLog.info("================= step8")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(23)
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
 tdCases.addWindows(__file__, TDTestCase())
 tdCases.addLinux(__file__, TDTestCase())

tests/pytest/import_merge/importCacheFileS.py

 ###################################################################
- #       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
- #
+#       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 -*-  
+# -*- coding: utf-8 -*-
 
 import sys
 import taos
@@ -18,72 +18,74 @@ from util.cases import *
 from util.sql import *
 from util.dnodes import *
 
+
 class TDTestCase:
-  def init(self, conn):
-    tdLog.debug("start to execute %s" % __file__)
-    tdSql.init(conn.cursor())
-    
-  def run(self):
-    self.ntables = 1
-    self.startTime = 1520000010000
-
-    tdDnodes.stop(1)
-    tdDnodes.deploy(1)
-    tdDnodes.start(1)
-
-    tdSql.execute('reset query cache')
-    tdSql.execute('drop database if exists db')
-    tdSql.execute('create database db')
-    tdSql.execute('use db')
-
-    tdLog.info("================= step1")
-    tdLog.info("create 1 table")
-    tdSql.execute('create table tb1 (ts timestamp, speed int)')
-
-    tdLog.info("================= step2")
-    tdLog.info("import 10 sequential data")
-    startTime = self.startTime
-    sqlcmd = ['import into tb1 values']
-    for rid in range(1,11):
-      sqlcmd.append('(%ld, %d)' %(startTime+rid, rid))
-    tdSql.execute(" ".join(sqlcmd))
-    
-    tdLog.info("================= step3")
-    tdSql.query('select * from tb1')
-    tdSql.checkRows(10)
-
-    tdLog.info("================= step4")
-    tdDnodes.stop(1)
-    tdLog.sleep(5)
-    tdDnodes.start(1)
-
-    tdLog.info("================= step5")
-    tdLog.info("import 10 data again")
-    startTime = self.startTime + 10
-    sqlcmd = ['import into tb1 values']
-    for rid in range(1,11):
-      sqlcmd.append('(%ld, %d)' %(startTime+rid, rid))
-    tdSql.execute(" ".join(sqlcmd))
-
-    tdLog.info("================= step6")
-    tdSql.query('select * from tb1')
-    tdSql.checkRows(20)
-
-    tdLog.info("================= step7")
-    tdLog.info("import 30 data covering existing data")
-    startTime = self.startTime - 5
-    sqlcmd = ['import into tb1 values']
-    for rid in range(1,31):
-      sqlcmd.append('(%ld, %d)' %(startTime+rid, rid))
-    tdSql.execute(" ".join(sqlcmd))
-
-    tdLog.info("================= step8")
-    tdSql.query('select * from tb1')
-    tdSql.checkRows(30)
-
-  def stop(self):
-    tdSql.close()
-    tdLog.success("%s successfully executed" % __file__)
-  
+    def init(self, conn):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor())
+
+    def run(self):
+        self.ntables = 1
+        self.startTime = 1520000010000
+
+        tdDnodes.stop(1)
+        tdDnodes.deploy(1)
+        tdDnodes.start(1)
+
+        tdSql.execute('reset query cache')
+        tdSql.execute('drop database if exists db')
+        tdSql.execute('create database db')
+        tdSql.execute('use db')
+
+        tdLog.info("================= step1")
+        tdLog.info("create 1 table")
+        tdSql.execute('create table tb1 (ts timestamp, speed int)')
+
+        tdLog.info("================= step2")
+        tdLog.info("import 10 sequential data")
+        startTime = self.startTime
+        sqlcmd = ['import into tb1 values']
+        for rid in range(1, 11):
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        tdSql.execute(" ".join(sqlcmd))
+
+        tdLog.info("================= step3")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(10)
+
+        tdLog.info("================= step4")
+        tdDnodes.stop(1)
+        tdLog.sleep(5)
+        tdDnodes.start(1)
+
+        tdLog.info("================= step5")
+        tdLog.info("import 10 data again")
+        startTime = self.startTime + 10
+        sqlcmd = ['import into tb1 values']
+        for rid in range(1, 11):
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        tdSql.execute(" ".join(sqlcmd))
+
+        tdLog.info("================= step6")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(20)
+
+        tdLog.info("================= step7")
+        tdLog.info("import 30 data covering existing data")
+        startTime = self.startTime - 5
+        sqlcmd = ['import into tb1 values']
+        for rid in range(1, 31):
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        tdSql.execute(" ".join(sqlcmd))
+
+        tdLog.info("================= step8")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(30)
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
 tdCases.addWindows(__file__, TDTestCase())
 tdCases.addLinux(__file__, TDTestCase())

tests/pytest/import_merge/importCacheFileSub.py

 ###################################################################
- #       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
- #
+#       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 -*-  
+# -*- coding: utf-8 -*-
 
 import sys
 import taos
@@ -18,72 +18,74 @@ from util.cases import *
 from util.sql import *
 from util.dnodes import *
 
+
 class TDTestCase:
-  def init(self, conn):
-    tdLog.debug("start to execute %s" % __file__)
-    tdSql.init(conn.cursor())
-    
-  def run(self):
-    self.ntables = 1
-    self.startTime = 1520000010000
-
-    tdDnodes.stop(1)
-    tdDnodes.deploy(1)
-    tdDnodes.start(1)
-
-    tdSql.execute('reset query cache')
-    tdSql.execute('drop database if exists db')
-    tdSql.execute('create database db')
-    tdSql.execute('use db')
-
-    tdLog.info("================= step1")
-    tdLog.info("create 1 table")
-    tdSql.execute('create table tb1 (ts timestamp, speed int)')
-
-    tdLog.info("================= step2")
-    tdLog.info("import 10 sequential data")
-    startTime = self.startTime
-    sqlcmd = ['import into tb1 values']
-    for rid in range(1,11):
-      sqlcmd.append('(%ld, %d)' %(startTime+rid, rid))
-    tdSql.execute(" ".join(sqlcmd))
-    
-    tdLog.info("================= step3")
-    tdSql.query('select * from tb1')
-    tdSql.checkRows(10)
-
-    tdLog.info("================= step4")
-    tdDnodes.stop(1)
-    tdLog.sleep(5)
-    tdDnodes.start(1)
-
-    tdLog.info("================= step5")
-    tdLog.info("import 10 data again")
-    startTime = self.startTime + 10
-    sqlcmd = ['import into tb1 values']
-    for rid in range(1,11):
-      sqlcmd.append('(%ld, %d)' %(startTime+rid, rid))
-    tdSql.execute(" ".join(sqlcmd))
-
-    tdLog.info("================= step6")
-    tdSql.query('select * from tb1')
-    tdSql.checkRows(20)
-
-    tdLog.info("================= step7")
-    tdLog.info("import 10 data totally repetitive")
-    startTime = self.startTime + 5
-    sqlcmd = ['import into tb1 values']
-    for rid in range(1,11):
-      sqlcmd.append('(%ld, %d)' %(startTime+rid, rid))
-    tdSql.execute(" ".join(sqlcmd))
-
-    tdLog.info("================= step8")
-    tdSql.query('select * from tb1')
-    tdSql.checkRows(20)
-
-  def stop(self):
-    tdSql.close()
-    tdLog.success("%s successfully executed" % __file__)
-  
+    def init(self, conn):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor())
+
+    def run(self):
+        self.ntables = 1
+        self.startTime = 1520000010000
+
+        tdDnodes.stop(1)
+        tdDnodes.deploy(1)
+        tdDnodes.start(1)
+
+        tdSql.execute('reset query cache')
+        tdSql.execute('drop database if exists db')
+        tdSql.execute('create database db')
+        tdSql.execute('use db')
+
+        tdLog.info("================= step1")
+        tdLog.info("create 1 table")
+        tdSql.execute('create table tb1 (ts timestamp, speed int)')
+
+        tdLog.info("================= step2")
+        tdLog.info("import 10 sequential data")
+        startTime = self.startTime
+        sqlcmd = ['import into tb1 values']
+        for rid in range(1, 11):
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        tdSql.execute(" ".join(sqlcmd))
+
+        tdLog.info("================= step3")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(10)
+
+        tdLog.info("================= step4")
+        tdDnodes.stop(1)
+        tdLog.sleep(5)
+        tdDnodes.start(1)
+
+        tdLog.info("================= step5")
+        tdLog.info("import 10 data again")
+        startTime = self.startTime + 10
+        sqlcmd = ['import into tb1 values']
+        for rid in range(1, 11):
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        tdSql.execute(" ".join(sqlcmd))
+
+        tdLog.info("================= step6")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(20)
+
+        tdLog.info("================= step7")
+        tdLog.info("import 10 data totally repetitive")
+        startTime = self.startTime + 5
+        sqlcmd = ['import into tb1 values']
+        for rid in range(1, 11):
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        tdSql.execute(" ".join(sqlcmd))
+
+        tdLog.info("================= step8")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(20)
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
 tdCases.addWindows(__file__, TDTestCase())
 tdCases.addLinux(__file__, TDTestCase())

tests/pytest/import_merge/importCacheFileT.py

 ###################################################################
- #       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
- #
+#       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 -*-  
+# -*- coding: utf-8 -*-
 
 import sys
 import taos
@@ -18,69 +18,71 @@ from util.cases import *
 from util.sql import *
 from util.dnodes import *
 
+
 class TDTestCase:
-  def init(self, conn):
-    tdLog.debug("start to execute %s" % __file__)
-    tdSql.init(conn.cursor())
-    
-  def run(self):
-    self.ntables = 1
-    self.startTime = 1520000010000
-
-    tdDnodes.stop(1)
-    tdDnodes.deploy(1)
-    tdDnodes.start(1)
-
-    tdSql.execute('reset query cache')
-    tdSql.execute('drop database if exists db')
-    tdSql.execute('create database db')
-    tdSql.execute('use db')
-
-    tdLog.info("================= step1")
-    tdLog.info("create 1 table")
-    tdSql.execute('create table tb1 (ts timestamp, speed int)')
-
-    tdLog.info("================= step2")
-    tdLog.info("import 10 sequential data")
-    startTime = self.startTime
-    sqlcmd = ['import into tb1 values']
-    for rid in range(1,11):
-      sqlcmd.append('(%ld, %d)' %(startTime+rid, rid))
-    tdSql.execute(" ".join(sqlcmd))
-    
-    tdLog.info("================= step3")
-    tdSql.query('select * from tb1')
-    tdSql.checkRows(10)
-
-    tdLog.info("================= step4")
-    tdDnodes.stop(1)
-    tdLog.sleep(5)
-    tdDnodes.start(1)
-
-    tdLog.info("================= step5")
-    tdLog.info("import 10 data again")
-    startTime = self.startTime + 10
-    sqlcmd = ['import into tb1 values']
-    for rid in range(1,11):
-      sqlcmd.append('(%ld, %d)' %(startTime+rid, rid))
-    tdSql.execute(" ".join(sqlcmd))
-
-    tdLog.info("================= step6")
-    tdSql.query('select * from tb1')
-    tdSql.checkRows(20)
-
-    tdLog.info("================= step7")
-    tdLog.info("import 1 data later")
-    startTime = self.startTime + 20
-    tdSql.execute('import into tb1 values(%ld, %d)' %(startTime+1, rid))
-
-    tdLog.info("================= step8")
-    tdSql.query('select * from tb1')
-    tdSql.checkRows(21)
-
-  def stop(self):
-    tdSql.close()
-    tdLog.success("%s successfully executed" % __file__)
-  
+    def init(self, conn):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor())
+
+    def run(self):
+        self.ntables = 1
+        self.startTime = 1520000010000
+
+        tdDnodes.stop(1)
+        tdDnodes.deploy(1)
+        tdDnodes.start(1)
+
+        tdSql.execute('reset query cache')
+        tdSql.execute('drop database if exists db')
+        tdSql.execute('create database db')
+        tdSql.execute('use db')
+
+        tdLog.info("================= step1")
+        tdLog.info("create 1 table")
+        tdSql.execute('create table tb1 (ts timestamp, speed int)')
+
+        tdLog.info("================= step2")
+        tdLog.info("import 10 sequential data")
+        startTime = self.startTime
+        sqlcmd = ['import into tb1 values']
+        for rid in range(1, 11):
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        tdSql.execute(" ".join(sqlcmd))
+
+        tdLog.info("================= step3")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(10)
+
+        tdLog.info("================= step4")
+        tdDnodes.stop(1)
+        tdLog.sleep(5)
+        tdDnodes.start(1)
+
+        tdLog.info("================= step5")
+        tdLog.info("import 10 data again")
+        startTime = self.startTime + 10
+        sqlcmd = ['import into tb1 values']
+        for rid in range(1, 11):
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        tdSql.execute(" ".join(sqlcmd))
+
+        tdLog.info("================= step6")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(20)
+
+        tdLog.info("================= step7")
+        tdLog.info("import 1 data later")
+        startTime = self.startTime + 20
+        tdSql.execute('import into tb1 values(%ld, %d)' % (startTime + 1, rid))
+
+        tdLog.info("================= step8")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(21)
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
 tdCases.addWindows(__file__, TDTestCase())
 tdCases.addLinux(__file__, TDTestCase())

tests/pytest/import_merge/importCacheFileTO.py

 ###################################################################
- #       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
- #
+#       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 -*-  
+# -*- coding: utf-8 -*-
 
 import sys
 import taos
@@ -18,72 +18,74 @@ from util.cases import *
 from util.sql import *
 from util.dnodes import *
 
+
 class TDTestCase:
-  def init(self, conn):
-    tdLog.debug("start to execute %s" % __file__)
-    tdSql.init(conn.cursor())
-    
-  def run(self):
-    self.ntables = 1
-    self.startTime = 1520000010000
-
-    tdDnodes.stop(1)
-    tdDnodes.deploy(1)
-    tdDnodes.start(1)
-
-    tdSql.execute('reset query cache')
-    tdSql.execute('drop database if exists db')
-    tdSql.execute('create database db')
-    tdSql.execute('use db')
-
-    tdLog.info("================= step1")
-    tdLog.info("create 1 table")
-    tdSql.execute('create table tb1 (ts timestamp, speed int)')
-
-    tdLog.info("================= step2")
-    tdLog.info("import 10 sequential data")
-    startTime = self.startTime
-    sqlcmd = ['import into tb1 values']
-    for rid in range(1,11):
-      sqlcmd.append('(%ld, %d)' %(startTime+rid, rid))
-    tdSql.execute(" ".join(sqlcmd))
-    
-    tdLog.info("================= step3")
-    tdSql.query('select * from tb1')
-    tdSql.checkRows(10)
-
-    tdLog.info("================= step4")
-    tdDnodes.stop(1)
-    tdLog.sleep(5)
-    tdDnodes.start(1)
-
-    tdLog.info("================= step5")
-    tdLog.info("import 10 data again")
-    startTime = self.startTime + 10
-    sqlcmd = ['import into tb1 values']
-    for rid in range(1,11):
-      sqlcmd.append('(%ld, %d)' %(startTime+rid, rid))
-    tdSql.execute(" ".join(sqlcmd))
-
-    tdLog.info("================= step6")
-    tdSql.query('select * from tb1')
-    tdSql.checkRows(20)
-
-    tdLog.info("================= step7")
-    tdLog.info("import 10 data later with overlap")
-    startTime = self.startTime + 15
-    sqlcmd = ['import into tb1 values']
-    for rid in range(1,11):
-      sqlcmd.append('(%ld, %d)' %(startTime+rid, rid))
-    tdSql.execute(" ".join(sqlcmd))
-
-    tdLog.info("================= step8")
-    tdSql.query('select * from tb1')
-    tdSql.checkRows(25)
-
-  def stop(self):
-    tdSql.close()
-    tdLog.success("%s successfully executed" % __file__)
-  
+    def init(self, conn):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor())
+
+    def run(self):
+        self.ntables = 1
+        self.startTime = 1520000010000
+
+        tdDnodes.stop(1)
+        tdDnodes.deploy(1)
+        tdDnodes.start(1)
+
+        tdSql.execute('reset query cache')
+        tdSql.execute('drop database if exists db')
+        tdSql.execute('create database db')
+        tdSql.execute('use db')
+
+        tdLog.info("================= step1")
+        tdLog.info("create 1 table")
+        tdSql.execute('create table tb1 (ts timestamp, speed int)')
+
+        tdLog.info("================= step2")
+        tdLog.info("import 10 sequential data")
+        startTime = self.startTime
+        sqlcmd = ['import into tb1 values']
+        for rid in range(1, 11):
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        tdSql.execute(" ".join(sqlcmd))
+
+        tdLog.info("================= step3")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(10)
+
+        tdLog.info("================= step4")
+        tdDnodes.stop(1)
+        tdLog.sleep(5)
+        tdDnodes.start(1)
+
+        tdLog.info("================= step5")
+        tdLog.info("import 10 data again")
+        startTime = self.startTime + 10
+        sqlcmd = ['import into tb1 values']
+        for rid in range(1, 11):
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        tdSql.execute(" ".join(sqlcmd))
+
+        tdLog.info("================= step6")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(20)
+
+        tdLog.info("================= step7")
+        tdLog.info("import 10 data later with overlap")
+        startTime = self.startTime + 15
+        sqlcmd = ['import into tb1 values']
+        for rid in range(1, 11):
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        tdSql.execute(" ".join(sqlcmd))
+
+        tdLog.info("================= step8")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(25)
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
 tdCases.addWindows(__file__, TDTestCase())
 tdCases.addLinux(__file__, TDTestCase())

tests/pytest/import_merge/importCacheFileTPO.py

 ###################################################################
- #       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
- #
+#       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 -*-  
+# -*- coding: utf-8 -*-
 
 import sys
 import taos
@@ -18,74 +18,78 @@ from util.cases import *
 from util.sql import *
 from util.dnodes import *
 
+
 class TDTestCase:
-  def init(self, conn):
-    tdLog.debug("start to execute %s" % __file__)
-    tdSql.init(conn.cursor())
-    
-  def run(self):
-    self.ntables = 1
-    self.startTime = 1520000010000
-
-    tdDnodes.stop(1)
-    tdDnodes.deploy(1)
-    tdDnodes.start(1)
-
-    tdSql.execute('reset query cache')
-    tdSql.execute('drop database if exists db')
-    tdSql.execute('create database db')
-    tdSql.execute('use db')
-
-    tdLog.info("================= step1")
-    tdLog.info("create 1 table")
-    tdSql.execute('create table tb1 (ts timestamp, speed int)')
-
-    tdLog.info("================= step2")
-    tdLog.info("import 9 sequential data with gap")
-    startTime = self.startTime
-    sqlcmd = ['import into tb1 values']
-    for rid in range(1,11):
-      if (rid == 7): continue
-      sqlcmd.append('(%ld, %d)' %(startTime+rid, rid))
-    tdSql.execute(" ".join(sqlcmd))
-    
-    tdLog.info("================= step3")
-    tdSql.query('select * from tb1')
-    tdSql.checkRows(9)
-
-    tdLog.info("================= step4")
-    tdDnodes.stop(1)
-    tdLog.sleep(5)
-    tdDnodes.start(1)
-
-    tdLog.info("================= step5")
-    tdLog.info("import 9 data again with gap")
-    startTime = self.startTime + 10
-    sqlcmd = ['import into tb1 values']
-    for rid in range(1,11):
-      if (rid == 7): continue
-      sqlcmd.append('(%ld, %d)' %(startTime+rid, rid))
-    tdSql.execute(" ".join(sqlcmd))
-
-    tdLog.info("================= step6")
-    tdSql.query('select * from tb1')
-    tdSql.checkRows(18)
-
-    tdLog.info("================= step7")
-    tdLog.info("import 20 data later with partly overlap")
-    startTime = self.startTime + 5
-    sqlcmd = ['import into tb1 values']
-    for rid in range(1,21):
-      sqlcmd.append('(%ld, %d)' %(startTime+rid, rid))
-    tdSql.execute(" ".join(sqlcmd))
-
-    tdLog.info("================= step8")
-    tdSql.query('select * from tb1')
-    tdSql.checkRows(25)
-
-  def stop(self):
-    tdSql.close()
-    tdLog.success("%s successfully executed" % __file__)
-  
+    def init(self, conn):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor())
+
+    def run(self):
+        self.ntables = 1
+        self.startTime = 1520000010000
+
+        tdDnodes.stop(1)
+        tdDnodes.deploy(1)
+        tdDnodes.start(1)
+
+        tdSql.execute('reset query cache')
+        tdSql.execute('drop database if exists db')
+        tdSql.execute('create database db')
+        tdSql.execute('use db')
+
+        tdLog.info("================= step1")
+        tdLog.info("create 1 table")
+        tdSql.execute('create table tb1 (ts timestamp, speed int)')
+
+        tdLog.info("================= step2")
+        tdLog.info("import 9 sequential data with gap")
+        startTime = self.startTime
+        sqlcmd = ['import into tb1 values']
+        for rid in range(1, 11):
+            if (rid == 7):
+                continue
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        tdSql.execute(" ".join(sqlcmd))
+
+        tdLog.info("================= step3")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(9)
+
+        tdLog.info("================= step4")
+        tdDnodes.stop(1)
+        tdLog.sleep(5)
+        tdDnodes.start(1)
+
+        tdLog.info("================= step5")
+        tdLog.info("import 9 data again with gap")
+        startTime = self.startTime + 10
+        sqlcmd = ['import into tb1 values']
+        for rid in range(1, 11):
+            if (rid == 7):
+                continue
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        tdSql.execute(" ".join(sqlcmd))
+
+        tdLog.info("================= step6")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(18)
+
+        tdLog.info("================= step7")
+        tdLog.info("import 20 data later with partly overlap")
+        startTime = self.startTime + 5
+        sqlcmd = ['import into tb1 values']
+        for rid in range(1, 21):
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        tdSql.execute(" ".join(sqlcmd))
+
+        tdLog.info("================= step8")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(25)
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
 tdCases.addWindows(__file__, TDTestCase())
 tdCases.addLinux(__file__, TDTestCase())

tests/pytest/import_merge/importDataH2.py

 ###################################################################
- #       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
- #
+#       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 -*-  
+# -*- coding: utf-8 -*-
 
 import sys
 import taos
@@ -18,74 +18,77 @@ from util.cases import *
 from util.sql import *
 from util.dnodes import *
 
+
 class TDTestCase:
-  def init(self, conn):
-    tdLog.debug("start to execute %s" % __file__)
-    tdSql.init(conn.cursor())
-    
-  def run(self):
-    self.ntables = 1
-    self.startTime = 1520000010000
-    self.rows = 200
-
-    tdDnodes.stop(1)
-    tdDnodes.deploy(1)
-    tdDnodes.start(1)
-
-    tdSql.execute('reset query cache')
-    tdSql.execute('drop database if exists db')
-    tdSql.execute('create database db rows %d' %self.rows)
-    tdSql.execute('use db')
-
-    tdLog.info("================= step1")
-    tdLog.info("create 1 table")
-    tdSql.execute('create table tb1 (ts timestamp, speed int)')
-    tdLog.info("More than 10 rows less than %d rows will go to data file" %self.rows)
-
-    tdLog.info("================= step2")
-    tdLog.info("import %d sequential data" %(self.rows/2))
-    startTime = self.startTime
-    sqlcmd = ['import into tb1 values']
-    for rid in range(1,self.rows/2+1):
-      sqlcmd.append('(%ld, %d)' %(startTime+rid, rid))
-    tdSql.execute(" ".join(sqlcmd))
-    
-    tdLog.info("================= step3")
-    tdSql.query('select * from tb1')
-    tdSql.checkRows(self.rows/2)
-
-    tdLog.info("================= step4")
-    tdDnodes.stop(1)
-    tdLog.sleep(5)
-    tdDnodes.start(1)
-
-    tdLog.info("================= step5")
-    tdLog.info("import 1 data before")
-    startTime = self.startTime - 1
-    tdSql.execute('import into tb1 values(%ld, %d)' %(startTime + 1, 1))
-
-
-    tdLog.info("================= step7")
-    tdSql.execute('reset query cache')
-    tdSql.query('select * from tb1 order by ts desc')
-    tdSql.checkRows(self.rows/2 + 1)
-
-    tdLog.info("================= step8")
-    tdLog.info("import 10 data in batch before")
-    startTime = self.startTime
-    sqlcmd = ['import into tb1 values']
-    for rid in range(1,11):
-      sqlcmd.append('(%ld, %d)' %(startTime - rid, rid))
-    tdSql.execute(" ".join(sqlcmd))
-
-    tdLog.info("================= step9")
-    tdSql.execute('reset query cache')
-    tdSql.query('select * from tb1 order by ts desc')
-    tdSql.checkRows(self.rows/2 + 11)
-
-  def stop(self):
-    tdSql.close()
-    tdLog.success("%s successfully executed" % __file__)
-  
+    def init(self, conn):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor())
+
+    def run(self):
+        self.ntables = 1
+        self.startTime = 1520000010000
+        self.rows = 200
+
+        tdDnodes.stop(1)
+        tdDnodes.deploy(1)
+        tdDnodes.start(1)
+
+        tdSql.execute('reset query cache')
+        tdSql.execute('drop database if exists db')
+        tdSql.execute('create database db rows %d' % self.rows)
+        tdSql.execute('use db')
+
+        tdLog.info("================= step1")
+        tdLog.info("create 1 table")
+        tdSql.execute('create table tb1 (ts timestamp, speed int)')
+        tdLog.info(
+            "More than 10 rows less than %d rows will go to data file" %
+            self.rows)
+
+        tdLog.info("================= step2")
+        tdLog.info("import %d sequential data" % (self.rows / 2))
+        startTime = self.startTime
+        sqlcmd = ['import into tb1 values']
+        for rid in range(1, self.rows / 2 + 1):
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        tdSql.execute(" ".join(sqlcmd))
+
+        tdLog.info("================= step3")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(self.rows / 2)
+
+        tdLog.info("================= step4")
+        tdDnodes.stop(1)
+        tdLog.sleep(5)
+        tdDnodes.start(1)
+
+        tdLog.info("================= step5")
+        tdLog.info("import 1 data before")
+        startTime = self.startTime - 1
+        tdSql.execute('import into tb1 values(%ld, %d)' % (startTime + 1, 1))
+
+        tdLog.info("================= step7")
+        tdSql.execute('reset query cache')
+        tdSql.query('select * from tb1 order by ts desc')
+        tdSql.checkRows(self.rows / 2 + 1)
+
+        tdLog.info("================= step8")
+        tdLog.info("import 10 data in batch before")
+        startTime = self.startTime
+        sqlcmd = ['import into tb1 values']
+        for rid in range(1, 11):
+            sqlcmd.append('(%ld, %d)' % (startTime - rid, rid))
+        tdSql.execute(" ".join(sqlcmd))
+
+        tdLog.info("================= step9")
+        tdSql.execute('reset query cache')
+        tdSql.query('select * from tb1 order by ts desc')
+        tdSql.checkRows(self.rows / 2 + 11)
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
 tdCases.addWindows(__file__, TDTestCase())
 tdCases.addLinux(__file__, TDTestCase())

tests/pytest/import_merge/importDataHO.py

 ###################################################################
- #       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
- #
+#       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 -*-  
+# -*- coding: utf-8 -*-
 
 import sys
 import taos
@@ -18,63 +18,67 @@ from util.cases import *
 from util.sql import *
 from util.dnodes import *
 
+
 class TDTestCase:
-  def init(self, conn):
-    tdLog.debug("start to execute %s" % __file__)
-    tdSql.init(conn.cursor())
-    
-  def run(self):
-    self.ntables = 1
-    self.startTime = 1520000010000
-    self.rows = 200
-    self.rowsPerTable = 20
-
-    tdDnodes.stop(1)
-    tdDnodes.deploy(1)
-    tdDnodes.start(1)
-
-    tdSql.execute('reset query cache')
-    tdSql.execute('drop database if exists db')
-    tdSql.execute('create database db rows %d' %self.rows)
-    tdSql.execute('use db')
-
-    tdLog.info("================= step1")
-    tdLog.info("create 1 table")
-    tdSql.execute('create table tb1 (ts timestamp, speed int)')
-    tdLog.info("More than 10 rows less than %d rows will go to data file" %self.rows)
-
-    tdLog.info("================= step2")
-    tdLog.info("import %d sequential data" %self.rowsPerTable)
-    startTime = self.startTime
-    sqlcmd = ['import into tb1 values']
-    for rid in range(1,self.rowsPerTable+1):
-      sqlcmd.append('(%ld, %d)' %(startTime+rid, rid))
-    tdSql.execute(" ".join(sqlcmd))
-    
-    tdLog.info("================= step3")
-    tdSql.query('select count(*) from tb1')
-    tdSql.checkData(0, 0, self.rowsPerTable)
-
-    tdLog.info("================= step4")
-    tdDnodes.stop(1)
-    tdLog.sleep(5)
-    tdDnodes.start(1)
-
-    tdLog.info("================= step5")
-    tdLog.info("import 6 data before with overlap")
-    startTime = self.startTime - 3
-    sqlcmd = ['import into tb1 values']
-    for rid in range(1,7):
-      sqlcmd.append('(%ld, %d)' %(startTime+rid, rid))
-    tdSql.execute(" ".join(sqlcmd))
-
-    tdLog.info("================= step6")
-    tdSql.query('select * from tb1 order by ts desc')
-    tdSql.checkRows(self.rowsPerTable + 3)
-
-  def stop(self):
-    tdSql.close()
-    tdLog.success("%s successfully executed" % __file__)
-  
+    def init(self, conn):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor())
+
+    def run(self):
+        self.ntables = 1
+        self.startTime = 1520000010000
+        self.rows = 200
+        self.rowsPerTable = 20
+
+        tdDnodes.stop(1)
+        tdDnodes.deploy(1)
+        tdDnodes.start(1)
+
+        tdSql.execute('reset query cache')
+        tdSql.execute('drop database if exists db')
+        tdSql.execute('create database db rows %d' % self.rows)
+        tdSql.execute('use db')
+
+        tdLog.info("================= step1")
+        tdLog.info("create 1 table")
+        tdSql.execute('create table tb1 (ts timestamp, speed int)')
+        tdLog.info(
+            "More than 10 rows less than %d rows will go to data file" %
+            self.rows)
+
+        tdLog.info("================= step2")
+        tdLog.info("import %d sequential data" % self.rowsPerTable)
+        startTime = self.startTime
+        sqlcmd = ['import into tb1 values']
+        for rid in range(1, self.rowsPerTable + 1):
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        tdSql.execute(" ".join(sqlcmd))
+
+        tdLog.info("================= step3")
+        tdSql.query('select count(*) from tb1')
+        tdSql.checkData(0, 0, self.rowsPerTable)
+
+        tdLog.info("================= step4")
+        tdDnodes.stop(1)
+        tdLog.sleep(5)
+        tdDnodes.start(1)
+
+        tdLog.info("================= step5")
+        tdLog.info("import 6 data before with overlap")
+        startTime = self.startTime - 3
+        sqlcmd = ['import into tb1 values']
+        for rid in range(1, 7):
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        tdSql.execute(" ".join(sqlcmd))
+
+        tdLog.info("================= step6")
+        tdSql.query('select * from tb1 order by ts desc')
+        tdSql.checkRows(self.rowsPerTable + 3)
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
 tdCases.addWindows(__file__, TDTestCase())
 tdCases.addLinux(__file__, TDTestCase())

tests/pytest/import_merge/importDataHO2.py

 ###################################################################
- #       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
- #
+#       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 -*-  
+# -*- coding: utf-8 -*-
 
 import sys
 import taos
@@ -18,63 +18,67 @@ from util.cases import *
 from util.sql import *
 from util.dnodes import *
 
+
 class TDTestCase:
-  def init(self, conn):
-    tdLog.debug("start to execute %s" % __file__)
-    tdSql.init(conn.cursor())
-    
-  def run(self):
-    self.ntables = 1
-    self.startTime = 1520000010000
-    self.rows = 200
-    self.rowsPerTable = 100
-
-    tdDnodes.stop(1)
-    tdDnodes.deploy(1)
-    tdDnodes.start(1)
-
-    tdSql.execute('reset query cache')
-    tdSql.execute('drop database if exists db')
-    tdSql.execute('create database db rows %d' %self.rows)
-    tdSql.execute('use db')
-
-    tdLog.info("================= step1")
-    tdLog.info("create 1 table")
-    tdSql.execute('create table tb1 (ts timestamp, speed int)')
-    tdLog.info("More than 10 rows less than %d rows will go to data file" %self.rows)
-
-    tdLog.info("================= step2")
-    tdLog.info("import %d sequential data" %self.rowsPerTable)
-    startTime = self.startTime
-    sqlcmd = ['import into tb1 values']
-    for rid in range(1,self.rowsPerTable+1):
-      sqlcmd.append('(%ld, %d)' %(startTime+rid, rid))
-    tdSql.execute(" ".join(sqlcmd))
-    
-    tdLog.info("================= step3")
-    tdSql.query('select count(*) from tb1')
-    tdSql.checkData(0, 0, self.rowsPerTable)
-
-    tdLog.info("================= step4")
-    tdDnodes.stop(1)
-    tdLog.sleep(5)
-    tdDnodes.start(1)
-
-    tdLog.info("================= step5")
-    tdLog.info("import 6 data before with overlap")
-    startTime = self.startTime - 3
-    sqlcmd = ['import into tb1 values']
-    for rid in range(6, 0, -1):
-      sqlcmd.append('(%ld, %d)' %(startTime+rid, rid))
-    tdSql.execute(" ".join(sqlcmd))
-
-    tdLog.info("================= step6")
-    tdSql.query('select * from tb1 order by ts desc')
-    tdSql.checkRows(self.rowsPerTable+3)
-
-  def stop(self):
-    tdSql.close()
-    tdLog.success("%s successfully executed" % __file__)
-  
+    def init(self, conn):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor())
+
+    def run(self):
+        self.ntables = 1
+        self.startTime = 1520000010000
+        self.rows = 200
+        self.rowsPerTable = 100
+
+        tdDnodes.stop(1)
+        tdDnodes.deploy(1)
+        tdDnodes.start(1)
+
+        tdSql.execute('reset query cache')
+        tdSql.execute('drop database if exists db')
+        tdSql.execute('create database db rows %d' % self.rows)
+        tdSql.execute('use db')
+
+        tdLog.info("================= step1")
+        tdLog.info("create 1 table")
+        tdSql.execute('create table tb1 (ts timestamp, speed int)')
+        tdLog.info(
+            "More than 10 rows less than %d rows will go to data file" %
+            self.rows)
+
+        tdLog.info("================= step2")
+        tdLog.info("import %d sequential data" % self.rowsPerTable)
+        startTime = self.startTime
+        sqlcmd = ['import into tb1 values']
+        for rid in range(1, self.rowsPerTable + 1):
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        tdSql.execute(" ".join(sqlcmd))
+
+        tdLog.info("================= step3")
+        tdSql.query('select count(*) from tb1')
+        tdSql.checkData(0, 0, self.rowsPerTable)
+
+        tdLog.info("================= step4")
+        tdDnodes.stop(1)
+        tdLog.sleep(5)
+        tdDnodes.start(1)
+
+        tdLog.info("================= step5")
+        tdLog.info("import 6 data before with overlap")
+        startTime = self.startTime - 3
+        sqlcmd = ['import into tb1 values']
+        for rid in range(6, 0, -1):
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        tdSql.execute(" ".join(sqlcmd))
+
+        tdLog.info("================= step6")
+        tdSql.query('select * from tb1 order by ts desc')
+        tdSql.checkRows(self.rowsPerTable + 3)
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
 tdCases.addWindows(__file__, TDTestCase())
 tdCases.addLinux(__file__, TDTestCase())

tests/pytest/import_merge/importDataHPO.py

 ###################################################################
- #       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
- #
+#       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 -*-  
+# -*- coding: utf-8 -*-
 
 import sys
 import taos
@@ -18,65 +18,69 @@ from util.cases import *
 from util.sql import *
 from util.dnodes import *
 
+
 class TDTestCase:
-  def init(self, conn):
-    tdLog.debug("start to execute %s" % __file__)
-    tdSql.init(conn.cursor())
-    
-  def run(self):
-    self.ntables = 1
-    self.startTime = 1520000010000
-    self.rows = 200
-    self.rowsPerTable = 20
-
-    tdDnodes.stop(1)
-    tdDnodes.deploy(1)
-    tdDnodes.start(1)
-
-    tdSql.execute('reset query cache')
-    tdSql.execute('drop database if exists db')
-    tdSql.execute('create database db rows %d' %self.rows)
-    tdSql.execute('use db')
-
-    tdLog.info("================= step1")
-    tdLog.info("create 1 table")
-    tdSql.execute('create table tb1 (ts timestamp, speed int)')
-    tdLog.info("More than 10 rows less than %d rows will go to data file" %self.rows)
-
-    tdLog.info("================= step2")
-    tdLog.info("import %d sequential data" %self.rowsPerTable)
-    startTime = self.startTime
-    sqlcmd = ['import into tb1 values']
-    for rid in range(1,10):
-      sqlcmd.append('(%ld, %d)' %(startTime+rid, rid))
-    for rid in range(14,self.rowsPerTable+5):
-      sqlcmd.append('(%ld, %d)' %(startTime+rid, rid))  
-    tdSql.execute(" ".join(sqlcmd))
-    
-    tdLog.info("================= step3")
-    tdSql.query('select count(*) from tb1')
-    tdSql.checkData(0, 0, self.rowsPerTable)
-
-    tdLog.info("================= step4")
-    tdDnodes.stop(1)
-    tdLog.sleep(5)
-    tdDnodes.start(1)
-
-    tdLog.info("================= step5")
-    tdLog.info("import 20 data before with partly overlap")
-    startTime = self.startTime - 4
-    sqlcmd = ['import into tb1 values']
-    for rid in range(1,21):
-      sqlcmd.append('(%ld, %d)' %(startTime+rid, rid))
-    tdSql.execute(" ".join(sqlcmd))
-
-    tdLog.info("================= step6")
-    tdSql.query('select * from tb1')
-    tdSql.checkRows(self.rowsPerTable+8)
-
-  def stop(self):
-    tdSql.close()
-    tdLog.success("%s successfully executed" % __file__)
-  
+    def init(self, conn):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor())
+
+    def run(self):
+        self.ntables = 1
+        self.startTime = 1520000010000
+        self.rows = 200
+        self.rowsPerTable = 20
+
+        tdDnodes.stop(1)
+        tdDnodes.deploy(1)
+        tdDnodes.start(1)
+
+        tdSql.execute('reset query cache')
+        tdSql.execute('drop database if exists db')
+        tdSql.execute('create database db rows %d' % self.rows)
+        tdSql.execute('use db')
+
+        tdLog.info("================= step1")
+        tdLog.info("create 1 table")
+        tdSql.execute('create table tb1 (ts timestamp, speed int)')
+        tdLog.info(
+            "More than 10 rows less than %d rows will go to data file" %
+            self.rows)
+
+        tdLog.info("================= step2")
+        tdLog.info("import %d sequential data" % self.rowsPerTable)
+        startTime = self.startTime
+        sqlcmd = ['import into tb1 values']
+        for rid in range(1, 10):
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        for rid in range(14, self.rowsPerTable + 5):
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        tdSql.execute(" ".join(sqlcmd))
+
+        tdLog.info("================= step3")
+        tdSql.query('select count(*) from tb1')
+        tdSql.checkData(0, 0, self.rowsPerTable)
+
+        tdLog.info("================= step4")
+        tdDnodes.stop(1)
+        tdLog.sleep(5)
+        tdDnodes.start(1)
+
+        tdLog.info("================= step5")
+        tdLog.info("import 20 data before with partly overlap")
+        startTime = self.startTime - 4
+        sqlcmd = ['import into tb1 values']
+        for rid in range(1, 21):
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        tdSql.execute(" ".join(sqlcmd))
+
+        tdLog.info("================= step6")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(self.rowsPerTable + 8)
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
 tdCases.addWindows(__file__, TDTestCase())
 tdCases.addLinux(__file__, TDTestCase())

tests/pytest/import_merge/importDataLastH.py

 ###################################################################
- #       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
- #
+#       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 -*-  
+# -*- coding: utf-8 -*-
 
 import sys
 import taos
@@ -18,59 +18,63 @@ from util.cases import *
 from util.sql import *
 from util.dnodes import *
 
+
 class TDTestCase:
-  def init(self, conn):
-    tdLog.debug("start to execute %s" % __file__)
-    tdSql.init(conn.cursor())
-    
-  def run(self):
-    self.ntables = 1
-    self.startTime = 1520000010000
-    self.rows = 200
-
-    tdDnodes.stop(1)
-    tdDnodes.deploy(1)
-    tdDnodes.start(1)
-
-    tdSql.execute('reset query cache')
-    tdSql.execute('drop database if exists db')
-    tdSql.execute('create database db rows %d' %self.rows)
-    tdSql.execute('use db')
-
-    tdLog.info("================= step1")
-    tdLog.info("create 1 table")
-    tdSql.execute('create table tb1 (ts timestamp, speed int)')
-    tdLog.info("More than %d rows less than %d rows will go to data and last file" %(self.rows, 10+self.rows))
-
-    tdLog.info("================= step2")
-    tdLog.info("import 205 sequential data")
-    startTime = self.startTime
-    sqlcmd = ['import into tb1 values']
-    for rid in range(1,206):
-      sqlcmd.append('(%ld, %d)' %(startTime+rid, rid))
-    tdSql.execute(" ".join(sqlcmd))
-    
-    tdLog.info("================= step3")
-    tdSql.query('select * from tb1')
-    tdSql.checkRows(205)
-
-    tdLog.info("================= step4")
-    tdDnodes.stop(1)
-    tdLog.sleep(5)
-    tdDnodes.start(1)
-
-    tdLog.info("================= step5")
-    tdLog.info("import 1 data before")
-    startTime = self.startTime - 1
-    tdSql.execute('import into tb1 values(%ld, %d)' %(startTime + 1, 1))
-
-    tdLog.info("================= step6")
-    tdSql.query('select * from tb1')
-    tdSql.checkRows(206)
-
-  def stop(self):
-    tdSql.close()
-    tdLog.success("%s successfully executed" % __file__)
-  
+    def init(self, conn):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor())
+
+    def run(self):
+        self.ntables = 1
+        self.startTime = 1520000010000
+        self.rows = 200
+
+        tdDnodes.stop(1)
+        tdDnodes.deploy(1)
+        tdDnodes.start(1)
+
+        tdSql.execute('reset query cache')
+        tdSql.execute('drop database if exists db')
+        tdSql.execute('create database db rows %d' % self.rows)
+        tdSql.execute('use db')
+
+        tdLog.info("================= step1")
+        tdLog.info("create 1 table")
+        tdSql.execute('create table tb1 (ts timestamp, speed int)')
+        tdLog.info(
+            "More than %d rows less than %d rows will go to data and last file" %
+            (self.rows, 10 + self.rows))
+
+        tdLog.info("================= step2")
+        tdLog.info("import 205 sequential data")
+        startTime = self.startTime
+        sqlcmd = ['import into tb1 values']
+        for rid in range(1, 206):
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        tdSql.execute(" ".join(sqlcmd))
+
+        tdLog.info("================= step3")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(205)
+
+        tdLog.info("================= step4")
+        tdDnodes.stop(1)
+        tdLog.sleep(5)
+        tdDnodes.start(1)
+
+        tdLog.info("================= step5")
+        tdLog.info("import 1 data before")
+        startTime = self.startTime - 1
+        tdSql.execute('import into tb1 values(%ld, %d)' % (startTime + 1, 1))
+
+        tdLog.info("================= step6")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(206)
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
 tdCases.addWindows(__file__, TDTestCase())
 tdCases.addLinux(__file__, TDTestCase())

tests/pytest/import_merge/importDataLastHO.py

 ###################################################################
- #       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
- #
+#       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 -*-  
+# -*- coding: utf-8 -*-
 
 import sys
 import taos
@@ -18,62 +18,66 @@ from util.cases import *
 from util.sql import *
 from util.dnodes import *
 
+
 class TDTestCase:
-  def init(self, conn):
-    tdLog.debug("start to execute %s" % __file__)
-    tdSql.init(conn.cursor())
-    
-  def run(self):
-    self.ntables = 1
-    self.startTime = 1520000010000
-    self.rows = 200
-
-    tdDnodes.stop(1)
-    tdDnodes.deploy(1)
-    tdDnodes.start(1)
-
-    tdSql.execute('reset query cache')
-    tdSql.execute('drop database if exists db')
-    tdSql.execute('create database db rows %d' %self.rows)
-    tdSql.execute('use db')
-
-    tdLog.info("================= step1")
-    tdLog.info("create 1 table")
-    tdSql.execute('create table tb1 (ts timestamp, speed int)')
-    tdLog.info("More than %d rows less than %d rows will go to data and last file" %(self.rows, 10+self.rows))
-
-    tdLog.info("================= step2")
-    tdLog.info("import 205 sequential data")
-    startTime = self.startTime
-    sqlcmd = ['import into tb1 values']
-    for rid in range(1,206):
-      sqlcmd.append('(%ld, %d)' %(startTime+rid, rid))
-    tdSql.execute(" ".join(sqlcmd))
-    
-    tdLog.info("================= step3")
-    tdSql.query('select * from tb1')
-    tdSql.checkRows(205)
-
-    tdLog.info("================= step4")
-    tdDnodes.stop(1)
-    tdLog.sleep(5)
-    tdDnodes.start(1)
-
-    tdLog.info("================= step5")
-    tdLog.info("import 5 data before with overlap")
-    startTime = self.startTime - 2
-    sqlcmd = ['import into tb1 values']
-    for rid in range(1,6):
-      sqlcmd.append('(%ld, %d)' %(startTime+rid, rid))
-    tdSql.execute(" ".join(sqlcmd))
-
-    tdLog.info("================= step6")
-    tdSql.query('select * from tb1')
-    tdSql.checkRows(207)
-
-  def stop(self):
-    tdSql.close()
-    tdLog.success("%s successfully executed" % __file__)
-  
+    def init(self, conn):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor())
+
+    def run(self):
+        self.ntables = 1
+        self.startTime = 1520000010000
+        self.rows = 200
+
+        tdDnodes.stop(1)
+        tdDnodes.deploy(1)
+        tdDnodes.start(1)
+
+        tdSql.execute('reset query cache')
+        tdSql.execute('drop database if exists db')
+        tdSql.execute('create database db rows %d' % self.rows)
+        tdSql.execute('use db')
+
+        tdLog.info("================= step1")
+        tdLog.info("create 1 table")
+        tdSql.execute('create table tb1 (ts timestamp, speed int)')
+        tdLog.info(
+            "More than %d rows less than %d rows will go to data and last file" %
+            (self.rows, 10 + self.rows))
+
+        tdLog.info("================= step2")
+        tdLog.info("import 205 sequential data")
+        startTime = self.startTime
+        sqlcmd = ['import into tb1 values']
+        for rid in range(1, 206):
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        tdSql.execute(" ".join(sqlcmd))
+
+        tdLog.info("================= step3")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(205)
+
+        tdLog.info("================= step4")
+        tdDnodes.stop(1)
+        tdLog.sleep(5)
+        tdDnodes.start(1)
+
+        tdLog.info("================= step5")
+        tdLog.info("import 5 data before with overlap")
+        startTime = self.startTime - 2
+        sqlcmd = ['import into tb1 values']
+        for rid in range(1, 6):
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        tdSql.execute(" ".join(sqlcmd))
+
+        tdLog.info("================= step6")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(207)
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
 tdCases.addWindows(__file__, TDTestCase())
 tdCases.addLinux(__file__, TDTestCase())

tests/pytest/import_merge/importDataLastHPO.py

 ###################################################################
- #       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
- #
+#       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 -*-  
+# -*- coding: utf-8 -*-
 
 import sys
 import taos
@@ -18,64 +18,68 @@ from util.cases import *
 from util.sql import *
 from util.dnodes import *
 
+
 class TDTestCase:
-  def init(self, conn):
-    tdLog.debug("start to execute %s" % __file__)
-    tdSql.init(conn.cursor())
-    
-  def run(self):
-    self.ntables = 1
-    self.startTime = 1520000010000
-    self.rows = 200
-
-    tdDnodes.stop(1)
-    tdDnodes.deploy(1)
-    tdDnodes.start(1)
-
-    tdSql.execute('reset query cache')
-    tdSql.execute('drop database if exists db')
-    tdSql.execute('create database db rows %d' %self.rows)
-    tdSql.execute('use db')
-
-    tdLog.info("================= step1")
-    tdLog.info("create 1 table")
-    tdSql.execute('create table tb1 (ts timestamp, speed int)')
-    tdLog.info("More than %d rows less than %d rows will go to data and last file" %(self.rows, 10+self.rows))
-
-    tdLog.info("================= step2")
-    tdLog.info("import 205 sequential data")
-    startTime = self.startTime
-    sqlcmd = ['import into tb1 values']
-    for rid in range(1,11):
-      sqlcmd.append('(%ld, %d)' %(startTime+rid, rid))
-    for rid in range(14,209):
-      sqlcmd.append('(%ld, %d)' %(startTime+rid, rid))
-    tdSql.execute(" ".join(sqlcmd))
-    
-    tdLog.info("================= step3")
-    tdSql.query('select * from tb1')
-    tdSql.checkRows(205)
-
-    tdLog.info("================= step4")
-    tdDnodes.stop(1)
-    tdLog.sleep(5)
-    tdDnodes.start(1)
-
-    tdLog.info("================= step5")
-    tdLog.info("import 20 data before with partly overlap")
-    startTime = self.startTime - 2
-    sqlcmd = ['import into tb1 values']
-    for rid in range(1,21):
-      sqlcmd.append('(%ld, %d)' %(startTime+rid, rid))
-    tdSql.execute(" ".join(sqlcmd))
-
-    tdLog.info("================= step6")
-    tdSql.query('select * from tb1')
-    tdSql.checkRows(210)
-
-  def stop(self):
-    tdSql.close()
-    tdLog.success("%s successfully executed" % __file__)
-  
+    def init(self, conn):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor())
+
+    def run(self):
+        self.ntables = 1
+        self.startTime = 1520000010000
+        self.rows = 200
+
+        tdDnodes.stop(1)
+        tdDnodes.deploy(1)
+        tdDnodes.start(1)
+
+        tdSql.execute('reset query cache')
+        tdSql.execute('drop database if exists db')
+        tdSql.execute('create database db rows %d' % self.rows)
+        tdSql.execute('use db')
+
+        tdLog.info("================= step1")
+        tdLog.info("create 1 table")
+        tdSql.execute('create table tb1 (ts timestamp, speed int)')
+        tdLog.info(
+            "More than %d rows less than %d rows will go to data and last file" %
+            (self.rows, 10 + self.rows))
+
+        tdLog.info("================= step2")
+        tdLog.info("import 205 sequential data")
+        startTime = self.startTime
+        sqlcmd = ['import into tb1 values']
+        for rid in range(1, 11):
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        for rid in range(14, 209):
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        tdSql.execute(" ".join(sqlcmd))
+
+        tdLog.info("================= step3")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(205)
+
+        tdLog.info("================= step4")
+        tdDnodes.stop(1)
+        tdLog.sleep(5)
+        tdDnodes.start(1)
+
+        tdLog.info("================= step5")
+        tdLog.info("import 20 data before with partly overlap")
+        startTime = self.startTime - 2
+        sqlcmd = ['import into tb1 values']
+        for rid in range(1, 21):
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        tdSql.execute(" ".join(sqlcmd))
+
+        tdLog.info("================= step6")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(210)
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
 tdCases.addWindows(__file__, TDTestCase())
 tdCases.addLinux(__file__, TDTestCase())

tests/pytest/import_merge/importDataLastS.py

 ###################################################################
- #       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
- #
+#       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 -*-  
+# -*- coding: utf-8 -*-
 
 import sys
 import taos
@@ -18,62 +18,66 @@ from util.cases import *
 from util.sql import *
 from util.dnodes import *
 
+
 class TDTestCase:
-  def init(self, conn):
-    tdLog.debug("start to execute %s" % __file__)
-    tdSql.init(conn.cursor())
-    
-  def run(self):
-    self.ntables = 1
-    self.startTime = 1520000010000
-    self.rows = 200
-
-    tdDnodes.stop(1)
-    tdDnodes.deploy(1)
-    tdDnodes.start(1)
-
-    tdSql.execute('reset query cache')
-    tdSql.execute('drop database if exists db')
-    tdSql.execute('create database db rows %d' %self.rows)
-    tdSql.execute('use db')
-
-    tdLog.info("================= step1")
-    tdLog.info("create 1 table")
-    tdSql.execute('create table tb1 (ts timestamp, speed int)')
-    tdLog.info("More than %d rows less than %d rows will go to data and last file" %(self.rows, 10+self.rows))
-
-    tdLog.info("================= step2")
-    tdLog.info("import 205 sequential data")
-    startTime = self.startTime
-    sqlcmd = ['import into tb1 values']
-    for rid in range(1,206):
-      sqlcmd.append('(%ld, %d)' %(startTime+rid, rid))
-    tdSql.execute(" ".join(sqlcmd))
-    
-    tdLog.info("================= step3")
-    tdSql.query('select * from tb1')
-    tdSql.checkRows(205)
-
-    tdLog.info("================= step4")
-    tdDnodes.stop(1)
-    tdLog.sleep(5)
-    tdDnodes.start(1)
-
-    tdLog.info("================= step5")
-    tdLog.info("import 250 data covering the existing data")
-    startTime = self.startTime - 15
-    sqlcmd = ['import into tb1 values']
-    for rid in range(1,251):
-      sqlcmd.append('(%ld, %d)' %(startTime+rid, rid))
-    tdSql.execute(" ".join(sqlcmd))
-
-    tdLog.info("================= step6")
-    tdSql.query('select * from tb1')
-    tdSql.checkRows(250)
-
-  def stop(self):
-    tdSql.close()
-    tdLog.success("%s successfully executed" % __file__)
-  
+    def init(self, conn):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor())
+
+    def run(self):
+        self.ntables = 1
+        self.startTime = 1520000010000
+        self.rows = 200
+
+        tdDnodes.stop(1)
+        tdDnodes.deploy(1)
+        tdDnodes.start(1)
+
+        tdSql.execute('reset query cache')
+        tdSql.execute('drop database if exists db')
+        tdSql.execute('create database db rows %d' % self.rows)
+        tdSql.execute('use db')
+
+        tdLog.info("================= step1")
+        tdLog.info("create 1 table")
+        tdSql.execute('create table tb1 (ts timestamp, speed int)')
+        tdLog.info(
+            "More than %d rows less than %d rows will go to data and last file" %
+            (self.rows, 10 + self.rows))
+
+        tdLog.info("================= step2")
+        tdLog.info("import 205 sequential data")
+        startTime = self.startTime
+        sqlcmd = ['import into tb1 values']
+        for rid in range(1, 206):
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        tdSql.execute(" ".join(sqlcmd))
+
+        tdLog.info("================= step3")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(205)
+
+        tdLog.info("================= step4")
+        tdDnodes.stop(1)
+        tdLog.sleep(5)
+        tdDnodes.start(1)
+
+        tdLog.info("================= step5")
+        tdLog.info("import 250 data covering the existing data")
+        startTime = self.startTime - 15
+        sqlcmd = ['import into tb1 values']
+        for rid in range(1, 251):
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        tdSql.execute(" ".join(sqlcmd))
+
+        tdLog.info("================= step6")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(250)
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
 tdCases.addWindows(__file__, TDTestCase())
 tdCases.addLinux(__file__, TDTestCase())

tests/pytest/import_merge/importDataLastSub.py

 ###################################################################
- #       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
- #
+#       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 -*-  
+# -*- coding: utf-8 -*-
 
 import sys
 import taos
@@ -18,62 +18,66 @@ from util.cases import *
 from util.sql import *
 from util.dnodes import *
 
+
 class TDTestCase:
-  def init(self, conn):
-    tdLog.debug("start to execute %s" % __file__)
-    tdSql.init(conn.cursor())
-    
-  def run(self):
-    self.ntables = 1
-    self.startTime = 1520000010000
-    self.rows = 200
-
-    tdDnodes.stop(1)
-    tdDnodes.deploy(1)
-    tdDnodes.start(1)
-
-    tdSql.execute('reset query cache')
-    tdSql.execute('drop database if exists db')
-    tdSql.execute('create database db rows %d' %self.rows)
-    tdSql.execute('use db')
-
-    tdLog.info("================= step1")
-    tdLog.info("create 1 table")
-    tdSql.execute('create table tb1 (ts timestamp, speed int)')
-    tdLog.info("More than %d rows less than %d rows will go to data and last file" %(self.rows, 10+self.rows))
-
-    tdLog.info("================= step2")
-    tdLog.info("import 205 sequential data")
-    startTime = self.startTime
-    sqlcmd = ['import into tb1 values']
-    for rid in range(1,206):
-      sqlcmd.append('(%ld, %d)' %(startTime+rid, rid))
-    tdSql.execute(" ".join(sqlcmd))
-    
-    tdLog.info("================= step3")
-    tdSql.query('select * from tb1')
-    tdSql.checkRows(205)
-
-    tdLog.info("================= step4")
-    tdDnodes.stop(1)
-    tdLog.sleep(5)
-    tdDnodes.start(1)
-
-    tdLog.info("================= step5")
-    tdLog.info("import 10 data totally repetitive")
-    startTime = self.startTime + 10
-    sqlcmd = ['import into tb1 values']
-    for rid in range(1,11):
-      sqlcmd.append('(%ld, %d)' %(startTime+rid, rid))
-    tdSql.execute(" ".join(sqlcmd))
-
-    tdLog.info("================= step6")
-    tdSql.query('select * from tb1')
-    tdSql.checkRows(205)
-
-  def stop(self):
-    tdSql.close()
-    tdLog.success("%s successfully executed" % __file__)
-  
+    def init(self, conn):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor())
+
+    def run(self):
+        self.ntables = 1
+        self.startTime = 1520000010000
+        self.rows = 200
+
+        tdDnodes.stop(1)
+        tdDnodes.deploy(1)
+        tdDnodes.start(1)
+
+        tdSql.execute('reset query cache')
+        tdSql.execute('drop database if exists db')
+        tdSql.execute('create database db rows %d' % self.rows)
+        tdSql.execute('use db')
+
+        tdLog.info("================= step1")
+        tdLog.info("create 1 table")
+        tdSql.execute('create table tb1 (ts timestamp, speed int)')
+        tdLog.info(
+            "More than %d rows less than %d rows will go to data and last file" %
+            (self.rows, 10 + self.rows))
+
+        tdLog.info("================= step2")
+        tdLog.info("import 205 sequential data")
+        startTime = self.startTime
+        sqlcmd = ['import into tb1 values']
+        for rid in range(1, 206):
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        tdSql.execute(" ".join(sqlcmd))
+
+        tdLog.info("================= step3")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(205)
+
+        tdLog.info("================= step4")
+        tdDnodes.stop(1)
+        tdLog.sleep(5)
+        tdDnodes.start(1)
+
+        tdLog.info("================= step5")
+        tdLog.info("import 10 data totally repetitive")
+        startTime = self.startTime + 10
+        sqlcmd = ['import into tb1 values']
+        for rid in range(1, 11):
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        tdSql.execute(" ".join(sqlcmd))
+
+        tdLog.info("================= step6")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(205)
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
 tdCases.addWindows(__file__, TDTestCase())
 tdCases.addLinux(__file__, TDTestCase())

tests/pytest/import_merge/importDataLastT.py

 ###################################################################
- #       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
- #
+#       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 -*-  
+# -*- coding: utf-8 -*-
 
 import sys
 import taos
@@ -18,55 +18,59 @@ from util.cases import *
 from util.sql import *
 from util.dnodes import *
 
+
 class TDTestCase:
-  def init(self, conn):
-    tdLog.debug("start to execute %s" % __file__)
-    tdSql.init(conn.cursor())
-    
-  def run(self):
-    self.ntables = 1
-    self.startTime = 1520000010000
-    self.rows = 200
+    def init(self, conn):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor())
+
+    def run(self):
+        self.ntables = 1
+        self.startTime = 1520000010000
+        self.rows = 200
+
+        tdSql.execute('reset query cache')
+        tdSql.execute('drop database if exists db')
+        tdSql.execute('create database db rows %d' % self.rows)
+        tdSql.execute('use db')
+
+        tdLog.info("================= step1")
+        tdLog.info("create 1 table")
+        tdSql.execute('create table tb1 (ts timestamp, speed int)')
+        tdLog.info(
+            "More than %d rows less than %d rows will go to data and last file" %
+            (self.rows, 10 + self.rows))
+
+        tdLog.info("================= step2")
+        tdLog.info("import 205 sequential data")
+        startTime = self.startTime
+        sqlcmd = ['import into tb1 values']
+        for rid in range(1, 206):
+            sqlcmd.append('(%ld, %d)' % (startTime + rid, rid))
+        tdSql.execute(" ".join(sqlcmd))
 
-    tdSql.execute('reset query cache')
-    tdSql.execute('drop database if exists db')
-    tdSql.execute('create database db rows %d' %self.rows)
-    tdSql.execute('use db')
+        tdLog.info("================= step3")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(205)
 
-    tdLog.info("================= step1")
-    tdLog.info("create 1 table")
-    tdSql.execute('create table tb1 (ts timestamp, speed int)')
-    tdLog.info("More than %d rows less than %d rows will go to data and last file" %(self.rows, 10+self.rows))
+        tdLog.info("================= step4")
+        tdDnodes.stop(1)
+        tdLog.sleep(5)
+        tdDnodes.start(1)
 
-    tdLog.info("================= step2")
-    tdLog.info("import 205 sequential data")
-    startTime = self.startTime
-    sqlcmd = ['import into tb1 values']
-    for rid in range(1,206):
-      sqlcmd.append('(%ld, %d)' %(startTime+rid, rid))
-    tdSql.execute(" ".join(sqlcmd))
-    
-    tdLog.info("================= step3")
-    tdSql.query('select * from tb1')
-    tdSql.checkRows(205)
+        tdLog.info("================= step5")
+        tdLog.info("import 1 data later")
+        startTime = self.startTime + 205
+        tdSql.execute('import into tb1 values(%ld, %d)' % (startTime + 1, 1))
 
-    tdLog.info("================= step4")
-    tdDnodes.stop(1)
-    tdLog.sleep(5)
-    tdDnodes.start(1)
+        tdLog.info("================= step6")
+        tdSql.query('select * from tb1')
+        tdSql.checkRows(206)
 
-    tdLog.info("================= step5")
-    tdLog.info("import 1 data later")
-    startTime = self.startTime + 205
-    tdSql.execute('import into tb1 values(%ld, %d)' %(startTime + 1, 1))
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
 
-    tdLog.info("================= step6")
-    tdSql.query('select * from tb1')
-    tdSql.checkRows(206)
 
-  def stop(self):
-    tdSql.close()
-    tdLog.success("%s successfully executed" % __file__)
-  
 tdCases.addWindows(__file__, TDTestCase())
 tdCases.addLinux(__file__, TDTestCase())

tests/pytest/query/tbname.py

@@ -26,12 +26,14 @@ class TDTestCase:
     def run(self):
         tdSql.prepare()
 
-        tdSql.execute('create table cars (ts timestamp, speed int) tags(id int)')
+        tdSql.execute(
+            'create table cars (ts timestamp, speed int) tags(id int)')
         tdSql.execute("create table carzero using cars tags(0)")
         tdSql.execute("create table carone using cars tags(1)")
         tdSql.execute("create table cartwo using cars tags(2)")
 
-        tdSql.execute("insert into carzero values(now, 100) carone values(now, 110)")
+        tdSql.execute(
+            "insert into carzero values(now, 100) carone values(now, 110)")
 
         tdSql.query("select * from cars where tbname in ('carzero', 'carone')")
         tdSql.checkRows(2)
@@ -39,13 +41,16 @@ class TDTestCase:
         tdSql.query("select * from cars where tbname in ('carzero', 'cartwo')")
         tdSql.checkRows(1)
 
-        tdSql.query("select * from cars where id=1 or tbname in ('carzero', 'cartwo')")
+        tdSql.query(
+            "select * from cars where id=1 or tbname in ('carzero', 'cartwo')")
         tdSql.checkRows(2)
 
-        tdSql.query("select * from cars where id=1 and tbname in ('carzero', 'cartwo')")
+        tdSql.query(
+            "select * from cars where id=1 and tbname in ('carzero', 'cartwo')")
         tdSql.checkRows(0)
 
-        tdSql.query("select * from cars where id=0 and tbname in ('carzero', 'cartwo')")
+        tdSql.query(
+            "select * from cars where id=0 and tbname in ('carzero', 'cartwo')")
         tdSql.checkRows(1)
 
         """

tests/pytest/util/sql.py

@@ -92,10 +92,10 @@ class TDSql:
 
         if data is None:
             tdLog.info("sql:%.40s, row:%d col:%d data:%s == expect:%s" %
-                   (self.sql, row, col, self.queryResult[row][col], data))
+                       (self.sql, row, col, self.queryResult[row][col], data))
         else:
             tdLog.info("sql:%.40s, row:%d col:%d data:%s == expect:%d" %
-                   (self.sql, row, col, self.queryResult[row][col], data))
+                       (self.sql, row, col, self.queryResult[row][col], data))
 
     def getData(self, row, col):
         if row < 0: