You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2016/11/11 09:26:59 UTC
[1/3] jena git commit: Add opFileBuffered.
Repository: jena
Updated Branches:
refs/heads/master 874c3be16 -> 5ddfefa4a
Add opFileBuffered.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/43c03fbf
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/43c03fbf
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/43c03fbf
Branch: refs/heads/master
Commit: 43c03fbfbade306b82fa811bcbba08cb1955d7d6
Parents: 874c3be
Author: Andy Seaborne <an...@apache.org>
Authored: Fri Nov 11 09:22:21 2016 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Fri Nov 11 09:22:21 2016 +0000
----------------------------------------------------------------------
.../main/java/org/apache/jena/atlas/io/IO.java | 29 ++++++++++++++++----
1 file changed, 23 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/43c03fbf/jena-base/src/main/java/org/apache/jena/atlas/io/IO.java
----------------------------------------------------------------------
diff --git a/jena-base/src/main/java/org/apache/jena/atlas/io/IO.java b/jena-base/src/main/java/org/apache/jena/atlas/io/IO.java
index c20b920..a1006b0 100644
--- a/jena-base/src/main/java/org/apache/jena/atlas/io/IO.java
+++ b/jena-base/src/main/java/org/apache/jena/atlas/io/IO.java
@@ -31,6 +31,9 @@ public class IO
{
public static final int EOF = -1 ;
public static final int UNSET = -2 ;
+
+ // Buffer size. Larger than Java's default.
+ private static final int BUFFER_SIZE = 128*1024 ;
private static Charset utf8 = StandardCharsets.UTF_8 ;
private static Charset ascii = StandardCharsets.US_ASCII ;
@@ -44,6 +47,20 @@ public class IO
catch (IOException ex) { IO.exception(ex); return null ; }
}
+ /**
+ * Open an input stream to a file and buffer it. If the filename is null or "-",
+ * return System.in If the filename ends in .gz, wrap in GZIPInputStream.
+ * If using this {@code InputStream} with an {@code InputStreamReader}
+ * (e.g. to get UTF-8), there is no need to buffer the {@code InputStream}.
+ * Instead, buffer the {@code Reader}.
+ */
+ static public InputStream openFileBuffered(String filename) {
+ try {
+ InputStream in = openFileEx(filename) ;
+ return new BufferedInputStream(in, BUFFER_SIZE) ;
+ } catch (IOException ex) { IO.exception(ex); return null ; }
+ }
+
/** Open an input stream to a file; do not mask IOExceptions.
* If the filename is null or "-", return System.in
* If the filename ends in .gz, wrap in GZIPInputStream
@@ -239,11 +256,10 @@ public class IO
out.flush();
}
- private static final int BUFFER_SIZE = 32*1024 ;
-
public static byte[] readWholeFile(InputStream in) {
- try(ByteArrayOutputStream out = new ByteArrayOutputStream(BUFFER_SIZE)) {
- byte buff[] = new byte[BUFFER_SIZE] ;
+ final int WHOLE_FILE_BUFFER_SIZE = 32*1024 ;
+ try(ByteArrayOutputStream out = new ByteArrayOutputStream(WHOLE_FILE_BUFFER_SIZE)) {
+ byte buff[] = new byte[WHOLE_FILE_BUFFER_SIZE] ;
while (true) {
int l = in.read(buff) ;
if ( l <= 0 )
@@ -292,8 +308,9 @@ public class IO
// Private worker as we are trying to force UTF-8.
private static String readWholeFileAsUTF8(Reader r) throws IOException {
- try(StringWriter sw = new StringWriter(BUFFER_SIZE)) {
- char buff[] = new char[BUFFER_SIZE];
+ final int WHOLE_FILE_BUFFER_SIZE = 32*1024 ;
+ try(StringWriter sw = new StringWriter(WHOLE_FILE_BUFFER_SIZE)) {
+ char buff[] = new char[WHOLE_FILE_BUFFER_SIZE];
for (;;)
{
int l = r.read(buff);
[2/3] jena git commit: JENA-1259: Fix E_Bound.evalSpecial of a
constant.
Posted by an...@apache.org.
JENA-1259: Fix E_Bound.evalSpecial of a constant.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/49b298d4
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/49b298d4
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/49b298d4
Branch: refs/heads/master
Commit: 49b298d488ed7bb4f47cb91b0f38b291e64a14dc
Parents: 43c03fb
Author: Andy Seaborne <an...@apache.org>
Authored: Fri Nov 11 09:24:54 2016 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Fri Nov 11 09:24:54 2016 +0000
----------------------------------------------------------------------
.../main/java/org/apache/jena/sparql/expr/E_Bound.java | 12 ++++++++----
.../main/java/org/apache/jena/sparql/expr/ExprLib.java | 3 ++-
.../org/apache/jena/sparql/expr/TestExpressions3.java | 4 ++--
3 files changed, 12 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/49b298d4/jena-arq/src/main/java/org/apache/jena/sparql/expr/E_Bound.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/expr/E_Bound.java b/jena-arq/src/main/java/org/apache/jena/sparql/expr/E_Bound.java
index 631cb0d..7f80b76 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/expr/E_Bound.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/expr/E_Bound.java
@@ -34,12 +34,16 @@ public class E_Bound extends ExprFunction1
@Override
public NodeValue evalSpecial(Binding binding, FunctionEnv env) {
- // See alse ExprLib.evalorNull.
- // This code predates that; it handles exceptions very slightly differently.
+ // See alse ExprLib.evalOrNull.
+ // This code predates that; it handles exceptions
+ // slightly differently (VariableNotBoundException not
+ // a general ExprEvalException).
if ( expr.isConstant() )
- // The case of the variable already being substituted for a constant.
- return NodeValue.FALSE ;
+ // The case of the variable having been substituted for a constant.
+ // Note: this has often been optimized away by constant folding
+ // (ExprTransformConstantFold) which called eval(NodeValue x) -> TRUE.
+ return NodeValue.TRUE ;
if ( expr.isVariable() )
// The case of the expr being a single variable.
http://git-wip-us.apache.org/repos/asf/jena/blob/49b298d4/jena-arq/src/main/java/org/apache/jena/sparql/expr/ExprLib.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/expr/ExprLib.java b/jena-arq/src/main/java/org/apache/jena/sparql/expr/ExprLib.java
index 123b5e0..d582f91 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/expr/ExprLib.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/expr/ExprLib.java
@@ -58,7 +58,8 @@ public class ExprLib
// being the important one.
//
// BOUND(?x) is a important case where the expression is often an exception
- // in general evaluation.
+ // in general evaluation. See E_Bound - different exception handling
+ // (it handles VariableNotBoundException not a general ExprEvalException).
if ( expr.isConstant() )
// Easy case.
http://git-wip-us.apache.org/repos/asf/jena/blob/49b298d4/jena-arq/src/test/java/org/apache/jena/sparql/expr/TestExpressions3.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/sparql/expr/TestExpressions3.java b/jena-arq/src/test/java/org/apache/jena/sparql/expr/TestExpressions3.java
index 61fa32e..4a33e6e 100644
--- a/jena-arq/src/test/java/org/apache/jena/sparql/expr/TestExpressions3.java
+++ b/jena-arq/src/test/java/org/apache/jena/sparql/expr/TestExpressions3.java
@@ -39,8 +39,8 @@ public class TestExpressions3 extends BaseTest
{
@Test public void bound_01() { eval("BOUND(?x)", "(?x 1)", true) ; }
@Test public void bound_02() { eval("BOUND(?x)", "(?y 1)", false) ; }
- @Test public void bound_03() { evalExpr("(bound 1)", "(?y 1)", false) ; }
- @Test public void bound_04() { evalExpr("(bound 1)", "()", false) ; }
+ @Test public void bound_03() { evalExpr("(bound 1)", "(?y 1)", true) ; }
+ @Test public void bound_04() { evalExpr("(bound 1)", "()", true) ; }
@Test public void bound_05() { evalExpr("(bound ?x)", "(?y 1)", false) ; }
@Test public void bound_06() { evalExpr("(bound ?x)", "(?x 1)", true) ; }
@Test public void bound_07() { evalExpr("(bound (+ ?x 1))", "(?y 1)", false) ; }
[3/3] jena git commit: Update POM for Jena development.
Posted by an...@apache.org.
Update POM for Jena development.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/5ddfefa4
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/5ddfefa4
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/5ddfefa4
Branch: refs/heads/master
Commit: 5ddfefa4a372fa96985b7d884b724efee1509f60
Parents: 49b298d
Author: Andy Seaborne <an...@apache.org>
Authored: Fri Nov 11 09:25:39 2016 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Fri Nov 11 09:25:39 2016 +0000
----------------------------------------------------------------------
jena-maven-tools/pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/5ddfefa4/jena-maven-tools/pom.xml
----------------------------------------------------------------------
diff --git a/jena-maven-tools/pom.xml b/jena-maven-tools/pom.xml
index 04d9ca2..021e9c3 100644
--- a/jena-maven-tools/pom.xml
+++ b/jena-maven-tools/pom.xml
@@ -30,7 +30,7 @@
<parent>
<groupId>org.apache.jena</groupId>
<artifactId>jena-parent</artifactId>
- <version>17-SNAPSHOT</version>
+ <version>18-SNAPSHOT</version>
<relativePath>../jena-parent</relativePath>
</parent>
@@ -188,7 +188,7 @@
<dependency>
<groupId>org.apache.jena</groupId>
<artifactId>jena-cmds</artifactId>
- <version>3.1.1-SNAPSHOT</version>
+ <version>3.1.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>