Skip to content

JENA-1714: Migrate 'migrate' packages #571

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
afs merged 1 commit into from
May 30, 2019
Merged

JENA-1714: Migrate 'migrate' packages #571

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions ...rg/apache/jena/riot/system/StreamOps.java → ...apache/jena/riot/system/StreamRDFOps.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
* whereas other operations do.
*/

public class StreamOps {
public class StreamRDFOps {

/** Send a dataset to a StreamRDF as prefixes, triples and quads, enclosed in stream.start()/stream.finish() */
public static void datasetToStream(DatasetGraph datasetGraph, StreamRDF stream) {
Expand Down Expand Up @@ -90,10 +90,10 @@ public static void sendDatasetToStream(DatasetGraph datasetGraph, StreamRDF stre

// Default graph
Iterator<Triple> iter1 = datasetGraph.getDefaultGraph().find(null, null, null) ;
StreamOps.sendTriplesToStream(iter1, stream) ;
StreamRDFOps.sendTriplesToStream(iter1, stream) ;

Iterator<Quad> iter2 = datasetGraph.findNG(null, null, null, null) ;
StreamOps.sendQuadsToStream(iter2, stream) ;
StreamRDFOps.sendQuadsToStream(iter2, stream) ;
}


Expand All @@ -108,7 +108,7 @@ public static void sendGraphToStream(Graph graph, StreamRDF stream, PrefixMap pr
if ( prefixMap != null )
sendPrefixesToStream(prefixMap, stream) ;
Iterator<Triple> iter = graph.find(null, null, null) ;
StreamOps.sendTriplesToStream(iter, stream) ;
StreamRDFOps.sendTriplesToStream(iter, stream) ;
}

/** Send the triples of graph to a StreamRDF (no prefix mapping) */
Expand All @@ -129,7 +129,7 @@ public static void sendTriplesToStream(Iterator<Triple> iter, StreamRDF dest)
/** Send quads of a dataset (including default graph as quads) to a StreamRDF, without prefixes */
public static void sendQuadsToStream(DatasetGraph datasetGraph, StreamRDF stream) {
Iterator<Quad> iter2 = datasetGraph.find(null, null, null, null) ;
StreamOps.sendQuadsToStream(iter2, stream) ;
StreamRDFOps.sendQuadsToStream(iter2, stream) ;
}

/** Set quads to a StreamRDF - does not call .start/.finish */
Expand All @@ -141,5 +141,4 @@ public static void sendQuadsToStream(Iterator<Quad> iter, StreamRDF dest)
dest.quad(q) ;
}
}

}
12 changes: 6 additions & 6 deletions jena-arq/src/main/java/org/apache/jena/riot/system/StreamRDFWriter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,8 +159,8 @@ public static RDFFormat defaultSerialization(Lang lang) {
* @param output OutputStream
* @param lang The syntax
* @return StreamRDF, or null if Lang does not have a streaming format.
* @see StreamOps#graphToStream
* @see StreamOps#datasetToStream
* @see StreamRDFOps#graphToStream
* @see StreamRDFOps#datasetToStream
*/
public static StreamRDF getWriterStream(OutputStream output, Lang lang) {
RDFFormat fmt = registry.choose(lang) ;
Expand All @@ -172,8 +172,8 @@ public static StreamRDF getWriterStream(OutputStream output, Lang lang) {
* @param output OutputStream
* @param format The syntax (as an {@link RDFFormat})
* @return StreamRDF, or null if format is not registered for streaming.
* @see StreamOps#graphToStream
* @see StreamOps#datasetToStream
* @see StreamRDFOps#graphToStream
* @see StreamRDFOps#datasetToStream
*/
public static StreamRDF getWriterStream(OutputStream output, RDFFormat format) {
StreamRDFWriterFactory x = registry.get(format) ;
Expand Down Expand Up @@ -218,7 +218,7 @@ public static void write(OutputStream output, Graph graph, Lang lang) {
*/
public static void write(OutputStream output, Graph graph, RDFFormat lang) {
StreamRDF stream = getWriterStream(output, lang) ;
StreamOps.graphToStream(graph, stream) ;
StreamRDFOps.graphToStream(graph, stream) ;
}

/** Write a DatasetGraph in streaming fashion
Expand All @@ -240,7 +240,7 @@ public static void write(OutputStream output, DatasetGraph datasetGraph, Lang la
*/
public static void write(OutputStream output, DatasetGraph datasetGraph, RDFFormat format) {
StreamRDF stream = getWriterStream(output, format) ;
StreamOps.datasetToStream(datasetGraph, stream) ;
StreamRDFOps.datasetToStream(datasetGraph, stream) ;
}

private static class StreamTriplesOnly extends StreamRDFWrapper {
Expand Down
4 changes: 2 additions & 2 deletions jena-arq/src/main/java/org/apache/jena/riot/thrift/WriterDatasetThrift.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
import org.apache.jena.riot.RDFFormat ;
import org.apache.jena.riot.WriterDatasetRIOT ;
import org.apache.jena.riot.system.PrefixMap ;
import org.apache.jena.riot.system.StreamOps ;
import org.apache.jena.riot.system.StreamRDFOps ;
import org.apache.jena.riot.system.StreamRDF ;
import org.apache.jena.sparql.core.DatasetGraph ;
import org.apache.jena.sparql.util.Context ;
Expand All @@ -51,7 +51,7 @@ public void write(Writer out, DatasetGraph dsg, PrefixMap prefixMap, String base
public void write(OutputStream out, DatasetGraph dsg, PrefixMap prefixMap, String baseURI, Context context) {
StreamRDF stream = BinRDF.streamToOutputStream(out, withValues) ;
stream.start();
StreamOps.sendDatasetToStream(dsg, stream, prefixMap) ;
StreamRDFOps.sendDatasetToStream(dsg, stream, prefixMap) ;
stream.finish();
}
}
4 changes: 2 additions & 2 deletions jena-arq/src/main/java/org/apache/jena/riot/thrift/WriterGraphThrift.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
import org.apache.jena.riot.RDFFormat ;
import org.apache.jena.riot.WriterGraphRIOT ;
import org.apache.jena.riot.system.PrefixMap ;
import org.apache.jena.riot.system.StreamOps ;
import org.apache.jena.riot.system.StreamRDFOps ;
import org.apache.jena.riot.system.StreamRDF ;
import org.apache.jena.sparql.util.Context ;

Expand All @@ -52,7 +52,7 @@ public void write(Writer out, Graph graph, PrefixMap prefixMap, String baseURI,
public void write(OutputStream out, Graph graph, PrefixMap prefixMap, String baseURI, Context context) {
StreamRDF stream = BinRDF.streamToOutputStream(out, withValues) ;
stream.start() ;
StreamOps.graphToStream(graph, stream) ;
StreamRDFOps.graphToStream(graph, stream) ;
stream.finish() ;
}
}
4 changes: 2 additions & 2 deletions jena-arq/src/main/java/org/apache/jena/riot/writer/NQuadsWriter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
import org.apache.jena.atlas.lib.CharSpace ;
import org.apache.jena.riot.Lang ;
import org.apache.jena.riot.system.PrefixMap ;
import org.apache.jena.riot.system.StreamOps ;
import org.apache.jena.riot.system.StreamRDFOps ;
import org.apache.jena.riot.system.StreamRDF ;
import org.apache.jena.riot.system.StreamRDFLib ;
import org.apache.jena.sparql.core.DatasetGraph ;
Expand Down Expand Up @@ -59,7 +59,7 @@ public static void write(Writer out, Iterator<Quad> iter, CharSpace charSpace)
private static void write$(StreamRDF s, Iterator<Quad> iter)
{
s.start() ;
StreamOps.sendQuadsToStream(iter, s) ;
StreamRDFOps.sendQuadsToStream(iter, s) ;
s.finish();
}

Expand Down
4 changes: 2 additions & 2 deletions jena-arq/src/main/java/org/apache/jena/riot/writer/NTriplesWriter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
import org.apache.jena.graph.Triple ;
import org.apache.jena.riot.Lang ;
import org.apache.jena.riot.system.PrefixMap ;
import org.apache.jena.riot.system.StreamOps ;
import org.apache.jena.riot.system.StreamRDFOps ;
import org.apache.jena.riot.system.StreamRDF ;
import org.apache.jena.riot.system.StreamRDFLib ;
import org.apache.jena.sparql.util.Context ;
Expand Down Expand Up @@ -61,7 +61,7 @@ public static void write(Writer out, Iterator<Triple> iter, CharSpace charSpace)
private static void write$(StreamRDF s, Iterator<Triple> iter)
{
s.start() ;
StreamOps.sendTriplesToStream(iter, s) ;
StreamRDFOps.sendTriplesToStream(iter, s) ;
s.finish();
}

Expand Down
4 changes: 2 additions & 2 deletions jena-arq/src/main/java/org/apache/jena/riot/writer/TriGWriterBlocks.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

import org.apache.jena.atlas.io.IndentedWriter ;
import org.apache.jena.riot.system.PrefixMap ;
import org.apache.jena.riot.system.StreamOps ;
import org.apache.jena.riot.system.StreamRDFOps ;
import org.apache.jena.riot.system.StreamRDF ;
import org.apache.jena.sparql.core.DatasetGraph ;
import org.apache.jena.sparql.util.Context ;
Expand All @@ -35,7 +35,7 @@ protected void output(IndentedWriter iOut, DatasetGraph dsg, PrefixMap prefixMap
StreamRDF dest = new WriterStreamRDFBlocks(iOut) ;
dest.start() ;
dest.base(baseURI) ;
StreamOps.sendDatasetToStream(dsg, dest, prefixMap) ;
StreamRDFOps.sendDatasetToStream(dsg, dest, prefixMap) ;
dest.finish() ;
}
}
Expand Down
4 changes: 2 additions & 2 deletions jena-arq/src/main/java/org/apache/jena/riot/writer/TriGWriterFlat.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

import org.apache.jena.atlas.io.IndentedWriter ;
import org.apache.jena.riot.system.PrefixMap ;
import org.apache.jena.riot.system.StreamOps ;
import org.apache.jena.riot.system.StreamRDFOps ;
import org.apache.jena.riot.system.StreamRDF ;
import org.apache.jena.sparql.core.DatasetGraph ;
import org.apache.jena.sparql.util.Context ;
Expand All @@ -36,7 +36,7 @@ protected void output(IndentedWriter iOut, DatasetGraph datasetGraph, PrefixMap
StreamRDF dest = new WriterStreamRDFFlat(iOut) ;
dest.start() ;
dest.base(baseURI) ;
StreamOps.sendDatasetToStream(datasetGraph, dest, prefixMap) ;
StreamRDFOps.sendDatasetToStream(datasetGraph, dest, prefixMap) ;
dest.finish() ;
}
}
4 changes: 2 additions & 2 deletions jena-arq/src/main/java/org/apache/jena/riot/writer/TurtleWriterBlocks.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
import org.apache.jena.atlas.io.IndentedWriter ;
import org.apache.jena.graph.Graph ;
import org.apache.jena.riot.system.PrefixMap ;
import org.apache.jena.riot.system.StreamOps ;
import org.apache.jena.riot.system.StreamRDFOps ;
import org.apache.jena.riot.system.StreamRDF ;
import org.apache.jena.sparql.util.Context ;

Expand All @@ -35,7 +35,7 @@ protected void output(IndentedWriter out, Graph graph, PrefixMap prefixMap, Stri
StreamRDF dest = new WriterStreamRDFBlocks(out) ;
dest.start() ;
dest.base(baseURI) ;
StreamOps.sendGraphToStream(graph, dest, prefixMap) ;
StreamRDFOps.sendGraphToStream(graph, dest, prefixMap) ;
dest.finish() ;
}
}
Expand Down
4 changes: 2 additions & 2 deletions jena-arq/src/main/java/org/apache/jena/riot/writer/TurtleWriterFlat.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
import org.apache.jena.atlas.io.IndentedWriter ;
import org.apache.jena.graph.Graph ;
import org.apache.jena.riot.system.PrefixMap ;
import org.apache.jena.riot.system.StreamOps ;
import org.apache.jena.riot.system.StreamRDFOps ;
import org.apache.jena.riot.system.StreamRDF ;
import org.apache.jena.sparql.util.Context ;

Expand All @@ -33,7 +33,7 @@ protected void output(IndentedWriter out, Graph graph, PrefixMap prefixMap, Stri
StreamRDF dest = new WriterStreamRDFFlat(out) ;
dest.start() ;
dest.base(baseURI) ;
StreamOps.sendGraphToStream(graph, dest, prefixMap) ;
StreamRDFOps.sendGraphToStream(graph, dest, prefixMap) ;
dest.finish() ;
}
}
6 changes: 3 additions & 3 deletions jena-arq/src/main/java/org/apache/jena/riot/writer/WriterTriX.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
import org.apache.jena.riot.lang.TriX ;
import org.apache.jena.riot.system.PrefixMap ;
import org.apache.jena.riot.system.RiotLib ;
import org.apache.jena.riot.system.StreamOps ;
import org.apache.jena.riot.system.StreamRDFOps ;
import org.apache.jena.sparql.core.DatasetGraph ;
import org.apache.jena.sparql.util.Context ;

Expand Down Expand Up @@ -66,7 +66,7 @@ public void write(Writer out, DatasetGraph datasetGraph, PrefixMap prefixMap, St

private void write(IndentedWriter out, DatasetGraph datasetGraph, PrefixMap prefixMap, String baseURI, Context context) {
StreamWriterTriX w = new StreamWriterTriX(out) ;
StreamOps.datasetToStream(datasetGraph, w) ;
StreamRDFOps.datasetToStream(datasetGraph, w) ;
}

// Graph
Expand All @@ -84,7 +84,7 @@ public void write(Writer out, Graph graph, PrefixMap prefixMap, String baseURI,

private static void write(IndentedWriter out, Graph graph, PrefixMap prefixMap, String baseURI, Object context) {
StreamWriterTriX w = new StreamWriterTriX(out) ;
StreamOps.graphToStream(graph, w) ;
StreamRDFOps.graphToStream(graph, w) ;
}
}

35 changes: 11 additions & 24 deletions jena-arq/src/main/java/org/apache/jena/sparql/algebra/OpLib.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,31 +18,18 @@

package org.apache.jena.sparql.algebra;

import org.apache.jena.sparql.algebra.op.* ;

// NB Operations take and return nulls for convenience.
import org.apache.jena.sparql.core.Quad;

public class OpLib
{
public static Op sub(Op1 op) { return op==null ? null : op.getSubOp() ; }
Copy link
Member

@ajs6f ajs6f May 28, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Did these guys just not get any use?

Copy link
Member Author

@afs afs May 28, 2019 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No use. Deleting them had no effect.

Copy link
Member

@ajs6f ajs6f May 28, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Got it, makes sense.


public static boolean isProject(Op op) { return op instanceof OpProject ; }
public static OpProject asProject(Op op)
{ return isProject(op) ? (OpProject)op : null ; }

public static boolean isDistinct(Op op) { return op instanceof OpDistinct ; }
public static OpDistinct asDistinct(Op op)
{ return isDistinct(op) ? (OpDistinct)op : null ; }

public static boolean isReduced(Op op) { return op instanceof OpReduced ; }
public static OpReduced asReduced(Op op)
{ return isReduced(op) ? (OpReduced)op : null ; }

public static boolean isOrder(Op op) { return op instanceof OpOrder ; }
public static OpOrder asOrder(Op op)
{ return isOrder(op) ? (OpOrder)op : null ; }

public static boolean isSlice(Op op) { return op instanceof OpSlice ; }
public static OpSlice asSlice(Op op)
{ return isSlice(op) ? (OpSlice)op : null ; }
/** Convert a pattern, assumed to be quad form,
* so that the default graph is the union of named graphs.
*/
public static Op unionDefaultGraphQuads(Op op)
{
// Rewrite so that any explicitly named "default graph" is union graph.
Transform t = new TransformGraphRename(Quad.defaultGraphNodeGenerated, Quad.unionGraph) ;
op = Transformer.transform(t, op) ;
return op ;
}
}
4 changes: 2 additions & 2 deletions ...ena/tdb/migrate/TransformGraphRename.java → .../sparql/algebra/TransformGraphRename.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,15 @@
* limitations under the License.
*/

package org.apache.jena.tdb.migrate;
package org.apache.jena.sparql.algebra;

import org.apache.jena.graph.Node ;
import org.apache.jena.sparql.algebra.Op ;
import org.apache.jena.sparql.algebra.TransformCopy ;
import org.apache.jena.sparql.algebra.op.OpGraph ;
import org.apache.jena.sparql.algebra.op.OpQuadPattern ;

/** Rename quad form alegra */
public class TransformGraphRename extends TransformCopy
{
private Node oldGraphName ;
Expand All @@ -35,7 +36,6 @@ public TransformGraphRename(Node oldGraphName, Node newGraphName)
this.newGraphName = newGraphName ;
}

// Does not affect variables.
@Override
public Op transform(OpGraph opGraph, Op x)
{
Expand Down
28 changes: 3 additions & 25 deletions ...g/apache/jena/dboe/storage/migrate/M.java → ...va/org/apache/jena/sparql/core/Match.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,25 +15,13 @@
* information regarding copyright ownership.
*/

package org.apache.jena.dboe.storage.migrate;
package org.apache.jena.sparql.core;

import org.apache.jena.graph.Node;
import org.apache.jena.graph.Triple;
import org.apache.jena.sparql.core.Quad;

/** Ways to match triples. quads */
public class M {

// public static Stream<Triple> match(Collection<Triple> triples, Node s, Node p, Node o) {
// return triples.stream()
// .filter(t-> match(t, s,p,o));
// }
//
// public static Stream<Quad> match(Collection<Quad> quads, Node g, Node s, Node p, Node o) {
// return quads.stream()
// .filter(q-> match(q, g,s,p,o));
// }

/** Match triples, quads, with wioldcar rules (null or {@link Node#ANY} are wildcards). */
public class Match {
public static boolean match(Quad quad, Node g, Node s, Node p, Node o) {
return
match(quad.getGraph(), g) &&
Expand All @@ -52,14 +40,4 @@ public static boolean match(Triple triple, Node s, Node p, Node o) {
public static boolean match(Node node, Node pattern) {
return pattern == null || pattern == Node.ANY || pattern.equals(node);
}

// public static void checkConcrete(Node...nodes) {
// for ( Node n : nodes )
// checkConcrete(n);
// }
//
// public static void checkConcrete(Node n) {
// if ( ! n.isConcrete() )
// throw new IllegalArgumentException("Not concrete: "+n);
// }
}
6 changes: 3 additions & 3 deletions jena-arq/src/test/java/org/apache/jena/riot/thrift/TestStreamRDFThrift.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
import org.apache.jena.graph.Triple ;
import org.apache.jena.riot.Lang ;
import org.apache.jena.riot.RDFDataMgr ;
import org.apache.jena.riot.system.StreamOps ;
import org.apache.jena.riot.system.StreamRDFOps ;
import org.apache.jena.riot.system.StreamRDF ;
import org.apache.jena.riot.system.StreamRDFLib ;
import org.apache.jena.riot.system.StreamRDFWriter ;
Expand Down Expand Up @@ -72,7 +72,7 @@ public class TestStreamRDFThrift extends BaseTest {
@Test public void graph_01() {
ByteArrayOutputStream out = new ByteArrayOutputStream() ;
StreamRDF stream = BinRDF.streamToOutputStream(out, true) ; // With values.
StreamOps.graphToStream(graph, stream) ;
StreamRDFOps.graphToStream(graph, stream) ;

byte[] bytes = out.toByteArray() ;
ByteArrayInputStream in = new ByteArrayInputStream(bytes) ;
Expand Down Expand Up @@ -114,7 +114,7 @@ public class TestStreamRDFThrift extends BaseTest {
DatasetGraph dsg1 = datasetGraph ;
ByteArrayOutputStream out = new ByteArrayOutputStream() ;
StreamRDF stream = BinRDF.streamToOutputStream(out) ;
StreamOps.datasetToStream(dsg1, stream) ;
StreamRDFOps.datasetToStream(dsg1, stream) ;

byte[] bytes = out.toByteArray() ;
ByteArrayInputStream in = new ByteArrayInputStream(bytes) ;
Expand Down
Loading