Merge remote-tracking branch 'origin/enh/rocksRevert' into enh/rocksRevert

cmake/cmake.version

@@ -2,7 +2,7 @@
 IF (DEFINED VERNUMBER)
   SET(TD_VER_NUMBER ${VERNUMBER})
 ELSE ()
-  SET(TD_VER_NUMBER "3.0.3.2")
+  SET(TD_VER_NUMBER "3.0.4.0")
 ENDIF ()
 
 IF (DEFINED VERCOMPATIBLE)

docs/en/14-reference/03-connector/07-python.mdx

@@ -459,6 +459,56 @@ For a more detailed description of the `sql()` method, please refer to [RestClie
 </TabItem>
 </Tabs>
 
+### Schemaless Insert
+
+Connector support schemaless insert.
+
+<Tabs defaultValue="list">
+<TabItem value="list" label="List Insert">
+
+Simple insert
+
+```python
+{{#include docs/examples/python/schemaless_insert.py}}
+```
+
+Insert with ttl argument
+
+```python
+{{#include docs/examples/python/schemaless_insert_ttl.py}}
+```
+
+Insert with req_id argument
+
+```python
+{{#include docs/examples/python/schemaless_insert_req_id.py}}
+```
+
+</TabItem>
+
+<TabItem value="raw" label="Raw Insert">
+
+Simple insert
+
+```python
+{{#include docs/examples/python/schemaless_insert_raw.py}}
+```
+
+Insert with ttl argument
+
+```python
+{{#include docs/examples/python/schemaless_insert_raw_ttl.py}}
+```
+
+Insert with req_id argument
+
+```python
+{{#include docs/examples/python/schemaless_insert_raw_req_id.py}}
+```
+
+</TabItem>
+</Tabs>
+
 ### Other sample programs
 
 | Example program links | Example program content |

docs/en/14-reference/04-taosadapter.md

@@ -66,15 +66,13 @@ Usage of taosAdapter:
       --cors.allowCredentials                            cors allow credentials. Env "TAOS_ADAPTER_CORS_ALLOW_Credentials"
       --cors.allowHeaders stringArray                    cors allow HEADERS. Env "TAOS_ADAPTER_ALLOW_HEADERS"
       --cors.allowOrigins stringArray                    cors allow origins. Env "TAOS_ADAPTER_ALLOW_ORIGINS"
-      --cors.allowWebSockets                         cors allow WebSockets. Env "TAOS_ADAPTER_CORS_ALLOW_WebSockets"
-      --cors.exposeHeaders stringArray               cors expose headers. Env "TAOS_ADAPTER_Expose_Headers"
+      --cors.allowWebSockets                             cors allow WebSockets. Env "TAOS_ADAPTER_CORS_ALLOW_WebSockets"      --cors.exposeHeaders stringArray                   cors expose headers. Env "TAOS_ADAPTER_Expose_Headers"
       --debug                                            enable debug mode. Env "TAOS_ADAPTER_DEBUG" (default true)
       --help                                             Print this help message and exit
-      --httpCodeServerError                          Use a non-200 http status code when taosd returns an error. Env "TAOS_ADAPTER_HTTP_CODE_SERVER_ERROR"
+      --httpCodeServerError                              Use a non-200 http status code when server returns an error. Env "TAOS_ADAPTER_HTTP_CODE_SERVER_ERROR"
       --influxdb.enable                                  enable influxdb. Env "TAOS_ADAPTER_INFLUXDB_ENABLE" (default true)
       --log.enableRecordHttpSql                          whether to record http sql. Env "TAOS_ADAPTER_LOG_ENABLE_RECORD_HTTP_SQL"
-      --log.path string                              log path. Env "TAOS_ADAPTER_LOG_PATH" (default "/var/log/taos")
-      --log.rotationCount uint                       log rotation count. Env "TAOS_ADAPTER_LOG_ROTATION_COUNT" (default 30)
+      --log.path string                                  log path. Env "TAOS_ADAPTER_LOG_PATH" (default "/var/log/taos")      --log.rotationCount uint                           log rotation count. Env "TAOS_ADAPTER_LOG_ROTATION_COUNT" (default 30)
       --log.rotationSize string                          log rotation size(KB MB GB), must be a positive integer. Env "TAOS_ADAPTER_LOG_ROTATION_SIZE" (default "1GB")
       --log.rotationTime duration                        log rotation time. Env "TAOS_ADAPTER_LOG_ROTATION_TIME" (default 24h0m0s)
       --log.sqlRotationCount uint                        record sql log rotation count. Env "TAOS_ADAPTER_LOG_SQL_ROTATION_COUNT" (default 2)
@@ -89,8 +87,7 @@ Usage of taosAdapter:
       --monitor.password string                          TDengine password. Env "TAOS_ADAPTER_MONITOR_PASSWORD" (default "taosdata")
       --monitor.pauseAllMemoryThreshold float            Memory percentage threshold for pause all. Env "TAOS_ADAPTER_MONITOR_PAUSE_ALL_MEMORY_THRESHOLD" (default 80)
       --monitor.pauseQueryMemoryThreshold float          Memory percentage threshold for pause query. Env "TAOS_ADAPTER_MONITOR_PAUSE_QUERY_MEMORY_THRESHOLD" (default 70)
-      --monitor.user string                          TDengine user. Env "TAOS_ADAPTER_MONITOR_USER" (default "root")
-      --monitor.writeInterval duration               Set write to TDengine interval. Env "TAOS_ADAPTER_MONITOR_WRITE_INTERVAL" (default 30s)
+      --monitor.user string                              TDengine user. Env "TAOS_ADAPTER_MONITOR_USER" (default "root")      --monitor.writeInterval duration                   Set write to TDengine interval. Env "TAOS_ADAPTER_MONITOR_WRITE_INTERVAL" (default 30s)
       --monitor.writeToTD                                Whether write metrics to TDengine. Env "TAOS_ADAPTER_MONITOR_WRITE_TO_TD"
       --node_exporter.caCertFile string                  node_exporter ca cert file path. Env "TAOS_ADAPTER_NODE_EXPORTER_CA_CERT_FILE"
       --node_exporter.certFile string                    node_exporter cert file path. Env "TAOS_ADAPTER_NODE_EXPORTER_CERT_FILE"
@@ -119,14 +116,14 @@ Usage of taosAdapter:
       --opentsdb_telnet.ttl int                          opentsdb_telnet data ttl. Env "TAOS_ADAPTER_OPENTSDB_TELNET_TTL"
       --opentsdb_telnet.user string                      opentsdb_telnet user. Env "TAOS_ADAPTER_OPENTSDB_TELNET_USER" (default "root")
       --pool.idleTimeout duration                        Set idle connection timeout. Env "TAOS_ADAPTER_POOL_IDLE_TIMEOUT"
-      --pool.maxConnect int                          max connections to taosd. Env "TAOS_ADAPTER_POOL_MAX_CONNECT"
-      --pool.maxIdle int                             max idle connections to taosd. Env "TAOS_ADAPTER_POOL_MAX_IDLE"
+      --pool.maxConnect int                              max connections to server. Env "TAOS_ADAPTER_POOL_MAX_CONNECT"
+      --pool.maxIdle int                                 max idle connections to server. Env "TAOS_ADAPTER_POOL_MAX_IDLE"
   -P, --port int                                         http port. Env "TAOS_ADAPTER_PORT" (default 6041)
       --prometheus.enable                                enable prometheus. Env "TAOS_ADAPTER_PROMETHEUS_ENABLE" (default true)
       --restfulRowLimit int                              restful returns the maximum number of rows (-1 means no limit). Env "TAOS_ADAPTER_RESTFUL_ROW_LIMIT" (default -1)
+      --smlAutoCreateDB                                  Whether to automatically create db when writing with schemaless. Env "TAOS_ADAPTER_SML_AUTO_CREATE_DB"
       --statsd.allowPendingMessages int                  statsd allow pending messages. Env "TAOS_ADAPTER_STATSD_ALLOW_PENDING_MESSAGES" (default 50000)
-      --statsd.db string                             statsd db name. Env "TAOS_ADAPTER_STATSD_DB" (default "statsd")
-      --statsd.deleteCounters                        statsd delete counter cache after gather. Env "TAOS_ADAPTER_STATSD_DELETE_COUNTERS" (default true)
+      --statsd.db string                                 statsd db name. Env "TAOS_ADAPTER_STATSD_DB" (default "statsd")      --statsd.deleteCounters                            statsd delete counter cache after gather. Env "TAOS_ADAPTER_STATSD_DELETE_COUNTERS" (default true)
       --statsd.deleteGauges                              statsd delete gauge cache after gather. Env "TAOS_ADAPTER_STATSD_DELETE_GAUGES" (default true)
       --statsd.deleteSets                                statsd delete set cache after gather. Env "TAOS_ADAPTER_STATSD_DELETE_SETS" (default true)
       --statsd.deleteTimings                             statsd delete timing cache after gather. Env "TAOS_ADAPTER_STATSD_DELETE_TIMINGS" (default true)
@@ -136,11 +133,11 @@ Usage of taosAdapter:
       --statsd.password string                           statsd password. Env "TAOS_ADAPTER_STATSD_PASSWORD" (default "taosdata")
       --statsd.port int                                  statsd server port. Env "TAOS_ADAPTER_STATSD_PORT" (default 6044)
       --statsd.protocol string                           statsd protocol [tcp or udp]. Env "TAOS_ADAPTER_STATSD_PROTOCOL" (default "udp")
-      --statsd.tcpKeepAlive                          enable tcp keep alive. Env "TAOS_ADAPTER_STATSD_TCP_KEEP_ALIVE"
-      --statsd.ttl int                               statsd data ttl. Env "TAOS_ADAPTER_STATSD_TTL"
+      --statsd.tcpKeepAlive                              enable tcp keep alive. Env "TAOS_ADAPTER_STATSD_TCP_KEEP_ALIVE"      --statsd.ttl int                                   statsd data ttl. Env "TAOS_ADAPTER_STATSD_TTL"
       --statsd.user string                               statsd user. Env "TAOS_ADAPTER_STATSD_USER" (default "root")
       --statsd.worker int                                statsd write worker. Env "TAOS_ADAPTER_STATSD_WORKER" (default 10)
       --taosConfigDir string                             load taos client config path. Env "TAOS_ADAPTER_TAOS_CONFIG_FILE"
+      --tmq.releaseIntervalMultiplierForAutocommit int   When set to autocommit, the interval for message release is a multiple of the autocommit interval, with a default value of 2 and a minimum value of 1 and a maximum value of 10. Env "TAOS_ADAPTER_TMQ_RELEASE_INTERVAL_MULTIPLIER_FOR_AUTOCOMMIT" (default 2)
       --version                                          Print the version and exit
 ```
 
@@ -332,6 +329,10 @@ This parameter controls the number of results returned by the following interfac
 
 taosAdapter uses the parameter `httpCodeServerError` to set whether to return a non-200 http status code  http status code other than when the C interface returns an error. When set to true, different http status codes will be returned according to the error code returned by C. For details, see [RESTful API](https://docs.tdengine.com/reference/rest-api/) HTTP Response Code chapter.
 
+## Configure whether schemaless writes automatically create DBs
+
+Starting from version 3.0.4.0, the taosAdapter provides the parameter "smlAutoCreateDB" to control whether to automatically create DBs when writing with the schemaless protocol. The default value is false, which means that the DB will not be automatically created and the user needs to manually create the DB before performing schemaless writing.
+
 ## Troubleshooting
 
 You can check the taosAdapter running status with the `systemctl status taosadapter` command.

docs/en/14-reference/12-config/index.md

@@ -628,6 +628,16 @@ The charset that takes effect is UTF-8.
 | Default Value | 1                                                                                                                                                                       |
 | Note          | The core file is generated under root directory `systemctl start taosd`/`launchctl start com.tdengine.taosd` is used to start, or under the working directory if `taosd` is started directly on Linux/macOS Shell. |
 
+### enableScience
+
+| Attribute     | Description                                                                                         |
+| -------- | ------------------------------------------------------------------------------------------------------------------------------------------ |
+| Applicable    |  Only taos-CLI client                                                                                                                                                      |
+| Meaning       | Whether to show float and double with the scientific notation                                                |
+| Value Range   | 0: false, 1: true                                                                                                                                                       |
+| Default Value | 0                                                                                                                                                                       |
+
+
 ### udf
 
 | Attribute     | Description                            |

docs/en/28-releases/01-tdengine.md

@@ -10,6 +10,10 @@ For TDengine 2.x installation packages by version, please visit [here](https://w
 
 import Release from "/components/ReleaseV3";
 
+## 3.0.4.0
+
+<Release type="tdengine" version="3.0.4.0" />
+
 ## 3.0.3.2
 
 <Release type="tdengine" version="3.0.3.2" />

docs/en/28-releases/02-tools.md

@@ -10,6 +10,10 @@ For other historical version installers, please visit [here](https://www.taosdat
 
 import Release from "/components/ReleaseV3";
 
+## 2.4.12
+
+<Release type="tools" version="2.4.12" />
+
 ## 2.4.11
 
 <Release type="tools" version="2.4.11" />

docs/examples/python/schemaless_insert.py

+import taos
+
+conn = taos.connect()
+dbname = "pytest_line"
+conn.execute("drop database if exists %s" % dbname)
+conn.execute("create database if not exists %s precision 'us'" % dbname)
+conn.select_db(dbname)
+
+lines = [
+    'st,t1=3i64,t2=4f64,t3="t3" c1=3i64,c3=L"pass",c2=false,c4=4f64 1626006833639000000',
+]
+conn.schemaless_insert(lines, taos.SmlProtocol.LINE_PROTOCOL, taos.SmlPrecision.NOT_CONFIGURED)
+print("inserted")
+
+conn.schemaless_insert(lines, taos.SmlProtocol.LINE_PROTOCOL, taos.SmlPrecision.NOT_CONFIGURED)
+
+result = conn.query("show tables")
+for row in result:
+    print(row)
+
+conn.execute("drop database if exists %s" % dbname)

docs/examples/python/schemaless_insert_raw.py

+import taos
+from taos import utils
+from taos import TaosConnection
+from taos.cinterface import *
+from taos.error import OperationalError, SchemalessError
+
+conn = taos.connect()
+dbname = "taos_schemaless_insert"
+try:
+    conn.execute("drop database if exists %s" % dbname)
+
+    if taos.IS_V3:
+        conn.execute("create database if not exists %s schemaless 1 precision 'ns'" % dbname)
+    else:
+        conn.execute("create database if not exists %s update 2 precision 'ns'" % dbname)
+
+    conn.select_db(dbname)
+
+    lines = '''st,t1=3i64,t2=4f64,t3="t3" c1=3i64,c3=L"passit",c2=false,c4=4f64 1626006833639000000
+    st,t1=4i64,t3="t4",t2=5f64,t4=5f64 c1=3i64,c3=L"passitagin, abc",c2=true,c4=5f64,c5=5f64,c6=7u64 1626006933640000000
+    stf,t1=4i64,t3="t4",t2=5f64,t4=5f64 c1=3i64,c3=L"passitagin_stf",c2=false,c5=5f64,c6=7u64 1626006933641000000'''
+
+    res = conn.schemaless_insert_raw(lines, 1, 0)
+    print("affected rows: ", res)
+    assert (res == 3)
+
+    lines = '''stf,t1=5i64,t3="t4",t2=5f64,t4=5f64 c1=3i64,c3=L"passitagin_stf",c2=false,c5=5f64,c6=7u64 1626006933641000000'''
+    res = conn.schemaless_insert_raw(lines, 1, 0)
+    print("affected rows: ", res)
+    assert (res == 1)
+
+    result = conn.query("select * from st")
+    dict2 = result.fetch_all_into_dict()
+    print(dict2)
+    print(result.row_count)
+
+    all = result.rows_iter()
+    for row in all:
+        print(row)
+    result.close()
+    assert (result.row_count == 2)
+
+    # error test
+    lines = ''',t1=3i64,t2=4f64,t3="t3" c1=3i64,c3=L"passit",c2=false,c4=4f64 1626006833639000000'''
+    try:
+        res = conn.schemaless_insert_raw(lines, 1, 0)
+        print(res)
+        # assert(False)
+    except SchemalessError as err:
+        print('**** error: ', err)
+        # assert (err.msg == 'Invalid data format')
+
+    result = conn.query("select * from st")
+    print(result.row_count)
+    all = result.rows_iter()
+    for row in all:
+        print(row)
+    result.close()
+
+    conn.execute("drop database if exists %s" % dbname)
+    conn.close()
+except InterfaceError as err:
+    conn.execute("drop database if exists %s" % dbname)
+    conn.close()
+    print(err)
+except SchemalessError as err:
+    conn.execute("drop database if exists %s" % dbname)
+    conn.close()
+    print(err)
+except Exception as err:
+    conn.execute("drop database if exists %s" % dbname)
+    conn.close()
+    print(err)
+    raise err

docs/examples/python/schemaless_insert_raw_req_id.py

+import taos
+from taos import utils
+from taos import TaosConnection
+from taos.cinterface import *
+from taos.error import OperationalError, SchemalessError
+
+conn = taos.connect()
+dbname = "taos_schemaless_insert"
+try:
+    conn.execute("drop database if exists %s" % dbname)
+
+    if taos.IS_V3:
+        conn.execute("create database if not exists %s schemaless 1 precision 'ns'" % dbname)
+    else:
+        conn.execute("create database if not exists %s update 2 precision 'ns'" % dbname)
+
+    conn.select_db(dbname)
+
+    lines = '''st,t1=3i64,t2=4f64,t3="t3" c1=3i64,c3=L"passit",c2=false,c4=4f64 1626006833639000000
+    st,t1=4i64,t3="t4",t2=5f64,t4=5f64 c1=3i64,c3=L"passitagin, abc",c2=true,c4=5f64,c5=5f64,c6=7u64 1626006933640000000
+    stf,t1=4i64,t3="t4",t2=5f64,t4=5f64 c1=3i64,c3=L"passitagin_stf",c2=false,c5=5f64,c6=7u64 1626006933641000000'''
+
+    ttl = 1000
+    req_id = utils.gen_req_id()
+    res = conn.schemaless_insert_raw(lines, 1, 0, ttl=ttl, req_id=req_id)
+    print("affected rows: ", res)
+    assert (res == 3)
+
+    lines = '''stf,t1=5i64,t3="t4",t2=5f64,t4=5f64 c1=3i64,c3=L"passitagin_stf",c2=false,c5=5f64,c6=7u64 1626006933641000000'''
+    ttl = 1000
+    req_id = utils.gen_req_id()
+    res = conn.schemaless_insert_raw(lines, 1, 0, ttl=ttl, req_id=req_id)
+    print("affected rows: ", res)
+    assert (res == 1)
+
+    result = conn.query("select * from st")
+    dict2 = result.fetch_all_into_dict()
+    print(dict2)
+    print(result.row_count)
+
+    all = result.rows_iter()
+    for row in all:
+        print(row)
+    result.close()
+    assert (result.row_count == 2)
+
+    # error test
+    lines = ''',t1=3i64,t2=4f64,t3="t3" c1=3i64,c3=L"passit",c2=false,c4=4f64 1626006833639000000'''
+    try:
+        ttl = 1000
+        req_id = utils.gen_req_id()
+        res = conn.schemaless_insert_raw(lines, 1, 0, ttl=ttl, req_id=req_id)
+        print(res)
+        # assert(False)
+    except SchemalessError as err:
+        print('**** error: ', err)
+        # assert (err.msg == 'Invalid data format')
+
+    result = conn.query("select * from st")
+    print(result.row_count)
+    all = result.rows_iter()
+    for row in all:
+        print(row)
+    result.close()
+
+    conn.execute("drop database if exists %s" % dbname)
+    conn.close()
+except InterfaceError as err:
+    conn.execute("drop database if exists %s" % dbname)
+    conn.close()
+    print(err)
+except Exception as err:
+    conn.execute("drop database if exists %s" % dbname)
+    conn.close()
+    print(err)
+    raise err

docs/examples/python/schemaless_insert_raw_ttl.py

+import taos
+from taos import utils
+from taos import TaosConnection
+from taos.cinterface import *
+from taos.error import OperationalError, SchemalessError
+
+conn = taos.connect()
+dbname = "taos_schemaless_insert"
+try:
+    conn.execute("drop database if exists %s" % dbname)
+
+    if taos.IS_V3:
+        conn.execute("create database if not exists %s schemaless 1 precision 'ns'" % dbname)
+    else:
+        conn.execute("create database if not exists %s update 2 precision 'ns'" % dbname)
+
+    conn.select_db(dbname)
+
+    lines = '''st,t1=3i64,t2=4f64,t3="t3" c1=3i64,c3=L"passit",c2=false,c4=4f64 1626006833639000000
+    st,t1=4i64,t3="t4",t2=5f64,t4=5f64 c1=3i64,c3=L"passitagin, abc",c2=true,c4=5f64,c5=5f64,c6=7u64 1626006933640000000
+    stf,t1=4i64,t3="t4",t2=5f64,t4=5f64 c1=3i64,c3=L"passitagin_stf",c2=false,c5=5f64,c6=7u64 1626006933641000000'''
+
+    ttl = 1000
+    res = conn.schemaless_insert_raw(lines, 1, 0, ttl=ttl)
+    print("affected rows: ", res)
+    assert (res == 3)
+
+    lines = '''stf,t1=5i64,t3="t4",t2=5f64,t4=5f64 c1=3i64,c3=L"passitagin_stf",c2=false,c5=5f64,c6=7u64 1626006933641000000'''
+    ttl = 1000
+    res = conn.schemaless_insert_raw(lines, 1, 0, ttl=ttl)
+    print("affected rows: ", res)
+    assert (res == 1)
+
+    result = conn.query("select * from st")
+    dict2 = result.fetch_all_into_dict()
+    print(dict2)
+    print(result.row_count)
+
+    all = result.rows_iter()
+    for row in all:
+        print(row)
+    result.close()
+    assert (result.row_count == 2)
+
+    # error test
+    lines = ''',t1=3i64,t2=4f64,t3="t3" c1=3i64,c3=L"passit",c2=false,c4=4f64 1626006833639000000'''
+    try:
+        ttl = 1000
+        res = conn.schemaless_insert_raw(lines, 1, 0, ttl=ttl)
+        print(res)
+        # assert(False)
+    except SchemalessError as err:
+        print('**** error: ', err)
+        # assert (err.msg == 'Invalid data format')
+
+    result = conn.query("select * from st")
+    print(result.row_count)
+    all = result.rows_iter()
+    for row in all:
+        print(row)
+    result.close()
+
+    conn.execute("drop database if exists %s" % dbname)
+    conn.close()
+except InterfaceError as err:
+    conn.execute("drop database if exists %s" % dbname)
+    conn.close()
+    print(err)
+except Exception as err:
+    conn.execute("drop database if exists %s" % dbname)
+    conn.close()
+    print(err)
+    raise err

docs/examples/python/schemaless_insert_req_id.py

+import taos
+from taos import SmlProtocol, SmlPrecision
+
+conn = taos.connect()
+dbname = "pytest_line"
+conn.execute("drop database if exists %s" % dbname)
+conn.execute("create database if not exists %s precision 'us'" % dbname)
+conn.select_db(dbname)
+
+lines = [
+    'st,t1=3i64,t2=4f64,t3="t3" c1=3i64,c3=L"pass",c2=false,c4=4f64 1626006833639000000',
+]
+conn.schemaless_insert(lines, taos.SmlProtocol.LINE_PROTOCOL, taos.SmlPrecision.NOT_CONFIGURED, req_id=1)
+print("inserted")
+
+conn.schemaless_insert(lines, taos.SmlProtocol.LINE_PROTOCOL, taos.SmlPrecision.NOT_CONFIGURED, req_id=2)
+
+result = conn.query("show tables")
+for row in result:
+    print(row)
+
+conn.execute("drop database if exists %s" % dbname)

docs/examples/python/schemaless_insert_ttl.py

+import taos
+from taos import SmlProtocol, SmlPrecision
+
+conn = taos.connect()
+dbname = "pytest_line"
+conn.execute("drop database if exists %s" % dbname)
+conn.execute("create database if not exists %s precision 'us'" % dbname)
+conn.select_db(dbname)
+
+lines = [
+    'st,t1=3i64,t2=4f64,t3="t3" c1=3i64,c3=L"pass",c2=false,c4=4f64 1626006833639000000',
+]
+conn.schemaless_insert(lines, taos.SmlProtocol.LINE_PROTOCOL, taos.SmlPrecision.NOT_CONFIGURED, ttl=1000)
+print("inserted")
+
+conn.schemaless_insert(lines, taos.SmlProtocol.LINE_PROTOCOL, taos.SmlPrecision.NOT_CONFIGURED, ttl=1000)
+
+result = conn.query("show tables")
+for row in result:
+    print(row)
+
+conn.execute("drop database if exists %s" % dbname)

docs/zh/08-connector/30-python.mdx

@@ -484,6 +484,56 @@ TaosCursor 类使用原生连接进行写入、查询操作。在客户端多线
 </TabItem>
 </Tabs>
 
+### 无模式写入
+
+连接器支持无模式写入功能。
+
+<Tabs defaultValue="list">
+<TabItem value="list" label="List 写入">
+
+简单写入
+
+```python
+{{#include docs/examples/python/schemaless_insert.py}}
+```
+
+带有 ttl 参数的写入
+
+```python
+{{#include docs/examples/python/schemaless_insert_ttl.py}}
+```
+
+带有 req_id 参数的写入
+
+```python
+{{#include docs/examples/python/schemaless_insert_req_id.py}}
+```
+
+</TabItem>
+
+<TabItem value="raw" label="Raw 写入">
+
+简单写入
+
+```python
+{{#include docs/examples/python/schemaless_insert_raw.py}}
+```
+
+带有 ttl 参数的写入
+
+```python
+{{#include docs/examples/python/schemaless_insert_raw_ttl.py}}
+```
+
+带有 req_id 参数的写入
+
+```python
+{{#include docs/examples/python/schemaless_insert_raw_req_id.py}}
+```
+
+</TabItem>
+</Tabs>
+
 ### 其它示例程序
 
 | 示例程序链接                                                                                                  | 示例程序内容            |

docs/zh/14-reference/04-taosadapter.md

@@ -66,15 +66,13 @@ Usage of taosAdapter:
       --cors.allowCredentials                            cors allow credentials. Env "TAOS_ADAPTER_CORS_ALLOW_Credentials"
       --cors.allowHeaders stringArray                    cors allow HEADERS. Env "TAOS_ADAPTER_ALLOW_HEADERS"
       --cors.allowOrigins stringArray                    cors allow origins. Env "TAOS_ADAPTER_ALLOW_ORIGINS"
-      --cors.allowWebSockets                         cors allow WebSockets. Env "TAOS_ADAPTER_CORS_ALLOW_WebSockets"
-      --cors.exposeHeaders stringArray               cors expose headers. Env "TAOS_ADAPTER_Expose_Headers"
+      --cors.allowWebSockets                             cors allow WebSockets. Env "TAOS_ADAPTER_CORS_ALLOW_WebSockets"      --cors.exposeHeaders stringArray                   cors expose headers. Env "TAOS_ADAPTER_Expose_Headers"
       --debug                                            enable debug mode. Env "TAOS_ADAPTER_DEBUG" (default true)
       --help                                             Print this help message and exit
-      --httpCodeServerError                          Use a non-200 http status code when taosd returns an error. Env "TAOS_ADAPTER_HTTP_CODE_SERVER_ERROR"
+      --httpCodeServerError                              Use a non-200 http status code when server returns an error. Env "TAOS_ADAPTER_HTTP_CODE_SERVER_ERROR"
       --influxdb.enable                                  enable influxdb. Env "TAOS_ADAPTER_INFLUXDB_ENABLE" (default true)
       --log.enableRecordHttpSql                          whether to record http sql. Env "TAOS_ADAPTER_LOG_ENABLE_RECORD_HTTP_SQL"
-      --log.path string                              log path. Env "TAOS_ADAPTER_LOG_PATH" (default "/var/log/taos")
-      --log.rotationCount uint                       log rotation count. Env "TAOS_ADAPTER_LOG_ROTATION_COUNT" (default 30)
+      --log.path string                                  log path. Env "TAOS_ADAPTER_LOG_PATH" (default "/var/log/taos")      --log.rotationCount uint                           log rotation count. Env "TAOS_ADAPTER_LOG_ROTATION_COUNT" (default 30)
       --log.rotationSize string                          log rotation size(KB MB GB), must be a positive integer. Env "TAOS_ADAPTER_LOG_ROTATION_SIZE" (default "1GB")
       --log.rotationTime duration                        log rotation time. Env "TAOS_ADAPTER_LOG_ROTATION_TIME" (default 24h0m0s)
       --log.sqlRotationCount uint                        record sql log rotation count. Env "TAOS_ADAPTER_LOG_SQL_ROTATION_COUNT" (default 2)
@@ -89,8 +87,7 @@ Usage of taosAdapter:
       --monitor.password string                          TDengine password. Env "TAOS_ADAPTER_MONITOR_PASSWORD" (default "taosdata")
       --monitor.pauseAllMemoryThreshold float            Memory percentage threshold for pause all. Env "TAOS_ADAPTER_MONITOR_PAUSE_ALL_MEMORY_THRESHOLD" (default 80)
       --monitor.pauseQueryMemoryThreshold float          Memory percentage threshold for pause query. Env "TAOS_ADAPTER_MONITOR_PAUSE_QUERY_MEMORY_THRESHOLD" (default 70)
-      --monitor.user string                          TDengine user. Env "TAOS_ADAPTER_MONITOR_USER" (default "root")
-      --monitor.writeInterval duration               Set write to TDengine interval. Env "TAOS_ADAPTER_MONITOR_WRITE_INTERVAL" (default 30s)
+      --monitor.user string                              TDengine user. Env "TAOS_ADAPTER_MONITOR_USER" (default "root")      --monitor.writeInterval duration                   Set write to TDengine interval. Env "TAOS_ADAPTER_MONITOR_WRITE_INTERVAL" (default 30s)
       --monitor.writeToTD                                Whether write metrics to TDengine. Env "TAOS_ADAPTER_MONITOR_WRITE_TO_TD"
       --node_exporter.caCertFile string                  node_exporter ca cert file path. Env "TAOS_ADAPTER_NODE_EXPORTER_CA_CERT_FILE"
       --node_exporter.certFile string                    node_exporter cert file path. Env "TAOS_ADAPTER_NODE_EXPORTER_CERT_FILE"
@@ -119,14 +116,14 @@ Usage of taosAdapter:
       --opentsdb_telnet.ttl int                          opentsdb_telnet data ttl. Env "TAOS_ADAPTER_OPENTSDB_TELNET_TTL"
       --opentsdb_telnet.user string                      opentsdb_telnet user. Env "TAOS_ADAPTER_OPENTSDB_TELNET_USER" (default "root")
       --pool.idleTimeout duration                        Set idle connection timeout. Env "TAOS_ADAPTER_POOL_IDLE_TIMEOUT"
-      --pool.maxConnect int                          max connections to taosd. Env "TAOS_ADAPTER_POOL_MAX_CONNECT"
-      --pool.maxIdle int                             max idle connections to taosd. Env "TAOS_ADAPTER_POOL_MAX_IDLE"
+      --pool.maxConnect int                              max connections to server. Env "TAOS_ADAPTER_POOL_MAX_CONNECT"
+      --pool.maxIdle int                                 max idle connections to server. Env "TAOS_ADAPTER_POOL_MAX_IDLE"
   -P, --port int                                         http port. Env "TAOS_ADAPTER_PORT" (default 6041)
       --prometheus.enable                                enable prometheus. Env "TAOS_ADAPTER_PROMETHEUS_ENABLE" (default true)
       --restfulRowLimit int                              restful returns the maximum number of rows (-1 means no limit). Env "TAOS_ADAPTER_RESTFUL_ROW_LIMIT" (default -1)
+      --smlAutoCreateDB                                  Whether to automatically create db when writing with schemaless. Env "TAOS_ADAPTER_SML_AUTO_CREATE_DB"
       --statsd.allowPendingMessages int                  statsd allow pending messages. Env "TAOS_ADAPTER_STATSD_ALLOW_PENDING_MESSAGES" (default 50000)
-      --statsd.db string                             statsd db name. Env "TAOS_ADAPTER_STATSD_DB" (default "statsd")
-      --statsd.deleteCounters                        statsd delete counter cache after gather. Env "TAOS_ADAPTER_STATSD_DELETE_COUNTERS" (default true)
+      --statsd.db string                                 statsd db name. Env "TAOS_ADAPTER_STATSD_DB" (default "statsd")      --statsd.deleteCounters                            statsd delete counter cache after gather. Env "TAOS_ADAPTER_STATSD_DELETE_COUNTERS" (default true)
       --statsd.deleteGauges                              statsd delete gauge cache after gather. Env "TAOS_ADAPTER_STATSD_DELETE_GAUGES" (default true)
       --statsd.deleteSets                                statsd delete set cache after gather. Env "TAOS_ADAPTER_STATSD_DELETE_SETS" (default true)
       --statsd.deleteTimings                             statsd delete timing cache after gather. Env "TAOS_ADAPTER_STATSD_DELETE_TIMINGS" (default true)
@@ -136,11 +133,11 @@ Usage of taosAdapter:
       --statsd.password string                           statsd password. Env "TAOS_ADAPTER_STATSD_PASSWORD" (default "taosdata")
       --statsd.port int                                  statsd server port. Env "TAOS_ADAPTER_STATSD_PORT" (default 6044)
       --statsd.protocol string                           statsd protocol [tcp or udp]. Env "TAOS_ADAPTER_STATSD_PROTOCOL" (default "udp")
-      --statsd.tcpKeepAlive                          enable tcp keep alive. Env "TAOS_ADAPTER_STATSD_TCP_KEEP_ALIVE"
-      --statsd.ttl int                               statsd data ttl. Env "TAOS_ADAPTER_STATSD_TTL"
+      --statsd.tcpKeepAlive                              enable tcp keep alive. Env "TAOS_ADAPTER_STATSD_TCP_KEEP_ALIVE"      --statsd.ttl int                                   statsd data ttl. Env "TAOS_ADAPTER_STATSD_TTL"
       --statsd.user string                               statsd user. Env "TAOS_ADAPTER_STATSD_USER" (default "root")
       --statsd.worker int                                statsd write worker. Env "TAOS_ADAPTER_STATSD_WORKER" (default 10)
       --taosConfigDir string                             load taos client config path. Env "TAOS_ADAPTER_TAOS_CONFIG_FILE"
+      --tmq.releaseIntervalMultiplierForAutocommit int   When set to autocommit, the interval for message release is a multiple of the autocommit interval, with a default value of 2 and a minimum value of 1 and a maximum value of 10. Env "TAOS_ADAPTER_TMQ_RELEASE_INTERVAL_MULTIPLIER_FOR_AUTOCOMMIT" (default 2)
       --version                                          Print the version and exit
 ```
 
@@ -331,6 +328,10 @@ taosAdapter 通过参数 `restfulRowLimit` 来控制结果的返回条数，-1
 
 taosAdapter 通过参数 `httpCodeServerError` 来设置当 C 接口返回错误时是否返回非 200 的 http 状态码。当设置为 true 时将根据 C 返回的错误码返回不同 http 状态码。具体见 [HTTP 响应码](../../connector/rest-api/#http-响应码)。
 
+## 配置 schemaless 写入是否自动创建 DB
+
+taosAdapter 从 3.0.4.0 版本开始，提供参数 `smlAutoCreateDB` 来控制在 schemaless 协议写入时是否自动创建 DB。默认值为 false 不自动创建 DB，需要用户手动创建 DB 后进行 schemaless 写入。
+
 ## 故障解决
 
 您可以通过命令 `systemctl status taosadapter` 来检查 taosAdapter 运行状态。

docs/zh/14-reference/12-config/index.md

@@ -626,6 +626,15 @@ charset 的有效值是 UTF-8。
 | 缺省值   | 1                                                                                                                                          |
 | 补充说明 | 不同的启动方式，生成 core 文件的目录如下：1、systemctl start taosd 启动：生成的 core 在根目录下 <br/> 2、手动启动，就在 taosd 执行目录下。 |
 
+### enableScience
+
+| 属性     | 说明                                                                                                                                       |
+| -------- | ------------------------------------------------------------------------------------------------------------------------------------------ |
+| 适用范围 | 仅客户端 TAOS-CLI 适用                                                                                                                       |
+| 含义     | 是否开启科学计数法显示浮点数                                                                                                                  |
+| 取值范围 | 0：否，1：是                                                                                                                                |
+| 缺省值   | 0                                                                                                                                          |
+
 ### udf
 
 | 属性     | 说明               |

docs/zh/28-releases/01-tdengine.md

@@ -10,6 +10,10 @@ TDengine 2.x 各版本安装包请访问[这里](https://www.taosdata.com/all-do
 
 import Release from "/components/ReleaseV3";
 
+## 3.0.4.0
+
+<Release type="tdengine" version="3.0.4.0" />
+
 ## 3.0.3.2
 
 <Release type="tdengine" version="3.0.3.2" />

docs/zh/28-releases/02-tools.md

@@ -10,6 +10,10 @@ taosTools 各版本安装包下载链接如下：
 
 import Release from "/components/ReleaseV3";
 
+## 2.4.12
+
+<Release type="tools" version="2.4.12" />
+
 ## 2.4.11
 
 <Release type="tools" version="2.4.11" />

include/os/osMemory.h

@@ -36,19 +36,19 @@ extern "C" {
 // #endif  // ifndef ALLOW_FORBID_FUNC
 #endif  // if !defined(WINDOWS)
 
-// #define taosMemoryFree    malloc
-#define taosMemoryMalloc  malloc
-#define taosMemoryCalloc  calloc
-#define taosMemoryRealloc realloc
-#define taosMemoryFree    free
+// // #define taosMemoryFree    malloc
+// #define taosMemoryMalloc  malloc
+// #define taosMemoryCalloc  calloc
+// #define taosMemoryRealloc realloc
+// #define taosMemoryFree    free
 
 int32_t taosMemoryDbgInit();
 int32_t taosMemoryDbgInitRestore();
-// void   *taosMemoryMalloc(int64_t size);
-// void   *taosMemoryCalloc(int64_t num, int64_t size);
-// void   *taosMemoryRealloc(void *ptr, int64_t size);
+void   *taosMemoryMalloc(int64_t size);
+void   *taosMemoryCalloc(int64_t num, int64_t size);
+void   *taosMemoryRealloc(void *ptr, int64_t size);
 char   *taosStrdup(const char *ptr);
-// void    taosMemoryFree(void *ptr);
+void    taosMemoryFree(void *ptr);
 int64_t taosMemorySize(void *ptr);
 void    taosPrintBackTrace();
 void    taosMemoryTrim(int32_t size);

packaging/tools/makepkg.sh

@@ -150,7 +150,7 @@ fi
 mkdir -p ${install_dir}/bin && cp ${bin_files} ${install_dir}/bin && chmod a+x ${install_dir}/bin/* || :
 mkdir -p ${install_dir}/init.d && cp ${init_file_deb} ${install_dir}/init.d/${serverName}.deb
 mkdir -p ${install_dir}/init.d && cp ${init_file_rpm} ${install_dir}/init.d/${serverName}.rpm
-mkdir -p ${install_dir}/share && cp -rf ${build_dir}/share/{etc,srv} ${install_dir}/share ||:
+# mkdir -p ${install_dir}/share && cp -rf ${build_dir}/share/{etc,srv} ${install_dir}/share ||:
 
 if [ $adapterName != "taosadapter" ]; then
   mv ${install_dir}/cfg/${clientName2}adapter.toml ${install_dir}/cfg/$adapterName.toml
@@ -322,6 +322,7 @@ if [[ $dbName == "taos" ]]; then
       mkdir -p ${install_dir}/share/
       cp -Rfap ${web_dir}/admin ${install_dir}/share/
       cp ${web_dir}/png/taos.png ${install_dir}/share/admin/images/taos.png
+      cp -rf ${build_dir}/share/{etc,srv} ${install_dir}/share ||:
     else
       echo "directory not found for enterprise release: ${web_dir}/admin"
     fi

source/libs/executor/src/scanoperator.c

@@ -2487,10 +2487,13 @@ SOperatorInfo* createStreamScanOperatorInfo(SReadHandle* pHandle, STableScanPhys
   pInfo->twAggSup.maxTs = INT64_MIN;
   pInfo->pState = NULL;
 
+  // for stream
+  if (pTaskInfo->streamInfo.pState) {
     void*   buff = NULL;
     int32_t len = 0;
     streamStateGetInfo(pTaskInfo->streamInfo.pState, STREAM_SCAN_OP_NAME, strlen(STREAM_SCAN_OP_NAME), &buff, &len);
     streamScanOperatorDeocde(buff, len, pInfo);
+  }
 
   setOperatorInfo(pOperator, STREAM_SCAN_OP_NAME, QUERY_NODE_PHYSICAL_PLAN_STREAM_SCAN, false, OP_NOT_OPENED, pInfo,
                   pTaskInfo);

source/libs/stream/src/streamStateRocksdb.c

@@ -1040,6 +1040,9 @@ int32_t streamStateGetKVByCur_rocksdb(SStreamStateCur* pCur, SWinKey* pKey, cons
     if (pKtmp->opNum != pCur->number) {
       return -1;
     }
+    size_t vlen = 0;
+    if (pVal != NULL) *pVal = (char*)rocksdb_iter_value(pCur->iter, &vlen);
+    if (pVLen != NULL) *pVLen = vlen;
     *pKey = pKtmp->key;
     return 0;
   }

source/libs/stream/src/tstreamFileState.c

@@ -100,6 +100,14 @@ void destroyRowBuffPosPtr(void* ptr) {
   }
 }
 
+void destroyRowBuffAllPosPtr(void* ptr) {
+  if (!ptr) {
+    return;
+  }
+  SRowBuffPos* pPos = *(SRowBuffPos**)ptr;
+  destroyRowBuffPos(pPos);
+}
+
 void destroyRowBuff(void* ptr) {
   if (!ptr) {
     return;
@@ -111,7 +119,7 @@ void streamFileStateDestroy(SStreamFileState* pFileState) {
   if (!pFileState) {
     return;
   }
-  tdListFreeP(pFileState->usedBuffs, destroyRowBuffPosPtr);
+  tdListFreeP(pFileState->usedBuffs, destroyRowBuffAllPosPtr);
   tdListFreeP(pFileState->freeBuffs, destroyRowBuff);
   tSimpleHashCleanup(pFileState->rowBuffMap);
   taosMemoryFree(pFileState);
@@ -399,7 +407,6 @@ int32_t deleteExpiredCheckPoint(SStreamFileState* pFileState, TSKEY mark) {
       return TSDB_CODE_FAILED;
     }
     sscanf(val, "%" PRId64 "", &maxCheckPointId);
-    taosMemoryFree(val);
   }
   for (int64_t i = maxCheckPointId; i > 0; i--) {
     char    buf[128] = {0};
@@ -412,7 +419,6 @@ int32_t deleteExpiredCheckPoint(SStreamFileState* pFileState, TSKEY mark) {
     }
     TSKEY ts;
     sscanf(val, "%" PRId64 "", &ts);
-    taosMemoryFree(val);
     if (ts < mark) {
       // statekey winkey.ts < mark
       forceRemoveCheckpoint(pFileState, i);
@@ -445,10 +451,11 @@ int32_t recoverSnapshot(SStreamFileState* pFileState) {
     code = streamStateGetKVByCur_rocksdb(pCur, pNewPos->pKey, (const void**)&pVal, &pVLen);
     if (code != TSDB_CODE_SUCCESS || pFileState->getTs(pNewPos->pKey) < pFileState->flushMark) {
       destroyRowBuffPos(pNewPos);
+      SListNode* pNode = tdListPopTail(pFileState->usedBuffs);
+      taosMemoryFreeClear(pNode);
       break;
     }
     memcpy(pNewPos->pRowBuff, pVal, pVLen);
-    taosMemoryFree(pVal);
     code = tSimpleHashPut(pFileState->rowBuffMap, pNewPos->pKey, pFileState->rowSize, &pNewPos, POINTER_BYTES);
     if (code != TSDB_CODE_SUCCESS) {
       destroyRowBuffPos(pNewPos);
@@ -456,6 +463,7 @@ int32_t recoverSnapshot(SStreamFileState* pFileState) {
     }
     code = streamStateCurPrev_rocksdb(pFileState->pFileStore, pCur);
   }
+  streamStateFreeCur(pCur);
 
   return TSDB_CODE_SUCCESS;
 }
\ No newline at end of file

source/libs/stream/test/tstreamUpdateTest.cpp

@@ -33,163 +33,163 @@ bool equalSBF(SScalableBf *left, SScalableBf *right) {
 }
 
 TEST(TD_STREAM_UPDATE_TEST, update) {
-  const int64_t interval = 20 * 1000;
-  const int64_t watermark = 10 * 60 * 1000;
-  SUpdateInfo  *pSU = updateInfoInit(interval, TSDB_TIME_PRECISION_MILLI, watermark);
-  GTEST_ASSERT_EQ(updateInfoIsUpdated(pSU, 1, 0), false);
-  GTEST_ASSERT_EQ(updateInfoIsUpdated(pSU, 1, -1), true);
-
-  for (int i = 0; i < 1024; i++) {
-    GTEST_ASSERT_EQ(updateInfoIsUpdated(pSU, i, 1), false);
-  }
-  for (int i = 0; i < 1024; i++) {
-    GTEST_ASSERT_EQ(updateInfoIsUpdated(pSU, i, 1), true);
-  }
-
-  for (int i = 0; i < 1024; i++) {
-    GTEST_ASSERT_EQ(updateInfoIsUpdated(pSU, i, 2), false);
-  }
-  for (int i = 0; i < 1024; i++) {
-    GTEST_ASSERT_EQ(updateInfoIsUpdated(pSU, i, 2), true);
-  }
-
-  for (int i = 0; i < 1024; i++) {
-    GTEST_ASSERT_EQ(updateInfoIsUpdated(pSU, i, 1), true);
-  }
-
-  TSKEY uid = 0;
-  for (int i = 3; i < 1024; i++) {
-    GTEST_ASSERT_EQ(updateInfoIsUpdated(pSU, uid, i), false);
-  }
-  GTEST_ASSERT_EQ(*(TSKEY *)taosHashGet(pSU->pMap, &uid, sizeof(uint64_t)), 1023);
-
-  for (int i = 3; i < 1024; i++) {
-    GTEST_ASSERT_EQ(updateInfoIsUpdated(pSU, uid, i), true);
-  }
-  GTEST_ASSERT_EQ(*(TSKEY *)taosHashGet(pSU->pMap, &uid, sizeof(uint64_t)), 1023);
-
-  SUpdateInfo *pSU1 = updateInfoInit(interval, TSDB_TIME_PRECISION_MILLI, watermark);
-  for (int i = 1; i <= watermark / interval; i++) {
-    GTEST_ASSERT_EQ(updateInfoIsUpdated(pSU1, 1, i * interval + 5), false);
-    GTEST_ASSERT_EQ(pSU1->minTS, interval);
-    GTEST_ASSERT_EQ(pSU1->numSBFs, watermark / interval);
-  }
-  for (int i = 0; i < pSU1->numSBFs; i++) {
-    SScalableBf  *pSBF = (SScalableBf *)taosArrayGetP(pSU1->pTsSBFs, i);
-    SBloomFilter *pBF = (SBloomFilter *)taosArrayGetP(pSBF->bfArray, 0);
-    GTEST_ASSERT_EQ(pBF->size, 1);
-  }
-
-  for (int i = watermark / interval + 1, j = 2; i <= watermark / interval + 10; i++, j++) {
-    GTEST_ASSERT_EQ(updateInfoIsUpdated(pSU1, 1, i * interval + 5), false);
-    GTEST_ASSERT_EQ(pSU1->minTS, interval * j);
-    GTEST_ASSERT_EQ(pSU1->numSBFs, watermark / interval);
-    SScalableBf  *pSBF = (SScalableBf *)taosArrayGetP(pSU1->pTsSBFs, pSU1->numSBFs - 1);
-    SBloomFilter *pBF = (SBloomFilter *)taosArrayGetP(pSBF->bfArray, 0);
-    GTEST_ASSERT_EQ(pBF->size, 1);
-  }
-
-  for (int i = watermark / interval * 100, j = 0; j < 10; i += (watermark / interval * 2), j++) {
-    GTEST_ASSERT_EQ(updateInfoIsUpdated(pSU1, 1, i * interval + 5), false);
-    GTEST_ASSERT_EQ(pSU1->minTS, (i - (pSU1->numSBFs - 1)) * interval);
-    GTEST_ASSERT_EQ(pSU1->numSBFs, watermark / interval);
-  }
-
-  SUpdateInfo *pSU2 = updateInfoInit(interval, TSDB_TIME_PRECISION_MILLI, watermark);
-  GTEST_ASSERT_EQ(updateInfoIsUpdated(pSU2, 1, 1 * interval + 5), false);
-  GTEST_ASSERT_EQ(pSU2->minTS, interval);
-  for (int i = watermark / interval * 100, j = 0; j < 10; i += (watermark / interval * 10), j++) {
-    GTEST_ASSERT_EQ(updateInfoIsUpdated(pSU2, 1, i * interval + 5), false);
-    GTEST_ASSERT_EQ(pSU2->minTS, (i - (pSU2->numSBFs - 1)) * interval);
-    GTEST_ASSERT_EQ(pSU2->numSBFs, watermark / interval);
-    TSKEY uid2 = 1;
-    GTEST_ASSERT_EQ(*(TSKEY *)taosHashGet(pSU2->pMap, &uid2, sizeof(uint64_t)), i * interval + 5);
-  }
-
-  SUpdateInfo *pSU3 = updateInfoInit(interval, TSDB_TIME_PRECISION_MILLI, watermark);
-  for (int j = 1; j < 100; j++) {
-    for (int i = 0; i < pSU3->numSBFs; i++) {
-      GTEST_ASSERT_EQ(updateInfoIsUpdated(pSU3, i, i * interval + 5 * j), false);
-      GTEST_ASSERT_EQ(pSU3->minTS, 0);
-      GTEST_ASSERT_EQ(pSU3->numSBFs, watermark / interval);
-      uint64_t uid3 = i;
-      GTEST_ASSERT_EQ(*(TSKEY *)taosHashGet(pSU3->pMap, &uid3, sizeof(uint64_t)), i * interval + 5 * j);
-      SScalableBf  *pSBF = (SScalableBf *)taosArrayGetP(pSU3->pTsSBFs, i);
-      SBloomFilter *pBF = (SBloomFilter *)taosArrayGetP(pSBF->bfArray, 0);
-      GTEST_ASSERT_EQ(pBF->size, j);
-    }
-  }
-
-  SUpdateInfo *pSU4 = updateInfoInit(-1, TSDB_TIME_PRECISION_MILLI, -1);
-  GTEST_ASSERT_EQ(pSU4->watermark, pSU4->interval);
-  GTEST_ASSERT_EQ(pSU4->interval, MILLISECOND_PER_MINUTE);
-
-  SUpdateInfo *pSU5 = updateInfoInit(0, TSDB_TIME_PRECISION_MILLI, 0);
-  GTEST_ASSERT_EQ(pSU5->watermark, pSU4->interval);
-  GTEST_ASSERT_EQ(pSU5->interval, MILLISECOND_PER_MINUTE);
-
-  SUpdateInfo *pSU7 = updateInfoInit(interval, TSDB_TIME_PRECISION_MILLI, watermark);
-  updateInfoAddCloseWindowSBF(pSU7);
-  for (int64_t i = 1; i < 2048000; i++) {
-    GTEST_ASSERT_EQ(updateInfoIsUpdated(pSU7, i, i), false);
-  }
-  GTEST_ASSERT_EQ(updateInfoIsUpdated(pSU7, 100, 1), true);
-  GTEST_ASSERT_EQ(updateInfoIsUpdated(pSU7, 110, 10), true);
-  GTEST_ASSERT_EQ(updateInfoIsUpdated(pSU7, 200, 20), true);
-
-  int32_t bufLen = updateInfoSerialize(NULL, 0, pSU7);
-  void   *buf = taosMemoryCalloc(1, bufLen);
-  int32_t resSize = updateInfoSerialize(buf, bufLen, pSU7);
-
-  SUpdateInfo *pSU6 = updateInfoInit(0, TSDB_TIME_PRECISION_MILLI, 0);
-  int32_t      desSize = updateInfoDeserialize(buf, bufLen, pSU6);
-  GTEST_ASSERT_EQ(desSize, 0);
-
-  GTEST_ASSERT_EQ(pSU7->interval, pSU6->interval);
-  GTEST_ASSERT_EQ(pSU7->maxVersion, pSU6->maxVersion);
-  GTEST_ASSERT_EQ(pSU7->minTS, pSU6->minTS);
-  GTEST_ASSERT_EQ(pSU7->numBuckets, pSU6->numBuckets);
-  GTEST_ASSERT_EQ(pSU7->numSBFs, pSU6->numSBFs);
-  GTEST_ASSERT_EQ(pSU7->scanGroupId, pSU6->scanGroupId);
-  GTEST_ASSERT_EQ(pSU7->scanWindow.ekey, pSU6->scanWindow.ekey);
-  GTEST_ASSERT_EQ(pSU7->scanWindow.skey, pSU6->scanWindow.skey);
-  GTEST_ASSERT_EQ(pSU7->watermark, pSU6->watermark);
-  GTEST_ASSERT_EQ(equalSBF(pSU7->pCloseWinSBF, pSU6->pCloseWinSBF), true);
-
-  int32_t mapSize = taosHashGetSize(pSU7->pMap);
-  GTEST_ASSERT_EQ(mapSize, taosHashGetSize(pSU6->pMap));
-  void  *pIte = NULL;
-  size_t keyLen = 0;
-  while ((pIte = taosHashIterate(pSU7->pMap, pIte)) != NULL) {
-    void *key = taosHashGetKey(pIte, &keyLen);
-    void *value6 = taosHashGet(pSU6->pMap, key, keyLen);
-    GTEST_ASSERT_EQ(*(TSKEY *)pIte, *(TSKEY *)value6);
-  }
-
-  int32_t buSize = taosArrayGetSize(pSU7->pTsBuckets);
-  GTEST_ASSERT_EQ(buSize, taosArrayGetSize(pSU6->pTsBuckets));
-  for (int32_t i = 0; i < buSize; i++) {
-    TSKEY ts1 = *(TSKEY *)taosArrayGet(pSU7->pTsBuckets, i);
-    TSKEY ts2 = *(TSKEY *)taosArrayGet(pSU6->pTsBuckets, i);
-    GTEST_ASSERT_EQ(ts1, ts2);
-  }
-  int32_t lSize = taosArrayGetSize(pSU7->pTsSBFs);
-  int32_t rSize = taosArrayGetSize(pSU6->pTsSBFs);
-  GTEST_ASSERT_EQ(lSize, rSize);
-  for (int32_t i = 0; i < lSize; i++) {
-    SScalableBf *pLeftSBF = (SScalableBf *)taosArrayGetP(pSU7->pTsSBFs, i);
-    SScalableBf *pRightSBF = (SScalableBf *)taosArrayGetP(pSU6->pTsSBFs, i);
-    GTEST_ASSERT_EQ(equalSBF(pLeftSBF, pRightSBF), true);
-  }
-
-  updateInfoDestroy(pSU);
-  updateInfoDestroy(pSU1);
-  updateInfoDestroy(pSU2);
-  updateInfoDestroy(pSU3);
-  updateInfoDestroy(pSU4);
-  updateInfoDestroy(pSU5);
-  updateInfoDestroy(pSU6);
-  updateInfoDestroy(pSU7);
+  // const int64_t interval = 20 * 1000;
+  // const int64_t watermark = 10 * 60 * 1000;
+  // SUpdateInfo  *pSU = updateInfoInit(interval, TSDB_TIME_PRECISION_MILLI, watermark);
+  // GTEST_ASSERT_EQ(updateInfoIsUpdated(pSU, 1, 0), false);
+  // GTEST_ASSERT_EQ(updateInfoIsUpdated(pSU, 1, -1), true);
+
+  // for (int i = 0; i < 1024; i++) {
+  //   GTEST_ASSERT_EQ(updateInfoIsUpdated(pSU, i, 1), false);
+  // }
+  // for (int i = 0; i < 1024; i++) {
+  //   GTEST_ASSERT_EQ(updateInfoIsUpdated(pSU, i, 1), true);
+  // }
+
+  // for (int i = 0; i < 1024; i++) {
+  //   GTEST_ASSERT_EQ(updateInfoIsUpdated(pSU, i, 2), false);
+  // }
+  // for (int i = 0; i < 1024; i++) {
+  //   GTEST_ASSERT_EQ(updateInfoIsUpdated(pSU, i, 2), true);
+  // }
+
+  // for (int i = 0; i < 1024; i++) {
+  //   GTEST_ASSERT_EQ(updateInfoIsUpdated(pSU, i, 1), true);
+  // }
+
+  // TSKEY uid = 0;
+  // for (int i = 3; i < 1024; i++) {
+  //   GTEST_ASSERT_EQ(updateInfoIsUpdated(pSU, uid, i), false);
+  // }
+  // GTEST_ASSERT_EQ(*(TSKEY *)taosHashGet(pSU->pMap, &uid, sizeof(uint64_t)), 1023);
+
+  // for (int i = 3; i < 1024; i++) {
+  //   GTEST_ASSERT_EQ(updateInfoIsUpdated(pSU, uid, i), true);
+  // }
+  // GTEST_ASSERT_EQ(*(TSKEY *)taosHashGet(pSU->pMap, &uid, sizeof(uint64_t)), 1023);
+
+  // SUpdateInfo *pSU1 = updateInfoInit(interval, TSDB_TIME_PRECISION_MILLI, watermark);
+  // for (int i = 1; i <= watermark / interval; i++) {
+  //   GTEST_ASSERT_EQ(updateInfoIsUpdated(pSU1, 1, i * interval + 5), false);
+  //   GTEST_ASSERT_EQ(pSU1->minTS, interval);
+  //   GTEST_ASSERT_EQ(pSU1->numSBFs, watermark / interval);
+  // }
+  // for (int i = 0; i < pSU1->numSBFs; i++) {
+  //   SScalableBf  *pSBF = (SScalableBf *)taosArrayGetP(pSU1->pTsSBFs, i);
+  //   SBloomFilter *pBF = (SBloomFilter *)taosArrayGetP(pSBF->bfArray, 0);
+  //   GTEST_ASSERT_EQ(pBF->size, 1);
+  // }
+
+  // for (int i = watermark / interval + 1, j = 2; i <= watermark / interval + 10; i++, j++) {
+  //   GTEST_ASSERT_EQ(updateInfoIsUpdated(pSU1, 1, i * interval + 5), false);
+  //   GTEST_ASSERT_EQ(pSU1->minTS, interval * j);
+  //   GTEST_ASSERT_EQ(pSU1->numSBFs, watermark / interval);
+  //   SScalableBf  *pSBF = (SScalableBf *)taosArrayGetP(pSU1->pTsSBFs, pSU1->numSBFs - 1);
+  //   SBloomFilter *pBF = (SBloomFilter *)taosArrayGetP(pSBF->bfArray, 0);
+  //   GTEST_ASSERT_EQ(pBF->size, 1);
+  // }
+
+  // for (int i = watermark / interval * 100, j = 0; j < 10; i += (watermark / interval * 2), j++) {
+  //   GTEST_ASSERT_EQ(updateInfoIsUpdated(pSU1, 1, i * interval + 5), false);
+  //   GTEST_ASSERT_EQ(pSU1->minTS, (i - (pSU1->numSBFs - 1)) * interval);
+  //   GTEST_ASSERT_EQ(pSU1->numSBFs, watermark / interval);
+  // }
+
+  // SUpdateInfo *pSU2 = updateInfoInit(interval, TSDB_TIME_PRECISION_MILLI, watermark);
+  // GTEST_ASSERT_EQ(updateInfoIsUpdated(pSU2, 1, 1 * interval + 5), false);
+  // GTEST_ASSERT_EQ(pSU2->minTS, interval);
+  // for (int i = watermark / interval * 100, j = 0; j < 10; i += (watermark / interval * 10), j++) {
+  //   GTEST_ASSERT_EQ(updateInfoIsUpdated(pSU2, 1, i * interval + 5), false);
+  //   GTEST_ASSERT_EQ(pSU2->minTS, (i - (pSU2->numSBFs - 1)) * interval);
+  //   GTEST_ASSERT_EQ(pSU2->numSBFs, watermark / interval);
+  //   TSKEY uid2 = 1;
+  //   GTEST_ASSERT_EQ(*(TSKEY *)taosHashGet(pSU2->pMap, &uid2, sizeof(uint64_t)), i * interval + 5);
+  // }
+
+  // SUpdateInfo *pSU3 = updateInfoInit(interval, TSDB_TIME_PRECISION_MILLI, watermark);
+  // for (int j = 1; j < 100; j++) {
+  //   for (int i = 0; i < pSU3->numSBFs; i++) {
+  //     GTEST_ASSERT_EQ(updateInfoIsUpdated(pSU3, i, i * interval + 5 * j), false);
+  //     GTEST_ASSERT_EQ(pSU3->minTS, 0);
+  //     GTEST_ASSERT_EQ(pSU3->numSBFs, watermark / interval);
+  //     uint64_t uid3 = i;
+  //     GTEST_ASSERT_EQ(*(TSKEY *)taosHashGet(pSU3->pMap, &uid3, sizeof(uint64_t)), i * interval + 5 * j);
+  //     SScalableBf  *pSBF = (SScalableBf *)taosArrayGetP(pSU3->pTsSBFs, i);
+  //     SBloomFilter *pBF = (SBloomFilter *)taosArrayGetP(pSBF->bfArray, 0);
+  //     GTEST_ASSERT_EQ(pBF->size, j);
+  //   }
+  // }
+
+  // SUpdateInfo *pSU4 = updateInfoInit(-1, TSDB_TIME_PRECISION_MILLI, -1);
+  // GTEST_ASSERT_EQ(pSU4->watermark, pSU4->interval);
+  // GTEST_ASSERT_EQ(pSU4->interval, MILLISECOND_PER_MINUTE);
+
+  // SUpdateInfo *pSU5 = updateInfoInit(0, TSDB_TIME_PRECISION_MILLI, 0);
+  // GTEST_ASSERT_EQ(pSU5->watermark, pSU4->interval);
+  // GTEST_ASSERT_EQ(pSU5->interval, MILLISECOND_PER_MINUTE);
+
+  // SUpdateInfo *pSU7 = updateInfoInit(interval, TSDB_TIME_PRECISION_MILLI, watermark);
+  // updateInfoAddCloseWindowSBF(pSU7);
+  // for (int64_t i = 1; i < 2048000; i++) {
+  //   GTEST_ASSERT_EQ(updateInfoIsUpdated(pSU7, i, i), false);
+  // }
+  // GTEST_ASSERT_EQ(updateInfoIsUpdated(pSU7, 100, 1), true);
+  // GTEST_ASSERT_EQ(updateInfoIsUpdated(pSU7, 110, 10), true);
+  // GTEST_ASSERT_EQ(updateInfoIsUpdated(pSU7, 200, 20), true);
+
+  // int32_t bufLen = updateInfoSerialize(NULL, 0, pSU7);
+  // void   *buf = taosMemoryCalloc(1, bufLen);
+  // int32_t resSize = updateInfoSerialize(buf, bufLen, pSU7);
+
+  // SUpdateInfo *pSU6 = updateInfoInit(0, TSDB_TIME_PRECISION_MILLI, 0);
+  // int32_t      desSize = updateInfoDeserialize(buf, bufLen, pSU6);
+  // GTEST_ASSERT_EQ(desSize, 0);
+
+  // GTEST_ASSERT_EQ(pSU7->interval, pSU6->interval);
+  // GTEST_ASSERT_EQ(pSU7->maxDataVersion, pSU6->maxVersion);
+  // GTEST_ASSERT_EQ(pSU7->minTS, pSU6->minTS);
+  // GTEST_ASSERT_EQ(pSU7->numBuckets, pSU6->numBuckets);
+  // GTEST_ASSERT_EQ(pSU7->numSBFs, pSU6->numSBFs);
+  // GTEST_ASSERT_EQ(pSU7->scanGroupId, pSU6->scanGroupId);
+  // GTEST_ASSERT_EQ(pSU7->scanWindow.ekey, pSU6->scanWindow.ekey);
+  // GTEST_ASSERT_EQ(pSU7->scanWindow.skey, pSU6->scanWindow.skey);
+  // GTEST_ASSERT_EQ(pSU7->watermark, pSU6->watermark);
+  // GTEST_ASSERT_EQ(equalSBF(pSU7->pCloseWinSBF, pSU6->pCloseWinSBF), true);
+
+  // int32_t mapSize = taosHashGetSize(pSU7->pMap);
+  // GTEST_ASSERT_EQ(mapSize, taosHashGetSize(pSU6->pMap));
+  // void  *pIte = NULL;
+  // size_t keyLen = 0;
+  // while ((pIte = taosHashIterate(pSU7->pMap, pIte)) != NULL) {
+  //   void *key = taosHashGetKey(pIte, &keyLen);
+  //   void *value6 = taosHashGet(pSU6->pMap, key, keyLen);
+  //   GTEST_ASSERT_EQ(*(TSKEY *)pIte, *(TSKEY *)value6);
+  // }
+
+  // int32_t buSize = taosArrayGetSize(pSU7->pTsBuckets);
+  // GTEST_ASSERT_EQ(buSize, taosArrayGetSize(pSU6->pTsBuckets));
+  // for (int32_t i = 0; i < buSize; i++) {
+  //   TSKEY ts1 = *(TSKEY *)taosArrayGet(pSU7->pTsBuckets, i);
+  //   TSKEY ts2 = *(TSKEY *)taosArrayGet(pSU6->pTsBuckets, i);
+  //   GTEST_ASSERT_EQ(ts1, ts2);
+  // }
+  // int32_t lSize = taosArrayGetSize(pSU7->pTsSBFs);
+  // int32_t rSize = taosArrayGetSize(pSU6->pTsSBFs);
+  // GTEST_ASSERT_EQ(lSize, rSize);
+  // for (int32_t i = 0; i < lSize; i++) {
+  //   SScalableBf *pLeftSBF = (SScalableBf *)taosArrayGetP(pSU7->pTsSBFs, i);
+  //   SScalableBf *pRightSBF = (SScalableBf *)taosArrayGetP(pSU6->pTsSBFs, i);
+  //   GTEST_ASSERT_EQ(equalSBF(pLeftSBF, pRightSBF), true);
+  // }
+
+  // updateInfoDestroy(pSU);
+  // updateInfoDestroy(pSU1);
+  // updateInfoDestroy(pSU2);
+  // updateInfoDestroy(pSU3);
+  // updateInfoDestroy(pSU4);
+  // updateInfoDestroy(pSU5);
+  // updateInfoDestroy(pSU6);
+  // updateInfoDestroy(pSU7);
 }
 
 int main(int argc, char *argv[]) {

source/os/src/osMemory.c

@@ -254,64 +254,64 @@ int32_t taosMemoryDbgInitRestore() {
 #endif
 }
 
-// void *taosMemoryMalloc(int64_t size) {
-// #ifdef USE_TD_MEMORY
-//   void *tmp = malloc(size + sizeof(TdMemoryInfo));
-//   if (tmp == NULL) return NULL;
-
-//   TdMemoryInfoPtr pTdMemoryInfo = (TdMemoryInfoPtr)tmp;
-//   pTdMemoryInfo->memorySize = size;
-//   pTdMemoryInfo->symbol = TD_MEMORY_SYMBOL;
-//   taosBackTrace(pTdMemoryInfo->stackTrace, TD_MEMORY_STACK_TRACE_DEPTH);
-
-//   return (char *)tmp + sizeof(TdMemoryInfo);
-// #else
-//   return malloc(size);
-// #endif
-// }
+void *taosMemoryMalloc(int64_t size) {
+#ifdef USE_TD_MEMORY
+  void *tmp = malloc(size + sizeof(TdMemoryInfo));
+  if (tmp == NULL) return NULL;
 
-// void *taosMemoryCalloc(int64_t num, int64_t size) {
-// #ifdef USE_TD_MEMORY
-//   int32_t memorySize = num * size;
-//   char   *tmp = calloc(memorySize + sizeof(TdMemoryInfo), 1);
-//   if (tmp == NULL) return NULL;
-
-//   TdMemoryInfoPtr pTdMemoryInfo = (TdMemoryInfoPtr)tmp;
-//   pTdMemoryInfo->memorySize = memorySize;
-//   pTdMemoryInfo->symbol = TD_MEMORY_SYMBOL;
-//   taosBackTrace(pTdMemoryInfo->stackTrace, TD_MEMORY_STACK_TRACE_DEPTH);
-
-//   return (char *)tmp + sizeof(TdMemoryInfo);
-// #else
-//   return calloc(num, size);
-// #endif
-// }
+  TdMemoryInfoPtr pTdMemoryInfo = (TdMemoryInfoPtr)tmp;
+  pTdMemoryInfo->memorySize = size;
+  pTdMemoryInfo->symbol = TD_MEMORY_SYMBOL;
+  taosBackTrace(pTdMemoryInfo->stackTrace, TD_MEMORY_STACK_TRACE_DEPTH);
 
-// void *taosMemoryRealloc(void *ptr, int64_t size) {
-// #ifdef USE_TD_MEMORY
-//   if (ptr == NULL) return taosMemoryMalloc(size);
+  return (char *)tmp + sizeof(TdMemoryInfo);
+#else
+  return malloc(size);
+#endif
+}
 
-//   TdMemoryInfoPtr pTdMemoryInfo = (TdMemoryInfoPtr)((char *)ptr - sizeof(TdMemoryInfo));
-//   ASSERT(pTdMemoryInfo->symbol == TD_MEMORY_SYMBOL);
-//   if (tpTdMemoryInfo->symbol != TD_MEMORY_SYMBOL) {
-//     +return NULL;
-//     +
-//   }
+void *taosMemoryCalloc(int64_t num, int64_t size) {
+#ifdef USE_TD_MEMORY
+  int32_t memorySize = num * size;
+  char   *tmp = calloc(memorySize + sizeof(TdMemoryInfo), 1);
+  if (tmp == NULL) return NULL;
 
-//   TdMemoryInfo tdMemoryInfo;
-//   memcpy(&tdMemoryInfo, pTdMemoryInfo, sizeof(TdMemoryInfo));
+  TdMemoryInfoPtr pTdMemoryInfo = (TdMemoryInfoPtr)tmp;
+  pTdMemoryInfo->memorySize = memorySize;
+  pTdMemoryInfo->symbol = TD_MEMORY_SYMBOL;
+  taosBackTrace(pTdMemoryInfo->stackTrace, TD_MEMORY_STACK_TRACE_DEPTH);
 
-//   void *tmp = realloc(pTdMemoryInfo, size + sizeof(TdMemoryInfo));
-//   if (tmp == NULL) return NULL;
+  return (char *)tmp + sizeof(TdMemoryInfo);
+#else
+  return calloc(num, size);
+#endif
+}
 
-//   memcpy(tmp, &tdMemoryInfo, sizeof(TdMemoryInfo));
-//   ((TdMemoryInfoPtr)tmp)->memorySize = size;
+void *taosMemoryRealloc(void *ptr, int64_t size) {
+#ifdef USE_TD_MEMORY
+  if (ptr == NULL) return taosMemoryMalloc(size);
 
-//   return (char *)tmp + sizeof(TdMemoryInfo);
-// #else
-//   return realloc(ptr, size);
-// #endif
-// }
+  TdMemoryInfoPtr pTdMemoryInfo = (TdMemoryInfoPtr)((char *)ptr - sizeof(TdMemoryInfo));
+  ASSERT(pTdMemoryInfo->symbol == TD_MEMORY_SYMBOL);
+  if (tpTdMemoryInfo->symbol != TD_MEMORY_SYMBOL) {
+    +return NULL;
+    +
+  }
+
+  TdMemoryInfo tdMemoryInfo;
+  memcpy(&tdMemoryInfo, pTdMemoryInfo, sizeof(TdMemoryInfo));
+
+  void *tmp = realloc(pTdMemoryInfo, size + sizeof(TdMemoryInfo));
+  if (tmp == NULL) return NULL;
+
+  memcpy(tmp, &tdMemoryInfo, sizeof(TdMemoryInfo));
+  ((TdMemoryInfoPtr)tmp)->memorySize = size;
+
+  return (char *)tmp + sizeof(TdMemoryInfo);
+#else
+  return realloc(ptr, size);
+#endif
+}
 
 char *taosStrdup(const char *ptr) {
 #ifdef USE_TD_MEMORY
@@ -334,21 +334,21 @@ char *taosStrdup(const char *ptr) {
 #endif
 }
 
-// void taosMemoryFree(void *ptr) {
-//   if (NULL == ptr) return;
-// #ifdef USE_TD_MEMORY
-//   TdMemoryInfoPtr pTdMemoryInfo = (TdMemoryInfoPtr)((char *)ptr - sizeof(TdMemoryInfo));
-//   if (pTdMemoryInfo->symbol == TD_MEMORY_SYMBOL) {
-//     pTdMemoryInfo->memorySize = 0;
-//     // memset(pTdMemoryInfo, 0, sizeof(TdMemoryInfo));
-//     free(pTdMemoryInfo);
-//   } else {
-//     free(ptr);
-//   }
-// #else
-//   return free(ptr);
-// #endif
-// }
+void taosMemoryFree(void *ptr) {
+  if (NULL == ptr) return;
+#ifdef USE_TD_MEMORY
+  TdMemoryInfoPtr pTdMemoryInfo = (TdMemoryInfoPtr)((char *)ptr - sizeof(TdMemoryInfo));
+  if (pTdMemoryInfo->symbol == TD_MEMORY_SYMBOL) {
+    pTdMemoryInfo->memorySize = 0;
+    // memset(pTdMemoryInfo, 0, sizeof(TdMemoryInfo));
+    free(pTdMemoryInfo);
+  } else {
+    free(ptr);
+  }
+#else
+  return free(ptr);
+#endif
+}
 
 int64_t taosMemorySize(void *ptr) {
   if (ptr == NULL) return 0;