[GitHub] jena pull request: Fix for JENA-1093: revert JENA-999 and add unit...

[afs]

Github user afs commented on the pull request:

https://github.com/apache/jena/pull/111#issuecomment-165045998
  
+1 : we have git revision control to keep the JENA 999 version.


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---

[GitHub] jena pull request: Fix for JENA-1093: revert JENA-999 and add unit...

[asfgit]

Github user asfgit closed the pull request at:

https://github.com/apache/jena/pull/111


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---

[GitHub] jena pull request: Fix for JENA-1093: revert JENA-999 and add unit...

[osma]

Github user osma commented on the pull request:

https://github.com/apache/jena/pull/111#issuecomment-164839149
  
All the (rather small) changes to PropertyFunctionBase seemed to be related 
to each other, but not directly to the changes in TextQueryPF, so I just 
reverted the whole file back to how it is currently (i.e. post JENA-999 state).


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---

[GitHub] jena pull request: Fix for JENA-1093: revert JENA-999 and add unit...

[afs]

Github user afs commented on a diff in the pull request:

https://github.com/apache/jena/pull/111#discussion_r47664861
  
--- Diff: 
jena-arq/src/main/java/org/apache/jena/sparql/pfunction/PropertyFunctionBase.java
 ---
@@ -88,24 +88,25 @@ public QueryIterator exec(QueryIterator input, 
PropFuncArg argSubject, Node pred
 
 class RepeatApplyIteratorPF extends QueryIterRepeatApply
 {
-private final PropFuncArg argSubject ; 
-private final Node predicate ;
-private final PropFuncArg argObject ;
+private ExecutionContext execCxt ;
+private PropFuncArg argSubject ; 
+private Node predicate ;
+private PropFuncArg argObject ;
 
-public RepeatApplyIteratorPF(QueryIterator input, PropFuncArg 
argSubject, Node predicate, PropFuncArg argObject, ExecutionContext execCxt)
-{ 
-super(input, execCxt) ;
-this.argSubject = argSubject ;
-this.predicate = predicate ;
-this.argObject = argObject ;
-}
+   public RepeatApplyIteratorPF(QueryIterator input, PropFuncArg 
argSubject, Node predicate, PropFuncArg argObject, ExecutionContext execCxt)
+   { 
+   super(input, execCxt) ;
+   this.argSubject = argSubject ;
+   this.predicate = predicate ;
+   this.argObject = argObject ;
+   }
 
 @Override
 protected QueryIterator nextStage(Binding binding)
 {
-QueryIterator iter = exec(binding, argSubject, predicate, 
argObject, getExecContext()) ;
+QueryIterator iter = exec(binding, argSubject, predicate, 
argObject, super.getExecContext()) ;
 if ( iter == null ) 
-iter = IterLib.noResults(getExecContext()) ;
+iter = IterLib.noResults(execCxt) ;
 return iter ;
--- End diff --

This change is potentially significant.  The execution context can change 
during execution where a new context derived from the current one is produced 
so please keep L108/L109.


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---

[GitHub] jena pull request: Fix for JENA-1093: revert JENA-999 and add unit...

[afs]

Github user afs commented on the pull request:

https://github.com/apache/jena/pull/111#issuecomment-164826676
  
I looked at the history of `TextQueryPF` and looks like we have struck 
lucky here - no post JENA-999 changes. The changes in `PropertyFunctionBase` 
look like tidying up except for just one line.


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---

[GitHub] jena pull request: Fix for JENA-1093: revert JENA-999 and add unit...

[osma]

GitHub user osma opened a pull request:

https://github.com/apache/jena/pull/111

Fix for JENA-1093: revert JENA-999 and add unit test ensuring that all 
matching literals are returned by jena-text

See https://issues.apache.org/jira/browse/JENA-1093

You can merge this pull request into a Git repository by running:

$ git pull https://github.com/osma/jena jena-text-all-literals

Alternatively you can review and apply these changes as the patch at:

https://github.com/apache/jena/pull/111.patch

To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:

This closes #111


commit 4bf7319c31cb3c65c0ab18e67477d4d24ad5c8ed
Author: Osma Suominen 
Date:   2015-12-15T14:52:08Z

add failing unit test for JENA-1093

commit 93113726533147d03742388bb919d60eee448b45
Author: Osma Suominen 
Date:   2015-12-15T15:42:37Z

Revert "JENA-999 - Fix performance of jena-text when subject variable is 
bound"

This reverts commit d6adcc17712a3b44cfe6d4264f75fb44ddcc7f67.




---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---

[GitHub] jena pull request: Fix for JENA-1093: revert JENA-999 and add unit...

[osma]

Github user osma commented on the pull request:

https://github.com/apache/jena/pull/111#issuecomment-165021049
  
I squashed the two previous comments to avoid back-and-forth changes to 
PropertyFunctionBase. So in effect the new commit now only reverts the changes 
made to TextQueryPF but keeps PropertyFunctionBase intact.


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---