Skip to content
This repository was archived by the owner on Aug 22, 2025. It is now read-only.

Fix reading properties #112

Open
pmadrigal wants to merge 2 commits into
base: branch-0.11
Choose a base branch
from
Open

Fix reading properties #112

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6d0f807
some reading properties fixed
pmadrigal Apr 3, 2016
2ec3c04
Property names changed to lower case to avoid issue with CaseInsensit…
pmadrigal Apr 3, 2016
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: 5 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
# Changelog

## 0.11.1 (? 2016)
## 0.11.2 (? 2016)

* Property names changed to lower case

## 0.11.1 (March 2016)

* Max and Min splitVector bounds for not sharded collections (see doc)
* Config parameter renamed idasobjectid -> idAsObjectId
Expand Down
38 changes: 19 additions & 19 deletions doc/src/site/sphinx/First_Steps.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,47 +89,47 @@ Configuration parameters
+-----------------------------------------------+--------------------------------------------------------------------------------+-------------------------+
| collection | "collectionName" | Yes |
+-----------------------------------------------+--------------------------------------------------------------------------------+-------------------------+
| schema_samplingRatio | 1.0 | No |
| schema_samplingratio | 1.0 | No |
+-----------------------------------------------+--------------------------------------------------------------------------------+-------------------------+
| writeConcern | mongodb.WriteConcern.ACKNOWLEDGED | No |
| writeconcern | mongodb.WriteConcern.ACKNOWLEDGED | No |
+-----------------------------------------------+--------------------------------------------------------------------------------+-------------------------+
| splitSize | 10 | No |
| splitsize | 10 | No |
+-----------------------------------------------+--------------------------------------------------------------------------------+-------------------------+
| splitKey | "fieldName" | No |
| splitkey | "fieldName" | No |
+-----------------------------------------------+--------------------------------------------------------------------------------+-------------------------+
| splitKeyType | "dataTypeName" | No |
| splitkeytype | "dataTypeName" | No |
+-----------------------------------------------+--------------------------------------------------------------------------------+-------------------------+
| splitKeyMin | "minvalue" | No |
| splitkeymin | "minvalue" | No |
+-----------------------------------------------+--------------------------------------------------------------------------------+-------------------------+
| splitKeyMax | "maxvalue" | No |
| splitkeymax | "maxvalue" | No |
+-----------------------------------------------+--------------------------------------------------------------------------------+-------------------------+
| credentials | "user,database,password;user,database,password" | No |
+-----------------------------------------------+--------------------------------------------------------------------------------+-------------------------+
| updateFields | "fieldName,fieldName" | No |
| updatefields | "fieldName,fieldName" | No |
+-----------------------------------------------+--------------------------------------------------------------------------------+-------------------------+
| sslOptions | "/path/keystorefile,keystorepassword,/path/truststorefile,truststorepassword" | No |
| ssloptions | "/path/keystorefile,keystorepassword,/path/truststorefile,truststorepassword" | No |
+-----------------------------------------------+--------------------------------------------------------------------------------+-------------------------+
| readPreference | "nearest" | No |
| readpreference | "nearest" | No |
+-----------------------------------------------+--------------------------------------------------------------------------------+-------------------------+
| language | "en" | No |
+-----------------------------------------------+--------------------------------------------------------------------------------+-------------------------+
| connectTimeout | "10000" | No |
| connecttimeout | "10000" | No |
+-----------------------------------------------+--------------------------------------------------------------------------------+-------------------------+
| connectionsPerHost | "100" | No |
| connectionsperhost | "100" | No |
+-----------------------------------------------+--------------------------------------------------------------------------------+-------------------------+
| maxWaitTime | "10000" | No |
| maxwaittime | "10000" | No |
+-----------------------------------------------+--------------------------------------------------------------------------------+-------------------------+
| socketTimeout | "1000" | No |
| sockettimeout | "1000" | No |
+-----------------------------------------------+--------------------------------------------------------------------------------+-------------------------+
| threadsAllowedToBlockForConnectionMultiplier | "5" | No |
| threadsallowedtoblockforconnectionmultiplier | "5" | No |
+-----------------------------------------------+--------------------------------------------------------------------------------+-------------------------+
| idAsObjectId | "false" | No |
| idasobjectid | "false" | No |
+-----------------------------------------------+--------------------------------------------------------------------------------+-------------------------+
| connectionsTime | "180000" | No |
| connectionstime | "180000" | No |
+-----------------------------------------------+--------------------------------------------------------------------------------+-------------------------+
| cursorBatchSize | "101" | No |
| cursorbatchsize | "101" | No |
+-----------------------------------------------+--------------------------------------------------------------------------------+-------------------------+
| bulkBatchSize | "1000" | No |
| bulkbatchsize | "1000" | No |
+-----------------------------------------------+--------------------------------------------------------------------------------+-------------------------+


