Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix DDL parser for spaces in table options #2

Merged
merged 1 commit into from Sep 2, 2016
Merged

Fix DDL parser for spaces in table options #2

merged 1 commit into from Sep 2, 2016

Conversation

LinuxJedi
Copy link
Contributor

MariaDB's parser allows for spaces instead of equals in table options, ColumnStore's parser currently does not allow this causing a query such as the following to fail:

CREATE TABLE t1 (a int, b int) ENGINE COLUMNSTORE;

This fix allows the spaces.

Fix DDL parser for spaces in table options
acb078d 
MariaDB's parser allows for spaces instead of equals in table options, ColumnStore's parser currently does not allow this causing a query such as the following to fail:

CREATE TABLE t1 (a int, b int) ENGINE COLUMNSTORE;

This fix allows the spaces.
ghost pushed a commit that referenced this pull request Aug 23, 2016
fix amazon check, ubuntu issue #2
ce0fa98
@davidhall586 davidhall586 merged commit 75ecb95 into mariadb-corporation:develop Sep 2, 2016
ghost pushed a commit that referenced this pull request Jan 19, 2018
MCOL-1060 - test tool change #2
c1035da
benthompson15 pushed a commit that referenced this pull request Jan 22, 2018
@columnstore-buildbot
Merge pull request #374 from mariadb-corporation/MCOL-1060
6c930a0 
MCOL-1060 - test tool change #2
drrtuy referenced this pull request in drrtuy/mariadb-columnstore-engine Dec 8, 2018
@drrtuy
PoC #2
2dafbed
@pleblanc1976 pleblanc1976 mentioned this pull request Feb 14, 2019
Merged
tntnatbry pushed a commit to tntnatbry/mariadb-columnstore-engine that referenced this pull request Jan 10, 2020
@drrtuy
Merge pull request mariadb-corporation#2 from tntnatbry/MCOL-641_2
ca66022 
Basic SELECT support for Decimal38
LinuxJedi added a commit to LinuxJedi/mariadb-columnstore-engine that referenced this pull request Feb 6, 2020
@LinuxJedi
MCOL-3764 Fix RENAME TABLE
cd5e742 
When ALTER TABLE ... ENGINE= is called the following happens:

1. A temporary table is created in the new engine with the real table
   name but a temporary file name supplied
2. A bulk insert is started from old to new table
3. The old table is dropped
4. The new table is renamed

