Skip to content

Commit

Permalink
🎉 New source: MongoDb ported to java (airbytehq#5530)
Browse files Browse the repository at this point in the history
* New abstraction for NoSql database sources

* New MongoDbSource: partial impl

* Added MongoDataType

* Improved MongoDatabase and fixed read method

* code review changes;

* merge clean up;

* Renamed NoSqlDatabase to AbstractDatabase

* formatter changes;

* code review changes: changed mongodb-new to mongodb-v2; left only new connector info in all docs

* code review changes: changed mongodb-new to mongodb-v2; left only new connector info in all docs

* updated spec.json and toDatabaseConfig() method

* updated doc accordingly to spec.json changes

Co-authored-by: Iryna Kruk <[email protected]>
  • Loading branch information
irynakruk and Iryna Kruk authored Sep 9, 2021
1 parent 984cebe commit ffecc1c
Show file tree
Hide file tree
Showing 24 changed files with 1,571 additions and 478 deletions.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"sourceDefinitionId": "b2e713cd-cc36-4c0a-b5bd-b47cb8a0561e",
"name": "MongoDb",
"dockerRepository": "airbyte/source-mongodb-v2",
"dockerImageTag": "0.1.0",
"documentationUrl": "https://docs.airbyte.io/integrations/sources/mongodb-v2",
"icon": "mongodb.svg"
}
Original file line number Diff line number Diff line change
Expand Up @@ -251,12 +251,6 @@
dockerImageTag: 0.2.4
documentationUrl: https://docs.airbyte.io/integrations/sources/appstore
icon: appstore.svg
- sourceDefinitionId: 487b930d-7f6a-43ce-8bac-46e6b2de0a55
name: Mongo DB
dockerRepository: airbyte/source-mongodb
dockerImageTag: 0.3.3
documentationUrl: https://docs.airbyte.io/integrations/sources/mongodb
icon: mongodb.svg
- sourceDefinitionId: d19ae824-e289-4b14-995a-0632eb46d246
name: Google Directory
dockerRepository: airbyte/source-google-directory
Expand Down Expand Up @@ -464,3 +458,9 @@
dockerRepository: airbyte/source-amazon-ads
dockerImageTag: 0.1.0
documentationUrl: https://docs.airbyte.io/integrations/sources/amazon-ads
- sourceDefinitionId: b2e713cd-cc36-4c0a-b5bd-b47cb8a0561e
name: MongoDb
dockerRepository: airbyte/source-mongodb-v2
dockerImageTag: 0.1.0
documentationUrl: https://docs.airbyte.io/integrations/sources/mongodb-v2
icon: mongodb.svg
3 changes: 3 additions & 0 deletions airbyte-db/lib/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@ dependencies {
// Lombok
implementation 'org.projectlombok:lombok:1.18.20'
annotationProcessor('org.projectlombok:lombok:1.18.20')

// MongoDB
compile 'org.mongodb:mongodb-driver-sync:4.3.0'
}

