Remove some useless code

apache · jiangpengcheng · Sep 15, 2020 · Sep 28, 2020 · Sep 29, 2020 · Oct 9, 2020
commit ef1711c7ad2fe9dc3924cf1731c0380357895799
diff --git a/ansible/files/whisks_design_document_for_entities_db_v2.1.0.json b/ansible/files/whisks_design_document_for_entities_db_v2.1.0.json
@@ -23,7 +23,7 @@
       "reduce": "_count"
     },
     "action-versions": {
-      "map": "function (doc) {\n  var isAction = function (doc) { return (doc.exec !== undefined) };\n  if (isAction(doc)) try {\n    var value = {\n      _id: doc.namespace + \"/\" + doc.name + \"/default\",\n      namespace: doc.namespace,\n      name: doc.name,\n      id: doc._id,\n      version: doc.version\n    };\n    emit([doc.namespace + \"/\" + doc.name], value);\n  } catch (e) {}\n}"
+      "map": "function (doc) {\n  var isAction = function (doc) { return (doc.exec !== undefined) };\n  if (isAction(doc)) try {\n    var value = {\n      _id: doc.namespace + \"/\" + doc.name + \"/default\",\n      namespace: doc.namespace,\n      name: doc.name,\n      version: doc.version\n    };\n    emit([doc.namespace + \"/\" + doc.name], value);\n  } catch (e) {}\n}"
     }
   }
 }
