database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-07-29 08:21:15 +03:00
Code Activity

[MCOL-69] autotools

Browse Source
This commit is contained in:
justin
2016-06-13 20:02:25 -04:00
parent 4365e207fc
commit 54c361cff7
6 changed files with 491 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
build/bootstrap
View File

@ -33,6 +33,10 @@ while true
esac
done
if [ "$INCLUDE" == "" ]; then
INCLUDE="-I$PWD/../sql -I$PWD/../include -I$PWD/../pcre"
fi
export CXXFLAGS=$INCLUDE $CXXFLAGS
#TODO: these prebuilt binaries may need to be fetched
@ -117,7 +121,7 @@ then
./configure --prefix=$PREFIX
else
echo "BUILDING WITH DEFAULT PREFIX"
./configure
./configure --prefix=/usr/local/mariadb/columnstore
fi
#for x in \

3
configure.ac
View File

@ -226,6 +226,7 @@ AC_CONFIG_FILES([
oamapps/traphandler/Makefile
oamapps/sendtrap/Makefile
oamapps/calpontSupport/Makefile
oamapps/columnstoreDB/Makefile
primitives/Makefile
primitives/blockcache/Makefile
primitives/linux-port/Makefile
@ -233,9 +234,11 @@ AC_CONFIG_FILES([
decomsvr/Makefile
procmgr/Makefile
procmon/Makefile
net-snmp/Makefile
snmpd/Makefile
snmpd/etc/Makefile
snmpd/snmpmanager/Makefile
oamapps/columnstoreSupport/Makefile
tools/Makefile
tools/editem/Makefile
tools/cplogger/Makefile

57
dbcon/dmlpackage/dml-scan.cpp
View File

@ -27,7 +27,7 @@
#define FLEX_SCANNER
#define YY_FLEX_MAJOR_VERSION 2
#define YY_FLEX_MINOR_VERSION 5
#define YY_FLEX_SUBMINOR_VERSION 35
#define YY_FLEX_SUBMINOR_VERSION 37
#if YY_FLEX_SUBMINOR_VERSION > 0
#define FLEX_BETA
#endif
@ -72,7 +72,6 @@ typedef int flex_int32_t;
typedef unsigned char flex_uint8_t;
typedef unsigned short int flex_uint16_t;
typedef unsigned int flex_uint32_t;
#endif /* ! C99 */
/* Limits of integral types. */
#ifndef INT8_MIN
@ -103,6 +102,8 @@ typedef unsigned int flex_uint32_t;
#define UINT32_MAX (4294967295U)
#endif
#endif /* ! C99 */
#endif /* ! FLEXINT_H */
#ifdef __cplusplus
@ -171,7 +172,12 @@ typedef unsigned int flex_uint32_t;
typedef struct yy_buffer_state *YY_BUFFER_STATE;
#endif
extern int dmlleng;
#ifndef YY_TYPEDEF_YY_SIZE_T
#define YY_TYPEDEF_YY_SIZE_T
typedef size_t yy_size_t;
#endif
extern yy_size_t dmlleng;
extern FILE *dmlin, *dmlout;
@ -197,11 +203,6 @@ extern FILE *dmlin, *dmlout;
#define unput(c) yyunput( c, (yytext_ptr) )
#ifndef YY_TYPEDEF_YY_SIZE_T
#define YY_TYPEDEF_YY_SIZE_T
typedef size_t yy_size_t;
#endif
#ifndef YY_STRUCT_YY_BUFFER_STATE
#define YY_STRUCT_YY_BUFFER_STATE
struct yy_buffer_state
@ -219,7 +220,7 @@ struct yy_buffer_state
/* Number of characters read into yy_ch_buf, not including EOB
* characters.
*/
int yy_n_chars;
yy_size_t yy_n_chars;
/* Whether we "own" the buffer - i.e., we know we created it,
* and can realloc() it to grow it, and should free() it to
@ -289,8 +290,8 @@ static YY_BUFFER_STATE * yy_buffer_stack = 0; /**< Stack as an array. */
/* yy_hold_char holds the character lost when dmltext is formed. */
static char yy_hold_char;
static int yy_n_chars; /* number of characters read into yy_ch_buf */
int dmlleng;
static yy_size_t yy_n_chars; /* number of characters read into yy_ch_buf */
yy_size_t dmlleng;
/* Points to current character in buffer. */
static char *yy_c_buf_p = (char *) 0;
@ -318,7 +319,7 @@ static void dml_init_buffer (YY_BUFFER_STATE b,FILE *file );
YY_BUFFER_STATE dml_scan_buffer (char *base,yy_size_t size );
YY_BUFFER_STATE dml_scan_string (yyconst char *yy_str );
YY_BUFFER_STATE dml_scan_bytes (yyconst char *bytes,int len );
YY_BUFFER_STATE dml_scan_bytes (yyconst char *bytes,yy_size_t len );
void *dmlalloc (yy_size_t );
void *dmlrealloc (void *,yy_size_t );
@ -350,7 +351,7 @@ void dmlfree (void * );
/* Begin user sect3 */
#define dmlwrap(n) 1
#define dmlwrap() 1
#define YY_SKIP_YYWRAP
typedef unsigned char YY_CHAR;
@ -889,7 +890,7 @@ FILE *dmlget_out (void );
void dmlset_out (FILE * out_str );
int dmlget_leng (void );
yy_size_t dmlget_leng (void );
char *dmlget_text (void );
@ -948,7 +949,7 @@ static int input (void );
if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
{ \
int c = '*'; \
unsigned n; \
size_t n; \
for ( n = 0; n < max_size && \
(c = getc( dmlin )) != EOF && c != '\n'; ++n ) \
buf[n] = (char) c; \
@ -1702,21 +1703,21 @@ static int yy_get_next_buffer (void)
else
{
int num_to_read =
yy_size_t num_to_read =
YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1;
while ( num_to_read <= 0 )
{ /* Not enough room in the buffer - grow it. */
/* just a shorter name for the current buffer */
YY_BUFFER_STATE b = YY_CURRENT_BUFFER;
YY_BUFFER_STATE b = YY_CURRENT_BUFFER_LVALUE;
int yy_c_buf_p_offset =
(int) ((yy_c_buf_p) - b->yy_ch_buf);
if ( b->yy_is_our_buffer )
{
int new_size = b->yy_buf_size * 2;
yy_size_t new_size = b->yy_buf_size * 2;
if ( new_size <= 0 )
b->yy_buf_size += b->yy_buf_size / 8;
@ -1747,7 +1748,7 @@ static int yy_get_next_buffer (void)
/* Read in more data. */
YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]),
(yy_n_chars), (size_t) num_to_read );
(yy_n_chars), num_to_read );
YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
}
@ -1842,7 +1843,7 @@ static int yy_get_next_buffer (void)
yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
yy_is_jam = (yy_current_state == 393);
return yy_is_jam ? 0 : yy_current_state;
return yy_is_jam ? 0 : yy_current_state;
}
#ifndef YY_NO_INPUT
@ -1869,7 +1870,7 @@ static int yy_get_next_buffer (void)
else
{ /* need more input */
int offset = (yy_c_buf_p) - (yytext_ptr);
yy_size_t offset = (yy_c_buf_p) - (yytext_ptr);
++(yy_c_buf_p);
switch ( yy_get_next_buffer( ) )
@ -2029,10 +2030,6 @@ static void dml_load_buffer_state (void)
dmlfree((void *) b );
}
#ifndef __cplusplus
extern int isatty (int );
#endif /* __cplusplus */
/* Initializes or reinitializes a buffer.
* This function is sometimes called more than once on the same buffer,
* such as during a dmlrestart() or at EOF.
@ -2145,7 +2142,7 @@ void dmlpop_buffer_state (void)
*/
static void dmlensure_buffer_stack (void)
{
int num_to_alloc;
yy_size_t num_to_alloc;
if (!(yy_buffer_stack)) {
@ -2237,12 +2234,12 @@ YY_BUFFER_STATE dml_scan_string (yyconst char * yystr )
/** Setup the input buffer state to scan the given bytes. The next call to dmllex() will
* scan from a @e copy of @a bytes.
* @param bytes the byte buffer to scan
* @param len the number of bytes in the buffer pointed to by @a bytes.
* @param yybytes the byte buffer to scan
* @param _yybytes_len the number of bytes in the buffer pointed to by @a bytes.
*
* @return the newly allocated buffer state object.
*/
YY_BUFFER_STATE dml_scan_bytes (yyconst char * yybytes, int _yybytes_len )
YY_BUFFER_STATE dml_scan_bytes (yyconst char * yybytes, yy_size_t _yybytes_len )
{
YY_BUFFER_STATE b;
char *buf;
@ -2329,7 +2326,7 @@ FILE *dmlget_out (void)
/** Get the length of the current token.
*
*/
int dmlget_leng (void)
yy_size_t dmlget_leng (void)
{
return dmlleng;
}

228
oamapps/columnstoreDB/columnstoreDBWrite Executable file
View File

File diff suppressed because one or more lines are too long

228
oamapps/columnstoreSupport/columnstoreSupport Executable file
View File

File diff suppressed because one or more lines are too long

1
utils/loggingcpp/errorids.h
View File

@ -1,5 +1,4 @@
/* Copyright (C) 2014 InfiniDB, Inc.
Copyright (C) 2016 MariaDB Corporaton
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License