For mariadb-corporation#1 we use the real table name instead of the temporary file name
(otherwise step mariadb-corporation#2 breaks), we were therefore trying to skip mariadb-corporation#4.
This broke regular RENAME TABLE commands.

With this patch we detect if the rename is for a temporary to real table
and skip it. Since this is the only instance where we support temporary
tables.

This patch also fixes issues with extracting table names from file
names and some other irrelevant stuff.

Longer term if we want to support temporary tables we need to store the
provided filename in our metadata since it could be different from table
name.
@LinuxJedi LinuxJedi mentioned this pull request Feb 6, 2020
Merged
mariadb-AlexeyAntipovsky added a commit to mariadb-AlexeyAntipovsky/mariadb-columnstore-engine that referenced this pull request May 7, 2021
@mariadb-AlexeyAntipovsky
tmp commit mariadb-corporation#2
79da290
abarkov added a commit that referenced this pull request May 24, 2021
@abarkov
Fixing 10.6 + develop compilation failure
b7c56ec 
mcsconfig.h and my_config.h have the following
pre-processor definitions:

1. Conflicting definitions coming from the standard cmake definitions:
- PACKAGE
- PACKAGE_BUGREPORT
- PACKAGE_NAME
- PACKAGE_STRING
- PACKAGE_TARNAME
- PACKAGE_VERSION
- VERSION

2. Conflicting definitions of other kinds:
- HAVE_STRTOLL - this is a dirt in MariaDB headers.
  Should be fixed in the server code. my_config.h erroneously
  performs "#define HAVE_STRTOLL" instead of "#define HAVE_STRTOLL 1".
  in some cases. The former is not CMake compatible style. The latter is.

3. Non-conflicting definitions:
  Otherwise, mcsconfig.h and my_config.h should be mutually compatible,
  because both are generated by cmake on the same host machine. So
  they should have exactly equal definitions like "HAVE_XXX", "SIZEOF_XXX", etc.

It's OK to include both mcsconfig.h and my_config.h providing that we
suppress duplicate definition of the above conflicting types #1 and #2.
Note, there is no a need to suppress duplicate definitions mentioned in #3,
as they are compatible!

This change make sure that we resolve conflicts by:
- either disallowing inclusion of mcsconfig.h and my_config.h
  at the same time
- or by hiding conflicting definitions #1 and #2
  (with their later restoring).

Details:
- idb_mysql.h can now only be included only after my_config.h
  An attempt to use idb_mysql.h with mcsconfig.h instead of
  my_config.h is caught by the "#error" preprocessor directive.

- mariadb_my_sys.h can now be only included after mcsconfig.h.
  An attempt to use mariadb_my_sys.h without mcscofig.h
  (e.g. with my_config.h) is also caught by "#error".

- collation.h now can now be included in two ways.
  It now has the following effective structure:

    #if defined(PREFER_MY_CONFIG_H) && defined(MY_CONFIG_H)
    //  Remember current conflicting definitions on the preprocessor stack
    //  Undefine current conflicting definitions
    #endif
    #include "mcsconfig.h"
    #include "m_ctype.h"
    #if defined(PREFER_MY_CONFIG_H) && defined(MY_CONFIG_H)
    #    Restore conflicting definitions from the preprocessor stack
    #endif

  and can be included as follows:

  a. using only mcsconfig.h as a configuration header:

    // my_config.h must not be included so far
    #include "collation.h"

  b. using my_config.h as the first included configuration file:

    #define PREFER_MY_CONFIG_H // Force conflict resolution
    #include "my_config.h"     // can be included directly or indirectly
    ...
    #include "collation.h"

Other changes:

- Adding helper header files
     utils/common/mcsconfig_conflicting_defs_remember.h
     utils/common/mcsconfig_conflicting_defs_restore.h
     utils/common/mcsconfig_conflicting_defs_undef.h
  to perform conflict resolution easier.

- Removing `#include "collation.h"` from a number of files,
  as it's automatically included from rowgroup.h.

- Removing redundant `#include "utils_utf8.h"`.
  This change is not directly related to the problem being fixed,
  but it's nice to remove redundant directives for both collation.h
  and utils_utf8.h from all the files that do not really need them.
  (this change could probably have gone as a separate commit)
@abarkov abarkov mentioned this pull request May 24, 2021
Merged
abarkov added a commit that referenced this pull request May 25, 2021
@abarkov
MCOL-4734 Compilation failure: MariaDB-10.6 + ColumnStore-develop
9608533 
mcsconfig.h and my_config.h have the following
pre-processor definitions:

1. Conflicting definitions coming from the standard cmake definitions:
- PACKAGE
- PACKAGE_BUGREPORT
- PACKAGE_NAME
- PACKAGE_STRING
- PACKAGE_TARNAME
- PACKAGE_VERSION
- VERSION

2. Conflicting definitions of other kinds:
- HAVE_STRTOLL - this is a dirt in MariaDB headers.
  Should be fixed in the server code. my_config.h erroneously
  performs "#define HAVE_STRTOLL" instead of "#define HAVE_STRTOLL 1".
  in some cases. The former is not CMake compatible style. The latter is.

3. Non-conflicting definitions:
  Otherwise, mcsconfig.h and my_config.h should be mutually compatible,
  because both are generated by cmake on the same host machine. So
  they should have exactly equal definitions like "HAVE_XXX", "SIZEOF_XXX", etc.

Observations:
- It's OK to include both mcsconfig.h and my_config.h providing that we
  suppress duplicate definition of the above conflicting types #1 and #2.
- There is no a need to suppress duplicate definitions mentioned in #3,
  as they are compatible!
- my_sys.h and m_ctype.h must always follow a CMake configuation header,
  either my_config.h or mcsconfig.h (or both).
  They must never be included without any preceeding configuration header.

This change make sure that we resolve conflicts by:
- either disallowing inclusion of mcsconfig.h and my_config.h
  at the same time
- or by hiding conflicting definitions #1 and #2
  (with their later restoring).
- also, by making sure that my_sys.h and m_ctype.h always follow
  a CMake configuration file.

Details:
- idb_mysql.h can now only be included only after my_config.h
  An attempt to use idb_mysql.h with mcsconfig.h instead of
  my_config.h is caught by the "#error" preprocessor directive.

- mariadb_my_sys.h can now be only included after mcsconfig.h.
  An attempt to use mariadb_my_sys.h without mcscofig.h
  (e.g. with my_config.h) is also caught by "#error".

- collation.h now can now be included in two ways.
  It now has the following effective structure:

    #if defined(PREFER_MY_CONFIG_H) && defined(MY_CONFIG_H)
    //  Remember current conflicting definitions on the preprocessor stack
    //  Undefine current conflicting definitions
    #endif
    #include "mcsconfig.h"
    #include "m_ctype.h"
    #if defined(PREFER_MY_CONFIG_H) && defined(MY_CONFIG_H)
    #    Restore conflicting definitions from the preprocessor stack
    #endif

  and can be included as follows:

  a. using only mcsconfig.h as a configuration header:

    // my_config.h must not be included so far
    #include "collation.h"

  b. using my_config.h as the first included configuration file:

    #define PREFER_MY_CONFIG_H // Force conflict resolution
    #include "my_config.h"     // can be included directly or indirectly
    ...
    #include "collation.h"

Other changes:

- Adding helper header files
     utils/common/mcsconfig_conflicting_defs_remember.h
     utils/common/mcsconfig_conflicting_defs_restore.h
     utils/common/mcsconfig_conflicting_defs_undef.h
  to perform conflict resolution easier.

- Removing `#include "collation.h"` from a number of files,
  as it's automatically included from rowgroup.h.

- Removing redundant `#include "utils_utf8.h"`.
  This change is not directly related to the problem being fixed,
  but it's nice to remove redundant directives for both collation.h
  and utils_utf8.h from all the files that do not really need them.
  (this change could probably have gone as a separate commit)

- Changing my_init() to MY_INIT(argv[0]) in the MCS services sources.
  After the fix of the complitation failure it appeared that ColumnStore
  services compiled with the debug build crash due to recent changes in
  safemalloc. The crash happened in strcmp() with `my_progname` as an argument
  (where my_progname is a mysys global variable). This problem should
  probably be fixed on the server side as well to avoid passing NULL.
  But, the majority of MariaDB executable programs also use MY_INIT(argv[0])
  rather than my_init(). So let's make MCS do like the other programs do.
denis0x0D added a commit to denis0x0D/mariadb-columnstore-engine that referenced this pull request Oct 8, 2021
@denis0x0D
refactor mariadb-corporation#2
7b07503
mariadb-RomanNavrotskiy added a commit that referenced this pull request Feb 25, 2022
@mariadb-RomanNavrotskiy
# This is a combination of 2 commits.
712be8f 
# This is the 1st commit message:

try rockylinux instead of the centos8

# This is the commit message #2:

-DRPM=rocky84
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
2 participants
@LinuxJedi @davidhall586