change testcontainer (#63)

* change testcontainer and revise code * add ci test
timeplus-io · Nov 18, 2024 · ae30890 · ae30890
1 parent 5246d9f
commit ae30890
Show file tree

Hide file tree

Showing 31 changed files with 146 additions and 367 deletions.
diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml
diff --git a/.github/workflows/integration-test-legacy.yml b/.github/workflows/integration-test-legacy.yml
diff --git a/.github/workflows/integration-test.yml b/.github/workflows/integration-test.yml
diff --git a/.github/workflows/native_jdbc_ci.yml b/.github/workflows/native_jdbc_ci.yml
@@ -0,0 +1,36 @@
+name: CI Pipeline
+
+on:
+  pull_request:
+    types:
+      - synchronize
+      - reopened
+      - opened
+      - ready_for_review
+  push:
+    branches:
+      - main
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        java-version: [8, 11]
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+
+      - name: Set up JDK
+        uses: actions/setup-java@v2
+        with:
+          distribution: 'temurin'
+          java-version: ${{ matrix.java-version }}
+
+      - name: Find Maven dependencies
+        run: mvn dependency:resolve
+
+      - name: Build with Maven
+        run: mvn clean install
diff --git a/CONTRIBUTE.md b/CONTRIBUTE.md
@@ -70,9 +70,7 @@ To build the source code locally, checkout and update the `master` branch:
 
 Then use Maven to compile everything, build all artifacts, and install all JAR, ZIP, and TAR files into your local Maven repository:
 
-    mvn clean install -DskipITs -DskipTests
-
-(Currently the unit tests and integration tests are not fixed, so we have to skip them)
+    mvn clean install
 
 ### Running and debugging tests
 (Not working at this point)
@@ -92,7 +90,7 @@ To fix pull requests with code style violations, simply run the project's build
 
 To run the build, navigate to the project's root directory and run:
 
-    mvn clean verify -DskipITs -DskipTests
+    mvn clean verify -DskipITs
 
 It might be useful to simply run a _validate_ check against the code instead of automatically applying code style changes.  If you want to simply run validation, navigate to the project's root directory and run:
 
@@ -122,7 +120,7 @@ export GPG_TTY=$(tty)
 Then run the following commmands:
 
 ```bash
-mvn clean javadoc:jar source:jar package gpg:sign install deploy -DskipITs -DskipTests -Drevision=2.0.2 -e
+mvn clean javadoc:jar source:jar package gpg:sign install deploy -DskipITs Drevision=2.0.2 -e
 ```
 
 This will geneate target/central-staging folder with required jar/asc/md5/sha1 files.

diff --git a/examples/pom.xml b/examples/pom.xml
@@ -44,12 +44,6 @@
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>com.clickhouse</groupId>
-            <artifactId>clickhouse-jdbc</artifactId>
-            <classifier>all</classifier>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>com.zaxxer</groupId>
             <artifactId>HikariCP</artifactId>
@@ -76,15 +70,10 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.testcontainers</groupId>
-            <artifactId>clickhouse</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <!-- <dependency>
             <groupId>org.testcontainers</groupId>
             <artifactId>timeplus</artifactId>
             <scope>test</scope>
-        </dependency> -->
+        </dependency>
     </dependencies>
 
     <build>

diff --git a/pom.xml b/pom.xml
@@ -127,7 +127,6 @@
         <aircompressor.version>0.21</aircompressor.version>
         <google.jsr305.version>3.0.2</google.jsr305.version>
         <jmh.version>1.27</jmh.version>
-        <yandex-clickhouse-jdbc.version>0.3.1-patch</yandex-clickhouse-jdbc.version>
         <mockito.version>3.6.28</mockito.version>
         <guava.version>16.0.1</guava.version>
         <jackson.version>2.10.3</jackson.version>
@@ -139,7 +138,7 @@
         <alibaba.druid.version>1.2.4</alibaba.druid.version>
         <dbcp2.version>2.8.0</dbcp2.version>
         <jupiter.version>5.7.0</jupiter.version>
-        <testcontainers.version>1.19.0</testcontainers.version>
+        <testcontainers.version>1.20.3</testcontainers.version>
 
         <async-profiler.library-path>/tmp/async-profiler-1.8.3-linux-x64/build</async-profiler.library-path>
 
@@ -201,27 +200,6 @@
                 <artifactId>jmh-generator-annprocess</artifactId>
                 <version>${jmh.version}</version>
             </dependency>
-            <dependency>
-                <groupId>com.clickhouse</groupId>
-                <artifactId>clickhouse-jdbc</artifactId>
-                <version>0.4.6</version>
-                <!-- use uber jar with all dependencies included, change classifier to http for smaller jar -->
-                <classifier>all</classifier>
-                <exclusions>
-                    <exclusion>
-                        <groupId>com.fasterxml.jackson.core</groupId>
-                        <artifactId>*</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>com.google.guava</groupId>
-                        <artifactId>*</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>org.apache.httpcomponents</groupId>
-                        <artifactId>*</artifactId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
             <dependency>
                 <groupId>org.scala-lang</groupId>
                 <artifactId>scala-compiler</artifactId>
@@ -293,15 +271,10 @@
                 <version>${testcontainers.version}</version>
             </dependency>
             <dependency>
-                <groupId>org.testcontainers</groupId>
-                <artifactId>clickhouse</artifactId>
-                <version>${testcontainers.version}</version>
-            </dependency>
-            <!-- <dependency>
                 <groupId>org.testcontainers</groupId>
                 <artifactId>timeplus</artifactId>
                 <version>${testcontainers.version}</version>
-            </dependency> -->
+            </dependency>
             <dependency>
                 <groupId>com.fasterxml.jackson.core</groupId>
                 <artifactId>jackson-annotations</artifactId>

diff --git a/timeplus-native-jdbc/pom.xml b/timeplus-native-jdbc/pom.xml
@@ -62,12 +62,6 @@
             <artifactId>jmh-generator-annprocess</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>com.clickhouse</groupId>
-            <artifactId>clickhouse-jdbc</artifactId>
-            <classifier>all</classifier>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
@@ -94,16 +88,11 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.testcontainers</groupId>
-            <artifactId>clickhouse</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <!-- <dependency>
             <groupId>org.testcontainers</groupId>
             <artifactId>timeplus</artifactId>
             <version>${testcontainers.version}</version>
             <scope>test</scope>
-        </dependency> -->
+        </dependency>
     </dependencies>
 
     <build>