Here's a list of the 7 commits that are "present" under the site branch,
but "missing" from master: https://github.com/apache/calcite/compare/site
I think the main reason is that we followed the instructions under the
site folder and cherry-picked those commits from master into site. I
believe that we should pull those commits into site using rebase
instead. To even out the branches after a release, I think a rebase
should be used, so that there won't be a merge commit and both master
and site would be even.
I also noticed a96db91 exist on the site branch, but the change is
exactly the same as e80ec97, so I think it can be removed.
I am not 100% on this, but I think Julian should be able to clarify as
he was RM for the last Calcite release.
If my assumption was correct, I think we can do the following to fix:
- Remove the offending commits (including the merge from master commit)
from the site branch
- Create a temp branch including commits up to 06b1894 from master
- Rebase the temp branch into site and delete the temp branch.
- Rebase my latest site commit (11c067f) into the site branch.
On 27/03/2019 12:52 pm, Kevin Risden wrote:
Maybe I screwed something up by cherry picking
27706dd078049601ea26cef7c45a95046719c444 into site branch? I didn't want to
remerge master again. Since just needed that one commit on the site branch.
According to the site readme, I thought we only had to cherry-pick commits
to the site branch between releases.
Kevin Risden
On Tue, Mar 26, 2019 at 7:57 PM Stamatis Zampetakis <[email protected]>
wrote:
Thanks again Kevin.
Regarding the differences between the master and the site it seems that
something is off.
I think that it is normal to be 10 commits behind master since from the
time that master was merged into site there have been 10 commits on the
master.
On the other hand the 7 commits ahead is bit weird. Normally, it should be
3 I think (only those made after the merge of master into site).
By doing
git log master..site
I get the following which shows that some commits exist in the site but not
in the master.
commit d09ea01b8c79dd162c40ad4bc0dc7f2d9ae18214 (HEAD -> site,
upstream-apache/site)
Author: Francis Chuang <[email protected]>
Date: Wed Mar 27 08:54:49 2019 +1100
Site: Add new committers (Haisheng Yuan, Hongze Zhang and Stamatis
Zampetakis)
commit 27706dd078049601ea26cef7c45a95046719c444
Author:
Kevin Risden
<[email protected]>
Date: Mon Mar 25 08:37:23 2019 -0400
Site: News item for release 1.19.0
commit 3ac7039292501293aec8dd953545a397acefe2a4
Merge: a96db9117 b8f4edfcf
Author: Kevin Risden <[email protected]>
Date: Mon Mar 25 10:43:10 2019 -0400
Merge branch 'master' into site
commit a96db9117e45ea32a953dc96d2db7e04f66765c6
Author: Andrei Sereda <[email protected]>
Date: Fri Jan 25 15:28:22 2019 -0500
Site: [CALCITE-2734] Update mongo documentation to reflect filename
changes
After mongo adapter refactoring some files were renamed (eg.
`mongo-zips-model.json`
-> `mongo-models.json` in `test/resources`).
commit d561dba0e090aed361b416978944a5a46a410071
Author: Stamatis Zampetakis <[email protected]>
Date: Tue Jan 8 16:01:48 2019 +0100
Site: Add commit message guidelines for contributors (Stamatis
Zampetakis)
Add guidelines for commit messages proposed by Julian Hyde in various
discussions in the dev list.
commit 15a6d384f8b08ca5fb7288d624fa555e0f44f4ab
Author: Francis Chuang <[email protected]>
Date: Thu Jan 10 08:48:15 2019 +1100
Site: Add Zoltan Haindrich as committer
commit 2afea1fc94c5cda594535f5d194b86f723e2e8be
Author: Andrei Sereda <[email protected]>
Date: Thu Jan 3 11:33:36 2019 -0500
Site: Elastic query example on _MAP
Στις Τρί, 26 Μαρ 2019 στις 11:47 μ.μ., ο/η Francis Chuang <
[email protected]> έγραψε:
Thanks for getting this release out, Kevin!
While adding our new committers to the site, I noticed that the site
branch is 7 commits ahead and 10 commits behind master. I was under the
impression that the site and master branches should be even after a
release, but I might be wrong.
Francis
On 26/03/2019 11:57 pm, Kevin Risden wrote:
Sent the release email after the website updated. I think I've
completed
all the 1.19 release manager steps.
Kevin Risden
On Tue, Mar 26, 2019 at 8:33 AM Kevin Risden <[email protected]>
wrote:
Committed the change to add JDK 12 to the 1.19.0 history. Should get
published shortly.
Kevin Risden
On Tue, Mar 26, 2019 at 8:19 AM Kevin Risden <[email protected]>
wrote:
Julian - Yea that sounds good to add the JDK 12 piece. I am holding
off
adding it to the initial push to gitbox for calcite-site. I'll add it
after
the first commit works and the site is published.
Kevin Risden
On Mon, Mar 25, 2019 at 6:07 PM Julian Hyde <[email protected]>
wrote:
I discovered one minor omission. We do not claim to have validated
Calcite on JDK 12. But I did - so I think we can legitimately modify
the
release notes when we deploy the site.
JDK 12 was released on 19th March, so is now the official latest
version
of Java.
I have logged https://issues.apache.org/jira/browse/CALCITE-2952 <
https://issues.apache.org/jira/browse/CALCITE-2952> for this task.
Julian
On Mar 25, 2019, at 7:56 AM,
Kevin Risden
<[email protected]> wrote:
Currently waiting the ~24 hour period for the release archives to
mirror.
About ~9 more hours until that will be complete. I will regenerate
the
site
and push the site news item and send the announce email at that
time.
Kevin Risden
On Wed, Mar 20, 2019 at 12:20 PM Kevin Risden <[email protected]>
wrote:
RC0 and RC1 had a few issues identified. Those issues have been
resolved
and RC2 is being created and should be out later today.
Kevin Risden
On Mon, Mar 11, 2019 at 10:24 PM Yuzhao Chen <
[email protected]>
wrote:
Nice job, Kevin
Best,
Yuzhao Chen
在 2019年3月11日 +0800 PM9:05，
Kevin Risden
<[email protected]>，写道：
As of this morning, all JIRAs tagged for 1.19.0 have been
resolved
or
moved
out to 1.20.0.
I will be starting the release steps this morning. Please hold
off
on
commits to master while the 1.19.0 release is happening.
Kevin Risden
On Wed, Mar 6, 2019 at 9:02 AM Kevin Risden <[email protected]
wrote:
It looks like we haven't made any progress (JIRAs have been
opened/closed)
towards closing down JIRAs tagged for 1.19.0. There are still
14
(14
on
2/27) open JIRAs tagged for 1.19.0.
I will start moving those JIRAs out today to 1.20.0 so I can
start
to
close those this release. We are getting to mid March at this
point
since
we keep postponing this release.
Kevin Risden
On Thu, Feb 28, 2019 at 5:55 AM YuZhao Chan <
[email protected]>
wrote:
I would help to review some PRs this weekend，especially [1].
Hope
to help
and release some of the burden.
[1]
https://issues.apache.org/jira/browse/CALCITE-2018?jql=project%20%3D%20CALCITE%20AND%20resolution%20%3D%20Unresolved%20AND%20fixVersion%20in%20(EMPTY%2C%20%22next%22)%20AND%20labels%20%3D%20pull-request-available%20ORDER%20BY%20priority%20DESC
Best,
YuZhao Chan
在 2019年2月26日 +0800 AM8:14，Julian Hyde <[email protected]>，写道：
Hey everyone.
There are 108 open pull requests. What are we going to do
about
it?
Last release I reviewed and committed dozens of pull
requests,
and I
burned out.
Julian
On Feb 22, 2019, at 1:20 PM,
Kevin Risden
<[email protected]> wrote:
Yea I don't mind pushing out the RC towards the end of next
week
(beginning
of March). I'm not in a rush to build the RC. I just picked
Monday to
try
to hit the target of February that was arbitrarily picked in
the
sand. At
this point, the release will most likely happen in early
March.
Kevin Risden
On Fri, Feb 22, 2019 at 4:15 PM Julian Hyde <
[email protected]
wrote:
Can you do the RC towards the end of next week?
I only just saw this message - 4 days after you sent it -
because
I’ve
been fighting down a backlog of 500 Apache messages. There
are some
changes
I would like to get into the release but I will need a few
days.
Julian
On Feb 18, 2019, at 9:56 AM,
Kevin Risden
<[email protected]> wrote:
It looks like there are some PRs to be reviewed and some
changes
to get
merged in this week.
How does creating the first RC on Monday Feb 25th sound?
Does
that give
enough time this week to get changes into Calcite 1.19.0?
Kevin Risden
On Wed, Feb 13, 2019 at 11:08 AM Zoltan Haindrich <
[email protected]>
wrote:
On 2/13/19 4:24 PM, Julian Hyde wrote:
Sorry, there’s been a misunderstanding. Let me clarify.
I
didn’t say
that your patches were too small. Or intend to imply it.
When I said “widespread changes for no good reason” - or
something like
that - I meant changes to the RexNode format due to
removing IS
TRUE
nodes.
I like small patches, provided each one fixes a well
defined
issue and
has appropriate tests.
From now on I will try to provide a testcase when
opening
the
jira.
Sorry for the misunderstanding, thank you for making it
clear!
Julian
On Feb 13, 2019, at 3:40 AM, Zoltan Haindrich <
[email protected]>
wrote:
Hello,
In Hive I'm a little bit behind in upgrading to 1.18
and
although the
upgrade would not cause any correctness issues; but in a
sense
it's more
conservative in doing some simplifications - which could
be
interpreted
as
regressions; if we take that into account that even the
plan
could get
worse.
I've a few patches almost ready - they are very small
changes
(actually
Julian mentioned that they are kinda too small, so next
time I
will not
be
opening separate jiras for them)
I will finish them and launch a custom Hive test with
the
latest
master
to see if there are any new issues coming from that
direction.
I should get the results for it by tomorrow.
cheers,
Zoltan
On 2/12/19 11:30 PM, Stamatis Zampetakis wrote:
I was not suggesting changing the release process. I
wanted just to
highlight the fact that if the aforementioned
tickets are
not part of
1.19
I will have to create an unofficial bundle which
includes
them in
order to
keep the downstream project working. Sorry for the
confusion.
Στις Τρί, 12 Φεβ 2019 στις 8:56 μ.μ., ο/η Julian
Hyde <
[email protected]>
έγραψε:
Stamatis,
We’ve so far managed to avoid making patch
releases. It
keeps life
simpler
if all releases are from the main line. And
simple is
important,
given that
there are no salaried release or QA engineers
working
on Calcite.
But as part of that contract, we commit to making
releases from main
line
frequently and regularly. Hopefully 1.19 will
arrive
soon enough for
your
purposes.
Julian
On Feb 12, 2019, at 5:27 AM, Stamatis
Zampetakis <
[email protected]>
wrote:
In order to enable Calcite on a downstream
project I
need to patch
the official release with the PRs of the
following
Jiras.
[CALCITE-2464] Allow to set nullability for
columns
of structured
types
[1]
[CALCITE-2677] Struct types with one field are
not
mapped correctly
to
Java
Classes [2]
[CALCITE-2776] Wrong value when accessing struct
types with one
attribute
[3]
I think the discussion has advanced quite a lot
for
CALCITE-2464
so I
could
probably take it on my self,
but I would really appreciate some input
regarding
CALCITE-2677 and
CALCITE-2776.
Let's continue the discussion under the
respective
Jiras.
Best,
Stamatis
[1]
https://jira.apache.org/jira/browse/CALCITE-2464
[2]
https://jira.apache.org/jira/browse/CALCITE-2677
[3]
https://jira.apache.org/jira/browse/CALCITE-2776
Στις Δευ, 11 Φεβ 2019 στις 9:49 μ.μ., ο/η
Francis
Chuang <
[email protected]> έγραψε:
Thanks for getting this started, Kevin!
On 12/02/2019 6:39 am, Julian Hyde wrote:
Are there any JIRA cases that should
make it
into 1.19.0 but
are
not
yet
finished?
Yes - there are a lot cases that have a PR
ready
that have not
been
reviewed / committed. We, the committers,
will need
to make a team
effort
to get as many of these in as possible.
Julian
On Feb 11, 2019, at 11:05 AM, Michael
Mior <
[email protected]>
wrote:
Thanks for getting the ball rolling Kevin!
--
Michael Mior
[email protected]
Le lun. 11 févr. 2019 à 09:51,
Kevin Risden
<[email protected]> a
écrit :
Calcite 1.18.0 was released on 2018-12
(coming up on 2 months
ago).
It
is
time to get the ball rolling for the
Calcite
1.19.0 release
since
there
have been releases every 2-3 months.
Calcite currently has 32 JIRA issues
tagged
for 1.19.0 with 68
commits.
Avatica currently has 2 JIRA issues
tagged
for avatica-1.14.0
with 8
commits.
Are there any JIRA cases that should
make it
into 1.19.0 but
are
not
yet
finished?
Since there are only two minor commits
to
Avatica I don't think
we
need a
new Avatica release before the Calcite
release.
Kevin Risden
