Skip to content
Permalink
Browse files
use properties to replace the specified dependency version and enable…
… library-udf module (#5762)
  • Loading branch information
jixuan1989 committed May 9, 2022
1 parent 7fc68b5 commit eee5bac46d8eef541cbcd829d71f27ceabec30bc
Showing 26 changed files with 222 additions and 162 deletions.
@@ -33,6 +33,7 @@
<cli.test.skip>false</cli.test.skip>
<cli.it.skip>${cli.test.skip}</cli.it.skip>
<cli.ut.skip>${cli.test.skip}</cli.ut.skip>
<commons-csv.version>1.9.0</commons-csv.version>
</properties>
<dependencies>
<dependency>
@@ -63,7 +64,7 @@
<dependency>
<groupId>me.tongfei</groupId>
<artifactId>progressbar</artifactId>
<version>0.9.2</version>
<version>${progressbar.version}</version>
</dependency>
<dependency>
<groupId>org.jline</groupId>
@@ -89,7 +90,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-csv</artifactId>
<version>1.9.0</version>
<version>${commons-csv.version}</version>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
@@ -40,7 +40,7 @@
<dependency>
<groupId>org.apache.thrift</groupId>
<artifactId>libthrift</artifactId>
<version>0.14.1</version>
<version>${thrift.version}</version>
</dependency>
<dependency>
<groupId>org.apache.iotdb</groupId>
@@ -106,7 +106,7 @@
<dependency>
<groupId>org.awaitility</groupId>
<artifactId>awaitility</artifactId>
<version>4.0.2</version>
<version>${awaitility.version}</version>
<scope>test</scope>
</dependency>
<!-- for mocked test-->
@@ -34,17 +34,17 @@
<dependency>
<groupId>org.apache.ratis</groupId>
<artifactId>ratis-server</artifactId>
<version>2.2.0</version>
<version>${ratis.version}</version>
</dependency>
<dependency>
<groupId>org.apache.ratis</groupId>
<artifactId>ratis-common</artifactId>
<version>2.2.0</version>
<version>${ratis.version}</version>
</dependency>
<dependency>
<groupId>org.apache.ratis</groupId>
<artifactId>ratis-grpc</artifactId>
<version>2.2.0</version>
<version>${ratis.version}</version>
</dependency>
<dependency>
<groupId>org.apache.iotdb</groupId>
@@ -56,5 +56,6 @@
<properties>
<maven.compiler.source>8</maven.compiler.source>
<maven.compiler.target>8</maven.compiler.target>
<ratis.version>2.2.0</ratis.version>
</properties>
</project>
@@ -32,6 +32,8 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<compile.version>1.8</compile.version>
<orc-core.version>1.6.0</orc-core.version>
<hive-storage-api.version>2.6.1</hive-storage-api.version>
</properties>
<dependencies>
<dependency>
@@ -74,14 +76,14 @@
<dependency>
<groupId>org.apache.orc</groupId>
<artifactId>orc-core</artifactId>
<version>1.6.0</version>
<version>${orc-core.version}</version>
</dependency>
<!-- orc-core 1.6 uses hive-storage-api 2.6.0, while hive-serde 2.8.4 uses 2.4.0, so we
explicitly claim it.-->
<dependency>
<groupId>org.apache.hive</groupId>
<artifactId>hive-storage-api</artifactId>
<version>2.6.1</version>
<version>${hive-storage-api.version}</version>
</dependency>
<dependency>
<groupId>org.apache.hive</groupId>
@@ -36,6 +36,7 @@
<influxdb.ut.skip>${influxdb.test.skip}</influxdb.ut.skip>
<maven.compiler.source>8</maven.compiler.source>
<maven.compiler.target>8</maven.compiler.target>
<influxdb-java.version>2.21</influxdb-java.version>
</properties>
<dependencies>
<dependency>
@@ -61,7 +62,7 @@
<dependency>
<groupId>org.influxdb</groupId>
<artifactId>influxdb-java</artifactId>
<version>2.21</version>
<version>${influxdb-java.version}</version>
</dependency>
<dependency>
<groupId>junit</groupId>
@@ -23,6 +23,9 @@
import org.apache.iotdb.jdbc.Config;
import org.apache.iotdb.jdbc.Constant;

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import java.sql.Connection;
import java.sql.DriverManager;
import java.sql.SQLException;
@@ -32,8 +35,7 @@

/** This class is used by org.apache.iotdb.integration.env.EnvFactory with using reflection. */
public class StandaloneEnv implements BaseEnv {

private Connection connection;
Logger logger = LoggerFactory.getLogger(StandaloneEnv.class);

@Override
public void initBeforeClass() {
@@ -42,12 +44,7 @@ public void initBeforeClass() {

@Override
public void cleanAfterClass() {
try {
EnvironmentUtils.cleanEnv();
} catch (Exception e) {
e.printStackTrace();
System.exit(-1);
}
cleanAfterTest();
}

@Override
@@ -70,28 +67,27 @@ public void cleanAfterTest() {
public Connection getConnection() throws SQLException {
try {
Class.forName(Config.JDBC_DRIVER_NAME);
connection =
DriverManager.getConnection(Config.IOTDB_URL_PREFIX + "127.0.0.1:6667/", "root", "root");
return DriverManager.getConnection(
Config.IOTDB_URL_PREFIX + "127.0.0.1:6667/", "root", "root");
} catch (ClassNotFoundException e) {
e.printStackTrace();
fail();
}
return connection;
return null;
}

@Override
public Connection getConnection(Constant.Version version) throws SQLException {
try {
Class.forName(Config.JDBC_DRIVER_NAME);
connection =
DriverManager.getConnection(
Config.IOTDB_URL_PREFIX + "127.0.0.1:6667" + "?" + VERSION + "=" + version.toString(),
"root",
"root");
return DriverManager.getConnection(
Config.IOTDB_URL_PREFIX + "127.0.0.1:6667" + "?" + VERSION + "=" + version.toString(),
"root",
"root");
} catch (ClassNotFoundException e) {
e.printStackTrace();
fail();
}
return connection;
return null;
}
}
@@ -34,6 +34,9 @@
<jdbc.test.skip>false</jdbc.test.skip>
<jdbc.it.skip>${jdbc.test.skip}</jdbc.it.skip>
<jdbc.ut.skip>${jdbc.test.skip}</jdbc.ut.skip>
<osgi.cmpn.version>6.0.0</osgi.cmpn.version>
<pax-jdbc-common.version>1.4.5</pax-jdbc-common.version>
<org.osgi.core.version>6.0.0</org.osgi.core.version>
</properties>
<dependencies>
<dependency>
@@ -44,17 +47,17 @@
<dependency>
<groupId>org.osgi</groupId>
<artifactId>osgi.cmpn</artifactId>
<version>6.0.0</version>
<version>${osgi.cmpn.version}</version>
</dependency>
<dependency>
<groupId>org.ops4j.pax.jdbc</groupId>
<artifactId>pax-jdbc-common</artifactId>
<version>1.4.5</version>
<version>${pax-jdbc-common.version}</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<version>6.0.0</version>
<version>${org.osgi.core.version}</version>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
@@ -27,7 +27,6 @@
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>library-udf</artifactId>
<version>2.0.0</version>
<properties>
<maven.compiler.source>8</maven.compiler.source>
<maven.compiler.target>8</maven.compiler.target>
@@ -36,24 +35,24 @@
<dependency>
<groupId>org.eclipse.collections</groupId>
<artifactId>eclipse-collections</artifactId>
<version>10.4.0</version>
<version>${eclipse-collections.version}</version>
</dependency>
<dependency>
<groupId>org.apache.iotdb</groupId>
<artifactId>iotdb-server</artifactId>
<version>${project.parent.version}</version>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.iotdb</groupId>
<artifactId>tsfile</artifactId>
<version>${project.parent.version}</version>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.iotdb</groupId>
<artifactId>iotdb-session</artifactId>
<version>${project.parent.version}</version>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
@@ -103,7 +102,7 @@
<dependency>
<groupId>org.apache.iotdb</groupId>
<artifactId>integration</artifactId>
<version>0.13.0-SNAPSHOT</version>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -29,7 +29,6 @@
import org.apache.iotdb.library.util.Util;
import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType;

import org.apache.commons.math3.linear.*;
import org.apache.commons.math3.stat.StatUtils;

import java.util.ArrayList;
@@ -20,7 +20,10 @@

import org.eclipse.collections.impl.map.mutable.UnifiedMap;

import java.util.*;
import java.util.Arrays;
import java.util.Comparator;
import java.util.Map;
import java.util.NoSuchElementException;

public class MADSketch {

@@ -18,7 +18,11 @@
*/
package org.apache.iotdb.library.drepair.util;

import java.util.*;
import java.util.ArrayList;
import java.util.Comparator;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.Map;

public class TimestampInterval {

@@ -22,7 +22,7 @@
import org.apache.iotdb.db.query.udf.api.access.RowIterator;
import org.apache.iotdb.library.util.Util;

import java.util.*;
import java.util.ArrayList;

public class TimestampRepair {

0 comments on commit eee5bac

Please sign in to comment.