0.22.2

README.md

@@ -14,27 +14,8 @@ mdrill
 
 
 
-<h1> 发行日志</h1>
- 2013.07.24 version 0.18-beta  初始化版本  <br>
- 2013.08.07 version 0.18.1-beta bug fix <a href="https://github.com/alibaba/mdrill/wiki/018_1">see detail</a>  <br>
- 2013.08.17 version 0.18.2-beta speed up <a href="https://github.com/alibaba/mdrill/wiki/018_2">see detail</a>  (<a href="http://yunpan.cn/QXn4tRAzx8NIL" target="_blank">下载</a>) <br>
- 2013.09.01 version 0.19-alpha HA by replication <a href="https://github.com/alibaba/mdrill/wiki/019_alpha">see detail</a>  (此版本需要一定时间的测试与调整，慎用) <br>
- 2013.09.26 version 0.19.1-beta Bug Fix <a href="https://github.com/alibaba/mdrill/wiki/019_beta_1">see detail</a>  (<a href="http://yunpan.cn/QGprqdtDD7r2x" target="_blank">下载</a>) <br>
- 2013.09.29 version 0.19.2-beta Bug Fix (<a href="http://yunpan.cn/QGC7TX2tupBcn" target="_blank">下载</a>) <br>
- 2013.10.09 version 0.19.3-beta speed up (此版本有严重BUG,请勿使用,<a href="http://yunpan.cn/QbreqTZbusDtu" target="_blank">下载</a>) <br>
- 2013.10.13 version 0.19.4-beta mergerServer优化&&bugfix (推荐版本,<a href="http://yunpan.cn/Qbk4ebcjuUyjL" target="_blank">下载</a>,依赖的zeromq从<a href="http://yunpan.cn/QGp3QIMaBbnpy" target="_blank">这里下载</a>) <br>
- 2013.11.19 version 0.20.1-alpha 使用hdfs进行检索&&实时append <a href="https://github.com/alibaba/mdrill/wiki/020_1">see detail</a>(alpha版本，慎用。 <a href="http://yunpan.cn/QUypgcZpmvwwv" target="_blank">源码下载</a>) <br>
- 2013.12.03 version 0.20.2-alpha 全文检索模式优化 <a href="https://github.com/alibaba/mdrill/wiki/020_2">see detail</a>(alpha版本，慎用。 <a href="http://yunpan.cn/QUeabpfm9bHwG" target="_blank">源码下载</a>) <br>
- 2013.12.05 version 0.20.3-alpha bugfix (alpha版本，慎用。 <a href="http://yunpan.cn/QU9u6YIRUyVin" target="_blank">源码下载</a>) <br>
- 2014.01.02 version 0.20.4-alpha 通过editlog来保证实时数据的可靠性 <a href="https://github.com/alibaba/mdrill/wiki/0_20_4_alpha" >see detail</a>(alpha版本，慎用。 <a href="http://yunpan.cn/QDTNyLH6NjyeA" target="_blank">源码下载</a>) <br>
- 2014.01.14 version 0.20.5-alpha bug fix (<a href="http://yunpan.cn/QzP6H2vfgW5k8" target="_blank">下载</a>) <br>
- 2014.01.26 version 0.20.6-alpha bug fix (<a href="http://yunpan.taobao.com/share/link/N62RcRYGa" target="_blank">下载</a>) <br>
- 2014.02.08 version 0.20.7-alpha cache改进 <a href="https://github.com/alibaba/mdrill/wiki/0.20.7">see detail</a>  (<a href="http://yunpan.taobao.com/share/link/662RdRlqL" target="_blank">点击这里下载</a> 。) <br>
- 2014.02.18 version 0.20.8.3-alpha bugfix&&重写调度&&优化 <a href="https://github.com/alibaba/mdrill/wiki/0.20.8">see detail</a>  (<a href="http://yunpan.taobao.com/share/link/862RiROZx" target="_blank">点击这里下载</a>)<br>
- 2014.03.05 version 0.20.9-beta bugfix <a href="https://github.com/alibaba/mdrill/wiki/0.20.9">see detail</a>  ( <a href="http://yunpan.taobao.com/share/link/862RqRFhx" target="_blank">点击这里下载</a> ) <br>
- 2014.03.28 version 0.21.1-alpha update模式的开发  (开发中的版本，请不要使用。<a href="http://yunpan.taobao.com/share/link/863R1R43x" target="_blank">点击这里获取源码</a> ) <br>
- 2014.06.29 version 0.22.1-beta <a href="https://github.com/alibaba/mdrill/blob/master/doc/Mdrill%E9%A1%B9%E7%9B%AE%E5%9C%A8lucene%E7%9A%84%E6%94%B9%E8%BF%9B%E4%B8%8A%E7%9A%8410%E7%82%B9%E5%BF%83%E5%BE%97.docx?raw=true">大幅度提高查询速度</a>  (推荐版本，之前的索引需要重建。<a href="http://yunpan.taobao.com/share/link/J64R7RKiW" target="_blank">点击这里获取源码,自行编译</a>  依赖的zeromq从<a href="http://yunpan.alibaba.com/share/link/463RLR7lN" target="_blank">这里下载</a>) <br>
-
+<h1> 版本下载</h1>
+<a href="https://github.com/alibaba/mdrill/wiki/version">版本下载</a>
 
 
 <h1>资源列表</h1>

