Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
3f2e1f88
Commit
3f2e1f88
authored
Oct 09, 2007
by
Yoni Fogel
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
db_load with initial test.
git-svn-id:
file:///svn/tokudb@417
c7de825b-a66e-492c-adef-691d508d4ae1
parent
cba20ee7
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
53 additions
and
35 deletions
+53
-35
utils/Makefile
utils/Makefile
+14
-4
utils/tokudb_common.h
utils/tokudb_common.h
+1
-1
utils/tokudb_load.c
utils/tokudb_load.c
+38
-30
No files found.
utils/Makefile
View file @
3f2e1f88
...
@@ -34,7 +34,8 @@ test_gen_hex:
...
@@ -34,7 +34,8 @@ test_gen_hex:
#Generating
$(TEST_GEN_HEX_NUMKEYS)
keys.
[
$(TEST_GEN_HEX_LENGTHMIN)
,
$(TEST_GEN_HEX_LENGTHLIMIT)
)
bytes + identifier overhead
#Generating
$(TEST_GEN_HEX_NUMKEYS)
keys.
[
$(TEST_GEN_HEX_LENGTHMIN)
,
$(TEST_GEN_HEX_LENGTHLIMIT)
)
bytes + identifier overhead
echo
"Generating text input > db > text"
echo
"Generating text input > db > text"
rm
-f
$@
.
*
.temp
rm
-f
$@
.
*
.temp
./tokudb_gen
$(TEST_GEN_HEX_FLAGS)
|
$(BDB_LOAD)
$@
.db.temp
./tokudb_gen
$(TEST_GEN_HEX_FLAGS)
>
$@
.gen.temp
$(BDB_LOAD)
$@
.db.temp <
$@
.gen.temp
$(BDB_DUMP)
$@
.db.temp
>
$@
.load_dump.temp
$(BDB_DUMP)
$@
.db.temp
>
$@
.load_dump.temp
./tokudb_gen
-Hf
>
$@
.gen_sorted.temp
./tokudb_gen
-Hf
>
$@
.gen_sorted.temp
./tokudb_gen
-hf
$(TEST_GEN_HEX_FLAGS)
-d
"
\t
"
-s
"
\n
"
|
sort
-k
1,1 |
tr
-d
"
\n
"
|
tr
"
\t
"
"
\n
"
>>
$@
.gen_sorted.temp
./tokudb_gen
-hf
$(TEST_GEN_HEX_FLAGS)
-d
"
\t
"
-s
"
\n
"
|
sort
-k
1,1 |
tr
-d
"
\n
"
|
tr
"
\t
"
"
\n
"
>>
$@
.gen_sorted.temp
...
@@ -42,8 +43,17 @@ test_gen_hex:
...
@@ -42,8 +43,17 @@ test_gen_hex:
if
!
diff
-q
$@
.load_dump.temp
$@
.gen_sorted.temp
;
then
echo
"Test Failed!"
;
exit
1
;
fi
if
!
diff
-q
$@
.load_dump.temp
$@
.gen_sorted.temp
;
then
echo
"Test Failed!"
;
exit
1
;
fi
rm
$@
.
*
.temp
rm
$@
.
*
.temp
test_load
:
test_load_hex
test_load
:
test_gen
#Generating
#Generating
$(TEST_GEN_HEX_NUMKEYS)
keys.
[
$(TEST_GEN_HEX_LENGTHMIN)
,
$(TEST_GEN_HEX_LENGTHLIMIT)
)
bytes + identifier overhead
echo
"Generating text input > db > text"
rm
-f
$@
.
*
.temp
./tokudb_gen
$(TEST_GEN_HEX_FLAGS)
>
$@
.gen.temp
$(BDB_LOAD)
$@
.bdb.temp <
$@
.gen.temp
./tokudb_load
$@
.tokudb.temp <
$@
.gen.temp
$(BDB_DUMP)
$@
.bdb.temp
>
$@
.dump.bdb.temp
$(BDB_DUMP)
$@
.tokudb.temp
>
$@
.dump.tokudb.temp
if
!
diff
-q
$@
.dump.bdb.temp
$@
.dump.tokudb.temp
;
then
echo
"Test Failed!"
;
exit
1
;
fi
#if diff -q <(echo "foo") <(echo "foo") > /dev/null; then echo yes; else echo no; fi
#if diff -q <(echo "foo") <(echo "foo") > /dev/null; then echo yes; else echo no; fi
clean
:
clean
:
...
...
utils/tokudb_common.h
View file @
3f2e1f88
...
@@ -16,7 +16,7 @@ typedef uint8_t bool;
...
@@ -16,7 +16,7 @@ typedef uint8_t bool;
#define IS_SET_ANY(bitvector, bits) ((bitvector) & (bits))
#define IS_SET_ANY(bitvector, bits) ((bitvector) & (bits))
#define IS_SET_ALL(bitvector, bits) (((bitvector) & (bits)) == (bits))
#define IS_SET_ALL(bitvector, bits) (((bitvector) & (bits)) == (bits))
#define IS_POWER_OF_2(num) ((num) > 0 && ((num) & ((num) - 1)))
#define IS_POWER_OF_2(num) ((num) > 0 && ((num) & ((num) - 1))
== 0
)
int
strtoint32
(
DB
*
db
,
char
*
progname
,
char
*
str
,
int32_t
*
num
,
int32_t
min
,
int32_t
max
,
int
base
);
int
strtoint32
(
DB
*
db
,
char
*
progname
,
char
*
str
,
int32_t
*
num
,
int32_t
min
,
int32_t
max
,
int
base
);
int
strtouint32
(
DB
*
db
,
char
*
progname
,
char
*
str
,
uint32_t
*
num
,
uint32_t
min
,
uint32_t
max
,
int
base
);
int
strtouint32
(
DB
*
db
,
char
*
progname
,
char
*
str
,
uint32_t
*
num
,
uint32_t
min
,
uint32_t
max
,
int
base
);
...
...
utils/tokudb_load.c
View file @
3f2e1f88
...
@@ -17,6 +17,7 @@ extern int optopt;
...
@@ -17,6 +17,7 @@ extern int optopt;
extern
int
opterr
;
extern
int
opterr
;
extern
int
optreset
;
extern
int
optreset
;
typedef
struct
{
typedef
struct
{
bool
leadingspace
;
bool
leadingspace
;
bool
plaintext
;
bool
plaintext
;
...
@@ -151,11 +152,10 @@ int main(int argc, char *argv[]) {
...
@@ -151,11 +152,10 @@ int main(int argc, char *argv[]) {
//TODO: /* Handle possible interruptions/signals. */
//TODO: /* Handle possible interruptions/signals. */
g
.
database
=
argv
[
0
];
g
.
database
=
argv
[
0
];
//TODO: flockfile(stdin);
if
(
create_init_env
()
!=
0
)
goto
error
;
if
(
create_init_env
()
!=
0
)
goto
error
;
while
(
!
g
.
eof
)
{
while
(
!
g
.
eof
)
{
//BOOKMARK
//BOOKMARK
if
(
!
load_database
()
)
goto
errorcleanup
;
if
(
load_database
()
!=
0
)
goto
errorcleanup
;
}
}
if
(
false
)
{
if
(
false
)
{
errorcleanup:
errorcleanup:
...
@@ -166,7 +166,6 @@ int main(int argc, char *argv[]) {
...
@@ -166,7 +166,6 @@ int main(int argc, char *argv[]) {
g
.
exitcode
=
EXIT_FAILURE
;
g
.
exitcode
=
EXIT_FAILURE
;
fprintf
(
stderr
,
"%s: dbenv->close: %s
\n
"
,
g
.
progname
,
db_strerror
(
retval
));
fprintf
(
stderr
,
"%s: dbenv->close: %s
\n
"
,
g
.
progname
,
db_strerror
(
retval
));
}
}
//TODO: funlockfile(stdin);
//TODO: /* Resend any caught signal. */
//TODO: /* Resend any caught signal. */
free
(
g
.
config_options
);
free
(
g
.
config_options
);
...
@@ -219,6 +218,7 @@ int load_database()
...
@@ -219,6 +218,7 @@ int load_database()
g
.
exitcode
=
EXIT_FAILURE
;
g
.
exitcode
=
EXIT_FAILURE
;
}
}
cleanup:
cleanup:
if
(
close_database
()
!=
0
)
g
.
exitcode
=
EXIT_FAILURE
;
if
(
close_database
()
!=
0
)
g
.
exitcode
=
EXIT_FAILURE
;
return
g
.
exitcode
;
return
g
.
exitcode
;
...
@@ -237,7 +237,7 @@ int usage()
...
@@ -237,7 +237,7 @@ int usage()
return
EXIT_FAILURE
;
return
EXIT_FAILURE
;
}
}
int
longusage
(
const
char
*
progname
)
int
longusage
()
{
{
printf
(
"TODO: Implement %s:%s:%d
\n
"
,
__FILE__
,
__FUNCTION__
,
__LINE__
);
printf
(
"TODO: Implement %s:%s:%d
\n
"
,
__FILE__
,
__FUNCTION__
,
__LINE__
);
return
EXIT_FAILURE
;
return
EXIT_FAILURE
;
...
@@ -268,7 +268,8 @@ int create_init_env()
...
@@ -268,7 +268,8 @@ int create_init_env()
/* Open the dbenvironment. */
/* Open the dbenvironment. */
g
.
is_private
=
false
;
g
.
is_private
=
false
;
flags
=
DB_JOINENV
|
DB_INIT_LOCK
|
DB_INIT_LOG
|
DB_INIT_MPOOL
|
DB_USE_ENVIRON
;
// flags = DB_JOINENV | DB_INIT_LOCK | DB_INIT_LOG | DB_INIT_MPOOL | DB_USE_ENVIRON;
flags
=
DB_INIT_LOCK
|
DB_INIT_LOG
|
DB_INIT_MPOOL
|
DB_USE_ENVIRON
;
//TODO: Transactions.. SET_BITS(flags, DB_INIT_TXN);
//TODO: Transactions.. SET_BITS(flags, DB_INIT_TXN);
if
(
!
dbenv
->
open
(
dbenv
,
g
.
homedir
,
flags
,
0
))
goto
success
;
if
(
!
dbenv
->
open
(
dbenv
,
g
.
homedir
,
flags
,
0
))
goto
success
;
...
@@ -311,7 +312,7 @@ int printabletocstring(char* inputstr, char** poutputstr)
...
@@ -311,7 +312,7 @@ int printabletocstring(char* inputstr, char** poutputstr)
cstring
=
(
char
*
)
malloc
((
strlen
(
inputstr
)
+
1
)
*
sizeof
(
char
));
cstring
=
(
char
*
)
malloc
((
strlen
(
inputstr
)
+
1
)
*
sizeof
(
char
));
if
(
cstring
==
NULL
)
{
if
(
cstring
==
NULL
)
{
dbenv
->
err
x
(
dbenv
,
"%s"
,
strerror
(
ENOMEM
)
);
dbenv
->
err
(
dbenv
,
ENOMEM
,
""
);
goto
error
;
goto
error
;
}
}
...
@@ -370,14 +371,14 @@ if (!strcmp(field, match)) { \
...
@@ -370,14 +371,14 @@ if (!strcmp(field, match)) { \
if (!strcmp(field, match)) { \
if (!strcmp(field, match)) { \
if (strtoint32(db, NULL, value, &num, 0, 1, 10)) { \
if (strtoint32(db, NULL, value, &num, 0, 1, 10)) { \
db->errx(db, \
db->errx(db, \
"%s:
%s:
boolean name=value pairs require a value of 0 or 1", \
"%s: boolean name=value pairs require a value of 0 or 1", \
g.progname, field);
\
field);
\
goto error; \
goto error; \
} \
} \
if ((retval = db->set_flags(db, flag)) != 0) { \
if ((retval = db->set_flags(db, flag)) != 0) { \
db->err(db, retval, \
db->err(db, retval, \
"
%s: set_flags: %s",
\
"
set_flags: %s",
\
g.progname, field);
\
field);
\
goto error; \
goto error; \
} \
} \
continue; \
continue; \
...
@@ -387,8 +388,8 @@ if (!strcmp(field, match)) { \
...
@@ -387,8 +388,8 @@ if (!strcmp(field, match)) { \
if (!strcmp(field, match)) { \
if (!strcmp(field, match)) { \
if (strtoint32(db, NULL, value, &num, 0, 1, 10)) { \
if (strtoint32(db, NULL, value, &num, 0, 1, 10)) { \
db->errx(db, \
db->errx(db, \
"%s:
%s:
boolean name=value pairs require a value of 0 or 1", \
"%s: boolean name=value pairs require a value of 0 or 1", \
g.progname, field);
\
field);
\
goto error; \
goto error; \
} \
} \
db->errx(db, "%s option not supported.\n", field); \
db->errx(db, "%s option not supported.\n", field); \
...
@@ -399,8 +400,8 @@ if (!strcmp(field, match)) { \
...
@@ -399,8 +400,8 @@ if (!strcmp(field, match)) { \
if (!strcmp(field, match)) { \
if (!strcmp(field, match)) { \
if (strlen(value) != 1) { \
if (strlen(value) != 1) { \
db->errx(db, \
db->errx(db, \
"%s
: %s
=%s: Expected 1-byte value", \
"%s=%s: Expected 1-byte value", \
g.progname, field, value);
\
field, value);
\
goto error; \
goto error; \
} \
} \
if ((retval = dbfunction(db, value[0])) != 0) { \
if ((retval = dbfunction(db, value[0])) != 0) { \
...
@@ -420,11 +421,12 @@ int read_header()
...
@@ -420,11 +421,12 @@ int read_header()
int32_t
num
;
int32_t
num
;
int
retval
;
int
retval
;
DB
*
db
=
g
.
db
;
DB
*
db
=
g
.
db
;
DB_ENV
*
dbenv
=
g
.
dbenv
;
assert
(
g
.
header
);
assert
(
g
.
header
);
if
(
data
==
NULL
&&
(
data
=
(
char
*
)
malloc
(
datasize
*
sizeof
(
char
)))
==
NULL
)
{
if
(
data
==
NULL
&&
(
data
=
(
char
*
)
malloc
(
datasize
*
sizeof
(
char
)))
==
NULL
)
{
fprintf
(
stderr
,
"%s: %s
\n
"
,
g
.
progname
,
strerror
(
errno
)
);
dbenv
->
err
(
dbenv
,
errno
,
""
);
goto
error
;
goto
error
;
}
}
while
(
!
g
.
eof
)
{
while
(
!
g
.
eof
)
{
...
@@ -446,6 +448,7 @@ int read_header()
...
@@ -446,6 +448,7 @@ int read_header()
/* Ensure room exists for next character/null terminator. */
/* Ensure room exists for next character/null terminator. */
if
(
index
==
datasize
&&
doublechararray
(
&
data
,
&
datasize
))
goto
error
;
if
(
index
==
datasize
&&
doublechararray
(
&
data
,
&
datasize
))
goto
error
;
}
}
if
(
index
==
0
&&
g
.
eof
)
goto
success
;
data
[
index
]
=
'\0'
;
data
[
index
]
=
'\0'
;
field
=
data
;
field
=
data
;
...
@@ -457,7 +460,7 @@ int read_header()
...
@@ -457,7 +460,7 @@ int read_header()
if
(
!
strcmp
(
field
,
"HEADER"
))
break
;
if
(
!
strcmp
(
field
,
"HEADER"
))
break
;
if
(
!
strcmp
(
field
,
"VERSION"
))
{
if
(
!
strcmp
(
field
,
"VERSION"
))
{
if
(
strtoint32
(
db
,
NULL
,
optarg
,
&
g
.
version
,
1
,
INT32_MAX
,
10
))
goto
error
;
if
(
strtoint32
(
db
,
NULL
,
value
,
&
g
.
version
,
1
,
INT32_MAX
,
10
))
goto
error
;
if
(
g
.
version
!=
3
)
{
if
(
g
.
version
!=
3
)
{
db
->
errx
(
db
,
"line %lu: VERSION %d is unsupported"
,
g
.
linenumber
,
g
.
version
);
db
->
errx
(
db
,
"line %lu: VERSION %d is unsupported"
,
g
.
linenumber
,
g
.
version
);
goto
error
;
goto
error
;
...
@@ -503,13 +506,13 @@ int read_header()
...
@@ -503,13 +506,13 @@ int read_header()
int32_t
temp
;
int32_t
temp
;
if
(
strtoint32
(
db
,
NULL
,
value
,
&
temp
,
0
,
1
,
10
))
{
if
(
strtoint32
(
db
,
NULL
,
value
,
&
temp
,
0
,
1
,
10
))
{
db
->
errx
(
db
,
db
->
errx
(
db
,
"%s:
%s:
boolean name=value pairs require a value of 0 or 1"
,
"%s: boolean name=value pairs require a value of 0 or 1"
,
g
.
progname
,
field
);
field
);
goto
error
;
goto
error
;
}
}
g
.
keys
=
temp
;
g
.
keys
=
temp
;
if
(
!
g
.
keys
)
{
if
(
!
g
.
keys
)
{
db
->
errx
(
db
,
"
%s: keys=0 not supported"
,
g
.
progname
,
field
);
db
->
errx
(
db
,
"
keys=0 not supported"
,
field
);
goto
error
;
goto
error
;
}
}
continue
;
continue
;
...
@@ -531,11 +534,12 @@ int read_header()
...
@@ -531,11 +534,12 @@ int read_header()
db
->
errx
(
db
,
"unknown input-file header configuration keyword
\"
%s
\"
"
,
field
);
db
->
errx
(
db
,
"unknown input-file header configuration keyword
\"
%s
\"
"
,
field
);
goto
error
;
goto
error
;
}
}
success:
return
EXIT_SUCCESS
;
return
EXIT_SUCCESS
;
if
(
false
)
{
if
(
false
)
{
printerror:
printerror:
db
->
err
(
db
,
retval
,
"%s
: %s=%s"
,
g
.
progname
,
field
,
value
);
db
->
err
(
db
,
retval
,
"%s
=%s"
,
field
,
value
);
}
}
if
(
false
)
{
if
(
false
)
{
formaterror:
formaterror:
...
@@ -595,13 +599,13 @@ int apply_commandline_options()
...
@@ -595,13 +599,13 @@ int apply_commandline_options()
int32_t
temp
;
int32_t
temp
;
if
(
strtoint32
(
db
,
NULL
,
value
,
&
temp
,
0
,
1
,
10
))
{
if
(
strtoint32
(
db
,
NULL
,
value
,
&
temp
,
0
,
1
,
10
))
{
db
->
errx
(
db
,
db
->
errx
(
db
,
"%s:
%s:
boolean name=value pairs require a value of 0 or 1"
,
"%s: boolean name=value pairs require a value of 0 or 1"
,
g
.
progname
,
field
);
field
);
goto
error
;
goto
error
;
}
}
g
.
keys
=
temp
;
g
.
keys
=
temp
;
if
(
!
g
.
keys
)
{
if
(
!
g
.
keys
)
{
db
->
errx
(
db
,
"
%s: keys=0 not supported"
,
g
.
progname
,
field
);
db
->
errx
(
db
,
"
keys=0 not supported"
,
field
);
goto
error
;
goto
error
;
}
}
continue
;
continue
;
...
@@ -632,7 +636,7 @@ int apply_commandline_options()
...
@@ -632,7 +636,7 @@ int apply_commandline_options()
if
(
false
)
{
if
(
false
)
{
printerror:
printerror:
db
->
err
(
db
,
retval
,
"%s
: %s=%s"
,
g
.
progname
,
field
,
value
);
db
->
err
(
db
,
retval
,
"%s
=%s"
,
field
,
value
);
}
}
error:
error:
return
EXIT_FAILURE
;
return
EXIT_FAILURE
;
...
@@ -698,11 +702,11 @@ int doublechararray(char** pmem, uint64_t* size)
...
@@ -698,11 +702,11 @@ int doublechararray(char** pmem, uint64_t* size)
*
size
<<=
1
;
*
size
<<=
1
;
if
(
*
size
==
0
)
{
if
(
*
size
==
0
)
{
/* Overflowed uint64_t. */
/* Overflowed uint64_t. */
db
->
errx
(
db
,
"
%s: Line %llu: Line too long.
\n
"
,
g
.
progname
,
g
.
linenumber
);
db
->
errx
(
db
,
"
Line %llu: Line too long.
\n
"
,
g
.
linenumber
);
goto
error
;
goto
error
;
}
}
if
((
*
pmem
=
(
char
*
)
realloc
(
*
pmem
,
*
size
))
==
NULL
)
{
if
((
*
pmem
=
(
char
*
)
realloc
(
*
pmem
,
*
size
))
==
NULL
)
{
db
->
err
x
(
db
,
"%s: %s
\n
"
,
g
.
progname
,
strerror
(
errno
)
);
db
->
err
(
db
,
errno
,
""
);
goto
error
;
goto
error
;
}
}
return
EXIT_SUCCESS
;
return
EXIT_SUCCESS
;
...
@@ -725,8 +729,12 @@ int get_dbt(DBT* pdbt)
...
@@ -725,8 +729,12 @@ int get_dbt(DBT* pdbt)
/* *pdbt should have been memset to 0 before being called. */
/* *pdbt should have been memset to 0 before being called. */
which
=
1
-
which
;
which
=
1
-
which
;
if
(
data
[
which
]
==
NULL
)
data
[
which
]
=
(
char
*
)
malloc
(
datasize
[
which
]
*
sizeof
(
char
));
if
(
data
[
which
]
==
NULL
&&
//TODO: Test for ENOMEM/error here.
(
data
[
which
]
=
(
char
*
)
malloc
(
datasize
[
which
]
*
sizeof
(
char
)))
==
NULL
)
{
db
->
err
(
db
,
errno
,
""
);
goto
error
;
}
datum
=
data
[
which
];
datum
=
data
[
which
];
if
(
g
.
plaintext
)
{
if
(
g
.
plaintext
)
{
...
@@ -898,7 +906,7 @@ int read_keys()
...
@@ -898,7 +906,7 @@ int read_keys()
if
(
fgets
(
footer
,
sizeof
(
"ATA=END
\n
"
),
stdin
)
!=
NULL
&&
if
(
fgets
(
footer
,
sizeof
(
"ATA=END
\n
"
),
stdin
)
!=
NULL
&&
(
!
strcmp
(
footer
,
"ATA=END"
)
||
!
strcmp
(
footer
,
"ATA=END
\n
"
)))
(
!
strcmp
(
footer
,
"ATA=END"
)
||
!
strcmp
(
footer
,
"ATA=END
\n
"
)))
{
{
goto
error
;
goto
success
;
}
}
goto
unexpectedinput
;
goto
unexpectedinput
;
}
}
...
@@ -946,7 +954,7 @@ int close_database()
...
@@ -946,7 +954,7 @@ int close_database()
int
retval
;
int
retval
;
assert
(
db
);
assert
(
db
);
if
(
db
->
close
(
db
,
0
)
)
{
if
(
(
retval
=
db
->
close
(
db
,
0
))
!=
0
)
{
dbenv
->
err
(
dbenv
,
retval
,
"DB->close"
);
dbenv
->
err
(
dbenv
,
retval
,
"DB->close"
);
goto
error
;
goto
error
;
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment