This is an automated email from the ASF dual-hosted git repository.
leirui pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
The following commit(s) were added to refs/heads/master by this push:
new d4ddfdd Update master docs after releasing 0.9.1 (#732)
d4ddfdd is described below
commit d4ddfdd6e27cdddf6ef28f1b8621182cf44ee043
Author: Lei Rui <[email protected]>
AuthorDate: Mon Jan 13 17:00:16 2020 +0800
Update master docs after releasing 0.9.1 (#732)
* update year from 2019 to 2020 for IoTDB in NOTICE and NOTICE-bianry
(cherry picked from commit cd6409ca807474e8f2dc87365b976c6f01a13656)
* make print-tsfile-resource&sketch shell executable
(cherry picked from commit c32155fd2f006045d366aad914fd9180e3ad06cc)
* Update docs about client python
(cherry picked from commit 3b386f2551bfc15ae1597a7442aec4065a82dc5f)
* update docs after releasing 0.9.1; fix a python bug about python3
* fix bug in batch by using quotes to protect against empty entries
---
NOTICE | 2 +-
NOTICE-binary | 2 +-
RELEASE_NOTES.md | 28 ++++++++++++
client-py/compile.bat | 5 +-
client-py/readme.md | 2 +-
client-py/src/client_example.py | 1 +
.../4-Client/4-Programming - Other Languages.md | 53 +++++++++++++++++-----
.../8-System Design (Developer)/1-Hierarchy.md | 6 +--
.../src/assembly/resources/sbin/start-server.bat | 4 +-
.../tsfileToolSet/print-tsfile-resource-files.sh | 0
.../tools/tsfileToolSet/print-tsfile-sketch.sh | 0
service-rpc/src/pypi/setup.py | 2 +-
12 files changed, 82 insertions(+), 23 deletions(-)
diff --git a/NOTICE b/NOTICE
index a228ae4..7c11064 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,5 +1,5 @@
Apache IoTDB
-Copyright 2018-2019 The Apache Software Foundation.
+Copyright 2018-2020 The Apache Software Foundation.
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
diff --git a/NOTICE-binary b/NOTICE-binary
index a228ae4..7c11064 100644
--- a/NOTICE-binary
+++ b/NOTICE-binary
@@ -1,5 +1,5 @@
Apache IoTDB
-Copyright 2018-2019 The Apache Software Foundation.
+Copyright 2018-2020 The Apache Software Foundation.
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 270b70c..8690246 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -19,6 +19,27 @@
-->
+# Apache IoTDB (incubating) 0.9.1
+
+## Bug Fixes
+
+- IOTDB-159 Fix NullPointerException in SeqTsFileRecoverTest and
UnseqTsFileRecoverTest
+- IOTDB-317 Fix a bug that "flush + wrong aggregation query" causes the
following queries to fail
+- IOTDB-324 Fix inaccurate statistics when writing in batch
+- IOTDB-327 Fix a groupBy-without-value-filter query bug caused by the wrong
page skipping logic
+- IOTDB-331 Fix a groupBy query bug when axisOrigin-startTimeOfWindow is an
integral multiple of interval
+- IOTDB-357 Fix NullPointerException in ActiveTimeSeriesCounter
+- IOTDB-359 Fix a wrong-data-type bug in TsFileSketchTool
+- IOTDB-360 Fix bug of a deadlock in CompressionRatio
+- IOTDB-363 Fix link errors in Development-Contributing.md and add
Development-Document.md
+- IOTDB-392 Fix a bug in CSV export tool
+- Fix apache rat header format error in some files
+
+## Miscellaneous changes
+
+- IOTDB-321 Add definitions of time expression and LEVEL in related documents
+- Support pypi distribution for Python client
+
# Apache IoTDB (incubating) 0.9.0
## New Features
@@ -114,6 +135,13 @@
* Fix start-walchecker scripts for letting user define the wal folder
* Fix start script to set JAVA_HOME
+# Apache IoTDB (incubating) 0.8.2
+
+ This is a bug-fix version of 0.8.1
+
+- IOTDB-264 lack checking datatype before writing WAL
+- IOTDB-317 Fix "flush + wrong aggregation" causes failed query in v0.8.x
+- NOTICE and LICENSE file update
# Apache IoTDB (incubating) 0.8.1
diff --git a/client-py/compile.bat b/client-py/compile.bat
index a8de20e..dca7559 100644
--- a/client-py/compile.bat
+++ b/client-py/compile.bat
@@ -18,11 +18,12 @@
@REM
@echo off
-set THRIFT_EXE=C:\bin\thrift-0.12.0.exe
+set THRIFT_EXE=D:\software\Thrift\thrift-0.13.0.exe
set BAT_DIR=%~dp0
set THRIFT_SCRIPT=%BAT_DIR%..\service-rpc\src\main\thrift\rpc.thrift
set THRIFT_OUT=%BAT_DIR%target\iotdb
-rm -rf %THRIFT_OUT%
+rmdir /Q /S %THRIFT_OUT%
mkdir -p %THRIFT_OUT%
+
%THRIFT_EXE% -gen py -out %THRIFT_OUT% %THRIFT_SCRIPT%
diff --git a/client-py/readme.md b/client-py/readme.md
index 7fb4718..576cae7 100644
--- a/client-py/readme.md
+++ b/client-py/readme.md
@@ -35,7 +35,7 @@ http://thrift.apache.org/docs/install/
## Compile the thrift library
If you have added Thrift executable into your path, you may just run
`client-py/compile.sh` or
- `client-py/compile.bat`, or you will have to modify it to set variable
`THRIFT_EXE` to point to
+ `client-py\compile.bat`, or you will have to modify it to set variable
`THRIFT_EXE` to point to
your executable. This will generate thrift sources under folder `target`, you
can add it to your
`PYTHONPATH` so that you would be able to use the library in your code. Notice
that the scripts
locate the thrift source file by relative path, so if you move the scripts
else where, they are
diff --git a/client-py/src/client_example.py b/client-py/src/client_example.py
index 30e8407..64227bb 100644
--- a/client-py/src/client_example.py
+++ b/client-py/src/client_example.py
@@ -18,6 +18,7 @@
import sys, struct
+# If you generate IoTDB python library manually, add it to your python path
sys.path.append("../target")
from thrift.protocol import TBinaryProtocol
diff --git a/docs/Documentation/UserGuide/4-Client/4-Programming - Other
Languages.md b/docs/Documentation/UserGuide/4-Client/4-Programming - Other
Languages.md
index 742d952..0d34de8 100644
--- a/docs/Documentation/UserGuide/4-Client/4-Programming - Other Languages.md
+++ b/docs/Documentation/UserGuide/4-Client/4-Programming - Other Languages.md
@@ -7,9 +7,9 @@
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
@@ -18,28 +18,57 @@
under the License.
-->
+
# Chapter 4: Client
# Programming - Other Languages
+
## Python API
-### Introduction
+
+### 1. Introduction
+
This is an example of how to connect to IoTDB with python, using the thrift
rpc interfaces. Things will be a bit different
on Linux or Windows, we will introduce how to operate on the two systems
separately.
-### Prerequisites
+### 2. Prerequisites
+
python3.7 or later is preferred.
You have to install Thrift (0.11.0 or later) to compile our thrift file into
python code. Below is the official
-tutorial of installation:
+tutorial of installation:
+
```
http://thrift.apache.org/docs/install/
```
-### Compile
-If you have added Thrift executable into your path, you may just run
`compile.sh` or `compile.bat`, or you will have to
-modify it to set variable `THRIFT_EXE` to point to your executable. This will
generate thrift sources under folder `target`,
-you can add it to your `PYTHONPATH` so that you would be able to use the
library in your code.
+### 3. How to Get the Python Library
+
+#### Option 1: pip install
+
+You can find the Apache IoTDB Python Client API package on
https://pypi.org/project/apache-iotdb/.
+
+The download command is:
+
+```
+pip install apache-iotdb
+```
+
+#### Option 2: use the compile script we provided
+
+If you have added Thrift executable into your path, you may just run
`client-py/compile.sh` or
+ `client-py\compile.bat`, or you will have to modify it to set variable
`THRIFT_EXE` to point to
+your executable. This will generate thrift sources under folder `target`, you
can add it to your
+`PYTHONPATH` so that you would be able to use the library in your code. Notice
that the scripts
+locate the thrift source file by relative path, so if you move the scripts
else where, they are
+no longer valid.
+
+#### Option 3: basic usage of thrift
+
+Optionally, if you know the basic usage of thrift, you can only download the
thrift source file in
+`service-rpc\src\main\thrift\rpc.thrift`, and simply use `thrift -gen py -out
./target/iotdb rpc.thrift`
+to generate the python library.
+
+### 4. Use Example
-### Example
-We provided an example of how to use the thrift library to connect to IoTDB in
`src\client_example.py`, please read it
-carefully before you write your own code.
+We provided an example of how to use the thrift library to connect to IoTDB in
`client-py/src
+/client_example.py`, please read it carefully before you write your own code.
diff --git a/docs/Documentation/UserGuide/8-System Design
(Developer)/1-Hierarchy.md b/docs/Documentation/UserGuide/8-System Design
(Developer)/1-Hierarchy.md
index ad677f2..02aaec3 100644
--- a/docs/Documentation/UserGuide/8-System Design (Developer)/1-Hierarchy.md
+++ b/docs/Documentation/UserGuide/8-System Design (Developer)/1-Hierarchy.md
@@ -183,7 +183,7 @@ Map<String, ByteBuffer> statistics = {
<img style="width:100%; max-width:800px; max-height:600px; margin-left:auto;
margin-right:auto; display:block;"
src="https://user-images.githubusercontent.com/33376433/63765352-664a4280-c8fb-11e9-869e-859edf6d00bb.png";>
-In v0.9.0, the storage format is changed to an array for space and time
efficiency. That is, `ByteBuffer[] statistics`. Each position of the array has
a fixed association with a specific type of statistic, following the order
defined in StatisticType:
+In v0.9.x, the storage format is changed to an array for space and time
efficiency. That is, `ByteBuffer[] statistics`. Each position of the array has
a fixed association with a specific type of statistic, following the order
defined in StatisticType:
```
enum StatisticType {
@@ -203,7 +203,7 @@ ByteBuffer[] statistics = [
]
```
-As another example in v0.9.0, when deserializing a TsDigest from buffer [3,
0,4,0, 1,4,99, 3,4,19], we get
+As another example in v0.9.x, when deserializing a TsDigest from buffer [3,
0,4,0, 1,4,99, 3,4,19], we get
```
ByteBuffer[] statistics = [
@@ -465,6 +465,6 @@ You can also use
`example/tsfile/org/apache/iotdb/tsfile/TsFileSequenceRead` to
<img style="width:100%; max-width:800px; max-height:600px; margin-left:auto;
margin-right:auto; display:block;"
src="https://user-images.githubusercontent.com/33376433/65209576-2bd36000-dacb-11e9-9e43-49e0dd01274e.png";>
-#### v0.9.0
+#### v0.9.x
<img style="width:100%; max-width:800px; max-height:600px; margin-left:auto;
margin-right:auto; display:block;"
src="https://user-images.githubusercontent.com/33376433/69341240-26012300-0ca4-11ea-91a1-d516810cad44.png";>
\ No newline at end of file
diff --git a/server/src/assembly/resources/sbin/start-server.bat
b/server/src/assembly/resources/sbin/start-server.bat
index 823df0e..5079ecb 100755
--- a/server/src/assembly/resources/sbin/start-server.bat
+++ b/server/src/assembly/resources/sbin/start-server.bat
@@ -42,8 +42,8 @@ for /f tokens^=2-5^ delims^=.-_+^" %%j in ('java -fullversion
2^>^&1') do (
set JAVA_VERSION=%MAJOR_VERSION%
-IF NOT %JAVA_VERSION% == 8 (
- IF NOT %JAVA_VERSION% == 11 (
+IF NOT "%JAVA_VERSION%" == "8" (
+ IF NOT "%JAVA_VERSION%" == "11" (
echo IoTDB only supports jdk8 or jdk11, please check your java
version.
goto finally
)
diff --git
a/server/src/assembly/resources/tools/tsfileToolSet/print-tsfile-resource-files.sh
b/server/src/assembly/resources/tools/tsfileToolSet/print-tsfile-resource-files.sh
old mode 100644
new mode 100755
diff --git
a/server/src/assembly/resources/tools/tsfileToolSet/print-tsfile-sketch.sh
b/server/src/assembly/resources/tools/tsfileToolSet/print-tsfile-sketch.sh
old mode 100644
new mode 100755
diff --git a/service-rpc/src/pypi/setup.py b/service-rpc/src/pypi/setup.py
index 4fa9354..ed93720 100644
--- a/service-rpc/src/pypi/setup.py
+++ b/service-rpc/src/pypi/setup.py
@@ -27,7 +27,7 @@ except FileNotFoundError:
long_description = ''
-print long_description
+print(long_description)
setuptools.setup(
name="apache-iotdb", # Replace with your own username
![https://user-images.githubusercontent.com/33376433/63765352-664a4280-c8fb-11e9-869e-859edf6d00bb.png"](https://user-images.githubusercontent.com/33376433/63765352-664a4280-c8fb-11e9-869e-859edf6d00bb.png"){kind=link}
![https://user-images.githubusercontent.com/33376433/65209576-2bd36000-dacb-11e9-9e43-49e0dd01274e.png"](https://user-images.githubusercontent.com/33376433/65209576-2bd36000-dacb-11e9-9e43-49e0dd01274e.png"){kind=link}
![https://user-images.githubusercontent.com/33376433/69341240-26012300-0ca4-11ea-91a1-d516810cad44.png"](https://user-images.githubusercontent.com/33376433/69341240-26012300-0ca4-11ea-91a1-d516810cad44.png"){kind=link}