Menu
▾
▴
[Bigdata-commit] SF.net SVN: bigdata:[7685] branches/MGC_1_3_0
|
From: <tho...@us...> - 2013-12-19 21:34:42
|
Revision: 7685
http://bigdata.svn.sourceforge.net/bigdata/?rev=7685&view=rev
Author: thompsonbry
Date: 2013-12-19 21:34:30 +0000 (Thu, 19 Dec 2013)
Log Message:
-----------
Merging in changes from the main development branch. This will catch up the feature branch with the 1.3.0 release. Among other things, this will clear up CI quite a bit.
Note: The HASendService will not use small chunks in this commit - the code is there, but it needs to be enabled by hand for debuging.
At revision r7684 in MGC_1_3_0.
{{{
merge https://bigdata.svn.sourceforge.net/svnroot/bigdata/branches/BIGDATA_RELEASE_1_3_0 /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC
--- Merging r7607 through r7684 into /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC
U /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-jini/src/test/com/bigdata/journal/jini/ha/TestHAJournalServer.java
U /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-jini/src/test/com/bigdata/journal/jini/ha/TestHAJournalServerOverride.java
U /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-jini/src/test/com/bigdata/journal/jini/ha/TestHA3ChangeLeader.java
U /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-jini/src/java/com/bigdata/quorum/zk/ZKQuorumImpl.java
U /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-jini/src/java/com/bigdata/journal/jini/ha/HAJournalServer.java
U /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-jini/src/java/com/bigdata/journal/jini/ha/NoSnapshotPolicy.java
U /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-jini/src/java/com/bigdata/journal/jini/ha/HAJournal.java
U /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-jini/src/java/com/bigdata/journal/jini/ha/DefaultSnapshotPolicy.java
U /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/build.properties
U /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-war/src/html/index.html
U /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/test/com/bigdata/quorum/MockQuorumFixture.java
U /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/test/com/bigdata/io/TestNameAndExtensionFilter.java
C /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/java/com/bigdata/quorum/AbstractQuorum.java
C /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/java/com/bigdata/quorum/QuorumActor.java
U /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata/src/releases/RELEASE_1_3_0.txt
U /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-sails/src/test/com/bigdata/rdf/sail/tck/BigdataSparqlTest.java
U /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-sails/src/test/com/bigdata/rdf/sail/sparql/TestReificationDoneRightParser.java
--- Merging r7607 through r7684 into /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp
U /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/HAStatusServletUtil.java
U /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/InsertServlet.java
--- Merging r7607 through r7684 into /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC
U /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/PrefixDeclProcessor.java
U /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/test/com/bigdata/rdf/store/TestLocalTripleStoreWithoutStatementIdentifiers.java
U /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/reif/rdr-01a.rq
U /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/reif/TestReificationDoneRightEval.java
U /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/reif/rdr-03a.rq
U /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/reif/rdr-01.ttl
U /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/reif/rdr-03.ttl
U /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/reif/rdr-02a.ttl
U /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/reif/rdr-03a.ttl
U /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/java/com/bigdata/rdf/rio/StatementBuffer.java
U /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_MGC/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/QueryHints.java
Merge complete.
===== File Statistics: =====
Updated: 28
==== Conflict Statistics: =====
File conflicts: 2
}}}
For both AbstractQuorum and QuorumActor, the conflicts were resolved by using the versions from the feature branch (MGC_1_3_0).
See #779
Revision Links:
--------------
http://bigdata.svn.sourceforge.net/bigdata/?rev=7684&view=rev
http://bigdata.svn.sourceforge.net/bigdata/?rev=7607&view=rev
http://bigdata.svn.sourceforge.net/bigdata/?rev=7684&view=rev
http://bigdata.svn.sourceforge.net/bigdata/?rev=7607&view=rev
http://bigdata.svn.sourceforge.net/bigdata/?rev=7684&view=rev
http://bigdata.svn.sourceforge.net/bigdata/?rev=7607&view=rev
http://bigdata.svn.sourceforge.net/bigdata/?rev=7684&view=rev
Modified Paths:
--------------
branches/MGC_1_3_0/bigdata/src/releases/RELEASE_1_3_0.txt
branches/MGC_1_3_0/bigdata/src/test/com/bigdata/io/TestNameAndExtensionFilter.java
branches/MGC_1_3_0/bigdata-jini/src/java/com/bigdata/journal/jini/ha/DefaultSnapshotPolicy.java
branches/MGC_1_3_0/bigdata-jini/src/java/com/bigdata/journal/jini/ha/HAJournal.java
branches/MGC_1_3_0/bigdata-jini/src/java/com/bigdata/journal/jini/ha/HAJournalServer.java
branches/MGC_1_3_0/bigdata-jini/src/java/com/bigdata/journal/jini/ha/NoSnapshotPolicy.java
branches/MGC_1_3_0/bigdata-jini/src/test/com/bigdata/journal/jini/ha/TestHA3ChangeLeader.java
branches/MGC_1_3_0/bigdata-jini/src/test/com/bigdata/journal/jini/ha/TestHAJournalServer.java
branches/MGC_1_3_0/bigdata-jini/src/test/com/bigdata/journal/jini/ha/TestHAJournalServerOverride.java
branches/MGC_1_3_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/reif/TestReificationDoneRightEval.java
branches/MGC_1_3_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/reif/rdr-01.ttl
branches/MGC_1_3_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/reif/rdr-01a.rq
branches/MGC_1_3_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/reif/rdr-02a.ttl
branches/MGC_1_3_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/reif/rdr-03.ttl
branches/MGC_1_3_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/reif/rdr-03a.rq
branches/MGC_1_3_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/reif/rdr-03a.ttl
branches/MGC_1_3_0/bigdata-rdf/src/test/com/bigdata/rdf/store/TestLocalTripleStoreWithoutStatementIdentifiers.java
branches/MGC_1_3_0/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/PrefixDeclProcessor.java
branches/MGC_1_3_0/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/HAStatusServletUtil.java
branches/MGC_1_3_0/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/InsertServlet.java
branches/MGC_1_3_0/bigdata-sails/src/test/com/bigdata/rdf/sail/sparql/TestReificationDoneRightParser.java
branches/MGC_1_3_0/bigdata-sails/src/test/com/bigdata/rdf/sail/tck/BigdataSparqlTest.java
branches/MGC_1_3_0/bigdata-war/src/html/index.html
branches/MGC_1_3_0/build.properties
Property Changed:
----------------
branches/MGC_1_3_0/
branches/MGC_1_3_0/bigdata/lib/jetty/
branches/MGC_1_3_0/bigdata/src/java/com/bigdata/bop/aggregate/
branches/MGC_1_3_0/bigdata/src/java/com/bigdata/bop/joinGraph/
branches/MGC_1_3_0/bigdata/src/java/com/bigdata/bop/util/
branches/MGC_1_3_0/bigdata/src/java/com/bigdata/htree/raba/
branches/MGC_1_3_0/bigdata/src/java/com/bigdata/jsr166/
branches/MGC_1_3_0/bigdata/src/test/com/bigdata/bop/joinGraph/
branches/MGC_1_3_0/bigdata/src/test/com/bigdata/bop/util/
branches/MGC_1_3_0/bigdata/src/test/com/bigdata/jsr166/
branches/MGC_1_3_0/bigdata/src/test/com/bigdata/util/httpd/
branches/MGC_1_3_0/bigdata-compatibility/
branches/MGC_1_3_0/bigdata-jini/src/java/com/bigdata/attr/
branches/MGC_1_3_0/bigdata-jini/src/java/com/bigdata/disco/
branches/MGC_1_3_0/bigdata-jini/src/java/com/bigdata/util/config/
branches/MGC_1_3_0/bigdata-perf/
branches/MGC_1_3_0/bigdata-perf/btc/
branches/MGC_1_3_0/bigdata-perf/btc/src/resources/
branches/MGC_1_3_0/bigdata-perf/lubm/
branches/MGC_1_3_0/bigdata-perf/uniprot/
branches/MGC_1_3_0/bigdata-perf/uniprot/src/
branches/MGC_1_3_0/bigdata-rdf/src/java/com/bigdata/bop/rdf/aggregate/
branches/MGC_1_3_0/bigdata-rdf/src/java/com/bigdata/rdf/changesets/
branches/MGC_1_3_0/bigdata-rdf/src/java/com/bigdata/rdf/error/
branches/MGC_1_3_0/bigdata-rdf/src/java/com/bigdata/rdf/internal/
branches/MGC_1_3_0/bigdata-rdf/src/java/com/bigdata/rdf/relation/
branches/MGC_1_3_0/bigdata-rdf/src/java/com/bigdata/rdf/util/
branches/MGC_1_3_0/bigdata-rdf/src/samples/
branches/MGC_1_3_0/bigdata-rdf/src/test/com/bigdata/bop/rdf/aggregate/
branches/MGC_1_3_0/bigdata-rdf/src/test/com/bigdata/rdf/internal/
branches/MGC_1_3_0/bigdata-rdf/src/test/com/bigdata/rdf/relation/
branches/MGC_1_3_0/bigdata-sails/src/java/com/bigdata/rdf/sail/bench/
branches/MGC_1_3_0/bigdata-sails/src/java/com/bigdata/rdf/sail/changesets/
branches/MGC_1_3_0/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/
branches/MGC_1_3_0/bigdata-sails/src/test/com/bigdata/rdf/sail/bench/
branches/MGC_1_3_0/bigdata-sails/src/test/com/bigdata/rdf/sail/webapp/
branches/MGC_1_3_0/dsi-utils/
branches/MGC_1_3_0/dsi-utils/LEGAL/
branches/MGC_1_3_0/dsi-utils/lib/
branches/MGC_1_3_0/dsi-utils/src/
branches/MGC_1_3_0/dsi-utils/src/java/
branches/MGC_1_3_0/dsi-utils/src/java/it/
branches/MGC_1_3_0/dsi-utils/src/java/it/unimi/
branches/MGC_1_3_0/dsi-utils/src/test/
branches/MGC_1_3_0/dsi-utils/src/test/it/unimi/
branches/MGC_1_3_0/dsi-utils/src/test/it/unimi/dsi/
branches/MGC_1_3_0/lgpl-utils/src/java/it/unimi/dsi/fastutil/bytes/custom/
branches/MGC_1_3_0/lgpl-utils/src/test/it/unimi/dsi/fastutil/bytes/custom/
branches/MGC_1_3_0/osgi/
branches/MGC_1_3_0/src/resources/bin/config/
Property changes on: branches/MGC_1_3_0
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/BIGDATA_OPENRDF_2_6_9_UPDATE:6769-6785
/branches/BIGDATA_RELEASE_1_2_0:6766-7380
/branches/BTREE_BUFFER_BRANCH:2004-2045
/branches/DEV_BRANCH_27_OCT_2009:2270-2546,2548-2782
/branches/INT64_BRANCH:4486-4522
/branches/JOURNAL_HA_BRANCH:2596-4066
/branches/LARGE_LITERALS_REFACTOR:4175-4387
/branches/LEXICON_REFACTOR_BRANCH:2633-3304
/branches/QUADS_QUERY_BRANCH:4525-4531,4550-4584,4586-4609,4634-4643,4646-4672,4674-4685,4687-4693,4697-4735,4737-4782,4784-4792,4794-4796,4798-4801
/branches/READ_CACHE:7215-7271
/branches/RWSTORE_1_1_0_DEBUG:5896-5935
/branches/TIDS_PLUS_BLOBS_BRANCH:4814-4836
/branches/ZK_DISCONNECT_HANDLING:7465-7484
/branches/bugfix-btm:2594-3237
/branches/dev-btm:2574-2730
/branches/fko:3150-3194
/trunk:3392-3437,3656-4061
+ /branches/BIGDATA_OPENRDF_2_6_9_UPDATE:6769-6785
/branches/BIGDATA_RELEASE_1_2_0:6766-7380
/branches/BIGDATA_RELEASE_1_3_0:7608-7684
/branches/BTREE_BUFFER_BRANCH:2004-2045
/branches/DEV_BRANCH_27_OCT_2009:2270-2546,2548-2782
/branches/INT64_BRANCH:4486-4522
/branches/JOURNAL_HA_BRANCH:2596-4066
/branches/LARGE_LITERALS_REFACTOR:4175-4387
/branches/LEXICON_REFACTOR_BRANCH:2633-3304
/branches/QUADS_QUERY_BRANCH:4525-4531,4550-4584,4586-4609,4634-4643,4646-4672,4674-4685,4687-4693,4697-4735,4737-4782,4784-4792,4794-4796,4798-4801
/branches/READ_CACHE:7215-7271
/branches/RWSTORE_1_1_0_DEBUG:5896-5935
/branches/TIDS_PLUS_BLOBS_BRANCH:4814-4836
/branches/ZK_DISCONNECT_HANDLING:7465-7484
/branches/bugfix-btm:2594-3237
/branches/dev-btm:2574-2730
/branches/fko:3150-3194
/trunk:3392-3437,3656-4061
Property changes on: branches/MGC_1_3_0/bigdata/lib/jetty
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata/lib/jetty:6769-6785
/branches/BIGDATA_RELEASE_1_2_0/bigdata/lib/jetty:6766-7380
/branches/INT64_BRANCH/bigdata/lib/jetty:4486-4522
/branches/QUADS_QUERY_BRANCH/bigdata/lib/jetty:4525-4531,4533-4548,4550-4584,4586-4609,4611-4632,4634-4643,4646-4672,4674-4685,4687-4693,4697-4735,4737-4782,4784-4792,4794-4796,4798-4801
/branches/READ_CACHE/bigdata/lib/jetty:7215-7271
/branches/RWSTORE_1_1_0_DEBUG/bigdata/lib/jetty:5896-5935
/branches/TIDS_PLUS_BLOBS_BRANCH/bigdata/lib/jetty:4814-4836
/branches/ZK_DISCONNECT_HANDLING/bigdata/lib/jetty:7465-7484
+ /branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata/lib/jetty:6769-6785
/branches/BIGDATA_RELEASE_1_2_0/bigdata/lib/jetty:6766-7380
/branches/BIGDATA_RELEASE_1_3_0/bigdata/lib/jetty:7608-7684
/branches/INT64_BRANCH/bigdata/lib/jetty:4486-4522
/branches/QUADS_QUERY_BRANCH/bigdata/lib/jetty:4525-4531,4533-4548,4550-4584,4586-4609,4611-4632,4634-4643,4646-4672,4674-4685,4687-4693,4697-4735,4737-4782,4784-4792,4794-4796,4798-4801
/branches/READ_CACHE/bigdata/lib/jetty:7215-7271
/branches/RWSTORE_1_1_0_DEBUG/bigdata/lib/jetty:5896-5935
/branches/TIDS_PLUS_BLOBS_BRANCH/bigdata/lib/jetty:4814-4836
/branches/ZK_DISCONNECT_HANDLING/bigdata/lib/jetty:7465-7484
Property changes on: branches/MGC_1_3_0/bigdata/src/java/com/bigdata/bop/aggregate
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata/src/java/com/bigdata/bop/aggregate:6769-6785
/branches/BIGDATA_RELEASE_1_2_0/bigdata/src/java/com/bigdata/bop/aggregate:6766-7380
/branches/INT64_BRANCH/bigdata/src/java/com/bigdata/bop/aggregate:4486-4522
/branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/bop/aggregate:4525-4531,4533-4548,4550-4584,4586-4609,4611-4632,4634-4643,4646-4672,4674-4685,4687-4693,4697-4735,4737-4782,4784-4792,4794-4796,4798-4801
/branches/READ_CACHE/bigdata/src/java/com/bigdata/bop/aggregate:7215-7271
/branches/RWSTORE_1_1_0_DEBUG/bigdata/src/java/com/bigdata/bop/aggregate:5896-5935
/branches/TIDS_PLUS_BLOBS_BRANCH/bigdata/src/java/com/bigdata/bop/aggregate:4814-4836
/branches/ZK_DISCONNECT_HANDLING/bigdata/src/java/com/bigdata/bop/aggregate:7465-7484
+ /branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata/src/java/com/bigdata/bop/aggregate:6769-6785
/branches/BIGDATA_RELEASE_1_2_0/bigdata/src/java/com/bigdata/bop/aggregate:6766-7380
/branches/BIGDATA_RELEASE_1_3_0/bigdata/src/java/com/bigdata/bop/aggregate:7608-7684
/branches/INT64_BRANCH/bigdata/src/java/com/bigdata/bop/aggregate:4486-4522
/branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/bop/aggregate:4525-4531,4533-4548,4550-4584,4586-4609,4611-4632,4634-4643,4646-4672,4674-4685,4687-4693,4697-4735,4737-4782,4784-4792,4794-4796,4798-4801
/branches/READ_CACHE/bigdata/src/java/com/bigdata/bop/aggregate:7215-7271
/branches/RWSTORE_1_1_0_DEBUG/bigdata/src/java/com/bigdata/bop/aggregate:5896-5935
/branches/TIDS_PLUS_BLOBS_BRANCH/bigdata/src/java/com/bigdata/bop/aggregate:4814-4836
/branches/ZK_DISCONNECT_HANDLING/bigdata/src/java/com/bigdata/bop/aggregate:7465-7484
Property changes on: branches/MGC_1_3_0/bigdata/src/java/com/bigdata/bop/joinGraph
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata/src/java/com/bigdata/bop/joinGraph:6769-6785
/branches/BIGDATA_RELEASE_1_2_0/bigdata/src/java/com/bigdata/bop/joinGraph:6766-7380
/branches/INT64_BRANCH/bigdata/src/java/com/bigdata/bop/joinGraph:4486-4522
/branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/bop/joinGraph:4525-4531,4533-4548,4550-4584,4586-4609,4611-4632,4634-4643,4646-4672,4674-4685,4687-4693,4697-4735,4737-4782,4784-4792,4794-4796,4798-4801
/branches/READ_CACHE/bigdata/src/java/com/bigdata/bop/joinGraph:7215-7271
/branches/RWSTORE_1_1_0_DEBUG/bigdata/src/java/com/bigdata/bop/joinGraph:5896-5935
/branches/TIDS_PLUS_BLOBS_BRANCH/bigdata/src/java/com/bigdata/bop/joinGraph:4814-4836
/branches/ZK_DISCONNECT_HANDLING/bigdata/src/java/com/bigdata/bop/joinGraph:7465-7484
+ /branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata/src/java/com/bigdata/bop/joinGraph:6769-6785
/branches/BIGDATA_RELEASE_1_2_0/bigdata/src/java/com/bigdata/bop/joinGraph:6766-7380
/branches/BIGDATA_RELEASE_1_3_0/bigdata/src/java/com/bigdata/bop/joinGraph:7608-7684
/branches/INT64_BRANCH/bigdata/src/java/com/bigdata/bop/joinGraph:4486-4522
/branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/bop/joinGraph:4525-4531,4533-4548,4550-4584,4586-4609,4611-4632,4634-4643,4646-4672,4674-4685,4687-4693,4697-4735,4737-4782,4784-4792,4794-4796,4798-4801
/branches/READ_CACHE/bigdata/src/java/com/bigdata/bop/joinGraph:7215-7271
/branches/RWSTORE_1_1_0_DEBUG/bigdata/src/java/com/bigdata/bop/joinGraph:5896-5935
/branches/TIDS_PLUS_BLOBS_BRANCH/bigdata/src/java/com/bigdata/bop/joinGraph:4814-4836
/branches/ZK_DISCONNECT_HANDLING/bigdata/src/java/com/bigdata/bop/joinGraph:7465-7484
Property changes on: branches/MGC_1_3_0/bigdata/src/java/com/bigdata/bop/util
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata/src/java/com/bigdata/bop/util:6769-6785
/branches/BIGDATA_RELEASE_1_2_0/bigdata/src/java/com/bigdata/bop/util:6766-7380
/branches/INT64_BRANCH/bigdata/src/java/com/bigdata/bop/util:4486-4522
/branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/bop/util:4525-4531,4533-4548,4550-4584,4586-4609,4611-4632,4634-4643,4646-4672,4674-4685,4687-4693,4697-4735,4737-4782,4784-4792,4794-4796,4798-4801
/branches/READ_CACHE/bigdata/src/java/com/bigdata/bop/util:7215-7271
/branches/RWSTORE_1_1_0_DEBUG/bigdata/src/java/com/bigdata/bop/util:5896-5935
/branches/TIDS_PLUS_BLOBS_BRANCH/bigdata/src/java/com/bigdata/bop/util:4814-4836
/branches/ZK_DISCONNECT_HANDLING/bigdata/src/java/com/bigdata/bop/util:7465-7484
+ /branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata/src/java/com/bigdata/bop/util:6769-6785
/branches/BIGDATA_RELEASE_1_2_0/bigdata/src/java/com/bigdata/bop/util:6766-7380
/branches/BIGDATA_RELEASE_1_3_0/bigdata/src/java/com/bigdata/bop/util:7608-7684
/branches/INT64_BRANCH/bigdata/src/java/com/bigdata/bop/util:4486-4522
/branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/bop/util:4525-4531,4533-4548,4550-4584,4586-4609,4611-4632,4634-4643,4646-4672,4674-4685,4687-4693,4697-4735,4737-4782,4784-4792,4794-4796,4798-4801
/branches/READ_CACHE/bigdata/src/java/com/bigdata/bop/util:7215-7271
/branches/RWSTORE_1_1_0_DEBUG/bigdata/src/java/com/bigdata/bop/util:5896-5935
/branches/TIDS_PLUS_BLOBS_BRANCH/bigdata/src/java/com/bigdata/bop/util:4814-4836
/branches/ZK_DISCONNECT_HANDLING/bigdata/src/java/com/bigdata/bop/util:7465-7484
Property changes on: branches/MGC_1_3_0/bigdata/src/java/com/bigdata/htree/raba
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata/src/java/com/bigdata/htree/raba:6769-6785
/branches/BIGDATA_RELEASE_1_2_0/bigdata/src/java/com/bigdata/htree/raba:6766-7380
/branches/INT64_BRANCH/bigdata/src/java/com/bigdata/htree/raba:4486-4522
/branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/htree/raba:4525-4531,4533-4548,4550-4584,4586-4609,4611-4632,4634-4643,4646-4672,4674-4685,4687-4693,4697-4735,4737-4782,4784-4792,4794-4796,4798-4801
/branches/READ_CACHE/bigdata/src/java/com/bigdata/htree/raba:7215-7271
/branches/RWSTORE_1_1_0_DEBUG/bigdata/src/java/com/bigdata/htree/raba:5896-5935
/branches/TIDS_PLUS_BLOBS_BRANCH/bigdata/src/java/com/bigdata/htree/raba:4814-4836
/branches/ZK_DISCONNECT_HANDLING/bigdata/src/java/com/bigdata/htree/raba:7465-7484
+ /branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata/src/java/com/bigdata/htree/raba:6769-6785
/branches/BIGDATA_RELEASE_1_2_0/bigdata/src/java/com/bigdata/htree/raba:6766-7380
/branches/BIGDATA_RELEASE_1_3_0/bigdata/src/java/com/bigdata/htree/raba:7608-7684
/branches/INT64_BRANCH/bigdata/src/java/com/bigdata/htree/raba:4486-4522
/branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/htree/raba:4525-4531,4533-4548,4550-4584,4586-4609,4611-4632,4634-4643,4646-4672,4674-4685,4687-4693,4697-4735,4737-4782,4784-4792,4794-4796,4798-4801
/branches/READ_CACHE/bigdata/src/java/com/bigdata/htree/raba:7215-7271
/branches/RWSTORE_1_1_0_DEBUG/bigdata/src/java/com/bigdata/htree/raba:5896-5935
/branches/TIDS_PLUS_BLOBS_BRANCH/bigdata/src/java/com/bigdata/htree/raba:4814-4836
/branches/ZK_DISCONNECT_HANDLING/bigdata/src/java/com/bigdata/htree/raba:7465-7484
Property changes on: branches/MGC_1_3_0/bigdata/src/java/com/bigdata/jsr166
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata/src/java/com/bigdata/jsr166:6769-6785
/branches/BIGDATA_RELEASE_1_2_0/bigdata/src/java/com/bigdata/jsr166:6766-7380
/branches/INT64_BRANCH/bigdata/src/java/com/bigdata/jsr166:4486-4522
/branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/jsr166:4525-4531,4533-4548,4550-4584,4586-4609,4611-4632,4634-4643,4646-4672,4674-4685,4687-4693,4697-4735,4737-4782,4784-4792,4794-4796,4798-4801
/branches/READ_CACHE/bigdata/src/java/com/bigdata/jsr166:7215-7271
/branches/RWSTORE_1_1_0_DEBUG/bigdata/src/java/com/bigdata/jsr166:5896-5935
/branches/TIDS_PLUS_BLOBS_BRANCH/bigdata/src/java/com/bigdata/jsr166:4814-4836
/branches/ZK_DISCONNECT_HANDLING/bigdata/src/java/com/bigdata/jsr166:7465-7484
+ /branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata/src/java/com/bigdata/jsr166:6769-6785
/branches/BIGDATA_RELEASE_1_2_0/bigdata/src/java/com/bigdata/jsr166:6766-7380
/branches/BIGDATA_RELEASE_1_3_0/bigdata/src/java/com/bigdata/jsr166:7608-7684
/branches/INT64_BRANCH/bigdata/src/java/com/bigdata/jsr166:4486-4522
/branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/jsr166:4525-4531,4533-4548,4550-4584,4586-4609,4611-4632,4634-4643,4646-4672,4674-4685,4687-4693,4697-4735,4737-4782,4784-4792,4794-4796,4798-4801
/branches/READ_CACHE/bigdata/src/java/com/bigdata/jsr166:7215-7271
/branches/RWSTORE_1_1_0_DEBUG/bigdata/src/java/com/bigdata/jsr166:5896-5935
/branches/TIDS_PLUS_BLOBS_BRANCH/bigdata/src/java/com/bigdata/jsr166:4814-4836
/branches/ZK_DISCONNECT_HANDLING/bigdata/src/java/com/bigdata/jsr166:7465-7484
Modified: branches/MGC_1_3_0/bigdata/src/releases/RELEASE_1_3_0.txt
===================================================================
--- branches/MGC_1_3_0/bigdata/src/releases/RELEASE_1_3_0.txt 2013-12-19 21:11:18 UTC (rev 7684)
+++ branches/MGC_1_3_0/bigdata/src/releases/RELEASE_1_3_0.txt 2013-12-19 21:34:30 UTC (rev 7685)
@@ -1,4 +1,4 @@
-This is a minor release of bigdata(R).
+This is a major release of bigdata(R).
Bigdata is a horizontally-scaled, open-source architecture for indexed data with an emphasis on RDF capable of loading 1B triples in under one hour on a 15 node cluster. Bigdata operates in both a single machine mode (Journal), highly available replication cluster mode (HAJournalServer), and a horizontally sharded cluster mode (BigdataFederation). The Journal provides fast scalable ACID indexed storage for very large data sets, up to 50 billion triples / quads. The HAJournalServer adds replication, online backup, horizontal scaling of query, and high availability. The federation provides fast scalable shard-wise parallel indexed storage using dynamic sharding and shard-wise ACID updates and incremental cluster size growth. Both platforms support fully concurrent readers with snapshot isolation.
@@ -8,8 +8,10 @@
Starting with the 1.0.0 release, we offer a WAR artifact [8] for easy installation of the single machine RDF database. For custom development and cluster installations we recommend checking out the code from SVN using the tag for this release. The code will build automatically under eclipse. You can also build the code using the ant script. The cluster installer requires the use of the ant script.
-You can download the WAR from:
+Starting with the 1.3.0 release, we offer a tarball artifact [10] for easy installation of the HA replication cluster.
+You can download the WAR (standalone) or HA artifacts from:
+
http://sourceforge.net/projects/bigdata/
You can checkout this release from:
@@ -18,16 +20,15 @@
New features:
-- SPARQL 1.1 Update Extensions (SPARQL UPDATE for named solution sets). See https://sourceforge.net/apps/mediawiki/bigdata/index.php?title=SPARQL_Update for more information.
-- SPARQL 1.1 Property Paths.
-- Remote Java client for Multi-Tenancy extensions NanoSparqlServer
-- Sesame 2.6.10 dependency
+- High availability [10].
+- Property Path performance enhancements.
- Plus numerous other bug fixes and performance enhancements.
Feature summary:
+- Highly Available Replication Clusters (HAJournalServer [10])
- Single machine data storage to ~50B triples/quads (RWStore);
-- Clustered data storage is essentially unlimited;
+- Clustered data storage is essentially unlimited (BigdataFederation);
- Simple embedded and/or webapp deployment (NanoSparqlServer);
- Triples, quads, or triples with provenance (SIDs);
- Fast RDFS+ inference and truth maintenance;
@@ -37,14 +38,94 @@
Road map [3]:
-- High availability for the journal and the cluster.
-- Runtime Query Optimizer for Analytic Query mode; and
-- Simplified deployment, configuration, and administration for clusters.
+- RDF Graph Mining API [12];
+- Reification Done Right [11];
+- Column-wise indexing;
+- Runtime Query Optimizer for Analytic Query mode;
+- Performance optimization for scale-out clusters; and
+- Simplified deployment, configuration, and administration for scale-out clusters.
Change log:
Note: Versions with (*) MAY require data migration. For details, see [9].
+1.3.0:
+
+- http://sourceforge.net/apps/trac/bigdata/ticket/530 (Journal HA)
+- http://sourceforge.net/apps/trac/bigdata/ticket/621 (Coalesce write cache records and install reads in cache)
+- http://sourceforge.net/apps/trac/bigdata/ticket/623 (HA TXS)
+- http://sourceforge.net/apps/trac/bigdata/ticket/639 (Remove triple-buffering in RWStore)
+- http://sourceforge.net/apps/trac/bigdata/ticket/645 (HA backup)
+- http://sourceforge.net/apps/trac/bigdata/ticket/646 (River not compatible with newer 1.6.0 and 1.7.0 JVMs)
+- http://sourceforge.net/apps/trac/bigdata/ticket/648 (Add a custom function to use full text index for filtering.)
+- http://sourceforge.net/apps/trac/bigdata/ticket/651 (RWS test failure)
+- http://sourceforge.net/apps/trac/bigdata/ticket/652 (Compress write cache blocks for replication and in HALogs)
+- http://sourceforge.net/apps/trac/bigdata/ticket/662 (Latency on followers during commit on leader)
+- http://sourceforge.net/apps/trac/bigdata/ticket/663 (Issue with OPTIONAL blocks)
+- http://sourceforge.net/apps/trac/bigdata/ticket/664 (RWStore needs post-commit protocol)
+- http://sourceforge.net/apps/trac/bigdata/ticket/665 (HA3 LOAD non-responsive with node failure)
+- http://sourceforge.net/apps/trac/bigdata/ticket/666 (Occasional CI deadlock in HALogWriter testConcurrentRWWriterReader)
+- http://sourceforge.net/apps/trac/bigdata/ticket/670 (Accumulating HALog files cause latency for HA commit)
+- http://sourceforge.net/apps/trac/bigdata/ticket/671 (Query on follower fails during UPDATE on leader)
+- http://sourceforge.net/apps/trac/bigdata/ticket/673 (DGC in release time consensus protocol causes native thread leak in HAJournalServer at each commit)
+- http://sourceforge.net/apps/trac/bigdata/ticket/674 (WCS write cache compaction causes errors in RWS postHACommit())
+- http://sourceforge.net/apps/trac/bigdata/ticket/676 (Bad patterns for timeout computations)
+- http://sourceforge.net/apps/trac/bigdata/ticket/677 (HA deadlock under UPDATE + QUERY)
+- http://sourceforge.net/apps/trac/bigdata/ticket/678 (DGC Thread and Open File Leaks: sendHALogForWriteSet())
+- http://sourceforge.net/apps/trac/bigdata/ticket/679 (HAJournalServer can not restart due to logically empty log file)
+- http://sourceforge.net/apps/trac/bigdata/ticket/681 (HAJournalServer deadlock: pipelineRemove() and getLeaderId())
+- http://sourceforge.net/apps/trac/bigdata/ticket/684 (Optimization with skos altLabel)
+- http://sourceforge.net/apps/trac/bigdata/ticket/686 (Consensus protocol does not detect clock skew correctly)
+- http://sourceforge.net/apps/trac/bigdata/ticket/687 (HAJournalServer Cache not populated)
+- http://sourceforge.net/apps/trac/bigdata/ticket/689 (Missing URL encoding in RemoteRepositoryManager)
+- http://sourceforge.net/apps/trac/bigdata/ticket/690 (Error when using the alias "a" instead of rdf:type for a multipart insert)
+- http://sourceforge.net/apps/trac/bigdata/ticket/691 (Failed to re-interrupt thread in HAJournalServer)
+- http://sourceforge.net/apps/trac/bigdata/ticket/692 (Failed to re-interrupt thread)
+- http://sourceforge.net/apps/trac/bigdata/ticket/693 (OneOrMorePath SPARQL property path expression ignored)
+- http://sourceforge.net/apps/trac/bigdata/ticket/694 (Transparently cancel update/query in RemoteRepository)
+- http://sourceforge.net/apps/trac/bigdata/ticket/695 (HAJournalServer reports "follower" but is in SeekConsensus and is not participating in commits.)
+- http://sourceforge.net/apps/trac/bigdata/ticket/701 (Problems in BackgroundTupleResult)
+- http://sourceforge.net/apps/trac/bigdata/ticket/702 (InvocationTargetException on /namespace call)
+- http://sourceforge.net/apps/trac/bigdata/ticket/704 (ask does not return json)
+- http://sourceforge.net/apps/trac/bigdata/ticket/705 (Race between QueryEngine.putIfAbsent() and shutdownNow())
+- http://sourceforge.net/apps/trac/bigdata/ticket/706 (MultiSourceSequentialCloseableIterator.nextSource() can throw NPE)
+- http://sourceforge.net/apps/trac/bigdata/ticket/707 (BlockingBuffer.close() does not unblock threads)
+- http://sourceforge.net/apps/trac/bigdata/ticket/708 (BIND heisenbug - race condition on select query with BIND)
+- http://sourceforge.net/apps/trac/bigdata/ticket/711 (sparql protocol: mime type application/sparql-query)
+- http://sourceforge.net/apps/trac/bigdata/ticket/712 (SELECT ?x { OPTIONAL { ?x eg:doesNotExist eg:doesNotExist } } incorrect)
+- http://sourceforge.net/apps/trac/bigdata/ticket/715 (Interrupt of thread submitting a query for evaluation does not always terminate the AbstractRunningQuery)
+- http://sourceforge.net/apps/trac/bigdata/ticket/716 (Verify that IRunningQuery instances (and nested queries) are correctly cancelled when interrupted)
+- http://sourceforge.net/apps/trac/bigdata/ticket/718 (HAJournalServer needs to handle ZK client connection loss)
+- http://sourceforge.net/apps/trac/bigdata/ticket/720 (HA3 simultaneous service start failure)
+- http://sourceforge.net/apps/trac/bigdata/ticket/723 (HA asynchronous tasks must be canceled when invariants are changed)
+- http://sourceforge.net/apps/trac/bigdata/ticket/725 (FILTER EXISTS in subselect)
+- http://sourceforge.net/apps/trac/bigdata/ticket/726 (Logically empty HALog for committed transaction)
+- http://sourceforge.net/apps/trac/bigdata/ticket/727 (DELETE/INSERT fails with OPTIONAL non-matching WHERE)
+- http://sourceforge.net/apps/trac/bigdata/ticket/728 (Refactor to create HAClient)
+- http://sourceforge.net/apps/trac/bigdata/ticket/729 (ant bundleJar not working)
+- http://sourceforge.net/apps/trac/bigdata/ticket/731 (CBD and Update leads to 500 status code)
+- http://sourceforge.net/apps/trac/bigdata/ticket/732 (describe statement limit does not work)
+- http://sourceforge.net/apps/trac/bigdata/ticket/733 (Range optimizer not optimizing Slice service)
+- http://sourceforge.net/apps/trac/bigdata/ticket/734 (two property paths interfere)
+- http://sourceforge.net/apps/trac/bigdata/ticket/736 (MIN() malfunction)
+- http://sourceforge.net/apps/trac/bigdata/ticket/737 (class cast exception)
+- http://sourceforge.net/apps/trac/bigdata/ticket/739 (Inconsistent treatment of bind and optional property path)
+- http://sourceforge.net/apps/trac/bigdata/ticket/741 (ctc-striterators should build as independent top-level project (Apache2))
+- http://sourceforge.net/apps/trac/bigdata/ticket/743 (AbstractTripleStore.destroy() does not filter for correct prefix)
+- http://sourceforge.net/apps/trac/bigdata/ticket/746 (Assertion error)
+- http://sourceforge.net/apps/trac/bigdata/ticket/747 (BOUND bug)
+- http://sourceforge.net/apps/trac/bigdata/ticket/748 (incorrect join with subselect renaming vars)
+- http://sourceforge.net/apps/trac/bigdata/ticket/754 (Failure to setup SERVICE hook and changeLog for Unisolated and Read/Write connections)
+- http://sourceforge.net/apps/trac/bigdata/ticket/755 (Concurrent QuorumActors can interfere leading to failure to progress)
+- http://sourceforge.net/apps/trac/bigdata/ticket/756 (order by and group_concat)
+- http://sourceforge.net/apps/trac/bigdata/ticket/760 (Code review on 2-phase commit protocol)
+- http://sourceforge.net/apps/trac/bigdata/ticket/764 (RESYNC failure (HA))
+- http://sourceforge.net/apps/trac/bigdata/ticket/770 (alpp ordering)
+- http://sourceforge.net/apps/trac/bigdata/ticket/772 (Query timeout only checked at operator start/stop.)
+- http://sourceforge.net/apps/trac/bigdata/ticket/776 (Closed as duplicate of #490)
+- http://sourceforge.net/apps/trac/bigdata/ticket/778 (HA Leader fail results in transient problem with allocations on other services)
+- http://sourceforge.net/apps/trac/bigdata/ticket/783 (Operator Alerts (HA))
+
1.2.4:
- http://sourceforge.net/apps/trac/bigdata/ticket/777 (ConcurrentModificationException in ASTComplexOptionalOptimizer)
@@ -293,6 +374,9 @@
[7] http://www.systap.com/bigdata.htm
[8] http://sourceforge.net/projects/bigdata/files/bigdata/
[9] http://sourceforge.net/apps/mediawiki/bigdata/index.php?title=DataMigration
+[10] http://sourceforge.net/apps/mediawiki/bigdata/index.php?title=HAJournalServer
+[11] http://www.bigdata.com/whitepapers/reifSPARQL.pdf
+[12] http://sourceforge.net/apps/mediawiki/bigdata/index.php?title=RDF_GAS_API
About bigdata:
Property changes on: branches/MGC_1_3_0/bigdata/src/test/com/bigdata/bop/joinGraph
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata/src/test/com/bigdata/bop/joinGraph:6769-6785
/branches/BIGDATA_RELEASE_1_2_0/bigdata/src/test/com/bigdata/bop/joinGraph:6766-7380
/branches/INT64_BRANCH/bigdata/src/test/com/bigdata/bop/joinGraph:4486-4522
/branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/bop/joinGraph:4525-4531,4533-4548,4550-4584,4586-4609,4611-4632,4634-4643,4646-4672,4674-4685,4687-4693,4697-4735,4737-4782,4784-4792,4794-4796,4798-4801
/branches/READ_CACHE/bigdata/src/test/com/bigdata/bop/joinGraph:7215-7271
/branches/RWSTORE_1_1_0_DEBUG/bigdata/src/test/com/bigdata/bop/joinGraph:5896-5935
/branches/TIDS_PLUS_BLOBS_BRANCH/bigdata/src/test/com/bigdata/bop/joinGraph:4814-4836
/branches/ZK_DISCONNECT_HANDLING/bigdata/src/test/com/bigdata/bop/joinGraph:7465-7484
+ /branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata/src/test/com/bigdata/bop/joinGraph:6769-6785
/branches/BIGDATA_RELEASE_1_2_0/bigdata/src/test/com/bigdata/bop/joinGraph:6766-7380
/branches/BIGDATA_RELEASE_1_3_0/bigdata/src/test/com/bigdata/bop/joinGraph:7608-7684
/branches/INT64_BRANCH/bigdata/src/test/com/bigdata/bop/joinGraph:4486-4522
/branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/bop/joinGraph:4525-4531,4533-4548,4550-4584,4586-4609,4611-4632,4634-4643,4646-4672,4674-4685,4687-4693,4697-4735,4737-4782,4784-4792,4794-4796,4798-4801
/branches/READ_CACHE/bigdata/src/test/com/bigdata/bop/joinGraph:7215-7271
/branches/RWSTORE_1_1_0_DEBUG/bigdata/src/test/com/bigdata/bop/joinGraph:5896-5935
/branches/TIDS_PLUS_BLOBS_BRANCH/bigdata/src/test/com/bigdata/bop/joinGraph:4814-4836
/branches/ZK_DISCONNECT_HANDLING/bigdata/src/test/com/bigdata/bop/joinGraph:7465-7484
Property changes on: branches/MGC_1_3_0/bigdata/src/test/com/bigdata/bop/util
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata/src/test/com/bigdata/bop/util:6769-6785
/branches/BIGDATA_RELEASE_1_2_0/bigdata/src/test/com/bigdata/bop/util:6766-7380
/branches/INT64_BRANCH/bigdata/src/test/com/bigdata/bop/util:4486-4522
/branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/bop/util:4525-4531,4533-4548,4550-4584,4586-4609,4611-4632,4634-4643,4646-4672,4674-4685,4687-4693,4697-4735,4737-4782,4784-4792,4794-4796,4798-4801
/branches/READ_CACHE/bigdata/src/test/com/bigdata/bop/util:7215-7271
/branches/RWSTORE_1_1_0_DEBUG/bigdata/src/test/com/bigdata/bop/util:5896-5935
/branches/TIDS_PLUS_BLOBS_BRANCH/bigdata/src/test/com/bigdata/bop/util:4814-4836
/branches/ZK_DISCONNECT_HANDLING/bigdata/src/test/com/bigdata/bop/util:7465-7484
+ /branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata/src/test/com/bigdata/bop/util:6769-6785
/branches/BIGDATA_RELEASE_1_2_0/bigdata/src/test/com/bigdata/bop/util:6766-7380
/branches/BIGDATA_RELEASE_1_3_0/bigdata/src/test/com/bigdata/bop/util:7608-7684
/branches/INT64_BRANCH/bigdata/src/test/com/bigdata/bop/util:4486-4522
/branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/bop/util:4525-4531,4533-4548,4550-4584,4586-4609,4611-4632,4634-4643,4646-4672,4674-4685,4687-4693,4697-4735,4737-4782,4784-4792,4794-4796,4798-4801
/branches/READ_CACHE/bigdata/src/test/com/bigdata/bop/util:7215-7271
/branches/RWSTORE_1_1_0_DEBUG/bigdata/src/test/com/bigdata/bop/util:5896-5935
/branches/TIDS_PLUS_BLOBS_BRANCH/bigdata/src/test/com/bigdata/bop/util:4814-4836
/branches/ZK_DISCONNECT_HANDLING/bigdata/src/test/com/bigdata/bop/util:7465-7484
Modified: branches/MGC_1_3_0/bigdata/src/test/com/bigdata/io/TestNameAndExtensionFilter.java
===================================================================
--- branches/MGC_1_3_0/bigdata/src/test/com/bigdata/io/TestNameAndExtensionFilter.java 2013-12-19 21:11:18 UTC (rev 7684)
+++ branches/MGC_1_3_0/bigdata/src/test/com/bigdata/io/TestNameAndExtensionFilter.java 2013-12-19 21:34:30 UTC (rev 7685)
@@ -53,7 +53,7 @@
/**
* @param name
*/
- public TestNameAndExtensionFilter(String name) {
+ public TestNameAndExtensionFilter(final String name) {
super(name);
}
@@ -64,85 +64,93 @@
* @param expected
* @param actual
*/
- public void assertSameFiles( File[] expected, File[] actual )
- {
-
- if( expected == null ) {
-
- throw new AssertionError( "expected is null.");
-
+ private void assertSameFiles(final File[] expected, final File[] actual) {
+
+ if (expected == null) {
+
+ throw new AssertionError("expected is null.");
+
}
- if( actual == null ) {
-
- fail( "actual is null.");
-
+ if (actual == null) {
+
+ fail("actual is null.");
+
}
- assertEquals( "#of files", expected.length, actual.length );
-
+ assertEquals("#of files", expected.length, actual.length);
+
// Insert the expected files into a set.
- Set expectedSet = new HashSet();
-
- for( int i=0; i<expected.length; i++ ) {
+ final Set<String> expectedSet = new HashSet<String>();
- File expectedFile = expected[ i ];
-
- if( expectedFile == null ) {
+ for (int i = 0; i < expected.length; i++) {
- throw new AssertionError( "expected file is null at index="+i );
-
+ final File expectedFile = expected[i];
+
+ if (expectedFile == null) {
+
+ throw new AssertionError("expected file is null at index=" + i);
+
}
- if( ! expectedSet.add( expectedFile.toString() ) ) {
-
- throw new AssertionError( "expected File[] contains duplicate: expected["+i+"]="+expectedFile );
-
+ if (!expectedSet.add(expectedFile.toString())) {
+
+ throw new AssertionError(
+ "expected File[] contains duplicate: expected[" + i
+ + "]=" + expectedFile);
+
}
-
+
}
/*
* Verify that each actual file occurs in the expectedSet using a
* selection without replacement policy.
*/
-
- for( int i=0; i<actual.length; i++ ) {
-
- File actualFile = actual[ i ];
-
- if( actualFile == null ) {
-
- fail( "actual file is null at index="+i );
-
+
+ for (int i = 0; i < actual.length; i++) {
+
+ final File actualFile = actual[i];
+
+ if (actualFile == null) {
+
+ fail("actual file is null at index=" + i);
+
}
-
- if( ! expectedSet.remove( actual[ i ].toString() ) ) {
-
- fail( "actual file="+actualFile+" at index="+i+" was not found in expected files." );
-
+
+ if (!expectedSet.remove(actual[i].toString())) {
+
+ fail("actual file=" + actualFile + " at index=" + i
+ + " was not found in expected files.");
+
}
-
+
}
-
+
}
-
+
/**
* Test verifies that no files are found using a guarenteed unique basename.
*/
- public void test_filter_001() throws IOException
- {
-
- final File basefile = File.createTempFile(getName(),"-test");
- basefile.deleteOnExit();
-
- final String basename = basefile.toString();
- System.err.println( "basename="+basename );
-
- NameAndExtensionFilter logFilter = new NameAndExtensionFilter( basename, ".log" );
-
- assertSameFiles( new File[]{}, logFilter.getFiles() );
-
+ public void test_filter_001() throws IOException {
+
+ final File basefile = File.createTempFile(getName(), "-test");
+
+ try {
+
+ final String basename = basefile.toString();
+
+ final NameAndExtensionFilter logFilter = new NameAndExtensionFilter(
+ basename, ".log");
+
+ assertSameFiles(new File[] {}, logFilter.getFiles());
+
+ } finally {
+
+ basefile.delete();
+
+ }
+
}
/**
@@ -150,33 +158,48 @@
*/
public void test_filter_002() throws IOException {
- int N = 100;
-
- final File logBaseFile = File.createTempFile(getName(),"-test");
- logBaseFile.deleteOnExit();
-
- final String basename = logBaseFile.toString();
- System.err.println( "basename="+basename );
-
- NameAndExtensionFilter logFilter = new NameAndExtensionFilter( basename, ".log" );
+ final int N = 100;
- Vector v = new Vector( N );
-
- for( int i=0; i<N; i++ ) {
+ final Vector<File> v = new Vector<File>(N);
- File logFile = new File( basename+"."+i+".log" );
- logFile.deleteOnExit();
- logFile.createNewFile();
-// System.err.println( "logFile="+logFile );
-
- v.add( logFile );
-
+ final File logBaseFile = File.createTempFile(getName(), "-test");
+ // logBaseFile.deleteOnExit();
+
+ try {
+
+ final String basename = logBaseFile.toString();
+ // System.err.println( "basename="+basename );
+
+ final NameAndExtensionFilter logFilter = new NameAndExtensionFilter(
+ basename, ".log");
+
+ for (int i = 0; i < N; i++) {
+
+ final File logFile = new File(basename + "." + i + ".log");
+ // logFile.deleteOnExit();
+ logFile.createNewFile();
+ // System.err.println( "logFile="+logFile );
+
+ v.add(logFile);
+
+ }
+
+ final File[] expectedFiles = (File[]) v.toArray(new File[] {});
+
+ assertSameFiles(expectedFiles, logFilter.getFiles());
+
+ } finally {
+
+ logBaseFile.delete();
+
+ for (File f : v) {
+
+ f.delete();
+
+ }
+
}
- File[] expectedFiles = (File[]) v.toArray(new File[]{});
-
- assertSameFiles( expectedFiles, logFilter.getFiles() );
-
}
}
Property changes on: branches/MGC_1_3_0/bigdata/src/test/com/bigdata/jsr166
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata/src/test/com/bigdata/jsr166:6769-6785
/branches/BIGDATA_RELEASE_1_2_0/bigdata/src/test/com/bigdata/jsr166:6766-7380
/branches/INT64_BRANCH/bigdata/src/test/com/bigdata/jsr166:4486-4522
/branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/jsr166:4525-4531,4533-4548,4550-4584,4586-4609,4611-4632,4634-4643,4646-4672,4674-4685,4687-4693,4697-4735,4737-4782,4784-4792,4794-4796,4798-4801
/branches/READ_CACHE/bigdata/src/test/com/bigdata/jsr166:7215-7271
/branches/RWSTORE_1_1_0_DEBUG/bigdata/src/test/com/bigdata/jsr166:5896-5935
/branches/TIDS_PLUS_BLOBS_BRANCH/bigdata/src/test/com/bigdata/jsr166:4814-4836
/branches/ZK_DISCONNECT_HANDLING/bigdata/src/test/com/bigdata/jsr166:7465-7484
+ /branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata/src/test/com/bigdata/jsr166:6769-6785
/branches/BIGDATA_RELEASE_1_2_0/bigdata/src/test/com/bigdata/jsr166:6766-7380
/branches/BIGDATA_RELEASE_1_3_0/bigdata/src/test/com/bigdata/jsr166:7608-7684
/branches/INT64_BRANCH/bigdata/src/test/com/bigdata/jsr166:4486-4522
/branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/jsr166:4525-4531,4533-4548,4550-4584,4586-4609,4611-4632,4634-4643,4646-4672,4674-4685,4687-4693,4697-4735,4737-4782,4784-4792,4794-4796,4798-4801
/branches/READ_CACHE/bigdata/src/test/com/bigdata/jsr166:7215-7271
/branches/RWSTORE_1_1_0_DEBUG/bigdata/src/test/com/bigdata/jsr166:5896-5935
/branches/TIDS_PLUS_BLOBS_BRANCH/bigdata/src/test/com/bigdata/jsr166:4814-4836
/branches/ZK_DISCONNECT_HANDLING/bigdata/src/test/com/bigdata/jsr166:7465-7484
Property changes on: branches/MGC_1_3_0/bigdata/src/test/com/bigdata/util/httpd
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata/src/test/com/bigdata/util/httpd:6769-6785
/branches/BIGDATA_RELEASE_1_2_0/bigdata/src/test/com/bigdata/util/httpd:6766-7380
/branches/INT64_BRANCH/bigdata/src/test/com/bigdata/util/httpd:4486-4522
/branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/util/httpd:4525-4531,4533-4548,4550-4584,4586-4609,4611-4632,4634-4643,4646-4672,4674-4685,4687-4693,4697-4735,4737-4782,4784-4792,4794-4796,4798-4801
/branches/READ_CACHE/bigdata/src/test/com/bigdata/util/httpd:7215-7271
/branches/RWSTORE_1_1_0_DEBUG/bigdata/src/test/com/bigdata/util/httpd:5896-5935
/branches/TIDS_PLUS_BLOBS_BRANCH/bigdata/src/test/com/bigdata/util/httpd:4814-4836
/branches/ZK_DISCONNECT_HANDLING/bigdata/src/test/com/bigdata/util/httpd:7465-7484
+ /branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata/src/test/com/bigdata/util/httpd:6769-6785
/branches/BIGDATA_RELEASE_1_2_0/bigdata/src/test/com/bigdata/util/httpd:6766-7380
/branches/BIGDATA_RELEASE_1_3_0/bigdata/src/test/com/bigdata/util/httpd:7608-7684
/branches/INT64_BRANCH/bigdata/src/test/com/bigdata/util/httpd:4486-4522
/branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/util/httpd:4525-4531,4533-4548,4550-4584,4586-4609,4611-4632,4634-4643,4646-4672,4674-4685,4687-4693,4697-4735,4737-4782,4784-4792,4794-4796,4798-4801
/branches/READ_CACHE/bigdata/src/test/com/bigdata/util/httpd:7215-7271
/branches/RWSTORE_1_1_0_DEBUG/bigdata/src/test/com/bigdata/util/httpd:5896-5935
/branches/TIDS_PLUS_BLOBS_BRANCH/bigdata/src/test/com/bigdata/util/httpd:4814-4836
/branches/ZK_DISCONNECT_HANDLING/bigdata/src/test/com/bigdata/util/httpd:7465-7484
Property changes on: branches/MGC_1_3_0/bigdata-compatibility
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-compatibility:6769-6785
/branches/BIGDATA_RELEASE_1_2_0/bigdata-compatibility:6766-7380
/branches/INT64_BRANCH/bigdata-compatibility:4486-4522
/branches/LARGE_LITERALS_REFACTOR/bigdata-compatibility:4175-4387
/branches/QUADS_QUERY_BRANCH/bigdata-compatibility:4525-4531,4533-4548,4550-4584,4586-4609,4611-4632,4634-4643,4646-4672,4674-4685,4687-4693,4697-4735,4737-4782,4784-4792,4794-4796,4798-4801
/branches/READ_CACHE/bigdata-compatibility:7215-7271
/branches/RWSTORE_1_1_0_DEBUG/bigdata-compatibility:5896-5935
/branches/TIDS_PLUS_BLOBS_BRANCH/bigdata-compatibility:4814-4836
/branches/ZK_DISCONNECT_HANDLING/bigdata-compatibility:7465-7484
+ /branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-compatibility:6769-6785
/branches/BIGDATA_RELEASE_1_2_0/bigdata-compatibility:6766-7380
/branches/BIGDATA_RELEASE_1_3_0/bigdata-compatibility:7608-7684
/branches/INT64_BRANCH/bigdata-compatibility:4486-4522
/branches/LARGE_LITERALS_REFACTOR/bigdata-compatibility:4175-4387
/branches/QUADS_QUERY_BRANCH/bigdata-compatibility:4525-4531,4533-4548,4550-4584,4586-4609,4611-4632,4634-4643,4646-4672,4674-4685,4687-4693,4697-4735,4737-4782,4784-4792,4794-4796,4798-4801
/branches/READ_CACHE/bigdata-compatibility:7215-7271
/branches/RWSTORE_1_1_0_DEBUG/bigdata-compatibility:5896-5935
/branches/TIDS_PLUS_BLOBS_BRANCH/bigdata-compatibility:4814-4836
/branches/ZK_DISCONNECT_HANDLING/bigdata-compatibility:7465-7484
Property changes on: branches/MGC_1_3_0/bigdata-jini/src/java/com/bigdata/attr
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-jini/src/java/com/bigdata/attr:6769-6785
/branches/BIGDATA_RELEASE_1_2_0/bigdata-jini/src/java/com/bigdata/attr:6766-7380
/branches/BTREE_BUFFER_BRANCH/bigdata-jini/src/java/com/bigdata/attr:2004-2045
/branches/DEV_BRANCH_27_OCT_2009/bigdata-jini/src/java/com/bigdata/attr:2270-2546,2548-2782
/branches/INT64_BRANCH/bigdata-jini/src/java/com/bigdata/attr:4486-4522
/branches/JOURNAL_HA_BRANCH/bigdata-jini/src/java/com/bigdata/attr:2596-4066
/branches/LARGE_LITERALS_REFACTOR/bigdata-jini/src/java/com/bigdata/attr:4175-4387
/branches/LEXICON_REFACTOR_BRANCH/bigdata-jini/src/java/com/bigdata/attr:2633-3304
/branches/QUADS_QUERY_BRANCH/bigdata-jini/src/java/com/bigdata/attr:4525-4531,4533-4548,4550-4584,4586-4609,4611-4632,4634-4643,4646-4672,4674-4685,4687-4693,4697-4735,4737-4782,4784-4792,4794-4796,4798-4801
/branches/READ_CACHE/bigdata-jini/src/java/com/bigdata/attr:7215-7271
/branches/RWSTORE_1_1_0_DEBUG/bigdata-jini/src/java/com/bigdata/attr:5896-5935
/branches/TIDS_PLUS_BLOBS_BRANCH/bigdata-jini/src/java/com/bigdata/attr:4814-4836
/branches/ZK_DISCONNECT_HANDLING/bigdata-jini/src/java/com/bigdata/attr:7465-7484
/branches/bugfix-btm/bigdata-jini/src/java/com/bigdata/attr:2594-3237
/branches/dev-btm/bigdata-jini/src/java/com/bigdata/attr:2574-2730
/branches/fko/bigdata-jini/src/java/com/bigdata/attr:3150-3194
/trunk/bigdata-jini/src/java/com/bigdata/attr:2981-3282,3368-3437,3656-4061
+ /branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-jini/src/java/com/bigdata/attr:6769-6785
/branches/BIGDATA_RELEASE_1_2_0/bigdata-jini/src/java/com/bigdata/attr:6766-7380
/branches/BIGDATA_RELEASE_1_3_0/bigdata-jini/src/java/com/bigdata/attr:7608-7684
/branches/BTREE_BUFFER_BRANCH/bigdata-jini/src/java/com/bigdata/attr:2004-2045
/branches/DEV_BRANCH_27_OCT_2009/bigdata-jini/src/java/com/bigdata/attr:2270-2546,2548-2782
/branches/INT64_BRANCH/bigdata-jini/src/java/com/bigdata/attr:4486-4522
/branches/JOURNAL_HA_BRANCH/bigdata-jini/src/java/com/bigdata/attr:2596-4066
/branches/LARGE_LITERALS_REFACTOR/bigdata-jini/src/java/com/bigdata/attr:4175-4387
/branches/LEXICON_REFACTOR_BRANCH/bigdata-jini/src/java/com/bigdata/attr:2633-3304
/branches/QUADS_QUERY_BRANCH/bigdata-jini/src/java/com/bigdata/attr:4525-4531,4533-4548,4550-4584,4586-4609,4611-4632,4634-4643,4646-4672,4674-4685,4687-4693,4697-4735,4737-4782,4784-4792,4794-4796,4798-4801
/branches/READ_CACHE/bigdata-jini/src/java/com/bigdata/attr:7215-7271
/branches/RWSTORE_1_1_0_DEBUG/bigdata-jini/src/java/com/bigdata/attr:5896-5935
/branches/TIDS_PLUS_BLOBS_BRANCH/bigdata-jini/src/java/com/bigdata/attr:4814-4836
/branches/ZK_DISCONNECT_HANDLING/bigdata-jini/src/java/com/bigdata/attr:7465-7484
/branches/bugfix-btm/bigdata-jini/src/java/com/bigdata/attr:2594-3237
/branches/dev-btm/bigdata-jini/src/java/com/bigdata/attr:2574-2730
/branches/fko/bigdata-jini/src/java/com/bigdata/attr:3150-3194
/trunk/bigdata-jini/src/java/com/bigdata/attr:2981-3282,3368-3437,3656-4061
Property changes on: branches/MGC_1_3_0/bigdata-jini/src/java/com/bigdata/disco
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-jini/src/java/com/bigdata/disco:6769-6785
/branches/BIGDATA_RELEASE_1_2_0/bigdata-jini/src/java/com/bigdata/disco:6766-7380
/branches/BTREE_BUFFER_BRANCH/bigdata-jini/src/java/com/bigdata/disco:2004-2045
/branches/DEV_BRANCH_27_OCT_2009/bigdata-jini/src/java/com/bigdata/disco:2270-2546,2548-2782
/branches/INT64_BRANCH/bigdata-jini/src/java/com/bigdata/disco:4486-4522
/branches/JOURNAL_HA_BRANCH/bigdata-jini/src/java/com/bigdata/disco:2596-4066
/branches/LARGE_LITERALS_REFACTOR/bigdata-jini/src/java/com/bigdata/disco:4175-4387
/branches/LEXICON_REFACTOR_BRANCH/bigdata-jini/src/java/com/bigdata/disco:2633-3304
/branches/QUADS_QUERY_BRANCH/bigdata-jini/src/java/com/bigdata/disco:4525-4531,4533-4548,4550-4584,4586-4609,4611-4632,4634-4643,4646-4672,4674-4685,4687-4693,4697-4735,4737-4782,4784-4792,4794-4796,4798-4801
/branches/READ_CACHE/bigdata-jini/src/java/com/bigdata/disco:7215-7271
/branches/RWSTORE_1_1_0_DEBUG/bigdata-jini/src/java/com/bigdata/disco:5896-5935
/branches/TIDS_PLUS_BLOBS_BRANCH/bigdata-jini/src/java/com/bigdata/disco:4814-4836
/branches/ZK_DISCONNECT_HANDLING/bigdata-jini/src/java/com/bigdata/disco:7465-7484
/branches/bugfix-btm/bigdata-jini/src/java/com/bigdata/disco:2594-3237
/branches/dev-btm/bigdata-jini/src/java/com/bigdata/disco:2574-2730
/branches/fko/bigdata-jini/src/java/com/bigdata/disco:3150-3194
/trunk/bigdata-jini/src/java/com/bigdata/disco:2981-3282,3368-3437,3656-4061
+ /branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata-jini/src/java/com/bigdata/disco:6769-6785
/branches/BIGDATA_RELEASE_1_2_0/bigdata-jini/src/java/com/bigdata/disco:6766-7380
/branches/BIGDATA_RELEASE_1_3_0/bigdata-jini/src/java/com/bigdata/disco:7608-7684
/branches/BTREE_BUFFER_BRANCH/bigdata-jini/src/java/com/bigdata/disco:2004-2045
/branches/DEV_BRANCH_27_OCT_2009/bigdata-jini/src/java/com/bigdata/disco:2270-2546,2548-2782
/branches/INT64_BRANCH/bigdata-jini/src/java/com/bigdata/disco:4486-4522
/branches/JOURNAL_HA_BRANCH/bigdata-jini/src/java/com/bigdata/disco:2596-4066
/branches/LARGE_LITERALS_REFACTOR/bigdata-jini/src/java/com/bigdata/disco:4175-4387
/branches/LEXICON_REFACTOR_BRANCH/bigdata-jini/src/java/com/bigdata/disco:2633-3304
/branches/QUADS_QUERY_BRANCH/bigdata-jini/src/java/com/bigdata/disco:4525-4531,4533-4548,4550-4584,4586-4609,4611-4632,4634-4643,4646-4672,4674-4685,4687-4693,4697-4735,4737-4782,4784-4792,4794-4796,4798-4801
/branches/READ_CACHE/bigdata-jini/src/java/com/bigdata/disco:7215-7271
/branches/RWSTORE_1_1_0_DEBUG/bigdata-jini/src/java/com/bigdata/disco:5896-5935
/branches/TIDS_PLUS_BLOBS_BRANCH/bigdata-jini/src/java/com/bigdata/disco:4814-4836
/branches/ZK_DISCONNECT_HANDLING/bigdata-jini/src/java/com/bigdata/disco:7465-7484
/branches/bugfix-btm/bigdata-jini/src/java/com/bigdata/disco:2594-3237
/branches/dev-btm/bigdata-jini/src/java/com/bigdata/disco:2574-2730
/branches/fko/bigdata-jini/src/java/com/bigdata/disco:3150-3194
/trunk/bigdata-jini/src/java/com/bigdata/disco:2981-3282,3368-3437,3656-4061
Modified: branches/MGC_1_3_0/bigdata-jini/src/java/com/bigdata/journal/jini/ha/DefaultSnapshotPolicy.java
===================================================================
--- branches/MGC_1_3_0/bigdata-jini/src/java/com/bigdata/journal/jini/ha/DefaultSnapshotPolicy.java 2013-12-19 21:11:18 UTC (rev 7684)
+++ branches/MGC_1_3_0/bigdata-jini/src/java/com/bigdata/journal/jini/ha/DefaultSnapshotPolicy.java 2013-12-19 21:34:30 UTC (rev 7685)
@@ -136,6 +136,7 @@
}
+ @Override
public void init(final HAJournal jnl) {
// delay until next run (ms).
Modified: branches/MGC_1_3_0/bigdata-jini/src/java/com/bigdata/journal/jini/ha/HAJournal.java
===================================================================
--- branches/MGC_1_3_0/bigdata-jini/src/java/com/bigdata/journal/jini/ha/HAJournal.java 2013-12-19 21:11:18 UTC (rev 7684)
+++ branches/MGC_1_3_0/bigdata-jini/src/java/com/bigdata/journal/jini/ha/HAJournal.java 2013-12-19 21:34:30 UTC (rev 7685)
@@ -54,6 +54,8 @@
import org.apache.log4j.Logger;
import com.bigdata.concurrent.FutureTaskInvariantMon;
+import com.bigdata.counters.CounterSet;
+import com.bigdata.counters.Instrument;
import com.bigdata.ha.HAGlue;
import com.bigdata.ha.QuorumService;
import com.bigdata.ha.RunState;
@@ -94,6 +96,7 @@
import com.bigdata.journal.jini.ha.HAJournalServer.NSSConfigurationOptions;
import com.bigdata.journal.jini.ha.HAJournalServer.RunStateEnum;
import com.bigdata.quorum.Quorum;
+import com.bigdata.resources.StoreManager.IStoreManagerCounters;
import com.bigdata.service.AbstractTransactionService;
import com.bigdata.service.jini.JiniClient;
import com.bigdata.service.jini.RemoteAdministrable;
@@ -729,6 +732,208 @@
// }
/**
+ * Interface for additional performance counters exposed by the
+ * {@link HAJournal}.
+ *
+ * @author <a href="mailto:tho...@us...">Bryan
+ * Thompson</a>
+ */
+ public interface IHAJournalCounters {
+
+ /**
+ * The namespace for counters pertaining to free space on the various
+ * volumes.
+ */
+ String Volumes = "Volumes";
+
+// /**
+// * The configured service directory.
+// */
+// String ServiceDir = "ServiceDir";
+//
+// /**
+// * The configured data directory (the directory in which the Journal
+// * file is stored).
+// */
+// String DataDir = "DataDir";
+//
+// /**
+// * The configured HALog directory.
+// */
+// String HALogDir = "HALogDir";
+//
+// /**
+// * The configured Snapshot directory.
+// */
+// String SnapshotDir = "ShapshotDir";
+//
+// /**
+// * The configured tmp directory.
+// */
+// String TmpDir = "TmpDir";
+
+ /**
+ * The #of bytes available on the disk volume on which the service
+ * directory is located.
+ *
+ * @see HAJournalServer#getServiceDir()
+ */
+ String ServiceDirBytesAvailable = "Service Volume Bytes Available";
+
+ /**
+ * The #of bytes available on the disk volume on which the data
+ * directory is located (the directory in which the Journal file
+ * is stored).
+ *
+ * @see Journal#getDataDir()
+ */
+ String DataDirBytesAvailable = "Data Volume Bytes Available";
+
+ /**
+ * The #of bytes available on the disk volume on which the HALog
+ * directory is located.
+ *
+ * @see HALogNexus#getHALogDir()
+ */
+ String HALogDirBytesAvailable = "HALog Volume Bytes Available";
+
+ /**
+ * The #of bytes available on the disk volume on which the snapshot
+ * directory is located.
+ *
+ ...
[truncated message content] |
