kinow commented on a change in pull request #1154: URL: https://github.com/apache/jena/pull/1154#discussion_r778406707
########## File path: jena-arq/src/main/java/org/apache/jena/riot/rowset/rw/RowSetReaderNone.java ########## @@ -0,0 +1,54 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.jena.riot.rowset.rw; + +import java.io.InputStream; +import java.io.Reader; +import java.util.Objects; + +import org.apache.jena.atlas.io.IO; +import org.apache.jena.riot.Lang; +import org.apache.jena.riot.resultset.ResultSetLang; +import org.apache.jena.riot.rowset.RowSetReader; +import org.apache.jena.riot.rowset.RowSetReaderFactory; +import org.apache.jena.sparql.exec.QueryExecResult; +import org.apache.jena.sparql.exec.RowSet; +import org.apache.jena.sparql.resultset.ResultSetException; +import org.apache.jena.sparql.util.Context; + +public class RowSetReaderNone implements RowSetReader { + + public static RowSetReaderFactory factory = (Lang lang)->{ + if ( !Objects.equals(lang, ResultSetLang.RS_None) ) + throw new ResultSetException("Results reader None asked for a " + lang); + return new RowSetReaderNone(); + }; + + + private RowSetReaderNone() {} + + @Override public RowSet read(InputStream in, Context context) { IO.skipToEnd(in) ; return null; } + + @Override public RowSet read(Reader in, Context context) { IO.skipToEnd(in); return null; } + + @Override public QueryExecResult readAny(InputStream in, Context context) { return null; } + + + +} Review comment: missing newline ########## File path: jena-arq/src/main/java/org/apache/jena/riot/rowset/rw/RowSetWriterThrift.java ########## @@ -0,0 +1,54 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.jena.riot.rowset.rw; + +import java.io.OutputStream; +import java.io.Writer; +import java.util.Objects; + +import org.apache.jena.atlas.lib.NotImplemented; +import org.apache.jena.riot.resultset.ResultSetLang; +import org.apache.jena.riot.rowset.RowSetWriter; +import org.apache.jena.riot.rowset.RowSetWriterFactory; +import org.apache.jena.riot.thrift.ThriftRDF; +import org.apache.jena.sparql.exec.RowSet; +import org.apache.jena.sparql.resultset.ResultSetException; +import org.apache.jena.sparql.util.Context; + +public class RowSetWriterThrift implements RowSetWriter { + + public static RowSetWriterFactory factory = lang -> { + if (!Objects.equals(lang, ResultSetLang.RS_Thrift ) ) + throw new ResultSetException("RowSetWriter for RDF/Thift asked for a "+lang); Review comment: s/Thift/Thrift ########## File path: jena-arq/src/main/java/org/apache/jena/riot/rowset/rw/RowSetWriterCSV.java ########## @@ -0,0 +1,140 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.jena.riot.rowset.rw; + +import java.io.OutputStream; +import java.io.Writer; +import java.util.List; +import java.util.Objects; + +import org.apache.jena.atlas.io.AWriter; +import org.apache.jena.atlas.io.IO; +import org.apache.jena.graph.Node; +import org.apache.jena.riot.resultset.ResultSetLang; +import org.apache.jena.riot.rowset.RowSetWriter; +import org.apache.jena.riot.rowset.RowSetWriterFactory; +import org.apache.jena.sparql.core.Var; +import org.apache.jena.sparql.engine.binding.Binding; +import org.apache.jena.sparql.exec.RowSet; +import org.apache.jena.sparql.resultset.ResultSetException; +import org.apache.jena.sparql.util.Context; +import org.apache.jena.sparql.util.NodeToLabelMap; + +public class RowSetWriterCSV implements RowSetWriter { + + public static RowSetWriterFactory factory = lang -> { + if ( !Objects.equals(lang, ResultSetLang.RS_CSV) ) + throw new ResultSetException("RowSetWriter for CSV asked for a " + lang); + return new RowSetWriterCSV(); + }; + + private RowSetWriterCSV() {} + + @Override + public void write(OutputStream out, RowSet resultSet, Context context) { + output(IO.wrapUTF8(out), resultSet); + } + + @Override + public void write(Writer out, RowSet resultSet, Context context) { + output(IO.wrap(out), resultSet); + } + + @Override + public void write(OutputStream out, boolean result, Context context) { + output(IO.wrapUTF8(out), result); + } + + private static void output(AWriter out, boolean booleanResult) { + out.write(headerBytes); + if ( booleanResult ) + out.write(yesBytes); + else + out.write(noBytes); + out.write(NL); + } + + private static void output(AWriter out, RowSet rowSet) { + try { Review comment: Wrong indentation. ########## File path: jena-arq/src/main/java/org/apache/jena/riot/rowset/rw/RowSetWriterTSV.java ########## @@ -0,0 +1,121 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.jena.riot.rowset.rw; + +import java.io.OutputStream; +import java.io.Writer; +import java.util.List; +import java.util.Objects; + +import org.apache.jena.atlas.io.AWriter; +import org.apache.jena.atlas.io.IO; +import org.apache.jena.graph.Node; +import org.apache.jena.riot.out.NodeFormatter; +import org.apache.jena.riot.out.NodeFormatterTTL; +import org.apache.jena.riot.resultset.ResultSetLang; +import org.apache.jena.riot.rowset.RowSetWriter; +import org.apache.jena.riot.rowset.RowSetWriterFactory; +import org.apache.jena.sparql.core.Var; +import org.apache.jena.sparql.engine.binding.Binding; +import org.apache.jena.sparql.exec.RowSet; +import org.apache.jena.sparql.resultset.ResultSetException; +import org.apache.jena.sparql.util.Context; + +public class RowSetWriterTSV implements RowSetWriter { + + public static RowSetWriterFactory factory = lang -> { + if (!Objects.equals(lang, ResultSetLang.RS_TSV ) ) + throw new ResultSetException("RowSetWriter for TSV asked for a "+lang); + return new RowSetWriterTSV(); + }; + + private RowSetWriterTSV() {} + + @Override + public void write(OutputStream out, RowSet rowSet, Context context) { + output(IO.wrapUTF8(out), rowSet); + } + + @Override + public void write(Writer out, RowSet rowSet, Context context) { + output(IO.wrap(out), rowSet); + } + + @Override + public void write(OutputStream out, boolean result, Context context) {} + + private static void output(AWriter out, boolean booleanResult) { + out.write(headerBytes); + if ( booleanResult ) + out.write(yesBytes); + else + out.write(noBytes); + out.write(NL); + out.flush(); + } + + private static void output(AWriter out, RowSet rowSet) { + try { + NodeFormatter formatter = createNodeFormatter(); + String sep = null; + List<Var> vars = rowSet.getResultVars(); + + // writes the variables on the first line + for ( Var var : vars ) { + if ( sep != null ) + out.write(sep); + else + sep = SEP; + out.write("?"); + out.write(var.getVarName()); + } + out.write(NL); + + // writes one binding by line + for ( ; rowSet.hasNext() ; ) { + sep = null; + Binding b = rowSet.next(); + + for ( Var v : vars ) { + if ( sep != null ) + out.write(sep); + sep = SEP; + + Node n = b.get(v); + if ( n != null ) { + // This will not include a raw tab. + formatter.format(out, n); + } + } + out.write(NL); + } + } finally { out.flush();} + } + + protected static NodeFormatter createNodeFormatter() { + // Use a Turtle formatter to format terms + return new NodeFormatterTTL(null, null); + } + + private static final String NL = "\n" ; + private static final String SEP = "\t" ; + private static final String headerBytes = "?_askResult" + NL; Review comment: Wrong indentation. ########## File path: jena-arq/src/main/java/org/apache/jena/sparql/resultset/TSVInput.java ########## @@ -18,66 +18,27 @@ package org.apache.jena.sparql.resultset; -import java.io.BufferedReader ; -import java.io.IOException ; import java.io.InputStream ; -import java.util.ArrayList ; -import java.util.List ; import java.util.regex.Pattern ; -import org.apache.jena.atlas.io.IO ; -import org.apache.jena.graph.Node ; import org.apache.jena.query.ResultSet ; -import org.apache.jena.riot.RiotException ; -import org.apache.jena.sparql.ARQException ; -import org.apache.jena.sparql.core.Var ; -import org.apache.jena.sparql.engine.ResultSetStream ; -import org.apache.jena.sparql.util.NodeFactoryExtra ; +import org.apache.jena.riot.resultset.ResultSetLang; +import org.apache.jena.riot.rowset.rw.RowSetReaderTSV; +import org.apache.jena.sparql.exec.RowSet; /** - * Input reader associated to {@link TSVOutput}. + * Input reader for Tab Separated Values format. + * @deprecated To be removed Review comment: Extra space (nit-picking! <hides/>) -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
