Add Timeplus module #8779

lizhou1111 · 2024-06-14T09:50:07Z

Timeplus is a simple, powerful, and cost-efficient stream processing platform. It's available in different ways:

Timeplus Proton: the core engine open-sourced at GitHub under Apache 2.0 License. It is a fast and lightweight streaming SQL engine.
Timeplus Enterprise: the production-ready commercial product, with 2 deployment options:
Cloud: a fully-managed unified platform for streaming and historical data processing.
Self-hosted: same feature sets as Timeplus Cloud, able to run and scale everywhere, from edge to your data center. Customize according to your configuration needs.
Timeplus provides powerful end-to-end capabilities to help data teams process streaming and historical data quickly and intuitively, accessible for organizations of all sizes and industries. It enables data engineers and platform engineers to unlock streaming data value using SQL.

modules/timeplus/src/test/java/org/testcontainers/TimeplusTestImages.java

modules/timeplus/src/main/java/org/testcontainers/containers/TimeplusContainer.java

modules/timeplus/build.gradle

eddumelendez · 2024-07-04T03:39:26Z

modules/timeplus/src/main/java/org/testcontainers/containers/TimeplusContainer.java

+    private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("timeplus/timeplusd:2.2.10");
+
+    private static final DockerImageName TIMEPLUS_IMAGE_NAME = DockerImageName.parse("timeplus/timeplusd:2.3.3");


Suggested change

private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("timeplus/timeplusd:2.2.10");

private static final DockerImageName TIMEPLUS_IMAGE_NAME = DockerImageName.parse("timeplus/timeplusd:2.3.3");

private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("timeplus/timeplusd");

eddumelendez · 2024-07-04T03:40:11Z

modules/timeplus/src/main/java/org/testcontainers/containers/TimeplusContainer.java

+    @Deprecated
+    public static final String IMAGE = DEFAULT_IMAGE_NAME.getUnversionedPart();
+
+    @Deprecated
+    public static final String DEFAULT_TAG = "latest";


delete deprecated constants

ok i will do it

eddumelendez · 2024-07-04T03:41:04Z

modules/timeplus/src/main/java/org/testcontainers/containers/TimeplusContainer.java

+    public static final Integer HTTP_PORT = 3128;
+
+    public static final Integer NATIVE_PORT = 8463;


Suggested change

public static final Integer HTTP_PORT = 3128;

public static final Integer NATIVE_PORT = 8463;

private static final Integer HTTP_PORT = 3128;

private static final Integer NATIVE_PORT = 8463;

eddumelendez · 2024-07-04T03:41:55Z

modules/timeplus/src/main/java/org/testcontainers/containers/TimeplusContainer.java

+    /**
+     * @deprecated use {@link #TimeplusContainer(DockerImageName)} instead
+     */
+    @Deprecated
+    public TimeplusContainer() {
+        this(DEFAULT_IMAGE_NAME.withTag(DEFAULT_TAG));
+    }
+


Suggested change

/**

* @deprecated use {@link #TimeplusContainer(DockerImageName)} instead

*/

@Deprecated

public TimeplusContainer() {

this(DEFAULT_IMAGE_NAME.withTag(DEFAULT_TAG));

}

eddumelendez · 2024-07-04T03:42:30Z

modules/timeplus/src/main/java/org/testcontainers/containers/TimeplusContainer.java

+        this.waitStrategy =
+            new HttpWaitStrategy()
+                .forStatusCode(200)
+                .forResponsePredicate("Ok."::equals)
+                .withStartupTimeout(Duration.ofMinutes(1));


use waitingFor(Wait.forLog...)

HttpWaitStrategy seems don't have waitingFor function, did you mean waitUntilReady? Could you offer more info?

sorry, it is Wait.forHttp

No need, thank you for telling me this, i'm not familiar with testconatiner code, so please feel free to comment, i will fix them.

modules/timeplus/src/main/java/org/testcontainers/timeplus/TimeplusContainer.java

yl-lisen · 2024-07-13T06:06:02Z

modules/timeplus/src/main/java/org/testcontainers/timeplus/TimeplusContainer.java

