Added samples for the v2.0

Author: leongor

samples/RegexMatchNFSample/.externalToolBuilders/org.eclipse.jdt.core.javabuilder (10).launch

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>RegexMatchNFSample</name>
+	<name>RegexNFSamples</name>
 	<comment></comment>
 	<projects>
 	</projects>

samples/RegexMatchNFSample/sample/RegexMatchNFSample.spl

@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <info:toolkitInfoModel xmlns:common="http://www.ibm.com/xmlns/prod/streams/spl/common" xmlns:info="http://www.ibm.com/xmlns/prod/streams/spl/toolkitInfo">
   <info:identity>
-    <info:name>com.ibm.streamsx.regex.RegexMatchNFSample</info:name>
+    <info:name>RegexNFSamples</info:name>
     <info:description>Sample use of regex native functions.</info:description>
-    <info:version>1.1.1</info:version>
+    <info:version>2.0.0</info:version>
     <info:requiredProductVersion>4.0</info:requiredProductVersion>
   </info:identity>
   <info:dependencies>
     <info:toolkit>
       <common:name>com.ibm.streamsx.regex</common:name>
-      <common:version>1.0.0</common:version>
+      <common:version>2.0.0</common:version>
     </info:toolkit>
   </info:dependencies>
 </info:toolkitInfoModel>

samples/RegexMatchNFSample/sample/RegexMatchRESample.spl

@@ -15,11 +15,10 @@ use com.ibm.streamsx.regex.re2::*;
 * * regexFullMatch: 'Hello world' matches '^Hello': false
 * * regexFullMatch: 'Hello world' matches 'Hello world$': true
 * * regexPartialMatch 2: 'Hello world' matches '': true
-* * WARN #splapptrc,J[0],P[0],Custom_2,REGEX M[Regex_re2.h:getRE2Options:28]  - "Regular expression '' is empty, possibly 'regexCompile' was not called before."
-* * ERROR #splapplog,J[0],P[0],Custom_3,spl_pe M[PEImpl.cpp:logTerminatingException:1988]  - CDISR5033E: An exception occurred during the execution of the Custom_3 operator. Processing element number 0 is terminating.
-* * ERROR #splapptrc,J[0],P[0],Custom_3,#splapptrc,J[0],P[0],Custom_3,spl_operator M[PEImpl.cpp:handleOperatorFailure:596]  - CDISR5030E: An exception occurred during the execution of the Custom_3 operator. The exception is: "Regular expression '[' failed to compile - missing ]: ["
-* * ERROR #splapptrc,J[0],P[0],Custom_2,spl_operator M[PEImpl.cpp:process:1367]  - CDISR5053E: Runtime failures occurred in the following operators: Custom_3.
-
+* * WARN ... "Regular expression '' is empty, possibly 'regexCompile' was not called before."
+* * ERROR ... CDISR5033E: An exception occurred during the execution of the Custom_3 operator. Processing element number 0 is terminating.
+* * ERROR ... CDISR5030E: An exception occurred during the execution of the Custom_3 operator. The exception is: "Regular expression '\[' failed to compile - missing ]: \["
+* * ERROR ... CDISR5053E: Runtime failures occurred in the following operators: Custom_3.
 */
 composite RegexMatchRESample
 {

samples/RegexMatchNFSample/sample/RegexMatchXPSample.spl

@@ -14,9 +14,14 @@ use com.ibm.streamsx.regex.xpressive::* ;
 * * regexPartialMatch: 'Hello world' matches '^Hello': true
 * * regexFullMatch: 'Hello world' matches '^Hello': false
 * * regexFullMatch: 'Hello world' matches 'Hello world$': true
+* * regexPartialMatch 2: 'Hello world' matches '': true
+* * WARN ... "Regular expression '' is empty, possibly 'regexCompile' was not called before."
+* * ERROR ... CDISR5033E: An exception occurred during the execution of the Custom_3 operator. Processing element number 0 is terminating.
+* * ERROR ... CDISR5030E: An exception occurred during the execution of the Custom_3 operator. The exception is: unexpected end of pattern found
+* * ERROR ... CDISR5053E: Runtime failures occurred in the following operators: Custom_3.
 */
 
-composite RegexReplaceXPSample
+composite RegexMatchXPSample
 {
 	graph
 		() as Custom_1 = Custom()
@@ -54,5 +59,28 @@ composite RegexReplaceXPSample
 
 		}
 
-}
+		() as Custom_2 = Custom()
+		{
+			logic
+				onProcess :
+				{
+					block(1.0);
+					// Fast partial match - regex pattern _1 is used, but not compiled first
+					printString("regexPartialMatch 2: 'Hello world' matches '': ") ;
+					println(regexPartialMatch("Hello world", RegexPattern._1)) ;
+				}
+
+		}
 
+		() as Custom_3 = Custom()
+		{
+			logic
+				onProcess :
+				{
+					block(2.0);
+					// Compile and index erroneous regex pattern - error is thrown
+					regexCompile("[", RegexPattern._1) ;
+				}
+
+		}
+}

samples/RegexMatchSample/.externalToolBuilders/org.eclipse.jdt.core.javabuilder (12).launch

@@ -0,0 +1,53 @@
+namespace sample ;
+
+use com.ibm.streamsx.regex::* ;
+use com.ibm.streamsx.regex.re2::*;
+
+/**
+* Run functional tests using native functions.
+* 
+* * Functional tests for compiled local/global replaces.
+* 
+* The output:
+* * regexReplace: replaces first 'Hello' word with 'Hi': <Hi world, Hello>
+* * regexGlobalReplace: replaces all 'Hello' words with 'Hi': <Hi world, Hi>
+* * (replaced 2 times)
+* * regexExtract: 'foo' and 'bar' are extracted and replace placeholders in str2: <In domain 'bar', user 'foo' exists!>
+*/
+composite RegexReplaceRESample
+{
+	graph
+		() as Custom_1 = Custom()
+		{
+			logic
+				state : {
+					// regexCompile can be called within a state
+					boolean _ = regexCompile("Hello", RegexPattern._1); // Compile and index regex pattern _1
+				}
+				onProcess :
+				{
+					// regexCompile can be called inside logic processing - nevertheless the compilation will run only once on the first call
+					regexCompile("(.*)@([^.]*)", RegexPattern._2); // Compile and index regex pattern _2
+
+					// One replace - compiled regex pattern _1 is used
+					mutable rstring str = "<Hello world, Hello>";
+					printString("regexReplace: replaces first 'Hello' word with 'Hi': ") ;
+					if( regexReplace(str, RegexPattern._1, "Hi"))
+						printStringLn(str) ;
+
+					// Global replace - compiled regex pattern _1 is used
+					mutable rstring str1 = "<Hello world, Hello>";
+					printString("regexGlobalReplace: replaces all 'Hello' words with 'Hi': ") ;
+					int32 count = regexGlobalReplace(str1, RegexPattern._1, "Hi");
+					if(count > 0)
+						printStringLn(str1 + "\n(replaced " + (rstring)count + " times)") ;
+
+					// Extract - compiled regex pattern _2 is used
+					mutable rstring str2 = "<In domain '\\2', user '\\1' exists!>";
+					printString("regexExtract: 'foo' and 'bar' are extracted and replace placeholders in str2: ") ;
+					if( regexExtract("[email protected]", RegexPattern._2, str2))
+						printStringLn(str2) ;
+				}
+
+		}
+}