Commit 27c3baca authored by Andrea Bignamini's avatar Andrea Bignamini
Browse files

Merge branch 'release/v1.1.0' 

- Remove check on remote columns
- Add make tar
parents aad03198 fca7d491

Makefile

+6 −0
Original line number Diff line number Diff line
@@ -3,6 +3,8 @@ EXEC_NAME=metadataExporter-srv 
INST_NAME=test

DEBUG_LEV=-v3

INSTALL_DIR=/usr/local/bin

VERSION := `git describe --tags`

TAR_NAME := `basename $(PWD)`

#================================================================================

INC_DIR=/usr/local/omniORB/include \

	   /usr/local/zeromq/include/zmq \
@@ -91,6 +93,10 @@ deepclean: 
install:

	-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

echo:

	@echo EXECUTABLE:

src/ProtocolManager.cpp

+15 −13
Original line number Diff line number Diff line
@@ -178,13 +178,14 @@ ResponseSP ProtocolManager::prepareValidation(RequestSP request_sp) 
                        throw std::runtime_error(errorStream.str());

                    }



                    if(validationReq.columns_size() != (int)informationList.size())

                    {

                        std::stringstream errorStream;

                        errorStream << "Table " << m_validatedSchema << "."

                            << m_validatedTable << " has different columns size";

                        throw std::runtime_error(errorStream.str());

                    }

		    // Same number of columns check removed

                    // if(validationReq.columns_size() != (int)informationList.size())

                    // {

                    //     std::stringstream errorStream;

                    //     errorStream << "Table " << m_validatedSchema << "."

                    //         << m_validatedTable << " has different columns size";

                    //     throw std::runtime_error(errorStream.str());

                    // }



                    for(int i=0; i<validationReq.columns_size(); ++i)

                        validateColumn(validationReq.columns(i), informationList);
@@ -378,12 +379,13 @@ void ProtocolManager::validateColumn(const Request::Validation::Column& column, 
        }

    }



    if(!found)

    {

        std::stringstream errorStream;

        errorStream << "Column " << column.name() << " not found";

        throw std::runtime_error(errorStream.str());

    }

    // Column not found check removed

    // if(!found)

    // {

    //     std::stringstream errorStream;

    //     errorStream << "Column " << column.name() << " not found";

    //     throw std::runtime_error(errorStream.str());

    // }

}



//==============================================================================