diff --git a/bundles/sirix-core/src/main/java/org/sirix/access/Databases.java b/bundles/sirix-core/src/main/java/org/sirix/access/Databases.java index cb2b29910..bf9b92abd 100644 --- a/bundles/sirix-core/src/main/java/org/sirix/access/Databases.java +++ b/bundles/sirix-core/src/main/java/org/sirix/access/Databases.java @@ -7,7 +7,6 @@ import org.sirix.cache.BufferManager; import org.sirix.exception.SirixIOException; import org.sirix.exception.SirixUsageException; -import org.sirix.io.DirectIOUtils; import org.sirix.utils.LogWrapper; import org.sirix.utils.SirixFiles; import org.slf4j.LoggerFactory; diff --git a/bundles/sirix-core/src/main/java/org/sirix/access/EmptyBufferManager.java b/bundles/sirix-core/src/main/java/org/sirix/access/EmptyBufferManager.java index 555ae9558..85441e01e 100644 --- a/bundles/sirix-core/src/main/java/org/sirix/access/EmptyBufferManager.java +++ b/bundles/sirix-core/src/main/java/org/sirix/access/EmptyBufferManager.java @@ -2,7 +2,7 @@ import org.sirix.cache.*; import org.sirix.index.name.Names; -import org.sirix.index.redblacktree.RBNode; +import org.sirix.node.interfaces.Node; import org.sirix.page.PageReference; import org.sirix.page.RevisionRootPage; import org.sirix.page.interfaces.Page; @@ -15,7 +15,7 @@ public final class EmptyBufferManager implements org.sirix.cache.BufferManager { private static final EmptyCache REVISION_ROOT_PAGE_CACHE = new EmptyCache<>(); - private static final EmptyCache> AVL_NODE_CACHE = new EmptyCache<>(); + private static final EmptyCache INDEX_CACHE = new EmptyCache<>(); private static final EmptyCache NAMES_CACHE = new EmptyCache<>(); @@ -40,8 +40,8 @@ public Cache getRevisionRootPageCache() { } @Override - public Cache> getIndexCache() { - return AVL_NODE_CACHE; + public Cache getIndexCache() { + return INDEX_CACHE; } @Override diff --git a/bundles/sirix-core/src/main/java/org/sirix/access/trx/node/AbstractResourceSession.java b/bundles/sirix-core/src/main/java/org/sirix/access/trx/node/AbstractResourceSession.java index 260324d26..8d0c54b13 100644 --- a/bundles/sirix-core/src/main/java/org/sirix/access/trx/node/AbstractResourceSession.java +++ b/bundles/sirix-core/src/main/java/org/sirix/access/trx/node/AbstractResourceSession.java @@ -26,7 +26,6 @@ import org.sirix.exception.SirixUsageException; import org.sirix.index.IndexType; import org.sirix.index.path.summary.PathSummaryReader; -import org.sirix.index.redblacktree.RBNode; import org.sirix.io.IOStorage; import org.sirix.io.Reader; import org.sirix.io.Writer; @@ -211,7 +210,7 @@ protected void initializeIndexController(final int revision, IndexController> getIndexCache() { + public Cache getIndexCache() { return bufferManager.getIndexCache(); } diff --git a/bundles/sirix-core/src/main/java/org/sirix/access/trx/node/json/JsonIndexController.java b/bundles/sirix-core/src/main/java/org/sirix/access/trx/node/json/JsonIndexController.java index f42f21e7e..ea93f27c1 100644 --- a/bundles/sirix-core/src/main/java/org/sirix/access/trx/node/json/JsonIndexController.java +++ b/bundles/sirix-core/src/main/java/org/sirix/access/trx/node/json/JsonIndexController.java @@ -64,20 +64,14 @@ Set createIndexBuilders(final Set indexDefs, final Js final var indexBuilders = new HashSet(indexDefs.size()); for (final IndexDef indexDef : indexDefs) { switch (indexDef.getType()) { - case PATH: - indexBuilders.add(createPathIndexBuilder(nodeWriteTrx.getPageWtx(), nodeWriteTrx.getPathSummary(), indexDef)); - break; - case CAS: - indexBuilders.add(createCASIndexBuilder(nodeWriteTrx, - nodeWriteTrx.getPageWtx(), - nodeWriteTrx.getPathSummary(), - indexDef)); - break; - case NAME: - indexBuilders.add(createNameIndexBuilder(nodeWriteTrx.getPageWtx(), indexDef)); - break; - default: - break; + case PATH -> indexBuilders.add(createPathIndexBuilder(nodeWriteTrx.getPageWtx(), + nodeWriteTrx.getPathSummary(), + indexDef)); + case CAS -> indexBuilders.add(createCASIndexBuilder(nodeWriteTrx, + nodeWriteTrx.getPageWtx(), + nodeWriteTrx.getPathSummary(), + indexDef)); + case NAME -> indexBuilders.add(createNameIndexBuilder(nodeWriteTrx.getPageWtx(), indexDef)); } } return indexBuilders; diff --git a/bundles/sirix-core/src/main/java/org/sirix/api/ResourceSession.java b/bundles/sirix-core/src/main/java/org/sirix/api/ResourceSession.java index dc6e40f34..1bfcaad92 100644 --- a/bundles/sirix-core/src/main/java/org/sirix/api/ResourceSession.java +++ b/bundles/sirix-core/src/main/java/org/sirix/api/ResourceSession.java @@ -21,6 +21,8 @@ package org.sirix.api; +import org.checkerframework.checker.index.qual.NonNegative; +import org.checkerframework.checker.nullness.qual.NonNull; import org.sirix.access.ResourceConfiguration; import org.sirix.access.User; import org.sirix.access.trx.node.AfterCommitState; @@ -34,10 +36,8 @@ import org.sirix.exception.SirixThreadedException; import org.sirix.exception.SirixUsageException; import org.sirix.index.path.summary.PathSummaryReader; -import org.sirix.index.redblacktree.RBNode; +import org.sirix.node.interfaces.Node; -import org.checkerframework.checker.index.qual.NonNegative; -import org.checkerframework.checker.nullness.qual.NonNull; import java.nio.file.Path; import java.time.Instant; import java.util.List; @@ -376,5 +376,5 @@ default PathSummaryReader openPathSummary() { * * @return the cache */ - Cache> getIndexCache(); + Cache getIndexCache(); } diff --git a/bundles/sirix-core/src/main/java/org/sirix/cache/BufferManager.java b/bundles/sirix-core/src/main/java/org/sirix/cache/BufferManager.java index f4a6bc823..55b877038 100644 --- a/bundles/sirix-core/src/main/java/org/sirix/cache/BufferManager.java +++ b/bundles/sirix-core/src/main/java/org/sirix/cache/BufferManager.java @@ -1,7 +1,7 @@ package org.sirix.cache; import org.sirix.index.name.Names; -import org.sirix.index.redblacktree.RBNode; +import org.sirix.node.interfaces.Node; import org.sirix.page.PageReference; import org.sirix.page.RevisionRootPage; import org.sirix.page.interfaces.Page; @@ -13,7 +13,7 @@ public interface BufferManager extends AutoCloseable { Cache getRevisionRootPageCache(); - Cache> getIndexCache(); + Cache getIndexCache(); Cache getNamesCache(); diff --git a/bundles/sirix-core/src/main/java/org/sirix/cache/BufferManagerImpl.java b/bundles/sirix-core/src/main/java/org/sirix/cache/BufferManagerImpl.java index 67a059add..601677b71 100644 --- a/bundles/sirix-core/src/main/java/org/sirix/cache/BufferManagerImpl.java +++ b/bundles/sirix-core/src/main/java/org/sirix/cache/BufferManagerImpl.java @@ -1,6 +1,6 @@ package org.sirix.cache; -import org.sirix.index.redblacktree.RBNode; +import org.sirix.node.interfaces.Node; import org.sirix.page.PageReference; import org.sirix.page.RevisionRootPage; import org.sirix.page.interfaces.Page; @@ -44,7 +44,7 @@ public Cache getRevisionRootPageCache() { } @Override - public Cache> getIndexCache() { + public Cache getIndexCache() { return redBlackTreeNodeCache; } diff --git a/bundles/sirix-core/src/main/java/org/sirix/cache/RedBlackTreeNodeCache.java b/bundles/sirix-core/src/main/java/org/sirix/cache/RedBlackTreeNodeCache.java index 6f4ef39c7..87cbfa97a 100644 --- a/bundles/sirix-core/src/main/java/org/sirix/cache/RedBlackTreeNodeCache.java +++ b/bundles/sirix-core/src/main/java/org/sirix/cache/RedBlackTreeNodeCache.java @@ -4,26 +4,30 @@ import com.github.benmanes.caffeine.cache.RemovalCause; import com.github.benmanes.caffeine.cache.RemovalListener; import org.checkerframework.checker.nullness.qual.NonNull; -import org.sirix.index.redblacktree.RBNode; +import org.sirix.index.redblacktree.RBNodeKey; +import org.sirix.node.interfaces.Node; import java.util.Map; -public final class RedBlackTreeNodeCache implements Cache> { +public final class RedBlackTreeNodeCache implements Cache { - private final com.github.benmanes.caffeine.cache.Cache> cache; + private final com.github.benmanes.caffeine.cache.Cache cache; public RedBlackTreeNodeCache(final int maxSize) { - final RemovalListener> removalListener = - (RBIndexKey key, RBNode value, RemovalCause cause) -> { + final RemovalListener removalListener = + (RBIndexKey key, Node value, RemovalCause cause) -> { assert key != null; assert value != null; - final RBNode parent = value.getParent(); - if (parent != null) { - if (value.equals(parent.getLeftChild())) { - parent.setLeftChild(null); - } else if (value.equals(parent.getRightChild())) { - parent.setRightChild(null); + if (value instanceof RBNodeKey rbNodeKey) { + final RBNodeKey parent = rbNodeKey.getParent(); + + if (parent != null) { + if (value.equals(parent.getLeftChild())) { + parent.setLeftChild(null); + } else if (value.equals(parent.getRightChild())) { + parent.setRightChild(null); + } } } }; @@ -37,17 +41,17 @@ public void clear() { } @Override - public RBNode get(RBIndexKey key) { + public Node get(RBIndexKey key) { return cache.getIfPresent(key); } @Override - public void put(RBIndexKey key, @NonNull RBNode value) { + public void put(RBIndexKey key, @NonNull Node value) { cache.put(key, value); } @Override - public void putAll(Map> map) { + public void putAll(Map map) { cache.putAll(map); } @@ -57,7 +61,7 @@ public void toSecondCache() { } @Override - public Map> getAll(Iterable keys) { + public Map getAll(Iterable keys) { return cache.getAllPresent(keys); } diff --git a/bundles/sirix-core/src/main/java/org/sirix/index/Filter.java b/bundles/sirix-core/src/main/java/org/sirix/index/Filter.java index efd2c39a9..0ec6ebcaa 100644 --- a/bundles/sirix-core/src/main/java/org/sirix/index/Filter.java +++ b/bundles/sirix-core/src/main/java/org/sirix/index/Filter.java @@ -1,9 +1,8 @@ package org.sirix.index; -import org.sirix.index.redblacktree.RBNode; -import org.sirix.index.redblacktree.keyvalue.NodeReferences; +import org.sirix.index.redblacktree.RBNodeKey; public interface Filter { - > boolean filter(RBNode node); + > boolean filter(RBNodeKey node); } diff --git a/bundles/sirix-core/src/main/java/org/sirix/index/IndexFilterAxis.java b/bundles/sirix-core/src/main/java/org/sirix/index/IndexFilterAxis.java index e7a346e4b..90c59dc4d 100644 --- a/bundles/sirix-core/src/main/java/org/sirix/index/IndexFilterAxis.java +++ b/bundles/sirix-core/src/main/java/org/sirix/index/IndexFilterAxis.java @@ -2,7 +2,8 @@ import java.util.Iterator; import java.util.Set; -import org.sirix.index.redblacktree.RBNode; +import org.sirix.index.redblacktree.RBNodeKey; +import org.sirix.index.redblacktree.RBTreeReader; import org.sirix.index.redblacktree.keyvalue.NodeReferences; import com.google.common.collect.AbstractIterator; @@ -11,12 +12,16 @@ public final class IndexFilterAxis> extends AbstractIterator { - private final Iterator> iter; + private final RBTreeReader treeReader; + + private final Iterator> iter; private final Set filter; - public IndexFilterAxis(final Iterator> iter, + + public IndexFilterAxis(final RBTreeReader treeReader, final Iterator> iter, final Set filter) { + this.treeReader = requireNonNull(treeReader); this.iter = requireNonNull(iter); this.filter = requireNonNull(filter); } @@ -24,16 +29,18 @@ public IndexFilterAxis(final Iterator> iter, @Override protected NodeReferences computeNext() { while (iter.hasNext()) { - final RBNode node = iter.next(); + final RBNodeKey node = iter.next(); boolean filterResult = true; for (final Filter filter : filter) { - filterResult = filterResult && filter.filter(node); + filterResult = filter.filter(node); if (!filterResult) { break; } } if (filterResult) { - return node.getValue(); + treeReader.moveTo(node.getValueNodeKey()); + assert treeReader.getCurrentNodeAsRBNodeValue() != null; + return treeReader.getCurrentNodeAsRBNodeValue().getValue(); } } return endOfData(); diff --git a/bundles/sirix-core/src/main/java/org/sirix/index/Materializable.java b/bundles/sirix-core/src/main/java/org/sirix/index/Materializable.java index da4c4cde2..1a58db051 100644 --- a/bundles/sirix-core/src/main/java/org/sirix/index/Materializable.java +++ b/bundles/sirix-core/src/main/java/org/sirix/index/Materializable.java @@ -14,15 +14,15 @@ public interface Materializable { * Materialize the object as a {@link Node} tree * * @return the root of the materialized tree - * @throws DocumentException + * @throws DocumentException if materialization fails */ - public Node materialize() throws DocumentException; + Node materialize(); /** * Initializes the materialized locator facet * * @param root root of the materialized facet subtree - * @throws DocumentException + * @throws DocumentException if initialization fails */ - public void init(Node root) throws DocumentException; + void init(Node root); } diff --git a/bundles/sirix-core/src/main/java/org/sirix/index/cas/CASFilter.java b/bundles/sirix-core/src/main/java/org/sirix/index/cas/CASFilter.java index 345412ef3..8d2e26e6b 100644 --- a/bundles/sirix-core/src/main/java/org/sirix/index/cas/CASFilter.java +++ b/bundles/sirix-core/src/main/java/org/sirix/index/cas/CASFilter.java @@ -5,11 +5,10 @@ import org.brackit.xquery.util.path.Path; import org.sirix.index.Filter; import org.sirix.index.SearchMode; -import org.sirix.index.redblacktree.RBNode; -import org.sirix.index.redblacktree.keyvalue.CASValue; -import org.sirix.index.redblacktree.keyvalue.NodeReferences; import org.sirix.index.path.PCRCollector; import org.sirix.index.path.PathFilter; +import org.sirix.index.redblacktree.RBNodeKey; +import org.sirix.index.redblacktree.keyvalue.CASValue; import java.util.Set; @@ -23,9 +22,6 @@ */ public final class CASFilter implements Filter { - /** The paths to filter. */ - private final Set> paths; - /** {@link PathFilter} instance to filter specific paths. */ private final PathFilter pathFilter; @@ -45,8 +41,7 @@ public final class CASFilter implements Filter { */ public CASFilter(final Set> paths, final Atomic key, final SearchMode mode, final PCRCollector pcrCollector) { - this.paths = requireNonNull(paths); - pathFilter = new PathFilter(this.paths, pcrCollector); + this.pathFilter = new PathFilter(requireNonNull(paths), pcrCollector); this.key = key; this.mode = requireNonNull(mode); } @@ -74,7 +69,7 @@ public Atomic getKey() { * @return {@code true} if the node has been filtered, {@code false} otherwise */ @Override - public > boolean filter(final RBNode node) { + public > boolean filter(final RBNodeKey node) { final K key = node.getKey(); if (key instanceof final CASValue casValue) { return pathFilter.filter(node) && (this.key == null || mode.compare(this.key, casValue.getAtomicValue()) == 0); diff --git a/bundles/sirix-core/src/main/java/org/sirix/index/cas/CASFilterRange.java b/bundles/sirix-core/src/main/java/org/sirix/index/cas/CASFilterRange.java index e9311b63a..6b9faae0d 100644 --- a/bundles/sirix-core/src/main/java/org/sirix/index/cas/CASFilterRange.java +++ b/bundles/sirix-core/src/main/java/org/sirix/index/cas/CASFilterRange.java @@ -5,9 +5,8 @@ import org.brackit.xquery.util.path.Path; import org.sirix.index.AtomicUtil; import org.sirix.index.Filter; -import org.sirix.index.redblacktree.RBNode; +import org.sirix.index.redblacktree.RBNodeKey; import org.sirix.index.redblacktree.keyvalue.CASValue; -import org.sirix.index.redblacktree.keyvalue.NodeReferences; import org.sirix.index.path.PCRCollector; import org.sirix.index.path.PathFilter; @@ -23,23 +22,20 @@ */ public final class CASFilterRange implements Filter { - /** The paths to filter. */ - private final Set> mPaths; - /** {@link PathFilter} instance to filter specific paths. */ - private final PathFilter mPathFilter; + private final PathFilter pathFilter; /** The minimum value. */ - private final Atomic mMin; + private final Atomic min; /** The maximum value. */ - private final Atomic mMax; + private final Atomic max; /** {@code true} if the minimum should be included, {@code false} otherwise */ - private final boolean mIncMin; + private final boolean incMin; /** {@code true} if the maximum should be included, {@code false} otherwise */ - private final boolean mIncMax; + private final boolean incMax; /** * Constructor. Initializes the internal state. @@ -53,20 +49,18 @@ public final class CASFilterRange implements Filter { */ public CASFilterRange(final Set> paths, final Atomic min, final Atomic max, final boolean incMin, final boolean incMax, final PCRCollector pcrCollector) { - mPaths = requireNonNull(paths); - mPathFilter = new PathFilter(mPaths, pcrCollector); - mMin = requireNonNull(min); - mMax = requireNonNull(max); - mIncMin = incMin; - mIncMax = incMax; + this.pathFilter = new PathFilter(requireNonNull(paths), pcrCollector); + this.min = requireNonNull(min); + this.max = requireNonNull(max); + this.incMin = incMin; + this.incMax = incMax; } @Override - public > boolean filter(final RBNode node) { + public > boolean filter(final RBNodeKey node) { final K key = node.getKey(); - if (key instanceof CASValue) { - final CASValue casValue = (CASValue) key; - final boolean filtered = mPathFilter.filter(node); + if (key instanceof CASValue casValue) { + final boolean filtered = pathFilter.filter(node); if (filtered) { return inRange(AtomicUtil.toType(casValue.getAtomicValue(), casValue.getType())); @@ -75,12 +69,12 @@ public > boolean filter(final RBNode> boolean inRange(Atomic key) { - final int minKeyCompare = (mMin != null) ? mMin.compareTo(key) : -1; - final int maxKeyCompare = (mMax != null) ? mMax.compareTo(key) : 1; + private boolean inRange(Atomic key) { + final int minKeyCompare = (min != null) ? min.compareTo(key) : -1; + final int maxKeyCompare = (max != null) ? max.compareTo(key) : 1; - final boolean lowerBoundValid = ((minKeyCompare == 0) && (mIncMin)) || (minKeyCompare < 0); - final boolean upperBoundValid = ((maxKeyCompare == 0) && (mIncMax)) || (maxKeyCompare > 0); + final boolean lowerBoundValid = ((minKeyCompare == 0) && (incMin)) || (minKeyCompare < 0); + final boolean upperBoundValid = ((maxKeyCompare == 0) && (incMax)) || (maxKeyCompare > 0); return upperBoundValid && lowerBoundValid; } diff --git a/bundles/sirix-core/src/main/java/org/sirix/index/cas/CASIndex.java b/bundles/sirix-core/src/main/java/org/sirix/index/cas/CASIndex.java index 3991e971a..4e0a8758b 100644 --- a/bundles/sirix-core/src/main/java/org/sirix/index/cas/CASIndex.java +++ b/bundles/sirix-core/src/main/java/org/sirix/index/cas/CASIndex.java @@ -11,7 +11,8 @@ import org.sirix.index.IndexFilterAxis; import org.sirix.index.SearchMode; import org.sirix.index.path.summary.PathSummaryReader; -import org.sirix.index.redblacktree.RBNode; +import org.sirix.index.redblacktree.RBNodeKey; +import org.sirix.index.redblacktree.RBNodeValue; import org.sirix.index.redblacktree.RBTreeReader; import org.sirix.index.redblacktree.keyvalue.CASValue; import org.sirix.index.redblacktree.keyvalue.NodeReferences; @@ -32,10 +33,9 @@ default Iterator openIndex(PageReadOnlyTrx pageRtx, IndexDef ind indexDef.getType(), indexDef.getID()); - final Iterator> iter = - reader.new RBNodeIterator(Fixed.DOCUMENT_NODE_KEY.getStandardProperty()); + final Iterator> iter = reader.new RBNodeIterator(Fixed.DOCUMENT_NODE_KEY.getStandardProperty()); - return new IndexFilterAxis<>(iter, Set.of(filter)); + return new IndexFilterAxis<>(reader, iter, Set.of(filter)); } default Iterator openIndex(PageReadOnlyTrx pageRtx, IndexDef indexDef, CASFilter filter) { @@ -46,7 +46,7 @@ default Iterator openIndex(PageReadOnlyTrx pageRtx, IndexDef ind indexDef.getID()); // PCRs requested. - final Set pcrsRequested = filter == null ? Collections.emptySet() : filter.getPCRs(); + final Set pcrsRequested = filter == null ? Set.of() : filter.getPCRs(); // PCRs available in index. final Set pcrsAvailable = filter == null @@ -63,13 +63,17 @@ default Iterator openIndex(PageReadOnlyTrx pageRtx, IndexDef ind if (mode == SearchMode.EQUAL) { // Compare for equality by PCR and atomic value. - final Optional> optionalNode = reader.getCurrentNode(value, mode); - - return optionalNode.map(node -> Iterators.forArray(node.getValue())) - .orElse(Iterators.unmodifiableIterator(Collections.emptyIterator())); + final Optional> optionalNode = reader.getCurrentNodeAsRBNodeKey(value, mode); + + return optionalNode.map(node -> { + reader.moveTo(node.getValueNodeKey()); + final RBNodeValue currentNodeAsRBNodeValue = reader.getCurrentNodeAsRBNodeValue(); + assert currentNodeAsRBNodeValue != null; + return Iterators.forArray(currentNodeAsRBNodeValue.getValue()); + }).orElse(Iterators.unmodifiableIterator(Collections.emptyIterator())); } else { // Compare for search criteria by PCR and atomic value. - final Optional> optionalNode = reader.getCurrentNode(value, mode); + final Optional> optionalNode = reader.getCurrentNodeAsRBNodeKey(value, mode); return optionalNode.map(concatWithFilterAxis(filter, reader)).orElse(Collections.emptyIterator()); } @@ -82,49 +86,51 @@ default Iterator openIndex(PageReadOnlyTrx pageRtx, IndexDef ind if (mode == SearchMode.EQUAL) { // Compare for equality by PCR and atomic value. - final Optional> optionalNode = reader.getCurrentNode(value, mode); + final Optional> optionalNode = reader.getCurrentNodeAsRBNodeKey(value, mode); return optionalNode.map(concatWithFilterAxis(filter, reader)).orElse(Collections.emptyIterator()); } else { // Compare for equality only by PCR. - final Optional> optionalNode = - reader.getCurrentNode(value, SearchMode.EQUAL, Comparator.comparingLong(CASValue::getPathNodeKey)); + final Optional> optionalNode = reader.getCurrentNodeAsRBNodeKey(value, + SearchMode.EQUAL, + Comparator.comparingLong( + CASValue::getPathNodeKey)); return optionalNode.map(findFirstNodeWithMatchingPCRAndAtomicValue(filter, reader, mode, value)) .orElse(Collections.emptyIterator()); } } else { - final Iterator> iter = + final Iterator> iter = reader.new RBNodeIterator(Fixed.DOCUMENT_NODE_KEY.getStandardProperty()); - return new IndexFilterAxis<>(iter, Set.of(filter)); + return new IndexFilterAxis<>(reader, iter, filter == null ? Set.of() : Set.of(filter)); } } - private Function, Iterator> findFirstNodeWithMatchingPCRAndAtomicValue( + private Function, Iterator> findFirstNodeWithMatchingPCRAndAtomicValue( CASFilter filter, RBTreeReader reader, SearchMode mode, CASValue value) { return node -> { // Now compare for equality by PCR and atomic value and find first // node which satisfies criteria. - final Optional> firstFoundNode = - reader.getCurrentNode(node.getNodeKey(), value, mode); + final Optional> firstFoundNode = + reader.getCurrentNodeAsRBNodeKey(node.getNodeKey(), value, mode); return firstFoundNode.map(theNode -> { // Iterate over subtree. - final Iterator> iter = reader.new RBNodeIterator(theNode.getNodeKey()); + final Iterator> iter = reader.new RBNodeIterator(theNode.getNodeKey()); - return (Iterator) new IndexFilterAxis<>(iter, Set.of(filter)); + return (Iterator) new IndexFilterAxis<>(reader, iter, Set.of(filter)); }).orElse(Collections.emptyIterator()); }; } - private Function, Iterator> concatWithFilterAxis(CASFilter filter, + private Function, Iterator> concatWithFilterAxis(CASFilter filter, RBTreeReader reader) { return node -> { // Iterate over subtree. - final Iterator> iter = reader.new RBNodeIterator(node.getNodeKey()); + final Iterator> iter = reader.new RBNodeIterator(node.getNodeKey()); - return new IndexFilterAxis<>(iter, Set.of(filter)); + return new IndexFilterAxis<>(reader, iter, Set.of(filter)); }; } } diff --git a/bundles/sirix-core/src/main/java/org/sirix/index/name/NameFilter.java b/bundles/sirix-core/src/main/java/org/sirix/index/name/NameFilter.java index 6c3682b31..3d17fa579 100644 --- a/bundles/sirix-core/src/main/java/org/sirix/index/name/NameFilter.java +++ b/bundles/sirix-core/src/main/java/org/sirix/index/name/NameFilter.java @@ -2,8 +2,7 @@ import org.brackit.xquery.atomic.QNm; import org.sirix.index.Filter; -import org.sirix.index.redblacktree.RBNode; -import org.sirix.index.redblacktree.keyvalue.NodeReferences; +import org.sirix.index.redblacktree.RBNodeKey; import java.util.Collections; import java.util.Set; @@ -30,7 +29,7 @@ public Set getExcludes() { } @Override - public > boolean filter(final RBNode node) { + public > boolean filter(final RBNodeKey node) { if (!(node.getKey() instanceof final QNm name)) throw new IllegalStateException("Key is not of type QNm!"); diff --git a/bundles/sirix-core/src/main/java/org/sirix/index/name/NameIndex.java b/bundles/sirix-core/src/main/java/org/sirix/index/name/NameIndex.java index 7409fc2af..40d63bdfb 100644 --- a/bundles/sirix-core/src/main/java/org/sirix/index/name/NameIndex.java +++ b/bundles/sirix-core/src/main/java/org/sirix/index/name/NameIndex.java @@ -6,7 +6,7 @@ import org.sirix.api.PageReadOnlyTrx; import org.sirix.api.PageTrx; import org.sirix.index.*; -import org.sirix.index.redblacktree.RBNode; +import org.sirix.index.redblacktree.RBNodeKey; import org.sirix.index.redblacktree.RBTreeReader; import org.sirix.index.redblacktree.keyvalue.NodeReferences; import org.sirix.settings.Fixed; @@ -32,11 +32,11 @@ default Iterator openIndex(PageReadOnlyTrx pageRtx, IndexDef ind reader.get(filter.getIncludes().iterator().next(), SearchMode.EQUAL); return Iterators.forArray(optionalNodeReferences.orElse(new NodeReferences())); } else { - final Iterator> iter = + final Iterator> iter = reader.new RBNodeIterator(Fixed.DOCUMENT_NODE_KEY.getStandardProperty()); - final Set setFilter = filter == null ? ImmutableSet.of() : ImmutableSet.of(filter); + final Set setFilter = ImmutableSet.of(filter); - return new IndexFilterAxis<>(iter, setFilter); + return new IndexFilterAxis<>(reader, iter, setFilter); } } } diff --git a/bundles/sirix-core/src/main/java/org/sirix/index/path/PathFilter.java b/bundles/sirix-core/src/main/java/org/sirix/index/path/PathFilter.java index a2649c6c6..c9dcd3379 100644 --- a/bundles/sirix-core/src/main/java/org/sirix/index/path/PathFilter.java +++ b/bundles/sirix-core/src/main/java/org/sirix/index/path/PathFilter.java @@ -3,10 +3,9 @@ import org.brackit.xquery.atomic.QNm; import org.brackit.xquery.util.path.Path; import org.sirix.index.Filter; -import org.sirix.index.redblacktree.RBNode; -import org.sirix.index.redblacktree.keyvalue.CASValue; -import org.sirix.index.redblacktree.keyvalue.NodeReferences; import org.sirix.index.path.summary.PathSummaryReader; +import org.sirix.index.redblacktree.RBNodeKey; +import org.sirix.index.redblacktree.keyvalue.CASValue; import java.util.Collections; import java.util.Set; @@ -67,7 +66,7 @@ public PCRCollector getPCRCollector() { * @return {@code true} if the node has been filtered, {@code false} otherwise */ @Override - public > boolean filter(final RBNode node) { + public > boolean filter(final RBNodeKey node) { if (genericPath) { return true; } diff --git a/bundles/sirix-core/src/main/java/org/sirix/index/path/PathIndex.java b/bundles/sirix-core/src/main/java/org/sirix/index/path/PathIndex.java index 6a100c07b..459263ee8 100644 --- a/bundles/sirix-core/src/main/java/org/sirix/index/path/PathIndex.java +++ b/bundles/sirix-core/src/main/java/org/sirix/index/path/PathIndex.java @@ -6,7 +6,7 @@ import org.sirix.api.PageTrx; import org.sirix.index.*; import org.sirix.index.path.summary.PathSummaryReader; -import org.sirix.index.redblacktree.RBNode; +import org.sirix.index.redblacktree.RBNodeKey; import org.sirix.index.redblacktree.RBTreeReader; import org.sirix.index.redblacktree.keyvalue.NodeReferences; import org.sirix.settings.Fixed; @@ -33,11 +33,11 @@ default Iterator openIndex(final PageReadOnlyTrx pageRtx, final reader.get(filter.getPCRs().iterator().next(), SearchMode.EQUAL); return Iterators.forArray(optionalNodeReferences.orElse(new NodeReferences())); } else { - final Iterator> iter = + final Iterator> iter = reader.new RBNodeIterator(Fixed.DOCUMENT_NODE_KEY.getStandardProperty()); final Set setFilter = filter == null ? ImmutableSet.of() : ImmutableSet.of(filter); - return new IndexFilterAxis<>(iter, setFilter); + return new IndexFilterAxis<>(reader, iter, setFilter); } } } diff --git a/bundles/sirix-core/src/main/java/org/sirix/index/redblacktree/ImmutableRBNodeImpl.java b/bundles/sirix-core/src/main/java/org/sirix/index/redblacktree/ImmutableRBNodeImpl.java index ce7f0bb25..01b493a3e 100644 --- a/bundles/sirix-core/src/main/java/org/sirix/index/redblacktree/ImmutableRBNodeImpl.java +++ b/bundles/sirix-core/src/main/java/org/sirix/index/redblacktree/ImmutableRBNodeImpl.java @@ -1,7 +1,7 @@ package org.sirix.index.redblacktree; import org.jetbrains.annotations.NotNull; -import org.sirix.index.redblacktree.interfaces.ImmutableRBNode; +import org.sirix.index.redblacktree.interfaces.ImmutableRBNodeKey; import org.sirix.node.AbstractForwardingNode; import org.sirix.node.NodeKind; import org.sirix.node.delegates.NodeDelegate; @@ -12,20 +12,19 @@ * @author Johannes Lichtenberger * * @param key which has to be comparable (implement Comparable interface) - * @param value */ -public final class ImmutableRBNodeImpl, V> extends AbstractForwardingNode - implements ImmutableRBNode { +public final class ImmutableRBNodeImpl> extends AbstractForwardingNode + implements ImmutableRBNodeKey { - /** {@link RBNode} to wrap. */ - private final RBNode node; + /** {@link RBNodeKey} to wrap. */ + private final RBNodeKey node; /** * Constructor. * - * @param node {@link RBNode} to wrap. + * @param node {@link RBNodeKey} to wrap. */ - public ImmutableRBNodeImpl(final RBNode node) { + public ImmutableRBNodeImpl(final RBNodeKey node) { assert node != null; this.node = node; } @@ -41,8 +40,8 @@ public K getKey() { } @Override - public V getValue() { - return node.getValue(); + public long getValueNodeKey() { + return node.getValueNodeKey(); } @Override diff --git a/bundles/sirix-core/src/main/java/org/sirix/index/redblacktree/RBNode.java b/bundles/sirix-core/src/main/java/org/sirix/index/redblacktree/RBNodeKey.java similarity index 79% rename from bundles/sirix-core/src/main/java/org/sirix/index/redblacktree/RBNode.java rename to bundles/sirix-core/src/main/java/org/sirix/index/redblacktree/RBNodeKey.java index 4e48f516a..1bcd60876 100644 --- a/bundles/sirix-core/src/main/java/org/sirix/index/redblacktree/RBNode.java +++ b/bundles/sirix-core/src/main/java/org/sirix/index/redblacktree/RBNodeKey.java @@ -5,7 +5,7 @@ import org.brackit.xquery.atomic.QNm; import org.checkerframework.checker.nullness.qual.Nullable; import org.jetbrains.annotations.NotNull; -import org.sirix.index.redblacktree.interfaces.MutableRBNode; +import org.sirix.index.redblacktree.interfaces.MutableRBNodeKey; import org.sirix.index.redblacktree.keyvalue.CASValue; import org.sirix.node.AbstractForwardingNode; import org.sirix.node.NodeKind; @@ -20,13 +20,13 @@ * * @author Johannes Lichtenberger */ -public final class RBNode, V> extends AbstractForwardingNode - implements MutableRBNode { +public final class RBNodeKey> extends AbstractForwardingNode + implements MutableRBNodeKey { /** Key token. */ private K key; /** Value. */ - private V value; + private long valueNodeKey; /** Reference to the left node. */ private long left = Fixed.NULL_NODE_KEY.getStandardProperty(); @@ -38,24 +38,24 @@ public final class RBNode, V> extends AbstractFo private boolean isChanged; /** {@link NodeDelegate} reference. */ - private NodeDelegate nodeDelegate; + private final NodeDelegate nodeDelegate; - private RBNode parent; + private RBNodeKey parent; - private RBNode leftChild; + private RBNodeKey leftChild; - private RBNode rightChild; + private RBNodeKey rightChild; /** * Constructor. * * @param key the key - * @param value the value + * @param valueNodeKey the node key of the value node * @param nodeDelegate the used node delegate */ - public RBNode(final K key, final V value, final NodeDelegate nodeDelegate) { + public RBNodeKey(final K key, final long valueNodeKey, final NodeDelegate nodeDelegate) { this.key = requireNonNull(key); - this.value = requireNonNull(value); + this.valueNodeKey = valueNodeKey; this.nodeDelegate = requireNonNull(nodeDelegate); } @@ -84,8 +84,8 @@ public K getKey() { } @Override - public V getValue() { - return value; + public long getValueNodeKey() { + return valueNodeKey; } /** @@ -123,27 +123,27 @@ public long getRightChildKey() { return right; } - public RBNode getParent() { + public RBNodeKey getParent() { return parent; } - public RBNode getLeftChild() { + public RBNodeKey getLeftChild() { return leftChild; } - public RBNode getRightChild() { + public RBNodeKey getRightChild() { return rightChild; } - public void setLeftChild(RBNode leftChild) { + public void setLeftChild(RBNodeKey leftChild) { this.leftChild = leftChild; } - public void setRightChild(RBNode rightChild) { + public void setRightChild(RBNodeKey rightChild) { this.rightChild = rightChild; } - public void setParent(RBNode parent) { + public void setParent(RBNodeKey parent) { this.parent = parent; } @@ -164,9 +164,9 @@ public int hashCode() { @Override public boolean equals(final @Nullable Object obj) { - if (obj instanceof RBNode) { + if (obj instanceof RBNodeKey) { @SuppressWarnings("unchecked") - final RBNode other = (RBNode) obj; + final RBNodeKey other = (RBNodeKey) obj; return this.nodeDelegate.getNodeKey() == other.nodeDelegate.getNodeKey(); } return false; @@ -180,7 +180,7 @@ public boolean equals(final @Nullable Object obj) { .add("right child", right) .add("changed", isChanged) .add("key", key) - .add("value", value) + .add("valueNodeKey", valueNodeKey) .toString(); } @@ -189,11 +189,6 @@ public void setKey(final K key) { this.key = requireNonNull(key); } - @Override - public void setValue(final V value) { - this.value = requireNonNull(value); - } - @Override public SirixDeweyID getDeweyID() { return null; diff --git a/bundles/sirix-core/src/main/java/org/sirix/index/redblacktree/RBNodeValue.java b/bundles/sirix-core/src/main/java/org/sirix/index/redblacktree/RBNodeValue.java new file mode 100644 index 000000000..de8de2421 --- /dev/null +++ b/bundles/sirix-core/src/main/java/org/sirix/index/redblacktree/RBNodeValue.java @@ -0,0 +1,123 @@ +package org.sirix.index.redblacktree; + +import com.google.common.base.MoreObjects; +import com.google.common.base.Objects; +import org.checkerframework.checker.nullness.qual.Nullable; +import org.jetbrains.annotations.NotNull; +import org.sirix.index.redblacktree.interfaces.MutableRBNodeValue; +import org.sirix.node.AbstractForwardingNode; +import org.sirix.node.NodeKind; +import org.sirix.node.SirixDeweyID; +import org.sirix.node.delegates.NodeDelegate; +import org.sirix.settings.Fixed; + +import static java.util.Objects.requireNonNull; + +/** + * Red-black tree node which is mutable. + * + * @author Johannes Lichtenberger + */ +public final class RBNodeValue extends AbstractForwardingNode + implements MutableRBNodeValue { + /** The value. */ + private V value; + + /** Reference to the left node. */ + private static final long LEFT = Fixed.NULL_NODE_KEY.getStandardProperty(); + + /** Reference to the right node. */ + private static final long RIGHT = Fixed.NULL_NODE_KEY.getStandardProperty(); + + /** {@link NodeDelegate} reference. */ + private NodeDelegate nodeDelegate; + + /** + * Constructor. + * + * @param value the value + * @param nodeDelegate the used node delegate + */ + public RBNodeValue(final V value, final NodeDelegate nodeDelegate) { + this.value = requireNonNull(value); + this.nodeDelegate = requireNonNull(nodeDelegate); + } + + @Override + public NodeKind getKind() { + return NodeKind.RB_NODE_VALUE; + } + + @Override + protected @NotNull NodeDelegate delegate() { + return nodeDelegate; + } + + @Override + public V getValue() { + return value; + } + + @Override + public boolean hasLeftChild() { + return LEFT != Fixed.NULL_NODE_KEY.getStandardProperty(); + } + + @Override + public boolean hasRightChild() { + return RIGHT != Fixed.NULL_NODE_KEY.getStandardProperty(); + } + + @Override + public long getLeftChildKey() { + return LEFT; + } + + @Override + public long getRightChildKey() { + return RIGHT; + } + + @Override + public int hashCode() { + return Objects.hashCode(nodeDelegate.getNodeKey()); + } + + @Override + public boolean equals(final @Nullable Object obj) { + if (obj instanceof RBNodeValue) { + @SuppressWarnings("unchecked") + final RBNodeValue other = (RBNodeValue) obj; + return this.nodeDelegate.getNodeKey() == other.nodeDelegate.getNodeKey(); + } + return false; + } + + @Override + public @NotNull String toString() { + return MoreObjects.toStringHelper(this) + .add("node delegate", nodeDelegate) + .add("value", value) + .toString(); + } + + @Override + public SirixDeweyID getDeweyID() { + return null; + } + + @Override + public byte[] getDeweyIDAsBytes() { + return null; + } + + @Override + public int getPreviousRevisionNumber() { + throw new UnsupportedOperationException(); + } + + @Override + public void setValue(V value) { + this.value = value; + } +} diff --git a/bundles/sirix-core/src/main/java/org/sirix/index/redblacktree/RBTreeReader.java b/bundles/sirix-core/src/main/java/org/sirix/index/redblacktree/RBTreeReader.java index c9410781a..f79070837 100644 --- a/bundles/sirix-core/src/main/java/org/sirix/index/redblacktree/RBTreeReader.java +++ b/bundles/sirix-core/src/main/java/org/sirix/index/redblacktree/RBTreeReader.java @@ -17,7 +17,6 @@ import org.sirix.node.interfaces.Node; import org.sirix.node.interfaces.StructNode; import org.sirix.node.interfaces.immutable.ImmutableNode; -import org.sirix.settings.Constants; import org.sirix.settings.Fixed; import java.io.PrintStream; @@ -42,7 +41,7 @@ public final class RBTreeReader, V extends Refer /** * Cache. */ - private final Cache> cache; + private final Cache cache; /** * The index type. @@ -106,7 +105,7 @@ public enum MoveCursor { * @return new tree instance */ public static , V extends References> RBTreeReader getInstance( - final Cache> cache, final PageReadOnlyTrx pageReadTrx, final IndexType type, + final Cache cache, final PageReadOnlyTrx pageReadTrx, final IndexType type, @NonNegative final int index) { return new RBTreeReader<>(cache, pageReadTrx, type, index); } @@ -119,7 +118,7 @@ public static , V extends References> RBTreeRead * @param indexType kind of indexType * @param indexNumber the indexNumber number */ - private RBTreeReader(final Cache> cache, final PageReadOnlyTrx pageReadOnlyTrx, + private RBTreeReader(final Cache cache, final PageReadOnlyTrx pageReadOnlyTrx, final IndexType indexType, final int indexNumber) { this.cache = requireNonNull(cache); this.pageReadOnlyTrx = requireNonNull(pageReadOnlyTrx); @@ -130,22 +129,21 @@ private RBTreeReader(final Cache> cache, final PageRead this.index = indexNumber; currentNode = - this.pageReadOnlyTrx.getRecord(Fixed.DOCUMENT_NODE_KEY.getStandardProperty(), IndexType.PATH_SUMMARY, 0); + this.pageReadOnlyTrx.getRecord(Fixed.DOCUMENT_NODE_KEY.getStandardProperty(), indexType, indexNumber); if (currentNode == null) { throw new IllegalStateException("Node couldn't be fetched from persistent storage!"); } // TODO: move this / constructor of course should not do any work! - for (RBNodeIterator it = new RBNodeIterator(0); it.hasNext(); ) { - RBNode node = it.next(); - assert node.getNodeKey() != 0; - if (pageReadOnlyTrx instanceof PageTrx) { - continue; + if (!(pageReadOnlyTrx instanceof PageTrx)) { + for (RBNodeIterator it = new RBNodeIterator(0); it.hasNext(); ) { + RBNodeKey node = it.next(); + assert node.getNodeKey() != 0; + this.cache.put(new RBIndexKey(node.getNodeKey(), revisionNumber, indexType, indexNumber), getCurrentNodeAsRBNodeKey()); } - this.cache.put(new RBIndexKey(node.getNodeKey(), revisionNumber, indexType, indexNumber), getCurrentNode()); + setCurrentNode(currentNode); } - moveToDocumentRoot(); } /** @@ -167,39 +165,54 @@ public void dump(final PrintStream out) { // Internal function to dump data to a PrintStream instance. private void internalDump(final PrintStream out) { - out.println(getCurrentNode()); - @SuppressWarnings("ConstantConditions") final long nodeKey = getCurrentNode().getNodeKey(); - if (getCurrentNode().hasLeftChild()) { + out.println(getCurrentNodeAsRBNodeKey()); + @SuppressWarnings("ConstantConditions") final long nodeKey = getCurrentNodeAsRBNodeKey().getNodeKey(); + if (getCurrentNodeAsRBNodeKey().hasLeftChild()) { moveToFirstChild(); internalDump(out); } moveTo(nodeKey); - if (getCurrentNode().hasRightChild()) { + if (getCurrentNodeAsRBNodeKey().hasRightChild()) { moveToLastChild(); internalDump(out); } } /** - * Get the {@link RBNode}. + * Get the {@link RBNodeKey}. + * + * @return {@link RBNodeKey} instance + */ + public RBNodeKey getCurrentNodeAsRBNodeKey() { + assertNotClosed(); + //noinspection rawtypes + if (currentNode instanceof RBNodeKey rbNodeKey) { + return rbNodeKey; + } + return null; + } + + /** + * Get the {@link RBNodeKey}. * - * @return {@link RBNode} instance + * @return {@link RBNodeKey} instance */ - RBNode getCurrentNode() { + public RBNodeValue getCurrentNodeAsRBNodeValue() { assertNotClosed(); - if (currentNode.getKind() != NodeKind.XML_DOCUMENT && currentNode.getKind() != NodeKind.JSON_DOCUMENT) { - return (RBNode) currentNode; + //noinspection rawtypes + if (currentNode instanceof RBNodeValue rbNodeValue) { + return rbNodeValue; } return null; } /** - * Set the {@link RBNode}. + * Set the current node. * * @param node the node to set - * @return {@link RBNode} instance + * @return the node instance */ - RBNode setCurrentNode(final RBNode node) { + Node setCurrentNode(final Node node) { assertNotClosed(); currentNode = node; return node; @@ -221,16 +234,20 @@ public Optional get(final long startNodeKey, final K key, final SearchMode mo return Optional.empty(); } moveToFirstChild(); - RBNode node = getCurrentNode(); + RBNodeKey node = getCurrentNodeAsRBNodeKey(); return getNode(key, mode, node); } @NonNull - private Optional getNode(K key, SearchMode mode, RBNode node) { + private Optional getNode(K key, SearchMode mode, RBNodeKey node) { while (true) { final int c = mode.compare(key, node.getKey()); if (c == 0) { - return Optional.ofNullable(node.getValue()); + final long valueNodeKey = node.getValueNodeKey(); + moveTo(valueNodeKey); + final var value = Optional.ofNullable(getCurrentNodeAsRBNodeValue().getValue()); + setCurrentNode(node); + return value; } boolean moved; @@ -243,15 +260,15 @@ private Optional getNode(K key, SearchMode mode, RBNode node) { } else if (node.hasLeftChild()) { node = pageReadOnlyTrx instanceof PageTrx ? null - : (RBNode) cache.get(new RBIndexKey(node.getLeftChildKey(), - revisionNumber, - indexType, - indexNumber)); + : (RBNodeKey) cache.get(new RBIndexKey(node.getLeftChildKey(), + revisionNumber, + indexType, + indexNumber)); if (node == null) { moved = moveToFirstChild(); if (moved) { - node = getCurrentNode(); + node = getCurrentNodeAsRBNodeKey(); } } else { currentNode = node; @@ -268,15 +285,15 @@ private Optional getNode(K key, SearchMode mode, RBNode node) { } else if (node.hasRightChild()) { node = pageReadOnlyTrx instanceof PageTrx ? null - : (RBNode) cache.get(new RBIndexKey(node.getRightChildKey(), - revisionNumber, - indexType, - indexNumber)); + : (RBNodeKey) cache.get(new RBIndexKey(node.getRightChildKey(), + revisionNumber, + indexType, + indexNumber)); if (node == null) { moved = moveToLastChild(); if (moved) { - node = getCurrentNode(); + node = getCurrentNodeAsRBNodeKey(); } } else { currentNode = node; @@ -309,7 +326,7 @@ public Optional get(final K key, final SearchMode mode) { return Optional.empty(); } moveToFirstChild(); - RBNode node = getCurrentNode(); + RBNodeKey node = getCurrentNodeAsRBNodeKey(); return getNode(key, mode, node); } @@ -320,20 +337,20 @@ public Optional get(final K key, final SearchMode mode) { * @param startNodeKey specified node * @param key key to be found * @param mode the search mode - * @return Optional {@link RBNode} reference + * @return Optional {@link RBNodeKey} reference */ - public Optional> getCurrentNode(final long startNodeKey, final K key, final SearchMode mode) { + public Optional> getCurrentNodeAsRBNodeKey(final long startNodeKey, final K key, final SearchMode mode) { assertNotClosed(); final boolean movedToStartNode = moveTo(startNodeKey); if (!movedToStartNode) { return Optional.empty(); } - RBNode node = getCurrentNode(); + RBNodeKey node = getCurrentNodeAsRBNodeKey(); return getTheSearchedNode(key, mode, node); } @NonNull - private Optional> getTheSearchedNode(K key, SearchMode mode, RBNode node) { + private Optional> getTheSearchedNode(K key, SearchMode mode, RBNodeKey node) { while (true) { final int c = key.compareTo(node.getKey()); if (mode != SearchMode.EQUAL && mode.compare(key, node.getKey()) == 0) { @@ -346,7 +363,7 @@ private Optional> getTheSearchedNode(K key, SearchMode mode, RBNode } final boolean moved = c < 0 ? moveToFirstChild() : moveToLastChild(); if (moved) { - node = getCurrentNode(); + node = getCurrentNodeAsRBNodeKey(); } else { break; } @@ -359,16 +376,16 @@ private Optional> getTheSearchedNode(K key, SearchMode mode, RBNode * * @param key key to be found * @param mode the search mode - * @return Optional {@link RBNode} reference + * @return Optional {@link RBNodeKey} reference */ - public Optional> getCurrentNode(final K key, final SearchMode mode) { + public Optional> getCurrentNodeAsRBNodeKey(final K key, final SearchMode mode) { assertNotClosed(); moveToDocumentRoot(); if (!((StructNode) getNode()).hasFirstChild()) { return Optional.empty(); } moveToFirstChild(); - RBNode node = getCurrentNode(); + RBNodeKey node = getCurrentNodeAsRBNodeKey(); return getTheSearchedNode(key, mode, node); } @@ -378,16 +395,16 @@ public Optional> getCurrentNode(final K key, final SearchMode mode) * @param key key to be found * @param mode the search mode * @param comp comparator to be used to compare keys - * @return Optional {@link RBNode} reference + * @return Optional {@link RBNodeKey} reference */ - public Optional> getCurrentNode(final K key, final SearchMode mode, final Comparator comp) { + public Optional> getCurrentNodeAsRBNodeKey(final K key, final SearchMode mode, final Comparator comp) { assertNotClosed(); moveToDocumentRoot(); if (!((StructNode) getNode()).hasFirstChild()) { return Optional.empty(); } moveToFirstChild(); - RBNode node = getCurrentNode(); + RBNodeKey node = getCurrentNodeAsRBNodeKey(); while (true) { final int c = key.compareTo(node.getKey()); if (mode.compare(key, node.getKey(), comp) == 0) { @@ -395,7 +412,7 @@ public Optional> getCurrentNode(final K key, final SearchMode mode, } final boolean moved = c < 0 ? moveToFirstChild() : moveToLastChild(); if (moved) { - node = getCurrentNode(); + node = getCurrentNodeAsRBNodeKey(); } else { break; } @@ -466,8 +483,8 @@ public boolean hasFirstChild() { @Override public boolean hasLastChild() { assertNotClosed(); - if (currentNode instanceof RBNode) { - return getCurrentNode().hasRightChild(); + if (currentNode instanceof RBNodeKey) { + return getCurrentNodeAsRBNodeKey().hasRightChild(); } return false; } @@ -526,13 +543,13 @@ public boolean moveToParent() { @Override public boolean moveToFirstChild() { assertNotClosed(); - if (currentNode instanceof RBNode) { - final RBNode node = getCurrentNode(); + if (currentNode instanceof RBNodeKey) { + final RBNodeKey node = getCurrentNodeAsRBNodeKey(); if (!node.hasLeftChild()) { return false; } final var move = moveTo(node.getLeftChildKey()); - @SuppressWarnings("unchecked") final var currentNode = (RBNode) this.currentNode; + @SuppressWarnings("unchecked") final var currentNode = (RBNodeKey) this.currentNode; node.setLeftChild(currentNode); currentNode.setParent(node); return move; @@ -543,13 +560,13 @@ public boolean moveToFirstChild() { @Override public boolean moveToLastChild() { assertNotClosed(); - if (currentNode instanceof RBNode) { - final RBNode node = getCurrentNode(); + if (currentNode instanceof RBNodeKey) { + final RBNodeKey node = getCurrentNodeAsRBNodeKey(); if (!node.hasRightChild()) { return false; } final var move = moveTo(node.getRightChildKey()); - @SuppressWarnings("unchecked") final var currentNode = (RBNode) this.currentNode; + @SuppressWarnings("unchecked") final var currentNode = (RBNodeKey) this.currentNode; node.setRightChild(currentNode); currentNode.setParent(node); return move; @@ -566,8 +583,8 @@ public boolean moveToPrevious() { @Override public boolean moveToNext() { assertNotClosed(); - if (currentNode instanceof RBNode) { - final RBNode node = (RBNode) currentNode; + if (currentNode instanceof RBNodeKey) { + final RBNodeKey node = (RBNodeKey) currentNode; if (node.hasLeftChild()) { moveToFirstChild(); } else if (node.hasRightChild()) { @@ -575,9 +592,9 @@ public boolean moveToNext() { } else { do { moveToParent(); - } while (getNode() instanceof RBNode && !hasLastChild()); + } while (getNode() instanceof RBNodeKey && !hasLastChild()); - if (getNode() instanceof RBNode) { + if (getNode() instanceof RBNodeKey) { moveToLastChild(); return true; } else { @@ -677,44 +694,27 @@ public boolean moveToNextFollowing() { @Override public long getLeftSiblingKey() { assertNotClosed(); - return Constants.NULL_ID_LONG; + return Fixed.NULL_NODE_KEY.getStandardProperty(); } @Override public long getRightSiblingKey() { assertNotClosed(); - return Constants.NULL_ID_LONG; + return Fixed.NULL_NODE_KEY.getStandardProperty(); } @Override public long getFirstChildKey() { assertNotClosed(); - final long firstChildKey; - - if (moveToFirstChild()) { - firstChildKey = getNodeKey(); - moveToParent(); - } else { - firstChildKey = Fixed.NULL_NODE_KEY.getStandardProperty(); - } - - return firstChildKey; + return ((StructNode) currentNode).getFirstChildKey(); } @Override public long getLastChildKey() { assertNotClosed(); - final long lastChildKey; - - if (moveToLastChild()) { - lastChildKey = getNodeKey(); - moveToParent(); - } else { - lastChildKey = Fixed.NULL_NODE_KEY.getStandardProperty(); - } - return lastChildKey; + return ((StructNode) currentNode).getLastChildKey(); } @Override @@ -727,7 +727,7 @@ public long getParentKey() { * * @author Johannes Lichtenberger */ - public final class RBNodeIterator extends AbstractIterator> { + public final class RBNodeIterator extends AbstractIterator> { /** * Determines if it's the first call. @@ -758,12 +758,12 @@ public RBNodeIterator(final long nodeKey) { } @Override - protected RBNode computeNext() { + protected RBNodeKey computeNext() { if (!first) { if (!keys.isEmpty()) { // Subsequent results. moveTo(keys.pop()); - final RBNode node = getCurrentNode(); + final RBNodeKey node = getCurrentNodeAsRBNodeKey(); stackOperation(node); return node; } @@ -777,23 +777,23 @@ protected RBNode computeNext() { moved = moveToFirstChild(); } if (moved) { - final RBNode node = getCurrentNode(); + final RBNodeKey node = getCurrentNodeAsRBNodeKey(); stackOperation(node); return node; } return endOfData(); } - private void stackOperation(final RBNode node) { + private void stackOperation(final RBNodeKey node) { if (node.hasRightChild()) { moveToLastChild(); - final RBNode right = getCurrentNode(); + final RBNodeKey right = getCurrentNodeAsRBNodeKey(); keys.push(right.getNodeKey()); } moveTo(node.getNodeKey()); if (node.hasLeftChild()) { moveToFirstChild(); - final RBNode left = getCurrentNode(); + final RBNodeKey left = getCurrentNodeAsRBNodeKey(); keys.push(left.getNodeKey()); } } diff --git a/bundles/sirix-core/src/main/java/org/sirix/index/redblacktree/RBTreeWriter.java b/bundles/sirix-core/src/main/java/org/sirix/index/redblacktree/RBTreeWriter.java index eb77841a7..8a1980688 100644 --- a/bundles/sirix-core/src/main/java/org/sirix/index/redblacktree/RBTreeWriter.java +++ b/bundles/sirix-core/src/main/java/org/sirix/index/redblacktree/RBTreeWriter.java @@ -60,6 +60,7 @@ * @param the value * @author Johannes Lichtenberger, University of Konstanz */ +@SuppressWarnings("ConstantValue") public final class RBTreeWriter, V extends References> extends AbstractForwardingNodeCursor { /** @@ -151,20 +152,24 @@ public V index(final K key, final V value, final MoveCursor move) { moveToDocumentRoot(); } final RevisionRootPage root = pageTrx.getActualRevisionRootPage(); - if (rbTreeReader.getCurrentNode() == null + if (rbTreeReader.getCurrentNodeAsRBNodeKey() == null && ((StructNode) getNode()).getFirstChildKey() == Fixed.NULL_NODE_KEY.getStandardProperty()) { - // Index is empty.. create root node. + // Index is empty... create root node. final long nodeKey = getNewNodeKey(root); - final RBNode treeRoot = pageTrx.createRecord(new RBNode<>(key, - value, - new NodeDelegate(nodeKey, - Fixed.DOCUMENT_NODE_KEY.getStandardProperty(), - null, - 0, - 0, - (SirixDeweyID) null)), + final RBNodeKey treeRoot = pageTrx.createRecord(new RBNodeKey<>(key, + nodeKey + 1, + new NodeDelegate(nodeKey, + Fixed.DOCUMENT_NODE_KEY.getStandardProperty(), + null, + 0, + 0, + (SirixDeweyID) null)), rbTreeReader.indexType, rbTreeReader.index); + pageTrx.createRecord(new RBNodeValue<>(value, + new NodeDelegate(nodeKey + 1, nodeKey, null, 0, 0, (SirixDeweyID) null)), + rbTreeReader.indexType, + rbTreeReader.index); final StructNode document = pageTrx.prepareRecordForModification(Fixed.DOCUMENT_NODE_KEY.getStandardProperty(), rbTreeReader.indexType, rbTreeReader.index); @@ -174,39 +179,50 @@ public V index(final K key, final V value, final MoveCursor move) { return value; } - if (move == MoveCursor.TO_DOCUMENT_ROOT || rbTreeReader.getCurrentNode() == null) { + if (move == MoveCursor.TO_DOCUMENT_ROOT || rbTreeReader.getCurrentNodeAsRBNodeKey() == null) { moveToDocumentRoot(); moveToFirstChild(); } - RBNode node = rbTreeReader.getCurrentNode(); + RBNodeKey node = rbTreeReader.getCurrentNodeAsRBNodeKey(); while (true) { final int c = key.compareTo(node.getKey()); if (c == 0) { - if (!value.equals(node.getValue())) { - final RBNode RBNode = - pageTrx.prepareRecordForModification(node.getNodeKey(), rbTreeReader.indexType, rbTreeReader.index); - RBNode.setValue(value); - } - return node.getValue(); + rbTreeReader.moveTo(node.getValueNodeKey()); + RBNodeValue rbNodeValue = rbTreeReader.getCurrentNodeAsRBNodeValue(); + assert rbNodeValue != null; + final V rbValueNodeValue = rbNodeValue.getValue(); + //if (!value.equals(rbValueNodeValue)) { + rbNodeValue = + pageTrx.prepareRecordForModification(node.getValueNodeKey(), rbTreeReader.indexType, rbTreeReader.index); + rbNodeValue.setValue(value); + //} + rbTreeReader.setCurrentNode(node); + return rbNodeValue.getValue(); } final boolean moved = c < 0 ? moveToFirstChild() : moveToLastChild(); if (moved) { - node = rbTreeReader.getCurrentNode(); + node = rbTreeReader.getCurrentNodeAsRBNodeKey(); continue; } final long nodeKey = getNewNodeKey(root); - final RBNode child = pageTrx.createRecord(new RBNode<>(key, - value, - new NodeDelegate(nodeKey, - node.getNodeKey(), - null, - 0, - 0, - (SirixDeweyID) null)), + final long valueNodeKey = nodeKey + 1; + final RBNodeKey child = pageTrx.createRecord(new RBNodeKey<>(key, + nodeKey + 1, + new NodeDelegate(nodeKey, + node.getNodeKey(), + null, + 0, + 0, + (SirixDeweyID) null)), rbTreeReader.indexType, rbTreeReader.index); + pageTrx.createRecord(new RBNodeValue<>(value, + new NodeDelegate(valueNodeKey, nodeKey, null, 0, 0, (SirixDeweyID) null)), + rbTreeReader.indexType, + rbTreeReader.index); + node = pageTrx.prepareRecordForModification(node.getNodeKey(), rbTreeReader.indexType, rbTreeReader.index); if (c < 0) { node.setLeftChildKey(child.getNodeKey()); @@ -257,8 +273,10 @@ public boolean remove(final K key, final @NonNegative long nodeKey) { removed = value.removeNodeKey(nodeKey); if (removed) { - final RBNode node = - pageTrx.prepareRecordForModification(rbTreeReader.getNodeKey(), rbTreeReader.indexType, rbTreeReader.index); + @SuppressWarnings("DataFlowIssue") final RBNodeValue node = + pageTrx.prepareRecordForModification(rbTreeReader.getCurrentNodeAsRBNodeKey().getValueNodeKey(), + rbTreeReader.indexType, + rbTreeReader.index); node.getValue().removeNodeKey(nodeKey); } } @@ -271,13 +289,13 @@ public boolean remove(final K key, final @NonNegative long nodeKey) { * @param node node to be adjusted * @throws SirixIOException if an I/O error occurs */ - private void adjust(RBNode node) { + private void adjust(RBNodeKey node) { setChanged(node, true); while (node != null && node.getParentKey() != Fixed.DOCUMENT_NODE_KEY.getStandardProperty() && parent(node) != null && parent(node).isChanged()) { if (parent(node).equals(left(parent(parent(node))))) { - final RBNode y = right(parent(parent(node))); + final RBNodeKey y = right(parent(parent(node))); if (y != null && y.isChanged()) { setChanged(parent(node), false); y.setChanged(false); @@ -294,7 +312,7 @@ && parent(node).isChanged()) { rotateRight(parent(parent(node))); } } else if (parent(node).equals(right(parent(parent(node))))) { - final RBNode y = left(parent(parent(node))); + final RBNodeKey y = left(parent(parent(node))); if (y != null && y.isChanged()) { setChanged(parent(node), false); setChanged(y, false); @@ -320,7 +338,7 @@ && parent(node).isChanged()) { if (((StructNode) getNode()).hasFirstChild()) { moveToFirstChild(); //noinspection ConstantConditions - setChanged(rbTreeReader.getCurrentNode(), false); + setChanged(rbTreeReader.getCurrentNodeAsRBNodeKey(), false); } moveTo(nodeKey); } @@ -332,8 +350,8 @@ && parent(node).isChanged()) { * @param changed changed value * @throws SirixIOException if an I/O error occurs */ - private void setChanged(final RBNode nodeToChange, final boolean changed) { - final RBNode node = + private void setChanged(final RBNodeKey nodeToChange, final boolean changed) { + final RBNodeKey node = pageTrx.prepareRecordForModification(nodeToChange.getNodeKey(), rbTreeReader.indexType, rbTreeReader.index); node.setChanged(changed); } @@ -344,7 +362,7 @@ private void setChanged(final RBNode nodeToChange, final boolean changed) * @param node node from which to move to and return the left sibling * @return left child node or {@code null} */ - private RBNode left(@Nullable final RBNode node) { + private RBNodeKey left(@Nullable final RBNodeKey node) { if (node == null || node.getLeftChildKey() == Fixed.NULL_NODE_KEY.getStandardProperty()) { return null; } @@ -354,7 +372,7 @@ private RBNode left(@Nullable final RBNode node) { assert node.getLeftChildKey() == leftChild.getNodeKey(); return leftChild; } - return moveTo(node.getLeftChildKey()) ? rbTreeReader.getCurrentNode() : null; + return moveTo(node.getLeftChildKey()) ? rbTreeReader.getCurrentNodeAsRBNodeKey() : null; } /** @@ -363,7 +381,7 @@ private RBNode left(@Nullable final RBNode node) { * @param node node from which to move to and return the right sibling * @return right child node or {@code null} */ - private RBNode right(@Nullable final RBNode node) { + private RBNodeKey right(@Nullable final RBNodeKey node) { if (node == null || node.getRightChildKey() == Fixed.NULL_NODE_KEY.getStandardProperty()) { return null; } @@ -373,7 +391,7 @@ private RBNode right(@Nullable final RBNode node) { assert node.getRightChildKey() == rightChild.getNodeKey(); return rightChild; } - return moveTo(node.getRightChildKey()) ? rbTreeReader.getCurrentNode() : null; + return moveTo(node.getRightChildKey()) ? rbTreeReader.getCurrentNodeAsRBNodeKey() : null; } /** @@ -382,7 +400,7 @@ private RBNode right(@Nullable final RBNode node) { * @param node node from which to move to and return the parent node * @return parent node or {@code null} */ - private RBNode parent(@Nullable final RBNode node) { + private RBNodeKey parent(@Nullable final RBNodeKey node) { if (node == null || node.getParentKey() == Fixed.NULL_NODE_KEY.getStandardProperty()) { return null; } @@ -392,7 +410,7 @@ private RBNode parent(@Nullable final RBNode node) { assert node.getParentKey() == parent.getNodeKey(); return parent; } - return moveTo(node.getParentKey()) ? rbTreeReader.getCurrentNode() : null; + return moveTo(node.getParentKey()) ? rbTreeReader.getCurrentNodeAsRBNodeKey() : null; } /** @@ -401,11 +419,11 @@ private RBNode parent(@Nullable final RBNode node) { * @param node node to be rotated * @throws SirixIOException if an I/O error occurs */ - private void rotateLeft(RBNode node) { + private void rotateLeft(RBNodeKey node) { moveTo(node.getNodeKey()); moveToLastChild(); - @SuppressWarnings("unchecked") RBNode right = (RBNode) getNode(); + @SuppressWarnings("unchecked") RBNodeKey right = (RBNodeKey) getNode(); node = pageTrx.prepareRecordForModification(node.getNodeKey(), rbTreeReader.indexType, rbTreeReader.index); assert right != null; @@ -413,7 +431,7 @@ private void rotateLeft(RBNode node) { node.setRightChild(right.getLeftChild()); if (right.hasLeftChild()) { - final RBNode rightLeftChild = + final RBNodeKey rightLeftChild = pageTrx.prepareRecordForModification(right.getLeftChildKey(), rbTreeReader.indexType, rbTreeReader.index); rightLeftChild.setParentKey(node.getNodeKey()); rightLeftChild.setParent(node); @@ -429,13 +447,14 @@ private void rotateLeft(RBNode node) { rbTreeReader.index); parent.setFirstChildKey(right.getNodeKey()); } else //noinspection ConstantConditions - if (moveTo(node.getParentKey()) && rbTreeReader.getCurrentNode().getLeftChildKey() == node.getNodeKey()) { - final RBNode parent = + if (moveTo(node.getParentKey()) + && rbTreeReader.getCurrentNodeAsRBNodeKey().getLeftChildKey() == node.getNodeKey()) { + final RBNodeKey parent = pageTrx.prepareRecordForModification(rbTreeReader.getNodeKey(), rbTreeReader.indexType, rbTreeReader.index); parent.setLeftChildKey(right.getNodeKey()); parent.setLeftChild(right); } else { - final RBNode parent = + final RBNodeKey parent = pageTrx.prepareRecordForModification(rbTreeReader.getNodeKey(), rbTreeReader.indexType, rbTreeReader.index); parent.setRightChildKey(right.getNodeKey()); parent.setRightChild(right); @@ -456,18 +475,18 @@ private void rotateLeft(RBNode node) { * @param node node to be rotated * @throws SirixIOException if an I/O error occurs */ - private void rotateRight(RBNode node) { + private void rotateRight(RBNodeKey node) { moveTo(node.getNodeKey()); moveToFirstChild(); - @SuppressWarnings("unchecked") RBNode leftChild = (RBNode) getNode(); + @SuppressWarnings("unchecked") RBNodeKey leftChild = (RBNodeKey) getNode(); node = pageTrx.prepareRecordForModification(node.getNodeKey(), rbTreeReader.indexType, rbTreeReader.index); assert leftChild != null; node.setLeftChildKey(leftChild.getRightChildKey()); node.setLeftChild(leftChild.getRightChild()); if (leftChild.hasRightChild()) { - final RBNode leftRightChild = pageTrx.prepareRecordForModification(leftChild.getRightChildKey(), + final RBNodeKey leftRightChild = pageTrx.prepareRecordForModification(leftChild.getRightChildKey(), rbTreeReader.indexType, rbTreeReader.index); leftRightChild.setParentKey(node.getNodeKey()); @@ -485,13 +504,14 @@ private void rotateRight(RBNode node) { rbTreeReader.index); parent.setFirstChildKey(leftChild.getNodeKey()); } else //noinspection ConstantConditions - if (moveTo(node.getParentKey()) && rbTreeReader.getCurrentNode().getRightChildKey() == node.getNodeKey()) { - final RBNode parent = + if (moveTo(node.getParentKey()) + && rbTreeReader.getCurrentNodeAsRBNodeKey().getRightChildKey() == node.getNodeKey()) { + final RBNodeKey parent = pageTrx.prepareRecordForModification(rbTreeReader.getNodeKey(), rbTreeReader.indexType, rbTreeReader.index); parent.setRightChildKey(leftChild.getNodeKey()); parent.setRightChild(leftChild); } else { - final RBNode parent = + final RBNodeKey parent = pageTrx.prepareRecordForModification(rbTreeReader.getNodeKey(), rbTreeReader.indexType, rbTreeReader.index); parent.setLeftChildKey(leftChild.getNodeKey()); parent.setLeftChild(leftChild); diff --git a/bundles/sirix-core/src/main/java/org/sirix/index/redblacktree/interfaces/ImmutableRBNode.java b/bundles/sirix-core/src/main/java/org/sirix/index/redblacktree/interfaces/ImmutableRBNodeKey.java similarity index 83% rename from bundles/sirix-core/src/main/java/org/sirix/index/redblacktree/interfaces/ImmutableRBNode.java rename to bundles/sirix-core/src/main/java/org/sirix/index/redblacktree/interfaces/ImmutableRBNodeKey.java index 7667fb52a..fb8e25623 100644 --- a/bundles/sirix-core/src/main/java/org/sirix/index/redblacktree/interfaces/ImmutableRBNode.java +++ b/bundles/sirix-core/src/main/java/org/sirix/index/redblacktree/interfaces/ImmutableRBNodeKey.java @@ -5,7 +5,7 @@ /** * Immutable RBNode. */ -public interface ImmutableRBNode, V> extends Node { +public interface ImmutableRBNodeKey> extends Node { /** * Key to be indexed. @@ -15,11 +15,11 @@ public interface ImmutableRBNode, V> extends Nod K getKey(); /** - * Value to be indexed. + * Node key of value node. * - * @return key reference + * @return the node key of the value node */ - V getValue(); + long getValueNodeKey(); /** * Flag which determines if node is changed. diff --git a/bundles/sirix-core/src/main/java/org/sirix/index/redblacktree/interfaces/ImmutableRBNodeValue.java b/bundles/sirix-core/src/main/java/org/sirix/index/redblacktree/interfaces/ImmutableRBNodeValue.java new file mode 100644 index 000000000..a6728ee98 --- /dev/null +++ b/bundles/sirix-core/src/main/java/org/sirix/index/redblacktree/interfaces/ImmutableRBNodeValue.java @@ -0,0 +1,44 @@ +package org.sirix.index.redblacktree.interfaces; + +import org.sirix.node.interfaces.Node; + +/** + * Immutable RBNode. + */ +public interface ImmutableRBNodeValue extends Node { + + /** + * Node value. + * + * @return the node value + */ + V getValue(); + + /** + * Determines node has a left child. + * + * @return {@code true}, if it has a left child, {@code false} otherwise + */ + boolean hasLeftChild(); + + /** + * Determines node has a right child. + * + * @return {@code true}, if it has a left child, {@code false} otherwise + */ + boolean hasRightChild(); + + /** + * Get left child. + * + * @return left child pointer + */ + long getLeftChildKey(); + + /** + * Get right child. + * + * @return right child pointer + */ + long getRightChildKey(); +} diff --git a/bundles/sirix-core/src/main/java/org/sirix/index/redblacktree/interfaces/MutableRBNode.java b/bundles/sirix-core/src/main/java/org/sirix/index/redblacktree/interfaces/MutableRBNodeKey.java similarity index 69% rename from bundles/sirix-core/src/main/java/org/sirix/index/redblacktree/interfaces/MutableRBNode.java rename to bundles/sirix-core/src/main/java/org/sirix/index/redblacktree/interfaces/MutableRBNodeKey.java index 6ace34602..ebd54cf8a 100644 --- a/bundles/sirix-core/src/main/java/org/sirix/index/redblacktree/interfaces/MutableRBNode.java +++ b/bundles/sirix-core/src/main/java/org/sirix/index/redblacktree/interfaces/MutableRBNodeKey.java @@ -6,7 +6,7 @@ * @author Johannes Lichtenberger * */ -public interface MutableRBNode, V> extends ImmutableRBNode { +public interface MutableRBNodeKey> extends ImmutableRBNodeKey { /** * Set the key. * @@ -14,13 +14,6 @@ public interface MutableRBNode, V> extends Immut */ void setKey(K key); - /** - * Set the value. - * - * @param value value to set - */ - void setValue(V value); - /** * Set left child. * @@ -40,5 +33,5 @@ public interface MutableRBNode, V> extends Immut * * @param changed flag which indicates if node is changed or not */ - public void setChanged(boolean changed); + void setChanged(boolean changed); } diff --git a/bundles/sirix-core/src/main/java/org/sirix/index/redblacktree/interfaces/MutableRBNodeValue.java b/bundles/sirix-core/src/main/java/org/sirix/index/redblacktree/interfaces/MutableRBNodeValue.java new file mode 100644 index 000000000..61ef23bf0 --- /dev/null +++ b/bundles/sirix-core/src/main/java/org/sirix/index/redblacktree/interfaces/MutableRBNodeValue.java @@ -0,0 +1,16 @@ +package org.sirix.index.redblacktree.interfaces; + +/** + * Mutable RBNode. + * + * @author Johannes Lichtenberger + * + */ +public interface MutableRBNodeValue extends ImmutableRBNodeValue { + /** + * Set the value. + * + * @param value value to set + */ + void setValue(V value); +} diff --git a/bundles/sirix-core/src/main/java/org/sirix/index/redblacktree/keyvalue/CASValue.java b/bundles/sirix-core/src/main/java/org/sirix/index/redblacktree/keyvalue/CASValue.java index b781807b1..3dbf186fa 100644 --- a/bundles/sirix-core/src/main/java/org/sirix/index/redblacktree/keyvalue/CASValue.java +++ b/bundles/sirix-core/src/main/java/org/sirix/index/redblacktree/keyvalue/CASValue.java @@ -13,6 +13,8 @@ import org.sirix.utils.LogWrapper; import org.slf4j.LoggerFactory; +import static java.util.Objects.requireNonNull; + /** * Value representing a text value, attribute value, element QName or any other byte encoded value. * @@ -41,8 +43,8 @@ public final class CASValue implements Comparable { * @param pathNodeKey the path node-key */ public CASValue(final Atomic value, final Type type, final @NonNegative long pathNodeKey) { - this.value = value; - this.type = type; + this.value = requireNonNull(value); + this.type = requireNonNull(type); this.pathNodeKey = pathNodeKey; } @@ -78,13 +80,15 @@ public Atomic getAtomicValue() { @Override public int compareTo(final @Nullable CASValue other) { - final CASValue otherValue = other; - Atomic thisAtomic = value != null && type != null ? value.asType(type) : null; - Atomic otherAtomic = - otherValue.value != null && otherValue.type != null ? otherValue.value.asType(otherValue.type) : null; + if (other == null) { + return 1; + } + + Atomic thisAtomic = value.asType(type); + Atomic otherAtomic = other.value.asType(other.type); return ComparisonChain.start() - .compare(pathNodeKey, otherValue.pathNodeKey) + .compare(pathNodeKey, other.pathNodeKey) .compare(thisAtomic, otherAtomic) .result(); } diff --git a/bundles/sirix-core/src/main/java/org/sirix/node/NodeKind.java b/bundles/sirix-core/src/main/java/org/sirix/node/NodeKind.java index 09c36e864..9315482ab 100644 --- a/bundles/sirix-core/src/main/java/org/sirix/node/NodeKind.java +++ b/bundles/sirix-core/src/main/java/org/sirix/node/NodeKind.java @@ -46,7 +46,8 @@ import org.sirix.api.PageReadOnlyTrx; import org.sirix.index.AtomicUtil; import org.sirix.index.path.summary.PathNode; -import org.sirix.index.redblacktree.RBNode; +import org.sirix.index.redblacktree.RBNodeKey; +import org.sirix.index.redblacktree.RBNodeValue; import org.sirix.index.redblacktree.keyvalue.CASValue; import org.sirix.index.redblacktree.keyvalue.NodeReferences; import org.sirix.node.delegates.NameNodeDelegate; @@ -83,7 +84,7 @@ * @author Sebastian Graf, University of Konstanz * @author Johannes Lichtenberger, University of Konstanz */ -@SuppressWarnings({ "DuplicatedCode" }) +@SuppressWarnings({ "DuplicatedCode", "unchecked" }) public enum NodeKind implements DeweyIdSerializer { /** @@ -558,7 +559,7 @@ public void serializeDeweyID(BytesOut sink, byte[] deweyID, byte[] nextDeweyI /** * Node kind is a CAS-RB node. */ - CASRB((byte) 17, RBNode.class) { + CASRB((byte) 17, RBNodeKey.class) { @Override public @NotNull DataRecord deserialize(final BytesIn source, final @NonNegative long recordID, final byte[] deweyID, final PageReadOnlyTrx pageReadTrx) { @@ -569,8 +570,6 @@ public void serializeDeweyID(BytesOut sink, byte[] deweyID, byte[] nextDeweyI final byte[] type = new byte[typeSize]; source.read(type, 0, typeSize); - final Roaring64Bitmap nodeKeys = deserializeNodeReferences(source); - final Type atomicType = resolveType(new String(type, Constants.DEFAULT_ENCODING)); // Node delegate. @@ -579,10 +578,10 @@ public void serializeDeweyID(BytesOut sink, byte[] deweyID, byte[] nextDeweyI final long rightChild = getVarLong(source); final long pathNodeKey = getVarLong(source); final boolean isChanged = source.readBoolean(); - + final long valueNodeKey = source.readLong(); final Atomic atomic = AtomicUtil.fromBytes(value, atomicType); final var node = - new RBNode<>(new CASValue(atomic, atomicType, pathNodeKey), new NodeReferences(nodeKeys), nodeDel); + new RBNodeKey<>(new CASValue(atomic, atomicType, pathNodeKey), valueNodeKey, nodeDel); node.setLeftChildKey(leftChild); node.setRightChildKey(rightChild); @@ -592,7 +591,7 @@ public void serializeDeweyID(BytesOut sink, byte[] deweyID, byte[] nextDeweyI @Override public void serialize(final BytesOut sink, final DataRecord record, final PageReadOnlyTrx pageReadTrx) { - final RBNode node = (RBNode) record; + final RBNodeKey node = (RBNodeKey) record; final CASValue key = node.getKey(); final byte[] textValue = key.getValue(); assert textValue != null; @@ -601,15 +600,13 @@ public void serialize(final BytesOut sink, final DataRecord record, final byte[] type = key.getType().toString().getBytes(Constants.DEFAULT_ENCODING); sink.writeInt(type.length); sink.write(type); - final NodeReferences value = node.getValue(); - final Roaring64Bitmap nodeKeys = value.getNodeKeys(); - serializeNodeReferences(sink, nodeKeys); serializeDelegate(node.getNodeDelegate(), sink); putVarLong(sink, node.getLeftChildKey()); putVarLong(sink, node.getRightChildKey()); putVarLong(sink, key.getPathNodeKey()); sink.writeBoolean(node.isChanged()); + sink.writeLong(node.getValueNodeKey()); } @Override @@ -638,18 +635,18 @@ private Type resolveType(final String s) { /** * Node kind is a PATH-RB node. */ - PATHRB((byte) 18, RBNode.class) { + PATHRB((byte) 18, RBNodeKey.class) { @Override public @NotNull DataRecord deserialize(final BytesIn source, final @NonNegative long recordID, final byte[] deweyID, final PageReadOnlyTrx pageReadTrx) { final long key = getVarLong(source); - final var nodeKeys = deserializeNodeReferences(source); // Node delegate. final NodeDelegate nodeDel = deserializeNodeDelegateWithoutIDs(source, recordID, pageReadTrx); final long leftChild = getVarLong(source); final long rightChild = getVarLong(source); final boolean isChanged = source.readBoolean(); - final RBNode node = new RBNode<>(key, new NodeReferences(nodeKeys), nodeDel); + final long valueNodeKey = source.readLong(); + final RBNodeKey node = new RBNodeKey<>(key, valueNodeKey, nodeDel); node.setLeftChildKey(leftChild); node.setRightChildKey(rightChild); node.setChanged(isChanged); @@ -658,15 +655,13 @@ private Type resolveType(final String s) { @Override public void serialize(final BytesOut sink, final DataRecord record, final PageReadOnlyTrx pageReadTrx) { - final RBNode node = (RBNode) record; + final RBNodeKey node = (RBNodeKey) record; putVarLong(sink, node.getKey()); - final NodeReferences value = node.getValue(); - final Roaring64Bitmap nodeKeys = value.getNodeKeys(); - serializeNodeReferences(sink, nodeKeys); serializeDelegate(node.getNodeDelegate(), sink); putVarLong(sink, node.getLeftChildKey()); putVarLong(sink, node.getRightChildKey()); sink.writeBoolean(node.isChanged()); + sink.writeLong(node.getValueNodeKey()); } @Override @@ -684,7 +679,7 @@ public void serializeDeweyID(BytesOut sink, byte[] deweyID, byte[] nextDeweyI /** * Node kind is a PATH-RB node. */ - NAMERB((byte) 19, RBNode.class) { + NAMERB((byte) 19, RBNodeKey.class) { @Override public @NotNull DataRecord deserialize(final BytesIn source, final @NonNegative long recordID, final byte[] deweyID, final PageReadOnlyTrx pageReadTrx) { @@ -697,13 +692,13 @@ public void serializeDeweyID(BytesOut sink, byte[] deweyID, byte[] nextDeweyI final QNm name = new QNm(new String(nspBytes, Constants.DEFAULT_ENCODING), new String(prefixBytes, Constants.DEFAULT_ENCODING), new String(localNameBytes, Constants.DEFAULT_ENCODING)); - final var nodeKeys = deserializeNodeReferences(source); // Node delegate. final NodeDelegate nodeDel = deserializeNodeDelegateWithoutIDs(source, recordID, pageReadTrx); final long leftChild = getVarLong(source); final long rightChild = getVarLong(source); final boolean isChanged = source.readBoolean(); - final RBNode node = new RBNode<>(name, new NodeReferences(nodeKeys), nodeDel); + final long valueNodeKey = source.readLong(); + final RBNodeKey node = new RBNodeKey<>(name, valueNodeKey, nodeDel); node.setLeftChildKey(leftChild); node.setRightChildKey(rightChild); node.setChanged(isChanged); @@ -712,7 +707,7 @@ public void serializeDeweyID(BytesOut sink, byte[] deweyID, byte[] nextDeweyI @Override public void serialize(final BytesOut sink, final DataRecord record, final PageReadOnlyTrx pageReadTrx) { - final RBNode node = (RBNode) record; + final RBNodeKey node = (RBNodeKey) record; final byte[] nspBytes = node.getKey().getNamespaceURI().getBytes(); sink.writeInt(nspBytes.length); sink.write(nspBytes); @@ -722,13 +717,45 @@ public void serialize(final BytesOut sink, final DataRecord record, final byte[] localNameBytes = node.getKey().getLocalName().getBytes(); sink.writeInt(localNameBytes.length); sink.write(localNameBytes); - final NodeReferences value = node.getValue(); - final Roaring64Bitmap nodeKeys = value.getNodeKeys(); - serializeNodeReferences(sink, nodeKeys); serializeDelegate(node.getNodeDelegate(), sink); putVarLong(sink, node.getLeftChildKey()); putVarLong(sink, node.getRightChildKey()); sink.writeBoolean(node.isChanged()); + sink.writeLong(node.getValueNodeKey()); + } + + @Override + public byte[] deserializeDeweyID(BytesIn source, byte[] previousDeweyID, ResourceConfiguration resourceConfig) { + throw new UnsupportedOperationException(); + } + + @Override + public void serializeDeweyID(BytesOut sink, byte[] deweyID, byte[] nextDeweyID, + ResourceConfiguration resourceConfig) { + throw new UnsupportedOperationException(); + } + }, + + /** + * Node kind is a value red black tree node. + */ + RB_NODE_VALUE((byte) 55, RBNodeValue.class) { + @Override + public @NotNull DataRecord deserialize(final BytesIn source, final @NonNegative long recordID, + final byte[] deweyID, final PageReadOnlyTrx pageReadTrx) { + final var nodeKeys = deserializeNodeReferences(source); + // Node delegate. + final NodeDelegate nodeDel = deserializeNodeDelegateWithoutIDs(source, recordID, pageReadTrx); + return new RBNodeValue<>(new NodeReferences(nodeKeys), nodeDel); + } + + @Override + public void serialize(final BytesOut sink, final DataRecord record, final PageReadOnlyTrx pageReadTrx) { + final RBNodeValue node = (RBNodeValue) record; + final NodeReferences value = node.getValue(); + final Roaring64Bitmap nodeKeys = value.getNodeKeys(); + serializeNodeReferences(sink, nodeKeys); + serializeDelegate(node.getNodeDelegate(), sink); } @Override @@ -872,7 +899,6 @@ public void serializeDeweyID(BytesOut sink, byte[] deweyID, byte[] nextDeweyI var rightSibling = currKey - getVarLong(source); var leftSibling = currKey - getVarLong(source); var firstChild = currKey - getVarLong(source); - @SuppressWarnings("UnnecessaryLocalVariable") var lastChild = firstChild; var config = pageReadTrx.getResourceSession().getResourceConfig(); @@ -1068,19 +1094,19 @@ public void serialize(final BytesOut sink, final DataRecord record, final Number number = node.getValue(); switch (number) { - case Double aDouble -> { + case Double ignored -> { sink.writeByte((byte) 0); sink.writeDouble(number.doubleValue()); } - case Float aFloat -> { + case Float ignored -> { sink.writeByte((byte) 1); sink.writeFloat(number.floatValue()); } - case Integer integer -> { + case Integer ignored -> { sink.writeByte((byte) 2); sink.writeInt(number.intValue()); } - case Long aLong -> { + case Long ignored -> { sink.writeByte((byte) 3); sink.writeLong(number.longValue()); } diff --git a/bundles/sirix-core/src/main/java/org/sirix/page/NamePage.java b/bundles/sirix-core/src/main/java/org/sirix/page/NamePage.java index bf6c5e604..ef3f4ccbb 100644 --- a/bundles/sirix-core/src/main/java/org/sirix/page/NamePage.java +++ b/bundles/sirix-core/src/main/java/org/sirix/page/NamePage.java @@ -49,7 +49,7 @@ import org.sirix.settings.Constants; /** - * The name page holds all names and their keys for a revision. Furthermore it has references to name indexes. + * The name page holds all names and their keys for a revision. Furthermore, it has references to name indexes. */ public final class NamePage extends AbstractForwardingPage { diff --git a/bundles/sirix-core/src/test/java/org/sirix/JsonTestHelper.java b/bundles/sirix-core/src/test/java/org/sirix/JsonTestHelper.java index 3dec6ff66..0cf91382d 100644 --- a/bundles/sirix-core/src/test/java/org/sirix/JsonTestHelper.java +++ b/bundles/sirix-core/src/test/java/org/sirix/JsonTestHelper.java @@ -24,7 +24,6 @@ import org.junit.Ignore; import org.junit.Test; import org.sirix.access.DatabaseConfiguration; -import org.sirix.access.DatabaseType; import org.sirix.access.Databases; import org.sirix.access.ResourceConfiguration; import org.sirix.access.trx.node.HashType; @@ -49,17 +48,22 @@ * This includes instantiation of databases plus resources. * * @author Johannes Lichtenberger - * */ public final class JsonTestHelper { - /** Temporary directory path. */ + /** + * Temporary directory path. + */ private static final String TMPDIR = System.getProperty("java.io.tmpdir"); - /** Common resource name. */ + /** + * Common resource name. + */ public static final String RESOURCE = "shredded"; - /** Paths where the data is stored to. */ + /** + * Paths where the data is stored to. + */ public enum PATHS { // PATH1 (Sirix) PATH1(Paths.get(TMPDIR, "sirix", "json-path1")), @@ -72,27 +76,23 @@ public enum PATHS { final Path file; - final DatabaseConfiguration config; - PATHS(final Path file) { this.file = file; - config = new DatabaseConfiguration(file).setDatabaseType(DatabaseType.JSON); } public Path getFile() { return file; } - - public DatabaseConfiguration getConfig() { - return config; - } - } - /** Common random instance for generating common tag names. */ + /** + * Common random instance for generating common tag names. + */ public final static Random random = new Random(); - /** Path <=> Database instances. */ + /** + * Path <=> Database instances. + */ private final static Map> INSTANCES = new HashMap<>(); @Test @@ -112,19 +112,14 @@ public static Database getDatabase(final Path file) { if (INSTANCES.containsKey(file)) { return INSTANCES.get(file); } else { - try { - final DatabaseConfiguration config = new DatabaseConfiguration(file); - if (!Files.exists(file)) { - Databases.createJsonDatabase(config); - } - final var database = Databases.openJsonDatabase(file); - database.createResource(ResourceConfiguration.newBuilder(RESOURCE).build()); - INSTANCES.put(file, database); - return database; - } catch (final SirixRuntimeException e) { - fail(e.toString()); - return null; + final DatabaseConfiguration config = new DatabaseConfiguration(file); + if (!Files.exists(file)) { + Databases.createJsonDatabase(config); } + final var database = Databases.openJsonDatabase(file); + database.createResource(ResourceConfiguration.newBuilder(RESOURCE).build()); + INSTANCES.put(file, database); + return database; } } diff --git a/bundles/sirix-core/src/test/java/org/sirix/index/JsonRedBlackTreeIntegrationTest.java b/bundles/sirix-core/src/test/java/org/sirix/index/JsonRedBlackTreeIntegrationTest.java index d3cb9f76d..3bdf3b7e7 100644 --- a/bundles/sirix-core/src/test/java/org/sirix/index/JsonRedBlackTreeIntegrationTest.java +++ b/bundles/sirix-core/src/test/java/org/sirix/index/JsonRedBlackTreeIntegrationTest.java @@ -86,9 +86,9 @@ public void testCreateCASIndexWhileListeningAndCASIndexOnDemandWithInvalidQName( public void testCreateNameIndexWhileListeningAndNameIndexOnDemand() { final var jsonPath = JSON.resolve("abc-location-stations.json"); final var database = JsonTestHelper.getDatabase(JsonTestHelper.PATHS.PATH1.getFile()); - try (final var manager = database.beginResourceSession(JsonTestHelper.RESOURCE); - final var trx = manager.beginNodeTrx()) { - var indexController = manager.getWtxIndexController(trx.getRevisionNumber()); + try (final var session = database.beginResourceSession(JsonTestHelper.RESOURCE); + final var trx = session.beginNodeTrx()) { + var indexController = session.getWtxIndexController(trx.getRevisionNumber()); final var allObjectKeyNames = IndexDefs.createNameIdxDef(0, IndexDef.DbType.JSON); @@ -133,12 +133,12 @@ public void testCreateNameIndexWhileListeningAndNameIndexOnDemand() { assertFalse(allTwitterAccounts.hasNext()); final var allStreetAddresses = - IndexDefs.createSelectiveNameIdxDef(Set.of(new QNm("streetaddress")), 1, IndexDef.DbType.JSON); + IndexDefs.createSelectiveNameIdxDef(Set.of(new QNm("streetaddress")), 2, IndexDef.DbType.JSON); indexController.createIndexes(Set.of(allStreetAddresses), trx); final var allStreetAddressesIndex = indexController.openNameIndex(trx.getPageTrx(), - allObjectKeyNamesExceptStreetAddress, + allStreetAddresses, indexController.createNameFilter(Set.of( "streetaddress"))); @@ -148,7 +148,7 @@ public void testCreateNameIndexWhileListeningAndNameIndexOnDemand() { assertFalse(allStreetAddressesIndex.hasNext()); - final var allStreetAddressesIndexReader = RBTreeReader.getInstance(manager.getIndexCache(), + final var allStreetAddressesIndexReader = RBTreeReader.getInstance(session.getIndexCache(), trx.getPageTrx(), allStreetAddresses.getType(), allStreetAddresses.getID()); @@ -158,49 +158,49 @@ public void testCreateNameIndexWhileListeningAndNameIndexOnDemand() { final var lastChildKey = allStreetAddressesIndexReader.getLastChildKey(); final var lastChildKind = allStreetAddressesIndexReader.getLastChildKind(); - assertEquals(3, firstChildKey); + assertEquals(1, firstChildKey); assertEquals(NodeKind.NAMERB, firstChildKind); assertEquals(-1, lastChildKey); assertEquals(NodeKind.UNKNOWN, lastChildKind); final RBTreeReader allObjectKeyNamesIndexReader = - RBTreeReader.getInstance(manager.getIndexCache(), + RBTreeReader.getInstance(session.getIndexCache(), trx.getPageTrx(), allObjectKeyNames.getType(), allObjectKeyNames.getID()); - final var avlNodeIterator = allObjectKeyNamesIndexReader.new RBNodeIterator(0); + final var iterator = allObjectKeyNamesIndexReader.new RBNodeIterator(0); - avlNodeIterator.forEachRemaining(avlNode -> { - System.out.println(avlNode); - System.out.println(avlNode.getKey()); + iterator.forEachRemaining(node -> { + System.out.println(node); + System.out.println(node.getKey()); }); final var name = new QNm("streetaddress"); - final var nodeGreater = allObjectKeyNamesIndexReader.getCurrentNode(name, SearchMode.GREATER); + final var nodeGreater = allObjectKeyNamesIndexReader.getCurrentNodeAsRBNodeKey(name, SearchMode.GREATER); assertTrue(nodeGreater.isPresent()); assertEquals("twitteraccount", nodeGreater.get().getKey().getLocalName()); final var nodeGreaterNotPresent = - allObjectKeyNamesIndexReader.getCurrentNode(new QNm("type"), SearchMode.GREATER); + allObjectKeyNamesIndexReader.getCurrentNodeAsRBNodeKey(new QNm("type"), SearchMode.GREATER); assertFalse(nodeGreaterNotPresent.isPresent()); - final var nodeGreaterOrEqual = allObjectKeyNamesIndexReader.getCurrentNode(name, SearchMode.GREATER_OR_EQUAL); + final var nodeGreaterOrEqual = allObjectKeyNamesIndexReader.getCurrentNodeAsRBNodeKey(name, SearchMode.GREATER_OR_EQUAL); assertTrue(nodeGreaterOrEqual.isPresent()); assertEquals("streetaddress", nodeGreaterOrEqual.get().getKey().getLocalName()); - final var nodeLess = allObjectKeyNamesIndexReader.getCurrentNode(name, SearchMode.LOWER); + final var nodeLess = allObjectKeyNamesIndexReader.getCurrentNodeAsRBNodeKey(name, SearchMode.LOWER); assertTrue(nodeLess.isPresent()); assertEquals("id", nodeLess.get().getKey().getLocalName()); - final var nodeLessOrEqual = allObjectKeyNamesIndexReader.getCurrentNode(nodeGreaterOrEqual.get().getNodeKey(), - name, - SearchMode.LOWER_OR_EQUAL); + final var nodeLessOrEqual = allObjectKeyNamesIndexReader.getCurrentNodeAsRBNodeKey(nodeGreaterOrEqual.get().getNodeKey(), + name, + SearchMode.LOWER_OR_EQUAL); assertTrue(nodeLessOrEqual.isPresent()); assertEquals("streetaddress", nodeLessOrEqual.get().getKey().getLocalName()); @@ -213,7 +213,7 @@ public void testCreateNameIndexWhileListeningAndNameIndexOnDemand() { assertEquals(18, stream.count()); final var nodeGreaterWithComp = - allObjectKeyNamesIndexReader.getCurrentNode(name, SearchMode.GREATER, Comparator.naturalOrder()); + allObjectKeyNamesIndexReader.getCurrentNodeAsRBNodeKey(name, SearchMode.GREATER, Comparator.naturalOrder()); assertEquals("twitteraccount", nodeGreaterWithComp.get().getKey().getLocalName()); diff --git a/bundles/sirix-examples/build.gradle b/bundles/sirix-examples/build.gradle index 13472ab13..fbdfea902 100644 --- a/bundles/sirix-examples/build.gradle +++ b/bundles/sirix-examples/build.gradle @@ -1,6 +1,6 @@ dependencies { implementation project(':sirix-core') - implementation project(':sirix-xquery') + implementation project(':sirix-query') } description = 'sirix-example' \ No newline at end of file diff --git a/bundles/sirix-examples/src/main/java/org/sirix/examples/XQueryUsage.java b/bundles/sirix-examples/src/main/java/org/sirix/examples/XQueryUsage.java index cb6436f29..32a8ac783 100644 --- a/bundles/sirix-examples/src/main/java/org/sirix/examples/XQueryUsage.java +++ b/bundles/sirix-examples/src/main/java/org/sirix/examples/XQueryUsage.java @@ -9,11 +9,11 @@ import org.brackit.xquery.sequence.SortedNodeSequence; import org.sirix.exception.SirixException; import org.sirix.index.IndexDef; -import org.sirix.xquery.SirixCompileChain; -import org.sirix.xquery.SirixQueryContext; -import org.sirix.xquery.SirixQueryContext.CommitStrategy; -import org.sirix.xquery.node.BasicXmlDBStore; -import org.sirix.xquery.node.XmlDBNode; +import org.sirix.query.SirixCompileChain; +import org.sirix.query.SirixQueryContext; +import org.sirix.query.SirixQueryContext.CommitStrategy; +import org.sirix.query.node.BasicXmlDBStore; +import org.sirix.query.node.XmlDBNode; import java.io.FileOutputStream; import java.io.IOException; diff --git a/bundles/sirix-kotlin-cli/build.gradle b/bundles/sirix-kotlin-cli/build.gradle index 2b0ff3002..816b9e6d9 100644 --- a/bundles/sirix-kotlin-cli/build.gradle +++ b/bundles/sirix-kotlin-cli/build.gradle @@ -17,7 +17,7 @@ tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all { dependencies { implementation project(':sirix-core') - implementation project(':sirix-xquery') + implementation project(':sirix-query') implementation implLibraries.kotlinStdlib implementation implLibraries.kotlinStdlibJdk8 diff --git a/bundles/sirix-kotlin-cli/src/main/kotlin/org/sirix/cli/commands/Query.kt b/bundles/sirix-kotlin-cli/src/main/kotlin/org/sirix/cli/commands/Query.kt index 3fbde045c..2cef715cf 100644 --- a/bundles/sirix-kotlin-cli/src/main/kotlin/org/sirix/cli/commands/Query.kt +++ b/bundles/sirix-kotlin-cli/src/main/kotlin/org/sirix/cli/commands/Query.kt @@ -10,14 +10,14 @@ import org.sirix.api.xml.XmlResourceSession import org.sirix.cli.CliOptions import org.sirix.cli.commands.RevisionsHelper.Companion.getRevisionsToSerialize import org.sirix.exception.SirixException -import org.sirix.xquery.JsonDBSerializer -import org.sirix.xquery.SirixCompileChain -import org.sirix.xquery.SirixQueryContext -import org.sirix.xquery.XmlDBSerializer -import org.sirix.xquery.json.* -import org.sirix.xquery.node.BasicXmlDBStore -import org.sirix.xquery.node.XmlDBCollection -import org.sirix.xquery.node.XmlDBNode +import org.sirix.query.JsonDBSerializer +import org.sirix.query.SirixCompileChain +import org.sirix.query.SirixQueryContext +import org.sirix.query.XmlDBSerializer +import org.sirix.query.json.* +import org.sirix.query.node.BasicXmlDBStore +import org.sirix.query.node.XmlDBCollection +import org.sirix.query.node.XmlDBNode import java.io.ByteArrayOutputStream import java.io.PrintStream diff --git a/bundles/sirix-xquery/build.gradle b/bundles/sirix-query/build.gradle similarity index 90% rename from bundles/sirix-xquery/build.gradle rename to bundles/sirix-query/build.gradle index 0224eca41..cac214fa9 100644 --- a/bundles/sirix-xquery/build.gradle +++ b/bundles/sirix-query/build.gradle @@ -15,7 +15,7 @@ apply plugin: 'kotlin' apply plugin: 'application' ext { - javaMainClass = "org.sirix.xquery.Main" + javaMainClass = "org.sirix.query.Main" } application { @@ -40,7 +40,7 @@ description = 'Sirix/Brackit binding.' jar { manifest { - attributes('Main-Class': 'org.sirix.xquery.Main') + attributes('Main-Class': 'org.sirix.query.Main') } } diff --git a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/JsonDBSerializer.java b/bundles/sirix-query/src/main/java/org/sirix/query/JsonDBSerializer.java similarity index 99% rename from bundles/sirix-xquery/src/main/java/org/sirix/xquery/JsonDBSerializer.java rename to bundles/sirix-query/src/main/java/org/sirix/query/JsonDBSerializer.java index 5d1bec0d7..3ca91365e 100644 --- a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/JsonDBSerializer.java +++ b/bundles/sirix-query/src/main/java/org/sirix/query/JsonDBSerializer.java @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.sirix.xquery; +package org.sirix.query; import org.brackit.xquery.atomic.Atomic; import org.brackit.xquery.jdm.Item; diff --git a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/Main.java b/bundles/sirix-query/src/main/java/org/sirix/query/Main.java similarity index 97% rename from bundles/sirix-xquery/src/main/java/org/sirix/xquery/Main.java rename to bundles/sirix-query/src/main/java/org/sirix/query/Main.java index 4b58eb691..ddde6bd79 100644 --- a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/Main.java +++ b/bundles/sirix-query/src/main/java/org/sirix/query/Main.java @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.sirix.xquery; +package org.sirix.query; import org.brackit.xquery.QueryContext; import org.brackit.xquery.QueryException; @@ -37,10 +37,10 @@ import org.brackit.xquery.node.parser.NodeSubtreeParser; import org.brackit.xquery.util.io.URIHandler; import org.sirix.service.json.shredder.JsonShredder; -import org.sirix.xquery.json.BasicJsonDBStore; -import org.sirix.xquery.json.JsonDBCollection; -import org.sirix.xquery.json.JsonDBItem; -import org.sirix.xquery.node.BasicXmlDBStore; +import org.sirix.query.json.BasicJsonDBStore; +import org.sirix.query.json.JsonDBCollection; +import org.sirix.query.json.JsonDBItem; +import org.sirix.query.node.BasicXmlDBStore; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/SirixCompileChain.java b/bundles/sirix-query/src/main/java/org/sirix/query/SirixCompileChain.java similarity index 83% rename from bundles/sirix-xquery/src/main/java/org/sirix/xquery/SirixCompileChain.java rename to bundles/sirix-query/src/main/java/org/sirix/query/SirixCompileChain.java index 381f0929c..d65b89d44 100644 --- a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/SirixCompileChain.java +++ b/bundles/sirix-query/src/main/java/org/sirix/query/SirixCompileChain.java @@ -1,4 +1,4 @@ -package org.sirix.xquery; +package org.sirix.query; import java.util.Map; import org.brackit.xquery.atomic.QNm; @@ -7,15 +7,15 @@ import org.brackit.xquery.compiler.optimizer.Optimizer; import org.brackit.xquery.compiler.translator.Translator; import org.brackit.xquery.util.Cfg; -import org.sirix.xquery.compiler.optimizer.SirixOptimizer; -import org.sirix.xquery.compiler.translator.SirixTranslator; -import org.sirix.xquery.function.jn.JNFun; -import org.sirix.xquery.function.sdb.SDBFun; -import org.sirix.xquery.function.xml.XMLFun; -import org.sirix.xquery.json.BasicJsonDBStore; -import org.sirix.xquery.json.JsonDBStore; -import org.sirix.xquery.node.BasicXmlDBStore; -import org.sirix.xquery.node.XmlDBStore; +import org.sirix.query.compiler.optimizer.SirixOptimizer; +import org.sirix.query.compiler.translator.SirixTranslator; +import org.sirix.query.function.jn.JNFun; +import org.sirix.query.function.sdb.SDBFun; +import org.sirix.query.function.xml.XMLFun; +import org.sirix.query.json.BasicJsonDBStore; +import org.sirix.query.json.JsonDBStore; +import org.sirix.query.node.BasicXmlDBStore; +import org.sirix.query.node.XmlDBStore; /** * Compile chain. diff --git a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/SirixQueryContext.java b/bundles/sirix-query/src/main/java/org/sirix/query/SirixQueryContext.java similarity index 96% rename from bundles/sirix-xquery/src/main/java/org/sirix/xquery/SirixQueryContext.java rename to bundles/sirix-query/src/main/java/org/sirix/query/SirixQueryContext.java index dce92112d..7d5f33190 100644 --- a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/SirixQueryContext.java +++ b/bundles/sirix-query/src/main/java/org/sirix/query/SirixQueryContext.java @@ -1,4 +1,4 @@ -package org.sirix.xquery; +package org.sirix.query; import org.brackit.xquery.BrackitQueryContext; import org.brackit.xquery.QueryContext; @@ -16,12 +16,12 @@ import org.checkerframework.checker.nullness.qual.Nullable; import org.sirix.api.json.JsonNodeTrx; import org.sirix.api.xml.XmlNodeTrx; -import org.sirix.xquery.json.BasicJsonDBStore; -import org.sirix.xquery.json.JsonDBItem; -import org.sirix.xquery.json.JsonDBStore; -import org.sirix.xquery.node.BasicXmlDBStore; -import org.sirix.xquery.node.XmlDBNode; -import org.sirix.xquery.node.XmlDBStore; +import org.sirix.query.json.BasicJsonDBStore; +import org.sirix.query.json.JsonDBItem; +import org.sirix.query.json.JsonDBStore; +import org.sirix.query.node.BasicXmlDBStore; +import org.sirix.query.node.XmlDBNode; +import org.sirix.query.node.XmlDBStore; import java.time.Instant; import java.util.Collections; diff --git a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/StructuredDBItem.java b/bundles/sirix-query/src/main/java/org/sirix/query/StructuredDBItem.java similarity index 90% rename from bundles/sirix-xquery/src/main/java/org/sirix/xquery/StructuredDBItem.java rename to bundles/sirix-query/src/main/java/org/sirix/query/StructuredDBItem.java index 7e5454dcf..e9f44bc1c 100644 --- a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/StructuredDBItem.java +++ b/bundles/sirix-query/src/main/java/org/sirix/query/StructuredDBItem.java @@ -1,4 +1,4 @@ -package org.sirix.xquery; +package org.sirix.query; import org.brackit.xquery.jdm.StructuredItem; import org.sirix.api.NodeCursor; diff --git a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/XmlDBSerializer.java b/bundles/sirix-query/src/main/java/org/sirix/query/XmlDBSerializer.java similarity index 98% rename from bundles/sirix-xquery/src/main/java/org/sirix/xquery/XmlDBSerializer.java rename to bundles/sirix-query/src/main/java/org/sirix/query/XmlDBSerializer.java index 89a37533f..bc304d6e2 100644 --- a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/XmlDBSerializer.java +++ b/bundles/sirix-query/src/main/java/org/sirix/query/XmlDBSerializer.java @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.sirix.xquery; +package org.sirix.query; import org.brackit.xquery.ErrorCode; import org.brackit.xquery.QueryException; @@ -38,7 +38,7 @@ import org.brackit.xquery.util.serialize.StringSerializer; import org.sirix.api.xml.XmlNodeReadOnlyTrx; import org.sirix.service.xml.serialize.XmlSerializer; -import org.sirix.xquery.node.XmlDBNode; +import org.sirix.query.node.XmlDBNode; import java.io.OutputStream; import java.io.PrintStream; diff --git a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/compiler/XQExt.java b/bundles/sirix-query/src/main/java/org/sirix/query/compiler/XQExt.java similarity index 93% rename from bundles/sirix-xquery/src/main/java/org/sirix/xquery/compiler/XQExt.java rename to bundles/sirix-query/src/main/java/org/sirix/query/compiler/XQExt.java index 595bbb45b..44748394c 100644 --- a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/compiler/XQExt.java +++ b/bundles/sirix-query/src/main/java/org/sirix/query/compiler/XQExt.java @@ -1,4 +1,4 @@ -package org.sirix.xquery.compiler; +package org.sirix.query.compiler; import org.brackit.xquery.compiler.XQ; diff --git a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/compiler/expression/IndexExpr.java b/bundles/sirix-query/src/main/java/org/sirix/query/compiler/expression/IndexExpr.java similarity index 98% rename from bundles/sirix-xquery/src/main/java/org/sirix/xquery/compiler/expression/IndexExpr.java rename to bundles/sirix-query/src/main/java/org/sirix/query/compiler/expression/IndexExpr.java index e12c67e2b..d43065ebd 100644 --- a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/compiler/expression/IndexExpr.java +++ b/bundles/sirix-query/src/main/java/org/sirix/query/compiler/expression/IndexExpr.java @@ -1,4 +1,4 @@ -package org.sirix.xquery.compiler.expression; +package org.sirix.query.compiler.expression; import it.unimi.dsi.fastutil.longs.LongLinkedOpenHashSet; import org.brackit.xquery.QueryContext; @@ -24,12 +24,12 @@ import org.sirix.index.name.NameFilter; import org.sirix.index.path.json.JsonPCRCollector; import org.sirix.index.redblacktree.keyvalue.NodeReferences; -import org.sirix.xquery.SirixQueryContext; -import org.sirix.xquery.compiler.optimizer.walker.json.Paths; -import org.sirix.xquery.compiler.optimizer.walker.json.QueryPathSegment; -import org.sirix.xquery.function.jn.JNFun; -import org.sirix.xquery.json.JsonDBCollection; -import org.sirix.xquery.json.JsonItemFactory; +import org.sirix.query.SirixQueryContext; +import org.sirix.query.compiler.optimizer.walker.json.Paths; +import org.sirix.query.compiler.optimizer.walker.json.QueryPathSegment; +import org.sirix.query.function.jn.JNFun; +import org.sirix.query.json.JsonDBCollection; +import org.sirix.query.json.JsonItemFactory; import java.util.*; diff --git a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/compiler/optimizer/SirixOptimizer.java b/bundles/sirix-query/src/main/java/org/sirix/query/compiler/optimizer/SirixOptimizer.java similarity index 79% rename from bundles/sirix-xquery/src/main/java/org/sirix/xquery/compiler/optimizer/SirixOptimizer.java rename to bundles/sirix-query/src/main/java/org/sirix/query/compiler/optimizer/SirixOptimizer.java index 1d5df1ecb..de231d936 100644 --- a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/compiler/optimizer/SirixOptimizer.java +++ b/bundles/sirix-query/src/main/java/org/sirix/query/compiler/optimizer/SirixOptimizer.java @@ -1,4 +1,4 @@ -package org.sirix.xquery.compiler.optimizer; +package org.sirix.query.compiler.optimizer; import java.util.Map; @@ -9,11 +9,11 @@ import org.brackit.xquery.compiler.optimizer.Stage; import org.brackit.xquery.compiler.optimizer.TopDownOptimizer; import org.brackit.xquery.module.StaticContext; -import org.sirix.xquery.compiler.optimizer.walker.json.JsonCASStep; -import org.sirix.xquery.compiler.optimizer.walker.json.JsonObjectKeyNameStep; -import org.sirix.xquery.compiler.optimizer.walker.json.JsonPathStep; -import org.sirix.xquery.json.JsonDBStore; -import org.sirix.xquery.node.XmlDBStore; +import org.sirix.query.compiler.optimizer.walker.json.JsonCASStep; +import org.sirix.query.compiler.optimizer.walker.json.JsonObjectKeyNameStep; +import org.sirix.query.compiler.optimizer.walker.json.JsonPathStep; +import org.sirix.query.json.JsonDBStore; +import org.sirix.query.node.XmlDBStore; public final class SirixOptimizer extends TopDownOptimizer { diff --git a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/compiler/optimizer/package-info.java b/bundles/sirix-query/src/main/java/org/sirix/query/compiler/optimizer/package-info.java similarity index 58% rename from bundles/sirix-xquery/src/main/java/org/sirix/xquery/compiler/optimizer/package-info.java rename to bundles/sirix-query/src/main/java/org/sirix/query/compiler/optimizer/package-info.java index a91026225..8851a2117 100644 --- a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/compiler/optimizer/package-info.java +++ b/bundles/sirix-query/src/main/java/org/sirix/query/compiler/optimizer/package-info.java @@ -1,7 +1,7 @@ -/** - * Database optimizer. - * - * @author Johannes Lichtenberger - * - */ -package org.sirix.xquery.compiler.optimizer; +/** + * Database optimizer. + * + * @author Johannes Lichtenberger + * + */ +package org.sirix.query.compiler.optimizer; diff --git a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/compiler/optimizer/walker/MultiChildStep.java b/bundles/sirix-query/src/main/java/org/sirix/query/compiler/optimizer/walker/MultiChildStep.java similarity index 98% rename from bundles/sirix-xquery/src/main/java/org/sirix/xquery/compiler/optimizer/walker/MultiChildStep.java rename to bundles/sirix-query/src/main/java/org/sirix/query/compiler/optimizer/walker/MultiChildStep.java index 8137d61ba..f30d9747e 100644 --- a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/compiler/optimizer/walker/MultiChildStep.java +++ b/bundles/sirix-query/src/main/java/org/sirix/query/compiler/optimizer/walker/MultiChildStep.java @@ -1,4 +1,4 @@ -package org.sirix.xquery.compiler.optimizer.walker; +package org.sirix.query.compiler.optimizer.walker; /* * [New BSD License] Copyright (c) 2011-2012, Brackit Project Team All rights @@ -29,7 +29,7 @@ import org.brackit.xquery.compiler.optimizer.walker.Walker; import org.brackit.xquery.module.StaticContext; import org.brackit.xquery.util.Cfg; -import org.sirix.xquery.compiler.XQExt; +import org.sirix.query.compiler.XQExt; /** * @author Sebastian Baechle diff --git a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/compiler/optimizer/walker/PathStep.java b/bundles/sirix-query/src/main/java/org/sirix/query/compiler/optimizer/walker/PathStep.java similarity index 93% rename from bundles/sirix-xquery/src/main/java/org/sirix/xquery/compiler/optimizer/walker/PathStep.java rename to bundles/sirix-query/src/main/java/org/sirix/query/compiler/optimizer/walker/PathStep.java index beb9be25a..7a30c70ee 100644 --- a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/compiler/optimizer/walker/PathStep.java +++ b/bundles/sirix-query/src/main/java/org/sirix/query/compiler/optimizer/walker/PathStep.java @@ -1,4 +1,4 @@ -package org.sirix.xquery.compiler.optimizer.walker; +package org.sirix.query.compiler.optimizer.walker; import org.brackit.xquery.compiler.AST; import org.brackit.xquery.compiler.XQ; diff --git a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/compiler/optimizer/walker/json/AbstractJsonPathWalker.java b/bundles/sirix-query/src/main/java/org/sirix/query/compiler/optimizer/walker/json/AbstractJsonPathWalker.java similarity index 99% rename from bundles/sirix-xquery/src/main/java/org/sirix/xquery/compiler/optimizer/walker/json/AbstractJsonPathWalker.java rename to bundles/sirix-query/src/main/java/org/sirix/query/compiler/optimizer/walker/json/AbstractJsonPathWalker.java index 8dd5c84cc..a9752a0e4 100644 --- a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/compiler/optimizer/walker/json/AbstractJsonPathWalker.java +++ b/bundles/sirix-query/src/main/java/org/sirix/query/compiler/optimizer/walker/json/AbstractJsonPathWalker.java @@ -1,4 +1,4 @@ -package org.sirix.xquery.compiler.optimizer.walker.json; +package org.sirix.query.compiler.optimizer.walker.json; import org.brackit.xquery.atomic.Int32; import org.brackit.xquery.atomic.QNm; @@ -17,8 +17,8 @@ import org.sirix.index.IndexDef; import org.sirix.index.path.summary.PathSummaryReader; import org.sirix.node.NodeKind; -import org.sirix.xquery.compiler.XQExt; -import org.sirix.xquery.json.JsonDBStore; +import org.sirix.query.compiler.XQExt; +import org.sirix.query.json.JsonDBStore; import java.util.*; import java.util.function.Function; diff --git a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/compiler/optimizer/walker/json/ComparatorData.java b/bundles/sirix-query/src/main/java/org/sirix/query/compiler/optimizer/walker/json/ComparatorData.java similarity index 95% rename from bundles/sirix-xquery/src/main/java/org/sirix/xquery/compiler/optimizer/walker/json/ComparatorData.java rename to bundles/sirix-query/src/main/java/org/sirix/query/compiler/optimizer/walker/json/ComparatorData.java index 19392dd4d..20abf79cf 100644 --- a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/compiler/optimizer/walker/json/ComparatorData.java +++ b/bundles/sirix-query/src/main/java/org/sirix/query/compiler/optimizer/walker/json/ComparatorData.java @@ -1,4 +1,4 @@ -package org.sirix.xquery.compiler.optimizer.walker.json; +package org.sirix.query.compiler.optimizer.walker.json; import org.brackit.xquery.atomic.Atomic; diff --git a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/compiler/optimizer/walker/json/JsonCASStep.java b/bundles/sirix-query/src/main/java/org/sirix/query/compiler/optimizer/walker/json/JsonCASStep.java similarity index 98% rename from bundles/sirix-xquery/src/main/java/org/sirix/xquery/compiler/optimizer/walker/json/JsonCASStep.java rename to bundles/sirix-query/src/main/java/org/sirix/query/compiler/optimizer/walker/json/JsonCASStep.java index 5629c6e9d..ee4137c89 100644 --- a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/compiler/optimizer/walker/json/JsonCASStep.java +++ b/bundles/sirix-query/src/main/java/org/sirix/query/compiler/optimizer/walker/json/JsonCASStep.java @@ -1,4 +1,4 @@ -package org.sirix.xquery.compiler.optimizer.walker.json; +package org.sirix.query.compiler.optimizer.walker.json; import org.brackit.xquery.atomic.Atomic; import org.brackit.xquery.atomic.Int32; @@ -12,8 +12,8 @@ import org.sirix.api.json.JsonNodeReadOnlyTrx; import org.sirix.api.json.JsonNodeTrx; import org.sirix.index.IndexDef; -import org.sirix.xquery.compiler.XQExt; -import org.sirix.xquery.json.JsonDBStore; +import org.sirix.query.compiler.XQExt; +import org.sirix.query.json.JsonDBStore; import java.util.*; diff --git a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/compiler/optimizer/walker/json/JsonObjectKeyNameStep.java b/bundles/sirix-query/src/main/java/org/sirix/query/compiler/optimizer/walker/json/JsonObjectKeyNameStep.java similarity index 94% rename from bundles/sirix-xquery/src/main/java/org/sirix/xquery/compiler/optimizer/walker/json/JsonObjectKeyNameStep.java rename to bundles/sirix-query/src/main/java/org/sirix/query/compiler/optimizer/walker/json/JsonObjectKeyNameStep.java index 0f85372cc..a5ccea89c 100644 --- a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/compiler/optimizer/walker/json/JsonObjectKeyNameStep.java +++ b/bundles/sirix-query/src/main/java/org/sirix/query/compiler/optimizer/walker/json/JsonObjectKeyNameStep.java @@ -1,4 +1,4 @@ -package org.sirix.xquery.compiler.optimizer.walker.json; +package org.sirix.query.compiler.optimizer.walker.json; import org.brackit.xquery.atomic.QNm; import org.brackit.xquery.compiler.AST; @@ -10,8 +10,8 @@ import org.sirix.api.json.JsonNodeTrx; import org.sirix.index.IndexDef; import org.sirix.index.IndexType; -import org.sirix.xquery.compiler.XQExt; -import org.sirix.xquery.json.JsonDBStore; +import org.sirix.query.compiler.XQExt; +import org.sirix.query.json.JsonDBStore; import java.util.Deque; import java.util.List; diff --git a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/compiler/optimizer/walker/json/JsonPathStep.java b/bundles/sirix-query/src/main/java/org/sirix/query/compiler/optimizer/walker/json/JsonPathStep.java similarity index 94% rename from bundles/sirix-xquery/src/main/java/org/sirix/xquery/compiler/optimizer/walker/json/JsonPathStep.java rename to bundles/sirix-query/src/main/java/org/sirix/query/compiler/optimizer/walker/json/JsonPathStep.java index 140809763..a7543422e 100644 --- a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/compiler/optimizer/walker/json/JsonPathStep.java +++ b/bundles/sirix-query/src/main/java/org/sirix/query/compiler/optimizer/walker/json/JsonPathStep.java @@ -1,4 +1,4 @@ -package org.sirix.xquery.compiler.optimizer.walker.json; +package org.sirix.query.compiler.optimizer.walker.json; import org.brackit.xquery.atomic.QNm; import org.brackit.xquery.compiler.AST; @@ -9,8 +9,8 @@ import org.sirix.api.json.JsonNodeReadOnlyTrx; import org.sirix.api.json.JsonNodeTrx; import org.sirix.index.IndexDef; -import org.sirix.xquery.compiler.XQExt; -import org.sirix.xquery.json.JsonDBStore; +import org.sirix.query.compiler.XQExt; +import org.sirix.query.json.JsonDBStore; import java.util.Deque; import java.util.List; diff --git a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/compiler/optimizer/walker/json/PathData.java b/bundles/sirix-query/src/main/java/org/sirix/query/compiler/optimizer/walker/json/PathData.java similarity index 83% rename from bundles/sirix-xquery/src/main/java/org/sirix/xquery/compiler/optimizer/walker/json/PathData.java rename to bundles/sirix-query/src/main/java/org/sirix/query/compiler/optimizer/walker/json/PathData.java index c3f085e07..9f73a0489 100644 --- a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/compiler/optimizer/walker/json/PathData.java +++ b/bundles/sirix-query/src/main/java/org/sirix/query/compiler/optimizer/walker/json/PathData.java @@ -1,4 +1,4 @@ -package org.sirix.xquery.compiler.optimizer.walker.json; +package org.sirix.query.compiler.optimizer.walker.json; import org.brackit.xquery.compiler.AST; diff --git a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/compiler/optimizer/walker/json/PathSegmentData.java b/bundles/sirix-query/src/main/java/org/sirix/query/compiler/optimizer/walker/json/PathSegmentData.java similarity index 72% rename from bundles/sirix-xquery/src/main/java/org/sirix/xquery/compiler/optimizer/walker/json/PathSegmentData.java rename to bundles/sirix-query/src/main/java/org/sirix/query/compiler/optimizer/walker/json/PathSegmentData.java index 5c307cac9..dacea7268 100644 --- a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/compiler/optimizer/walker/json/PathSegmentData.java +++ b/bundles/sirix-query/src/main/java/org/sirix/query/compiler/optimizer/walker/json/PathSegmentData.java @@ -1,4 +1,4 @@ -package org.sirix.xquery.compiler.optimizer.walker.json; +package org.sirix.query.compiler.optimizer.walker.json; import java.util.Deque; import java.util.Map; diff --git a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/compiler/optimizer/walker/json/Paths.java b/bundles/sirix-query/src/main/java/org/sirix/query/compiler/optimizer/walker/json/Paths.java similarity index 97% rename from bundles/sirix-xquery/src/main/java/org/sirix/xquery/compiler/optimizer/walker/json/Paths.java rename to bundles/sirix-query/src/main/java/org/sirix/query/compiler/optimizer/walker/json/Paths.java index 0de542eae..a6313f891 100644 --- a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/compiler/optimizer/walker/json/Paths.java +++ b/bundles/sirix-query/src/main/java/org/sirix/query/compiler/optimizer/walker/json/Paths.java @@ -1,4 +1,4 @@ -package org.sirix.xquery.compiler.optimizer.walker.json; +package org.sirix.query.compiler.optimizer.walker.json; import org.brackit.xquery.atomic.QNm; import org.brackit.xquery.util.path.Path; diff --git a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/compiler/optimizer/walker/json/QueryPathSegment.java b/bundles/sirix-query/src/main/java/org/sirix/query/compiler/optimizer/walker/json/QueryPathSegment.java similarity index 66% rename from bundles/sirix-xquery/src/main/java/org/sirix/xquery/compiler/optimizer/walker/json/QueryPathSegment.java rename to bundles/sirix-query/src/main/java/org/sirix/query/compiler/optimizer/walker/json/QueryPathSegment.java index f87f425f6..4171a726a 100644 --- a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/compiler/optimizer/walker/json/QueryPathSegment.java +++ b/bundles/sirix-query/src/main/java/org/sirix/query/compiler/optimizer/walker/json/QueryPathSegment.java @@ -1,4 +1,4 @@ -package org.sirix.xquery.compiler.optimizer.walker.json; +package org.sirix.query.compiler.optimizer.walker.json; import java.util.Deque; diff --git a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/compiler/optimizer/walker/json/RevisionData.java b/bundles/sirix-query/src/main/java/org/sirix/query/compiler/optimizer/walker/json/RevisionData.java similarity index 60% rename from bundles/sirix-xquery/src/main/java/org/sirix/xquery/compiler/optimizer/walker/json/RevisionData.java rename to bundles/sirix-query/src/main/java/org/sirix/query/compiler/optimizer/walker/json/RevisionData.java index b2a03c5d3..b877b70fa 100644 --- a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/compiler/optimizer/walker/json/RevisionData.java +++ b/bundles/sirix-query/src/main/java/org/sirix/query/compiler/optimizer/walker/json/RevisionData.java @@ -1,4 +1,4 @@ -package org.sirix.xquery.compiler.optimizer.walker.json; +package org.sirix.query.compiler.optimizer.walker.json; public record RevisionData(String databaseName, String resourceName, int revision) { } diff --git a/bundles/sirix-query/src/main/java/org/sirix/query/compiler/package-info.java b/bundles/sirix-query/src/main/java/org/sirix/query/compiler/package-info.java new file mode 100644 index 000000000..5977b7e5e --- /dev/null +++ b/bundles/sirix-query/src/main/java/org/sirix/query/compiler/package-info.java @@ -0,0 +1,5 @@ +/** + * @author johannes + * + */ +package org.sirix.query.compiler; diff --git a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/compiler/translator/DerefDescendantExpr.java b/bundles/sirix-query/src/main/java/org/sirix/query/compiler/translator/DerefDescendantExpr.java similarity index 99% rename from bundles/sirix-xquery/src/main/java/org/sirix/xquery/compiler/translator/DerefDescendantExpr.java rename to bundles/sirix-query/src/main/java/org/sirix/query/compiler/translator/DerefDescendantExpr.java index 108588310..d1db511a2 100644 --- a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/compiler/translator/DerefDescendantExpr.java +++ b/bundles/sirix-query/src/main/java/org/sirix/query/compiler/translator/DerefDescendantExpr.java @@ -1,4 +1,4 @@ -package org.sirix.xquery.compiler.translator; +package org.sirix.query.compiler.translator; import com.google.common.collect.ImmutableSet; import org.brackit.xquery.QueryContext; @@ -35,8 +35,8 @@ import org.sirix.exception.SirixException; import org.sirix.index.path.summary.PathSummaryReader; import org.sirix.node.NodeKind; -import org.sirix.xquery.json.JsonDBItem; -import org.sirix.xquery.stream.json.SirixJsonStream; +import org.sirix.query.json.JsonDBItem; +import org.sirix.query.stream.json.SirixJsonStream; import java.util.*; diff --git a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/compiler/translator/SirixLazySequence.java b/bundles/sirix-query/src/main/java/org/sirix/query/compiler/translator/SirixLazySequence.java similarity index 86% rename from bundles/sirix-xquery/src/main/java/org/sirix/xquery/compiler/translator/SirixLazySequence.java rename to bundles/sirix-query/src/main/java/org/sirix/query/compiler/translator/SirixLazySequence.java index 39d55ffa9..9531d8c51 100644 --- a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/compiler/translator/SirixLazySequence.java +++ b/bundles/sirix-query/src/main/java/org/sirix/query/compiler/translator/SirixLazySequence.java @@ -1,10 +1,10 @@ -package org.sirix.xquery.compiler.translator; +package org.sirix.query.compiler.translator; import org.brackit.xquery.jdm.Item; import org.brackit.xquery.jdm.Iter; import org.brackit.xquery.sequence.BaseIter; import org.brackit.xquery.sequence.LazySequence; -import org.sirix.xquery.stream.json.SirixJsonStream; +import org.sirix.query.stream.json.SirixJsonStream; class SirixJsonLazySequence extends LazySequence { diff --git a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/compiler/translator/SirixTranslator.java b/bundles/sirix-query/src/main/java/org/sirix/query/compiler/translator/SirixTranslator.java similarity index 99% rename from bundles/sirix-xquery/src/main/java/org/sirix/xquery/compiler/translator/SirixTranslator.java rename to bundles/sirix-query/src/main/java/org/sirix/query/compiler/translator/SirixTranslator.java index c71834e74..e0d824b70 100644 --- a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/compiler/translator/SirixTranslator.java +++ b/bundles/sirix-query/src/main/java/org/sirix/query/compiler/translator/SirixTranslator.java @@ -1,4 +1,4 @@ -package org.sirix.xquery.compiler.translator; +package org.sirix.query.compiler.translator; import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSet.Builder; @@ -30,11 +30,11 @@ import org.sirix.index.path.summary.PathSummaryReader; import org.sirix.service.xml.xpath.expr.UnionAxis; import org.sirix.settings.Fixed; -import org.sirix.xquery.compiler.XQExt; -import org.sirix.xquery.compiler.expression.IndexExpr; -import org.sirix.xquery.node.XmlDBNode; -import org.sirix.xquery.stream.node.SirixNodeStream; -import org.sirix.xquery.stream.node.TemporalSirixNodeStream; +import org.sirix.query.compiler.XQExt; +import org.sirix.query.compiler.expression.IndexExpr; +import org.sirix.query.node.XmlDBNode; +import org.sirix.query.stream.node.SirixNodeStream; +import org.sirix.query.stream.node.TemporalSirixNodeStream; import java.util.*; diff --git a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/compiler/translator/package-info.java b/bundles/sirix-query/src/main/java/org/sirix/query/compiler/translator/package-info.java similarity index 57% rename from bundles/sirix-xquery/src/main/java/org/sirix/xquery/compiler/translator/package-info.java rename to bundles/sirix-query/src/main/java/org/sirix/query/compiler/translator/package-info.java index 54e9b11ff..fa1c194b4 100644 --- a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/compiler/translator/package-info.java +++ b/bundles/sirix-query/src/main/java/org/sirix/query/compiler/translator/package-info.java @@ -1,7 +1,7 @@ -/** - * Database translator. - * - * @author Johannes Lichtenberger - * - */ -package org.sirix.xquery.compiler.translator; +/** + * Database translator. + * + * @author Johannes Lichtenberger + * + */ +package org.sirix.query.compiler.translator; diff --git a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/DateTimeToInstant.java b/bundles/sirix-query/src/main/java/org/sirix/query/function/DateTimeToInstant.java similarity index 94% rename from bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/DateTimeToInstant.java rename to bundles/sirix-query/src/main/java/org/sirix/query/function/DateTimeToInstant.java index a01293e79..c55a5b690 100644 --- a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/DateTimeToInstant.java +++ b/bundles/sirix-query/src/main/java/org/sirix/query/function/DateTimeToInstant.java @@ -1,4 +1,4 @@ -package org.sirix.xquery.function; +package org.sirix.query.function; import org.brackit.xquery.atomic.DateTime; diff --git a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/FunUtil.java b/bundles/sirix-query/src/main/java/org/sirix/query/function/FunUtil.java similarity index 95% rename from bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/FunUtil.java rename to bundles/sirix-query/src/main/java/org/sirix/query/function/FunUtil.java index fe0e4eb68..894f2f4d2 100644 --- a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/FunUtil.java +++ b/bundles/sirix-query/src/main/java/org/sirix/query/function/FunUtil.java @@ -1,136 +1,136 @@ -/* - * [New BSD License] Copyright (c) 2011-2012, Brackit Project Team All rights - * reserved. - * - * Redistribution and use in source and binary forms, with or without modification, are permitted - * provided that the following conditions are met: * Redistributions of source code must retain the - * above copyright notice, this list of conditions and the following disclaimer. * Redistributions - * in binary form must reproduce the above copyright notice, this list of conditions and the - * following disclaimer in the documentation and/or other materials provided with the distribution. - * * Neither the name of the Brackit Project Team nor the names of its contributors may be used to - * endorse or promote products derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY - * WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package org.sirix.xquery.function; - -import org.brackit.xquery.QueryException; -import org.brackit.xquery.atomic.Atomic; -import org.brackit.xquery.atomic.Bool; -import org.brackit.xquery.atomic.IntNumeric; -import org.brackit.xquery.jdm.Sequence; -import org.sirix.xquery.function.sdb.SDBFun; - -import java.util.Arrays; - -/** - * - * @author Sebastian Baechle - * - */ -public final class FunUtil { - - public static int getInt(Sequence[] params, int pos, String parameterName, int defaultValue, - int[] allowedValues, boolean required) throws QueryException { - if (pos >= params.length || params[pos] == null) { - if (required) { - throw new QueryException(SDBFun.ERR_INVALID_ARGUMENT, - "Invalid integer parameter %s. Expected %s", parameterName, - Arrays.toString(allowedValues)); - } - - return defaultValue; - } - - final int value = ((IntNumeric) params[pos]).intValue(); - - if (allowedValues == null) { - return value; - } - - for (final int allowedValue : allowedValues) { - if (value == allowedValue) { - return value; - } - } - - throw new QueryException(SDBFun.ERR_INVALID_ARGUMENT, - "Invalid integer parameter %s. Expected %s", parameterName, Arrays.toString(allowedValues)); - } - - public static long getLong(Sequence[] params, int pos, String parameterName, long defaultValue, - long[] allowedValues, boolean required) throws QueryException { - if (pos >= params.length || params[pos] == null) { - if (required) { - throw new QueryException(SDBFun.ERR_INVALID_ARGUMENT, - "Invalid long parameter %s. Expected %s", parameterName, - Arrays.toString(allowedValues)); - } - - return defaultValue; - } - - final long value = ((IntNumeric) params[pos]).longValue(); - - if (allowedValues == null) { - return value; - } - - for (final long allowedValue : allowedValues) { - if (value == allowedValue) { - return value; - } - } - - throw new QueryException(SDBFun.ERR_INVALID_ARGUMENT, "Invalid long parameter %s. Expected %s", - parameterName, Arrays.toString(allowedValues)); - } - - public static boolean getBoolean(Sequence[] params, int pos, String parameterName, - boolean defaultValue, boolean required) throws QueryException { - if (pos >= params.length || params[pos] == null) { - if (required) { - throw new QueryException(SDBFun.ERR_INVALID_ARGUMENT, "Invalid empty boolean parameter %s.", - parameterName); - } - - return defaultValue; - } - - return ((Bool) params[pos]).bool; - } - - public static String getString(Sequence[] params, int pos, String parameterName, - String defaultValue, String[] allowedValues, boolean required) throws QueryException { - if (pos >= params.length || params[pos] == null) { - if (required) { - throw new QueryException(SDBFun.ERR_INVALID_ARGUMENT, "Invalid parameter %s. Expected %s", - parameterName, Arrays.toString(allowedValues)); - } - - return defaultValue; - } - - String value = ((Atomic) params[pos]).stringValue(); - - if (allowedValues == null) { - return value; - } - - for (String allowedValue : allowedValues) { - if (value.equals(allowedValue)) { - return value; - } - } - - throw new QueryException(SDBFun.ERR_INVALID_ARGUMENT, - "Invalid string parameter %s. Expected %s", parameterName, Arrays.toString(allowedValues)); - } -} +/* + * [New BSD License] Copyright (c) 2011-2012, Brackit Project Team All rights + * reserved. + * + * Redistribution and use in source and binary forms, with or without modification, are permitted + * provided that the following conditions are met: * Redistributions of source code must retain the + * above copyright notice, this list of conditions and the following disclaimer. * Redistributions + * in binary form must reproduce the above copyright notice, this list of conditions and the + * following disclaimer in the documentation and/or other materials provided with the distribution. + * * Neither the name of the Brackit Project Team nor the names of its contributors may be used to + * endorse or promote products derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY + * WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ +package org.sirix.query.function; + +import org.brackit.xquery.QueryException; +import org.brackit.xquery.atomic.Atomic; +import org.brackit.xquery.atomic.Bool; +import org.brackit.xquery.atomic.IntNumeric; +import org.brackit.xquery.jdm.Sequence; +import org.sirix.query.function.sdb.SDBFun; + +import java.util.Arrays; + +/** + * + * @author Sebastian Baechle + * + */ +public final class FunUtil { + + public static int getInt(Sequence[] params, int pos, String parameterName, int defaultValue, + int[] allowedValues, boolean required) throws QueryException { + if (pos >= params.length || params[pos] == null) { + if (required) { + throw new QueryException(SDBFun.ERR_INVALID_ARGUMENT, + "Invalid integer parameter %s. Expected %s", parameterName, + Arrays.toString(allowedValues)); + } + + return defaultValue; + } + + final int value = ((IntNumeric) params[pos]).intValue(); + + if (allowedValues == null) { + return value; + } + + for (final int allowedValue : allowedValues) { + if (value == allowedValue) { + return value; + } + } + + throw new QueryException(SDBFun.ERR_INVALID_ARGUMENT, + "Invalid integer parameter %s. Expected %s", parameterName, Arrays.toString(allowedValues)); + } + + public static long getLong(Sequence[] params, int pos, String parameterName, long defaultValue, + long[] allowedValues, boolean required) throws QueryException { + if (pos >= params.length || params[pos] == null) { + if (required) { + throw new QueryException(SDBFun.ERR_INVALID_ARGUMENT, + "Invalid long parameter %s. Expected %s", parameterName, + Arrays.toString(allowedValues)); + } + + return defaultValue; + } + + final long value = ((IntNumeric) params[pos]).longValue(); + + if (allowedValues == null) { + return value; + } + + for (final long allowedValue : allowedValues) { + if (value == allowedValue) { + return value; + } + } + + throw new QueryException(SDBFun.ERR_INVALID_ARGUMENT, "Invalid long parameter %s. Expected %s", + parameterName, Arrays.toString(allowedValues)); + } + + public static boolean getBoolean(Sequence[] params, int pos, String parameterName, + boolean defaultValue, boolean required) throws QueryException { + if (pos >= params.length || params[pos] == null) { + if (required) { + throw new QueryException(SDBFun.ERR_INVALID_ARGUMENT, "Invalid empty boolean parameter %s.", + parameterName); + } + + return defaultValue; + } + + return ((Bool) params[pos]).bool; + } + + public static String getString(Sequence[] params, int pos, String parameterName, + String defaultValue, String[] allowedValues, boolean required) throws QueryException { + if (pos >= params.length || params[pos] == null) { + if (required) { + throw new QueryException(SDBFun.ERR_INVALID_ARGUMENT, "Invalid parameter %s. Expected %s", + parameterName, Arrays.toString(allowedValues)); + } + + return defaultValue; + } + + String value = ((Atomic) params[pos]).stringValue(); + + if (allowedValues == null) { + return value; + } + + for (String allowedValue : allowedValues) { + if (value.equals(allowedValue)) { + return value; + } + } + + throw new QueryException(SDBFun.ERR_INVALID_ARGUMENT, + "Invalid string parameter %s. Expected %s", parameterName, Arrays.toString(allowedValues)); + } +} diff --git a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/jn/JNFun.java b/bundles/sirix-query/src/main/java/org/sirix/query/function/jn/JNFun.java similarity index 89% rename from bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/jn/JNFun.java rename to bundles/sirix-query/src/main/java/org/sirix/query/function/jn/JNFun.java index 7b305dc68..e15038ba1 100644 --- a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/jn/JNFun.java +++ b/bundles/sirix-query/src/main/java/org/sirix/query/function/jn/JNFun.java @@ -1,4 +1,4 @@ -package org.sirix.xquery.function.jn; +package org.sirix.query.function.jn; import org.brackit.xquery.atomic.QNm; import org.brackit.xquery.function.json.JSONFun; @@ -8,33 +8,33 @@ import org.brackit.xquery.jdm.type.Cardinality; import org.brackit.xquery.jdm.type.SequenceType; import org.brackit.xquery.module.Functions; -import org.sirix.xquery.function.jn.diff.Diff; -import org.sirix.xquery.function.jn.index.create.CreateCASIndex; -import org.sirix.xquery.function.jn.index.create.CreateNameIndex; -import org.sirix.xquery.function.jn.index.create.CreatePathIndex; -import org.sirix.xquery.function.jn.index.find.FindCASIndex; -import org.sirix.xquery.function.jn.index.find.FindNameIndex; -import org.sirix.xquery.function.jn.index.find.FindPathIndex; -import org.sirix.xquery.function.jn.index.scan.ScanCASIndex; -import org.sirix.xquery.function.jn.index.scan.ScanCASIndexRange; -import org.sirix.xquery.function.jn.index.scan.ScanNameIndex; -import org.sirix.xquery.function.jn.index.scan.ScanPathIndex; -import org.sirix.xquery.function.jn.io.*; -import org.sirix.xquery.function.jn.temporal.*; -import org.sirix.xquery.function.jn.trx.SelectJsonItem; +import org.sirix.query.function.jn.diff.Diff; +import org.sirix.query.function.jn.index.create.CreateCASIndex; +import org.sirix.query.function.jn.index.create.CreateNameIndex; +import org.sirix.query.function.jn.index.create.CreatePathIndex; +import org.sirix.query.function.jn.index.find.FindCASIndex; +import org.sirix.query.function.jn.index.find.FindNameIndex; +import org.sirix.query.function.jn.index.find.FindPathIndex; +import org.sirix.query.function.jn.index.scan.ScanCASIndex; +import org.sirix.query.function.jn.index.scan.ScanCASIndexRange; +import org.sirix.query.function.jn.index.scan.ScanNameIndex; +import org.sirix.query.function.jn.index.scan.ScanPathIndex; +import org.sirix.query.function.jn.io.*; +import org.sirix.query.function.jn.temporal.*; +import org.sirix.query.function.jn.trx.SelectJsonItem; -import static org.sirix.xquery.function.jn.diff.Diff.DIFF; -import static org.sirix.xquery.function.jn.index.create.CreateCASIndex.CREATE_CAS_INDEX; -import static org.sirix.xquery.function.jn.index.create.CreateNameIndex.CREATE_NAME_INDEX; -import static org.sirix.xquery.function.jn.index.create.CreatePathIndex.CREATE_PATH_INDEX; -import static org.sirix.xquery.function.jn.index.find.FindCASIndex.FIND_CAS_INDEX; -import static org.sirix.xquery.function.jn.index.find.FindNameIndex.FIND_NAME_INDEX; -import static org.sirix.xquery.function.jn.index.find.FindPathIndex.FIND_PATH_INDEX; -import static org.sirix.xquery.function.jn.io.Doc.DOC; -import static org.sirix.xquery.function.jn.io.DocByPointInTime.OPEN; -import static org.sirix.xquery.function.jn.io.Load.LOAD; -import static org.sirix.xquery.function.jn.io.OpenRevisions.OPEN_REVISIONS; -import static org.sirix.xquery.function.jn.io.Store.STORE; +import static org.sirix.query.function.jn.diff.Diff.DIFF; +import static org.sirix.query.function.jn.index.create.CreateCASIndex.CREATE_CAS_INDEX; +import static org.sirix.query.function.jn.index.create.CreateNameIndex.CREATE_NAME_INDEX; +import static org.sirix.query.function.jn.index.create.CreatePathIndex.CREATE_PATH_INDEX; +import static org.sirix.query.function.jn.index.find.FindCASIndex.FIND_CAS_INDEX; +import static org.sirix.query.function.jn.index.find.FindNameIndex.FIND_NAME_INDEX; +import static org.sirix.query.function.jn.index.find.FindPathIndex.FIND_PATH_INDEX; +import static org.sirix.query.function.jn.io.Doc.DOC; +import static org.sirix.query.function.jn.io.DocByPointInTime.OPEN; +import static org.sirix.query.function.jn.io.Load.LOAD; +import static org.sirix.query.function.jn.io.OpenRevisions.OPEN_REVISIONS; +import static org.sirix.query.function.jn.io.Store.STORE; /** * Function definitions. diff --git a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/jn/diff/Diff.java b/bundles/sirix-query/src/main/java/org/sirix/query/function/jn/diff/Diff.java similarity index 97% rename from bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/jn/diff/Diff.java rename to bundles/sirix-query/src/main/java/org/sirix/query/function/jn/diff/Diff.java index ed5967207..203788264 100644 --- a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/jn/diff/Diff.java +++ b/bundles/sirix-query/src/main/java/org/sirix/query/function/jn/diff/Diff.java @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.sirix.xquery.function.jn.diff; +package org.sirix.query.function.jn.diff; import com.google.gson.JsonArray; import com.google.gson.JsonObject; @@ -43,8 +43,8 @@ import org.sirix.api.JsonDiff; import org.sirix.api.json.JsonResourceSession; import org.sirix.service.json.BasicJsonDiff; -import org.sirix.xquery.function.FunUtil; -import org.sirix.xquery.json.JsonDBCollection; +import org.sirix.query.function.FunUtil; +import org.sirix.query.json.JsonDBCollection; /** *

diff --git a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/jn/index/create/CreateCASIndex.java b/bundles/sirix-query/src/main/java/org/sirix/query/function/jn/index/create/CreateCASIndex.java similarity index 97% rename from bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/jn/index/create/CreateCASIndex.java rename to bundles/sirix-query/src/main/java/org/sirix/query/function/jn/index/create/CreateCASIndex.java index 689b22c14..8e5848c5a 100644 --- a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/jn/index/create/CreateCASIndex.java +++ b/bundles/sirix-query/src/main/java/org/sirix/query/function/jn/index/create/CreateCASIndex.java @@ -1,4 +1,4 @@ -package org.sirix.xquery.function.jn.index.create; +package org.sirix.query.function.jn.index.create; import org.brackit.xquery.QueryContext; import org.brackit.xquery.QueryException; @@ -18,7 +18,7 @@ import org.sirix.index.IndexDef; import org.sirix.index.IndexDefs; import org.sirix.index.IndexType; -import org.sirix.xquery.json.JsonDBItem; +import org.sirix.query.json.JsonDBItem; import java.util.HashSet; import java.util.Optional; diff --git a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/jn/index/create/CreateNameIndex.java b/bundles/sirix-query/src/main/java/org/sirix/query/function/jn/index/create/CreateNameIndex.java similarity index 97% rename from bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/jn/index/create/CreateNameIndex.java rename to bundles/sirix-query/src/main/java/org/sirix/query/function/jn/index/create/CreateNameIndex.java index 95a4fde87..0a5f0bc29 100644 --- a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/jn/index/create/CreateNameIndex.java +++ b/bundles/sirix-query/src/main/java/org/sirix/query/function/jn/index/create/CreateNameIndex.java @@ -1,4 +1,4 @@ -package org.sirix.xquery.function.jn.index.create; +package org.sirix.query.function.jn.index.create; import com.google.common.collect.ImmutableSet; import org.brackit.xquery.QueryContext; @@ -20,7 +20,7 @@ import org.sirix.index.IndexDef; import org.sirix.index.IndexDefs; import org.sirix.index.IndexType; -import org.sirix.xquery.json.JsonDBItem; +import org.sirix.query.json.JsonDBItem; import java.util.HashSet; import java.util.Optional; diff --git a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/jn/index/create/CreatePathIndex.java b/bundles/sirix-query/src/main/java/org/sirix/query/function/jn/index/create/CreatePathIndex.java similarity index 97% rename from bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/jn/index/create/CreatePathIndex.java rename to bundles/sirix-query/src/main/java/org/sirix/query/function/jn/index/create/CreatePathIndex.java index 58a48cf50..1b8b644a1 100644 --- a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/jn/index/create/CreatePathIndex.java +++ b/bundles/sirix-query/src/main/java/org/sirix/query/function/jn/index/create/CreatePathIndex.java @@ -1,4 +1,4 @@ -package org.sirix.xquery.function.jn.index.create; +package org.sirix.query.function.jn.index.create; import com.google.common.collect.ImmutableSet; import org.brackit.xquery.QueryContext; @@ -21,7 +21,7 @@ import org.sirix.index.IndexDef; import org.sirix.index.IndexDefs; import org.sirix.index.IndexType; -import org.sirix.xquery.json.JsonDBItem; +import org.sirix.query.json.JsonDBItem; import java.util.HashSet; import java.util.Optional; diff --git a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/jn/index/find/FindCASIndex.java b/bundles/sirix-query/src/main/java/org/sirix/query/function/jn/index/find/FindCASIndex.java similarity index 96% rename from bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/jn/index/find/FindCASIndex.java rename to bundles/sirix-query/src/main/java/org/sirix/query/function/jn/index/find/FindCASIndex.java index 1a66fc425..da897ab95 100644 --- a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/jn/index/find/FindCASIndex.java +++ b/bundles/sirix-query/src/main/java/org/sirix/query/function/jn/index/find/FindCASIndex.java @@ -1,4 +1,4 @@ -package org.sirix.xquery.function.jn.index.find; +package org.sirix.query.function.jn.index.find; import org.brackit.xquery.QueryContext; import org.brackit.xquery.QueryException; @@ -17,7 +17,7 @@ import org.sirix.access.trx.node.json.JsonIndexController; import org.sirix.api.json.JsonNodeReadOnlyTrx; import org.sirix.index.IndexDef; -import org.sirix.xquery.json.JsonDBItem; +import org.sirix.query.json.JsonDBItem; import java.util.Optional; diff --git a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/jn/index/find/FindNameIndex.java b/bundles/sirix-query/src/main/java/org/sirix/query/function/jn/index/find/FindNameIndex.java similarity index 95% rename from bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/jn/index/find/FindNameIndex.java rename to bundles/sirix-query/src/main/java/org/sirix/query/function/jn/index/find/FindNameIndex.java index 500a79f69..d91293bf0 100644 --- a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/jn/index/find/FindNameIndex.java +++ b/bundles/sirix-query/src/main/java/org/sirix/query/function/jn/index/find/FindNameIndex.java @@ -1,4 +1,4 @@ -package org.sirix.xquery.function.jn.index.find; +package org.sirix.query.function.jn.index.find; import org.brackit.xquery.QueryContext; import org.brackit.xquery.QueryException; @@ -13,7 +13,7 @@ import org.sirix.access.trx.node.json.JsonIndexController; import org.sirix.api.json.JsonNodeReadOnlyTrx; import org.sirix.index.IndexDef; -import org.sirix.xquery.json.JsonDBItem; +import org.sirix.query.json.JsonDBItem; import java.util.Optional; diff --git a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/jn/index/find/FindPathIndex.java b/bundles/sirix-query/src/main/java/org/sirix/query/function/jn/index/find/FindPathIndex.java similarity index 96% rename from bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/jn/index/find/FindPathIndex.java rename to bundles/sirix-query/src/main/java/org/sirix/query/function/jn/index/find/FindPathIndex.java index 21858fade..6dc5ee00a 100644 --- a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/jn/index/find/FindPathIndex.java +++ b/bundles/sirix-query/src/main/java/org/sirix/query/function/jn/index/find/FindPathIndex.java @@ -1,4 +1,4 @@ -package org.sirix.xquery.function.jn.index.find; +package org.sirix.query.function.jn.index.find; import org.brackit.xquery.QueryContext; import org.brackit.xquery.QueryException; @@ -15,7 +15,7 @@ import org.sirix.access.trx.node.json.JsonIndexController; import org.sirix.api.json.JsonNodeReadOnlyTrx; import org.sirix.index.IndexDef; -import org.sirix.xquery.json.JsonDBItem; +import org.sirix.query.json.JsonDBItem; import java.util.Optional; diff --git a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/jn/index/scan/AbstractScanIndex.java b/bundles/sirix-query/src/main/java/org/sirix/query/function/jn/index/scan/AbstractScanIndex.java similarity index 88% rename from bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/jn/index/scan/AbstractScanIndex.java rename to bundles/sirix-query/src/main/java/org/sirix/query/function/jn/index/scan/AbstractScanIndex.java index bb4c97fe7..6bbb06c24 100644 --- a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/jn/index/scan/AbstractScanIndex.java +++ b/bundles/sirix-query/src/main/java/org/sirix/query/function/jn/index/scan/AbstractScanIndex.java @@ -1,4 +1,4 @@ -package org.sirix.xquery.function.jn.index.scan; +package org.sirix.query.function.jn.index.scan; import org.brackit.xquery.atomic.QNm; import org.brackit.xquery.function.AbstractFunction; @@ -6,8 +6,8 @@ import org.brackit.xquery.sequence.BaseIter; import org.brackit.xquery.sequence.LazySequence; import org.sirix.index.redblacktree.keyvalue.NodeReferences; -import org.sirix.xquery.json.JsonDBItem; -import org.sirix.xquery.stream.json.SirixJsonItemKeyStream; +import org.sirix.query.json.JsonDBItem; +import org.sirix.query.stream.json.SirixJsonItemKeyStream; import java.util.Iterator; diff --git a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/jn/index/scan/ScanCASIndex.java b/bundles/sirix-query/src/main/java/org/sirix/query/function/jn/index/scan/ScanCASIndex.java similarity index 96% rename from bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/jn/index/scan/ScanCASIndex.java rename to bundles/sirix-query/src/main/java/org/sirix/query/function/jn/index/scan/ScanCASIndex.java index cca73c743..1c2bff451 100644 --- a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/jn/index/scan/ScanCASIndex.java +++ b/bundles/sirix-query/src/main/java/org/sirix/query/function/jn/index/scan/ScanCASIndex.java @@ -1,4 +1,4 @@ -package org.sirix.xquery.function.jn.index.scan; +package org.sirix.query.function.jn.index.scan; import com.google.common.collect.ImmutableSet; import org.brackit.xquery.QueryContext; @@ -24,9 +24,9 @@ import org.sirix.index.SearchMode; import org.sirix.index.cas.CASFilter; import org.sirix.index.path.json.JsonPCRCollector; -import org.sirix.xquery.function.FunUtil; -import org.sirix.xquery.function.sdb.SDBFun; -import org.sirix.xquery.json.JsonDBItem; +import org.sirix.query.function.FunUtil; +import org.sirix.query.function.sdb.SDBFun; +import org.sirix.query.json.JsonDBItem; import java.util.Set; diff --git a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/jn/index/scan/ScanCASIndexRange.java b/bundles/sirix-query/src/main/java/org/sirix/query/function/jn/index/scan/ScanCASIndexRange.java similarity index 95% rename from bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/jn/index/scan/ScanCASIndexRange.java rename to bundles/sirix-query/src/main/java/org/sirix/query/function/jn/index/scan/ScanCASIndexRange.java index 615547284..072bd9501 100644 --- a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/jn/index/scan/ScanCASIndexRange.java +++ b/bundles/sirix-query/src/main/java/org/sirix/query/function/jn/index/scan/ScanCASIndexRange.java @@ -1,4 +1,4 @@ -package org.sirix.xquery.function.jn.index.scan; +package org.sirix.query.function.jn.index.scan; import org.brackit.xquery.QueryContext; import org.brackit.xquery.QueryException; @@ -22,9 +22,9 @@ import org.sirix.index.IndexType; import org.sirix.index.cas.CASFilterRange; import org.sirix.index.path.json.JsonPCRCollector; -import org.sirix.xquery.function.FunUtil; -import org.sirix.xquery.function.sdb.SDBFun; -import org.sirix.xquery.json.JsonDBItem; +import org.sirix.query.function.FunUtil; +import org.sirix.query.function.sdb.SDBFun; +import org.sirix.query.json.JsonDBItem; import java.util.Set; diff --git a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/jn/index/scan/ScanNameIndex.java b/bundles/sirix-query/src/main/java/org/sirix/query/function/jn/index/scan/ScanNameIndex.java similarity index 94% rename from bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/jn/index/scan/ScanNameIndex.java rename to bundles/sirix-query/src/main/java/org/sirix/query/function/jn/index/scan/ScanNameIndex.java index 96c1dc06a..c1711d0f4 100644 --- a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/jn/index/scan/ScanNameIndex.java +++ b/bundles/sirix-query/src/main/java/org/sirix/query/function/jn/index/scan/ScanNameIndex.java @@ -1,4 +1,4 @@ -package org.sirix.xquery.function.jn.index.scan; +package org.sirix.query.function.jn.index.scan; import org.brackit.xquery.QueryContext; import org.brackit.xquery.QueryException; @@ -18,9 +18,9 @@ import org.sirix.index.IndexDef; import org.sirix.index.IndexType; import org.sirix.index.name.NameFilter; -import org.sirix.xquery.function.FunUtil; -import org.sirix.xquery.function.sdb.SDBFun; -import org.sirix.xquery.json.JsonDBItem; +import org.sirix.query.function.FunUtil; +import org.sirix.query.function.sdb.SDBFun; +import org.sirix.query.json.JsonDBItem; import java.util.Set; diff --git a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/jn/index/scan/ScanPathIndex.java b/bundles/sirix-query/src/main/java/org/sirix/query/function/jn/index/scan/ScanPathIndex.java similarity index 94% rename from bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/jn/index/scan/ScanPathIndex.java rename to bundles/sirix-query/src/main/java/org/sirix/query/function/jn/index/scan/ScanPathIndex.java index 221fd7f97..5341405ad 100644 --- a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/jn/index/scan/ScanPathIndex.java +++ b/bundles/sirix-query/src/main/java/org/sirix/query/function/jn/index/scan/ScanPathIndex.java @@ -1,4 +1,4 @@ -package org.sirix.xquery.function.jn.index.scan; +package org.sirix.query.function.jn.index.scan; import org.brackit.xquery.QueryContext; import org.brackit.xquery.QueryException; @@ -18,9 +18,9 @@ import org.sirix.index.IndexDef; import org.sirix.index.IndexType; import org.sirix.index.path.PathFilter; -import org.sirix.xquery.function.FunUtil; -import org.sirix.xquery.function.sdb.SDBFun; -import org.sirix.xquery.json.JsonDBItem; +import org.sirix.query.function.FunUtil; +import org.sirix.query.function.sdb.SDBFun; +import org.sirix.query.json.JsonDBItem; import java.util.Set; diff --git a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/jn/io/Doc.java b/bundles/sirix-query/src/main/java/org/sirix/query/function/jn/io/Doc.java similarity index 93% rename from bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/jn/io/Doc.java rename to bundles/sirix-query/src/main/java/org/sirix/query/function/jn/io/Doc.java index c80045ec7..dd83c57fc 100644 --- a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/jn/io/Doc.java +++ b/bundles/sirix-query/src/main/java/org/sirix/query/function/jn/io/Doc.java @@ -1,4 +1,4 @@ -package org.sirix.xquery.function.jn.io; +package org.sirix.query.function.jn.io; import org.brackit.xquery.QueryContext; import org.brackit.xquery.QueryException; @@ -9,8 +9,8 @@ import org.brackit.xquery.jdm.Sequence; import org.brackit.xquery.jdm.Signature; import org.brackit.xquery.module.StaticContext; -import org.sirix.xquery.function.FunUtil; -import org.sirix.xquery.json.JsonDBCollection; +import org.sirix.query.function.FunUtil; +import org.sirix.query.json.JsonDBCollection; /** *

diff --git a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/jn/io/DocByPointInTime.java b/bundles/sirix-query/src/main/java/org/sirix/query/function/jn/io/DocByPointInTime.java similarity index 93% rename from bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/jn/io/DocByPointInTime.java rename to bundles/sirix-query/src/main/java/org/sirix/query/function/jn/io/DocByPointInTime.java index 94a89a6f2..0a4033508 100644 --- a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/jn/io/DocByPointInTime.java +++ b/bundles/sirix-query/src/main/java/org/sirix/query/function/jn/io/DocByPointInTime.java @@ -1,4 +1,4 @@ -package org.sirix.xquery.function.jn.io; +package org.sirix.query.function.jn.io; import org.brackit.xquery.QueryContext; import org.brackit.xquery.QueryException; @@ -10,8 +10,8 @@ import org.brackit.xquery.jdm.Sequence; import org.brackit.xquery.jdm.Signature; import org.brackit.xquery.module.StaticContext; -import org.sirix.xquery.function.DateTimeToInstant; -import org.sirix.xquery.json.JsonDBCollection; +import org.sirix.query.function.DateTimeToInstant; +import org.sirix.query.json.JsonDBCollection; import java.time.Instant; diff --git a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/jn/io/Load.java b/bundles/sirix-query/src/main/java/org/sirix/query/function/jn/io/Load.java similarity index 95% rename from bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/jn/io/Load.java rename to bundles/sirix-query/src/main/java/org/sirix/query/function/jn/io/Load.java index 349d2d31e..46e95c51f 100644 --- a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/jn/io/Load.java +++ b/bundles/sirix-query/src/main/java/org/sirix/query/function/jn/io/Load.java @@ -1,4 +1,4 @@ -package org.sirix.xquery.function.jn.io; +package org.sirix.query.function.jn.io; import com.google.gson.stream.JsonReader; import org.brackit.xquery.QueryContext; @@ -18,10 +18,10 @@ import org.brackit.xquery.sequence.FunctionConversionSequence; import org.brackit.xquery.util.annotation.FunctionAnnotation; import org.brackit.xquery.util.io.URIHandler; -import org.sirix.xquery.function.DateTimeToInstant; -import org.sirix.xquery.function.FunUtil; -import org.sirix.xquery.json.JsonDBCollection; -import org.sirix.xquery.json.JsonDBStore; +import org.sirix.query.function.DateTimeToInstant; +import org.sirix.query.function.FunUtil; +import org.sirix.query.json.JsonDBCollection; +import org.sirix.query.json.JsonDBStore; import java.io.IOException; import java.io.InputStreamReader; @@ -122,7 +122,6 @@ public Sequence execute(final StaticContext sctx, final QueryContext ctx, final return coll; } catch (final Exception e) { - e.printStackTrace(); throw new QueryException(new QNm(e.getMessage()), e); } } @@ -152,9 +151,9 @@ private static void add(final JsonDBCollection coll, final String resName, private JsonDBCollection create(final JsonDBStore store, final String collName, final String resName, final Sequence resources, final String commitMessage, final Instant commitTimestamp) throws IOException { - if (resources instanceof Str) { + if (resources instanceof Atomic atomic) { try (final JsonReader reader = - new JsonReader(new InputStreamReader(URIHandler.getInputStream(((Str) resources).stringValue())))) { + new JsonReader(new InputStreamReader(URIHandler.getInputStream(atomic.stringValue())))) { return store.create(collName, resName, reader, commitMessage, commitTimestamp); } catch (final Exception e) { throw new QueryException(new QNm("Failed to insert subtree: " + e.getMessage())); diff --git a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/jn/io/OpenRevisions.java b/bundles/sirix-query/src/main/java/org/sirix/query/function/jn/io/OpenRevisions.java similarity index 95% rename from bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/jn/io/OpenRevisions.java rename to bundles/sirix-query/src/main/java/org/sirix/query/function/jn/io/OpenRevisions.java index b14dc8c40..e053baa42 100644 --- a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/jn/io/OpenRevisions.java +++ b/bundles/sirix-query/src/main/java/org/sirix/query/function/jn/io/OpenRevisions.java @@ -1,4 +1,4 @@ -package org.sirix.xquery.function.jn.io; +package org.sirix.query.function.jn.io; import org.brackit.xquery.QueryContext; import org.brackit.xquery.QueryException; @@ -12,8 +12,8 @@ import org.brackit.xquery.jdm.Signature; import org.brackit.xquery.module.StaticContext; import org.brackit.xquery.sequence.ItemSequence; -import org.sirix.xquery.json.JsonDBCollection; -import org.sirix.xquery.json.JsonDBItem; +import org.sirix.query.json.JsonDBCollection; +import org.sirix.query.json.JsonDBItem; import java.time.Instant; import java.util.ArrayList; diff --git a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/jn/io/Store.java b/bundles/sirix-query/src/main/java/org/sirix/query/function/jn/io/Store.java similarity index 96% rename from bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/jn/io/Store.java rename to bundles/sirix-query/src/main/java/org/sirix/query/function/jn/io/Store.java index 8d17d9358..39658dd07 100644 --- a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/jn/io/Store.java +++ b/bundles/sirix-query/src/main/java/org/sirix/query/function/jn/io/Store.java @@ -1,4 +1,4 @@ -package org.sirix.xquery.function.jn.io; +package org.sirix.query.function.jn.io; import com.google.gson.stream.JsonReader; import org.brackit.xquery.QueryContext; @@ -18,10 +18,10 @@ import org.brackit.xquery.sequence.FunctionConversionSequence; import org.brackit.xquery.util.annotation.FunctionAnnotation; import org.sirix.service.json.shredder.JsonShredder; -import org.sirix.xquery.function.DateTimeToInstant; -import org.sirix.xquery.function.FunUtil; -import org.sirix.xquery.json.JsonDBCollection; -import org.sirix.xquery.json.JsonDBStore; +import org.sirix.query.function.DateTimeToInstant; +import org.sirix.query.function.FunUtil; +import org.sirix.query.json.JsonDBCollection; +import org.sirix.query.json.JsonDBStore; import java.time.Instant; import java.util.ArrayList; diff --git a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/jn/temporal/AllTimes.java b/bundles/sirix-query/src/main/java/org/sirix/query/function/jn/temporal/AllTimes.java similarity index 95% rename from bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/jn/temporal/AllTimes.java rename to bundles/sirix-query/src/main/java/org/sirix/query/function/jn/temporal/AllTimes.java index da516a5f6..4adfcb58b 100644 --- a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/jn/temporal/AllTimes.java +++ b/bundles/sirix-query/src/main/java/org/sirix/query/function/jn/temporal/AllTimes.java @@ -1,4 +1,4 @@ -package org.sirix.xquery.function.jn.temporal; +package org.sirix.query.function.jn.temporal; import org.brackit.xquery.QueryContext; import org.brackit.xquery.atomic.QNm; @@ -8,7 +8,7 @@ import org.brackit.xquery.module.StaticContext; import org.brackit.xquery.sequence.BaseIter; import org.brackit.xquery.sequence.LazySequence; -import org.sirix.xquery.json.TemporalJsonDBItem; +import org.sirix.query.json.TemporalJsonDBItem; /** *

diff --git a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/jn/temporal/First.java b/bundles/sirix-query/src/main/java/org/sirix/query/function/jn/temporal/First.java similarity index 92% rename from bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/jn/temporal/First.java rename to bundles/sirix-query/src/main/java/org/sirix/query/function/jn/temporal/First.java index 1f2aa4fd7..f94782176 100644 --- a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/jn/temporal/First.java +++ b/bundles/sirix-query/src/main/java/org/sirix/query/function/jn/temporal/First.java @@ -1,4 +1,4 @@ -package org.sirix.xquery.function.jn.temporal; +package org.sirix.query.function.jn.temporal; import org.brackit.xquery.QueryContext; import org.brackit.xquery.atomic.QNm; @@ -7,7 +7,7 @@ import org.brackit.xquery.jdm.Sequence; import org.brackit.xquery.jdm.Signature; import org.brackit.xquery.module.StaticContext; -import org.sirix.xquery.json.TemporalJsonDBItem; +import org.sirix.query.json.TemporalJsonDBItem; /** *

diff --git a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/jn/temporal/FirstExisting.java b/bundles/sirix-query/src/main/java/org/sirix/query/function/jn/temporal/FirstExisting.java similarity index 94% rename from bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/jn/temporal/FirstExisting.java rename to bundles/sirix-query/src/main/java/org/sirix/query/function/jn/temporal/FirstExisting.java index 19f323d1b..775f36cb1 100644 --- a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/jn/temporal/FirstExisting.java +++ b/bundles/sirix-query/src/main/java/org/sirix/query/function/jn/temporal/FirstExisting.java @@ -1,4 +1,4 @@ -package org.sirix.xquery.function.jn.temporal; +package org.sirix.query.function.jn.temporal; import org.brackit.xquery.QueryContext; import org.brackit.xquery.atomic.QNm; @@ -9,8 +9,8 @@ import org.brackit.xquery.module.StaticContext; import org.sirix.index.IndexType; import org.sirix.node.RevisionReferencesNode; -import org.sirix.xquery.json.JsonDBItem; -import org.sirix.xquery.json.JsonItemFactory; +import org.sirix.query.json.JsonDBItem; +import org.sirix.query.json.JsonItemFactory; /** *

diff --git a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/jn/temporal/Future.java b/bundles/sirix-query/src/main/java/org/sirix/query/function/jn/temporal/Future.java similarity index 93% rename from bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/jn/temporal/Future.java rename to bundles/sirix-query/src/main/java/org/sirix/query/function/jn/temporal/Future.java index bf0ff56ad..0d8ce5b49 100644 --- a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/jn/temporal/Future.java +++ b/bundles/sirix-query/src/main/java/org/sirix/query/function/jn/temporal/Future.java @@ -1,4 +1,4 @@ -package org.sirix.xquery.function.jn.temporal; +package org.sirix.query.function.jn.temporal; import org.brackit.xquery.QueryContext; import org.brackit.xquery.atomic.QNm; @@ -8,8 +8,8 @@ import org.brackit.xquery.module.StaticContext; import org.brackit.xquery.sequence.BaseIter; import org.brackit.xquery.sequence.LazySequence; -import org.sirix.xquery.function.FunUtil; -import org.sirix.xquery.json.TemporalJsonDBItem; +import org.sirix.query.function.FunUtil; +import org.sirix.query.json.TemporalJsonDBItem; /** *

diff --git a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/jn/temporal/Last.java b/bundles/sirix-query/src/main/java/org/sirix/query/function/jn/temporal/Last.java similarity index 92% rename from bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/jn/temporal/Last.java rename to bundles/sirix-query/src/main/java/org/sirix/query/function/jn/temporal/Last.java index 4519ac79c..1a7a01f83 100644 --- a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/jn/temporal/Last.java +++ b/bundles/sirix-query/src/main/java/org/sirix/query/function/jn/temporal/Last.java @@ -1,4 +1,4 @@ -package org.sirix.xquery.function.jn.temporal; +package org.sirix.query.function.jn.temporal; import org.brackit.xquery.QueryContext; import org.brackit.xquery.atomic.QNm; @@ -7,7 +7,7 @@ import org.brackit.xquery.jdm.Sequence; import org.brackit.xquery.jdm.Signature; import org.brackit.xquery.module.StaticContext; -import org.sirix.xquery.json.TemporalJsonDBItem; +import org.sirix.query.json.TemporalJsonDBItem; /** *

diff --git a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/jn/temporal/LastExisting.java b/bundles/sirix-query/src/main/java/org/sirix/query/function/jn/temporal/LastExisting.java similarity index 96% rename from bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/jn/temporal/LastExisting.java rename to bundles/sirix-query/src/main/java/org/sirix/query/function/jn/temporal/LastExisting.java index e4fc94ce8..a20a1c2d9 100644 --- a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/jn/temporal/LastExisting.java +++ b/bundles/sirix-query/src/main/java/org/sirix/query/function/jn/temporal/LastExisting.java @@ -1,4 +1,4 @@ -package org.sirix.xquery.function.jn.temporal; +package org.sirix.query.function.jn.temporal; import org.brackit.xquery.QueryContext; import org.brackit.xquery.QueryException; @@ -12,8 +12,8 @@ import org.sirix.api.json.JsonResourceSession; import org.sirix.index.IndexType; import org.sirix.node.RevisionReferencesNode; -import org.sirix.xquery.json.JsonDBItem; -import org.sirix.xquery.json.JsonItemFactory; +import org.sirix.query.json.JsonDBItem; +import org.sirix.query.json.JsonItemFactory; /** *

diff --git a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/jn/temporal/Next.java b/bundles/sirix-query/src/main/java/org/sirix/query/function/jn/temporal/Next.java similarity index 92% rename from bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/jn/temporal/Next.java rename to bundles/sirix-query/src/main/java/org/sirix/query/function/jn/temporal/Next.java index b3bdc26e5..368472ed3 100644 --- a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/jn/temporal/Next.java +++ b/bundles/sirix-query/src/main/java/org/sirix/query/function/jn/temporal/Next.java @@ -1,4 +1,4 @@ -package org.sirix.xquery.function.jn.temporal; +package org.sirix.query.function.jn.temporal; import org.brackit.xquery.QueryContext; import org.brackit.xquery.atomic.QNm; @@ -7,7 +7,7 @@ import org.brackit.xquery.jdm.Sequence; import org.brackit.xquery.jdm.Signature; import org.brackit.xquery.module.StaticContext; -import org.sirix.xquery.json.TemporalJsonDBItem; +import org.sirix.query.json.TemporalJsonDBItem; /** *

diff --git a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/jn/temporal/Past.java b/bundles/sirix-query/src/main/java/org/sirix/query/function/jn/temporal/Past.java similarity index 93% rename from bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/jn/temporal/Past.java rename to bundles/sirix-query/src/main/java/org/sirix/query/function/jn/temporal/Past.java index cb57800c0..6cb1489ae 100644 --- a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/jn/temporal/Past.java +++ b/bundles/sirix-query/src/main/java/org/sirix/query/function/jn/temporal/Past.java @@ -1,4 +1,4 @@ -package org.sirix.xquery.function.jn.temporal; +package org.sirix.query.function.jn.temporal; import org.brackit.xquery.QueryContext; import org.brackit.xquery.atomic.QNm; @@ -8,8 +8,8 @@ import org.brackit.xquery.module.StaticContext; import org.brackit.xquery.sequence.BaseIter; import org.brackit.xquery.sequence.LazySequence; -import org.sirix.xquery.function.FunUtil; -import org.sirix.xquery.json.TemporalJsonDBItem; +import org.sirix.query.function.FunUtil; +import org.sirix.query.json.TemporalJsonDBItem; /** *

diff --git a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/jn/temporal/Previous.java b/bundles/sirix-query/src/main/java/org/sirix/query/function/jn/temporal/Previous.java similarity index 92% rename from bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/jn/temporal/Previous.java rename to bundles/sirix-query/src/main/java/org/sirix/query/function/jn/temporal/Previous.java index a89f2e246..6ea86f92d 100644 --- a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/jn/temporal/Previous.java +++ b/bundles/sirix-query/src/main/java/org/sirix/query/function/jn/temporal/Previous.java @@ -1,4 +1,4 @@ -package org.sirix.xquery.function.jn.temporal; +package org.sirix.query.function.jn.temporal; import org.brackit.xquery.QueryContext; import org.brackit.xquery.atomic.QNm; @@ -7,7 +7,7 @@ import org.brackit.xquery.jdm.Sequence; import org.brackit.xquery.jdm.Signature; import org.brackit.xquery.module.StaticContext; -import org.sirix.xquery.json.TemporalJsonDBItem; +import org.sirix.query.json.TemporalJsonDBItem; /** *

diff --git a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/jn/trx/SelectJsonItem.java b/bundles/sirix-query/src/main/java/org/sirix/query/function/jn/trx/SelectJsonItem.java similarity index 90% rename from bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/jn/trx/SelectJsonItem.java rename to bundles/sirix-query/src/main/java/org/sirix/query/function/jn/trx/SelectJsonItem.java index e4419aa97..84d9945e8 100644 --- a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/jn/trx/SelectJsonItem.java +++ b/bundles/sirix-query/src/main/java/org/sirix/query/function/jn/trx/SelectJsonItem.java @@ -1,4 +1,4 @@ -package org.sirix.xquery.function.jn.trx; +package org.sirix.query.function.jn.trx; import org.brackit.xquery.QueryContext; import org.brackit.xquery.QueryException; @@ -9,9 +9,9 @@ import org.brackit.xquery.jdm.Signature; import org.brackit.xquery.module.StaticContext; import org.sirix.api.json.JsonNodeReadOnlyTrx; -import org.sirix.xquery.function.FunUtil; -import org.sirix.xquery.json.JsonDBItem; -import org.sirix.xquery.json.JsonItemFactory; +import org.sirix.query.function.FunUtil; +import org.sirix.query.json.JsonDBItem; +import org.sirix.query.json.JsonItemFactory; /** *

diff --git a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/sdb/SDBFun.java b/bundles/sirix-query/src/main/java/org/sirix/query/function/sdb/SDBFun.java similarity index 80% rename from bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/sdb/SDBFun.java rename to bundles/sirix-query/src/main/java/org/sirix/query/function/sdb/SDBFun.java index 85355815e..dd715964b 100644 --- a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/sdb/SDBFun.java +++ b/bundles/sirix-query/src/main/java/org/sirix/query/function/sdb/SDBFun.java @@ -1,4 +1,4 @@ -package org.sirix.xquery.function.sdb; +package org.sirix.query.function.sdb; import org.brackit.xquery.atomic.QNm; import org.brackit.xquery.jdm.Signature; @@ -8,51 +8,51 @@ import org.brackit.xquery.jdm.type.SequenceType; import org.brackit.xquery.module.Functions; import org.brackit.xquery.module.Namespaces; -import org.sirix.xquery.function.sdb.trx.*; -import org.sirix.xquery.function.xml.diff.Diff; -import org.sirix.xquery.function.xml.index.SortByDocOrder; -import org.sirix.xquery.function.xml.index.create.CreateCASIndex; -import org.sirix.xquery.function.xml.index.create.CreateNameIndex; -import org.sirix.xquery.function.xml.index.create.CreatePathIndex; -import org.sirix.xquery.function.xml.index.find.FindCASIndex; -import org.sirix.xquery.function.xml.index.find.FindNameIndex; -import org.sirix.xquery.function.xml.index.find.FindPathIndex; -import org.sirix.xquery.function.xml.index.scan.ScanCASIndex; -import org.sirix.xquery.function.xml.index.scan.ScanCASIndexRange; -import org.sirix.xquery.function.xml.index.scan.ScanNameIndex; -import org.sirix.xquery.function.xml.index.scan.ScanPathIndex; -import org.sirix.xquery.function.xml.io.*; -import org.sirix.xquery.function.xml.trx.GetNamespaceCount; - -import static org.sirix.xquery.function.sdb.trx.Commit.COMMIT; -import static org.sirix.xquery.function.sdb.trx.GetAuthorID.AUTHOR_ID; -import static org.sirix.xquery.function.sdb.trx.GetAuthorName.AUTHOR_NAME; -import static org.sirix.xquery.function.sdb.trx.GetChildCount.GET_CHILD_COUNT; -import static org.sirix.xquery.function.sdb.trx.GetDescendantCount.GET_DESCENDANT_COUNT; -import static org.sirix.xquery.function.sdb.trx.GetHash.HASH; -import static org.sirix.xquery.function.sdb.trx.GetMostRecentRevision.MOST_RECENT_REVISION; -import static org.sirix.xquery.function.sdb.trx.GetRevision.REVISION; -import static org.sirix.xquery.function.sdb.trx.GetRevisionTimestamp.TIMESTAMP; -import static org.sirix.xquery.function.sdb.trx.IsDeleted.IS_DELETED; -import static org.sirix.xquery.function.sdb.trx.ItemHistory.NODE_HISTORY; -import static org.sirix.xquery.function.sdb.trx.LevelOrder.LEVEL_ORDER; -import static org.sirix.xquery.function.sdb.trx.Rollback.ROLLBACK; -import static org.sirix.xquery.function.xml.diff.Diff.DIFF; -import static org.sirix.xquery.function.xml.index.SortByDocOrder.SORT; -import static org.sirix.xquery.function.xml.index.create.CreateCASIndex.CREATE_CAS_INDEX; -import static org.sirix.xquery.function.xml.index.create.CreateNameIndex.CREATE_NAME_INDEX; -import static org.sirix.xquery.function.xml.index.create.CreatePathIndex.CREATE_PATH_INDEX; -import static org.sirix.xquery.function.xml.index.find.FindCASIndex.FIND_CAS_INDEX; -import static org.sirix.xquery.function.xml.index.find.FindNameIndex.FIND_NAME_INDEX; -import static org.sirix.xquery.function.xml.index.find.FindPathIndex.FIND_PATH_INDEX; -import static org.sirix.xquery.function.xml.io.Doc.DOC; -import static org.sirix.xquery.function.xml.io.DocByPointInTime.OPEN; -import static org.sirix.xquery.function.xml.io.Import.IMPORT; -import static org.sirix.xquery.function.xml.io.Load.LOAD; -import static org.sirix.xquery.function.xml.io.OpenRevisions.OPEN_REVISIONS; -import static org.sirix.xquery.function.xml.io.Store.STORE; -import static org.sirix.xquery.function.xml.trx.GetAttributeCount.GET_ATTRIBUTE_COUNT; -import static org.sirix.xquery.function.xml.trx.GetNamespaceCount.GET_NAMESPACE_COUNT; +import org.sirix.query.function.sdb.trx.*; +import org.sirix.query.function.xml.diff.Diff; +import org.sirix.query.function.xml.index.SortByDocOrder; +import org.sirix.query.function.xml.index.create.CreateCASIndex; +import org.sirix.query.function.xml.index.create.CreateNameIndex; +import org.sirix.query.function.xml.index.create.CreatePathIndex; +import org.sirix.query.function.xml.index.find.FindCASIndex; +import org.sirix.query.function.xml.index.find.FindNameIndex; +import org.sirix.query.function.xml.index.find.FindPathIndex; +import org.sirix.query.function.xml.index.scan.ScanCASIndex; +import org.sirix.query.function.xml.index.scan.ScanCASIndexRange; +import org.sirix.query.function.xml.index.scan.ScanNameIndex; +import org.sirix.query.function.xml.index.scan.ScanPathIndex; +import org.sirix.query.function.xml.io.*; +import org.sirix.query.function.xml.trx.GetNamespaceCount; + +import static org.sirix.query.function.sdb.trx.Commit.COMMIT; +import static org.sirix.query.function.sdb.trx.GetAuthorID.AUTHOR_ID; +import static org.sirix.query.function.sdb.trx.GetAuthorName.AUTHOR_NAME; +import static org.sirix.query.function.sdb.trx.GetChildCount.GET_CHILD_COUNT; +import static org.sirix.query.function.sdb.trx.GetDescendantCount.GET_DESCENDANT_COUNT; +import static org.sirix.query.function.sdb.trx.GetHash.HASH; +import static org.sirix.query.function.sdb.trx.GetMostRecentRevision.MOST_RECENT_REVISION; +import static org.sirix.query.function.sdb.trx.GetRevision.REVISION; +import static org.sirix.query.function.sdb.trx.GetRevisionTimestamp.TIMESTAMP; +import static org.sirix.query.function.sdb.trx.IsDeleted.IS_DELETED; +import static org.sirix.query.function.sdb.trx.ItemHistory.NODE_HISTORY; +import static org.sirix.query.function.sdb.trx.LevelOrder.LEVEL_ORDER; +import static org.sirix.query.function.sdb.trx.Rollback.ROLLBACK; +import static org.sirix.query.function.xml.diff.Diff.DIFF; +import static org.sirix.query.function.xml.index.SortByDocOrder.SORT; +import static org.sirix.query.function.xml.index.create.CreateCASIndex.CREATE_CAS_INDEX; +import static org.sirix.query.function.xml.index.create.CreateNameIndex.CREATE_NAME_INDEX; +import static org.sirix.query.function.xml.index.create.CreatePathIndex.CREATE_PATH_INDEX; +import static org.sirix.query.function.xml.index.find.FindCASIndex.FIND_CAS_INDEX; +import static org.sirix.query.function.xml.index.find.FindNameIndex.FIND_NAME_INDEX; +import static org.sirix.query.function.xml.index.find.FindPathIndex.FIND_PATH_INDEX; +import static org.sirix.query.function.xml.io.Doc.DOC; +import static org.sirix.query.function.xml.io.DocByPointInTime.OPEN; +import static org.sirix.query.function.xml.io.Import.IMPORT; +import static org.sirix.query.function.xml.io.Load.LOAD; +import static org.sirix.query.function.xml.io.OpenRevisions.OPEN_REVISIONS; +import static org.sirix.query.function.xml.io.Store.STORE; +import static org.sirix.query.function.xml.trx.GetAttributeCount.GET_ATTRIBUTE_COUNT; +import static org.sirix.query.function.xml.trx.GetNamespaceCount.GET_NAMESPACE_COUNT; /** * Function definitions. diff --git a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/sdb/trx/Commit.java b/bundles/sirix-query/src/main/java/org/sirix/query/function/sdb/trx/Commit.java similarity index 92% rename from bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/sdb/trx/Commit.java rename to bundles/sirix-query/src/main/java/org/sirix/query/function/sdb/trx/Commit.java index 67d0b6f18..69c6b57d4 100644 --- a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/sdb/trx/Commit.java +++ b/bundles/sirix-query/src/main/java/org/sirix/query/function/sdb/trx/Commit.java @@ -1,4 +1,4 @@ -package org.sirix.xquery.function.sdb.trx; +package org.sirix.query.function.sdb.trx; import org.brackit.xquery.QueryContext; import org.brackit.xquery.atomic.DateTime; @@ -10,10 +10,10 @@ import org.brackit.xquery.module.StaticContext; import org.sirix.api.NodeTrx; import org.sirix.api.ResourceSession; -import org.sirix.xquery.StructuredDBItem; -import org.sirix.xquery.function.DateTimeToInstant; -import org.sirix.xquery.function.FunUtil; -import org.sirix.xquery.function.sdb.SDBFun; +import org.sirix.query.StructuredDBItem; +import org.sirix.query.function.DateTimeToInstant; +import org.sirix.query.function.FunUtil; +import org.sirix.query.function.sdb.SDBFun; import java.time.Instant; diff --git a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/sdb/trx/GetAuthorID.java b/bundles/sirix-query/src/main/java/org/sirix/query/function/sdb/trx/GetAuthorID.java similarity index 90% rename from bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/sdb/trx/GetAuthorID.java rename to bundles/sirix-query/src/main/java/org/sirix/query/function/sdb/trx/GetAuthorID.java index faeec6fa7..c40e2a135 100644 --- a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/sdb/trx/GetAuthorID.java +++ b/bundles/sirix-query/src/main/java/org/sirix/query/function/sdb/trx/GetAuthorID.java @@ -1,4 +1,4 @@ -package org.sirix.xquery.function.sdb.trx; +package org.sirix.query.function.sdb.trx; import org.brackit.xquery.QueryContext; import org.brackit.xquery.atomic.QNm; @@ -7,8 +7,8 @@ import org.brackit.xquery.jdm.Sequence; import org.brackit.xquery.jdm.Signature; import org.brackit.xquery.module.StaticContext; -import org.sirix.xquery.StructuredDBItem; -import org.sirix.xquery.function.sdb.SDBFun; +import org.sirix.query.StructuredDBItem; +import org.sirix.query.function.sdb.SDBFun; /** *

diff --git a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/sdb/trx/GetAuthorName.java b/bundles/sirix-query/src/main/java/org/sirix/query/function/sdb/trx/GetAuthorName.java similarity index 90% rename from bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/sdb/trx/GetAuthorName.java rename to bundles/sirix-query/src/main/java/org/sirix/query/function/sdb/trx/GetAuthorName.java index 0c8dce961..b5c49b018 100644 --- a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/sdb/trx/GetAuthorName.java +++ b/bundles/sirix-query/src/main/java/org/sirix/query/function/sdb/trx/GetAuthorName.java @@ -1,4 +1,4 @@ -package org.sirix.xquery.function.sdb.trx; +package org.sirix.query.function.sdb.trx; import org.brackit.xquery.QueryContext; import org.brackit.xquery.atomic.QNm; @@ -7,8 +7,8 @@ import org.brackit.xquery.jdm.Sequence; import org.brackit.xquery.jdm.Signature; import org.brackit.xquery.module.StaticContext; -import org.sirix.xquery.StructuredDBItem; -import org.sirix.xquery.function.sdb.SDBFun; +import org.sirix.query.StructuredDBItem; +import org.sirix.query.function.sdb.SDBFun; /** *

diff --git a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/sdb/trx/GetChildCount.java b/bundles/sirix-query/src/main/java/org/sirix/query/function/sdb/trx/GetChildCount.java similarity index 90% rename from bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/sdb/trx/GetChildCount.java rename to bundles/sirix-query/src/main/java/org/sirix/query/function/sdb/trx/GetChildCount.java index ff33488f9..b06b674b5 100644 --- a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/sdb/trx/GetChildCount.java +++ b/bundles/sirix-query/src/main/java/org/sirix/query/function/sdb/trx/GetChildCount.java @@ -1,4 +1,4 @@ -package org.sirix.xquery.function.sdb.trx; +package org.sirix.query.function.sdb.trx; import org.brackit.xquery.QueryContext; import org.brackit.xquery.atomic.Int64; @@ -7,8 +7,8 @@ import org.brackit.xquery.jdm.Sequence; import org.brackit.xquery.jdm.Signature; import org.brackit.xquery.module.StaticContext; -import org.sirix.xquery.StructuredDBItem; -import org.sirix.xquery.function.sdb.SDBFun; +import org.sirix.query.StructuredDBItem; +import org.sirix.query.function.sdb.SDBFun; /** *

diff --git a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/sdb/trx/GetDescendantCount.java b/bundles/sirix-query/src/main/java/org/sirix/query/function/sdb/trx/GetDescendantCount.java similarity index 90% rename from bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/sdb/trx/GetDescendantCount.java rename to bundles/sirix-query/src/main/java/org/sirix/query/function/sdb/trx/GetDescendantCount.java index 84ebed04e..58b3c1514 100644 --- a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/sdb/trx/GetDescendantCount.java +++ b/bundles/sirix-query/src/main/java/org/sirix/query/function/sdb/trx/GetDescendantCount.java @@ -1,4 +1,4 @@ -package org.sirix.xquery.function.sdb.trx; +package org.sirix.query.function.sdb.trx; import org.brackit.xquery.QueryContext; import org.brackit.xquery.atomic.Int64; @@ -7,8 +7,8 @@ import org.brackit.xquery.jdm.Sequence; import org.brackit.xquery.jdm.Signature; import org.brackit.xquery.module.StaticContext; -import org.sirix.xquery.StructuredDBItem; -import org.sirix.xquery.function.sdb.SDBFun; +import org.sirix.query.StructuredDBItem; +import org.sirix.query.function.sdb.SDBFun; /** *

diff --git a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/sdb/trx/GetHash.java b/bundles/sirix-query/src/main/java/org/sirix/query/function/sdb/trx/GetHash.java similarity index 90% rename from bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/sdb/trx/GetHash.java rename to bundles/sirix-query/src/main/java/org/sirix/query/function/sdb/trx/GetHash.java index f59048429..120b9227d 100644 --- a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/sdb/trx/GetHash.java +++ b/bundles/sirix-query/src/main/java/org/sirix/query/function/sdb/trx/GetHash.java @@ -1,4 +1,4 @@ -package org.sirix.xquery.function.sdb.trx; +package org.sirix.query.function.sdb.trx; import org.brackit.xquery.QueryContext; import org.brackit.xquery.atomic.QNm; @@ -7,8 +7,8 @@ import org.brackit.xquery.jdm.Sequence; import org.brackit.xquery.jdm.Signature; import org.brackit.xquery.module.StaticContext; -import org.sirix.xquery.StructuredDBItem; -import org.sirix.xquery.function.sdb.SDBFun; +import org.sirix.query.StructuredDBItem; +import org.sirix.query.function.sdb.SDBFun; /** *

diff --git a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/sdb/trx/GetMostRecentRevision.java b/bundles/sirix-query/src/main/java/org/sirix/query/function/sdb/trx/GetMostRecentRevision.java similarity index 90% rename from bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/sdb/trx/GetMostRecentRevision.java rename to bundles/sirix-query/src/main/java/org/sirix/query/function/sdb/trx/GetMostRecentRevision.java index 3115291b5..c8a175342 100644 --- a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/sdb/trx/GetMostRecentRevision.java +++ b/bundles/sirix-query/src/main/java/org/sirix/query/function/sdb/trx/GetMostRecentRevision.java @@ -1,4 +1,4 @@ -package org.sirix.xquery.function.sdb.trx; +package org.sirix.query.function.sdb.trx; import org.brackit.xquery.QueryContext; import org.brackit.xquery.atomic.Int32; @@ -7,8 +7,8 @@ import org.brackit.xquery.jdm.Sequence; import org.brackit.xquery.jdm.Signature; import org.brackit.xquery.module.StaticContext; -import org.sirix.xquery.StructuredDBItem; -import org.sirix.xquery.function.sdb.SDBFun; +import org.sirix.query.StructuredDBItem; +import org.sirix.query.function.sdb.SDBFun; /** *

diff --git a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/sdb/trx/GetNodeKey.java b/bundles/sirix-query/src/main/java/org/sirix/query/function/sdb/trx/GetNodeKey.java similarity index 90% rename from bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/sdb/trx/GetNodeKey.java rename to bundles/sirix-query/src/main/java/org/sirix/query/function/sdb/trx/GetNodeKey.java index c829456f9..411e85cce 100644 --- a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/sdb/trx/GetNodeKey.java +++ b/bundles/sirix-query/src/main/java/org/sirix/query/function/sdb/trx/GetNodeKey.java @@ -1,4 +1,4 @@ -package org.sirix.xquery.function.sdb.trx; +package org.sirix.query.function.sdb.trx; import org.brackit.xquery.QueryContext; import org.brackit.xquery.atomic.Int64; @@ -7,8 +7,8 @@ import org.brackit.xquery.jdm.Sequence; import org.brackit.xquery.jdm.Signature; import org.brackit.xquery.module.StaticContext; -import org.sirix.xquery.StructuredDBItem; -import org.sirix.xquery.function.sdb.SDBFun; +import org.sirix.query.StructuredDBItem; +import org.sirix.query.function.sdb.SDBFun; /** *

diff --git a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/sdb/trx/GetPath.java b/bundles/sirix-query/src/main/java/org/sirix/query/function/sdb/trx/GetPath.java similarity index 95% rename from bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/sdb/trx/GetPath.java rename to bundles/sirix-query/src/main/java/org/sirix/query/function/sdb/trx/GetPath.java index 297d9970e..141e7b464 100644 --- a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/sdb/trx/GetPath.java +++ b/bundles/sirix-query/src/main/java/org/sirix/query/function/sdb/trx/GetPath.java @@ -1,4 +1,4 @@ -package org.sirix.xquery.function.sdb.trx; +package org.sirix.query.function.sdb.trx; import org.brackit.xquery.QueryContext; import org.brackit.xquery.atomic.QNm; @@ -11,8 +11,8 @@ import org.sirix.api.NodeReadOnlyTrx; import org.sirix.api.json.JsonNodeReadOnlyTrx; import org.sirix.index.path.summary.PathSummaryReader; -import org.sirix.xquery.StructuredDBItem; -import org.sirix.xquery.function.sdb.SDBFun; +import org.sirix.query.StructuredDBItem; +import org.sirix.query.function.sdb.SDBFun; import java.util.ArrayDeque; diff --git a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/sdb/trx/GetRevision.java b/bundles/sirix-query/src/main/java/org/sirix/query/function/sdb/trx/GetRevision.java similarity index 87% rename from bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/sdb/trx/GetRevision.java rename to bundles/sirix-query/src/main/java/org/sirix/query/function/sdb/trx/GetRevision.java index acb39aff8..f53bd0b8f 100644 --- a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/sdb/trx/GetRevision.java +++ b/bundles/sirix-query/src/main/java/org/sirix/query/function/sdb/trx/GetRevision.java @@ -1,45 +1,45 @@ -package org.sirix.xquery.function.sdb.trx; - -import org.brackit.xquery.QueryContext; -import org.brackit.xquery.atomic.Int32; -import org.brackit.xquery.atomic.QNm; -import org.brackit.xquery.function.AbstractFunction; -import org.brackit.xquery.jdm.Sequence; -import org.brackit.xquery.jdm.Signature; -import org.brackit.xquery.module.StaticContext; -import org.sirix.xquery.StructuredDBItem; -import org.sirix.xquery.function.sdb.SDBFun; - -/** - *

- * Function for getting the current revision. Supported signature is: - *

- *
    - *
  • sdb:revision($doc as xs:node) as xs:int
    • - *
- * - * @author Johannes Lichtenberger - * - */ -public final class GetRevision extends AbstractFunction { - - /** Get most recent revision function name. */ - public final static QNm REVISION = new QNm(SDBFun.SDB_NSURI, SDBFun.SDB_PREFIX, "revision"); - - /** - * Constructor. - * - * @param name the name of the function - * @param signature the signature of the function - */ - public GetRevision(final QNm name, final Signature signature) { - super(name, signature, true); - } - - @Override - public Sequence execute(final StaticContext sctx, final QueryContext ctx, final Sequence[] args) { - final StructuredDBItem doc = ((StructuredDBItem) args[0]); - - return new Int32(doc.getTrx().getRevisionNumber()); - } -} +package org.sirix.query.function.sdb.trx; + +import org.brackit.xquery.QueryContext; +import org.brackit.xquery.atomic.Int32; +import org.brackit.xquery.atomic.QNm; +import org.brackit.xquery.function.AbstractFunction; +import org.brackit.xquery.jdm.Sequence; +import org.brackit.xquery.jdm.Signature; +import org.brackit.xquery.module.StaticContext; +import org.sirix.query.StructuredDBItem; +import org.sirix.query.function.sdb.SDBFun; + +/** + *

+ * Function for getting the current revision. Supported signature is: + *

+ *
    + *
  • sdb:revision($doc as xs:node) as xs:int
    • + *
+ * + * @author Johannes Lichtenberger + * + */ +public final class GetRevision extends AbstractFunction { + + /** Get most recent revision function name. */ + public final static QNm REVISION = new QNm(SDBFun.SDB_NSURI, SDBFun.SDB_PREFIX, "revision"); + + /** + * Constructor. + * + * @param name the name of the function + * @param signature the signature of the function + */ + public GetRevision(final QNm name, final Signature signature) { + super(name, signature, true); + } + + @Override + public Sequence execute(final StaticContext sctx, final QueryContext ctx, final Sequence[] args) { + final StructuredDBItem doc = ((StructuredDBItem) args[0]); + + return new Int32(doc.getTrx().getRevisionNumber()); + } +} diff --git a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/sdb/trx/GetRevisionTimestamp.java b/bundles/sirix-query/src/main/java/org/sirix/query/function/sdb/trx/GetRevisionTimestamp.java similarity index 91% rename from bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/sdb/trx/GetRevisionTimestamp.java rename to bundles/sirix-query/src/main/java/org/sirix/query/function/sdb/trx/GetRevisionTimestamp.java index 627b763fd..70508e029 100644 --- a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/sdb/trx/GetRevisionTimestamp.java +++ b/bundles/sirix-query/src/main/java/org/sirix/query/function/sdb/trx/GetRevisionTimestamp.java @@ -1,4 +1,4 @@ -package org.sirix.xquery.function.sdb.trx; +package org.sirix.query.function.sdb.trx; import org.brackit.xquery.QueryContext; import org.brackit.xquery.atomic.DateTime; @@ -7,8 +7,8 @@ import org.brackit.xquery.jdm.Sequence; import org.brackit.xquery.jdm.Signature; import org.brackit.xquery.module.StaticContext; -import org.sirix.xquery.StructuredDBItem; -import org.sirix.xquery.function.sdb.SDBFun; +import org.sirix.query.StructuredDBItem; +import org.sirix.query.function.sdb.SDBFun; import java.time.Instant; import java.time.format.DateTimeFormatter; diff --git a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/sdb/trx/IsDeleted.java b/bundles/sirix-query/src/main/java/org/sirix/query/function/sdb/trx/IsDeleted.java similarity index 94% rename from bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/sdb/trx/IsDeleted.java rename to bundles/sirix-query/src/main/java/org/sirix/query/function/sdb/trx/IsDeleted.java index facae8869..cbaeefd29 100644 --- a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/sdb/trx/IsDeleted.java +++ b/bundles/sirix-query/src/main/java/org/sirix/query/function/sdb/trx/IsDeleted.java @@ -1,4 +1,4 @@ -package org.sirix.xquery.function.sdb.trx; +package org.sirix.query.function.sdb.trx; import org.brackit.xquery.QueryContext; import org.brackit.xquery.atomic.Bool; @@ -11,8 +11,8 @@ import org.sirix.api.ResourceSession; import org.sirix.index.IndexType; import org.sirix.node.RevisionReferencesNode; -import org.sirix.xquery.StructuredDBItem; -import org.sirix.xquery.function.sdb.SDBFun; +import org.sirix.query.StructuredDBItem; +import org.sirix.query.function.sdb.SDBFun; /** *

diff --git a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/sdb/trx/ItemHistory.java b/bundles/sirix-query/src/main/java/org/sirix/query/function/sdb/trx/ItemHistory.java similarity index 94% rename from bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/sdb/trx/ItemHistory.java rename to bundles/sirix-query/src/main/java/org/sirix/query/function/sdb/trx/ItemHistory.java index f851c72b2..2b7500102 100644 --- a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/sdb/trx/ItemHistory.java +++ b/bundles/sirix-query/src/main/java/org/sirix/query/function/sdb/trx/ItemHistory.java @@ -1,4 +1,4 @@ -package org.sirix.xquery.function.sdb.trx; +package org.sirix.query.function.sdb.trx; import org.brackit.xquery.QueryContext; import org.brackit.xquery.atomic.QNm; @@ -13,11 +13,11 @@ import org.sirix.api.xml.XmlNodeReadOnlyTrx; import org.sirix.index.IndexType; import org.sirix.node.RevisionReferencesNode; -import org.sirix.xquery.StructuredDBItem; -import org.sirix.xquery.function.sdb.SDBFun; -import org.sirix.xquery.json.JsonDBItem; -import org.sirix.xquery.json.JsonItemFactory; -import org.sirix.xquery.node.XmlDBNode; +import org.sirix.query.StructuredDBItem; +import org.sirix.query.function.sdb.SDBFun; +import org.sirix.query.json.JsonDBItem; +import org.sirix.query.json.JsonItemFactory; +import org.sirix.query.node.XmlDBNode; import java.util.ArrayDeque; import java.util.ArrayList; diff --git a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/sdb/trx/LevelOrder.java b/bundles/sirix-query/src/main/java/org/sirix/query/function/sdb/trx/LevelOrder.java similarity index 89% rename from bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/sdb/trx/LevelOrder.java rename to bundles/sirix-query/src/main/java/org/sirix/query/function/sdb/trx/LevelOrder.java index b8cb57140..9f236b24b 100644 --- a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/sdb/trx/LevelOrder.java +++ b/bundles/sirix-query/src/main/java/org/sirix/query/function/sdb/trx/LevelOrder.java @@ -1,4 +1,4 @@ -package org.sirix.xquery.function.sdb.trx; +package org.sirix.query.function.sdb.trx; import org.brackit.xquery.QueryContext; import org.brackit.xquery.atomic.QNm; @@ -9,13 +9,13 @@ import org.brackit.xquery.sequence.LazySequence; import org.sirix.api.json.JsonNodeReadOnlyTrx; import org.sirix.axis.LevelOrderAxis; -import org.sirix.xquery.StructuredDBItem; -import org.sirix.xquery.function.FunUtil; -import org.sirix.xquery.function.sdb.SDBFun; -import org.sirix.xquery.json.JsonDBItem; -import org.sirix.xquery.json.JsonItemFactory; -import org.sirix.xquery.node.XmlDBNode; -import org.sirix.xquery.stream.node.SirixNodeStream; +import org.sirix.query.StructuredDBItem; +import org.sirix.query.function.FunUtil; +import org.sirix.query.function.sdb.SDBFun; +import org.sirix.query.json.JsonDBItem; +import org.sirix.query.json.JsonItemFactory; +import org.sirix.query.node.XmlDBNode; +import org.sirix.query.stream.node.SirixNodeStream; /** *

diff --git a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/sdb/trx/Rollback.java b/bundles/sirix-query/src/main/java/org/sirix/query/function/sdb/trx/Rollback.java similarity index 92% rename from bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/sdb/trx/Rollback.java rename to bundles/sirix-query/src/main/java/org/sirix/query/function/sdb/trx/Rollback.java index f5595d25e..b48802967 100644 --- a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/sdb/trx/Rollback.java +++ b/bundles/sirix-query/src/main/java/org/sirix/query/function/sdb/trx/Rollback.java @@ -1,4 +1,4 @@ -package org.sirix.xquery.function.sdb.trx; +package org.sirix.query.function.sdb.trx; import org.brackit.xquery.QueryContext; import org.brackit.xquery.QueryException; @@ -9,8 +9,8 @@ import org.brackit.xquery.jdm.Signature; import org.brackit.xquery.module.StaticContext; import org.sirix.api.NodeTrx; -import org.sirix.xquery.StructuredDBItem; -import org.sirix.xquery.function.sdb.SDBFun; +import org.sirix.query.StructuredDBItem; +import org.sirix.query.function.sdb.SDBFun; /** *

diff --git a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/sdb/trx/SelectItem.java b/bundles/sirix-query/src/main/java/org/sirix/query/function/sdb/trx/SelectItem.java similarity index 86% rename from bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/sdb/trx/SelectItem.java rename to bundles/sirix-query/src/main/java/org/sirix/query/function/sdb/trx/SelectItem.java index c706b90e7..fdb7317ab 100644 --- a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/sdb/trx/SelectItem.java +++ b/bundles/sirix-query/src/main/java/org/sirix/query/function/sdb/trx/SelectItem.java @@ -1,4 +1,4 @@ -package org.sirix.xquery.function.sdb.trx; +package org.sirix.query.function.sdb.trx; import org.brackit.xquery.QueryContext; import org.brackit.xquery.QueryException; @@ -10,12 +10,12 @@ import org.sirix.api.NodeReadOnlyTrx; import org.sirix.api.json.JsonNodeReadOnlyTrx; import org.sirix.api.xml.XmlNodeReadOnlyTrx; -import org.sirix.xquery.StructuredDBItem; -import org.sirix.xquery.function.FunUtil; -import org.sirix.xquery.function.sdb.SDBFun; -import org.sirix.xquery.json.JsonDBItem; -import org.sirix.xquery.json.JsonItemFactory; -import org.sirix.xquery.node.XmlDBNode; +import org.sirix.query.StructuredDBItem; +import org.sirix.query.function.FunUtil; +import org.sirix.query.function.sdb.SDBFun; +import org.sirix.query.json.JsonDBItem; +import org.sirix.query.json.JsonItemFactory; +import org.sirix.query.node.XmlDBNode; /** *

diff --git a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/sdb/trx/SelectParent.java b/bundles/sirix-query/src/main/java/org/sirix/query/function/sdb/trx/SelectParent.java similarity index 87% rename from bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/sdb/trx/SelectParent.java rename to bundles/sirix-query/src/main/java/org/sirix/query/function/sdb/trx/SelectParent.java index ac0e787ed..5a80f4dd5 100644 --- a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/sdb/trx/SelectParent.java +++ b/bundles/sirix-query/src/main/java/org/sirix/query/function/sdb/trx/SelectParent.java @@ -1,4 +1,4 @@ -package org.sirix.xquery.function.sdb.trx; +package org.sirix.query.function.sdb.trx; import org.brackit.xquery.QueryContext; import org.brackit.xquery.QueryException; @@ -10,11 +10,11 @@ import org.sirix.api.NodeReadOnlyTrx; import org.sirix.api.json.JsonNodeReadOnlyTrx; import org.sirix.api.xml.XmlNodeReadOnlyTrx; -import org.sirix.xquery.StructuredDBItem; -import org.sirix.xquery.function.sdb.SDBFun; -import org.sirix.xquery.json.JsonDBItem; -import org.sirix.xquery.json.JsonItemFactory; -import org.sirix.xquery.node.XmlDBNode; +import org.sirix.query.StructuredDBItem; +import org.sirix.query.function.sdb.SDBFun; +import org.sirix.query.json.JsonDBItem; +import org.sirix.query.json.JsonItemFactory; +import org.sirix.query.node.XmlDBNode; /** *

diff --git a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/xml/XMLFun.java b/bundles/sirix-query/src/main/java/org/sirix/query/function/xml/XMLFun.java similarity index 83% rename from bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/xml/XMLFun.java rename to bundles/sirix-query/src/main/java/org/sirix/query/function/xml/XMLFun.java index 72bfb1ba6..1559bf709 100644 --- a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/xml/XMLFun.java +++ b/bundles/sirix-query/src/main/java/org/sirix/query/function/xml/XMLFun.java @@ -1,4 +1,4 @@ -package org.sirix.xquery.function.xml; +package org.sirix.query.function.xml; import org.brackit.xquery.atomic.QNm; import org.brackit.xquery.jdm.Signature; @@ -8,40 +8,40 @@ import org.brackit.xquery.jdm.type.SequenceType; import org.brackit.xquery.module.Functions; import org.brackit.xquery.module.Namespaces; -import org.sirix.xquery.function.sdb.trx.LevelOrder; -import org.sirix.xquery.function.xml.diff.Diff; -import org.sirix.xquery.function.xml.index.SortByDocOrder; -import org.sirix.xquery.function.xml.index.create.CreateCASIndex; -import org.sirix.xquery.function.xml.index.create.CreateNameIndex; -import org.sirix.xquery.function.xml.index.create.CreatePathIndex; -import org.sirix.xquery.function.xml.index.find.FindCASIndex; -import org.sirix.xquery.function.xml.index.find.FindNameIndex; -import org.sirix.xquery.function.xml.index.find.FindPathIndex; -import org.sirix.xquery.function.xml.index.scan.ScanCASIndex; -import org.sirix.xquery.function.xml.index.scan.ScanCASIndexRange; -import org.sirix.xquery.function.xml.index.scan.ScanNameIndex; -import org.sirix.xquery.function.xml.index.scan.ScanPathIndex; -import org.sirix.xquery.function.xml.io.*; -import org.sirix.xquery.function.xml.trx.GetAttributeCount; -import org.sirix.xquery.function.xml.trx.GetNamespaceCount; - -import static org.sirix.xquery.function.sdb.trx.LevelOrder.LEVEL_ORDER; -import static org.sirix.xquery.function.xml.diff.Diff.DIFF; -import static org.sirix.xquery.function.xml.index.SortByDocOrder.SORT; -import static org.sirix.xquery.function.xml.index.create.CreateCASIndex.CREATE_CAS_INDEX; -import static org.sirix.xquery.function.xml.index.create.CreateNameIndex.CREATE_NAME_INDEX; -import static org.sirix.xquery.function.xml.index.create.CreatePathIndex.CREATE_PATH_INDEX; -import static org.sirix.xquery.function.xml.index.find.FindCASIndex.FIND_CAS_INDEX; -import static org.sirix.xquery.function.xml.index.find.FindNameIndex.FIND_NAME_INDEX; -import static org.sirix.xquery.function.xml.index.find.FindPathIndex.FIND_PATH_INDEX; -import static org.sirix.xquery.function.xml.io.Doc.DOC; -import static org.sirix.xquery.function.xml.io.DocByPointInTime.OPEN; -import static org.sirix.xquery.function.xml.io.Import.IMPORT; -import static org.sirix.xquery.function.xml.io.Load.LOAD; -import static org.sirix.xquery.function.xml.io.OpenRevisions.OPEN_REVISIONS; -import static org.sirix.xquery.function.xml.io.Store.STORE; -import static org.sirix.xquery.function.xml.trx.GetAttributeCount.GET_ATTRIBUTE_COUNT; -import static org.sirix.xquery.function.xml.trx.GetNamespaceCount.GET_NAMESPACE_COUNT; +import org.sirix.query.function.sdb.trx.LevelOrder; +import org.sirix.query.function.xml.diff.Diff; +import org.sirix.query.function.xml.index.SortByDocOrder; +import org.sirix.query.function.xml.index.create.CreateCASIndex; +import org.sirix.query.function.xml.index.create.CreateNameIndex; +import org.sirix.query.function.xml.index.create.CreatePathIndex; +import org.sirix.query.function.xml.index.find.FindCASIndex; +import org.sirix.query.function.xml.index.find.FindNameIndex; +import org.sirix.query.function.xml.index.find.FindPathIndex; +import org.sirix.query.function.xml.index.scan.ScanCASIndex; +import org.sirix.query.function.xml.index.scan.ScanCASIndexRange; +import org.sirix.query.function.xml.index.scan.ScanNameIndex; +import org.sirix.query.function.xml.index.scan.ScanPathIndex; +import org.sirix.query.function.xml.io.*; +import org.sirix.query.function.xml.trx.GetAttributeCount; +import org.sirix.query.function.xml.trx.GetNamespaceCount; + +import static org.sirix.query.function.sdb.trx.LevelOrder.LEVEL_ORDER; +import static org.sirix.query.function.xml.diff.Diff.DIFF; +import static org.sirix.query.function.xml.index.SortByDocOrder.SORT; +import static org.sirix.query.function.xml.index.create.CreateCASIndex.CREATE_CAS_INDEX; +import static org.sirix.query.function.xml.index.create.CreateNameIndex.CREATE_NAME_INDEX; +import static org.sirix.query.function.xml.index.create.CreatePathIndex.CREATE_PATH_INDEX; +import static org.sirix.query.function.xml.index.find.FindCASIndex.FIND_CAS_INDEX; +import static org.sirix.query.function.xml.index.find.FindNameIndex.FIND_NAME_INDEX; +import static org.sirix.query.function.xml.index.find.FindPathIndex.FIND_PATH_INDEX; +import static org.sirix.query.function.xml.io.Doc.DOC; +import static org.sirix.query.function.xml.io.DocByPointInTime.OPEN; +import static org.sirix.query.function.xml.io.Import.IMPORT; +import static org.sirix.query.function.xml.io.Load.LOAD; +import static org.sirix.query.function.xml.io.OpenRevisions.OPEN_REVISIONS; +import static org.sirix.query.function.xml.io.Store.STORE; +import static org.sirix.query.function.xml.trx.GetAttributeCount.GET_ATTRIBUTE_COUNT; +import static org.sirix.query.function.xml.trx.GetNamespaceCount.GET_NAMESPACE_COUNT; /** * Function definitions. diff --git a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/xml/diff/Diff.java b/bundles/sirix-query/src/main/java/org/sirix/query/function/xml/diff/Diff.java similarity index 98% rename from bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/xml/diff/Diff.java rename to bundles/sirix-query/src/main/java/org/sirix/query/function/xml/diff/Diff.java index 6ea6e4ceb..c058cc887 100644 --- a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/xml/diff/Diff.java +++ b/bundles/sirix-query/src/main/java/org/sirix/query/function/xml/diff/Diff.java @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.sirix.xquery.function.xml.diff; +package org.sirix.query.function.xml.diff; import com.google.api.client.util.Objects; import com.google.common.collect.ImmutableSet; @@ -51,10 +51,10 @@ import org.sirix.diff.DiffTuple; import org.sirix.node.NodeKind; import org.sirix.service.xml.serialize.XmlSerializer; -import org.sirix.xquery.function.FunUtil; -import org.sirix.xquery.function.xml.XMLFun; -import org.sirix.xquery.node.XmlDBCollection; -import org.sirix.xquery.node.XmlDBNode; +import org.sirix.query.function.FunUtil; +import org.sirix.query.function.xml.XMLFun; +import org.sirix.query.node.XmlDBCollection; +import org.sirix.query.node.XmlDBNode; import java.io.ByteArrayOutputStream; import java.io.OutputStream; diff --git a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/xml/index/SortByDocOrder.java b/bundles/sirix-query/src/main/java/org/sirix/query/function/xml/index/SortByDocOrder.java similarity index 93% rename from bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/xml/index/SortByDocOrder.java rename to bundles/sirix-query/src/main/java/org/sirix/query/function/xml/index/SortByDocOrder.java index 1d649ecd3..45461472e 100644 --- a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/xml/index/SortByDocOrder.java +++ b/bundles/sirix-query/src/main/java/org/sirix/query/function/xml/index/SortByDocOrder.java @@ -1,4 +1,4 @@ -package org.sirix.xquery.function.xml.index; +package org.sirix.query.function.xml.index; import org.brackit.xquery.QueryContext; import org.brackit.xquery.Tuple; @@ -9,7 +9,7 @@ import org.brackit.xquery.jdm.node.Node; import org.brackit.xquery.module.StaticContext; import org.brackit.xquery.sequence.SortedNodeSequence; -import org.sirix.xquery.function.xml.XMLFun; +import org.sirix.query.function.xml.XMLFun; import java.util.Comparator; diff --git a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/xml/index/create/CreateCASIndex.java b/bundles/sirix-query/src/main/java/org/sirix/query/function/xml/index/create/CreateCASIndex.java similarity index 96% rename from bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/xml/index/create/CreateCASIndex.java rename to bundles/sirix-query/src/main/java/org/sirix/query/function/xml/index/create/CreateCASIndex.java index a70490742..9811f3a97 100644 --- a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/xml/index/create/CreateCASIndex.java +++ b/bundles/sirix-query/src/main/java/org/sirix/query/function/xml/index/create/CreateCASIndex.java @@ -1,4 +1,4 @@ -package org.sirix.xquery.function.xml.index.create; +package org.sirix.query.function.xml.index.create; import com.google.common.collect.ImmutableSet; import org.brackit.xquery.QueryContext; @@ -18,8 +18,8 @@ import org.sirix.index.IndexDef; import org.sirix.index.IndexDefs; import org.sirix.index.IndexType; -import org.sirix.xquery.function.xml.XMLFun; -import org.sirix.xquery.node.XmlDBNode; +import org.sirix.query.function.xml.XMLFun; +import org.sirix.query.node.XmlDBNode; import java.util.HashSet; import java.util.Optional; diff --git a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/xml/index/create/CreateNameIndex.java b/bundles/sirix-query/src/main/java/org/sirix/query/function/xml/index/create/CreateNameIndex.java similarity index 96% rename from bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/xml/index/create/CreateNameIndex.java rename to bundles/sirix-query/src/main/java/org/sirix/query/function/xml/index/create/CreateNameIndex.java index bef29c2ff..f07b5089c 100644 --- a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/xml/index/create/CreateNameIndex.java +++ b/bundles/sirix-query/src/main/java/org/sirix/query/function/xml/index/create/CreateNameIndex.java @@ -1,4 +1,4 @@ -package org.sirix.xquery.function.xml.index.create; +package org.sirix.query.function.xml.index.create; import com.google.common.collect.ImmutableSet; import org.brackit.xquery.QueryContext; @@ -19,8 +19,8 @@ import org.sirix.index.IndexDef; import org.sirix.index.IndexDefs; import org.sirix.index.IndexType; -import org.sirix.xquery.function.xml.XMLFun; -import org.sirix.xquery.node.XmlDBNode; +import org.sirix.query.function.xml.XMLFun; +import org.sirix.query.node.XmlDBNode; import java.util.HashSet; import java.util.Optional; diff --git a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/xml/index/create/CreatePathIndex.java b/bundles/sirix-query/src/main/java/org/sirix/query/function/xml/index/create/CreatePathIndex.java similarity index 96% rename from bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/xml/index/create/CreatePathIndex.java rename to bundles/sirix-query/src/main/java/org/sirix/query/function/xml/index/create/CreatePathIndex.java index 350766da0..5a8338fa7 100644 --- a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/xml/index/create/CreatePathIndex.java +++ b/bundles/sirix-query/src/main/java/org/sirix/query/function/xml/index/create/CreatePathIndex.java @@ -1,4 +1,4 @@ -package org.sirix.xquery.function.xml.index.create; +package org.sirix.query.function.xml.index.create; import com.google.common.collect.ImmutableSet; import org.brackit.xquery.QueryContext; @@ -20,8 +20,8 @@ import org.sirix.index.IndexDef; import org.sirix.index.IndexDefs; import org.sirix.index.IndexType; -import org.sirix.xquery.function.xml.XMLFun; -import org.sirix.xquery.node.XmlDBNode; +import org.sirix.query.function.xml.XMLFun; +import org.sirix.query.node.XmlDBNode; import java.util.HashSet; import java.util.Optional; diff --git a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/xml/index/find/FindCASIndex.java b/bundles/sirix-query/src/main/java/org/sirix/query/function/xml/index/find/FindCASIndex.java similarity index 94% rename from bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/xml/index/find/FindCASIndex.java rename to bundles/sirix-query/src/main/java/org/sirix/query/function/xml/index/find/FindCASIndex.java index 47a5eca94..dffe1d27f 100644 --- a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/xml/index/find/FindCASIndex.java +++ b/bundles/sirix-query/src/main/java/org/sirix/query/function/xml/index/find/FindCASIndex.java @@ -1,4 +1,4 @@ -package org.sirix.xquery.function.xml.index.find; +package org.sirix.query.function.xml.index.find; import org.brackit.xquery.QueryContext; import org.brackit.xquery.QueryException; @@ -15,8 +15,8 @@ import org.sirix.access.trx.node.xml.XmlIndexController; import org.sirix.api.xml.XmlNodeReadOnlyTrx; import org.sirix.index.IndexDef; -import org.sirix.xquery.function.xml.XMLFun; -import org.sirix.xquery.node.XmlDBNode; +import org.sirix.query.function.xml.XMLFun; +import org.sirix.query.node.XmlDBNode; import java.util.Optional; diff --git a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/xml/index/find/FindNameIndex.java b/bundles/sirix-query/src/main/java/org/sirix/query/function/xml/index/find/FindNameIndex.java similarity index 94% rename from bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/xml/index/find/FindNameIndex.java rename to bundles/sirix-query/src/main/java/org/sirix/query/function/xml/index/find/FindNameIndex.java index bd793c869..2b028b07f 100644 --- a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/xml/index/find/FindNameIndex.java +++ b/bundles/sirix-query/src/main/java/org/sirix/query/function/xml/index/find/FindNameIndex.java @@ -1,4 +1,4 @@ -package org.sirix.xquery.function.xml.index.find; +package org.sirix.query.function.xml.index.find; import org.brackit.xquery.QueryContext; import org.brackit.xquery.QueryException; @@ -15,8 +15,8 @@ import org.sirix.access.trx.node.xml.XmlIndexController; import org.sirix.api.xml.XmlNodeReadOnlyTrx; import org.sirix.index.IndexDef; -import org.sirix.xquery.function.xml.XMLFun; -import org.sirix.xquery.node.XmlDBNode; +import org.sirix.query.function.xml.XMLFun; +import org.sirix.query.node.XmlDBNode; import java.util.Optional; diff --git a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/xml/index/find/FindPathIndex.java b/bundles/sirix-query/src/main/java/org/sirix/query/function/xml/index/find/FindPathIndex.java similarity index 93% rename from bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/xml/index/find/FindPathIndex.java rename to bundles/sirix-query/src/main/java/org/sirix/query/function/xml/index/find/FindPathIndex.java index 4e4d24cb6..866bbdfe4 100644 --- a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/xml/index/find/FindPathIndex.java +++ b/bundles/sirix-query/src/main/java/org/sirix/query/function/xml/index/find/FindPathIndex.java @@ -1,4 +1,4 @@ -package org.sirix.xquery.function.xml.index.find; +package org.sirix.query.function.xml.index.find; import org.brackit.xquery.QueryContext; import org.brackit.xquery.QueryException; @@ -13,8 +13,8 @@ import org.sirix.access.trx.node.xml.XmlIndexController; import org.sirix.api.xml.XmlNodeReadOnlyTrx; import org.sirix.index.IndexDef; -import org.sirix.xquery.function.xml.XMLFun; -import org.sirix.xquery.node.XmlDBNode; +import org.sirix.query.function.xml.XMLFun; +import org.sirix.query.node.XmlDBNode; import java.util.Optional; diff --git a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/xml/index/scan/AbstractScanIndex.java b/bundles/sirix-query/src/main/java/org/sirix/query/function/xml/index/scan/AbstractScanIndex.java similarity index 88% rename from bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/xml/index/scan/AbstractScanIndex.java rename to bundles/sirix-query/src/main/java/org/sirix/query/function/xml/index/scan/AbstractScanIndex.java index d5a0f5f56..c581c78fb 100644 --- a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/xml/index/scan/AbstractScanIndex.java +++ b/bundles/sirix-query/src/main/java/org/sirix/query/function/xml/index/scan/AbstractScanIndex.java @@ -1,4 +1,4 @@ -package org.sirix.xquery.function.xml.index.scan; +package org.sirix.query.function.xml.index.scan; import org.brackit.xquery.atomic.QNm; import org.brackit.xquery.function.AbstractFunction; @@ -6,8 +6,8 @@ import org.brackit.xquery.sequence.BaseIter; import org.brackit.xquery.sequence.LazySequence; import org.sirix.index.redblacktree.keyvalue.NodeReferences; -import org.sirix.xquery.node.XmlDBNode; -import org.sirix.xquery.stream.node.SirixNodeKeyStream; +import org.sirix.query.node.XmlDBNode; +import org.sirix.query.stream.node.SirixNodeKeyStream; import java.util.Iterator; diff --git a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/xml/index/scan/ScanCASIndex.java b/bundles/sirix-query/src/main/java/org/sirix/query/function/xml/index/scan/ScanCASIndex.java similarity index 94% rename from bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/xml/index/scan/ScanCASIndex.java rename to bundles/sirix-query/src/main/java/org/sirix/query/function/xml/index/scan/ScanCASIndex.java index b99f959c9..74e76300a 100644 --- a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/xml/index/scan/ScanCASIndex.java +++ b/bundles/sirix-query/src/main/java/org/sirix/query/function/xml/index/scan/ScanCASIndex.java @@ -1,4 +1,4 @@ -package org.sirix.xquery.function.xml.index.scan; +package org.sirix.query.function.xml.index.scan; import org.brackit.xquery.QueryContext; import org.brackit.xquery.QueryException; @@ -22,10 +22,10 @@ import org.sirix.index.SearchMode; import org.sirix.index.cas.CASFilter; import org.sirix.index.path.xml.XmlPCRCollector; -import org.sirix.xquery.function.FunUtil; -import org.sirix.xquery.function.sdb.SDBFun; -import org.sirix.xquery.function.xml.XMLFun; -import org.sirix.xquery.node.XmlDBNode; +import org.sirix.query.function.FunUtil; +import org.sirix.query.function.sdb.SDBFun; +import org.sirix.query.function.xml.XMLFun; +import org.sirix.query.node.XmlDBNode; import java.util.Set; diff --git a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/xml/index/scan/ScanCASIndexRange.java b/bundles/sirix-query/src/main/java/org/sirix/query/function/xml/index/scan/ScanCASIndexRange.java similarity index 94% rename from bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/xml/index/scan/ScanCASIndexRange.java rename to bundles/sirix-query/src/main/java/org/sirix/query/function/xml/index/scan/ScanCASIndexRange.java index 7da722431..404eee140 100644 --- a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/xml/index/scan/ScanCASIndexRange.java +++ b/bundles/sirix-query/src/main/java/org/sirix/query/function/xml/index/scan/ScanCASIndexRange.java @@ -1,4 +1,4 @@ -package org.sirix.xquery.function.xml.index.scan; +package org.sirix.query.function.xml.index.scan; import org.brackit.xquery.QueryContext; import org.brackit.xquery.QueryException; @@ -21,10 +21,10 @@ import org.sirix.index.IndexType; import org.sirix.index.cas.CASFilterRange; import org.sirix.index.path.xml.XmlPCRCollector; -import org.sirix.xquery.function.FunUtil; -import org.sirix.xquery.function.sdb.SDBFun; -import org.sirix.xquery.function.xml.XMLFun; -import org.sirix.xquery.node.XmlDBNode; +import org.sirix.query.function.FunUtil; +import org.sirix.query.function.sdb.SDBFun; +import org.sirix.query.function.xml.XMLFun; +import org.sirix.query.node.XmlDBNode; import java.util.Set; diff --git a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/xml/index/scan/ScanNameIndex.java b/bundles/sirix-query/src/main/java/org/sirix/query/function/xml/index/scan/ScanNameIndex.java similarity index 93% rename from bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/xml/index/scan/ScanNameIndex.java rename to bundles/sirix-query/src/main/java/org/sirix/query/function/xml/index/scan/ScanNameIndex.java index a3debe6aa..5a35c780e 100644 --- a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/xml/index/scan/ScanNameIndex.java +++ b/bundles/sirix-query/src/main/java/org/sirix/query/function/xml/index/scan/ScanNameIndex.java @@ -1,4 +1,4 @@ -package org.sirix.xquery.function.xml.index.scan; +package org.sirix.query.function.xml.index.scan; import org.brackit.xquery.QueryContext; import org.brackit.xquery.QueryException; @@ -17,10 +17,10 @@ import org.sirix.index.IndexDef; import org.sirix.index.IndexType; import org.sirix.index.name.NameFilter; -import org.sirix.xquery.function.FunUtil; -import org.sirix.xquery.function.sdb.SDBFun; -import org.sirix.xquery.function.xml.XMLFun; -import org.sirix.xquery.node.XmlDBNode; +import org.sirix.query.function.FunUtil; +import org.sirix.query.function.sdb.SDBFun; +import org.sirix.query.function.xml.XMLFun; +import org.sirix.query.node.XmlDBNode; import java.util.Set; diff --git a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/xml/index/scan/ScanPathIndex.java b/bundles/sirix-query/src/main/java/org/sirix/query/function/xml/index/scan/ScanPathIndex.java similarity index 93% rename from bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/xml/index/scan/ScanPathIndex.java rename to bundles/sirix-query/src/main/java/org/sirix/query/function/xml/index/scan/ScanPathIndex.java index 23693c826..6a3c13054 100644 --- a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/xml/index/scan/ScanPathIndex.java +++ b/bundles/sirix-query/src/main/java/org/sirix/query/function/xml/index/scan/ScanPathIndex.java @@ -1,4 +1,4 @@ -package org.sirix.xquery.function.xml.index.scan; +package org.sirix.query.function.xml.index.scan; import org.brackit.xquery.QueryContext; import org.brackit.xquery.QueryException; @@ -17,10 +17,10 @@ import org.sirix.index.IndexDef; import org.sirix.index.IndexType; import org.sirix.index.path.PathFilter; -import org.sirix.xquery.function.FunUtil; -import org.sirix.xquery.function.sdb.SDBFun; -import org.sirix.xquery.function.xml.XMLFun; -import org.sirix.xquery.node.XmlDBNode; +import org.sirix.query.function.FunUtil; +import org.sirix.query.function.sdb.SDBFun; +import org.sirix.query.function.xml.XMLFun; +import org.sirix.query.node.XmlDBNode; import java.util.Set; diff --git a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/xml/io/Doc.java b/bundles/sirix-query/src/main/java/org/sirix/query/function/xml/io/Doc.java similarity index 91% rename from bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/xml/io/Doc.java rename to bundles/sirix-query/src/main/java/org/sirix/query/function/xml/io/Doc.java index 7721589d2..fc530d474 100644 --- a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/xml/io/Doc.java +++ b/bundles/sirix-query/src/main/java/org/sirix/query/function/xml/io/Doc.java @@ -1,4 +1,4 @@ -package org.sirix.xquery.function.xml.io; +package org.sirix.query.function.xml.io; import org.brackit.xquery.QueryContext; import org.brackit.xquery.QueryException; @@ -8,9 +8,9 @@ import org.brackit.xquery.jdm.Sequence; import org.brackit.xquery.jdm.Signature; import org.brackit.xquery.module.StaticContext; -import org.sirix.xquery.function.FunUtil; -import org.sirix.xquery.function.xml.XMLFun; -import org.sirix.xquery.node.XmlDBCollection; +import org.sirix.query.function.FunUtil; +import org.sirix.query.function.xml.XMLFun; +import org.sirix.query.node.XmlDBCollection; /** *

diff --git a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/xml/io/DocByPointInTime.java b/bundles/sirix-query/src/main/java/org/sirix/query/function/xml/io/DocByPointInTime.java similarity index 91% rename from bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/xml/io/DocByPointInTime.java rename to bundles/sirix-query/src/main/java/org/sirix/query/function/xml/io/DocByPointInTime.java index 3a9e9dda5..10c0326c0 100644 --- a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/xml/io/DocByPointInTime.java +++ b/bundles/sirix-query/src/main/java/org/sirix/query/function/xml/io/DocByPointInTime.java @@ -1,4 +1,4 @@ -package org.sirix.xquery.function.xml.io; +package org.sirix.query.function.xml.io; import org.brackit.xquery.QueryContext; import org.brackit.xquery.QueryException; @@ -9,9 +9,9 @@ import org.brackit.xquery.jdm.Sequence; import org.brackit.xquery.jdm.Signature; import org.brackit.xquery.module.StaticContext; -import org.sirix.xquery.function.DateTimeToInstant; -import org.sirix.xquery.function.xml.XMLFun; -import org.sirix.xquery.node.XmlDBCollection; +import org.sirix.query.function.DateTimeToInstant; +import org.sirix.query.function.xml.XMLFun; +import org.sirix.query.node.XmlDBCollection; import java.time.Instant; diff --git a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/xml/io/Import.java b/bundles/sirix-query/src/main/java/org/sirix/query/function/xml/io/Import.java similarity index 94% rename from bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/xml/io/Import.java rename to bundles/sirix-query/src/main/java/org/sirix/query/function/xml/io/Import.java index a01eb3821..e9e30da36 100644 --- a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/xml/io/Import.java +++ b/bundles/sirix-query/src/main/java/org/sirix/query/function/xml/io/Import.java @@ -1,4 +1,4 @@ -package org.sirix.xquery.function.xml.io; +package org.sirix.query.function.xml.io; import org.brackit.xquery.QueryContext; import org.brackit.xquery.QueryException; @@ -16,10 +16,10 @@ import org.sirix.diff.algorithm.fmse.FMSE; import org.sirix.diff.service.FMSEImport; import org.sirix.utils.SirixFiles; -import org.sirix.xquery.function.xml.XMLFun; -import org.sirix.xquery.node.BasicXmlDBStore; -import org.sirix.xquery.node.XmlDBCollection; -import org.sirix.xquery.node.XmlDBNode; +import org.sirix.query.function.xml.XMLFun; +import org.sirix.query.node.BasicXmlDBStore; +import org.sirix.query.node.XmlDBCollection; +import org.sirix.query.node.XmlDBNode; import java.io.IOException; import java.nio.file.Files; diff --git a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/xml/io/Load.java b/bundles/sirix-query/src/main/java/org/sirix/query/function/xml/io/Load.java similarity index 97% rename from bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/xml/io/Load.java rename to bundles/sirix-query/src/main/java/org/sirix/query/function/xml/io/Load.java index 0c2a3c352..8e565be77 100644 --- a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/xml/io/Load.java +++ b/bundles/sirix-query/src/main/java/org/sirix/query/function/xml/io/Load.java @@ -1,4 +1,4 @@ -package org.sirix.xquery.function.xml.io; +package org.sirix.query.function.xml.io; import org.brackit.xquery.ErrorCode; import org.brackit.xquery.QueryContext; @@ -21,11 +21,11 @@ import org.brackit.xquery.node.parser.NodeSubtreeParser; import org.brackit.xquery.util.annotation.FunctionAnnotation; import org.brackit.xquery.util.io.URIHandler; -import org.sirix.xquery.function.DateTimeToInstant; -import org.sirix.xquery.function.FunUtil; -import org.sirix.xquery.function.xml.XMLFun; -import org.sirix.xquery.node.BasicXmlDBStore; -import org.sirix.xquery.node.XmlDBCollection; +import org.sirix.query.function.DateTimeToInstant; +import org.sirix.query.function.FunUtil; +import org.sirix.query.function.xml.XMLFun; +import org.sirix.query.node.BasicXmlDBStore; +import org.sirix.query.node.XmlDBCollection; import java.io.IOException; import java.time.Instant; diff --git a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/xml/io/OpenRevisions.java b/bundles/sirix-query/src/main/java/org/sirix/query/function/xml/io/OpenRevisions.java similarity index 93% rename from bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/xml/io/OpenRevisions.java rename to bundles/sirix-query/src/main/java/org/sirix/query/function/xml/io/OpenRevisions.java index b2b8e8074..fe41a416a 100644 --- a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/xml/io/OpenRevisions.java +++ b/bundles/sirix-query/src/main/java/org/sirix/query/function/xml/io/OpenRevisions.java @@ -1,4 +1,4 @@ -package org.sirix.xquery.function.xml.io; +package org.sirix.query.function.xml.io; import org.brackit.xquery.QueryContext; import org.brackit.xquery.QueryException; @@ -11,9 +11,9 @@ import org.brackit.xquery.jdm.Signature; import org.brackit.xquery.module.StaticContext; import org.brackit.xquery.sequence.ItemSequence; -import org.sirix.xquery.function.xml.XMLFun; -import org.sirix.xquery.node.XmlDBCollection; -import org.sirix.xquery.node.XmlDBNode; +import org.sirix.query.function.xml.XMLFun; +import org.sirix.query.node.XmlDBCollection; +import org.sirix.query.node.XmlDBNode; import java.time.Instant; import java.util.ArrayList; diff --git a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/xml/io/Serialize.java b/bundles/sirix-query/src/main/java/org/sirix/query/function/xml/io/Serialize.java similarity index 95% rename from bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/xml/io/Serialize.java rename to bundles/sirix-query/src/main/java/org/sirix/query/function/xml/io/Serialize.java index 2930970c1..a02b055be 100644 --- a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/xml/io/Serialize.java +++ b/bundles/sirix-query/src/main/java/org/sirix/query/function/xml/io/Serialize.java @@ -19,7 +19,7 @@ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY * WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.sirix.xquery.function.xml.io; +package org.sirix.query.function.xml.io; import org.brackit.xquery.QueryContext; import org.brackit.xquery.QueryException; @@ -35,9 +35,9 @@ import org.brackit.xquery.module.StaticContext; import org.brackit.xquery.util.io.IOUtils; import org.brackit.xquery.util.serialize.StringSerializer; -import org.sirix.xquery.function.FunUtil; -import org.sirix.xquery.function.sdb.SDBFun; -import org.sirix.xquery.function.xml.XMLFun; +import org.sirix.query.function.FunUtil; +import org.sirix.query.function.sdb.SDBFun; +import org.sirix.query.function.xml.XMLFun; import java.io.FileNotFoundException; import java.io.FileOutputStream; diff --git a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/xml/io/Store.java b/bundles/sirix-query/src/main/java/org/sirix/query/function/xml/io/Store.java similarity index 97% rename from bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/xml/io/Store.java rename to bundles/sirix-query/src/main/java/org/sirix/query/function/xml/io/Store.java index 63468daf1..a6695b7a3 100644 --- a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/xml/io/Store.java +++ b/bundles/sirix-query/src/main/java/org/sirix/query/function/xml/io/Store.java @@ -1,4 +1,4 @@ -package org.sirix.xquery.function.xml.io; +package org.sirix.query.function.xml.io; import org.brackit.xquery.ErrorCode; import org.brackit.xquery.QueryContext; @@ -15,11 +15,11 @@ import org.brackit.xquery.node.parser.NodeSubtreeHandler; import org.brackit.xquery.node.parser.NodeSubtreeParser; import org.brackit.xquery.util.annotation.FunctionAnnotation; -import org.sirix.xquery.function.DateTimeToInstant; -import org.sirix.xquery.function.FunUtil; -import org.sirix.xquery.function.xml.XMLFun; -import org.sirix.xquery.node.XmlDBCollection; -import org.sirix.xquery.node.XmlDBStore; +import org.sirix.query.function.DateTimeToInstant; +import org.sirix.query.function.FunUtil; +import org.sirix.query.function.xml.XMLFun; +import org.sirix.query.node.XmlDBCollection; +import org.sirix.query.node.XmlDBStore; import java.time.Instant; diff --git a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/xml/trx/GetAttributeCount.java b/bundles/sirix-query/src/main/java/org/sirix/query/function/xml/trx/GetAttributeCount.java similarity index 90% rename from bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/xml/trx/GetAttributeCount.java rename to bundles/sirix-query/src/main/java/org/sirix/query/function/xml/trx/GetAttributeCount.java index d509fe1c1..7410dae35 100644 --- a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/xml/trx/GetAttributeCount.java +++ b/bundles/sirix-query/src/main/java/org/sirix/query/function/xml/trx/GetAttributeCount.java @@ -1,4 +1,4 @@ -package org.sirix.xquery.function.xml.trx; +package org.sirix.query.function.xml.trx; import org.brackit.xquery.QueryContext; import org.brackit.xquery.atomic.Int32; @@ -7,8 +7,8 @@ import org.brackit.xquery.jdm.Sequence; import org.brackit.xquery.jdm.Signature; import org.brackit.xquery.module.StaticContext; -import org.sirix.xquery.function.xml.XMLFun; -import org.sirix.xquery.node.XmlDBNode; +import org.sirix.query.function.xml.XMLFun; +import org.sirix.query.node.XmlDBNode; /** *

diff --git a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/xml/trx/GetNamespaceCount.java b/bundles/sirix-query/src/main/java/org/sirix/query/function/xml/trx/GetNamespaceCount.java similarity index 90% rename from bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/xml/trx/GetNamespaceCount.java rename to bundles/sirix-query/src/main/java/org/sirix/query/function/xml/trx/GetNamespaceCount.java index b844ca078..e52342bc5 100644 --- a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/function/xml/trx/GetNamespaceCount.java +++ b/bundles/sirix-query/src/main/java/org/sirix/query/function/xml/trx/GetNamespaceCount.java @@ -1,4 +1,4 @@ -package org.sirix.xquery.function.xml.trx; +package org.sirix.query.function.xml.trx; import org.brackit.xquery.QueryContext; import org.brackit.xquery.atomic.Int32; @@ -7,8 +7,8 @@ import org.brackit.xquery.jdm.Sequence; import org.brackit.xquery.jdm.Signature; import org.brackit.xquery.module.StaticContext; -import org.sirix.xquery.function.xml.XMLFun; -import org.sirix.xquery.node.XmlDBNode; +import org.sirix.query.function.xml.XMLFun; +import org.sirix.query.node.XmlDBNode; /** *

diff --git a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/json/AbstractJsonDBArray.java b/bundles/sirix-query/src/main/java/org/sirix/query/json/AbstractJsonDBArray.java similarity index 99% rename from bundles/sirix-xquery/src/main/java/org/sirix/xquery/json/AbstractJsonDBArray.java rename to bundles/sirix-query/src/main/java/org/sirix/query/json/AbstractJsonDBArray.java index 01c357715..c5f3f2eba 100644 --- a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/json/AbstractJsonDBArray.java +++ b/bundles/sirix-query/src/main/java/org/sirix/query/json/AbstractJsonDBArray.java @@ -1,4 +1,4 @@ -package org.sirix.xquery.json; +package org.sirix.query.json; import org.brackit.xquery.ErrorCode; import org.brackit.xquery.QueryException; @@ -21,7 +21,7 @@ import org.sirix.axis.temporal.LastAxis; import org.sirix.axis.temporal.NextAxis; import org.sirix.axis.temporal.PreviousAxis; -import org.sirix.xquery.StructuredDBItem; +import org.sirix.query.StructuredDBItem; import java.util.ArrayList; import java.util.List; diff --git a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/json/AtomicBooleanJsonDBItem.java b/bundles/sirix-query/src/main/java/org/sirix/query/json/AtomicBooleanJsonDBItem.java similarity index 95% rename from bundles/sirix-xquery/src/main/java/org/sirix/xquery/json/AtomicBooleanJsonDBItem.java rename to bundles/sirix-query/src/main/java/org/sirix/query/json/AtomicBooleanJsonDBItem.java index 4350b4b8e..042b5f247 100644 --- a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/json/AtomicBooleanJsonDBItem.java +++ b/bundles/sirix-query/src/main/java/org/sirix/query/json/AtomicBooleanJsonDBItem.java @@ -1,9 +1,9 @@ -package org.sirix.xquery.json; +package org.sirix.query.json; import org.brackit.xquery.atomic.Bool; import org.sirix.api.json.JsonNodeReadOnlyTrx; import org.sirix.api.json.JsonResourceSession; -import org.sirix.xquery.StructuredDBItem; +import org.sirix.query.StructuredDBItem; import static java.util.Objects.requireNonNull; diff --git a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/json/AtomicNullJsonDBItem.java b/bundles/sirix-query/src/main/java/org/sirix/query/json/AtomicNullJsonDBItem.java similarity index 91% rename from bundles/sirix-xquery/src/main/java/org/sirix/xquery/json/AtomicNullJsonDBItem.java rename to bundles/sirix-query/src/main/java/org/sirix/query/json/AtomicNullJsonDBItem.java index e7fce10b3..4af5a05eb 100644 --- a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/json/AtomicNullJsonDBItem.java +++ b/bundles/sirix-query/src/main/java/org/sirix/query/json/AtomicNullJsonDBItem.java @@ -1,10 +1,9 @@ -package org.sirix.xquery.json; +package org.sirix.query.json; -import com.google.common.base.Preconditions; import org.brackit.xquery.atomic.Null; import org.sirix.api.json.JsonNodeReadOnlyTrx; import org.sirix.api.json.JsonResourceSession; -import org.sirix.xquery.StructuredDBItem; +import org.sirix.query.StructuredDBItem; import static java.util.Objects.requireNonNull; diff --git a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/json/AtomicStrJsonDBItem.java b/bundles/sirix-query/src/main/java/org/sirix/query/json/AtomicStrJsonDBItem.java similarity index 95% rename from bundles/sirix-xquery/src/main/java/org/sirix/xquery/json/AtomicStrJsonDBItem.java rename to bundles/sirix-query/src/main/java/org/sirix/query/json/AtomicStrJsonDBItem.java index 57d42b630..f7b759ac1 100644 --- a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/json/AtomicStrJsonDBItem.java +++ b/bundles/sirix-query/src/main/java/org/sirix/query/json/AtomicStrJsonDBItem.java @@ -1,9 +1,9 @@ -package org.sirix.xquery.json; +package org.sirix.query.json; import org.brackit.xquery.atomic.Str; import org.sirix.api.json.JsonNodeReadOnlyTrx; import org.sirix.api.json.JsonResourceSession; -import org.sirix.xquery.StructuredDBItem; +import org.sirix.query.StructuredDBItem; import static java.util.Objects.requireNonNull; diff --git a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/json/BasicJsonDBStore.java b/bundles/sirix-query/src/main/java/org/sirix/query/json/BasicJsonDBStore.java similarity index 99% rename from bundles/sirix-xquery/src/main/java/org/sirix/xquery/json/BasicJsonDBStore.java rename to bundles/sirix-query/src/main/java/org/sirix/query/json/BasicJsonDBStore.java index bae4d6382..016d7a96c 100644 --- a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/json/BasicJsonDBStore.java +++ b/bundles/sirix-query/src/main/java/org/sirix/query/json/BasicJsonDBStore.java @@ -1,4 +1,4 @@ -package org.sirix.xquery.json; +package org.sirix.query.json; import com.google.gson.stream.JsonReader; import org.brackit.xquery.atomic.Str; diff --git a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/json/JsonDBArray.java b/bundles/sirix-query/src/main/java/org/sirix/query/json/JsonDBArray.java similarity index 92% rename from bundles/sirix-xquery/src/main/java/org/sirix/xquery/json/JsonDBArray.java rename to bundles/sirix-query/src/main/java/org/sirix/query/json/JsonDBArray.java index 3e3359075..a0fcb03d6 100644 --- a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/json/JsonDBArray.java +++ b/bundles/sirix-query/src/main/java/org/sirix/query/json/JsonDBArray.java @@ -1,6 +1,5 @@ -package org.sirix.xquery.json; +package org.sirix.query.json; -import com.google.common.base.Preconditions; import org.brackit.xquery.atomic.IntNumeric; import org.brackit.xquery.jdm.Stream; import org.brackit.xquery.jdm.json.Array; @@ -9,8 +8,8 @@ import org.sirix.axis.temporal.AllTimeAxis; import org.sirix.axis.temporal.FutureAxis; import org.sirix.axis.temporal.PastAxis; -import org.sirix.xquery.StructuredDBItem; -import org.sirix.xquery.stream.json.TemporalSirixJsonArrayStream; +import org.sirix.query.StructuredDBItem; +import org.sirix.query.stream.json.TemporalSirixJsonArrayStream; import static java.util.Objects.requireNonNull; diff --git a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/json/JsonDBArraySlice.java b/bundles/sirix-query/src/main/java/org/sirix/query/json/JsonDBArraySlice.java similarity index 97% rename from bundles/sirix-xquery/src/main/java/org/sirix/xquery/json/JsonDBArraySlice.java rename to bundles/sirix-query/src/main/java/org/sirix/query/json/JsonDBArraySlice.java index d6ff3b5d2..fde99da12 100644 --- a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/json/JsonDBArraySlice.java +++ b/bundles/sirix-query/src/main/java/org/sirix/query/json/JsonDBArraySlice.java @@ -1,6 +1,5 @@ -package org.sirix.xquery.json; +package org.sirix.query.json; -import com.google.common.base.Preconditions; import org.brackit.xquery.ErrorCode; import org.brackit.xquery.QueryException; import org.brackit.xquery.atomic.Int32; @@ -14,7 +13,7 @@ import org.sirix.axis.temporal.AllTimeAxis; import org.sirix.axis.temporal.FutureAxis; import org.sirix.axis.temporal.PastAxis; -import org.sirix.xquery.stream.json.TemporalSirixJsonArraySliceStream; +import org.sirix.query.stream.json.TemporalSirixJsonArraySliceStream; import java.util.ArrayList; import java.util.List; diff --git a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/json/JsonDBCollection.java b/bundles/sirix-query/src/main/java/org/sirix/query/json/JsonDBCollection.java similarity index 98% rename from bundles/sirix-xquery/src/main/java/org/sirix/xquery/json/JsonDBCollection.java rename to bundles/sirix-query/src/main/java/org/sirix/query/json/JsonDBCollection.java index 995eb61a4..def7219ea 100644 --- a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/json/JsonDBCollection.java +++ b/bundles/sirix-query/src/main/java/org/sirix/query/json/JsonDBCollection.java @@ -1,6 +1,5 @@ -package org.sirix.xquery.json; +package org.sirix.query.json; -import com.google.common.base.Preconditions; import com.google.gson.stream.JsonReader; import org.brackit.xquery.jdm.DocumentException; import org.brackit.xquery.jdm.Stream; @@ -19,7 +18,7 @@ import org.sirix.exception.SirixIOException; import org.sirix.service.json.shredder.JsonShredder; import org.sirix.utils.LogWrapper; -import org.sirix.xquery.node.XmlDBCollection; +import org.sirix.query.node.XmlDBCollection; import org.slf4j.LoggerFactory; import java.nio.file.Path; diff --git a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/json/JsonDBItem.java b/bundles/sirix-query/src/main/java/org/sirix/query/json/JsonDBItem.java similarity index 87% rename from bundles/sirix-xquery/src/main/java/org/sirix/xquery/json/JsonDBItem.java rename to bundles/sirix-query/src/main/java/org/sirix/query/json/JsonDBItem.java index 7a26015d3..9b5b97b9a 100644 --- a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/json/JsonDBItem.java +++ b/bundles/sirix-query/src/main/java/org/sirix/query/json/JsonDBItem.java @@ -1,15 +1,15 @@ -package org.sirix.xquery.json; - -import org.brackit.xquery.jdm.json.JsonItem; -import org.sirix.api.json.JsonNodeReadOnlyTrx; -import org.sirix.api.json.JsonResourceSession; - -public interface JsonDBItem extends JsonItem { - JsonResourceSession getResourceSession(); - - JsonNodeReadOnlyTrx getTrx(); - - long getNodeKey(); - - JsonDBCollection getCollection(); -} +package org.sirix.query.json; + +import org.brackit.xquery.jdm.json.JsonItem; +import org.sirix.api.json.JsonNodeReadOnlyTrx; +import org.sirix.api.json.JsonResourceSession; + +public interface JsonDBItem extends JsonItem { + JsonResourceSession getResourceSession(); + + JsonNodeReadOnlyTrx getTrx(); + + long getNodeKey(); + + JsonDBCollection getCollection(); +} diff --git a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/json/JsonDBObject.java b/bundles/sirix-query/src/main/java/org/sirix/query/json/JsonDBObject.java similarity index 98% rename from bundles/sirix-xquery/src/main/java/org/sirix/xquery/json/JsonDBObject.java rename to bundles/sirix-query/src/main/java/org/sirix/query/json/JsonDBObject.java index 4082658f6..50a2d826c 100644 --- a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/json/JsonDBObject.java +++ b/bundles/sirix-query/src/main/java/org/sirix/query/json/JsonDBObject.java @@ -1,4 +1,4 @@ -package org.sirix.xquery.json; +package org.sirix.query.json; import com.google.common.base.Preconditions; import org.brackit.xquery.ErrorCode; @@ -26,9 +26,9 @@ import org.sirix.axis.filter.json.JsonNameFilter; import org.sirix.axis.temporal.*; import org.sirix.index.path.summary.PathSummaryReader; -import org.sirix.xquery.StructuredDBItem; -import org.sirix.xquery.stream.json.SirixJsonStream; -import org.sirix.xquery.stream.json.TemporalSirixJsonObjectStream; +import org.sirix.query.StructuredDBItem; +import org.sirix.query.stream.json.SirixJsonStream; +import org.sirix.query.stream.json.TemporalSirixJsonObjectStream; import java.util.BitSet; import java.util.HashMap; diff --git a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/json/JsonDBStore.java b/bundles/sirix-query/src/main/java/org/sirix/query/json/JsonDBStore.java similarity index 98% rename from bundles/sirix-xquery/src/main/java/org/sirix/xquery/json/JsonDBStore.java rename to bundles/sirix-query/src/main/java/org/sirix/query/json/JsonDBStore.java index 175a2d493..aba4090e6 100644 --- a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/json/JsonDBStore.java +++ b/bundles/sirix-query/src/main/java/org/sirix/query/json/JsonDBStore.java @@ -1,4 +1,4 @@ -package org.sirix.xquery.json; +package org.sirix.query.json; import com.google.gson.stream.JsonReader; import org.brackit.xquery.atomic.Str; diff --git a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/json/JsonItemFactory.java b/bundles/sirix-query/src/main/java/org/sirix/query/json/JsonItemFactory.java similarity index 98% rename from bundles/sirix-xquery/src/main/java/org/sirix/xquery/json/JsonItemFactory.java rename to bundles/sirix-query/src/main/java/org/sirix/query/json/JsonItemFactory.java index 3d0afb2ae..e08d61499 100644 --- a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/json/JsonItemFactory.java +++ b/bundles/sirix-query/src/main/java/org/sirix/query/json/JsonItemFactory.java @@ -1,4 +1,4 @@ -package org.sirix.xquery.json; +package org.sirix.query.json; import org.brackit.xquery.atomic.*; import org.brackit.xquery.jdm.json.JsonItem; diff --git a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/json/JsonItemIterator.java b/bundles/sirix-query/src/main/java/org/sirix/query/json/JsonItemIterator.java similarity index 97% rename from bundles/sirix-xquery/src/main/java/org/sirix/xquery/json/JsonItemIterator.java rename to bundles/sirix-query/src/main/java/org/sirix/query/json/JsonItemIterator.java index c9c67a34c..8a5675bc1 100644 --- a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/json/JsonItemIterator.java +++ b/bundles/sirix-query/src/main/java/org/sirix/query/json/JsonItemIterator.java @@ -1,4 +1,4 @@ -package org.sirix.xquery.json; +package org.sirix.query.json; import com.google.common.collect.AbstractIterator; import org.brackit.xquery.jdm.Item; diff --git a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/json/JsonItemSequence.java b/bundles/sirix-query/src/main/java/org/sirix/query/json/JsonItemSequence.java similarity index 99% rename from bundles/sirix-xquery/src/main/java/org/sirix/xquery/json/JsonItemSequence.java rename to bundles/sirix-query/src/main/java/org/sirix/query/json/JsonItemSequence.java index 149f712f7..8aabf2758 100644 --- a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/json/JsonItemSequence.java +++ b/bundles/sirix-query/src/main/java/org/sirix/query/json/JsonItemSequence.java @@ -1,4 +1,4 @@ -package org.sirix.xquery.json; +package org.sirix.query.json; import org.brackit.xquery.atomic.*; import org.brackit.xquery.jdm.Item; diff --git a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/json/JsonObjectKeyDBArray.java b/bundles/sirix-query/src/main/java/org/sirix/query/json/JsonObjectKeyDBArray.java similarity index 95% rename from bundles/sirix-xquery/src/main/java/org/sirix/xquery/json/JsonObjectKeyDBArray.java rename to bundles/sirix-query/src/main/java/org/sirix/query/json/JsonObjectKeyDBArray.java index db10b328b..71acc24b3 100644 --- a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/json/JsonObjectKeyDBArray.java +++ b/bundles/sirix-query/src/main/java/org/sirix/query/json/JsonObjectKeyDBArray.java @@ -1,4 +1,4 @@ -package org.sirix.xquery.json; +package org.sirix.query.json; import org.brackit.xquery.atomic.IntNumeric; import org.brackit.xquery.jdm.Stream; @@ -9,7 +9,7 @@ import org.sirix.axis.temporal.AllTimeAxis; import org.sirix.axis.temporal.FutureAxis; import org.sirix.axis.temporal.PastAxis; -import org.sirix.xquery.stream.json.TemporalSirixJsonObjectKeyArrayStream; +import org.sirix.query.stream.json.TemporalSirixJsonObjectKeyArrayStream; import static java.util.Objects.requireNonNull; diff --git a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/json/JsonObjectValueDBArray.java b/bundles/sirix-query/src/main/java/org/sirix/query/json/JsonObjectValueDBArray.java similarity index 95% rename from bundles/sirix-xquery/src/main/java/org/sirix/xquery/json/JsonObjectValueDBArray.java rename to bundles/sirix-query/src/main/java/org/sirix/query/json/JsonObjectValueDBArray.java index b9acdd2fd..4b44ffd3a 100644 --- a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/json/JsonObjectValueDBArray.java +++ b/bundles/sirix-query/src/main/java/org/sirix/query/json/JsonObjectValueDBArray.java @@ -1,4 +1,4 @@ -package org.sirix.xquery.json; +package org.sirix.query.json; import org.brackit.xquery.atomic.IntNumeric; import org.brackit.xquery.jdm.Stream; @@ -8,7 +8,7 @@ import org.sirix.axis.temporal.AllTimeAxis; import org.sirix.axis.temporal.FutureAxis; import org.sirix.axis.temporal.PastAxis; -import org.sirix.xquery.stream.json.TemporalSirixJsonObjectValueArrayStream; +import org.sirix.query.stream.json.TemporalSirixJsonObjectValueArrayStream; import static java.util.Objects.requireNonNull; diff --git a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/json/NumericJsonDBItem.java b/bundles/sirix-query/src/main/java/org/sirix/query/json/NumericJsonDBItem.java similarity index 93% rename from bundles/sirix-xquery/src/main/java/org/sirix/xquery/json/NumericJsonDBItem.java rename to bundles/sirix-query/src/main/java/org/sirix/query/json/NumericJsonDBItem.java index 8523749d6..f2c6bbe16 100644 --- a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/json/NumericJsonDBItem.java +++ b/bundles/sirix-query/src/main/java/org/sirix/query/json/NumericJsonDBItem.java @@ -1,195 +1,195 @@ -package org.sirix.xquery.json; - -import org.brackit.xquery.atomic.AbstractNumeric; -import org.brackit.xquery.atomic.Atomic; -import org.brackit.xquery.atomic.IntNumeric; -import org.brackit.xquery.atomic.Numeric; -import org.brackit.xquery.jdm.Type; -import org.sirix.api.json.JsonNodeReadOnlyTrx; -import org.sirix.api.json.JsonResourceSession; -import org.sirix.xquery.StructuredDBItem; - -import java.math.BigDecimal; - -import static java.util.Objects.requireNonNull; - -public final class NumericJsonDBItem extends AbstractNumeric - implements JsonDBItem, Numeric, StructuredDBItem { - - /** Sirix {@link JsonNodeReadOnlyTrx}. */ - private final JsonNodeReadOnlyTrx rtx; - - /** Sirix node key. */ - private final long nodeKey; - - /** Collection this node is part of. */ - private final JsonDBCollection collection; - - /** The atomic value delegate. */ - private final Numeric atomic; - - /** - * Constructor. - * - * @param rtx {@link JsonNodeReadOnlyTrx} for providing reading access to the underlying node - * @param collection {@link JsonDBCollection} reference - * @param atomic the atomic value delegate - */ - public NumericJsonDBItem(final JsonNodeReadOnlyTrx rtx, final JsonDBCollection collection, final Numeric atomic) { - this.collection = requireNonNull(collection); - this.rtx = requireNonNull(rtx); - nodeKey = this.rtx.getNodeKey(); - this.atomic = atomic; - } - - @Override - public JsonResourceSession getResourceSession() { - return rtx.getResourceSession(); - } - - private void moveRtx() { - rtx.moveTo(nodeKey); - } - - @Override - public JsonNodeReadOnlyTrx getTrx() { - moveRtx(); - - return rtx; - } - - @Override - public JsonDBCollection getCollection() { - return collection; - } - - @Override - public boolean booleanValue() { - return atomic.booleanValue(); - } - - @Override - public Type type() { - return atomic.type(); - } - - @Override - public int cmp(Atomic atomic) { - return this.atomic.cmp(atomic); - } - - @Override - public String stringValue() { - return atomic.stringValue(); - } - - @Override - public Atomic asType(Type type) { - return atomic.asType(type); - } - - @Override - public long getNodeKey() { - return nodeKey; - } - - @Override - public double doubleValue() { - return atomic.doubleValue(); - } - - @Override - public float floatValue() { - return atomic.floatValue(); - } - - @Override - public BigDecimal integerValue() { - return atomic.integerValue(); - } - - @Override - public BigDecimal decimalValue() { - return atomic.decimalValue(); - } - - @Override - public long longValue() { - return atomic.longValue(); - } - - @Override - public int intValue() { - return atomic.intValue(); - } - - @Override - public IntNumeric asIntNumeric() { - return atomic.asIntNumeric(); - } - - @Override - public Numeric add(Numeric other) { - return atomic.add(other); - } - - @Override - public Numeric subtract(Numeric other) { - return atomic.subtract(other); - } - - @Override - public Numeric multiply(Numeric other) { - return atomic.multiply(other); - } - - @Override - public Numeric div(Numeric other) { - return atomic.div(other); - } - - @Override - public Numeric idiv(Numeric other) { - return atomic.idiv(other); - } - - @Override - public Numeric mod(Numeric other) { - return atomic.mod(other); - } - - @Override - public Numeric negate() { - return atomic.negate(); - } - - @Override - public Numeric round() { - return atomic.round(); - } - - @Override - public Numeric abs() { - return atomic.abs(); - } - - @Override - public Numeric floor() { - return atomic.floor(); - } - - @Override - public Numeric ceiling() { - return atomic.ceiling(); - } - - @Override - public Numeric roundHalfToEven(int precision) { - return atomic.roundHalfToEven(precision); - } - - @Override - public int atomicCmpInternal(Atomic atomic) { - return this.atomic.atomicCmp(atomic); - } -} +package org.sirix.query.json; + +import org.brackit.xquery.atomic.AbstractNumeric; +import org.brackit.xquery.atomic.Atomic; +import org.brackit.xquery.atomic.IntNumeric; +import org.brackit.xquery.atomic.Numeric; +import org.brackit.xquery.jdm.Type; +import org.sirix.api.json.JsonNodeReadOnlyTrx; +import org.sirix.api.json.JsonResourceSession; +import org.sirix.query.StructuredDBItem; + +import java.math.BigDecimal; + +import static java.util.Objects.requireNonNull; + +public final class NumericJsonDBItem extends AbstractNumeric + implements JsonDBItem, Numeric, StructuredDBItem { + + /** Sirix {@link JsonNodeReadOnlyTrx}. */ + private final JsonNodeReadOnlyTrx rtx; + + /** Sirix node key. */ + private final long nodeKey; + + /** Collection this node is part of. */ + private final JsonDBCollection collection; + + /** The atomic value delegate. */ + private final Numeric atomic; + + /** + * Constructor. + * + * @param rtx {@link JsonNodeReadOnlyTrx} for providing reading access to the underlying node + * @param collection {@link JsonDBCollection} reference + * @param atomic the atomic value delegate + */ + public NumericJsonDBItem(final JsonNodeReadOnlyTrx rtx, final JsonDBCollection collection, final Numeric atomic) { + this.collection = requireNonNull(collection); + this.rtx = requireNonNull(rtx); + nodeKey = this.rtx.getNodeKey(); + this.atomic = atomic; + } + + @Override + public JsonResourceSession getResourceSession() { + return rtx.getResourceSession(); + } + + private void moveRtx() { + rtx.moveTo(nodeKey); + } + + @Override + public JsonNodeReadOnlyTrx getTrx() { + moveRtx(); + + return rtx; + } + + @Override + public JsonDBCollection getCollection() { + return collection; + } + + @Override + public boolean booleanValue() { + return atomic.booleanValue(); + } + + @Override + public Type type() { + return atomic.type(); + } + + @Override + public int cmp(Atomic atomic) { + return this.atomic.cmp(atomic); + } + + @Override + public String stringValue() { + return atomic.stringValue(); + } + + @Override + public Atomic asType(Type type) { + return atomic.asType(type); + } + + @Override + public long getNodeKey() { + return nodeKey; + } + + @Override + public double doubleValue() { + return atomic.doubleValue(); + } + + @Override + public float floatValue() { + return atomic.floatValue(); + } + + @Override + public BigDecimal integerValue() { + return atomic.integerValue(); + } + + @Override + public BigDecimal decimalValue() { + return atomic.decimalValue(); + } + + @Override + public long longValue() { + return atomic.longValue(); + } + + @Override + public int intValue() { + return atomic.intValue(); + } + + @Override + public IntNumeric asIntNumeric() { + return atomic.asIntNumeric(); + } + + @Override + public Numeric add(Numeric other) { + return atomic.add(other); + } + + @Override + public Numeric subtract(Numeric other) { + return atomic.subtract(other); + } + + @Override + public Numeric multiply(Numeric other) { + return atomic.multiply(other); + } + + @Override + public Numeric div(Numeric other) { + return atomic.div(other); + } + + @Override + public Numeric idiv(Numeric other) { + return atomic.idiv(other); + } + + @Override + public Numeric mod(Numeric other) { + return atomic.mod(other); + } + + @Override + public Numeric negate() { + return atomic.negate(); + } + + @Override + public Numeric round() { + return atomic.round(); + } + + @Override + public Numeric abs() { + return atomic.abs(); + } + + @Override + public Numeric floor() { + return atomic.floor(); + } + + @Override + public Numeric ceiling() { + return atomic.ceiling(); + } + + @Override + public Numeric roundHalfToEven(int precision) { + return atomic.roundHalfToEven(precision); + } + + @Override + public int atomicCmpInternal(Atomic atomic) { + return this.atomic.atomicCmp(atomic); + } +} diff --git a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/json/TemporalJsonDBCollection.java b/bundles/sirix-query/src/main/java/org/sirix/query/json/TemporalJsonDBCollection.java similarity index 79% rename from bundles/sirix-xquery/src/main/java/org/sirix/xquery/json/TemporalJsonDBCollection.java rename to bundles/sirix-query/src/main/java/org/sirix/query/json/TemporalJsonDBCollection.java index b9c95ebe5..af97937b1 100644 --- a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/json/TemporalJsonDBCollection.java +++ b/bundles/sirix-query/src/main/java/org/sirix/query/json/TemporalJsonDBCollection.java @@ -1,7 +1,7 @@ -package org.sirix.xquery.json; - -import org.brackit.xquery.jdm.json.TemporalJsonCollection; - -public interface TemporalJsonDBCollection extends TemporalJsonCollection { - -} +package org.sirix.query.json; + +import org.brackit.xquery.jdm.json.TemporalJsonCollection; + +public interface TemporalJsonDBCollection extends TemporalJsonCollection { + +} diff --git a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/json/TemporalJsonDBItem.java b/bundles/sirix-query/src/main/java/org/sirix/query/json/TemporalJsonDBItem.java similarity index 75% rename from bundles/sirix-xquery/src/main/java/org/sirix/xquery/json/TemporalJsonDBItem.java rename to bundles/sirix-query/src/main/java/org/sirix/query/json/TemporalJsonDBItem.java index 25da33e4b..8a3f1f833 100644 --- a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/json/TemporalJsonDBItem.java +++ b/bundles/sirix-query/src/main/java/org/sirix/query/json/TemporalJsonDBItem.java @@ -1,9 +1,9 @@ -package org.sirix.xquery.json; - -import org.brackit.xquery.jdm.json.TemporalJsonItem; -import org.sirix.api.json.JsonNodeReadOnlyTrx; -import org.sirix.xquery.StructuredDBItem; - -public interface TemporalJsonDBItem> - extends TemporalJsonItem, StructuredDBItem { -} +package org.sirix.query.json; + +import org.brackit.xquery.jdm.json.TemporalJsonItem; +import org.sirix.api.json.JsonNodeReadOnlyTrx; +import org.sirix.query.StructuredDBItem; + +public interface TemporalJsonDBItem> + extends TemporalJsonItem, StructuredDBItem { +} diff --git a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/node/BasicXmlDBStore.java b/bundles/sirix-query/src/main/java/org/sirix/query/node/BasicXmlDBStore.java similarity index 99% rename from bundles/sirix-xquery/src/main/java/org/sirix/xquery/node/BasicXmlDBStore.java rename to bundles/sirix-query/src/main/java/org/sirix/query/node/BasicXmlDBStore.java index ed45a4239..ce393563a 100644 --- a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/node/BasicXmlDBStore.java +++ b/bundles/sirix-query/src/main/java/org/sirix/query/node/BasicXmlDBStore.java @@ -1,4 +1,4 @@ -package org.sirix.xquery.node; +package org.sirix.query.node; import org.brackit.xquery.jdm.DocumentException; import org.brackit.xquery.jdm.Stream; diff --git a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/node/SirixScope.java b/bundles/sirix-query/src/main/java/org/sirix/query/node/SirixScope.java similarity index 94% rename from bundles/sirix-xquery/src/main/java/org/sirix/xquery/node/SirixScope.java rename to bundles/sirix-query/src/main/java/org/sirix/query/node/SirixScope.java index 1d996827a..89a6617f5 100644 --- a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/node/SirixScope.java +++ b/bundles/sirix-query/src/main/java/org/sirix/query/node/SirixScope.java @@ -1,107 +1,107 @@ -package org.sirix.xquery.node; - -import org.brackit.xquery.atomic.QNm; -import org.brackit.xquery.jdm.DocumentException; -import org.brackit.xquery.jdm.Scope; -import org.brackit.xquery.jdm.Stream; -import org.checkerframework.checker.nullness.qual.Nullable; -import org.sirix.api.xml.XmlNodeReadOnlyTrx; -import org.sirix.api.xml.XmlNodeTrx; -import org.sirix.exception.SirixException; -import org.sirix.settings.Fixed; - -/** - * Sirix scope. - * - * @author Johannes Lichtenberger - * - */ -public final class SirixScope implements Scope { - - /** Sirix {@link XmlNodeReadOnlyTrx}. */ - private final XmlNodeReadOnlyTrx rtx; - - /** - * Constructor. - * - * @param node database node - */ - public SirixScope(final XmlDBNode node) { - // Assertion instead of requireNonNull(...) (part of internal API). - assert node != null; - rtx = node.getTrx(); - } - - @Override - public Stream localPrefixes() { - return new Stream<>() { - private int index; - - private final int mNamespaces = rtx.getNamespaceCount(); - - @Override - public String next() throws DocumentException { - if (index < mNamespaces) { - rtx.moveToNamespace(index++); - return rtx.nameForKey(rtx.getPrefixKey()); - } - return null; - } - - @Override - public void close() { - } - }; - } - - @Override - public String defaultNS() { - return resolvePrefix(""); - } - - @Override - public void addPrefix(final String prefix, final String uri) { - if (rtx instanceof final XmlNodeTrx wtx) { - try { - wtx.insertNamespace(new QNm(uri, prefix, "")); - } catch (final SirixException e) { - throw new DocumentException(e); - } - } - } - - @Override - public String resolvePrefix(final @Nullable String prefix) { - final int prefixVocID = (prefix == null || prefix.isEmpty()) - ? -1 - : rtx.keyForName(prefix); - while (true) { - // First iterate over all namespaces. - for (int i = 0, namespaces = rtx.getNamespaceCount(); i < namespaces; i++) { - rtx.moveToNamespace(i); - final String name = rtx.nameForKey(prefixVocID); - if (name != null) { - return name; - } - rtx.moveToParent(); - } - // Then move to parent. - if (rtx.hasParent() && rtx.getParentKey() != Fixed.NULL_NODE_KEY.getStandardProperty()) { - rtx.moveToParent(); - } else { - break; - } - } - if (prefix.equals("xml")) { - return "http://www.w3.org/XML/1998/namespace"; - } - return prefixVocID == -1 - ? "" - : null; - } - - @Override - public void setDefaultNS(final String uri) { - addPrefix("", uri); - } -} +package org.sirix.query.node; + +import org.brackit.xquery.atomic.QNm; +import org.brackit.xquery.jdm.DocumentException; +import org.brackit.xquery.jdm.Scope; +import org.brackit.xquery.jdm.Stream; +import org.checkerframework.checker.nullness.qual.Nullable; +import org.sirix.api.xml.XmlNodeReadOnlyTrx; +import org.sirix.api.xml.XmlNodeTrx; +import org.sirix.exception.SirixException; +import org.sirix.settings.Fixed; + +/** + * Sirix scope. + * + * @author Johannes Lichtenberger + * + */ +public final class SirixScope implements Scope { + + /** Sirix {@link XmlNodeReadOnlyTrx}. */ + private final XmlNodeReadOnlyTrx rtx; + + /** + * Constructor. + * + * @param node database node + */ + public SirixScope(final XmlDBNode node) { + // Assertion instead of requireNonNull(...) (part of internal API). + assert node != null; + rtx = node.getTrx(); + } + + @Override + public Stream localPrefixes() { + return new Stream<>() { + private int index; + + private final int mNamespaces = rtx.getNamespaceCount(); + + @Override + public String next() throws DocumentException { + if (index < mNamespaces) { + rtx.moveToNamespace(index++); + return rtx.nameForKey(rtx.getPrefixKey()); + } + return null; + } + + @Override + public void close() { + } + }; + } + + @Override + public String defaultNS() { + return resolvePrefix(""); + } + + @Override + public void addPrefix(final String prefix, final String uri) { + if (rtx instanceof final XmlNodeTrx wtx) { + try { + wtx.insertNamespace(new QNm(uri, prefix, "")); + } catch (final SirixException e) { + throw new DocumentException(e); + } + } + } + + @Override + public String resolvePrefix(final @Nullable String prefix) { + final int prefixVocID = (prefix == null || prefix.isEmpty()) + ? -1 + : rtx.keyForName(prefix); + while (true) { + // First iterate over all namespaces. + for (int i = 0, namespaces = rtx.getNamespaceCount(); i < namespaces; i++) { + rtx.moveToNamespace(i); + final String name = rtx.nameForKey(prefixVocID); + if (name != null) { + return name; + } + rtx.moveToParent(); + } + // Then move to parent. + if (rtx.hasParent() && rtx.getParentKey() != Fixed.NULL_NODE_KEY.getStandardProperty()) { + rtx.moveToParent(); + } else { + break; + } + } + if (prefix.equals("xml")) { + return "http://www.w3.org/XML/1998/namespace"; + } + return prefixVocID == -1 + ? "" + : null; + } + + @Override + public void setDefaultNS(final String uri) { + addPrefix("", uri); + } +} diff --git a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/node/SubtreeBuilder.java b/bundles/sirix-query/src/main/java/org/sirix/query/node/SubtreeBuilder.java similarity index 99% rename from bundles/sirix-xquery/src/main/java/org/sirix/xquery/node/SubtreeBuilder.java rename to bundles/sirix-query/src/main/java/org/sirix/query/node/SubtreeBuilder.java index ca7406b8f..d75529b90 100644 --- a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/node/SubtreeBuilder.java +++ b/bundles/sirix-query/src/main/java/org/sirix/query/node/SubtreeBuilder.java @@ -1,4 +1,4 @@ -package org.sirix.xquery.node; +package org.sirix.query.node; import org.brackit.xquery.atomic.Atomic; import org.brackit.xquery.atomic.QNm; diff --git a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/node/SubtreeProcessor.java b/bundles/sirix-query/src/main/java/org/sirix/query/node/SubtreeProcessor.java similarity index 95% rename from bundles/sirix-xquery/src/main/java/org/sirix/xquery/node/SubtreeProcessor.java rename to bundles/sirix-query/src/main/java/org/sirix/query/node/SubtreeProcessor.java index fbd5ec8bc..f36749e51 100644 --- a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/node/SubtreeProcessor.java +++ b/bundles/sirix-query/src/main/java/org/sirix/query/node/SubtreeProcessor.java @@ -1,189 +1,189 @@ -package org.sirix.xquery.node; - -import org.brackit.xquery.jdm.DocumentException; -import org.brackit.xquery.jdm.node.Node; -import org.brackit.xquery.node.parser.NodeSubtreeListener; -import org.sirix.utils.LogWrapper; -import org.slf4j.LoggerFactory; - -import java.util.ArrayList; -import java.util.List; - -/** - * SubtreeProcessor which notifies a list of listeners. - * - * @author Johannes Lichtenberger - * - * @param the node implementation - */ -public class SubtreeProcessor> { - /** {@link LogWrapper} reference. */ - private static final LogWrapper LOGWRAPPER = - new LogWrapper(LoggerFactory.getLogger(SubtreeProcessor.class)); - - /** Observers. */ - private final List> listeners; - - /** - * Constructor. - * - * @param listeners list of listeners/observers - */ - public SubtreeProcessor(final List> listeners) { - this.listeners = new ArrayList<>(); - if (listeners != null) { - this.listeners.addAll(listeners); - } - } - - /** - * Notify the beginning. - * - * @throws DocumentException if anything went wrong - */ - public void notifyBegin() throws DocumentException { - for (NodeSubtreeListener listener : listeners) { - listener.begin(); - } - } - - /** - * Notify the end. - * - * @throws DocumentException if anything went wrong - */ - public void notifyEnd() throws DocumentException { - for (NodeSubtreeListener listener : listeners) { - listener.end(); - } - } - - /** - * Notify the beginning of a document. - * - * @throws DocumentException if anything went wrong - */ - public void notifyBeginDocument() throws DocumentException { - for (NodeSubtreeListener listener : listeners) { - listener.startDocument(); - } - } - - /** - * Notify the end of a document. - * - * @throws DocumentException if anything went wrong - */ - public void notifyEndDocument() throws DocumentException { - for (NodeSubtreeListener listener : listeners) { - listener.endDocument(); - } - } - - /** - * Notify the start of a fragment. - * - * @throws DocumentException if anything went wrong - */ - public void notifyBeginFragment() throws DocumentException { - for (NodeSubtreeListener listener : listeners) { - listener.beginFragment(); - } - } - - /** - * Notify the end of a fragment. - * - * @throws DocumentException if anything went wrong - */ - public void notifyEndFragment() throws DocumentException { - for (NodeSubtreeListener listener : listeners) { - listener.endFragment(); - } - } - - /** - * Notify a failure. - */ - public void notifyFail() { - for (final NodeSubtreeListener listener : listeners) { - try { - listener.fail(); - } catch (final DocumentException e) { - LOGWRAPPER.error(e.getMessage(), e); - } - } - } - - /** - * Notify a start tag. - * - * @param node element node - * @throws DocumentException if anything went wrong - */ - public void notifyStartElement(final E node) throws DocumentException { - for (NodeSubtreeListener listener : listeners) { - listener.startElement(node); - } - } - - /** - * Notify an end tag. - * - * @param node element node - * @throws DocumentException if anything went wrong - */ - public void notifyEndElement(final E node) throws DocumentException { - for (NodeSubtreeListener listener : listeners) { - listener.endElement(node); - } - } - - /** - * Notify an attribute node. - * - * @param node attribute node - * @throws DocumentException if anything went wrong - */ - public void notifyAttribute(final E node) throws DocumentException { - for (NodeSubtreeListener listener : listeners) { - listener.attribute(node); - } - } - - /** - * Notify a text node. - * - * @param node text node - * @throws DocumentException if anything went wrong - */ - public void notifyText(final E node) throws DocumentException { - for (NodeSubtreeListener listener : listeners) { - listener.text(node); - } - } - - /** - * Notify a comment node. - * - * @param node comment node - * @throws DocumentException if anything went wrong - */ - public void notifyComment(final E node) throws DocumentException { - for (NodeSubtreeListener listener : listeners) { - listener.comment(node); - } - } - - /** - * Notify a processing instruction node. - * - * @param node the processing instruction - * @throws DocumentException if anything went wrong - */ - public void notifyProcessingInstruction(final E node) throws DocumentException { - for (NodeSubtreeListener listener : listeners) { - listener.processingInstruction(node); - } - } -} +package org.sirix.query.node; + +import org.brackit.xquery.jdm.DocumentException; +import org.brackit.xquery.jdm.node.Node; +import org.brackit.xquery.node.parser.NodeSubtreeListener; +import org.sirix.utils.LogWrapper; +import org.slf4j.LoggerFactory; + +import java.util.ArrayList; +import java.util.List; + +/** + * SubtreeProcessor which notifies a list of listeners. + * + * @author Johannes Lichtenberger + * + * @param the node implementation + */ +public class SubtreeProcessor> { + /** {@link LogWrapper} reference. */ + private static final LogWrapper LOGWRAPPER = + new LogWrapper(LoggerFactory.getLogger(SubtreeProcessor.class)); + + /** Observers. */ + private final List> listeners; + + /** + * Constructor. + * + * @param listeners list of listeners/observers + */ + public SubtreeProcessor(final List> listeners) { + this.listeners = new ArrayList<>(); + if (listeners != null) { + this.listeners.addAll(listeners); + } + } + + /** + * Notify the beginning. + * + * @throws DocumentException if anything went wrong + */ + public void notifyBegin() throws DocumentException { + for (NodeSubtreeListener listener : listeners) { + listener.begin(); + } + } + + /** + * Notify the end. + * + * @throws DocumentException if anything went wrong + */ + public void notifyEnd() throws DocumentException { + for (NodeSubtreeListener listener : listeners) { + listener.end(); + } + } + + /** + * Notify the beginning of a document. + * + * @throws DocumentException if anything went wrong + */ + public void notifyBeginDocument() throws DocumentException { + for (NodeSubtreeListener listener : listeners) { + listener.startDocument(); + } + } + + /** + * Notify the end of a document. + * + * @throws DocumentException if anything went wrong + */ + public void notifyEndDocument() throws DocumentException { + for (NodeSubtreeListener listener : listeners) { + listener.endDocument(); + } + } + + /** + * Notify the start of a fragment. + * + * @throws DocumentException if anything went wrong + */ + public void notifyBeginFragment() throws DocumentException { + for (NodeSubtreeListener listener : listeners) { + listener.beginFragment(); + } + } + + /** + * Notify the end of a fragment. + * + * @throws DocumentException if anything went wrong + */ + public void notifyEndFragment() throws DocumentException { + for (NodeSubtreeListener listener : listeners) { + listener.endFragment(); + } + } + + /** + * Notify a failure. + */ + public void notifyFail() { + for (final NodeSubtreeListener listener : listeners) { + try { + listener.fail(); + } catch (final DocumentException e) { + LOGWRAPPER.error(e.getMessage(), e); + } + } + } + + /** + * Notify a start tag. + * + * @param node element node + * @throws DocumentException if anything went wrong + */ + public void notifyStartElement(final E node) throws DocumentException { + for (NodeSubtreeListener listener : listeners) { + listener.startElement(node); + } + } + + /** + * Notify an end tag. + * + * @param node element node + * @throws DocumentException if anything went wrong + */ + public void notifyEndElement(final E node) throws DocumentException { + for (NodeSubtreeListener listener : listeners) { + listener.endElement(node); + } + } + + /** + * Notify an attribute node. + * + * @param node attribute node + * @throws DocumentException if anything went wrong + */ + public void notifyAttribute(final E node) throws DocumentException { + for (NodeSubtreeListener listener : listeners) { + listener.attribute(node); + } + } + + /** + * Notify a text node. + * + * @param node text node + * @throws DocumentException if anything went wrong + */ + public void notifyText(final E node) throws DocumentException { + for (NodeSubtreeListener listener : listeners) { + listener.text(node); + } + } + + /** + * Notify a comment node. + * + * @param node comment node + * @throws DocumentException if anything went wrong + */ + public void notifyComment(final E node) throws DocumentException { + for (NodeSubtreeListener listener : listeners) { + listener.comment(node); + } + } + + /** + * Notify a processing instruction node. + * + * @param node the processing instruction + * @throws DocumentException if anything went wrong + */ + public void notifyProcessingInstruction(final E node) throws DocumentException { + for (NodeSubtreeListener listener : listeners) { + listener.processingInstruction(node); + } + } +} diff --git a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/node/XmlDBCollection.java b/bundles/sirix-query/src/main/java/org/sirix/query/node/XmlDBCollection.java similarity index 99% rename from bundles/sirix-xquery/src/main/java/org/sirix/xquery/node/XmlDBCollection.java rename to bundles/sirix-query/src/main/java/org/sirix/query/node/XmlDBCollection.java index b990959ab..288a42b03 100644 --- a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/node/XmlDBCollection.java +++ b/bundles/sirix-query/src/main/java/org/sirix/query/node/XmlDBCollection.java @@ -1,4 +1,4 @@ -package org.sirix.xquery.node; +package org.sirix.query.node; import org.brackit.xquery.jdm.DocumentException; import org.brackit.xquery.jdm.Stream; diff --git a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/node/XmlDBNode.java b/bundles/sirix-query/src/main/java/org/sirix/query/node/XmlDBNode.java similarity index 99% rename from bundles/sirix-xquery/src/main/java/org/sirix/xquery/node/XmlDBNode.java rename to bundles/sirix-query/src/main/java/org/sirix/query/node/XmlDBNode.java index f7a2918fe..a6e13656c 100644 --- a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/node/XmlDBNode.java +++ b/bundles/sirix-query/src/main/java/org/sirix/query/node/XmlDBNode.java @@ -1,4 +1,4 @@ -package org.sirix.xquery.node; +package org.sirix.query.node; import com.google.common.base.MoreObjects; import org.brackit.xquery.atomic.Atomic; @@ -28,9 +28,9 @@ import org.sirix.service.InsertPosition; import org.sirix.settings.Fixed; import org.sirix.utils.LogWrapper; -import org.sirix.xquery.StructuredDBItem; -import org.sirix.xquery.stream.node.SirixNodeStream; -import org.sirix.xquery.stream.node.TemporalSirixNodeStream; +import org.sirix.query.StructuredDBItem; +import org.sirix.query.stream.node.SirixNodeStream; +import org.sirix.query.stream.node.TemporalSirixNodeStream; import org.slf4j.LoggerFactory; import java.util.Collections; diff --git a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/node/XmlDBStore.java b/bundles/sirix-query/src/main/java/org/sirix/query/node/XmlDBStore.java similarity index 98% rename from bundles/sirix-xquery/src/main/java/org/sirix/xquery/node/XmlDBStore.java rename to bundles/sirix-query/src/main/java/org/sirix/query/node/XmlDBStore.java index 8e3f75fed..be6d7e5e7 100644 --- a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/node/XmlDBStore.java +++ b/bundles/sirix-query/src/main/java/org/sirix/query/node/XmlDBStore.java @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.sirix.xquery.node; +package org.sirix.query.node; import org.brackit.xquery.jdm.Stream; import org.brackit.xquery.jdm.node.NodeStore; diff --git a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/package-info.java b/bundles/sirix-query/src/main/java/org/sirix/query/package-info.java similarity index 71% rename from bundles/sirix-xquery/src/main/java/org/sirix/xquery/package-info.java rename to bundles/sirix-query/src/main/java/org/sirix/query/package-info.java index 989080969..14bd1ef97 100644 --- a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/package-info.java +++ b/bundles/sirix-query/src/main/java/org/sirix/query/package-info.java @@ -1,7 +1,7 @@ -/** - * Base package for XQuery bundle. - * - * @author Johannes Lichtenberger - * - */ -package org.sirix.xquery; +/** + * Base package for XQuery bundle. + * + * @author Johannes Lichtenberger + * + */ +package org.sirix.query; diff --git a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/stream/json/SirixJsonItemKeyStream.java b/bundles/sirix-query/src/main/java/org/sirix/query/stream/json/SirixJsonItemKeyStream.java similarity index 91% rename from bundles/sirix-xquery/src/main/java/org/sirix/xquery/stream/json/SirixJsonItemKeyStream.java rename to bundles/sirix-query/src/main/java/org/sirix/query/stream/json/SirixJsonItemKeyStream.java index 6a7cde021..f5241d9dd 100644 --- a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/stream/json/SirixJsonItemKeyStream.java +++ b/bundles/sirix-query/src/main/java/org/sirix/query/stream/json/SirixJsonItemKeyStream.java @@ -1,12 +1,12 @@ -package org.sirix.xquery.stream.json; +package org.sirix.query.stream.json; import org.brackit.xquery.jdm.Item; import org.brackit.xquery.jdm.Stream; import org.jetbrains.annotations.Nullable; import org.sirix.api.json.JsonNodeReadOnlyTrx; import org.sirix.index.redblacktree.keyvalue.NodeReferences; -import org.sirix.xquery.json.JsonDBCollection; -import org.sirix.xquery.json.JsonItemFactory; +import org.sirix.query.json.JsonDBCollection; +import org.sirix.query.json.JsonItemFactory; import java.util.Iterator; diff --git a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/stream/json/SirixJsonStream.java b/bundles/sirix-query/src/main/java/org/sirix/query/stream/json/SirixJsonStream.java similarity index 91% rename from bundles/sirix-xquery/src/main/java/org/sirix/xquery/stream/json/SirixJsonStream.java rename to bundles/sirix-query/src/main/java/org/sirix/query/stream/json/SirixJsonStream.java index f9a43b894..edaa88a77 100644 --- a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/stream/json/SirixJsonStream.java +++ b/bundles/sirix-query/src/main/java/org/sirix/query/stream/json/SirixJsonStream.java @@ -1,12 +1,12 @@ -package org.sirix.xquery.stream.json; +package org.sirix.query.stream.json; import com.google.common.base.MoreObjects; import org.brackit.xquery.jdm.Item; import org.brackit.xquery.jdm.Stream; import org.sirix.api.Axis; import org.sirix.api.SirixAxis; -import org.sirix.xquery.json.JsonDBCollection; -import org.sirix.xquery.json.JsonItemFactory; +import org.sirix.query.json.JsonDBCollection; +import org.sirix.query.json.JsonItemFactory; import static java.util.Objects.requireNonNull; diff --git a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/stream/json/TemporalSirixJsonArraySliceStream.java b/bundles/sirix-query/src/main/java/org/sirix/query/stream/json/TemporalSirixJsonArraySliceStream.java similarity index 90% rename from bundles/sirix-xquery/src/main/java/org/sirix/xquery/stream/json/TemporalSirixJsonArraySliceStream.java rename to bundles/sirix-query/src/main/java/org/sirix/query/stream/json/TemporalSirixJsonArraySliceStream.java index 64425ff3d..f018869f1 100644 --- a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/stream/json/TemporalSirixJsonArraySliceStream.java +++ b/bundles/sirix-query/src/main/java/org/sirix/query/stream/json/TemporalSirixJsonArraySliceStream.java @@ -1,4 +1,4 @@ -package org.sirix.xquery.stream.json; +package org.sirix.query.stream.json; import com.google.common.base.MoreObjects; import org.brackit.xquery.jdm.Stream; @@ -6,9 +6,9 @@ import org.sirix.api.json.JsonNodeReadOnlyTrx; import org.sirix.api.json.JsonNodeTrx; import org.sirix.axis.AbstractTemporalAxis; -import org.sirix.xquery.json.JsonDBArraySlice; -import org.sirix.xquery.json.JsonDBCollection; -import org.sirix.xquery.node.XmlDBCollection; +import org.sirix.query.json.JsonDBArraySlice; +import org.sirix.query.json.JsonDBCollection; +import org.sirix.query.node.XmlDBCollection; import static java.util.Objects.requireNonNull; diff --git a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/stream/json/TemporalSirixJsonArrayStream.java b/bundles/sirix-query/src/main/java/org/sirix/query/stream/json/TemporalSirixJsonArrayStream.java similarity index 88% rename from bundles/sirix-xquery/src/main/java/org/sirix/xquery/stream/json/TemporalSirixJsonArrayStream.java rename to bundles/sirix-query/src/main/java/org/sirix/query/stream/json/TemporalSirixJsonArrayStream.java index c25030aeb..61c67b8a1 100644 --- a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/stream/json/TemporalSirixJsonArrayStream.java +++ b/bundles/sirix-query/src/main/java/org/sirix/query/stream/json/TemporalSirixJsonArrayStream.java @@ -1,4 +1,4 @@ -package org.sirix.xquery.stream.json; +package org.sirix.query.stream.json; import com.google.common.base.MoreObjects; import org.brackit.xquery.jdm.Stream; @@ -6,9 +6,9 @@ import org.sirix.api.json.JsonNodeReadOnlyTrx; import org.sirix.api.json.JsonNodeTrx; import org.sirix.axis.AbstractTemporalAxis; -import org.sirix.xquery.json.JsonDBArray; -import org.sirix.xquery.json.JsonDBCollection; -import org.sirix.xquery.node.XmlDBCollection; +import org.sirix.query.json.JsonDBArray; +import org.sirix.query.json.JsonDBCollection; +import org.sirix.query.node.XmlDBCollection; import static java.util.Objects.requireNonNull; diff --git a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/stream/json/TemporalSirixJsonObjectKeyArrayStream.java b/bundles/sirix-query/src/main/java/org/sirix/query/stream/json/TemporalSirixJsonObjectKeyArrayStream.java similarity index 88% rename from bundles/sirix-xquery/src/main/java/org/sirix/xquery/stream/json/TemporalSirixJsonObjectKeyArrayStream.java rename to bundles/sirix-query/src/main/java/org/sirix/query/stream/json/TemporalSirixJsonObjectKeyArrayStream.java index 9f76ee4e9..c0331aeb0 100644 --- a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/stream/json/TemporalSirixJsonObjectKeyArrayStream.java +++ b/bundles/sirix-query/src/main/java/org/sirix/query/stream/json/TemporalSirixJsonObjectKeyArrayStream.java @@ -1,4 +1,4 @@ -package org.sirix.xquery.stream.json; +package org.sirix.query.stream.json; import com.google.common.base.MoreObjects; import org.brackit.xquery.jdm.Stream; @@ -6,9 +6,9 @@ import org.sirix.api.json.JsonNodeReadOnlyTrx; import org.sirix.api.json.JsonNodeTrx; import org.sirix.axis.AbstractTemporalAxis; -import org.sirix.xquery.json.JsonDBCollection; -import org.sirix.xquery.json.JsonObjectKeyDBArray; -import org.sirix.xquery.node.XmlDBCollection; +import org.sirix.query.json.JsonDBCollection; +import org.sirix.query.json.JsonObjectKeyDBArray; +import org.sirix.query.node.XmlDBCollection; import static java.util.Objects.requireNonNull; diff --git a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/stream/json/TemporalSirixJsonObjectStream.java b/bundles/sirix-query/src/main/java/org/sirix/query/stream/json/TemporalSirixJsonObjectStream.java similarity index 88% rename from bundles/sirix-xquery/src/main/java/org/sirix/xquery/stream/json/TemporalSirixJsonObjectStream.java rename to bundles/sirix-query/src/main/java/org/sirix/query/stream/json/TemporalSirixJsonObjectStream.java index c1efbe672..7957ceba9 100644 --- a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/stream/json/TemporalSirixJsonObjectStream.java +++ b/bundles/sirix-query/src/main/java/org/sirix/query/stream/json/TemporalSirixJsonObjectStream.java @@ -1,4 +1,4 @@ -package org.sirix.xquery.stream.json; +package org.sirix.query.stream.json; import com.google.common.base.MoreObjects; import org.brackit.xquery.jdm.Stream; @@ -6,9 +6,9 @@ import org.sirix.api.json.JsonNodeReadOnlyTrx; import org.sirix.api.json.JsonNodeTrx; import org.sirix.axis.AbstractTemporalAxis; -import org.sirix.xquery.json.JsonDBCollection; -import org.sirix.xquery.json.JsonDBObject; -import org.sirix.xquery.node.XmlDBCollection; +import org.sirix.query.json.JsonDBCollection; +import org.sirix.query.json.JsonDBObject; +import org.sirix.query.node.XmlDBCollection; import static java.util.Objects.requireNonNull; diff --git a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/stream/json/TemporalSirixJsonObjectValueArrayStream.java b/bundles/sirix-query/src/main/java/org/sirix/query/stream/json/TemporalSirixJsonObjectValueArrayStream.java similarity index 88% rename from bundles/sirix-xquery/src/main/java/org/sirix/xquery/stream/json/TemporalSirixJsonObjectValueArrayStream.java rename to bundles/sirix-query/src/main/java/org/sirix/query/stream/json/TemporalSirixJsonObjectValueArrayStream.java index dd4e90473..6ed53551e 100644 --- a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/stream/json/TemporalSirixJsonObjectValueArrayStream.java +++ b/bundles/sirix-query/src/main/java/org/sirix/query/stream/json/TemporalSirixJsonObjectValueArrayStream.java @@ -1,4 +1,4 @@ -package org.sirix.xquery.stream.json; +package org.sirix.query.stream.json; import com.google.common.base.MoreObjects; import org.brackit.xquery.jdm.Stream; @@ -6,9 +6,9 @@ import org.sirix.api.json.JsonNodeReadOnlyTrx; import org.sirix.api.json.JsonNodeTrx; import org.sirix.axis.AbstractTemporalAxis; -import org.sirix.xquery.json.JsonDBCollection; -import org.sirix.xquery.json.JsonObjectValueDBArray; -import org.sirix.xquery.node.XmlDBCollection; +import org.sirix.query.json.JsonDBCollection; +import org.sirix.query.json.JsonObjectValueDBArray; +import org.sirix.query.node.XmlDBCollection; import static java.util.Objects.requireNonNull; diff --git a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/stream/node/SirixNodeKeyStream.java b/bundles/sirix-query/src/main/java/org/sirix/query/stream/node/SirixNodeKeyStream.java similarity index 91% rename from bundles/sirix-xquery/src/main/java/org/sirix/xquery/stream/node/SirixNodeKeyStream.java rename to bundles/sirix-query/src/main/java/org/sirix/query/stream/node/SirixNodeKeyStream.java index b07927fff..e4e2bf7a0 100644 --- a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/stream/node/SirixNodeKeyStream.java +++ b/bundles/sirix-query/src/main/java/org/sirix/query/stream/node/SirixNodeKeyStream.java @@ -1,11 +1,11 @@ -package org.sirix.xquery.stream.node; +package org.sirix.query.stream.node; import org.brackit.xquery.jdm.Stream; import org.roaringbitmap.longlong.PeekableLongIterator; import org.sirix.api.xml.XmlNodeReadOnlyTrx; import org.sirix.index.redblacktree.keyvalue.NodeReferences; -import org.sirix.xquery.node.XmlDBCollection; -import org.sirix.xquery.node.XmlDBNode; +import org.sirix.query.node.XmlDBCollection; +import org.sirix.query.node.XmlDBNode; import java.util.Iterator; diff --git a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/stream/node/SirixNodeStream.java b/bundles/sirix-query/src/main/java/org/sirix/query/stream/node/SirixNodeStream.java similarity index 90% rename from bundles/sirix-xquery/src/main/java/org/sirix/xquery/stream/node/SirixNodeStream.java rename to bundles/sirix-query/src/main/java/org/sirix/query/stream/node/SirixNodeStream.java index 73ae66643..aff95e727 100644 --- a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/stream/node/SirixNodeStream.java +++ b/bundles/sirix-query/src/main/java/org/sirix/query/stream/node/SirixNodeStream.java @@ -1,12 +1,12 @@ -package org.sirix.xquery.stream.node; +package org.sirix.query.stream.node; import com.google.common.base.MoreObjects; import org.brackit.xquery.jdm.DocumentException; import org.brackit.xquery.jdm.Stream; import org.sirix.api.Axis; import org.sirix.api.SirixAxis; -import org.sirix.xquery.node.XmlDBCollection; -import org.sirix.xquery.node.XmlDBNode; +import org.sirix.query.node.XmlDBCollection; +import org.sirix.query.node.XmlDBNode; import static java.util.Objects.requireNonNull; diff --git a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/stream/node/TemporalSirixNodeStream.java b/bundles/sirix-query/src/main/java/org/sirix/query/stream/node/TemporalSirixNodeStream.java similarity index 92% rename from bundles/sirix-xquery/src/main/java/org/sirix/xquery/stream/node/TemporalSirixNodeStream.java rename to bundles/sirix-query/src/main/java/org/sirix/query/stream/node/TemporalSirixNodeStream.java index 84e929b80..985e94c38 100644 --- a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/stream/node/TemporalSirixNodeStream.java +++ b/bundles/sirix-query/src/main/java/org/sirix/query/stream/node/TemporalSirixNodeStream.java @@ -1,4 +1,4 @@ -package org.sirix.xquery.stream.node; +package org.sirix.query.stream.node; import com.google.common.base.MoreObjects; import org.brackit.xquery.jdm.DocumentException; @@ -8,8 +8,8 @@ import org.sirix.api.xml.XmlNodeReadOnlyTrx; import org.sirix.api.xml.XmlNodeTrx; import org.sirix.axis.AbstractTemporalAxis; -import org.sirix.xquery.node.XmlDBCollection; -import org.sirix.xquery.node.XmlDBNode; +import org.sirix.query.node.XmlDBCollection; +import org.sirix.query.node.XmlDBNode; import static java.util.Objects.requireNonNull; diff --git a/bundles/sirix-xquery/src/main/resources/logback.xml b/bundles/sirix-query/src/main/resources/logback.xml similarity index 100% rename from bundles/sirix-xquery/src/main/resources/logback.xml rename to bundles/sirix-query/src/main/resources/logback.xml diff --git a/bundles/sirix-xquery/src/test/java/org/sirix/xquery/AbstractJsonTest.java b/bundles/sirix-query/src/test/java/org/sirix/query/AbstractJsonTest.java similarity index 98% rename from bundles/sirix-xquery/src/test/java/org/sirix/xquery/AbstractJsonTest.java rename to bundles/sirix-query/src/test/java/org/sirix/query/AbstractJsonTest.java index a1e807f60..37384badc 100644 --- a/bundles/sirix-xquery/src/test/java/org/sirix/xquery/AbstractJsonTest.java +++ b/bundles/sirix-query/src/test/java/org/sirix/query/AbstractJsonTest.java @@ -1,10 +1,10 @@ -package org.sirix.xquery; +package org.sirix.query; import org.brackit.xquery.XQuery; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.sirix.JsonTestHelper; -import org.sirix.xquery.json.BasicJsonDBStore; +import org.sirix.query.json.BasicJsonDBStore; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/bundles/sirix-xquery/src/test/java/org/sirix/xquery/JsonIntegrationTest.java b/bundles/sirix-query/src/test/java/org/sirix/query/JsonIntegrationTest.java similarity index 99% rename from bundles/sirix-xquery/src/test/java/org/sirix/xquery/JsonIntegrationTest.java rename to bundles/sirix-query/src/test/java/org/sirix/query/JsonIntegrationTest.java index 5b787fe38..cc2c136a9 100644 --- a/bundles/sirix-xquery/src/test/java/org/sirix/xquery/JsonIntegrationTest.java +++ b/bundles/sirix-query/src/test/java/org/sirix/query/JsonIntegrationTest.java @@ -1,4 +1,4 @@ -package org.sirix.xquery; +package org.sirix.query; import org.junit.Test; diff --git a/bundles/sirix-xquery/src/test/java/org/sirix/xquery/function/jn/diff/DiffTest.java b/bundles/sirix-query/src/test/java/org/sirix/query/function/jn/diff/DiffTest.java similarity index 96% rename from bundles/sirix-xquery/src/test/java/org/sirix/xquery/function/jn/diff/DiffTest.java rename to bundles/sirix-query/src/test/java/org/sirix/query/function/jn/diff/DiffTest.java index 2cf0eb2cb..3ea3b8649 100644 --- a/bundles/sirix-xquery/src/test/java/org/sirix/xquery/function/jn/diff/DiffTest.java +++ b/bundles/sirix-query/src/test/java/org/sirix/query/function/jn/diff/DiffTest.java @@ -1,4 +1,4 @@ -package org.sirix.xquery.function.jn.diff; +package org.sirix.query.function.jn.diff; import org.brackit.xquery.XQuery; import org.junit.After; @@ -8,9 +8,9 @@ import org.sirix.JsonTestHelper.PATHS; import org.sirix.access.trx.node.json.objectvalue.StringValue; import org.sirix.service.json.shredder.JsonShredder; -import org.sirix.xquery.SirixCompileChain; -import org.sirix.xquery.SirixQueryContext; -import org.sirix.xquery.json.BasicJsonDBStore; +import org.sirix.query.SirixCompileChain; +import org.sirix.query.SirixQueryContext; +import org.sirix.query.json.BasicJsonDBStore; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/bundles/sirix-xquery/src/test/java/org/sirix/xquery/function/jn/io/DocIntegrationTest.java b/bundles/sirix-query/src/test/java/org/sirix/query/function/jn/io/DocIntegrationTest.java similarity index 86% rename from bundles/sirix-xquery/src/test/java/org/sirix/xquery/function/jn/io/DocIntegrationTest.java rename to bundles/sirix-query/src/test/java/org/sirix/query/function/jn/io/DocIntegrationTest.java index 6277ad1c9..ac86914c3 100644 --- a/bundles/sirix-xquery/src/test/java/org/sirix/xquery/function/jn/io/DocIntegrationTest.java +++ b/bundles/sirix-query/src/test/java/org/sirix/query/function/jn/io/DocIntegrationTest.java @@ -1,47 +1,47 @@ -package org.sirix.xquery.function.jn.io; - -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.io.PrintWriter; -import org.brackit.xquery.XQuery; -import org.junit.Test; -import org.sirix.JsonTestHelper; -import org.sirix.JsonTestHelper.PATHS; -import org.sirix.xquery.SirixCompileChain; -import org.sirix.xquery.SirixQueryContext; -import org.sirix.xquery.json.BasicJsonDBStore; -import junit.framework.TestCase; - -public final class DocIntegrationTest extends TestCase { - - @Override - protected void setUp() throws Exception { - JsonTestHelper.deleteEverything(); - } - - @Override - protected void tearDown() { - JsonTestHelper.deleteEverything(); - } - - @Test - public void test() throws IOException { - // Initialize query context and store. - try (final BasicJsonDBStore store = BasicJsonDBStore.newBuilder().location(PATHS.PATH1.getFile().getParent()).build(); - final SirixQueryContext ctx = SirixQueryContext.createWithJsonStore(store); - final SirixCompileChain chain = SirixCompileChain.createWithJsonStore(store)) { - - // Use XQuery to store a JSON string into the store. - final String storeQuery = "jn:store('json-path1','mydoc.jn','[\"bla\", \"blubb\"]')"; - new XQuery(chain, storeQuery).evaluate(ctx); - - // Use XQuery to load a JSON database/resource. - final String openQuery = "jn:doc('json-path1','mydoc.jn')"; - - try (final var out = new ByteArrayOutputStream(); final var printWriter = new PrintWriter(out)) { - new XQuery(chain, openQuery).serialize(ctx, printWriter); - assertEquals("[\"bla\",\"blubb\"]", out.toString()); - } - } - } -} +package org.sirix.query.function.jn.io; + +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.PrintWriter; +import org.brackit.xquery.XQuery; +import org.junit.Test; +import org.sirix.JsonTestHelper; +import org.sirix.JsonTestHelper.PATHS; +import org.sirix.query.SirixCompileChain; +import org.sirix.query.SirixQueryContext; +import org.sirix.query.json.BasicJsonDBStore; +import junit.framework.TestCase; + +public final class DocIntegrationTest extends TestCase { + + @Override + protected void setUp() throws Exception { + JsonTestHelper.deleteEverything(); + } + + @Override + protected void tearDown() { + JsonTestHelper.deleteEverything(); + } + + @Test + public void test() throws IOException { + // Initialize query context and store. + try (final BasicJsonDBStore store = BasicJsonDBStore.newBuilder().location(PATHS.PATH1.getFile().getParent()).build(); + final SirixQueryContext ctx = SirixQueryContext.createWithJsonStore(store); + final SirixCompileChain chain = SirixCompileChain.createWithJsonStore(store)) { + + // Use XQuery to store a JSON string into the store. + final String storeQuery = "jn:store('json-path1','mydoc.jn','[\"bla\", \"blubb\"]')"; + new XQuery(chain, storeQuery).evaluate(ctx); + + // Use XQuery to load a JSON database/resource. + final String openQuery = "jn:doc('json-path1','mydoc.jn')"; + + try (final var out = new ByteArrayOutputStream(); final var printWriter = new PrintWriter(out)) { + new XQuery(chain, openQuery).serialize(ctx, printWriter); + assertEquals("[\"bla\",\"blubb\"]", out.toString()); + } + } + } +} diff --git a/bundles/sirix-xquery/src/test/java/org/sirix/xquery/function/jn/io/LoadIntegrationTest.java b/bundles/sirix-query/src/test/java/org/sirix/query/function/jn/io/LoadIntegrationTest.java similarity index 92% rename from bundles/sirix-xquery/src/test/java/org/sirix/xquery/function/jn/io/LoadIntegrationTest.java rename to bundles/sirix-query/src/test/java/org/sirix/query/function/jn/io/LoadIntegrationTest.java index 8be435dd8..f241eb978 100644 --- a/bundles/sirix-xquery/src/test/java/org/sirix/xquery/function/jn/io/LoadIntegrationTest.java +++ b/bundles/sirix-query/src/test/java/org/sirix/query/function/jn/io/LoadIntegrationTest.java @@ -1,99 +1,98 @@ -package org.sirix.xquery.function.jn.io; - -import java.nio.file.Path; -import java.nio.file.Paths; -import org.brackit.xquery.XQuery; -import org.junit.Before; -import org.junit.Test; -import org.junit.jupiter.api.AfterEach; -import org.junit.jupiter.api.BeforeEach; -import org.sirix.JsonTestHelper; -import org.sirix.JsonTestHelper.PATHS; -import org.sirix.xquery.SirixCompileChain; -import org.sirix.xquery.SirixQueryContext; -import org.sirix.xquery.json.BasicJsonDBStore; -import junit.framework.TestCase; - -public final class LoadIntegrationTest extends TestCase { - - final Path testResources = Paths.get("src", "test", "resources"); - - final Path jsonArray = testResources.resolve("json").resolve("array.json"); - - final Path jsonObject = testResources.resolve("json").resolve("object.json"); - - @BeforeEach - protected void setUp() throws Exception { - JsonTestHelper.deleteEverything(); - } - - @AfterEach - protected void tearDown() { - JsonTestHelper.deleteEverything(); - } - - @Test - public void test() { - // Initialize query context and store. - try (final BasicJsonDBStore store = BasicJsonDBStore.newBuilder().location(PATHS.PATH1.getFile()).build(); - final SirixQueryContext ctx = SirixQueryContext.createWithJsonStore(store); - final SirixCompileChain chain = SirixCompileChain.createWithJsonStore(store)) { - - // Use XQuery to store a JSON string into the store. - final var str = jsonArray.toAbsolutePath().toString(); - final String query = "jn:load('mycol.jn','mydoc.jn','" + str + "')"; - new XQuery(chain, query).evaluate(ctx); - } - } - - @Test - public void testWithCommitMessage() { - // Initialize query context and store. - try (final BasicJsonDBStore store = BasicJsonDBStore.newBuilder().location(PATHS.PATH1.getFile()).build(); - final SirixQueryContext ctx = SirixQueryContext.createWithJsonStore(store); - final SirixCompileChain chain = SirixCompileChain.createWithJsonStore(store)) { - - // Use XQuery to store a JSON string into the store. - final var str = jsonArray.toAbsolutePath().toString(); - final String query = "jn:load('mycol.jn','mydoc.jn','" + str + "',true(),'commitMessage')"; - new XQuery(chain, query).evaluate(ctx); - } - } - - @Test - public void testWithCommitMessageAndCommitTimestamp() { - // Initialize query context and store. - try (final BasicJsonDBStore store = BasicJsonDBStore.newBuilder().location(PATHS.PATH1.getFile()).build(); - final SirixQueryContext ctx = SirixQueryContext.createWithJsonStore(store); - final SirixCompileChain chain = SirixCompileChain.createWithJsonStore(store)) { - - // Use XQuery to store a JSON string into the store. - final var str = jsonArray.toAbsolutePath().toString(); - final String query = "jn:load('mycol.jn','mydoc.jn','" + str + "',true(),'commitMessage',xs:dateTime(\"2021-05-01T00:00:00\"))"; - new XQuery(chain, query).evaluate(ctx); - } - } - - @Test - public void testMultipleStrings() { - // Initialize query context and store. - try (final BasicJsonDBStore store = BasicJsonDBStore.newBuilder().location(PATHS.PATH1.getFile()).build(); - final SirixQueryContext ctx = SirixQueryContext.createWithJsonStore(store); - final SirixCompileChain chain = SirixCompileChain.createWithJsonStore(store)) { - - // Use XQuery to load multiple JSON files into the store. - final var array = jsonArray.toAbsolutePath().toString(); - final var object = jsonObject.toAbsolutePath().toString(); - final String query = "jn:load('mycol.jn',(),('" + array + "','" + object + "'))"; - new XQuery(chain, query).evaluate(ctx); - - // Use XQuery to add a JSON file to the collection. - final String queryAdd = "jn:load('mycol.jn',(),'" + array + "',false())"; - new XQuery(chain, queryAdd).evaluate(ctx); - - // Use XQuery to add JSON files to the collection. - final String queryAddStrings = "jn:load('mycol.jn',(),('" + array + "','" + object + "'),false())"; - new XQuery(chain, queryAddStrings).evaluate(ctx); - } - } -} +package org.sirix.query.function.jn.io; + +import java.nio.file.Path; +import java.nio.file.Paths; +import org.brackit.xquery.XQuery; +import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.sirix.JsonTestHelper; +import org.sirix.JsonTestHelper.PATHS; +import org.sirix.query.SirixCompileChain; +import org.sirix.query.SirixQueryContext; +import org.sirix.query.json.BasicJsonDBStore; +import junit.framework.TestCase; + +public final class LoadIntegrationTest extends TestCase { + + final Path testResources = Paths.get("src", "test", "resources"); + + final Path jsonArray = testResources.resolve("json").resolve("array.json"); + + final Path jsonObject = testResources.resolve("json").resolve("object.json"); + + @BeforeEach + protected void setUp() throws Exception { + JsonTestHelper.deleteEverything(); + } + + @AfterEach + protected void tearDown() { + JsonTestHelper.deleteEverything(); + } + + @Test + public void test() { + // Initialize query context and store. + try (final BasicJsonDBStore store = BasicJsonDBStore.newBuilder().location(PATHS.PATH1.getFile()).build(); + final SirixQueryContext ctx = SirixQueryContext.createWithJsonStore(store); + final SirixCompileChain chain = SirixCompileChain.createWithJsonStore(store)) { + + // Use XQuery to store a JSON string into the store. + final var str = jsonArray.toAbsolutePath().toString(); + final String query = "jn:load('mycol.jn','mydoc.jn','" + str + "')"; + new XQuery(chain, query).evaluate(ctx); + } + } + + @Test + public void testWithCommitMessage() { + // Initialize query context and store. + try (final BasicJsonDBStore store = BasicJsonDBStore.newBuilder().location(PATHS.PATH1.getFile()).build(); + final SirixQueryContext ctx = SirixQueryContext.createWithJsonStore(store); + final SirixCompileChain chain = SirixCompileChain.createWithJsonStore(store)) { + + // Use XQuery to store a JSON string into the store. + final var str = jsonArray.toAbsolutePath().toString(); + final String query = "jn:load('mycol.jn','mydoc.jn','" + str + "',true(),'commitMessage')"; + new XQuery(chain, query).evaluate(ctx); + } + } + + @Test + public void testWithCommitMessageAndCommitTimestamp() { + // Initialize query context and store. + try (final BasicJsonDBStore store = BasicJsonDBStore.newBuilder().location(PATHS.PATH1.getFile()).build(); + final SirixQueryContext ctx = SirixQueryContext.createWithJsonStore(store); + final SirixCompileChain chain = SirixCompileChain.createWithJsonStore(store)) { + + // Use XQuery to store a JSON string into the store. + final var str = jsonArray.toAbsolutePath().toString(); + final String query = "jn:load('mycol.jn','mydoc.jn','" + str + "',true(),'commitMessage',xs:dateTime(\"2021-05-01T00:00:00\"))"; + new XQuery(chain, query).evaluate(ctx); + } + } + + @Test + public void testMultipleStrings() { + // Initialize query context and store. + try (final BasicJsonDBStore store = BasicJsonDBStore.newBuilder().location(PATHS.PATH1.getFile()).build(); + final SirixQueryContext ctx = SirixQueryContext.createWithJsonStore(store); + final SirixCompileChain chain = SirixCompileChain.createWithJsonStore(store)) { + + // Use XQuery to load multiple JSON files into the store. + final var array = jsonArray.toAbsolutePath().toString(); + final var object = jsonObject.toAbsolutePath().toString(); + final String query = "jn:load('mycol.jn',(),('" + array + "','" + object + "'))"; + new XQuery(chain, query).evaluate(ctx); + + // Use XQuery to add a JSON file to the collection. + final String queryAdd = "jn:load('mycol.jn',(),'" + array + "',false())"; + new XQuery(chain, queryAdd).evaluate(ctx); + + // Use XQuery to add JSON files to the collection. + final String queryAddStrings = "jn:load('mycol.jn',(),('" + array + "','" + object + "'),false())"; + new XQuery(chain, queryAddStrings).evaluate(ctx); + } + } +} diff --git a/bundles/sirix-xquery/src/test/java/org/sirix/xquery/function/jn/io/SimpleQueryIntegrationTest.java b/bundles/sirix-query/src/test/java/org/sirix/query/function/jn/io/SimpleQueryIntegrationTest.java similarity index 98% rename from bundles/sirix-xquery/src/test/java/org/sirix/xquery/function/jn/io/SimpleQueryIntegrationTest.java rename to bundles/sirix-query/src/test/java/org/sirix/query/function/jn/io/SimpleQueryIntegrationTest.java index c0224ea44..437480a73 100644 --- a/bundles/sirix-xquery/src/test/java/org/sirix/xquery/function/jn/io/SimpleQueryIntegrationTest.java +++ b/bundles/sirix-query/src/test/java/org/sirix/query/function/jn/io/SimpleQueryIntegrationTest.java @@ -1,4 +1,4 @@ -package org.sirix.xquery.function.jn.io; +package org.sirix.query.function.jn.io; import org.brackit.xquery.XQuery; import org.brackit.xquery.jdm.Sequence; @@ -11,10 +11,10 @@ import org.sirix.JsonTestHelper.PATHS; import org.sirix.service.json.shredder.JsonShredder; import org.sirix.utils.JsonDocumentCreator; -import org.sirix.xquery.SirixCompileChain; -import org.sirix.xquery.SirixQueryContext; -import org.sirix.xquery.json.BasicJsonDBStore; -import org.sirix.xquery.json.JsonDBObject; +import org.sirix.query.SirixCompileChain; +import org.sirix.query.SirixQueryContext; +import org.sirix.query.json.BasicJsonDBStore; +import org.sirix.query.json.JsonDBObject; import java.io.IOException; import java.io.PrintStream; diff --git a/bundles/sirix-xquery/src/test/java/org/sirix/xquery/function/jn/io/StoreIntegrationTest.java b/bundles/sirix-query/src/test/java/org/sirix/query/function/jn/io/StoreIntegrationTest.java similarity index 89% rename from bundles/sirix-xquery/src/test/java/org/sirix/xquery/function/jn/io/StoreIntegrationTest.java rename to bundles/sirix-query/src/test/java/org/sirix/query/function/jn/io/StoreIntegrationTest.java index 90349b49a..635279985 100644 --- a/bundles/sirix-xquery/src/test/java/org/sirix/xquery/function/jn/io/StoreIntegrationTest.java +++ b/bundles/sirix-query/src/test/java/org/sirix/query/function/jn/io/StoreIntegrationTest.java @@ -1,60 +1,60 @@ -package org.sirix.xquery.function.jn.io; - -import java.nio.file.Path; -import org.brackit.xquery.XQuery; -import org.junit.Test; -import org.sirix.JsonTestHelper; -import org.sirix.JsonTestHelper.PATHS; -import org.sirix.xquery.SirixCompileChain; -import org.sirix.xquery.SirixQueryContext; -import org.sirix.xquery.json.BasicJsonDBStore; -import junit.framework.TestCase; - -public final class StoreIntegrationTest extends TestCase { - - private Path sirixPath = PATHS.PATH1.getFile(); - - @Override - protected void setUp() throws Exception { - JsonTestHelper.deleteEverything(); - } - - @Override - protected void tearDown() { - JsonTestHelper.deleteEverything(); - } - - @Test - public void test() { - // Initialize query context and store. - try (final BasicJsonDBStore store = BasicJsonDBStore.newBuilder().location(sirixPath.getParent()).build(); - final SirixQueryContext ctx = SirixQueryContext.createWithJsonStore(store); - final SirixCompileChain chain = SirixCompileChain.createWithJsonStore(store)) { - - // Use XQuery to store a JSON string into the store. - final String query = "jn:store('json-path1','mydoc.jn','[\"bla\", \"blubb\"]')"; - new XQuery(chain, query).evaluate(ctx); - } - } - - @Test - public void testMultipleStrings() { - // Initialize query context and store. - try (final BasicJsonDBStore store = BasicJsonDBStore.newBuilder().location(sirixPath.getParent()).build(); - final SirixQueryContext ctx = SirixQueryContext.createWithJsonStore(store); - final SirixCompileChain chain = SirixCompileChain.createWithJsonStore(store)) { - - // Use XQuery to store multiple JSON strings into the store. - final String query = "jn:store('json-path1',(),('[\"bla\", \"blubb\"]','{\"foo\": true}'))"; - new XQuery(chain, query).evaluate(ctx); - - // Use XQuery to add a JSON string to the collection. - final String queryAdd = "jn:store('json-path1',(),'[\"bla\", \"blubb\"]',false())"; - new XQuery(chain, queryAdd).evaluate(ctx); - - // Use XQuery to add a JSON string to the collection. - final String queryAddStrings = "jn:store('json-path1',(),('[\"bla\", \"blubb\"]','{\"foo\": true}'),false())"; - new XQuery(chain, queryAddStrings).evaluate(ctx); - } - } -} +package org.sirix.query.function.jn.io; + +import java.nio.file.Path; +import org.brackit.xquery.XQuery; +import org.junit.Test; +import org.sirix.JsonTestHelper; +import org.sirix.JsonTestHelper.PATHS; +import org.sirix.query.SirixCompileChain; +import org.sirix.query.SirixQueryContext; +import org.sirix.query.json.BasicJsonDBStore; +import junit.framework.TestCase; + +public final class StoreIntegrationTest extends TestCase { + + private Path sirixPath = PATHS.PATH1.getFile(); + + @Override + protected void setUp() throws Exception { + JsonTestHelper.deleteEverything(); + } + + @Override + protected void tearDown() { + JsonTestHelper.deleteEverything(); + } + + @Test + public void test() { + // Initialize query context and store. + try (final BasicJsonDBStore store = BasicJsonDBStore.newBuilder().location(sirixPath.getParent()).build(); + final SirixQueryContext ctx = SirixQueryContext.createWithJsonStore(store); + final SirixCompileChain chain = SirixCompileChain.createWithJsonStore(store)) { + + // Use XQuery to store a JSON string into the store. + final String query = "jn:store('json-path1','mydoc.jn','[\"bla\", \"blubb\"]')"; + new XQuery(chain, query).evaluate(ctx); + } + } + + @Test + public void testMultipleStrings() { + // Initialize query context and store. + try (final BasicJsonDBStore store = BasicJsonDBStore.newBuilder().location(sirixPath.getParent()).build(); + final SirixQueryContext ctx = SirixQueryContext.createWithJsonStore(store); + final SirixCompileChain chain = SirixCompileChain.createWithJsonStore(store)) { + + // Use XQuery to store multiple JSON strings into the store. + final String query = "jn:store('json-path1',(),('[\"bla\", \"blubb\"]','{\"foo\": true}'))"; + new XQuery(chain, query).evaluate(ctx); + + // Use XQuery to add a JSON string to the collection. + final String queryAdd = "jn:store('json-path1',(),'[\"bla\", \"blubb\"]',false())"; + new XQuery(chain, queryAdd).evaluate(ctx); + + // Use XQuery to add a JSON string to the collection. + final String queryAddStrings = "jn:store('json-path1',(),('[\"bla\", \"blubb\"]','{\"foo\": true}'),false())"; + new XQuery(chain, queryAddStrings).evaluate(ctx); + } + } +} diff --git a/bundles/sirix-xquery/src/test/java/org/sirix/xquery/function/jn/temporal/FirstExistingTest.java b/bundles/sirix-query/src/test/java/org/sirix/query/function/jn/temporal/FirstExistingTest.java similarity index 92% rename from bundles/sirix-xquery/src/test/java/org/sirix/xquery/function/jn/temporal/FirstExistingTest.java rename to bundles/sirix-query/src/test/java/org/sirix/query/function/jn/temporal/FirstExistingTest.java index 4dbd62c3c..d4bcef79f 100644 --- a/bundles/sirix-xquery/src/test/java/org/sirix/xquery/function/jn/temporal/FirstExistingTest.java +++ b/bundles/sirix-query/src/test/java/org/sirix/query/function/jn/temporal/FirstExistingTest.java @@ -1,4 +1,4 @@ -package org.sirix.xquery.function.jn.temporal; +package org.sirix.query.function.jn.temporal; import org.brackit.xquery.XQuery; import org.brackit.xquery.util.io.IOUtils; @@ -7,9 +7,9 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.BeforeEach; import org.sirix.JsonTestHelper; -import org.sirix.xquery.SirixCompileChain; -import org.sirix.xquery.SirixQueryContext; -import org.sirix.xquery.json.BasicJsonDBStore; +import org.sirix.query.SirixCompileChain; +import org.sirix.query.SirixQueryContext; +import org.sirix.query.json.BasicJsonDBStore; import java.io.IOException; import java.nio.file.Path; diff --git a/bundles/sirix-xquery/src/test/java/org/sirix/xquery/function/jn/temporal/LastExistingTest.java b/bundles/sirix-query/src/test/java/org/sirix/query/function/jn/temporal/LastExistingTest.java similarity index 92% rename from bundles/sirix-xquery/src/test/java/org/sirix/xquery/function/jn/temporal/LastExistingTest.java rename to bundles/sirix-query/src/test/java/org/sirix/query/function/jn/temporal/LastExistingTest.java index 5bc6ad973..be93058fc 100644 --- a/bundles/sirix-xquery/src/test/java/org/sirix/xquery/function/jn/temporal/LastExistingTest.java +++ b/bundles/sirix-query/src/test/java/org/sirix/query/function/jn/temporal/LastExistingTest.java @@ -1,4 +1,4 @@ -package org.sirix.xquery.function.jn.temporal; +package org.sirix.query.function.jn.temporal; import org.brackit.xquery.XQuery; import org.brackit.xquery.util.io.IOUtils; @@ -7,9 +7,9 @@ import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.sirix.JsonTestHelper; -import org.sirix.xquery.SirixCompileChain; -import org.sirix.xquery.SirixQueryContext; -import org.sirix.xquery.json.BasicJsonDBStore; +import org.sirix.query.SirixCompileChain; +import org.sirix.query.SirixQueryContext; +import org.sirix.query.json.BasicJsonDBStore; import java.io.IOException; import java.nio.file.Path; diff --git a/bundles/sirix-xquery/src/test/java/org/sirix/xquery/function/jn/temporal/SetupRevisions.java b/bundles/sirix-query/src/test/java/org/sirix/query/function/jn/temporal/SetupRevisions.java similarity index 84% rename from bundles/sirix-xquery/src/test/java/org/sirix/xquery/function/jn/temporal/SetupRevisions.java rename to bundles/sirix-query/src/test/java/org/sirix/query/function/jn/temporal/SetupRevisions.java index b1f16e4fa..706a33f70 100644 --- a/bundles/sirix-xquery/src/test/java/org/sirix/xquery/function/jn/temporal/SetupRevisions.java +++ b/bundles/sirix-query/src/test/java/org/sirix/query/function/jn/temporal/SetupRevisions.java @@ -1,11 +1,11 @@ -package org.sirix.xquery.function.jn.temporal; +package org.sirix.query.function.jn.temporal; import org.brackit.xquery.XQuery; import org.sirix.service.json.shredder.JsonShredder; import org.sirix.utils.JsonDocumentCreator; -import org.sirix.xquery.SirixCompileChain; -import org.sirix.xquery.SirixQueryContext; -import org.sirix.xquery.json.JsonDBObject; +import org.sirix.query.SirixCompileChain; +import org.sirix.query.SirixQueryContext; +import org.sirix.query.json.JsonDBObject; import java.io.IOException; diff --git a/bundles/sirix-xquery/src/test/java/org/sirix/xquery/function/sdb/trx/AuthorNameTest.java b/bundles/sirix-query/src/test/java/org/sirix/query/function/sdb/trx/AuthorNameTest.java similarity index 95% rename from bundles/sirix-xquery/src/test/java/org/sirix/xquery/function/sdb/trx/AuthorNameTest.java rename to bundles/sirix-query/src/test/java/org/sirix/query/function/sdb/trx/AuthorNameTest.java index 847fa197c..1374db30a 100644 --- a/bundles/sirix-xquery/src/test/java/org/sirix/xquery/function/sdb/trx/AuthorNameTest.java +++ b/bundles/sirix-query/src/test/java/org/sirix/query/function/sdb/trx/AuthorNameTest.java @@ -1,4 +1,4 @@ -package org.sirix.xquery.function.sdb.trx; +package org.sirix.query.function.sdb.trx; import org.brackit.xquery.XQuery; import org.junit.After; @@ -10,9 +10,9 @@ import org.sirix.access.ResourceConfiguration; import org.sirix.access.User; import org.sirix.service.json.shredder.JsonShredder; -import org.sirix.xquery.SirixCompileChain; -import org.sirix.xquery.SirixQueryContext; -import org.sirix.xquery.json.BasicJsonDBStore; +import org.sirix.query.SirixCompileChain; +import org.sirix.query.SirixQueryContext; +import org.sirix.query.json.BasicJsonDBStore; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/bundles/sirix-xquery/src/test/java/org/sirix/xquery/function/sdb/trx/AuthorUUIDTest.java b/bundles/sirix-query/src/test/java/org/sirix/query/function/sdb/trx/AuthorUUIDTest.java similarity index 95% rename from bundles/sirix-xquery/src/test/java/org/sirix/xquery/function/sdb/trx/AuthorUUIDTest.java rename to bundles/sirix-query/src/test/java/org/sirix/query/function/sdb/trx/AuthorUUIDTest.java index 035f96f17..fd1302e4a 100644 --- a/bundles/sirix-xquery/src/test/java/org/sirix/xquery/function/sdb/trx/AuthorUUIDTest.java +++ b/bundles/sirix-query/src/test/java/org/sirix/query/function/sdb/trx/AuthorUUIDTest.java @@ -1,4 +1,4 @@ -package org.sirix.xquery.function.sdb.trx; +package org.sirix.query.function.sdb.trx; import org.brackit.xquery.XQuery; import org.junit.After; @@ -10,9 +10,9 @@ import org.sirix.access.ResourceConfiguration; import org.sirix.access.User; import org.sirix.service.json.shredder.JsonShredder; -import org.sirix.xquery.SirixCompileChain; -import org.sirix.xquery.SirixQueryContext; -import org.sirix.xquery.json.BasicJsonDBStore; +import org.sirix.query.SirixCompileChain; +import org.sirix.query.SirixQueryContext; +import org.sirix.query.json.BasicJsonDBStore; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/bundles/sirix-xquery/src/test/java/org/sirix/xquery/function/sdb/trx/GetPathTest.java b/bundles/sirix-query/src/test/java/org/sirix/query/function/sdb/trx/GetPathTest.java similarity index 94% rename from bundles/sirix-xquery/src/test/java/org/sirix/xquery/function/sdb/trx/GetPathTest.java rename to bundles/sirix-query/src/test/java/org/sirix/query/function/sdb/trx/GetPathTest.java index 091698f77..a08fea710 100644 --- a/bundles/sirix-xquery/src/test/java/org/sirix/xquery/function/sdb/trx/GetPathTest.java +++ b/bundles/sirix-query/src/test/java/org/sirix/query/function/sdb/trx/GetPathTest.java @@ -1,4 +1,4 @@ -package org.sirix.xquery.function.sdb.trx; +package org.sirix.query.function.sdb.trx; import org.brackit.xquery.XQuery; import org.junit.jupiter.api.AfterEach; @@ -6,9 +6,9 @@ import org.junit.jupiter.api.Test; import org.sirix.JsonTestHelper; import org.sirix.service.json.shredder.JsonShredder; -import org.sirix.xquery.SirixCompileChain; -import org.sirix.xquery.SirixQueryContext; -import org.sirix.xquery.json.BasicJsonDBStore; +import org.sirix.query.SirixCompileChain; +import org.sirix.query.SirixQueryContext; +import org.sirix.query.json.BasicJsonDBStore; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/bundles/sirix-xquery/src/test/java/org/sirix/xquery/function/sdb/trx/GetRevisionTimestampTest.java b/bundles/sirix-query/src/test/java/org/sirix/query/function/sdb/trx/GetRevisionTimestampTest.java similarity index 94% rename from bundles/sirix-xquery/src/test/java/org/sirix/xquery/function/sdb/trx/GetRevisionTimestampTest.java rename to bundles/sirix-query/src/test/java/org/sirix/query/function/sdb/trx/GetRevisionTimestampTest.java index 56c82ab71..7c477dae2 100644 --- a/bundles/sirix-xquery/src/test/java/org/sirix/xquery/function/sdb/trx/GetRevisionTimestampTest.java +++ b/bundles/sirix-query/src/test/java/org/sirix/query/function/sdb/trx/GetRevisionTimestampTest.java @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.sirix.xquery.function.sdb.trx; +package org.sirix.query.function.sdb.trx; import org.brackit.xquery.QueryContext; import org.brackit.xquery.QueryException; @@ -39,9 +39,9 @@ import org.sirix.XmlTestHelper.PATHS; import org.sirix.exception.SirixException; import org.sirix.utils.XmlDocumentCreator; -import org.sirix.xquery.SirixCompileChain; -import org.sirix.xquery.SirixQueryContext; -import org.sirix.xquery.node.BasicXmlDBStore; +import org.sirix.query.SirixCompileChain; +import org.sirix.query.SirixQueryContext; +import org.sirix.query.node.BasicXmlDBStore; import java.nio.file.Path; diff --git a/bundles/sirix-xquery/src/test/java/org/sirix/xquery/function/sdb/trx/IsDeletedTest.java b/bundles/sirix-query/src/test/java/org/sirix/query/function/sdb/trx/IsDeletedTest.java similarity index 94% rename from bundles/sirix-xquery/src/test/java/org/sirix/xquery/function/sdb/trx/IsDeletedTest.java rename to bundles/sirix-query/src/test/java/org/sirix/query/function/sdb/trx/IsDeletedTest.java index 7fc9ba294..2434b74bd 100644 --- a/bundles/sirix-xquery/src/test/java/org/sirix/xquery/function/sdb/trx/IsDeletedTest.java +++ b/bundles/sirix-query/src/test/java/org/sirix/query/function/sdb/trx/IsDeletedTest.java @@ -1,4 +1,4 @@ -package org.sirix.xquery.function.sdb.trx; +package org.sirix.query.function.sdb.trx; import org.brackit.xquery.XQuery; import org.junit.jupiter.api.*; @@ -6,9 +6,9 @@ import org.sirix.access.ResourceConfiguration; import org.sirix.api.json.JsonNodeTrx; import org.sirix.service.json.shredder.JsonShredder; -import org.sirix.xquery.SirixCompileChain; -import org.sirix.xquery.SirixQueryContext; -import org.sirix.xquery.json.BasicJsonDBStore; +import org.sirix.query.SirixCompileChain; +import org.sirix.query.SirixQueryContext; +import org.sirix.query.json.BasicJsonDBStore; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.assertFalse; diff --git a/bundles/sirix-xquery/src/test/java/org/sirix/xquery/function/sdb/trx/ItemHistoryTest.java b/bundles/sirix-query/src/test/java/org/sirix/query/function/sdb/trx/ItemHistoryTest.java similarity index 95% rename from bundles/sirix-xquery/src/test/java/org/sirix/xquery/function/sdb/trx/ItemHistoryTest.java rename to bundles/sirix-query/src/test/java/org/sirix/query/function/sdb/trx/ItemHistoryTest.java index b9524d5c7..d00edd59f 100644 --- a/bundles/sirix-xquery/src/test/java/org/sirix/xquery/function/sdb/trx/ItemHistoryTest.java +++ b/bundles/sirix-query/src/test/java/org/sirix/query/function/sdb/trx/ItemHistoryTest.java @@ -1,4 +1,4 @@ -package org.sirix.xquery.function.sdb.trx; +package org.sirix.query.function.sdb.trx; import org.brackit.xquery.XQuery; import org.junit.jupiter.api.AfterEach; @@ -8,9 +8,9 @@ import org.sirix.JsonTestHelper; import org.sirix.access.ResourceConfiguration; import org.sirix.service.json.shredder.JsonShredder; -import org.sirix.xquery.SirixCompileChain; -import org.sirix.xquery.SirixQueryContext; -import org.sirix.xquery.json.BasicJsonDBStore; +import org.sirix.query.SirixCompileChain; +import org.sirix.query.SirixQueryContext; +import org.sirix.query.json.BasicJsonDBStore; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/bundles/sirix-xquery/src/test/java/org/sirix/xquery/function/sdb/trx/JsonGetNodeKeyTest.java b/bundles/sirix-query/src/test/java/org/sirix/query/function/sdb/trx/JsonGetNodeKeyTest.java similarity index 89% rename from bundles/sirix-xquery/src/test/java/org/sirix/xquery/function/sdb/trx/JsonGetNodeKeyTest.java rename to bundles/sirix-query/src/test/java/org/sirix/query/function/sdb/trx/JsonGetNodeKeyTest.java index 3c5c1d289..040238d5e 100644 --- a/bundles/sirix-xquery/src/test/java/org/sirix/xquery/function/sdb/trx/JsonGetNodeKeyTest.java +++ b/bundles/sirix-query/src/test/java/org/sirix/query/function/sdb/trx/JsonGetNodeKeyTest.java @@ -1,13 +1,13 @@ -package org.sirix.xquery.function.sdb.trx; +package org.sirix.query.function.sdb.trx; import org.brackit.xquery.XQuery; import org.junit.Test; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.sirix.JsonTestHelper; -import org.sirix.xquery.SirixCompileChain; -import org.sirix.xquery.SirixQueryContext; -import org.sirix.xquery.json.BasicJsonDBStore; +import org.sirix.query.SirixCompileChain; +import org.sirix.query.SirixQueryContext; +import org.sirix.query.json.BasicJsonDBStore; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/bundles/sirix-xquery/src/test/java/org/sirix/xquery/function/sdb/trx/SelectParentTest.java b/bundles/sirix-query/src/test/java/org/sirix/query/function/sdb/trx/SelectParentTest.java similarity index 90% rename from bundles/sirix-xquery/src/test/java/org/sirix/xquery/function/sdb/trx/SelectParentTest.java rename to bundles/sirix-query/src/test/java/org/sirix/query/function/sdb/trx/SelectParentTest.java index d84934639..f0489fd30 100644 --- a/bundles/sirix-xquery/src/test/java/org/sirix/xquery/function/sdb/trx/SelectParentTest.java +++ b/bundles/sirix-query/src/test/java/org/sirix/query/function/sdb/trx/SelectParentTest.java @@ -1,13 +1,13 @@ -package org.sirix.xquery.function.sdb.trx; +package org.sirix.query.function.sdb.trx; import org.brackit.xquery.XQuery; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.sirix.JsonTestHelper; -import org.sirix.xquery.SirixCompileChain; -import org.sirix.xquery.SirixQueryContext; -import org.sirix.xquery.json.BasicJsonDBStore; +import org.sirix.query.SirixCompileChain; +import org.sirix.query.SirixQueryContext; +import org.sirix.query.json.BasicJsonDBStore; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/bundles/sirix-xquery/src/test/java/org/sirix/xquery/function/sdb/trx/XmlGetNodeKeyTest.java b/bundles/sirix-query/src/test/java/org/sirix/query/function/sdb/trx/XmlGetNodeKeyTest.java similarity index 95% rename from bundles/sirix-xquery/src/test/java/org/sirix/xquery/function/sdb/trx/XmlGetNodeKeyTest.java rename to bundles/sirix-query/src/test/java/org/sirix/query/function/sdb/trx/XmlGetNodeKeyTest.java index dc3075f70..355965a34 100644 --- a/bundles/sirix-xquery/src/test/java/org/sirix/xquery/function/sdb/trx/XmlGetNodeKeyTest.java +++ b/bundles/sirix-query/src/test/java/org/sirix/query/function/sdb/trx/XmlGetNodeKeyTest.java @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.sirix.xquery.function.sdb.trx; +package org.sirix.query.function.sdb.trx; import org.brackit.xquery.QueryContext; import org.brackit.xquery.QueryException; @@ -40,9 +40,9 @@ import org.sirix.XmlTestHelper.PATHS; import org.sirix.exception.SirixException; import org.sirix.utils.XmlDocumentCreator; -import org.sirix.xquery.SirixCompileChain; -import org.sirix.xquery.SirixQueryContext; -import org.sirix.xquery.node.BasicXmlDBStore; +import org.sirix.query.SirixCompileChain; +import org.sirix.query.SirixQueryContext; +import org.sirix.query.node.BasicXmlDBStore; import java.nio.file.Path; diff --git a/bundles/sirix-xquery/src/test/java/org/sirix/xquery/function/xml/diff/DiffTest.java b/bundles/sirix-query/src/test/java/org/sirix/query/function/xml/diff/DiffTest.java similarity index 97% rename from bundles/sirix-xquery/src/test/java/org/sirix/xquery/function/xml/diff/DiffTest.java rename to bundles/sirix-query/src/test/java/org/sirix/query/function/xml/diff/DiffTest.java index e59ebcfa1..91d42a255 100644 --- a/bundles/sirix-xquery/src/test/java/org/sirix/xquery/function/xml/diff/DiffTest.java +++ b/bundles/sirix-query/src/test/java/org/sirix/query/function/xml/diff/DiffTest.java @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.sirix.xquery.function.xml.diff; +package org.sirix.query.function.xml.diff; import org.brackit.xquery.QueryContext; import org.brackit.xquery.QueryException; @@ -45,9 +45,9 @@ import org.sirix.exception.SirixException; import org.sirix.service.xml.shredder.XmlShredder; import org.sirix.utils.XmlDocumentCreator; -import org.sirix.xquery.SirixCompileChain; -import org.sirix.xquery.SirixQueryContext; -import org.sirix.xquery.node.BasicXmlDBStore; +import org.sirix.query.SirixCompileChain; +import org.sirix.query.SirixQueryContext; +import org.sirix.query.node.BasicXmlDBStore; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/bundles/sirix-xquery/src/test/java/org/sirix/xquery/function/xml/diff/ExcelDiffEmptyTest.java b/bundles/sirix-query/src/test/java/org/sirix/query/function/xml/diff/ExcelDiffEmptyTest.java similarity index 96% rename from bundles/sirix-xquery/src/test/java/org/sirix/xquery/function/xml/diff/ExcelDiffEmptyTest.java rename to bundles/sirix-query/src/test/java/org/sirix/query/function/xml/diff/ExcelDiffEmptyTest.java index efa35b420..3dd61805d 100644 --- a/bundles/sirix-xquery/src/test/java/org/sirix/xquery/function/xml/diff/ExcelDiffEmptyTest.java +++ b/bundles/sirix-query/src/test/java/org/sirix/query/function/xml/diff/ExcelDiffEmptyTest.java @@ -1,4 +1,4 @@ -package org.sirix.xquery.function.xml.diff; +package org.sirix.query.function.xml.diff; import static java.util.stream.Collectors.toList; import java.io.ByteArrayOutputStream; @@ -31,9 +31,9 @@ import org.sirix.service.xml.serialize.XmlSerializer.XmlSerializerBuilder; import org.sirix.service.InsertPosition; import org.sirix.service.xml.shredder.XmlShredder; -import org.sirix.xquery.SirixCompileChain; -import org.sirix.xquery.SirixQueryContext; -import org.sirix.xquery.node.BasicXmlDBStore; +import org.sirix.query.SirixCompileChain; +import org.sirix.query.SirixQueryContext; +import org.sirix.query.node.BasicXmlDBStore; import junit.framework.TestCase; public final class ExcelDiffEmptyTest extends TestCase { diff --git a/bundles/sirix-xquery/src/test/java/org/sirix/xquery/function/xml/diff/ExcelDiffTest.java b/bundles/sirix-query/src/test/java/org/sirix/query/function/xml/diff/ExcelDiffTest.java similarity index 97% rename from bundles/sirix-xquery/src/test/java/org/sirix/xquery/function/xml/diff/ExcelDiffTest.java rename to bundles/sirix-query/src/test/java/org/sirix/query/function/xml/diff/ExcelDiffTest.java index 279e67023..f121fba64 100644 --- a/bundles/sirix-xquery/src/test/java/org/sirix/xquery/function/xml/diff/ExcelDiffTest.java +++ b/bundles/sirix-query/src/test/java/org/sirix/query/function/xml/diff/ExcelDiffTest.java @@ -1,4 +1,4 @@ -package org.sirix.xquery.function.xml.diff; +package org.sirix.query.function.xml.diff; import org.brackit.xquery.QueryContext; import org.brackit.xquery.XQuery; @@ -20,9 +20,9 @@ import org.sirix.service.xml.serialize.XmlSerializer; import org.sirix.service.xml.serialize.XmlSerializer.XmlSerializerBuilder; import org.sirix.service.xml.shredder.XmlShredder; -import org.sirix.xquery.SirixCompileChain; -import org.sirix.xquery.SirixQueryContext; -import org.sirix.xquery.node.BasicXmlDBStore; +import org.sirix.query.SirixCompileChain; +import org.sirix.query.SirixQueryContext; +import org.sirix.query.node.BasicXmlDBStore; import java.io.*; import java.nio.charset.StandardCharsets; diff --git a/bundles/sirix-xquery/src/test/java/org/sirix/xquery/function/xml/diff/ExcelDiffTest1.java b/bundles/sirix-query/src/test/java/org/sirix/query/function/xml/diff/ExcelDiffTest1.java similarity index 97% rename from bundles/sirix-xquery/src/test/java/org/sirix/xquery/function/xml/diff/ExcelDiffTest1.java rename to bundles/sirix-query/src/test/java/org/sirix/query/function/xml/diff/ExcelDiffTest1.java index 9d4e58cba..ba622683d 100644 --- a/bundles/sirix-xquery/src/test/java/org/sirix/xquery/function/xml/diff/ExcelDiffTest1.java +++ b/bundles/sirix-query/src/test/java/org/sirix/query/function/xml/diff/ExcelDiffTest1.java @@ -1,4 +1,4 @@ -package org.sirix.xquery.function.xml.diff; +package org.sirix.query.function.xml.diff; import org.brackit.xquery.QueryContext; import org.brackit.xquery.XQuery; @@ -24,9 +24,9 @@ import org.sirix.service.xml.serialize.XmlSerializer; import org.sirix.service.xml.serialize.XmlSerializer.XmlSerializerBuilder; import org.sirix.service.xml.shredder.XmlShredder; -import org.sirix.xquery.SirixCompileChain; -import org.sirix.xquery.SirixQueryContext; -import org.sirix.xquery.node.BasicXmlDBStore; +import org.sirix.query.SirixCompileChain; +import org.sirix.query.SirixQueryContext; +import org.sirix.query.node.BasicXmlDBStore; import java.io.*; import java.nio.charset.StandardCharsets; diff --git a/bundles/sirix-xquery/src/test/java/org/sirix/xquery/function/xml/diff/ExcelDiffWholeRevisionDeleteInsertTest.java b/bundles/sirix-query/src/test/java/org/sirix/query/function/xml/diff/ExcelDiffWholeRevisionDeleteInsertTest.java similarity index 97% rename from bundles/sirix-xquery/src/test/java/org/sirix/xquery/function/xml/diff/ExcelDiffWholeRevisionDeleteInsertTest.java rename to bundles/sirix-query/src/test/java/org/sirix/query/function/xml/diff/ExcelDiffWholeRevisionDeleteInsertTest.java index 0ab961f67..b0be84f8d 100644 --- a/bundles/sirix-xquery/src/test/java/org/sirix/xquery/function/xml/diff/ExcelDiffWholeRevisionDeleteInsertTest.java +++ b/bundles/sirix-query/src/test/java/org/sirix/query/function/xml/diff/ExcelDiffWholeRevisionDeleteInsertTest.java @@ -1,4 +1,4 @@ -package org.sirix.xquery.function.xml.diff; +package org.sirix.query.function.xml.diff; import org.brackit.xquery.QueryContext; import org.brackit.xquery.XQuery; @@ -20,9 +20,9 @@ import org.sirix.service.xml.serialize.XmlSerializer; import org.sirix.service.xml.serialize.XmlSerializer.XmlSerializerBuilder; import org.sirix.service.xml.shredder.XmlShredder; -import org.sirix.xquery.SirixCompileChain; -import org.sirix.xquery.SirixQueryContext; -import org.sirix.xquery.node.BasicXmlDBStore; +import org.sirix.query.SirixCompileChain; +import org.sirix.query.SirixQueryContext; +import org.sirix.query.node.BasicXmlDBStore; import java.io.*; import java.nio.charset.StandardCharsets; diff --git a/bundles/sirix-xquery/src/test/java/org/sirix/xquery/function/xml/io/DocByPointInTimeTest.java b/bundles/sirix-query/src/test/java/org/sirix/query/function/xml/io/DocByPointInTimeTest.java similarity index 94% rename from bundles/sirix-xquery/src/test/java/org/sirix/xquery/function/xml/io/DocByPointInTimeTest.java rename to bundles/sirix-query/src/test/java/org/sirix/query/function/xml/io/DocByPointInTimeTest.java index 08f9f6eb7..40f5d221b 100644 --- a/bundles/sirix-xquery/src/test/java/org/sirix/xquery/function/xml/io/DocByPointInTimeTest.java +++ b/bundles/sirix-query/src/test/java/org/sirix/query/function/xml/io/DocByPointInTimeTest.java @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.sirix.xquery.function.xml.io; +package org.sirix.query.function.xml.io; import junit.framework.TestCase; import org.brackit.xquery.QueryContext; @@ -39,10 +39,10 @@ import org.sirix.XmlTestHelper.PATHS; import org.sirix.exception.SirixException; import org.sirix.utils.XmlDocumentCreator; -import org.sirix.xquery.SirixCompileChain; -import org.sirix.xquery.SirixQueryContext; -import org.sirix.xquery.node.BasicXmlDBStore; -import org.sirix.xquery.node.XmlDBNode; +import org.sirix.query.SirixCompileChain; +import org.sirix.query.SirixQueryContext; +import org.sirix.query.node.BasicXmlDBStore; +import org.sirix.query.node.XmlDBNode; import java.nio.file.Path; diff --git a/bundles/sirix-xquery/src/test/java/org/sirix/xquery/function/xml/io/ImportTestCase.java b/bundles/sirix-query/src/test/java/org/sirix/query/function/xml/io/ImportTestCase.java similarity index 99% rename from bundles/sirix-xquery/src/test/java/org/sirix/xquery/function/xml/io/ImportTestCase.java rename to bundles/sirix-query/src/test/java/org/sirix/query/function/xml/io/ImportTestCase.java index 0ef816bb6..a5526c36f 100644 --- a/bundles/sirix-xquery/src/test/java/org/sirix/xquery/function/xml/io/ImportTestCase.java +++ b/bundles/sirix-query/src/test/java/org/sirix/query/function/xml/io/ImportTestCase.java @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.sirix.xquery.function.xml.io; +package org.sirix.query.function.xml.io; import java.nio.file.Files; import java.nio.file.Path; diff --git a/bundles/sirix-xquery/src/test/java/org/sirix/xquery/function/xml/io/OpenRevisionsTest.java b/bundles/sirix-query/src/test/java/org/sirix/query/function/xml/io/OpenRevisionsTest.java similarity index 96% rename from bundles/sirix-xquery/src/test/java/org/sirix/xquery/function/xml/io/OpenRevisionsTest.java rename to bundles/sirix-query/src/test/java/org/sirix/query/function/xml/io/OpenRevisionsTest.java index 303751537..75ce52187 100644 --- a/bundles/sirix-xquery/src/test/java/org/sirix/xquery/function/xml/io/OpenRevisionsTest.java +++ b/bundles/sirix-query/src/test/java/org/sirix/query/function/xml/io/OpenRevisionsTest.java @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.sirix.xquery.function.xml.io; +package org.sirix.query.function.xml.io; import junit.framework.TestCase; import org.brackit.xquery.QueryContext; @@ -42,9 +42,9 @@ import org.sirix.api.xml.XmlNodeReadOnlyTrx; import org.sirix.exception.SirixException; import org.sirix.utils.XmlDocumentCreator; -import org.sirix.xquery.SirixCompileChain; -import org.sirix.xquery.SirixQueryContext; -import org.sirix.xquery.node.BasicXmlDBStore; +import org.sirix.query.SirixCompileChain; +import org.sirix.query.SirixQueryContext; +import org.sirix.query.node.BasicXmlDBStore; import java.io.IOException; import java.nio.file.Path; diff --git a/bundles/sirix-xquery/src/test/java/org/sirix/xquery/node/NodeAxisTest.java b/bundles/sirix-query/src/test/java/org/sirix/query/node/NodeAxisTest.java similarity index 92% rename from bundles/sirix-xquery/src/test/java/org/sirix/xquery/node/NodeAxisTest.java rename to bundles/sirix-query/src/test/java/org/sirix/query/node/NodeAxisTest.java index b5695f224..5e1be8ce9 100644 --- a/bundles/sirix-xquery/src/test/java/org/sirix/xquery/node/NodeAxisTest.java +++ b/bundles/sirix-query/src/test/java/org/sirix/query/node/NodeAxisTest.java @@ -1,4 +1,4 @@ -package org.sirix.xquery.node; +package org.sirix.query.node; import org.brackit.xquery.jdm.node.NodeStore; import org.brackit.xquery.node.AxisTest; diff --git a/bundles/sirix-xquery/src/test/java/org/sirix/xquery/node/SirixXMarkTest.java b/bundles/sirix-query/src/test/java/org/sirix/query/node/SirixXMarkTest.java similarity index 93% rename from bundles/sirix-xquery/src/test/java/org/sirix/xquery/node/SirixXMarkTest.java rename to bundles/sirix-query/src/test/java/org/sirix/query/node/SirixXMarkTest.java index cae02cba2..d7e18563a 100644 --- a/bundles/sirix-xquery/src/test/java/org/sirix/xquery/node/SirixXMarkTest.java +++ b/bundles/sirix-query/src/test/java/org/sirix/query/node/SirixXMarkTest.java @@ -1,4 +1,4 @@ -package org.sirix.xquery.node; +package org.sirix.query.node; import org.brackit.xquery.XMarkTest; import org.brackit.xquery.XQuery; @@ -7,7 +7,7 @@ import org.brackit.xquery.jdm.node.NodeStore; import org.brackit.xquery.node.parser.DocumentParser; import org.junit.After; -import org.sirix.xquery.SirixCompileChain; +import org.sirix.query.SirixCompileChain; /** * XMark test. diff --git a/bundles/sirix-xquery/src/test/resources/docs/orga.xml b/bundles/sirix-query/src/test/resources/docs/orga.xml similarity index 100% rename from bundles/sirix-xquery/src/test/resources/docs/orga.xml rename to bundles/sirix-query/src/test/resources/docs/orga.xml diff --git a/bundles/sirix-xquery/src/test/resources/json/array.json b/bundles/sirix-query/src/test/resources/json/array.json similarity index 100% rename from bundles/sirix-xquery/src/test/resources/json/array.json rename to bundles/sirix-query/src/test/resources/json/array.json diff --git a/bundles/sirix-xquery/src/test/resources/json/diff-with-maxlevel.json b/bundles/sirix-query/src/test/resources/json/diff-with-maxlevel.json similarity index 100% rename from bundles/sirix-xquery/src/test/resources/json/diff-with-maxlevel.json rename to bundles/sirix-query/src/test/resources/json/diff-with-maxlevel.json diff --git a/bundles/sirix-xquery/src/test/resources/json/diff-with-startnodekey.json b/bundles/sirix-query/src/test/resources/json/diff-with-startnodekey.json similarity index 100% rename from bundles/sirix-xquery/src/test/resources/json/diff-with-startnodekey.json rename to bundles/sirix-query/src/test/resources/json/diff-with-startnodekey.json diff --git a/bundles/sirix-xquery/src/test/resources/json/diff.json b/bundles/sirix-query/src/test/resources/json/diff.json similarity index 100% rename from bundles/sirix-xquery/src/test/resources/json/diff.json rename to bundles/sirix-query/src/test/resources/json/diff.json diff --git a/bundles/sirix-xquery/src/test/resources/json/object.json b/bundles/sirix-query/src/test/resources/json/object.json similarity index 100% rename from bundles/sirix-xquery/src/test/resources/json/object.json rename to bundles/sirix-query/src/test/resources/json/object.json diff --git a/bundles/sirix-xquery/src/test/resources/json/query.xq b/bundles/sirix-query/src/test/resources/json/query.xq similarity index 97% rename from bundles/sirix-xquery/src/test/resources/json/query.xq rename to bundles/sirix-query/src/test/resources/json/query.xq index b2094fe87..dadad9397 100644 --- a/bundles/sirix-xquery/src/test/resources/json/query.xq +++ b/bundles/sirix-query/src/test/resources/json/query.xq @@ -1,7 +1,7 @@ -let $statuses := jn:open('mycol.jn','mydoc.jn', xs:dateTime('$$$$'))=>statuses -let $foundStatus := for $status in bit:array-values($statuses) - let $dateTimeCreated := xs:dateTime($status=>created_at) - where $dateTimeCreated > xs:dateTime("2018-02-01T00:00:00") - order by $dateTimeCreated - return $dateTimeCreated -return $foundStatus +let $statuses := jn:open('mycol.jn','mydoc.jn', xs:dateTime('$$$$'))=>statuses +let $foundStatus := for $status in bit:array-values($statuses) + let $dateTimeCreated := xs:dateTime($status=>created_at) + where $dateTimeCreated > xs:dateTime("2018-02-01T00:00:00") + order by $dateTimeCreated + return $dateTimeCreated +return $foundStatus diff --git a/bundles/sirix-xquery/src/test/resources/json/temporal-query.xq b/bundles/sirix-query/src/test/resources/json/temporal-query.xq similarity index 98% rename from bundles/sirix-xquery/src/test/resources/json/temporal-query.xq rename to bundles/sirix-query/src/test/resources/json/temporal-query.xq index 2f1a8ed25..20ecb7608 100644 --- a/bundles/sirix-xquery/src/test/resources/json/temporal-query.xq +++ b/bundles/sirix-query/src/test/resources/json/temporal-query.xq @@ -1,7 +1,7 @@ -let $statuses := jn:open('mycol.jn','mydoc.jn', xs:dateTime('$$$$'))=>statuses -let $foundStatus := for $status in bit:array-values($statuses) - let $dateTimeCreated := xs:dateTime($status=>created_at) - where $dateTimeCreated > xs:dateTime("2018-02-01T00:00:00") and not(exists(jn:previous($status))) - order by $dateTimeCreated - return $status +let $statuses := jn:open('mycol.jn','mydoc.jn', xs:dateTime('$$$$'))=>statuses +let $foundStatus := for $status in bit:array-values($statuses) + let $dateTimeCreated := xs:dateTime($status=>created_at) + where $dateTimeCreated > xs:dateTime("2018-02-01T00:00:00") and not(exists(jn:previous($status))) + order by $dateTimeCreated + return $status return {"revision": sdb:revision($foundStatus), $foundStatus{text}} \ No newline at end of file diff --git a/bundles/sirix-xquery/src/test/resources/json/testCreateAndScanCASIndex/expectedOutput b/bundles/sirix-query/src/test/resources/json/testCreateAndScanCASIndex/expectedOutput similarity index 100% rename from bundles/sirix-xquery/src/test/resources/json/testCreateAndScanCASIndex/expectedOutput rename to bundles/sirix-query/src/test/resources/json/testCreateAndScanCASIndex/expectedOutput diff --git a/bundles/sirix-xquery/src/test/resources/json/testCreateAndScanCASIndex/multiple-revisions.json b/bundles/sirix-query/src/test/resources/json/testCreateAndScanCASIndex/multiple-revisions.json similarity index 100% rename from bundles/sirix-xquery/src/test/resources/json/testCreateAndScanCASIndex/multiple-revisions.json rename to bundles/sirix-query/src/test/resources/json/testCreateAndScanCASIndex/multiple-revisions.json diff --git a/bundles/sirix-xquery/src/test/resources/json/testCreateAndScanCASIndex2/expectedOutput b/bundles/sirix-query/src/test/resources/json/testCreateAndScanCASIndex2/expectedOutput similarity index 100% rename from bundles/sirix-xquery/src/test/resources/json/testCreateAndScanCASIndex2/expectedOutput rename to bundles/sirix-query/src/test/resources/json/testCreateAndScanCASIndex2/expectedOutput diff --git a/bundles/sirix-xquery/src/test/resources/json/testCreateAndScanCASIndex2/multiple-revisions.json b/bundles/sirix-query/src/test/resources/json/testCreateAndScanCASIndex2/multiple-revisions.json similarity index 100% rename from bundles/sirix-xquery/src/test/resources/json/testCreateAndScanCASIndex2/multiple-revisions.json rename to bundles/sirix-query/src/test/resources/json/testCreateAndScanCASIndex2/multiple-revisions.json diff --git a/bundles/sirix-xquery/src/test/resources/json/testCreateAndScanCASIndex3/copperfield-book.json b/bundles/sirix-query/src/test/resources/json/testCreateAndScanCASIndex3/copperfield-book.json similarity index 100% rename from bundles/sirix-xquery/src/test/resources/json/testCreateAndScanCASIndex3/copperfield-book.json rename to bundles/sirix-query/src/test/resources/json/testCreateAndScanCASIndex3/copperfield-book.json diff --git a/bundles/sirix-xquery/src/test/resources/json/testCreateAndScanCASIndex3/expectedOutput b/bundles/sirix-query/src/test/resources/json/testCreateAndScanCASIndex3/expectedOutput similarity index 100% rename from bundles/sirix-xquery/src/test/resources/json/testCreateAndScanCASIndex3/expectedOutput rename to bundles/sirix-query/src/test/resources/json/testCreateAndScanCASIndex3/expectedOutput diff --git a/bundles/sirix-xquery/src/test/resources/json/testCreateAndScanNameIndex/expectedOutput b/bundles/sirix-query/src/test/resources/json/testCreateAndScanNameIndex/expectedOutput similarity index 100% rename from bundles/sirix-xquery/src/test/resources/json/testCreateAndScanNameIndex/expectedOutput rename to bundles/sirix-query/src/test/resources/json/testCreateAndScanNameIndex/expectedOutput diff --git a/bundles/sirix-xquery/src/test/resources/json/testCreateAndScanNameIndex/multiple-revisions.json b/bundles/sirix-query/src/test/resources/json/testCreateAndScanNameIndex/multiple-revisions.json similarity index 100% rename from bundles/sirix-xquery/src/test/resources/json/testCreateAndScanNameIndex/multiple-revisions.json rename to bundles/sirix-query/src/test/resources/json/testCreateAndScanNameIndex/multiple-revisions.json diff --git a/bundles/sirix-xquery/src/test/resources/json/testCreateAndScanPathIndex/expectedOutput b/bundles/sirix-query/src/test/resources/json/testCreateAndScanPathIndex/expectedOutput similarity index 100% rename from bundles/sirix-xquery/src/test/resources/json/testCreateAndScanPathIndex/expectedOutput rename to bundles/sirix-query/src/test/resources/json/testCreateAndScanPathIndex/expectedOutput diff --git a/bundles/sirix-xquery/src/test/resources/json/testCreateAndScanPathIndex/multiple-revisions.json b/bundles/sirix-query/src/test/resources/json/testCreateAndScanPathIndex/multiple-revisions.json similarity index 100% rename from bundles/sirix-xquery/src/test/resources/json/testCreateAndScanPathIndex/multiple-revisions.json rename to bundles/sirix-query/src/test/resources/json/testCreateAndScanPathIndex/multiple-revisions.json diff --git a/bundles/sirix-xquery/src/test/resources/json/testNesting10/expectedOutput b/bundles/sirix-query/src/test/resources/json/testNesting10/expectedOutput similarity index 100% rename from bundles/sirix-xquery/src/test/resources/json/testNesting10/expectedOutput rename to bundles/sirix-query/src/test/resources/json/testNesting10/expectedOutput diff --git a/bundles/sirix-xquery/src/test/resources/json/testNesting10/multiple-revisions.json b/bundles/sirix-query/src/test/resources/json/testNesting10/multiple-revisions.json similarity index 100% rename from bundles/sirix-xquery/src/test/resources/json/testNesting10/multiple-revisions.json rename to bundles/sirix-query/src/test/resources/json/testNesting10/multiple-revisions.json diff --git a/bundles/sirix-xquery/src/test/resources/json/testNesting11/expectedOutput b/bundles/sirix-query/src/test/resources/json/testNesting11/expectedOutput similarity index 100% rename from bundles/sirix-xquery/src/test/resources/json/testNesting11/expectedOutput rename to bundles/sirix-query/src/test/resources/json/testNesting11/expectedOutput diff --git a/bundles/sirix-xquery/src/test/resources/json/testNesting11/multiple-revisions.json b/bundles/sirix-query/src/test/resources/json/testNesting11/multiple-revisions.json similarity index 100% rename from bundles/sirix-xquery/src/test/resources/json/testNesting11/multiple-revisions.json rename to bundles/sirix-query/src/test/resources/json/testNesting11/multiple-revisions.json diff --git a/bundles/sirix-xquery/src/test/resources/json/testNesting12/expectedOutput b/bundles/sirix-query/src/test/resources/json/testNesting12/expectedOutput similarity index 100% rename from bundles/sirix-xquery/src/test/resources/json/testNesting12/expectedOutput rename to bundles/sirix-query/src/test/resources/json/testNesting12/expectedOutput diff --git a/bundles/sirix-xquery/src/test/resources/json/testNesting12/multiple-revisions.json b/bundles/sirix-query/src/test/resources/json/testNesting12/multiple-revisions.json similarity index 100% rename from bundles/sirix-xquery/src/test/resources/json/testNesting12/multiple-revisions.json rename to bundles/sirix-query/src/test/resources/json/testNesting12/multiple-revisions.json diff --git a/bundles/sirix-xquery/src/test/resources/json/testNesting13/expectedOutput b/bundles/sirix-query/src/test/resources/json/testNesting13/expectedOutput similarity index 100% rename from bundles/sirix-xquery/src/test/resources/json/testNesting13/expectedOutput rename to bundles/sirix-query/src/test/resources/json/testNesting13/expectedOutput diff --git a/bundles/sirix-xquery/src/test/resources/json/testNesting13/multiple-revisions.json b/bundles/sirix-query/src/test/resources/json/testNesting13/multiple-revisions.json similarity index 100% rename from bundles/sirix-xquery/src/test/resources/json/testNesting13/multiple-revisions.json rename to bundles/sirix-query/src/test/resources/json/testNesting13/multiple-revisions.json diff --git a/bundles/sirix-xquery/src/test/resources/json/testNesting14/expectedOutput b/bundles/sirix-query/src/test/resources/json/testNesting14/expectedOutput similarity index 100% rename from bundles/sirix-xquery/src/test/resources/json/testNesting14/expectedOutput rename to bundles/sirix-query/src/test/resources/json/testNesting14/expectedOutput diff --git a/bundles/sirix-xquery/src/test/resources/json/testNesting14/multiple-revisions.json b/bundles/sirix-query/src/test/resources/json/testNesting14/multiple-revisions.json similarity index 100% rename from bundles/sirix-xquery/src/test/resources/json/testNesting14/multiple-revisions.json rename to bundles/sirix-query/src/test/resources/json/testNesting14/multiple-revisions.json diff --git a/bundles/sirix-xquery/src/test/resources/json/testNesting15/expectedOutput b/bundles/sirix-query/src/test/resources/json/testNesting15/expectedOutput similarity index 100% rename from bundles/sirix-xquery/src/test/resources/json/testNesting15/expectedOutput rename to bundles/sirix-query/src/test/resources/json/testNesting15/expectedOutput diff --git a/bundles/sirix-xquery/src/test/resources/json/testNesting15/multiple-revisions.json b/bundles/sirix-query/src/test/resources/json/testNesting15/multiple-revisions.json similarity index 100% rename from bundles/sirix-xquery/src/test/resources/json/testNesting15/multiple-revisions.json rename to bundles/sirix-query/src/test/resources/json/testNesting15/multiple-revisions.json diff --git a/bundles/sirix-xquery/src/test/resources/json/testNesting16/expectedOutput b/bundles/sirix-query/src/test/resources/json/testNesting16/expectedOutput similarity index 100% rename from bundles/sirix-xquery/src/test/resources/json/testNesting16/expectedOutput rename to bundles/sirix-query/src/test/resources/json/testNesting16/expectedOutput diff --git a/bundles/sirix-xquery/src/test/resources/json/testNesting16/multiple-revisions.json b/bundles/sirix-query/src/test/resources/json/testNesting16/multiple-revisions.json similarity index 100% rename from bundles/sirix-xquery/src/test/resources/json/testNesting16/multiple-revisions.json rename to bundles/sirix-query/src/test/resources/json/testNesting16/multiple-revisions.json diff --git a/bundles/sirix-xquery/src/test/resources/json/testNesting17/expectedOutput b/bundles/sirix-query/src/test/resources/json/testNesting17/expectedOutput similarity index 100% rename from bundles/sirix-xquery/src/test/resources/json/testNesting17/expectedOutput rename to bundles/sirix-query/src/test/resources/json/testNesting17/expectedOutput diff --git a/bundles/sirix-xquery/src/test/resources/json/testNesting17/trade-apis.json b/bundles/sirix-query/src/test/resources/json/testNesting17/trade-apis.json similarity index 100% rename from bundles/sirix-xquery/src/test/resources/json/testNesting17/trade-apis.json rename to bundles/sirix-query/src/test/resources/json/testNesting17/trade-apis.json diff --git a/bundles/sirix-xquery/src/test/resources/json/testNesting18/expectedOutput b/bundles/sirix-query/src/test/resources/json/testNesting18/expectedOutput similarity index 100% rename from bundles/sirix-xquery/src/test/resources/json/testNesting18/expectedOutput rename to bundles/sirix-query/src/test/resources/json/testNesting18/expectedOutput diff --git a/bundles/sirix-xquery/src/test/resources/json/testNesting18/trade-apis.json b/bundles/sirix-query/src/test/resources/json/testNesting18/trade-apis.json similarity index 100% rename from bundles/sirix-xquery/src/test/resources/json/testNesting18/trade-apis.json rename to bundles/sirix-query/src/test/resources/json/testNesting18/trade-apis.json diff --git a/bundles/sirix-xquery/src/test/resources/json/testNesting19/expectedOutput b/bundles/sirix-query/src/test/resources/json/testNesting19/expectedOutput similarity index 100% rename from bundles/sirix-xquery/src/test/resources/json/testNesting19/expectedOutput rename to bundles/sirix-query/src/test/resources/json/testNesting19/expectedOutput diff --git a/bundles/sirix-xquery/src/test/resources/json/testNesting19/trade-apis.json b/bundles/sirix-query/src/test/resources/json/testNesting19/trade-apis.json similarity index 100% rename from bundles/sirix-xquery/src/test/resources/json/testNesting19/trade-apis.json rename to bundles/sirix-query/src/test/resources/json/testNesting19/trade-apis.json diff --git a/bundles/sirix-xquery/src/test/resources/json/testNesting20/expectedOutput b/bundles/sirix-query/src/test/resources/json/testNesting20/expectedOutput similarity index 100% rename from bundles/sirix-xquery/src/test/resources/json/testNesting20/expectedOutput rename to bundles/sirix-query/src/test/resources/json/testNesting20/expectedOutput diff --git a/bundles/sirix-xquery/src/test/resources/json/testNesting20/trade-apis.json b/bundles/sirix-query/src/test/resources/json/testNesting20/trade-apis.json similarity index 100% rename from bundles/sirix-xquery/src/test/resources/json/testNesting20/trade-apis.json rename to bundles/sirix-query/src/test/resources/json/testNesting20/trade-apis.json diff --git a/bundles/sirix-xquery/src/test/resources/json/testNesting21/expectedOutput b/bundles/sirix-query/src/test/resources/json/testNesting21/expectedOutput similarity index 100% rename from bundles/sirix-xquery/src/test/resources/json/testNesting21/expectedOutput rename to bundles/sirix-query/src/test/resources/json/testNesting21/expectedOutput diff --git a/bundles/sirix-xquery/src/test/resources/json/testNesting21/multiple-revisions.json b/bundles/sirix-query/src/test/resources/json/testNesting21/multiple-revisions.json similarity index 100% rename from bundles/sirix-xquery/src/test/resources/json/testNesting21/multiple-revisions.json rename to bundles/sirix-query/src/test/resources/json/testNesting21/multiple-revisions.json diff --git a/bundles/sirix-xquery/src/test/resources/json/testNesting22/expectedOutput b/bundles/sirix-query/src/test/resources/json/testNesting22/expectedOutput similarity index 100% rename from bundles/sirix-xquery/src/test/resources/json/testNesting22/expectedOutput rename to bundles/sirix-query/src/test/resources/json/testNesting22/expectedOutput diff --git a/bundles/sirix-xquery/src/test/resources/json/testNesting22/multiple-revisions.json b/bundles/sirix-query/src/test/resources/json/testNesting22/multiple-revisions.json similarity index 100% rename from bundles/sirix-xquery/src/test/resources/json/testNesting22/multiple-revisions.json rename to bundles/sirix-query/src/test/resources/json/testNesting22/multiple-revisions.json diff --git a/bundles/sirix-xquery/src/test/resources/json/testNesting23/expectedOutput b/bundles/sirix-query/src/test/resources/json/testNesting23/expectedOutput similarity index 100% rename from bundles/sirix-xquery/src/test/resources/json/testNesting23/expectedOutput rename to bundles/sirix-query/src/test/resources/json/testNesting23/expectedOutput diff --git a/bundles/sirix-xquery/src/test/resources/json/testNesting23/multiple-revisions.json b/bundles/sirix-query/src/test/resources/json/testNesting23/multiple-revisions.json similarity index 100% rename from bundles/sirix-xquery/src/test/resources/json/testNesting23/multiple-revisions.json rename to bundles/sirix-query/src/test/resources/json/testNesting23/multiple-revisions.json diff --git a/bundles/sirix-xquery/src/test/resources/json/testNesting24/expectedOutput b/bundles/sirix-query/src/test/resources/json/testNesting24/expectedOutput similarity index 100% rename from bundles/sirix-xquery/src/test/resources/json/testNesting24/expectedOutput rename to bundles/sirix-query/src/test/resources/json/testNesting24/expectedOutput diff --git a/bundles/sirix-xquery/src/test/resources/json/testNesting24/multiple-revisions.json b/bundles/sirix-query/src/test/resources/json/testNesting24/multiple-revisions.json similarity index 100% rename from bundles/sirix-xquery/src/test/resources/json/testNesting24/multiple-revisions.json rename to bundles/sirix-query/src/test/resources/json/testNesting24/multiple-revisions.json diff --git a/bundles/sirix-xquery/src/test/resources/json/testNesting25/expectedOutput b/bundles/sirix-query/src/test/resources/json/testNesting25/expectedOutput similarity index 100% rename from bundles/sirix-xquery/src/test/resources/json/testNesting25/expectedOutput rename to bundles/sirix-query/src/test/resources/json/testNesting25/expectedOutput diff --git a/bundles/sirix-xquery/src/test/resources/json/testNesting25/multiple-revisions.json b/bundles/sirix-query/src/test/resources/json/testNesting25/multiple-revisions.json similarity index 100% rename from bundles/sirix-xquery/src/test/resources/json/testNesting25/multiple-revisions.json rename to bundles/sirix-query/src/test/resources/json/testNesting25/multiple-revisions.json diff --git a/bundles/sirix-xquery/src/test/resources/json/testNesting26/expectedOutput b/bundles/sirix-query/src/test/resources/json/testNesting26/expectedOutput similarity index 100% rename from bundles/sirix-xquery/src/test/resources/json/testNesting26/expectedOutput rename to bundles/sirix-query/src/test/resources/json/testNesting26/expectedOutput diff --git a/bundles/sirix-xquery/src/test/resources/json/testNesting26/multiple-revisions.json b/bundles/sirix-query/src/test/resources/json/testNesting26/multiple-revisions.json similarity index 100% rename from bundles/sirix-xquery/src/test/resources/json/testNesting26/multiple-revisions.json rename to bundles/sirix-query/src/test/resources/json/testNesting26/multiple-revisions.json diff --git a/bundles/sirix-xquery/src/test/resources/json/testNesting27/expectedOutput b/bundles/sirix-query/src/test/resources/json/testNesting27/expectedOutput similarity index 100% rename from bundles/sirix-xquery/src/test/resources/json/testNesting27/expectedOutput rename to bundles/sirix-query/src/test/resources/json/testNesting27/expectedOutput diff --git a/bundles/sirix-xquery/src/test/resources/json/testNesting27/multiple-revisions.json b/bundles/sirix-query/src/test/resources/json/testNesting27/multiple-revisions.json similarity index 100% rename from bundles/sirix-xquery/src/test/resources/json/testNesting27/multiple-revisions.json rename to bundles/sirix-query/src/test/resources/json/testNesting27/multiple-revisions.json diff --git a/bundles/sirix-xquery/src/test/resources/json/testNesting28/expectedOutput b/bundles/sirix-query/src/test/resources/json/testNesting28/expectedOutput similarity index 100% rename from bundles/sirix-xquery/src/test/resources/json/testNesting28/expectedOutput rename to bundles/sirix-query/src/test/resources/json/testNesting28/expectedOutput diff --git a/bundles/sirix-xquery/src/test/resources/json/testNesting28/multiple-revisions.json b/bundles/sirix-query/src/test/resources/json/testNesting28/multiple-revisions.json similarity index 100% rename from bundles/sirix-xquery/src/test/resources/json/testNesting28/multiple-revisions.json rename to bundles/sirix-query/src/test/resources/json/testNesting28/multiple-revisions.json diff --git a/bundles/sirix-xquery/src/test/resources/json/testNesting29/expectedOutput b/bundles/sirix-query/src/test/resources/json/testNesting29/expectedOutput similarity index 100% rename from bundles/sirix-xquery/src/test/resources/json/testNesting29/expectedOutput rename to bundles/sirix-query/src/test/resources/json/testNesting29/expectedOutput diff --git a/bundles/sirix-xquery/src/test/resources/json/testNesting29/multiple-revisions.json b/bundles/sirix-query/src/test/resources/json/testNesting29/multiple-revisions.json similarity index 100% rename from bundles/sirix-xquery/src/test/resources/json/testNesting29/multiple-revisions.json rename to bundles/sirix-query/src/test/resources/json/testNesting29/multiple-revisions.json diff --git a/bundles/sirix-xquery/src/test/resources/json/testNesting30/expectedOutput b/bundles/sirix-query/src/test/resources/json/testNesting30/expectedOutput similarity index 100% rename from bundles/sirix-xquery/src/test/resources/json/testNesting30/expectedOutput rename to bundles/sirix-query/src/test/resources/json/testNesting30/expectedOutput diff --git a/bundles/sirix-xquery/src/test/resources/json/testNesting30/multiple-revisions.json b/bundles/sirix-query/src/test/resources/json/testNesting30/multiple-revisions.json similarity index 100% rename from bundles/sirix-xquery/src/test/resources/json/testNesting30/multiple-revisions.json rename to bundles/sirix-query/src/test/resources/json/testNesting30/multiple-revisions.json diff --git a/bundles/sirix-xquery/src/test/resources/json/testNesting31/expectedOutput b/bundles/sirix-query/src/test/resources/json/testNesting31/expectedOutput similarity index 100% rename from bundles/sirix-xquery/src/test/resources/json/testNesting31/expectedOutput rename to bundles/sirix-query/src/test/resources/json/testNesting31/expectedOutput diff --git a/bundles/sirix-xquery/src/test/resources/json/testNesting31/multiple-revisions.json b/bundles/sirix-query/src/test/resources/json/testNesting31/multiple-revisions.json similarity index 100% rename from bundles/sirix-xquery/src/test/resources/json/testNesting31/multiple-revisions.json rename to bundles/sirix-query/src/test/resources/json/testNesting31/multiple-revisions.json diff --git a/bundles/sirix-xquery/src/test/resources/json/testNesting32/expectedOutput b/bundles/sirix-query/src/test/resources/json/testNesting32/expectedOutput similarity index 100% rename from bundles/sirix-xquery/src/test/resources/json/testNesting32/expectedOutput rename to bundles/sirix-query/src/test/resources/json/testNesting32/expectedOutput diff --git a/bundles/sirix-xquery/src/test/resources/json/testNesting32/multiple-revisions.json b/bundles/sirix-query/src/test/resources/json/testNesting32/multiple-revisions.json similarity index 100% rename from bundles/sirix-xquery/src/test/resources/json/testNesting32/multiple-revisions.json rename to bundles/sirix-query/src/test/resources/json/testNesting32/multiple-revisions.json diff --git a/bundles/sirix-xquery/src/test/resources/json/testNesting4/expectedOutput b/bundles/sirix-query/src/test/resources/json/testNesting4/expectedOutput similarity index 100% rename from bundles/sirix-xquery/src/test/resources/json/testNesting4/expectedOutput rename to bundles/sirix-query/src/test/resources/json/testNesting4/expectedOutput diff --git a/bundles/sirix-xquery/src/test/resources/json/testNesting5/expectedOutput b/bundles/sirix-query/src/test/resources/json/testNesting5/expectedOutput similarity index 100% rename from bundles/sirix-xquery/src/test/resources/json/testNesting5/expectedOutput rename to bundles/sirix-query/src/test/resources/json/testNesting5/expectedOutput diff --git a/bundles/sirix-xquery/src/test/resources/json/testNesting5/trade-apis.json b/bundles/sirix-query/src/test/resources/json/testNesting5/trade-apis.json similarity index 100% rename from bundles/sirix-xquery/src/test/resources/json/testNesting5/trade-apis.json rename to bundles/sirix-query/src/test/resources/json/testNesting5/trade-apis.json diff --git a/bundles/sirix-xquery/src/test/resources/json/testNesting6/expectedOutput b/bundles/sirix-query/src/test/resources/json/testNesting6/expectedOutput similarity index 100% rename from bundles/sirix-xquery/src/test/resources/json/testNesting6/expectedOutput rename to bundles/sirix-query/src/test/resources/json/testNesting6/expectedOutput diff --git a/bundles/sirix-xquery/src/test/resources/json/testNesting6/trade-apis.json b/bundles/sirix-query/src/test/resources/json/testNesting6/trade-apis.json similarity index 100% rename from bundles/sirix-xquery/src/test/resources/json/testNesting6/trade-apis.json rename to bundles/sirix-query/src/test/resources/json/testNesting6/trade-apis.json diff --git a/bundles/sirix-xquery/src/test/resources/json/testNesting7/expectedOutput b/bundles/sirix-query/src/test/resources/json/testNesting7/expectedOutput similarity index 100% rename from bundles/sirix-xquery/src/test/resources/json/testNesting7/expectedOutput rename to bundles/sirix-query/src/test/resources/json/testNesting7/expectedOutput diff --git a/bundles/sirix-xquery/src/test/resources/json/testNesting7/trade-apis.json b/bundles/sirix-query/src/test/resources/json/testNesting7/trade-apis.json similarity index 100% rename from bundles/sirix-xquery/src/test/resources/json/testNesting7/trade-apis.json rename to bundles/sirix-query/src/test/resources/json/testNesting7/trade-apis.json diff --git a/bundles/sirix-xquery/src/test/resources/json/testNesting8/expectedOutput b/bundles/sirix-query/src/test/resources/json/testNesting8/expectedOutput similarity index 100% rename from bundles/sirix-xquery/src/test/resources/json/testNesting8/expectedOutput rename to bundles/sirix-query/src/test/resources/json/testNesting8/expectedOutput diff --git a/bundles/sirix-xquery/src/test/resources/json/testNesting8/trade-apis.json b/bundles/sirix-query/src/test/resources/json/testNesting8/trade-apis.json similarity index 100% rename from bundles/sirix-xquery/src/test/resources/json/testNesting8/trade-apis.json rename to bundles/sirix-query/src/test/resources/json/testNesting8/trade-apis.json diff --git a/bundles/sirix-xquery/src/test/resources/json/testNesting9/expectedOutput b/bundles/sirix-query/src/test/resources/json/testNesting9/expectedOutput similarity index 100% rename from bundles/sirix-xquery/src/test/resources/json/testNesting9/expectedOutput rename to bundles/sirix-query/src/test/resources/json/testNesting9/expectedOutput diff --git a/bundles/sirix-xquery/src/test/resources/json/testNesting9/multiple-revisions.json b/bundles/sirix-query/src/test/resources/json/testNesting9/multiple-revisions.json similarity index 100% rename from bundles/sirix-xquery/src/test/resources/json/testNesting9/multiple-revisions.json rename to bundles/sirix-query/src/test/resources/json/testNesting9/multiple-revisions.json diff --git a/bundles/sirix-xquery/src/test/resources/json/twitter.json b/bundles/sirix-query/src/test/resources/json/twitter.json similarity index 97% rename from bundles/sirix-xquery/src/test/resources/json/twitter.json rename to bundles/sirix-query/src/test/resources/json/twitter.json index 889362ef4..f1778ecdb 100644 --- a/bundles/sirix-xquery/src/test/resources/json/twitter.json +++ b/bundles/sirix-query/src/test/resources/json/twitter.json @@ -1,329 +1,329 @@ -{ - "statuses": [ - { - "created_at": "2018-08-16T21:10:50.557", - "id": 967824267948773377, - "id_str": "967824267948773377", - "text": "From pilot to astronaut, Robert H. Lawrence was the first African-American to be selected as an astronaut by any na… https://t.co/FjPEWnh804", - "truncated": true, - "entities": { - "hashtags": [], - "symbols": [], - "user_mentions": [], - "urls": [ - { - "url": "https://t.co/FjPEWnh804", - "expanded_url": "https://twitter.com/i/web/status/967824267948773377", - "display_url": "twitter.com/i/web/status/9…", - "indices": [ - 117, - 140 - ] - } - ] - }, - "metadata": { - "result_type": "popular", - "iso_language_code": "en" - }, - "source": "Sprinklr", - "in_reply_to_status_id": null, - "in_reply_to_status_id_str": null, - "in_reply_to_user_id": null, - "in_reply_to_user_id_str": null, - "in_reply_to_screen_name": null, - "user": { - "id": 11348282, - "id_str": "11348282", - "name": "NASA", - "screen_name": "NASA", - "location": "", - "description": "Explore the universe and discover our home planet with @NASA. We usually post in EST (UTC-5)", - "url": "https://t.co/TcEE6NS8nD", - "entities": { - "url": { - "urls": [ - { - "url": "https://t.co/TcEE6NS8nD", - "expanded_url": "http://www.nasa.gov", - "display_url": "nasa.gov", - "indices": [ - 0, - 23 - ] - } - ] - }, - "description": { - "urls": [] - } - }, - "protected": false, - "followers_count": 28605561, - "friends_count": 270, - "listed_count": 90405, - "created_at": "Wed Dec 19 20:20:32 +0000 2007", - "favourites_count": 2960, - "utc_offset": -18000, - "time_zone": "Eastern Time (US & Canada)", - "geo_enabled": false, - "verified": true, - "statuses_count": 50713, - "lang": "en", - "contributors_enabled": false, - "is_translator": false, - "is_translation_enabled": false, - "profile_background_color": "000000", - "profile_background_image_url": "http://pbs.twimg.com/profile_background_images/590922434682880000/3byPYvqe.jpg", - "profile_background_image_url_https": "https://pbs.twimg.com/profile_background_images/590922434682880000/3byPYvqe.jpg", - "profile_background_tile": false, - "profile_image_url": "http://pbs.twimg.com/profile_images/188302352/nasalogo_twitter_normal.jpg", - "profile_image_url_https": "https://pbs.twimg.com/profile_images/188302352/nasalogo_twitter_normal.jpg", - "profile_banner_url": "https://pbs.twimg.com/profile_banners/11348282/1518798395", - "profile_link_color": "205BA7", - "profile_sidebar_border_color": "000000", - "profile_sidebar_fill_color": "F3F2F2", - "profile_text_color": "000000", - "profile_use_background_image": true, - "has_extended_profile": true, - "default_profile": false, - "default_profile_image": false, - "following": null, - "follow_request_sent": null, - "notifications": null, - "translator_type": "regular" - }, - "geo": null, - "coordinates": null, - "place": null, - "contributors": null, - "is_quote_status": false, - "retweet_count": 988, - "favorite_count": 3875, - "favorited": false, - "retweeted": false, - "possibly_sensitive": false, - "lang": "en" - }, - { - "created_at": "2018-02-25T19:31:07", - "id": 967844427480911872, - "id_str": "967844427480911872", - "text": "A magnetic power struggle of galactic proportions - new research highlights the role of the Sun's magnetic landscap… https://t.co/29dZgga54m", - "truncated": true, - "entities": { - "hashtags": [], - "symbols": [], - "user_mentions": [], - "urls": [ - { - "url": "https://t.co/29dZgga54m", - "expanded_url": "https://twitter.com/i/web/status/967844427480911872", - "display_url": "twitter.com/i/web/status/9…", - "indices": [ - 117, - 140 - ] - } - ] - }, - "metadata": { - "result_type": "popular", - "iso_language_code": "en" - }, - "source": "Sprinklr", - "in_reply_to_status_id": null, - "in_reply_to_status_id_str": null, - "in_reply_to_user_id": null, - "in_reply_to_user_id_str": null, - "in_reply_to_screen_name": null, - "user": { - "id": 11348282, - "id_str": "11348282", - "name": "NASA", - "screen_name": "NASA", - "location": "", - "description": "Explore the universe and discover our home planet with @NASA. We usually post in EST (UTC-5)", - "url": "https://t.co/TcEE6NS8nD", - "entities": { - "url": { - "urls": [ - { - "url": "https://t.co/TcEE6NS8nD", - "expanded_url": "http://www.nasa.gov", - "display_url": "nasa.gov", - "indices": [ - 0, - 23 - ] - } - ] - }, - "description": { - "urls": [] - } - }, - "protected": false, - "followers_count": 28605561, - "friends_count": 270, - "listed_count": 90405, - "created_at": "Wed Dec 19 20:20:32 +0000 2007", - "favourites_count": 2960, - "utc_offset": -18000, - "time_zone": "Eastern Time (US & Canada)", - "geo_enabled": false, - "verified": true, - "statuses_count": 50713, - "lang": "en", - "contributors_enabled": false, - "is_translator": false, - "is_translation_enabled": false, - "profile_background_color": "000000", - "profile_background_image_url": "http://pbs.twimg.com/profile_background_images/590922434682880000/3byPYvqe.jpg", - "profile_background_image_url_https": "https://pbs.twimg.com/profile_background_images/590922434682880000/3byPYvqe.jpg", - "profile_background_tile": false, - "profile_image_url": "http://pbs.twimg.com/profile_images/188302352/nasalogo_twitter_normal.jpg", - "profile_image_url_https": "https://pbs.twimg.com/profile_images/188302352/nasalogo_twitter_normal.jpg", - "profile_banner_url": "https://pbs.twimg.com/profile_banners/11348282/1518798395", - "profile_link_color": "205BA7", - "profile_sidebar_border_color": "000000", - "profile_sidebar_fill_color": "F3F2F2", - "profile_text_color": "000000", - "profile_use_background_image": true, - "has_extended_profile": true, - "default_profile": false, - "default_profile_image": false, - "following": null, - "follow_request_sent": null, - "notifications": null, - "translator_type": "regular" - }, - "geo": null, - "coordinates": null, - "place": null, - "contributors": null, - "is_quote_status": false, - "retweet_count": 2654, - "favorite_count": 7962, - "favorited": false, - "retweeted": false, - "possibly_sensitive": false, - "lang": "en" - }, - { - "created_at": "2018-01-11T19:31:07", - "id": 968204446625869827, - "id_str": "968204446625869827", - "text": "Someone's got to be first. In space, the first explorers beyond Mars were Pioneers 10 and 11, twin robots who chart… https://t.co/SUX30Y45mr", - "truncated": true, - "entities": { - "hashtags": [], - "symbols": [], - "user_mentions": [], - "urls": [ - { - "url": "https://t.co/SUX30Y45mr", - "expanded_url": "https://twitter.com/i/web/status/968204446625869827", - "display_url": "twitter.com/i/web/status/9…", - "indices": [ - 117, - 140 - ] - } - ] - }, - "metadata": { - "result_type": "popular", - "iso_language_code": "en" - }, - "source": "Sprinklr", - "in_reply_to_status_id": null, - "in_reply_to_status_id_str": null, - "in_reply_to_user_id": null, - "in_reply_to_user_id_str": null, - "in_reply_to_screen_name": null, - "user": { - "id": 11348282, - "id_str": "11348282", - "name": "NASA", - "screen_name": "NASA", - "location": "", - "description": "Explore the universe and discover our home planet with @NASA. We usually post in EST (UTC-5)", - "url": "https://t.co/TcEE6NS8nD", - "entities": { - "url": { - "urls": [ - { - "url": "https://t.co/TcEE6NS8nD", - "expanded_url": "http://www.nasa.gov", - "display_url": "nasa.gov", - "indices": [ - 0, - 23 - ] - } - ] - }, - "description": { - "urls": [] - } - }, - "protected": false, - "followers_count": 28605561, - "friends_count": 270, - "listed_count": 90405, - "created_at": "Wed Dec 19 20:20:32 +0000 2007", - "favourites_count": 2960, - "utc_offset": -18000, - "time_zone": "Eastern Time (US & Canada)", - "geo_enabled": false, - "verified": true, - "statuses_count": 50713, - "lang": "en", - "contributors_enabled": false, - "is_translator": false, - "is_translation_enabled": false, - "profile_background_color": "000000", - "profile_background_image_url": "http://pbs.twimg.com/profile_background_images/590922434682880000/3byPYvqe.jpg", - "profile_background_image_url_https": "https://pbs.twimg.com/profile_background_images/590922434682880000/3byPYvqe.jpg", - "profile_background_tile": false, - "profile_image_url": "http://pbs.twimg.com/profile_images/188302352/nasalogo_twitter_normal.jpg", - "profile_image_url_https": "https://pbs.twimg.com/profile_images/188302352/nasalogo_twitter_normal.jpg", - "profile_banner_url": "https://pbs.twimg.com/profile_banners/11348282/1518798395", - "profile_link_color": "205BA7", - "profile_sidebar_border_color": "000000", - "profile_sidebar_fill_color": "F3F2F2", - "profile_text_color": "000000", - "profile_use_background_image": true, - "has_extended_profile": true, - "default_profile": false, - "default_profile_image": false, - "following": null, - "follow_request_sent": null, - "notifications": null, - "translator_type": "regular" - }, - "geo": null, - "coordinates": null, - "place": null, - "contributors": null, - "is_quote_status": false, - "retweet_count": 729, - "favorite_count": 2777, - "favorited": false, - "retweeted": false, - "possibly_sensitive": false, - "lang": "en" - } - ], - "search_metadata": { - "completed_in": 0.057, - "max_id": 0, - "max_id_str": "0", - "next_results": "?max_id=967574182522482687&q=nasa&include_entities=1&result_type=popular", - "query": "nasa", - "count": 3, - "since_id": 0, - "since_id_str": "0" - } +{ + "statuses": [ + { + "created_at": "2018-08-16T21:10:50.557", + "id": 967824267948773377, + "id_str": "967824267948773377", + "text": "From pilot to astronaut, Robert H. Lawrence was the first African-American to be selected as an astronaut by any na… https://t.co/FjPEWnh804", + "truncated": true, + "entities": { + "hashtags": [], + "symbols": [], + "user_mentions": [], + "urls": [ + { + "url": "https://t.co/FjPEWnh804", + "expanded_url": "https://twitter.com/i/web/status/967824267948773377", + "display_url": "twitter.com/i/web/status/9…", + "indices": [ + 117, + 140 + ] + } + ] + }, + "metadata": { + "result_type": "popular", + "iso_language_code": "en" + }, + "source": "Sprinklr", + "in_reply_to_status_id": null, + "in_reply_to_status_id_str": null, + "in_reply_to_user_id": null, + "in_reply_to_user_id_str": null, + "in_reply_to_screen_name": null, + "user": { + "id": 11348282, + "id_str": "11348282", + "name": "NASA", + "screen_name": "NASA", + "location": "", + "description": "Explore the universe and discover our home planet with @NASA. We usually post in EST (UTC-5)", + "url": "https://t.co/TcEE6NS8nD", + "entities": { + "url": { + "urls": [ + { + "url": "https://t.co/TcEE6NS8nD", + "expanded_url": "http://www.nasa.gov", + "display_url": "nasa.gov", + "indices": [ + 0, + 23 + ] + } + ] + }, + "description": { + "urls": [] + } + }, + "protected": false, + "followers_count": 28605561, + "friends_count": 270, + "listed_count": 90405, + "created_at": "Wed Dec 19 20:20:32 +0000 2007", + "favourites_count": 2960, + "utc_offset": -18000, + "time_zone": "Eastern Time (US & Canada)", + "geo_enabled": false, + "verified": true, + "statuses_count": 50713, + "lang": "en", + "contributors_enabled": false, + "is_translator": false, + "is_translation_enabled": false, + "profile_background_color": "000000", + "profile_background_image_url": "http://pbs.twimg.com/profile_background_images/590922434682880000/3byPYvqe.jpg", + "profile_background_image_url_https": "https://pbs.twimg.com/profile_background_images/590922434682880000/3byPYvqe.jpg", + "profile_background_tile": false, + "profile_image_url": "http://pbs.twimg.com/profile_images/188302352/nasalogo_twitter_normal.jpg", + "profile_image_url_https": "https://pbs.twimg.com/profile_images/188302352/nasalogo_twitter_normal.jpg", + "profile_banner_url": "https://pbs.twimg.com/profile_banners/11348282/1518798395", + "profile_link_color": "205BA7", + "profile_sidebar_border_color": "000000", + "profile_sidebar_fill_color": "F3F2F2", + "profile_text_color": "000000", + "profile_use_background_image": true, + "has_extended_profile": true, + "default_profile": false, + "default_profile_image": false, + "following": null, + "follow_request_sent": null, + "notifications": null, + "translator_type": "regular" + }, + "geo": null, + "coordinates": null, + "place": null, + "contributors": null, + "is_quote_status": false, + "retweet_count": 988, + "favorite_count": 3875, + "favorited": false, + "retweeted": false, + "possibly_sensitive": false, + "lang": "en" + }, + { + "created_at": "2018-02-25T19:31:07", + "id": 967844427480911872, + "id_str": "967844427480911872", + "text": "A magnetic power struggle of galactic proportions - new research highlights the role of the Sun's magnetic landscap… https://t.co/29dZgga54m", + "truncated": true, + "entities": { + "hashtags": [], + "symbols": [], + "user_mentions": [], + "urls": [ + { + "url": "https://t.co/29dZgga54m", + "expanded_url": "https://twitter.com/i/web/status/967844427480911872", + "display_url": "twitter.com/i/web/status/9…", + "indices": [ + 117, + 140 + ] + } + ] + }, + "metadata": { + "result_type": "popular", + "iso_language_code": "en" + }, + "source": "Sprinklr", + "in_reply_to_status_id": null, + "in_reply_to_status_id_str": null, + "in_reply_to_user_id": null, + "in_reply_to_user_id_str": null, + "in_reply_to_screen_name": null, + "user": { + "id": 11348282, + "id_str": "11348282", + "name": "NASA", + "screen_name": "NASA", + "location": "", + "description": "Explore the universe and discover our home planet with @NASA. We usually post in EST (UTC-5)", + "url": "https://t.co/TcEE6NS8nD", + "entities": { + "url": { + "urls": [ + { + "url": "https://t.co/TcEE6NS8nD", + "expanded_url": "http://www.nasa.gov", + "display_url": "nasa.gov", + "indices": [ + 0, + 23 + ] + } + ] + }, + "description": { + "urls": [] + } + }, + "protected": false, + "followers_count": 28605561, + "friends_count": 270, + "listed_count": 90405, + "created_at": "Wed Dec 19 20:20:32 +0000 2007", + "favourites_count": 2960, + "utc_offset": -18000, + "time_zone": "Eastern Time (US & Canada)", + "geo_enabled": false, + "verified": true, + "statuses_count": 50713, + "lang": "en", + "contributors_enabled": false, + "is_translator": false, + "is_translation_enabled": false, + "profile_background_color": "000000", + "profile_background_image_url": "http://pbs.twimg.com/profile_background_images/590922434682880000/3byPYvqe.jpg", + "profile_background_image_url_https": "https://pbs.twimg.com/profile_background_images/590922434682880000/3byPYvqe.jpg", + "profile_background_tile": false, + "profile_image_url": "http://pbs.twimg.com/profile_images/188302352/nasalogo_twitter_normal.jpg", + "profile_image_url_https": "https://pbs.twimg.com/profile_images/188302352/nasalogo_twitter_normal.jpg", + "profile_banner_url": "https://pbs.twimg.com/profile_banners/11348282/1518798395", + "profile_link_color": "205BA7", + "profile_sidebar_border_color": "000000", + "profile_sidebar_fill_color": "F3F2F2", + "profile_text_color": "000000", + "profile_use_background_image": true, + "has_extended_profile": true, + "default_profile": false, + "default_profile_image": false, + "following": null, + "follow_request_sent": null, + "notifications": null, + "translator_type": "regular" + }, + "geo": null, + "coordinates": null, + "place": null, + "contributors": null, + "is_quote_status": false, + "retweet_count": 2654, + "favorite_count": 7962, + "favorited": false, + "retweeted": false, + "possibly_sensitive": false, + "lang": "en" + }, + { + "created_at": "2018-01-11T19:31:07", + "id": 968204446625869827, + "id_str": "968204446625869827", + "text": "Someone's got to be first. In space, the first explorers beyond Mars were Pioneers 10 and 11, twin robots who chart… https://t.co/SUX30Y45mr", + "truncated": true, + "entities": { + "hashtags": [], + "symbols": [], + "user_mentions": [], + "urls": [ + { + "url": "https://t.co/SUX30Y45mr", + "expanded_url": "https://twitter.com/i/web/status/968204446625869827", + "display_url": "twitter.com/i/web/status/9…", + "indices": [ + 117, + 140 + ] + } + ] + }, + "metadata": { + "result_type": "popular", + "iso_language_code": "en" + }, + "source": "Sprinklr", + "in_reply_to_status_id": null, + "in_reply_to_status_id_str": null, + "in_reply_to_user_id": null, + "in_reply_to_user_id_str": null, + "in_reply_to_screen_name": null, + "user": { + "id": 11348282, + "id_str": "11348282", + "name": "NASA", + "screen_name": "NASA", + "location": "", + "description": "Explore the universe and discover our home planet with @NASA. We usually post in EST (UTC-5)", + "url": "https://t.co/TcEE6NS8nD", + "entities": { + "url": { + "urls": [ + { + "url": "https://t.co/TcEE6NS8nD", + "expanded_url": "http://www.nasa.gov", + "display_url": "nasa.gov", + "indices": [ + 0, + 23 + ] + } + ] + }, + "description": { + "urls": [] + } + }, + "protected": false, + "followers_count": 28605561, + "friends_count": 270, + "listed_count": 90405, + "created_at": "Wed Dec 19 20:20:32 +0000 2007", + "favourites_count": 2960, + "utc_offset": -18000, + "time_zone": "Eastern Time (US & Canada)", + "geo_enabled": false, + "verified": true, + "statuses_count": 50713, + "lang": "en", + "contributors_enabled": false, + "is_translator": false, + "is_translation_enabled": false, + "profile_background_color": "000000", + "profile_background_image_url": "http://pbs.twimg.com/profile_background_images/590922434682880000/3byPYvqe.jpg", + "profile_background_image_url_https": "https://pbs.twimg.com/profile_background_images/590922434682880000/3byPYvqe.jpg", + "profile_background_tile": false, + "profile_image_url": "http://pbs.twimg.com/profile_images/188302352/nasalogo_twitter_normal.jpg", + "profile_image_url_https": "https://pbs.twimg.com/profile_images/188302352/nasalogo_twitter_normal.jpg", + "profile_banner_url": "https://pbs.twimg.com/profile_banners/11348282/1518798395", + "profile_link_color": "205BA7", + "profile_sidebar_border_color": "000000", + "profile_sidebar_fill_color": "F3F2F2", + "profile_text_color": "000000", + "profile_use_background_image": true, + "has_extended_profile": true, + "default_profile": false, + "default_profile_image": false, + "following": null, + "follow_request_sent": null, + "notifications": null, + "translator_type": "regular" + }, + "geo": null, + "coordinates": null, + "place": null, + "contributors": null, + "is_quote_status": false, + "retweet_count": 729, + "favorite_count": 2777, + "favorited": false, + "retweeted": false, + "possibly_sensitive": false, + "lang": "en" + } + ], + "search_metadata": { + "completed_in": 0.057, + "max_id": 0, + "max_id_str": "0", + "next_results": "?max_id=967574182522482687&q=nasa&include_entities=1&result_type=popular", + "query": "nasa", + "count": 3, + "since_id": 0, + "since_id_str": "0" + } } \ No newline at end of file diff --git a/bundles/sirix-xquery/src/test/resources/json/twitterTweet1.json b/bundles/sirix-query/src/test/resources/json/twitterTweet1.json similarity index 97% rename from bundles/sirix-xquery/src/test/resources/json/twitterTweet1.json rename to bundles/sirix-query/src/test/resources/json/twitterTweet1.json index 283587313..411b5b236 100644 --- a/bundles/sirix-xquery/src/test/resources/json/twitterTweet1.json +++ b/bundles/sirix-query/src/test/resources/json/twitterTweet1.json @@ -1,113 +1,113 @@ - { - "created_at": "2018-01-13T21:10:50.557", - "id": 967928974960545793, - "id_str": "967928974960545793", - "text": "Congratulations to #Olympics athletes who won gold! Neutron stars like the one at the heart of the Crab Nebula may… https://t.co/vz4SnPupe2", - "truncated": true, - "entities": { - "hashtags": [ - { - "text": "Olympics", - "indices": [ - 19, - 28 - ] - } - ], - "symbols": [], - "user_mentions": [], - "urls": [ - { - "url": "https://t.co/vz4SnPupe2", - "expanded_url": "https://twitter.com/i/web/status/967928974960545793", - "display_url": "twitter.com/i/web/status/9…", - "indices": [ - 116, - 139 - ] - } - ] - }, - "metadata": { - "result_type": "popular", - "iso_language_code": "en" - }, - "source": "Media Studio", - "in_reply_to_status_id": null, - "in_reply_to_status_id_str": null, - "in_reply_to_user_id": null, - "in_reply_to_user_id_str": null, - "in_reply_to_screen_name": null, - "user": { - "id": 19802879, - "id_str": "19802879", - "name": "NASA JPL", - "screen_name": "NASAJPL", - "location": "Pasadena, Calif.", - "description": "NASA Jet Propulsion Laboratory manages many of NASA's robotic missions exploring Earth, the solar system and our universe. Tweets from JPL's News Office.", - "url": "http://t.co/gcM9d1YLUB", - "entities": { - "url": { - "urls": [ - { - "url": "http://t.co/gcM9d1YLUB", - "expanded_url": "http://www.jpl.nasa.gov", - "display_url": "jpl.nasa.gov", - "indices": [ - 0, - 22 - ] - } - ] - }, - "description": { - "urls": [] - } - }, - "protected": false, - "followers_count": 2566921, - "friends_count": 379, - "listed_count": 15065, - "created_at": "Sat Jan 31 03:19:43 +0000 2009", - "favourites_count": 1281, - "utc_offset": -32400, - "time_zone": "Alaska", - "geo_enabled": false, - "verified": true, - "statuses_count": 6328, - "lang": "en", - "contributors_enabled": false, - "is_translator": false, - "is_translation_enabled": false, - "profile_background_color": "0B090B", - "profile_background_image_url": "http://pbs.twimg.com/profile_background_images/8479565/twitter_jpl_bkg.009.jpg", - "profile_background_image_url_https": "https://pbs.twimg.com/profile_background_images/8479565/twitter_jpl_bkg.009.jpg", - "profile_background_tile": false, - "profile_image_url": "http://pbs.twimg.com/profile_images/2305452633/lg0hov3l8g4msxbdwv48_normal.jpeg", - "profile_image_url_https": "https://pbs.twimg.com/profile_images/2305452633/lg0hov3l8g4msxbdwv48_normal.jpeg", - "profile_banner_url": "https://pbs.twimg.com/profile_banners/19802879/1398298134", - "profile_link_color": "0D1787", - "profile_sidebar_border_color": "100F0E", - "profile_sidebar_fill_color": "74A6CD", - "profile_text_color": "0C0C0D", - "profile_use_background_image": true, - "has_extended_profile": false, - "default_profile": false, - "default_profile_image": false, - "following": null, - "follow_request_sent": null, - "notifications": null, - "translator_type": "none" - }, - "geo": null, - "coordinates": null, - "place": null, - "contributors": null, - "is_quote_status": false, - "retweet_count": 325, - "favorite_count": 1280, - "favorited": false, - "retweeted": false, - "possibly_sensitive": false, - "lang": "en" + { + "created_at": "2018-01-13T21:10:50.557", + "id": 967928974960545793, + "id_str": "967928974960545793", + "text": "Congratulations to #Olympics athletes who won gold! Neutron stars like the one at the heart of the Crab Nebula may… https://t.co/vz4SnPupe2", + "truncated": true, + "entities": { + "hashtags": [ + { + "text": "Olympics", + "indices": [ + 19, + 28 + ] + } + ], + "symbols": [], + "user_mentions": [], + "urls": [ + { + "url": "https://t.co/vz4SnPupe2", + "expanded_url": "https://twitter.com/i/web/status/967928974960545793", + "display_url": "twitter.com/i/web/status/9…", + "indices": [ + 116, + 139 + ] + } + ] + }, + "metadata": { + "result_type": "popular", + "iso_language_code": "en" + }, + "source": "Media Studio", + "in_reply_to_status_id": null, + "in_reply_to_status_id_str": null, + "in_reply_to_user_id": null, + "in_reply_to_user_id_str": null, + "in_reply_to_screen_name": null, + "user": { + "id": 19802879, + "id_str": "19802879", + "name": "NASA JPL", + "screen_name": "NASAJPL", + "location": "Pasadena, Calif.", + "description": "NASA Jet Propulsion Laboratory manages many of NASA's robotic missions exploring Earth, the solar system and our universe. Tweets from JPL's News Office.", + "url": "http://t.co/gcM9d1YLUB", + "entities": { + "url": { + "urls": [ + { + "url": "http://t.co/gcM9d1YLUB", + "expanded_url": "http://www.jpl.nasa.gov", + "display_url": "jpl.nasa.gov", + "indices": [ + 0, + 22 + ] + } + ] + }, + "description": { + "urls": [] + } + }, + "protected": false, + "followers_count": 2566921, + "friends_count": 379, + "listed_count": 15065, + "created_at": "Sat Jan 31 03:19:43 +0000 2009", + "favourites_count": 1281, + "utc_offset": -32400, + "time_zone": "Alaska", + "geo_enabled": false, + "verified": true, + "statuses_count": 6328, + "lang": "en", + "contributors_enabled": false, + "is_translator": false, + "is_translation_enabled": false, + "profile_background_color": "0B090B", + "profile_background_image_url": "http://pbs.twimg.com/profile_background_images/8479565/twitter_jpl_bkg.009.jpg", + "profile_background_image_url_https": "https://pbs.twimg.com/profile_background_images/8479565/twitter_jpl_bkg.009.jpg", + "profile_background_tile": false, + "profile_image_url": "http://pbs.twimg.com/profile_images/2305452633/lg0hov3l8g4msxbdwv48_normal.jpeg", + "profile_image_url_https": "https://pbs.twimg.com/profile_images/2305452633/lg0hov3l8g4msxbdwv48_normal.jpeg", + "profile_banner_url": "https://pbs.twimg.com/profile_banners/19802879/1398298134", + "profile_link_color": "0D1787", + "profile_sidebar_border_color": "100F0E", + "profile_sidebar_fill_color": "74A6CD", + "profile_text_color": "0C0C0D", + "profile_use_background_image": true, + "has_extended_profile": false, + "default_profile": false, + "default_profile_image": false, + "following": null, + "follow_request_sent": null, + "notifications": null, + "translator_type": "none" + }, + "geo": null, + "coordinates": null, + "place": null, + "contributors": null, + "is_quote_status": false, + "retweet_count": 325, + "favorite_count": 1280, + "favorited": false, + "retweeted": false, + "possibly_sensitive": false, + "lang": "en" } \ No newline at end of file diff --git a/bundles/sirix-xquery/src/test/resources/json/twitterTweet2.json b/bundles/sirix-query/src/test/resources/json/twitterTweet2.json similarity index 97% rename from bundles/sirix-xquery/src/test/resources/json/twitterTweet2.json rename to bundles/sirix-query/src/test/resources/json/twitterTweet2.json index 9a94f97de..7ca79ce27 100644 --- a/bundles/sirix-xquery/src/test/resources/json/twitterTweet2.json +++ b/bundles/sirix-query/src/test/resources/json/twitterTweet2.json @@ -1,105 +1,105 @@ - { - "created_at": "2018-02-26T06:42:50", - "id": 968013469743288321, - "id_str": "968013469743288321", - "text": "宇宙ステーションã§ã‚‚ã€æ—¥æœ¬ã¨9時間ã®æ™‚å·®ã§æœˆæ›œæ—¥ãŒå§‹ã¾ã‚Šã¾ã—ãŸã€‚n今週ã¯6人ã‹ã‚‰3人ã«ã‚¯ãƒ«ãƒ¼ã®ã‚µã‚¤ã‚ºãƒ€ã‚¦ãƒ³ãŒã‚ã‚Šã¾ã™ãŒã€ã—ã£ã‹ã‚Šã¨ä»»ã•ã‚Œã¦ã„るタスクをã“ãªã—ãŸã„ã¨æ€ã„ã¾ã™ã€‚nn写真ã¯ã€NASAã®å®Ÿé¨“施設「ディスティニーã€ã®ã‚°ãƒ­ãƒ¼ãƒ–… https://t.co/2CYoPV6Aqx", - "truncated": true, - "entities": { - "hashtags": [], - "symbols": [], - "user_mentions": [], - "urls": [ - { - "url": "https://t.co/2CYoPV6Aqx", - "expanded_url": "https://twitter.com/i/web/status/968013469743288321", - "display_url": "twitter.com/i/web/status/9…", - "indices": [ - 117, - 140 - ] - } - ] - }, - "metadata": { - "result_type": "popular", - "iso_language_code": "ja" - }, - "source": "Twitter Web Client", - "in_reply_to_status_id": null, - "in_reply_to_status_id_str": null, - "in_reply_to_user_id": null, - "in_reply_to_user_id_str": null, - "in_reply_to_screen_name": null, - "user": { - "id": 842625693733203968, - "id_str": "842625693733203968", - "name": "金井 宣茂", - "screen_name": "Astro_Kanai", - "location": "", - "description": "宇宙飛行士。2017å¹´12月19æ—¥ã‹ã‚‰å›½éš›å®‡å®™ã‚¹ãƒ†ãƒ¼ã‚·ãƒ§ãƒ³ã«é•·æœŸæ»žåœ¨ä¸­ã€‚ å¿œæ´ã„ãŸã ã„ã¦ã„るフォロワーã®ã¿ãªã•ã¾ã¨ä¸€ç·’ã«ã€å®‡å®™æ»žåœ¨ã‚’楽ã—ã¿ãŸã„ã¨æ€ã„ã¾ã™ï¼", - "url": "https://t.co/rWU6cxY9iL", - "entities": { - "url": { - "urls": [ - { - "url": "https://t.co/rWU6cxY9iL", - "expanded_url": "https://ameblo.jp/astro-kanai/", - "display_url": "ameblo.jp/astro-kanai/", - "indices": [ - 0, - 23 - ] - } - ] - }, - "description": { - "urls": [] - } - }, - "protected": false, - "followers_count": 51512, - "friends_count": 59, - "listed_count": 655, - "created_at": "Fri Mar 17 06:36:35 +0000 2017", - "favourites_count": 7075, - "utc_offset": 32400, - "time_zone": "Tokyo", - "geo_enabled": false, - "verified": true, - "statuses_count": 1035, - "lang": "ja", - "contributors_enabled": false, - "is_translator": false, - "is_translation_enabled": false, - "profile_background_color": "000000", - "profile_background_image_url": "http://abs.twimg.com/images/themes/theme1/bg.png", - "profile_background_image_url_https": "https://abs.twimg.com/images/themes/theme1/bg.png", - "profile_background_tile": false, - "profile_image_url": "http://pbs.twimg.com/profile_images/879071738625232901/u0nlrr4Y_normal.jpg", - "profile_image_url_https": "https://pbs.twimg.com/profile_images/879071738625232901/u0nlrr4Y_normal.jpg", - "profile_banner_url": "https://pbs.twimg.com/profile_banners/842625693733203968/1492509582", - "profile_link_color": "E81C4F", - "profile_sidebar_border_color": "000000", - "profile_sidebar_fill_color": "000000", - "profile_text_color": "000000", - "profile_use_background_image": false, - "has_extended_profile": true, - "default_profile": false, - "default_profile_image": false, - "following": null, - "follow_request_sent": null, - "notifications": null, - "translator_type": "none" - }, - "geo": null, - "coordinates": null, - "place": null, - "contributors": null, - "is_quote_status": false, - "retweet_count": 226, - "favorite_count": 1356, - "favorited": false, - "retweeted": false, - "possibly_sensitive": false, - "lang": "ja" + { + "created_at": "2018-02-26T06:42:50", + "id": 968013469743288321, + "id_str": "968013469743288321", + "text": "宇宙ステーションã§ã‚‚ã€æ—¥æœ¬ã¨9時間ã®æ™‚å·®ã§æœˆæ›œæ—¥ãŒå§‹ã¾ã‚Šã¾ã—ãŸã€‚n今週ã¯6人ã‹ã‚‰3人ã«ã‚¯ãƒ«ãƒ¼ã®ã‚µã‚¤ã‚ºãƒ€ã‚¦ãƒ³ãŒã‚ã‚Šã¾ã™ãŒã€ã—ã£ã‹ã‚Šã¨ä»»ã•ã‚Œã¦ã„るタスクをã“ãªã—ãŸã„ã¨æ€ã„ã¾ã™ã€‚nn写真ã¯ã€NASAã®å®Ÿé¨“施設「ディスティニーã€ã®ã‚°ãƒ­ãƒ¼ãƒ–… https://t.co/2CYoPV6Aqx", + "truncated": true, + "entities": { + "hashtags": [], + "symbols": [], + "user_mentions": [], + "urls": [ + { + "url": "https://t.co/2CYoPV6Aqx", + "expanded_url": "https://twitter.com/i/web/status/968013469743288321", + "display_url": "twitter.com/i/web/status/9…", + "indices": [ + 117, + 140 + ] + } + ] + }, + "metadata": { + "result_type": "popular", + "iso_language_code": "ja" + }, + "source": "Twitter Web Client", + "in_reply_to_status_id": null, + "in_reply_to_status_id_str": null, + "in_reply_to_user_id": null, + "in_reply_to_user_id_str": null, + "in_reply_to_screen_name": null, + "user": { + "id": 842625693733203968, + "id_str": "842625693733203968", + "name": "金井 宣茂", + "screen_name": "Astro_Kanai", + "location": "", + "description": "宇宙飛行士。2017å¹´12月19æ—¥ã‹ã‚‰å›½éš›å®‡å®™ã‚¹ãƒ†ãƒ¼ã‚·ãƒ§ãƒ³ã«é•·æœŸæ»žåœ¨ä¸­ã€‚ å¿œæ´ã„ãŸã ã„ã¦ã„るフォロワーã®ã¿ãªã•ã¾ã¨ä¸€ç·’ã«ã€å®‡å®™æ»žåœ¨ã‚’楽ã—ã¿ãŸã„ã¨æ€ã„ã¾ã™ï¼", + "url": "https://t.co/rWU6cxY9iL", + "entities": { + "url": { + "urls": [ + { + "url": "https://t.co/rWU6cxY9iL", + "expanded_url": "https://ameblo.jp/astro-kanai/", + "display_url": "ameblo.jp/astro-kanai/", + "indices": [ + 0, + 23 + ] + } + ] + }, + "description": { + "urls": [] + } + }, + "protected": false, + "followers_count": 51512, + "friends_count": 59, + "listed_count": 655, + "created_at": "Fri Mar 17 06:36:35 +0000 2017", + "favourites_count": 7075, + "utc_offset": 32400, + "time_zone": "Tokyo", + "geo_enabled": false, + "verified": true, + "statuses_count": 1035, + "lang": "ja", + "contributors_enabled": false, + "is_translator": false, + "is_translation_enabled": false, + "profile_background_color": "000000", + "profile_background_image_url": "http://abs.twimg.com/images/themes/theme1/bg.png", + "profile_background_image_url_https": "https://abs.twimg.com/images/themes/theme1/bg.png", + "profile_background_tile": false, + "profile_image_url": "http://pbs.twimg.com/profile_images/879071738625232901/u0nlrr4Y_normal.jpg", + "profile_image_url_https": "https://pbs.twimg.com/profile_images/879071738625232901/u0nlrr4Y_normal.jpg", + "profile_banner_url": "https://pbs.twimg.com/profile_banners/842625693733203968/1492509582", + "profile_link_color": "E81C4F", + "profile_sidebar_border_color": "000000", + "profile_sidebar_fill_color": "000000", + "profile_text_color": "000000", + "profile_use_background_image": false, + "has_extended_profile": true, + "default_profile": false, + "default_profile_image": false, + "following": null, + "follow_request_sent": null, + "notifications": null, + "translator_type": "none" + }, + "geo": null, + "coordinates": null, + "place": null, + "contributors": null, + "is_quote_status": false, + "retweet_count": 226, + "favorite_count": 1356, + "favorited": false, + "retweeted": false, + "possibly_sensitive": false, + "lang": "ja" } \ No newline at end of file diff --git a/bundles/sirix-xquery/src/test/resources/logback-test.xml b/bundles/sirix-query/src/test/resources/logback-test.xml similarity index 100% rename from bundles/sirix-xquery/src/test/resources/logback-test.xml rename to bundles/sirix-query/src/test/resources/logback-test.xml diff --git a/bundles/sirix-xquery/src/test/resources/revXMLsAll/1.xml b/bundles/sirix-query/src/test/resources/revXMLsAll/1.xml similarity index 98% rename from bundles/sirix-xquery/src/test/resources/revXMLsAll/1.xml rename to bundles/sirix-query/src/test/resources/revXMLsAll/1.xml index 8d688b4e7..e14947a7d 100644 --- a/bundles/sirix-xquery/src/test/resources/revXMLsAll/1.xml +++ b/bundles/sirix-query/src/test/resources/revXMLsAll/1.xml @@ -1,75 +1,75 @@ - - - - - - - - - - - - - - - - - - 0 - - - - - - - - - - - - 0 - - - - - - - - - - - - 0 - - - - - - - - - - - - 0 - - - - - - - - - - - - 0 - - - - - - - - - + + + + + + + + + + + + + + + + + + 0 + + + + + + + + + + + + 0 + + + + + + + + + + + + 0 + + + + + + + + + + + + 0 + + + + + + + + + + + + 0 + + + + + + + + + diff --git a/bundles/sirix-xquery/src/test/resources/revXMLsAll/2.xml b/bundles/sirix-query/src/test/resources/revXMLsAll/2.xml similarity index 98% rename from bundles/sirix-xquery/src/test/resources/revXMLsAll/2.xml rename to bundles/sirix-query/src/test/resources/revXMLsAll/2.xml index 9801297ce..2a454d614 100644 --- a/bundles/sirix-xquery/src/test/resources/revXMLsAll/2.xml +++ b/bundles/sirix-query/src/test/resources/revXMLsAll/2.xml @@ -1,66 +1,66 @@ - - - - - - - text - - - - - - - - - fooooo - - - baaar - 0 - - fasel - - - - - - - - - blablabla - - schakkalakka - 0 - - - - - - - - - - yeeeha - - 0 - - - - - - - - - - - - 0 - - - - - - - - + + + + + + + text + + + + + + + + + fooooo + + + baaar + 0 + + fasel + + + + + + + + + blablabla + + schakkalakka + 0 + + + + + + + + + + yeeeha + + 0 + + + + + + + + + + + + 0 + + + + + + + + diff --git a/bundles/sirix-xquery/src/test/resources/sheets/1.xml b/bundles/sirix-query/src/test/resources/sheets/1.xml similarity index 100% rename from bundles/sirix-xquery/src/test/resources/sheets/1.xml rename to bundles/sirix-query/src/test/resources/sheets/1.xml diff --git a/bundles/sirix-xquery/src/test/resources/sheets/2.xml b/bundles/sirix-query/src/test/resources/sheets/2.xml similarity index 100% rename from bundles/sirix-xquery/src/test/resources/sheets/2.xml rename to bundles/sirix-query/src/test/resources/sheets/2.xml diff --git a/bundles/sirix-xquery/src/test/resources/sheets2/1.xml b/bundles/sirix-query/src/test/resources/sheets2/1.xml similarity index 99% rename from bundles/sirix-xquery/src/test/resources/sheets2/1.xml rename to bundles/sirix-query/src/test/resources/sheets2/1.xml index d23d623ae..50d980887 100644 --- a/bundles/sirix-xquery/src/test/resources/sheets2/1.xml +++ b/bundles/sirix-query/src/test/resources/sheets2/1.xml @@ -1,2 +1,2 @@ - + 012345620200107899.5416666666666661F3*1.14510.925208333333332212002078919.083333333333332F4*1.14521.8504166666666642003078928.62500000000000432.7756250000000052004078938.16666666666666443.7008333333333282005078947.70833333333333654.6260416666666732006078957.25000000000000765.551250000000012007078966.79166666666667176.4764583333333412008078976.33333333333332987.4016666666666572009078985.87598.3268750000000012010078995.416666666666671109.2520833333333520110789104.95833333333334120.1772916666666820120789114.50000000000001131.1025000000000220130789124.04166666666667142.0277083333333520140789133.58333333333334152.9529166666666820150789143.125163.8781250000000120160789152.66666666666666174.8033333333333120170789162.20833333333334185.7285416666666720180789171.75196.6537520010108915F21*1.14517.1750000000000012002010892528.6252003010893540.0750000000000032004010894551.5249999999999992005010895562.9750000000000012006010896574.4249999999999972007010897585.8752008010898597.32500000000000320090108995108.77500000000001201001089105120.22500000000001201101089115131.67500000000001201201089125143.125201301089135154.57499999999999201401089145166.02500000000001201501089155177.47499999999999201601089165188.92500000000001201701089175200.375201801089185211.82500000000002 \ No newline at end of file diff --git a/bundles/sirix-xquery/src/test/resources/sheets2/2.xml b/bundles/sirix-query/src/test/resources/sheets2/2.xml similarity index 99% rename from bundles/sirix-xquery/src/test/resources/sheets2/2.xml rename to bundles/sirix-query/src/test/resources/sheets2/2.xml index 3d1089e15..e6bcad9ba 100644 --- a/bundles/sirix-xquery/src/test/resources/sheets2/2.xml +++ b/bundles/sirix-query/src/test/resources/sheets2/2.xml @@ -1,2 +1,2 @@ - + 111512131420232614212325142224 \ No newline at end of file diff --git a/bundles/sirix-xquery/src/test/resources/sheets3/1.xml b/bundles/sirix-query/src/test/resources/sheets3/1.xml similarity index 98% rename from bundles/sirix-xquery/src/test/resources/sheets3/1.xml rename to bundles/sirix-query/src/test/resources/sheets3/1.xml index eb12d5dfa..b3c40afab 100644 --- a/bundles/sirix-xquery/src/test/resources/sheets3/1.xml +++ b/bundles/sirix-query/src/test/resources/sheets3/1.xml @@ -1,11 +1,11 @@ - - - - - - - - - - + + + + + + + + + + \ No newline at end of file diff --git a/bundles/sirix-xquery/src/test/resources/sheets3/2.xml b/bundles/sirix-query/src/test/resources/sheets3/2.xml similarity index 98% rename from bundles/sirix-xquery/src/test/resources/sheets3/2.xml rename to bundles/sirix-query/src/test/resources/sheets3/2.xml index c333ed54c..4081f6fa6 100644 --- a/bundles/sirix-xquery/src/test/resources/sheets3/2.xml +++ b/bundles/sirix-query/src/test/resources/sheets3/2.xml @@ -1,11 +1,11 @@ - - - - - - - - - - + + + + + + + + + + \ No newline at end of file diff --git a/bundles/sirix-xquery/src/test/resources/sheets4/1.xml b/bundles/sirix-query/src/test/resources/sheets4/1.xml similarity index 95% rename from bundles/sirix-xquery/src/test/resources/sheets4/1.xml rename to bundles/sirix-query/src/test/resources/sheets4/1.xml index 737d52e8b..e14225a75 100644 --- a/bundles/sirix-xquery/src/test/resources/sheets4/1.xml +++ b/bundles/sirix-query/src/test/resources/sheets4/1.xml @@ -1,910 +1,910 @@ - - - - - - - - - - - - - 0 - - - 1 - - - 2 - - - 3 - - - 4 - - - 5 - - - 6 - - - 19 - - - - - 2001 - - - 0 - - - 7 - - - 8 - - - 9 - - - 11.45 - - - F3*1.145 - 13.110249999999999 - - - 17 - - - - - 2002 - - - 0 - - - 7 - - - 8 - - - 9 - - - 22.9 - - - F4*1.145 - 26.220499999999998 - - - - - 2003 - - - 0 - - - 7 - - - 8 - - - 9 - - - 34.35 - - - - 39.330750000000002 - - - - - 2004 - - - 0 - - - 7 - - - 8 - - - 9 - - - 45.8 - - - - 52.440999999999995 - - - - - 2005 - - - 0 - - - 7 - - - 8 - - - 9 - - - 57.25 - - - - 65.551249999999996 - - - 2 - - - - - 2006 - - - 0 - - - 7 - - - 8 - - - 9 - - - 68.7 - - - - 78.661500000000004 - - - - - 2007 - - - 0 - - - 7 - - - 8 - - - 9 - - - 80.150000000000006 - - - - 91.771750000000011 - - - - - 2008 - - - 0 - - - 7 - - - 8 - - - 9 - - - 91.6 - - - - 104.88199999999999 - - - - - 2009 - - - 0 - - - 7 - - - 8 - - - 9 - - - 103.05 - - - - 117.99225 - - - - - 2010 - - - 0 - - - 7 - - - 8 - - - 9 - - - 114.5 - - - - 131.10249999999999 - - - - - 2011 - - - 0 - - - 7 - - - 8 - - - 9 - - - 125.95 - - - - 144.21275 - - - - - 2012 - - - 0 - - - 7 - - - 8 - - - 9 - - - 137.4 - - - - 157.32300000000001 - - - - - 2013 - - - 0 - - - 7 - - - 8 - - - 9 - - - 148.85 - - - - 170.43324999999999 - - - - - 2014 - - - 0 - - - 7 - - - 8 - - - 9 - - - 160.30000000000001 - - - - 183.54350000000002 - - - - - 2015 - - - 0 - - - 7 - - - 8 - - - 9 - - - 171.75 - - - - 196.65375 - - - - - 2016 - - - 0 - - - 7 - - - 8 - - - 9 - - - 183.2 - - - - 209.76399999999998 - - - - - 2017 - - - 0 - - - 7 - - - 8 - - - 9 - - - 194.65 - - - - 222.87425000000002 - - - - - 2018 - - - 0 - - - 7 - - - 8 - - - 9 - - - 206.1 - - - - 235.9845 - - - - - 2001 - - - 0 - - - 10 - - - 8 - - - 9 - - - 30 - - - (F21*1.145)*2 - 68.7 - - - - - 2002 - - - 0 - - - 10 - - - 8 - - - 9 - - - 50 - - - (F22*1.145)*2 - 114.5 - - - - - 2003 - - - 0 - - - 10 - - - 8 - - - 9 - - - 70 - - - (F23*1.145)*2 - 160.30000000000001 - - - - - 2004 - - - 0 - - - 10 - - - 8 - - - 9 - - - 90 - - - (F24*1.145)*2 - 206.1 - - - - - 2005 - - - 0 - - - 10 - - - 8 - - - 9 - - - 110 - - - (F25*1.145)*2 - 251.9 - - - - - 2006 - - - 0 - - - 10 - - - 8 - - - 9 - - - 130 - - - (F26*1.145)*2 - 297.7 - - - - - 2007 - - - 0 - - - 10 - - - 8 - - - 9 - - - 150 - - - (F27*1.145)*2 - 343.5 - - - - - 2008 - - - 0 - - - 10 - - - 8 - - - 9 - - - 170 - - - (F28*1.145)*2 - 389.3 - - - - - 2009 - - - 0 - - - 10 - - - 8 - - - 9 - - - 190 - - - (F29*1.145)*2 - 435.1 - - - - - 2010 - - - 0 - - - 10 - - - 8 - - - 9 - - - 210 - - - (F30*1.145)*2 - 480.90000000000003 - - - - - 2011 - - - 0 - - - 10 - - - 8 - - - 9 - - - 230 - - - (F31*1.145)*2 - 526.70000000000005 - - - - - 2012 - - - 0 - - - 10 - - - 8 - - - 9 - - - 250 - - - (F32*1.145)*2 - 572.5 - - - - - 2013 - - - 0 - - - 10 - - - 8 - - - 9 - - - 270 - - - (F33*1.145)*2 - 618.29999999999995 - - - - - 2014 - - - 0 - - - 10 - - - 8 - - - 9 - - - 290 - - - (F34*1.145)*2 - 664.1 - - - - - 2015 - - - 0 - - - 10 - - - 8 - - - 9 - - - 310 - - - (F35*1.145)*2 - 709.9 - - - - - 2016 - - - 0 - - - 10 - - - 8 - - - 9 - - - 330 - - - (F36*1.145)*2 - 755.7 - - - - - 2017 - - - 0 - - - 10 - - - 8 - - - 9 - - - 350 - - - (F37*1.145)*2 - 801.5 - - - - - 2018 - - - 0 - - - 10 - - - 8 - - - 9 - - - 370 - - - (F38*1.145)*2 - 847.30000000000007 - - - - - + + + + + + + + + + + + + 0 + + + 1 + + + 2 + + + 3 + + + 4 + + + 5 + + + 6 + + + 19 + + + + + 2001 + + + 0 + + + 7 + + + 8 + + + 9 + + + 11.45 + + + F3*1.145 + 13.110249999999999 + + + 17 + + + + + 2002 + + + 0 + + + 7 + + + 8 + + + 9 + + + 22.9 + + + F4*1.145 + 26.220499999999998 + + + + + 2003 + + + 0 + + + 7 + + + 8 + + + 9 + + + 34.35 + + + + 39.330750000000002 + + + + + 2004 + + + 0 + + + 7 + + + 8 + + + 9 + + + 45.8 + + + + 52.440999999999995 + + + + + 2005 + + + 0 + + + 7 + + + 8 + + + 9 + + + 57.25 + + + + 65.551249999999996 + + + 2 + + + + + 2006 + + + 0 + + + 7 + + + 8 + + + 9 + + + 68.7 + + + + 78.661500000000004 + + + + + 2007 + + + 0 + + + 7 + + + 8 + + + 9 + + + 80.150000000000006 + + + + 91.771750000000011 + + + + + 2008 + + + 0 + + + 7 + + + 8 + + + 9 + + + 91.6 + + + + 104.88199999999999 + + + + + 2009 + + + 0 + + + 7 + + + 8 + + + 9 + + + 103.05 + + + + 117.99225 + + + + + 2010 + + + 0 + + + 7 + + + 8 + + + 9 + + + 114.5 + + + + 131.10249999999999 + + + + + 2011 + + + 0 + + + 7 + + + 8 + + + 9 + + + 125.95 + + + + 144.21275 + + + + + 2012 + + + 0 + + + 7 + + + 8 + + + 9 + + + 137.4 + + + + 157.32300000000001 + + + + + 2013 + + + 0 + + + 7 + + + 8 + + + 9 + + + 148.85 + + + + 170.43324999999999 + + + + + 2014 + + + 0 + + + 7 + + + 8 + + + 9 + + + 160.30000000000001 + + + + 183.54350000000002 + + + + + 2015 + + + 0 + + + 7 + + + 8 + + + 9 + + + 171.75 + + + + 196.65375 + + + + + 2016 + + + 0 + + + 7 + + + 8 + + + 9 + + + 183.2 + + + + 209.76399999999998 + + + + + 2017 + + + 0 + + + 7 + + + 8 + + + 9 + + + 194.65 + + + + 222.87425000000002 + + + + + 2018 + + + 0 + + + 7 + + + 8 + + + 9 + + + 206.1 + + + + 235.9845 + + + + + 2001 + + + 0 + + + 10 + + + 8 + + + 9 + + + 30 + + + (F21*1.145)*2 + 68.7 + + + + + 2002 + + + 0 + + + 10 + + + 8 + + + 9 + + + 50 + + + (F22*1.145)*2 + 114.5 + + + + + 2003 + + + 0 + + + 10 + + + 8 + + + 9 + + + 70 + + + (F23*1.145)*2 + 160.30000000000001 + + + + + 2004 + + + 0 + + + 10 + + + 8 + + + 9 + + + 90 + + + (F24*1.145)*2 + 206.1 + + + + + 2005 + + + 0 + + + 10 + + + 8 + + + 9 + + + 110 + + + (F25*1.145)*2 + 251.9 + + + + + 2006 + + + 0 + + + 10 + + + 8 + + + 9 + + + 130 + + + (F26*1.145)*2 + 297.7 + + + + + 2007 + + + 0 + + + 10 + + + 8 + + + 9 + + + 150 + + + (F27*1.145)*2 + 343.5 + + + + + 2008 + + + 0 + + + 10 + + + 8 + + + 9 + + + 170 + + + (F28*1.145)*2 + 389.3 + + + + + 2009 + + + 0 + + + 10 + + + 8 + + + 9 + + + 190 + + + (F29*1.145)*2 + 435.1 + + + + + 2010 + + + 0 + + + 10 + + + 8 + + + 9 + + + 210 + + + (F30*1.145)*2 + 480.90000000000003 + + + + + 2011 + + + 0 + + + 10 + + + 8 + + + 9 + + + 230 + + + (F31*1.145)*2 + 526.70000000000005 + + + + + 2012 + + + 0 + + + 10 + + + 8 + + + 9 + + + 250 + + + (F32*1.145)*2 + 572.5 + + + + + 2013 + + + 0 + + + 10 + + + 8 + + + 9 + + + 270 + + + (F33*1.145)*2 + 618.29999999999995 + + + + + 2014 + + + 0 + + + 10 + + + 8 + + + 9 + + + 290 + + + (F34*1.145)*2 + 664.1 + + + + + 2015 + + + 0 + + + 10 + + + 8 + + + 9 + + + 310 + + + (F35*1.145)*2 + 709.9 + + + + + 2016 + + + 0 + + + 10 + + + 8 + + + 9 + + + 330 + + + (F36*1.145)*2 + 755.7 + + + + + 2017 + + + 0 + + + 10 + + + 8 + + + 9 + + + 350 + + + (F37*1.145)*2 + 801.5 + + + + + 2018 + + + 0 + + + 10 + + + 8 + + + 9 + + + 370 + + + (F38*1.145)*2 + 847.30000000000007 + + + + + \ No newline at end of file diff --git a/bundles/sirix-xquery/src/test/resources/sheets4/2.xml b/bundles/sirix-query/src/test/resources/sheets4/2.xml similarity index 95% rename from bundles/sirix-xquery/src/test/resources/sheets4/2.xml rename to bundles/sirix-query/src/test/resources/sheets4/2.xml index a75bef646..5d6e78811 100644 --- a/bundles/sirix-xquery/src/test/resources/sheets4/2.xml +++ b/bundles/sirix-query/src/test/resources/sheets4/2.xml @@ -1,877 +1,877 @@ - - - - - - - - - - - - - 0 - - - 1 - - - 2 - - - 3 - - - 4 - - - 5 - - - 6 - - - 19 - - - - - 2001 - - - 0 - - - 7 - - - 8 - - - 9 - - - 0 - - - 0 - - - 17 - - - - - 2002 - - - 0 - - - 7 - - - 8 - - - 9 - - - 0 - - - 0 - - - 25 - - - - - 2003 - - - 0 - - - 7 - - - 8 - - - 9 - - - 0 - - - 0 - - - - - 2004 - - - 0 - - - 7 - - - 8 - - - 9 - - - 0 - - - 0 - - - - - 2005 - - - 0 - - - 7 - - - 8 - - - 9 - - - 0 - - - 0 - - - 2 - - - - - 2006 - - - 0 - - - 7 - - - 8 - - - 9 - - - 0 - - - 0 - - - - - 2007 - - - 0 - - - 7 - - - 8 - - - 9 - - - 0 - - - 0 - - - - - 2008 - - - 0 - - - 7 - - - 8 - - - 9 - - - 0 - - - 0 - - - - - 2009 - - - 0 - - - 7 - - - 8 - - - 9 - - - 0 - - - 0 - - - - - 2010 - - - 0 - - - 7 - - - 8 - - - 9 - - - 0 - - - 0 - - - - - 2011 - - - 0 - - - 7 - - - 8 - - - 9 - - - 0 - - - 0 - - - - - 2012 - - - 0 - - - 7 - - - 8 - - - 9 - - - 0 - - - 0 - - - - - 2013 - - - 0 - - - 7 - - - 8 - - - 9 - - - 0 - - - 0 - - - - - 2014 - - - 0 - - - 7 - - - 8 - - - 9 - - - 0 - - - 0 - - - - - 2015 - - - 0 - - - 7 - - - 8 - - - 9 - - - 0 - - - 0 - - - - - 2016 - - - 0 - - - 7 - - - 8 - - - 9 - - - 0 - - - 0 - - - - - 2017 - - - 0 - - - 7 - - - 8 - - - 9 - - - 0 - - - 0 - - - - - 2018 - - - 0 - - - 7 - - - 8 - - - 9 - - - 0 - - - 0 - - - - - 2001 - - - 0 - - - 10 - - - 8 - - - 9 - - - 0 - - - 0 - - - - - 2002 - - - 0 - - - 10 - - - 8 - - - 9 - - - 0 - - - 0 - - - - - 2003 - - - 0 - - - 10 - - - 8 - - - 9 - - - 0 - - - 0 - - - - - 2004 - - - 0 - - - 10 - - - 8 - - - 9 - - - 0 - - - 0 - - - - - 2005 - - - 0 - - - 10 - - - 8 - - - 9 - - - 0 - - - 0 - - - - - 2006 - - - 0 - - - 10 - - - 8 - - - 9 - - - 0 - - - 0 - - - - - 2007 - - - 0 - - - 10 - - - 8 - - - 9 - - - 0 - - - 0 - - - - - 2008 - - - 0 - - - 10 - - - 8 - - - 9 - - - 0 - - - 0 - - - - - 2009 - - - 0 - - - 10 - - - 8 - - - 9 - - - 0 - - - 0 - - - - - 2010 - - - 0 - - - 10 - - - 8 - - - 9 - - - 0 - - - 0 - - - - - 2011 - - - 0 - - - 10 - - - 8 - - - 9 - - - 0 - - - 0 - - - - - 2012 - - - 0 - - - 10 - - - 8 - - - 9 - - - 0 - - - 0 - - - - - 2013 - - - 0 - - - 10 - - - 8 - - - 9 - - - 0 - - - 0 - - - - - 2014 - - - 0 - - - 10 - - - 8 - - - 9 - - - 0 - - - 0 - - - - - 2015 - - - 0 - - - 10 - - - 8 - - - 9 - - - 0 - - - 0 - - - - - 2016 - - - 0 - - - 10 - - - 8 - - - 9 - - - 0 - - - 0 - - - - - 2017 - - - 0 - - - 10 - - - 8 - - - 9 - - - 0 - - - 0 - - - - - 2018 - - - 0 - - - 10 - - - 8 - - - 9 - - - 0 - - - 0 - - - - - + + + + + + + + + + + + + 0 + + + 1 + + + 2 + + + 3 + + + 4 + + + 5 + + + 6 + + + 19 + + + + + 2001 + + + 0 + + + 7 + + + 8 + + + 9 + + + 0 + + + 0 + + + 17 + + + + + 2002 + + + 0 + + + 7 + + + 8 + + + 9 + + + 0 + + + 0 + + + 25 + + + + + 2003 + + + 0 + + + 7 + + + 8 + + + 9 + + + 0 + + + 0 + + + + + 2004 + + + 0 + + + 7 + + + 8 + + + 9 + + + 0 + + + 0 + + + + + 2005 + + + 0 + + + 7 + + + 8 + + + 9 + + + 0 + + + 0 + + + 2 + + + + + 2006 + + + 0 + + + 7 + + + 8 + + + 9 + + + 0 + + + 0 + + + + + 2007 + + + 0 + + + 7 + + + 8 + + + 9 + + + 0 + + + 0 + + + + + 2008 + + + 0 + + + 7 + + + 8 + + + 9 + + + 0 + + + 0 + + + + + 2009 + + + 0 + + + 7 + + + 8 + + + 9 + + + 0 + + + 0 + + + + + 2010 + + + 0 + + + 7 + + + 8 + + + 9 + + + 0 + + + 0 + + + + + 2011 + + + 0 + + + 7 + + + 8 + + + 9 + + + 0 + + + 0 + + + + + 2012 + + + 0 + + + 7 + + + 8 + + + 9 + + + 0 + + + 0 + + + + + 2013 + + + 0 + + + 7 + + + 8 + + + 9 + + + 0 + + + 0 + + + + + 2014 + + + 0 + + + 7 + + + 8 + + + 9 + + + 0 + + + 0 + + + + + 2015 + + + 0 + + + 7 + + + 8 + + + 9 + + + 0 + + + 0 + + + + + 2016 + + + 0 + + + 7 + + + 8 + + + 9 + + + 0 + + + 0 + + + + + 2017 + + + 0 + + + 7 + + + 8 + + + 9 + + + 0 + + + 0 + + + + + 2018 + + + 0 + + + 7 + + + 8 + + + 9 + + + 0 + + + 0 + + + + + 2001 + + + 0 + + + 10 + + + 8 + + + 9 + + + 0 + + + 0 + + + + + 2002 + + + 0 + + + 10 + + + 8 + + + 9 + + + 0 + + + 0 + + + + + 2003 + + + 0 + + + 10 + + + 8 + + + 9 + + + 0 + + + 0 + + + + + 2004 + + + 0 + + + 10 + + + 8 + + + 9 + + + 0 + + + 0 + + + + + 2005 + + + 0 + + + 10 + + + 8 + + + 9 + + + 0 + + + 0 + + + + + 2006 + + + 0 + + + 10 + + + 8 + + + 9 + + + 0 + + + 0 + + + + + 2007 + + + 0 + + + 10 + + + 8 + + + 9 + + + 0 + + + 0 + + + + + 2008 + + + 0 + + + 10 + + + 8 + + + 9 + + + 0 + + + 0 + + + + + 2009 + + + 0 + + + 10 + + + 8 + + + 9 + + + 0 + + + 0 + + + + + 2010 + + + 0 + + + 10 + + + 8 + + + 9 + + + 0 + + + 0 + + + + + 2011 + + + 0 + + + 10 + + + 8 + + + 9 + + + 0 + + + 0 + + + + + 2012 + + + 0 + + + 10 + + + 8 + + + 9 + + + 0 + + + 0 + + + + + 2013 + + + 0 + + + 10 + + + 8 + + + 9 + + + 0 + + + 0 + + + + + 2014 + + + 0 + + + 10 + + + 8 + + + 9 + + + 0 + + + 0 + + + + + 2015 + + + 0 + + + 10 + + + 8 + + + 9 + + + 0 + + + 0 + + + + + 2016 + + + 0 + + + 10 + + + 8 + + + 9 + + + 0 + + + 0 + + + + + 2017 + + + 0 + + + 10 + + + 8 + + + 9 + + + 0 + + + 0 + + + + + 2018 + + + 0 + + + 10 + + + 8 + + + 9 + + + 0 + + + 0 + + + + + \ No newline at end of file diff --git a/bundles/sirix-xquery/src/test/resources/xmark/auction.xml b/bundles/sirix-query/src/test/resources/xmark/auction.xml similarity index 100% rename from bundles/sirix-xquery/src/test/resources/xmark/auction.xml rename to bundles/sirix-query/src/test/resources/xmark/auction.xml diff --git a/bundles/sirix-xquery/src/test/resources/xmark/mini.xml b/bundles/sirix-query/src/test/resources/xmark/mini.xml similarity index 100% rename from bundles/sirix-xquery/src/test/resources/xmark/mini.xml rename to bundles/sirix-query/src/test/resources/xmark/mini.xml diff --git a/bundles/sirix-xquery/src/test/resources/xmark/queries/fndoc/q01.xq b/bundles/sirix-query/src/test/resources/xmark/queries/fndoc/q01.xq similarity index 100% rename from bundles/sirix-xquery/src/test/resources/xmark/queries/fndoc/q01.xq rename to bundles/sirix-query/src/test/resources/xmark/queries/fndoc/q01.xq diff --git a/bundles/sirix-xquery/src/test/resources/xmark/queries/fndoc/q02.xq b/bundles/sirix-query/src/test/resources/xmark/queries/fndoc/q02.xq similarity index 100% rename from bundles/sirix-xquery/src/test/resources/xmark/queries/fndoc/q02.xq rename to bundles/sirix-query/src/test/resources/xmark/queries/fndoc/q02.xq diff --git a/bundles/sirix-xquery/src/test/resources/xmark/queries/fndoc/q03.xq b/bundles/sirix-query/src/test/resources/xmark/queries/fndoc/q03.xq similarity index 100% rename from bundles/sirix-xquery/src/test/resources/xmark/queries/fndoc/q03.xq rename to bundles/sirix-query/src/test/resources/xmark/queries/fndoc/q03.xq diff --git a/bundles/sirix-xquery/src/test/resources/xmark/queries/fndoc/q04.xq b/bundles/sirix-query/src/test/resources/xmark/queries/fndoc/q04.xq similarity index 100% rename from bundles/sirix-xquery/src/test/resources/xmark/queries/fndoc/q04.xq rename to bundles/sirix-query/src/test/resources/xmark/queries/fndoc/q04.xq diff --git a/bundles/sirix-xquery/src/test/resources/xmark/queries/fndoc/q05.xq b/bundles/sirix-query/src/test/resources/xmark/queries/fndoc/q05.xq similarity index 100% rename from bundles/sirix-xquery/src/test/resources/xmark/queries/fndoc/q05.xq rename to bundles/sirix-query/src/test/resources/xmark/queries/fndoc/q05.xq diff --git a/bundles/sirix-xquery/src/test/resources/xmark/queries/fndoc/q06.xq b/bundles/sirix-query/src/test/resources/xmark/queries/fndoc/q06.xq similarity index 100% rename from bundles/sirix-xquery/src/test/resources/xmark/queries/fndoc/q06.xq rename to bundles/sirix-query/src/test/resources/xmark/queries/fndoc/q06.xq diff --git a/bundles/sirix-xquery/src/test/resources/xmark/queries/fndoc/q07.xq b/bundles/sirix-query/src/test/resources/xmark/queries/fndoc/q07.xq similarity index 100% rename from bundles/sirix-xquery/src/test/resources/xmark/queries/fndoc/q07.xq rename to bundles/sirix-query/src/test/resources/xmark/queries/fndoc/q07.xq diff --git a/bundles/sirix-xquery/src/test/resources/xmark/queries/fndoc/q08.xq b/bundles/sirix-query/src/test/resources/xmark/queries/fndoc/q08.xq similarity index 100% rename from bundles/sirix-xquery/src/test/resources/xmark/queries/fndoc/q08.xq rename to bundles/sirix-query/src/test/resources/xmark/queries/fndoc/q08.xq diff --git a/bundles/sirix-xquery/src/test/resources/xmark/queries/fndoc/q09.xq b/bundles/sirix-query/src/test/resources/xmark/queries/fndoc/q09.xq similarity index 100% rename from bundles/sirix-xquery/src/test/resources/xmark/queries/fndoc/q09.xq rename to bundles/sirix-query/src/test/resources/xmark/queries/fndoc/q09.xq diff --git a/bundles/sirix-xquery/src/test/resources/xmark/queries/fndoc/q10.xq b/bundles/sirix-query/src/test/resources/xmark/queries/fndoc/q10.xq similarity index 100% rename from bundles/sirix-xquery/src/test/resources/xmark/queries/fndoc/q10.xq rename to bundles/sirix-query/src/test/resources/xmark/queries/fndoc/q10.xq diff --git a/bundles/sirix-xquery/src/test/resources/xmark/queries/fndoc/q11.xq b/bundles/sirix-query/src/test/resources/xmark/queries/fndoc/q11.xq similarity index 100% rename from bundles/sirix-xquery/src/test/resources/xmark/queries/fndoc/q11.xq rename to bundles/sirix-query/src/test/resources/xmark/queries/fndoc/q11.xq diff --git a/bundles/sirix-xquery/src/test/resources/xmark/queries/fndoc/q12.xq b/bundles/sirix-query/src/test/resources/xmark/queries/fndoc/q12.xq similarity index 100% rename from bundles/sirix-xquery/src/test/resources/xmark/queries/fndoc/q12.xq rename to bundles/sirix-query/src/test/resources/xmark/queries/fndoc/q12.xq diff --git a/bundles/sirix-xquery/src/test/resources/xmark/queries/fndoc/q13.xq b/bundles/sirix-query/src/test/resources/xmark/queries/fndoc/q13.xq similarity index 100% rename from bundles/sirix-xquery/src/test/resources/xmark/queries/fndoc/q13.xq rename to bundles/sirix-query/src/test/resources/xmark/queries/fndoc/q13.xq diff --git a/bundles/sirix-xquery/src/test/resources/xmark/queries/fndoc/q14.xq b/bundles/sirix-query/src/test/resources/xmark/queries/fndoc/q14.xq similarity index 100% rename from bundles/sirix-xquery/src/test/resources/xmark/queries/fndoc/q14.xq rename to bundles/sirix-query/src/test/resources/xmark/queries/fndoc/q14.xq diff --git a/bundles/sirix-xquery/src/test/resources/xmark/queries/fndoc/q15.xq b/bundles/sirix-query/src/test/resources/xmark/queries/fndoc/q15.xq similarity index 100% rename from bundles/sirix-xquery/src/test/resources/xmark/queries/fndoc/q15.xq rename to bundles/sirix-query/src/test/resources/xmark/queries/fndoc/q15.xq diff --git a/bundles/sirix-xquery/src/test/resources/xmark/queries/fndoc/q16.xq b/bundles/sirix-query/src/test/resources/xmark/queries/fndoc/q16.xq similarity index 100% rename from bundles/sirix-xquery/src/test/resources/xmark/queries/fndoc/q16.xq rename to bundles/sirix-query/src/test/resources/xmark/queries/fndoc/q16.xq diff --git a/bundles/sirix-xquery/src/test/resources/xmark/queries/fndoc/q17.xq b/bundles/sirix-query/src/test/resources/xmark/queries/fndoc/q17.xq similarity index 100% rename from bundles/sirix-xquery/src/test/resources/xmark/queries/fndoc/q17.xq rename to bundles/sirix-query/src/test/resources/xmark/queries/fndoc/q17.xq diff --git a/bundles/sirix-xquery/src/test/resources/xmark/queries/fndoc/q18.xq b/bundles/sirix-query/src/test/resources/xmark/queries/fndoc/q18.xq similarity index 100% rename from bundles/sirix-xquery/src/test/resources/xmark/queries/fndoc/q18.xq rename to bundles/sirix-query/src/test/resources/xmark/queries/fndoc/q18.xq diff --git a/bundles/sirix-xquery/src/test/resources/xmark/queries/fndoc/q19.xq b/bundles/sirix-query/src/test/resources/xmark/queries/fndoc/q19.xq similarity index 100% rename from bundles/sirix-xquery/src/test/resources/xmark/queries/fndoc/q19.xq rename to bundles/sirix-query/src/test/resources/xmark/queries/fndoc/q19.xq diff --git a/bundles/sirix-xquery/src/test/resources/xmark/queries/fndoc/q20.xq b/bundles/sirix-query/src/test/resources/xmark/queries/fndoc/q20.xq similarity index 100% rename from bundles/sirix-xquery/src/test/resources/xmark/queries/fndoc/q20.xq rename to bundles/sirix-query/src/test/resources/xmark/queries/fndoc/q20.xq diff --git a/bundles/sirix-xquery/src/test/resources/xmark/queries/orig/q01.xq b/bundles/sirix-query/src/test/resources/xmark/queries/orig/q01.xq similarity index 100% rename from bundles/sirix-xquery/src/test/resources/xmark/queries/orig/q01.xq rename to bundles/sirix-query/src/test/resources/xmark/queries/orig/q01.xq diff --git a/bundles/sirix-xquery/src/test/resources/xmark/queries/orig/q02.xq b/bundles/sirix-query/src/test/resources/xmark/queries/orig/q02.xq similarity index 100% rename from bundles/sirix-xquery/src/test/resources/xmark/queries/orig/q02.xq rename to bundles/sirix-query/src/test/resources/xmark/queries/orig/q02.xq diff --git a/bundles/sirix-xquery/src/test/resources/xmark/queries/orig/q03.xq b/bundles/sirix-query/src/test/resources/xmark/queries/orig/q03.xq similarity index 100% rename from bundles/sirix-xquery/src/test/resources/xmark/queries/orig/q03.xq rename to bundles/sirix-query/src/test/resources/xmark/queries/orig/q03.xq diff --git a/bundles/sirix-xquery/src/test/resources/xmark/queries/orig/q04.xq b/bundles/sirix-query/src/test/resources/xmark/queries/orig/q04.xq similarity index 100% rename from bundles/sirix-xquery/src/test/resources/xmark/queries/orig/q04.xq rename to bundles/sirix-query/src/test/resources/xmark/queries/orig/q04.xq diff --git a/bundles/sirix-xquery/src/test/resources/xmark/queries/orig/q05.xq b/bundles/sirix-query/src/test/resources/xmark/queries/orig/q05.xq similarity index 100% rename from bundles/sirix-xquery/src/test/resources/xmark/queries/orig/q05.xq rename to bundles/sirix-query/src/test/resources/xmark/queries/orig/q05.xq diff --git a/bundles/sirix-xquery/src/test/resources/xmark/queries/orig/q06.xq b/bundles/sirix-query/src/test/resources/xmark/queries/orig/q06.xq similarity index 100% rename from bundles/sirix-xquery/src/test/resources/xmark/queries/orig/q06.xq rename to bundles/sirix-query/src/test/resources/xmark/queries/orig/q06.xq diff --git a/bundles/sirix-xquery/src/test/resources/xmark/queries/orig/q07.xq b/bundles/sirix-query/src/test/resources/xmark/queries/orig/q07.xq similarity index 100% rename from bundles/sirix-xquery/src/test/resources/xmark/queries/orig/q07.xq rename to bundles/sirix-query/src/test/resources/xmark/queries/orig/q07.xq diff --git a/bundles/sirix-xquery/src/test/resources/xmark/queries/orig/q08.xq b/bundles/sirix-query/src/test/resources/xmark/queries/orig/q08.xq similarity index 100% rename from bundles/sirix-xquery/src/test/resources/xmark/queries/orig/q08.xq rename to bundles/sirix-query/src/test/resources/xmark/queries/orig/q08.xq diff --git a/bundles/sirix-xquery/src/test/resources/xmark/queries/orig/q09.xq b/bundles/sirix-query/src/test/resources/xmark/queries/orig/q09.xq similarity index 100% rename from bundles/sirix-xquery/src/test/resources/xmark/queries/orig/q09.xq rename to bundles/sirix-query/src/test/resources/xmark/queries/orig/q09.xq diff --git a/bundles/sirix-xquery/src/test/resources/xmark/queries/orig/q10.xq b/bundles/sirix-query/src/test/resources/xmark/queries/orig/q10.xq similarity index 100% rename from bundles/sirix-xquery/src/test/resources/xmark/queries/orig/q10.xq rename to bundles/sirix-query/src/test/resources/xmark/queries/orig/q10.xq diff --git a/bundles/sirix-xquery/src/test/resources/xmark/queries/orig/q11.xq b/bundles/sirix-query/src/test/resources/xmark/queries/orig/q11.xq similarity index 100% rename from bundles/sirix-xquery/src/test/resources/xmark/queries/orig/q11.xq rename to bundles/sirix-query/src/test/resources/xmark/queries/orig/q11.xq diff --git a/bundles/sirix-xquery/src/test/resources/xmark/queries/orig/q12.xq b/bundles/sirix-query/src/test/resources/xmark/queries/orig/q12.xq similarity index 100% rename from bundles/sirix-xquery/src/test/resources/xmark/queries/orig/q12.xq rename to bundles/sirix-query/src/test/resources/xmark/queries/orig/q12.xq diff --git a/bundles/sirix-xquery/src/test/resources/xmark/queries/orig/q13.xq b/bundles/sirix-query/src/test/resources/xmark/queries/orig/q13.xq similarity index 100% rename from bundles/sirix-xquery/src/test/resources/xmark/queries/orig/q13.xq rename to bundles/sirix-query/src/test/resources/xmark/queries/orig/q13.xq diff --git a/bundles/sirix-xquery/src/test/resources/xmark/queries/orig/q14.xq b/bundles/sirix-query/src/test/resources/xmark/queries/orig/q14.xq similarity index 100% rename from bundles/sirix-xquery/src/test/resources/xmark/queries/orig/q14.xq rename to bundles/sirix-query/src/test/resources/xmark/queries/orig/q14.xq diff --git a/bundles/sirix-xquery/src/test/resources/xmark/queries/orig/q15.xq b/bundles/sirix-query/src/test/resources/xmark/queries/orig/q15.xq similarity index 100% rename from bundles/sirix-xquery/src/test/resources/xmark/queries/orig/q15.xq rename to bundles/sirix-query/src/test/resources/xmark/queries/orig/q15.xq diff --git a/bundles/sirix-xquery/src/test/resources/xmark/queries/orig/q16.xq b/bundles/sirix-query/src/test/resources/xmark/queries/orig/q16.xq similarity index 100% rename from bundles/sirix-xquery/src/test/resources/xmark/queries/orig/q16.xq rename to bundles/sirix-query/src/test/resources/xmark/queries/orig/q16.xq diff --git a/bundles/sirix-xquery/src/test/resources/xmark/queries/orig/q17.xq b/bundles/sirix-query/src/test/resources/xmark/queries/orig/q17.xq similarity index 100% rename from bundles/sirix-xquery/src/test/resources/xmark/queries/orig/q17.xq rename to bundles/sirix-query/src/test/resources/xmark/queries/orig/q17.xq diff --git a/bundles/sirix-xquery/src/test/resources/xmark/queries/orig/q18.xq b/bundles/sirix-query/src/test/resources/xmark/queries/orig/q18.xq similarity index 100% rename from bundles/sirix-xquery/src/test/resources/xmark/queries/orig/q18.xq rename to bundles/sirix-query/src/test/resources/xmark/queries/orig/q18.xq diff --git a/bundles/sirix-xquery/src/test/resources/xmark/queries/orig/q19.xq b/bundles/sirix-query/src/test/resources/xmark/queries/orig/q19.xq similarity index 100% rename from bundles/sirix-xquery/src/test/resources/xmark/queries/orig/q19.xq rename to bundles/sirix-query/src/test/resources/xmark/queries/orig/q19.xq diff --git a/bundles/sirix-xquery/src/test/resources/xmark/queries/orig/q20.xq b/bundles/sirix-query/src/test/resources/xmark/queries/orig/q20.xq similarity index 100% rename from bundles/sirix-xquery/src/test/resources/xmark/queries/orig/q20.xq rename to bundles/sirix-query/src/test/resources/xmark/queries/orig/q20.xq diff --git a/bundles/sirix-xquery/src/test/resources/xmark/results/q01.out b/bundles/sirix-query/src/test/resources/xmark/results/q01.out similarity index 100% rename from bundles/sirix-xquery/src/test/resources/xmark/results/q01.out rename to bundles/sirix-query/src/test/resources/xmark/results/q01.out diff --git a/bundles/sirix-xquery/src/test/resources/xmark/results/q02.out b/bundles/sirix-query/src/test/resources/xmark/results/q02.out similarity index 100% rename from bundles/sirix-xquery/src/test/resources/xmark/results/q02.out rename to bundles/sirix-query/src/test/resources/xmark/results/q02.out diff --git a/bundles/sirix-xquery/src/test/resources/xmark/results/q03.out b/bundles/sirix-query/src/test/resources/xmark/results/q03.out similarity index 100% rename from bundles/sirix-xquery/src/test/resources/xmark/results/q03.out rename to bundles/sirix-query/src/test/resources/xmark/results/q03.out diff --git a/bundles/sirix-xquery/src/test/resources/xmark/results/q04.out b/bundles/sirix-query/src/test/resources/xmark/results/q04.out similarity index 100% rename from bundles/sirix-xquery/src/test/resources/xmark/results/q04.out rename to bundles/sirix-query/src/test/resources/xmark/results/q04.out diff --git a/bundles/sirix-xquery/src/test/resources/xmark/results/q05.out b/bundles/sirix-query/src/test/resources/xmark/results/q05.out similarity index 100% rename from bundles/sirix-xquery/src/test/resources/xmark/results/q05.out rename to bundles/sirix-query/src/test/resources/xmark/results/q05.out diff --git a/bundles/sirix-xquery/src/test/resources/xmark/results/q06.out b/bundles/sirix-query/src/test/resources/xmark/results/q06.out similarity index 100% rename from bundles/sirix-xquery/src/test/resources/xmark/results/q06.out rename to bundles/sirix-query/src/test/resources/xmark/results/q06.out diff --git a/bundles/sirix-xquery/src/test/resources/xmark/results/q07.out b/bundles/sirix-query/src/test/resources/xmark/results/q07.out similarity index 100% rename from bundles/sirix-xquery/src/test/resources/xmark/results/q07.out rename to bundles/sirix-query/src/test/resources/xmark/results/q07.out diff --git a/bundles/sirix-xquery/src/test/resources/xmark/results/q08.out b/bundles/sirix-query/src/test/resources/xmark/results/q08.out similarity index 100% rename from bundles/sirix-xquery/src/test/resources/xmark/results/q08.out rename to bundles/sirix-query/src/test/resources/xmark/results/q08.out diff --git a/bundles/sirix-xquery/src/test/resources/xmark/results/q09.out b/bundles/sirix-query/src/test/resources/xmark/results/q09.out similarity index 100% rename from bundles/sirix-xquery/src/test/resources/xmark/results/q09.out rename to bundles/sirix-query/src/test/resources/xmark/results/q09.out diff --git a/bundles/sirix-xquery/src/test/resources/xmark/results/q10.out b/bundles/sirix-query/src/test/resources/xmark/results/q10.out similarity index 100% rename from bundles/sirix-xquery/src/test/resources/xmark/results/q10.out rename to bundles/sirix-query/src/test/resources/xmark/results/q10.out diff --git a/bundles/sirix-xquery/src/test/resources/xmark/results/q11.out b/bundles/sirix-query/src/test/resources/xmark/results/q11.out similarity index 100% rename from bundles/sirix-xquery/src/test/resources/xmark/results/q11.out rename to bundles/sirix-query/src/test/resources/xmark/results/q11.out diff --git a/bundles/sirix-xquery/src/test/resources/xmark/results/q12.out b/bundles/sirix-query/src/test/resources/xmark/results/q12.out similarity index 100% rename from bundles/sirix-xquery/src/test/resources/xmark/results/q12.out rename to bundles/sirix-query/src/test/resources/xmark/results/q12.out diff --git a/bundles/sirix-xquery/src/test/resources/xmark/results/q13.out b/bundles/sirix-query/src/test/resources/xmark/results/q13.out similarity index 100% rename from bundles/sirix-xquery/src/test/resources/xmark/results/q13.out rename to bundles/sirix-query/src/test/resources/xmark/results/q13.out diff --git a/bundles/sirix-xquery/src/test/resources/xmark/results/q14.out b/bundles/sirix-query/src/test/resources/xmark/results/q14.out similarity index 100% rename from bundles/sirix-xquery/src/test/resources/xmark/results/q14.out rename to bundles/sirix-query/src/test/resources/xmark/results/q14.out diff --git a/bundles/sirix-xquery/src/test/resources/xmark/results/q15.out b/bundles/sirix-query/src/test/resources/xmark/results/q15.out similarity index 100% rename from bundles/sirix-xquery/src/test/resources/xmark/results/q15.out rename to bundles/sirix-query/src/test/resources/xmark/results/q15.out diff --git a/bundles/sirix-xquery/src/test/resources/xmark/results/q16.out b/bundles/sirix-query/src/test/resources/xmark/results/q16.out similarity index 100% rename from bundles/sirix-xquery/src/test/resources/xmark/results/q16.out rename to bundles/sirix-query/src/test/resources/xmark/results/q16.out diff --git a/bundles/sirix-xquery/src/test/resources/xmark/results/q17.out b/bundles/sirix-query/src/test/resources/xmark/results/q17.out similarity index 100% rename from bundles/sirix-xquery/src/test/resources/xmark/results/q17.out rename to bundles/sirix-query/src/test/resources/xmark/results/q17.out diff --git a/bundles/sirix-xquery/src/test/resources/xmark/results/q18.out b/bundles/sirix-query/src/test/resources/xmark/results/q18.out similarity index 100% rename from bundles/sirix-xquery/src/test/resources/xmark/results/q18.out rename to bundles/sirix-query/src/test/resources/xmark/results/q18.out diff --git a/bundles/sirix-xquery/src/test/resources/xmark/results/q19.out b/bundles/sirix-query/src/test/resources/xmark/results/q19.out similarity index 100% rename from bundles/sirix-xquery/src/test/resources/xmark/results/q19.out rename to bundles/sirix-query/src/test/resources/xmark/results/q19.out diff --git a/bundles/sirix-xquery/src/test/resources/xmark/results/q20.out b/bundles/sirix-query/src/test/resources/xmark/results/q20.out similarity index 100% rename from bundles/sirix-xquery/src/test/resources/xmark/results/q20.out rename to bundles/sirix-query/src/test/resources/xmark/results/q20.out diff --git a/bundles/sirix-rest-api/build.gradle b/bundles/sirix-rest-api/build.gradle index 6c178c4ff..38770ff31 100644 --- a/bundles/sirix-rest-api/build.gradle +++ b/bundles/sirix-rest-api/build.gradle @@ -20,7 +20,7 @@ apply plugin: 'docker-compose' dependencies { implementation project(':sirix-core') - implementation project(':sirix-xquery') + implementation project(':sirix-query') testImplementation project(':sirix-core').sourceSets.test.output implementation implLibraries.kotlinStdlib diff --git a/bundles/sirix-rest-api/src/main/kotlin/org/sirix/rest/crud/QuerySerializer.kt b/bundles/sirix-rest-api/src/main/kotlin/org/sirix/rest/crud/QuerySerializer.kt index 090e354fa..abfd01d14 100644 --- a/bundles/sirix-rest-api/src/main/kotlin/org/sirix/rest/crud/QuerySerializer.kt +++ b/bundles/sirix-rest-api/src/main/kotlin/org/sirix/rest/crud/QuerySerializer.kt @@ -5,8 +5,8 @@ import io.vertx.ext.auth.authorization.AuthorizationProvider import io.vertx.ext.auth.oauth2.OAuth2Auth import org.brackit.xquery.jdm.Item import org.brackit.xquery.util.serialize.Serializer -import org.sirix.xquery.SirixCompileChain -import org.sirix.xquery.SirixQueryContext +import org.sirix.query.SirixCompileChain +import org.sirix.query.SirixQueryContext class QuerySerializer { companion object { diff --git a/bundles/sirix-rest-api/src/main/kotlin/org/sirix/rest/crud/json/JsonDelete.kt b/bundles/sirix-rest-api/src/main/kotlin/org/sirix/rest/crud/json/JsonDelete.kt index 623863ed2..aef1184bd 100644 --- a/bundles/sirix-rest-api/src/main/kotlin/org/sirix/rest/crud/json/JsonDelete.kt +++ b/bundles/sirix-rest-api/src/main/kotlin/org/sirix/rest/crud/json/JsonDelete.kt @@ -12,7 +12,7 @@ import org.sirix.api.Database import org.sirix.api.ResourceSession import org.sirix.api.json.JsonResourceSession import org.sirix.rest.crud.AbstractDeleteHandler -import org.sirix.xquery.json.BasicJsonDBStore +import org.sirix.query.json.BasicJsonDBStore import java.nio.file.Path class JsonDelete(location: Path, private val authz: AuthorizationProvider) : AbstractDeleteHandler(location) { diff --git a/bundles/sirix-rest-api/src/main/kotlin/org/sirix/rest/crud/json/JsonGet.kt b/bundles/sirix-rest-api/src/main/kotlin/org/sirix/rest/crud/json/JsonGet.kt index 8e0b038b6..52ddd3040 100644 --- a/bundles/sirix-rest-api/src/main/kotlin/org/sirix/rest/crud/json/JsonGet.kt +++ b/bundles/sirix-rest-api/src/main/kotlin/org/sirix/rest/crud/json/JsonGet.kt @@ -19,11 +19,11 @@ import org.sirix.rest.crud.Revisions import org.sirix.rest.crud.xml.XmlSessionDBStore import org.sirix.service.json.serialize.JsonRecordSerializer import org.sirix.service.json.serialize.JsonSerializer -import org.sirix.xquery.JsonDBSerializer -import org.sirix.xquery.SirixCompileChain -import org.sirix.xquery.SirixQueryContext -import org.sirix.xquery.json.* -import org.sirix.xquery.node.BasicXmlDBStore +import org.sirix.query.JsonDBSerializer +import org.sirix.query.SirixCompileChain +import org.sirix.query.SirixQueryContext +import org.sirix.query.json.* +import org.sirix.query.node.BasicXmlDBStore import java.io.StringWriter import java.nio.file.Path diff --git a/bundles/sirix-rest-api/src/main/kotlin/org/sirix/rest/crud/json/JsonSessionDBCollection.kt b/bundles/sirix-rest-api/src/main/kotlin/org/sirix/rest/crud/json/JsonSessionDBCollection.kt index a5bb6f788..6df45d6be 100644 --- a/bundles/sirix-rest-api/src/main/kotlin/org/sirix/rest/crud/json/JsonSessionDBCollection.kt +++ b/bundles/sirix-rest-api/src/main/kotlin/org/sirix/rest/crud/json/JsonSessionDBCollection.kt @@ -3,7 +3,7 @@ package org.sirix.rest.crud.json import io.vertx.ext.auth.User import io.vertx.ext.web.RoutingContext import org.brackit.xquery.jdm.json.TemporalJsonCollection -import org.sirix.xquery.json.JsonDBItem +import org.sirix.query.json.JsonDBItem class JsonSessionDBCollection( private val ctx: RoutingContext, diff --git a/bundles/sirix-rest-api/src/main/kotlin/org/sirix/rest/crud/json/JsonSessionDBStore.kt b/bundles/sirix-rest-api/src/main/kotlin/org/sirix/rest/crud/json/JsonSessionDBStore.kt index 31f3807a5..6b12dd888 100644 --- a/bundles/sirix-rest-api/src/main/kotlin/org/sirix/rest/crud/json/JsonSessionDBStore.kt +++ b/bundles/sirix-rest-api/src/main/kotlin/org/sirix/rest/crud/json/JsonSessionDBStore.kt @@ -7,8 +7,8 @@ import io.vertx.ext.web.RoutingContext import io.vertx.kotlin.coroutines.dispatcher import org.sirix.rest.Auth import org.sirix.rest.AuthRole -import org.sirix.xquery.json.JsonDBCollection -import org.sirix.xquery.json.JsonDBStore +import org.sirix.query.json.JsonDBCollection +import org.sirix.query.json.JsonDBStore import java.nio.file.Path import java.time.Instant diff --git a/bundles/sirix-rest-api/src/main/kotlin/org/sirix/rest/crud/xml/XmlDelete.kt b/bundles/sirix-rest-api/src/main/kotlin/org/sirix/rest/crud/xml/XmlDelete.kt index 74e54255f..8903a3c24 100644 --- a/bundles/sirix-rest-api/src/main/kotlin/org/sirix/rest/crud/xml/XmlDelete.kt +++ b/bundles/sirix-rest-api/src/main/kotlin/org/sirix/rest/crud/xml/XmlDelete.kt @@ -12,7 +12,7 @@ import org.sirix.api.Database import org.sirix.api.ResourceSession import org.sirix.api.xml.XmlResourceSession import org.sirix.rest.crud.AbstractDeleteHandler -import org.sirix.xquery.node.BasicXmlDBStore +import org.sirix.query.node.BasicXmlDBStore import java.nio.file.Path class XmlDelete(location: Path, private val authz: AuthorizationProvider) : AbstractDeleteHandler(location) { diff --git a/bundles/sirix-rest-api/src/main/kotlin/org/sirix/rest/crud/xml/XmlGet.kt b/bundles/sirix-rest-api/src/main/kotlin/org/sirix/rest/crud/xml/XmlGet.kt index 2a9948074..268de3561 100644 --- a/bundles/sirix-rest-api/src/main/kotlin/org/sirix/rest/crud/xml/XmlGet.kt +++ b/bundles/sirix-rest-api/src/main/kotlin/org/sirix/rest/crud/xml/XmlGet.kt @@ -20,13 +20,13 @@ import org.sirix.rest.crud.QuerySerializer import org.sirix.rest.crud.Revisions import org.sirix.rest.crud.json.JsonSessionDBStore import org.sirix.service.xml.serialize.XmlSerializer -import org.sirix.xquery.SirixCompileChain -import org.sirix.xquery.SirixQueryContext -import org.sirix.xquery.XmlDBSerializer -import org.sirix.xquery.json.BasicJsonDBStore -import org.sirix.xquery.node.BasicXmlDBStore -import org.sirix.xquery.node.XmlDBCollection -import org.sirix.xquery.node.XmlDBNode +import org.sirix.query.SirixCompileChain +import org.sirix.query.SirixQueryContext +import org.sirix.query.XmlDBSerializer +import org.sirix.query.json.BasicJsonDBStore +import org.sirix.query.node.BasicXmlDBStore +import org.sirix.query.node.XmlDBCollection +import org.sirix.query.node.XmlDBNode import java.io.ByteArrayOutputStream import java.io.PrintStream import java.nio.file.Path diff --git a/bundles/sirix-rest-api/src/main/kotlin/org/sirix/rest/crud/xml/XmlSessionDBCollection.kt b/bundles/sirix-rest-api/src/main/kotlin/org/sirix/rest/crud/xml/XmlSessionDBCollection.kt index 74eb4c2a1..8fa7c2b80 100644 --- a/bundles/sirix-rest-api/src/main/kotlin/org/sirix/rest/crud/xml/XmlSessionDBCollection.kt +++ b/bundles/sirix-rest-api/src/main/kotlin/org/sirix/rest/crud/xml/XmlSessionDBCollection.kt @@ -4,7 +4,7 @@ import io.vertx.ext.auth.User import io.vertx.ext.web.RoutingContext import org.brackit.xquery.jdm.node.AbstractTemporalNode import org.brackit.xquery.jdm.node.TemporalNodeCollection -import org.sirix.xquery.node.XmlDBNode +import org.sirix.query.node.XmlDBNode class XmlSessionDBCollection( private val ctx: RoutingContext, diff --git a/bundles/sirix-rest-api/src/main/kotlin/org/sirix/rest/crud/xml/XmlSessionDBNode.kt b/bundles/sirix-rest-api/src/main/kotlin/org/sirix/rest/crud/xml/XmlSessionDBNode.kt index 491138938..3de15adb7 100644 --- a/bundles/sirix-rest-api/src/main/kotlin/org/sirix/rest/crud/xml/XmlSessionDBNode.kt +++ b/bundles/sirix-rest-api/src/main/kotlin/org/sirix/rest/crud/xml/XmlSessionDBNode.kt @@ -3,7 +3,7 @@ package org.sirix.rest.crud.xml import io.vertx.ext.auth.User import io.vertx.ext.web.RoutingContext import org.sirix.api.xml.XmlNodeReadOnlyTrx -import org.sirix.xquery.StructuredDBItem +import org.sirix.query.StructuredDBItem class XmlSessionDBNode( private val ctx: RoutingContext, diff --git a/bundles/sirix-rest-api/src/main/kotlin/org/sirix/rest/crud/xml/XmlSessionDBStore.kt b/bundles/sirix-rest-api/src/main/kotlin/org/sirix/rest/crud/xml/XmlSessionDBStore.kt index c507244f7..29f8968d5 100644 --- a/bundles/sirix-rest-api/src/main/kotlin/org/sirix/rest/crud/xml/XmlSessionDBStore.kt +++ b/bundles/sirix-rest-api/src/main/kotlin/org/sirix/rest/crud/xml/XmlSessionDBStore.kt @@ -8,8 +8,8 @@ import org.brackit.xquery.jdm.Stream import org.brackit.xquery.node.parser.NodeSubtreeParser import org.sirix.rest.Auth import org.sirix.rest.AuthRole -import org.sirix.xquery.node.XmlDBCollection -import org.sirix.xquery.node.XmlDBStore +import org.sirix.query.node.XmlDBCollection +import org.sirix.query.node.XmlDBStore import java.time.Instant class XmlSessionDBStore( diff --git a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/compiler/package-info.java b/bundles/sirix-xquery/src/main/java/org/sirix/xquery/compiler/package-info.java deleted file mode 100644 index b19596a8d..000000000 --- a/bundles/sirix-xquery/src/main/java/org/sirix/xquery/compiler/package-info.java +++ /dev/null @@ -1,5 +0,0 @@ -/** - * @author johannes - * - */ -package org.sirix.xquery.compiler; diff --git a/settings.gradle b/settings.gradle index 2ba94acd1..20b6cf5d1 100644 --- a/settings.gradle +++ b/settings.gradle @@ -4,13 +4,13 @@ rootProject.name = 'sirix-parent' include(':sirix-core') -include(':sirix-xquery') +include(':sirix-query') include(':sirix-rest-api') include(':sirix-example') include(':sirix-kotlin-api') include(':sirix-kotlin-cli') project(':sirix-core').projectDir = file('bundles/sirix-core') -project(':sirix-xquery').projectDir = file('bundles/sirix-xquery') +project(':sirix-query').projectDir = file('bundles/sirix-query') project(':sirix-rest-api').projectDir = file('bundles/sirix-rest-api') project(':sirix-example').projectDir = file('bundles/sirix-examples') project(':sirix-kotlin-api').projectDir = file('bundles/sirix-kotlin-api')