+
+    private static final String NAME = "timeplus";
+
+    private static final DockerImageName TIMEPLUS_IMAGE_NAME = DockerImageName.parse("timeplus/timeplusd:2.3.3");


please use timeplus/timeplusd:develop

no we shouldn't use latest image, use stable version instead

https://github.com/testcontainers/testcontainers-java/blame/18a7c277bc749057bf5783a50ee3d1a052fab022/docs/contributing.md#L54

Let's removed. New modules do not provide an specific tag. It should be provided by the consumer.

Suggested change

private static final DockerImageName TIMEPLUS_IMAGE_NAME = DockerImageName.parse("timeplus/timeplusd:2.3.3");

yl-lisen · 2024-07-13T06:08:06Z

modules/timeplus/src/main/java/org/testcontainers/timeplus/TimeplusContainer.java

+            JDBC_URL_PREFIX +
+            getHost() +
+            ":" +
+            getMappedPort(HTTP_PORT) +


use NATIVE_PORT instead of HTTP_PORT

yl-lisen · 2024-07-13T06:12:36Z

modules/timeplus/src/main/java/org/testcontainers/timeplus/TimeplusContainer.java

+        this.waitStrategy =
+            Wait
+                .forHttp("/")
+                .forStatusCode(200)
+                .forResponsePredicate("Ok."::equals)
+                .withStartupTimeout(Duration.ofMinutes(1));


Suggested change

this.waitStrategy =

Wait

.forHttp("/")

.forStatusCode(200)

.forResponsePredicate("Ok."::equals)

.withStartupTimeout(Duration.ofMinutes(1));

this.waitStrategy =

Wait.forHttp("/timeplusd/v1/ping").forStatusCode(200).withStartupTimeout(Duration.ofMinutes(1));

eddumelendez · 2024-07-15T16:50:36Z

Please, read the Pull request template and the instructions for new modules.

lizhou1111 · 2024-07-16T02:58:07Z

later, will add the doc related

eddumelendez · 2024-07-17T02:41:56Z

modules/timeplus/src/main/java/org/testcontainers/timeplus/TimeplusContainer.java

+
+    private static final String NAME = "timeplus";
+
+    private static final DockerImageName TIMEPLUS_IMAGE_NAME = DockerImageName.parse("timeplus/timeplusd:2.3.3");


Let's removed. New modules do not provide an specific tag. It should be provided by the consumer.

Suggested change

private static final DockerImageName TIMEPLUS_IMAGE_NAME = DockerImageName.parse("timeplus/timeplusd:2.3.3");

eddumelendez · 2024-07-17T02:42:24Z

modules/timeplus/src/main/java/org/testcontainers/timeplus/TimeplusContainer.java

+        this.waitStrategy =
+            Wait.forHttp("/timeplusd/v1/ping").forStatusCode(200).withStartupTimeout(Duration.ofMinutes(1));


Suggested change

this.waitStrategy =

Wait.forHttp("/timeplusd/v1/ping").forStatusCode(200).withStartupTimeout(Duration.ofMinutes(1));

waitFor(

Wait.forHttp("/timeplusd/v1/ping").forStatusCode(200).withStartupTimeout(Duration.ofMinutes(1)));

eddumelendez · 2024-07-17T02:42:46Z

modules/timeplus/src/main/java/org/testcontainers/timeplus/TimeplusContainer.java

+        withEnv("CLICKHOUSE_DB", this.databaseName);
+        withEnv("CLICKHOUSE_USER", this.username);
+        withEnv("CLICKHOUSE_PASSWORD", this.password);


are those env vars right?

eddumelendez · 2024-07-29T17:53:23Z

docs/modules/databases/timeplus.md

@@ -0,0 +1,24 @@
+# timeplus Module


Suggested change

# timeplus Module

# Timeplus Module

eddumelendez · 2024-07-29T17:54:12Z

modules/timeplus/build.gradle

+
+    testImplementation project(':jdbc-test')
+    testRuntimeOnly 'com.timeplus:timeplus-native-jdbc:2.0.1'
+    testImplementation 'org.assertj:assertj-core:3.25.3'