task(newConfigsMigration, dependsOn: 'classes', type: JavaExec) {
Expand Down
50 changes: 50 additions & 0 deletions airbyte-db/lib/src/main/java/io/airbyte/db/AbstractDatabase.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
/*
* MIT License
*
* Copyright (c) 2020 Airbyte
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in all
* copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/

package io.airbyte.db;

import com.fasterxml.jackson.databind.JsonNode;

public abstract class AbstractDatabase implements AutoCloseable {

private JsonNode sourceConfig;
private JsonNode databaseConfig;

public JsonNode getSourceConfig() {
return sourceConfig;
}

public void setSourceConfig(JsonNode sourceConfig) {
this.sourceConfig = sourceConfig;
}

public JsonNode getDatabaseConfig() {
return databaseConfig;
}

public void setDatabaseConfig(JsonNode databaseConfig) {
this.databaseConfig = databaseConfig;
}

}
5 changes: 5 additions & 0 deletions airbyte-db/lib/src/main/java/io/airbyte/db/Databases.java
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
import io.airbyte.db.jdbc.JdbcStreamingQueryConfiguration;
import io.airbyte.db.jdbc.JdbcUtils;
import io.airbyte.db.jdbc.StreamingJdbcDatabase;
import io.airbyte.db.mongodb.MongoDatabase;
import java.util.Optional;
import java.util.function.Function;
import org.apache.commons.dbcp2.BasicDataSource;
Expand Down Expand Up @@ -202,4 +203,8 @@ public static BigQueryDatabase createBigQueryDatabase(final String projectId, fi
return new BigQueryDatabase(projectId, jsonCreds);
}

public static MongoDatabase createMongoDatabase(final String connectionString, final String databaseName) {
return new MongoDatabase(connectionString, databaseName);
}

}
21 changes: 1 addition & 20 deletions airbyte-db/lib/src/main/java/io/airbyte/db/SqlDatabase.java
Original file line number Diff line number Diff line change
Expand Up @@ -27,29 +27,10 @@
import com.fasterxml.jackson.databind.JsonNode;
import java.util.stream.Stream;

public abstract class SqlDatabase implements AutoCloseable {

private JsonNode sourceConfig;
private JsonNode databaseConfig;
public abstract class SqlDatabase extends AbstractDatabase {

public abstract void execute(String sql) throws Exception;

public abstract Stream<JsonNode> query(String sql, String... params) throws Exception;

public JsonNode getSourceConfig() {
return sourceConfig;
}

public void setSourceConfig(JsonNode sourceConfig) {
this.sourceConfig = sourceConfig;
}

public JsonNode getDatabaseConfig() {
return databaseConfig;
}

public void setDatabaseConfig(JsonNode databaseConfig) {
this.databaseConfig = databaseConfig;
}

}
144 changes: 144 additions & 0 deletions airbyte-db/lib/src/main/java/io/airbyte/db/mongodb/MongoDatabase.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,144 @@
/*
* MIT License
*
* Copyright (c) 2020 Airbyte
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in all
* copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/

package io.airbyte.db.mongodb;

import com.fasterxml.jackson.databind.JsonNode;
import com.google.common.annotations.VisibleForTesting;
import com.mongodb.ConnectionString;
import com.mongodb.ReadConcern;
import com.mongodb.client.MongoClient;
import com.mongodb.client.MongoClients;
import com.mongodb.client.MongoCollection;
import com.mongodb.client.MongoCursor;
import com.mongodb.client.MongoIterable;
import io.airbyte.commons.functional.CheckedFunction;
import io.airbyte.db.AbstractDatabase;
import java.util.List;
import java.util.Optional;
import java.util.Spliterator;
import java.util.Spliterators;
import java.util.function.Consumer;
import java.util.stream.Stream;
import java.util.stream.StreamSupport;
import org.bson.BsonDocument;
import org.bson.Document;
import org.bson.conversions.Bson;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

public class MongoDatabase extends AbstractDatabase {

private static final Logger LOGGER = LoggerFactory.getLogger(MongoDatabase.class);
private static final int BATCH_SIZE = 1000;

private final ConnectionString connectionString;
private final String databaseName;

private MongoClient mongoClient;

public MongoDatabase(String uri, String databaseName) {
try {
connectionString = new ConnectionString(uri);
mongoClient = MongoClients.create(connectionString);
this.databaseName = databaseName;
} catch (Exception e) {
LOGGER.error(e.getMessage());
throw new RuntimeException(e);
}
}

@Override
public void close() throws Exception {
mongoClient.close();
}

public com.mongodb.client.MongoDatabase getDatabase() {
return mongoClient.getDatabase(databaseName);
}

public MongoIterable<String> getCollectionNames() {
return getDatabase().listCollectionNames();
}

public MongoCollection<Document> getCollection(String collectionName) {
return getDatabase().getCollection(collectionName)
.withReadConcern(ReadConcern.MAJORITY);
}

@VisibleForTesting
public MongoCollection<Document> createCollection(String name) {
getDatabase().createCollection(name);
return getDatabase().getCollection(name);
}

@VisibleForTesting
public String getName() {
return getDatabase().getName();
}

public Stream<JsonNode> read(String collectionName, List<String> columnNames, Optional<Bson> filter) {
try {
final MongoCollection<Document> collection = getDatabase().getCollection(collectionName);
final MongoCursor<Document> cursor = collection
.find(filter.orElse(new BsonDocument()))
.batchSize(BATCH_SIZE)
.cursor();

return getStream(cursor, (document) -> MongoUtils.toJsonNode(document, columnNames))
.onClose(() -> {
try {
cursor.close();
} catch (Exception e) {
throw new RuntimeException();
}
});

} catch (Exception e) {
LOGGER.error("Exception attempting to read data from collection: ", collectionName, e.getMessage());
throw new RuntimeException(e);
}
}

private Stream<JsonNode> getStream(MongoCursor<Document> cursor, CheckedFunction<Document, JsonNode, Exception> mapper) {
return StreamSupport.stream(new Spliterators.AbstractSpliterator<>(Long.MAX_VALUE, Spliterator.ORDERED) {

@Override
public boolean tryAdvance(Consumer<? super JsonNode> action) {
try {
Document document = cursor.tryNext();
if (document == null) {
return false;
}
action.accept(mapper.apply(document));
return true;
} catch (Exception e) {
throw new RuntimeException(e);
}
}

}, false);
}

}
Loading

0 comments on commit ffecc1c

Please sign in to comment.