Navigation

← Previous Changeset
Next Changeset →

Changeset 69c4c699ba62a8a9245115601f9c6ea80bf39e36

Timestamp:

04/19/11 01:36:38 (2 years ago)

Author:

Theo Schlossnagle <jesus@omniti.com>

git-committer:

Theo Schlossnagle <jesus@omniti.com> 1303176998 -0400

git-parent:

[55a5979360515e22a04982c4397c7bbb8271a34b]

git-author:

Theo Schlossnagle <jesus@omniti.com> 1303176998 -0400

Message:

upgrade to esper 4.1.0

Files:

src/java/Makefile.in (modified) (1 diff)
src/java/com/omniti/reconnoiter/esper/CounterViewFactory.java (modified) (1 diff)
src/java/com/omniti/reconnoiter/esper/DeriveView.java (modified) (3 diffs)
src/java/com/omniti/reconnoiter/esper/DeriveViewFactory.java (modified) (1 diff)
src/java/com/omniti/reconnoiter/esper/ExactBaseBivariateStatisticsView.java (modified) (3 diffs)
src/java/com/omniti/reconnoiter/esper/ExactRegressionLinestView.java (modified) (1 diff)
src/java/com/omniti/reconnoiter/esper/ExactStatViewFactory.java (modified) (1 diff)
src/java/com/omniti/reconnoiter/event/NoitMetric.java (modified) (1 diff)
src/java/lib/esper-3.5.0.jar (deleted)
src/java/lib/esper-4.1.0.jar (added)
src/java/run-iep.sh.in (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed
: Modified
: Copied
: Moved

src/java/Makefile.in

rb4b7c74	r69c4c69
78	78	J_CLASS = $(J_JAVA:.java=*.class)
79	79
80		R_SUPPORT=lib/activemq-all-5.2.0.jar lib/antlr-runtime-3.1.1.jar lib/esper-~~3.5~~.0.jar \
	80	R_SUPPORT=lib/activemq-all-5.2.0.jar lib/antlr-runtime-3.1.1.jar lib/esper-4.1.0.jar \
81	81	lib/log4j-1.2.15.jar lib/spring-beans-2.5.5.jar lib/spring-context-2.5.5.jar \
82	82	lib/cglib-nodep-2.2.jar lib/commons-pool-1.4.jar lib/commons-dbcp-1.2.2.jar \

src/java/com/omniti/reconnoiter/esper/CounterViewFactory.java

r54eb3fe	r69c4c69
46	46	valueExpression = validatedNodes[1];
47	47
48		if ((timestampExpression.getType() != long.class) &&
49		(timestampExpression.getType() != Long.class)) {
	48	if ((timestampExpression.getExprEvaluator().getType() != long.class) &&
	49	(timestampExpression.getExprEvaluator().getType() != Long.class)) {
50	50	throw new ViewParameterException(
51	51	"View requires long-typed timestamp values in parameter 1");
52	52	}
53		if ((valueExpression.getType() != double.class) &&
54		(valueExpression.getType() != Double.class) &&
55		(valueExpression.getType() != long.class) &&
56		(valueExpression.getType() != Long.class)) {
	53	if ((valueExpression.getExprEvaluator().getType() != double.class) &&
	54	(valueExpression.getExprEvaluator().getType() != Double.class) &&
	55	(valueExpression.getExprEvaluator().getType() != long.class) &&
	56	(valueExpression.getExprEvaluator().getType() != Long.class)) {
57	57	throw new ViewParameterException(
58	58	"View requires long-typed or double-typed values for in parameter 2");

src/java/com/omniti/reconnoiter/esper/DeriveView.java

r8bce3fd	r69c4c69
49	49	this.expressionX = expressionX;
50	50	this.expressionY = expressionY;
51		isDouble = (expressionY.get~~Type() != double.class \|\| expressionY~~.getType() != Double.class);
	51	isDouble = (expressionY.getExprEvaluator().getType() != double.class \|\| expressionY.getExprEvaluator().getType() != Double.class);
52	52	}
53	53
…	…
64	64	public static EventType getEventType(com.espertech.esper.event.EventAdapterService eas)
65	65	{
66		return eas.addBeanType(WeightedValueBean.class.getName(), WeightedValueBean.class, ~~fals~~e);
	66	return eas.addBeanType(WeightedValueBean.class.getName(), WeightedValueBean.class, true, true, true);
67	67	}
68	68
…	…
88	88	for ( EventBean pointb : newData ) {
89	89	EventBean eventsPerStream[] = { pointb };
90		Number NX = (Number) expressionX.evaluate(eventsPerStream, true, statementContext);
	90	Number NX = (Number) expressionX.getExprEvaluator().evaluate(eventsPerStream, true, statementContext);
91	91	if(NX == null) continue;
92		Number NY = (Number) expressionY.evaluate(eventsPerStream, true, statementContext);
	92	Number NY = (Number) expressionY.getExprEvaluator().evaluate(eventsPerStream, true, statementContext);
93	93	if(NY == null) continue;
94	94	NoitDerivePoint point = new NoitDerivePoint();

src/java/com/omniti/reconnoiter/esper/DeriveViewFactory.java

r54eb3fe	r69c4c69
46	46	valueExpression = validatedNodes[1];
47	47
48		if ((timestampExpression.getType() != long.class) &&
49		(timestampExpression.getType() != Long.class)) {
	48	if ((timestampExpression.getExprEvaluator().getType() != long.class) &&
	49	(timestampExpression.getExprEvaluator().getType() != Long.class)) {
50	50	throw new ViewParameterException(
51	51	"View requires long-typed timestamp values in parameter 1");
52	52	}
53		if ((valueExpression.getType() != double.class) &&
54		(valueExpression.getType() != Double.class) &&
55		(valueExpression.getType() != long.class) &&
56		(valueExpression.getType() != Long.class)) {
	53	if ((valueExpression.getExprEvaluator().getType() != double.class) &&
	54	(valueExpression.getExprEvaluator().getType() != Double.class) &&
	55	(valueExpression.getExprEvaluator().getType() != long.class) &&
	56	(valueExpression.getExprEvaluator().getType() != Long.class)) {
57	57	throw new ViewParameterException(
58	58	"View requires long-typed or double-typed values for in parameter 2");

src/java/com/omniti/reconnoiter/esper/ExactBaseBivariateStatisticsView.java

r54eb3fe	r69c4c69
45	45	this.expressionX = expressionX;
46	46	this.expressionY = expressionY;
47		isDouble = (expressionY.get~~Type() != double.class \|\| expressionY~~.getType() != Double.class);
	47	isDouble = (expressionY.getExprEvaluator().getType() != double.class \|\| expressionY.getExprEvaluator().getType() != Double.class);
48	48	}
49	49
…	…
66	66	{
67	67	eventsPerStream[0] = newData[i];
68		BigDecimal X = new BigDecimal(((Number) expressionX.evaluate(eventsPerStream, true, statementContext)).toString());
	68	BigDecimal X = new BigDecimal(((Number) expressionX.getExprEvaluator().evaluate(eventsPerStream, true, statementContext)).toString());
69	69	BigDecimal Y;
70	70	if(isDouble)
71		Y = new BigDecimal(((Number) expressionY.evaluate(eventsPerStream, true, statementContext)).doubleValue());
	71	Y = new BigDecimal(((Number) expressionY.getExprEvaluator().evaluate(eventsPerStream, true, statementContext)).doubleValue());
72	72	else
73		Y = new BigDecimal(((Number) expressionY.evaluate(eventsPerStream, true, statementContext)).toString());
	73	Y = new BigDecimal(((Number) expressionY.getExprEvaluator().evaluate(eventsPerStream, true, statementContext)).toString());
74	74	statisticsBean.addPoint(X, Y);
75	75	}
…	…
82	82	{
83	83	eventsPerStream[0] = oldData[i];
84		BigDecimal X = new BigDecimal(((Number) expressionX.evaluate(eventsPerStream, true, statementContext)).toString());
	84	BigDecimal X = new BigDecimal(((Number) expressionX.getExprEvaluator().evaluate(eventsPerStream, true, statementContext)).toString());
85	85	BigDecimal Y;
86	86	if(isDouble)
87		Y = new BigDecimal(((Number) expressionY.evaluate(eventsPerStream, true, statementContext)).doubleValue());
	87	Y = new BigDecimal(((Number) expressionY.getExprEvaluator().evaluate(eventsPerStream, true, statementContext)).doubleValue());
88	88	else
89		Y = new BigDecimal(((Number) expressionY.evaluate(eventsPerStream, true, statementContext)).toString());
	89	Y = new BigDecimal(((Number) expressionY.getExprEvaluator().evaluate(eventsPerStream, true, statementContext)).toString());
90	90	statisticsBean.removePoint(X, Y);
91	91	}

src/java/com/omniti/reconnoiter/esper/ExactRegressionLinestView.java

r54eb3fe	r69c4c69
33	33	public static EventType getEventType(com.espertech.esper.event.EventAdapterService eas)
34	34	{
35		return eas.addBeanType(ExactRegressionBean.class.getName(), ExactRegressionBean.class, ~~fals~~e);
	35	return eas.addBeanType(ExactRegressionBean.class.getName(), ExactRegressionBean.class, true, true, true);
36	36	}
37	37

src/java/com/omniti/reconnoiter/esper/ExactStatViewFactory.java

r54eb3fe	r69c4c69
46	46	valueExpression = validatedNodes[1];
47	47
48		if ((timestampExpression.getType() != long.class) &&
49		(timestampExpression.getType() != Long.class)) {
	48	if ((timestampExpression.getExprEvaluator().getType() != long.class) &&
	49	(timestampExpression.getExprEvaluator().getType() != Long.class)) {
50	50	throw new ViewParameterException(
51	51	"View requires long-typed timestamp values in parameter 1");
52	52	}
53		if ((valueExpression.getType() != double.class) &&
54		(valueExpression.getType() != Double.class) &&
55		(valueExpression.getType() != long.class) &&
56		(valueExpression.getType() != Long.class)) {
	53	if ((valueExpression.getExprEvaluator().getType() != double.class) &&
	54	(valueExpression.getExprEvaluator().getType() != Double.class) &&
	55	(valueExpression.getExprEvaluator().getType() != long.class) &&
	56	(valueExpression.getExprEvaluator().getType() != Long.class)) {
57	57	throw new ViewParameterException(
58	58	"View requires long-typed or double-typed values for in parameter 2");

src/java/com/omniti/reconnoiter/event/NoitMetric.java

rd483232	r69c4c69
41	41	logger.debug("sendEvent("+getUuid()+"-"+getName()+") took "+(nanos/1000)+"us");
42	42	}
43		public String getUuid() {
44		return (nmn != null) ? nmn.getUuid() : nmt.getUuid();
45		}
46		public String getName() {
47		return (nmn != null) ? nmn.getName() : nmt.getName();
48		}
	43	public String getUuid() { return (nmn != null)?nmn.getUuid():nmt.getUuid(); }
	44	public String getName() { return (nmn != null)?nmn.getName():nmt.getName(); }
	45	public long getTime() { return (nmn != null)?nmn.getTime():nmt.getTime(); }
	46	public String getNoit() { return (nmn != null)?nmn.getNoit():nmt.getNoit(); }
	47	public String getCheck_target() { return (nmn != null)?nmn.getCheck_target():nmt.getCheck_target(); }
	48	public String getCheck_module() { return (nmn != null)?nmn.getCheck_module():nmt.getCheck_module(); }
	49	public String getCheck_name() { return (nmn != null)?nmn.getCheck_name():nmt.getCheck_name(); }
	50
49	51	public boolean isNumeric() { return nmn != null; }
50	52	public boolean isText() { return nmt != null; }

src/java/run-iep.sh.in

rb4b7c74	r69c4c69
12	12	fi
13	13	JARS="reconnoiter.jar activemq-all-5.2.0.jar antlr-runtime-3.1.1.jar \
14		esper-~~3.5~~.0.jar log4j-1.2.15.jar \
	14	esper-4.1.0.jar log4j-1.2.15.jar \
15	15	spring-beans-2.5.5.jar spring-context-2.5.5.jar \
16	16	cglib-nodep-2.2.jar commons-pool-1.4.jar commons-dbcp-1.2.2.jar \

Navigation

Changeset 69c4c699ba62a8a9245115601f9c6ea80bf39e36

Legend:

Download in other formats: