Author: andy
Date: Thu Jun 27 15:43:44 2013
New Revision: 1497403
URL: http://svn.apache.org/r1497403
Log:
Tidy up after adding isomorphic equality operation to UpdateRequest.
Modified:
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/Prologue.java
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/QueryHashCode.java
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/update/Update.java
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/update/UpdateRequest.java
Modified:
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/Prologue.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/Prologue.java?rev=1497403&r1=1497402&r2=1497403&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/Prologue.java
(original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/Prologue.java
Thu Jun 27 15:43:44 2013
@@ -27,7 +27,7 @@ import org.apache.jena.atlas.logging.Log
import com.hp.hpl.jena.sparql.util.PrefixMapping2 ;
-//** Prologues - combines with PrefixMapping (the RIOT Prologue uses
PrefixMap) */
+/** Prologue - combines with PrefixMapping (the RIOT Prologue uses PrefixMap)
*/
public class Prologue
{
protected boolean seenBaseURI = false ; // Implicit or set.
@@ -211,4 +211,20 @@ public class Prologue
return false ;
return
getPrefixMapping().samePrefixMappingAs(other.getPrefixMapping()) ;
}
+
+ // Caution.
+ // Prologues are inherited (historical).
+ // This is support code.
+
+ public static int hash(Prologue prologue) {
+ final int prime = 31 ;
+ int x = 1 ;
+ if ( prologue.seenBaseURI )
+ x = prime * x + prologue.getBaseURI().hashCode() ;
+ else
+ x = 1237 ;
+ if ( prologue.prefixMap != null )
+ x = prime * x + prologue.prefixMap.getNsPrefixMap().hashCode() ;
+ return x ;
+ }
}
Modified:
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/QueryHashCode.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/QueryHashCode.java?rev=1497403&r1=1497402&r2=1497403&view=diff
==============================================================================
---
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/QueryHashCode.java
(original)
+++
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/QueryHashCode.java
Thu Jun 27 15:43:44 2013
@@ -52,9 +52,7 @@ public class QueryHashCode
@Override
public void visitPrologue(Prologue query)
{
- if ( query.explicitlySetBaseURI() )
- x ^= query.getBaseURI().hashCode() ;
- x ^= query.getPrefixMapping().getNsPrefixMap().hashCode() ;
+ x ^= Prologue.hash(query) ;
}
@Override
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/update/Update.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/update/Update.java?rev=1497403&r1=1497402&r2=1497403&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/update/Update.java
(original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/update/Update.java Thu
Jun 27 15:43:44 2013
@@ -55,29 +55,6 @@ public abstract class Update implements
/** Compare by isomorphism - if the isomorphism map is null, compare nodes
by .equals */
public abstract boolean equalTo(Update other, NodeIsomorphismMap isoMap) ;
-
-// @Override
-// public boolean equals(Object other) {
-// if ( ! ( other instanceof Update ) )
-// return false ;
-// return equalTo((Update)other, null) ;
-// }
-//
-// @Override
-// public abstract int hashCode() ;
-
- protected static final int hashAdd = 0x1000 ;
- protected static final int hashCopy = 0x1001 ;
- protected static final int hashMove = 0x1002 ;
- protected static final int hashCreate = 0x1003 ;
- protected static final int hashInsertData = 0x1004 ;
- protected static final int hashDeleteData = 0x1005 ;
- protected static final int hashDeleteWhere = 0x1006 ;
- protected static final int hashClear = 0x1007 ;
- protected static final int hashDrop = 0x1008 ;
-
- protected static final int hashLoad = 0x1009 ;
- protected static final int hashDeleteInsert = 0x100A ;
-
+ // Update equality should not be structural isomorphism.
}
Modified:
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/update/UpdateRequest.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/update/UpdateRequest.java?rev=1497403&r1=1497402&r2=1497403&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/update/UpdateRequest.java
(original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/update/UpdateRequest.java
Thu Jun 27 15:43:44 2013
@@ -72,5 +72,7 @@ public class UpdateRequest extends Prolo
public boolean equalTo(UpdateRequest other) {
return UpdateCompare.isomorphic(this, other) ;
}
-
+
+ // Better to have an explicit "isomorphism" equality and leave .equals
alone.
+ // The Query object historical did it the other way so leave that.
}
