Skip to content
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.

Sign up for GitHub

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

[INLONG-10010][Agent] Adjust source encapsulation, keep public initialization in the base class init, and place specific source related initialization in the subclass's initSource #10011

Merged
merged 1 commit into from
Apr 19, 2024
Merged

[INLONG-10010][Agent] Adjust source encapsulation, keep public initialization in the base class init, and place specific source related initialization in the subclass's initSource #10011

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions ...agent-plugins/src/main/java/org/apache/inlong/agent/plugin/sources/DatabaseSqlSource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@

package org.apache.inlong.agent.plugin.sources;

import org.apache.inlong.agent.conf.InstanceProfile;
import org.apache.inlong.agent.conf.TaskProfile;
import org.apache.inlong.agent.plugin.Message;
import org.apache.inlong.agent.plugin.file.Reader;
Expand Down Expand Up @@ -93,6 +94,11 @@ protected String getThreadName() {
return null;
}

@Override
protected void initSource(InstanceProfile profile) {

}

@Override
protected void printCurrentState() {

Expand Down
4 changes: 1 addition & 3 deletions ...agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/sources/KafkaSource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,11 +69,9 @@ public KafkaSource() {
}

@Override
public void init(InstanceProfile profile) {
protected void initSource(InstanceProfile profile) {
try {
LOGGER.info("KafkaSource init: {}", profile.toJsonStr());
this.profile = profile;
super.init(profile);
topic = profile.getInstanceId();
props.put(ConsumerConfig.BOOTSTRAP_SERVERS_CONFIG, profile.get(TASK_KAFKA_BOOTSTRAP_SERVERS));
props.put(ConsumerConfig.GROUP_ID_CONFIG, taskId);
Expand Down
3 changes: 1 addition & 2 deletions ...ent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/sources/LogFileSource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,10 +65,9 @@ public LogFileSource() {
}

@Override
public void init(InstanceProfile profile) {
protected void initSource(InstanceProfile profile) {
try {
LOGGER.info("LogFileSource init: {}", profile.toJsonStr());
super.init(profile);
fileName = profile.getInstanceId();
bufferToReadFile = new byte[SIZE_OF_BUFFER_TO_READ_FILE];
isIncrement = isIncrement(profile);
Expand Down
4 changes: 1 addition & 3 deletions ...ent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/sources/MongoDBSource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,11 +66,9 @@ public MongoDBSource() {
}

@Override
public void init(InstanceProfile profile) {
protected void initSource(InstanceProfile profile) {
try {
LOGGER.info("MongoDBSource init: {}", profile.toJsonStr());
this.profile = profile;
super.init(profile);
debeziumQueue = new LinkedBlockingQueue<>(DEBEZIUM_QUEUE_SIZE);
database = profile.get(TaskConstants.TASK_MONGO_DATABASE_INCLUDE_LIST);
collection = profile.get(TaskConstants.TASK_MONGO_COLLECTION_INCLUDE_LIST);
Expand Down
6 changes: 6 additions & 0 deletions ...-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/sources/MqttSource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@

package org.apache.inlong.agent.plugin.sources;

import org.apache.inlong.agent.conf.InstanceProfile;
import org.apache.inlong.agent.conf.TaskProfile;
import org.apache.inlong.agent.constant.CommonConstants;
import org.apache.inlong.agent.plugin.Message;
Expand Down Expand Up @@ -84,6 +85,11 @@ protected String getThreadName() {
return null;
}

@Override
protected void initSource(InstanceProfile profile) {

}

@Override
protected void printCurrentState() {

Expand Down
6 changes: 6 additions & 0 deletions ...gent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/sources/OracleSource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@

package org.apache.inlong.agent.plugin.sources;

import org.apache.inlong.agent.conf.InstanceProfile;
import org.apache.inlong.agent.conf.TaskProfile;
import org.apache.inlong.agent.plugin.Message;
import org.apache.inlong.agent.plugin.file.Reader;
Expand Down Expand Up @@ -53,6 +54,11 @@ protected String getThreadName() {
return null;
}

@Override
protected void initSource(InstanceProfile profile) {

}

@Override
protected void printCurrentState() {

Expand Down
6 changes: 6 additions & 0 deletions .../agent-plugins/src/main/java/org/apache/inlong/agent/plugin/sources/PostgreSQLSource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@

package org.apache.inlong.agent.plugin.sources;

import org.apache.inlong.agent.conf.InstanceProfile;
import org.apache.inlong.agent.conf.TaskProfile;
import org.apache.inlong.agent.plugin.Message;
import org.apache.inlong.agent.plugin.file.Reader;
Expand Down Expand Up @@ -54,6 +55,11 @@ protected String getThreadName() {
return null;
}

@Override
protected void initSource(InstanceProfile profile) {

}

@Override
protected void printCurrentState() {

Expand Down
3 changes: 1 addition & 2 deletions ...gent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/sources/PulsarSource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,10 +63,9 @@ public PulsarSource() {
}

@Override
public void init(InstanceProfile profile) {
protected void initSource(InstanceProfile profile) {
try {
LOGGER.info("PulsarSource init: {}", profile.toJsonStr());
super.init(profile);
topic = profile.getInstanceId();
serviceUrl = profile.get(TASK_PULSAR_SERVICE_URL);
subscription = profile.get(TASK_PULSAR_SUBSCRIPTION, PULSAR_SUBSCRIPTION_PREFIX + inlongStreamId);
Expand Down
6 changes: 6 additions & 0 deletions ...agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/sources/RedisSource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@

package org.apache.inlong.agent.plugin.sources;

import org.apache.inlong.agent.conf.InstanceProfile;
import org.apache.inlong.agent.conf.TaskProfile;
import org.apache.inlong.agent.plugin.Message;
import org.apache.inlong.agent.plugin.file.Reader;
Expand Down Expand Up @@ -54,6 +55,11 @@ protected String getThreadName() {
return null;
}

@Override
protected void initSource(InstanceProfile profile) {

}

@Override
protected void printCurrentState() {

Expand Down
6 changes: 6 additions & 0 deletions ...t/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/sources/SQLServerSource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@

package org.apache.inlong.agent.plugin.sources;

import org.apache.inlong.agent.conf.InstanceProfile;
import org.apache.inlong.agent.conf.TaskProfile;
import org.apache.inlong.agent.plugin.Message;
import org.apache.inlong.agent.plugin.file.Reader;
Expand Down Expand Up @@ -53,6 +54,11 @@ protected String getThreadName() {
return null;
}

@Override
protected void initSource(InstanceProfile profile) {

}

@Override
protected void printCurrentState() {

Expand Down
10 changes: 10 additions & 0 deletions ...ent-plugins/src/main/java/org/apache/inlong/agent/plugin/sources/file/AbstractSource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import org.apache.inlong.agent.common.AgentThreadFactory;
import org.apache.inlong.agent.conf.InstanceProfile;
import org.apache.inlong.agent.conf.OffsetProfile;
import org.apache.inlong.agent.conf.TaskProfile;
import org.apache.inlong.agent.constant.CycleUnitType;
import org.apache.inlong.agent.constant.TaskConstants;
import org.apache.inlong.agent.core.task.MemoryManager;
Expand All @@ -29,6 +30,7 @@
import org.apache.inlong.agent.metrics.AgentMetricItemSet;
import org.apache.inlong.agent.metrics.audit.AuditUtils;
import org.apache.inlong.agent.plugin.Message;
import org.apache.inlong.agent.plugin.file.Reader;
import org.apache.inlong.agent.plugin.file.Source;
import org.apache.inlong.agent.plugin.sources.file.extend.ExtendedHandler;
import org.apache.inlong.agent.utils.AgentUtils;
Expand Down Expand Up @@ -128,8 +130,11 @@ public void init(InstanceProfile profile) {
initOffset();
registerMetric();
initExtendHandler();
initSource(profile);
}

protected abstract void initSource(InstanceProfile profile);
justinwwhuang marked this conversation as resolved.
Show resolved Hide resolved

protected void initOffset() {
offsetProfile = OffsetManager.getInstance().getOffset(taskId, instanceId);
}
Expand Down Expand Up @@ -396,4 +401,9 @@ public boolean sourceFinish() {
}
return emptyCount > EMPTY_CHECK_COUNT_AT_LEAST;
}

@Override
public List<Reader> split(TaskProfile conf) {
return null;
}
}
Loading