Skip to content

Commit

Permalink
Merge branch '0.9.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
shuzhi.cy committed Jan 3, 2014
2 parents 16d0886 + 512fcef commit 881db79
Show file tree
Hide file tree
Showing 8 changed files with 23 additions and 176 deletions.
Binary file modified README.md
View file
Binary file not shown.
85 changes: 9 additions & 76 deletions jstorm-client-extension/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,17 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<!-- <parent> -->
<!-- <groupId>com.alibaba.jstorm</groupId> -->
<!-- <artifactId>jstorm-all</artifactId> -->
<!-- <version>0.9.0</version> -->
<!-- <relativePath>..</relativePath> -->
<!-- </parent> -->
<parent>
<parent>
<groupId>com.alibaba.jstorm</groupId>
<artifactId>jstorm-all</artifactId>
<version>0.9.0</version>
<relativePath>..</relativePath>
</parent>
<!--
<parent>
<groupId>com.taobao</groupId>
<artifactId>parent</artifactId>
<version>1.0.2</version>
</parent>
-->
<modelVersion>4.0.0</modelVersion>
<groupId>com.alibaba.jstorm</groupId>
<artifactId>jstorm-client-extension</artifactId>
Expand Down Expand Up @@ -140,11 +142,6 @@
<artifactId>hiccup</artifactId>
<version>0.3.6</version>
</dependency>
<!-- <dependency> -->
<!-- <groupId>ring</groupId> -->
<!-- <artifactId>ring-devel</artifactId> -->
<!-- <version>0.3.11</version> -->
<!-- </dependency> -->
<dependency>
<groupId>ring</groupId>
<artifactId>ring-jetty-adapter</artifactId>
Expand Down Expand Up @@ -208,35 +205,12 @@
<artifactId>guava</artifactId>
<version>13.0</version>
</dependency>
<!--
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>1.0.6</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>log4j-over-slf4j</artifactId>
<version>1.6.6</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
<version>1.6.6</version>
</dependency>
-->
<dependency>
<groupId>org.clojure</groupId>
<artifactId>tools.nrepl</artifactId>
<version>0.2.3</version>
<scope>test</scope>
</dependency>
<!-- <dependency> -->
<!-- <groupId>clojure-complete</groupId> -->
<!-- <artifactId>clojure-complete</artifactId> -->
<!-- <version>0.2.3</version> -->
<!-- <scope>test</scope> -->
<!-- </dependency> -->
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
Expand Down Expand Up @@ -271,47 +245,6 @@
<version>3.0</version>
<scope>test</scope>
</dependency>
<!--
<dependency>
<groupId>cglib</groupId>
<artifactId>cglib-nodep</artifactId>
<version>2.1_3</version>
</dependency>
<dependency>
<groupId>swank-clojure</groupId>
<artifactId>swank-clojure</artifactId>
<version>1.2.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>lein-ring</groupId>
<artifactId>lein-ring</artifactId>
<version>0.4.5</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.clojure</groupId>
<artifactId>clojure-contrib</artifactId>
<version>1.2.0</version>
</dependency>
<dependency>
<groupId>com.googlecode</groupId>
<artifactId>kryo</artifactId>
<version>1.04</version>
</dependency>
-->

<!-- <dependency> -->
<!-- <groupId>org.clojure</groupId> -->
<!-- <artifactId>clojure</artifactId> -->
<!-- <version>1.4.0</version> -->
<!-- </dependency> -->
<!-- <dependency> -->
<!-- <groupId>org.slf4j</groupId> -->
<!-- <artifactId>slf4j-log4j12</artifactId> -->
<!-- <version>1.5.6</version> -->
<!-- </dependency> -->


</dependencies>
Expand Down
10 changes: 5 additions & 5 deletions jstorm-client-extension/src/main/java/com/alibaba/jstorm/utils/RotatingMap.java
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
package com.alibaba.jstorm.utils;

import java.util.Iterator;
import java.util.LinkedList;
import java.util.Map;
import java.util.Map.Entry;
import java.util.concurrent.ConcurrentHashMap;

import org.apache.log4j.Logger;
import java.util.concurrent.LinkedBlockingDeque;

