Merged PRs

dolt

• 3347: Improve merge failure messages
  Fixes #3336
  Slightly improves the failure messages for merge. Basically adds a better hint that dolt conflicts should be used to investigate and resolve any conflicts.
  Before:

  -> dolt merge right
  Updating j2pj08g8rkm8o348fr13vbo9fafv0ck8..rbdk7ovdugbnsnimrjjqq6rbq09idh7p
  Auto-merging t
  CONFLICT (content): Merge conflict in t
  Automatic merge failed; fix conflicts and then commit the result.
  -> dolt merge right
  error: Merging is not possible because you have unmerged tables.
  hint: Fix them up in the working tree, and then use 'dolt add <table>'
  hint: as appropriate to mark resolution and make a commit.
  fatal: Exiting because of an unresolved conflict.
  

  After:

  -> dolt merge right
  Updating j2pj08g8rkm8o348fr13vbo9fafv0ck8..rbdk7ovdugbnsnimrjjqq6rbq09idh7p
  Auto-merging t
  CONFLICT (content): Merge conflict in t
  Automatic merge failed; 1 table(s) are unmerged.
  Use 'dolt conflicts' to investigate and resolve conflicts.
  -> dolt merge right
  error: A merge is already in progress, 1 table(s) are unmerged due to conflicts or constraint violations.
  hint: Fix them up in the working tree, and then use 'dolt add <table>'
  hint: as appropriate to mark resolution and make a commit.
  fatal: Exiting because of an unresolved conflict.
  fatal: Use 'dolt conflicts' to investigate and resolve conflicts.
  

• 3342: Adding check for GeometryKind when writing to column
  Fix for: dolthub/dolthub-issues#203
• 3332: Fix composite index merge bug
  A bug was discovered where a composite index is left in an inconsistent state after a merge. This PR adds a bats test to catch this bug, and fixes it.
  In preparation for the new storage format, this PR also rewrites the merge tests in a universal way. This will allow us to test both the old format and new format functionality with the same test cases.
• 3331: [no-release-note] Add pkg message to abstract flatbuffers details
  • Adds pkg Message to abstract Flatbuffers message serialization. The intent is to store different prolly tree implementations with different Flatbuffers messages.
  • Adds AddressMap as a chunked alternative to RefMap. Rather than store name keys as [string], AddressMap uses a key array ([ubyte]) with offsets ([uin16]) to store keys in less space.
• 3329: Changed default behavior for handling merge conflicts in sessions
  Changed the default of @@dolt_allow_commit_conflicts to false, and changed how merge conflicts that happen incidentally on commit are handled.
  A commit that results in a merge conflict from another client updating the same head will always roll back the transaction, since many connectors will be unable to recover from such a condition otherwise, regardless of the value of @@dolt_allow_commit_conflicts.
  A commit that has merge conflicts from a dolt_merge() can be committed by setting @@dolt_allow_commit_conflicts = on to allow others to collaborate on resolving the conflicts. By default, attempting to commit a working set with merge conflicts will result in a rollback, as above.
• 3311: mergeTableData for New Storage Format
  Implements the mergeTableData function for the new storage format. Any conflicts will throw an error. Cell-wise merge is implemented.
  TODO:
  • Fix merging of secondary indexes in the presence of cell-wise merges.
  • Conflicts

go-mysql-server

• 990: support SELECT INTO 'variable' functionality
  Added functionality support for SELECT INTO variable only. Usages of 'outfile' or 'dumpfile' will return unsupported syntax error.
  Added tests for different cases of SELECT INTO syntax. Using SELECT INTO around unions will not work unless the result is a single row because we do not support order by and limit clauses for union statements even though we parse it correctly.
• 988: Fix SHOW CREATE ... AS OF ... prepared statements
  Fix for: #3304
  Note:
  • The parseColumnDefaults rule is repeated because ColumnDefaults are unresolved after unresolveTables and setTargetSchemas, for some reason this only happens when using a DoltHarness.
• 983: Change Autocommit Query Plan
  This PR adds a new analyzer rule and query Node for autocommit. This fixes an issue where previously a query process was being killed (via a cancelCtx function) before a transaction committed.

vitess

• 160: return Into value in GetInto() in SelectStatement
  This allows to get Into value without doing switch on its types.
• 159: support parsing of XOR logic operator
  Added support for parsing XOR logic operator
• 158: support SELECT ... INTO syntax
  Added supporting of SELECT ... INTO syntax
  Added tests for cases with different locations of INTO in SELECT statement
  INTO clause can only be used in one place, but it can come in different positions, before [FROM ...] or after the whole SELECT statement but beforing locking. (mysql recommends it after locking options)
  INTO OUTFILE ... and INTO DUMPFILE ... are not included yet.

Closed Issues

• 3226: Dolt Python SDK write_pandas is not consistent with dolt table import
• 3336: Difficult to learn how to resolve merge conflicts on command line
• 3242: supportSELECT ... INTO Statement (for create procedure)
• 3314: pushdown IN filters into range scans