chetanmeh commented on a change in pull request #3562: ArtifactStore implementation for CosmosDB URL: https://github.com/apache/incubator-openwhisk/pull/3562#discussion_r184652297
########## File path: common/scala/src/main/scala/whisk/core/database/cosmosdb/CosmosDBSupport.scala ########## @@ -0,0 +1,93 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package whisk.core.database.cosmosdb + +import com.microsoft.azure.cosmosdb._ +import com.microsoft.azure.cosmosdb.rx.AsyncDocumentClient + +import scala.collection.JavaConverters._ +import scala.collection.immutable + +private[cosmosdb] trait CosmosDBSupport extends RxObservableImplicits { + protected def config: CosmosDBConfig + protected def collName: String + protected def client: AsyncDocumentClient + protected def viewMapper: CosmosDBViewMapper + + def initialize(): (Database, DocumentCollection) = { + val db = getOrCreateDatabase() + (db, getOrCreateCollection(db)) + } + + private def getOrCreateDatabase(): Database = { + client + .queryDatabases(querySpec(config.db), null) + .blockingOnlyResult() + .getOrElse { + client.createDatabase(newDatabase, null).blockingResult() + } + } + + private def getOrCreateCollection(database: Database) = { + client + .queryCollections(database.getSelfLink, querySpec(collName), null) + .blockingOnlyResult() + .map { coll => + if (matchingIndexingPolicy(coll)) { + coll + } else { + //Modify the found collection with latest policy as its selfLink is set + coll.setIndexingPolicy(viewMapper.indexingPolicy.asJava()) + client.replaceCollection(coll, null).blockingResult() + } + } + .getOrElse { + client.createCollection(database.getSelfLink, newDatabaseCollection, null).blockingResult() + } + } + + private def matchingIndexingPolicy(coll: DocumentCollection): Boolean = + IndexingPolicy.isSame(viewMapper.indexingPolicy, IndexingPolicy(coll.getIndexingPolicy)) + + private def newDatabaseCollection = { + val defn = new DocumentCollection + defn.setId(collName) + defn.setIndexingPolicy(viewMapper.indexingPolicy.asJava()) + defn.setPartitionKey(viewMapper.partitionKeyDefn) + defn + } + + private def newDatabase = { + val databaseDefinition = new Database + databaseDefinition.setId(config.db) + databaseDefinition + } + + protected def querySpec(id: String) = + new SqlQuerySpec("SELECT * FROM root r WHERE r.id=@id", new SqlParameterCollection(new SqlParameter("@id", id))) + + /** + * CosmosDB id considers '/', '\' , '?' and '#' as invalid. EntityNames can include '/' so + * that need to be escaped. For that we use '|' as the replacement char + */ + protected def escapeId(id: String): String = id.replace("/", "|") Review comment: Good point. So far this was checked in `EntityName#entityNameMatcher` however would be good to check the invariant in util method also Added a check with test for this logic ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