diff --git a/common/scala/src/main/scala/org/apache/openwhisk/core/database/DocumentHandler.scala b/common/scala/src/main/scala/org/apache/openwhisk/core/database/DocumentHandler.scala
@@ -211,7 +211,7 @@ object WhisksHandler extends SimpleHandler {
   val FULL_NAME = "fullname"
   private val commonFields = Set("namespace", "name", "version", "publish", "annotations", "updated")
   private val actionFields = commonFields ++ Set("limits", "exec.binary")
-  private val actionVersionFields = commonFields ++ Set("_id", "id")
+  private val actionVersionFields = commonFields ++ Set("_id")
   private val packageFields = commonFields ++ Set("binding")
   private val packagePublicFields = commonFields
   private val ruleFields = commonFields
@@ -308,7 +308,7 @@ object WhisksHandler extends SimpleHandler {
   private def computeActionVersionsView(js: JsObject): JsObject = {
     val base = js.fields.filterKeys(actionVersionFields).toMap
     val defaultId = js.fields("namespace") + "/" + js.fields("name") + "/default"
-    JsObject(base + ("_id" -> JsString(defaultId), "id" -> js.fields("_id")))
+    JsObject(base + ("_id" -> JsString(defaultId)))
   }
 }
 

diff --git a/common/scala/src/main/scala/org/apache/openwhisk/core/entity/WhiskAction.scala b/common/scala/src/main/scala/org/apache/openwhisk/core/entity/WhiskAction.scala
@@ -360,15 +360,9 @@ case class ExecutableWhiskActionMetaData(namespace: EntityPath,
 
 }
 
-case class WhiskActionVersion(id: String, namespace: EntityPath, name: EntityName, version: SemVer)
-
-object WhiskActionVersion {
-  val serdes = jsonFormat(WhiskActionVersion.apply, "id", "namespace", "name", "version")
-}
-
 case class WhiskActionVersionList(namespace: EntityPath,
                                   name: EntityName,
-                                  versions: Map[SemVer, String],
+                                  versions: List[SemVer],
                                   defaultVersion: Option[SemVer]) {
   def matchedDocId(version: Option[SemVer]): Option[DocId] = {
     version match {
@@ -377,7 +371,7 @@ case class WhiskActionVersionList(namespace: EntityPath,
       case None if defaultVersion.nonEmpty =>
         Some(DocId(s"$namespace/$name@${defaultVersion.get}"))
       case None if versions.nonEmpty =>
-        Some(DocId(versions.maxBy(_._1)._2))
+        Some(DocId(s"$namespace/$name@${versions.max}"))
       case _ =>
         None
     }
@@ -418,19 +412,21 @@ object WhiskActionVersionList extends MultipleReadersSingleWriterCache[WhiskActi
           val values = result.map { row =>
             row.fields("value").asJsObject()
           }
-          val mappings = values
-            .map(WhiskActionVersion.serdes.read(_))
-            .map { actionVersion =>
-              (actionVersion.version, actionVersion.id)
-            }
-            .toMap
+          val versions = values.map { value =>
+            Try { value.fields.get("version").map(_.convertTo[SemVer]) } getOrElse None
+          }
+
           val defaultVersion = if (result.nonEmpty) {
             result.head.fields.get("doc") match {
               case Some(value) => Try { value.asJsObject.fields.get("default").map(_.convertTo[SemVer]) } getOrElse None
               case None        => None
             }
           } else None
-          WhiskActionVersionList(action.namespace.toPath, action.name, mappings, defaultVersion)
+          WhiskActionVersionList(
+            action.namespace.toPath,
+            action.name,
+            versions.filter(_.nonEmpty).map(_.get),
+            defaultVersion)
         },
       fromCache)
   }
@@ -445,7 +441,7 @@ object WhiskActionVersionList extends MultipleReadersSingleWriterCache[WhiskActi
         case None if res.defaultVersion.nonEmpty =>
           Some(DocId(action.copy(version = res.defaultVersion).asString))
         case None if res.versions.nonEmpty =>
-          Some(DocId(res.versions.maxBy(_._1)._2))
+          Some(DocId(action.copy(version = Some(res.versions.max)).asString))
         case _ =>
           None
       }

diff --git a/core/controller/src/main/scala/org/apache/openwhisk/core/controller/Actions.scala b/core/controller/src/main/scala/org/apache/openwhisk/core/controller/Actions.scala
@@ -228,7 +228,7 @@ trait WhiskActionsApi extends WhiskCollectionAPI with PostActionActivation with
           } match {
             case Success(version) =>
               onComplete(WhiskActionVersionList.get(entityName, entityStore, false)) {
-                case Success(result) if (result.versions.keys.toVector.contains(version)) =>
+                case Success(result) if (result.versions.contains(version)) =>
                   val dv = WhiskActionDefaultVersion(entityName.path, entityName.name, Some(version))
                   putEntity(
                     WhiskActionDefaultVersion,
@@ -274,7 +274,7 @@ trait WhiskActionsApi extends WhiskCollectionAPI with PostActionActivation with
                         postProcess = Some { action: WhiskAction =>
                           // delete oldest version when created successfully
                           if (result.versions.size >= actionMaxVersionLimit) {
-                            val id = result.versions.minBy(_._1)._2
+                            val id = entityName.copy(version = Some(result.versions.min)).asString
                             WhiskAction.get(entityStore, DocId(id)) flatMap { entity =>
                               WhiskAction.del(entityStore, DocInfo ! (id, entity.rev.rev)).map(_ => entity)
                             } andThen {
@@ -433,12 +433,12 @@ trait WhiskActionsApi extends WhiskCollectionAPI with PostActionActivation with
                     WhiskAction.del(entityStore, entity.docinfo).map(_ => entity)
                   })
                 else
-                  results.versions.values
-                    .map { id =>
-                      WhiskAction.get(entityStore, DocId(id)) flatMap { entity =>
-                        WhiskAction.del(entityStore, DocInfo ! (id, entity.rev.rev)).map(_ => entity)
-                      }
+                  results.versions.map { version =>
+                    val id = entityName.copy(version = Some(version)).asString
+                    WhiskAction.get(entityStore, DocId(id)) flatMap { entity =>
+                      WhiskAction.del(entityStore, DocInfo ! (id, entity.rev.rev)).map(_ => entity)
                     }
+                  }
               val deleteFuture = Future.sequence(fs).andThen {
                 case _ =>
                   WhiskActionVersionList

diff --git a/tests/src/test/scala/common/WskCliOperations.scala b/tests/src/test/scala/common/WskCliOperations.scala
@@ -207,7 +207,6 @@ class CliActionOperations(override val wsk: RunCliCmd)
     web: Option[String] = None,
     websecure: Option[String] = None,
     deleteOld: Boolean = true,
-    defaultVersion: Option[String] = None,
     expectedExitCode: Int = SUCCESS_EXIT)(implicit wp: WskProps): RunResult = {
     val params = Seq(noun, if (!update) "create" else "update", "--auth", wp.authKey, fqn(name)) ++ {
       artifact map { Seq(_) } getOrElse Seq.empty

diff --git a/tests/src/test/scala/common/WskOperations.scala b/tests/src/test/scala/common/WskOperations.scala
@@ -246,7 +246,6 @@ trait ActionOperations extends DeleteFromCollectionOperations with ListOrGetFrom
              web: Option[String] = None,
              websecure: Option[String] = None,
              deleteOld: Boolean = true,
-             defaultVersion: Option[String] = None,
              expectedExitCode: Int = SUCCESS_EXIT)(implicit wp: WskProps): RunResult
 
   def invoke(name: String,

diff --git a/tests/src/test/scala/common/rest/WskRestOperations.scala b/tests/src/test/scala/common/rest/WskRestOperations.scala
@@ -276,7 +276,6 @@ class RestActionOperations(implicit val actorSystem: ActorSystem)
     web: Option[String] = None,
     websecure: Option[String] = None,
     deleteOld: Boolean = true,
-    defaultVersion: Option[String] = None,
     expectedExitCode: Int = OK.intValue)(implicit wp: WskProps): RestResult = {
 
     val (namespace, actionName) = getNamespaceEntityName(name)
@@ -373,11 +372,8 @@ class RestActionOperations(implicit val actorSystem: ActorSystem)
     }
 
     val path = Path(s"$basePath/namespaces/$namespace/$noun/$actionName")
-    val paramemters =
-      Map("overwrite" -> update.toString, "deleteOld" -> deleteOld.toString) ++ defaultVersion.map(version =>
-        ("defaultVersion" -> version))
     val resp =
-      if (update) requestEntity(PUT, path, paramemters, Some(JsObject(body).toString))
+      if (update) requestEntity(PUT, path, Map("overwrite" -> "true"), Some(JsObject(body).toString))
       else requestEntity(PUT, path, body = Some(JsObject(body).toString))
     val rr = new RestResult(resp.status, getTransactionId(resp), getRespData(resp))
     validateStatusCode(expectedExitCode, rr.statusCode.intValue)

diff --git a/tests/src/test/scala/system/basic/WskActionTests.scala b/tests/src/test/scala/system/basic/WskActionTests.scala
@@ -83,26 +83,6 @@ class WskActionTests extends TestHelpers with WskTestHelpers with JsHelpers with
       expectedExitCode = NotFound.intValue)
   }
 
-  it should "invoke the default version of an action if version parameter is not provided" in withAssetCleaner(wskprops) {
-    (wp, assetHelper) =>
-      val name = "defaultVersion"
-      assetHelper.withCleaner(wsk.action, name) { (action, _) =>
-        action.create(name, Some(TestUtils.getTestActionFilename("hello.js")))
-        action.create(name, Some(TestUtils.getTestActionFilename("echo.js")))
-      }
-
-      // set the default version
-      wsk.action.create(name, Some(TestUtils.getTestActionFilename("hello.js")), defaultVersion = Some("0.0.2"))
-
-      // invoke the default version
-      val run = wsk.action.invoke(name, Map("payload" -> "world".toJson))
-      withActivation(wsk.activation, run) { activation =>
-        activation.response.status shouldBe "success"
-        activation.response.result shouldBe Some(JsObject("payload" -> "world".toJson))
-        activation.logs.get.mkString(" ") shouldBe empty
-      }
-  }
-
   it should "invoke an action returning a promise" in withAssetCleaner(wskprops) { (wp, assetHelper) =>
     val name = "hello promise"
     assetHelper.withCleaner(wsk.action, name) { (action, _) =>