-
Notifications
You must be signed in to change notification settings - Fork 1.1k
[IOTDB-1797][IOTDB-1799] Compatibility of Apache IoTDB with InfluxDB - Intergration Framework #4081
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
62 commits
Select commit
Hold shift + click to select a range
15bc593
Compatible influxdb protocol
jun0315 7d42836
Add apache license
jun0315 d5e0a2e
Autogen antlr4 code
jun0315 d5ac11e
Format code and Adjust dependent version
jun0315 b972945
[IOTDB-1689] revise the Chinese notes into English
jun0315 df8c6db
[IOTDB-1689] spotless apply format code
jun0315 b41c3ca
[IOTDB-1689] implements influxdb interface
jun0315 916514f
[IOTDB-1689] modify readme support function
jun0315 411d874
[IOTDB-1689] use iotdb built-in func
jun0315 bab4ee0
[IOTDB-1689] add integration test and fix bugs
jun0315 3da4af9
[IOTDB-1689] add workflow it
jun0315 94087a3
[IOTDB-1689] add workflow file
jun0315 2a53d22
Merge branch 'master' into influxdb-connect
jun0315 9cd8f34
[IOTDB-1689] add licenses
jun0315 80ac469
[IOTDB-1689] build distribution zip
jun0315 61919d3
[IOTDB-1689] modify bash
jun0315 bb5e4a8
[IOTDB-1689] avoid test influxdb
jun0315 4ed43a9
[IOTDB-1689] modify maven version
jun0315 1035e7e
[IOTDB-1689] add factory
jun0315 c211575
[IOTDB-1689] spotless apply
jun0315 e063be2
[IOTDB-1689] add license
jun0315 d414314
[IOTDB-1689] spotless apply
jun0315 4d4c8f4
[IOTDB-1689] fix bugs
jun0315 7011b1b
[IOTDB-1689] modify IoTDB name
jun0315 ce0181b
[IOTDB-1689] fix bugs
jun0315 2a83a44
[IOTDB-1689] remove useless g4
jun0315 7aaf5cf
[IOTDB-1689] rename file name and remove unless g4
jun0315 4595a54
[IOTDB-1689] revise the Chinese note into English
jun0315 849ce28
Update docs/zh/UserGuide/API/IoTDB-InfluxDB.md
SteveYurongSu 26b61e3
[IOTDB-1689] modify image src
jun0315 92164b4
add iotdb-influxdb as a sub module of iotdb
SteveYurongSu 6d7c1c8
remvoe necessary code
SteveYurongSu 28a62c2
[IOTDB-1689]remove unless readme
jun0315 dc66521
spotless:apply
SteveYurongSu cea8f49
Merge branch 'influxdb-connect' of github.com:jun0315/iotdb into infl…
SteveYurongSu c9173a9
refactor structure
SteveYurongSu 83d64ba
Merge pull request #1 from jun0315/influxdb-connect-steve
jun0315 d2a947d
modify package name and UserGuide
jun0315 32a899a
remove unnecessary code
jun0315 b686b11
remove unnecessary code
jun0315 5b79a11
Merge branch 'master' into influxdb-frame
jun0315 3873632
frame code
jun0315 77e52a8
remove g4
jun0315 3c4e005
remove notes
jun0315 6ac5ed3
modify workflow file
jun0315 62dbaa9
modify workflow file
jun0315 f34cc5e
add close func
jun0315 600fe9c
modify workflow yml
jun0315 3c62451
fix bugs
jun0315 edc93ef
add ut skip
jun0315 dba27a0
spotless apply
jun0315 9f58022
modify exception
jun0315 d48d42e
Merge branch 'master' into influxdb-frame
jun0315 e67c646
modify it
jun0315 54a9724
modify workflow
jun0315 7b86e99
fix pom.xml
SteveYurongSu 117160b
fix IoTDBInfluxDB
SteveYurongSu d410fcf
fix codestyle
SteveYurongSu 7974e46
spotless
SteveYurongSu 52ec7ca
fix workflows yml
SteveYurongSu 91ee8c1
fix docs
SteveYurongSu 38a31dc
influx-protocol test
SteveYurongSu File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,64 @@ | ||
| # Licensed 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. | ||
|
|
||
| name: InfluxDB Protocol Test | ||
|
|
||
| on: | ||
| push: | ||
| branches: | ||
| - master | ||
| - 'rel/*' | ||
| paths-ignore: | ||
| - 'docs/**' | ||
| pull_request: | ||
| branches: | ||
| - master | ||
| - 'rel/*' | ||
| paths-ignore: | ||
| - 'docs/**' | ||
| # allow manually run the action: | ||
| workflow_dispatch: | ||
|
|
||
| env: | ||
| MAVEN_OPTS: -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false -Dmaven.wagon.http.retryHandler.class=standard -Dmaven.wagon.http.retryHandler.count=3 | ||
|
|
||
| jobs: | ||
| ubuntu: | ||
| runs-on: ubuntu-latest | ||
|
|
||
| steps: | ||
| - uses: actions/checkout@v2 | ||
|
|
||
| - name: Set up JDK 11 | ||
| uses: actions/setup-java@v1 | ||
| with: | ||
| java-version: 11 | ||
|
|
||
| - name: Cache Maven packages | ||
| uses: actions/cache@v2 | ||
| with: | ||
| path: ~/.m2 | ||
| key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }} | ||
| restore-keys: ${{ runner.os }}-m2- | ||
|
|
||
| - name: Build Distribution Zip | ||
| run: ./mvnw.sh -B -DskipTests clean install | ||
|
|
||
| - name: Build Docker Image | ||
| run: | | ||
| docker build . -f docker/src/main/Dockerfile-single -t "iotdb:$GITHUB_SHA" | ||
| docker images | ||
|
|
||
| - name: IT Test | ||
| shell: bash | ||
| run: | | ||
| cd influxdb-protocol && mvn -B clean compile post-integration-test -Dtest.port.closed=true |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,35 @@ | ||
| <!-- | ||
|
|
||
| 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. | ||
|
|
||
| --> | ||
|
|
||
| # 切换方案 | ||
|
|
||
| 假如您原先接入 InfluxDB 的业务代码如下: | ||
|
|
||
| ```java | ||
| InfluxDB influxDB = InfluxDBFactory.connect(openurl, username, password); | ||
| ``` | ||
|
|
||
| 您只需要将 InfluxDBFactory 替换为 **IoTDBInfluxDBFactory** 即可实现业务向 IoTDB 的切换: | ||
|
|
||
| ```java | ||
| InfluxDB influxDB = IoTDBInfluxDBFactory.connect(openurl, username, password); | ||
| ``` | ||
|
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,135 @@ | ||
| <?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.13.0-SNAPSHOT</version> | ||
| <relativePath>../pom.xml</relativePath> | ||
| </parent> | ||
| <artifactId>influxdb-protocol</artifactId> | ||
| <name>InfluxDB Protocol</name> | ||
| <description>compatible with the protocol of influxdb.</description> | ||
| <properties> | ||
| <influxdb.test.skip>false</influxdb.test.skip> | ||
| <influxdb.it.skip>${influxdb.test.skip}</influxdb.it.skip> | ||
| <influxdb.ut.skip>${influxdb.test.skip}</influxdb.ut.skip> | ||
| <maven.compiler.source>8</maven.compiler.source> | ||
| <maven.compiler.target>8</maven.compiler.target> | ||
| </properties> | ||
| <dependencies> | ||
| <dependency> | ||
| <groupId>org.apache.iotdb</groupId> | ||
| <artifactId>iotdb-session</artifactId> | ||
| <version>0.13.0-SNAPSHOT</version> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.apache.iotdb</groupId> | ||
| <artifactId>iotdb-thrift</artifactId> | ||
| <version>0.13.0-SNAPSHOT</version> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.influxdb</groupId> | ||
| <artifactId>influxdb-java</artifactId> | ||
| <version>2.21</version> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>junit</groupId> | ||
| <artifactId>junit</artifactId> | ||
| <version>${junit.version}</version> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.antlr</groupId> | ||
| <artifactId>antlr4-runtime</artifactId> | ||
| </dependency> | ||
| </dependencies> | ||
| <build> | ||
| <plugins> | ||
| <plugin> | ||
| <groupId>org.apache.maven.plugins</groupId> | ||
| <artifactId>maven-surefire-plugin</artifactId> | ||
| <configuration> | ||
| <skipTests>${influxdb.ut.skip}</skipTests> | ||
| <systemProperties> | ||
| <IOTDB_CONF>src/test/resources</IOTDB_CONF> | ||
| </systemProperties> | ||
| </configuration> | ||
| </plugin> | ||
| <plugin> | ||
| <groupId>org.apache.maven.plugins</groupId> | ||
| <artifactId>maven-failsafe-plugin</artifactId> | ||
| <executions> | ||
| <execution> | ||
| <id>run-integration-tests</id> | ||
| <phase>integration-test</phase> | ||
| <goals> | ||
| <goal>integration-test</goal> | ||
| <goal>verify</goal> | ||
| </goals> | ||
| </execution> | ||
| </executions> | ||
| <configuration> | ||
| <skipTests>${influxdb.test.skip}</skipTests> | ||
| <skipITs>${influxdb.it.skip}</skipITs> | ||
| </configuration> | ||
| </plugin> | ||
| <plugin> | ||
| <groupId>org.antlr</groupId> | ||
| <artifactId>antlr4-maven-plugin</artifactId> | ||
| <version>${antlr4.version}</version> | ||
| <executions> | ||
| <execution> | ||
| <configuration> | ||
| <listener>false</listener> | ||
| <visitor>true</visitor> | ||
| </configuration> | ||
| <goals> | ||
| <goal>antlr4</goal> | ||
| </goals> | ||
| </execution> | ||
| </executions> | ||
| </plugin> | ||
| <plugin> | ||
| <groupId>org.codehaus.mojo</groupId> | ||
| <artifactId>build-helper-maven-plugin</artifactId> | ||
| <version>3.2.0</version> | ||
| <executions> | ||
| <execution> | ||
| <id>add-source</id> | ||
| <phase>generate-sources</phase> | ||
| <goals> | ||
| <goal>add-source</goal> | ||
| </goals> | ||
| <configuration> | ||
| <sources> | ||
| <source>${project.build.directory}/generated-sources/antlr4</source> | ||
| </sources> | ||
| </configuration> | ||
| </execution> | ||
| </executions> | ||
| </plugin> | ||
| </plugins> | ||
| </build> | ||
| </project> | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.