You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by gr...@apache.org on 2015/08/04 01:53:03 UTC
[1/3] incubator-usergrid git commit: USERGRID-871: add Apache
comments + changes for modification date auditing
Repository: incubator-usergrid
Updated Branches:
refs/heads/two-dot-o-dev 6ad32c363 -> 29f22332a
USERGRID-871: add Apache comments + changes for modification date auditing
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/a6939ccc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/a6939ccc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/a6939ccc
Branch: refs/heads/two-dot-o-dev
Commit: a6939ccc9af485848a6cb2579792bde5a5762217
Parents: b038b46
Author: Mike Dunker <md...@apigee.com>
Authored: Mon Aug 3 16:10:39 2015 -0700
Committer: Mike Dunker <md...@apigee.com>
Committed: Mon Aug 3 16:10:39 2015 -0700
----------------------------------------------------------------------
.../org/apache/usergrid/enums/AuthType.scala | 16 ++++++++++
.../usergrid/enums/ConfigProperties.scala | 16 ++++++++++
.../usergrid/enums/EndConditionType.scala | 16 ++++++++++
.../org/apache/usergrid/enums/EntityType.scala | 16 ++++++++++
.../apache/usergrid/enums/ScenarioType.scala | 16 ++++++++++
.../org/apache/usergrid/enums/TokenType.scala | 16 ++++++++++
.../usergrid/scenarios/AuditScenarios.scala | 32 ++++++++++++--------
.../org/apache/usergrid/settings/Settings.scala | 24 ++++++++++-----
.../src/test/resources/dummyAuditUuid.csv | 2 +-
9 files changed, 132 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/a6939ccc/stack/loadtests/src/main/scala/org/apache/usergrid/enums/AuthType.scala
----------------------------------------------------------------------
diff --git a/stack/loadtests/src/main/scala/org/apache/usergrid/enums/AuthType.scala b/stack/loadtests/src/main/scala/org/apache/usergrid/enums/AuthType.scala
index abbb204..13891fe 100644
--- a/stack/loadtests/src/main/scala/org/apache/usergrid/enums/AuthType.scala
+++ b/stack/loadtests/src/main/scala/org/apache/usergrid/enums/AuthType.scala
@@ -1,3 +1,19 @@
+/*
+ * 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 org.apache.usergrid.enums
/**
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/a6939ccc/stack/loadtests/src/main/scala/org/apache/usergrid/enums/ConfigProperties.scala
----------------------------------------------------------------------
diff --git a/stack/loadtests/src/main/scala/org/apache/usergrid/enums/ConfigProperties.scala b/stack/loadtests/src/main/scala/org/apache/usergrid/enums/ConfigProperties.scala
index 75228a7..293cc9d 100644
--- a/stack/loadtests/src/main/scala/org/apache/usergrid/enums/ConfigProperties.scala
+++ b/stack/loadtests/src/main/scala/org/apache/usergrid/enums/ConfigProperties.scala
@@ -1,3 +1,19 @@
+/*
+ * 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 org.apache.usergrid.enums
import java.util.Date
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/a6939ccc/stack/loadtests/src/main/scala/org/apache/usergrid/enums/EndConditionType.scala
----------------------------------------------------------------------
diff --git a/stack/loadtests/src/main/scala/org/apache/usergrid/enums/EndConditionType.scala b/stack/loadtests/src/main/scala/org/apache/usergrid/enums/EndConditionType.scala
index 2d4bf63..6d77dd1 100644
--- a/stack/loadtests/src/main/scala/org/apache/usergrid/enums/EndConditionType.scala
+++ b/stack/loadtests/src/main/scala/org/apache/usergrid/enums/EndConditionType.scala
@@ -1,3 +1,19 @@
+/*
+ * 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 org.apache.usergrid.enums
object EndConditionType {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/a6939ccc/stack/loadtests/src/main/scala/org/apache/usergrid/enums/EntityType.scala
----------------------------------------------------------------------
diff --git a/stack/loadtests/src/main/scala/org/apache/usergrid/enums/EntityType.scala b/stack/loadtests/src/main/scala/org/apache/usergrid/enums/EntityType.scala
index 214d48c..505dd4f 100644
--- a/stack/loadtests/src/main/scala/org/apache/usergrid/enums/EntityType.scala
+++ b/stack/loadtests/src/main/scala/org/apache/usergrid/enums/EntityType.scala
@@ -1,3 +1,19 @@
+/*
+ * 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 org.apache.usergrid.enums
object EntityType {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/a6939ccc/stack/loadtests/src/main/scala/org/apache/usergrid/enums/ScenarioType.scala
----------------------------------------------------------------------
diff --git a/stack/loadtests/src/main/scala/org/apache/usergrid/enums/ScenarioType.scala b/stack/loadtests/src/main/scala/org/apache/usergrid/enums/ScenarioType.scala
index 76fae7b..6f9a20e 100644
--- a/stack/loadtests/src/main/scala/org/apache/usergrid/enums/ScenarioType.scala
+++ b/stack/loadtests/src/main/scala/org/apache/usergrid/enums/ScenarioType.scala
@@ -1,3 +1,19 @@
+/*
+ * 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 org.apache.usergrid.enums
object ScenarioType {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/a6939ccc/stack/loadtests/src/main/scala/org/apache/usergrid/enums/TokenType.scala
----------------------------------------------------------------------
diff --git a/stack/loadtests/src/main/scala/org/apache/usergrid/enums/TokenType.scala b/stack/loadtests/src/main/scala/org/apache/usergrid/enums/TokenType.scala
index 456a9cb..99ed52a 100644
--- a/stack/loadtests/src/main/scala/org/apache/usergrid/enums/TokenType.scala
+++ b/stack/loadtests/src/main/scala/org/apache/usergrid/enums/TokenType.scala
@@ -1,3 +1,19 @@
+/*
+ * 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 org.apache.usergrid.enums
object TokenType {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/a6939ccc/stack/loadtests/src/main/scala/org/apache/usergrid/scenarios/AuditScenarios.scala
----------------------------------------------------------------------
diff --git a/stack/loadtests/src/main/scala/org/apache/usergrid/scenarios/AuditScenarios.scala b/stack/loadtests/src/main/scala/org/apache/usergrid/scenarios/AuditScenarios.scala
index 93440ac..eaf14a9 100644
--- a/stack/loadtests/src/main/scala/org/apache/usergrid/scenarios/AuditScenarios.scala
+++ b/stack/loadtests/src/main/scala/org/apache/usergrid/scenarios/AuditScenarios.scala
@@ -52,12 +52,14 @@ object AuditScenarios {
.get(collectionGetUrl(false))
.headers(Headers.authToken)
.check(status.is(200), extractCollectionUuids(SessionVarCollectionUuids), maybeExtractCursor(SessionVarCursor)))
- .foreach("${" + SessionVarCollectionUuids + "}", "singleUuid") {
+ .foreach("${" + SessionVarCollectionUuids + "}", "singleResult") {
exec(session => {
- val uuidObj = session("singleUuid").as[Map[String,Any]]
- val uuid = uuidObj("uuid").asInstanceOf[String]
+ val resultObj = session("singleResult").as[Map[String,Any]]
+ val uuid = resultObj("uuid").asInstanceOf[String]
+ val entityName = resultObj("name").asInstanceOf[String]
+ val modified = resultObj("modified").asInstanceOf[Long]
val collectionName = session(SessionVarCollectionName).as[String]
- Settings.addAuditUuid(uuid, collectionName)
+ Settings.addAuditUuid(uuid, collectionName, entityName, modified)
session
})
}
@@ -67,12 +69,14 @@ object AuditScenarios {
.get(collectionGetUrl(true))
.headers(Headers.authToken)
.check(status.is(200), extractCollectionUuids(SessionVarCollectionUuids), maybeExtractCursor(SessionVarCursor)))
- .foreach("${" + SessionVarCollectionUuids + "}", "singleUuid") {
+ .foreach("${" + SessionVarCollectionUuids + "}", "singleResult") {
exec(session => {
- val uuidObj = session("singleUuid").as[Map[String,Any]]
- val uuid = uuidObj("uuid").asInstanceOf[String]
+ val resultObj = session("singleResult").as[Map[String,Any]]
+ val uuid = resultObj("uuid").asInstanceOf[String]
+ val entityName = resultObj("name").asInstanceOf[String]
+ val modified = resultObj("modified").asInstanceOf[Long]
val collectionName = session(SessionVarCollectionName).as[String]
- Settings.addAuditUuid(uuid, collectionName)
+ Settings.addAuditUuid(uuid, collectionName, entityName, modified)
session
})
}
@@ -102,19 +106,21 @@ object AuditScenarios {
.exec(session => {
val count = session("count").as[String].toInt
val uuid = session("uuid").as[String]
+ val entityName = session("name").as[String]
+ val modified = session("modified").as[Long]
val collectionName = session(SessionVarCollectionName).as[String]
// save items not found
if (count < 1) {
- Settings.addAuditUuid(uuid, collectionName)
+ Settings.addAuditUuid(uuid, collectionName, entityName, modified)
Settings.incAuditNotFound()
- println(s"NOT FOUND: $collectionName.$uuid")
+ println(s"NOT FOUND: $collectionName.$entityName $uuid")
} else if (count > 1) {
- Settings.addAuditUuid(uuid, collectionName)
+ Settings.addAuditUuid(uuid, collectionName, entityName, modified)
Settings.incAuditBadResponse()
- println(s"INVALID RESPONSE (count=$count): $collectionName.$uuid")
+ println(s"INVALID RESPONSE (count=$count): $collectionName.$entityName $uuid")
} else {
- // println(s"FOUND: $collectionName.$uuid")
+ // println(s"FOUND: $collectionName.$entityName $uuid")
Settings.incAuditSuccess()
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/a6939ccc/stack/loadtests/src/main/scala/org/apache/usergrid/settings/Settings.scala
----------------------------------------------------------------------
diff --git a/stack/loadtests/src/main/scala/org/apache/usergrid/settings/Settings.scala b/stack/loadtests/src/main/scala/org/apache/usergrid/settings/Settings.scala
index 0714698..61231d5 100755
--- a/stack/loadtests/src/main/scala/org/apache/usergrid/settings/Settings.scala
+++ b/stack/loadtests/src/main/scala/org/apache/usergrid/settings/Settings.scala
@@ -25,6 +25,8 @@ import org.apache.usergrid.datagenerators.FeederGenerator
import org.apache.usergrid.enums._
import org.apache.usergrid.helpers.Utils
+import scala.collection.mutable
+
object Settings {
def initStrSetting(cfg: String): String = {
@@ -255,25 +257,31 @@ object Settings {
}
- val auditUuidsHeader = "collection,uuid"
+ val auditUuidsHeader = "collection,name,uuid,modified"
+
+ case class AuditList(var collection: String, var entityName: String, var uuid: String, var modified: Long)
// key: uuid, value: collection
- private var auditUuidMap: Map[String,String] = Map()
- def addAuditUuid(uuid: String, collection: String): Unit = {
- if (captureAuditUuids) auditUuidMap += (uuid -> collection)
+ private var auditUuidList: mutable.MutableList[AuditList] = mutable.MutableList[AuditList]()
+ def addAuditUuid(uuid: String, collection: String, entityName: String, modified: Long): Unit = {
+ if (captureAuditUuids) {
+ auditUuidList.synchronized {
+ auditUuidList += AuditList(collection, entityName, uuid, modified)
+ }
+ }
}
def writeAuditUuidsToFile(uuidDesc: String): Unit = {
if (captureAuditUuids) {
- println(s"Sorting and writing ${auditUuidMap.size} ${uuidDesc} UUIDs in CSV file ${captureAuditUuidFilename}")
+ println(s"Sorting and writing ${auditUuidList.size} $uuidDesc UUIDs in CSV file $captureAuditUuidFilename")
val writer = {
val fos = new FileOutputStream(captureAuditUuidFilename)
new PrintWriter(fos, false)
}
writer.println(auditUuidsHeader)
- val uuidList: List[(String, String)] = auditUuidMap.toList.sortBy(l => (l._2, l._1))
- uuidList.foreach { l =>
- writer.println(s"${l._2},${l._1}")
+ val uuidList: List[AuditList] = auditUuidList.toList.sortBy(e => (e.collection, e.entityName, e.modified))
+ uuidList.foreach { e =>
+ writer.println(s"${e.collection},${e.entityName},${e.uuid},${e.modified}")
}
writer.flush()
writer.close()
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/a6939ccc/stack/loadtests/src/test/resources/dummyAuditUuid.csv
----------------------------------------------------------------------
diff --git a/stack/loadtests/src/test/resources/dummyAuditUuid.csv b/stack/loadtests/src/test/resources/dummyAuditUuid.csv
index fc9f2fb..6d81339 100644
--- a/stack/loadtests/src/test/resources/dummyAuditUuid.csv
+++ b/stack/loadtests/src/test/resources/dummyAuditUuid.csv
@@ -1 +1 @@
-collection,uuid
+collection,name,uuid,modified
[3/3] incubator-usergrid git commit: Merge branch 'two-dot-o-dev' of
https://github.com/mdunker/incubator-usergrid into two-dot-o-dev
Posted by gr...@apache.org.
Merge branch 'two-dot-o-dev' of https://github.com/mdunker/incubator-usergrid into two-dot-o-dev
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/29f22332
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/29f22332
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/29f22332
Branch: refs/heads/two-dot-o-dev
Commit: 29f22332a1b5d5e29fad4e69b5a67b72790622ce
Parents: 6ad32c3 c5e1623
Author: GERey <gr...@apigee.com>
Authored: Mon Aug 3 16:52:50 2015 -0700
Committer: GERey <gr...@apigee.com>
Committed: Mon Aug 3 16:52:50 2015 -0700
----------------------------------------------------------------------
.../org/apache/usergrid/enums/AuthType.scala | 16 ++++++++++
.../usergrid/enums/ConfigProperties.scala | 16 ++++++++++
.../usergrid/enums/EndConditionType.scala | 16 ++++++++++
.../org/apache/usergrid/enums/EntityType.scala | 16 ++++++++++
.../apache/usergrid/enums/ScenarioType.scala | 16 ++++++++++
.../org/apache/usergrid/enums/TokenType.scala | 16 ++++++++++
.../usergrid/scenarios/AuditScenarios.scala | 32 ++++++++++++--------
.../org/apache/usergrid/settings/Settings.scala | 24 ++++++++++-----
.../src/test/resources/dummyAuditUuid.csv | 2 +-
stack/pom.xml | 5 +++
10 files changed, 137 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/29f22332/stack/pom.xml
----------------------------------------------------------------------
[2/3] incubator-usergrid git commit: USERGRID-871: RAT exclusions
Posted by gr...@apache.org.
USERGRID-871: RAT exclusions
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/c5e16239
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/c5e16239
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/c5e16239
Branch: refs/heads/two-dot-o-dev
Commit: c5e162397f03cdba3a69b94205e465b6df3e867a
Parents: a6939cc
Author: Mike Dunker <md...@apigee.com>
Authored: Mon Aug 3 16:38:21 2015 -0700
Committer: Mike Dunker <md...@apigee.com>
Committed: Mon Aug 3 16:38:21 2015 -0700
----------------------------------------------------------------------
stack/pom.xml | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/c5e16239/stack/pom.xml
----------------------------------------------------------------------
diff --git a/stack/pom.xml b/stack/pom.xml
index 6f984e3..9049f91 100644
--- a/stack/pom.xml
+++ b/stack/pom.xml
@@ -1553,6 +1553,11 @@
<exclude>loadtests/loadtest_setup.sh</exclude>
<exclude>loadtests/gatling/user-files/request-bodies/**</exclude>
+ <!-- gatling loadtest data files -->
+ <exclude>loadtests/src/main/scala/org/apache/usergrid/datagenerators/datafiles/**.txt</exclude>
+ <exclude>loadtests/src/main/scala/org/apache/usergrid/datagenerators/**.txt</exclude>
+ <exclude>loadtests/src/test/resources/**.csv</exclude>
+
<!-- other -->
<exclude>**/catalina_base/**</exclude>
<exclude>**/m2/**</exclude>