BLZG-2091 Fix for Regression: IF + BOUND produce exception in 2.1.4

[igor-kim]

No description provided.

[beebs-systap]

@igor-kim Can you confirm that com.bigdata.rdf.sail.TestTicket1747.testBug runs correctly for you with this fix? I see a CI failure, but will check.

[beebs-systap]

Confirmed local CI fails on TestTicket1747 for this one.

[igor-kim]

I have access only to [BLAZEGRAPH_RELEASE_CANDIDATE_2_2_0 branch|https://github.com/maginfo-team/database/tree/BLAZEGRAPH_RELEASE_CANDIDATE_2_2_0] in blazegraph/database repo. Test_Ticket_2091 completes successfully (although, I had to resolve conflict in TestNanoSparqlServerWithProxyIndexManager for the line with adds the test).
#30

Please, let me know if I could test the fix against newer code, as mentioned branch was last updated back in September.

[igor-kim]

Is there any link to the logs of failing build?

[beebs-systap]

Does TestTicket1747 also run for you? I can reproduce this by applying this commit against 2.1.4. TestTicket1747 passes in the 2.1.4 release.

My git is configured with your maginfo repo as the remote named maginfo.

maginfo https://github.com/maginfo-team/database.git (fetch)
maginfo https://github.com/maginfo-team/database.git (push)

git checkout BLAZEGRAPH-RELEASE_2_1_4
git fetch maginfo BLZG-2091 && git cherry-pick 0828d926b7bf40554a170badadbaddbab8277810
mvn install -DskipTests
cd bigdata-sails-test
mvn -DtestClass=com.bigdata.rdf.sail.TestBigdataSailWithoutSids -Dtest=TestTicket1747 test

-------------------------------------------------------------------------------
Test set: com.bigdata.rdf.sail.TestTicket1747
-------------------------------------------------------------------------------
Tests run: 3, Failures: 0, Errors: 3, Skipped: 0, Time elapsed: 2.321 sec <<< FAILURE! - in com.bigdata.rdf.sail.TestTicket1747
testBug(com.bigdata.rdf.sail.TestTicket1747)  Time elapsed: 1.809 sec  <<< ERROR!
com.bigdata.rdf.internal.NotMaterializedException: XSDInteger(11)
    at com.bigdata.rdf.internal.impl.AbstractIV.getValue(AbstractIV.java:993)
    at com.bigdata.rdf.sparql.ast.eval.ASTDeferredIVResolution.fillInIV(ASTDeferredIVResolution.java:981)
    at com.bigdata.rdf.sparql.ast.eval.ASTDeferredIVResolution.fillInIV(ASTDeferredIVResolution.java:896)
    at com.bigdata.rdf.sparql.ast.eval.ASTDeferredIVResolution.fillInIV(ASTDeferredIVResolution.java:896)
    at com.bigdata.rdf.sparql.ast.eval.ASTDeferredIVResolution.prepare(ASTDeferredIVResolution.java:669)
    at com.bigdata.rdf.sparql.ast.eval.ASTDeferredIVResolution.resolve(ASTDeferredIVResolution.java:454)
    at com.bigdata.rdf.sparql.ast.eval.ASTDeferredIVResolution.resolveQuery(ASTDeferredIVResolution.java:268)
    at com.bigdata.rdf.sparql.ast.eval.ASTDeferredIVResolution.resolveQuery(ASTDeferredIVResolution.java:181)
    at com.bigdata.rdf.sail.TestTicket1747.executeQuery(TestTicket1747.java:118)
    at com.bigdata.rdf.sail.TestTicket1747.testBug(TestTicket1747.java:70)

[igor-kim]

The fix for 2091 extends IVs resolution for constants (previously it was resolving only TermIds, but other IVs also could require resolution), but not materialized constant IV could not be resolved at this point (there is no BigdataValue to be passed to addTerms), fix applied: added a check for hasValue.

[beebs-systap]

Looks good on my side. Thanks.