[Bigdata-commit] SF.net SVN: bigdata:[8196] branches/BIGDATA_RELEASE_1_3_0

[<mrp...@us...>]

Revision: 8196
          http://sourceforge.net/p/bigdata/code/8196
Author:   mrpersonick
Date:     2014-05-05 15:08:22 +0000 (Mon, 05 May 2014)
Log Message:
-----------
got rid of IDoNotJoinService

Modified Paths:
--------------
    branches/BIGDATA_RELEASE_1_3_0/bigdata/src/java/com/bigdata/bop/controller/ServiceCallJoin.java

Removed Paths:
-------------
    branches/BIGDATA_RELEASE_1_3_0/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/service/IDoNotJoinService.java

Modified: branches/BIGDATA_RELEASE_1_3_0/bigdata/src/java/com/bigdata/bop/controller/ServiceCallJoin.java
===================================================================
--- branches/BIGDATA_RELEASE_1_3_0/bigdata/src/java/com/bigdata/bop/controller/ServiceCallJoin.java	2014-05-05 12:29:04 UTC (rev 8195)
+++ branches/BIGDATA_RELEASE_1_3_0/bigdata/src/java/com/bigdata/bop/controller/ServiceCallJoin.java	2014-05-05 15:08:22 UTC (rev 8196)
@@ -58,7 +58,6 @@
 import com.bigdata.rdf.model.BigdataURI;
 import com.bigdata.rdf.sparql.ast.service.BigdataServiceCall;
 import com.bigdata.rdf.sparql.ast.service.ExternalServiceCall;
-import com.bigdata.rdf.sparql.ast.service.IDoNotJoinService;
 import com.bigdata.rdf.sparql.ast.service.RemoteServiceCall;
 import com.bigdata.rdf.sparql.ast.service.ServiceCall;
 import com.bigdata.rdf.sparql.ast.service.ServiceCallUtility;
@@ -586,52 +585,6 @@
                         : new UnsyncLocalOutputBuffer<IBindingSet>(
                                 op.getChunkCapacity(), sink2);
 
-                if (serviceCall instanceof IDoNotJoinService) {
-                	
-                    // The iterator draining the subquery
-                    ICloseableIterator<IBindingSet[]> serviceSolutionItr = null;
-                    try {
-
-                        /*
-                         * Invoke the service.
-                         * 
-                         * Note: Returns [null] IFF SILENT and SERVICE ERROR.
-                         */
-                        
-                        serviceSolutionItr = doServiceCall(serviceCall, chunk);
-
-                        if (serviceSolutionItr != null) {
-
-                        	while (serviceSolutionItr.hasNext()) {
-                        		
-                        		final IBindingSet[] bsets = 
-                        				serviceSolutionItr.next();
-                        		
-                        		for (IBindingSet bs : bsets) {
-                        		
-                        			unsyncBuffer.add(bs);
-                        			
-                        		}
-                        		
-                        	}
-
-                        }
-
-                    } finally {
-
-                        // ensure the service call iterator is closed.
-                        if (serviceSolutionItr != null)
-                            serviceSolutionItr.close();
-
-                    }
-                    
-                    unsyncBuffer.flush();
-
-                    // done.
-                    return null;
-                	
-                }
-                
                 final JVMHashJoinUtility state = new JVMHashJoinUtility(op,
                         silent ? JoinTypeEnum.Optional : JoinTypeEnum.Normal
                         );

Deleted: branches/BIGDATA_RELEASE_1_3_0/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/service/IDoNotJoinService.java
===================================================================
--- branches/BIGDATA_RELEASE_1_3_0/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/service/IDoNotJoinService.java	2014-05-05 12:29:04 UTC (rev 8195)
+++ branches/BIGDATA_RELEASE_1_3_0/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/service/IDoNotJoinService.java	2014-05-05 15:08:22 UTC (rev 8196)
@@ -1,35 +0,0 @@
-/**
-
-Copyright (C) SYSTAP, LLC 2006-2014.  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
-*/
-package com.bigdata.rdf.sparql.ast.service;
-
-/**
- * Service calls can implement this interface and they will not be routed 
- * through a hash join in the query plan.  They will be responsible for their
- * own join internally.
- * 
- * @author mikepersonick
- */
-public interface IDoNotJoinService {
-
-}

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.