Alawn/Druid
1
0
Fork 0
mirror of https://github.com/alibaba/druid.git synced 2023-03-04 19:17:16 +00:00
Code Issues Releases Wiki Activity

multiStatmentAllow config

Browse Source
This commit is contained in:
温少
2012-03-20 01:30:13 +08:00
parent 0756bff598
commit 636a815c84
18 changed files with 17 additions and 4362 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/alibaba/druid/filter/trace/TraceAfterEvent.java
-42
View File
@@ -1,42 +0,0 @@
/*
* Copyright 1999-2011 Alibaba Group Holding Ltd.
*
* Licensed 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 com.alibaba.druid.filter.trace;
import java.util.Date;
public class TraceAfterEvent extends TraceEvent {
public TraceAfterEvent(){
}
public TraceAfterEvent(String eventType, Date eventTime, long timespan){
super(eventType, eventTime);
this.getContext().put("timespan", timespan);
}
public long getTimespan() {
Long timespan = ((Long) getContext().get("timespan"));
if (timespan == null) {
return 0;
}
return timespan.longValue();
}
public void setTimespan(long timespan) {
this.getContext().put("timespan", timespan);
}
}
src/main/java/com/alibaba/druid/filter/trace/TraceErrorEvent.java
-48
View File
@@ -1,48 +0,0 @@
/*
* Copyright 1999-2011 Alibaba Group Holding Ltd.
*
* Licensed 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 com.alibaba.druid.filter.trace;
import java.util.Date;
public class TraceErrorEvent extends TraceEvent {
public TraceErrorEvent(){
}
public TraceErrorEvent(String eventType, Date eventTime, Throwable error){
super(eventType, eventTime);
this.getContext().put("error", error);
}
public Throwable getError() {
return (Throwable) getContext().get("error");
}
public void setError(Throwable error) {
this.getContext().put("error", error);
}
public Date getErrorTime() {
return (Date) getContext().get("errorTime");
}
public void setErrorTime(Date errorTime) {
this.getContext().put("errorTime", errorTime);
}
}
src/main/java/com/alibaba/druid/filter/trace/TraceEvent.java
-61
View File
@@ -1,61 +0,0 @@
/*
* Copyright 1999-2011 Alibaba Group Holding Ltd.
*
* Licensed 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 com.alibaba.druid.filter.trace;
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
public class TraceEvent {
private Date eventTime;
private String eventType;
private final Map<String, Object> context = new HashMap<String, Object>();
public TraceEvent(){
this.eventTime = new Date();
}
public TraceEvent(String eventType, Date eventTime){
this.eventType = eventType;
this.eventTime = eventTime;
}
public Date getEventTime() {
return eventTime;
}
public void setEventTime(Date eventTime) {
this.eventTime = eventTime;
}
public Map<String, Object> getContext() {
return context;
}
public String getEventType() {
return eventType;
}
public void setEventType(String eventType) {
this.eventType = eventType;
}
public void putContext(String name, Object value) {
this.context.put(name, value);
}
}
src/main/java/com/alibaba/druid/filter/trace/TraceEventListener.java
-23
View File
@@ -1,23 +0,0 @@
/*
* Copyright 1999-2011 Alibaba Group Holding Ltd.
*
* Licensed 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 com.alibaba.druid.filter.trace;
import java.util.EventListener;
public interface TraceEventListener extends EventListener {
void fireEvent(TraceEvent event);
}
src/main/java/com/alibaba/druid/filter/trace/TraceFilter.java
-3443
View File
File diff suppressed because it is too large Load Diff
src/main/java/com/alibaba/druid/filter/trace/TraceFilterMBean.java
-20
View File
@@ -1,20 +0,0 @@
/*
* Copyright 1999-2011 Alibaba Group Holding Ltd.
*
* Licensed 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 com.alibaba.druid.filter.trace;
public interface TraceFilterMBean {
}
src/main/java/com/alibaba/druid/stat/JdbcStatManager.java
+4 -6
View File
@@ -72,8 +72,6 @@ public class JdbcStatManager implements JdbcStatManagerMBean {
public JdbcStatContext createStatContext() {
JdbcStatContext context = new JdbcStatContext();
context.setTraceEnable(JdbcTraceManager.getInstance().isTraceEnable());
return context;
}
@@ -180,9 +178,9 @@ public class JdbcStatManager implements JdbcStatManagerMBean {
SimpleType.LONG, //
SimpleType.DATE, //
SimpleType.LONG, //
SimpleType.LONG, //
new ArrayType<Long>(SimpleType.LONG, true), //
SimpleType.LONG, //
new ArrayType<Long>(SimpleType.LONG, true), //
// 55 -
new ArrayType<Long>(SimpleType.LONG, true)
//
@@ -263,7 +261,7 @@ public class JdbcStatManager implements JdbcStatManagerMBean {
"ConnectionAliveMillisMax", //
"ConnectionAliveMillisMin", //
"ConnectionHistogram", //
// 55 -
"StatementHistogram",
//
src/main/java/com/alibaba/druid/stat/JdbcTraceManager.java
+2 -99
View File
@@ -15,109 +15,12 @@
*/
package com.alibaba.druid.stat;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.atomic.AtomicLong;
public class JdbcTraceManager implements JdbcTraceManagerMBean {
import javax.management.Notification;
import javax.management.NotificationBroadcasterSupport;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import com.alibaba.druid.filter.trace.TraceEvent;
import com.alibaba.druid.filter.trace.TraceEventListener;
public class JdbcTraceManager extends NotificationBroadcasterSupport implements JdbcTraceManagerMBean {
public final static Log LOG = LogFactory.getLog(JdbcTraceManager.class);
private boolean traceEnable = false;
private final static JdbcTraceManager instance = new JdbcTraceManager();
private final List<TraceEventListener> eventListeners = new ArrayList<TraceEventListener>();
private final AtomicLong fireEventCount = new AtomicLong();
private final AtomicLong skipEventCount = new AtomicLong();
private boolean notificationEnable = false;
private final NotificationTraceEventListener notificationListener = new NotificationTraceEventListener();
public boolean isNotificationEnable() {
return notificationEnable;
}
public void setNotificationEnable(boolean notificationEnable) {
this.notificationEnable = notificationEnable;
}
public NotificationTraceEventListener getNotificationListener() {
return notificationListener;
}
private final static JdbcTraceManager instance = new JdbcTraceManager();
public static JdbcTraceManager getInstance() {
return instance;
}
public boolean isTraceEnable() {
return traceEnable;
}
public void setTraceEnable(boolean traceEnable) {
this.traceEnable = traceEnable;
}
public long getEventFiredCount() {
return fireEventCount.get();
}
public int getEventListenerSize() {
return this.eventListeners.size();
}
public long getEventSkipCount() {
return skipEventCount.get();
}
public void fireTraceEvent(TraceEvent event) {
fireEventCount.incrementAndGet();
if (!this.traceEnable) {
skipEventCount.incrementAndGet();
return;
}
if (isNotificationEnable()) {
notificationListener.fireEvent(event);
}
for (TraceEventListener listener : this.eventListeners) {
try {
listener.fireEvent(event);
} catch (Exception e) {
LOG.error("fireTraceEventError", e);
}
}
}
public List<TraceEventListener> getEventListeners() {
return eventListeners;
}
public class NotificationTraceEventListener implements TraceEventListener {
private long sequenceNumber = 0;
@Override
public void fireEvent(TraceEvent event) {
Notification notification = new Notification(event.getEventType(), JdbcTraceManager.class.getName(),
sequenceNumber++);
notification.setTimeStamp(event.getEventTime().getTime());
notification.setUserData(event.getContext());
sendNotification(notification);
}
}
}
src/main/java/com/alibaba/druid/stat/JdbcTraceManagerMBean.java
-12
View File
@@ -17,17 +17,5 @@ package com.alibaba.druid.stat;
public interface JdbcTraceManagerMBean {
void setNotificationEnable(boolean notificationEnable);
boolean isNotificationEnable();
long getEventFiredCount();
long getEventSkipCount();
int getEventListenerSize();
boolean isTraceEnable();
void setTraceEnable(boolean traceEnable);
}
src/main/java/com/alibaba/druid/wall/WallConfig.java
+10
View File
@@ -27,6 +27,8 @@ public class WallConfig {
private boolean insertAllow = true;
private boolean mergeAllow = true;
private boolean multiStatementAllow = false;
private boolean truncateAllow = false;
private boolean commentAllow = false;
@@ -198,6 +200,14 @@ public class WallConfig {
this.mergeAllow = mergeAllow;
}
public boolean isMultiStatementAllow() {
return multiStatementAllow;
}
public void setMultiStatementAllow(boolean multiStatementAllow) {
this.multiStatementAllow = multiStatementAllow;
}
public boolean isSchemaCheck() {
return schemaCheck;
}
src/main/java/com/alibaba/druid/wall/WallProvider.java
+1 -1
View File
@@ -104,7 +104,7 @@ public abstract class WallProvider {
return Collections.<Violation> singletonList(new IllegalSQLObjectViolation(sql));
}
if (statementList.size() > 1) {
if (statementList.size() > 1 && !config.isMultiStatementAllow()) {
return Collections.<Violation> singletonList(new IllegalSQLObjectViolation(sql));
}