Expand Down
46 changes: 23 additions & 23 deletions spark-mongodb/src/main/scala/com/stratio/datasource/mongodb/config/MongodbConfig.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,27 +29,27 @@ object MongodbConfig {
val Host = "host"
val Database = "database"
val Collection = "collection"
val SSLOptions = "sslOptions"
val ReadPreference = "readPreference"
val ConnectTimeout = "connectTimeout"
val ConnectionsPerHost = "connectionsPerHost"
val MaxWaitTime = "maxWaitTime"
val SocketTimeout = "socketTimeout"
val ThreadsAllowedToBlockForConnectionMultiplier = "threadsAllowedToBlockForConnectionMultiplier"
val WriteConcern = "writeConcern"
val SSLOptions = "ssloptions"
val ReadPreference = "readpreference"
val ConnectTimeout = "connecttimeout"
val ConnectionsPerHost = "connectionsperhost"
val MaxWaitTime = "maxwaittime"
val SocketTimeout = "sockettimeout"
val ThreadsAllowedToBlockForConnectionMultiplier = "threadsallowedtoblockforconnectionmultiplier"
val WriteConcern = "writeconcern"
val Credentials = "credentials"
val SamplingRatio = "schema_samplingRatio"
val SplitSize = "splitSize"
val SplitKey = "splitKey"
val SplitKeyType = "splitKeyType"
val SplitKeyMin = "splitKeyMin"
val SplitKeyMax = "splitKeyMax"
val UpdateFields = "updateFields"
val SamplingRatio = "schema_samplingratio"
val SplitSize = "splitsize"
val SplitKey = "splitkey"
val SplitKeyType = "splitkeytype"
val SplitKeyMin = "splitkeymin"
val SplitKeyMax = "splitkeymax"
val UpdateFields = "updatefields"
val Language = "language"
val ConnectionsTime = "connectionsTime"
val CursorBatchSize = "cursorBatchSize"
val BulkBatchSize = "bulkBatchSize"
val IdAsObjectId = "idAsObjectId"
val ConnectionsTime = "connectionstime"
val CursorBatchSize = "cursorbatchsize"
val BulkBatchSize = "bulkbatchsize"
val IdAsObjectId = "idasobjectid"

// List of parameters for mongoClientOptions
val ListMongoClientOptions = List(
Expand Down Expand Up @@ -84,8 +84,8 @@ object MongodbConfig {
val DefaultSplitSize = 10
val DefaultSplitKey = "_id"
val DefaultConnectionsTime = 120000L
val DefaultCursorBatchSize = 101
val DefaultBulkBatchSize = 1000
val DefaultCursorBatchSize = "101"
val DefaultBulkBatchSize = "1000"
val DefaultIdAsObjectId = "true"

/**
Expand All @@ -105,7 +105,7 @@ object MongodbConfig {
val optionalProperties: List[String] = List(Credentials,SSLOptions, UpdateFields)

(properties /: optionalProperties){
/** We will assume credentials are provided like 'user,database,password;user,database,password;...' */
/** We will assume credentials are provided like 'user,database,password;...;user,database,password' */
case (properties,Credentials) =>
parameters.get(Credentials).map{ credentialInput =>
val credentials = credentialInput.split(";").map(_.split(",")).toList
Expand All @@ -122,7 +122,7 @@ object MongodbConfig {
properties + (SSLOptions -> ssloptions)
} getOrElse properties

/** We will assume fields are provided like 'user,database,password...' */
/** We will assume fields are provided like 'field1,field2,...,fieldN' */
case (properties, UpdateFields) => {
parameters.get(UpdateFields).map{ updateInputs =>
val updateFields = updateInputs.split(",")
Expand Down
3 changes: 2 additions & 1 deletion ...ongodb/src/main/scala/com/stratio/datasource/mongodb/partitioner/MongodbPartitioner.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,8 @@ class MongodbPartitioner(config: Config) extends Partitioner[MongodbPartition] {

private val connectionsTime = config.get[String](MongodbConfig.ConnectionsTime).map(_.toLong)

private val cursorBatchSize = config.getOrElse[Int](MongodbConfig.CursorBatchSize, MongodbConfig.DefaultCursorBatchSize)
private val cursorBatchSize =
config.getOrElse[String](MongodbConfig.CursorBatchSize, MongodbConfig.DefaultCursorBatchSize).toInt

override def computePartitions(): Array[MongodbPartition] = {
val mongoClient = MongodbClientFactory.getClient(hosts, credentials, ssloptions, clientOptions)
Expand Down
3 changes: 2 additions & 1 deletion spark-mongodb/src/main/scala/com/stratio/datasource/mongodb/reader/MongodbReader.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,8 @@ class MongodbReader(config: Config,

private var dbCursor: Option[MongoCursorBase] = None

private val batchSize = config.getOrElse[Int](MongodbConfig.CursorBatchSize, MongodbConfig.DefaultCursorBatchSize)
private val batchSize =
config.getOrElse[String](MongodbConfig.CursorBatchSize, MongodbConfig.DefaultCursorBatchSize).toInt

private val connectionsTime = config.get[String](MongodbConfig.ConnectionsTime).map(_.toLong)

Expand Down
3 changes: 2 additions & 1 deletion spark-mongodb/src/main/scala/com/stratio/datasource/mongodb/writer/MongodbBatchWriter.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@ class MongodbBatchWriter(config: Config) extends MongodbWriter(config) {

private val IdKey = "_id"

private val bulkBatchSize = config.getOrElse[Int](MongodbConfig.BulkBatchSize, MongodbConfig.DefaultBulkBatchSize)
private val bulkBatchSize =
config.getOrElse[String](MongodbConfig.BulkBatchSize, MongodbConfig.DefaultBulkBatchSize).toInt

private val pkConfig: Option[Array[String]] = config.get[Array[String]](MongodbConfig.UpdateFields)

Expand Down
2 changes: 1 addition & 1 deletion spark-mongodb/src/main/scala/com/stratio/datasource/util/Config.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ trait Config extends Serializable {
val properties: Map[Property, Any]

/** Returns the value associated with a key, or a default value if the key is not contained in the configuration object.

* Generic is required in order to get the correct type of the property, in any case for a type conversion.
* @param key Desired property.
* @param default Value in case no binding for `key` is found in the map.
* @tparam T Result type of the default computation.
Expand Down