You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@jena.apache.org by aj...@apache.org on 2017/10/13 16:17:26 UTC
Re: [2/2] jena git commit: JENA-1391: adding isEmpty method to
Dataset
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.
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, ajs6f@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());
>> + }
>> }
>>
Re: github stuff Was: [2/2] jena git commit: JENA-1391: adding
isEmpty method to Dataset
Posted by "Bruno P. Kinoshita" <ki...@apache.org>.
GitHub supports Jekyll out of the box. They have their own kind of gitpubsub cms.
In our case, with or without maven and plugins, we would need to ask contributors to install ruby to build the website.
Not a huge issue, but sometimes ruby doesn't play nice in certain os'es.
As I use ruby in some projects, it won't affect me, but I think it could put off some contributors. Jbake has some advantage on this for being pure java, but the maven plugin had some hiatus, and there's no guarantee it will be maintained for a long time.
And jbake has less examples and layouts than jekyll.
We'd have to compromise, and pick our poison here. I'm fine with either solution, as I think these could attract more contributions IMO.
Bruno
Sent from Yahoo Mail on Android
On Tue, 24 Oct 2017 at 22:41, ajs6f@apache.org<aj...@apache.org> wrote: Super +1 to going to gitpubsub. I am agnostic (because I don't know enough to have a very informed opinion) about site
processing tools. (I've had no problem using plain ol' Maven Site processing, but I never used it on very large
projects, nothing with a site the size of Jena's.)
I had not heard of Jekyll, so I went and looked at https://jekyllrb.com/ but it appears to be a Ruby product? Would we
run it somehow via JRuby from within Maven? Or as an exec task?
ajs6f
Bruno P. Kinoshita wrote on 10/23/17 5:11 AM:
>> Is there a git+CMS option? (or mirro git to SVN then ...)
>
>
> More or less. It was enabled in 2015 https://blogs.apache.org/infra/entry/git_based_websites_available
>
> You must have the web site in the asf-site branch.
> No mirror to SVN as far as I know...
>
>> CMS may not be around forever, and while the markdown isn't all >standard, it's quite close. (e.g. the processor "Title:" stuff)
>
> OpenNLP had a few issues migrating to JBake, but a bit of IDE-fu + regex did the trick. The difference with Jena, I think, is that Jena's documentation is much more extensive, which means more pages to edit. But doable nevertheless.
>
>> I don't know what processor is behind CMS - python based? Home
>> grown/modified?
>
> Home grown, like the old IRC bot/factoid code (written in Lua I think), the Help Wanted app (Lua too I believe). The CMS is a mix of Perl and Python.
>
> Source code for the curious: https://svn.apache.org/repos/infra/websites/cms/
>
>> I've use jekyll (choice based on choosing a commonly used system to >increase the longevity and stability of the choice).
>
> Jekyll is my preferred option as well, as there are heaps more documentation / examples / templates to re-use.
>
> The work for OpenNLP is done in https://github.com/apache/opennlp-site, in the master branch. Then, there is a job somewhere, set up by ASF Infra, that pulls the master branch, runs `mvn clean package ...`, and then deploys the resulting static files generated onto the asf-site branch.
>
> The site is served with the contents of that asf-site branch. One can build locally pull requests with `mvn clean package ...` and preview the web site, without having to wait and preview in the staging web site. Or even preview in GitHub pages as well.
>
> The decision for JBake was already done when I joined, so I just helped with a few issues. It works quite well though. But if ASF Infra is able to build a Jekyll project, then we could use it instead.
>
> Bruno
>
>
>
> ________________________________
> From: Andy Seaborne <an...@apache.org>
> To: dev@jena.apache.org
> Sent: Monday, 23 October 2017 3:09 AM
> Subject: Re: github stuff Was: [2/2] jena git commit: JENA-1391: adding isEmpty method to Dataset
>
>
>
> Is there a git+CMS option? (or mirro git to SVN then ...)
>
> CMS may not be around forever, and while the markdown isn't all
> standard, it's quite close. (e.g. the processor "Title:" stuff)
>
> I don't know what processor is behind CMS - python based? Home
> grown/modified?
>
> I've use jekyll (choice based on choosing a commonly used system to
> increase the longevity and stability of the choice).
>
> Andy
>
>
> On 16/10/17 19:51, Bruno P. Kinoshita wrote:
>> A few months ago I helped setting up OpenNLP's new website building from github.
>>
>> The source is in an opennlp-site git repository, and is built with maven using the maven jbake static site generator.
>>
>> Before they were using the svn cms pubsub if I recall correctly. Maybe we could have something similar if others like this approach.
>>
>> CheersBruno
>>
>> Sent from Yahoo Mail on Android
>>
>> On Tue, 17 Oct 2017 at 2:12, ajs6f@apache.org<aj...@apache.org> wrote:
>> Andy Seaborne wrote on 10/13/17 3:40 PM:
>>> 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
>>
>> That sounds good to me. Is this the sort of thing for which I could just file a ticket on INFRA and follow up with them?
>>
>> As long as we are digressing, you know what I would really love? Being able to do our docs/site in git/github. I'm
>> pretty sure other Apache projects manage to do that...
>>
>> ajs6f
>>
>>
Re: github stuff Was: [2/2] jena git commit: JENA-1391: adding
isEmpty method to Dataset
Posted by aj...@apache.org.
Super +1 to going to gitpubsub. I am agnostic (because I don't know enough to have a very informed opinion) about site
processing tools. (I've had no problem using plain ol' Maven Site processing, but I never used it on very large
projects, nothing with a site the size of Jena's.)
I had not heard of Jekyll, so I went and looked at https://jekyllrb.com/ but it appears to be a Ruby product? Would we
run it somehow via JRuby from within Maven? Or as an exec task?
ajs6f
Bruno P. Kinoshita wrote on 10/23/17 5:11 AM:
>> Is there a git+CMS option? (or mirro git to SVN then ...)
>
>
> More or less. It was enabled in 2015 https://blogs.apache.org/infra/entry/git_based_websites_available
>
> You must have the web site in the asf-site branch.
> No mirror to SVN as far as I know...
>
>> CMS may not be around forever, and while the markdown isn't all >standard, it's quite close. (e.g. the processor "Title:" stuff)
>
> OpenNLP had a few issues migrating to JBake, but a bit of IDE-fu + regex did the trick. The difference with Jena, I think, is that Jena's documentation is much more extensive, which means more pages to edit. But doable nevertheless.
>
>> I don't know what processor is behind CMS - python based? Home
>> grown/modified?
>
> Home grown, like the old IRC bot/factoid code (written in Lua I think), the Help Wanted app (Lua too I believe). The CMS is a mix of Perl and Python.
>
> Source code for the curious: https://svn.apache.org/repos/infra/websites/cms/
>
>> I've use jekyll (choice based on choosing a commonly used system to >increase the longevity and stability of the choice).
>
> Jekyll is my preferred option as well, as there are heaps more documentation / examples / templates to re-use.
>
> The work for OpenNLP is done in https://github.com/apache/opennlp-site, in the master branch. Then, there is a job somewhere, set up by ASF Infra, that pulls the master branch, runs `mvn clean package ...`, and then deploys the resulting static files generated onto the asf-site branch.
>
> The site is served with the contents of that asf-site branch. One can build locally pull requests with `mvn clean package ...` and preview the web site, without having to wait and preview in the staging web site. Or even preview in GitHub pages as well.
>
> The decision for JBake was already done when I joined, so I just helped with a few issues. It works quite well though. But if ASF Infra is able to build a Jekyll project, then we could use it instead.
>
> Bruno
>
>
>
> ________________________________
> From: Andy Seaborne <an...@apache.org>
> To: dev@jena.apache.org
> Sent: Monday, 23 October 2017 3:09 AM
> Subject: Re: github stuff Was: [2/2] jena git commit: JENA-1391: adding isEmpty method to Dataset
>
>
>
> Is there a git+CMS option? (or mirro git to SVN then ...)
>
> CMS may not be around forever, and while the markdown isn't all
> standard, it's quite close. (e.g. the processor "Title:" stuff)
>
> I don't know what processor is behind CMS - python based? Home
> grown/modified?
>
> I've use jekyll (choice based on choosing a commonly used system to
> increase the longevity and stability of the choice).
>
> Andy
>
>
> On 16/10/17 19:51, Bruno P. Kinoshita wrote:
>> A few months ago I helped setting up OpenNLP's new website building from github.
>>
>> The source is in an opennlp-site git repository, and is built with maven using the maven jbake static site generator.
>>
>> Before they were using the svn cms pubsub if I recall correctly. Maybe we could have something similar if others like this approach.
>>
>> CheersBruno
>>
>> Sent from Yahoo Mail on Android
>>
>> On Tue, 17 Oct 2017 at 2:12, ajs6f@apache.org<aj...@apache.org> wrote:
>> Andy Seaborne wrote on 10/13/17 3:40 PM:
>>> 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
>>
>> That sounds good to me. Is this the sort of thing for which I could just file a ticket on INFRA and follow up with them?
>>
>> As long as we are digressing, you know what I would really love? Being able to do our docs/site in git/github. I'm
>> pretty sure other Apache projects manage to do that...
>>
>> ajs6f
>>
>>
Re: github stuff Was: [2/2] jena git commit: JENA-1391: adding
isEmpty method to Dataset
Posted by "Bruno P. Kinoshita" <br...@yahoo.com.br.INVALID>.
>Is there a git+CMS option? (or mirro git to SVN then ...)
More or less. It was enabled in 2015 https://blogs.apache.org/infra/entry/git_based_websites_available
You must have the web site in the asf-site branch.
No mirror to SVN as far as I know...
>CMS may not be around forever, and while the markdown isn't all >standard, it's quite close. (e.g. the processor "Title:" stuff)
OpenNLP had a few issues migrating to JBake, but a bit of IDE-fu + regex did the trick. The difference with Jena, I think, is that Jena's documentation is much more extensive, which means more pages to edit. But doable nevertheless.
>I don't know what processor is behind CMS - python based? Home
>grown/modified?
Home grown, like the old IRC bot/factoid code (written in Lua I think), the Help Wanted app (Lua too I believe). The CMS is a mix of Perl and Python.
Source code for the curious: https://svn.apache.org/repos/infra/websites/cms/
>I've use jekyll (choice based on choosing a commonly used system to >increase the longevity and stability of the choice).
Jekyll is my preferred option as well, as there are heaps more documentation / examples / templates to re-use.
The work for OpenNLP is done in https://github.com/apache/opennlp-site, in the master branch. Then, there is a job somewhere, set up by ASF Infra, that pulls the master branch, runs `mvn clean package ...`, and then deploys the resulting static files generated onto the asf-site branch.
The site is served with the contents of that asf-site branch. One can build locally pull requests with `mvn clean package ...` and preview the web site, without having to wait and preview in the staging web site. Or even preview in GitHub pages as well.
The decision for JBake was already done when I joined, so I just helped with a few issues. It works quite well though. But if ASF Infra is able to build a Jekyll project, then we could use it instead.
Bruno
________________________________
From: Andy Seaborne <an...@apache.org>
To: dev@jena.apache.org
Sent: Monday, 23 October 2017 3:09 AM
Subject: Re: github stuff Was: [2/2] jena git commit: JENA-1391: adding isEmpty method to Dataset
Is there a git+CMS option? (or mirro git to SVN then ...)
CMS may not be around forever, and while the markdown isn't all
standard, it's quite close. (e.g. the processor "Title:" stuff)
I don't know what processor is behind CMS - python based? Home
grown/modified?
I've use jekyll (choice based on choosing a commonly used system to
increase the longevity and stability of the choice).
Andy
On 16/10/17 19:51, Bruno P. Kinoshita wrote:
> A few months ago I helped setting up OpenNLP's new website building from github.
>
> The source is in an opennlp-site git repository, and is built with maven using the maven jbake static site generator.
>
> Before they were using the svn cms pubsub if I recall correctly. Maybe we could have something similar if others like this approach.
>
> CheersBruno
>
> Sent from Yahoo Mail on Android
>
> On Tue, 17 Oct 2017 at 2:12, ajs6f@apache.org<aj...@apache.org> wrote:
> Andy Seaborne wrote on 10/13/17 3:40 PM:
>> 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
>
> That sounds good to me. Is this the sort of thing for which I could just file a ticket on INFRA and follow up with them?
>
> As long as we are digressing, you know what I would really love? Being able to do our docs/site in git/github. I'm
> pretty sure other Apache projects manage to do that...
>
> ajs6f
>
>
Re: github stuff Was: [2/2] jena git commit: JENA-1391: adding
isEmpty method to Dataset
Posted by Andy Seaborne <an...@apache.org>.
Is there a git+CMS option? (or mirro git to SVN then ...)
CMS may not be around forever, and while the markdown isn't all
standard, it's quite close. (e.g. the processor "Title:" stuff)
I don't know what processor is behind CMS - python based? Home
grown/modified?
I've use jekyll (choice based on choosing a commonly used system to
increase the longevity and stability of the choice).
Andy
On 16/10/17 19:51, Bruno P. Kinoshita wrote:
> A few months ago I helped setting up OpenNLP's new website building from github.
>
> The source is in an opennlp-site git repository, and is built with maven using the maven jbake static site generator.
>
> Before they were using the svn cms pubsub if I recall correctly. Maybe we could have something similar if others like this approach.
>
> CheersBruno
>
> Sent from Yahoo Mail on Android
>
> On Tue, 17 Oct 2017 at 2:12, ajs6f@apache.org<aj...@apache.org> wrote:
> Andy Seaborne wrote on 10/13/17 3:40 PM:
>> 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
>
> That sounds good to me. Is this the sort of thing for which I could just file a ticket on INFRA and follow up with them?
>
> As long as we are digressing, you know what I would really love? Being able to do our docs/site in git/github. I'm
> pretty sure other Apache projects manage to do that...
>
> ajs6f
>
>
Re: github stuff Was: [2/2] jena git commit: JENA-1391: adding
isEmpty method to Dataset
Posted by "Bruno P. Kinoshita" <ki...@apache.org>.
A few months ago I helped setting up OpenNLP's new website building from github.
The source is in an opennlp-site git repository, and is built with maven using the maven jbake static site generator.
Before they were using the svn cms pubsub if I recall correctly. Maybe we could have something similar if others like this approach.
CheersBruno
Sent from Yahoo Mail on Android
On Tue, 17 Oct 2017 at 2:12, ajs6f@apache.org<aj...@apache.org> wrote:
Andy Seaborne wrote on 10/13/17 3:40 PM:
> 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
That sounds good to me. Is this the sort of thing for which I could just file a ticket on INFRA and follow up with them?
As long as we are digressing, you know what I would really love? Being able to do our docs/site in git/github. I'm
pretty sure other Apache projects manage to do that...
ajs6f
Re: GitBox Was: github stuff
Posted by "Bruno P. Kinoshita" <ki...@apache.org>.
Has there been a request to infra to look into this?
I always assumed git at asf meant git repo in asf infra, and a read-only mirror in github.
So I thought we'd have to ask infra to switch. Making git at asf the mirror, and allowing us to work freely on github (not sure if that's the intended here).
CheersBruno
Sent from Yahoo Mail on Android
On Tue, 24 Oct 2017 at 22:32, ajs6f@apache.org<aj...@apache.org> wrote: It's been surprisingly hard for me to find docs about how GitHub vs. Apache-side git works, but that may be my problem!
:grin: I have found:
https://gitbox.apache.org/setup/
and linked my accounts. But I see no change in behavior-- I cannot push a test branch to Github.
So perhaps we (Jena) need to do something to enable this?
ajs6f
Andy Seaborne wrote on 10/22/17 4:02 PM:
>
>
> On 16/10/17 14:12, ajs6f@apache.org wrote:
>>
>> Andy Seaborne wrote on 10/13/17 3:40 PM:
>>> 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
>>
>> That sounds good to me. Is this the sort of thing for which I could just file a ticket on INFRA and follow up with them?
>
> Step one is investigate - I've just seen it mentioned and don't know the details of what it does, aand what it does at
> ASF. Do you want to find out?
>
> Andy
>
>> ...
GitBox Was: github stuff
Posted by aj...@apache.org.
It's been surprisingly hard for me to find docs about how GitHub vs. Apache-side git works, but that may be my problem!
:grin: I have found:
https://gitbox.apache.org/setup/
and linked my accounts. But I see no change in behavior-- I cannot push a test branch to Github.
So perhaps we (Jena) need to do something to enable this?
ajs6f
Andy Seaborne wrote on 10/22/17 4:02 PM:
>
>
> On 16/10/17 14:12, ajs6f@apache.org wrote:
>>
>> Andy Seaborne wrote on 10/13/17 3:40 PM:
>>> 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
>>
>> That sounds good to me. Is this the sort of thing for which I could just file a ticket on INFRA and follow up with them?
>
> Step one is investigate - I've just seen it mentioned and don't know the details of what it does, aand what it does at
> ASF. Do you want to find out?
>
> Andy
>
>> ...
Re: github stuff Was: [2/2] jena git commit: JENA-1391: adding
isEmpty method to Dataset
Posted by Andy Seaborne <an...@apache.org>.
On 16/10/17 14:12, ajs6f@apache.org wrote:
>
> Andy Seaborne wrote on 10/13/17 3:40 PM:
>> 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
>
> That sounds good to me. Is this the sort of thing for which I could just
> file a ticket on INFRA and follow up with them?
Step one is investigate - I've just seen it mentioned and don't know the
details of what it does, aand what it does at ASF. Do you want to find out?
Andy
> ...
github stuff Was: [2/2] jena git commit: JENA-1391: adding isEmpty
method to Dataset
Posted by aj...@apache.org.
Andy Seaborne wrote on 10/13/17 3:40 PM:
> 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
That sounds good to me. Is this the sort of thing for which I could just file a ticket on INFRA and follow up with them?
As long as we are digressing, you know what I would really love? Being able to do our docs/site in git/github. I'm
pretty sure other Apache projects manage to do that...
ajs6f
Re: [2/2] jena git commit: JENA-1391: adding isEmpty method to
Dataset
Posted by Andy Seaborne <an...@apache.org>.
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, ajs6f@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, ajs6f@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());
>>> + }
>>> }
>>>