Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
M
metadata_exporter
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
IA2
metadata_exporter
Commits
27c3baca
Commit
27c3baca
authored
May 24, 2017
by
Andrea Bignamini
Browse files
Options
Downloads
Plain Diff
Merge branch 'release/v1.1.0'
- Remove check on remote columns - Add make tar
parents
aad03198
fca7d491
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
Makefile
+6
-0
6 additions, 0 deletions
Makefile
src/ProtocolManager.cpp
+15
-13
15 additions, 13 deletions
src/ProtocolManager.cpp
with
21 additions
and
13 deletions
Makefile
+
6
−
0
View file @
27c3baca
...
@@ -3,6 +3,8 @@ EXEC_NAME=metadataExporter-srv
...
@@ -3,6 +3,8 @@ EXEC_NAME=metadataExporter-srv
INST_NAME
=
test
INST_NAME
=
test
DEBUG_LEV
=
-v3
DEBUG_LEV
=
-v3
INSTALL_DIR
=
/usr/local/bin
INSTALL_DIR
=
/usr/local/bin
VERSION
:=
`
git describe
--tags
`
TAR_NAME
:=
`
basename
$(
PWD
)
`
#================================================================================
#================================================================================
INC_DIR
=
/usr/local/omniORB/include
\
INC_DIR
=
/usr/local/omniORB/include
\
/usr/local/zeromq/include/zmq
\
/usr/local/zeromq/include/zmq
\
...
@@ -91,6 +93,10 @@ deepclean:
...
@@ -91,6 +93,10 @@ deepclean:
install
:
install
:
-
cp
$(
EXECUTABLE
)
$(
INSTALL_DIR
)
-
cp
$(
EXECUTABLE
)
$(
INSTALL_DIR
)
.PHONY
:
tar
tar
:
-
tar
-czvf
$(
TAR_NAME
)
_
$(
VERSION
)
.tar.gz
--transform
=
"s|^.|
$(
TAR_NAME
)
_
$(
VERSION
)
/|"
$(
PROTO_DIR
)
$(
SRC_DIR
)
./Makefile
.PHONY
:
echo
.PHONY
:
echo
echo
:
echo
:
@
echo
EXECUTABLE:
@
echo
EXECUTABLE:
...
...
This diff is collapsed.
Click to expand it.
src/ProtocolManager.cpp
+
15
−
13
View file @
27c3baca
...
@@ -178,13 +178,14 @@ ResponseSP ProtocolManager::prepareValidation(RequestSP request_sp)
...
@@ -178,13 +178,14 @@ ResponseSP ProtocolManager::prepareValidation(RequestSP request_sp)
throw
std
::
runtime_error
(
errorStream
.
str
());
throw
std
::
runtime_error
(
errorStream
.
str
());
}
}
if
(
validationReq
.
columns_size
()
!=
(
int
)
informationList
.
size
())
// Same number of columns check removed
{
// if(validationReq.columns_size() != (int)informationList.size())
std
::
stringstream
errorStream
;
// {
errorStream
<<
"Table "
<<
m_validatedSchema
<<
"."
// std::stringstream errorStream;
<<
m_validatedTable
<<
" has different columns size"
;
// errorStream << "Table " << m_validatedSchema << "."
throw
std
::
runtime_error
(
errorStream
.
str
());
// << m_validatedTable << " has different columns size";
}
// throw std::runtime_error(errorStream.str());
// }
for
(
int
i
=
0
;
i
<
validationReq
.
columns_size
();
++
i
)
for
(
int
i
=
0
;
i
<
validationReq
.
columns_size
();
++
i
)
validateColumn
(
validationReq
.
columns
(
i
),
informationList
);
validateColumn
(
validationReq
.
columns
(
i
),
informationList
);
...
@@ -378,12 +379,13 @@ void ProtocolManager::validateColumn(const Request::Validation::Column& column,
...
@@ -378,12 +379,13 @@ void ProtocolManager::validateColumn(const Request::Validation::Column& column,
}
}
}
}
if
(
!
found
)
// Column not found check removed
{
// if(!found)
std
::
stringstream
errorStream
;
// {
errorStream
<<
"Column "
<<
column
.
name
()
<<
" not found"
;
// std::stringstream errorStream;
throw
std
::
runtime_error
(
errorStream
.
str
());
// errorStream << "Column " << column.name() << " not found";
}
// throw std::runtime_error(errorStream.str());
// }
}
}
//==============================================================================
//==============================================================================
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment