Implemented quad dictionaries for .nq files

hdt-api/src/main/java/org/rdfhdt/hdt/dictionary/Dictionary.java

@@ -99,6 +99,11 @@ public interface Dictionary extends Closeable {
 	 */
 	long getNobjects();
 
+	/**
+	 * Returns the number of objects in the dictionary. Note: Includes shared
+	 */
+	long getNgraphs();
+
 	/**
 	 * Returns the number of subjects/objects in the dictionary.
 	 */
@@ -111,6 +116,8 @@ public interface Dictionary extends Closeable {
 
 	DictionarySection getObjects();
 
+	DictionarySection getGraphs();
+
 	Map<? extends CharSequence, DictionarySection> getAllObjects();
 
 	DictionarySection getShared();

hdt-api/src/main/java/org/rdfhdt/hdt/enums/DictionarySectionRole.java

@@ -4,5 +4,6 @@ public enum DictionarySectionRole {
 	SUBJECT,
 	PREDICATE,
 	OBJECT,
-	SHARED
+	SHARED,
+	GRAPH,
 }

hdt-api/src/main/java/org/rdfhdt/hdt/enums/TripleComponentRole.java

@@ -38,4 +38,6 @@ public enum TripleComponentRole {
 	PREDICATE,
 	/** The triple is an object */
 	OBJECT,
+	/** The triple is a graph */
+	GRAPH,
 }

hdt-api/src/main/java/org/rdfhdt/hdt/hdt/HDTVocabulary.java

@@ -84,6 +84,7 @@ public class HDTVocabulary {
 	public static final String DICTIONARY_TYPE_PLAIN = HDT_DICTIONARY_BASE+"Plain>";
 	public static final String DICTIONARY_TYPE_FOUR_SECTION = HDT_DICTIONARY_BASE+"Four>";
 	public static final String DICTIONARY_TYPE_MULT_SECTION = HDT_DICTIONARY_BASE+"Mult>";
+	public static final String DICTIONARY_TYPE_FOUR_QUAD_SECTION = HDT_DICTIONARY_BASE+"FourQuad>";
 
 	public static final String DICTIONARY_TYPE_FOUR_PSFC_SECTION = HDT_DICTIONARY_BASE+"FourPsfc>";
 
@@ -106,6 +107,7 @@ public class HDTVocabulary {
 	public static final String TRIPLES_TYPE_PLAIN = HDT_TRIPLES_BASE+"Plain>";
 	public static final String TRIPLES_TYPE_COMPACT = HDT_TRIPLES_BASE+"Compact>";
 	public static final String TRIPLES_TYPE_BITMAP = HDT_TRIPLES_BASE+"Bitmap>";
+	public static final String TRIPLES_TYPE_BITMAP_QUAD = HDT_TRIPLES_BASE+"BitmapQuad>";
 
 	// Index type
 	public static final String INDEX_TYPE_FOQ = HDT_BASE+"indexFoQ>";

hdt-api/src/main/java/org/rdfhdt/hdt/options/HDTOptionsKeys.java

@@ -263,6 +263,10 @@ public class HDTOptionsKeys {
 	 */
 	@Value(key = TEMP_DICTIONARY_IMPL_KEY, desc = "hash dictionary")
 	public static final String TEMP_DICTIONARY_IMPL_VALUE_HASH = "hash";
+	/**
+	 * use Hash quad to create the HDTQ
+	 */
+	public static final String TEMP_DICTIONARY_IMPL_VALUE_HASH_QUAD  = "hashQuad";
 	/**
 	 * use Hash map to create the HDT and store the multisection dictionary, mandatory to create MSC
 	 */
@@ -282,8 +286,13 @@ public class HDTOptionsKeys {
 	/**
 	 * 4 Section dictionary
 	 */
-	@Value(key = DICTIONARY_TYPE_KEY, desc = "Four sectiob dictionary")
+	@Value(key = DICTIONARY_TYPE_KEY, desc = "Four section dictionary")
 	public static final String DICTIONARY_TYPE_VALUE_FOUR_SECTION = HDTVocabulary.DICTIONARY_TYPE_FOUR_SECTION;
+	/*
+	 * 4 Quad Section dictionary
+	 */
+	@Value(key = DICTIONARY_TYPE_KEY, desc = "Four quad section dictionary")
+	public static final String DICTIONARY_TYPE_VALUE_FOUR_QUAD_SECTION = HDTVocabulary.DICTIONARY_TYPE_FOUR_QUAD_SECTION;
 	/**
 	 * Prefix AND Suffix front-coded (PSFC) 4 Section dictionary
 	 */

hdt-api/src/main/java/org/rdfhdt/hdt/quad/QuadString.java

@@ -116,4 +116,9 @@ public int hashCode() {
 	public QuadString tripleToString() {
 		return new QuadString(subject.toString(), predicate.toString(), object.toString(), context.toString());
 	}
+
+	@Override
+	public String toString() {
+		return super.toString() + " " + context;
+	}
 }

hdt-java-cli/src/main/java/org/rdfhdt/hdt/tools/RDF2HDT.java

@@ -173,6 +173,11 @@ public void execute() throws ParserException, IOException {
 			}
 		}
 
+		if (notation == RDFNotation.NQUAD) {
+			spec.set(HDTOptionsKeys.TEMP_DICTIONARY_IMPL_KEY, HDTOptionsKeys.TEMP_DICTIONARY_IMPL_VALUE_HASH_QUAD);
+			spec.set(HDTOptionsKeys.DICTIONARY_TYPE_KEY, HDTOptionsKeys.DICTIONARY_TYPE_VALUE_FOUR_QUAD_SECTION);
+		}
+
 		colorTool.log("Converting " +rdfInput+" to "+hdtOutput+" as "+notation.name());
 
 		if (ntSimpleLoading) {
@@ -251,6 +256,7 @@ public void execute() throws ParserException, IOException {
 				colorTool.logValue("Different subjects .... ", "" + hdt.getDictionary().getNsubjects());
 				colorTool.logValue("Different predicates .. ", "" + hdt.getDictionary().getNpredicates());
 				colorTool.logValue("Different objects ..... ", "" + hdt.getDictionary().getNobjects());
+				colorTool.logValue("Different graphs ...... ", "" + hdt.getDictionary().getNgraphs());
 				colorTool.logValue("Common Subject/Object . ", "" + hdt.getDictionary().getNshared());
 			}
 

hdt-java-core/src/main/java/org/rdfhdt/hdt/dictionary/DictionaryFactory.java

@@ -27,10 +27,12 @@
 
 package org.rdfhdt.hdt.dictionary;
 
+import org.rdfhdt.hdt.dictionary.impl.FourQuadSectionDictionary;
 import org.rdfhdt.hdt.dictionary.impl.FourSectionDictionary;
 import org.rdfhdt.hdt.dictionary.impl.FourSectionDictionaryBig;
 import org.rdfhdt.hdt.dictionary.impl.FourSectionDictionaryDiff;
 import org.rdfhdt.hdt.dictionary.impl.HashDictionary;
+import org.rdfhdt.hdt.dictionary.impl.HashQuadDictionary;
 import org.rdfhdt.hdt.dictionary.impl.MultipleSectionDictionary;
 import org.rdfhdt.hdt.dictionary.impl.MultipleSectionDictionaryDiff;
 import org.rdfhdt.hdt.dictionary.impl.PSFCFourSectionDictionary;
@@ -108,12 +110,13 @@ public static Dictionary createDefaultDictionary()
 	 */
 	public static TempDictionary createTempDictionary(HDTOptions spec) {
 		String name = spec.get(HDTOptionsKeys.TEMP_DICTIONARY_IMPL_KEY, "");
-
 		// Implementations available in the Core
 		switch (name) {
 			case "":
 			case HDTOptionsKeys.TEMP_DICTIONARY_IMPL_VALUE_HASH:
 				return new HashDictionary(spec, false);
+			case HDTOptionsKeys.TEMP_DICTIONARY_IMPL_VALUE_HASH_QUAD:
+				return new HashQuadDictionary(spec, false);
 			case HDTOptionsKeys.TEMP_DICTIONARY_IMPL_VALUE_HASH_PSFC:
 				return new PSFCTempDictionary(new HashDictionary(spec, false));
 			case HDTOptionsKeys.TEMP_DICTIONARY_IMPL_VALUE_MULT_HASH:
@@ -135,6 +138,8 @@ public static DictionaryPrivate createDictionary(HDTOptions spec) {
 			case "":
 			case HDTOptionsKeys.DICTIONARY_TYPE_VALUE_FOUR_SECTION:
 				return new FourSectionDictionary(spec);
+			case HDTOptionsKeys.DICTIONARY_TYPE_VALUE_FOUR_QUAD_SECTION:
+				return new FourQuadSectionDictionary(spec);
 			case HDTOptionsKeys.DICTIONARY_TYPE_VALUE_FOUR_PSFC_SECTION:
 				return new PSFCFourSectionDictionary(spec);
 			case HDTOptionsKeys.DICTIONARY_TYPE_VALUE_FOUR_SECTION_BIG:

hdt-java-core/src/main/java/org/rdfhdt/hdt/dictionary/TempDictionary.java

@@ -48,6 +48,8 @@ public interface TempDictionary extends Closeable {
 
 	TempDictionarySection getShared();
 
+	TempDictionarySection getGraphs();
+
 	/**
 	 * To be executed at the start of the processing
 	 *

hdt-java-core/src/main/java/org/rdfhdt/hdt/dictionary/impl/BaseDictionary.java

@@ -57,6 +57,7 @@ public abstract class BaseDictionary implements DictionaryPrivate {
 	protected DictionarySectionPrivate predicates;
 	protected DictionarySectionPrivate objects;
 	protected DictionarySectionPrivate shared;
+	protected DictionarySectionPrivate graphs;
 
 	public BaseDictionary(HDTOptions spec) {
 		this.spec = spec;
@@ -69,7 +70,8 @@ protected long getGlobalId(long id, DictionarySectionRole position) {
 			return shared.getNumberOfElements()+id;
 
 		case PREDICATE:
-		case SHARED:	                
+		case GRAPH:
+		case SHARED:
 			return id;
 		default:
 			throw new IllegalArgumentException();
@@ -86,6 +88,7 @@ protected long getLocalId(long id, TripleComponentRole position) {
 				return id-shared.getNumberOfElements();
 			}
 		case PREDICATE:
+		case GRAPH:
 			return id;
 		default:
 			throw new IllegalArgumentException();
@@ -126,6 +129,12 @@ public long stringToId(CharSequence str, TripleComponentRole position) {
 				return getGlobalId(ret, DictionarySectionRole.PREDICATE);
 			}
 			return -1;
+		case GRAPH:
+			ret = graphs.locate(str);
+			if(ret!=0) {
+				return getGlobalId(ret, DictionarySectionRole.GRAPH);
+			}
+			return -1;
 		case OBJECT:
 			if(str.charAt(0)!='"') {
 				ret = shared.locate(str);
@@ -145,12 +154,12 @@ public long stringToId(CharSequence str, TripleComponentRole position) {
 
 	@Override
 	public long getNumberOfElements() {
-		return subjects.getNumberOfElements()+predicates.getNumberOfElements()+objects.getNumberOfElements()+shared.getNumberOfElements();
+		return subjects.getNumberOfElements()+predicates.getNumberOfElements()+objects.getNumberOfElements()+shared.getNumberOfElements()+graphs.getNumberOfElements();
 	}
 
 	@Override
 	public long size() {
-		return subjects.size()+predicates.size()+objects.size()+shared.size();
+		return subjects.size()+predicates.size()+objects.size()+shared.size()+graphs.size();
 	}
 
 	@Override
@@ -168,6 +177,11 @@ public long getNobjects() {
 		return objects.getNumberOfElements()+shared.getNumberOfElements();
 	}
 
+	@Override
+	public long getNgraphs() {
+		return graphs.getNumberOfElements();
+	}
+
 	@Override
 	public long getNshared() {
 		return shared.getNumberOfElements();
@@ -187,6 +201,11 @@ public DictionarySection getPredicates() {
 	public DictionarySection getObjects() {
 		return objects;
 	}
+
+	@Override
+	public DictionarySection getGraphs() {
+		return graphs;
+	}
 
 	@Override
 	public DictionarySection getShared() {
@@ -203,6 +222,8 @@ private DictionarySectionPrivate getSection(long id, TripleComponentRole role) {
 			}
 		case PREDICATE:
 			return predicates;
+		case GRAPH:
+			return graphs;
 		case OBJECT:
 			if(id<=shared.getNumberOfElements()) {
 				return shared;

hdt-java-core/src/main/java/org/rdfhdt/hdt/dictionary/impl/BaseTempDictionary.java

@@ -153,6 +153,11 @@ public TempDictionarySection getObjects() {
 	public TempDictionarySection getShared() {
 		return shared;
 	}
+
+	@Override
+	public TempDictionarySection getGraphs() {
+		throw new NotImplementedException();
+	}
 
 	protected long getGlobalId(long id, DictionarySectionRole position) {
 		switch (position) {

hdt-java-core/src/main/java/org/rdfhdt/hdt/dictionary/impl/CompressFourSectionDictionary.java

@@ -189,6 +189,11 @@ public TempDictionarySection getShared() {
 		return shared;
 	}
 
+	@Override
+	public TempDictionarySection getGraphs() {
+		throw new NotImplementedException();
+	}
+
 	@Override
 	public void startProcessing() {
 	}