Re: [2/2] jena git commit: JENA-1391: adding isEmpty method to Dataset

[Andy Seaborne]

The SHA1 is different.

The previous commit to rebased commit has changed so the SHA1 is 
different.  It is a different commit, some different metadata, with the 
same patch.
On 13/10/17 17:17, aj...@apache.org wrote:
I did exactly that -- rebase branch over master, merge branch into 
master, and push to apache:master (which is what I usually do). I see 
them being different than the commits in the PR, but I can't see for the 
life of me why...

Anyway, I force-pushed to the PR-- that seems to have closed it.

Cool.

You can also close by

git commit --allow-empty -m "This closes #NNN."

(but it looks yuk in the history).

Digressing -

If anyone is interesting in following it up, I have read that Apache 
projects can now use gitbox where by all work is on Github, including 
the full PR cycle, and the ASF is mirrored back.  To us, it looks like 
the GH is the master and ASF the mirror (IIRC its a bit more complicated 
under the hood for INFRA than that).

    Andy


ajs6f

Andy Seaborne wrote on 10/13/17 11:54 AM:
Adam,

I guess you pushed from your local repo to Jena Aapche git repo? Maybe 
after a rebase?

These aren't the commits on the PR.

Could you pull from GH? Or otherwise tidy up the PR?

(you can force push changes from your local repo to GH)

    Thanks
    Andy

On 13/10/17 15:40, aj...@apache.org wrote:
JENA-1391: adding isEmpty method to Dataset


Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/b792e8da
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/b792e8da
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/b792e8da

Branch: refs/heads/master
Commit: b792e8da1fbe7e397399f2b0803f4e28222c9c3e
Parents: 32de4dc
Author: ajs6f <aj...@apache.org>
Authored: Thu Oct 12 10:18:41 2017 -0400
Committer: ajs6f <aj...@apache.org>
Committed: Fri Oct 13 10:40:18 2017 -0400

----------------------------------------------------------------------
  jena-arq/src/main/java/org/apache/jena/query/Dataset.java    | 7 
+++++++
  .../main/java/org/apache/jena/sparql/core/DatasetImpl.java   | 5 +++++
  .../org/apache/jena/sparql/core/AbstractTestDataset.java     | 8 
++++++++
  3 files changed, 20 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jena/blob/b792e8da/jena-arq/src/main/java/org/apache/jena/query/Dataset.java 

----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/query/Dataset.java
b/jena-arq/src/main/java/org/apache/jena/query/Dataset.java
index db88642..539053a 100644
--- a/jena-arq/src/main/java/org/apache/jena/query/Dataset.java
+++ b/jena-arq/src/main/java/org/apache/jena/query/Dataset.java
@@ -113,4 +113,11 @@ public interface Dataset extends Transactional
       *  The dataset can not be used for query after this call.
       */
      public void close() ;
+
+    /**
+     * @return Whether this {@code Dataset} is empty of graphs. Be 
aware of the semantic looseness inherent in
+     * <a 
href="https://www.w3.org/TR/2014/REC-rdf11-concepts-20140225/#h_note_4";>the 
definition
+     * of RDF Datasets</a>; whether a named graph exists if nothing 
is in it is implementation-specific.
+     */
+    boolean isEmpty();
  }

http://git-wip-us.apache.org/repos/asf/jena/blob/b792e8da/jena-arq/src/main/java/org/apache/jena/sparql/core/DatasetImpl.java 


----------------------------------------------------------------------
diff --git 
a/jena-arq/src/main/java/org/apache/jena/sparql/core/DatasetImpl.java
b/jena-arq/src/main/java/org/apache/jena/sparql/core/DatasetImpl.java
index 2216d2f..00e419a 100644
--- 
a/jena-arq/src/main/java/org/apache/jena/sparql/core/DatasetImpl.java
+++ 
b/jena-arq/src/main/java/org/apache/jena/sparql/core/DatasetImpl.java
@@ -209,4 +209,9 @@ public class DatasetImpl implements Dataset
          if ( uri == null )
              throw new ARQException("null for graph name");
      }
+
+    @Override
+    public boolean isEmpty() {
+        return dsg.isEmpty();
+    }
  }

http://git-wip-us.apache.org/repos/asf/jena/blob/b792e8da/jena-arq/src/test/java/org/apache/jena/sparql/core/AbstractTestDataset.java 


----------------------------------------------------------------------
diff --git 
a/jena-arq/src/test/java/org/apache/jena/sparql/core/AbstractTestDataset.java 

b/jena-arq/src/test/java/org/apache/jena/sparql/core/AbstractTestDataset.java 

index 0ac1dee..b55991d 100644
--- 
a/jena-arq/src/test/java/org/apache/jena/sparql/core/AbstractTestDataset.java 

+++ 
b/jena-arq/src/test/java/org/apache/jena/sparql/core/AbstractTestDataset.java 

@@ -108,4 +108,12 @@ public abstract class AbstractTestDataset 
extends BaseTest
          
assertFalse(model1.isIsomorphicWith(ds.getNamedModel(graphName))) ;
          
assertTrue(model2.isIsomorphicWith(ds.getNamedModel(graphName))) ;
      }
+
+    @Test public void dataset_06()
+    {
+        String graphName = "http://example/"; ;
+        Dataset ds = createDataset() ;
+        ds.addNamedModel(graphName, model1) ;
+        assertFalse("Dataset should not be empty after a named graph 
has been added!", ds.isEmpty());
+    }
  }