Author: jukka
Date: Thu Jan 23 20:41:40 2014
New Revision: 1560805
URL: http://svn.apache.org/r1560805
Log:
OAK-834: Efficient copying of binaries across repositories
Implement ReferenceBinary based on the Blob.getReference() method
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/value/BinaryImpl.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/value/ValueImpl.java
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/value/BinaryImpl.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/value/BinaryImpl.java?rev=1560805&r1=1560804&r2=1560805&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/value/BinaryImpl.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/value/BinaryImpl.java
Thu Jan 23 20:41:40 2014
@@ -1,77 +1,87 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.jackrabbit.oak.plugins.value;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-import javax.jcr.Binary;
-import javax.jcr.PropertyType;
-import javax.jcr.RepositoryException;
-
-/**
- * TODO document
- */
-class BinaryImpl implements Binary {
-
- private final ValueImpl value;
-
- BinaryImpl(ValueImpl value) {
- this.value = value;
- }
-
- ValueImpl getBinaryValue() {
- return value.getType() == PropertyType.BINARY ? value : null;
- }
-
- //-------------------------------------------------------------< Binary
>---
-
- @Override
- public InputStream getStream() {
- return value.getNewStream();
- }
-
- @Override
- public int read(byte[] b, long position) throws IOException {
- InputStream stream = value.getNewStream();
- try {
- if (position != stream.skip(position)) {
- throw new IOException("Can't skip to position " + position);
- }
- return stream.read(b);
- } finally {
- stream.close();
- }
- }
-
- @Override
- public long getSize() throws RepositoryException {
- switch (value.getType()) {
- case PropertyType.NAME:
- case PropertyType.PATH:
- // need to respect namespace remapping
- return value.getString().length();
- default:
- return value.getStreamLength();
- }
- }
-
- @Override
- public void dispose() {
- // nothing to do
- }
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jackrabbit.oak.plugins.value;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+import javax.annotation.CheckForNull;
+import javax.jcr.PropertyType;
+import javax.jcr.RepositoryException;
+
+import org.apache.jackrabbit.api.ReferenceBinary;
+
+/**
+ * TODO document
+ */
+class BinaryImpl implements ReferenceBinary {
+
+ private final ValueImpl value;
+
+ BinaryImpl(ValueImpl value) {
+ this.value = value;
+ }
+
+ ValueImpl getBinaryValue() {
+ return value.getType() == PropertyType.BINARY ? value : null;
+ }
+
+ //-------------------------------------------------------------< Binary
>---
+
+ @Override
+ public InputStream getStream() {
+ return value.getBlob().getNewStream();
+ }
+
+ @Override
+ public int read(byte[] b, long position) throws IOException {
+ InputStream stream = getStream();
+ try {
+ if (position != stream.skip(position)) {
+ throw new IOException("Can't skip to position " + position);
+ }
+ return stream.read(b);
+ } finally {
+ stream.close();
+ }
+ }
+
+ @Override
+ public long getSize() throws RepositoryException {
+ switch (value.getType()) {
+ case PropertyType.NAME:
+ case PropertyType.PATH:
+ // need to respect namespace remapping
+ return value.getString().length();
+ default:
+ return value.getBlob().length();
+ }
+ }
+
+ @Override
+ public void dispose() {
+ // nothing to do
+ }
+
+ //---------------------------------------------------< ReferenceBinary >--
+
+ @Override @CheckForNull
+ public String getReference() {
+ return value.getBlob().getReference();
+ }
+
}
\ No newline at end of file
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/value/ValueImpl.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/value/ValueImpl.java?rev=1560805&r1=1560804&r2=1560805&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/value/ValueImpl.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/value/ValueImpl.java
Thu Jan 23 20:41:40 2014
@@ -1,309 +1,301 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.jackrabbit.oak.plugins.value;
-
-import java.io.InputStream;
-import java.math.BigDecimal;
-import java.util.Calendar;
-
-import javax.jcr.Binary;
-import javax.jcr.PropertyType;
-import javax.jcr.RepositoryException;
-import javax.jcr.Value;
-import javax.jcr.ValueFormatException;
-
-import org.apache.jackrabbit.oak.api.Blob;
-import org.apache.jackrabbit.oak.api.PropertyState;
-import org.apache.jackrabbit.oak.api.Type;
-import org.apache.jackrabbit.oak.namepath.NamePathMapper;
-
-import com.google.common.base.Objects;
-
-import static com.google.common.base.Preconditions.checkArgument;
-import static com.google.common.base.Preconditions.checkState;
-
-/**
- * Implementation of {@link Value} based on {@code PropertyState}.
- */
-public class ValueImpl implements Value {
-
- public static Blob getBlob(Value value) {
- checkState(value instanceof ValueImpl);
- return ((ValueImpl) value).getBlob();
- }
-
- private final PropertyState propertyState;
- private final int index;
- private final NamePathMapper namePathMapper;
-
- private InputStream stream = null;
-
- /**
- * Create a new {@code Value} instance
- * @param property The property state this instance is based on
- * @param index The index
- * @param namePathMapper The name/path mapping used for converting JCR
names/paths to
- * the internal representation.
- * @throws IllegalArgumentException if {@code index <
propertyState.count()}
- */
- ValueImpl(PropertyState property, int index, NamePathMapper
namePathMapper) {
- checkArgument(index < property.count());
- this.propertyState = property;
- this.index = index;
- this.namePathMapper = namePathMapper;
- }
-
- /**
- * Create a new {@code Value} instance
- * @param property The property state this instance is based on
- * @param namePathMapper The name/path mapping used for converting JCR
names/paths to
- * the internal representation.
- * @throws IllegalArgumentException if {@code property.isArray()} is
{@code true}.
- */
- ValueImpl(PropertyState property, NamePathMapper namePathMapper) {
- this(checkSingleValued(property), 0, namePathMapper);
- }
-
- private Blob getBlob() {
- return propertyState.getValue(Type.BINARY, index);
- }
-
- /**
- * Same as {@link #getString()} unless that names and paths are returned
in their
- * Oak representation instead of being mapped to their JCR representation.
- * @return A String representation of the value of this property.
- */
- public String getOakString() {
- return propertyState.getValue(Type.STRING, index);
- }
-
- private static PropertyState checkSingleValued(PropertyState property) {
- checkArgument(!property.isArray());
- return property;
- }
-
- //--------------------------------------------------------------< Value
>---
-
- /**
- * @see javax.jcr.Value#getType()
- */
- @Override
- public int getType() {
- return propertyState.getType().tag();
- }
-
- /**
- * @see javax.jcr.Value#getBoolean()
- */
- @Override
- public boolean getBoolean() throws RepositoryException {
- switch (getType()) {
- case PropertyType.STRING:
- case PropertyType.BINARY:
- case PropertyType.BOOLEAN:
- return propertyState.getValue(Type.BOOLEAN, index);
- default:
- throw new ValueFormatException("Incompatible type " +
PropertyType.nameFromValue(getType()));
- }
- }
-
- /**
- * @see javax.jcr.Value#getDate()
- */
- @Override
- public Calendar getDate() throws RepositoryException {
- try {
- switch (getType()) {
- case PropertyType.STRING:
- case PropertyType.BINARY:
- case PropertyType.DATE:
- String value = propertyState.getValue(Type.DATE, index);
- return Conversions.convert(value).toCalendar();
- case PropertyType.LONG:
- case PropertyType.DOUBLE:
- case PropertyType.DECIMAL:
- return
Conversions.convert(propertyState.getValue(Type.LONG, index)).toCalendar();
- default:
- throw new ValueFormatException("Incompatible type " +
PropertyType.nameFromValue(getType()));
- }
- }
- catch (IllegalArgumentException e) {
- throw new ValueFormatException("Error converting value to date",
e);
- }
- }
-
- /**
- * @see javax.jcr.Value#getDecimal()
- */
- @Override
- public BigDecimal getDecimal() throws RepositoryException {
- try {
- switch (getType()) {
- case PropertyType.STRING:
- case PropertyType.BINARY:
- case PropertyType.LONG:
- case PropertyType.DOUBLE:
- case PropertyType.DATE:
- case PropertyType.DECIMAL:
- return propertyState.getValue(Type.DECIMAL, index);
- default:
- throw new ValueFormatException("Incompatible type " +
PropertyType.nameFromValue(getType()));
- }
- }
- catch (IllegalArgumentException e) {
- throw new ValueFormatException("Error converting value to
decimal", e);
- }
- }
-
- /**
- * @see javax.jcr.Value#getDouble()
- */
- @Override
- public double getDouble() throws RepositoryException {
- try {
- switch (getType()) {
- case PropertyType.STRING:
- case PropertyType.BINARY:
- case PropertyType.LONG:
- case PropertyType.DOUBLE:
- case PropertyType.DATE:
- case PropertyType.DECIMAL:
- return propertyState.getValue(Type.DOUBLE, index);
- default:
- throw new ValueFormatException("Incompatible type " +
PropertyType.nameFromValue(getType()));
- }
- }
- catch (IllegalArgumentException e) {
- throw new ValueFormatException("Error converting value to double",
e);
- }
- }
-
- /**
- * @see javax.jcr.Value#getLong()
- */
- @Override
- public long getLong() throws RepositoryException {
- try {
- switch (getType()) {
- case PropertyType.STRING:
- case PropertyType.BINARY:
- case PropertyType.LONG:
- case PropertyType.DOUBLE:
- case PropertyType.DATE:
- case PropertyType.DECIMAL:
- return propertyState.getValue(Type.LONG, index);
- default:
- throw new ValueFormatException("Incompatible type " +
PropertyType.nameFromValue(getType()));
- }
- }
- catch (IllegalArgumentException e) {
- throw new ValueFormatException("Error converting value to double",
e);
- }
- }
-
- /**
- * @see javax.jcr.Value#getString()
- */
- @Override
- public String getString() throws RepositoryException {
- checkState(getType() != PropertyType.BINARY || stream == null,
- "getStream has previously been called on this Value instance.
" +
- "In this case a new Value instance must be acquired in order
to successfully call this method.");
-
- switch (getType()) {
- case PropertyType.NAME:
- return namePathMapper.getJcrName(getOakString());
- case PropertyType.PATH:
- String s = getOakString();
- if (s.startsWith("[") && s.endsWith("]")) {
- // identifier paths are returned as-is (JCR 2.0, 3.4.3.1)
- return s;
- } else {
- return namePathMapper.getJcrPath(s);
- }
- default:
- return getOakString();
- }
- }
-
- /**
- * @see javax.jcr.Value#getStream()
- */
- @Override
- public InputStream getStream() throws IllegalStateException {
- if (stream == null) {
- stream = getNewStream();
- }
- return stream;
- }
-
- InputStream getNewStream() {
- return propertyState.getValue(Type.BINARY, index).getNewStream();
- }
-
- long getStreamLength() {
- return propertyState.getValue(Type.BINARY, index).length();
- }
-
- /**
- * @see javax.jcr.Value#getBinary()
- */
- @Override
- public Binary getBinary() throws RepositoryException {
- return new BinaryImpl(this);
- }
-
- //-------------------------------------------------------------< Object
>---
-
- /**
- * @see Object#equals(Object)
- */
- @Override
- public boolean equals(Object other) {
- if (other instanceof ValueImpl) {
- ValueImpl that = (ValueImpl) other;
- Type<?> type = propertyState.getType();
- if (type.isArray()) {
- type = type.getBaseType();
- }
- return type.tag() == that.propertyState.getType().tag()
- && Objects.equal(
- propertyState.getValue(type, index),
- that.propertyState.getValue(type, that.index));
- } else {
- return false;
- }
- }
-
- /**
- * @see Object#hashCode()
- */
- @Override
- public int hashCode() {
- if (getType() == PropertyType.BINARY) {
- return propertyState.getValue(Type.BINARY, index).hashCode();
- } else {
- return getOakString().hashCode();
- }
- }
-
- @Override
- public String toString() {
- return getOakString();
- }
-
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jackrabbit.oak.plugins.value;
+
+import java.io.InputStream;
+import java.math.BigDecimal;
+import java.util.Calendar;
+
+import javax.jcr.Binary;
+import javax.jcr.PropertyType;
+import javax.jcr.RepositoryException;
+import javax.jcr.Value;
+import javax.jcr.ValueFormatException;
+
+import org.apache.jackrabbit.oak.api.Blob;
+import org.apache.jackrabbit.oak.api.PropertyState;
+import org.apache.jackrabbit.oak.api.Type;
+import org.apache.jackrabbit.oak.namepath.NamePathMapper;
+
+import com.google.common.base.Objects;
+
+import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.base.Preconditions.checkState;
+
+/**
+ * Implementation of {@link Value} based on {@code PropertyState}.
+ */
+public class ValueImpl implements Value {
+
+ public static Blob getBlob(Value value) {
+ checkState(value instanceof ValueImpl);
+ return ((ValueImpl) value).getBlob();
+ }
+
+ private final PropertyState propertyState;
+ private final int index;
+ private final NamePathMapper namePathMapper;
+
+ private InputStream stream = null;
+
+ /**
+ * Create a new {@code Value} instance
+ * @param property The property state this instance is based on
+ * @param index The index
+ * @param namePathMapper The name/path mapping used for converting JCR
names/paths to
+ * the internal representation.
+ * @throws IllegalArgumentException if {@code index <
propertyState.count()}
+ */
+ ValueImpl(PropertyState property, int index, NamePathMapper
namePathMapper) {
+ checkArgument(index < property.count());
+ this.propertyState = property;
+ this.index = index;
+ this.namePathMapper = namePathMapper;
+ }
+
+ /**
+ * Create a new {@code Value} instance
+ * @param property The property state this instance is based on
+ * @param namePathMapper The name/path mapping used for converting JCR
names/paths to
+ * the internal representation.
+ * @throws IllegalArgumentException if {@code property.isArray()} is
{@code true}.
+ */
+ ValueImpl(PropertyState property, NamePathMapper namePathMapper) {
+ this(checkSingleValued(property), 0, namePathMapper);
+ }
+
+ Blob getBlob() {
+ return propertyState.getValue(Type.BINARY, index);
+ }
+
+ /**
+ * Same as {@link #getString()} unless that names and paths are returned
in their
+ * Oak representation instead of being mapped to their JCR representation.
+ * @return A String representation of the value of this property.
+ */
+ public String getOakString() {
+ return propertyState.getValue(Type.STRING, index);
+ }
+
+ private static PropertyState checkSingleValued(PropertyState property) {
+ checkArgument(!property.isArray());
+ return property;
+ }
+
+ //--------------------------------------------------------------< Value
>---
+
+ /**
+ * @see javax.jcr.Value#getType()
+ */
+ @Override
+ public int getType() {
+ return propertyState.getType().tag();
+ }
+
+ /**
+ * @see javax.jcr.Value#getBoolean()
+ */
+ @Override
+ public boolean getBoolean() throws RepositoryException {
+ switch (getType()) {
+ case PropertyType.STRING:
+ case PropertyType.BINARY:
+ case PropertyType.BOOLEAN:
+ return propertyState.getValue(Type.BOOLEAN, index);
+ default:
+ throw new ValueFormatException("Incompatible type " +
PropertyType.nameFromValue(getType()));
+ }
+ }
+
+ /**
+ * @see javax.jcr.Value#getDate()
+ */
+ @Override
+ public Calendar getDate() throws RepositoryException {
+ try {
+ switch (getType()) {
+ case PropertyType.STRING:
+ case PropertyType.BINARY:
+ case PropertyType.DATE:
+ String value = propertyState.getValue(Type.DATE, index);
+ return Conversions.convert(value).toCalendar();
+ case PropertyType.LONG:
+ case PropertyType.DOUBLE:
+ case PropertyType.DECIMAL:
+ return
Conversions.convert(propertyState.getValue(Type.LONG, index)).toCalendar();
+ default:
+ throw new ValueFormatException("Incompatible type " +
PropertyType.nameFromValue(getType()));
+ }
+ }
+ catch (IllegalArgumentException e) {
+ throw new ValueFormatException("Error converting value to date",
e);
+ }
+ }
+
+ /**
+ * @see javax.jcr.Value#getDecimal()
+ */
+ @Override
+ public BigDecimal getDecimal() throws RepositoryException {
+ try {
+ switch (getType()) {
+ case PropertyType.STRING:
+ case PropertyType.BINARY:
+ case PropertyType.LONG:
+ case PropertyType.DOUBLE:
+ case PropertyType.DATE:
+ case PropertyType.DECIMAL:
+ return propertyState.getValue(Type.DECIMAL, index);
+ default:
+ throw new ValueFormatException("Incompatible type " +
PropertyType.nameFromValue(getType()));
+ }
+ }
+ catch (IllegalArgumentException e) {
+ throw new ValueFormatException("Error converting value to
decimal", e);
+ }
+ }
+
+ /**
+ * @see javax.jcr.Value#getDouble()
+ */
+ @Override
+ public double getDouble() throws RepositoryException {
+ try {
+ switch (getType()) {
+ case PropertyType.STRING:
+ case PropertyType.BINARY:
+ case PropertyType.LONG:
+ case PropertyType.DOUBLE:
+ case PropertyType.DATE:
+ case PropertyType.DECIMAL:
+ return propertyState.getValue(Type.DOUBLE, index);
+ default:
+ throw new ValueFormatException("Incompatible type " +
PropertyType.nameFromValue(getType()));
+ }
+ }
+ catch (IllegalArgumentException e) {
+ throw new ValueFormatException("Error converting value to double",
e);
+ }
+ }
+
+ /**
+ * @see javax.jcr.Value#getLong()
+ */
+ @Override
+ public long getLong() throws RepositoryException {
+ try {
+ switch (getType()) {
+ case PropertyType.STRING:
+ case PropertyType.BINARY:
+ case PropertyType.LONG:
+ case PropertyType.DOUBLE:
+ case PropertyType.DATE:
+ case PropertyType.DECIMAL:
+ return propertyState.getValue(Type.LONG, index);
+ default:
+ throw new ValueFormatException("Incompatible type " +
PropertyType.nameFromValue(getType()));
+ }
+ }
+ catch (IllegalArgumentException e) {
+ throw new ValueFormatException("Error converting value to double",
e);
+ }
+ }
+
+ /**
+ * @see javax.jcr.Value#getString()
+ */
+ @Override
+ public String getString() throws RepositoryException {
+ checkState(getType() != PropertyType.BINARY || stream == null,
+ "getStream has previously been called on this Value instance.
" +
+ "In this case a new Value instance must be acquired in order
to successfully call this method.");
+
+ switch (getType()) {
+ case PropertyType.NAME:
+ return namePathMapper.getJcrName(getOakString());
+ case PropertyType.PATH:
+ String s = getOakString();
+ if (s.startsWith("[") && s.endsWith("]")) {
+ // identifier paths are returned as-is (JCR 2.0, 3.4.3.1)
+ return s;
+ } else {
+ return namePathMapper.getJcrPath(s);
+ }
+ default:
+ return getOakString();
+ }
+ }
+
+ /**
+ * @see javax.jcr.Value#getStream()
+ */
+ @Override
+ public InputStream getStream() throws IllegalStateException {
+ if (stream == null) {
+ stream = getBlob().getNewStream();
+ }
+ return stream;
+ }
+
+ /**
+ * @see javax.jcr.Value#getBinary()
+ */
+ @Override
+ public Binary getBinary() throws RepositoryException {
+ return new BinaryImpl(this);
+ }
+
+ //-------------------------------------------------------------< Object
>---
+
+ /**
+ * @see Object#equals(Object)
+ */
+ @Override
+ public boolean equals(Object other) {
+ if (other instanceof ValueImpl) {
+ ValueImpl that = (ValueImpl) other;
+ Type<?> type = propertyState.getType();
+ if (type.isArray()) {
+ type = type.getBaseType();
+ }
+ return type.tag() == that.propertyState.getType().tag()
+ && Objects.equal(
+ propertyState.getValue(type, index),
+ that.propertyState.getValue(type, that.index));
+ } else {
+ return false;
+ }
+ }
+
+ /**
+ * @see Object#hashCode()
+ */
+ @Override
+ public int hashCode() {
+ if (getType() == PropertyType.BINARY) {
+ return propertyState.getValue(Type.BINARY, index).hashCode();
+ } else {
+ return getOakString().hashCode();
+ }
+ }
+
+ @Override
+ public String toString() {
+ return getOakString();
+ }
+
}
\ No newline at end of file
