You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ja...@apache.org on 2023/06/02 02:28:14 UTC
[iotdb] branch DelUselessDependency created (now 0f062bca499)
This is an automated email from the ASF dual-hosted git repository.
jackietien pushed a change to branch DelUselessDependency
in repository https://gitbox.apache.org/repos/asf/iotdb.git
at 0f062bca499 [To rel/1.2] Delete useless dependency of previously removed module
This branch includes the following new commits:
new 0f062bca499 [To rel/1.2] Delete useless dependency of previously removed module
The 1 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] 01/01: [To rel/1.2] Delete useless dependency of previously removed module
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jackietien pushed a commit to branch DelUselessDependency
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 0f062bca499848f0601af53c0babcc9d224b2152
Author: JackieTien97 <ja...@gmail.com>
AuthorDate: Fri Jun 2 10:27:55 2023 +0800
[To rel/1.2] Delete useless dependency of previously removed module
---
.github/workflows/influxdb-protocol.yml | 67 -------------
distribution/pom.xml | 6 --
example/influxdb-protocol-example/pom.xml | 39 --------
.../org/apache/iotdb/influxdb/InfluxDBExample.java | 110 ---------------------
example/pom.xml | 1 -
integration-test/pom.xml | 5 -
6 files changed, 228 deletions(-)
diff --git a/.github/workflows/influxdb-protocol.yml b/.github/workflows/influxdb-protocol.yml
deleted file mode 100644
index 1c5735a78ab..00000000000
--- a/.github/workflows/influxdb-protocol.yml
+++ /dev/null
@@ -1,67 +0,0 @@
-# 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/*'
- - "new_*"
- paths-ignore:
- - 'docs/**'
- - 'site/**'
- pull_request:
- branches:
- - master
- - 'rel/*'
- - "new_*"
- paths-ignore:
- - 'docs/**'
- - 'site/**'
- # allow manually run the action:
- workflow_dispatch:
-
-concurrency:
- group: ${{ github.workflow }}-${{ github.ref }}
- cancel-in-progress: true
-
-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@v3
-
- - name: Cache Maven packages
- uses: actions/cache@v3
- with:
- path: ~/.m2
- key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
- restore-keys: ${{ runner.os }}-m2-
-
- - name: Build Distribution Zip
- run: mvn clean install -pl distribution -am -DskipTests
-
- - name: Build Docker Image
- run: |
- docker build . -f docker/src/main/Dockerfile-1c1d-influxdb -t "apache/iotdb:influxdb-protocol-on"
- docker images
-
- - name: IT Test
- shell: bash
- run: |
- cd iotdb-connector/influxdb-protocol && mvn -B clean compile post-integration-test -Dtest.port.closed=true -Dinfluxdb.test.skip=false
diff --git a/distribution/pom.xml b/distribution/pom.xml
index 0e9641e3a04..0d48a5c111f 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -138,12 +138,6 @@
<type>pom</type>
<!-- <classifier>${os.classifier}</classifier>-->
</dependency>
- <dependency>
- <groupId>org.apache.iotdb</groupId>
- <artifactId>influxdb-protocol</artifactId>
- <version>${project.version}</version>
- <type>pom</type>
- </dependency>
<dependency>
<groupId>org.apache.iotdb</groupId>
<artifactId>library-udf</artifactId>
diff --git a/example/influxdb-protocol-example/pom.xml b/example/influxdb-protocol-example/pom.xml
deleted file mode 100644
index 34783701c8d..00000000000
--- a/example/influxdb-protocol-example/pom.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <artifactId>iotdb-examples</artifactId>
- <groupId>org.apache.iotdb</groupId>
- <version>1.2.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
- <artifactId>influxdb-protocol-example</artifactId>
- <name>influxdb-protocol-example</name>
- <dependencies>
- <dependency>
- <groupId>org.apache.iotdb</groupId>
- <artifactId>influxdb-protocol</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
-</project>
diff --git a/example/influxdb-protocol-example/src/main/java/org/apache/iotdb/influxdb/InfluxDBExample.java b/example/influxdb-protocol-example/src/main/java/org/apache/iotdb/influxdb/InfluxDBExample.java
deleted file mode 100644
index cdb884dfc1b..00000000000
--- a/example/influxdb-protocol-example/src/main/java/org/apache/iotdb/influxdb/InfluxDBExample.java
+++ /dev/null
@@ -1,110 +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.
- */
-
-package org.apache.iotdb.influxdb;
-
-import org.influxdb.InfluxDB;
-import org.influxdb.dto.Point;
-import org.influxdb.dto.Query;
-import org.influxdb.dto.QueryResult;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.concurrent.TimeUnit;
-
-public class InfluxDBExample {
-
- private static InfluxDB influxDB;
-
- private static final String database = "monitor";
-
- private static final String measurement = "factory";
-
- public static void main(String[] args) {
- influxDB = IoTDBInfluxDBFactory.connect("http://127.0.0.1:8086", "root", "root");
- influxDB.createDatabase(database);
- influxDB.setDatabase(database);
- insertData();
- queryData();
- influxDB.close();
- }
-
- private static void insertData() {
- Point.Builder builder = Point.measurement(measurement);
- Map<String, String> tags = new HashMap<>();
- Map<String, Object> fields = new HashMap<>();
- tags.put("workshop", "A1");
- tags.put("production", "B1");
- tags.put("cell", "C1");
- fields.put("temperature", 16.9);
- fields.put("pressure", 142);
- builder.tag(tags);
- builder.fields(fields);
- builder.time(System.currentTimeMillis(), TimeUnit.MILLISECONDS);
- Point point = builder.build();
- influxDB.write(point);
-
- builder = Point.measurement(measurement);
- tags = new HashMap<>();
- fields = new HashMap<>();
- tags.put("workshop", "A1");
- tags.put("production", "B1");
- tags.put("cell", "C2");
- fields.put("temperature", 16.5);
- fields.put("pressure", 108);
- builder.tag(tags);
- builder.fields(fields);
- builder.time(System.currentTimeMillis(), TimeUnit.MILLISECONDS);
- point = builder.build();
- influxDB.write(point);
-
- builder = Point.measurement(measurement);
- tags = new HashMap<>();
- fields = new HashMap<>();
- tags.put("workshop", "A1");
- tags.put("production", "B2");
- tags.put("cell", "C2");
- fields.put("temperature", 13.0);
- fields.put("pressure", 130);
- builder.tag(tags);
- builder.fields(fields);
- builder.time(System.currentTimeMillis(), TimeUnit.MILLISECONDS);
- point = builder.build();
- influxDB.write(point);
- }
-
- private static void queryData() {
- Query query;
- QueryResult result;
-
- query =
- new Query(
- "select * from factory where (workshop=\"A1\" and production=\"B1\" and cell =\"C1\" and time>now()-7d)",
- database);
- result = influxDB.query(query);
- System.out.println("query1 result:" + result.getResults().get(0).getSeries().get(0).toString());
-
- query =
- new Query(
- "select count(temperature),first(temperature),last(temperature),max(temperature),mean(temperature),median(temperature),min(temperature),mode(temperature),spread(temperature),stddev(temperature),sum(temperature) from factory where ((workshop=\"A1\" and production=\"B1\" and cell =\"C1\" ) or temperature< 15 )",
- database);
- result = influxDB.query(query);
- System.out.println("query2 result:" + result.getResults().get(0).getSeries().get(0).toString());
- }
-}
diff --git a/example/pom.xml b/example/pom.xml
index 9b6a5adab4e..25e24fb13fc 100644
--- a/example/pom.xml
+++ b/example/pom.xml
@@ -48,7 +48,6 @@
<module>trigger</module>
<module>rabbitmq</module>
<module>rest-java-example</module>
- <module>influxdb-protocol-example</module>
<module>ext-pipe-plugin-example</module>
</modules>
<build>
diff --git a/integration-test/pom.xml b/integration-test/pom.xml
index 4b09df50498..3c2f16548fd 100644
--- a/integration-test/pom.xml
+++ b/integration-test/pom.xml
@@ -81,11 +81,6 @@
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.iotdb</groupId>
- <artifactId>rewrite-tsfile-tool</artifactId>
- <version>${project.version}</version>
- </dependency>
<dependency>
<groupId>org.awaitility</groupId>
<artifactId>awaitility</artifactId>