You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@helix.apache.org by ka...@apache.org on 2014/03/25 22:19:57 UTC
[1/4] git commit: [HELIX-412] Remove camel/josql from ivy,
missed some lines
Repository: helix
Updated Branches:
refs/heads/helix-0.6.x 34fa62c39 -> ba98d03d5
[HELIX-412] Remove camel/josql from ivy, missed some lines
Project: http://git-wip-us.apache.org/repos/asf/helix/repo
Commit: http://git-wip-us.apache.org/repos/asf/helix/commit/930406db
Tree: http://git-wip-us.apache.org/repos/asf/helix/tree/930406db
Diff: http://git-wip-us.apache.org/repos/asf/helix/diff/930406db
Branch: refs/heads/helix-0.6.x
Commit: 930406dbb4f0d32055865e17af91fa213be515aa
Parents: 001d59d
Author: Kanak Biscuitwala <ka...@apache.org>
Authored: Fri Mar 21 11:21:25 2014 -0700
Committer: Kanak Biscuitwala <ka...@apache.org>
Committed: Tue Mar 25 14:19:25 2014 -0700
----------------------------------------------------------------------
helix-core/helix-core-0.6.4-SNAPSHOT.ivy | 2 --
1 file changed, 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/helix/blob/930406db/helix-core/helix-core-0.6.4-SNAPSHOT.ivy
----------------------------------------------------------------------
diff --git a/helix-core/helix-core-0.6.4-SNAPSHOT.ivy b/helix-core/helix-core-0.6.4-SNAPSHOT.ivy
index 6fc37dd..74ed0ba 100644
--- a/helix-core/helix-core-0.6.4-SNAPSHOT.ivy
+++ b/helix-core/helix-core-0.6.4-SNAPSHOT.ivy
@@ -54,8 +54,6 @@ under the License.
<dependency org="commons-cli" name="commons-cli" rev="1.2" conf="compile->compile(default);runtime->runtime(default);default->default"/>
<dependency org="commons-math" name="commons-math" rev="2.1" conf="compile->compile(default);runtime->runtime(default);default->default"/>
<dependency org="com.github.sgroschupf" name="zkclient" rev="0.1" conf="compile->compile(default);runtime->runtime(default);default->default"/>
- <dependency org="org.fusesource.commonman" name="commons-management" rev="1.0" conf="compile->compile(*),master(*);runtime->runtime(*)"/>
- <dependency org="commons-logging" name="commons-logging-api" rev="1.1" conf="compile->compile(*),master(*);runtime->runtime(*)"/>
<dependency org="org.restlet.jse" name="org.restlet" rev="2.1.4" force="true" conf="compile->compile(*),master(*);runtime->runtime(*)"/>
<dependency org="commons-logging" name="commons-logging-api" rev="1.1" conf="compile->compile(*),master(*);runtime->runtime(*)"/>
</dependencies>
[3/4] git commit: [HELIX-414] Fix property store paths for rsync
recipe
Posted by ka...@apache.org.
[HELIX-414] Fix property store paths for rsync recipe
Project: http://git-wip-us.apache.org/repos/asf/helix/repo
Commit: http://git-wip-us.apache.org/repos/asf/helix/commit/82d9d09b
Tree: http://git-wip-us.apache.org/repos/asf/helix/tree/82d9d09b
Diff: http://git-wip-us.apache.org/repos/asf/helix/diff/82d9d09b
Branch: refs/heads/helix-0.6.x
Commit: 82d9d09bf4aeae77ddd6b0cb9fef6d8ba95dda17
Parents: 4dc2b42
Author: Kanak Biscuitwala <ka...@apache.org>
Authored: Tue Mar 25 14:17:13 2014 -0700
Committer: Kanak Biscuitwala <ka...@apache.org>
Committed: Tue Mar 25 14:19:25 2014 -0700
----------------------------------------------------------------------
helix-core/helix-core-0.6.4-SNAPSHOT.ivy | 3 +--
.../org/apache/helix/filestore/FileStoreStateModel.java | 11 +++++------
2 files changed, 6 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/helix/blob/82d9d09b/helix-core/helix-core-0.6.4-SNAPSHOT.ivy
----------------------------------------------------------------------
diff --git a/helix-core/helix-core-0.6.4-SNAPSHOT.ivy b/helix-core/helix-core-0.6.4-SNAPSHOT.ivy
index f4b5f0d..3b54149 100644
--- a/helix-core/helix-core-0.6.4-SNAPSHOT.ivy
+++ b/helix-core/helix-core-0.6.4-SNAPSHOT.ivy
@@ -61,8 +61,7 @@ under the License.
<dependency org="org.fusesource.commonman" name="commons-management" rev="1.0" conf="compile->compile(*),master(*);runtime->runtime(*)"/>
<dependency org="commons-logging" name="commons-logging-api" rev="1.1" conf="compile->compile(*),master(*);runtime->runtime(*)"/>
<dependency org="org.restlet.jse" name="org.restlet" rev="2.1.4" force="true" conf="compile->compile(*),master(*);runtime->runtime(*)"/>
- <dependency org="net.sf" name="jsqlparser" rev="0.7.0" force="true" conf="compile->compile(*),master(*);runtime->runtime(*)"/>
-
+ <dependency org="commons-logging" name="commons-logging-api" rev="1.1" conf="compile->compile(*),master(*);runtime->runtime(*)"/>
</dependencies>
</ivy-module>
http://git-wip-us.apache.org/repos/asf/helix/blob/82d9d09b/recipes/rsync-replicated-file-system/src/main/java/org/apache/helix/filestore/FileStoreStateModel.java
----------------------------------------------------------------------
diff --git a/recipes/rsync-replicated-file-system/src/main/java/org/apache/helix/filestore/FileStoreStateModel.java b/recipes/rsync-replicated-file-system/src/main/java/org/apache/helix/filestore/FileStoreStateModel.java
index 6809a87..ce3d564 100644
--- a/recipes/rsync-replicated-file-system/src/main/java/org/apache/helix/filestore/FileStoreStateModel.java
+++ b/recipes/rsync-replicated-file-system/src/main/java/org/apache/helix/filestore/FileStoreStateModel.java
@@ -20,9 +20,6 @@ package org.apache.helix.filestore;
*/
import org.I0Itec.zkclient.DataUpdater;
-import org.apache.log4j.Logger;
-import org.apache.zookeeper.data.Stat;
-
import org.apache.helix.AccessOption;
import org.apache.helix.HelixManager;
import org.apache.helix.NotificationContext;
@@ -33,6 +30,8 @@ import org.apache.helix.participant.statemachine.StateModel;
import org.apache.helix.participant.statemachine.StateModelInfo;
import org.apache.helix.participant.statemachine.Transition;
import org.apache.helix.store.zk.ZkHelixPropertyStore;
+import org.apache.log4j.Logger;
+import org.apache.zookeeper.data.Stat;
@StateModelInfo(initialState = "OFFLINE", states = {
"OFFLINE", "MASTER", "SLAVE"
@@ -151,12 +150,12 @@ public class FileStoreStateModel extends StateModel {
CheckpointFile checkpointFile = new CheckpointFile(checkpointDirPath);
final ChangeRecord lastRecordProcessed = checkpointFile.findLastRecordProcessed();
DataUpdater<ZNRecord> updater = new HighWaterMarkUpdater(message, lastRecordProcessed);
- helixPropertyStore.update("TRANSACTION_ID_METADATA" + "/" + message.getResourceName(), updater,
- AccessOption.PERSISTENT);
+ helixPropertyStore.update("/TRANSACTION_ID_METADATA" + "/" + message.getResourceName(),
+ updater, AccessOption.PERSISTENT);
Stat stat = new Stat();
;
ZNRecord znRecord =
- helixPropertyStore.get("TRANSACTION_ID_METADATA" + "/" + message.getResourceName(), stat,
+ helixPropertyStore.get("/TRANSACTION_ID_METADATA" + "/" + message.getResourceName(), stat,
AccessOption.PERSISTENT);
int startGen = Integer.parseInt(znRecord.getSimpleField("currentGen"));
int startSeq = Integer.parseInt(znRecord.getSimpleField("currentGenStartSeq"));
[2/4] git commit: [HELIX-412] Remove camel/josql from ivy files
Posted by ka...@apache.org.
[HELIX-412] Remove camel/josql from ivy files
Project: http://git-wip-us.apache.org/repos/asf/helix/repo
Commit: http://git-wip-us.apache.org/repos/asf/helix/commit/001d59d8
Tree: http://git-wip-us.apache.org/repos/asf/helix/tree/001d59d8
Diff: http://git-wip-us.apache.org/repos/asf/helix/diff/001d59d8
Branch: refs/heads/helix-0.6.x
Commit: 001d59d84023c0139f2c6c858f771ed3aa53bd67
Parents: 82d9d09
Author: Kanak Biscuitwala <ka...@apache.org>
Authored: Fri Mar 21 11:12:47 2014 -0700
Committer: Kanak Biscuitwala <ka...@apache.org>
Committed: Tue Mar 25 14:19:25 2014 -0700
----------------------------------------------------------------------
helix-core/helix-core-0.6.4-SNAPSHOT.ivy | 4 ----
1 file changed, 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/helix/blob/001d59d8/helix-core/helix-core-0.6.4-SNAPSHOT.ivy
----------------------------------------------------------------------
diff --git a/helix-core/helix-core-0.6.4-SNAPSHOT.ivy b/helix-core/helix-core-0.6.4-SNAPSHOT.ivy
index 3b54149..6fc37dd 100644
--- a/helix-core/helix-core-0.6.4-SNAPSHOT.ivy
+++ b/helix-core/helix-core-0.6.4-SNAPSHOT.ivy
@@ -54,10 +54,6 @@ under the License.
<dependency org="commons-cli" name="commons-cli" rev="1.2" conf="compile->compile(default);runtime->runtime(default);default->default"/>
<dependency org="commons-math" name="commons-math" rev="2.1" conf="compile->compile(default);runtime->runtime(default);default->default"/>
<dependency org="com.github.sgroschupf" name="zkclient" rev="0.1" conf="compile->compile(default);runtime->runtime(default);default->default"/>
- <dependency org="org.apache.camel" name="camel-josql" rev="2.5.0" conf="compile->compile(default);runtime->runtime(default);default->default"/>
- <dependency org="org.apache.camel" name="camel-core" rev="2.5.0" conf="compile->compile(*),master(*);runtime->runtime(*)"/>
- <dependency org="net.sf.josql" name="gentlyweb-utils" rev="1.5" conf="compile->compile(*),master(*);runtime->runtime(*)"/>
- <dependency org="net.sf.josql" name="josql" rev="1.5" conf="compile->compile(*),master(*);runtime->runtime(*)"/>
<dependency org="org.fusesource.commonman" name="commons-management" rev="1.0" conf="compile->compile(*),master(*);runtime->runtime(*)"/>
<dependency org="commons-logging" name="commons-logging-api" rev="1.1" conf="compile->compile(*),master(*);runtime->runtime(*)"/>
<dependency org="org.restlet.jse" name="org.restlet" rev="2.1.4" force="true" conf="compile->compile(*),master(*);runtime->runtime(*)"/>
[4/4] git commit: Merge branch 'helix-0.6.x' of
https://git-wip-us.apache.org/repos/asf/helix into helix-0.6.x
Posted by ka...@apache.org.
Merge branch 'helix-0.6.x' of https://git-wip-us.apache.org/repos/asf/helix into helix-0.6.x
Project: http://git-wip-us.apache.org/repos/asf/helix/repo
Commit: http://git-wip-us.apache.org/repos/asf/helix/commit/ba98d03d
Tree: http://git-wip-us.apache.org/repos/asf/helix/tree/ba98d03d
Diff: http://git-wip-us.apache.org/repos/asf/helix/diff/ba98d03d
Branch: refs/heads/helix-0.6.x
Commit: ba98d03d54eea673f9074f0a126b881219fb7405
Parents: 930406d 34fa62c
Author: Kanak Biscuitwala <ka...@apache.org>
Authored: Tue Mar 25 14:19:48 2014 -0700
Committer: Kanak Biscuitwala <ka...@apache.org>
Committed: Tue Mar 25 14:19:48 2014 -0700
----------------------------------------------------------------------
----------------------------------------------------------------------