Skip to content

Commit 31cf61f

Browse files
author
KIRSTEN W. HILDRUM
committed
Fix extra close comment, clean up performance tests, add new sample
1 parent 6be00c6 commit 31cf61f

File tree

10 files changed

+84
-23
lines changed

10 files changed

+84
-23
lines changed

‎com.ibm.streamsx.transform/com.ibm.streamsx.transform/RuntimeFilter.spl

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*******************************************************************************
22
* Copyright (C) 2015, International Business Machines Corporation
33
* All Rights Reserved
4-
*******************************************************************************/
4+
*******************************************************************************
55
*/
66
namespace com.ibm.streamsx.transform;
77

@@ -21,25 +21,25 @@ stream<ToFilter> Filtered = Custom(ToFilter;ChangeFilter) {
2121
boolean testFilterBeforeUpdate=$testFilterBeforeUpdate;
2222
}
2323
onTuple ChangeFilter: {
24-
rstring newfilter = $filterExpression;
24+
mutable rstring _newfilter = $filterExpression;
2525
if (testFilterBeforeUpdate) {
2626
mutable int32 err=0;
27-
evalPredicate(newfilter,(ToFilter){},err);
27+
evalPredicate(_newfilter,(ToFilter){},err);
2828
if (err == 0) {
29-
currentFilter=newfilter;
29+
currentFilter=_newfilter;
3030
if (isTraceable(Trace.info)) {
31-
appTrc(Trace.info,"Updating filter to "+newfilter);
31+
appTrc(Trace.info,"Updating filter to "+_newfilter);
3232
}
3333
}
3434
else {
35-
appTrc(Trace.error,"Error "+(rstring)err+" on new filter "+newfilter+"; not updating");
35+
appTrc(Trace.error,"Error "+(rstring)err+" on new filter "+_newfilter+"; not updating");
3636
}
3737
}
3838
else {
3939
if (isTraceable(Trace.info)) {
40-
appTrc(Trace.info,"Updating filter to "+newfilter);
40+
appTrc(Trace.info,"Updating filter to "+_newfilter);
4141
}
42-
currentFilter = newfilter;
42+
currentFilter = _newfilter;
4343
}
4444
}
4545
onTuple ToFilter: {

‎samples/RuntimeFilter/WebView/SimpleInject.spl

+51
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
/*
2+
# Licensed Materials - Property of IBM
3+
# Copyright IBM Corp. 2011, 2014
4+
# US Government Users Restricted Rights - Use, duplication or
5+
# disclosure restricted by GSA ADP Schedule Contract with
6+
# IBM Corp.
7+
*/
8+
use com.ibm.streamsx.transform::RuntimeFilter;
9+
10+
use com.ibm.streamsx.inet.rest::*;
11+
12+
/**
13+
* Web example showing RuntimeFilter in action.
14+
* Point browser to [http://127.0.0.1:8080]
15+
*/
16+
composite SimpleInject {
17+
18+
graph
19+
20+
stream<int64 iter> Data = Beacon() {
21+
param period: 1.0;
22+
output Data:
23+
iter = (int64)IterationCount();
24+
}
25+
26+
stream<rstring newfilter> FilterUpdate
27+
= HTTPTupleInjection() {
28+
param
29+
port: 8080;
30+
config
31+
// Ensure the operators are in a single PE to have a single web-server
32+
placement: partitionColocation("jetty8080");
33+
34+
}
35+
36+
stream<Data> Filtered = RuntimeFilter(Data;FilterUpdate) {
37+
param filterExpression: newfilter;
38+
}
39+
40+
41+
() as InjectView = HTTPTupleView(Filtered) {
42+
window Filtered: sliding, count(10), count(1);
43+
param
44+
port: 8080;
45+
config
46+
// Ensure the operators are in a single PE to have a single web-server
47+
placement: partitionColocation("jetty8080");
48+
49+
}
50+
51+
}

‎samples/RuntimeFilter/WebView/info.xml

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<info:toolkitInfoModel xmlns:common="http://www.ibm.com/xmlns/prod/streams/spl/common" xmlns:info="http://www.ibm.com/xmlns/prod/streams/spl/toolkitInfo">
3+
<info:identity>
4+
<info:name>RuntimeFilterWithHTTPTupleInject</info:name>
5+
<info:description>Sample application showing RuntimeFilter with HTTPTupleInject to add filtersand other operator</info:description>
6+
<info:version>1.0.0</info:version>
7+
<info:requiredProductVersion>4.0.1</info:requiredProductVersion>
8+
</info:identity>
9+
<info:dependencies>
10+
<info:toolkit>
11+
<common:name>com.ibm.streamsx.inet</common:name>
12+
<common:version>2.5</common:version>
13+
</info:toolkit>
14+
</info:dependencies>
15+
</info:toolkitInfoModel>

‎tests/RuntimeFilter/timing/GenerateData.spl

+2-7
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,19 @@
22
* Copyright (C) 2015, International Business Machines Corporation
33
* All Rights Reserved
44
*******************************************************************************/
5-
*/
6-
type StringListData = uint64 tupleNum, list<rstring> potterList, list<rstring> lotrList,list<rstring> austenList;
5+
type StringListData = uint64 tupleNum, list<rstring> characterList;
76
type ThreeClauseString = rstring hero,rstring heroine,rstring villain;
87
type IntData = int64 x, int64 y, int64 z;
98

109
composite GenerateStringList(output OutStream) {
1110
param
12-
expression<list<rstring>> $nameList: ["Harry","Herminone","Ron","Mrs. Weasley","Sirius","Dumbledore","Lilly","Voldemort","James","Malfoy"];
13-
expression<list<rstring>> $nameList2: ["Aragorn","Frodo","Gandalf","Eowyn","Merry","Fatty","Pippin","Eomer","Theoden","Faramir","Boromir"];
1411
expression<int32> $iterations: (int32)getSubmissionTimeValue("iterations","100000000");
1512
graph
1613
stream<StringListData> OutStream = Beacon() {
1714
param iterations: $iterations;
1815
output OutStream:
1916
tupleNum=IterationCount(),
20-
potterList = $nameList,
21-
lotrList = $nameList2,
22-
austenList = ["Emma","Lizzy","Jane","Wentworth","Elinor","Fanny","Anne","Lady Susan","Catherine","Henry"];
17+
characterList = ["Emma","Lizzy","Jane","Wentworth","Elinor","Fanny","Anne","Lady Susan","Catherine","Henry"];
2318
}
2419
}
2520

‎tests/RuntimeFilter/timing/IntegerInequality.splmm

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* Copyright (C) 2015, International Business Machines Corporation
33
* All Rights Reserved
44
*******************************************************************************/
5-
*/
5+
66
use com.ibm.streamsx.transform::RuntimeFilter;
77

88
composite GenerateIntTuples(output Data) {

‎tests/RuntimeFilter/timing/IntegerTest.splmm

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* Copyright (C) 2015, International Business Machines Corporation
33
* All Rights Reserved
44
*******************************************************************************/
5-
*/
5+
66
<%
77
my $label = $ARGV[0];
88
my $filterExpression = $ARGV[1];

‎tests/RuntimeFilter/timing/StringEquality.splmm

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* Copyright (C) 2015, International Business Machines Corporation
33
* All Rights Reserved
44
*******************************************************************************/
5-
*/
5+
66
<%
77
my $label = $ARGV[0];
88
my $filterExpression = $ARGV[1];

‎tests/RuntimeFilter/timing/StringList.splmm

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* Copyright (C) 2014, International Business Machines Corporation
33
* All Rights Reserved
44
*******************************************************************************/
5-
*/
5+
66
<%
77
my $label = $ARGV[0];
88
my $filterExpression = $ARGV[1];

‎tests/RuntimeFilter/timing/TestComposites.splmm

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* Copyright (C) 2014, International Business Machines Corporation
33
* All Rights Reserved
44
*******************************************************************************/
5-
*/
5+
66
<%
77
my $filterExpression=$ARGV[1];
88
%>

‎tests/RuntimeFilter/timing/examples.sh

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
toolkit=../../../com.ibm.streamsx.transform
22
opts=-a
3-
iterations=60000000
4-
sc $opts -T -M StringListBasic_String1 String1 '\"malfoy\" in potterList' -t $toolkit
3+
iterations=300000000
4+
sc $opts -T -M StringListBasic_String1 String1 '\"Eyre\" in characterList' -t $toolkit
55
time output/bin/standalone iterations=$iterations
6-
sc $opts -T -M StringListDynamic_String1 String1 '\"malfoy\" in potterList' -t $toolkit
6+
sc $opts -T -M StringListDynamic_String1 String1 '\"Eyre\" in characterList' -t $toolkit
77
time output/bin/standalone iterations=$iterations
88
sc $opts -T -M IntDynamic_1 1 'x > 5l' -t $toolkit
99
time output/bin/standalone iterations=$iterations

0 commit comments

Comments
 (0)