diff options
Diffstat (limited to 'lang/java/src/com')
325 files changed, 1919 insertions, 481 deletions
diff --git a/lang/java/src/com/sleepycat/bind/ByteArrayBinding.java b/lang/java/src/com/sleepycat/bind/ByteArrayBinding.java index f2a09d61..9f562afb 100644 --- a/lang/java/src/com/sleepycat/bind/ByteArrayBinding.java +++ b/lang/java/src/com/sleepycat/bind/ByteArrayBinding.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2000, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/bind/EntityBinding.java b/lang/java/src/com/sleepycat/bind/EntityBinding.java index c1cca90b..3ee907d1 100644 --- a/lang/java/src/com/sleepycat/bind/EntityBinding.java +++ b/lang/java/src/com/sleepycat/bind/EntityBinding.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2000, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/bind/EntryBinding.java b/lang/java/src/com/sleepycat/bind/EntryBinding.java index 7c2947cd..12c4cd35 100644 --- a/lang/java/src/com/sleepycat/bind/EntryBinding.java +++ b/lang/java/src/com/sleepycat/bind/EntryBinding.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2000, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/bind/RecordNumberBinding.java b/lang/java/src/com/sleepycat/bind/RecordNumberBinding.java index 6e88b490..b057b9c7 100644 --- a/lang/java/src/com/sleepycat/bind/RecordNumberBinding.java +++ b/lang/java/src/com/sleepycat/bind/RecordNumberBinding.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2000, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/bind/serial/ClassCatalog.java b/lang/java/src/com/sleepycat/bind/serial/ClassCatalog.java index 1b82cb1a..fecc416f 100644 --- a/lang/java/src/com/sleepycat/bind/serial/ClassCatalog.java +++ b/lang/java/src/com/sleepycat/bind/serial/ClassCatalog.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2000, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/bind/serial/SerialBase.java b/lang/java/src/com/sleepycat/bind/serial/SerialBase.java index 4af4b300..7ed383fd 100644 --- a/lang/java/src/com/sleepycat/bind/serial/SerialBase.java +++ b/lang/java/src/com/sleepycat/bind/serial/SerialBase.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2000, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/bind/serial/SerialBinding.java b/lang/java/src/com/sleepycat/bind/serial/SerialBinding.java index 04ab52b8..ea731a9f 100644 --- a/lang/java/src/com/sleepycat/bind/serial/SerialBinding.java +++ b/lang/java/src/com/sleepycat/bind/serial/SerialBinding.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2000, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/bind/serial/SerialInput.java b/lang/java/src/com/sleepycat/bind/serial/SerialInput.java index 23e493e6..8ee813a3 100644 --- a/lang/java/src/com/sleepycat/bind/serial/SerialInput.java +++ b/lang/java/src/com/sleepycat/bind/serial/SerialInput.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2000, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/bind/serial/SerialOutput.java b/lang/java/src/com/sleepycat/bind/serial/SerialOutput.java index a4113524..7e800a58 100644 --- a/lang/java/src/com/sleepycat/bind/serial/SerialOutput.java +++ b/lang/java/src/com/sleepycat/bind/serial/SerialOutput.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2000, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/bind/serial/SerialSerialBinding.java b/lang/java/src/com/sleepycat/bind/serial/SerialSerialBinding.java index bc3e3b6c..a04a04b0 100644 --- a/lang/java/src/com/sleepycat/bind/serial/SerialSerialBinding.java +++ b/lang/java/src/com/sleepycat/bind/serial/SerialSerialBinding.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2000, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/bind/serial/SerialSerialKeyCreator.java b/lang/java/src/com/sleepycat/bind/serial/SerialSerialKeyCreator.java index 350d8a1f..3c632d6d 100644 --- a/lang/java/src/com/sleepycat/bind/serial/SerialSerialKeyCreator.java +++ b/lang/java/src/com/sleepycat/bind/serial/SerialSerialKeyCreator.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2000, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/bind/serial/StoredClassCatalog.java b/lang/java/src/com/sleepycat/bind/serial/StoredClassCatalog.java index b751139e..1d66d94b 100644 --- a/lang/java/src/com/sleepycat/bind/serial/StoredClassCatalog.java +++ b/lang/java/src/com/sleepycat/bind/serial/StoredClassCatalog.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2000, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/bind/serial/TupleSerialBinding.java b/lang/java/src/com/sleepycat/bind/serial/TupleSerialBinding.java index ee618fa0..15512cd0 100644 --- a/lang/java/src/com/sleepycat/bind/serial/TupleSerialBinding.java +++ b/lang/java/src/com/sleepycat/bind/serial/TupleSerialBinding.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2000, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/bind/serial/TupleSerialKeyCreator.java b/lang/java/src/com/sleepycat/bind/serial/TupleSerialKeyCreator.java index 6f03b8ac..f059a759 100644 --- a/lang/java/src/com/sleepycat/bind/serial/TupleSerialKeyCreator.java +++ b/lang/java/src/com/sleepycat/bind/serial/TupleSerialKeyCreator.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2000, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/bind/serial/TupleSerialMarshalledBinding.java b/lang/java/src/com/sleepycat/bind/serial/TupleSerialMarshalledBinding.java index 0687d9ab..c7202049 100644 --- a/lang/java/src/com/sleepycat/bind/serial/TupleSerialMarshalledBinding.java +++ b/lang/java/src/com/sleepycat/bind/serial/TupleSerialMarshalledBinding.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2000, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/bind/serial/TupleSerialMarshalledKeyCreator.java b/lang/java/src/com/sleepycat/bind/serial/TupleSerialMarshalledKeyCreator.java index 23a97302..b571931f 100644 --- a/lang/java/src/com/sleepycat/bind/serial/TupleSerialMarshalledKeyCreator.java +++ b/lang/java/src/com/sleepycat/bind/serial/TupleSerialMarshalledKeyCreator.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2000, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/bind/tuple/BigDecimalBinding.java b/lang/java/src/com/sleepycat/bind/tuple/BigDecimalBinding.java index 98fd1407..fb15d7cd 100644 --- a/lang/java/src/com/sleepycat/bind/tuple/BigDecimalBinding.java +++ b/lang/java/src/com/sleepycat/bind/tuple/BigDecimalBinding.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2000, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/bind/tuple/BigIntegerBinding.java b/lang/java/src/com/sleepycat/bind/tuple/BigIntegerBinding.java index ddb66093..83cc651a 100644 --- a/lang/java/src/com/sleepycat/bind/tuple/BigIntegerBinding.java +++ b/lang/java/src/com/sleepycat/bind/tuple/BigIntegerBinding.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2000, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/bind/tuple/BooleanBinding.java b/lang/java/src/com/sleepycat/bind/tuple/BooleanBinding.java index daeede2a..d9afd62a 100644 --- a/lang/java/src/com/sleepycat/bind/tuple/BooleanBinding.java +++ b/lang/java/src/com/sleepycat/bind/tuple/BooleanBinding.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2000, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/bind/tuple/ByteBinding.java b/lang/java/src/com/sleepycat/bind/tuple/ByteBinding.java index ee02d9c1..5704489d 100644 --- a/lang/java/src/com/sleepycat/bind/tuple/ByteBinding.java +++ b/lang/java/src/com/sleepycat/bind/tuple/ByteBinding.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2000, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/bind/tuple/CharacterBinding.java b/lang/java/src/com/sleepycat/bind/tuple/CharacterBinding.java index 8aaea1cd..968638d6 100644 --- a/lang/java/src/com/sleepycat/bind/tuple/CharacterBinding.java +++ b/lang/java/src/com/sleepycat/bind/tuple/CharacterBinding.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2000, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/bind/tuple/DoubleBinding.java b/lang/java/src/com/sleepycat/bind/tuple/DoubleBinding.java index 4032a860..e4456a24 100644 --- a/lang/java/src/com/sleepycat/bind/tuple/DoubleBinding.java +++ b/lang/java/src/com/sleepycat/bind/tuple/DoubleBinding.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2000, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/bind/tuple/FloatBinding.java b/lang/java/src/com/sleepycat/bind/tuple/FloatBinding.java index bc78ca2b..d2e2babd 100644 --- a/lang/java/src/com/sleepycat/bind/tuple/FloatBinding.java +++ b/lang/java/src/com/sleepycat/bind/tuple/FloatBinding.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2000, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/bind/tuple/IntegerBinding.java b/lang/java/src/com/sleepycat/bind/tuple/IntegerBinding.java index 5d19b657..877b6457 100644 --- a/lang/java/src/com/sleepycat/bind/tuple/IntegerBinding.java +++ b/lang/java/src/com/sleepycat/bind/tuple/IntegerBinding.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2000, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/bind/tuple/LongBinding.java b/lang/java/src/com/sleepycat/bind/tuple/LongBinding.java index b9a15f9f..1674b2f9 100644 --- a/lang/java/src/com/sleepycat/bind/tuple/LongBinding.java +++ b/lang/java/src/com/sleepycat/bind/tuple/LongBinding.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2000, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/bind/tuple/MarshalledTupleEntry.java b/lang/java/src/com/sleepycat/bind/tuple/MarshalledTupleEntry.java index a089a116..3907327e 100644 --- a/lang/java/src/com/sleepycat/bind/tuple/MarshalledTupleEntry.java +++ b/lang/java/src/com/sleepycat/bind/tuple/MarshalledTupleEntry.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2000, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/bind/tuple/MarshalledTupleKeyEntity.java b/lang/java/src/com/sleepycat/bind/tuple/MarshalledTupleKeyEntity.java index 9fb48079..9a6591aa 100644 --- a/lang/java/src/com/sleepycat/bind/tuple/MarshalledTupleKeyEntity.java +++ b/lang/java/src/com/sleepycat/bind/tuple/MarshalledTupleKeyEntity.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2000, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/bind/tuple/PackedIntegerBinding.java b/lang/java/src/com/sleepycat/bind/tuple/PackedIntegerBinding.java index e45b0980..72a2272a 100644 --- a/lang/java/src/com/sleepycat/bind/tuple/PackedIntegerBinding.java +++ b/lang/java/src/com/sleepycat/bind/tuple/PackedIntegerBinding.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2000, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/bind/tuple/PackedLongBinding.java b/lang/java/src/com/sleepycat/bind/tuple/PackedLongBinding.java index c6989891..a84e3b5c 100644 --- a/lang/java/src/com/sleepycat/bind/tuple/PackedLongBinding.java +++ b/lang/java/src/com/sleepycat/bind/tuple/PackedLongBinding.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2000, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/bind/tuple/ShortBinding.java b/lang/java/src/com/sleepycat/bind/tuple/ShortBinding.java index 1ec33cfb..9be38578 100644 --- a/lang/java/src/com/sleepycat/bind/tuple/ShortBinding.java +++ b/lang/java/src/com/sleepycat/bind/tuple/ShortBinding.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2000, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/bind/tuple/SortedBigDecimalBinding.java b/lang/java/src/com/sleepycat/bind/tuple/SortedBigDecimalBinding.java index c5e4a2ea..5b732766 100644 --- a/lang/java/src/com/sleepycat/bind/tuple/SortedBigDecimalBinding.java +++ b/lang/java/src/com/sleepycat/bind/tuple/SortedBigDecimalBinding.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2000, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/bind/tuple/SortedDoubleBinding.java b/lang/java/src/com/sleepycat/bind/tuple/SortedDoubleBinding.java index 1de803bf..968296ff 100644 --- a/lang/java/src/com/sleepycat/bind/tuple/SortedDoubleBinding.java +++ b/lang/java/src/com/sleepycat/bind/tuple/SortedDoubleBinding.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2000, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/bind/tuple/SortedFloatBinding.java b/lang/java/src/com/sleepycat/bind/tuple/SortedFloatBinding.java index 671995aa..f863acb1 100644 --- a/lang/java/src/com/sleepycat/bind/tuple/SortedFloatBinding.java +++ b/lang/java/src/com/sleepycat/bind/tuple/SortedFloatBinding.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2000, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/bind/tuple/SortedPackedIntegerBinding.java b/lang/java/src/com/sleepycat/bind/tuple/SortedPackedIntegerBinding.java index 5e83166f..818ff127 100644 --- a/lang/java/src/com/sleepycat/bind/tuple/SortedPackedIntegerBinding.java +++ b/lang/java/src/com/sleepycat/bind/tuple/SortedPackedIntegerBinding.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2000, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/bind/tuple/SortedPackedLongBinding.java b/lang/java/src/com/sleepycat/bind/tuple/SortedPackedLongBinding.java index 0d91c471..f970d772 100644 --- a/lang/java/src/com/sleepycat/bind/tuple/SortedPackedLongBinding.java +++ b/lang/java/src/com/sleepycat/bind/tuple/SortedPackedLongBinding.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2000, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/bind/tuple/StringBinding.java b/lang/java/src/com/sleepycat/bind/tuple/StringBinding.java index be3b73cd..2523bdb3 100644 --- a/lang/java/src/com/sleepycat/bind/tuple/StringBinding.java +++ b/lang/java/src/com/sleepycat/bind/tuple/StringBinding.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2000, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/bind/tuple/TupleBase.java b/lang/java/src/com/sleepycat/bind/tuple/TupleBase.java index 30ecbb63..62cfc75d 100644 --- a/lang/java/src/com/sleepycat/bind/tuple/TupleBase.java +++ b/lang/java/src/com/sleepycat/bind/tuple/TupleBase.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2000, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/bind/tuple/TupleBinding.java b/lang/java/src/com/sleepycat/bind/tuple/TupleBinding.java index 2291c622..040ad4e8 100644 --- a/lang/java/src/com/sleepycat/bind/tuple/TupleBinding.java +++ b/lang/java/src/com/sleepycat/bind/tuple/TupleBinding.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2000, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/bind/tuple/TupleInput.java b/lang/java/src/com/sleepycat/bind/tuple/TupleInput.java index 33e65794..ce1d7a90 100644 --- a/lang/java/src/com/sleepycat/bind/tuple/TupleInput.java +++ b/lang/java/src/com/sleepycat/bind/tuple/TupleInput.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2000, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/bind/tuple/TupleInputBinding.java b/lang/java/src/com/sleepycat/bind/tuple/TupleInputBinding.java index ea78d4d0..96b73de3 100644 --- a/lang/java/src/com/sleepycat/bind/tuple/TupleInputBinding.java +++ b/lang/java/src/com/sleepycat/bind/tuple/TupleInputBinding.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2000, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/bind/tuple/TupleMarshalledBinding.java b/lang/java/src/com/sleepycat/bind/tuple/TupleMarshalledBinding.java index f9d6d838..87096f52 100644 --- a/lang/java/src/com/sleepycat/bind/tuple/TupleMarshalledBinding.java +++ b/lang/java/src/com/sleepycat/bind/tuple/TupleMarshalledBinding.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2000, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/bind/tuple/TupleOutput.java b/lang/java/src/com/sleepycat/bind/tuple/TupleOutput.java index 4ae0061c..2d3e7a8b 100644 --- a/lang/java/src/com/sleepycat/bind/tuple/TupleOutput.java +++ b/lang/java/src/com/sleepycat/bind/tuple/TupleOutput.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2000, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/bind/tuple/TupleTupleBinding.java b/lang/java/src/com/sleepycat/bind/tuple/TupleTupleBinding.java index d0c96ec0..31719f8f 100644 --- a/lang/java/src/com/sleepycat/bind/tuple/TupleTupleBinding.java +++ b/lang/java/src/com/sleepycat/bind/tuple/TupleTupleBinding.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2000, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/bind/tuple/TupleTupleKeyCreator.java b/lang/java/src/com/sleepycat/bind/tuple/TupleTupleKeyCreator.java index 8567f2a1..d3c33fb9 100644 --- a/lang/java/src/com/sleepycat/bind/tuple/TupleTupleKeyCreator.java +++ b/lang/java/src/com/sleepycat/bind/tuple/TupleTupleKeyCreator.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2000, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/bind/tuple/TupleTupleMarshalledBinding.java b/lang/java/src/com/sleepycat/bind/tuple/TupleTupleMarshalledBinding.java index 4f9826bd..c4ea0d98 100644 --- a/lang/java/src/com/sleepycat/bind/tuple/TupleTupleMarshalledBinding.java +++ b/lang/java/src/com/sleepycat/bind/tuple/TupleTupleMarshalledBinding.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2000, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/bind/tuple/TupleTupleMarshalledKeyCreator.java b/lang/java/src/com/sleepycat/bind/tuple/TupleTupleMarshalledKeyCreator.java index 1da91d7d..4ee81467 100644 --- a/lang/java/src/com/sleepycat/bind/tuple/TupleTupleMarshalledKeyCreator.java +++ b/lang/java/src/com/sleepycat/bind/tuple/TupleTupleMarshalledKeyCreator.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2000, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/collections/BaseIterator.java b/lang/java/src/com/sleepycat/collections/BaseIterator.java index 2a55a632..e794c310 100644 --- a/lang/java/src/com/sleepycat/collections/BaseIterator.java +++ b/lang/java/src/com/sleepycat/collections/BaseIterator.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2000, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/collections/BlockIterator.java b/lang/java/src/com/sleepycat/collections/BlockIterator.java index 60a3b3ba..26fc6c24 100644 --- a/lang/java/src/com/sleepycat/collections/BlockIterator.java +++ b/lang/java/src/com/sleepycat/collections/BlockIterator.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2000, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/collections/CurrentTransaction.java b/lang/java/src/com/sleepycat/collections/CurrentTransaction.java index 8119c264..15f8b89b 100644 --- a/lang/java/src/com/sleepycat/collections/CurrentTransaction.java +++ b/lang/java/src/com/sleepycat/collections/CurrentTransaction.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2000, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/collections/DataCursor.java b/lang/java/src/com/sleepycat/collections/DataCursor.java index a4ac6cdd..b43e784a 100644 --- a/lang/java/src/com/sleepycat/collections/DataCursor.java +++ b/lang/java/src/com/sleepycat/collections/DataCursor.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2000, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/collections/DataView.java b/lang/java/src/com/sleepycat/collections/DataView.java index f410b442..c6c4e6a6 100644 --- a/lang/java/src/com/sleepycat/collections/DataView.java +++ b/lang/java/src/com/sleepycat/collections/DataView.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2000, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/collections/MapEntryParameter.java b/lang/java/src/com/sleepycat/collections/MapEntryParameter.java index e5a3d644..2b906868 100644 --- a/lang/java/src/com/sleepycat/collections/MapEntryParameter.java +++ b/lang/java/src/com/sleepycat/collections/MapEntryParameter.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2000, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/collections/MyRangeCursor.java b/lang/java/src/com/sleepycat/collections/MyRangeCursor.java index c8e9498a..5141a69b 100644 --- a/lang/java/src/com/sleepycat/collections/MyRangeCursor.java +++ b/lang/java/src/com/sleepycat/collections/MyRangeCursor.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2000, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/collections/PrimaryKeyAssigner.java b/lang/java/src/com/sleepycat/collections/PrimaryKeyAssigner.java index 127d6064..76defe6c 100644 --- a/lang/java/src/com/sleepycat/collections/PrimaryKeyAssigner.java +++ b/lang/java/src/com/sleepycat/collections/PrimaryKeyAssigner.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2000, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/collections/StoredCollection.java b/lang/java/src/com/sleepycat/collections/StoredCollection.java index 3dcfcb9b..026944e5 100644 --- a/lang/java/src/com/sleepycat/collections/StoredCollection.java +++ b/lang/java/src/com/sleepycat/collections/StoredCollection.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2000, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/collections/StoredCollections.java b/lang/java/src/com/sleepycat/collections/StoredCollections.java index d7bd4fec..42620e16 100644 --- a/lang/java/src/com/sleepycat/collections/StoredCollections.java +++ b/lang/java/src/com/sleepycat/collections/StoredCollections.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2000, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/collections/StoredContainer.java b/lang/java/src/com/sleepycat/collections/StoredContainer.java index b63ac0de..3cee5a02 100644 --- a/lang/java/src/com/sleepycat/collections/StoredContainer.java +++ b/lang/java/src/com/sleepycat/collections/StoredContainer.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2000, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/collections/StoredEntrySet.java b/lang/java/src/com/sleepycat/collections/StoredEntrySet.java index 5134cb16..2c5103f9 100644 --- a/lang/java/src/com/sleepycat/collections/StoredEntrySet.java +++ b/lang/java/src/com/sleepycat/collections/StoredEntrySet.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2000, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/collections/StoredIterator.java b/lang/java/src/com/sleepycat/collections/StoredIterator.java index fc35d005..29d24ff1 100644 --- a/lang/java/src/com/sleepycat/collections/StoredIterator.java +++ b/lang/java/src/com/sleepycat/collections/StoredIterator.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2000, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/collections/StoredKeySet.java b/lang/java/src/com/sleepycat/collections/StoredKeySet.java index bc3864ad..c41aa87a 100644 --- a/lang/java/src/com/sleepycat/collections/StoredKeySet.java +++ b/lang/java/src/com/sleepycat/collections/StoredKeySet.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2000, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/collections/StoredList.java b/lang/java/src/com/sleepycat/collections/StoredList.java index 6e35167a..490687fc 100644 --- a/lang/java/src/com/sleepycat/collections/StoredList.java +++ b/lang/java/src/com/sleepycat/collections/StoredList.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2000, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/collections/StoredMap.java b/lang/java/src/com/sleepycat/collections/StoredMap.java index 1e9449a1..7224718c 100644 --- a/lang/java/src/com/sleepycat/collections/StoredMap.java +++ b/lang/java/src/com/sleepycat/collections/StoredMap.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2000, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/collections/StoredMapEntry.java b/lang/java/src/com/sleepycat/collections/StoredMapEntry.java index 0d60def4..23ea3499 100644 --- a/lang/java/src/com/sleepycat/collections/StoredMapEntry.java +++ b/lang/java/src/com/sleepycat/collections/StoredMapEntry.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2000, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/collections/StoredSortedEntrySet.java b/lang/java/src/com/sleepycat/collections/StoredSortedEntrySet.java index 4569a48d..438fa661 100644 --- a/lang/java/src/com/sleepycat/collections/StoredSortedEntrySet.java +++ b/lang/java/src/com/sleepycat/collections/StoredSortedEntrySet.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2000, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/collections/StoredSortedKeySet.java b/lang/java/src/com/sleepycat/collections/StoredSortedKeySet.java index 006e76c7..96957d52 100644 --- a/lang/java/src/com/sleepycat/collections/StoredSortedKeySet.java +++ b/lang/java/src/com/sleepycat/collections/StoredSortedKeySet.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2000, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/collections/StoredSortedMap.java b/lang/java/src/com/sleepycat/collections/StoredSortedMap.java index 8c57a876..5f3350b2 100644 --- a/lang/java/src/com/sleepycat/collections/StoredSortedMap.java +++ b/lang/java/src/com/sleepycat/collections/StoredSortedMap.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2000, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/collections/StoredSortedValueSet.java b/lang/java/src/com/sleepycat/collections/StoredSortedValueSet.java index 5c1bd9a0..d257fc22 100644 --- a/lang/java/src/com/sleepycat/collections/StoredSortedValueSet.java +++ b/lang/java/src/com/sleepycat/collections/StoredSortedValueSet.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2000, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/collections/StoredValueSet.java b/lang/java/src/com/sleepycat/collections/StoredValueSet.java index b8001b9a..99a93b71 100644 --- a/lang/java/src/com/sleepycat/collections/StoredValueSet.java +++ b/lang/java/src/com/sleepycat/collections/StoredValueSet.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2000, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/collections/TransactionRunner.java b/lang/java/src/com/sleepycat/collections/TransactionRunner.java index 08d27e97..99399d01 100644 --- a/lang/java/src/com/sleepycat/collections/TransactionRunner.java +++ b/lang/java/src/com/sleepycat/collections/TransactionRunner.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2000, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/collections/TransactionWorker.java b/lang/java/src/com/sleepycat/collections/TransactionWorker.java index 1cb47b1f..4aa1ec5f 100644 --- a/lang/java/src/com/sleepycat/collections/TransactionWorker.java +++ b/lang/java/src/com/sleepycat/collections/TransactionWorker.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2000, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/collections/TupleSerialFactory.java b/lang/java/src/com/sleepycat/collections/TupleSerialFactory.java index c732eeab..cb27859a 100644 --- a/lang/java/src/com/sleepycat/collections/TupleSerialFactory.java +++ b/lang/java/src/com/sleepycat/collections/TupleSerialFactory.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2000, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/collections/package.html b/lang/java/src/com/sleepycat/collections/package.html index 57d82c7a..3298e1e1 100644 --- a/lang/java/src/com/sleepycat/collections/package.html +++ b/lang/java/src/com/sleepycat/collections/package.html @@ -4,7 +4,7 @@ See the file LICENSE for redistribution information. - Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2002, 2015 Oracle. All rights reserved. --> diff --git a/lang/java/src/com/sleepycat/compat/DbCompat.java b/lang/java/src/com/sleepycat/compat/DbCompat.java index 427810a2..da4d19c8 100644 --- a/lang/java/src/com/sleepycat/compat/DbCompat.java +++ b/lang/java/src/com/sleepycat/compat/DbCompat.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2000, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ diff --git a/lang/java/src/com/sleepycat/db/BackupHandler.java b/lang/java/src/com/sleepycat/db/BackupHandler.java index 2d107d63..7e2f3ddb 100644 --- a/lang/java/src/com/sleepycat/db/BackupHandler.java +++ b/lang/java/src/com/sleepycat/db/BackupHandler.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2011, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ diff --git a/lang/java/src/com/sleepycat/db/BackupOptions.java b/lang/java/src/com/sleepycat/db/BackupOptions.java index 3db723bc..ca1ebd93 100644 --- a/lang/java/src/com/sleepycat/db/BackupOptions.java +++ b/lang/java/src/com/sleepycat/db/BackupOptions.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2011, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ diff --git a/lang/java/src/com/sleepycat/db/BtreeCompressor.java b/lang/java/src/com/sleepycat/db/BtreeCompressor.java index d6c45851..6389c27c 100644 --- a/lang/java/src/com/sleepycat/db/BtreeCompressor.java +++ b/lang/java/src/com/sleepycat/db/BtreeCompressor.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2001, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ diff --git a/lang/java/src/com/sleepycat/db/BtreePrefixCalculator.java b/lang/java/src/com/sleepycat/db/BtreePrefixCalculator.java index 4d8c0c76..fcb2c69a 100644 --- a/lang/java/src/com/sleepycat/db/BtreePrefixCalculator.java +++ b/lang/java/src/com/sleepycat/db/BtreePrefixCalculator.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2001, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ diff --git a/lang/java/src/com/sleepycat/db/BtreeStats.java b/lang/java/src/com/sleepycat/db/BtreeStats.java index 27d6a089..abd83934 100644 --- a/lang/java/src/com/sleepycat/db/BtreeStats.java +++ b/lang/java/src/com/sleepycat/db/BtreeStats.java @@ -4,7 +4,7 @@ * * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. */ package com.sleepycat.db; @@ -114,6 +114,14 @@ public class BtreeStats extends DatabaseStats { return bt_minkey; } + private int bt_nblobs; + /** + The number of blob records. + */ + public int getNumBlobs() { + return bt_nblobs; + } + private int bt_re_len; /** The length of fixed-length records. @@ -265,6 +273,7 @@ was not configured by the {@link com.sleepycat.db.StatsConfig#setFast StatsConfi + "\n bt_pagecnt=" + bt_pagecnt + "\n bt_pagesize=" + bt_pagesize + "\n bt_minkey=" + bt_minkey + + "\n bt_nblobs=" + bt_nblobs + "\n bt_re_len=" + bt_re_len + "\n bt_re_pad=" + bt_re_pad + "\n bt_levels=" + bt_levels diff --git a/lang/java/src/com/sleepycat/db/CacheFile.java b/lang/java/src/com/sleepycat/db/CacheFile.java index b459974d..c7da1ae7 100644 --- a/lang/java/src/com/sleepycat/db/CacheFile.java +++ b/lang/java/src/com/sleepycat/db/CacheFile.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2001, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ diff --git a/lang/java/src/com/sleepycat/db/CacheFilePriority.java b/lang/java/src/com/sleepycat/db/CacheFilePriority.java index 1f4a3d2a..88923f66 100644 --- a/lang/java/src/com/sleepycat/db/CacheFilePriority.java +++ b/lang/java/src/com/sleepycat/db/CacheFilePriority.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ diff --git a/lang/java/src/com/sleepycat/db/CacheFileStats.java b/lang/java/src/com/sleepycat/db/CacheFileStats.java index 5748420f..82b30ba0 100644 --- a/lang/java/src/com/sleepycat/db/CacheFileStats.java +++ b/lang/java/src/com/sleepycat/db/CacheFileStats.java @@ -4,7 +4,7 @@ * * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. */ package com.sleepycat.db; @@ -73,7 +73,7 @@ public class CacheFileStats { } private long st_backup_spins; - /** TODO */ + /** Spins while trying to back up the file. */ public long getBackupSpins() { return st_backup_spins; } diff --git a/lang/java/src/com/sleepycat/db/CacheStats.java b/lang/java/src/com/sleepycat/db/CacheStats.java index c41fdab4..efe0ced1 100644 --- a/lang/java/src/com/sleepycat/db/CacheStats.java +++ b/lang/java/src/com/sleepycat/db/CacheStats.java @@ -4,7 +4,7 @@ * * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. */ package com.sleepycat.db; @@ -267,7 +267,7 @@ public class CacheStats { private long st_region_nowait; /** The number of times that a thread of control was able to obtain a - region lock without waiting. + cache region mutex without waiting. */ public long getRegionNowait() { return st_region_nowait; @@ -276,7 +276,7 @@ public class CacheStats { private long st_region_wait; /** The number of times that a thread of control was forced to wait - before obtaining a region lock. + before obtaining a cache region mutex. */ public long getRegionWait() { return st_region_wait; @@ -306,6 +306,14 @@ public class CacheStats { return st_mvcc_freed; } + private long st_mvcc_reused; + /** + Number of outdated intermediate versions reused. + */ + public long getMultiversionReused() { + return st_mvcc_reused; + } + private long st_alloc; /** Number of page allocations. @@ -362,6 +370,18 @@ public class CacheStats { return st_sync_interrupted; } + private int st_oddfsize_detect; + /** TODO */ + /* package */ int getOddfSizeDetect() { + return st_oddfsize_detect; + } + + private int st_oddfsize_resolve; + /** TODO */ + /* package */ int getOddfSizeResolve() { + return st_oddfsize_resolve; + } + private long st_regsize; /** Individual cache size. @@ -371,7 +391,7 @@ public class CacheStats { } private long st_regmax; - /** The max size of the mutex region size. */ + /** The maximum size, in bytes, of the mutex region. */ public long getRegmax() { return st_regmax; } @@ -417,6 +437,7 @@ public class CacheStats { + "\n st_mvcc_frozen=" + st_mvcc_frozen + "\n st_mvcc_thawed=" + st_mvcc_thawed + "\n st_mvcc_freed=" + st_mvcc_freed + + "\n st_mvcc_reused=" + st_mvcc_reused + "\n st_alloc=" + st_alloc + "\n st_alloc_buckets=" + st_alloc_buckets + "\n st_alloc_max_buckets=" + st_alloc_max_buckets diff --git a/lang/java/src/com/sleepycat/db/CheckpointConfig.java b/lang/java/src/com/sleepycat/db/CheckpointConfig.java index 7b69bad5..bd89238f 100644 --- a/lang/java/src/com/sleepycat/db/CheckpointConfig.java +++ b/lang/java/src/com/sleepycat/db/CheckpointConfig.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ diff --git a/lang/java/src/com/sleepycat/db/CompactConfig.java b/lang/java/src/com/sleepycat/db/CompactConfig.java index 4909e89c..8332e569 100644 --- a/lang/java/src/com/sleepycat/db/CompactConfig.java +++ b/lang/java/src/com/sleepycat/db/CompactConfig.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ diff --git a/lang/java/src/com/sleepycat/db/CompactStats.java b/lang/java/src/com/sleepycat/db/CompactStats.java index f084340c..84dee7da 100644 --- a/lang/java/src/com/sleepycat/db/CompactStats.java +++ b/lang/java/src/com/sleepycat/db/CompactStats.java @@ -4,7 +4,7 @@ * * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. */ package com.sleepycat.db; @@ -41,7 +41,9 @@ public class CompactStats { } private int compact_empty_buckets; - /** The number of empty hash buckets that were found the compaction phase. */ + /** + The number of empty hash buckets that were found the compaction phase. + */ public int getEmptyBuckets() { return compact_empty_buckets; } @@ -64,7 +66,8 @@ public class CompactStats { private int compact_levels; /** - The number of levels removed from the Btree or Recno database during the compaction phase. + The number of levels removed from the Btree or Recno database during the + compaction phase. */ public int getLevels() { return compact_levels; @@ -99,16 +102,12 @@ public class CompactStats { */ public String toString() { return "CompactStats:" - + "\n compact_fillpercent=" + compact_fillpercent - + "\n compact_timeout=" + compact_timeout - + "\n compact_pages=" + compact_pages + "\n compact_empty_buckets=" + compact_empty_buckets + "\n compact_pages_free=" + compact_pages_free + "\n compact_pages_examine=" + compact_pages_examine + "\n compact_levels=" + compact_levels + "\n compact_deadlock=" + compact_deadlock + "\n compact_pages_truncated=" + compact_pages_truncated - + "\n compact_truncate=" + compact_truncate ; } } diff --git a/lang/java/src/com/sleepycat/db/Cursor.java b/lang/java/src/com/sleepycat/db/Cursor.java index 56463a4b..7402a06a 100644 --- a/lang/java/src/com/sleepycat/db/Cursor.java +++ b/lang/java/src/com/sleepycat/db/Cursor.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ @@ -1202,4 +1202,24 @@ deadlock. dbc.set_priority(priority.getFlag()); } + + /** + Return a database stream pointing to a key/data pair where the data item + is a blob. + <p> + @param config + The database stream attributes. If null, default attributes are used. + <p> + @return + A database stream. + <p> + @throws DatabaseException if the data item is not a blob. + */ + public DatabaseStream openDatabaseStream(DatabaseStreamConfig config) + throws DatabaseException { + + return new DatabaseStream(this, DatabaseStreamConfig.checkNull( + config).openDatabaseStream(dbc), config); + } + } diff --git a/lang/java/src/com/sleepycat/db/CursorConfig.java b/lang/java/src/com/sleepycat/db/CursorConfig.java index 61465095..179c1bfe 100644 --- a/lang/java/src/com/sleepycat/db/CursorConfig.java +++ b/lang/java/src/com/sleepycat/db/CursorConfig.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ diff --git a/lang/java/src/com/sleepycat/db/Database.java b/lang/java/src/com/sleepycat/db/Database.java index c0060300..059b9cb2 100644 --- a/lang/java/src/com/sleepycat/db/Database.java +++ b/lang/java/src/com/sleepycat/db/Database.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ @@ -365,6 +365,14 @@ it will be closed when the environment handle that owns the database handle is c DbConstants.DB_TXN_NOSYNC : 0) : 0); } + private java.io.File getBlobSubDir() + throws DatabaseException { + String blobDirStr = db.get_blob_sub_dir(); + if (blobDirStr != null) + return (new java.io.File(blobDirStr)); + return null; + } + /** Return the database's underlying file name. <p> @@ -1311,6 +1319,28 @@ from the {@link com.sleepycat.db.Environment#beginCDSGroup Environment.beginCDSG } /** + Print database statistics to a specified output channel (see the + setMsgfile() method for more information), or passed to an application + callback function (see the setMsgcall() method for more information). + <p> + @param config + The statistics returned; if null, default statistics are returned. + <p> + @return + A non-zero error value on failure and 0 on success. + <p> + @throws DeadlockException if the operation was selected to resolve a + deadlock. + <p> + @throws DatabaseException if a failure occurs. + */ + public int printStats(StatsConfig config) + throws DatabaseException { + + return db.stat_print(StatsConfig.checkNull(config).getFlags()); + } + + /** <p> Remove the database specified by the file and database parameters. <p> @@ -1360,7 +1390,8 @@ The database to be removed. DatabaseConfig config) throws DatabaseException, java.io.FileNotFoundException { - final Db db = DatabaseConfig.checkNull(config).createDatabase(null); + final Db db = DatabaseConfig.DEFAULT.createDatabase(null); + DatabaseConfig.checkNull(config).configureDatabase(db, DatabaseConfig.DEFAULT); db.remove(fileName, databaseName, 0); } @@ -1637,7 +1668,26 @@ or failure. throws DatabaseException, java.io.FileNotFoundException { final Db db = DatabaseConfig.checkNull(dbConfig).createDatabase(null); + /* Configure db with dbConfig */ + dbConfig.configureDatabase(db, DatabaseConfig.DEFAULT); return db.verify(fileName, databaseName, dumpStream, VerifyConfig.checkNull(verifyConfig).getFlags()); } + + /** + Sets the path of a file to store statistical information. + <p> + @param file + The path of a file to store statistical information. + <p> + @throws DatabaseException if a failure occurs. + */ + public void setMsgfile(java.io.File file) throws DatabaseException { + if (file != null) { + db.set_msgfile(file.toString()); + } + else { + db.set_msgfile(null); + } + } } diff --git a/lang/java/src/com/sleepycat/db/DatabaseConfig.java b/lang/java/src/com/sleepycat/db/DatabaseConfig.java index 76f54e24..bf8da94e 100644 --- a/lang/java/src/com/sleepycat/db/DatabaseConfig.java +++ b/lang/java/src/com/sleepycat/db/DatabaseConfig.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ @@ -36,6 +36,8 @@ public class DatabaseConfig implements Cloneable { /* Parameters */ private DatabaseType type = DatabaseType.UNKNOWN; private int mode = 0644; + private java.io.File blobDir = null; + private int blobThreshold = 0; private int btMinKey = 0; private int byteOrder = 0; private long cacheSize = 0L; @@ -48,6 +50,8 @@ public class DatabaseConfig implements Cloneable { private long heapSize = 0L; private int heapRegionSize = 0; private java.io.OutputStream messageStream = null; + private java.io.File msgfile = null; + private String msgfileStr = null; private Boolean noWaitDbExclusiveLock = null; private int pageSize = 0; private java.io.File[] partitionDirs = null; @@ -140,6 +144,70 @@ True if the {@link com.sleepycat.db.Environment#openDatabase Environment.openDat } /** + Sets the path of a directory where blobs are stored. + <p> + If the database is opened within an environment, this path setting is + ignored in + {@link com.sleepycat.db.Environment#openDatabase Environment.openDatabase}. + Use {@link com.sleepycat.db.Database#getConfig Database.getConfig} and + {@link com.sleepycat.db.DatabaseConfig#getBlobDir DatabaseConfig.getBlobDir} + to identify the current storage location of blobs after opening + the database. + <p> + This path can not be set after opening the database. + <p> + @param dir + The path of a directory where blobs are stored. + */ + public void setBlobDir(java.io.File dir) { + this.blobDir = dir; + } + + /** + Returns the path of a directory where blobs are stored. + <p> + @return + The path of a directory where blobs are stored. + */ + public java.io.File getBlobDir() { + return blobDir; + } + + /** + Set the size in bytes which is used to determine when a data item will be + stored as a blob. + <p> + Any data item that is equal to or larger in size than the + threshold value will automatically be stored as a blob. + <p> + It is illegal to enable blob in the database which is configured + as in-memory database or with chksum, encryption, duplicates, sorted + duplicates, compression, multiversion concurrency control and + transactional read operations with degree 1 isolation. + <p> + This threshold value can not be set after opening the database. + <p> + @param value + The size in bytes which is used to determine when a data item will be + stored as a blob. If 0, blob will be never used by the database. + */ + public void setBlobThreshold(int value) { + this.blobThreshold = value; + } + + /** + Return the threshold value in bytes beyond which data items are + stored as blobs. + <p> + @return + The threshold value in bytes beyond which data items are + stored as blobs. If 0, blob is not used by the database. + */ + public int getBlobThreshold() { + return blobThreshold; + } + + /** By default, a byte by byte lexicographic comparison is used for btree keys. To customize the comparison, supply a different Comparator. @@ -1044,6 +1112,22 @@ The function to be called with an informational message. } /** +Sets the path of a file to store statistical information. +<p> +This method may be called at any time during the life of the application. +<p> +@param file +The path of a file to store statistical information. + */ + public void setMsgfile(java.io.File file) { + this.msgfile = file; + if (file != null) + this.msgfileStr = file.toString(); + else + this.msgfileStr = null; + } + + /** Set an OutputStream for displaying informational messages. <p> There are interfaces in the Berkeley DB library which either directly @@ -1323,10 +1407,30 @@ The number of partitions that will be created. <p> @param keys A MultipleDatabaseEntry that contains the boundary keys for partitioning. +<p> +@throws IllegalArgumentException if parts is not equal to the size of key array plus 1. */ public void setPartitionByRange(int parts, MultipleDataEntry keys) { + if (keys == null || keys.getSize() == 0) + this.partitionKeys = null; + else { + // Get the number of items from the input keys + MultipleDataEntry keysmulti = new MultipleDataEntry(); + keysmulti.setData(keys.getData()); + keysmulti.setUserBuffer(keys.getData().length, true); + DatabaseEntry keyElement = new DatabaseEntry(); + int cnt = 0; + while(keysmulti.next(keyElement)) + cnt++; + // Ensure the size of key array equal to parts minus 1 + if (cnt != (parts - 1)) + throw new IllegalArgumentException("parts!=(key number-1)."); + else if (cnt == 0) + this.partitionKeys = null; + else + this.partitionKeys = keys; + } this.partitionParts = parts; - this.partitionKeys = keys; } /** @@ -2265,6 +2369,10 @@ database has been opened. if (dbFlags != 0) db.set_flags(dbFlags); + if (db.get_env().wrapper == null && blobDir != oldConfig.blobDir) + db.set_blob_dir(blobDir.toString()); + if (blobThreshold != oldConfig.blobThreshold) + db.set_blob_threshold(blobThreshold, 0); if (btMinKey != oldConfig.btMinKey) db.set_bt_minkey(btMinKey); if (byteOrder != oldConfig.byteOrder) @@ -2289,6 +2397,8 @@ database has been opened. db.set_heap_regionsize(heapRegionSize); if (messageStream != oldConfig.messageStream) db.set_message_stream(messageStream); + if (msgfile != oldConfig.msgfile) + db.set_msgfile(msgfile.toString()); if (pageSize != oldConfig.pageSize) db.set_pagesize(pageSize); @@ -2372,6 +2482,10 @@ database has been opened. unsortedDuplicates = !sortedDuplicates && ((dbFlags & DbConstants.DB_DUP) != 0); transactionNotDurable = (dbFlags & DbConstants.DB_TXN_NOT_DURABLE) != 0; + String blobDirStr = db.get_blob_dir(); + if (blobDirStr != null) + blobDir = new java.io.File(blobDirStr); + blobThreshold = db.get_blob_threshold(); if (type == DatabaseType.BTREE) { btMinKey = db.get_bt_minkey(); } @@ -2391,6 +2505,9 @@ database has been opened. heapRegionSize = db.get_heap_regionsize(); } messageStream = db.get_message_stream(); + if (msgfileStr != null) + msgfile = new java.io.File(msgfileStr); + pageSize = db.get_pagesize(); // Not available by design password = ((dbFlags & DbConstants.DB_ENCRYPT) != 0) ? "" : null; diff --git a/lang/java/src/com/sleepycat/db/DatabaseEntry.java b/lang/java/src/com/sleepycat/db/DatabaseEntry.java index 015917d6..69dfcdb6 100644 --- a/lang/java/src/com/sleepycat/db/DatabaseEntry.java +++ b/lang/java/src/com/sleepycat/db/DatabaseEntry.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ @@ -212,6 +212,29 @@ public class DatabaseEntry { */ /** + Configure this DatabaseEntry to be stored as a blob. + <p> + @param blob + Whether this DatabaseEntry is configured to be stored as a blob. + */ + public void setBlob(final boolean blob) { + if (blob) + flags |= DbConstants.DB_DBT_BLOB; + else + flags &= ~DbConstants.DB_DBT_BLOB; + } + + /** + Return whether this DatabaseEntry is configured to be stored as a blob. + <p> + @return + Whether this DatabaseEntry is configured to be stored as a blob. + */ + public boolean getBlob() { + return (flags & DbConstants.DB_DBT_BLOB) != 0; + } + + /** Return the byte array. <p> For a DatabaseEntry that is used as an output parameter, the byte diff --git a/lang/java/src/com/sleepycat/db/DatabaseException.java b/lang/java/src/com/sleepycat/db/DatabaseException.java index 419dd3df..34188fce 100644 --- a/lang/java/src/com/sleepycat/db/DatabaseException.java +++ b/lang/java/src/com/sleepycat/db/DatabaseException.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 1997, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ diff --git a/lang/java/src/com/sleepycat/db/DatabaseStats.java b/lang/java/src/com/sleepycat/db/DatabaseStats.java index dc3a42c0..5553bb93 100644 --- a/lang/java/src/com/sleepycat/db/DatabaseStats.java +++ b/lang/java/src/com/sleepycat/db/DatabaseStats.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 1997, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ diff --git a/lang/java/src/com/sleepycat/db/DatabaseStream.java b/lang/java/src/com/sleepycat/db/DatabaseStream.java new file mode 100644 index 00000000..add27405 --- /dev/null +++ b/lang/java/src/com/sleepycat/db/DatabaseStream.java @@ -0,0 +1,159 @@ +/*- + * See the file LICENSE for redistribution information. + * + * Copyright (c) 2013, 2015 Oracle and/or its affiliates. All rights reserved. + * + * $Id$ + */ + +package com.sleepycat.db; + +import com.sleepycat.db.internal.DbConstants; +import com.sleepycat.db.internal.DbStream; + +/** +A database stream. The database stream is used to access the blob. +<p> +Once the database stream close method has been called, the handle may not +be accessed again. +<p> +To obtain a database stream with default attributes: +<blockquote><pre> + DatabaseStream dbs = myCursor.openDatabaseStream(null); +</pre></blockquote> +To customize the attributes of a database stream, +use a DatabaseStreamConfig object. +<blockquote><pre> + DatabaseStreamConfig config = new DatabaseStreamConfig(); + config.setReadOnly(true); + DatabaseStream dbs = myCursor.openDatabaseStream(config); +</pre></blockquote> +*/ +public class DatabaseStream { + /* package */ DbStream dbs; + /* package */ Cursor cursor; + /* package */ DatabaseStreamConfig config; + + protected DatabaseStream( + final Cursor cursor, final DatabaseStreamConfig config) { + this.cursor = cursor; + this.config = config; + } + + DatabaseStream(final Cursor cursor, + final DbStream dbs, final DatabaseStreamConfig config) + throws DatabaseException { + + this.cursor = cursor; + this.dbs = dbs; + this.config = config; + } + + /** + Discard the database stream. + <p> + After the close method has been called, you cannot use the database stream + handle again. + <p> + It is recommended to always close all database stream handles immediately + after their use to release resources. + <p> + @throws DatabaseException if a failure occurs. + */ + public synchronized void close() + throws DatabaseException { + + if (dbs != null) { + try { + dbs.close(0); + } finally { + dbs = null; + } + } + } + + /** + Return this database stream configuration. + <p> + @return + This database stream configuration. + <p> + @throws DatabaseException if a failure occurs. + */ + public DatabaseStreamConfig getConfig() { + return config; + } + + /** + Return the {@link com.sleepycat.db.Cursor Cursor} handle associated + with this database stream. + <p> + @return + The cursor handle associated with this database stream. + */ + public Cursor getCursor() { + return cursor; + } + + /** + Read from the blob accessed by this database stream. + <p> + @throws IllegalArgumentException if a failure occurs. + <p> + @param data the data read from the blob + returned as output. Its byte array does not need to be initialized by the + caller. + <p> + @param offset the position in bytes in the blob where the reading starts. + <p> + @param size the number of bytes to read. + <p> + @return {@link com.sleepycat.db.OperationStatus#SUCCESS OperationStatus.SUCCESS} + if the operation succeeds. + <p> + @throws IllegalArgumentException if the operation fails. + <p> + @throws DatabaseException if a failure occurs. + */ + public OperationStatus read(final DatabaseEntry data, long offset, int size) + throws DatabaseException, IllegalArgumentException { + + return OperationStatus.fromInt( + dbs.read(data, offset, size, 0)); + } + + /** + Return the size in bytes of the blob accessed by the database stream. + <p> + @return + The size in bytes of the blob accessed by the database stream. + <p> + @throws DatabaseException if a failure occurs. + */ + public long size() + throws DatabaseException { + return dbs.size(0); + } + + /** + Write to the blob accessed by the database stream. + <p> + @param data the data {@link com.sleepycat.db.DatabaseEntry DatabaseEntry} + to write into the blob. + <p> + @param offset the position in bytes in the blob where the writing starts. + <p> + @return {@link com.sleepycat.db.OperationStatus#SUCCESS OperationStatus.SUCCESS} + if the operation succeeds. + <p> + @throws IllegalArgumentException if the operation fails. + <p> + @throws DatabaseException if a failure occurs. + */ + public OperationStatus write(final DatabaseEntry data, long offset) + throws DatabaseException, IllegalArgumentException { + + return OperationStatus.fromInt(dbs.write(data, offset, 0)); + } + +} diff --git a/lang/java/src/com/sleepycat/db/DatabaseStreamConfig.java b/lang/java/src/com/sleepycat/db/DatabaseStreamConfig.java new file mode 100644 index 00000000..f8f88033 --- /dev/null +++ b/lang/java/src/com/sleepycat/db/DatabaseStreamConfig.java @@ -0,0 +1,93 @@ +/*- + * See the file LICENSE for redistribution information. + * + * Copyright (c) 2013, 2015 Oracle and/or its affiliates. All rights reserved. + * + * $Id$ + */ + +package com.sleepycat.db; + +import com.sleepycat.db.internal.DbConstants; +import com.sleepycat.db.internal.DbStream; +import com.sleepycat.db.internal.Dbc; + +/** +Specify the attributes of database stream. An instance created with the +default constructor is initialized with the system's default settings. +*/ +public class DatabaseStreamConfig implements Cloneable { + private boolean readOnly = false; + private boolean readOnlyIsSet = false; + private boolean syncPerWrite = false; + + /** + Default configuration used if null is passed to methods that create a + database stream. + */ + public static final DatabaseStreamConfig DEFAULT = + new DatabaseStreamConfig(); + + /* package */ + static DatabaseStreamConfig checkNull(DatabaseStreamConfig config) { + return (config == null) ? DEFAULT : config; + } + + /** + Configure the database stream as read only. + <p> + @param readOnly + If true, configure the database stream to read only. + */ + public void setReadOnly(final boolean readOnly) { + this.readOnlyIsSet = true; + this.readOnly = readOnly; + } + + /** + Return true if the database stream is read only. + <p> + @return + true if the database stream is configured to read only. + */ + public boolean getReadOnly() { + return readOnly; + } + + /** + Configure the database stream to sync the blob on each write. + <p> + @param syncPerWrite + If true, configure the database stream to sync the blob on + each write. + */ + public void setSyncPerWrite(final boolean syncPerWrite) { + this.syncPerWrite = syncPerWrite; + } + + /** + Return if the database stream is configured to sync the blob + on each write. + <p> + @return + true if the database stream is configured to sync the blob + on each write, and false otherwise. + */ + public boolean getSyncPerWrite() { + return syncPerWrite; + } + + /* package */ + DbStream openDatabaseStream(final Dbc dbc) + throws DatabaseException { + + int flags = 0; + if (readOnlyIsSet) + flags |= readOnly ? DbConstants.DB_STREAM_READ : + DbConstants.DB_STREAM_WRITE; + if (syncPerWrite) + flags |= DbConstants.DB_STREAM_SYNC_WRITE; + return dbc.db_stream(flags); + } + +} diff --git a/lang/java/src/com/sleepycat/db/DatabaseType.java b/lang/java/src/com/sleepycat/db/DatabaseType.java index 8b3669f8..ffc905de 100644 --- a/lang/java/src/com/sleepycat/db/DatabaseType.java +++ b/lang/java/src/com/sleepycat/db/DatabaseType.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ diff --git a/lang/java/src/com/sleepycat/db/DeadlockException.java b/lang/java/src/com/sleepycat/db/DeadlockException.java index 63d04629..1079fb85 100644 --- a/lang/java/src/com/sleepycat/db/DeadlockException.java +++ b/lang/java/src/com/sleepycat/db/DeadlockException.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 1999, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ diff --git a/lang/java/src/com/sleepycat/db/Environment.java b/lang/java/src/com/sleepycat/db/Environment.java index 21934527..6037d216 100644 --- a/lang/java/src/com/sleepycat/db/Environment.java +++ b/lang/java/src/com/sleepycat/db/Environment.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ @@ -156,9 +156,8 @@ public class Environment { Close the database environment, freeing any allocated resources and closing any underlying subsystems. <p> - This function has verify similar - behavior as Environment.close(), except the following: - When each open database handle is closed, the database is synchronized. + This function is similar to Environment.close(), except that + each open database is synchronized as it is closed. */ public void closeForceSync() throws DatabaseException { @@ -166,6 +165,33 @@ public class Environment { dbenv.close(DbConstants.DB_FORCESYNC); } + /** + Close the database environment, freeing any allocated resources and + closing any underlying subsystems. + <p> + This function is similar to Environment.close(), except that + all memory mapped environment regions are synchronized as the + environment is closed. + */ + public void closeForceSyncEnv() + throws DatabaseException { + + dbenv.close(DbConstants.DB_FORCESYNCENV); + } + + /** + Close the database environment, freeing any allocated resources and + closing any underlying subsystems. + <p> + This function is similar to Environment.close(), except that + it has the effect of both closeForceSync() and closeForceSyncEnv(). + */ + public void closeForceSyncAndForceSyncEnv() + throws DatabaseException { + + dbenv.close(DbConstants.DB_FORCESYNC | DbConstants.DB_FORCESYNCENV); + } + /* package */ DbEnv unwrap() { return dbenv; @@ -1368,6 +1394,162 @@ performed using a specified {@link com.sleepycat.db.Environment Environment} han return dbenv.txn_stat(StatsConfig.checkNull(config).getFlags()); } + /* Statistics */ + /** + Print the cache subsystem statistical information to a specified output + channel (see the setMsgfile() method for more information), or passed to an + application callback function (see the setMsgcall() method for more + information). + <p> + @param config The statistics attributes. If null, default attributes are used. + <p> + @return A non-zero error value on failure and 0 on success. + <p> + <p> +@throws DatabaseException if a failure occurs. + */ + public int printMempStats(StatsConfig config) + throws DatabaseException { + + return dbenv.memp_stat_print(StatsConfig.checkNull(config).getFlags()); + } + + /** + Print the logging subsystem statistical information to a specified output + channel (see the setMsgfile() method for more information), or passed to an + application callback function (see the setMsgcall() method for more + information). + <p> + @param config The statistics attributes. If null, default attributes are used. + <p> + @return A non-zero error value on failure and 0 on success. + <p> + <p> +@throws DatabaseException if a failure occurs. + */ + public int printLogStats(StatsConfig config) + throws DatabaseException { + + return dbenv.log_stat_print(StatsConfig.checkNull(config).getFlags()); + } + + /** + Print the replication subsystem statistical information to a specified output + channel (see the setMsgfile() method for more information), or passed to an + application callback function (see the setMsgcall() method for more + information). + <p> + @param config The statistics attributes. If null, default attributes are used. + <p> + @return A non-zero error value on failure and 0 on success. + <p> + <p> +@throws DatabaseException if a failure occurs. + */ + public int printReplicationStats(StatsConfig config) + throws DatabaseException { + + return dbenv.rep_stat_print(StatsConfig.checkNull(config).getFlags()); + } + + /** + Print the Replication Manager subsystem statistical information to a + specified output channel (see the setMsgfile() method for more + information), or passed to an application callback function (see the + setMsgcall() method for more information). + <p> + @param config The statistics attributes. If null, default attributes are used. + <p> + @return A non-zero error value on failure and 0 on success. + <p> + <p> +@throws DatabaseException if a failure occurs. + */ + public int printReplicationManagerStats( + StatsConfig config) + throws DatabaseException { + + return dbenv.repmgr_stat_print(StatsConfig.checkNull(config).getFlags()); + } + + /** + Print the locking subsystem statistical information to a specified output + channel (see the setMsgfile() method for more information), or passed to an + application callback function (see the setMsgcall() method for more + information). + <p> + @param config The statistics attributes. If null, default attributes are used. + <p> + @return A non-zero error value on failure and 0 on success. + <p> + <p> +@throws DatabaseException if a failure occurs. + */ + public int printLockStats(StatsConfig config) + throws DatabaseException { + + return dbenv.lock_stat_print(StatsConfig.checkNull(config).getFlags()); + } + + /** + Print the mutex subsystem statistical information to a specified output + channel (see the setMsgfile() method for more information), or passed to an + application callback function (see the setMsgcall() method for more + information). + <p> + @param config The statistics attributes. If null, default attributes are used. + <p> + @return A non-zero error value on failure and 0 on success. + <p> + <p> +@throws DatabaseException if a failure occurs. + */ + public int printMutexStats(StatsConfig config) + throws DatabaseException { + + return dbenv.mutex_stat_print(StatsConfig.checkNull(config).getFlags()); + } + + /** + Print environment statistical information to a specified output + channel (see the setMsgfile() method for more information), or passed to an + application callback function (see the setMsgcall() method for more + information). + <p> + @param config The statistics attributes. If null, default attributes are used. + <p> + @return A non-zero error value on failure and 0 on success. + <p> + <p> +@throws DatabaseException if a failure occurs. + */ + public int printStats(StatsConfig config) + throws DatabaseException { + + return dbenv.stat_print(StatsConfig.checkNull(config).getFlags()); + } + + + /** + Print the transaction subsystem statistical information to a specified + output channel (see the setMsgfile() method for more information), or + passed to an application callback function (see the setMsgcall() method + for more information). + <p> + @param config The statistics attributes. If null, default attributes are used. + <p> + @return A non-zero error value on failure and 0 on success. + <p> + <p> +@throws DatabaseException if a failure occurs. + */ + public int printTransactionStats(StatsConfig config) + throws DatabaseException { + + return dbenv.txn_stat_print(StatsConfig.checkNull(config).getFlags()); + } + + /* Transaction management */ /** Allocate a locker ID in an environment configured for Berkeley DB @@ -1994,4 +2176,36 @@ The release patch number. to create channel to send messages only to the master site. */ public static final int EID_MASTER = DbConstants.DB_EID_MASTER; + + /** + Set the blob threshold size. + <p> + @param value + The blob threshold size. + <p> + Any data item that is equal to or larger in size than the + threshold value will automatically be stored as a blob file. + <p> + @throws DatabaseException if a failure occurs. + */ + public void setBlobThreshold(int value) throws DatabaseException { + dbenv.set_blob_threshold(value, 0); + } + + /** + Sets the path of a file to store statistical information. + <p> + @param file + The path of a file to store statistical information. + <p> + @throws DatabaseException if a failure occurs. + */ + public void setMsgfile(java.io.File file) throws DatabaseException { + if (file != null) { + dbenv.set_msgfile(file.toString()); + } + else { + dbenv.set_msgfile(null); + } + } } diff --git a/lang/java/src/com/sleepycat/db/EnvironmentConfig.java b/lang/java/src/com/sleepycat/db/EnvironmentConfig.java index d50fba5a..d87e907f 100644 --- a/lang/java/src/com/sleepycat/db/EnvironmentConfig.java +++ b/lang/java/src/com/sleepycat/db/EnvironmentConfig.java @@ -1,8 +1,7 @@ - /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ @@ -82,6 +81,9 @@ public class EnvironmentConfig implements Cloneable { private int backup_read_sleep = 0; private int backup_size = 0; private boolean backup_write_direct = false; + private int write_direct = 0; + private java.io.File blobDir = null; + private int blobThreshold = 0; private int cacheCount = 0; private long cacheSize = 0L; private long cacheMax = 0L; @@ -108,6 +110,8 @@ public class EnvironmentConfig implements Cloneable { private int maxWrite = 0; private long maxWriteSleep = 0L; private java.io.File metadataDir = null; + private java.io.File msgfile = null; + private String msgfileStr = null; private int mutexAlignment = 0; private int mutexIncrement = 0; private int mutexTestAndSetSpins = 0; @@ -132,6 +136,7 @@ public class EnvironmentConfig implements Cloneable { private java.io.File temporaryDirectory = null; private ReplicationManagerAckPolicy repmgrAckPolicy = ReplicationManagerAckPolicy.QUORUM; + private long repmgrIncomingQueueMax = 0; private java.util.Vector repmgrSitesConfig = new java.util.Vector(); /* Initial region resource allocation. */ @@ -170,7 +175,9 @@ public class EnvironmentConfig implements Cloneable { private boolean hotbackupInProgress = false; private boolean initializeRegions = false; private boolean logAutoRemove = false; + private boolean logBlobContent = false; private boolean logInMemory = false; + private boolean logNoSync = false; private boolean logZero = false; private boolean multiversion = false; private boolean noLocking = false; @@ -212,6 +219,8 @@ public class EnvironmentConfig implements Cloneable { private EventHandler eventHandler = null; private MessageHandler messageHandler = null; private PanicHandler panicHandler = null; + private boolean repViewIsSet = false; + private ReplicationViewHandler replicationViewHandler = null; private ReplicationTransport replicationTransport = null; /** @@ -247,6 +256,76 @@ True if the database environment is configured to create any } /** + Sets the path of a directory where blobs are stored. + <p> + The blobs of each {@link com.sleepycat.db.Database Database} opened + within this {@link com.sleepycat.db.Environment Environment} are + stored under this directory. + <p> + This path can not be set after opening the environment. + <p> + @param dir + The path of a directory where blobs are stored. + */ + public void setBlobDir(java.io.File dir) { + this.blobDir = dir; + } + + /** + Returns the path of a directory where blobs are stored. + <p> + The blobs of each {@link com.sleepycat.db.Database Database} opened + within this {@link com.sleepycat.db.Environment Environment} are + stored under this directory. + <p> + @return + The path of a directory where blobs are stored. + */ + public java.io.File getBlobDir() { + return blobDir; + } + + /** + Set the default blob threshold for databases opened in this environment. + The blob threshold is the size in bytes which is used to determine when + a data item will be stored as a blob. + <p> + Any data item that is equal to or larger in size than the + threshold value will automatically be stored as a blob. + <p> + It is illegal to enable blob in the environment if any of + {@link com.sleepycat.db.EnvironmentConfig#setTxnSnapshot EnvironmentConfig.setTxnSnapshot}, + {@link com.sleepycat.db.EnvironmentConfig#setInitializeReplication EnvironmentConfig.setInitializeReplication}, + and {@link com.sleepycat.db.EnvironmentConfig#setMultiversion EnvironmentConfig.setMultiversion} + is called with true value. + <p> + This threshold value can be set any time before and after opening the + environment. + <p> + @param value + The size in bytes which is used to determine when a data item will + be stored as a blob. If 0, databases opened in the environment will default + to never using blob. + */ + public void setBlobThreshold(int value) { + this.blobThreshold = value; + } + + /** + Return the environment wide default blob threshold value. The blob + threshold is the size in bytes which is used to determine when a data item + will be stored as a blob. + <p> + @return + The blob threshold value in bytes beyond which data items are + stored as blobs. If 0, databases opened in the environment will default to + never using blobs. + */ + public int getBlobThreshold() { + return blobThreshold; + } + + /** Set the size of the shared memory buffer pool, that is, the size of the cache. <p> @@ -1468,6 +1547,29 @@ True if the system has been configured to to automatically remove log } /** + Enable full logging of blob data. Required for HA and the hotbackup + utility. + <p> + @param logBlobContent + If true, enable full logging of blob data. + */ + public void setLogBlobContent(final boolean logBlobContent) { + this.logBlobContent = logBlobContent; + } + + /** + Return true if full logging of blob data is enabled. + <p> + This method may be called at any time during the life of the application. + <p> + @return + True if full logging of blob data is enabled. + */ + public boolean getLogBlobContent() { + return logBlobContent; + } + + /** If set, maintain transaction logs in memory rather than on disk. This means that transactions exhibit the ACI (atomicity, consistency, and isolation) properties, but not D (durability); that is, database integrity will be @@ -1515,6 +1617,36 @@ True if the database environment is configured to maintain transaction logs } /** + Configure the system to avoid fsync() calls during log file flushes. + <p> + Log nosync is only safe when recovery is not needed after a system crash. + If the system remains alive and the application crashes, the database will + be recoverable in that situation. + <p> + This method may not be called after the environment has been opened. + <p> + @param logNoSync + If true, configure the system to avoid fsync() calls during log file flushes. + */ + public void setLogNoSync(final boolean logNoSync) { + this.logNoSync = logNoSync; + } + + /** + Return true if the system has been configured to avoid fsync() calls during + log files during flushes. + <p> + This method may be called at any time during the life of the application. + <p> + @return + True if the system has been configured to avoid fsync() calls during log + files flushes. + */ + public boolean getLogNoSync() { + return logNoSync; + } + + /** Set a function to process application-specific log records. <p> This method configures only operations performed using a single a @@ -1728,6 +1860,35 @@ The handler for application-specific log records. return repmgrAckPolicy; } + /** + Set the maximum amount of dynamic memory used by the Replication Manager + incoming queue. + <p> + By default, the Replication Manager incoming queue size has a limit of 100MB. + If zero is specified, then the Replication Manager incoming queue size is + limited by available heap memory. + <p> + @param repmgrIncomingQueueMax + The maximum amount of dynamic memory used by the Replication Manager incoming queue. + */ + public void setReplicationManagerIncomingQueueMax( + final long repmgrIncomingQueueMax) + { + this.repmgrIncomingQueueMax = repmgrIncomingQueueMax; + } + + /** + Get the maximum amount of dynamic memory used by the Replication Manager + incoming queue. + <p> + @return + The maximum amount of dynamic memory used by the Replication Manager incoming queue. + */ + public long getReplicationManagerIncomingQueueMax() + { + return this.repmgrIncomingQueueMax; + } + /** Configure a site in a replication group. This could be called more than once, to set local site and remote sites. @@ -2325,6 +2486,22 @@ The an OutputStream for displaying informational messages. return mmapSize; } + /** + Sets the path of a file to store statistical information. + <p> + This method may be called at any time during the life of the application. + <p> + @param file + The path of a file to store statistical information. + */ + public void setMsgfile(java.io.File file) { + this.msgfile = file; + if (file != null) + this.msgfileStr = file.toString(); + else + this.msgfileStr = null; + } + /** Sets the page size used to allocate the hash table and the number of mutexes expected to be needed by the buffer pool. @@ -2623,6 +2800,37 @@ The function to be called if the database environment panics. } /** + Set the function to be used by replication views to determine whether a + database file is replicated to the local site. + <p> + @param repViewHandler + The function name to determine whether a database file is replicated. If + null, the replication view is a full view and all database files are + replicated to the local site. Otherwise it is a partial view and only some + database files are replicated to the local site. + */ + public void setReplicationView( + final ReplicationViewHandler repViewHandler) { + this.repViewIsSet = true; + this.replicationViewHandler = repViewHandler; + } + + /** + Return the function name used by replication views to determine whether + a database file is replicated to the local site. + <p> + @return + The function name used by replication views to determine whether a database + file is replicated to the local site. If null, the replication view is a + full view and all database files are replicated to the local site. + Otherwise it is a partial view and only some database files are replicated + to the local site. + */ + public ReplicationViewHandler getReplicationViewHandler() { + return this.replicationViewHandler; + } + + /** Configure the database environment to only be accessed by a single process (although that process may be multithreaded). <p> @@ -4433,9 +4641,15 @@ True if the system has been configured to yield the processor if (logAutoRemove != oldConfig.logAutoRemove) dbenv.log_set_config(DbConstants.DB_LOG_AUTO_REMOVE, logAutoRemove); + if (logBlobContent != oldConfig.logBlobContent) + dbenv.log_set_config(DbConstants.DB_LOG_BLOB, logBlobContent); + if (logInMemory != oldConfig.logInMemory) dbenv.log_set_config(DbConstants.DB_LOG_IN_MEMORY, logInMemory); + if (logNoSync != oldConfig.logNoSync) + dbenv.log_set_config(DbConstants.DB_LOG_NOSYNC, logNoSync); + if (logZero != oldConfig.logZero) dbenv.log_set_config(DbConstants.DB_LOG_ZERO, logZero); @@ -4499,10 +4713,44 @@ True if the system has been configured to yield the processor dbenv.set_msgcall(messageHandler); if (panicHandler != oldConfig.panicHandler) dbenv.set_paniccall(panicHandler); + /* + * Configure replication views for a new environment or an existing + * environment with the callback provided by the application. + * If the callback is set as null, the replication view is a full view + * and all database files are replicated to the local site. Otherwise + * it is a partial view and only some database files are replicated to + * the local site. + */ + if (repViewIsSet) + dbenv.rep_set_view(replicationViewHandler); if (replicationTransport != oldConfig.replicationTransport) dbenv.rep_set_transport(envid, replicationTransport); /* Other settings */ + + if (backup_read_count != 0) + dbenv.set_backup_config(DbConstants.DB_BACKUP_READ_COUNT, + backup_read_count); + + if (backup_read_sleep != 0) + dbenv.set_backup_config(DbConstants.DB_BACKUP_READ_SLEEP, + backup_read_sleep); + + if (backup_size != 0) { + dbenv.set_backup_config(DbConstants.DB_BACKUP_SIZE, + backup_size); + } + + if (backup_write_direct == true) + dbenv.set_backup_config(DbConstants.DB_BACKUP_WRITE_DIRECT, 1); + else + dbenv.set_backup_config(DbConstants.DB_BACKUP_WRITE_DIRECT, 0); + + if (blobDir != oldConfig.blobDir) + dbenv.set_blob_dir(blobDir.toString()); + if (blobThreshold != oldConfig.blobThreshold) + dbenv.set_blob_threshold(blobThreshold, 0); + if (cacheSize != oldConfig.cacheSize || cacheCount != oldConfig.cacheCount) dbenv.set_cachesize(cacheSize, cacheCount); @@ -4558,6 +4806,8 @@ True if the system has been configured to yield the processor dbenv.set_mp_pagesize(mpPageSize); if (mpTableSize != oldConfig.mpTableSize) dbenv.set_mp_tablesize(mpTableSize); + if (msgfile != oldConfig.msgfile) + dbenv.set_msgfile(msgfile.toString()); if (password != null) dbenv.set_encrypt(password, DbConstants.DB_ENCRYPT_AES); if (replicationClockskewFast != oldConfig.replicationClockskewFast || @@ -4622,6 +4872,8 @@ True if the system has been configured to yield the processor DbConstants.DB_REP_CONF_INMEM, replicationInMemory); if (repmgrAckPolicy != oldConfig.repmgrAckPolicy) dbenv.repmgr_set_ack_policy(repmgrAckPolicy.getId()); + if (repmgrIncomingQueueMax != oldConfig.repmgrIncomingQueueMax) + dbenv.repmgr_set_incoming_queue_max(repmgrIncomingQueueMax); java.util.Iterator elems = repmgrSitesConfig.listIterator(); java.util.Iterator oldElems = oldConfig.repmgrSitesConfig.listIterator(); while (elems.hasNext()){ @@ -4708,7 +4960,9 @@ True if the system has been configured to yield the processor directLogIO = dbenv.log_get_config(DbConstants.DB_LOG_DIRECT); dsyncLog = dbenv.log_get_config(DbConstants.DB_LOG_DSYNC); logAutoRemove = dbenv.log_get_config(DbConstants.DB_LOG_AUTO_REMOVE); + logBlobContent = dbenv.log_get_config(DbConstants.DB_LOG_BLOB); logInMemory = dbenv.log_get_config(DbConstants.DB_LOG_IN_MEMORY); + logNoSync = dbenv.log_get_config(DbConstants.DB_LOG_NOSYNC); logZero = dbenv.log_get_config(DbConstants.DB_LOG_ZERO); } @@ -4742,6 +4996,21 @@ True if the system has been configured to yield the processor // XXX: replicationTransport and envid aren't available? /* Other settings */ + backup_read_count = + dbenv.get_backup_config(DbConstants.DB_BACKUP_READ_COUNT); + backup_read_sleep = + dbenv.get_backup_config(DbConstants.DB_BACKUP_READ_SLEEP); + backup_size = + dbenv.get_backup_config(DbConstants.DB_BACKUP_SIZE); + write_direct = + dbenv.get_backup_config(DbConstants.DB_BACKUP_WRITE_DIRECT); + backup_write_direct = (write_direct == 1) ? true : false; + + String blobDirStr = dbenv.get_blob_dir(); + if (blobDirStr != null) + blobDir = new java.io.File(blobDirStr); + blobThreshold = dbenv.get_blob_threshold(); + if (initializeCache) { cacheSize = dbenv.get_cachesize(); cacheMax = dbenv.get_cache_max(); @@ -4802,6 +5071,8 @@ True if the system has been configured to yield the processor logRegionSize = 0; } messageStream = dbenv.get_message_stream(); + if (msgfileStr != null) + msgfile = new java.io.File(msgfileStr); // XXX: intentional information loss? password = (dbenv.get_encrypt_flags() == 0) ? null : ""; @@ -4846,10 +5117,12 @@ True if the system has been configured to yield the processor replicationRequestMax = dbenv.rep_get_request_max(); repmgrAckPolicy = ReplicationManagerAckPolicy.fromInt( dbenv.repmgr_get_ack_policy()); + repmgrIncomingQueueMax = dbenv.repmgr_get_incoming_queue_max(); } else { replicationLimit = 0L; replicationRequestMin = 0; replicationRequestMax = 0; + repmgrIncomingQueueMax = 0; } segmentId = dbenv.get_shm_key(); diff --git a/lang/java/src/com/sleepycat/db/ErrorHandler.java b/lang/java/src/com/sleepycat/db/ErrorHandler.java index 43fdb9de..4ef5b206 100644 --- a/lang/java/src/com/sleepycat/db/ErrorHandler.java +++ b/lang/java/src/com/sleepycat/db/ErrorHandler.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 1997, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ diff --git a/lang/java/src/com/sleepycat/db/EventHandler.java b/lang/java/src/com/sleepycat/db/EventHandler.java index a876a645..6bbdf20a 100644 --- a/lang/java/src/com/sleepycat/db/EventHandler.java +++ b/lang/java/src/com/sleepycat/db/EventHandler.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2000, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ @@ -50,6 +50,16 @@ public interface EventHandler { public void handlePanicEvent(); /** + A callback function to be called when a Replication automatic takeover + failed event is sent from the Berkeley DB library. + <p> + This event callback is received in a replication manager subordinate + process when it fails to take over as the replication process and + all replication manager threads in it are stopped unexpectedly. + */ + public void handleRepAutoTakeoverFailedEvent(); + + /** A callback function to be called when a Replication Client event is sent from the Berkeley DB library. <p> @@ -133,6 +143,15 @@ public interface EventHandler { A callback function to be called when an event is sent from the Berkeley DB library. <p> + This event callback is received when replication Mananger incoming queue + has reached its maximum threshold. + */ + public void handleRepInQueueFullEvent(); + + /** + A callback function to be called when an event is sent from the + Berkeley DB library. + <p> This event callback is received when the local site could not synchronize with the master because an internal initialization was required, but internal initialization has been turned off by the {@link com.sleepycat.db.ReplicationConfig#AUTOINIT ReplicationConfig.AUTOINIT} diff --git a/lang/java/src/com/sleepycat/db/EventHandlerAdapter.java b/lang/java/src/com/sleepycat/db/EventHandlerAdapter.java index ef563df9..c2ddabd7 100644 --- a/lang/java/src/com/sleepycat/db/EventHandlerAdapter.java +++ b/lang/java/src/com/sleepycat/db/EventHandlerAdapter.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2000, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ @@ -28,6 +28,11 @@ public abstract class EventHandlerAdapter implements EventHandler { */ public void handlePanicEvent() {} /** + See {@link com.sleepycat.db.EventHandler#handleRepAutoTakeoverFailedEvent EventHandler.handleRepAutoTakeoverFailedEvent} for details of this + callback. + */ + public void handleRepAutoTakeoverFailedEvent() {} + /** See {@link com.sleepycat.db.EventHandler#handleRepClientEvent EventHandler.handleRepClientEvent} for details of this callback. */ @@ -68,6 +73,11 @@ public abstract class EventHandlerAdapter implements EventHandler { */ public void handleRepInitDoneEvent() {} /** + see {@link com.sleepycat.db.EventHandler#handleRepInQueueFullEvent EventHandler.handleRepInQueueFullEvent}for details of this + callback. + */ + public void handleRepInQueueFullEvent() {} + /** See {@link com.sleepycat.db.EventHandler#handleRepJoinFailureEvent EventHandler.handleRepJoinFailureEvent} for details of this callback. */ diff --git a/lang/java/src/com/sleepycat/db/FeedbackHandler.java b/lang/java/src/com/sleepycat/db/FeedbackHandler.java index 63bec27d..2c8cabec 100644 --- a/lang/java/src/com/sleepycat/db/FeedbackHandler.java +++ b/lang/java/src/com/sleepycat/db/FeedbackHandler.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 1997, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ diff --git a/lang/java/src/com/sleepycat/db/ForeignKeyDeleteAction.java b/lang/java/src/com/sleepycat/db/ForeignKeyDeleteAction.java index 1bf66750..122b243d 100644 --- a/lang/java/src/com/sleepycat/db/ForeignKeyDeleteAction.java +++ b/lang/java/src/com/sleepycat/db/ForeignKeyDeleteAction.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ diff --git a/lang/java/src/com/sleepycat/db/ForeignKeyNullifier.java b/lang/java/src/com/sleepycat/db/ForeignKeyNullifier.java index 08174654..f55ffeaf 100644 --- a/lang/java/src/com/sleepycat/db/ForeignKeyNullifier.java +++ b/lang/java/src/com/sleepycat/db/ForeignKeyNullifier.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2008, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ diff --git a/lang/java/src/com/sleepycat/db/ForeignMultiKeyNullifier.java b/lang/java/src/com/sleepycat/db/ForeignMultiKeyNullifier.java index 71311de5..0b4b986b 100644 --- a/lang/java/src/com/sleepycat/db/ForeignMultiKeyNullifier.java +++ b/lang/java/src/com/sleepycat/db/ForeignMultiKeyNullifier.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2008, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ diff --git a/lang/java/src/com/sleepycat/db/HashStats.java b/lang/java/src/com/sleepycat/db/HashStats.java index b073904c..f33b82d3 100644 --- a/lang/java/src/com/sleepycat/db/HashStats.java +++ b/lang/java/src/com/sleepycat/db/HashStats.java @@ -4,7 +4,7 @@ * * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. */ package com.sleepycat.db; @@ -66,6 +66,14 @@ public class HashStats extends DatabaseStats { return hash_ndata; } + private int hash_nblobs; + /** + The number of blob records. + */ + public int getNumBlobs() { + return hash_nblobs; + } + private int hash_pagecnt; /** The number of pages in the database. @@ -94,7 +102,7 @@ public class HashStats extends DatabaseStats { private int hash_buckets; /** - The the number of hash buckets. + The number of hash buckets. */ public int getBuckets() { return hash_buckets; @@ -124,7 +132,8 @@ was not configured by the {@link com.sleepycat.db.StatsConfig#setFast StatsConfi private int hash_bigpages; /** - The number of big key/data pages. + The number of hash overflow pages (created when key/data is too big for + the page). <p> The information is only included if the {@link com.sleepycat.db.Database#getStats Database.getStats} call was not configured by the {@link com.sleepycat.db.StatsConfig#setFast StatsConfig.setFast} method. @@ -135,7 +144,7 @@ was not configured by the {@link com.sleepycat.db.StatsConfig#setFast StatsConfi private long hash_big_bfree; /** - The number of bytes free on big item pages. + The number of bytes free on hash overflow (big item) pages. <p> The information is only included if the {@link com.sleepycat.db.Database#getStats Database.getStats} call was not configured by the {@link com.sleepycat.db.StatsConfig#setFast StatsConfig.setFast} method. @@ -146,7 +155,8 @@ was not configured by the {@link com.sleepycat.db.StatsConfig#setFast StatsConfi private int hash_overflows; /** - The number of overflow pages. + The number of bucket overflow pages (bucket overflow pages are created when + items did not fit on the main bucket page). <p> The information is only included if the {@link com.sleepycat.db.Database#getStats Database.getStats} call was not configured by the {@link com.sleepycat.db.StatsConfig#setFast StatsConfig.setFast} method. @@ -157,7 +167,7 @@ was not configured by the {@link com.sleepycat.db.StatsConfig#setFast StatsConfi private long hash_ovfl_free; /** - The number of bytes free on overflow pages. + The number of bytes free on bucket overflow pages. <p> The information is only included if the {@link com.sleepycat.db.Database#getStats Database.getStats} call was not configured by the {@link com.sleepycat.db.StatsConfig#setFast StatsConfig.setFast} method. @@ -199,6 +209,7 @@ was not configured by the {@link com.sleepycat.db.StatsConfig#setFast StatsConfi + "\n hash_metaflags=" + hash_metaflags + "\n hash_nkeys=" + hash_nkeys + "\n hash_ndata=" + hash_ndata + + "\n hash_nblobs=" + hash_nblobs + "\n hash_pagecnt=" + hash_pagecnt + "\n hash_pagesize=" + hash_pagesize + "\n hash_ffactor=" + hash_ffactor diff --git a/lang/java/src/com/sleepycat/db/Hasher.java b/lang/java/src/com/sleepycat/db/Hasher.java index 45349a68..28e44995 100644 --- a/lang/java/src/com/sleepycat/db/Hasher.java +++ b/lang/java/src/com/sleepycat/db/Hasher.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2000, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ diff --git a/lang/java/src/com/sleepycat/db/HeapFullException.java b/lang/java/src/com/sleepycat/db/HeapFullException.java index 232cb067..9faf60da 100644 --- a/lang/java/src/com/sleepycat/db/HeapFullException.java +++ b/lang/java/src/com/sleepycat/db/HeapFullException.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2011, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ diff --git a/lang/java/src/com/sleepycat/db/HeapRecordId.java b/lang/java/src/com/sleepycat/db/HeapRecordId.java index 2f926a39..ac719d73 100644 --- a/lang/java/src/com/sleepycat/db/HeapRecordId.java +++ b/lang/java/src/com/sleepycat/db/HeapRecordId.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2011, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ diff --git a/lang/java/src/com/sleepycat/db/HeapStats.java b/lang/java/src/com/sleepycat/db/HeapStats.java index a63ae7bf..08f450f5 100644 --- a/lang/java/src/com/sleepycat/db/HeapStats.java +++ b/lang/java/src/com/sleepycat/db/HeapStats.java @@ -4,7 +4,7 @@ * * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. */ package com.sleepycat.db; @@ -40,6 +40,14 @@ public class HeapStats extends DatabaseStats { return heap_metaflags; } + private int heap_nblobs; + /** + The number of blob records. + */ + public int getHeapNumBlobs() { + return heap_nblobs; + } + private int heap_nrecs; /** Reports the number of records in the Heap database. @@ -73,7 +81,10 @@ public class HeapStats extends DatabaseStats { } private int heap_regionsize; - /** TODO */ + /** + The number of pages in a region in the Heap database. Returned if + DB_FAST_STAT is set. + */ public int getHeapRegionSize() { return heap_regionsize; } @@ -87,6 +98,7 @@ public class HeapStats extends DatabaseStats { + "\n heap_magic=" + heap_magic + "\n heap_version=" + heap_version + "\n heap_metaflags=" + heap_metaflags + + "\n heap_nblobs=" + heap_nblobs + "\n heap_nrecs=" + heap_nrecs + "\n heap_pagecnt=" + heap_pagecnt + "\n heap_pagesize=" + heap_pagesize diff --git a/lang/java/src/com/sleepycat/db/JoinConfig.java b/lang/java/src/com/sleepycat/db/JoinConfig.java index cde2e1c7..358cce77 100644 --- a/lang/java/src/com/sleepycat/db/JoinConfig.java +++ b/lang/java/src/com/sleepycat/db/JoinConfig.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ diff --git a/lang/java/src/com/sleepycat/db/JoinCursor.java b/lang/java/src/com/sleepycat/db/JoinCursor.java index f426af7f..60ae53c6 100644 --- a/lang/java/src/com/sleepycat/db/JoinCursor.java +++ b/lang/java/src/com/sleepycat/db/JoinCursor.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ diff --git a/lang/java/src/com/sleepycat/db/KeyRange.java b/lang/java/src/com/sleepycat/db/KeyRange.java index a2cdbe47..3ebf6942 100644 --- a/lang/java/src/com/sleepycat/db/KeyRange.java +++ b/lang/java/src/com/sleepycat/db/KeyRange.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 1997, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ diff --git a/lang/java/src/com/sleepycat/db/Lock.java b/lang/java/src/com/sleepycat/db/Lock.java index 88e0542b..557aefa8 100644 --- a/lang/java/src/com/sleepycat/db/Lock.java +++ b/lang/java/src/com/sleepycat/db/Lock.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2001, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ diff --git a/lang/java/src/com/sleepycat/db/LockDetectMode.java b/lang/java/src/com/sleepycat/db/LockDetectMode.java index c673a31d..775110a1 100644 --- a/lang/java/src/com/sleepycat/db/LockDetectMode.java +++ b/lang/java/src/com/sleepycat/db/LockDetectMode.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ diff --git a/lang/java/src/com/sleepycat/db/LockMode.java b/lang/java/src/com/sleepycat/db/LockMode.java index d8fb16a5..a75001e4 100644 --- a/lang/java/src/com/sleepycat/db/LockMode.java +++ b/lang/java/src/com/sleepycat/db/LockMode.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ diff --git a/lang/java/src/com/sleepycat/db/LockNotGrantedException.java b/lang/java/src/com/sleepycat/db/LockNotGrantedException.java index 1c0281f2..9b41ef1a 100644 --- a/lang/java/src/com/sleepycat/db/LockNotGrantedException.java +++ b/lang/java/src/com/sleepycat/db/LockNotGrantedException.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 1997, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ diff --git a/lang/java/src/com/sleepycat/db/LockOperation.java b/lang/java/src/com/sleepycat/db/LockOperation.java index 0063d821..e9660e11 100644 --- a/lang/java/src/com/sleepycat/db/LockOperation.java +++ b/lang/java/src/com/sleepycat/db/LockOperation.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ diff --git a/lang/java/src/com/sleepycat/db/LockRequest.java b/lang/java/src/com/sleepycat/db/LockRequest.java index 8453b806..e170c4f3 100644 --- a/lang/java/src/com/sleepycat/db/LockRequest.java +++ b/lang/java/src/com/sleepycat/db/LockRequest.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 1997, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ diff --git a/lang/java/src/com/sleepycat/db/LockRequestMode.java b/lang/java/src/com/sleepycat/db/LockRequestMode.java index 915fcd82..a1a44095 100644 --- a/lang/java/src/com/sleepycat/db/LockRequestMode.java +++ b/lang/java/src/com/sleepycat/db/LockRequestMode.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ diff --git a/lang/java/src/com/sleepycat/db/LockStats.java b/lang/java/src/com/sleepycat/db/LockStats.java index c06f720d..649b165c 100644 --- a/lang/java/src/com/sleepycat/db/LockStats.java +++ b/lang/java/src/com/sleepycat/db/LockStats.java @@ -4,7 +4,7 @@ * * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. */ package com.sleepycat.db; @@ -299,36 +299,36 @@ public class LockStats { private long st_part_wait; /** - The number of times that a thread of control was forced to wait before - obtaining a lock partition mutex. - * */ + The number of times that a thread of control was forced to wait before + obtaining a lock partition mutex. + */ public long getPartWait() { return st_part_wait; } private long st_part_nowait; /** - The number of times that a thread of control was able to obtain a lock - partition mutex without waiting. - * */ + The number of times that a thread of control was able to obtain a lock + partition mutex without waiting. + */ public long getPartNowait() { return st_part_nowait; } private long st_part_max_wait; /** - The maximum number of times that a thread of control was forced to wait - before obtaining any one lock partition mutex. - * */ + The maximum number of times that a thread of control was forced to wait + before obtaining any one lock partition mutex. + */ public long getPartMaxWait() { return st_part_max_wait; } private long st_part_max_nowait; /** - The number of times that a thread of control was able to obtain any one - lock partition mutex without waiting. - * */ + The number of times that a thread of control was able to obtain any one + lock partition mutex without waiting. + */ public long getPartMaxNowait() { return st_part_max_nowait; } @@ -371,8 +371,8 @@ public class LockStats { private long st_region_wait; /** - The number of times that a thread of control was forced to wait - before obtaining the region lock. + The number of times that a thread of control was forced to wait before + obtaining the lock region mutex. */ public long getRegionWait() { return st_region_wait; @@ -380,13 +380,29 @@ public class LockStats { private long st_region_nowait; /** - The number of times that a thread of control was able to obtain the - region lock without waiting. + The number of times that a thread of control was able to obtain the lock + region mutex without waiting. */ public long getRegionNowait() { return st_region_nowait; } + private long st_nlockers_hit; + /** + The number of hits in the thread locker cache. + */ + public long getNumLockersHit() { + return st_nlockers_hit; + } + + private long st_nlockers_reused; + /** + Total number of lockers reused. + */ + public long getNumLockersReused() { + return st_nlockers_reused; + } + private int st_hash_len; /** Maximum length of a lock hash bucket. @@ -456,6 +472,8 @@ public class LockStats { + "\n st_lockers_nowait=" + st_lockers_nowait + "\n st_region_wait=" + st_region_wait + "\n st_region_nowait=" + st_region_nowait + + "\n st_nlockers_hit=" + st_nlockers_hit + + "\n st_nlockers_reused=" + st_nlockers_reused + "\n st_hash_len=" + st_hash_len + "\n st_regsize=" + st_regsize ; diff --git a/lang/java/src/com/sleepycat/db/LogCursor.java b/lang/java/src/com/sleepycat/db/LogCursor.java index ca51b380..20f5269e 100644 --- a/lang/java/src/com/sleepycat/db/LogCursor.java +++ b/lang/java/src/com/sleepycat/db/LogCursor.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2001, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ diff --git a/lang/java/src/com/sleepycat/db/LogRecordHandler.java b/lang/java/src/com/sleepycat/db/LogRecordHandler.java index 843a072c..e64082e1 100644 --- a/lang/java/src/com/sleepycat/db/LogRecordHandler.java +++ b/lang/java/src/com/sleepycat/db/LogRecordHandler.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2000, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ diff --git a/lang/java/src/com/sleepycat/db/LogSequenceNumber.java b/lang/java/src/com/sleepycat/db/LogSequenceNumber.java index 017d4681..9fdbc27f 100644 --- a/lang/java/src/com/sleepycat/db/LogSequenceNumber.java +++ b/lang/java/src/com/sleepycat/db/LogSequenceNumber.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2001, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ diff --git a/lang/java/src/com/sleepycat/db/LogStats.java b/lang/java/src/com/sleepycat/db/LogStats.java index 3072913e..f2b824ea 100644 --- a/lang/java/src/com/sleepycat/db/LogStats.java +++ b/lang/java/src/com/sleepycat/db/LogStats.java @@ -4,7 +4,7 @@ * * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. */ package com.sleepycat.db; @@ -147,7 +147,7 @@ public class LogStats { private long st_region_wait; /** The number of times that a thread of control was forced to wait - before obtaining the region lock. + before obtaining the log region mutex. */ public long getRegionWait() { return st_region_wait; @@ -155,8 +155,8 @@ public class LogStats { private long st_region_nowait; /** - The number of times that a thread of control was able to obtain the - region lock without waiting. + The number of times that a thread of control was able to obtain + the log region mutex without waiting. */ public long getRegionNowait() { return st_region_nowait; diff --git a/lang/java/src/com/sleepycat/db/LogVerifyConfig.java b/lang/java/src/com/sleepycat/db/LogVerifyConfig.java index b64c1c1f..19c86513 100644 --- a/lang/java/src/com/sleepycat/db/LogVerifyConfig.java +++ b/lang/java/src/com/sleepycat/db/LogVerifyConfig.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2009, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id: LogVerifyConfig.java,v 0f73af5ae3da 2010/05/10 05:38:40 alexander $ */ diff --git a/lang/java/src/com/sleepycat/db/MemoryException.java b/lang/java/src/com/sleepycat/db/MemoryException.java index 8c3fe56b..f0ed44f7 100644 --- a/lang/java/src/com/sleepycat/db/MemoryException.java +++ b/lang/java/src/com/sleepycat/db/MemoryException.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 1999, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ diff --git a/lang/java/src/com/sleepycat/db/MessageHandler.java b/lang/java/src/com/sleepycat/db/MessageHandler.java index 16cdea2b..d0db1d0c 100644 --- a/lang/java/src/com/sleepycat/db/MessageHandler.java +++ b/lang/java/src/com/sleepycat/db/MessageHandler.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 1997, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ diff --git a/lang/java/src/com/sleepycat/db/MetaCheckSumFailException.java b/lang/java/src/com/sleepycat/db/MetaCheckSumFailException.java new file mode 100644 index 00000000..45609483 --- /dev/null +++ b/lang/java/src/com/sleepycat/db/MetaCheckSumFailException.java @@ -0,0 +1,33 @@ +/*- + * See the file LICENSE for redistribution information. + * + * Copyright (c) 2014, 2015 Oracle and/or its affiliates. All rights reserved. + * + * $Id$ + */ +package com.sleepycat.db; + +import com.sleepycat.db.internal.DbConstants; +import com.sleepycat.db.internal.DbEnv; + + +/** +A MetaCheckSumFailException is thrown when a checksum mismatch is detected +on a database metadata page. Either the database is corrupted or the file +is not a Berkeley DB database file. +*/ +public class MetaCheckSumFailException extends DatabaseException { + private String message; + + /* package */ MetaCheckSumFailException(final String message, + final int errno, final DbEnv dbenv) { + super(message, errno, dbenv); + this.message = message; + } + + /** {@inheritDoc} */ + public String toString() { + return message; + } + +} diff --git a/lang/java/src/com/sleepycat/db/MultipleDataEntry.java b/lang/java/src/com/sleepycat/db/MultipleDataEntry.java index 9d216bae..52c611c7 100644 --- a/lang/java/src/com/sleepycat/db/MultipleDataEntry.java +++ b/lang/java/src/com/sleepycat/db/MultipleDataEntry.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ diff --git a/lang/java/src/com/sleepycat/db/MultipleEntry.java b/lang/java/src/com/sleepycat/db/MultipleEntry.java index 0c526ee1..cd0b0339 100644 --- a/lang/java/src/com/sleepycat/db/MultipleEntry.java +++ b/lang/java/src/com/sleepycat/db/MultipleEntry.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ diff --git a/lang/java/src/com/sleepycat/db/MultipleKeyDataEntry.java b/lang/java/src/com/sleepycat/db/MultipleKeyDataEntry.java index 3113d657..d5d72f98 100644 --- a/lang/java/src/com/sleepycat/db/MultipleKeyDataEntry.java +++ b/lang/java/src/com/sleepycat/db/MultipleKeyDataEntry.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ diff --git a/lang/java/src/com/sleepycat/db/MultipleKeyNIODataEntry.java b/lang/java/src/com/sleepycat/db/MultipleKeyNIODataEntry.java index 3095815d..4b0a21e5 100644 --- a/lang/java/src/com/sleepycat/db/MultipleKeyNIODataEntry.java +++ b/lang/java/src/com/sleepycat/db/MultipleKeyNIODataEntry.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ diff --git a/lang/java/src/com/sleepycat/db/MultipleNIODataEntry.java b/lang/java/src/com/sleepycat/db/MultipleNIODataEntry.java index 4d8ebc36..73578864 100644 --- a/lang/java/src/com/sleepycat/db/MultipleNIODataEntry.java +++ b/lang/java/src/com/sleepycat/db/MultipleNIODataEntry.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ diff --git a/lang/java/src/com/sleepycat/db/MultipleRecnoDataEntry.java b/lang/java/src/com/sleepycat/db/MultipleRecnoDataEntry.java index 7dac980a..5483b2cc 100644 --- a/lang/java/src/com/sleepycat/db/MultipleRecnoDataEntry.java +++ b/lang/java/src/com/sleepycat/db/MultipleRecnoDataEntry.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ diff --git a/lang/java/src/com/sleepycat/db/MultipleRecnoNIODataEntry.java b/lang/java/src/com/sleepycat/db/MultipleRecnoNIODataEntry.java index 1ad28add..6660669a 100644 --- a/lang/java/src/com/sleepycat/db/MultipleRecnoNIODataEntry.java +++ b/lang/java/src/com/sleepycat/db/MultipleRecnoNIODataEntry.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ diff --git a/lang/java/src/com/sleepycat/db/MutexStats.java b/lang/java/src/com/sleepycat/db/MutexStats.java index 6f40e40b..1d009b41 100644 --- a/lang/java/src/com/sleepycat/db/MutexStats.java +++ b/lang/java/src/com/sleepycat/db/MutexStats.java @@ -4,7 +4,7 @@ * * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. */ package com.sleepycat.db; diff --git a/lang/java/src/com/sleepycat/db/OperationStatus.java b/lang/java/src/com/sleepycat/db/OperationStatus.java index 8cbdac14..35f49da0 100644 --- a/lang/java/src/com/sleepycat/db/OperationStatus.java +++ b/lang/java/src/com/sleepycat/db/OperationStatus.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ diff --git a/lang/java/src/com/sleepycat/db/PanicHandler.java b/lang/java/src/com/sleepycat/db/PanicHandler.java index e4a09443..27dbc14f 100644 --- a/lang/java/src/com/sleepycat/db/PanicHandler.java +++ b/lang/java/src/com/sleepycat/db/PanicHandler.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 1997, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ diff --git a/lang/java/src/com/sleepycat/db/PartitionHandler.java b/lang/java/src/com/sleepycat/db/PartitionHandler.java index dce9e6a6..aa764c69 100644 --- a/lang/java/src/com/sleepycat/db/PartitionHandler.java +++ b/lang/java/src/com/sleepycat/db/PartitionHandler.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2001, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ @@ -9,7 +9,13 @@ package com.sleepycat.db; /** -An interface specifying how Btree prefixes should be calculated. +An interface specifying how to set up database partitioning. +Implementation of this interface is required when +{@link com.sleepycat.db.Database} is opened and +{@link DatabaseConfig#setPartitionByCallback DatabaseConfig.setPartitionByCallback} is called. +<p> +You configure the database with this handler using the +{@link DatabaseConfig#setPartitionByCallback DatabaseConfig.setPartitionByCallback} method. */ public interface PartitionHandler { /** @@ -19,6 +25,8 @@ public interface PartitionHandler { The enclosing database handle. @param key A database entry representing a database key. + @return + A partition number for the key. */ int partition(Database db, DatabaseEntry key); } diff --git a/lang/java/src/com/sleepycat/db/PreparedTransaction.java b/lang/java/src/com/sleepycat/db/PreparedTransaction.java index a8d3c8f8..c6189015 100644 --- a/lang/java/src/com/sleepycat/db/PreparedTransaction.java +++ b/lang/java/src/com/sleepycat/db/PreparedTransaction.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 1999, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ diff --git a/lang/java/src/com/sleepycat/db/QueueStats.java b/lang/java/src/com/sleepycat/db/QueueStats.java index 29006467..3a0e3eef 100644 --- a/lang/java/src/com/sleepycat/db/QueueStats.java +++ b/lang/java/src/com/sleepycat/db/QueueStats.java @@ -4,7 +4,7 @@ * * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. */ package com.sleepycat.db; diff --git a/lang/java/src/com/sleepycat/db/RecordNumberAppender.java b/lang/java/src/com/sleepycat/db/RecordNumberAppender.java index eb10a768..e1f09412 100644 --- a/lang/java/src/com/sleepycat/db/RecordNumberAppender.java +++ b/lang/java/src/com/sleepycat/db/RecordNumberAppender.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2000, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ diff --git a/lang/java/src/com/sleepycat/db/RecoveryOperation.java b/lang/java/src/com/sleepycat/db/RecoveryOperation.java index bea18d17..7f07abde 100644 --- a/lang/java/src/com/sleepycat/db/RecoveryOperation.java +++ b/lang/java/src/com/sleepycat/db/RecoveryOperation.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ diff --git a/lang/java/src/com/sleepycat/db/RegionResourceType.java b/lang/java/src/com/sleepycat/db/RegionResourceType.java index ceca9746..a3df3b14 100644 --- a/lang/java/src/com/sleepycat/db/RegionResourceType.java +++ b/lang/java/src/com/sleepycat/db/RegionResourceType.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2011, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ diff --git a/lang/java/src/com/sleepycat/db/ReplicationChannel.java b/lang/java/src/com/sleepycat/db/ReplicationChannel.java index 91446fe0..366a47b2 100644 --- a/lang/java/src/com/sleepycat/db/ReplicationChannel.java +++ b/lang/java/src/com/sleepycat/db/ReplicationChannel.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2011, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ diff --git a/lang/java/src/com/sleepycat/db/ReplicationConfig.java b/lang/java/src/com/sleepycat/db/ReplicationConfig.java index ede4df75..a46ad274 100644 --- a/lang/java/src/com/sleepycat/db/ReplicationConfig.java +++ b/lang/java/src/com/sleepycat/db/ReplicationConfig.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ @@ -78,7 +78,28 @@ public final class ReplicationConfig implements Cloneable { Once this option is turned on, it may never be turned off. */ public static final ReplicationConfig LEASE = - new ReplicationConfig("LEASE", DbConstants.DB_REP_CONF_LEASE); + new ReplicationConfig("LEASE", DbConstants.DB_REP_CONF_LEASE); + + /** + This flag is used to specify the preferred master site in a replication + group operating in preferred master mode. A preferred master replication + group must contain only two sites, with one site specified as the preferred + master site and the other site specified as the client site. The preferred + master site operates as the master site whenever possible. + **/ + public static final ReplicationConfig PREFMAS_MASTER = + new ReplicationConfig("PREFMAS_MASTER", DbConstants.DB_REPMGR_CONF_PREFMAS_MASTER); + + /** + This flag is used to specify the client site in a replication group + operating in preferred master mode. A preferred master replication group + must contain only two sites, with one site specified as the preferred + master site and the other site specified as the client site. The client + site in a preferred master replication group takes over temporarily as + master when the preferred master site is unavailable. + **/ + public static final ReplicationConfig PREFMAS_CLIENT = + new ReplicationConfig("PREFMAS_CLIENT", DbConstants.DB_REPMGR_CONF_PREFMAS_CLIENT); /* package */ static ReplicationConfig fromInt(int which) { @@ -95,8 +116,12 @@ public final class ReplicationConfig implements Cloneable { return STRICT_2SITE; case DbConstants.DB_REPMGR_CONF_ELECTIONS: return ELECTIONS; - case DbConstants.DB_REP_CONF_LEASE: - return LEASE; + case DbConstants.DB_REP_CONF_LEASE: + return LEASE; + case DbConstants.DB_REPMGR_CONF_PREFMAS_MASTER: + return PREFMAS_MASTER; + case DbConstants.DB_REPMGR_CONF_PREFMAS_CLIENT: + return PREFMAS_CLIENT; default: throw new IllegalArgumentException( "Unknown replication config: " + which); diff --git a/lang/java/src/com/sleepycat/db/ReplicationDuplicateMasterException.java b/lang/java/src/com/sleepycat/db/ReplicationDuplicateMasterException.java index 216d47fc..6ba215db 100644 --- a/lang/java/src/com/sleepycat/db/ReplicationDuplicateMasterException.java +++ b/lang/java/src/com/sleepycat/db/ReplicationDuplicateMasterException.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 1997, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ diff --git a/lang/java/src/com/sleepycat/db/ReplicationHandleDeadException.java b/lang/java/src/com/sleepycat/db/ReplicationHandleDeadException.java index 7df82663..31a4cd51 100644 --- a/lang/java/src/com/sleepycat/db/ReplicationHandleDeadException.java +++ b/lang/java/src/com/sleepycat/db/ReplicationHandleDeadException.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 1997, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ diff --git a/lang/java/src/com/sleepycat/db/ReplicationHoldElectionException.java b/lang/java/src/com/sleepycat/db/ReplicationHoldElectionException.java index e98cae13..a141ac97 100644 --- a/lang/java/src/com/sleepycat/db/ReplicationHoldElectionException.java +++ b/lang/java/src/com/sleepycat/db/ReplicationHoldElectionException.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 1997, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ diff --git a/lang/java/src/com/sleepycat/db/ReplicationHostAddress.java b/lang/java/src/com/sleepycat/db/ReplicationHostAddress.java index c49bdf7d..9ee4051d 100644 --- a/lang/java/src/com/sleepycat/db/ReplicationHostAddress.java +++ b/lang/java/src/com/sleepycat/db/ReplicationHostAddress.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 1997, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ diff --git a/lang/java/src/com/sleepycat/db/ReplicationJoinFailureException.java b/lang/java/src/com/sleepycat/db/ReplicationJoinFailureException.java index b9f77174..88ad7c3e 100644 --- a/lang/java/src/com/sleepycat/db/ReplicationJoinFailureException.java +++ b/lang/java/src/com/sleepycat/db/ReplicationJoinFailureException.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 1997, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ diff --git a/lang/java/src/com/sleepycat/db/ReplicationLeaseExpiredException.java b/lang/java/src/com/sleepycat/db/ReplicationLeaseExpiredException.java index 6af9f381..df20af90 100644 --- a/lang/java/src/com/sleepycat/db/ReplicationLeaseExpiredException.java +++ b/lang/java/src/com/sleepycat/db/ReplicationLeaseExpiredException.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 1997, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ diff --git a/lang/java/src/com/sleepycat/db/ReplicationLockoutException.java b/lang/java/src/com/sleepycat/db/ReplicationLockoutException.java index 34f24d9e..3a1f1da7 100644 --- a/lang/java/src/com/sleepycat/db/ReplicationLockoutException.java +++ b/lang/java/src/com/sleepycat/db/ReplicationLockoutException.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 1997, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ diff --git a/lang/java/src/com/sleepycat/db/ReplicationManagerAckPolicy.java b/lang/java/src/com/sleepycat/db/ReplicationManagerAckPolicy.java index df6a74ef..b34a8b6d 100644 --- a/lang/java/src/com/sleepycat/db/ReplicationManagerAckPolicy.java +++ b/lang/java/src/com/sleepycat/db/ReplicationManagerAckPolicy.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ @@ -11,8 +11,8 @@ package com.sleepycat.db; import com.sleepycat.db.internal.DbConstants; /** -A class that provides definitions for the types of network ack policyto use -when transmitting messages between replication sites using theReplication +A class that provides definitions for the types of network ack policy to use +when transmitting messages between replication sites using the Replication Manager. <p> Set using the {@link com.sleepycat.db.EnvironmentConfig#setReplicationManagerAckPolicy EnvironmentConfig.setReplicationManagerAckPolicy} API. diff --git a/lang/java/src/com/sleepycat/db/ReplicationManagerConnectionStatus.java b/lang/java/src/com/sleepycat/db/ReplicationManagerConnectionStatus.java index b62342d9..94a36599 100644 --- a/lang/java/src/com/sleepycat/db/ReplicationManagerConnectionStatus.java +++ b/lang/java/src/com/sleepycat/db/ReplicationManagerConnectionStatus.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2011, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ diff --git a/lang/java/src/com/sleepycat/db/ReplicationManagerMessageDispatch.java b/lang/java/src/com/sleepycat/db/ReplicationManagerMessageDispatch.java index ae10fe5f..3de8d2c9 100644 --- a/lang/java/src/com/sleepycat/db/ReplicationManagerMessageDispatch.java +++ b/lang/java/src/com/sleepycat/db/ReplicationManagerMessageDispatch.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2011, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ diff --git a/lang/java/src/com/sleepycat/db/ReplicationManagerSite.java b/lang/java/src/com/sleepycat/db/ReplicationManagerSite.java index 6bc55e3d..4a5cbd9d 100644 --- a/lang/java/src/com/sleepycat/db/ReplicationManagerSite.java +++ b/lang/java/src/com/sleepycat/db/ReplicationManagerSite.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2011, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ diff --git a/lang/java/src/com/sleepycat/db/ReplicationManagerSiteConfig.java b/lang/java/src/com/sleepycat/db/ReplicationManagerSiteConfig.java index 7a6e0ccd..b39012c0 100644 --- a/lang/java/src/com/sleepycat/db/ReplicationManagerSiteConfig.java +++ b/lang/java/src/com/sleepycat/db/ReplicationManagerSiteConfig.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2011, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ diff --git a/lang/java/src/com/sleepycat/db/ReplicationManagerSiteInfo.java b/lang/java/src/com/sleepycat/db/ReplicationManagerSiteInfo.java index ac30c3e1..e0b6e522 100644 --- a/lang/java/src/com/sleepycat/db/ReplicationManagerSiteInfo.java +++ b/lang/java/src/com/sleepycat/db/ReplicationManagerSiteInfo.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 1997, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ @@ -31,7 +31,7 @@ public class ReplicationManagerSiteInfo */ public ReplicationManagerSiteInfo(ReplicationHostAddress hostAddr, int eid) { - this(hostAddr, eid, false, false); + this(hostAddr, eid, false, false, false); } /** @@ -39,18 +39,19 @@ public class ReplicationManagerSiteInfo */ public ReplicationManagerSiteInfo(ReplicationHostAddress hostAddr, int eid, boolean isConnected) { - this(hostAddr, eid, isConnected, false); + this(hostAddr, eid, isConnected, false, false); } /** Create a ReplicationManagerSiteInfo with the given information. */ - public ReplicationManagerSiteInfo(ReplicationHostAddress hostAddr, int eid, boolean isConnected, boolean isPeer) + public ReplicationManagerSiteInfo(ReplicationHostAddress hostAddr, int eid, boolean isConnected, boolean isPeer, boolean isView) { - this.addr = hostAddr; + this.addr = hostAddr; this.eid = eid; this.status = isConnected ? DbConstants.DB_REPMGR_CONNECTED : 0; this.flags = isPeer ? DbConstants.DB_REPMGR_ISPEER : 0; + this.flags |= isView ? DbConstants.DB_REPMGR_ISVIEW : 0; } /** @@ -77,5 +78,12 @@ public class ReplicationManagerSiteInfo public boolean isPeer() { return ((this.flags & DbConstants.DB_REPMGR_ISPEER) != 0); } + + /** + The replication site is a view. + */ + public boolean isView() { + return ((this.flags & DbConstants.DB_REPMGR_ISVIEW) != 0); + } } diff --git a/lang/java/src/com/sleepycat/db/ReplicationManagerStartPolicy.java b/lang/java/src/com/sleepycat/db/ReplicationManagerStartPolicy.java index a5991419..8adbed23 100644 --- a/lang/java/src/com/sleepycat/db/ReplicationManagerStartPolicy.java +++ b/lang/java/src/com/sleepycat/db/ReplicationManagerStartPolicy.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ diff --git a/lang/java/src/com/sleepycat/db/ReplicationManagerStats.java b/lang/java/src/com/sleepycat/db/ReplicationManagerStats.java index 0feca5c1..6b01f267 100644 --- a/lang/java/src/com/sleepycat/db/ReplicationManagerStats.java +++ b/lang/java/src/com/sleepycat/db/ReplicationManagerStats.java @@ -4,7 +4,7 @@ * * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. */ package com.sleepycat.db; @@ -18,9 +18,10 @@ public class ReplicationManagerStats { private long st_perm_failed; /** - The number of times a PERM message originating at this site did - not receive sufficient acknowledgement from clients, according to the - configured acknowledgement policy and acknowledgement timeout. + The number of times a message critical for maintaining database + integrity (for example, a transaction commit), originating at this site, + did not receive sufficient acknowledgement from clients, according to + the configured acknowledgement policy and acknowledgement timeout */ public long getPermFailed() { return st_perm_failed; @@ -28,7 +29,9 @@ public class ReplicationManagerStats { private long st_msgs_queued; /** - The number of messages queued due to a network delay. + The number of outgoing messages which could not be transmitted + immediately, due to a full network buffer, and had to be queued for + later delivery. */ public long getMsgsQueued() { return st_msgs_queued; @@ -36,16 +39,48 @@ public class ReplicationManagerStats { private long st_msgs_dropped; /** - The number of messages discarded due to queue length overflows. + The number of outgoing messages that were dropped, because the outgoing + message queue was full. (Berkeley DB replication is tolerant of dropped + messages, and will automatically request retransmission of any missing + messages as needed.) */ public long getMsgsDropped() { return st_msgs_dropped; } + private int st_incoming_queue_gbytes; + /** + Gigabytes component of the memory consumption for the messages + currently in the incoming queue. + */ + public int getIncomingQueueGbytes() { + return st_incoming_queue_gbytes; + } + + private int st_incoming_queue_bytes; + /** + Bytes component of the memory consumption for the messages currently + in the incoming queue. + */ + public int getIncomingQueueBytes() { + return st_incoming_queue_bytes; + } + + private long st_incoming_msgs_dropped; + /** + The number of incoming messages that were dropped because the incoming + queue was full. (Berkeley DB replication is tolerant of dropped + messages, and will automatically request retransmission of any missing + messages as needed.) + */ + public long getIncomingMsgsDropped() { + return st_incoming_msgs_dropped; + } + private long st_connection_drop; /** - The number of existing connections that have been dropped since the - statistics were last reset. + The number of existing connections that have been dropped + since the statistics were last reset. */ public long getConnectionDrop() { return st_connection_drop; @@ -53,28 +88,62 @@ public class ReplicationManagerStats { private long st_connect_fail; /** - The number of times new connection attempts have failed. + The number of times an attempt to open a new TCP/IP connection + failed. */ public long getConnectFail() { return st_connect_fail; } - private long st_elect_threads; + private int st_elect_threads; /** - Number of currently active election threads. + Number of currently active election threads. */ - public long getElectThreads() { + public int getElectThreads() { return st_elect_threads; } - private long st_max_elect_threads; + private int st_max_elect_threads; /** - Election threads for which space is reserved. + The number of election threads for which space is reserved. */ - public long getMaxElectThreads() { + public int getMaxElectThreads() { return st_max_elect_threads; } + private int st_site_participants; + /** + Number of replication group participant sites. + */ + public int getSiteParticipants() { + return st_site_participants; + } + + private int st_site_total; + /** + Total number of replication group sites. + */ + public int getSiteTotal() { + return st_site_total; + } + + private int st_site_views; + /** + Number of replication group view sites. + */ + public int getSiteViews() { + return st_site_views; + } + + private long st_takeovers; + /** + The number of times a subordinate process took over as the replication + process after a previous replication process has finished successfully. + */ + public long getTakeovers() { + return st_takeovers; + } + /** For convenience, the ReplicationManagerStats class has a toString method that lists all the data fields. @@ -84,10 +153,17 @@ public class ReplicationManagerStats { + "\n st_perm_failed=" + st_perm_failed + "\n st_msgs_queued=" + st_msgs_queued + "\n st_msgs_dropped=" + st_msgs_dropped + + "\n st_incoming_queue_gbytes=" + st_incoming_queue_gbytes + + "\n st_incoming_queue_bytes=" + st_incoming_queue_bytes + + "\n st_incoming_msgs_dropped=" + st_incoming_msgs_dropped + "\n st_connection_drop=" + st_connection_drop + "\n st_connect_fail=" + st_connect_fail + "\n st_elect_threads=" + st_elect_threads + "\n st_max_elect_threads=" + st_max_elect_threads + + "\n st_site_participants=" + st_site_participants + + "\n st_site_total=" + st_site_total + + "\n st_site_views=" + st_site_views + + "\n st_takeovers=" + st_takeovers ; } } diff --git a/lang/java/src/com/sleepycat/db/ReplicationSiteUnavailableException.java b/lang/java/src/com/sleepycat/db/ReplicationSiteUnavailableException.java index 977de157..bc74c867 100644 --- a/lang/java/src/com/sleepycat/db/ReplicationSiteUnavailableException.java +++ b/lang/java/src/com/sleepycat/db/ReplicationSiteUnavailableException.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 1997, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ diff --git a/lang/java/src/com/sleepycat/db/ReplicationStats.java b/lang/java/src/com/sleepycat/db/ReplicationStats.java index ff035b4d..5c0c7eef 100644 --- a/lang/java/src/com/sleepycat/db/ReplicationStats.java +++ b/lang/java/src/com/sleepycat/db/ReplicationStats.java @@ -4,7 +4,7 @@ * * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. */ package com.sleepycat.db; @@ -38,6 +38,12 @@ public class ReplicationStats { return (st_startup_complete != 0); } + private int st_view; + /** True if the site is a view and false if not. */ + public boolean getView() { + return (st_view != 0); + } + private long st_log_queued; /** The number of log records currently queued. */ public long getLogQueued() { @@ -405,6 +411,7 @@ public class ReplicationStats { public String toString() { return "ReplicationStats:" + "\n st_startup_complete=" + (st_startup_complete != 0) + + "\n st_view=" + st_view + "\n st_log_queued=" + st_log_queued + "\n st_status=" + st_status + "\n st_next_lsn=" + st_next_lsn diff --git a/lang/java/src/com/sleepycat/db/ReplicationStatus.java b/lang/java/src/com/sleepycat/db/ReplicationStatus.java index c7114ea9..a7421065 100644 --- a/lang/java/src/com/sleepycat/db/ReplicationStatus.java +++ b/lang/java/src/com/sleepycat/db/ReplicationStatus.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ diff --git a/lang/java/src/com/sleepycat/db/ReplicationTimeoutType.java b/lang/java/src/com/sleepycat/db/ReplicationTimeoutType.java index 583a658c..e1377e8d 100644 --- a/lang/java/src/com/sleepycat/db/ReplicationTimeoutType.java +++ b/lang/java/src/com/sleepycat/db/ReplicationTimeoutType.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ diff --git a/lang/java/src/com/sleepycat/db/ReplicationTransport.java b/lang/java/src/com/sleepycat/db/ReplicationTransport.java index 8fa23f93..287f6479 100644 --- a/lang/java/src/com/sleepycat/db/ReplicationTransport.java +++ b/lang/java/src/com/sleepycat/db/ReplicationTransport.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2001, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ diff --git a/lang/java/src/com/sleepycat/db/ReplicationViewHandler.java b/lang/java/src/com/sleepycat/db/ReplicationViewHandler.java new file mode 100644 index 00000000..aec03f41 --- /dev/null +++ b/lang/java/src/com/sleepycat/db/ReplicationViewHandler.java @@ -0,0 +1,31 @@ +/*- + * See the file LICENSE for redistribution information. + * + * Copyright (c) 2012, 2015 Oracle and/or its affiliates. All rights reserved. + * + * $Id$ + */ + +package com.sleepycat.db; + +/** +An interface specifying a callback function to be used by replication views. +*/ +public interface ReplicationViewHandler { + /** + The application-specific function used by replication views to determine + whether a database file is replicated. + <p> + @param dbenv + The enclosing database environment handle. + @param name + The name of the database file. + @param flags + Currently unused. + @return True if the file is replicated, or false if not. + @throws DatabaseException if an error occurs when determining whether or + not the database file is replicated. + */ + boolean partial_view(Environment dbenv, String name, int flags) + throws DatabaseException; +} diff --git a/lang/java/src/com/sleepycat/db/RunRecoveryException.java b/lang/java/src/com/sleepycat/db/RunRecoveryException.java index f071c067..309df1e5 100644 --- a/lang/java/src/com/sleepycat/db/RunRecoveryException.java +++ b/lang/java/src/com/sleepycat/db/RunRecoveryException.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 1997, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ diff --git a/lang/java/src/com/sleepycat/db/SecondaryConfig.java b/lang/java/src/com/sleepycat/db/SecondaryConfig.java index b1799f3f..3862785c 100644 --- a/lang/java/src/com/sleepycat/db/SecondaryConfig.java +++ b/lang/java/src/com/sleepycat/db/SecondaryConfig.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ diff --git a/lang/java/src/com/sleepycat/db/SecondaryCursor.java b/lang/java/src/com/sleepycat/db/SecondaryCursor.java index f59ef066..7b2b0433 100644 --- a/lang/java/src/com/sleepycat/db/SecondaryCursor.java +++ b/lang/java/src/com/sleepycat/db/SecondaryCursor.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ diff --git a/lang/java/src/com/sleepycat/db/SecondaryDatabase.java b/lang/java/src/com/sleepycat/db/SecondaryDatabase.java index 616bdfa5..c854aa1e 100644 --- a/lang/java/src/com/sleepycat/db/SecondaryDatabase.java +++ b/lang/java/src/com/sleepycat/db/SecondaryDatabase.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ diff --git a/lang/java/src/com/sleepycat/db/SecondaryKeyCreator.java b/lang/java/src/com/sleepycat/db/SecondaryKeyCreator.java index e988fb78..df8ded12 100644 --- a/lang/java/src/com/sleepycat/db/SecondaryKeyCreator.java +++ b/lang/java/src/com/sleepycat/db/SecondaryKeyCreator.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ diff --git a/lang/java/src/com/sleepycat/db/SecondaryMultiKeyCreator.java b/lang/java/src/com/sleepycat/db/SecondaryMultiKeyCreator.java index 7411f779..23b5430e 100644 --- a/lang/java/src/com/sleepycat/db/SecondaryMultiKeyCreator.java +++ b/lang/java/src/com/sleepycat/db/SecondaryMultiKeyCreator.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ diff --git a/lang/java/src/com/sleepycat/db/Sequence.java b/lang/java/src/com/sleepycat/db/Sequence.java index 576d9993..3d7484aa 100644 --- a/lang/java/src/com/sleepycat/db/Sequence.java +++ b/lang/java/src/com/sleepycat/db/Sequence.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2001, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ @@ -127,4 +127,22 @@ must be specified. return seq.stat(config.getFlags()); } + + /** + Print statistical information about the sequence to a specified output + channel (see the setMsgfile() method for more information), or passed to an + application callback function (see the setMsgcall() method for more + information). + <p> + @param config + The statistics returned; if null, default statistics are returned. + <p> + @return + A non-zero error value on failure and 0 on success. + */ + public int printStats(StatsConfig config) + throws DatabaseException { + + return seq.stat_print(config.getFlags()); + } } diff --git a/lang/java/src/com/sleepycat/db/SequenceConfig.java b/lang/java/src/com/sleepycat/db/SequenceConfig.java index 47f05d83..38e8b3d9 100644 --- a/lang/java/src/com/sleepycat/db/SequenceConfig.java +++ b/lang/java/src/com/sleepycat/db/SequenceConfig.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ diff --git a/lang/java/src/com/sleepycat/db/SequenceStats.java b/lang/java/src/com/sleepycat/db/SequenceStats.java index fe435536..c2e21172 100644 --- a/lang/java/src/com/sleepycat/db/SequenceStats.java +++ b/lang/java/src/com/sleepycat/db/SequenceStats.java @@ -4,7 +4,7 @@ * * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. */ package com.sleepycat.db; diff --git a/lang/java/src/com/sleepycat/db/StatsConfig.java b/lang/java/src/com/sleepycat/db/StatsConfig.java index e8af08cf..a0768b55 100644 --- a/lang/java/src/com/sleepycat/db/StatsConfig.java +++ b/lang/java/src/com/sleepycat/db/StatsConfig.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ diff --git a/lang/java/src/com/sleepycat/db/Transaction.java b/lang/java/src/com/sleepycat/db/Transaction.java index ec7f0514..85367fd7 100644 --- a/lang/java/src/com/sleepycat/db/Transaction.java +++ b/lang/java/src/com/sleepycat/db/Transaction.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ diff --git a/lang/java/src/com/sleepycat/db/TransactionConfig.java b/lang/java/src/com/sleepycat/db/TransactionConfig.java index f9cb0b00..079e5f6a 100644 --- a/lang/java/src/com/sleepycat/db/TransactionConfig.java +++ b/lang/java/src/com/sleepycat/db/TransactionConfig.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ diff --git a/lang/java/src/com/sleepycat/db/TransactionStats.java b/lang/java/src/com/sleepycat/db/TransactionStats.java index d7602efa..9d893286 100644 --- a/lang/java/src/com/sleepycat/db/TransactionStats.java +++ b/lang/java/src/com/sleepycat/db/TransactionStats.java @@ -4,7 +4,7 @@ * * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. */ package com.sleepycat.db; @@ -59,7 +59,7 @@ public class TransactionStats { } private int priority; - /** Assigned priority used when resolving deadlocks. */ + /** This transaction's deadlock resolution priority. */ public int getPriority() { return priority; } @@ -205,8 +205,8 @@ public class TransactionStats { private long st_region_wait; /** - The number of times that a thread of control was forced to wait - before obtaining the region lock. + The number of times that a thread of control was forced to wait before + obtaining the transaction region mutex. */ public long getRegionWait() { return st_region_wait; @@ -215,7 +215,7 @@ public class TransactionStats { private long st_region_nowait; /** The number of times that a thread of control was able to obtain the - region lock without waiting. + transaction region mutex without waiting. */ public long getRegionNowait() { return st_region_nowait; diff --git a/lang/java/src/com/sleepycat/db/TransactionStatus.java b/lang/java/src/com/sleepycat/db/TransactionStatus.java index ab1ee699..34efcac1 100644 --- a/lang/java/src/com/sleepycat/db/TransactionStatus.java +++ b/lang/java/src/com/sleepycat/db/TransactionStatus.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2010, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2010, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ diff --git a/lang/java/src/com/sleepycat/db/VerboseConfig.java b/lang/java/src/com/sleepycat/db/VerboseConfig.java index 7f90a427..71ed1494 100644 --- a/lang/java/src/com/sleepycat/db/VerboseConfig.java +++ b/lang/java/src/com/sleepycat/db/VerboseConfig.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ diff --git a/lang/java/src/com/sleepycat/db/VerifyConfig.java b/lang/java/src/com/sleepycat/db/VerifyConfig.java index 2843f890..6adb59ac 100644 --- a/lang/java/src/com/sleepycat/db/VerifyConfig.java +++ b/lang/java/src/com/sleepycat/db/VerifyConfig.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ diff --git a/lang/java/src/com/sleepycat/db/VersionMismatchException.java b/lang/java/src/com/sleepycat/db/VersionMismatchException.java index 63c42777..16f17ae0 100644 --- a/lang/java/src/com/sleepycat/db/VersionMismatchException.java +++ b/lang/java/src/com/sleepycat/db/VersionMismatchException.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 1997, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ diff --git a/lang/java/src/com/sleepycat/db/internal/Db.java b/lang/java/src/com/sleepycat/db/internal/Db.java index 941091b3..359792da 100644 --- a/lang/java/src/com/sleepycat/db/internal/Db.java +++ b/lang/java/src/com/sleepycat/db/internal/Db.java @@ -1,6 +1,6 @@ /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). - * Version 2.0.4 + * Version 2.0.12 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -364,6 +364,16 @@ public class Db { public int get_assoc_flags() throws com.sleepycat.db.DatabaseException { return db_javaJNI.Db_get_assoc_flags(swigCPtr, this); } + public String get_blob_dir() throws com.sleepycat.db.DatabaseException { + return db_javaJNI.Db_get_blob_dir(swigCPtr, this); + } + + public String get_blob_sub_dir() throws com.sleepycat.db.DatabaseException { + return db_javaJNI.Db_get_blob_sub_dir(swigCPtr, this); + } + + public int get_blob_threshold() throws com.sleepycat.db.DatabaseException { return db_javaJNI.Db_get_blob_threshold(swigCPtr, this); } + public boolean get_byteswapped() throws com.sleepycat.db.DatabaseException { return db_javaJNI.Db_get_byteswapped(swigCPtr, this); } public long get_cachesize() throws com.sleepycat.db.DatabaseException { @@ -476,6 +486,10 @@ public class Db { public void set_append_recno(com.sleepycat.db.RecordNumberAppender db_append_recno_fcn) throws com.sleepycat.db.DatabaseException { db_javaJNI.Db_set_append_recno(swigCPtr, this, (append_recno_handler = db_append_recno_fcn) != null ); } + public void set_blob_dir(String dir) throws com.sleepycat.db.DatabaseException { db_javaJNI.Db_set_blob_dir(swigCPtr, this, dir); } + + public void set_blob_threshold(int bytes, int flags) throws com.sleepycat.db.DatabaseException { db_javaJNI.Db_set_blob_threshold(swigCPtr, this, bytes, flags); } + public void set_bt_compare(java.util.Comparator bt_compare_fcn) throws com.sleepycat.db.DatabaseException { db_javaJNI.Db_set_bt_compare(swigCPtr, this, (bt_compare_handler = bt_compare_fcn) != null ); } public void set_bt_minkey(int bt_minkey) throws com.sleepycat.db.DatabaseException { db_javaJNI.Db_set_bt_minkey(swigCPtr, this, bt_minkey); } @@ -512,6 +526,10 @@ public class Db { public void set_lorder(int lorder) throws com.sleepycat.db.DatabaseException { db_javaJNI.Db_set_lorder(swigCPtr, this, lorder); } + public int set_msgfile(String msgfile) /* no exception */ { + return db_javaJNI.Db_set_msgfile(swigCPtr, this, msgfile); + } + public void set_pagesize(long pagesize) throws com.sleepycat.db.DatabaseException { db_javaJNI.Db_set_pagesize(swigCPtr, this, pagesize); } public void set_partition(int parts, com.sleepycat.db.DatabaseEntry keys, com.sleepycat.db.PartitionHandler db_partition_fcn) throws com.sleepycat.db.DatabaseException { db_javaJNI.Db_set_partition(swigCPtr, this, parts, keys, (partition_handler = db_partition_fcn) != null ); } @@ -534,6 +552,10 @@ public class Db { public Object stat(DbTxn txnid, int flags) throws com.sleepycat.db.DatabaseException { return db_javaJNI.Db_stat(swigCPtr, this, DbTxn.getCPtr(txnid), txnid, flags); } + public int stat_print(int flags) throws com.sleepycat.db.DatabaseException { + return db_javaJNI.Db_stat_print(swigCPtr, this, flags); + } + public void sync(int flags) throws com.sleepycat.db.DatabaseException { db_javaJNI.Db_sync(swigCPtr, this, flags); } public int truncate(DbTxn txnid, int flags) throws com.sleepycat.db.DatabaseException { diff --git a/lang/java/src/com/sleepycat/db/internal/DbChannel.java b/lang/java/src/com/sleepycat/db/internal/DbChannel.java index f97e7aab..33c9fab8 100644 --- a/lang/java/src/com/sleepycat/db/internal/DbChannel.java +++ b/lang/java/src/com/sleepycat/db/internal/DbChannel.java @@ -1,6 +1,6 @@ /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). - * Version 2.0.4 + * Version 2.0.12 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. diff --git a/lang/java/src/com/sleepycat/db/internal/DbConstants.java b/lang/java/src/com/sleepycat/db/internal/DbConstants.java index 4028514e..188b568b 100644 --- a/lang/java/src/com/sleepycat/db/internal/DbConstants.java +++ b/lang/java/src/com/sleepycat/db/internal/DbConstants.java @@ -34,11 +34,12 @@ public interface DbConstants int DB_CREATE = 0x00000001; int DB_CURRENT = 6; int DB_CURSOR_BULK = 0x00000001; - int DB_DBT_BULK = 0x002; - int DB_DBT_MALLOC = 0x010; - int DB_DBT_PARTIAL = 0x040; - int DB_DBT_READONLY = 0x100; - int DB_DBT_USERMEM = 0x800; + int DB_DBT_BLOB = 0x1000; + int DB_DBT_BULK = 0x0002; + int DB_DBT_MALLOC = 0x0010; + int DB_DBT_PARTIAL = 0x0040; + int DB_DBT_READONLY = 0x0100; + int DB_DBT_USERMEM = 0x0800; int DB_DIRECT_DB = 0x00000200; int DB_DSYNC_DB = 0x00000400; int DB_DUP = 0x00000010; @@ -54,6 +55,7 @@ public interface DbConstants int DB_FLUSH = 0x00000002; int DB_FORCE = 0x00000001; int DB_FORCESYNC = 0x00000001; + int DB_FORCESYNCENV = 0x00000002; int DB_FOREIGN_ABORT = 0x00000001; int DB_FOREIGN_CASCADE = 0x00000002; int DB_FOREIGN_NULLIFY = 0x00000004; @@ -65,7 +67,6 @@ public interface DbConstants int DB_GROUP_CREATOR = 0x00000002; int DB_HASH = 2; int DB_HEAP = 6; - int DB_HEAP_FULL = -30996; int DB_HOTBACKUP_IN_PROGRESS = 0x00000800; int DB_IGNORE_LEASE = 0x00001000; int DB_IMMUTABLE_KEY = 0x00000002; @@ -110,10 +111,12 @@ public interface DbConstants int DB_LOCK_WRITE = 2; int DB_LOCK_YOUNGEST = 9; int DB_LOG_AUTO_REMOVE = 0x00000001; - int DB_LOG_DIRECT = 0x00000002; - int DB_LOG_DSYNC = 0x00000004; - int DB_LOG_IN_MEMORY = 0x00000008; - int DB_LOG_ZERO = 0x00000010; + int DB_LOG_BLOB = 0x00000002; + int DB_LOG_DIRECT = 0x00000004; + int DB_LOG_DSYNC = 0x00000008; + int DB_LOG_IN_MEMORY = 0x00000010; + int DB_LOG_NOSYNC = 0x00000020; + int DB_LOG_ZERO = 0x00000040; int DB_MEM_LOCK = 1; int DB_MEM_LOCKOBJECT = 2; int DB_MEM_LOCKER = 3; @@ -170,21 +173,24 @@ public interface DbConstants int DB_REPMGR_ACKS_QUORUM = 7; int DB_REPMGR_CONF_2SITE_STRICT = 0x00000001; int DB_REPMGR_CONF_ELECTIONS = 0x00000002; + int DB_REPMGR_CONF_PREFMAS_CLIENT = 0x00000004; + int DB_REPMGR_CONF_PREFMAS_MASTER = 0x00000008; int DB_REPMGR_CONNECTED = 1; int DB_REPMGR_DISCONNECTED = 2; int DB_REPMGR_NEED_RESPONSE = 0x00000001; int DB_REPMGR_ISPEER = 0x01; + int DB_REPMGR_ISVIEW = 0x02; int DB_REPMGR_PEER = 0x00000010; int DB_REP_ACK_TIMEOUT = 1; int DB_REP_ANYWHERE = 0x00000001; int DB_REP_CHECKPOINT_DELAY = 2; int DB_REP_CLIENT = 0x00000001; - int DB_REP_CONF_AUTOINIT = 0x00000004; - int DB_REP_CONF_BULK = 0x00000010; - int DB_REP_CONF_DELAYCLIENT = 0x00000020; - int DB_REP_CONF_INMEM = 0x00000040; - int DB_REP_CONF_LEASE = 0x00000080; - int DB_REP_CONF_NOWAIT = 0x00000100; + int DB_REP_CONF_AUTOINIT = 0x00000010; + int DB_REP_CONF_BULK = 0x00000040; + int DB_REP_CONF_DELAYCLIENT = 0x00000080; + int DB_REP_CONF_INMEM = 0x00000200; + int DB_REP_CONF_LEASE = 0x00000400; + int DB_REP_CONF_NOWAIT = 0x00000800; int DB_REP_CONNECTION_RETRY = 3; int DB_REP_DEFAULT_PRIORITY = 100; int DB_REP_ELECTION = 0x00000004; @@ -215,11 +221,14 @@ public interface DbConstants int DB_SET_TXN_TIMEOUT = 0x00000002; int DB_SNAPSHOT = 0x00000200; int DB_STAT_CLEAR = 0x00000001; + int DB_STREAM_READ = 0x00000001; + int DB_STREAM_SYNC_WRITE = 0x00000004; + int DB_STREAM_WRITE = 0x00000002; int DB_SYSTEM_MEM = 0x00080000; int DB_THREAD = 0x00000020; int DB_TIMEOUT = -30971; int DB_TIME_NOTGRANTED = 0x00040000; - int DB_TRUNCATE = 0x00020000; + int DB_TRUNCATE = 0x00040000; int DB_TXN_ABORT = 0; int DB_TXN_APPLY = 1; int DB_TXN_BACKWARD_ROLL = 3; @@ -242,23 +251,23 @@ public interface DbConstants int DB_VERB_DEADLOCK = 0x00000002; int DB_VERB_FILEOPS = 0x00000004; int DB_VERB_FILEOPS_ALL = 0x00000008; - int DB_VERB_RECOVERY = 0x00000010; - int DB_VERB_REGISTER = 0x00000020; - int DB_VERB_REPLICATION = 0x00000040; - int DB_VERB_REPMGR_CONNFAIL = 0x00000080; - int DB_VERB_REPMGR_MISC = 0x00000100; - int DB_VERB_REP_ELECT = 0x00000200; - int DB_VERB_REP_LEASE = 0x00000400; - int DB_VERB_REP_MISC = 0x00000800; - int DB_VERB_REP_MSGS = 0x00001000; - int DB_VERB_REP_SYNC = 0x00002000; - int DB_VERB_REP_SYSTEM = 0x00004000; - int DB_VERB_REP_TEST = 0x00008000; - int DB_VERB_WAITSFOR = 0x00010000; + int DB_VERB_RECOVERY = 0x00000020; + int DB_VERB_REGISTER = 0x00000040; + int DB_VERB_REPLICATION = 0x00000080; + int DB_VERB_REPMGR_CONNFAIL = 0x00000100; + int DB_VERB_REPMGR_MISC = 0x00000200; + int DB_VERB_REP_ELECT = 0x00000400; + int DB_VERB_REP_LEASE = 0x00000800; + int DB_VERB_REP_MISC = 0x00001000; + int DB_VERB_REP_MSGS = 0x00002000; + int DB_VERB_REP_SYNC = 0x00004000; + int DB_VERB_REP_SYSTEM = 0x00008000; + int DB_VERB_REP_TEST = 0x00010000; + int DB_VERB_WAITSFOR = 0x00020000; int DB_VERIFY = 0x00000002; - int DB_VERSION_MAJOR = 5; - int DB_VERSION_MINOR = 3; - int DB_VERSION_PATCH = 21; + int DB_VERSION_MAJOR = 6; + int DB_VERSION_MINOR = 1; + int DB_VERSION_PATCH = 23; int DB_WRITECURSOR = 0x00000010; int DB_YIELDCPU = 0x00080000; } diff --git a/lang/java/src/com/sleepycat/db/internal/DbEnv.java b/lang/java/src/com/sleepycat/db/internal/DbEnv.java index ad8b152f..3f3455c4 100644 --- a/lang/java/src/com/sleepycat/db/internal/DbEnv.java +++ b/lang/java/src/com/sleepycat/db/internal/DbEnv.java @@ -1,6 +1,6 @@ /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). - * Version 2.0.4 + * Version 2.0.12 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -50,6 +50,7 @@ public class DbEnv { private String errpfx; private MessageHandler message_handler; private PanicHandler panic_handler; + private ReplicationViewHandler rep_view_handler; private ReplicationManagerMessageDispatch repmgr_msg_dispatch_handler; private ReplicationTransport rep_transport_handler; private java.io.OutputStream error_stream; @@ -107,6 +108,10 @@ public class DbEnv { event_notify_handler.handlePanicEvent(); } + private final void handle_rep_autotakeover_failed_event_notify() { + event_notify_handler.handleRepAutoTakeoverFailedEvent(); + } + private final void handle_rep_client_event_notify() { event_notify_handler.handleRepClientEvent(); } @@ -135,9 +140,13 @@ public class DbEnv { event_notify_handler.handleRepElectionFailedEvent(); } - private final void handle_rep_init_done_event_notify() { - event_notify_handler.handleRepInitDoneEvent(); - } + private final void handle_rep_init_done_event_notify() { + event_notify_handler.handleRepInitDoneEvent(); + } + + private final void handle_rep_inqueue_full_event_notify() { + event_notify_handler.handleRepInQueueFullEvent(); + } private final void handle_rep_join_failure_event_notify() { event_notify_handler.handleRepJoinFailureEvent(); @@ -255,6 +264,10 @@ public class DbEnv { return panic_handler; } + public final boolean handle_rep_view(String name, int flags) throws com.sleepycat.db.DatabaseException { + return rep_view_handler.partial_view(wrapper, name, flags); + } + private final int handle_rep_transport(DatabaseEntry control, DatabaseEntry rec, LogSequenceNumber lsn, @@ -373,6 +386,12 @@ public class DbEnv { public void fileid_reset(String file, int flags) throws com.sleepycat.db.DatabaseException { db_javaJNI.DbEnv_fileid_reset(swigCPtr, this, file, flags); } + public String get_blob_dir() throws com.sleepycat.db.DatabaseException { + return db_javaJNI.DbEnv_get_blob_dir(swigCPtr, this); + } + + public int get_blob_threshold() throws com.sleepycat.db.DatabaseException { return db_javaJNI.DbEnv_get_blob_threshold(swigCPtr, this); } + public String[] get_data_dirs() throws com.sleepycat.db.DatabaseException { return db_javaJNI.DbEnv_get_data_dirs(swigCPtr, this); } public int get_encrypt_flags() throws com.sleepycat.db.DatabaseException { return db_javaJNI.DbEnv_get_encrypt_flags(swigCPtr, this); } @@ -409,6 +428,10 @@ public class DbEnv { /* package */ void remove0(String db_home, int flags) { db_javaJNI.DbEnv_remove0(swigCPtr, this, db_home, flags); } + public void set_blob_dir(String dir) throws com.sleepycat.db.DatabaseException { db_javaJNI.DbEnv_set_blob_dir(swigCPtr, this, dir); } + + public void set_blob_threshold(int bytes, int flags) throws com.sleepycat.db.DatabaseException { db_javaJNI.DbEnv_set_blob_threshold(swigCPtr, this, bytes, flags); } + public void set_cachesize(long bytes, int ncache) throws com.sleepycat.db.DatabaseException { db_javaJNI.DbEnv_set_cachesize(swigCPtr, this, bytes, ncache); } public void set_cache_max(long bytes) throws com.sleepycat.db.DatabaseException { db_javaJNI.DbEnv_set_cache_max(swigCPtr, this, bytes); } @@ -445,6 +468,10 @@ public class DbEnv { db_javaJNI.DbEnv_set_msgcall(swigCPtr, this, (message_handler = db_msgcall_fcn) != null ); } + public int set_msgfile(String msgfile) /* no exception */ { + return db_javaJNI.DbEnv_set_msgfile(swigCPtr, this, msgfile); + } + public void set_paniccall(com.sleepycat.db.PanicHandler db_panic_fcn) throws com.sleepycat.db.DatabaseException { db_javaJNI.DbEnv_set_paniccall(swigCPtr, this, (panic_handler = db_panic_fcn) != null ); } public void set_shm_key(long shm_key) throws com.sleepycat.db.DatabaseException { db_javaJNI.DbEnv_set_shm_key(swigCPtr, this, shm_key); } @@ -502,6 +529,10 @@ public class DbEnv { public com.sleepycat.db.LockStats lock_stat(int flags) throws com.sleepycat.db.DatabaseException { return db_javaJNI.DbEnv_lock_stat(swigCPtr, this, flags); } + public int lock_stat_print(int flags) throws com.sleepycat.db.DatabaseException { + return db_javaJNI.DbEnv_lock_stat_print(swigCPtr, this, flags); + } + public void set_lk_conflicts(byte[][] conflicts) throws com.sleepycat.db.DatabaseException { db_javaJNI.DbEnv_set_lk_conflicts(swigCPtr, this, conflicts); } public void set_lk_detect(int detect) throws com.sleepycat.db.DatabaseException { db_javaJNI.DbEnv_set_lk_detect(swigCPtr, this, detect); } @@ -563,6 +594,10 @@ public class DbEnv { public com.sleepycat.db.LogStats log_stat(int flags) throws com.sleepycat.db.DatabaseException { return db_javaJNI.DbEnv_log_stat(swigCPtr, this, flags); } + public int log_stat_print(int flags) throws com.sleepycat.db.DatabaseException { + return db_javaJNI.DbEnv_log_stat_print(swigCPtr, this, flags); + } + public int log_verify(String envhome, int cachesz, String dbfile, String dbname, long stime, long etime, int stfile, int stoffset, int efile, int eoffset, int caf, int verbose) throws com.sleepycat.db.DatabaseException { return db_javaJNI.DbEnv_log_verify(swigCPtr, this, envhome, cachesz, dbfile, dbname, stime, etime, stfile, stoffset, efile, eoffset, caf, verbose); } @@ -615,6 +650,10 @@ public class DbEnv { public com.sleepycat.db.CacheStats memp_stat(int flags) throws com.sleepycat.db.DatabaseException { return db_javaJNI.DbEnv_memp_stat(swigCPtr, this, flags); } + public int memp_stat_print(int flags) throws com.sleepycat.db.DatabaseException { + return db_javaJNI.DbEnv_memp_stat_print(swigCPtr, this, flags); + } + public com.sleepycat.db.CacheFileStats[] memp_fstat(int flags) throws com.sleepycat.db.DatabaseException { return db_javaJNI.DbEnv_memp_fstat(swigCPtr, this, flags); } public void memp_sync(com.sleepycat.db.LogSequenceNumber lsn_or_null) throws com.sleepycat.db.DatabaseException { db_javaJNI.DbEnv_memp_sync(swigCPtr, this, lsn_or_null); } @@ -645,12 +684,20 @@ public class DbEnv { public com.sleepycat.db.MutexStats mutex_stat(int flags) throws com.sleepycat.db.DatabaseException { return db_javaJNI.DbEnv_mutex_stat(swigCPtr, this, flags); } + public int mutex_stat_print(int flags) throws com.sleepycat.db.DatabaseException { + return db_javaJNI.DbEnv_mutex_stat_print(swigCPtr, this, flags); + } + public int get_tx_max() throws com.sleepycat.db.DatabaseException { return db_javaJNI.DbEnv_get_tx_max(swigCPtr, this); } public long get_tx_timestamp() throws com.sleepycat.db.DatabaseException { return db_javaJNI.DbEnv_get_tx_timestamp(swigCPtr, this); } public long get_timeout(int flag) throws com.sleepycat.db.DatabaseException { return db_javaJNI.DbEnv_get_timeout(swigCPtr, this, flag); } + public int stat_print(int flags) throws com.sleepycat.db.DatabaseException { + return db_javaJNI.DbEnv_stat_print(swigCPtr, this, flags); + } + public int txn_applied(byte[] token, int maxwait, int flags) throws com.sleepycat.db.DatabaseException { return db_javaJNI.DbEnv_txn_applied(swigCPtr, this, token, maxwait, flags); } @@ -666,6 +713,10 @@ public class DbEnv { public com.sleepycat.db.TransactionStats txn_stat(int flags) throws com.sleepycat.db.DatabaseException { return db_javaJNI.DbEnv_txn_stat(swigCPtr, this, flags); } + public int txn_stat_print(int flags) throws com.sleepycat.db.DatabaseException { + return db_javaJNI.DbEnv_txn_stat_print(swigCPtr, this, flags); + } + public long rep_get_limit() throws com.sleepycat.db.DatabaseException { return db_javaJNI.DbEnv_rep_get_limit(swigCPtr, this); } @@ -694,6 +745,10 @@ public class DbEnv { public com.sleepycat.db.ReplicationStats rep_stat(int flags) throws com.sleepycat.db.DatabaseException { return db_javaJNI.DbEnv_rep_stat(swigCPtr, this, flags); } + public int rep_stat_print(int flags) throws com.sleepycat.db.DatabaseException { + return db_javaJNI.DbEnv_rep_stat_print(swigCPtr, this, flags); + } + public void rep_set_limit(long bytes) throws com.sleepycat.db.DatabaseException { db_javaJNI.DbEnv_rep_set_limit(swigCPtr, this, bytes); } public int rep_get_request_min() throws com.sleepycat.db.DatabaseException { return db_javaJNI.DbEnv_rep_get_request_min(swigCPtr, this); } @@ -709,6 +764,8 @@ public class DbEnv { public void rep_set_transport(int envid, com.sleepycat.db.ReplicationTransport send) throws com.sleepycat.db.DatabaseException { db_javaJNI.DbEnv_rep_set_transport(swigCPtr, this, envid, (rep_transport_handler = send) != null ); } + public void rep_set_view(com.sleepycat.db.ReplicationViewHandler rep_view_fcn) throws com.sleepycat.db.DatabaseException { db_javaJNI.DbEnv_rep_set_view(swigCPtr, this, (rep_view_handler = rep_view_fcn) != null ); } + public int rep_get_nsites() throws com.sleepycat.db.DatabaseException { return db_javaJNI.DbEnv_rep_get_nsites(swigCPtr, this); } public int rep_get_priority() throws com.sleepycat.db.DatabaseException { return db_javaJNI.DbEnv_rep_get_priority(swigCPtr, this); } @@ -725,6 +782,10 @@ public class DbEnv { return db_javaJNI.DbEnv_repmgr_get_ack_policy(swigCPtr, this); } + public long repmgr_get_incoming_queue_max() throws com.sleepycat.db.DatabaseException { + return db_javaJNI.DbEnv_repmgr_get_incoming_queue_max(swigCPtr, this); + } + public DbSite repmgr_local_site() throws com.sleepycat.db.DatabaseException { long cPtr = db_javaJNI.DbEnv_repmgr_local_site(swigCPtr, this); return (cPtr == 0) ? null : new DbSite(cPtr, false); @@ -732,6 +793,8 @@ public class DbEnv { public void repmgr_set_ack_policy(int policy) throws com.sleepycat.db.DatabaseException { db_javaJNI.DbEnv_repmgr_set_ack_policy(swigCPtr, this, policy); } + public void repmgr_set_incoming_queue_max(long bytes) throws com.sleepycat.db.DatabaseException { db_javaJNI.DbEnv_repmgr_set_incoming_queue_max(swigCPtr, this, bytes); } + public DbSite repmgr_site(String host, long port) throws com.sleepycat.db.DatabaseException { long cPtr = db_javaJNI.DbEnv_repmgr_site(swigCPtr, this, host, port); return (cPtr == 0) ? null : new DbSite(cPtr, false); @@ -750,6 +813,10 @@ public class DbEnv { public com.sleepycat.db.ReplicationManagerStats repmgr_stat(int flags) throws com.sleepycat.db.DatabaseException { return db_javaJNI.DbEnv_repmgr_stat(swigCPtr, this, flags); } + public int repmgr_stat_print(int flags) throws com.sleepycat.db.DatabaseException { + return db_javaJNI.DbEnv_repmgr_stat_print(swigCPtr, this, flags); + } + public int get_backup_config(int config_type) throws com.sleepycat.db.DatabaseException { return db_javaJNI.DbEnv_get_backup_config(swigCPtr, this, config_type); } public void backup(String target, int flags) throws com.sleepycat.db.DatabaseException { db_javaJNI.DbEnv_backup(swigCPtr, this, target, flags); } diff --git a/lang/java/src/com/sleepycat/db/internal/DbLock.java b/lang/java/src/com/sleepycat/db/internal/DbLock.java index 8cd42c40..dd64dd85 100644 --- a/lang/java/src/com/sleepycat/db/internal/DbLock.java +++ b/lang/java/src/com/sleepycat/db/internal/DbLock.java @@ -1,6 +1,6 @@ /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). - * Version 2.0.4 + * Version 2.0.12 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. diff --git a/lang/java/src/com/sleepycat/db/internal/DbLogc.java b/lang/java/src/com/sleepycat/db/internal/DbLogc.java index 3b9613dd..a833741f 100644 --- a/lang/java/src/com/sleepycat/db/internal/DbLogc.java +++ b/lang/java/src/com/sleepycat/db/internal/DbLogc.java @@ -1,6 +1,6 @@ /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). - * Version 2.0.4 + * Version 2.0.12 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. diff --git a/lang/java/src/com/sleepycat/db/internal/DbMpoolFile.java b/lang/java/src/com/sleepycat/db/internal/DbMpoolFile.java index 2d05e67b..7ebedb2b 100644 --- a/lang/java/src/com/sleepycat/db/internal/DbMpoolFile.java +++ b/lang/java/src/com/sleepycat/db/internal/DbMpoolFile.java @@ -1,6 +1,6 @@ /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). - * Version 2.0.4 + * Version 2.0.12 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. diff --git a/lang/java/src/com/sleepycat/db/internal/DbSequence.java b/lang/java/src/com/sleepycat/db/internal/DbSequence.java index f4df2b16..38299b85 100644 --- a/lang/java/src/com/sleepycat/db/internal/DbSequence.java +++ b/lang/java/src/com/sleepycat/db/internal/DbSequence.java @@ -1,6 +1,6 @@ /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). - * Version 2.0.4 + * Version 2.0.12 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -90,4 +90,8 @@ public class DbSequence { public com.sleepycat.db.SequenceStats stat(int flags) throws com.sleepycat.db.DatabaseException { return db_javaJNI.DbSequence_stat(swigCPtr, this, flags); } + public int stat_print(int flags) throws com.sleepycat.db.DatabaseException { + return db_javaJNI.DbSequence_stat_print(swigCPtr, this, flags); + } + } diff --git a/lang/java/src/com/sleepycat/db/internal/DbSite.java b/lang/java/src/com/sleepycat/db/internal/DbSite.java index 680a6fc7..5e5ff87c 100644 --- a/lang/java/src/com/sleepycat/db/internal/DbSite.java +++ b/lang/java/src/com/sleepycat/db/internal/DbSite.java @@ -1,6 +1,6 @@ /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). - * Version 2.0.4 + * Version 2.0.12 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. diff --git a/lang/java/src/com/sleepycat/db/internal/DbStream.java b/lang/java/src/com/sleepycat/db/internal/DbStream.java new file mode 100644 index 00000000..aa666baf --- /dev/null +++ b/lang/java/src/com/sleepycat/db/internal/DbStream.java @@ -0,0 +1,59 @@ +/* ---------------------------------------------------------------------------- + * This file was automatically generated by SWIG (http://www.swig.org). + * Version 2.0.12 + * + * Do not make changes to this file unless you know what you are doing--modify + * the SWIG interface file instead. + * ----------------------------------------------------------------------------- */ + +package com.sleepycat.db.internal; + +import com.sleepycat.db.*; +import java.util.Comparator; + +public class DbStream { + private long swigCPtr; + protected boolean swigCMemOwn; + + protected DbStream(long cPtr, boolean cMemoryOwn) { + swigCMemOwn = cMemoryOwn; + swigCPtr = cPtr; + } + + protected static long getCPtr(DbStream obj) { + return (obj == null) ? 0 : obj.swigCPtr; + } + + /* package */ synchronized void delete() { + if (swigCPtr != 0) { + if (swigCMemOwn) { + swigCMemOwn = false; + throw new UnsupportedOperationException("C++ destructor does not have public access"); + } + swigCPtr = 0; + } + } + + public synchronized void close(int flags) throws DatabaseException { + try { + close0(flags); + } finally { + swigCPtr = 0; + } + } + + /* package */ void close0(int flags) { db_javaJNI.DbStream_close0(swigCPtr, this, flags); } + + public int read(com.sleepycat.db.DatabaseEntry data, long offset, int size, int flags) throws com.sleepycat.db.DatabaseException { + return db_javaJNI.DbStream_read(swigCPtr, this, data, offset, size, flags); + } + + public long size(int flags) throws com.sleepycat.db.DatabaseException { + return db_javaJNI.DbStream_size(swigCPtr, this, flags); + } + + public int write(com.sleepycat.db.DatabaseEntry data, long offset, int flags) throws com.sleepycat.db.DatabaseException { + return db_javaJNI.DbStream_write(swigCPtr, this, data, offset, flags); + } + +} diff --git a/lang/java/src/com/sleepycat/db/internal/DbTxn.java b/lang/java/src/com/sleepycat/db/internal/DbTxn.java index b24e8b15..0815f7ed 100644 --- a/lang/java/src/com/sleepycat/db/internal/DbTxn.java +++ b/lang/java/src/com/sleepycat/db/internal/DbTxn.java @@ -1,6 +1,6 @@ /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). - * Version 2.0.4 + * Version 2.0.12 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. diff --git a/lang/java/src/com/sleepycat/db/internal/DbUtil.java b/lang/java/src/com/sleepycat/db/internal/DbUtil.java index 83d6d65e..eae4dda8 100644 --- a/lang/java/src/com/sleepycat/db/internal/DbUtil.java +++ b/lang/java/src/com/sleepycat/db/internal/DbUtil.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2001, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id$ */ diff --git a/lang/java/src/com/sleepycat/db/internal/Dbc.java b/lang/java/src/com/sleepycat/db/internal/Dbc.java index b74f41d7..5dd47fe2 100644 --- a/lang/java/src/com/sleepycat/db/internal/Dbc.java +++ b/lang/java/src/com/sleepycat/db/internal/Dbc.java @@ -1,6 +1,6 @@ /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). - * Version 2.0.4 + * Version 2.0.12 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -50,6 +50,11 @@ public class Dbc { public int count(int flags) throws com.sleepycat.db.DatabaseException { return db_javaJNI.Dbc_count(swigCPtr, this, flags); } + public DbStream db_stream(int flags) throws com.sleepycat.db.DatabaseException { + long cPtr = db_javaJNI.Dbc_db_stream(swigCPtr, this, flags); + return (cPtr == 0) ? null : new DbStream(cPtr, false); + } + public int del(int flags) throws com.sleepycat.db.DatabaseException { return db_javaJNI.Dbc_del(swigCPtr, this, flags); } diff --git a/lang/java/src/com/sleepycat/db/internal/db_java.java b/lang/java/src/com/sleepycat/db/internal/db_java.java index 373ae5a3..01d40188 100644 --- a/lang/java/src/com/sleepycat/db/internal/db_java.java +++ b/lang/java/src/com/sleepycat/db/internal/db_java.java @@ -1,6 +1,6 @@ /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). - * Version 2.0.4 + * Version 2.0.12 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. diff --git a/lang/java/src/com/sleepycat/db/internal/db_javaJNI.java b/lang/java/src/com/sleepycat/db/internal/db_javaJNI.java index 8432d409..bb26fa91 100644 --- a/lang/java/src/com/sleepycat/db/internal/db_javaJNI.java +++ b/lang/java/src/com/sleepycat/db/internal/db_javaJNI.java @@ -1,6 +1,6 @@ /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). - * Version 2.0.4 + * Version 2.0.12 * * Do not make changes to this file unless you know what you are doing--modify * the SWIG interface file instead. @@ -88,6 +88,9 @@ class db_javaJNI { public final static native int Db_exists(long jarg1, Db jarg1_, long jarg2, DbTxn jarg2_, com.sleepycat.db.DatabaseEntry jarg3, int jarg4) throws com.sleepycat.db.DatabaseException; public final static native int Db_get(long jarg1, Db jarg1_, long jarg2, DbTxn jarg2_, com.sleepycat.db.DatabaseEntry jarg3, com.sleepycat.db.DatabaseEntry jarg4, int jarg5) throws com.sleepycat.db.DatabaseException; public final static native int Db_get_assoc_flags(long jarg1, Db jarg1_) throws com.sleepycat.db.DatabaseException; + public final static native String Db_get_blob_dir(long jarg1, Db jarg1_) throws com.sleepycat.db.DatabaseException; + public final static native String Db_get_blob_sub_dir(long jarg1, Db jarg1_) throws com.sleepycat.db.DatabaseException; + public final static native int Db_get_blob_threshold(long jarg1, Db jarg1_) throws com.sleepycat.db.DatabaseException; public final static native boolean Db_get_byteswapped(long jarg1, Db jarg1_) throws com.sleepycat.db.DatabaseException; public final static native long Db_get_cachesize(long jarg1, Db jarg1_) throws com.sleepycat.db.DatabaseException; public final static native int Db_get_cachesize_ncache(long jarg1, Db jarg1_) throws com.sleepycat.db.DatabaseException; @@ -126,6 +129,8 @@ class db_javaJNI { /* package */ final static native void Db_remove0(long jarg1, Db jarg1_, String jarg2, String jarg3, int jarg4); /* package */ final static native void Db_rename0(long jarg1, Db jarg1_, String jarg2, String jarg3, String jarg4, int jarg5); public final static native void Db_set_append_recno(long jarg1, Db jarg1_, boolean jarg2) throws com.sleepycat.db.DatabaseException; + public final static native void Db_set_blob_dir(long jarg1, Db jarg1_, String jarg2) throws com.sleepycat.db.DatabaseException; + public final static native void Db_set_blob_threshold(long jarg1, Db jarg1_, int jarg2, int jarg3) throws com.sleepycat.db.DatabaseException; public final static native void Db_set_bt_compare(long jarg1, Db jarg1_, boolean jarg2) throws com.sleepycat.db.DatabaseException; public final static native void Db_set_bt_minkey(long jarg1, Db jarg1_, int jarg2) throws com.sleepycat.db.DatabaseException; public final static native void Db_set_bt_compress(long jarg1, Db jarg1_, boolean jarg2, boolean jarg3) throws com.sleepycat.db.DatabaseException; @@ -144,6 +149,7 @@ class db_javaJNI { public final static native void Db_set_h_nelem(long jarg1, Db jarg1_, int jarg2) throws com.sleepycat.db.DatabaseException; public final static native void Db_set_lk_exclusive(long jarg1, Db jarg1_, int jarg2) throws com.sleepycat.db.DatabaseException; public final static native void Db_set_lorder(long jarg1, Db jarg1_, int jarg2) throws com.sleepycat.db.DatabaseException; + public final static native int Db_set_msgfile(long jarg1, Db jarg1_, String jarg2) /* no exception */; public final static native void Db_set_pagesize(long jarg1, Db jarg1_, long jarg2) throws com.sleepycat.db.DatabaseException; public final static native void Db_set_partition(long jarg1, Db jarg1_, int jarg2, com.sleepycat.db.DatabaseEntry jarg3, boolean jarg4) throws com.sleepycat.db.DatabaseException; public final static native void Db_set_partition_dirs(long jarg1, Db jarg1_, String[] jarg2) throws com.sleepycat.db.DatabaseException; @@ -155,6 +161,7 @@ class db_javaJNI { public final static native void Db_set_q_extentsize(long jarg1, Db jarg1_, int jarg2) throws com.sleepycat.db.DatabaseException; public final static native void Db_sort_multiple(long jarg1, Db jarg1_, com.sleepycat.db.DatabaseEntry jarg2, com.sleepycat.db.DatabaseEntry jarg3) throws com.sleepycat.db.DatabaseException; public final static native Object Db_stat(long jarg1, Db jarg1_, long jarg2, DbTxn jarg2_, int jarg3) throws com.sleepycat.db.DatabaseException; + public final static native int Db_stat_print(long jarg1, Db jarg1_, int jarg2) throws com.sleepycat.db.DatabaseException; public final static native void Db_sync(long jarg1, Db jarg1_, int jarg2) throws com.sleepycat.db.DatabaseException; public final static native int Db_truncate(long jarg1, Db jarg1_, long jarg2, DbTxn jarg2_, int jarg3) throws com.sleepycat.db.DatabaseException; public final static native void Db_upgrade(long jarg1, Db jarg1_, String jarg2, int jarg3) throws com.sleepycat.db.DatabaseException; @@ -162,6 +169,7 @@ class db_javaJNI { /* package */ final static native void Dbc_close0(long jarg1, Dbc jarg1_); public final static native int Dbc_cmp(long jarg1, Dbc jarg1_, long jarg2, Dbc jarg2_, int jarg3) throws com.sleepycat.db.DatabaseException; public final static native int Dbc_count(long jarg1, Dbc jarg1_, int jarg2) throws com.sleepycat.db.DatabaseException; + public final static native long Dbc_db_stream(long jarg1, Dbc jarg1_, int jarg2) throws com.sleepycat.db.DatabaseException; public final static native int Dbc_del(long jarg1, Dbc jarg1_, int jarg2) throws com.sleepycat.db.DatabaseException; public final static native long Dbc_dup(long jarg1, Dbc jarg1_, int jarg2) throws com.sleepycat.db.DatabaseException; public final static native int Dbc_get(long jarg1, Dbc jarg1_, com.sleepycat.db.DatabaseEntry jarg2, com.sleepycat.db.DatabaseEntry jarg3, int jarg4) throws com.sleepycat.db.DatabaseException; @@ -177,6 +185,8 @@ class db_javaJNI { public final static native void DbEnv_errx(long jarg1, DbEnv jarg1_, String jarg2) /* no exception */; public final static native long DbEnv_cdsgroup_begin(long jarg1, DbEnv jarg1_) throws com.sleepycat.db.DatabaseException; public final static native void DbEnv_fileid_reset(long jarg1, DbEnv jarg1_, String jarg2, int jarg3) throws com.sleepycat.db.DatabaseException; + public final static native String DbEnv_get_blob_dir(long jarg1, DbEnv jarg1_) throws com.sleepycat.db.DatabaseException; + public final static native int DbEnv_get_blob_threshold(long jarg1, DbEnv jarg1_) throws com.sleepycat.db.DatabaseException; public final static native String[] DbEnv_get_data_dirs(long jarg1, DbEnv jarg1_) throws com.sleepycat.db.DatabaseException; public final static native int DbEnv_get_encrypt_flags(long jarg1, DbEnv jarg1_) throws com.sleepycat.db.DatabaseException; public final static native int DbEnv_get_flags(long jarg1, DbEnv jarg1_) throws com.sleepycat.db.DatabaseException; @@ -191,6 +201,8 @@ class db_javaJNI { public final static native void DbEnv_lsn_reset(long jarg1, DbEnv jarg1_, String jarg2, int jarg3) throws com.sleepycat.db.DatabaseException; public final static native void DbEnv_open(long jarg1, DbEnv jarg1_, String jarg2, int jarg3, int jarg4) throws com.sleepycat.db.DatabaseException, java.io.FileNotFoundException; /* package */ final static native void DbEnv_remove0(long jarg1, DbEnv jarg1_, String jarg2, int jarg3); + public final static native void DbEnv_set_blob_dir(long jarg1, DbEnv jarg1_, String jarg2) throws com.sleepycat.db.DatabaseException; + public final static native void DbEnv_set_blob_threshold(long jarg1, DbEnv jarg1_, int jarg2, int jarg3) throws com.sleepycat.db.DatabaseException; public final static native void DbEnv_set_cachesize(long jarg1, DbEnv jarg1_, long jarg2, int jarg3) throws com.sleepycat.db.DatabaseException; public final static native void DbEnv_set_cache_max(long jarg1, DbEnv jarg1_, long jarg2) throws com.sleepycat.db.DatabaseException; public final static native void DbEnv_set_create_dir(long jarg1, DbEnv jarg1_, String jarg2) throws com.sleepycat.db.DatabaseException; @@ -207,6 +219,7 @@ class db_javaJNI { public final static native void DbEnv_set_mp_pagesize(long jarg1, DbEnv jarg1_, int jarg2) throws com.sleepycat.db.DatabaseException; public final static native void DbEnv_set_mp_tablesize(long jarg1, DbEnv jarg1_, int jarg2) throws com.sleepycat.db.DatabaseException; public final static native void DbEnv_set_msgcall(long jarg1, DbEnv jarg1_, boolean jarg2) /* no exception */; + public final static native int DbEnv_set_msgfile(long jarg1, DbEnv jarg1_, String jarg2) /* no exception */; public final static native void DbEnv_set_paniccall(long jarg1, DbEnv jarg1_, boolean jarg2) throws com.sleepycat.db.DatabaseException; public final static native void DbEnv_set_shm_key(long jarg1, DbEnv jarg1_, long jarg2) throws com.sleepycat.db.DatabaseException; public final static native void DbEnv_set_timeout(long jarg1, DbEnv jarg1_, long jarg2, int jarg3) throws com.sleepycat.db.DatabaseException; @@ -232,6 +245,7 @@ class db_javaJNI { public final static native void DbEnv_lock_id_free(long jarg1, DbEnv jarg1_, int jarg2) throws com.sleepycat.db.DatabaseException; public final static native void DbEnv_lock_put(long jarg1, DbEnv jarg1_, long jarg2, DbLock jarg2_) throws com.sleepycat.db.DatabaseException; public final static native com.sleepycat.db.LockStats DbEnv_lock_stat(long jarg1, DbEnv jarg1_, int jarg2) throws com.sleepycat.db.DatabaseException; + public final static native int DbEnv_lock_stat_print(long jarg1, DbEnv jarg1_, int jarg2) throws com.sleepycat.db.DatabaseException; public final static native void DbEnv_set_lk_conflicts(long jarg1, DbEnv jarg1_, byte[][] jarg2) throws com.sleepycat.db.DatabaseException; public final static native void DbEnv_set_lk_detect(long jarg1, DbEnv jarg1_, int jarg2) throws com.sleepycat.db.DatabaseException; public final static native void DbEnv_set_lk_max_lockers(long jarg1, DbEnv jarg1_, int jarg2) throws com.sleepycat.db.DatabaseException; @@ -257,6 +271,7 @@ class db_javaJNI { public final static native void DbEnv_log_print(long jarg1, DbEnv jarg1_, long jarg2, DbTxn jarg2_, String jarg3) throws com.sleepycat.db.DatabaseException; public final static native void DbEnv_log_set_config(long jarg1, DbEnv jarg1_, int jarg2, boolean jarg3) throws com.sleepycat.db.DatabaseException; public final static native com.sleepycat.db.LogStats DbEnv_log_stat(long jarg1, DbEnv jarg1_, int jarg2) throws com.sleepycat.db.DatabaseException; + public final static native int DbEnv_log_stat_print(long jarg1, DbEnv jarg1_, int jarg2) throws com.sleepycat.db.DatabaseException; public final static native int DbEnv_log_verify(long jarg1, DbEnv jarg1_, String jarg2, int jarg3, String jarg4, String jarg5, long jarg6, long jarg7, int jarg8, int jarg9, int jarg10, int jarg11, int jarg12, int jarg13) throws com.sleepycat.db.DatabaseException; public final static native void DbEnv_set_lg_bsize(long jarg1, DbEnv jarg1_, int jarg2) throws com.sleepycat.db.DatabaseException; public final static native void DbEnv_set_lg_dir(long jarg1, DbEnv jarg1_, String jarg2) throws com.sleepycat.db.DatabaseException; @@ -274,6 +289,7 @@ class db_javaJNI { public final static native int DbEnv_get_mp_pagesize(long jarg1, DbEnv jarg1_) throws com.sleepycat.db.DatabaseException; public final static native int DbEnv_get_mp_tablesize(long jarg1, DbEnv jarg1_) throws com.sleepycat.db.DatabaseException; public final static native com.sleepycat.db.CacheStats DbEnv_memp_stat(long jarg1, DbEnv jarg1_, int jarg2) throws com.sleepycat.db.DatabaseException; + public final static native int DbEnv_memp_stat_print(long jarg1, DbEnv jarg1_, int jarg2) throws com.sleepycat.db.DatabaseException; public final static native com.sleepycat.db.CacheFileStats[] DbEnv_memp_fstat(long jarg1, DbEnv jarg1_, int jarg2) throws com.sleepycat.db.DatabaseException; public final static native void DbEnv_memp_sync(long jarg1, DbEnv jarg1_, com.sleepycat.db.LogSequenceNumber jarg2) throws com.sleepycat.db.DatabaseException; public final static native int DbEnv_memp_trickle(long jarg1, DbEnv jarg1_, int jarg2) throws com.sleepycat.db.DatabaseException; @@ -288,14 +304,17 @@ class db_javaJNI { public final static native void DbEnv_mutex_set_max(long jarg1, DbEnv jarg1_, int jarg2) throws com.sleepycat.db.DatabaseException; public final static native void DbEnv_mutex_set_tas_spins(long jarg1, DbEnv jarg1_, int jarg2) throws com.sleepycat.db.DatabaseException; public final static native com.sleepycat.db.MutexStats DbEnv_mutex_stat(long jarg1, DbEnv jarg1_, int jarg2) throws com.sleepycat.db.DatabaseException; + public final static native int DbEnv_mutex_stat_print(long jarg1, DbEnv jarg1_, int jarg2) throws com.sleepycat.db.DatabaseException; public final static native int DbEnv_get_tx_max(long jarg1, DbEnv jarg1_) throws com.sleepycat.db.DatabaseException; public final static native long DbEnv_get_tx_timestamp(long jarg1, DbEnv jarg1_) throws com.sleepycat.db.DatabaseException; public final static native long DbEnv_get_timeout(long jarg1, DbEnv jarg1_, int jarg2) throws com.sleepycat.db.DatabaseException; + public final static native int DbEnv_stat_print(long jarg1, DbEnv jarg1_, int jarg2) throws com.sleepycat.db.DatabaseException; public final static native int DbEnv_txn_applied(long jarg1, DbEnv jarg1_, byte[] jarg2, int jarg3, int jarg4) throws com.sleepycat.db.DatabaseException; public final static native long DbEnv_txn_begin(long jarg1, DbEnv jarg1_, long jarg2, DbTxn jarg2_, int jarg3) throws com.sleepycat.db.DatabaseException; public final static native void DbEnv_txn_checkpoint(long jarg1, DbEnv jarg1_, int jarg2, int jarg3, int jarg4) throws com.sleepycat.db.DatabaseException; public final static native com.sleepycat.db.PreparedTransaction[] DbEnv_txn_recover(long jarg1, DbEnv jarg1_, long jarg2, long jarg3) throws com.sleepycat.db.DatabaseException; public final static native com.sleepycat.db.TransactionStats DbEnv_txn_stat(long jarg1, DbEnv jarg1_, int jarg2) throws com.sleepycat.db.DatabaseException; + public final static native int DbEnv_txn_stat_print(long jarg1, DbEnv jarg1_, int jarg2) throws com.sleepycat.db.DatabaseException; public final static native long DbEnv_rep_get_limit(long jarg1, DbEnv jarg1_) throws com.sleepycat.db.DatabaseException; public final static native void DbEnv_rep_elect(long jarg1, DbEnv jarg1_, int jarg2, int jarg3, int jarg4) throws com.sleepycat.db.DatabaseException; public final static native int DbEnv_rep_process_message(long jarg1, DbEnv jarg1_, com.sleepycat.db.DatabaseEntry jarg2, com.sleepycat.db.DatabaseEntry jarg3, int jarg4, com.sleepycat.db.LogSequenceNumber jarg5) /* no exception */; @@ -308,12 +327,14 @@ class db_javaJNI { public final static native void DbEnv_rep_sync(long jarg1, DbEnv jarg1_, int jarg2) throws com.sleepycat.db.DatabaseException; public final static native boolean DbEnv_rep_get_config(long jarg1, DbEnv jarg1_, int jarg2) throws com.sleepycat.db.DatabaseException; public final static native com.sleepycat.db.ReplicationStats DbEnv_rep_stat(long jarg1, DbEnv jarg1_, int jarg2) throws com.sleepycat.db.DatabaseException; + public final static native int DbEnv_rep_stat_print(long jarg1, DbEnv jarg1_, int jarg2) throws com.sleepycat.db.DatabaseException; public final static native void DbEnv_rep_set_limit(long jarg1, DbEnv jarg1_, long jarg2) throws com.sleepycat.db.DatabaseException; public final static native int DbEnv_rep_get_request_min(long jarg1, DbEnv jarg1_) throws com.sleepycat.db.DatabaseException; public final static native int DbEnv_rep_get_request_max(long jarg1, DbEnv jarg1_) throws com.sleepycat.db.DatabaseException; public final static native long DbEnv_repmgr_channel(long jarg1, DbEnv jarg1_, int jarg2, int jarg3) throws com.sleepycat.db.DatabaseException; public final static native void DbEnv_rep_set_request(long jarg1, DbEnv jarg1_, int jarg2, int jarg3) throws com.sleepycat.db.DatabaseException; public final static native void DbEnv_rep_set_transport(long jarg1, DbEnv jarg1_, int jarg2, boolean jarg3) throws com.sleepycat.db.DatabaseException; + public final static native void DbEnv_rep_set_view(long jarg1, DbEnv jarg1_, boolean jarg2) throws com.sleepycat.db.DatabaseException; public final static native int DbEnv_rep_get_nsites(long jarg1, DbEnv jarg1_) throws com.sleepycat.db.DatabaseException; public final static native int DbEnv_rep_get_priority(long jarg1, DbEnv jarg1_) throws com.sleepycat.db.DatabaseException; public final static native int DbEnv_rep_get_timeout(long jarg1, DbEnv jarg1_, int jarg2) throws com.sleepycat.db.DatabaseException; @@ -321,14 +342,17 @@ class db_javaJNI { public final static native void DbEnv_rep_set_priority(long jarg1, DbEnv jarg1_, int jarg2) throws com.sleepycat.db.DatabaseException; public final static native void DbEnv_rep_set_timeout(long jarg1, DbEnv jarg1_, int jarg2, long jarg3) throws com.sleepycat.db.DatabaseException; public final static native int DbEnv_repmgr_get_ack_policy(long jarg1, DbEnv jarg1_) throws com.sleepycat.db.DatabaseException; + public final static native long DbEnv_repmgr_get_incoming_queue_max(long jarg1, DbEnv jarg1_) throws com.sleepycat.db.DatabaseException; public final static native long DbEnv_repmgr_local_site(long jarg1, DbEnv jarg1_) throws com.sleepycat.db.DatabaseException; public final static native void DbEnv_repmgr_set_ack_policy(long jarg1, DbEnv jarg1_, int jarg2) throws com.sleepycat.db.DatabaseException; + public final static native void DbEnv_repmgr_set_incoming_queue_max(long jarg1, DbEnv jarg1_, long jarg2) throws com.sleepycat.db.DatabaseException; public final static native long DbEnv_repmgr_site(long jarg1, DbEnv jarg1_, String jarg2, long jarg3) throws com.sleepycat.db.DatabaseException; public final static native long DbEnv_repmgr_site_by_eid(long jarg1, DbEnv jarg1_, int jarg2) throws com.sleepycat.db.DatabaseException; public final static native void DbEnv_repmgr_set_dispatch(long jarg1, DbEnv jarg1_, boolean jarg2, int jarg3) throws com.sleepycat.db.DatabaseException; public final static native com.sleepycat.db.ReplicationManagerSiteInfo[] DbEnv_repmgr_site_list(long jarg1, DbEnv jarg1_) throws com.sleepycat.db.DatabaseException; public final static native void DbEnv_repmgr_start(long jarg1, DbEnv jarg1_, int jarg2, int jarg3) throws com.sleepycat.db.DatabaseException; public final static native com.sleepycat.db.ReplicationManagerStats DbEnv_repmgr_stat(long jarg1, DbEnv jarg1_, int jarg2) throws com.sleepycat.db.DatabaseException; + public final static native int DbEnv_repmgr_stat_print(long jarg1, DbEnv jarg1_, int jarg2) throws com.sleepycat.db.DatabaseException; public final static native int DbEnv_get_backup_config(long jarg1, DbEnv jarg1_, int jarg2) throws com.sleepycat.db.DatabaseException; public final static native void DbEnv_backup(long jarg1, DbEnv jarg1_, String jarg2, int jarg3) throws com.sleepycat.db.DatabaseException; public final static native void DbEnv_dbbackup(long jarg1, DbEnv jarg1_, String jarg2, String jarg3, int jarg4) throws com.sleepycat.db.DatabaseException; @@ -368,12 +392,17 @@ class db_javaJNI { public final static native void DbSequence_set_flags(long jarg1, DbSequence jarg1_, int jarg2) throws com.sleepycat.db.DatabaseException; public final static native void DbSequence_set_range(long jarg1, DbSequence jarg1_, long jarg2, long jarg3) throws com.sleepycat.db.DatabaseException; public final static native com.sleepycat.db.SequenceStats DbSequence_stat(long jarg1, DbSequence jarg1_, int jarg2) throws com.sleepycat.db.DatabaseException; + public final static native int DbSequence_stat_print(long jarg1, DbSequence jarg1_, int jarg2) throws com.sleepycat.db.DatabaseException; /* package */ final static native void DbSite_close0(long jarg1, DbSite jarg1_); public final static native com.sleepycat.db.ReplicationHostAddress DbSite_get_address(long jarg1, DbSite jarg1_) throws com.sleepycat.db.DatabaseException; public final static native boolean DbSite_get_config(long jarg1, DbSite jarg1_, int jarg2) throws com.sleepycat.db.DatabaseException; public final static native int DbSite_get_eid(long jarg1, DbSite jarg1_) throws com.sleepycat.db.DatabaseException; /* package */ final static native void DbSite_remove0(long jarg1, DbSite jarg1_); public final static native void DbSite_set_config(long jarg1, DbSite jarg1_, int jarg2, boolean jarg3) throws com.sleepycat.db.DatabaseException; + /* package */ final static native void DbStream_close0(long jarg1, DbStream jarg1_, int jarg2); + public final static native int DbStream_read(long jarg1, DbStream jarg1_, com.sleepycat.db.DatabaseEntry jarg2, long jarg3, int jarg4, int jarg5) throws com.sleepycat.db.DatabaseException; + public final static native long DbStream_size(long jarg1, DbStream jarg1_, int jarg2) throws com.sleepycat.db.DatabaseException; + public final static native int DbStream_write(long jarg1, DbStream jarg1_, com.sleepycat.db.DatabaseEntry jarg2, long jarg3, int jarg4) throws com.sleepycat.db.DatabaseException; /* package */ final static native void DbTxn_abort0(long jarg1, DbTxn jarg1_); /* package */ final static native void DbTxn_discard0(long jarg1, DbTxn jarg1_, int jarg2); public final static native String DbTxn_get_name(long jarg1, DbTxn jarg1_) throws com.sleepycat.db.DatabaseException; diff --git a/lang/java/src/com/sleepycat/db/package.html b/lang/java/src/com/sleepycat/db/package.html index 8e00efdf..305e6362 100644 --- a/lang/java/src/com/sleepycat/db/package.html +++ b/lang/java/src/com/sleepycat/db/package.html @@ -5,7 +5,7 @@ See the file LICENSE for redistribution information. - Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. $Id$ diff --git a/lang/java/src/com/sleepycat/persist/BasicCursor.java b/lang/java/src/com/sleepycat/persist/BasicCursor.java index c5291484..22b7f27e 100644 --- a/lang/java/src/com/sleepycat/persist/BasicCursor.java +++ b/lang/java/src/com/sleepycat/persist/BasicCursor.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/BasicIndex.java b/lang/java/src/com/sleepycat/persist/BasicIndex.java index 19abf98b..ecc4742a 100644 --- a/lang/java/src/com/sleepycat/persist/BasicIndex.java +++ b/lang/java/src/com/sleepycat/persist/BasicIndex.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/BasicIterator.java b/lang/java/src/com/sleepycat/persist/BasicIterator.java index e87d2212..7b01e93d 100644 --- a/lang/java/src/com/sleepycat/persist/BasicIterator.java +++ b/lang/java/src/com/sleepycat/persist/BasicIterator.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/DataValueAdapter.java b/lang/java/src/com/sleepycat/persist/DataValueAdapter.java index 2c2c1b02..f82a00c6 100644 --- a/lang/java/src/com/sleepycat/persist/DataValueAdapter.java +++ b/lang/java/src/com/sleepycat/persist/DataValueAdapter.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/DatabaseNamer.java b/lang/java/src/com/sleepycat/persist/DatabaseNamer.java index f5137acc..a398a07e 100644 --- a/lang/java/src/com/sleepycat/persist/DatabaseNamer.java +++ b/lang/java/src/com/sleepycat/persist/DatabaseNamer.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/EntityCursor.java b/lang/java/src/com/sleepycat/persist/EntityCursor.java index a255b942..9e74760b 100644 --- a/lang/java/src/com/sleepycat/persist/EntityCursor.java +++ b/lang/java/src/com/sleepycat/persist/EntityCursor.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/EntityIndex.java b/lang/java/src/com/sleepycat/persist/EntityIndex.java index 32181483..4f280a15 100644 --- a/lang/java/src/com/sleepycat/persist/EntityIndex.java +++ b/lang/java/src/com/sleepycat/persist/EntityIndex.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/EntityJoin.java b/lang/java/src/com/sleepycat/persist/EntityJoin.java index 447cccd9..4863dd32 100644 --- a/lang/java/src/com/sleepycat/persist/EntityJoin.java +++ b/lang/java/src/com/sleepycat/persist/EntityJoin.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/EntityStore.java b/lang/java/src/com/sleepycat/persist/EntityStore.java index b2e25477..ca8afeb7 100644 --- a/lang/java/src/com/sleepycat/persist/EntityStore.java +++ b/lang/java/src/com/sleepycat/persist/EntityStore.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/EntityValueAdapter.java b/lang/java/src/com/sleepycat/persist/EntityValueAdapter.java index d4d57172..83cd157c 100644 --- a/lang/java/src/com/sleepycat/persist/EntityValueAdapter.java +++ b/lang/java/src/com/sleepycat/persist/EntityValueAdapter.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/ForwardCursor.java b/lang/java/src/com/sleepycat/persist/ForwardCursor.java index 144df6fb..b6778818 100644 --- a/lang/java/src/com/sleepycat/persist/ForwardCursor.java +++ b/lang/java/src/com/sleepycat/persist/ForwardCursor.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/IndexNotAvailableException.java b/lang/java/src/com/sleepycat/persist/IndexNotAvailableException.java index b9a7a503..f805dc7f 100644 --- a/lang/java/src/com/sleepycat/persist/IndexNotAvailableException.java +++ b/lang/java/src/com/sleepycat/persist/IndexNotAvailableException.java @@ -1,7 +1,7 @@ /* * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/KeySelector.java b/lang/java/src/com/sleepycat/persist/KeySelector.java index 70cdd8ef..dd9f1ec5 100644 --- a/lang/java/src/com/sleepycat/persist/KeySelector.java +++ b/lang/java/src/com/sleepycat/persist/KeySelector.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/KeyValueAdapter.java b/lang/java/src/com/sleepycat/persist/KeyValueAdapter.java index 4d8ed2e6..f6e9c915 100644 --- a/lang/java/src/com/sleepycat/persist/KeyValueAdapter.java +++ b/lang/java/src/com/sleepycat/persist/KeyValueAdapter.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/KeysIndex.java b/lang/java/src/com/sleepycat/persist/KeysIndex.java index a3aba5f9..87db9442 100644 --- a/lang/java/src/com/sleepycat/persist/KeysIndex.java +++ b/lang/java/src/com/sleepycat/persist/KeysIndex.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/PrimaryIndex.java b/lang/java/src/com/sleepycat/persist/PrimaryIndex.java index 2d988a20..0552a5f6 100644 --- a/lang/java/src/com/sleepycat/persist/PrimaryIndex.java +++ b/lang/java/src/com/sleepycat/persist/PrimaryIndex.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ @@ -564,7 +564,6 @@ public class PrimaryIndex<PK, E> extends BasicIndex<PK, E> { } /** - * @hidden * For internal use only. * * Used for obtaining the auto-commit txn config from the store, which diff --git a/lang/java/src/com/sleepycat/persist/PrimaryKeyValueAdapter.java b/lang/java/src/com/sleepycat/persist/PrimaryKeyValueAdapter.java index 0706f69f..c2f770e8 100644 --- a/lang/java/src/com/sleepycat/persist/PrimaryKeyValueAdapter.java +++ b/lang/java/src/com/sleepycat/persist/PrimaryKeyValueAdapter.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/SecondaryIndex.java b/lang/java/src/com/sleepycat/persist/SecondaryIndex.java index 3bf819b2..d931ca24 100644 --- a/lang/java/src/com/sleepycat/persist/SecondaryIndex.java +++ b/lang/java/src/com/sleepycat/persist/SecondaryIndex.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ @@ -978,7 +978,6 @@ public class SecondaryIndex<SK, PK, E> extends BasicIndex<SK, E> { } /** - * @hidden * For internal use only. * * Used for obtaining the auto-commit txn config from the store, which diff --git a/lang/java/src/com/sleepycat/persist/StoreConfig.java b/lang/java/src/com/sleepycat/persist/StoreConfig.java index 1a5fa39d..d7f42ee9 100644 --- a/lang/java/src/com/sleepycat/persist/StoreConfig.java +++ b/lang/java/src/com/sleepycat/persist/StoreConfig.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ @@ -90,7 +90,6 @@ public class StoreConfig implements Cloneable { } /** - * @hidden * The void return setter for use by Bean editors. */ public void setAllowCreateVoid(boolean allowCreate) { @@ -118,7 +117,6 @@ public class StoreConfig implements Cloneable { } /** - * @hidden * The void return setter for use by Bean editors. */ public void setExclusiveCreateVoid(boolean exclusiveCreate) { @@ -146,7 +144,6 @@ public class StoreConfig implements Cloneable { } /** - * @hidden * The void return setter for use by Bean editors. */ public void setTransactionalVoid(boolean transactional) { @@ -174,7 +171,6 @@ public class StoreConfig implements Cloneable { } /** - * @hidden * The void return setter for use by Bean editors. */ public void setReadOnlyVoid(boolean readOnly) { @@ -222,7 +218,6 @@ public class StoreConfig implements Cloneable { } /** - * @hidden * The void return setter for use by Bean editors. */ public void setSecondaryBulkLoadVoid(boolean secondaryBulkLoad) { @@ -248,7 +243,6 @@ public class StoreConfig implements Cloneable { } /** - * @hidden * The void return setter for use by Bean editors. */ public void setModelVoid(EntityModel model) { @@ -288,7 +282,6 @@ public class StoreConfig implements Cloneable { } /** - * @hidden * The void return setter for use by Bean editors. */ public void setMutationsVoid(Mutations mutations) { @@ -316,7 +309,6 @@ public class StoreConfig implements Cloneable { } /** - * @hidden * The void return setter for use by Bean editors. */ public void setDatabaseNamerVoid(DatabaseNamer databaseNamer) { diff --git a/lang/java/src/com/sleepycat/persist/StoreConfigBeanInfo.java b/lang/java/src/com/sleepycat/persist/StoreConfigBeanInfo.java index 8acd27d7..0ebdf01f 100644 --- a/lang/java/src/com/sleepycat/persist/StoreConfigBeanInfo.java +++ b/lang/java/src/com/sleepycat/persist/StoreConfigBeanInfo.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/StoreExistsException.java b/lang/java/src/com/sleepycat/persist/StoreExistsException.java index 7c6886f3..d5977b2d 100644 --- a/lang/java/src/com/sleepycat/persist/StoreExistsException.java +++ b/lang/java/src/com/sleepycat/persist/StoreExistsException.java @@ -1,7 +1,7 @@ /* * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id: StoreExistsException.java,v 0f73af5ae3da 2010/05/10 05:38:40 alexander $ */ diff --git a/lang/java/src/com/sleepycat/persist/StoreNotFoundException.java b/lang/java/src/com/sleepycat/persist/StoreNotFoundException.java index ccc70d96..59b1e369 100644 --- a/lang/java/src/com/sleepycat/persist/StoreNotFoundException.java +++ b/lang/java/src/com/sleepycat/persist/StoreNotFoundException.java @@ -1,7 +1,7 @@ /* * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id: StoreNotFoundException.java,v 0f73af5ae3da 2010/05/10 05:38:40 alexander $ */ diff --git a/lang/java/src/com/sleepycat/persist/SubIndex.java b/lang/java/src/com/sleepycat/persist/SubIndex.java index 117c3071..fcf28c4a 100644 --- a/lang/java/src/com/sleepycat/persist/SubIndex.java +++ b/lang/java/src/com/sleepycat/persist/SubIndex.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/SubIndexCursor.java b/lang/java/src/com/sleepycat/persist/SubIndexCursor.java index 4fc215e4..7a3150fb 100644 --- a/lang/java/src/com/sleepycat/persist/SubIndexCursor.java +++ b/lang/java/src/com/sleepycat/persist/SubIndexCursor.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/ValueAdapter.java b/lang/java/src/com/sleepycat/persist/ValueAdapter.java index 8e234081..9898f6ae 100644 --- a/lang/java/src/com/sleepycat/persist/ValueAdapter.java +++ b/lang/java/src/com/sleepycat/persist/ValueAdapter.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/evolve/Conversion.java b/lang/java/src/com/sleepycat/persist/evolve/Conversion.java index ebc33f5d..ffb682ae 100644 --- a/lang/java/src/com/sleepycat/persist/evolve/Conversion.java +++ b/lang/java/src/com/sleepycat/persist/evolve/Conversion.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/evolve/Converter.java b/lang/java/src/com/sleepycat/persist/evolve/Converter.java index b5aed18a..9d93788c 100644 --- a/lang/java/src/com/sleepycat/persist/evolve/Converter.java +++ b/lang/java/src/com/sleepycat/persist/evolve/Converter.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/evolve/DeletedClassException.java b/lang/java/src/com/sleepycat/persist/evolve/DeletedClassException.java index a38ba2a5..5b48883d 100644 --- a/lang/java/src/com/sleepycat/persist/evolve/DeletedClassException.java +++ b/lang/java/src/com/sleepycat/persist/evolve/DeletedClassException.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id: DeletedClassException.java,v 0f73af5ae3da 2010/05/10 05:38:40 alexander $ */ diff --git a/lang/java/src/com/sleepycat/persist/evolve/Deleter.java b/lang/java/src/com/sleepycat/persist/evolve/Deleter.java index cbe3d5a3..db64d780 100644 --- a/lang/java/src/com/sleepycat/persist/evolve/Deleter.java +++ b/lang/java/src/com/sleepycat/persist/evolve/Deleter.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/evolve/EntityConverter.java b/lang/java/src/com/sleepycat/persist/evolve/EntityConverter.java index 07d5157e..d20adcb0 100644 --- a/lang/java/src/com/sleepycat/persist/evolve/EntityConverter.java +++ b/lang/java/src/com/sleepycat/persist/evolve/EntityConverter.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/evolve/EvolveConfig.java b/lang/java/src/com/sleepycat/persist/evolve/EvolveConfig.java index 461ac314..7d5d6d0e 100644 --- a/lang/java/src/com/sleepycat/persist/evolve/EvolveConfig.java +++ b/lang/java/src/com/sleepycat/persist/evolve/EvolveConfig.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ @@ -83,7 +83,6 @@ public class EvolveConfig implements Cloneable { } /** - * @hidden * The void return setter for use by Bean editors. */ public void setEvolveListenerVoid(EvolveListener listener) { diff --git a/lang/java/src/com/sleepycat/persist/evolve/EvolveConfigBeanInfo.java b/lang/java/src/com/sleepycat/persist/evolve/EvolveConfigBeanInfo.java index 4500e805..ab131d76 100644 --- a/lang/java/src/com/sleepycat/persist/evolve/EvolveConfigBeanInfo.java +++ b/lang/java/src/com/sleepycat/persist/evolve/EvolveConfigBeanInfo.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/evolve/EvolveEvent.java b/lang/java/src/com/sleepycat/persist/evolve/EvolveEvent.java index 692d60af..603704ce 100644 --- a/lang/java/src/com/sleepycat/persist/evolve/EvolveEvent.java +++ b/lang/java/src/com/sleepycat/persist/evolve/EvolveEvent.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/evolve/EvolveInternal.java b/lang/java/src/com/sleepycat/persist/evolve/EvolveInternal.java index 77713b68..680c7ad8 100644 --- a/lang/java/src/com/sleepycat/persist/evolve/EvolveInternal.java +++ b/lang/java/src/com/sleepycat/persist/evolve/EvolveInternal.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/evolve/EvolveListener.java b/lang/java/src/com/sleepycat/persist/evolve/EvolveListener.java index 828fec8b..a1458259 100644 --- a/lang/java/src/com/sleepycat/persist/evolve/EvolveListener.java +++ b/lang/java/src/com/sleepycat/persist/evolve/EvolveListener.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/evolve/EvolveStats.java b/lang/java/src/com/sleepycat/persist/evolve/EvolveStats.java index e5b64148..ee12021d 100644 --- a/lang/java/src/com/sleepycat/persist/evolve/EvolveStats.java +++ b/lang/java/src/com/sleepycat/persist/evolve/EvolveStats.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/evolve/IncompatibleClassException.java b/lang/java/src/com/sleepycat/persist/evolve/IncompatibleClassException.java index 7decfc3a..31394adb 100644 --- a/lang/java/src/com/sleepycat/persist/evolve/IncompatibleClassException.java +++ b/lang/java/src/com/sleepycat/persist/evolve/IncompatibleClassException.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id: IncompatibleClassException.java,v 0f73af5ae3da 2010/05/10 05:38:40 alexander $ */ diff --git a/lang/java/src/com/sleepycat/persist/evolve/Mutation.java b/lang/java/src/com/sleepycat/persist/evolve/Mutation.java index 08431c27..abd4c486 100644 --- a/lang/java/src/com/sleepycat/persist/evolve/Mutation.java +++ b/lang/java/src/com/sleepycat/persist/evolve/Mutation.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/evolve/Mutations.java b/lang/java/src/com/sleepycat/persist/evolve/Mutations.java index 54326b2f..f6740bb5 100644 --- a/lang/java/src/com/sleepycat/persist/evolve/Mutations.java +++ b/lang/java/src/com/sleepycat/persist/evolve/Mutations.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/evolve/Renamer.java b/lang/java/src/com/sleepycat/persist/evolve/Renamer.java index 1ef76019..ee08e570 100644 --- a/lang/java/src/com/sleepycat/persist/evolve/Renamer.java +++ b/lang/java/src/com/sleepycat/persist/evolve/Renamer.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/evolve/package.html b/lang/java/src/com/sleepycat/persist/evolve/package.html index b5aa9ba3..b4bc338c 100644 --- a/lang/java/src/com/sleepycat/persist/evolve/package.html +++ b/lang/java/src/com/sleepycat/persist/evolve/package.html @@ -63,9 +63,9 @@ compatibly; for such changes a class Converter mutation is required.</p> <p>Changes to field types in entity class definitions are compatible when they conform to the Java Language Specification definitions for <a -href="http://java.sun.com/docs/books/jls/third_edition/html/conversions.html#5.1.2">Widening +href="http://docs.oracle.com/javase/specs/jls/se7/html/jls-5.html#jls-5.1.2">Widening Primitive Conversions</a> and <a -href="http://java.sun.com/docs/books/jls/third_edition/html/conversions.html#5.1.5">Widening +href="http://docs.oracle.com/javase/specs/jls/se7/html/jls-5.html#jls-5.1.5">Widening Reference Conversions</a>. For example, a smaller integer type may be changed to a larger integer type, and a reference type may be changed to one of its supertypes. Automatic widening conversions are performed diff --git a/lang/java/src/com/sleepycat/persist/impl/AbstractInput.java b/lang/java/src/com/sleepycat/persist/impl/AbstractInput.java index 045118b7..87801076 100644 --- a/lang/java/src/com/sleepycat/persist/impl/AbstractInput.java +++ b/lang/java/src/com/sleepycat/persist/impl/AbstractInput.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/impl/Accessor.java b/lang/java/src/com/sleepycat/persist/impl/Accessor.java index c0e8551e..b41431b9 100644 --- a/lang/java/src/com/sleepycat/persist/impl/Accessor.java +++ b/lang/java/src/com/sleepycat/persist/impl/Accessor.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/impl/Catalog.java b/lang/java/src/com/sleepycat/persist/impl/Catalog.java index fb41b117..4c7a9a61 100644 --- a/lang/java/src/com/sleepycat/persist/impl/Catalog.java +++ b/lang/java/src/com/sleepycat/persist/impl/Catalog.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/impl/CollectionProxy.java b/lang/java/src/com/sleepycat/persist/impl/CollectionProxy.java index bc4fcf4d..e58f95a1 100644 --- a/lang/java/src/com/sleepycat/persist/impl/CollectionProxy.java +++ b/lang/java/src/com/sleepycat/persist/impl/CollectionProxy.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/impl/ComparatorCatalog.java b/lang/java/src/com/sleepycat/persist/impl/ComparatorCatalog.java index 8cb5e96d..580e6d63 100644 --- a/lang/java/src/com/sleepycat/persist/impl/ComparatorCatalog.java +++ b/lang/java/src/com/sleepycat/persist/impl/ComparatorCatalog.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/impl/ComplexFormat.java b/lang/java/src/com/sleepycat/persist/impl/ComplexFormat.java index 61247cca..4b8318d7 100644 --- a/lang/java/src/com/sleepycat/persist/impl/ComplexFormat.java +++ b/lang/java/src/com/sleepycat/persist/impl/ComplexFormat.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/impl/CompositeKeyFormat.java b/lang/java/src/com/sleepycat/persist/impl/CompositeKeyFormat.java index cf95a3b9..19e8310b 100644 --- a/lang/java/src/com/sleepycat/persist/impl/CompositeKeyFormat.java +++ b/lang/java/src/com/sleepycat/persist/impl/CompositeKeyFormat.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/impl/ConverterReader.java b/lang/java/src/com/sleepycat/persist/impl/ConverterReader.java index a67b2f2b..6c69c93d 100644 --- a/lang/java/src/com/sleepycat/persist/impl/ConverterReader.java +++ b/lang/java/src/com/sleepycat/persist/impl/ConverterReader.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/impl/Enhanced.java b/lang/java/src/com/sleepycat/persist/impl/Enhanced.java index 756e3631..de087e30 100644 --- a/lang/java/src/com/sleepycat/persist/impl/Enhanced.java +++ b/lang/java/src/com/sleepycat/persist/impl/Enhanced.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/impl/EnhancedAccessor.java b/lang/java/src/com/sleepycat/persist/impl/EnhancedAccessor.java index 5fedb0b3..575feae3 100644 --- a/lang/java/src/com/sleepycat/persist/impl/EnhancedAccessor.java +++ b/lang/java/src/com/sleepycat/persist/impl/EnhancedAccessor.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/impl/EntityInput.java b/lang/java/src/com/sleepycat/persist/impl/EntityInput.java index 0010d427..13773cb5 100644 --- a/lang/java/src/com/sleepycat/persist/impl/EntityInput.java +++ b/lang/java/src/com/sleepycat/persist/impl/EntityInput.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/impl/EntityOutput.java b/lang/java/src/com/sleepycat/persist/impl/EntityOutput.java index 252f1631..9b3b0e0c 100644 --- a/lang/java/src/com/sleepycat/persist/impl/EntityOutput.java +++ b/lang/java/src/com/sleepycat/persist/impl/EntityOutput.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/impl/EnumFormat.java b/lang/java/src/com/sleepycat/persist/impl/EnumFormat.java index 4b292f1a..b6136de4 100644 --- a/lang/java/src/com/sleepycat/persist/impl/EnumFormat.java +++ b/lang/java/src/com/sleepycat/persist/impl/EnumFormat.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/impl/Evolver.java b/lang/java/src/com/sleepycat/persist/impl/Evolver.java index b1d180b7..f4cd155c 100644 --- a/lang/java/src/com/sleepycat/persist/impl/Evolver.java +++ b/lang/java/src/com/sleepycat/persist/impl/Evolver.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ @@ -355,8 +355,8 @@ class Evolver { return false; } if (oldLatestFormat == oldLatestFormat.getLatestVersion()) { - assert !newFormats.containsValue(newFormat) : newFormat; - /* newFormat equals oldLatestFormat and was discarded. */ + /* newFormat is no longer relevant [#21869]. */ + newFormats.remove(newFormat.getClassName()); newFormat = oldLatestFormat; } } diff --git a/lang/java/src/com/sleepycat/persist/impl/FieldInfo.java b/lang/java/src/com/sleepycat/persist/impl/FieldInfo.java index 1e14193c..5020473c 100644 --- a/lang/java/src/com/sleepycat/persist/impl/FieldInfo.java +++ b/lang/java/src/com/sleepycat/persist/impl/FieldInfo.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/impl/Format.java b/lang/java/src/com/sleepycat/persist/impl/Format.java index 060beeb7..8c614d1f 100644 --- a/lang/java/src/com/sleepycat/persist/impl/Format.java +++ b/lang/java/src/com/sleepycat/persist/impl/Format.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/impl/KeyLocation.java b/lang/java/src/com/sleepycat/persist/impl/KeyLocation.java index c9ac5bbc..a1460dce 100644 --- a/lang/java/src/com/sleepycat/persist/impl/KeyLocation.java +++ b/lang/java/src/com/sleepycat/persist/impl/KeyLocation.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/impl/MapProxy.java b/lang/java/src/com/sleepycat/persist/impl/MapProxy.java index 9b55fff5..b4094007 100644 --- a/lang/java/src/com/sleepycat/persist/impl/MapProxy.java +++ b/lang/java/src/com/sleepycat/persist/impl/MapProxy.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/impl/NonPersistentFormat.java b/lang/java/src/com/sleepycat/persist/impl/NonPersistentFormat.java index d2217a77..16fcc578 100644 --- a/lang/java/src/com/sleepycat/persist/impl/NonPersistentFormat.java +++ b/lang/java/src/com/sleepycat/persist/impl/NonPersistentFormat.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/impl/ObjectArrayFormat.java b/lang/java/src/com/sleepycat/persist/impl/ObjectArrayFormat.java index 58716811..5ad772a3 100644 --- a/lang/java/src/com/sleepycat/persist/impl/ObjectArrayFormat.java +++ b/lang/java/src/com/sleepycat/persist/impl/ObjectArrayFormat.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/impl/PersistCatalog.java b/lang/java/src/com/sleepycat/persist/impl/PersistCatalog.java index 1f5e3b37..2c7225ee 100644 --- a/lang/java/src/com/sleepycat/persist/impl/PersistCatalog.java +++ b/lang/java/src/com/sleepycat/persist/impl/PersistCatalog.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/impl/PersistComparator.java b/lang/java/src/com/sleepycat/persist/impl/PersistComparator.java index aff47fd5..eb4a50a2 100644 --- a/lang/java/src/com/sleepycat/persist/impl/PersistComparator.java +++ b/lang/java/src/com/sleepycat/persist/impl/PersistComparator.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/impl/PersistEntityBinding.java b/lang/java/src/com/sleepycat/persist/impl/PersistEntityBinding.java index 3e03356d..ddb1dc99 100644 --- a/lang/java/src/com/sleepycat/persist/impl/PersistEntityBinding.java +++ b/lang/java/src/com/sleepycat/persist/impl/PersistEntityBinding.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/impl/PersistKeyAssigner.java b/lang/java/src/com/sleepycat/persist/impl/PersistKeyAssigner.java index 940b25e9..7cdd8233 100644 --- a/lang/java/src/com/sleepycat/persist/impl/PersistKeyAssigner.java +++ b/lang/java/src/com/sleepycat/persist/impl/PersistKeyAssigner.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/impl/PersistKeyBinding.java b/lang/java/src/com/sleepycat/persist/impl/PersistKeyBinding.java index 05b441fc..0514a470 100644 --- a/lang/java/src/com/sleepycat/persist/impl/PersistKeyBinding.java +++ b/lang/java/src/com/sleepycat/persist/impl/PersistKeyBinding.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/impl/PersistKeyCreator.java b/lang/java/src/com/sleepycat/persist/impl/PersistKeyCreator.java index 00725bb8..95b4297a 100644 --- a/lang/java/src/com/sleepycat/persist/impl/PersistKeyCreator.java +++ b/lang/java/src/com/sleepycat/persist/impl/PersistKeyCreator.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/impl/PrimitiveArrayFormat.java b/lang/java/src/com/sleepycat/persist/impl/PrimitiveArrayFormat.java index f890a89a..fd3fdd58 100644 --- a/lang/java/src/com/sleepycat/persist/impl/PrimitiveArrayFormat.java +++ b/lang/java/src/com/sleepycat/persist/impl/PrimitiveArrayFormat.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/impl/ProxiedFormat.java b/lang/java/src/com/sleepycat/persist/impl/ProxiedFormat.java index 1a9af940..37b309f8 100644 --- a/lang/java/src/com/sleepycat/persist/impl/ProxiedFormat.java +++ b/lang/java/src/com/sleepycat/persist/impl/ProxiedFormat.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/impl/RawAbstractInput.java b/lang/java/src/com/sleepycat/persist/impl/RawAbstractInput.java index cc0f180f..c2234586 100644 --- a/lang/java/src/com/sleepycat/persist/impl/RawAbstractInput.java +++ b/lang/java/src/com/sleepycat/persist/impl/RawAbstractInput.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/impl/RawAccessor.java b/lang/java/src/com/sleepycat/persist/impl/RawAccessor.java index cb327f1e..2164c92d 100644 --- a/lang/java/src/com/sleepycat/persist/impl/RawAccessor.java +++ b/lang/java/src/com/sleepycat/persist/impl/RawAccessor.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/impl/RawArrayInput.java b/lang/java/src/com/sleepycat/persist/impl/RawArrayInput.java index 8907bc1a..1cadb91a 100644 --- a/lang/java/src/com/sleepycat/persist/impl/RawArrayInput.java +++ b/lang/java/src/com/sleepycat/persist/impl/RawArrayInput.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/impl/RawComplexInput.java b/lang/java/src/com/sleepycat/persist/impl/RawComplexInput.java index 0999cd6b..9955a33b 100644 --- a/lang/java/src/com/sleepycat/persist/impl/RawComplexInput.java +++ b/lang/java/src/com/sleepycat/persist/impl/RawComplexInput.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/impl/RawSingleInput.java b/lang/java/src/com/sleepycat/persist/impl/RawSingleInput.java index 4159b6b1..9b342a62 100644 --- a/lang/java/src/com/sleepycat/persist/impl/RawSingleInput.java +++ b/lang/java/src/com/sleepycat/persist/impl/RawSingleInput.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/impl/ReadOnlyCatalog.java b/lang/java/src/com/sleepycat/persist/impl/ReadOnlyCatalog.java index 7892878d..59dedabc 100644 --- a/lang/java/src/com/sleepycat/persist/impl/ReadOnlyCatalog.java +++ b/lang/java/src/com/sleepycat/persist/impl/ReadOnlyCatalog.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/impl/Reader.java b/lang/java/src/com/sleepycat/persist/impl/Reader.java index b5058273..bb1755cc 100644 --- a/lang/java/src/com/sleepycat/persist/impl/Reader.java +++ b/lang/java/src/com/sleepycat/persist/impl/Reader.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/impl/RecordInput.java b/lang/java/src/com/sleepycat/persist/impl/RecordInput.java index bdd13aff..55dd7fc8 100644 --- a/lang/java/src/com/sleepycat/persist/impl/RecordInput.java +++ b/lang/java/src/com/sleepycat/persist/impl/RecordInput.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/impl/RecordOutput.java b/lang/java/src/com/sleepycat/persist/impl/RecordOutput.java index 36e2a029..e9022959 100644 --- a/lang/java/src/com/sleepycat/persist/impl/RecordOutput.java +++ b/lang/java/src/com/sleepycat/persist/impl/RecordOutput.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/impl/ReflectionAccessor.java b/lang/java/src/com/sleepycat/persist/impl/ReflectionAccessor.java index e8c2e61c..11c1761f 100644 --- a/lang/java/src/com/sleepycat/persist/impl/ReflectionAccessor.java +++ b/lang/java/src/com/sleepycat/persist/impl/ReflectionAccessor.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/impl/RefreshException.java b/lang/java/src/com/sleepycat/persist/impl/RefreshException.java index ffdadfb2..b8df07b3 100644 --- a/lang/java/src/com/sleepycat/persist/impl/RefreshException.java +++ b/lang/java/src/com/sleepycat/persist/impl/RefreshException.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/impl/SimpleCatalog.java b/lang/java/src/com/sleepycat/persist/impl/SimpleCatalog.java index f021420d..a2a9a4a1 100644 --- a/lang/java/src/com/sleepycat/persist/impl/SimpleCatalog.java +++ b/lang/java/src/com/sleepycat/persist/impl/SimpleCatalog.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/impl/SimpleFormat.java b/lang/java/src/com/sleepycat/persist/impl/SimpleFormat.java index d83f19e4..3a7364f4 100644 --- a/lang/java/src/com/sleepycat/persist/impl/SimpleFormat.java +++ b/lang/java/src/com/sleepycat/persist/impl/SimpleFormat.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/impl/Store.java b/lang/java/src/com/sleepycat/persist/impl/Store.java index 895ad968..164613a1 100644 --- a/lang/java/src/com/sleepycat/persist/impl/Store.java +++ b/lang/java/src/com/sleepycat/persist/impl/Store.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/impl/StoredModel.java b/lang/java/src/com/sleepycat/persist/impl/StoredModel.java index 725a5748..b764331b 100644 --- a/lang/java/src/com/sleepycat/persist/impl/StoredModel.java +++ b/lang/java/src/com/sleepycat/persist/impl/StoredModel.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/impl/VisitedObjects.java b/lang/java/src/com/sleepycat/persist/impl/VisitedObjects.java index aee70255..959ba082 100644 --- a/lang/java/src/com/sleepycat/persist/impl/VisitedObjects.java +++ b/lang/java/src/com/sleepycat/persist/impl/VisitedObjects.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id: VisitedObjects.java,v 0f73af5ae3da 2010/05/10 05:38:40 alexander $ */ diff --git a/lang/java/src/com/sleepycat/persist/impl/WidenerInput.java b/lang/java/src/com/sleepycat/persist/impl/WidenerInput.java index 752f136b..5fb1a0ef 100644 --- a/lang/java/src/com/sleepycat/persist/impl/WidenerInput.java +++ b/lang/java/src/com/sleepycat/persist/impl/WidenerInput.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/model/AnnotationModel.java b/lang/java/src/com/sleepycat/persist/model/AnnotationModel.java index c98e498e..06b3ca03 100644 --- a/lang/java/src/com/sleepycat/persist/model/AnnotationModel.java +++ b/lang/java/src/com/sleepycat/persist/model/AnnotationModel.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/model/BytecodeEnhancer.java b/lang/java/src/com/sleepycat/persist/model/BytecodeEnhancer.java index d58e78b4..8848a4af 100644 --- a/lang/java/src/com/sleepycat/persist/model/BytecodeEnhancer.java +++ b/lang/java/src/com/sleepycat/persist/model/BytecodeEnhancer.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/model/ClassEnhancer.java b/lang/java/src/com/sleepycat/persist/model/ClassEnhancer.java index 61d4b985..7c5e4c4c 100644 --- a/lang/java/src/com/sleepycat/persist/model/ClassEnhancer.java +++ b/lang/java/src/com/sleepycat/persist/model/ClassEnhancer.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/model/ClassMetadata.java b/lang/java/src/com/sleepycat/persist/model/ClassMetadata.java index 6a6dec3d..d146aa45 100644 --- a/lang/java/src/com/sleepycat/persist/model/ClassMetadata.java +++ b/lang/java/src/com/sleepycat/persist/model/ClassMetadata.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/model/DeleteAction.java b/lang/java/src/com/sleepycat/persist/model/DeleteAction.java index e4b2fb3b..d19b80bf 100644 --- a/lang/java/src/com/sleepycat/persist/model/DeleteAction.java +++ b/lang/java/src/com/sleepycat/persist/model/DeleteAction.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/model/Entity.java b/lang/java/src/com/sleepycat/persist/model/Entity.java index bb0bfe5b..b540f169 100644 --- a/lang/java/src/com/sleepycat/persist/model/Entity.java +++ b/lang/java/src/com/sleepycat/persist/model/Entity.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/model/EntityMetadata.java b/lang/java/src/com/sleepycat/persist/model/EntityMetadata.java index 89218ff7..184afca2 100644 --- a/lang/java/src/com/sleepycat/persist/model/EntityMetadata.java +++ b/lang/java/src/com/sleepycat/persist/model/EntityMetadata.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/model/EntityModel.java b/lang/java/src/com/sleepycat/persist/model/EntityModel.java index 70c27316..8a3e258f 100644 --- a/lang/java/src/com/sleepycat/persist/model/EntityModel.java +++ b/lang/java/src/com/sleepycat/persist/model/EntityModel.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/model/FieldMetadata.java b/lang/java/src/com/sleepycat/persist/model/FieldMetadata.java index 835ddb18..09dee292 100644 --- a/lang/java/src/com/sleepycat/persist/model/FieldMetadata.java +++ b/lang/java/src/com/sleepycat/persist/model/FieldMetadata.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/model/KeyField.java b/lang/java/src/com/sleepycat/persist/model/KeyField.java index b0b5567f..506fdedc 100644 --- a/lang/java/src/com/sleepycat/persist/model/KeyField.java +++ b/lang/java/src/com/sleepycat/persist/model/KeyField.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/model/ModelInternal.java b/lang/java/src/com/sleepycat/persist/model/ModelInternal.java index 65cd416c..686f2e9c 100644 --- a/lang/java/src/com/sleepycat/persist/model/ModelInternal.java +++ b/lang/java/src/com/sleepycat/persist/model/ModelInternal.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/model/NotPersistent.java b/lang/java/src/com/sleepycat/persist/model/NotPersistent.java index c6105fa1..7cefd374 100644 --- a/lang/java/src/com/sleepycat/persist/model/NotPersistent.java +++ b/lang/java/src/com/sleepycat/persist/model/NotPersistent.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/model/NotTransient.java b/lang/java/src/com/sleepycat/persist/model/NotTransient.java index 44a81066..2f4bf313 100644 --- a/lang/java/src/com/sleepycat/persist/model/NotTransient.java +++ b/lang/java/src/com/sleepycat/persist/model/NotTransient.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/model/Persistent.java b/lang/java/src/com/sleepycat/persist/model/Persistent.java index 5988655f..98595f08 100644 --- a/lang/java/src/com/sleepycat/persist/model/Persistent.java +++ b/lang/java/src/com/sleepycat/persist/model/Persistent.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/model/PersistentProxy.java b/lang/java/src/com/sleepycat/persist/model/PersistentProxy.java index 88d94a20..14855756 100644 --- a/lang/java/src/com/sleepycat/persist/model/PersistentProxy.java +++ b/lang/java/src/com/sleepycat/persist/model/PersistentProxy.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/model/PrimaryKey.java b/lang/java/src/com/sleepycat/persist/model/PrimaryKey.java index b8cc7f0e..9fb05658 100644 --- a/lang/java/src/com/sleepycat/persist/model/PrimaryKey.java +++ b/lang/java/src/com/sleepycat/persist/model/PrimaryKey.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/model/PrimaryKeyMetadata.java b/lang/java/src/com/sleepycat/persist/model/PrimaryKeyMetadata.java index b9ca8dff..122279c2 100644 --- a/lang/java/src/com/sleepycat/persist/model/PrimaryKeyMetadata.java +++ b/lang/java/src/com/sleepycat/persist/model/PrimaryKeyMetadata.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/model/Relationship.java b/lang/java/src/com/sleepycat/persist/model/Relationship.java index 3877519d..f4b89efe 100644 --- a/lang/java/src/com/sleepycat/persist/model/Relationship.java +++ b/lang/java/src/com/sleepycat/persist/model/Relationship.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/model/SecondaryKey.java b/lang/java/src/com/sleepycat/persist/model/SecondaryKey.java index d2e096a0..93d79d74 100644 --- a/lang/java/src/com/sleepycat/persist/model/SecondaryKey.java +++ b/lang/java/src/com/sleepycat/persist/model/SecondaryKey.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/model/SecondaryKeyMetadata.java b/lang/java/src/com/sleepycat/persist/model/SecondaryKeyMetadata.java index 24bea808..1641f279 100644 --- a/lang/java/src/com/sleepycat/persist/model/SecondaryKeyMetadata.java +++ b/lang/java/src/com/sleepycat/persist/model/SecondaryKeyMetadata.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/raw/RawField.java b/lang/java/src/com/sleepycat/persist/raw/RawField.java index e4c566fb..31f4b750 100644 --- a/lang/java/src/com/sleepycat/persist/raw/RawField.java +++ b/lang/java/src/com/sleepycat/persist/raw/RawField.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/raw/RawObject.java b/lang/java/src/com/sleepycat/persist/raw/RawObject.java index efb6c707..0cdc953c 100644 --- a/lang/java/src/com/sleepycat/persist/raw/RawObject.java +++ b/lang/java/src/com/sleepycat/persist/raw/RawObject.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/raw/RawStore.java b/lang/java/src/com/sleepycat/persist/raw/RawStore.java index 4b8c9bae..116c9375 100644 --- a/lang/java/src/com/sleepycat/persist/raw/RawStore.java +++ b/lang/java/src/com/sleepycat/persist/raw/RawStore.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/persist/raw/RawType.java b/lang/java/src/com/sleepycat/persist/raw/RawType.java index c3063f45..3421bb4d 100644 --- a/lang/java/src/com/sleepycat/persist/raw/RawType.java +++ b/lang/java/src/com/sleepycat/persist/raw/RawType.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/util/ClassResolver.java b/lang/java/src/com/sleepycat/util/ClassResolver.java index 2438557f..35f27765 100644 --- a/lang/java/src/com/sleepycat/util/ClassResolver.java +++ b/lang/java/src/com/sleepycat/util/ClassResolver.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2000, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/util/ConfigBeanInfoBase.java b/lang/java/src/com/sleepycat/util/ConfigBeanInfoBase.java index 0b5128bf..e51389e7 100644 --- a/lang/java/src/com/sleepycat/util/ConfigBeanInfoBase.java +++ b/lang/java/src/com/sleepycat/util/ConfigBeanInfoBase.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ @@ -17,33 +17,33 @@ import java.util.ArrayList; /* * If someone add a property in some FooConfig.java, - * (1) If the setter/getter methods are setFoo/getFoo, the name of the + * (1) If the setter/getter methods are setFoo/getFoo, the name of the * property should be "foo", which means the first letter of the property * name should be lower case. - * (2) The setter method for this property setProperty should return "this", + * (2) The setter method for this property setProperty should return "this", * and setPropertyVoid method which returns void value must be added. - * The return type of the getter method should be the same as the + * The return type of the getter method should be the same as the * parameter of the setter method. - * (3) The setter method and getter method must be added into + * (3) The setter method and getter method must be added into * FooConfigBeanInfo; - * (4) If for some of the setter methods in the FooConfig.java, setterVoid - * methods are not necessary, then add the name of such setter methods - * into the ArrayList ignoreMethods within the corresponding - * FooConfigBeanInfo.getPropertyDescriptors method. For example, - * setMaxSeedTestHook method in DiskOrderedCursorConfig.java is only used - * for unit tests, so "setMaxSeedTestHook" is added into ignoreMethods + * (4) If for some of the setter methods in the FooConfig.java, setterVoid + * methods are not necessary, then add the name of such setter methods + * into the ArrayList ignoreMethods within the corresponding + * FooConfigBeanInfo.getPropertyDescriptors method. For example, + * setMaxSeedTestHook method in DiskOrderedCursorConfig.java is only used + * for unit tests, so "setMaxSeedTestHook" is added into ignoreMethods * list within DiskOrderedCursorConfigBeanInfo.getPropertyDescriptors. - * + * * * If someone adds a new FooConfig.java, * (1) The definition of setter/getter mehods and the names of the properties - * should follow the rules described above. + * should follow the rules described above. * (2) There must be FooConfigBeanInfo.java. You can write it according to * the current beaninfo classes. - * (3) "PackagePath.FooConfig" must be added into the unit test: + * (3) "PackagePath.FooConfig" must be added into the unit test: * com.sleepycat.db.ConfigBeanInfoTest. * - * If someond remove an existing FooConfig.java, then "PackagePath.FooConfig" + * If someond remove an existing FooConfig.java, then "PackagePath.FooConfig" * must be deleted in the unit test com.sleepycat.db.ConfigBeanInfoTest. */ public class ConfigBeanInfoBase extends SimpleBeanInfo { @@ -58,22 +58,22 @@ public class ConfigBeanInfoBase extends SimpleBeanInfo { private static final int defaultPropertyIndex = -1; private static final int defaultEventIndex = -1; - + protected static ArrayList<String> propertiesName = new ArrayList<String>(); - protected static ArrayList<String> + protected static ArrayList<String> getterAndSetterMethods = new ArrayList<String>(); - + protected static ArrayList<String> ignoreMethods = new ArrayList<String>(); - - /* - * Get the propertis' infomation, including all the properties's names + + /* + * Get the propertis' infomation, including all the properties's names * and their getter/setter methods. */ - protected static void getPropertiesInfo(Class cls) { + protected static void getPropertiesInfo(Class cls) { propertiesName.clear(); getterAndSetterMethods.clear(); try { - + /* Get all of the public methods. */ ArrayList<String> allMethodNames = new ArrayList<String>(); Method[] methods = cls.getMethods(); @@ -83,7 +83,7 @@ public class ConfigBeanInfoBase extends SimpleBeanInfo { for (int i = 0; i < allMethodNames.size(); i++) { String name = allMethodNames.get(i); String subName = name.substring(0, 3); - + /* If it is a setter method. */ if (subName.equals("set")) { if (isIgnoreMethods(name)) { @@ -96,18 +96,18 @@ public class ConfigBeanInfoBase extends SimpleBeanInfo { } catch (NoSuchMethodException e) { getterMethod = null; } - if (getterMethod != null) { + if (getterMethod != null) { getterAndSetterMethods.add("get" + propertyName); getterAndSetterMethods.add(name + "Void"); - - /* - * Add the real property name into propertiesName. - * if the names of setter/getter methods are - * setFoo/getFoo, the name of the property should be + + /* + * Add the real property name into propertiesName. + * if the names of setter/getter methods are + * setFoo/getFoo, the name of the property should be * "foo". */ propertiesName.add - (propertyName.substring(0, 1).toLowerCase() + + (propertyName.substring(0, 1).toLowerCase() + propertyName.substring(1)); } } @@ -116,7 +116,7 @@ public class ConfigBeanInfoBase extends SimpleBeanInfo { e.printStackTrace(); } } - + private static boolean isIgnoreMethods(String methodName) { for (int i = 0; i < ignoreMethods.size(); i++) { if (ignoreMethods.get(i).equals(methodName)) { @@ -125,16 +125,16 @@ public class ConfigBeanInfoBase extends SimpleBeanInfo { } return false; } - + protected static PropertyDescriptor[] getPdescriptor(Class cls) { getPropertiesInfo(cls); final int propertyNum = propertiesName.size(); assert propertyNum * 2 == getterAndSetterMethods.size(); - PropertyDescriptor[] properties = new PropertyDescriptor[propertyNum]; + PropertyDescriptor[] properties = new PropertyDescriptor[propertyNum]; try { for (int i = 0, j = 0; i < propertyNum; i += 1, j += 2) { properties[i] = new PropertyDescriptor - (propertiesName.get(i), cls, getterAndSetterMethods.get(j), + (propertiesName.get(i), cls, getterAndSetterMethods.get(j), getterAndSetterMethods.get(j + 1)); } } catch(IntrospectionException e) { @@ -142,7 +142,7 @@ public class ConfigBeanInfoBase extends SimpleBeanInfo { } return properties; } - + protected static BeanDescriptor getBdescriptor(Class cls) { BeanDescriptor beanDescriptor = new BeanDescriptor(cls, null); return beanDescriptor; diff --git a/lang/java/src/com/sleepycat/util/ErrorBuffer.java b/lang/java/src/com/sleepycat/util/ErrorBuffer.java index 82757c80..1d10672a 100644 --- a/lang/java/src/com/sleepycat/util/ErrorBuffer.java +++ b/lang/java/src/com/sleepycat/util/ErrorBuffer.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2008, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2015 Oracle and/or its affiliates. All rights reserved. * * $Id: ErrorBuffer.java,v 0f73af5ae3da 2010/05/10 05:38:40 alexander $ */ diff --git a/lang/java/src/com/sleepycat/util/ExceptionUnwrapper.java b/lang/java/src/com/sleepycat/util/ExceptionUnwrapper.java index f8a0204d..aaccc383 100644 --- a/lang/java/src/com/sleepycat/util/ExceptionUnwrapper.java +++ b/lang/java/src/com/sleepycat/util/ExceptionUnwrapper.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2000, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/util/ExceptionWrapper.java b/lang/java/src/com/sleepycat/util/ExceptionWrapper.java index 689dc3b7..ac3f63ce 100644 --- a/lang/java/src/com/sleepycat/util/ExceptionWrapper.java +++ b/lang/java/src/com/sleepycat/util/ExceptionWrapper.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2000, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/util/FastInputStream.java b/lang/java/src/com/sleepycat/util/FastInputStream.java index 86e7fac4..1bacba58 100644 --- a/lang/java/src/com/sleepycat/util/FastInputStream.java +++ b/lang/java/src/com/sleepycat/util/FastInputStream.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2000, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/util/FastOutputStream.java b/lang/java/src/com/sleepycat/util/FastOutputStream.java index 4983c41c..e922e547 100644 --- a/lang/java/src/com/sleepycat/util/FastOutputStream.java +++ b/lang/java/src/com/sleepycat/util/FastOutputStream.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2000, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/util/IOExceptionWrapper.java b/lang/java/src/com/sleepycat/util/IOExceptionWrapper.java index 8a1502d1..20b97c7a 100644 --- a/lang/java/src/com/sleepycat/util/IOExceptionWrapper.java +++ b/lang/java/src/com/sleepycat/util/IOExceptionWrapper.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2000, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/util/PackedInteger.java b/lang/java/src/com/sleepycat/util/PackedInteger.java index 1614b664..baff10f2 100644 --- a/lang/java/src/com/sleepycat/util/PackedInteger.java +++ b/lang/java/src/com/sleepycat/util/PackedInteger.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2000, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015 Oracle and/or its affiliates. All rights reserved. * */ @@ -602,15 +602,15 @@ public class PackedInteger { /* * valueLen is the length of the value part stored in buf. Because - * the first byte of buf is used to stored the length, so we need - * to minus one. + * the first byte of buf is used to stored the length, we need + * to subtract one. */ int valueLen = offset - byte1Off - 1; /* * The first byte stores the number of additional bytes. Here we * store the result of 0x08 - valueLen, rather than directly store - * valueLen. The reason is to implement nature sort order for + * valueLen. The reason is to implement natural sort order for * byte-by-byte comparison. */ buf[byte1Off] = (byte) (0x08 - valueLen); @@ -618,7 +618,7 @@ public class PackedInteger { /* * If the value > 120, then first adjust the value by subtracting - * 119. Then the adjusted value is stored as an unsigned big endian + * 121. Then the adjusted value is stored as an unsigned big endian * integer. */ value -= 121; @@ -647,15 +647,15 @@ public class PackedInteger { /* * valueLen is the length of the value part stored in buf. Because - * the first byte of buf is used to stored the length, so we need - * to minus one. + * the first byte of buf is used to stored the length, we need to + * subtract one. */ int valueLen = offset - byte1Off - 1; /* * The first byte stores the number of additional bytes. Here we * store the result of 0xF7 + valueLen, rather than directly store - * valueLen. The reason is to implement nature sort order for + * valueLen. The reason is to implement natural sort order for * byte-by-byte comparison. */ buf[byte1Off] = (byte) (0xF7 + valueLen); @@ -663,7 +663,7 @@ public class PackedInteger { /* * If -119 <= value <= 120, only one byte is needed to store the - * value. The stored value is the original value adds 127. + * value. The stored value is the original value plus 127. */ buf[byte1Off] = (byte) (value + 127); } diff --git a/lang/java/src/com/sleepycat/util/RuntimeExceptionWrapper.java b/lang/java/src/com/sleepycat/util/RuntimeExceptionWrapper.java index 27078728..9b18bab1 100644 --- a/lang/java/src/com/sleepycat/util/RuntimeExceptionWrapper.java +++ b/lang/java/src/com/sleepycat/util/RuntimeExceptionWrapper.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2000, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/util/UtfOps.java b/lang/java/src/com/sleepycat/util/UtfOps.java index 033f8904..6c50aec2 100644 --- a/lang/java/src/com/sleepycat/util/UtfOps.java +++ b/lang/java/src/com/sleepycat/util/UtfOps.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2000, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/util/keyrange/KeyRange.java b/lang/java/src/com/sleepycat/util/keyrange/KeyRange.java index e2f368ad..8e835873 100644 --- a/lang/java/src/com/sleepycat/util/keyrange/KeyRange.java +++ b/lang/java/src/com/sleepycat/util/keyrange/KeyRange.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/util/keyrange/KeyRangeException.java b/lang/java/src/com/sleepycat/util/keyrange/KeyRangeException.java index 767dcfdb..22711011 100644 --- a/lang/java/src/com/sleepycat/util/keyrange/KeyRangeException.java +++ b/lang/java/src/com/sleepycat/util/keyrange/KeyRangeException.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2000, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2015 Oracle and/or its affiliates. All rights reserved. * */ diff --git a/lang/java/src/com/sleepycat/util/keyrange/RangeCursor.java b/lang/java/src/com/sleepycat/util/keyrange/RangeCursor.java index facc46ba..981d3bbc 100644 --- a/lang/java/src/com/sleepycat/util/keyrange/RangeCursor.java +++ b/lang/java/src/com/sleepycat/util/keyrange/RangeCursor.java @@ -1,7 +1,7 @@ /*- * See the file LICENSE for redistribution information. * - * Copyright (c) 2002, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015 Oracle and/or its affiliates. All rights reserved. * */ |