From 337e1c19c014069ceaaff6f0ef6d26a763ca1fff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=CC=88rg=20Prante?= Date: Wed, 25 May 2022 10:41:50 +0200 Subject: [PATCH] update to gradle 7.3.2, add bgzf (MIT License) --- gradle.properties | 4 +- gradle/wrapper/gradle-wrapper.jar | Bin 59203 -> 59536 bytes gradle/wrapper/gradle-wrapper.properties | 2 +- gradlew | 269 ++++--- io-codec/build.gradle | 1 + io-codec/src/main/java/module-info.java | 2 + .../xbib/io/codec/bgzf/BzgfStreamCodec.java | 37 + io-compress-bgzf/LICENSE.txt | 21 + .../src/main/java/module-info.java | 3 + .../xbib/io/compress/bgzf/BGZFException.java | 19 + .../io/compress/bgzf/BGZFFilePointerUtil.java | 67 ++ .../io/compress/bgzf/BGZFFormatException.java | 19 + .../io/compress/bgzf/BGZFStreamConstants.java | 95 +++ .../xbib/io/compress/bgzf/BinaryCodec.java | 666 ++++++++++++++++ .../bgzf/BlockCompressedInputStream.java | 709 ++++++++++++++++++ .../bgzf/BlockCompressedOutputStream.java | 358 +++++++++ .../xbib/io/compress/bgzf/BlockGunzipper.java | 114 +++ .../io/compress/bgzf/DeflaterFactory.java | 24 + .../io/compress/bgzf/InflaterFactory.java | 20 + .../compress/bgzf/SeekableBufferedStream.java | 105 +++ .../io/compress/bgzf/SeekableFileStream.java | 110 +++ .../xbib/io/compress/bgzf/SeekableStream.java | 44 ++ .../compress/bgzf/SeekableStreamFactory.java | 11 + settings.gradle | 1 + 24 files changed, 2588 insertions(+), 113 deletions(-) create mode 100644 io-codec/src/main/java/org/xbib/io/codec/bgzf/BzgfStreamCodec.java create mode 100644 io-compress-bgzf/LICENSE.txt create mode 100644 io-compress-bgzf/src/main/java/module-info.java create mode 100644 io-compress-bgzf/src/main/java/org/xbib/io/compress/bgzf/BGZFException.java create mode 100644 io-compress-bgzf/src/main/java/org/xbib/io/compress/bgzf/BGZFFilePointerUtil.java create mode 100644 io-compress-bgzf/src/main/java/org/xbib/io/compress/bgzf/BGZFFormatException.java create mode 100644 io-compress-bgzf/src/main/java/org/xbib/io/compress/bgzf/BGZFStreamConstants.java create mode 100644 io-compress-bgzf/src/main/java/org/xbib/io/compress/bgzf/BinaryCodec.java create mode 100644 io-compress-bgzf/src/main/java/org/xbib/io/compress/bgzf/BlockCompressedInputStream.java create mode 100644 io-compress-bgzf/src/main/java/org/xbib/io/compress/bgzf/BlockCompressedOutputStream.java create mode 100644 io-compress-bgzf/src/main/java/org/xbib/io/compress/bgzf/BlockGunzipper.java create mode 100644 io-compress-bgzf/src/main/java/org/xbib/io/compress/bgzf/DeflaterFactory.java create mode 100644 io-compress-bgzf/src/main/java/org/xbib/io/compress/bgzf/InflaterFactory.java create mode 100644 io-compress-bgzf/src/main/java/org/xbib/io/compress/bgzf/SeekableBufferedStream.java create mode 100644 io-compress-bgzf/src/main/java/org/xbib/io/compress/bgzf/SeekableFileStream.java create mode 100644 io-compress-bgzf/src/main/java/org/xbib/io/compress/bgzf/SeekableStream.java create mode 100644 io-compress-bgzf/src/main/java/org/xbib/io/compress/bgzf/SeekableStreamFactory.java diff --git a/gradle.properties b/gradle.properties index 8a3e593..496f169 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ group = org.xbib name = archive -version = 1.0.1 +version = 1.1.0 -gradle.wrapper.version = 6.6.1 +gradle.wrapper.version = 7.3.2 diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index e708b1c023ec8b20f512888fe07c5bd3ff77bb8f..7454180f2ae8848c63b8b4dea2cb829da983f2fa 100644 GIT binary patch delta 18435 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 B8dv}T delta 17845 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 X49Luk)baa85H9$5YCsTPT`SVRWMtMW diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 33682bb..ac0b842 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.2-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 4f906e0..1b6c787 100755 --- a/gradlew +++ b/gradlew @@ -1,7 +1,7 @@ -#!/usr/bin/env sh +#!/bin/sh # -# Copyright 2015 the original author or authors. +# Copyright © 2015-2021 the original authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -17,67 +17,101 @@ # ############################################################################## -## -## Gradle start up script for UN*X -## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# ############################################################################## # Attempt to set APP_HOME + # Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null + +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` +APP_BASE_NAME=${0##*/} # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" +MAX_FD=maximum warn () { echo "$*" -} +} >&2 die () { echo echo "$*" echo exit 1 -} +} >&2 # OS specific support (must be 'true' or 'false'). cygwin=false msys=false darwin=false nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; esac CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar @@ -87,9 +121,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -98,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD="java" + JAVACMD=java which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the @@ -106,80 +140,95 @@ location of your Java installation." fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi -fi - -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi - -# For Cygwin or MSYS, switch paths to Windows format before running java -if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi - # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" - fi - i=`expr $i + 1` - done - case $i in - 0) set -- ;; - 1) set -- "$args0" ;; - 2) set -- "$args0" "$args1" ;; - 3) set -- "$args0" "$args1" "$args2" ;; - 4) set -- "$args0" "$args1" "$args2" "$args3" ;; - 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" esac fi -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=`save "$@"` +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' exec "$JAVACMD" "$@" diff --git a/io-codec/build.gradle b/io-codec/build.gradle index bdf594f..45bca87 100644 --- a/io-codec/build.gradle +++ b/io-codec/build.gradle @@ -1,5 +1,6 @@ dependencies { api project(':io-archive') + implementation project(':io-compress-bgzf') implementation project(':io-compress-bzip2') implementation project(':io-compress-lzf') implementation project(':io-compress-xz') diff --git a/io-codec/src/main/java/module-info.java b/io-codec/src/main/java/module-info.java index 0231a06..1ece307 100644 --- a/io-codec/src/main/java/module-info.java +++ b/io-codec/src/main/java/module-info.java @@ -2,11 +2,13 @@ module org.xbib.io.codec { uses org.xbib.io.codec.StreamCodec; exports org.xbib.io.codec; exports org.xbib.io.codec.ar; + exports org.xbib.io.codec.bgzf; exports org.xbib.io.codec.cpio; exports org.xbib.io.codec.file; exports org.xbib.io.codec.jar; exports org.xbib.io.codec.tar; exports org.xbib.io.codec.zip; + requires transitive org.xbib.io.compress.bgzf; requires org.xbib.io.compress.bzip; requires org.xbib.io.compress.lzf; requires org.xbib.io.compress.xz; diff --git a/io-codec/src/main/java/org/xbib/io/codec/bgzf/BzgfStreamCodec.java b/io-codec/src/main/java/org/xbib/io/codec/bgzf/BzgfStreamCodec.java new file mode 100644 index 0000000..fa0f65c --- /dev/null +++ b/io-codec/src/main/java/org/xbib/io/codec/bgzf/BzgfStreamCodec.java @@ -0,0 +1,37 @@ +package org.xbib.io.codec.bgzf; + +import org.xbib.io.codec.StreamCodec; +import org.xbib.io.compress.bgzf.BlockCompressedInputStream; +import org.xbib.io.compress.bgzf.BlockCompressedOutputStream; + +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; + +public class BzgfStreamCodec implements StreamCodec { + + @Override + public String getName() { + return "bgzf"; + } + + @Override + public BlockCompressedInputStream decode(InputStream in) throws IOException { + return new BlockCompressedInputStream(in); + } + + @Override + public BlockCompressedInputStream decode(InputStream in, int bufsize) throws IOException { + return new BlockCompressedInputStream(in); + } + + @Override + public BlockCompressedOutputStream encode(OutputStream out) throws IOException { + return new BlockCompressedOutputStream(out); + } + + @Override + public BlockCompressedOutputStream encode(OutputStream out, int bufsize) throws IOException { + return new BlockCompressedOutputStream(out); + } +} diff --git a/io-compress-bgzf/LICENSE.txt b/io-compress-bgzf/LICENSE.txt new file mode 100644 index 0000000..b149f1b --- /dev/null +++ b/io-compress-bgzf/LICENSE.txt @@ -0,0 +1,21 @@ +/* + * The MIT License + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ \ No newline at end of file diff --git a/io-compress-bgzf/src/main/java/module-info.java b/io-compress-bgzf/src/main/java/module-info.java new file mode 100644 index 0000000..80b1d35 --- /dev/null +++ b/io-compress-bgzf/src/main/java/module-info.java @@ -0,0 +1,3 @@ +module org.xbib.io.compress.bgzf { + exports org.xbib.io.compress.bgzf; +} diff --git a/io-compress-bgzf/src/main/java/org/xbib/io/compress/bgzf/BGZFException.java b/io-compress-bgzf/src/main/java/org/xbib/io/compress/bgzf/BGZFException.java new file mode 100644 index 0000000..1dc4d25 --- /dev/null +++ b/io-compress-bgzf/src/main/java/org/xbib/io/compress/bgzf/BGZFException.java @@ -0,0 +1,19 @@ +package org.xbib.io.compress.bgzf; + +@SuppressWarnings("serial") +public class BGZFException extends RuntimeException { + + public BGZFException() {} + + public BGZFException(final String s) { + super(s); + } + + public BGZFException(final String s, final Throwable throwable) { + super(s, throwable); + } + + public BGZFException(final Throwable throwable) { + super(throwable); + } +} diff --git a/io-compress-bgzf/src/main/java/org/xbib/io/compress/bgzf/BGZFFilePointerUtil.java b/io-compress-bgzf/src/main/java/org/xbib/io/compress/bgzf/BGZFFilePointerUtil.java new file mode 100644 index 0000000..ebc5935 --- /dev/null +++ b/io-compress-bgzf/src/main/java/org/xbib/io/compress/bgzf/BGZFFilePointerUtil.java @@ -0,0 +1,67 @@ + +package org.xbib.io.compress.bgzf; + +public class BGZFFilePointerUtil { + + private static final int SHIFT_AMOUNT = 16; + private static final int OFFSET_MASK = 0xffff; + private static final long ADDRESS_MASK = 0xFFFFFFFFFFFFL; + + public static final long MAX_BLOCK_ADDRESS = ADDRESS_MASK; + public static final int MAX_OFFSET = OFFSET_MASK; + + public static int compare(final long vfp1, final long vfp2) { + if (vfp1 == vfp2) return 0; + // When treating as unsigned, negative number is > positive. + if (vfp1 < 0 && vfp2 >= 0) return 1; + if (vfp1 >= 0 && vfp2 < 0) return -1; + // Either both negative or both non-negative, so regular comparison works. + if (vfp1 < vfp2) return -1; + return 1; // vfp1 > vfp2 + } + + /** + * @return true if vfp2 points to somewhere in the same BGZF block, or the one immediately + * following vfp1's BGZF block. + */ + public static boolean areInSameOrAdjacentBlocks(final long vfp1, final long vfp2) { + final long block1 = getBlockAddress(vfp1); + final long block2 = getBlockAddress(vfp2); + return (block1 == block2 || block1 + 1 == block2); + } + + /** + * @param blockAddress File offset of start of BGZF block. + * @param blockOffset Offset into uncompressed block. + * @return Virtual file pointer that embodies the input parameters. + */ + static long makeFilePointer(final long blockAddress, final int blockOffset) { + if (blockOffset < 0) { + throw new IllegalArgumentException("Negative blockOffset " + blockOffset + + " not allowed."); + } + if (blockAddress < 0) { + throw new IllegalArgumentException("Negative blockAddress " + blockAddress + + " not allowed."); + } + if (blockOffset > MAX_OFFSET) { + throw new IllegalArgumentException("blockOffset " + blockOffset + " too large."); + } + if (blockAddress > MAX_BLOCK_ADDRESS) { + throw new IllegalArgumentException("blockAddress " + blockAddress + " too large."); + } + return blockAddress << SHIFT_AMOUNT | blockOffset; + } + + public static long getBlockAddress(final long virtualFilePointer) { + return (virtualFilePointer >> SHIFT_AMOUNT) & ADDRESS_MASK; + } + + public static int getBlockOffset(final long virtualFilePointer) { + return (int)(virtualFilePointer & OFFSET_MASK); + } + + public static String asString(final long vfp) { + return String.format("%d(0x%x): (block address: %d, offset: %d)", vfp, vfp, getBlockAddress(vfp), getBlockOffset(vfp)); + } +} diff --git a/io-compress-bgzf/src/main/java/org/xbib/io/compress/bgzf/BGZFFormatException.java b/io-compress-bgzf/src/main/java/org/xbib/io/compress/bgzf/BGZFFormatException.java new file mode 100644 index 0000000..3212fc5 --- /dev/null +++ b/io-compress-bgzf/src/main/java/org/xbib/io/compress/bgzf/BGZFFormatException.java @@ -0,0 +1,19 @@ +package org.xbib.io.compress.bgzf; + +@SuppressWarnings("serial") +public class BGZFFormatException extends BGZFException { + + public BGZFFormatException() {} + + public BGZFFormatException(final String s) { + super(s); + } + + public BGZFFormatException(final String s, final Throwable throwable) { + super(s, throwable); + } + + public BGZFFormatException(final Throwable throwable) { + super(throwable); + } +} diff --git a/io-compress-bgzf/src/main/java/org/xbib/io/compress/bgzf/BGZFStreamConstants.java b/io-compress-bgzf/src/main/java/org/xbib/io/compress/bgzf/BGZFStreamConstants.java new file mode 100644 index 0000000..298aa8a --- /dev/null +++ b/io-compress-bgzf/src/main/java/org/xbib/io/compress/bgzf/BGZFStreamConstants.java @@ -0,0 +1,95 @@ +package org.xbib.io.compress.bgzf; + +/** + * Constants shared by BlockCompressed{Input,Output}Stream classes + */ +public class BGZFStreamConstants { + + // Number of bytes in the gzip block before the deflated data. + // This is not the standard header size, because we include one optional subfield, + // but it is the standard for us. + public static final int BLOCK_HEADER_LENGTH = 18; + + // Location in the gzip block of the total block size (actually total block size - 1) + public static final int BLOCK_LENGTH_OFFSET = 16; + + // Number of bytes that follow the deflated data + public static final int BLOCK_FOOTER_LENGTH = 8; + + // We require that a compressed block (including header and footer, be <= this) + public static final int MAX_COMPRESSED_BLOCK_SIZE = 64 * 1024; + + // Gzip overhead is the header, the footer, and the block size (encoded as a short). + public static final int GZIP_OVERHEAD = BLOCK_HEADER_LENGTH + BLOCK_FOOTER_LENGTH + 2; + + // If Deflater has compression level == NO_COMPRESSION, 10 bytes of overhead (determined experimentally). + public static final int NO_COMPRESSION_OVERHEAD = 10; + + // Push out a gzip block when this many uncompressed bytes have been accumulated. + // This size is selected so that if data is not compressible, if Deflater is given + // compression level == NO_COMPRESSION, compressed size is guaranteed to be <= MAX_COMPRESSED_BLOCK_SIZE. + public static final int DEFAULT_UNCOMPRESSED_BLOCK_SIZE = 64 * 1024 - (GZIP_OVERHEAD + NO_COMPRESSION_OVERHEAD); + + // Magic numbers + public static final byte GZIP_ID1 = 31; + public static final int GZIP_ID2 = 139; + + // FEXTRA flag means there are optional fields + public static final int GZIP_FLG = 4; + + // extra flags + public static final int GZIP_XFL = 0; + + // length of extra subfield + public static final short GZIP_XLEN = 6; + + // The deflate compression, which is customarily used by gzip + public static final byte GZIP_CM_DEFLATE = 8; + + public static final int DEFAULT_COMPRESSION_LEVEL = 5; + + // We don't care about OS because we're not doing line terminator translation + public static final int GZIP_OS_UNKNOWN = 255; + + // The subfield ID + public static final byte BGZF_ID1 = 66; + public static final byte BGZF_ID2 = 67; + + // subfield length in bytes + public static final byte BGZF_LEN = 2; + + public static final byte[] EMPTY_GZIP_BLOCK = { + BGZFStreamConstants.GZIP_ID1, + (byte)BGZFStreamConstants.GZIP_ID2, + BGZFStreamConstants.GZIP_CM_DEFLATE, + BGZFStreamConstants.GZIP_FLG, + 0, 0, 0, 0, // Modification time + BGZFStreamConstants.GZIP_XFL, + (byte)BGZFStreamConstants.GZIP_OS_UNKNOWN, + BGZFStreamConstants.GZIP_XLEN, 0, // Little-endian short + BGZFStreamConstants.BGZF_ID1, + BGZFStreamConstants.BGZF_ID2, + BGZFStreamConstants.BGZF_LEN, 0, // Little-endian short + // Total block size - 1 + BGZFStreamConstants.BLOCK_HEADER_LENGTH + + BGZFStreamConstants.BLOCK_FOOTER_LENGTH - 1 + 2, 0, // Little-endian short + // Dummy payload? + 3, 0, + 0, 0, 0, 0, // crc + 0, 0, 0, 0, // uncompressedSize + }; + + public static final byte[] GZIP_BLOCK_PREAMBLE = { + BGZFStreamConstants.GZIP_ID1, + (byte)BGZFStreamConstants.GZIP_ID2, + BGZFStreamConstants.GZIP_CM_DEFLATE, + BGZFStreamConstants.GZIP_FLG, + 0, 0, 0, 0, // Modification time + BGZFStreamConstants.GZIP_XFL, + (byte)BGZFStreamConstants.GZIP_OS_UNKNOWN, + BGZFStreamConstants.GZIP_XLEN, 0, // Little-endian short + BGZFStreamConstants.BGZF_ID1, + BGZFStreamConstants.BGZF_ID2, + BGZFStreamConstants.BGZF_LEN, 0, // Little-endian short + }; +} diff --git a/io-compress-bgzf/src/main/java/org/xbib/io/compress/bgzf/BinaryCodec.java b/io-compress-bgzf/src/main/java/org/xbib/io/compress/bgzf/BinaryCodec.java new file mode 100644 index 0000000..9466fba --- /dev/null +++ b/io-compress-bgzf/src/main/java/org/xbib/io/compress/bgzf/BinaryCodec.java @@ -0,0 +1,666 @@ +package org.xbib.io.compress.bgzf; + +import java.io.ByteArrayInputStream; +import java.io.EOFException; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.io.SyncFailedException; +import java.nio.ByteBuffer; +import java.nio.ByteOrder; + +/** + * Encapsulates file representation of various primitive data types. Forces little-endian disk + * representation. Note that this class is currently not very efficient. There are plans to increase + * the size of the ByteBuffer, and move data between the ByteBuffer and the underlying input or + * output stream in larger chunks. + * + * All the read methods throw EOFException if the input stream is exhausted before the + * required number of bytes are read. + */ +public class BinaryCodec { + + // Outstream to write to + private OutputStream outputStream; + // If a file or filename was given it will be stored here. Used for error reporting. + private String outputFileName; + + // Input stream to read from + private InputStream inputStream; + // If a file or filename was give to read from it will be stored here. Used for error reporting. + private String inputFileName; + + /* + * Mode that the BinaryCodec is in. It is either writing to a binary file or reading from. This + * is set to true if it is writing to a binary file Right now we don't support reading and + * writing to the same file with the same BinaryCodec instance + */ + private boolean isWriting; + + /** + * For byte swapping. + */ + private ByteBuffer byteBuffer; + + /** + * For reading Strings of known length, this can reduce object creation + */ + private final byte[] scratchBuffer = new byte[16]; + + // Byte order used in BAM files. + private static final ByteOrder LITTLE_ENDIAN = ByteOrder.LITTLE_ENDIAN; + private static final byte[] NULL_BYTE = {0}; + + private static final long MAX_UBYTE = (Byte.MAX_VALUE * 2) + 1; + private static final long MAX_USHORT = (Short.MAX_VALUE * 2) + 1; + private static final long MAX_UINT = ((long)Integer.MAX_VALUE * 2) + 1; + + // We never serialize more than this much at a time (except for Strings) + private static final int MAX_BYTE_BUFFER = 8; + /** + * Constructs BinaryCodec from a file and set it's mode to writing or not + * + * @param file file to be written to or read from + * @param writing whether the file is being written to + * @throws FileNotFoundException + */ + public BinaryCodec(final File file, final boolean writing) throws FileNotFoundException { + this(); + + this.isWriting = writing; + if (this.isWriting) { + this.outputStream = new FileOutputStream(file); + this.outputFileName = file.getName(); + } else { + this.inputStream = new FileInputStream(file); + this.inputFileName = file.getName(); + } + } + + /** + * Constructs BinaryCodec from a file name and set it's mode to writing or not + * + * @param fileName name of the file to be written to or read from + * @param writing writing whether the file is being written to + * @throws FileNotFoundException + */ + public BinaryCodec(final String fileName, final boolean writing) throws FileNotFoundException { + this(new File(fileName), writing); + } + + /** + * Constructs BinaryCodec from an output stream + * + * @param outputStream Stream to write to, since it's an output stream we know that isWriting + * should be set to true + */ + public BinaryCodec(final OutputStream outputStream) { + this(); + setOutputStream(outputStream); + } + + /** + * Constructs BinaryCodec from an input stream + * + * @param inputStream Stream to read from, since we are reading isWriting is set to false + */ + public BinaryCodec(final InputStream inputStream) { + this(); + setInputStream(inputStream); + } + + /** + * Ambiguous whether reading or writing until set{In,Out}putStream is called + */ + public BinaryCodec() { + initByteBuffer(); + } + + /** + * Shared among ctors. Note that if endianness is changed, all the unsigned methods must also be + * changed. + */ + private void initByteBuffer() { + byteBuffer = ByteBuffer.allocate(MAX_BYTE_BUFFER); + byteBuffer.order(LITTLE_ENDIAN); + } + + + /** + * Write whatever has been put into the byte buffer + * + * @param numBytes -- how much to write. Note that in case of writing an unsigned value, more + * bytes were put into the ByteBuffer than will get written out. + * @throws IOException + */ + private void writeByteBuffer(final int numBytes) throws IOException { + assert (numBytes <= byteBuffer.limit()); + writeBytes(byteBuffer.array(), 0, numBytes); + } + + /** + * Writes a byte to the output buffer + * + * @param bite byte array to write + * @throws IOException + */ + public void writeByte(final byte bite) throws IOException { + byteBuffer.clear(); + byteBuffer.put(bite); + writeByteBuffer(1); + } + + public void writeByte(final int b) throws IOException { + writeByte((byte)b); + } + + /** + * Writes a byte array to the output buffer + * + * @param bytes value to write + * @throws IOException + */ + public void writeBytes(final byte[] bytes) throws IOException { + writeBytes(bytes, 0, bytes.length); + } + + public void writeBytes(final byte[] bytes, final int startOffset, final int numBytes) throws IOException { + if (!isWriting) { + throw new IllegalStateException("Calling write method on BinaryCodec open for read."); + } + + outputStream.write(bytes, startOffset, numBytes); + } + + /** + * Write a 32-bit int to the output stream + * + * @param value int to write + * @throws IOException + */ + public void writeInt(final int value) throws IOException { + byteBuffer.clear(); + byteBuffer.putInt(value); + writeByteBuffer(4); + } + + /** + * Write a double (8 bytes) to the output stream + * + * @param value double to write + * @throws IOException + */ + public void writeDouble(final double value) throws IOException { + byteBuffer.clear(); + byteBuffer.putDouble(value); + writeByteBuffer(8); + } + + /** + * Write a 64-bit long to the output stream + * + * @param value long to write + * @throws IOException + */ + public void writeLong(final long value) throws IOException { + byteBuffer.clear(); + byteBuffer.putLong(value); + writeByteBuffer(8); + } + + + /** + * Write a 16-bit short to output stream + * + * @throws IOException + */ + public void writeShort(final short value) throws IOException { + byteBuffer.clear(); + byteBuffer.putShort(value); + writeByteBuffer(2); + } + + /** + * Write a float (4 bytes) to the output stream + * + * @param value float to write + * @throws IOException + */ + public void writeFloat(final float value) throws IOException { + byteBuffer.clear(); + byteBuffer.putFloat(value); + writeByteBuffer(4); + } + + /** + * Writes a boolean (1 byte) to the output buffer + * + * @param value boolean to write + * @throws IOException + */ + public void writeBoolean(final boolean value) throws IOException { + byteBuffer.clear(); + byteBuffer.put(value ? (byte)1 : (byte)0); + writeByteBuffer(1); + } + + /** + * Writes a string to the buffer as ASCII bytes + * + * @param value string to write to buffer + * @param writeLength prefix the string with the length as a 32-bit int + * @param appendNull add a null byte to the end of the string + * @throws IOException + */ + public void writeString(final String value, final boolean writeLength, final boolean appendNull) throws IOException { + if (writeLength) { + int lengthToWrite = value.length(); + if (appendNull) lengthToWrite++; + writeInt(lengthToWrite); + } + + // Actually writes the string to a buffer + writeString(value); + + if (appendNull) writeBytes(NULL_BYTE); + + } + + + /** + * Write a string to the buffer as ASCII bytes + * + * @param value string to write + * @throws IOException + */ + private void writeString(final String value) throws IOException { + final byte[] byteBuffer = new byte[value.length()]; + final char[] charBuffer = value.toCharArray(); + for (int i = 0; i < charBuffer.length; ++i) { + byteBuffer[i] = (byte)(charBuffer[i] & 0xff); + } + writeBytes(byteBuffer); + } + + /** + * Write an 8-bit unsigned byte. NOTE: This method will break if we change to big-endian. + * + * @throws IOException + */ + public void writeUByte(final short val) throws IOException { + if (val < 0) { + throw new IllegalArgumentException("Negative value (" + val + + ") passed to unsigned writing method."); + } + if (val > MAX_UBYTE) { + throw new IllegalArgumentException("Value (" + val + + ") to large to be written as ubyte."); + } + byteBuffer.clear(); + byteBuffer.putShort(val); + writeByteBuffer(1); + } + + /** + * Write a 16-bit unsigned short. NOTE: This method will break if we change to big-endian. + * + * @throws IOException + */ + public void writeUShort(final int val) throws IOException { + if (val < 0) { + throw new IllegalArgumentException("Negative value (" + val + + ") passed to unsigned writing method."); + } + if (val > MAX_USHORT) { + throw new IllegalArgumentException("Value (" + val + + ") to large to be written as ushort."); + } + byteBuffer.clear(); + byteBuffer.putInt(val); + writeByteBuffer(2); + } + + /** + * Write a 32-bit unsigned int. NOTE: This method will break if we change to big-endian. + * + * @throws IOException + */ + public void writeUInt(final long val) throws IOException { + if (val < 0) { + throw new IllegalArgumentException("Negative value (" + val + + ") passed to unsigned writing method."); + } + if (val > MAX_UINT) { + throw new IllegalArgumentException("Value (" + val + + ") to large to be written as uint."); + } + byteBuffer.clear(); + byteBuffer.putLong(val); + writeByteBuffer(4); + } + + /** + * Read a byte array from the input stream. + * + * @throws IOException + */ + public void readBytes(final byte[] buffer) throws IOException { + readBytes(buffer, 0, buffer.length); + } + + /** + * Read a byte array from the input stream + * + * @param buffer where to put bytes read + * @param offset offset to start putting bytes into buffer + * @param length number of bytes to read + * @throws IOException + */ + public void readBytes(final byte[] buffer, final int offset, final int length) throws IOException { + int totalNumRead = 0; + do { + final int numRead = + readBytesOrFewer(buffer, offset + totalNumRead, length - totalNumRead); + if (numRead < 0) { + throw new EOFException(constructErrorMessage("Premature EOF")); + } else { + totalNumRead += numRead; + } + } while (totalNumRead < length); + } + + /** + * Reads a byte array from the input stream. + * + * @param buffer where to put bytes read + * @param offset offset to start putting bytes into buffer + * @param length number of bytes to read. Fewer bytes may be read if EOF is reached before + * length bytes have been read. + * @return the total number of bytes read into the buffer, or -1 if there is no more data + * because the end of the stream has been reached. + * @throws IOException + */ + public int readBytesOrFewer(final byte[] buffer, final int offset, final int length) throws IOException { + if (isWriting) { + throw new IllegalStateException("Calling read method on BinaryCodec open for write."); + } + + return inputStream.read(buffer, offset, length); + } + + /** + * @return a single byte read from the input stream. + * @throws IOException + */ + public byte readByte() throws IOException { + if (isWriting) { + throw new IllegalStateException("Calling read method on BinaryCodec open for write."); + } + + final int ret = inputStream.read(); + if (ret == -1) { + throw new EOFException(constructErrorMessage("Premature EOF")); + } + return (byte)ret; + } + + /** + * @return true if it is possible to know for sure if at EOF, and it is known for sure. If the + * input stream is a ByteArrayInputStream, this is faster than causing a + * RuntimeEOFException to be thrown. + * @throws IOException + */ + public boolean knownAtEof() throws IOException { + if (isWriting) { + throw new IllegalStateException( + "Calling knownAtEof method on BinaryCodec open for write."); + } + + return inputStream instanceof ByteArrayInputStream && inputStream.available() == 0; + } + + /** + * Read a string off the input stream, as ASCII bytes + * + * @param length length of string to read + * @return String read from stream + * @throws IOException + */ + public String readString(final int length) throws IOException { + final byte[] buffer; + // Recycle single buffer if possible + if (length <= scratchBuffer.length) { + buffer = scratchBuffer; + } else { + buffer = new byte[length]; + + } + readBytes(buffer, 0, length); + + final char[] charBuffer = new char[length]; + for (int i = 0; i < length; ++i) { + charBuffer[i] = (char)buffer[i]; + } + return new String(charBuffer); + } + + /** + * Read ASCII bytes from the input stream until a null byte is read + * + * @return String constructed from the ASCII bytes read + * @throws IOException + */ + public String readNullTerminatedString() throws IOException { + final StringBuilder ret = new StringBuilder(); + for (byte b = this.readByte(); b != 0; b = this.readByte()) { + ret.append((char)(b & 0xff)); + } + return ret.toString(); + } + + /** + * Read an int length, and then a String of that length + * + * @param devourNull if true, the length include a null terminator, which is read and discarded + * @throws IOException + */ + public String readLengthAndString(final boolean devourNull) throws IOException { + int length = readInt(); + if (devourNull) { + --length; + } + final String ret = readString(length); + if (devourNull) { + readByte(); + } + return ret; + } + + private void readByteBuffer(final int numBytes) throws IOException { + assert (numBytes <= byteBuffer.capacity()); + readBytes(byteBuffer.array(), 0, numBytes); + byteBuffer.limit(byteBuffer.capacity()); + byteBuffer.position(numBytes); + } + + /** + * Read an int off the input stream + * + * @return int from input stream + * @throws IOException + */ + public int readInt() throws IOException { + readByteBuffer(4); + byteBuffer.flip(); + return byteBuffer.getInt(); + } + + /** + * Reads a double off the input stream + * + * @return double + * @throws IOException + */ + public double readDouble() throws IOException { + readByteBuffer(8); + byteBuffer.flip(); + return byteBuffer.getDouble(); + } + + /** + * Reads a long off the input stream + * + * @return long + * @throws IOException + */ + public long readLong() throws IOException { + readByteBuffer(8); + byteBuffer.flip(); + return byteBuffer.getLong(); + } + + public short readShort() throws IOException { + readByteBuffer(2); + byteBuffer.flip(); + return byteBuffer.getShort(); + } + + /** + * Reads a float off the input stream + * + * @return float + * @throws IOException + */ + public float readFloat() throws IOException { + readByteBuffer(4); + byteBuffer.flip(); + return byteBuffer.getFloat(); + } + + /** + * Reads a boolean off the input stream, represented as a byte with value 1 or 0 + * + * @return boolean + * @throws IOException + */ + public boolean readBoolean() throws IOException { + return ((readByte()) == 1); + } + + /** + * Reads an 8-bit unsigned byte from the input stream. This method assumes little-endianness. + * + * @throws IOException + */ + public short readUByte() throws IOException { + readByteBuffer(1); + byteBuffer.put((byte)0); + byteBuffer.flip(); + return byteBuffer.getShort(); + } + + /** + * Reads a 16-bit unsigned short from the input stream. This method assumes little-endianness. + * + * @throws IOException + */ + public int readUShort() throws IOException { + readByteBuffer(2); + byteBuffer.putShort((short)0); + byteBuffer.flip(); + return byteBuffer.getInt(); + } + + /** + * Reads a 32-bit unsigned int from the input stream. This method assumes little-endianness. + * + * @throws IOException + */ + public long readUInt() throws IOException { + readByteBuffer(4); + byteBuffer.putInt(0); + byteBuffer.flip(); + return byteBuffer.getLong(); + } + + /** + * Close the appropriate stream + * + * @throws IOException + */ + public void close() throws IOException { + if (this.isWriting) { + // To the degree possible, make sure the bytes get forced to the file system, + // or else cause an exception to be thrown. + if (this.outputStream instanceof FileOutputStream) { + this.outputStream.flush(); + FileOutputStream fos = (FileOutputStream)this.outputStream; + try { + fos.getFD().sync(); + } catch (SyncFailedException e) { + // ignore + } + } + this.outputStream.close(); + } else { + this.inputStream.close(); + } + } + + private String constructErrorMessage(final String msg) { + final StringBuilder sb = new StringBuilder(msg); + sb.append("; BinaryCodec in "); + sb.append(isWriting ? "write" : "read"); + sb.append("mode; "); + final String filename = isWriting ? outputFileName : inputFileName; + if (filename != null) { + sb.append("file: "); + sb.append(filename); + } else { + sb.append("streamed file (filename not available)"); + } + return sb.toString(); + } + + public String getInputFileName() { + return inputFileName; + } + + public String getOutputFileName() { + return outputFileName; + } + + public void setOutputFileName(final String outputFileName) { + this.outputFileName = outputFileName; + } + + public void setInputFileName(final String inputFileName) { + this.inputFileName = inputFileName; + } + + public boolean isWriting() { + return isWriting; + } + + public OutputStream getOutputStream() { + return outputStream; + } + + public InputStream getInputStream() { + return inputStream; + } + + public void setInputStream(final InputStream is) { + isWriting = false; + this.inputStream = is; + } + + public void setOutputStream(final OutputStream os) { + isWriting = true; + this.outputStream = os; + } +} diff --git a/io-compress-bgzf/src/main/java/org/xbib/io/compress/bgzf/BlockCompressedInputStream.java b/io-compress-bgzf/src/main/java/org/xbib/io/compress/bgzf/BlockCompressedInputStream.java new file mode 100644 index 0000000..b7f40a4 --- /dev/null +++ b/io-compress-bgzf/src/main/java/org/xbib/io/compress/bgzf/BlockCompressedInputStream.java @@ -0,0 +1,709 @@ +package org.xbib.io.compress.bgzf; + +import java.io.BufferedInputStream; +import java.io.ByteArrayOutputStream; +import java.io.EOFException; +import java.io.File; +import java.io.IOException; +import java.io.InputStream; +import java.nio.ByteBuffer; +import java.nio.ByteOrder; +import java.nio.channels.SeekableByteChannel; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.StandardOpenOption; +import java.util.Arrays; + +/** + * Stream class for reading BGZF block compressed files. The caller can treat this file like any other InputStream. + * It probably is not necessary to wrap this stream in a buffering stream, because there is internal buffering. + * The advantage of BGZF over conventional GZip format is that BGZF allows for seeking without having to read the + * entire file up to the location being sought. Note that seeking is only possible if the input stream is seekable. + * + * Note that this implementation is not synchronized. If multiple threads access an instance concurrently, it must be synchronized externally. + * + * @see http://samtools.sourceforge.net/SAM1.pdf for details of BGZF file format. + */ +public class BlockCompressedInputStream extends InputStream { + + public final static String INCORRECT_HEADER_SIZE_MSG = "Incorrect header size for file: "; + public final static String UNEXPECTED_BLOCK_LENGTH_MSG = "Unexpected compressed block length: "; + public final static String PREMATURE_END_MSG = "Premature end of file: "; + public final static String CANNOT_SEEK_STREAM_MSG = "Cannot seek a position for a non-file stream"; + public final static String CANNOT_SEEK_CLOSED_STREAM_MSG = "Cannot seek a position for a closed stream"; + public final static String INVALID_FILE_PTR_MSG = "Invalid file pointer: "; + + private InputStream mStream; + private boolean mIsClosed = false; + private SeekableStream mFile; + private byte[] mFileBuffer = null; + private DecompressedBlock mCurrentBlock = null; + private int mCurrentOffset = 0; + private long mStreamOffset = 0; + private final BlockGunzipper blockGunzipper; + + private volatile ByteArrayOutputStream buf = null; + private static final byte eol = '\n'; + private static final byte eolCr = '\r'; + + /** + * Note that seek() is not supported if this ctor is used. + * @param stream source of bytes + */ + public BlockCompressedInputStream(final InputStream stream) { + this(stream, true, BlockGunzipper.getDefaultInflaterFactory()); + } + + /** + * Note that seek() is not supported if this ctor is used. + * @param stream source of bytes + * @param inflaterFactory {@link InflaterFactory} used by {@link BlockGunzipper} + */ + public BlockCompressedInputStream(final InputStream stream, final InflaterFactory inflaterFactory) { + this(stream, true, inflaterFactory); + } + + /** + * Note that seek() is not supported if this ctor is used. + * @param stream source of bytes + * @param allowBuffering if true, allow buffering + */ + public BlockCompressedInputStream(final InputStream stream, final boolean allowBuffering) { + this(stream, allowBuffering, BlockGunzipper.getDefaultInflaterFactory()); + } + + /** + * Note that seek() is not supported if this ctor is used. + * @param stream source of bytes + * @param allowBuffering if true, allow buffering + * @param inflaterFactory {@link InflaterFactory} used by {@link BlockGunzipper} + */ + public BlockCompressedInputStream(final InputStream stream, final boolean allowBuffering, final InflaterFactory inflaterFactory) { + if (allowBuffering) { + mStream = new BufferedInputStream(stream); + } + else { + mStream = stream; + } + + mFile = null; + blockGunzipper = new BlockGunzipper(inflaterFactory); + } + + /** + * Use this ctor if you wish to call seek() + * @param file source of bytes + * @throws IOException + */ + public BlockCompressedInputStream(final File file) throws IOException { + this(file, BlockGunzipper.getDefaultInflaterFactory()); + } + + /** + * Use this ctor if you wish to call seek() + * @param file source of bytes + * @param inflaterFactory {@link InflaterFactory} used by {@link BlockGunzipper} + * @throws IOException + */ + public BlockCompressedInputStream(final File file, final InflaterFactory inflaterFactory) throws IOException { + mFile = new SeekableFileStream(file); + mStream = null; + blockGunzipper = new BlockGunzipper(inflaterFactory); + } + + /** + * For providing some arbitrary data source. No additional buffering is + * provided, so if the underlying source is not buffered, wrap it in a + * SeekableBufferedStream before passing to this ctor. + * @param strm source of bytes + */ + public BlockCompressedInputStream(final SeekableStream strm) { + this(strm, BlockGunzipper.getDefaultInflaterFactory()); + } + + /** + * For providing some arbitrary data source. No additional buffering is + * provided, so if the underlying source is not buffered, wrap it in a + * SeekableBufferedStream before passing to this ctor. + * @param strm source of bytes + * @param inflaterFactory {@link InflaterFactory} used by {@link BlockGunzipper} + */ + public BlockCompressedInputStream(final SeekableStream strm, final InflaterFactory inflaterFactory) { + mFile = strm; + mStream = null; + blockGunzipper = new BlockGunzipper(inflaterFactory); + } + + /** + * Determines whether or not the inflater will re-calculated the CRC on the decompressed data + * and check it against the value stored in the GZIP header. CRC checking is an expensive + * operation and should be used accordingly. + */ + public void setCheckCrcs(final boolean check) { + this.blockGunzipper.setCheckCrcs(check); + } + + /** + * @return the number of bytes that can be read (or skipped over) from this input stream without blocking by the + * next caller of a method for this input stream. The next caller might be the same thread or another thread. + * Note that although the next caller can read this many bytes without blocking, the available() method call itself + * may block in order to fill an internal buffer if it has been exhausted. + */ + @Override + public int available() throws IOException { + if (mCurrentBlock == null || mCurrentOffset == mCurrentBlock.mBlock.length) { + readBlock(); + } + if (mCurrentBlock == null) { + return 0; + } + return mCurrentBlock.mBlock.length - mCurrentOffset; + } + + /** + * @return true if the stream is at the end of a BGZF block, + * false otherwise. + */ + public boolean endOfBlock() { + return (mCurrentBlock != null && mCurrentOffset == mCurrentBlock.mBlock.length); + } + + /** + * Closes the underlying InputStream or RandomAccessFile + */ + @Override + public void close() throws IOException { + if (mFile != null) { + mFile.close(); + mFile = null; + } else if (mStream != null) { + mStream.close(); + mStream = null; + } + // Encourage garbage collection + mFileBuffer = null; + mCurrentBlock = null; + + // Mark as closed + mIsClosed = true; + } + + /** + * Reads the next byte of data from the input stream. The value byte is returned as an int in the range 0 to 255. + * If no byte is available because the end of the stream has been reached, the value -1 is returned. + * This method blocks until input data is available, the end of the stream is detected, or an exception is thrown. + + * @return the next byte of data, or -1 if the end of the stream is reached. + */ + @Override + public int read() throws IOException { + return (available() > 0) ? (mCurrentBlock.mBlock[mCurrentOffset++] & 0xFF) : -1; + } + + /** + * Reads some number of bytes from the input stream and stores them into the buffer array b. The number of bytes + * actually read is returned as an integer. This method blocks until input data is available, end of file is detected, + * or an exception is thrown. + * + * read(buf) has the same effect as read(buf, 0, buf.length). + * + * @param buffer the buffer into which the data is read. + * @return the total number of bytes read into the buffer, or -1 is there is no more data because the end of + * the stream has been reached. + */ + @Override + public int read(final byte[] buffer) throws IOException { + return read(buffer, 0, buffer.length); + } + + /** + * Reads a whole line. A line is considered to be terminated by either a line feed ('\n'), + * carriage return ('\r') or carriage return followed by a line feed ("\r\n"). + * + * @return A String containing the contents of the line, excluding the line terminating + * character, or null if the end of the stream has been reached + * + * @exception IOException If an I/O error occurs + */ + public String readLine() throws IOException { + int available = available(); + if (available == 0) { + return null; + } + if(null == buf){ // lazy initialisation + buf = new ByteArrayOutputStream(8192); + } + buf.reset(); + boolean done = false; + boolean foundCr = false; // \r found flag + while (!done) { + int linetmpPos = mCurrentOffset; + int bCnt = 0; + while((available-- > 0)){ + final byte c = mCurrentBlock.mBlock[linetmpPos++]; + if(c == eol){ // found \n + done = true; + break; + } else if(foundCr){ // previous char was \r + --linetmpPos; // current char is not \n so put it back + done = true; + break; + } else if(c == eolCr){ // found \r + foundCr = true; + continue; // no ++bCnt + } + ++bCnt; + } + if(mCurrentOffset < linetmpPos) { + buf.write(mCurrentBlock.mBlock, mCurrentOffset, bCnt); + mCurrentOffset = linetmpPos; + } + available = available(); + if(available == 0) { + // EOF + done = true; + } + } + return buf.toString(); + } + + /** + * Reads up to len bytes of data from the input stream into an array of bytes. An attempt is made to read + * as many as len bytes, but a smaller number may be read. The number of bytes actually read is returned as an integer. + * + * This method blocks until input data is available, end of file is detected, or an exception is thrown. + * + * @param buffer buffer into which data is read. + * @param offset the start offset in array b at which the data is written. + * @param length the maximum number of bytes to read. + * @return the total number of bytes read into the buffer, or -1 if there is no more data because the end of + * the stream has been reached. + */ + @Override + public int read(final byte[] buffer, int offset, int length) throws IOException { + final int originalLength = length; + while (length > 0) { + final int available = available(); + if (available == 0) { + // Signal EOF to caller + if (originalLength == length) { + return -1; + } + break; + } + final int copyLength = Math.min(length, available); + System.arraycopy(mCurrentBlock.mBlock, mCurrentOffset, buffer, offset, copyLength); + mCurrentOffset += copyLength; + offset += copyLength; + length -= copyLength; + } + return originalLength - length; + } + + /** + * Seek to the given position in the file. Note that pos is a special virtual file pointer, + * not an actual byte offset. + * + * @param pos virtual file pointer position + * @throws IOException if stream is closed or not a file based stream + */ + public void seek(final long pos) throws IOException { + // Must be before the mFile == null check because mFile == null for closed files and streams + if (mIsClosed) { + throw new IOException(CANNOT_SEEK_CLOSED_STREAM_MSG); + } + + // Cannot seek on streams that are not file based + if (mFile == null) { + throw new IOException(CANNOT_SEEK_STREAM_MSG); + } + + // Decode virtual file pointer + // Upper 48 bits is the byte offset into the compressed stream of a + // block. + // Lower 16 bits is the byte offset into the uncompressed stream inside + // the block. + final long compressedOffset = BGZFFilePointerUtil.getBlockAddress(pos); + final int uncompressedOffset = BGZFFilePointerUtil.getBlockOffset(pos); + final int available; + if (mCurrentBlock != null && mCurrentBlock.mBlockAddress == compressedOffset) { + available = mCurrentBlock.mBlock.length; + } else { + prepareForSeek(); + mFile.seek(compressedOffset); + mStreamOffset = compressedOffset; + mCurrentBlock = nextBlock(getBufferForReuse(mCurrentBlock)); + mCurrentOffset = 0; + available = available(); + } + if (uncompressedOffset > available || (uncompressedOffset == available && !eof())) { + throw new IOException(INVALID_FILE_PTR_MSG + pos + " for " + getSource()); + } + mCurrentOffset = uncompressedOffset; + } + + /** + * Performs cleanup required before seek is called on the underlying stream + */ + protected void prepareForSeek() { + } + + private boolean eof() throws IOException { + if (mFile.eof()) { + return true; + } + // If the last remaining block is the size of the EMPTY_GZIP_BLOCK, this is the same as being at EOF. + return (mFile.length() - (mCurrentBlock.mBlockAddress + + mCurrentBlock.mBlockCompressedSize) == BGZFStreamConstants.EMPTY_GZIP_BLOCK.length); + } + + /** + * @return virtual file pointer that can be passed to seek() to return to the current position. This is + * not an actual byte offset, so arithmetic on file pointers cannot be done to determine the distance between + * the two. + */ + public long getFilePointer() { + if (mCurrentBlock == null) { + // Haven't read anything yet = at start of stream + return BGZFFilePointerUtil.makeFilePointer(0, 0); + } + if (mCurrentOffset > 0 && mCurrentOffset == mCurrentBlock.mBlock.length) { + // If current offset is at the end of the current block, file + // pointer should point + // to the beginning of the next block. + return BGZFFilePointerUtil.makeFilePointer(mCurrentBlock.mBlockAddress + mCurrentBlock.mBlockCompressedSize, 0); + } + return BGZFFilePointerUtil.makeFilePointer(mCurrentBlock.mBlockAddress, mCurrentOffset); + } + + public long getPosition() { + return getFilePointer(); + } + + public static long getFileBlock(final long bgzfOffset) { + return BGZFFilePointerUtil.getBlockAddress(bgzfOffset); + } + + /** + * @param stream Must be at start of file. Throws RuntimeException if !stream.markSupported(). + * @return true if the given file looks like a valid BGZF file. + */ + public static boolean isValidFile(final InputStream stream) throws IOException { + if (!stream.markSupported()) { + throw new RuntimeException("Cannot test non-buffered stream"); + } + stream.mark(BGZFStreamConstants.BLOCK_HEADER_LENGTH); + final byte[] buffer = new byte[BGZFStreamConstants.BLOCK_HEADER_LENGTH]; + final int count = readBytes(stream, buffer, 0, BGZFStreamConstants.BLOCK_HEADER_LENGTH); + stream.reset(); + return count == BGZFStreamConstants.BLOCK_HEADER_LENGTH && isValidBlockHeader(buffer); + } + + private static boolean isValidBlockHeader(final byte[] buffer) { + return (buffer[0] == BGZFStreamConstants.GZIP_ID1 && + (buffer[1] & 0xFF) == BGZFStreamConstants.GZIP_ID2 && + (buffer[3] & BGZFStreamConstants.GZIP_FLG) != 0 && + buffer[10] == BGZFStreamConstants.GZIP_XLEN && + buffer[12] == BGZFStreamConstants.BGZF_ID1 && + buffer[13] == BGZFStreamConstants.BGZF_ID2); + } + + private void readBlock() throws IOException { + mCurrentBlock = nextBlock(getBufferForReuse(mCurrentBlock)); + mCurrentOffset = 0; + checkAndRethrowDecompressionException(); + } + /** + * Reads and decompresses the next block + * @param bufferAvailableForReuse decompression buffer available for reuse + * @return next block in the decompressed stream + */ + protected DecompressedBlock nextBlock(byte[] bufferAvailableForReuse) { + return processNextBlock(bufferAvailableForReuse); + } + /** + * Rethrows an exception encountered during decompression + * @throws IOException + */ + private void checkAndRethrowDecompressionException() throws IOException { + if (mCurrentBlock.mException != null) { + if (mCurrentBlock.mException instanceof IOException) { + throw (IOException) mCurrentBlock.mException; + } else if (mCurrentBlock.mException instanceof RuntimeException) { + throw (RuntimeException) mCurrentBlock.mException; + } else { + throw new RuntimeException(mCurrentBlock.mException); + } + } + } + + /** + * Attempt to reuse the buffer of the given block + * @param block owning block + * @return null decompressing buffer to reuse, null if no buffer is available + */ + private byte[] getBufferForReuse(DecompressedBlock block) { + if (block == null) return null; + return block.mBlock; + } + + /** + * Decompress the next block from the input stream. When using asynchronous + * IO, this will be called by the background thread. + * @param bufferAvailableForReuse buffer in which to place decompressed block. A null or + * incorrectly sized buffer will result in the buffer being ignored and + * a new buffer allocated for decompression. + * @return next block in input stream + */ + protected DecompressedBlock processNextBlock(byte[] bufferAvailableForReuse) { + if (mFileBuffer == null) { + mFileBuffer = new byte[BGZFStreamConstants.MAX_COMPRESSED_BLOCK_SIZE]; + } + long blockAddress = mStreamOffset; + try { + final int headerByteCount = readBytes(mFileBuffer, 0, BGZFStreamConstants.BLOCK_HEADER_LENGTH); + mStreamOffset += headerByteCount; + if (headerByteCount == 0) { + // Handle case where there is no empty gzip block at end. + return new DecompressedBlock(blockAddress, new byte[0], 0); + } + if (headerByteCount != BGZFStreamConstants.BLOCK_HEADER_LENGTH) { + return new DecompressedBlock(blockAddress, headerByteCount, new IOException(INCORRECT_HEADER_SIZE_MSG + getSource())); + } + final int blockLength = unpackInt16(mFileBuffer, BGZFStreamConstants.BLOCK_LENGTH_OFFSET) + 1; + if (blockLength < BGZFStreamConstants.BLOCK_HEADER_LENGTH || blockLength > mFileBuffer.length) { + return new DecompressedBlock(blockAddress, blockLength, + new IOException(UNEXPECTED_BLOCK_LENGTH_MSG + blockLength + " for " + getSource())); + } + final int remaining = blockLength - BGZFStreamConstants.BLOCK_HEADER_LENGTH; + final int dataByteCount = readBytes(mFileBuffer, BGZFStreamConstants.BLOCK_HEADER_LENGTH, + remaining); + mStreamOffset += dataByteCount; + if (dataByteCount != remaining) { + return new DecompressedBlock(blockAddress, blockLength, + new BGZFException(PREMATURE_END_MSG + getSource())); + } + final byte[] decompressed = inflateBlock(mFileBuffer, blockLength, bufferAvailableForReuse); + return new DecompressedBlock(blockAddress, decompressed, blockLength); + } catch (IOException e) { + return new DecompressedBlock(blockAddress, 0, e); + } + } + + private byte[] inflateBlock(final byte[] compressedBlock, final int compressedLength, + final byte[] bufferAvailableForReuse) throws IOException { + final int uncompressedLength = unpackInt32(compressedBlock, compressedLength - 4); + if (uncompressedLength < 0) { + throw new BGZFException(getSource() + " has invalid uncompressedLength: " + uncompressedLength); + } + byte[] buffer = bufferAvailableForReuse; + if (buffer == null || uncompressedLength != buffer.length) { + // can't reuse the buffer since the size is incorrect + buffer = new byte[uncompressedLength]; + } + blockGunzipper.unzipBlock(buffer, compressedBlock, compressedLength); + return buffer; + } + + private String getSource() { + return mFile == null ? "data stream" : mFile.getSource(); + } + + private int readBytes(final byte[] buffer, final int offset, final int length) throws IOException { + if (mFile != null) { + return readBytes(mFile, buffer, offset, length); + } else if (mStream != null) { + return readBytes(mStream, buffer, offset, length); + } else { + return 0; + } + } + + private static int readBytes(final SeekableStream file, final byte[] buffer, final int offset, final int length) throws IOException { + int bytesRead = 0; + while (bytesRead < length) { + final int count = file.read(buffer, offset + bytesRead, length - bytesRead); + if (count <= 0) { + break; + } + bytesRead += count; + } + return bytesRead; + } + + private static int readBytes(final InputStream stream, final byte[] buffer, final int offset, final int length) throws IOException { + int bytesRead = 0; + while (bytesRead < length) { + final int count = stream.read(buffer, offset + bytesRead, length - bytesRead); + if (count <= 0) { + break; + } + bytesRead += count; + } + return bytesRead; + } + + private int unpackInt16(final byte[] buffer, final int offset) { + return ((buffer[offset] & 0xFF) | + ((buffer[offset+1] & 0xFF) << 8)); + } + + private int unpackInt32(final byte[] buffer, final int offset) { + return ((buffer[offset] & 0xFF) | + ((buffer[offset+1] & 0xFF) << 8) | + ((buffer[offset+2] & 0xFF) << 16) | + ((buffer[offset+3] & 0xFF) << 24)); + } + + public enum FileTermination {HAS_TERMINATOR_BLOCK, HAS_HEALTHY_LAST_BLOCK, DEFECTIVE} + + /** + * + * @param file the file to check + * @return status of the last compressed block + * @throws IOException + */ + public static FileTermination checkTermination(final File file) throws IOException { + return checkTermination(file.toPath()); + } + + /** + * + * @param path to the file to check + * @return status of the last compressed block + * @throws IOException + */ + public static FileTermination checkTermination(final Path path) throws IOException { + try( final SeekableByteChannel channel = Files.newByteChannel(path, StandardOpenOption.READ) ){ + return checkTermination(channel); + } + } + + /** + * check the status of the final bzgipped block for the given bgzipped resource + * + * @param channel an open channel to read from, + * the channel will remain open and the initial position will be restored when the operation completes + * this makes no guarantee about the state of the channel if an exception is thrown during reading + * + * @return the status of the last compressed black + * @throws IOException + */ + public static FileTermination checkTermination(SeekableByteChannel channel) throws IOException { + final long fileSize = channel.size(); + if (fileSize < BGZFStreamConstants.EMPTY_GZIP_BLOCK.length) { + return FileTermination.DEFECTIVE; + } + final long initialPosition = channel.position(); + boolean exceptionThrown = false; + try { + channel.position(fileSize - BGZFStreamConstants.EMPTY_GZIP_BLOCK.length); + + //Check if the end of the file is an empty gzip block which is used as the terminator for a bgzipped file + final ByteBuffer lastBlockBuffer = ByteBuffer.allocate(BGZFStreamConstants.EMPTY_GZIP_BLOCK.length); + readFully(channel, lastBlockBuffer); + if (Arrays.equals(lastBlockBuffer.array(), BGZFStreamConstants.EMPTY_GZIP_BLOCK)) { + return FileTermination.HAS_TERMINATOR_BLOCK; + } + + //if the last block isn't an empty gzip block, check to see if it is a healthy compressed block or if it's corrupted + final int bufsize = (int) Math.min(fileSize, BGZFStreamConstants.MAX_COMPRESSED_BLOCK_SIZE); + final byte[] bufferArray = new byte[bufsize]; + channel.position(fileSize - bufsize); + readFully(channel, ByteBuffer.wrap(bufferArray)); + for (int i = bufferArray.length - BGZFStreamConstants.EMPTY_GZIP_BLOCK.length; + i >= 0; --i) { + if (!preambleEqual(BGZFStreamConstants.GZIP_BLOCK_PREAMBLE, + bufferArray, i, BGZFStreamConstants.GZIP_BLOCK_PREAMBLE.length)) { + continue; + } + final ByteBuffer byteBuffer = ByteBuffer.wrap(bufferArray, + i + BGZFStreamConstants.GZIP_BLOCK_PREAMBLE.length, + 4); + byteBuffer.order(ByteOrder.LITTLE_ENDIAN); + final int totalBlockSizeMinusOne = byteBuffer.getShort() & 0xFFFF; + if (bufferArray.length - i == totalBlockSizeMinusOne + 1) { + return FileTermination.HAS_HEALTHY_LAST_BLOCK; + } else { + return FileTermination.DEFECTIVE; + } + } + return FileTermination.DEFECTIVE; + } catch (final Throwable e) { + exceptionThrown = true; + throw e; + } finally { + //if an exception was thrown we don't want to reset the position because that would be likely to throw again + //and suppress the initial exception + if(!exceptionThrown) { + channel.position(initialPosition); + } + } + } + + /** + * read as many bytes as dst's capacity into dst or throw if that's not possible + * + * @throws EOFException if channel has fewer bytes available than dst's capacity + */ + static void readFully(SeekableByteChannel channel, ByteBuffer dst) throws IOException { + int totalBytesRead = 0; + final int capacity = dst.capacity(); + while (totalBytesRead < capacity) { + final int bytesRead = channel.read(dst); + if (bytesRead == -1) { + throw new EOFException(); + } + totalBytesRead += bytesRead; + } + } + + public static void assertNonDefectiveFile(final File file) throws IOException { + if (checkTermination(file) == FileTermination.DEFECTIVE) { + throw new BGZFException(file.getAbsolutePath() + " does not have a valid GZIP block at the end of the file."); + } + } + + private static boolean preambleEqual(final byte[] preamble, final byte[] buf, final int startOffset, final int length) { + for (int i = 0; i < length; ++i) { + if (preamble[i] != buf[i + startOffset]) { + return false; + } + } + return true; + } + + protected static class DecompressedBlock { + /** + * Decompressed block + */ + private final byte[] mBlock; + /** + * Compressed size of block (the uncompressed size can be found using + * mBlock.length) + */ + private final int mBlockCompressedSize; + /** + * Stream offset of start of block + */ + private final long mBlockAddress; + /** + * Exception thrown (if any) when attempting to decompress block + */ + private final Exception mException; + + public DecompressedBlock(long blockAddress, byte[] block, int compressedSize) { + mBlock = block; + mBlockAddress = blockAddress; + mBlockCompressedSize = compressedSize; + mException = null; + } + + public DecompressedBlock(long blockAddress, int compressedSize, Exception exception) { + mBlock = new byte[0]; + mBlockAddress = blockAddress; + mBlockCompressedSize = compressedSize; + mException = exception; + } + } +} diff --git a/io-compress-bgzf/src/main/java/org/xbib/io/compress/bgzf/BlockCompressedOutputStream.java b/io-compress-bgzf/src/main/java/org/xbib/io/compress/bgzf/BlockCompressedOutputStream.java new file mode 100644 index 0000000..8453f71 --- /dev/null +++ b/io-compress-bgzf/src/main/java/org/xbib/io/compress/bgzf/BlockCompressedOutputStream.java @@ -0,0 +1,358 @@ +package org.xbib.io.compress.bgzf; + +import java.io.File; +import java.io.FileNotFoundException; +import java.io.IOException; +import java.io.OutputStream; +import java.nio.file.Files; +import java.nio.file.Path; +import java.util.zip.CRC32; +import java.util.zip.Deflater; + +/** + * Stream class for a file that is a series of gzip blocks (BGZF format). The caller just treats it as an + * OutputStream, and under the covers a gzip block is written when the amount of uncompressed as-yet-unwritten + * bytes reaches a threshold. + * + * The advantage of BGZF over conventional gzip is that BGZF allows for seeking without having to scan through + * the entire file up to the position being sought. + * + * Note that the flush() method should not be called by client + * unless you know what you're doing, because it forces a gzip block to be written even if the + * number of buffered bytes has not reached threshold. close(), on the other hand, must be called + * when done writing in order to force the last gzip block to be written. + * + * @see http://samtools.sourceforge.net/SAM1.pdf for details of BGZF file format. + */ +public class BlockCompressedOutputStream extends OutputStream { + + private static int defaultCompressionLevel = BGZFStreamConstants.DEFAULT_COMPRESSION_LEVEL; + private static DeflaterFactory defaultDeflaterFactory = new DeflaterFactory(); + + public static void setDefaultCompressionLevel(final int compressionLevel) { + if (compressionLevel < Deflater.NO_COMPRESSION || compressionLevel > Deflater.BEST_COMPRESSION) { + throw new IllegalArgumentException("Invalid compression level: " + compressionLevel); + } + defaultCompressionLevel = compressionLevel; + } + + public static int getDefaultCompressionLevel() { + return defaultCompressionLevel; + } + + /** + * Sets the default {@link DeflaterFactory} that will be used for all instances unless specified otherwise in the constructor. + * If this method is not called the default is a factory that will create the JDK {@link Deflater}. + * @param deflaterFactory non-null default factory. + */ + public static void setDefaultDeflaterFactory(final DeflaterFactory deflaterFactory) { + if (deflaterFactory == null) { + throw new IllegalArgumentException("null deflaterFactory"); + } + defaultDeflaterFactory = deflaterFactory; + } + + public static DeflaterFactory getDefaultDeflaterFactory() { + return defaultDeflaterFactory; + } + + private final BinaryCodec codec; + private final byte[] uncompressedBuffer = new byte[BGZFStreamConstants.DEFAULT_UNCOMPRESSED_BLOCK_SIZE]; + private int numUncompressedBytes = 0; + private final byte[] compressedBuffer = + new byte[BGZFStreamConstants.MAX_COMPRESSED_BLOCK_SIZE - + BGZFStreamConstants.BLOCK_HEADER_LENGTH]; + private final Deflater deflater; + + // A second deflater is created for the very unlikely case where the regular deflation actually makes + // things bigger, and the compressed block is too big. It should be possible to downshift the + // primary deflater to NO_COMPRESSION level, recompress, and then restore it to its original setting, + // but in practice that doesn't work. + // The motivation for deflating at NO_COMPRESSION level is that it will predictably produce compressed + // output that is 10 bytes larger than the input, and the threshold at which a block is generated is such that + // the size of tbe final gzip block will always be <= 64K. This is preferred over the previous method, + // which would attempt to compress up to 64K bytes, and if the resulting compressed block was too large, + // try compressing fewer input bytes (aka "downshifting'). The problem with downshifting is that + // getFilePointer might return an inaccurate value. + // I assume (AW 29-Oct-2013) that there is no value in using hardware-assisted deflater for no-compression mode, + // so just use JDK standard. + private final Deflater noCompressionDeflater = new Deflater(Deflater.NO_COMPRESSION, true); + private final CRC32 crc32 = new CRC32(); + private Path file = null; + private long mBlockAddress = 0; + + /** + * Uses default compression level, which is 5 unless changed by setCompressionLevel + * Note: this constructor uses the default {@link DeflaterFactory}, see {@link #getDefaultDeflaterFactory()}. + * Use {@link #BlockCompressedOutputStream(File, int, DeflaterFactory)} to specify a custom factory. + */ + public BlockCompressedOutputStream(final String filename) throws FileNotFoundException { + this(filename, defaultCompressionLevel); + } + + /** + * Uses default compression level, which is 5 unless changed by setCompressionLevel + * Note: this constructor uses the default {@link DeflaterFactory}, see {@link #getDefaultDeflaterFactory()}. + * Use {@link #BlockCompressedOutputStream(File, int, DeflaterFactory)} to specify a custom factory. + */ + public BlockCompressedOutputStream(final File file) throws FileNotFoundException { + this(file, defaultCompressionLevel); + } + + public BlockCompressedOutputStream(final String filename, final int compressionLevel) throws FileNotFoundException { + this(new File(filename), compressionLevel); + } + + public BlockCompressedOutputStream(final File file, final int compressionLevel) throws FileNotFoundException { + this(file, compressionLevel, defaultDeflaterFactory); + } + + public BlockCompressedOutputStream(final File file, final int compressionLevel, final DeflaterFactory deflaterFactory) throws FileNotFoundException { + this.file = file.toPath(); + codec = new BinaryCodec(file, true); + deflater = deflaterFactory.makeDeflater(compressionLevel, true); + } + + /** + * Uses default compression level, which is 5 unless changed by setCompressionLevel + * Note: this constructor uses the default {@link DeflaterFactory}, see {@link #getDefaultDeflaterFactory()}. + * Use {@link #BlockCompressedOutputStream(OutputStream, File, int, DeflaterFactory)} to specify a custom factory. + */ + public BlockCompressedOutputStream(final OutputStream os) { + this(os, (File)null, defaultCompressionLevel); + } + + /** + * Uses default compression level, which is 5 unless changed by setCompressionLevel + * Note: this constructor uses the default {@link DeflaterFactory}, see {@link #getDefaultDeflaterFactory()}. + * Use {@link #BlockCompressedOutputStream(OutputStream, File, int, DeflaterFactory)} to specify a custom factory. + * + * @param file may be null + */ + public BlockCompressedOutputStream(final OutputStream os, final Path file) { + this(os, file, defaultCompressionLevel); + } + + /** + * Note: this constructor uses the default {@link DeflaterFactory}, see {@link #getDefaultDeflaterFactory()}. + * Use {@link #BlockCompressedOutputStream(OutputStream, File, int, DeflaterFactory)} to specify a custom factory. + */ + public BlockCompressedOutputStream(final OutputStream os, final File file, final int compressionLevel) { + this(os, file, compressionLevel, defaultDeflaterFactory); + } + + /** + * Note: this constructor uses the default {@link DeflaterFactory}, see {@link #getDefaultDeflaterFactory()}. + * Use {@link #BlockCompressedOutputStream(OutputStream, File, int, DeflaterFactory)} to specify a custom factory. + */ + public BlockCompressedOutputStream(final OutputStream os, final Path file, final int compressionLevel) { + this(os, file, compressionLevel, defaultDeflaterFactory); + } + + /** + * Creates the output stream. + * @param os output stream to create a BlockCompressedOutputStream from + * @param file file to which to write the output or null if not available + * @param compressionLevel the compression level (0-9) + * @param deflaterFactory custom factory to create deflaters (overrides the default) + */ + public BlockCompressedOutputStream(final OutputStream os, final File file, final int compressionLevel, final DeflaterFactory deflaterFactory) { + this(os, file != null ? file.toPath() : null, compressionLevel, deflaterFactory); + } + + /** + * Creates the output stream. + * @param os output stream to create a BlockCompressedOutputStream from + * @param file file to which to write the output or null if not available + * @param compressionLevel the compression level (0-9) + * @param deflaterFactory custom factory to create deflaters (overrides the default) + */ + public BlockCompressedOutputStream(final OutputStream os, final Path file, final int compressionLevel, final DeflaterFactory deflaterFactory) { + this.file = file; + codec = new BinaryCodec(os); + if (file != null) { + codec.setOutputFileName(file.toAbsolutePath().toUri().toString()); + } + deflater = deflaterFactory.makeDeflater(compressionLevel, true); + } + + /** + * @param output May or not already be a BlockCompressedOutputStream. + * @return A BlockCompressedOutputStream, either by wrapping the given OutputStream, or by casting if it already + * is a BCOS. + */ + public static BlockCompressedOutputStream maybeBgzfWrapOutputStream(OutputStream output) { + if (!(output instanceof BlockCompressedOutputStream)) { + return new BlockCompressedOutputStream(output); + } else { + return (BlockCompressedOutputStream)output; + } + } + + /** + * Writes b.length bytes from the specified byte array to this output stream. The general contract for write(b) + * is that it should have exactly the same effect as the call write(b, 0, b.length). + * @param bytes the data + */ + @Override + public void write(final byte[] bytes) throws IOException { + write(bytes, 0, bytes.length); + } + + /** + * Writes len bytes from the specified byte array starting at offset off to this output stream. The general + * contract for write(b, off, len) is that some of the bytes in the array b are written to the output stream in order; + * element b[off] is the first byte written and b[off+len-1] is the last byte written by this operation. + * + * @param bytes the data + * @param startIndex the start offset in the data + * @param numBytes the number of bytes to write + */ + @Override + public void write(final byte[] bytes, int startIndex, int numBytes) throws IOException { + while (numBytes > 0) { + final int bytesToWrite = Math.min(uncompressedBuffer.length - numUncompressedBytes, numBytes); + System.arraycopy(bytes, startIndex, uncompressedBuffer, numUncompressedBytes, bytesToWrite); + numUncompressedBytes += bytesToWrite; + startIndex += bytesToWrite; + numBytes -= bytesToWrite; + if (numUncompressedBytes == uncompressedBuffer.length) { + deflateBlock(); + } + } + } + + @Override + public void write(final int b) throws IOException { + uncompressedBuffer[numUncompressedBytes++] = (byte) b; + if (numUncompressedBytes == uncompressedBuffer.length) deflateBlock(); + } + + /** + * WARNING: flush() affects the output format, because it causes the current contents of uncompressedBuffer + * to be compressed and written, even if it isn't full. Unless you know what you're doing, don't call flush(). + * Instead, call close(), which will flush any unwritten data before closing the underlying stream. + * + */ + @Override + public void flush() throws IOException { + while (numUncompressedBytes > 0) { + deflateBlock(); + } + codec.getOutputStream().flush(); + } + + /** + * close() must be called in order to flush any remaining buffered bytes. An unclosed file will likely be + * defective. + * + */ + @Override + public void close() throws IOException { + close(true); + } + + public void close(final boolean writeTerminatorBlock) throws IOException { + flush(); + // For debugging... + // if (numberOfThrottleBacks > 0) { + // System.err.println("In BlockCompressedOutputStream, had to throttle back " + numberOfThrottleBacks + + // " times for file " + codec.getOutputFileName()); + // } + if (writeTerminatorBlock) { + codec.writeBytes(BGZFStreamConstants.EMPTY_GZIP_BLOCK); + } + codec.close(); + + // If a terminator block was written, ensure that it's there and valid + if (writeTerminatorBlock) { + // Can't re-open something that is not a regular file, e.g. a named pipe or an output stream + if (this.file == null || !Files.isRegularFile(this.file)) return; + if (BlockCompressedInputStream.checkTermination(this.file) != + BlockCompressedInputStream.FileTermination.HAS_TERMINATOR_BLOCK) { + throw new IOException("Terminator block not found after closing BGZF file " + this.file); + } + } + } + + /** Encode virtual file pointer + * Upper 48 bits is the byte offset into the compressed stream of a block. + * Lower 16 bits is the byte offset into the uncompressed stream inside the block. + */ + public long getFilePointer(){ + return BGZFFilePointerUtil.makeFilePointer(mBlockAddress, numUncompressedBytes); + } + + public long getPosition() { + return getFilePointer(); + } + + /** + * Attempt to write the data in uncompressedBuffer to the underlying file in a gzip block. + * If the entire uncompressedBuffer does not fit in the maximum allowed size, reduce the amount + * of data to be compressed, and slide the excess down in uncompressedBuffer so it can be picked + * up in the next deflate event. + * @return size of gzip block that was written. + */ + private int deflateBlock() throws IOException { + if (numUncompressedBytes == 0) { + return 0; + } + final int bytesToCompress = numUncompressedBytes; + // Compress the input + deflater.reset(); + deflater.setInput(uncompressedBuffer, 0, bytesToCompress); + deflater.finish(); + int compressedSize = deflater.deflate(compressedBuffer, 0, compressedBuffer.length); + + // If it didn't all fit in compressedBuffer.length, set compression level to NO_COMPRESSION + // and try again. This should always fit. + if (!deflater.finished()) { + noCompressionDeflater.reset(); + noCompressionDeflater.setInput(uncompressedBuffer, 0, bytesToCompress); + noCompressionDeflater.finish(); + compressedSize = noCompressionDeflater.deflate(compressedBuffer, 0, compressedBuffer.length); + if (!noCompressionDeflater.finished()) { + throw new IllegalStateException("unpossible"); + } + } + // Data compressed small enough, so write it out. + crc32.reset(); + crc32.update(uncompressedBuffer, 0, bytesToCompress); + + final int totalBlockSize = writeGzipBlock(compressedSize, bytesToCompress, crc32.getValue()); + + // Clear out from uncompressedBuffer the data that was written + numUncompressedBytes = 0; + mBlockAddress += totalBlockSize; + return totalBlockSize; + } + + /** + * Writes the entire gzip block, assuming the compressed data is stored in compressedBuffer + * @return size of gzip block that was written. + */ + private int writeGzipBlock(final int compressedSize, final int uncompressedSize, final long crc) throws IOException { + // Init gzip header + codec.writeByte(BGZFStreamConstants.GZIP_ID1); + codec.writeByte(BGZFStreamConstants.GZIP_ID2); + codec.writeByte(BGZFStreamConstants.GZIP_CM_DEFLATE); + codec.writeByte(BGZFStreamConstants.GZIP_FLG); + codec.writeInt(0); // Modification time + codec.writeByte(BGZFStreamConstants.GZIP_XFL); + codec.writeByte(BGZFStreamConstants.GZIP_OS_UNKNOWN); + codec.writeShort(BGZFStreamConstants.GZIP_XLEN); + codec.writeByte(BGZFStreamConstants.BGZF_ID1); + codec.writeByte(BGZFStreamConstants.BGZF_ID2); + codec.writeShort(BGZFStreamConstants.BGZF_LEN); + final int totalBlockSize = compressedSize + BGZFStreamConstants.BLOCK_HEADER_LENGTH + + BGZFStreamConstants.BLOCK_FOOTER_LENGTH; + + // I don't know why we store block size - 1, but that is what the spec says + codec.writeShort((short)(totalBlockSize - 1)); + codec.writeBytes(compressedBuffer, 0, compressedSize); + codec.writeInt((int)crc); + codec.writeInt(uncompressedSize); + return totalBlockSize; + } +} diff --git a/io-compress-bgzf/src/main/java/org/xbib/io/compress/bgzf/BlockGunzipper.java b/io-compress-bgzf/src/main/java/org/xbib/io/compress/bgzf/BlockGunzipper.java new file mode 100644 index 0000000..e67fca8 --- /dev/null +++ b/io-compress-bgzf/src/main/java/org/xbib/io/compress/bgzf/BlockGunzipper.java @@ -0,0 +1,114 @@ +package org.xbib.io.compress.bgzf; + +import java.nio.ByteBuffer; +import java.nio.ByteOrder; +import java.util.zip.CRC32; +import java.util.zip.DataFormatException; +import java.util.zip.Inflater; + +/** + * For decompressing GZIP blocks that are already loaded into a byte[]. + * The main advantage is that this object can be used over and over again to decompress many blocks, + * whereas a new GZIPInputStream and ByteArrayInputStream would otherwise need to be created for each + * block to be decompressed. + * + * This code requires that the GZIP header conform to the GZIP blocks written to BAM files, with + * a specific subfield and no other optional stuff. + */ +public class BlockGunzipper { + private static InflaterFactory defaultInflaterFactory = new InflaterFactory(); + private final Inflater inflater; + private final CRC32 crc32 = new CRC32(); + private boolean checkCrcs = false; + BlockGunzipper() { + inflater = defaultInflaterFactory.makeInflater(true); // GZIP mode + } + + /** + * Create a BlockGunzipper using the provided inflaterFactory + * @param inflaterFactory + */ + BlockGunzipper(InflaterFactory inflaterFactory) { + inflater = inflaterFactory.makeInflater(true); // GZIP mode + } + + /** + * Sets the default {@link InflaterFactory} that will be used for all instances unless specified otherwise in the constructor. + * If this method is not called the default is a factory that will create the JDK {@link Inflater}. + * @param inflaterFactory non-null default factory. + */ + public static void setDefaultInflaterFactory(final InflaterFactory inflaterFactory) { + if (inflaterFactory == null) { + throw new IllegalArgumentException("null inflaterFactory"); + } + defaultInflaterFactory = inflaterFactory; + } + + public static InflaterFactory getDefaultInflaterFactory() { + return defaultInflaterFactory; + } + /** Allows the caller to decide whether or not to check CRCs on when uncompressing blocks. */ + public void setCheckCrcs(final boolean check) { + this.checkCrcs = check; + } + + /** + * Decompress GZIP-compressed data + * @param uncompressedBlock must be big enough to hold decompressed output. + * @param compressedBlock compressed data starting at offset 0 + * @param compressedLength size of compressed data, possibly less than the size of the buffer. + */ + void unzipBlock(byte[] uncompressedBlock, byte[] compressedBlock, int compressedLength) { + try { + ByteBuffer byteBuffer = ByteBuffer.wrap(compressedBlock, 0, compressedLength); + byteBuffer.order(ByteOrder.LITTLE_ENDIAN); + + // Validate GZIP header + if (byteBuffer.get() != BGZFStreamConstants.GZIP_ID1 || + byteBuffer.get() != (byte)BGZFStreamConstants.GZIP_ID2 || + byteBuffer.get() != BGZFStreamConstants.GZIP_CM_DEFLATE || + byteBuffer.get() != BGZFStreamConstants.GZIP_FLG + ) { + throw new BGZFFormatException("Invalid GZIP header"); + } + // Skip MTIME, XFL, OS fields + byteBuffer.position(byteBuffer.position() + 6); + if (byteBuffer.getShort() != BGZFStreamConstants.GZIP_XLEN) { + throw new BGZFFormatException("Invalid GZIP header"); + } + // Skip blocksize subfield intro + byteBuffer.position(byteBuffer.position() + 4); + // Read ushort + final int totalBlockSize = (byteBuffer.getShort() & 0xffff) + 1; + if (totalBlockSize != compressedLength) { + throw new BGZFFormatException("GZIP blocksize disagreement"); + } + + // Read expected size and CRD from end of GZIP block + final int deflatedSize = compressedLength - BGZFStreamConstants.BLOCK_HEADER_LENGTH - BGZFStreamConstants.BLOCK_FOOTER_LENGTH; + byteBuffer.position(byteBuffer.position() + deflatedSize); + int expectedCrc = byteBuffer.getInt(); + int uncompressedSize = byteBuffer.getInt(); + inflater.reset(); + + // Decompress + inflater.setInput(compressedBlock, BGZFStreamConstants.BLOCK_HEADER_LENGTH, deflatedSize); + final int inflatedBytes = inflater.inflate(uncompressedBlock, 0, uncompressedSize); + if (inflatedBytes != uncompressedSize) { + throw new BGZFFormatException("Did not inflate expected amount"); + } + + // Validate CRC if so desired + if (this.checkCrcs) { + crc32.reset(); + crc32.update(uncompressedBlock, 0, uncompressedSize); + final long crc = crc32.getValue(); + if ((int)crc != expectedCrc) { + throw new BGZFFormatException("CRC mismatch"); + } + } + } catch (DataFormatException e) { + throw new BGZFException(e); + } + } +} diff --git a/io-compress-bgzf/src/main/java/org/xbib/io/compress/bgzf/DeflaterFactory.java b/io-compress-bgzf/src/main/java/org/xbib/io/compress/bgzf/DeflaterFactory.java new file mode 100644 index 0000000..da1605d --- /dev/null +++ b/io-compress-bgzf/src/main/java/org/xbib/io/compress/bgzf/DeflaterFactory.java @@ -0,0 +1,24 @@ +package org.xbib.io.compress.bgzf; + +import java.util.zip.Deflater; + +/** + * Factory for {@link Deflater} objects used by {@link BlockCompressedOutputStream}. + * This class may be extended to provide alternative deflaters (e.g., for improved performance). + */ +public class DeflaterFactory { + + public DeflaterFactory() { + //Note: made explicit constructor to make searching for references easier + } + + /** + * Returns a deflater object that will be used when writing BAM files. + * Subclasses may override to provide their own deflater implementation. + * @param compressionLevel the compression level (0-9) + * @param gzipCompatible if true then use GZIP compatible compression + */ + public Deflater makeDeflater(final int compressionLevel, final boolean gzipCompatible) { + return new Deflater(compressionLevel, gzipCompatible); + } +} diff --git a/io-compress-bgzf/src/main/java/org/xbib/io/compress/bgzf/InflaterFactory.java b/io-compress-bgzf/src/main/java/org/xbib/io/compress/bgzf/InflaterFactory.java new file mode 100644 index 0000000..1cdc4da --- /dev/null +++ b/io-compress-bgzf/src/main/java/org/xbib/io/compress/bgzf/InflaterFactory.java @@ -0,0 +1,20 @@ +package org.xbib.io.compress.bgzf; + +import java.util.zip.Inflater; + +/** + * Factory for {@link Inflater} objects used by {@link BlockGunzipper}. + * This class may be extended to provide alternative inflaters (e.g., for improved performance). + * The default implementation returns a JDK {@link Inflater} + */ +public class InflaterFactory { + /** + * Returns an inflater object that will be used when reading DEFLATE compressed files. + * Subclasses may override to provide their own inflater implementation. + * The default implementation returns a JDK {@link Inflater} + * @param gzipCompatible if true then use GZIP compatible compression + */ + public Inflater makeInflater(final boolean gzipCompatible) { + return new Inflater(gzipCompatible); + } +} diff --git a/io-compress-bgzf/src/main/java/org/xbib/io/compress/bgzf/SeekableBufferedStream.java b/io-compress-bgzf/src/main/java/org/xbib/io/compress/bgzf/SeekableBufferedStream.java new file mode 100644 index 0000000..0f13d85 --- /dev/null +++ b/io-compress-bgzf/src/main/java/org/xbib/io/compress/bgzf/SeekableBufferedStream.java @@ -0,0 +1,105 @@ +package org.xbib.io.compress.bgzf; + +import java.io.BufferedInputStream; +import java.io.IOException; +import java.io.InputStream; + +/** + * A wrapper class to provide buffered read access to a SeekableStream. Just wrapping such a stream with + * a BufferedInputStream will not work as it does not support seeking. In this implementation a + * seek call is delegated to the wrapped stream, and the buffer reset. + */ +public class SeekableBufferedStream extends SeekableStream { + + /** Little extension to buffered input stream to give access to the available bytes in the buffer. */ + private static class ExtBufferedInputStream extends BufferedInputStream { + private ExtBufferedInputStream(final InputStream inputStream, final int i) { + super(inputStream, i); + } + + /** Returns the number of bytes that can be read from the buffer without reading more into the buffer. */ + int getBytesInBufferAvailable() { + if (this.count == this.pos) return 0; // documented test for "is buffer empty" + else return this.buf.length - this.pos; + } + } + + public static final int DEFAULT_BUFFER_SIZE = 512000; + + final private int bufferSize; + final SeekableStream wrappedStream; + ExtBufferedInputStream bufferedStream; + long position; + + public SeekableBufferedStream(final SeekableStream stream, final int bufferSize) { + this.bufferSize = bufferSize; + this.wrappedStream = stream; + this.position = 0; + bufferedStream = new ExtBufferedInputStream(wrappedStream, bufferSize); + } + + public SeekableBufferedStream(final SeekableStream stream) { + this(stream, DEFAULT_BUFFER_SIZE); + } + + @Override + public long length() { + return wrappedStream.length(); + } + + @Override + public long skip(final long skipLength) throws IOException { + if (skipLength < this.bufferedStream.getBytesInBufferAvailable()) { + final long retval = this.bufferedStream.skip(skipLength); + this.position += retval; + return retval; + } else { + final long position = this.position + skipLength; + seek(position); + return skipLength; + } + } + + @Override + public void seek(final long position) throws IOException { + this.position = position; + wrappedStream.seek(position); + bufferedStream = new ExtBufferedInputStream(wrappedStream, bufferSize); + } + + @Override + public int read() throws IOException { + int b = bufferedStream.read(); + position++; + return b; + } + + @Override + public int read(final byte[] buffer, final int offset, final int length) throws IOException { + final int nBytesRead = bufferedStream.read(buffer, offset, length); + if (nBytesRead > 0) { + position += nBytesRead; + } + return nBytesRead; + } + + @Override + public void close() throws IOException { + wrappedStream.close(); + } + + @Override + public boolean eof() throws IOException { + return position >= wrappedStream.length(); + } + + @Override + public String getSource() { + return wrappedStream.getSource(); + } + + @Override + public long position() throws IOException { + return position; + } +} diff --git a/io-compress-bgzf/src/main/java/org/xbib/io/compress/bgzf/SeekableFileStream.java b/io-compress-bgzf/src/main/java/org/xbib/io/compress/bgzf/SeekableFileStream.java new file mode 100644 index 0000000..8a80470 --- /dev/null +++ b/io-compress-bgzf/src/main/java/org/xbib/io/compress/bgzf/SeekableFileStream.java @@ -0,0 +1,110 @@ +package org.xbib.io.compress.bgzf; + +import java.io.File; +import java.io.FileNotFoundException; +import java.io.IOException; +import java.io.RandomAccessFile; +import java.util.Collection; +import java.util.Collections; +import java.util.HashSet; + +public class SeekableFileStream extends SeekableStream { + + /** + * Collection of all open instances. SeekableFileStream objects are usually open and kept open for the + * duration of a session. This collection supports a method to close them all. + */ + private static final Collection allInstances = Collections.synchronizedCollection(new HashSet<>()); + + File file; + RandomAccessFile fis; + + public SeekableFileStream(final File file) throws FileNotFoundException { + this.file = file; + fis = new RandomAccessFile(file, "r"); + allInstances.add(this); + } + + @Override + public long length() { + return file.length(); + } + + @Override + public boolean eof() throws IOException { + return fis.length() == fis.getFilePointer(); + } + + @Override + public void seek(final long position) throws IOException { + fis.seek(position); + } + + @Override + public long position() throws IOException { + return fis.getChannel().position(); + } + + @Override + public long skip(long n) throws IOException { + long initPos = position(); + fis.getChannel().position(initPos + n); + return position() - initPos; + } + + @Override + public int read(final byte[] buffer, final int offset, final int length) throws IOException { + if (length < 0) { + throw new IndexOutOfBoundsException(); + } + int n = 0; + while (n < length) { + final int count = fis.read(buffer, offset + n, length - n); + if (count < 0) { + if (n > 0) { + return n; + } else { + return count; + } + } + n += count; + } + return n; + + } + + @Override + public int read() throws IOException { + return fis.read(); + } + + @Override + public int read(byte[] b) throws IOException { + return fis.read(b); + } + + @Override + public String getSource() { + return file.getAbsolutePath(); + } + + + @Override + public void close() throws IOException { + allInstances.remove(this); + fis.close(); + + } + + public static synchronized void closeAllInstances() { + Collection clonedInstances = new HashSet<>(allInstances); + for (SeekableFileStream sfs : clonedInstances) { + try { + sfs.close(); + } catch (IOException e) { + // + } + } + allInstances.clear(); + } +} diff --git a/io-compress-bgzf/src/main/java/org/xbib/io/compress/bgzf/SeekableStream.java b/io-compress-bgzf/src/main/java/org/xbib/io/compress/bgzf/SeekableStream.java new file mode 100644 index 0000000..8af3c4c --- /dev/null +++ b/io-compress-bgzf/src/main/java/org/xbib/io/compress/bgzf/SeekableStream.java @@ -0,0 +1,44 @@ +package org.xbib.io.compress.bgzf; + +import java.io.EOFException; +import java.io.IOException; +import java.io.InputStream; + +public abstract class SeekableStream extends InputStream { + + public abstract long length(); + + public abstract long position() throws IOException; + + public abstract void seek(long position) throws IOException; + + @Override + public abstract int read(byte[] buffer, int offset, int length) throws IOException; + + @Override + public abstract void close() throws IOException; + + public abstract boolean eof() throws IOException; + + /** + * @return String representation of source (e.g. URL, file path, etc.), or null if not available. + */ + public abstract String getSource(); + + /** + * Read enough bytes to fill the input buffer. + * @param b byte array + * @throws EOFException If EOF is reached before buffer is filled + */ + public void readFully(byte[] b) throws IOException { + int len = b.length; + int n = 0; + while (n < len) { + int count = read(b, n, len - n); + if (count < 0){ + throw new EOFException(); + } + n += count; + } + } +} diff --git a/io-compress-bgzf/src/main/java/org/xbib/io/compress/bgzf/SeekableStreamFactory.java b/io-compress-bgzf/src/main/java/org/xbib/io/compress/bgzf/SeekableStreamFactory.java new file mode 100644 index 0000000..4acb8b4 --- /dev/null +++ b/io-compress-bgzf/src/main/java/org/xbib/io/compress/bgzf/SeekableStreamFactory.java @@ -0,0 +1,11 @@ +package org.xbib.io.compress.bgzf; + +import java.io.File; +import java.io.IOException; + +public class SeekableStreamFactory { + + public static SeekableStream getStreamFor(String path) throws IOException { + return new SeekableFileStream(new File(path)); + } +} diff --git a/settings.gradle b/settings.gradle index 6d59c8e..3166302 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,3 +1,4 @@ +include 'io-compress-bgzf' include 'io-compress-bzip2' include 'io-compress-lzf' include 'io-compress-xz'