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

release 2.12.0 #36

Merged
merged 3 commits into from
Jan 15, 2025
Merged

release 2.12.0 #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8ac09a0
increase read timeout for pinecone sdk
nianliuu Jan 15, 2025
864360b
upgrade jdk to 17
nianliuu Jan 15, 2025
82b3724
fix
nianliuu Jan 15, 2025
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
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
<revision>2.3.8-SNAPSHOT</revision>
<seatunnel.config.shade.version>2.1.1</seatunnel.config.shade.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<java.version>1.8</java.version>
<java.version>17</java.version>
<scala.version>2.12.15</scala.version>
<scala.binary.version>2.12</scala.binary.version>
<maven.compiler.source>${java.version}</maven.compiler.source>
Expand Down
6 changes: 6 additions & 0 deletions seatunnel-connectors-v2/connector-pinecone/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,12 @@
<artifactId>protobuf-java</artifactId>
<version>3.25.1</version>
</dependency>
<!-- https://mvnrepository.com/artifact/com.squareup.okhttp3/okhttp -->
<dependency>
<groupId>com.squareup.okhttp3</groupId>
<artifactId>okhttp</artifactId>
<version>4.12.0</version>
</dependency>
</dependencies>


Expand Down
20 changes: 16 additions & 4 deletions ...e/src/main/java/org/apache/seatunnel/connectors/pinecone/source/PineconeSourceReader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
import io.pinecone.proto.Pagination;
import io.pinecone.proto.Vector;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.apache.seatunnel.api.configuration.ReadonlyConfig;
import org.apache.seatunnel.api.source.Boundedness;
import org.apache.seatunnel.api.source.Collector;
Expand All @@ -35,7 +34,6 @@
import org.apache.seatunnel.api.table.catalog.TablePath;
import org.apache.seatunnel.api.table.catalog.TableSchema;
import org.apache.seatunnel.api.table.type.SeaTunnelRow;
import org.apache.seatunnel.connectors.pinecone.config.PineconeSourceConfig;
import static org.apache.seatunnel.connectors.pinecone.config.PineconeSourceConfig.API_KEY;
import static org.apache.seatunnel.connectors.pinecone.config.PineconeSourceConfig.BATCH_SIZE;
import static org.apache.seatunnel.connectors.pinecone.config.PineconeSourceConfig.MERGE_NAMESPACE;
Expand All @@ -46,10 +44,12 @@
import java.io.IOException;
import java.util.ArrayList;
import java.util.Deque;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.concurrent.ConcurrentLinkedDeque;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;

@Slf4j
Expand All @@ -59,6 +59,7 @@ public class PineconeSourceReader implements SourceReader<SeaTunnelRow, Pinecone
private final Context context;
private final Map<TablePath, CatalogTable> sourceTables;
private Pinecone pinecone;
private Map<TablePath, Index> pathIndexMap = new HashMap<>();

private volatile boolean noMoreSplit;
public PineconeSourceReader(Context readerContext, ReadonlyConfig config, Map<TablePath, CatalogTable> sourceTables) {
Expand All @@ -72,7 +73,12 @@ public PineconeSourceReader(Context readerContext, ReadonlyConfig config, Map<Ta
*/
@Override
public void open() throws Exception {
pinecone = new Pinecone.Builder(config.get(API_KEY)).build();
okhttp3.OkHttpClient httpClient = new okhttp3.OkHttpClient().newBuilder()
.connectTimeout(30, TimeUnit.SECONDS)
.readTimeout(180, TimeUnit.SECONDS)
.writeTimeout(60, TimeUnit.SECONDS)
.build();
pinecone = new Pinecone.Builder(config.get(API_KEY)).withOkHttpClient(httpClient).build();
}

/**
Expand Down Expand Up @@ -105,7 +111,13 @@ public void pollNext(Collector<SeaTunnelRow> output) throws Exception {
throw new PineconeConnectorException(
PineconeConnectionErrorCode.SOURCE_TABLE_SCHEMA_IS_NULL);
}
Index index = pinecone.getIndexConnection(tablePath.getTableName());
Index index = null;
if(pathIndexMap.containsKey(tablePath)){
index = pathIndexMap.get(tablePath);
}else {
index = pinecone.getIndexConnection(tablePath.getTableName());
pathIndexMap.put(tablePath, index);
}
ListResponse listResponse;
while (!(Objects.equals(paginationToken, ""))) {
if(paginationToken == null){
Expand Down