You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by hx...@apache.org on 2020/11/03 19:49:00 UTC
[iotdb] branch fix_pypi created (now db8d908)
This is an automated email from the ASF dual-hosted git repository.
hxd pushed a change to branch fix_pypi
in repository https://gitbox.apache.org/repos/asf/iotdb.git.
at db8d908 finish client-py module for pypi
This branch includes the following new commits:
new 1aa771e fix pypi
new c49b1fd merge with master
new 8f0e52d move pypi files from thrift to client-py
new fa1a298 Merge remote-tracking branch 'origin/master' into fix_pypi
new db8d908 finish client-py module for pypi
The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[iotdb] 03/05: move pypi files from thrift to client-py
Posted by hx...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hxd pushed a commit to branch fix_pypi
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 8f0e52daccdc746c54061bde6b67ff3d05912d5a
Author: xiangdong huang <sa...@gmail.com>
AuthorDate: Wed Nov 4 03:29:48 2020 +0800
move pypi files from thrift to client-py
---
thrift/pom.xml | 55 ---------------------------------------
thrift/src/pypi/README.md | 65 -----------------------------------------------
thrift/src/pypi/setup.py | 55 ---------------------------------------
3 files changed, 175 deletions(-)
diff --git a/thrift/pom.xml b/thrift/pom.xml
index 5444971..55cd184 100644
--- a/thrift/pom.xml
+++ b/thrift/pom.xml
@@ -96,59 +96,4 @@
</plugin>
</plugins>
</build>
- <profiles>
- <profile>
- <id>only-eclipse</id>
- <activation>
- <property>
- <name>m2e.version</name>
- </property>
- </activation>
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.eclipse.m2e</groupId>
- <artifactId>lifecycle-mapping</artifactId>
- <version>1.0.0</version>
- <configuration>
- <lifecycleMappingMetadata>
- <pluginExecutions>
- <pluginExecution>
- <pluginExecutionFilter>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <versionRange>${maven-dependency-plugin.version}</versionRange>
- <goals>
- <goal>copy-dependencies</goal>
- </goals>
- </pluginExecutionFilter>
- <action>
- <ignore/>
- </action>
- </pluginExecution>
- <pluginExecution>
- <pluginExecutionFilter>
- <groupId>org.apache.thrift.tools</groupId>
- <artifactId>maven-thrift-plugin</artifactId>
- <versionRange>[0.1.10,)</versionRange>
- <goals>
- <goal>compile</goal>
- </goals>
- </pluginExecutionFilter>
- <action>
- <execute>
- <runOnIncremental>false</runOnIncremental>
- </execute>
- </action>
- </pluginExecution>
- </pluginExecutions>
- </lifecycleMappingMetadata>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
- </profile>
- </profiles>
</project>
diff --git a/thrift/src/pypi/README.md b/thrift/src/pypi/README.md
deleted file mode 100644
index 710fc76..0000000
--- a/thrift/src/pypi/README.md
+++ /dev/null
@@ -1,65 +0,0 @@
-<!--
-
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
-
--->
-
-# Apache IoTDB
-
-[](https://www.travis-ci.org/apache/incubator-iotdb)
-[](https://codecov.io/gh/thulab/incubator-iotdb)
-[](https://github.com/apache/incubator-iotdb/releases)
-[](https://www.apache.org/licenses/LICENSE-2.0.html)
-
-
-
-
-[](https://iotdb.apache.org/)
-
-
-Apache IoTDB (incubating) (Database for Internet of Things) is an integrated data management engine designed for
-timeseries data. It provides users with services for data collection, storage and analysis. Due to its light-weight
-architecture, high performance and rich feature set together with its deep integration with Apache Hadoop and Spark,
-Apache IoTDB (incubating) can meet the requirements of massive data storage, high-speed data ingestion and complex data
-analysis in the IoT industrial fields.
-
-
-# Apache IoTDB Python Client API
-
-Using the package, you can write data to IoTDB, read data from IoTDB and maintain the schema of IoTDB.
-
-## Requirements
-
-You have to install thrift (>=0.13) before using the package.
-
-## How to use (Example)
-
-First, download the package: `pip3 install apache-iotdb`
-
-You can get an example of using the package to read and write data at here: [Example](https://github.com/apache/incubator-iotdb/blob/rel/0.10/client-py/src/SessionExample.py)
-
-(you need to add `import iotdb` in the head of the file)
-
-# DISCLAIMER
-
-Apache IoTDB is an effort undergoing incubation at The Apache Software Foundation (ASF).
-Incubation is required of all newly accepted projects until a further review indicates that the
-infrastructure, communications, and decision making process have stabilized in a manner consistent
-with other successful ASF projects. While incubation status is not necessarily a reflection of the
-completeness or stability of the code, it does indicate that the project has yet to be fully
-endorsed by the ASF.
\ No newline at end of file
diff --git a/thrift/src/pypi/setup.py b/thrift/src/pypi/setup.py
deleted file mode 100644
index 1223ff9..0000000
--- a/thrift/src/pypi/setup.py
+++ /dev/null
@@ -1,55 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-import setuptools
-import io
-
-
-try:
- with io.open('README.md', encoding='utf-8') as f:
- long_description = f.read()
-except FileNotFoundError:
- long_description = ''
-
-
-print(long_description)
-
-setuptools.setup(
- name="apache-iotdb", # Replace with your own username
- version="0.11.0",
- author=" Apache Software Foundation",
- author_email="dev@iotdb.apache.org",
- description="Apache IoTDB client API",
- long_description=long_description,
- long_description_content_type="text/markdown",
- url="https://github.com/apache/incubator-iotdb",
- packages=setuptools.find_packages(),
- install_requires=[
- 'thrift>=0.13.0',
- ],
- classifiers=[
- "Programming Language :: Python :: 3",
- "License :: OSI Approved :: Apache Software License",
- "Operating System :: OS Independent",
- "Topic :: Software Development :: Libraries",
- "Topic :: Software Development :: Libraries :: Python Modules",
- ],
- python_requires='>=3.7',
- license='Apache License, Version 2.0',
- website='https://iotdb.apache.org',
-)
[iotdb] 04/05: Merge remote-tracking branch 'origin/master' into
fix_pypi
Posted by hx...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hxd pushed a commit to branch fix_pypi
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit fa1a298d1edd6022cdaa845276f9949632f56479
Merge: 8f0e52d e0bd43c
Author: xiangdong huang <sa...@gmail.com>
AuthorDate: Wed Nov 4 03:32:40 2020 +0800
Merge remote-tracking branch 'origin/master' into fix_pypi
client-py/src/SessionExample.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
[iotdb] 01/05: fix pypi
Posted by hx...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hxd pushed a commit to branch fix_pypi
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 1aa771e786c6cb05ef398dbdd557249122b9b5a0
Author: xiangdong huang <sa...@gmail.com>
AuthorDate: Wed Nov 4 03:26:26 2020 +0800
fix pypi
---
client-py/pom.xml | 126 ++++++++++++++++++++++++++++++++++++++++++++++
client-py/pypi/README.md | 65 ++++++++++++++++++++++++
client-py/pypi/setup.py | 55 ++++++++++++++++++++
client-py/src/Session.py | 3 +-
client-py/src/__init__.py | 18 +++++++
pom.xml | 1 +
thrift/pom.xml | 48 ------------------
7 files changed, 266 insertions(+), 50 deletions(-)
diff --git a/client-py/pom.xml b/client-py/pom.xml
new file mode 100644
index 0000000..8e060b6
--- /dev/null
+++ b/client-py/pom.xml
@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.iotdb</groupId>
+ <artifactId>iotdb-parent</artifactId>
+ <version>0.11.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+ <artifactId>iotdb-python-api</artifactId>
+ <name>python-api</name>
+ <description>Python API of IoTDB.</description>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.iotdb</groupId>
+ <artifactId>iotdb-thrift</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <!-- for pypi distribution -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>2.4.3</version>
+ <configuration>
+ <encoding>${project.build.sourceEncoding}</encoding>
+ </configuration>
+ <executions>
+ <execution>
+ <id>copy-thrift-python-resources</id>
+ <!-- here the phase you need -->
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <configuration>
+ <encoding>utf-8</encoding>
+ <outputDirectory>${project.build.directory}/pypi/iotdb_session</outputDirectory>
+ <resources>
+ <resource>
+ <directory>${basedir}/../thrift/target/generated-sources-python</directory>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ <execution>
+ <id>copy-license-resources</id>
+ <!-- here the phase you need -->
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <configuration>
+ <encoding>utf-8</encoding>
+ <outputDirectory>${project.build.directory}/pypi</outputDirectory>
+ <resources>
+ <resource>
+ <directory>${basedir}/../</directory>
+ <includes>
+ <include>LICENSE</include>
+ </includes>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ <execution>
+ <id>copy-python-file-resources</id>
+ <!-- here the phase you need -->
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <configuration>
+ <encoding>utf-8</encoding>
+ <outputDirectory>${project.build.directory}/pypi//iotdb_session/</outputDirectory>
+ <resources>
+ <resource>
+ <directory>${basedir}/src/</directory>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ <execution>
+ <id>copy-pypi-file-resources</id>
+ <!-- here the phase you need -->
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <configuration>
+ <encoding>utf-8</encoding>
+ <outputDirectory>${project.build.directory}/pypi</outputDirectory>
+ <resources>
+ <resource>
+ <directory>${basedir}/pypi</directory>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
diff --git a/client-py/pypi/README.md b/client-py/pypi/README.md
new file mode 100644
index 0000000..710fc76
--- /dev/null
+++ b/client-py/pypi/README.md
@@ -0,0 +1,65 @@
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
+
+# Apache IoTDB
+
+[](https://www.travis-ci.org/apache/incubator-iotdb)
+[](https://codecov.io/gh/thulab/incubator-iotdb)
+[](https://github.com/apache/incubator-iotdb/releases)
+[](https://www.apache.org/licenses/LICENSE-2.0.html)
+
+
+
+
+[](https://iotdb.apache.org/)
+
+
+Apache IoTDB (incubating) (Database for Internet of Things) is an integrated data management engine designed for
+timeseries data. It provides users with services for data collection, storage and analysis. Due to its light-weight
+architecture, high performance and rich feature set together with its deep integration with Apache Hadoop and Spark,
+Apache IoTDB (incubating) can meet the requirements of massive data storage, high-speed data ingestion and complex data
+analysis in the IoT industrial fields.
+
+
+# Apache IoTDB Python Client API
+
+Using the package, you can write data to IoTDB, read data from IoTDB and maintain the schema of IoTDB.
+
+## Requirements
+
+You have to install thrift (>=0.13) before using the package.
+
+## How to use (Example)
+
+First, download the package: `pip3 install apache-iotdb`
+
+You can get an example of using the package to read and write data at here: [Example](https://github.com/apache/incubator-iotdb/blob/rel/0.10/client-py/src/SessionExample.py)
+
+(you need to add `import iotdb` in the head of the file)
+
+# DISCLAIMER
+
+Apache IoTDB is an effort undergoing incubation at The Apache Software Foundation (ASF).
+Incubation is required of all newly accepted projects until a further review indicates that the
+infrastructure, communications, and decision making process have stabilized in a manner consistent
+with other successful ASF projects. While incubation status is not necessarily a reflection of the
+completeness or stability of the code, it does indicate that the project has yet to be fully
+endorsed by the ASF.
\ No newline at end of file
diff --git a/client-py/pypi/setup.py b/client-py/pypi/setup.py
new file mode 100644
index 0000000..1223ff9
--- /dev/null
+++ b/client-py/pypi/setup.py
@@ -0,0 +1,55 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+import setuptools
+import io
+
+
+try:
+ with io.open('README.md', encoding='utf-8') as f:
+ long_description = f.read()
+except FileNotFoundError:
+ long_description = ''
+
+
+print(long_description)
+
+setuptools.setup(
+ name="apache-iotdb", # Replace with your own username
+ version="0.11.0",
+ author=" Apache Software Foundation",
+ author_email="dev@iotdb.apache.org",
+ description="Apache IoTDB client API",
+ long_description=long_description,
+ long_description_content_type="text/markdown",
+ url="https://github.com/apache/incubator-iotdb",
+ packages=setuptools.find_packages(),
+ install_requires=[
+ 'thrift>=0.13.0',
+ ],
+ classifiers=[
+ "Programming Language :: Python :: 3",
+ "License :: OSI Approved :: Apache Software License",
+ "Operating System :: OS Independent",
+ "Topic :: Software Development :: Libraries",
+ "Topic :: Software Development :: Libraries :: Python Modules",
+ ],
+ python_requires='>=3.7',
+ license='Apache License, Version 2.0',
+ website='https://iotdb.apache.org',
+)
diff --git a/client-py/src/Session.py b/client-py/src/Session.py
index f9ee8f0..9fcc2f9 100644
--- a/client-py/src/Session.py
+++ b/client-py/src/Session.py
@@ -19,8 +19,7 @@
import sys
import struct
-# sys.path.append("../target")
-sys.path.append("../../thrift/target/generated-sources-python")
+#sys.path.append("../../thrift/target/generated-sources-python")
sys.path.append("./utils")
from IoTDBConstants import *
diff --git a/client-py/src/__init__.py b/client-py/src/__init__.py
new file mode 100644
index 0000000..a4797b6
--- /dev/null
+++ b/client-py/src/__init__.py
@@ -0,0 +1,18 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
diff --git a/pom.xml b/pom.xml
index e77198e..86daaca 100644
--- a/pom.xml
+++ b/pom.xml
@@ -97,6 +97,7 @@
<module>distribution</module>
<module>hive-connector</module>
<module>cross-tests</module>
+ <module>client-py</module>
</modules>
<!-- Properties Management -->
<properties>
diff --git a/thrift/pom.xml b/thrift/pom.xml
index 718b884..5444971 100644
--- a/thrift/pom.xml
+++ b/thrift/pom.xml
@@ -94,54 +94,6 @@
</execution>
</executions>
</plugin>
- <!-- for pypi distribution -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-resources-plugin</artifactId>
- <version>2.4.3</version>
- <configuration>
- <encoding>${project.build.sourceEncoding}</encoding>
- </configuration>
- <executions>
- <execution>
- <id>copy-pypi-resources</id>
- <!-- here the phase you need -->
- <phase>generate-sources</phase>
- <goals>
- <goal>copy-resources</goal>
- </goals>
- <configuration>
- <encoding>utf-8</encoding>
- <outputDirectory>${project.build.directory}/generated-sources-python</outputDirectory>
- <resources>
- <resource>
- <directory>${basedir}/src/pypi</directory>
- </resource>
- </resources>
- </configuration>
- </execution>
- <execution>
- <id>copy-license-resources</id>
- <!-- here the phase you need -->
- <phase>generate-sources</phase>
- <goals>
- <goal>copy-resources</goal>
- </goals>
- <configuration>
- <encoding>utf-8</encoding>
- <outputDirectory>${project.build.directory}/generated-sources-python</outputDirectory>
- <resources>
- <resource>
- <directory>${basedir}/../</directory>
- <includes>
- <include>LICENSE</include>
- </includes>
- </resource>
- </resources>
- </configuration>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
<profiles>
[iotdb] 05/05: finish client-py module for pypi
Posted by hx...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hxd pushed a commit to branch fix_pypi
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit db8d90842bbc42c5473ce07f653e9d2a3c12657f
Author: xiangdong huang <sa...@gmail.com>
AuthorDate: Wed Nov 4 03:48:39 2020 +0800
finish client-py module for pypi
---
client-py/pom.xml | 2 +-
client-py/pypi/setup.py | 2 +-
client-py/readme.md | 13 ++++++++++++-
3 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/client-py/pom.xml b/client-py/pom.xml
index 8e060b6..404e159 100644
--- a/client-py/pom.xml
+++ b/client-py/pom.xml
@@ -94,7 +94,7 @@
</goals>
<configuration>
<encoding>utf-8</encoding>
- <outputDirectory>${project.build.directory}/pypi//iotdb_session/</outputDirectory>
+ <outputDirectory>${project.build.directory}/pypi/iotdb_session</outputDirectory>
<resources>
<resource>
<directory>${basedir}/src/</directory>
diff --git a/client-py/pypi/setup.py b/client-py/pypi/setup.py
index 1223ff9..23b9a8b 100644
--- a/client-py/pypi/setup.py
+++ b/client-py/pypi/setup.py
@@ -37,7 +37,7 @@ setuptools.setup(
description="Apache IoTDB client API",
long_description=long_description,
long_description_content_type="text/markdown",
- url="https://github.com/apache/incubator-iotdb",
+ url="https://github.com/apache/iotdb",
packages=setuptools.find_packages(),
install_requires=[
'thrift>=0.13.0',
diff --git a/client-py/readme.md b/client-py/readme.md
index c0bcade..abdcb7f 100644
--- a/client-py/readme.md
+++ b/client-py/readme.md
@@ -47,4 +47,15 @@ to generate the python library.
## Session Client & Example
We packed up the Thrift interface in `client-py/src/Session.py` (similar with its Java counterpart), also provided
-an example file `client-py/src/SessionExample.py` of how to use the session module. please read it carefully.
\ No newline at end of file
+an example file `client-py/src/SessionExample.py` of how to use the session module. please read it carefully.
+
+## How to Debug
+
+To debug the python API module, run `mvn generate-sources -pl thrift,client-py`
+
+Then, go to target/pypi to get the complete projects.
+
+But !BE CAUTIOUS!
+All your modifications in target/pypi must be copied manually to src/ folder.
+Otherwise once you run `mvn clean`, you will lose all your effort.
+
[iotdb] 02/05: merge with master
Posted by hx...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hxd pushed a commit to branch fix_pypi
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit c49b1fdf5ac51df855a070cb090432268cfbecd7
Merge: 1aa771e 3606aaa
Author: xiangdong huang <sa...@gmail.com>
AuthorDate: Wed Nov 4 03:27:16 2020 +0800
merge with master
RELEASE_NOTES.md | 71 ++++++++++++++++
client-py/src/Session.py | 9 +-
.../{TsFileManagement.md => Compaction.md} | 49 +++++------
.../resources/conf/iotdb-engine.properties | 67 +++++++--------
.../org/apache/iotdb/db/concurrent/ThreadName.java | 2 +-
.../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 95 +++++++++-------------
.../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 19 ++---
.../CompactionMergeTaskPoolManager.java} | 32 ++++----
.../CompactionStrategy.java} | 20 ++---
.../TsFileManagement.java | 41 +++++-----
.../level/LevelCompactionTsFileManagement.java} | 79 ++++++++----------
.../no/NoCompactionTsFileManagement.java} | 10 +--
.../utils/CompactionLogAnalyzer.java} | 18 ++--
.../utils/CompactionLogger.java} | 12 +--
.../utils/CompactionUtils.java} | 54 ++++--------
.../iotdb/db/engine/merge/manage/MergeManager.java | 17 ----
.../db/engine/merge/task/MergeMultiChunkTask.java | 3 +-
.../engine/storagegroup/StorageGroupProcessor.java | 44 +++++-----
.../org/apache/iotdb/db/metadata/MManager.java | 22 +++++
.../java/org/apache/iotdb/db/service/IoTDB.java | 4 +-
.../org/apache/iotdb/db/service/ServiceType.java | 2 +-
.../apache/iotdb/db/engine/merge/MergeLogTest.java | 2 +-
.../iotdb/db/engine/merge/MergePerfTest.java | 2 +-
.../iotdb/db/engine/merge/MergeTaskTest.java | 2 +-
.../apache/iotdb/db/engine/merge/MergeTest.java | 6 +-
.../storagegroup/StorageGroupProcessorTest.java | 6 +-
.../db/integration/IoTDBDeleteTimeseriesIT.java | 10 +--
.../db/integration/IoTDBLoadExternalTsfileIT.java | 6 +-
.../iotdb/db/integration/IoTDBMergeTest.java | 10 +--
.../db/integration/IoTDBRemovePartitionIT.java | 2 -
.../iotdb/db/integration/IoTDBSeriesReaderIT.java | 12 +--
31 files changed, 372 insertions(+), 356 deletions(-)
diff --cc client-py/src/Session.py
index 9fcc2f9,c8dd51d..93579ce
--- a/client-py/src/Session.py
+++ b/client-py/src/Session.py
@@@ -18,8 -18,10 +18,9 @@@
import sys
import struct
+ import time
-# sys.path.append("../target")
-sys.path.append("../../thrift/target/generated-sources-python")
+#sys.path.append("../../thrift/target/generated-sources-python")
sys.path.append("./utils")
from IoTDBConstants import *