You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2015/05/26 16:03:27 UTC
[1/2] incubator-ignite git commit: # ignite-456: change history
managment
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-sprint-5 d70dbd4cc -> c75caba1c
# ignite-456: change history managment
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/484a0fe0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/484a0fe0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/484a0fe0
Branch: refs/heads/ignite-sprint-5
Commit: 484a0fe0dc083745c2a0fc0c1a6bbbea601cc376
Parents: d2af9e2
Author: artem.shutak <as...@gridgain.com>
Authored: Tue May 26 17:03:06 2015 +0300
Committer: artem.shutak <as...@gridgain.com>
Committed: Tue May 26 17:03:06 2015 +0300
----------------------------------------------------------------------
dev-tools/src/main/groovy/jiraslurp.groovy | 36 +++++++++++++++----------
1 file changed, 22 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/484a0fe0/dev-tools/src/main/groovy/jiraslurp.groovy
----------------------------------------------------------------------
diff --git a/dev-tools/src/main/groovy/jiraslurp.groovy b/dev-tools/src/main/groovy/jiraslurp.groovy
index 0920001..93349ef 100644
--- a/dev-tools/src/main/groovy/jiraslurp.groovy
+++ b/dev-tools/src/main/groovy/jiraslurp.groovy
@@ -117,8 +117,9 @@ def sendGetRequest = { urlString, user, pwd->
final GIT_REPO = "https://git1-us-west.apache.org/repos/asf/incubator-ignite.git"
final JIRA_URL = "https://issues.apache.org"
final ATTACHMENT_URL = "$JIRA_URL/jira/secure/attachment"
-final validated_filename = "${System.getProperty("user.home")}/validated-jira.txt"
-final LAST_SUCCESSFUL_ARTIFACT = "guestAuth/repository/download/Ignite_PatchValidation_PatchChecker/.lastSuccessful/$validated_filename"
+final HISTORY_FILE = "${System.getProperty("user.home")}/validated-jira.txt"
+final LAST_SUCCESSFUL_ARTIFACT = "guestAuth/repository/download/Ignite_PatchValidation_PatchChecker/.lastSuccessful/$HISTORY_FILE"
+final NL = System.getProperty("line.separator")
final def JIRA_CMD = System.getProperty('JIRA_COMMAND', 'jira.sh')
@@ -162,16 +163,20 @@ def readHistory = {
List validated_list = []
- def validated = new File(validated_filename)
+ def validated = new File(HISTORY_FILE)
if (validated.exists()) {
validated_list = validated.text.split('\n')
}
// Let's make sure the preserved history isn't too long
- if (validated_list.size > MAX_HISTORY)
+ if (validated_list.size > MAX_HISTORY) {
validated_list = validated_list[validated_list.size - MAX_HISTORY..validated_list.size - 1]
+ validated.delete()
+ validated << validated_list.join(NL)
+ }
+
println "History=$validated_list"
validated_list
@@ -211,31 +216,32 @@ def findAttachments = {
"https://issues.apache.org/jira/sr/jira.issueviews:searchrequest-xml/12330308/SearchRequest-12330308.xml?tempMax=100&field=key&field=attachments"
def rss = new XmlSlurper().parse(JIRA_FILTER)
- List list = readHistory {}
+ final List history = readHistory {}
LinkedHashMap<String, String> attachments = [:]
rss.channel.item.each { jira ->
String row = getLatestAttachment(jira)
- if (row != null && !list.contains(row)) {
+ if (row != null && !history.contains(row)) {
def pair = row.split(',')
attachments.put(pair[0] as String, pair[1] as String)
-
- list.add(row)
}
}
- // Write everything back to persist the list
- def validated = new File(validated_filename)
+ attachments
+}
- if (validated.exists())
- validated.delete()
+/**
+ * Store jira with attachment id to hostory.
+ */
+def addToHistory = {jira, attachmentId ->
+ def validated = new File(HISTORY_FILE)
- validated << list.join('\n')
+ assert validated.exists(), "History file does not exist."
- attachments
+ validated << NL + "$jira,$attachmentId"
}
def tryGitAmAbort = {
@@ -445,6 +451,8 @@ args.each {
println "Triggering the test builds for: $k = $ATTACHMENT_URL/$v/"
runAllTestBuilds(builds, k)
+
+ addToHistory(k, v)
}
}
else if (parameters.length >= 1 && parameters[0] == "patchApply") {
[2/2] incubator-ignite git commit: Merge remote-tracking branch
'origin/ignite-sprint-5' into ignite-sprint-5
Posted by sb...@apache.org.
Merge remote-tracking branch 'origin/ignite-sprint-5' into ignite-sprint-5
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/c75caba1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c75caba1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c75caba1
Branch: refs/heads/ignite-sprint-5
Commit: c75caba1c38f73818ca48df497c03a15c7f675a7
Parents: 484a0fe d70dbd4
Author: artem.shutak <as...@gridgain.com>
Authored: Tue May 26 17:03:30 2015 +0300
Committer: artem.shutak <as...@gridgain.com>
Committed: Tue May 26 17:03:30 2015 +0300
----------------------------------------------------------------------
.../processors/cache/IgniteCacheProxy.java | 3 +-
.../GridDistributedTxRemoteAdapter.java | 10 ++--
.../processors/query/GridQueryIndexing.java | 16 +++++
.../processors/query/GridQueryProcessor.java | 52 ++++++----------
.../query/h2/GridH2IndexingGeoSelfTest.java | 20 ++++++-
.../processors/query/h2/IgniteH2Indexing.java | 17 ++++++
.../query/h2/opt/GridH2AbstractKeyValueRow.java | 18 ++++--
.../query/h2/opt/GridH2KeyValueRowOffheap.java | 4 +-
.../query/h2/sql/GridSqlOperationType.java | 2 +-
.../h2/twostep/GridReduceQueryExecutor.java | 2 +-
.../IgniteCacheQueryMultiThreadedSelfTest.java | 2 +-
.../local/IgniteCacheLocalQuerySelfTest.java | 6 ++
.../visor/commands/node/VisorNodeCommand.scala | 2 +-
.../commands/tasks/VisorTasksCommand.scala | 2 +-
.../scala/org/apache/ignite/visor/visor.scala | 63 ++++++++++++++++++--
15 files changed, 161 insertions(+), 58 deletions(-)
----------------------------------------------------------------------