From: <tho...@us...> - 2014-11-15 20:33:55
|
Revision: 8710 http://sourceforge.net/p/bigdata/code/8710 Author: thompsonbry Date: 2014-11-15 20:33:32 +0000 (Sat, 15 Nov 2014) Log Message: ----------- Merge from git master to branches/BIGDATA_RELEASE_1_4_0 for CI leading up to the 1.4.0 release. See #1042 Modified Paths: -------------- branches/BIGDATA_RELEASE_1_4_0/.classpath branches/BIGDATA_RELEASE_1_4_0/.project branches/BIGDATA_RELEASE_1_4_0/bigdata/src/java/com/bigdata/Depends.java branches/BIGDATA_RELEASE_1_4_0/bigdata/src/java/com/bigdata/bop/Var.java branches/BIGDATA_RELEASE_1_4_0/bigdata/src/java/com/bigdata/bop/join/HashIndexOp.java branches/BIGDATA_RELEASE_1_4_0/bigdata/src/java/com/bigdata/bop/join/NestedLoopJoinOp.java branches/BIGDATA_RELEASE_1_4_0/bigdata/src/java/com/bigdata/bop/join/PipelineJoin.java branches/BIGDATA_RELEASE_1_4_0/bigdata/src/java/com/bigdata/htree/DirectoryPage.java branches/BIGDATA_RELEASE_1_4_0/bigdata/src/java/com/bigdata/relation/accesspath/AccessPath.java branches/BIGDATA_RELEASE_1_4_0/bigdata/src/java/com/bigdata/service/DataService.java branches/BIGDATA_RELEASE_1_4_0/bigdata/src/java/com/bigdata/striterator/AbstractKeyOrder.java branches/BIGDATA_RELEASE_1_4_0/bigdata/src/java/com/bigdata/util/config/LogUtil.java branches/BIGDATA_RELEASE_1_4_0/bigdata/src/resources/logging/log4j-dev.properties branches/BIGDATA_RELEASE_1_4_0/bigdata/src/resources/logging/log4j.properties branches/BIGDATA_RELEASE_1_4_0/bigdata/src/test/com/bigdata/bop/join/TestAll.java branches/BIGDATA_RELEASE_1_4_0/bigdata/src/test/com/bigdata/btree/AbstractBTreeTestCase.java branches/BIGDATA_RELEASE_1_4_0/bigdata/src/test/com/bigdata/journal/ProxyTestCase.java branches/BIGDATA_RELEASE_1_4_0/bigdata-blueprints/src/java/com/bigdata/blueprints/BigdataGraph.java branches/BIGDATA_RELEASE_1_4_0/bigdata-blueprints/src/java/com/bigdata/blueprints/BigdataGraphEmbedded.java branches/BIGDATA_RELEASE_1_4_0/bigdata-blueprints/src/java/com/bigdata/blueprints/BigdataGraphFactory.java branches/BIGDATA_RELEASE_1_4_0/bigdata-gas/src/java/com/bigdata/rdf/graph/util/AbstractGraphFixture.java branches/BIGDATA_RELEASE_1_4_0/bigdata-gom/src/test/com/bigdata/gom/TestAll.java branches/BIGDATA_RELEASE_1_4_0/bigdata-gom/src/test/com/bigdata/gom/TestNumericBNodes.java branches/BIGDATA_RELEASE_1_4_0/bigdata-rdf/src/java/com/bigdata/rdf/ServiceProviderHook.java branches/BIGDATA_RELEASE_1_4_0/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/ConcatBOp.java branches/BIGDATA_RELEASE_1_4_0/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/DatatypeBOp.java branches/BIGDATA_RELEASE_1_4_0/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/DateBOp.java branches/BIGDATA_RELEASE_1_4_0/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/DigestBOp.java branches/BIGDATA_RELEASE_1_4_0/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/IriBOp.java branches/BIGDATA_RELEASE_1_4_0/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/IsNumericBOp.java branches/BIGDATA_RELEASE_1_4_0/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/NumericBOp.java branches/BIGDATA_RELEASE_1_4_0/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/StrAfterBOp.java branches/BIGDATA_RELEASE_1_4_0/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/StrBeforeBOp.java branches/BIGDATA_RELEASE_1_4_0/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/StrdtBOp.java branches/BIGDATA_RELEASE_1_4_0/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/StrlangBOp.java branches/BIGDATA_RELEASE_1_4_0/bigdata-rdf/src/java/com/bigdata/rdf/internal/impl/AbstractIV.java branches/BIGDATA_RELEASE_1_4_0/bigdata-rdf/src/java/com/bigdata/rdf/internal/impl/uri/IPv4AddrIV.java branches/BIGDATA_RELEASE_1_4_0/bigdata-rdf/src/java/com/bigdata/rdf/model/BNodeContextFactory.java branches/BIGDATA_RELEASE_1_4_0/bigdata-rdf/src/java/com/bigdata/rdf/model/BigdataURIImpl.java branches/BIGDATA_RELEASE_1_4_0/bigdata-rdf/src/java/com/bigdata/rdf/model/BigdataValueFactory.java branches/BIGDATA_RELEASE_1_4_0/bigdata-rdf/src/java/com/bigdata/rdf/model/BigdataValueFactoryImpl.java branches/BIGDATA_RELEASE_1_4_0/bigdata-rdf/src/java/com/bigdata/rdf/rio/RDFParserOptions.java branches/BIGDATA_RELEASE_1_4_0/bigdata-rdf/src/java/com/bigdata/rdf/rio/json/BigdataSPARQLResultsJSONParser.java branches/BIGDATA_RELEASE_1_4_0/bigdata-rdf/src/java/com/bigdata/rdf/rio/json/BigdataSPARQLResultsJSONParserFactory.java branches/BIGDATA_RELEASE_1_4_0/bigdata-rdf/src/java/com/bigdata/rdf/rio/json/BigdataSPARQLResultsJSONWriter.java branches/BIGDATA_RELEASE_1_4_0/bigdata-rdf/src/java/com/bigdata/rdf/rio/ntriples/BigdataNTriplesParser.java branches/BIGDATA_RELEASE_1_4_0/bigdata-rdf/src/java/com/bigdata/rdf/rio/turtle/BigdataTurtleParser.java branches/BIGDATA_RELEASE_1_4_0/bigdata-rdf/src/java/com/bigdata/rdf/rio/turtle/BigdataTurtleWriter.java branches/BIGDATA_RELEASE_1_4_0/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/AssignmentNode.java branches/BIGDATA_RELEASE_1_4_0/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/BindingsClause.java branches/BIGDATA_RELEASE_1_4_0/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/CompiledSolutionSetStats.java branches/BIGDATA_RELEASE_1_4_0/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/FunctionNode.java branches/BIGDATA_RELEASE_1_4_0/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/FunctionRegistry.java branches/BIGDATA_RELEASE_1_4_0/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/GroupMemberValueExpressionNodeBase.java branches/BIGDATA_RELEASE_1_4_0/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/QueryBase.java branches/BIGDATA_RELEASE_1_4_0/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/QueryHints.java branches/BIGDATA_RELEASE_1_4_0/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/QueryRoot.java branches/BIGDATA_RELEASE_1_4_0/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/StatementPatternNode.java branches/BIGDATA_RELEASE_1_4_0/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/StaticAnalysis.java branches/BIGDATA_RELEASE_1_4_0/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/AST2BOpJoins.java branches/BIGDATA_RELEASE_1_4_0/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/AST2BOpUpdate.java branches/BIGDATA_RELEASE_1_4_0/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/AST2BOpUpdateContext.java branches/BIGDATA_RELEASE_1_4_0/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/AST2BOpUtility.java branches/BIGDATA_RELEASE_1_4_0/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/ASTConstructIterator.java branches/BIGDATA_RELEASE_1_4_0/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/ASTEvalHelper.java branches/BIGDATA_RELEASE_1_4_0/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/optimizers/ASTBottomUpOptimizer.java branches/BIGDATA_RELEASE_1_4_0/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/optimizers/ASTComplexOptionalOptimizer.java branches/BIGDATA_RELEASE_1_4_0/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/optimizers/ASTGraphGroupOptimizer.java branches/BIGDATA_RELEASE_1_4_0/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/optimizers/ASTJoinOrderByTypeOptimizer.java branches/BIGDATA_RELEASE_1_4_0/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/optimizers/DefaultOptimizerList.java branches/BIGDATA_RELEASE_1_4_0/bigdata-rdf/src/java/com/bigdata/rdf/spo/DistinctTermAdvancer.java branches/BIGDATA_RELEASE_1_4_0/bigdata-rdf/src/java/com/bigdata/rdf/spo/SPOKeyOrder.java branches/BIGDATA_RELEASE_1_4_0/bigdata-rdf/src/java/com/bigdata/rdf/spo/SPORelation.java branches/BIGDATA_RELEASE_1_4_0/bigdata-rdf/src/resources/service-providers/META-INF/services/org.openrdf.query.resultio.TupleQueryResultWriterFactory branches/BIGDATA_RELEASE_1_4_0/bigdata-rdf/src/resources/service-providers/META-INF/services/org.openrdf.rio.RDFParserFactory branches/BIGDATA_RELEASE_1_4_0/bigdata-rdf/src/resources/service-providers/META-INF/services/org.openrdf.rio.RDFWriterFactory branches/BIGDATA_RELEASE_1_4_0/bigdata-rdf/src/test/com/bigdata/bop/rdf/filter/TestNativeDistinctFilter.java branches/BIGDATA_RELEASE_1_4_0/bigdata-rdf/src/test/com/bigdata/rdf/internal/TestUnsignedIVs.java branches/BIGDATA_RELEASE_1_4_0/bigdata-rdf/src/test/com/bigdata/rdf/internal/constraints/TestStrAfterBOp.java branches/BIGDATA_RELEASE_1_4_0/bigdata-rdf/src/test/com/bigdata/rdf/rio/TestAll_RIO.java branches/BIGDATA_RELEASE_1_4_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/AbstractSolutionSetStatsTestCase.java branches/BIGDATA_RELEASE_1_4_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/TestAll.java branches/BIGDATA_RELEASE_1_4_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/TestNegation.java branches/BIGDATA_RELEASE_1_4_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/service/TestRemoteSparql10QueryBuilder.java branches/BIGDATA_RELEASE_1_4_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/service/TestRemoteSparql11QueryBuilder.java branches/BIGDATA_RELEASE_1_4_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/service/TestRemoteSparqlBuilderFactory.java branches/BIGDATA_RELEASE_1_4_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/optimizers/AbstractOptimizerTestCase.java branches/BIGDATA_RELEASE_1_4_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/optimizers/TestASTEmptyGroupOptimizer.java branches/BIGDATA_RELEASE_1_4_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/optimizers/TestAll.java branches/BIGDATA_RELEASE_1_4_0/bigdata-rdf/src/test/com/bigdata/rdf/spo/TestSPOKeyOrder.java branches/BIGDATA_RELEASE_1_4_0/bigdata-rdf/src/test/com/bigdata/rdf/store/TestStatementIdentifiers.java branches/BIGDATA_RELEASE_1_4_0/bigdata-rdf/src/test/com/bigdata/rdf/store/TestTripleStore.java branches/BIGDATA_RELEASE_1_4_0/bigdata-sails/src/java/com/bigdata/rdf/sail/BigdataSail.java branches/BIGDATA_RELEASE_1_4_0/bigdata-sails/src/java/com/bigdata/rdf/sail/BigdataSailUpdate.java branches/BIGDATA_RELEASE_1_4_0/bigdata-sails/src/java/com/bigdata/rdf/sail/CreateKBTask.java branches/BIGDATA_RELEASE_1_4_0/bigdata-sails/src/java/com/bigdata/rdf/sail/remote/BigdataSailRemoteRepositoryConnection.java branches/BIGDATA_RELEASE_1_4_0/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/ASTVisitorBase.java branches/BIGDATA_RELEASE_1_4_0/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/BaseDeclProcessor.java branches/BIGDATA_RELEASE_1_4_0/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/BigdataExprBuilder.java branches/BIGDATA_RELEASE_1_4_0/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/BlankNodeVarProcessor.java branches/BIGDATA_RELEASE_1_4_0/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/GroupGraphPatternBuilder.java branches/BIGDATA_RELEASE_1_4_0/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/PrefixDeclProcessor.java branches/BIGDATA_RELEASE_1_4_0/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/UpdateExprBuilder.java branches/BIGDATA_RELEASE_1_4_0/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/ValueExprBuilder.java branches/BIGDATA_RELEASE_1_4_0/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/ast/SyntaxTreeBuilder.java branches/BIGDATA_RELEASE_1_4_0/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/ast/SyntaxTreeBuilderConstants.java branches/BIGDATA_RELEASE_1_4_0/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/ast/SyntaxTreeBuilderTokenManager.java branches/BIGDATA_RELEASE_1_4_0/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/ast/SyntaxTreeBuilderTreeConstants.java branches/BIGDATA_RELEASE_1_4_0/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/ast/SyntaxTreeBuilderVisitor.java branches/BIGDATA_RELEASE_1_4_0/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/ast/sparql.jj branches/BIGDATA_RELEASE_1_4_0/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/ast/sparql.jjt branches/BIGDATA_RELEASE_1_4_0/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/ConnegUtil.java branches/BIGDATA_RELEASE_1_4_0/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/client/BackgroundTupleResult.java branches/BIGDATA_RELEASE_1_4_0/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/client/RemoteRepository.java branches/BIGDATA_RELEASE_1_4_0/bigdata-sails/src/test/com/bigdata/rdf/sail/ProxyBigdataSailTestCase.java branches/BIGDATA_RELEASE_1_4_0/bigdata-sails/src/test/com/bigdata/rdf/sail/TestBigdataSailWithQuads.java branches/BIGDATA_RELEASE_1_4_0/bigdata-sails/src/test/com/bigdata/rdf/sail/TestMROWTransactions.java branches/BIGDATA_RELEASE_1_4_0/bigdata-sails/src/test/com/bigdata/rdf/sail/TestProvenanceQuery.java branches/BIGDATA_RELEASE_1_4_0/bigdata-sails/src/test/com/bigdata/rdf/sail/sparql/AbstractBigdataExprBuilderTestCase.java branches/BIGDATA_RELEASE_1_4_0/bigdata-sails/src/test/com/bigdata/rdf/sail/sparql/Bigdata2ASTSPARQL11SyntaxTest.java branches/BIGDATA_RELEASE_1_4_0/bigdata-sails/src/test/com/bigdata/rdf/sail/sparql/Bigdata2ASTSPARQLSyntaxTest.java branches/BIGDATA_RELEASE_1_4_0/bigdata-sails/src/test/com/bigdata/rdf/sail/sparql/TestBigdataExprBuilder.java branches/BIGDATA_RELEASE_1_4_0/bigdata-sails/src/test/com/bigdata/rdf/sail/sparql/TestBindingsClause.java branches/BIGDATA_RELEASE_1_4_0/bigdata-sails/src/test/com/bigdata/rdf/sail/sparql/TestGroupGraphPatternBuilder.java branches/BIGDATA_RELEASE_1_4_0/bigdata-sails/src/test/com/bigdata/rdf/sail/sparql/TestSubqueryPatterns.java branches/BIGDATA_RELEASE_1_4_0/bigdata-sails/src/test/com/bigdata/rdf/sail/sparql/TestTriplePatternBuilder.java branches/BIGDATA_RELEASE_1_4_0/bigdata-sails/src/test/com/bigdata/rdf/sail/sparql/TestUpdateExprBuilder.java branches/BIGDATA_RELEASE_1_4_0/bigdata-sails/src/test/com/bigdata/rdf/sail/sparql/TestValueExprBuilder.java branches/BIGDATA_RELEASE_1_4_0/bigdata-sails/src/test/com/bigdata/rdf/sail/sparql/TestVirtualGraphs.java branches/BIGDATA_RELEASE_1_4_0/bigdata-sails/src/test/com/bigdata/rdf/sail/tck/BigdataComplexSparqlQueryTest.java branches/BIGDATA_RELEASE_1_4_0/bigdata-sails/src/test/com/bigdata/rdf/sail/tck/BigdataConnectionTest.java branches/BIGDATA_RELEASE_1_4_0/bigdata-sails/src/test/com/bigdata/rdf/sail/tck/BigdataEmbeddedFederationSparqlTest.java branches/BIGDATA_RELEASE_1_4_0/bigdata-sails/src/test/com/bigdata/rdf/sail/tck/BigdataFederationSparqlTest.java branches/BIGDATA_RELEASE_1_4_0/bigdata-sails/src/test/com/bigdata/rdf/sail/tck/BigdataSPARQLUpdateConformanceTest.java branches/BIGDATA_RELEASE_1_4_0/bigdata-sails/src/test/com/bigdata/rdf/sail/tck/BigdataSPARQLUpdateTest.java branches/BIGDATA_RELEASE_1_4_0/bigdata-sails/src/test/com/bigdata/rdf/sail/tck/BigdataSparqlFullRWTxTest.java branches/BIGDATA_RELEASE_1_4_0/bigdata-sails/src/test/com/bigdata/rdf/sail/tck/BigdataSparqlTest.java branches/BIGDATA_RELEASE_1_4_0/bigdata-sails/src/test/com/bigdata/rdf/sail/tck/BigdataStoreTest.java branches/BIGDATA_RELEASE_1_4_0/bigdata-sails/src/test/com/bigdata/rdf/sail/webapp/AbstractNamedGraphUpdateTest.java branches/BIGDATA_RELEASE_1_4_0/bigdata-sails/src/test/com/bigdata/rdf/sail/webapp/AbstractSimpleInsertTest.java branches/BIGDATA_RELEASE_1_4_0/bigdata-sails/src/test/com/bigdata/rdf/sail/webapp/ProxySuiteHelper.java branches/BIGDATA_RELEASE_1_4_0/bigdata-sails/src/test/com/bigdata/rdf/sail/webapp/ProxyTestCase.java branches/BIGDATA_RELEASE_1_4_0/bigdata-sails/src/test/com/bigdata/rdf/sail/webapp/TestAll.java branches/BIGDATA_RELEASE_1_4_0/bigdata-sails/src/test/com/bigdata/rdf/sail/webapp/TestAskJsonTrac704.java branches/BIGDATA_RELEASE_1_4_0/bigdata-sails/src/test/com/bigdata/rdf/sail/webapp/TestBigdataSailRemoteRepository.java branches/BIGDATA_RELEASE_1_4_0/bigdata-sails/src/test/com/bigdata/rdf/sail/webapp/TestFederatedQuery.java branches/BIGDATA_RELEASE_1_4_0/bigdata-sails/src/test/com/bigdata/rdf/sail/webapp/TestHelper.java branches/BIGDATA_RELEASE_1_4_0/bigdata-sails/src/test/com/bigdata/rdf/sail/webapp/TestNanoSparqlClient.java branches/BIGDATA_RELEASE_1_4_0/bigdata-sails/src/test/com/bigdata/rdf/sail/webapp/TestPostNotURLEncoded.java branches/BIGDATA_RELEASE_1_4_0/bigdata-sails/src/test/com/bigdata/rdf/sail/webapp/TestRelease123Protocol.java branches/BIGDATA_RELEASE_1_4_0/bigdata-sails/src/test/com/bigdata/rdf/sail/webapp/TestSparqlUpdate.java branches/BIGDATA_RELEASE_1_4_0/bigdata-sails/src/test/org/openrdf/query/parser/sparql/ComplexSPARQLQueryTest.java branches/BIGDATA_RELEASE_1_4_0/bigdata-sails/src/test/org/openrdf/query/parser/sparql/SPARQLUpdateTest.java branches/BIGDATA_RELEASE_1_4_0/bigdata-sails/src/test/org/openrdf/sail/RDFStoreTest.java branches/BIGDATA_RELEASE_1_4_0/bigdata-war/src/html/js/workbench.js branches/BIGDATA_RELEASE_1_4_0/build.properties branches/BIGDATA_RELEASE_1_4_0/build.xml branches/BIGDATA_RELEASE_1_4_0/pom.xml Added Paths: ----------- branches/BIGDATA_RELEASE_1_4_0/.settings/org.eclipse.core.resources.prefs branches/BIGDATA_RELEASE_1_4_0/bigdata/LEGAL/hamcrest-license.txt branches/BIGDATA_RELEASE_1_4_0/bigdata/lib/hamcrest-core-1.3.jar branches/BIGDATA_RELEASE_1_4_0/bigdata/lib/junit-4.11.jar branches/BIGDATA_RELEASE_1_4_0/bigdata/src/java/com/bigdata/bop/join/DistinctTermScanOp.java branches/BIGDATA_RELEASE_1_4_0/bigdata/src/java/com/bigdata/bop/join/FastRangeCountOp.java branches/BIGDATA_RELEASE_1_4_0/bigdata/src/test/com/bigdata/bop/join/TestDistinctTermScanOp.java branches/BIGDATA_RELEASE_1_4_0/bigdata/src/test/com/bigdata/bop/join/TestFastRangeCountOp.java branches/BIGDATA_RELEASE_1_4_0/bigdata-blueprints/src/java/com/bigdata/blueprints/BigdataGraphListener.java branches/BIGDATA_RELEASE_1_4_0/bigdata-rdf/lib/openrdf-sesame-2.7.13-onejar.jar branches/BIGDATA_RELEASE_1_4_0/bigdata-rdf/lib/sesame-rio-testsuite-2.7.13.jar branches/BIGDATA_RELEASE_1_4_0/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/NowBOp.java branches/BIGDATA_RELEASE_1_4_0/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/UUIDBOp.java branches/BIGDATA_RELEASE_1_4_0/bigdata-rdf/src/java/com/bigdata/rdf/rio/json/BigdataSPARQLResultsJSONParserForConstruct.java branches/BIGDATA_RELEASE_1_4_0/bigdata-rdf/src/java/com/bigdata/rdf/rio/json/BigdataSPARQLResultsJSONParserForConstructFactory.java branches/BIGDATA_RELEASE_1_4_0/bigdata-rdf/src/java/com/bigdata/rdf/rio/json/BigdataSPARQLResultsJSONWriterFactory.java branches/BIGDATA_RELEASE_1_4_0/bigdata-rdf/src/java/com/bigdata/rdf/rio/json/BigdataSPARQLResultsJSONWriterForConstruct.java branches/BIGDATA_RELEASE_1_4_0/bigdata-rdf/src/java/com/bigdata/rdf/rio/json/BigdataSPARQLResultsJSONWriterForConstructFactory.java branches/BIGDATA_RELEASE_1_4_0/bigdata-rdf/src/java/com/bigdata/rdf/rio/json/SPARQLJSONParserBase.java branches/BIGDATA_RELEASE_1_4_0/bigdata-rdf/src/java/com/bigdata/rdf/rio/json/SPARQLJSONWriterBase.java branches/BIGDATA_RELEASE_1_4_0/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/optimizers/ASTDistinctTermScanOptimizer.java branches/BIGDATA_RELEASE_1_4_0/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/optimizers/ASTFastRangeCountOptimizer.java branches/BIGDATA_RELEASE_1_4_0/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/optimizers/ASTValuesOptimizer.java branches/BIGDATA_RELEASE_1_4_0/bigdata-rdf/src/resources/service-providers/META-INF/services/org.openrdf.query.resultio.TupleQueryResultParserFactory branches/BIGDATA_RELEASE_1_4_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/TestDistinctTermScanOptimizer.java branches/BIGDATA_RELEASE_1_4_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/TestFastRangeCountOptimizer.java branches/BIGDATA_RELEASE_1_4_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/distinctTermScan_quads_01.rq branches/BIGDATA_RELEASE_1_4_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/distinctTermScan_quads_01.srx branches/BIGDATA_RELEASE_1_4_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/distinctTermScan_quads_01.trig branches/BIGDATA_RELEASE_1_4_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/distinctTermScan_quads_01b.rq branches/BIGDATA_RELEASE_1_4_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/distinctTermScan_quads_01b.srx branches/BIGDATA_RELEASE_1_4_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/distinctTermScan_quads_01c.rq branches/BIGDATA_RELEASE_1_4_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/distinctTermScan_quads_01c.srx branches/BIGDATA_RELEASE_1_4_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/distinctTermScan_quads_02.rq branches/BIGDATA_RELEASE_1_4_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/distinctTermScan_quads_02.srx branches/BIGDATA_RELEASE_1_4_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/distinctTermScan_quads_03.rq branches/BIGDATA_RELEASE_1_4_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/distinctTermScan_quads_03.srx branches/BIGDATA_RELEASE_1_4_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/distinctTermScan_quads_correctRejection_01.rq branches/BIGDATA_RELEASE_1_4_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/distinctTermScan_quads_correctRejection_01.srx branches/BIGDATA_RELEASE_1_4_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/distinctTermScan_quads_correctRejection_02.rq branches/BIGDATA_RELEASE_1_4_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/distinctTermScan_quads_correctRejection_02.srx branches/BIGDATA_RELEASE_1_4_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/distinctTermScan_triples_01.rq branches/BIGDATA_RELEASE_1_4_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/distinctTermScan_triples_01.srx branches/BIGDATA_RELEASE_1_4_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/distinctTermScan_triples_01.ttl branches/BIGDATA_RELEASE_1_4_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/distinctTermScan_triples_02.rq branches/BIGDATA_RELEASE_1_4_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/distinctTermScan_triples_02.srx branches/BIGDATA_RELEASE_1_4_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/distinctTermScan_triples_03.rq branches/BIGDATA_RELEASE_1_4_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/distinctTermScan_triples_03.srx branches/BIGDATA_RELEASE_1_4_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/distinctTermScan_triples_correctRejection_01.rq branches/BIGDATA_RELEASE_1_4_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/distinctTermScan_triples_correctRejection_01.srx branches/BIGDATA_RELEASE_1_4_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/distinctTermScan_triples_correctRejection_01.ttl branches/BIGDATA_RELEASE_1_4_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/distinctTermScan_triples_subQuery_01.rq branches/BIGDATA_RELEASE_1_4_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/distinctTermScan_triples_subQuery_01.srx branches/BIGDATA_RELEASE_1_4_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/fastRangeCount_quads_01.rq branches/BIGDATA_RELEASE_1_4_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/fastRangeCount_quads_01.srx branches/BIGDATA_RELEASE_1_4_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/fastRangeCount_quads_01.trig branches/BIGDATA_RELEASE_1_4_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/fastRangeCount_quads_02.rq branches/BIGDATA_RELEASE_1_4_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/fastRangeCount_quads_02.srx branches/BIGDATA_RELEASE_1_4_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/fastRangeCount_quads_03.rq branches/BIGDATA_RELEASE_1_4_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/fastRangeCount_quads_03.srx branches/BIGDATA_RELEASE_1_4_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/fastRangeCount_quads_04.rq branches/BIGDATA_RELEASE_1_4_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/fastRangeCount_quads_04.srx branches/BIGDATA_RELEASE_1_4_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/fastRangeCount_quads_05.rq branches/BIGDATA_RELEASE_1_4_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/fastRangeCount_quads_05.srx branches/BIGDATA_RELEASE_1_4_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/fastRangeCount_triples_01.rq branches/BIGDATA_RELEASE_1_4_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/fastRangeCount_triples_01.srx branches/BIGDATA_RELEASE_1_4_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/fastRangeCount_triples_01.ttl branches/BIGDATA_RELEASE_1_4_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/fastRangeCount_triples_02.rq branches/BIGDATA_RELEASE_1_4_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/fastRangeCount_triples_02.srx branches/BIGDATA_RELEASE_1_4_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/optimizers/TestASTDistinctTermScanOptimizer.java branches/BIGDATA_RELEASE_1_4_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/optimizers/TestASTFastRangeCountOptimizer.java branches/BIGDATA_RELEASE_1_4_0/bigdata-sails/lib/sesame-sparql-testsuite-2.7.13.jar branches/BIGDATA_RELEASE_1_4_0/bigdata-sails/lib/sesame-store-testsuite-2.7.13.jar branches/BIGDATA_RELEASE_1_4_0/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/ast/ASTInlineData.java branches/BIGDATA_RELEASE_1_4_0/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/ast/ASTSTRUUID.java branches/BIGDATA_RELEASE_1_4_0/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/ast/ASTUUID.java branches/BIGDATA_RELEASE_1_4_0/bigdata-sails/src/java/com/bigdata/rdf/sail/sparql/ast/ASTUnparsedQuadDataBlock.java branches/BIGDATA_RELEASE_1_4_0/bigdata-sails/src/java/org/openrdf/query/parser/sparql/ branches/BIGDATA_RELEASE_1_4_0/bigdata-sails/src/java/org/openrdf/query/parser/sparql/manifest/ branches/BIGDATA_RELEASE_1_4_0/bigdata-sails/src/java/org/openrdf/query/parser/sparql/manifest/SPARQL11ManifestTest.java branches/BIGDATA_RELEASE_1_4_0/bigdata-sails/src/test/org/openrdf/model/ branches/BIGDATA_RELEASE_1_4_0/bigdata-sails/src/test/org/openrdf/model/util/ branches/BIGDATA_RELEASE_1_4_0/bigdata-sails/src/test/org/openrdf/model/util/ModelUtil.java branches/BIGDATA_RELEASE_1_4_0/bigdata-sails/src/test/org/openrdf/query/parser/sparql/manifest/ branches/BIGDATA_RELEASE_1_4_0/bigdata-sails/src/test/org/openrdf/query/parser/sparql/manifest/SPARQLQueryTest.java branches/BIGDATA_RELEASE_1_4_0/bigdata-sails/src/test/org/openrdf/query/parser/sparql/manifest/SPARQLUpdateConformanceTest.java branches/BIGDATA_RELEASE_1_4_0/bigdata-sails/src/test/org/openrdf/repository/RepositoryConnectionTest.java Removed Paths: ------------- branches/BIGDATA_RELEASE_1_4_0/bigdata/lib/junit-3.8.1.jar branches/BIGDATA_RELEASE_1_4_0/bigdata-rdf/src/java/com/bigdata/rdf/rio/json/BigdataSPARQLResultsJSONWriterFactoryForConstruct.java branches/BIGDATA_RELEASE_1_4_0/bigdata-rdf/src/java/com/bigdata/rdf/rio/json/BigdataSPARQLResultsJSONWriterFactoryForSelect.java branches/BIGDATA_RELEASE_1_4_0/bigdata-rdf/src/java/com/bigdata/rdf/rio/nquads/ branches/BIGDATA_RELEASE_1_4_0/bigdata-rdf/src/java/com/bigdata/rdf/rio/rdfxml/ branches/BIGDATA_RELEASE_1_4_0/bigdata-rdf/src/test/com/bigdata/rdf/rio/TestRDFXMLInterchangeWithStatementIdentifiers.java branches/BIGDATA_RELEASE_1_4_0/bigdata-rdf/src/test/com/bigdata/rdf/rio/rdfxml/RDFWriterTest.java branches/BIGDATA_RELEASE_1_4_0/bigdata-rdf/src/test/com/bigdata/rdf/rio/rdfxml/RDFXMLParserTest.java branches/BIGDATA_RELEASE_1_4_0/bigdata-rdf/src/test/com/bigdata/rdf/rio/rdfxml/RDFXMLParserTestCase.java branches/BIGDATA_RELEASE_1_4_0/bigdata-rdf/src/test/com/bigdata/rdf/rio/rdfxml/RDFXMLWriterTest.java branches/BIGDATA_RELEASE_1_4_0/bigdata-rdf/src/test/com/bigdata/rdf/rio/rdfxml/RDFXMLWriterTestCase.java branches/BIGDATA_RELEASE_1_4_0/bigdata-rdf/src/test/com/bigdata/rdf/rio/rdfxml/TestAll.java branches/BIGDATA_RELEASE_1_4_0/bigdata-rdf/src/test/com/bigdata/rdf/rio/rdfxml/TestRDFXMLParserFactory.java branches/BIGDATA_RELEASE_1_4_0/bigdata-rdf/src/test/com/bigdata/rdf/rio/rdfxml/TestRDFXMLWriterFactory.java branches/BIGDATA_RELEASE_1_4_0/bigdata-sails/src/test/org/openrdf/query/parser/sparql/EarlReport.java branches/BIGDATA_RELEASE_1_4_0/bigdata-sails/src/test/org/openrdf/query/parser/sparql/SPARQL11SyntaxTest.java branches/BIGDATA_RELEASE_1_4_0/bigdata-sails/src/test/org/openrdf/query/parser/sparql/SPARQLASTQueryTest.java branches/BIGDATA_RELEASE_1_4_0/bigdata-sails/src/test/org/openrdf/query/parser/sparql/SPARQLQueryTest.java Modified: branches/BIGDATA_RELEASE_1_4_0/.classpath =================================================================== --- branches/BIGDATA_RELEASE_1_4_0/.classpath 2014-11-15 16:46:45 UTC (rev 8709) +++ branches/BIGDATA_RELEASE_1_4_0/.classpath 2014-11-15 20:33:32 UTC (rev 8710) @@ -40,7 +40,6 @@ <classpathentry exported="true" kind="lib" path="bigdata/lib/unimi/colt-1.2.0.jar"/> <classpathentry exported="true" kind="lib" path="bigdata/lib/icu/icu4j-4.8.jar"/> <classpathentry exported="true" kind="lib" path="bigdata/lib/icu/icu4j-charset-4.8.jar"/> - <classpathentry exported="true" kind="lib" path="bigdata/lib/junit-3.8.1.jar" sourcepath="/root/.m2/repository/junit/junit/3.8.1/junit-3.8.1-sources.jar"/> <classpathentry exported="true" kind="lib" path="bigdata-jini/lib/jini/lib/browser.jar"/> <classpathentry exported="true" kind="lib" path="bigdata-jini/lib/jini/lib/classserver.jar"/> <classpathentry exported="true" kind="lib" path="bigdata-jini/lib/jini/lib/fiddler.jar"/> @@ -60,8 +59,8 @@ <classpathentry exported="true" kind="lib" path="bigdata/lib/unimi/fastutil-5.1.5.jar"/> <classpathentry exported="true" kind="lib" path="bigdata/lib/lucene/lucene-analyzers-3.0.0.jar"/> <classpathentry exported="true" kind="lib" path="bigdata/lib/lucene/lucene-core-3.0.0.jar"/> - <classpathentry kind="lib" path="bigdata/lib/jetty/jetty-jmx-9.1.4.v20140401.jar"/> - <classpathentry kind="lib" path="bigdata/lib/jetty/jetty-jndi-9.1.4.v20140401.jar"/> + <classpathentry exported="true" kind="lib" path="bigdata/lib/jetty/jetty-jmx-9.1.4.v20140401.jar"/> + <classpathentry exported="true" kind="lib" path="bigdata/lib/jetty/jetty-jndi-9.1.4.v20140401.jar"/> <classpathentry exported="true" kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry exported="true" kind="lib" path="bigdata/lib/high-scale-lib-v1.1.2.jar"/> <classpathentry exported="true" kind="lib" path="bigdata/lib/junit-ext-1.1-b3-dev.jar"/> @@ -75,11 +74,6 @@ <classpathentry exported="true" kind="lib" path="bigdata-sails/lib/httpcomponents/httpmime-4.1.3.jar"/> <classpathentry exported="true" kind="lib" path="bigdata-sails/lib/httpcomponents/commons-io-2.1.jar"/> <classpathentry exported="true" kind="lib" path="bigdata/lib/apache/log4j-1.2.17.jar"/> - <classpathentry exported="true" kind="lib" path="bigdata-rdf/lib/openrdf-sesame-2.6.10-onejar.jar" sourcepath="/Users/bryan/Documents/workspace/org.openrdf.sesame-2.6.10"/> - <classpathentry exported="true" kind="lib" path="bigdata-rdf/lib/sesame-rio-testsuite-2.6.10.jar"/> - <classpathentry exported="true" kind="lib" path="bigdata-sails/lib/sesame-sparql-testsuite-2.6.10.jar"/> - <classpathentry exported="true" kind="lib" path="bigdata-sails/lib/sesame-store-testsuite-2.6.10.jar"/> - <classpathentry exported="true" kind="lib" path="bigdata-rdf/lib/nxparser-1.2.3.jar"/> <classpathentry exported="true" kind="lib" path="bigdata/lib/jetty/jetty-client-9.1.4.v20140401.jar"/> <classpathentry exported="true" kind="lib" path="bigdata/lib/jetty/jetty-continuation-9.1.4.v20140401.jar"/> <classpathentry exported="true" kind="lib" path="bigdata/lib/jetty/jetty-http-9.1.4.v20140401.jar"/> @@ -93,11 +87,17 @@ <classpathentry exported="true" kind="lib" path="bigdata/lib/jetty/jetty-webapp-9.1.4.v20140401.jar" sourcepath="/Users/bryan/Downloads/org.eclipse.jetty.project-jetty-9.1.4.v20140401"/> <classpathentry exported="true" kind="lib" path="bigdata/lib/jetty/jetty-xml-9.1.4.v20140401.jar"/> <classpathentry exported="true" kind="lib" path="bigdata-sails/lib/jackson-core-2.2.3.jar"/> - <classpathentry kind="lib" path="bigdata-blueprints/lib/jettison-1.3.3.jar"/> - <classpathentry kind="lib" path="bigdata-blueprints/lib/blueprints-core-2.5.0.jar"/> - <classpathentry kind="lib" path="bigdata-blueprints/lib/blueprints-test-2.5.0.jar"/> - <classpathentry kind="lib" path="bigdata-blueprints/lib/rexster-core-2.5.0.jar"/> - <classpathentry kind="lib" path="bigdata-blueprints/lib/commons-configuration-1.10.jar"/> - <classpathentry kind="lib" path="bigdata-sails/lib/httpcomponents/commons-fileupload-1.3.1.jar"/> + <classpathentry exported="true" kind="lib" path="bigdata-blueprints/lib/jettison-1.3.3.jar"/> + <classpathentry exported="true" kind="lib" path="bigdata-blueprints/lib/blueprints-core-2.5.0.jar"/> + <classpathentry exported="true" kind="lib" path="bigdata-blueprints/lib/blueprints-test-2.5.0.jar"/> + <classpathentry exported="true" kind="lib" path="bigdata-blueprints/lib/rexster-core-2.5.0.jar"/> + <classpathentry exported="true" kind="lib" path="bigdata-blueprints/lib/commons-configuration-1.10.jar"/> + <classpathentry exported="true" kind="lib" path="bigdata/lib/junit-4.11.jar" sourcepath="/Users/mikepersonick/.m2/repository/junit/junit/4.11/junit-4.11-sources.jar"/> + <classpathentry exported="true" kind="lib" path="bigdata/lib/hamcrest-core-1.3.jar"/> + <classpathentry exported="true" kind="lib" path="bigdata-sails/lib/httpcomponents/commons-fileupload-1.3.1.jar"/> + <classpathentry exported="true" kind="lib" path="bigdata-rdf/lib/sesame-rio-testsuite-2.7.13.jar"/> + <classpathentry exported="true" kind="lib" path="bigdata-sails/lib/sesame-sparql-testsuite-2.7.13.jar" sourcepath="/Users/mikepersonick/.m2/repository/org/openrdf/sesame/sesame-sparql-testsuite/2.7.13/sesame-sparql-testsuite-2.7.13-sources.jar"/> + <classpathentry exported="true" kind="lib" path="bigdata-sails/lib/sesame-store-testsuite-2.7.13.jar"/> + <classpathentry exported="true" kind="lib" path="bigdata-rdf/lib/openrdf-sesame-2.7.13-onejar.jar"/> <classpathentry kind="output" path="bin"/> </classpath> Modified: branches/BIGDATA_RELEASE_1_4_0/.project =================================================================== --- branches/BIGDATA_RELEASE_1_4_0/.project 2014-11-15 16:46:45 UTC (rev 8709) +++ branches/BIGDATA_RELEASE_1_4_0/.project 2014-11-15 20:33:32 UTC (rev 8710) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <projectDescription> - <name>BIGDATA_RELEASE_1_1_0</name> + <name>bigdata</name> <comment></comment> <projects> </projects> Added: branches/BIGDATA_RELEASE_1_4_0/.settings/org.eclipse.core.resources.prefs =================================================================== --- branches/BIGDATA_RELEASE_1_4_0/.settings/org.eclipse.core.resources.prefs (rev 0) +++ branches/BIGDATA_RELEASE_1_4_0/.settings/org.eclipse.core.resources.prefs 2014-11-15 20:33:32 UTC (rev 8710) @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding//bigdata-sails/src/test/org/openrdf/repository/RepositoryConnectionTest.java=UTF-8 Added: branches/BIGDATA_RELEASE_1_4_0/bigdata/LEGAL/hamcrest-license.txt =================================================================== --- branches/BIGDATA_RELEASE_1_4_0/bigdata/LEGAL/hamcrest-license.txt (rev 0) +++ branches/BIGDATA_RELEASE_1_4_0/bigdata/LEGAL/hamcrest-license.txt 2014-11-15 20:33:32 UTC (rev 8710) @@ -0,0 +1,27 @@ +BSD License + +Copyright (c) 2000-2006, www.hamcrest.org +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + +Redistributions of source code must retain the above copyright notice, this list of +conditions and the following disclaimer. Redistributions in binary form must reproduce +the above copyright notice, this list of conditions and the following disclaimer in +the documentation and/or other materials provided with the distribution. + +Neither the name of Hamcrest nor the names of its contributors may be used to endorse +or promote products derived from this software without specific prior written +permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY +EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT +SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, +INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED +TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR +BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY +WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH +DAMAGE. \ No newline at end of file Added: branches/BIGDATA_RELEASE_1_4_0/bigdata/lib/hamcrest-core-1.3.jar =================================================================== (Binary files differ) Index: branches/BIGDATA_RELEASE_1_4_0/bigdata/lib/hamcrest-core-1.3.jar =================================================================== --- branches/BIGDATA_RELEASE_1_4_0/bigdata/lib/hamcrest-core-1.3.jar 2014-11-15 16:46:45 UTC (rev 8709) +++ branches/BIGDATA_RELEASE_1_4_0/bigdata/lib/hamcrest-core-1.3.jar 2014-11-15 20:33:32 UTC (rev 8710) Property changes on: branches/BIGDATA_RELEASE_1_4_0/bigdata/lib/hamcrest-core-1.3.jar ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Deleted: branches/BIGDATA_RELEASE_1_4_0/bigdata/lib/junit-3.8.1.jar =================================================================== (Binary files differ) Added: branches/BIGDATA_RELEASE_1_4_0/bigdata/lib/junit-4.11.jar =================================================================== (Binary files differ) Index: branches/BIGDATA_RELEASE_1_4_0/bigdata/lib/junit-4.11.jar =================================================================== --- branches/BIGDATA_RELEASE_1_4_0/bigdata/lib/junit-4.11.jar 2014-11-15 16:46:45 UTC (rev 8709) +++ branches/BIGDATA_RELEASE_1_4_0/bigdata/lib/junit-4.11.jar 2014-11-15 20:33:32 UTC (rev 8710) Property changes on: branches/BIGDATA_RELEASE_1_4_0/bigdata/lib/junit-4.11.jar ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Modified: branches/BIGDATA_RELEASE_1_4_0/bigdata/src/java/com/bigdata/Depends.java =================================================================== --- branches/BIGDATA_RELEASE_1_4_0/bigdata/src/java/com/bigdata/Depends.java 2014-11-15 16:46:45 UTC (rev 8709) +++ branches/BIGDATA_RELEASE_1_4_0/bigdata/src/java/com/bigdata/Depends.java 2014-11-15 20:33:32 UTC (rev 8710) @@ -67,6 +67,7 @@ @SuppressWarnings("unused") private static class OrderByLicense implements Comparator<Dependency> { + @Override public int compare(Dependency o1, Dependency o2) { return o1.licenseURL().compareTo(o2.licenseURL()); } @@ -244,9 +245,9 @@ "http://site.icu-project.org/", "http://source.icu-project.org/repos/icu/icu/trunk/license.html"); - private final static Dep nxparser = new Dep("nxparser", - "http://sw.deri.org/2006/08/nxparser/", - "http://sw.deri.org/2006/08/nxparser/license.txt"); +// private final static Dep nxparser = new Dep("nxparser", +// "http://sw.deri.org/2006/08/nxparser/", +// "http://sw.deri.org/2006/08/nxparser/license.txt"); private final static Dep nanohttp = new Dep("nanohttp", "http://elonen.iki.fi/code/nanohttpd/", @@ -281,6 +282,12 @@ "https://github.com/tinkerpop/rexster", "https://github.com/tinkerpop/rexster/blob/master/LICENSE.txt"); + // Note: This is a test-only dependency at this time. + @SuppressWarnings("unused") + private final static Dep hamcrestCore = new Dep("hamcrest-core", + "https://code.google.com/p/hamcrest/", + "http://opensource.org/licenses/BSD-3-Clause"); + static private final Dep[] depends; static { depends = new Dep[] { // @@ -304,7 +311,7 @@ slf4j,// sesame,// icu,// - nxparser,// +// nxparser,// nanohttp,// jetty,// servletApi,// Modified: branches/BIGDATA_RELEASE_1_4_0/bigdata/src/java/com/bigdata/bop/Var.java =================================================================== --- branches/BIGDATA_RELEASE_1_4_0/bigdata/src/java/com/bigdata/bop/Var.java 2014-11-15 16:46:45 UTC (rev 8709) +++ branches/BIGDATA_RELEASE_1_4_0/bigdata/src/java/com/bigdata/bop/Var.java 2014-11-15 20:33:32 UTC (rev 8710) @@ -53,12 +53,14 @@ final private String name; + @Override final public boolean isVar() { return true; } + @Override final public boolean isConstant() { return false; @@ -86,6 +88,7 @@ * part of the canonicalizing mapping). Because we override clone we do not * need to provide the deep copy constructor (it is never invoked). */ + @Override final public Var<E> clone() { return this; @@ -96,6 +99,7 @@ * @todo Why two versions of equals? This one is coming from * IConstantOrVariable. */ + @Override public final boolean equals(final IVariableOrConstant<E> o) { if (this == o) @@ -111,6 +115,7 @@ } + @Override public final boolean equals(final Object o) { if (this == o) @@ -126,18 +131,21 @@ } + @Override public final int hashCode() { return name.hashCode(); } + @Override public String toString() { return name; } + @Override public boolean isWildcard() { return name.length() == 1 && name.charAt(0) == '*'; @@ -153,6 +161,7 @@ // // } + @Override public E get() { throw new UnsupportedOperationException(); @@ -171,6 +180,7 @@ } + @Override public String getName() { return name; Added: branches/BIGDATA_RELEASE_1_4_0/bigdata/src/java/com/bigdata/bop/join/DistinctTermScanOp.java =================================================================== --- branches/BIGDATA_RELEASE_1_4_0/bigdata/src/java/com/bigdata/bop/join/DistinctTermScanOp.java (rev 0) +++ branches/BIGDATA_RELEASE_1_4_0/bigdata/src/java/com/bigdata/bop/join/DistinctTermScanOp.java 2014-11-15 20:33:32 UTC (rev 8710) @@ -0,0 +1,476 @@ +/** + +Copyright (C) SYSTAP, LLC 2006-2010. All rights reserved. + +Contact: + SYSTAP, LLC + 4501 Tower Road + Greensboro, NC 27410 + lic...@bi... + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; version 2 of the License. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +*/ +/* + * Created on Aug 25, 2010 + */ + +package com.bigdata.bop.join; + +import java.util.Iterator; +import java.util.Map; +import java.util.concurrent.Callable; +import java.util.concurrent.FutureTask; + +import com.bigdata.bop.BOp; +import com.bigdata.bop.BOpContext; +import com.bigdata.bop.BOpUtility; +import com.bigdata.bop.Constant; +import com.bigdata.bop.IBindingSet; +import com.bigdata.bop.IConstraint; +import com.bigdata.bop.IPredicate; +import com.bigdata.bop.IVariable; +import com.bigdata.bop.NV; +import com.bigdata.bop.PipelineOp; +import com.bigdata.bop.bindingSet.ListBindingSet; +import com.bigdata.bop.engine.BOpStats; +import com.bigdata.btree.IRangeQuery; +import com.bigdata.btree.ITuple; +import com.bigdata.btree.filter.TupleFilter; +import com.bigdata.rdf.internal.IV; +import com.bigdata.rdf.internal.IVUtility; +import com.bigdata.rdf.lexicon.ITermIVFilter; +import com.bigdata.rdf.spo.DistinctTermAdvancer; +import com.bigdata.rdf.spo.SPOKeyOrder; +import com.bigdata.rdf.spo.SPORelation; +import com.bigdata.relation.IRelation; +import com.bigdata.relation.accesspath.AccessPath; +import com.bigdata.relation.accesspath.IAccessPath; +import com.bigdata.relation.accesspath.IBlockingBuffer; +import com.bigdata.relation.accesspath.UnsyncLocalOutputBuffer; +import com.bigdata.striterator.ChunkedWrappedIterator; +import com.bigdata.striterator.IChunkedIterator; +import com.bigdata.striterator.IKeyOrder; + +import cutthecrap.utils.striterators.Resolver; +import cutthecrap.utils.striterators.Striterator; + +/** + * This operator performs a distinct terms scan for an {@link IPredicate}, + * binding the distinct values for the specified variable(s) from the + * {@link IAccessPath} for the {@link IPredicate}. This is done using a + * {@link DistinctTermAdvancer} to skip over any duplicate solutions in the + * index. Thus the cost of this operator is O(N) where N is the number of + * distinct solutions that exist in the index. + * + * @see <a href="http://trac.bigdata.com/ticket/1035" > DISTINCT PREDICATEs + * query is slow </a> + * @see DistinctTermAdvancer + * + * @author <a href="mailto:tho...@us...">Bryan Thompson</a> + */ +public class DistinctTermScanOp<E> extends PipelineOp { + + /** + * + */ + private static final long serialVersionUID = 1L; + + public interface Annotations extends AccessPathJoinAnnotations { + + /** + * The name of the variable whose distinct projection against the + * {@link IAccessPath} associated with the as-bound {@link IPredicate} + * is output by this operator. + */ + String DISTINCT_VAR = DistinctTermScanOp.class.getName() + + ".distinctVar"; + + } + + /** + * Deep copy constructor. + * + * @param op + */ + public DistinctTermScanOp(final DistinctTermScanOp<E> op) { + + super(op); + + } + + /** + * Shallow copy constructor. + * + * @param args + * @param annotations + */ + public DistinctTermScanOp(final BOp[] args, + final Map<String, Object> annotations) { + + super(args, annotations); + + // MUST be given. + getDistinctVar(); + getRequiredProperty(Annotations.PREDICATE); + + if (isOptional()) { + + /* + * TODO OPTIONAL is not implemented for this operator. + */ + + throw new UnsupportedOperationException(); + + } + + } + + public DistinctTermScanOp(final BOp[] args, final NV... annotations) { + + this(args, NV.asMap(annotations)); + + } + + /** + * @see Annotations#DISTINCT_VAR + */ + protected IVariable<?> getDistinctVar() { + + return (IVariable<?>) getRequiredProperty(Annotations.DISTINCT_VAR); + + } + + /** + * @see Annotations#SELECT + */ + protected IVariable<?>[] getSelect() { + + return getProperty(Annotations.SELECT, null/* defaultValue */); + + } + + /** + * @see Annotations#CONSTRAINTS + */ + protected IConstraint[] constraints() { + + return getProperty(Annotations.CONSTRAINTS, null/* defaultValue */); + + } + + @SuppressWarnings("unchecked") + public IPredicate<E> getPredicate() { + + return (IPredicate<E>) getRequiredProperty(Annotations.PREDICATE); + + } + + /** + * Return the value of {@link IPredicate#isOptional()} for the + * {@link IPredicate} associated with this join. + * + * @see IPredicate.Annotations#OPTIONAL + */ + private boolean isOptional() { + + return getPredicate().isOptional(); + + } + + @Override + public FutureTask<Void> eval(final BOpContext<IBindingSet> context) { + + return new FutureTask<Void>(new ChunkTask<E>(this, context)); + + } + + /** + * Copy the source to the sink. + */ + static private class ChunkTask<E> implements Callable<Void> { + + private final DistinctTermScanOp<E> op; + + private final BOpContext<IBindingSet> context; + + /** + * The variable that gets bound to the distinct values by the scan. + */ + private final IVariable<?> distinctVar; + + /** + * The source for the elements to be joined. + */ + private final IPredicate<E> predicate; + + /** + * The relation associated with the {@link #predicate} operand. + */ + private final IRelation<E> relation; + + ChunkTask(final DistinctTermScanOp<E> op, + final BOpContext<IBindingSet> context) { + + this.op = op; + + this.context = context; + + this.distinctVar = op.getDistinctVar(); + + this.predicate = op.getPredicate(); + + this.relation = context.getRelation(predicate); + + } + + @Override + public Void call() throws Exception { + + final BOpStats stats = context.getStats(); + + // Convert source solutions to array (assumes low cardinality). + final IBindingSet[] leftSolutions = BOpUtility.toArray( + context.getSource(), stats); + + // default sink + final IBlockingBuffer<IBindingSet[]> sink = context.getSink(); + + final UnsyncLocalOutputBuffer<IBindingSet> unsyncBuffer = new UnsyncLocalOutputBuffer<IBindingSet>( + op.getChunkCapacity(), sink); + + final IVariable<?>[] selectVars = op.getSelect(); + + final IConstraint[] constraints = op.constraints(); + + try { + + /* + * TODO If there are multiple left solutions (from the pipeline) + * then we could generate their fromKeys and order them to + * improve cache locality. See PipelineJoin for an example of + * how this is done. For the distinct-term-scan this could + * provide a reasonable improvement in cache locality for the + * index. + */ + + // For each source solution. + for (IBindingSet bindingSet : leftSolutions) { + + // constrain the predicate to the given bindings. + IPredicate<E> asBound = predicate.asBound(bindingSet); + + if (asBound == null) { + + /* + * This can happen for a SIDS mode join if some of the + * (s,p,o,[c]) and SID are bound on entry and they can not + * be unified. For example, the s position might be + * inconsistent with the Subject that can be decoded from + * the SID binding. + * + * @see #815 (RDR query does too much work) + */ + + continue; + + } + +// if (partitionId != -1) { +// +// /* +// * Constrain the predicate to the desired index +// * partition. +// * +// * Note: we do this for scale-out joins since the +// * access path will be evaluated by a JoinTask +// * dedicated to this index partition, which is part +// * of how we give the JoinTask to gain access to the +// * local index object for an index partition. +// */ +// +// asBound = asBound.setPartitionId(partitionId); +// +// } + + /** + * The {@link IAccessPath} corresponding to the asBound + * {@link IPredicate} for this join dimension. The asBound + * {@link IPredicate} is {@link IAccessPath#getPredicate()}. + * + * FIXME What do we do if there is a local filter or an + * access path filter? Do we have to NOT generate this + * operator? It is probably not safe to ignore those + * filters.... + */ + final IAccessPath<E> accessPath = context.getAccessPath( + relation, asBound); + + if (accessPath.getPredicate().getIndexLocalFilter() != null) { + // index has local filter. requires scan. + throw new AssertionError(); + } + + if (accessPath.getPredicate().getAccessPathFilter() != null) { + // access path filter exists. requires scan. + throw new AssertionError(); + } + + // TODO Cast to AccessPath is not type safe. + final IChunkedIterator<IV> rightItr = distinctTermScan( + (AccessPath<E>) accessPath, null/* termIdFilter */); + + while (rightItr.hasNext()) { + + // New binding set. + final IBindingSet right = new ListBindingSet(); + + // Bind the distinctTermVar. + right.set(distinctVar, new Constant(rightItr.next())); + + // See if the solutions join. + final IBindingSet outSolution = BOpContext.bind(// + bindingSet,// left + right,// + constraints,// + selectVars// + ); + + if (outSolution != null) { + + // Output the solution. + unsyncBuffer.add(outSolution); + + } + + } + + } + + // flush the unsync buffer. + unsyncBuffer.flush(); + + // flush the sink. + sink.flush(); + + // Done. + return null; + + } finally { + + sink.close(); + + context.getSource().close(); + + } + + } + + /** + * Efficient scan of the distinct term identifiers that appear in the + * first position of the keys for the statement index corresponding to + * the specified {@link IKeyOrder}. For example, using + * {@link SPOKeyOrder#POS} will give you the term identifiers for the + * distinct predicates actually in use within statements in the + * {@link SPORelation}. + * + * @param keyOrder + * The selected index order. + * @param fromKey + * The first key for the scan -or- <code>null</code> to start + * the scan at the head of the index. + * @param toKey + * The last key (exclusive upper bound) for the scan -or- + * <code>null</code> to scan until the end of the index. + * @param termIdFilter + * An optional filter on the visited {@link IV}s. + * + * @return An iterator visiting the distinct term identifiers. + * + * TODO Move this method to {@link AccessPath}. Also, refactor + * {@link SPORelation#distinctTermScan(IKeyOrder)} to use this + * code. + */ + private static <E> IChunkedIterator<IV> distinctTermScan( + final AccessPath<E> ap, final ITermIVFilter termIdFilter) { + + final IKeyOrder<E> keyOrder = ap.getKeyOrder(); + + final byte[] fromKey = ap.getFromKey(); + + final byte[] toKey = ap.getToKey(); + + final DistinctTermAdvancer filter = new DistinctTermAdvancer( + keyOrder.getKeyArity()); + + /* + * Layer in the logic to advance to the tuple that will have the + * next distinct term identifier in the first position of the key. + */ + + if (termIdFilter != null) { + + /* + * Layer in a filter for only the desired term types. + */ + + filter.addFilter(new TupleFilter<E>() { + + private static final long serialVersionUID = 1L; + + @Override + protected boolean isValid(final ITuple<E> tuple) { + + final byte[] key = tuple.getKey(); + + final IV iv = IVUtility.decode(key); + + return termIdFilter.isValid(iv); + + } + + }); + + } + + @SuppressWarnings("unchecked") + final Iterator<IV> itr = new Striterator(ap.getIndex(/*keyOrder*/) + .rangeIterator(fromKey, toKey,// + 0/* capacity */, IRangeQuery.KEYS | IRangeQuery.CURSOR, + filter)).addFilter(new Resolver() { + + private static final long serialVersionUID = 1L; + + /** + * Resolve tuple to IV. + */ + @Override + protected IV resolve(final Object obj) { + + final byte[] key = ((ITuple<?>) obj).getKey(); + + return IVUtility.decode(key); + + } + + }); + + return new ChunkedWrappedIterator<IV>(itr, ap.getChunkCapacity(), + IV.class); + + } + + } // class ChunkTask + + +} Added: branches/BIGDATA_RELEASE_1_4_0/bigdata/src/java/com/bigdata/bop/join/FastRangeCountOp.java =================================================================== --- branches/BIGDATA_RELEASE_1_4_0/bigdata/src/java/com/bigdata/bop/join/FastRangeCountOp.java (rev 0) +++ branches/BIGDATA_RELEASE_1_4_0/bigdata/src/java/com/bigdata/bop/join/FastRangeCountOp.java 2014-11-15 20:33:32 UTC (rev 8710) @@ -0,0 +1,391 @@ +/** + +Copyright (C) SYSTAP, LLC 2006-2010. All rights reserved. + +Contact: + SYSTAP, LLC + 4501 Tower Road + Greensboro, NC 27410 + lic...@bi... + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; version 2 of the License. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +*/ +/* + * Created on Aug 25, 2010 + */ + +package com.bigdata.bop.join; + +import java.math.BigInteger; +import java.util.Map; +import java.util.concurrent.Callable; +import java.util.concurrent.FutureTask; + +import com.bigdata.bop.BOp; +import com.bigdata.bop.BOpContext; +import com.bigdata.bop.BOpUtility; +import com.bigdata.bop.Constant; +import com.bigdata.bop.IBindingSet; +import com.bigdata.bop.IConstraint; +import com.bigdata.bop.IPredicate; +import com.bigdata.bop.IVariable; +import com.bigdata.bop.NV; +import com.bigdata.bop.PipelineOp; +import com.bigdata.bop.bindingSet.ListBindingSet; +import com.bigdata.bop.engine.BOpStats; +import com.bigdata.rdf.internal.impl.literal.XSDIntegerIV; +import com.bigdata.relation.IRelation; +import com.bigdata.relation.accesspath.IAccessPath; +import com.bigdata.relation.accesspath.IBlockingBuffer; +import com.bigdata.relation.accesspath.UnsyncLocalOutputBuffer; + +/** + * This operator reports the fast-range count for an as-bound {@link IPredicate} + * . The cost of this operator is two key probes. Unlike a normal access path, + * this operator does not bind variables to data in tuples in the underlying + * index. Instead it binds a pre-identified variable to the aggregate (COUNT) of + * the tuple range spanned by the {@link IPredicate}. + * + * @see <a href="http://trac.bigdata.com/ticket/1037" > Rewrite SELECT + * COUNT(...) (DISTINCT|REDUCED) {single-triple-pattern} as ESTCARD </a> + * + * @author <a href="mailto:tho...@us...">Bryan Thompson</a> + */ +public class FastRangeCountOp<E> extends PipelineOp { + + /** + * +... [truncated message content] |