trunk/adhoc-core/src/main/java/com/alipay/bluewhale/core/cluster/StormClusterState.java

@@ -10,7 +10,7 @@
 import com.alipay.bluewhale.core.task.heartbeat.TaskHeartbeat;
 
 /**
- * ²Ù×÷stormÔÚzkÉϵĽڵãÐÅÏ¢
+ * ����storm��zk�ϵĽڵ���Ϣ
  */
 public interface StormClusterState {
 	public List<String> assignments(RunnableCallback callback);
@@ -60,5 +60,5 @@ public interface StormClusterState {
 	void higo_remove(String tablename);
 	void higo_remove_task(String tablename, Integer taskId);
 	List<String> higo_tableList();
-	void higo_base(String tablename, RunnableCallback callback);
+	List<Integer> higo_base(String tablename, RunnableCallback callback);
 }

trunk/adhoc-core/src/main/java/com/alipay/bluewhale/core/cluster/StormZkClusterState.java

@@ -77,7 +77,7 @@ public <T> Object execute(T... args) {
 						RunnableCallback fn = null;
 						if (root.equals(Cluster.ASSIGNMENTS_ROOT)) {
 							if (size == 1) {
-								//设置null，返回oldvalue
+								//����null������oldvalue
 								fn = assignments_callback.getAndSet(null);
 							} else {
 								params = toks.get(1);
@@ -100,7 +100,7 @@ public <T> Object execute(T... args) {
 						}
 
 						if (fn != null) {
-							//FIXME 何处设置这三个参数？？
+							//FIXME �������������������
 							//fn.setArgs(params, zkEventTypes, path);
 							fn.run();
 						}
@@ -402,12 +402,28 @@ public void higo_heartbeat(String tablename,Integer task, SolrInfo info) {
 	}
 
 	@Override
-	public void higo_base(String tablename, RunnableCallback callback) {
+	public List<Integer> higo_base(String tablename, RunnableCallback callback) {
 		if (callback != null) {
 			higo_base_callback.put(tablename, callback);
 		}
+
+
+		String tablePath = Cluster.higo_table(tablename);
+
+		List<String> list = cluster_state.get_children(tablePath, callback != null);
+
+		List<Integer> rtn = new ArrayList<Integer>();
+		if(list!=null)
+		{
+			for (String str : list) {
+				rtn.add(Integer.parseInt(str));
+			}
+		}
+
+		return rtn;
 	}
 
+
 	@Override
 	public List<Integer> higo_ids(String tablename) {
 
@@ -425,6 +441,8 @@ public List<Integer> higo_ids(String tablename) {
 		return rtn;
 	}
 
+
+
 	@Override
 	public List<String> higo_tableList() {
 

trunk/adhoc-core/webapp/downloadabtest.jsp

@@ -6,6 +6,8 @@
 
 	<%	
 	String uuid = request.getParameter("uuid");
+		String isall = request.getParameter("isall");
+String matchallstre="y";
 
 	String did=AdhocOfflineService.readHiveResultID(uuid);
 
@@ -16,7 +18,7 @@
 	out.clear();
   out = pageContext.pushBody();
 	OutputStreamWriter outStream = new OutputStreamWriter(response.getOutputStream(),"gbk"); 
-	AdhocOfflineService.readAbtestResult(uuid,outStream,"",true);
+	AdhocOfflineService.readAbtestResult(uuid,outStream,"",!matchallstre.equals(isall));
 	outStream.flush();
   outStream.close();
 

trunk/adhoc-core/webapp/quanjing/navi.jsp

@@ -10,18 +10,14 @@
 
 	String[] namelist={
 		"p4p监控"
-		,"416宇宙扎堆节"
 		,"流量分析"
-		,"3.8生活节"
 		,"TANX外投流量指标"
 		,"TANX外投流量数据排行"
 	};
 	
 		String[] hrefList={
 		"./goldeye_realtime.jsp"
-		,"./416_realtime.jsp"
 		,"./siteoverlap.jsp"
-		,"./3_8_realtime.jsp"
 		,"./tanxpv.jsp"
 		,"./tanx_table.jsp"
 	};

trunk/adhoc-internal/pom.xml

@@ -44,7 +44,11 @@
 	       <artifactId>adhoc-realtime</artifactId>
 	        <version>0.18-beta</version>
 	</dependency>
-
+		<dependency>
+	     <groupId>com.alimama.dw</groupId>
+	       <artifactId>adhoc-web</artifactId>
+	        <version>0.18-beta</version>
+	</dependency>
 
  	<dependency>
             <groupId>com.alibaba.cdo</groupId>