-
Notifications
You must be signed in to change notification settings - Fork 4.5k
🎉 New source: MongoDb ported to java #5530
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.
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
Merged
Merged
Changes from 8 commits
Commits
Show all changes
17 commits
Select commit
Hold shift + click to select a range
091c10c
New abstraction for NoSql database sources
02a928b
New MongoDbSource: partial impl
066a123
merged master
c6ca34f
Added MongoDataType
5ff230e
Improved MongoDatabase and fixed read method
irynakruk f9eb86f
merged master;
irynakruk 2db879d
code review changes;
irynakruk 2f5fbdc
merge clean up;
irynakruk 7437f48
Renamed NoSqlDatabase to AbstractDatabase
irynakruk 703bc7d
merged master;
irynakruk 2a8eb53
merged master;
irynakruk ad7f500
formatter changes;
irynakruk d58350a
code review changes: changed mongodb-new to mongodb-v2; left only new…
irynakruk eb9465a
code review changes: changed mongodb-new to mongodb-v2; left only new…
irynakruk bbac807
Merge remote-tracking branch 'origin/irynakruk/3428-mongodb-source' i…
irynakruk e1fdc7f
updated spec.json and toDatabaseConfig() method
irynakruk 500b1a9
updated doc accordingly to spec.json changes
irynakruk File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
8 changes: 8 additions & 0 deletions
8
...ain/resources/config/STANDARD_SOURCE_DEFINITION/b2e713cd-cc36-4c0a-b5bd-b47cb8a0561e.json
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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-new", | ||
"dockerImageTag": "0.1.0", | ||
"documentationUrl": "https://docs.airbyte.io/integrations/sources/mongodb-new", | ||
"icon": "mongodb.svg" | ||
} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
50 changes: 50 additions & 0 deletions
50
airbyte-db/lib/src/main/java/io/airbyte/db/NoSqlDatabase.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 NoSqlDatabase 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; | ||
} | ||
|
||
} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
141 changes: 141 additions & 0 deletions
141
airbyte-db/lib/src/main/java/io/airbyte/db/mongodb/MongoDatabase.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,141 @@ | ||
/* | ||
* 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.MongoClient; | ||
import com.mongodb.MongoClientURI; | ||
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.NoSqlDatabase; | ||
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 NoSqlDatabase { | ||
|
||
private static final Logger LOGGER = LoggerFactory.getLogger(MongoDatabase.class); | ||
private static final int BATCH_SIZE = 1000; | ||
|
||
private final MongoClientURI mongoClientURI; | ||
private final String databaseName; | ||
|
||
private MongoClient mongoClient; | ||
|
||
public MongoDatabase(String uri, String databaseName) { | ||
try { | ||
mongoClientURI = new MongoClientURI(uri); | ||
mongoClient = new MongoClient(mongoClientURI); | ||
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); | ||
} | ||
|
||
@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); | ||
} | ||
|
||
} |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
lets remove the old mongo db implementation, having two implementations is confusing to the user
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I removed old implementation from source definitions.