/**
* Expires keys that have not been updated in the configured number of seconds.
Expand All @@ -26,15 +24,17 @@ public static interface ExpiredCallback<K, V> {
public void expire(K key, V val);
}

private LinkedList<Map<K, V>> _buckets;
private LinkedBlockingDeque<Map<K, V>> _buckets;

private ExpiredCallback _callback;

private final Object lock = new Object();

public RotatingMap(int numBuckets, ExpiredCallback<K, V> callback) {
if(numBuckets<2) {
throw new IllegalArgumentException("numBuckets must be >= 2");
}
_buckets = new LinkedList<Map<K, V>>();
_buckets = new LinkedBlockingDeque<Map<K, V>>();
for(int i=0; i<numBuckets; i++) {
_buckets.add(new ConcurrentHashMap<K, V>());
}
Expand Down
85 changes: 9 additions & 76 deletions jstorm-client/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,16 +1,18 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

<!-- <parent> -->
<!-- <groupId>com.alibaba.jstorm</groupId> -->
<!-- <artifactId>jstorm-all</artifactId> -->
<!-- <version>0.9.0</version> -->
<!-- <relativePath>..</relativePath> -->
<!-- </parent> -->
<parent>
<groupId>com.alibaba.jstorm</groupId>
<artifactId>jstorm-all</artifactId>
<version>0.9.0</version>
<relativePath>..</relativePath>
</parent>
<!--
<parent>
<groupId>com.taobao</groupId>
<artifactId>parent</artifactId>
<version>1.0.2</version>
</parent>
</parent>
-->
<modelVersion>4.0.0</modelVersion>
<groupId>com.alibaba.jstorm</groupId>
<artifactId>jstorm-client</artifactId>
Expand Down Expand Up @@ -141,11 +143,6 @@
<artifactId>hiccup</artifactId>
<version>0.3.6</version>
</dependency>
<!-- <dependency> -->
<!-- <groupId>ring</groupId> -->
<!-- <artifactId>ring-devel</artifactId> -->
<!-- <version>0.3.11</version> -->
<!-- </dependency> -->
<dependency>
<groupId>ring</groupId>
<artifactId>ring-jetty-adapter</artifactId>
Expand Down Expand Up @@ -209,35 +206,12 @@
<artifactId>guava</artifactId>
<version>13.0</version>
</dependency>
<!--
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>1.0.6</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>log4j-over-slf4j</artifactId>
<version>1.6.6</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
<version>1.6.6</version>
</dependency>
-->
<dependency>
<groupId>org.clojure</groupId>
<artifactId>tools.nrepl</artifactId>
<version>0.2.3</version>
<scope>test</scope>
</dependency>
<!-- <dependency> -->
<!-- <groupId>clojure-complete</groupId> -->
<!-- <artifactId>clojure-complete</artifactId> -->
<!-- <version>0.2.3</version> -->
<!-- <scope>test</scope> -->
<!-- </dependency> -->
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
Expand Down Expand Up @@ -272,47 +246,6 @@
<version>3.0</version>
<scope>test</scope>
</dependency>
<!--
<dependency>
<groupId>cglib</groupId>
<artifactId>cglib-nodep</artifactId>
<version>2.1_3</version>
</dependency>
<dependency>
<groupId>swank-clojure</groupId>
<artifactId>swank-clojure</artifactId>
<version>1.2.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>lein-ring</groupId>
<artifactId>lein-ring</artifactId>
<version>0.4.5</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.clojure</groupId>
<artifactId>clojure-contrib</artifactId>
<version>1.2.0</version>
</dependency>
<dependency>
<groupId>com.googlecode</groupId>
<artifactId>kryo</artifactId>
<version>1.04</version>
</dependency>
-->

<!-- <dependency> -->
<!-- <groupId>org.clojure</groupId> -->
<!-- <artifactId>clojure</artifactId> -->
<!-- <version>1.4.0</version> -->
<!-- </dependency> -->
<!-- <dependency> -->
<!-- <groupId>org.slf4j</groupId> -->
<!-- <artifactId>slf4j-log4j12</artifactId> -->
<!-- <version>1.5.6</version> -->
<!-- </dependency> -->


</dependencies>
Expand Down
15 changes: 0 additions & 15 deletions jstorm-server/conf/aloha_logback.xml
View file

This file was deleted.

2 changes: 0 additions & 2 deletions jstorm-server/conf/storm.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@
storm.zookeeper.servers:
- "localhost"

nimbus.host: "localhost"

storm.zookeeper.root: "/jstorm"

storm.local.dir: "jstorm"
Expand Down
1 change: 0 additions & 1 deletion jstorm-server/src/main/java/com/alibaba/jstorm/callback/AsyncLoopRunnable.java
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package com.alibaba.jstorm.callback;

import org.apache.log4j.Logger;
import org.mortbay.log.Log;

import com.alibaba.jstorm.utils.JStormServerUtils;

Expand Down
1 change: 0 additions & 1 deletion jstorm-server/src/main/java/com/alibaba/jstorm/schedule/TopologyAssignContext.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@

import org.apache.commons.lang.builder.ToStringBuilder;
import org.apache.commons.lang.builder.ToStringStyle;
import org.mortbay.jetty.handler.StatisticsHandler;

import com.alibaba.jstorm.daemon.supervisor.SupervisorInfo;
import com.alibaba.jstorm.task.Assignment;
Expand Down

0 comments on commit 881db79

Please sign in to comment.