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 2011/09/22 16:29:13 UTC
svn commit: r1174161 - in /incubator/jena/Scratch/AFS/trunk:
src-dev/dev/Table.java src-dev/dev/TableArray.java src-dev/table/
src-dev/table/Table.java src-dev/table/TableArray.java
src-dev/table/TableStream.java src/algebra2/Table.java
Author: andy
Date: Thu Sep 22 14:29:13 2011
New Revision: 1174161
URL: http://svn.apache.org/viewvc?rev=1174161&view=rev
Log: (empty)
Added:
incubator/jena/Scratch/AFS/trunk/src-dev/table/
incubator/jena/Scratch/AFS/trunk/src-dev/table/Table.java (contents, props changed)
- copied, changed from r1174152, incubator/jena/Scratch/AFS/trunk/src-dev/dev/Table.java
incubator/jena/Scratch/AFS/trunk/src-dev/table/TableArray.java (contents, props changed)
- copied, changed from r1174152, incubator/jena/Scratch/AFS/trunk/src-dev/dev/TableArray.java
incubator/jena/Scratch/AFS/trunk/src-dev/table/TableStream.java (with props)
Removed:
incubator/jena/Scratch/AFS/trunk/src-dev/dev/Table.java
incubator/jena/Scratch/AFS/trunk/src-dev/dev/TableArray.java
Modified:
incubator/jena/Scratch/AFS/trunk/src/algebra2/Table.java
Copied: incubator/jena/Scratch/AFS/trunk/src-dev/table/Table.java (from r1174152, incubator/jena/Scratch/AFS/trunk/src-dev/dev/Table.java)
URL: http://svn.apache.org/viewvc/incubator/jena/Scratch/AFS/trunk/src-dev/table/Table.java?p2=incubator/jena/Scratch/AFS/trunk/src-dev/table/Table.java&p1=incubator/jena/Scratch/AFS/trunk/src-dev/dev/Table.java&r1=1174152&r2=1174161&rev=1174161&view=diff
==============================================================================
--- incubator/jena/Scratch/AFS/trunk/src-dev/dev/Table.java (original)
+++ incubator/jena/Scratch/AFS/trunk/src-dev/table/Table.java Thu Sep 22 14:29:13 2011
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package dev;
+package table;
import java.util.Iterator ;
import java.util.List ;
@@ -34,7 +34,7 @@ public interface Table
* a particular row may not have a binding for a particular variable.
*/
- public List<Var> columns() ;
+ public List<Var> vars() ;
/**
* The rows of the table as an iterator.
Propchange: incubator/jena/Scratch/AFS/trunk/src-dev/table/Table.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: incubator/jena/Scratch/AFS/trunk/src-dev/table/TableArray.java (from r1174152, incubator/jena/Scratch/AFS/trunk/src-dev/dev/TableArray.java)
URL: http://svn.apache.org/viewvc/incubator/jena/Scratch/AFS/trunk/src-dev/table/TableArray.java?p2=incubator/jena/Scratch/AFS/trunk/src-dev/table/TableArray.java&p1=incubator/jena/Scratch/AFS/trunk/src-dev/dev/TableArray.java&r1=1174152&r2=1174161&rev=1174161&view=diff
==============================================================================
--- incubator/jena/Scratch/AFS/trunk/src-dev/dev/TableArray.java (original)
+++ incubator/jena/Scratch/AFS/trunk/src-dev/table/TableArray.java Thu Sep 22 14:29:13 2011
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package dev;
+package table;
import java.util.ArrayList ;
import java.util.Collections ;
@@ -25,16 +25,24 @@ import java.util.List ;
import com.hp.hpl.jena.sparql.core.Var ;
import com.hp.hpl.jena.sparql.engine.binding.Binding ;
+import com.hp.hpl.jena.sparql.engine.binding.BindingInputStream ;
/** Implementation of a Table using an array. */
public class TableArray implements Table
{
private List<Binding> rows = new ArrayList<Binding>() ;
- private List<Var> columns = new ArrayList<Var>() ;
+ private List<Var> vars = new ArrayList<Var>() ;
public TableArray() {}
+ static TableArray read(BindingInputStream in)
+ {
+ TableArray table = new TableArray() ;
+ table.add(in) ;
+ return table ;
+ }
+
public void add(Binding binding)
{
Iterator<Var> vars = binding.vars() ;
@@ -61,14 +69,14 @@ public class TableArray implements Table
return ;
}
// General
- for ( Var v : other.columns() )
+ for ( Var v : other.vars() )
accVar(v) ;
add(other.rows()) ;
}
public void add(TableArray other)
{
- for ( Var v : other.columns() )
+ for ( Var v : other.vars() )
accVar(v) ;
rows.addAll(other.rows) ;
}
@@ -79,14 +87,14 @@ public class TableArray implements Table
private void accVar(Var var)
{
- if ( ! columns.contains(var) )
- columns.add(var) ;
+ if ( ! vars.contains(var) )
+ vars.add(var) ;
}
@Override
- public List<Var> columns()
+ public List<Var> vars()
{
- return Collections.unmodifiableList(columns) ;
+ return Collections.unmodifiableList(vars) ;
}
@Override
Propchange: incubator/jena/Scratch/AFS/trunk/src-dev/table/TableArray.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: incubator/jena/Scratch/AFS/trunk/src-dev/table/TableStream.java
URL: http://svn.apache.org/viewvc/incubator/jena/Scratch/AFS/trunk/src-dev/table/TableStream.java?rev=1174161&view=auto
==============================================================================
--- incubator/jena/Scratch/AFS/trunk/src-dev/table/TableStream.java (added)
+++ incubator/jena/Scratch/AFS/trunk/src-dev/table/TableStream.java Thu Sep 22 14:29:13 2011
@@ -0,0 +1,47 @@
+/**
+ * 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 table;
+
+import java.util.Collections ;
+import java.util.Iterator ;
+import java.util.List ;
+
+import com.hp.hpl.jena.sparql.core.Var ;
+import com.hp.hpl.jena.sparql.engine.binding.Binding ;
+
+/** Implementation of a Table as a simple wrapper over an iterator with known columns. */
+
+public class TableStream implements Table
+{
+ private Iterator<Binding> rows ;
+ private List<Var> vars ;
+
+ public TableStream(List<Var> vars, Iterator<Binding> rows)
+ {
+ this.rows = rows ;
+ this.vars = vars ;
+ }
+
+ @Override
+ public List<Var> vars() { return Collections.unmodifiableList(vars) ; }
+
+ @Override
+ public Iterator<Binding> rows() { return rows ; }
+}
+
Propchange: incubator/jena/Scratch/AFS/trunk/src-dev/table/TableStream.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: incubator/jena/Scratch/AFS/trunk/src/algebra2/Table.java
URL: http://svn.apache.org/viewvc/incubator/jena/Scratch/AFS/trunk/src/algebra2/Table.java?rev=1174161&r1=1174160&r2=1174161&view=diff
==============================================================================
--- incubator/jena/Scratch/AFS/trunk/src/algebra2/Table.java (original)
+++ incubator/jena/Scratch/AFS/trunk/src/algebra2/Table.java Thu Sep 22 14:29:13 2011
@@ -25,7 +25,7 @@ import org.openjena.atlas.lib.Tuple;
import com.hp.hpl.jena.sparql.core.Var ;
import com.hp.hpl.jena.sparql.engine.binding.Binding ;
-/** Abstraction of a set of tuples (ragged - not every columen is defined in every row) */
+/** Abstraction of a set of tuples (ragged - not every column is defined in every row) */
public interface Table
{
// Later : QueryIterator or QI adapter.