Suggested change

testImplementation 'org.assertj:assertj-core:3.25.3'

testImplementation 'org.assertj:assertj-core:3.26.3'

eddumelendez · 2024-07-29T17:54:37Z

modules/timeplus/src/main/java/org/testcontainers/timeplus/TimeplusContainer.java

+
+    static final String DOCKER_IMAGE_NAME = "timeplus/timeplusd";
+
+    private static final DockerImageName TIMEPLUS_IMAGE_NAME = DockerImageName.parse("timeplus/timeplusd");


Suggested change

private static final DockerImageName TIMEPLUS_IMAGE_NAME = DockerImageName.parse("timeplus/timeplusd");

private static final DockerImageName TIMEPLUS_IMAGE_NAME = DockerImageName.parse(DOCKER_IMAGE_NAME);

eddumelendez · 2024-07-29T17:56:09Z

modules/timeplus/src/main/java/org/testcontainers/timeplus/TimeplusContainer.java

+
+    @Override
+    public String getUsername() {
+        return username;


Suggested change

return username;

return this.username;

eddumelendez · 2024-07-29T17:56:23Z

modules/timeplus/src/main/java/org/testcontainers/timeplus/TimeplusContainer.java

+
+    @Override
+    public String getPassword() {
+        return password;


Suggested change

return password;

return this.password;

eddumelendez · 2024-07-29T17:56:29Z

modules/timeplus/src/main/java/org/testcontainers/timeplus/TimeplusContainer.java

+
+    @Override
+    public String getDatabaseName() {
+        return databaseName;


Suggested change

return databaseName;

return this.databaseName;

eddumelendez · 2024-07-29T17:57:14Z

modules/timeplus/src/test/java/org/testcontainers/junit/timeplus/SimpleTimeplusTest.java

+
+import static org.assertj.core.api.Assertions.assertThat;
+
+@RunWith(Parameterized.class)


It can be run without being Parameterized

Jasmine-ge · 2024-08-13T08:05:01Z

@eddumelendez i have revised about these comments, could you please take a look again

eddumelendez · 2024-08-13T08:30:44Z

Hi @Jasmine-ge, tests are failing. Can you please take a look?

eddumelendez · 2024-08-13T21:53:22Z

Small thing: Please, add modules/databases/timeplus.md here.

Jasmine-ge · 2024-08-14T03:13:23Z

@eddumelendez Got it. Thank you very much for your help, I'm working on it.

Jasmine-ge · 2024-08-14T07:24:29Z

@eddumelendez I've fixed the problem that causes the failure test and added the information. Also I‘ve changed our database version to a stable one. Could you please take a look? I'm deeply grateful for your time.

eddumelendez · 2024-08-14T19:05:04Z

Thanks for your contribution @lizhou1111, @Jasmine-ge ! The new module will be available in the next release.

lizhou1111 requested a review from a team as a code owner June 14, 2024 09:50

lizhou1111 marked this pull request as draft June 14, 2024 09:50

chenziliang reviewed Jun 14, 2024

View reviewed changes

modules/timeplus/src/test/java/org/testcontainers/TimeplusTestImages.java Outdated Show resolved Hide resolved

chenziliang reviewed Jun 14, 2024

View reviewed changes

modules/timeplus/src/main/java/org/testcontainers/containers/TimeplusContainer.java Outdated Show resolved Hide resolved

chenziliang reviewed Jun 14, 2024

View reviewed changes

modules/timeplus/build.gradle Outdated Show resolved Hide resolved

lizhou1111 force-pushed the add_timeplus_container branch 2 times, most recently from 1e57c4f to 7f71364 Compare July 4, 2024 02:56

lizhou1111 marked this pull request as ready for review July 4, 2024 02:57

lizhou1111 force-pushed the add_timeplus_container branch from 56d393a to ece9945 Compare July 4, 2024 03:04

eddumelendez requested changes Jul 4, 2024

View reviewed changes

lizhou1111 force-pushed the add_timeplus_container branch from fd8678c to ece9945 Compare July 5, 2024 03:06

yl-lisen reviewed Jul 13, 2024

View reviewed changes

lizhou1111 force-pushed the add_timeplus_container branch from d40dbeb to 5597d18 Compare July 13, 2024 11:37

github-actions bot added modules/selenium github_actions Pull requests that update Github_actions code modules/localstack modules/dynalite modules/nginx modules/oracle modules/chromadb modules/weaviate labels Jul 13, 2024

lizhou1111 added 4 commits July 13, 2024 19:44

add Timeplus container for test

3be7509

fix comments

676bea0

fix comments 2

22013c0

some cleanup

f50b0bb

lizhou1111 force-pushed the add_timeplus_container branch from 5597d18 to f50b0bb Compare July 13, 2024 11:44

eddumelendez removed modules/selenium modules/localstack labels Jul 15, 2024

eddumelendez removed the modules/weaviate label Jul 15, 2024

lizhou1111 requested a review from eddumelendez July 16, 2024 02:16

add template option

e6cce0f

lizhou1111 force-pushed the add_timeplus_container branch from baf1ce7 to e6cce0f Compare July 16, 2024 02:53

eddumelendez reviewed Jul 17, 2024

View reviewed changes

github-actions bot added the type/docs label Jul 17, 2024

add doc

00536d1

lizhou1111 force-pushed the add_timeplus_container branch from 56dc6bb to 00536d1 Compare July 17, 2024 08:48

fix comments 3

6149564

eddumelendez reviewed Jul 29, 2024

View reviewed changes

eddumelendez changed the title ~~add Timeplus container for test~~ Add Timeplus module Jul 29, 2024

eddumelendez added the type/new module label Jul 29, 2024

Jasmine-ge force-pushed the add_timeplus_container branch from db409c9 to 062c80b Compare August 13, 2024 07:51

better

69a6974

Jasmine-ge force-pushed the add_timeplus_container branch from 062c80b to 69a6974 Compare August 13, 2024 08:01

Jasmine-ge force-pushed the add_timeplus_container branch from b29c4a9 to 6d9d81a Compare August 14, 2024 06:34

fix several problems

858b0ca

Jasmine-ge force-pushed the add_timeplus_container branch from 6d9d81a to 858b0ca Compare August 14, 2024 06:37

Merge branch 'main' into add_timeplus_container

d341ace

eddumelendez added this to the next milestone Aug 14, 2024

Polish

96169a9

eddumelendez merged commit 0f9956a into testcontainers:main Aug 14, 2024
102 checks passed

		private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("timeplus/timeplusd:2.2.10");

		private static final DockerImageName TIMEPLUS_IMAGE_NAME = DockerImageName.parse("timeplus/timeplusd:2.3.3");

		public static final Integer HTTP_PORT = 3128;

		public static final Integer NATIVE_PORT = 8463;


		private static final String NAME = "timeplus";

		private static final DockerImageName TIMEPLUS_IMAGE_NAME = DockerImageName.parse("timeplus/timeplusd:2.3.3");

		this.waitStrategy =
		Wait.forHttp("/timeplusd/v1/ping").forStatusCode(200).withStartupTimeout(Duration.ofMinutes(1));

	testImplementation 'org.assertj:assertj-core:3.25.3'
	testImplementation 'org.assertj:assertj-core:3.26.3'


		static final String DOCKER_IMAGE_NAME = "timeplus/timeplusd";

		private static final DockerImageName TIMEPLUS_IMAGE_NAME = DockerImageName.parse("timeplus/timeplusd");


		import static org.assertj.core.api.Assertions.assertThat;

		@RunWith(Parameterized.class)

Add Timeplus module #8779

Add Timeplus module #8779

Conversation

lizhou1111 commented Jun 14, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

eddumelendez commented Jul 15, 2024

lizhou1111 commented Jul 16, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Jasmine-ge commented Aug 13, 2024

eddumelendez commented Aug 13, 2024

eddumelendez commented Aug 13, 2024

Jasmine-ge commented Aug 14, 2024

Jasmine-ge commented Aug 14, 2024

eddumelendez commented Aug 14, 2024

lizhou1111 commented Jun 14, 2024 •

edited

Loading