Skip to content
Permalink
Browse files
revolve conflict after merging master
  • Loading branch information
qiaojialin committed Mar 9, 2020
2 parents c2a8bee + 0bc56c4 commit 97f2bdac9fcc37144ff88d852282d5064abfcfeb
Showing 53 changed files with 2,662 additions and 300 deletions.
@@ -29,7 +29,7 @@
![](https://img.shields.io/badge/platform-win10%20%7C%20macox%20%7C%20linux-yellow.svg)
![](https://img.shields.io/badge/java--language-1.8-blue.svg)
[![IoTDB Website](https://img.shields.io/website-up-down-green-red/https/shields.io.svg?label=iotdb-website)](https://iotdb.apache.org/)
[![Maven Version](https://maven-badges.herokuapp.com/maven-central/org.apache.iotdb/iotdb-parent/badge.png)](http://search.maven.org/#search|gav|1|g:"org.apache.iotdb")
[![Maven Version](https://maven-badges.herokuapp.com/maven-central/org.apache.iotdb/iotdb-parent/badge.svg)](http://search.maven.org/#search|gav|1|g:"org.apache.iotdb")

# Overview

@@ -79,7 +79,7 @@ For the latest information about IoTDB, please visit [IoTDB official website](ht

# Quick Start

This short guide will walk you through the basic process of using IoTDB. For a more detailed introduction, please visit our website's [User Guide](https://iotdb.apache.org/#/Documents/0.10.0/chap1/sec1).
This short guide will walk you through the basic process of using IoTDB. For a more detailed introduction, please visit our website's [User Guide](https://iotdb.apache.org/#/Documents/0.9.x/chap1/sec1).

## Prerequisites

@@ -384,8 +384,8 @@ IExpression 为查询过滤条件。一个 IExpression 可以是一个 SingleSer

*情况二*:GlobalTimeExpression 和 IExpression 的关系为 OR。该情况下的合并步骤如下:
1. 得到该查询所要投影的所有时间序列,其为一个 Path 的集合,以一个包含三个投影时间序列的查询为例,记所有要投影的列为 PathList{path1, path2, path3}。
2. 记 GlobalTimeExpression 的 Filter 为 tFilter,调用 pushGlobalTimeFilterToAllSeries() 方法为每个 Path 创建一个对应的 SingleSeriesExpression,且每个 SingleSeriesExpression 的 Filter 值均为 tFilter;将所有新创建的 SingleSeriesExpression 用 OR 运算符进行连接,得到一个 OrExpression,记其为 orExpression
3. 将步骤二得到的 orExpression 与 IExpression 按照关系 OR 进行合并,得到最终的结果
2. 记 GlobalTimeExpression 的 Filter 为 tFilter,调用 pushGlobalTimeFilterToAllSeries() 方法为每个 Path 创建一个对应的 SingleSeriesExpression,且每个 SingleSeriesExpression 的 Filter 值均为 tFilter;将所有新创建的 SingleSeriesExpression 用 OR 运算符进行连接,得到一个 OrExpression,记其为 orExpression
3. 调用 mergeSecondTreeToFirstTree 方法将 IExpression 中的节点与步骤二得到的 orExpression 中的节点进行合并,返回合并后的表达式


例如,将如下 GlobaLTimeFilter 和 IExpression 按照关系 OR 进行合并,设该查询的被投影列为 PathList{path1, path2, path3}
@@ -72,7 +72,7 @@ IoTDB支持多种安装途径。用户可以使用三种方式对IoTDB进行安
* 日志配置模块 (`logback.xml`).

想要了解更多,请浏览[Chapter3: Server](https://iotdb.apache.org/#/Documents/progress/chap3/sec1)


## IoTDB试用

@@ -281,3 +281,13 @@ Windows系统停止命令如下:
```
> $sbin\stop-server.bat
```

## 只建立客户端

在incubator-iotdb的根路径下:

```
> mvn clean package -pl client -am -DskipTests
```

构建后,IoTDB客户端将位于文件夹“ client / target / iotdb-client- {project.version}”下。
@@ -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
@@ -29,3 +29,9 @@ Apache IoTDB 始于清华大学软件学院。IoTDB是一个用于管理大量
* [Matching Consecutive Subpatterns over Streaming Time Series](https://link.springer.com/chapter/10.1007/978-3-319-96893-3_8), Rong Kang and Chen Wang and Peng Wang and Yuting Ding and Jianmin Wang. APWeb/WAIM 2018.
* [KV-match: A Subsequence Matching Approach Supporting Normalization and Time Warping](https://www.semanticscholar.org/paper/KV-match%3A-A-Subsequence-Matching-Approach-and-Time-Wu-Wang/9ed84cb15b7e5052028fc5b4d667248713ac8592), Jiaye Wu and Peng Wang and Chen Wang and Wei Wang and Jianmin Wang. ICDE 2019.
* 我们还研发了面向时间序列数据库的Benchmark工具: [https://github.com/thulab/iotdb-benchmark](https://github.com/thulab/iotdb-benchmark)

# Benchmark工具

我们还研发了面向时间序列数据库的Benchmark工具:

https://github.com/thulab/iotdb-benchmark
@@ -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
@@ -20,4 +20,6 @@
-->
# 第3章: 服务器端

## 集群设置

Coming Soon.
@@ -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
@@ -30,7 +30,7 @@

<!-- /TOC -->

# Command Line Interface (CLI)
# 命令行接口(CLI)
IOTDB为用户提供Client/Shell工具用于启动客户端和服务端程序。下面介绍每个Client/Shell工具的运行方式和相关参数。
> \$IOTDB\_HOME表示IoTDB的安装目录所在路径。
@@ -23,6 +23,8 @@

# 编程 - 原生接口

## 使用

## 依赖

* JDK >= 1.8
@@ -52,8 +54,8 @@

* 初始化Session
​ Session(String host, int port)
Session(String host, String port, String username, String password)
Session(String host, int port, String username, String password)
Session(String host, String port, String username, String password)
Session(String host, int port, String username, String password)

* 开启Session
​ Session.open()
@@ -70,7 +72,7 @@
* 删除单个或多个存储组

​ TSStatus deleteStorageGroup(String storageGroup)
TSStatus deleteStorageGroups(List<String> storageGroups)
TSStatus deleteStorageGroups(List<String> storageGroups)

* 创建单个时间序列

@@ -79,12 +81,12 @@
* 删除一个或多个时间序列

​ TSStatus deleteTimeseries(String path)
TSStatus deleteTimeseries(List<String> paths)
TSStatus deleteTimeseries(List<String> paths)

* 删除某一特定时间前的时间序列

​ TSStatus deleteData(String path, long time)
TSStatus deleteData(List<String> paths, long time)
TSStatus deleteData(List<String> paths, long time)

* 插入时序数据

@@ -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
@@ -21,4 +21,46 @@
# 第4章: 客户端
## 其他语言

Coming Soon.
## Python API

### 1. 介绍

这是一个如何使用thrift rpc接口通过python连接到IoTDB的示例。 在Linux或Windows上情况会有所不同,我们将介绍如何分别在两个系统上进行操作。

### 2. 先决条件

首选python3.7或更高版本。

您必须安装Thrift(0.11.0或更高版本)才能将我们的Thrift文件编译为python代码。

下面是官方安装教程:

```
http://thrift.apache.org/docs/install/
```

### 3. 如何获取Python库

#### 方案1: pip install

您可以在https://pypi.org/project/apache-iotdb/上找到Apache IoTDB Python客户端API软件包。

下载命令为:

```
pip install apache-iotdb
```

#### 方案2: 使用我们提供的编译脚本

如果你在路径中添加了Thrift可执行文件,则可以运行`client-py/compile.sh`
`client-py \ compile.bat`,或者你必须对其进行修改以将变量`THRIFT_EXE`设置为指向你的可执行文件。 这将在`target`文件夹下生成节俭源,你可以将其添加到你的`PYTHONPATH`,以便你可以在代码中使用该库。 请注意,脚本通过相对路径找到节俭的源文件,因此,如果将脚本移动到其他位置,它们将不再有效。

#### 方案3:thrift的基本用法

或者,如果您了解thrift的基本用法,则只能在以下位置下载Thrift源文件:
`service-rpc\src\main\thrift\rpc.thrift`,并且只需使用`thrift -gen py -out ./target/iotdb rpc.thrift`生成python库。

### 4. 示例代码

我们在`client-py / src/ client_example.py`中提供了一个示例,说明如何使用Thrift库连接到IoTDB,请先仔细阅读,然后再编写自己的代码。

0 comments on commit 97f2bda

Please sign in to comment.