Re: Broken history after force pushing to master

Just notice - github allows to disable a force push into master branch. It's not the first time that we have had small problems with history so no worries. Thankfully with the help of commit@calcite list we can always find a way to fix things as long as we identify the problem soon enough.

Re: Broken history after force pushing to master

Hi Julian, Thanks a lot for your feedback. I will start a separate thread to discuss the related problems when things are done, to avoid similar problems in the future. Best, Liya Fan Julian Hyde 于2022年3月10日周四 08:30写道： > Yes, the ‘git rebase’ command works in mysterious ways. If it sees

Re: Broken history after force pushing to master

Yes, the ‘git rebase’ command works in mysterious ways. If it sees commits that have the same content it will ignore them, even if they have different hashes. Since you want to preserve the hashes in the master branch, the direction that you rebase (e.g. from master to site, versus from site to

[CANCEL][VOTE] Release Apache Calcite 1.30.0 (release candidate 1)

Due to the broken history problem, let's cancel this vote. Thanks to all who have voted in this thread. Best, Liya Fan

Re: [VOTE] Release Apache Calcite 1.30.0 (release candidate 1)

Hi Ruben and Julian, Thanks a lot for your feedback, I will prepare a PR addressing all the issues described above. Best, Liya Fan Julian Hyde 于2022年3月10日周四 08:03写道： > Liya, > > I made much the same comments as Ruben regarding the release notes. > > Though we don’t usually use PRs for

Re: Broken history after force pushing to master

Hi Ruben and Stamatis, Thanks a lot for your kind help. I should have sent an email asking for help when I encountered the problem. I must be careful in the future to never repeat such mistake again. In step 2, I found the following commits in site branch but not in master branch (through git

Re: [VOTE] Release Apache Calcite 1.30.0 (release candidate 1)

Liya, I made much the same comments as Ruben regarding the release notes. Though we don’t usually use PRs for releases, I think it would be useful if we had a PR in which to review the release notes. It seems better than bike-shedding them during the actual release vote. If you agree, can you

Re: Broken history after force pushing to master

That sounds good. I concur that "[CALCITE-5019] Avoid multiple scans when table is ProjectableFilterableTable and projections and filters act on different columns” is the last good commit and that its hash should be dcbc493bf699d961427952c5efc047b76d859096. Go ahead when you’re ready.

Re: Broken history after force pushing to master

It's not the first time that we have had small problems with history so no worries. Thankfully with the help of commit@calcite list we can always find a way to fix things as long as we identify the problem soon enough. According to the change log [1] the last commit before force pushing was

[jira] [Created] (CALCITE-5037) Upgrade HSQLDB to 2.5.1

Julian Hyde created CALCITE-5037: Summary: Upgrade HSQLDB to 2.5.1 Key: CALCITE-5037 URL: https://issues.apache.org/jira/browse/CALCITE-5037 Project: Calcite Issue Type: Bug

Re: Broken history after force pushing to master

Hello Liya, No worries, we all make mistakes. I think the sequence of steps that you describe looks like a plausible explanation for how we get into this situation. Do you know (from step 2) which commits were in site branch that were not in master? If in the future you (or anybody else) get

Re: Broken history after force pushing to master

Hi all, I think the broken history was caused by this: 1. In document "Making a release candidate [1]", it says "Make sure master branch and site branch are in sync". 2. I checked the two branches, and find they have diverged. Some commits in the site branch are not in the master branch. 3. I

Re: Broken history after force pushing to master

Hi. Stamatis. I agree we need to address this issue first. I find some relative descriptions at end of the email https://lists.apache.org/thread/gkvn5hlmm3jlcklgw9k9nodyhxvqmsw4. So it is a force push. Sorry I am not very good at Github job flow. But I think it describes what happened according to

Re: [VOTE] Release Apache Calcite 1.30.0 (release candidate 1)

Thanks Liya Fan for being the release manager. First of all, for the record regarding the RC itself: - Checksum and signature: ok - Gradle test: ok - Calcite-based application test suite: ok IMO release notes would need some adjustments: - Traditionally, at the beginning of the release note,

Re: Travis CI is broken

Thanks for looking into this Alessandro! We are in code freeze right now so anyways we cannot commit something to master. If it is not resolved in the following days we can go for the workaround. Best, Stamatis On Tue, Mar 8, 2022 at 5:33 PM Alessandro Solimando <

Re: [VOTE] Release Apache Calcite 1.30.0 (release candidate 1)

Thanks for preparing the RC Liya! The repository seems to be in some weird state (see [1]) so I don't feel comfortable getting a release out till we understand what exactly has happened. Let's continue the discussion under the respective thread. -1 (binding) Stamatis [1]

Broken history after force pushing to master

Hi all, Something happened during the generation of the 1.30.0 release candidate and the git history is somewhat broken. If you use the GitHub repo and you try to pull (DON'T DO IT NOW) changes from master to update your local copy you will see that a merge commit is necessary which is not

[jira] [Created] (CALCITE-5036) `RelMetadataQuery#getPulledUpPredicates` support to analyze constant key for the operator of IS_NOT_DISTINCT_FROM

Xurenhe created CALCITE-5036: Summary: `RelMetadataQuery#getPulledUpPredicates` support to analyze constant key for the operator of IS_NOT_DISTINCT_FROM Key: CALCITE-5036 URL: